4004 files changed, 68057 insertions, 71679 deletions

diff --git a/.gitignore b/.gitignore
index 6fe8a9d457..1237086030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 *.sw?
 *~
+lib/oe/*.pyc
+contrib/oeaudit/*.pyc
diff --git a/classes/amend.bbclass b/classes/amend.bbclass
index bcb93d4e75..cddd28caea 100644
--- a/classes/amend.bbclass
+++ b/classes/amend.bbclass
@@ -21,9 +21,7 @@ python () {
     depends = d.getVar("__depends", 0) or []
     d.setVar("__depends", depends + [(file, 0) for file in amendfiles if not os.path.exists(file)])
 
-    existing = (file for file in amendfiles if os.path.exists(file))
-    try:
-        bb.parse.handle(existing.next(), d, 1)
-    except StopIteration:
-        pass
+    for file in amendfiles:
+        if os.path.exists(file):
+            bb.parse.handle(file, d, 1)
 }
diff --git a/classes/angstrom-mirrors.bbclass b/classes/angstrom-mirrors.bbclass
index 10bf75044f..1ba60e9252 100644
--- a/classes/angstrom-mirrors.bbclass
+++ b/classes/angstrom-mirrors.bbclass
@@ -1,3 +1,11 @@
+PREMIRRORS_append () {
+cvs://.*/.* http://www.angstrom-distribution.org/unstable/sources/
+svn://.*/.* http://www.angstrom-distribution.org/unstable/sources/
+git://.*/.* http://www.angstrom-distribution.org/unstable/sources/
+hg://.*/.* http://www.angstrom-distribution.org/unstable/sources/
+bzr://.*/.* http://www.angstrom-distribution.org/unstable/sources/
+}
+
 MIRRORS_append () {
 ftp://.*/.*	http://www.angstrom-distribution.org/unstable/sources/
 https?$://.*/.*	http://www.angstrom-distribution.org/unstable/sources/
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 31d357892a..df2c11426e 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -44,30 +44,27 @@ def autotools_set_crosscompiling(d):
 
 # EXTRA_OECONF_append = "${@autotools_set_crosscompiling(d)}"
 
+CONFIGUREOPTS = " --build=${BUILD_SYS} \
+		  --host=${HOST_SYS} \
+		  --target=${TARGET_SYS} \
+		  --prefix=${prefix} \
+		  --exec_prefix=${exec_prefix} \
+		  --bindir=${bindir} \
+		  --sbindir=${sbindir} \
+		  --libexecdir=${libexecdir} \
+		  --datadir=${datadir} \
+		  --sysconfdir=${sysconfdir} \
+		  --sharedstatedir=${sharedstatedir} \
+		  --localstatedir=${localstatedir} \
+		  --libdir=${libdir} \
+		  --includedir=${includedir} \
+		  --oldincludedir=${oldincludedir} \
+		  --infodir=${infodir} \
+		  --mandir=${mandir}"
+
 oe_runconf () {
 	if [ -x ${S}/configure ] ; then
-		cfgcmd="${S}/configure \
-		    --build=${BUILD_SYS} \
-		    --host=${HOST_SYS} \
-		    --target=${TARGET_SYS} \
-		    --prefix=${prefix} \
-		    --exec_prefix=${exec_prefix} \
-		    --bindir=${bindir} \
-		    --sbindir=${sbindir} \
-		    --libexecdir=${libexecdir} \
-		    --datadir=${datadir} \
-		    --sysconfdir=${sysconfdir} \
-		    --sharedstatedir=${sharedstatedir} \
-		    --localstatedir=${localstatedir} \
-		    --libdir=${libdir} \
-		    --includedir=${includedir} \
-		    --oldincludedir=${oldincludedir} \
-		    --infodir=${infodir} \
-		    --mandir=${mandir} \
-			${EXTRA_OECONF} \
-		    $@"
-		oenote "Running $cfgcmd..."
-		$cfgcmd || oefatal "oe_runconf failed" 
+		${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"
 	else
 		oefatal "no configure script found"
 	fi
@@ -127,14 +124,18 @@ autotools_do_configure() {
 			    oenote Executing glib-gettextize --force --copy
 			    echo "no" | glib-gettextize --force --copy
 			  fi
+			else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
+			  cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
+			fi
+
 			fi
 			mkdir -p m4
+			oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
+			autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed."
 			if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
 			  oenote Executing intltoolize --copy --force --automake
 			  intltoolize --copy --force --automake
 			fi
-			oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
-			autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed."
 			cd $olddir
 		fi
 	;;
@@ -154,21 +155,17 @@ PACKAGE_PREPROCESS_FUNCS += "autotools_prepackage_lamangler"
 
 autotools_prepackage_lamangler () {
         for i in `find ${PKGD} -name "*.la"` ; do \
-                sed -i -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${libdir}/\1,g' $i
-                sed -i -e s:${CROSS_DIR}/${HOST_SYS}::g $i
-                sed -i -e s:${CROSS_DIR}::g $i
-                sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
-                if [ -n "${STAGING_DIR_HOST}" ]; then
-                        sed -i -e s:${STAGING_DIR_HOST}::g $i
-                fi
-                sed -i -e s:${STAGING_DIR}::g $i
-                sed -i -e s:${S}::g $i
-                sed -i -e s:${T}::g $i
-                sed -i -e s:${D}::g $i
-        done
+            sed -i -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
+                   -e 's:${D}::g;' \
+                   -e 's:-I${WORKDIR}\S*: :g;' \
+                   -e 's:-L${WORKDIR}\S*: :g;' \
+                   $i
+	done
 }
 
+# STAGE_TEMP_PREFIX is used for a speedup by packaged-staging
 STAGE_TEMP="${WORKDIR}/temp-staging"
+STAGE_TEMP_PREFIX = ""
 
 autotools_stage_includes() {
 	if [ "${INHIBIT_AUTO_STAGE_INCLUDES}" != "1" ]
diff --git a/classes/base.bbclass b/classes/base.bbclass
index d3bfa768c1..8bac509115 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -9,6 +9,32 @@ inherit utils
 inherit utility-tasks
 inherit metadata_scm
 
+python sys_path_eh () {
+    if isinstance(e, bb.event.ConfigParsed):
+        import sys
+        import os
+        import time
+
+        bbpath = e.data.getVar("BBPATH", True).split(":")
+        sys.path[0:0] = [os.path.join(dir, "lib") for dir in bbpath]
+
+        def inject(name, value):
+            """Make a python object accessible from everywhere for the metadata"""
+            if hasattr(bb.utils, "_context"):
+                bb.utils._context[name] = value
+            else:
+                __builtins__[name] = value
+
+        import oe.path
+        import oe.utils
+        inject("bb", bb)
+        inject("sys", sys)
+        inject("time", time)
+        inject("oe", oe)
+}
+
+addhandler sys_path_eh
+
 die() {
 	oefatal "$*"
 }
@@ -37,11 +63,10 @@ def base_dep_prepend(d):
 	# the case where host == build == target, for now we don't work in
 	# that case though.
 	#
-	deps = "shasum-native coreutils-native"
-	if bb.data.getVar('PN', d, True) == "shasum-native" or bb.data.getVar('PN', d, True) == "stagemanager-native":
+	deps = "coreutils-native"
+	if bb.data.getVar('PN', d, True) in ("shasum-native", "stagemanager-native",
+	                                     "coreutils-native"):
 		deps = ""
-	if bb.data.getVar('PN', d, True) == "coreutils-native":
-		deps = "shasum-native"
 
 	# INHIBIT_DEFAULT_DEPS doesn't apply to the patch command.  Whether or  not
 	# we need that built is the responsibility of the patch function / class, not
@@ -76,7 +101,6 @@ addtask setscene before do_fetch
 
 addtask fetch
 do_fetch[dirs] = "${DL_DIR}"
-do_fetch[depends] = "shasum-native:do_populate_staging"
 python base_do_fetch() {
 	import sys
 
@@ -183,7 +207,7 @@ def oe_unpack_file(file, data, url = None):
 		cmd = 'cp -pPR %s %s/%s/' % (file, os.getcwd(), destdir)
 	else:
 		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
-		if not 'patch' in parm:
+		if not 'apply' in parm and not 'patch' in parm:
 			# The "destdir" handling was specifically done for FILESPATH
 			# items.  So, only do so for file:// entries.
 			if type == "file":
@@ -225,10 +249,9 @@ python base_do_unpack() {
 	localdata = bb.data.createCopy(d)
 	bb.data.update_data(localdata)
 
-	src_uri = bb.data.getVar('SRC_URI', localdata)
+	src_uri = bb.data.getVar('SRC_URI', localdata, True)
 	if not src_uri:
 		return
-	src_uri = bb.data.expand(src_uri, localdata)
 	for url in src_uri.split():
 		try:
 			local = bb.data.expand(bb.fetch.localpath(url, localdata), localdata)
@@ -302,7 +325,7 @@ python base_eventhandler() {
 
 addtask configure after do_unpack do_patch
 do_configure[dirs] = "${S} ${B}"
-do_configure[deptask] = "do_populate_staging"
+do_configure[deptask] = "do_populate_sysroot"
 base_do_configure() {
 	:
 }
@@ -317,7 +340,6 @@ base_do_compile() {
 	fi
 }
 
-
 addtask install after do_compile
 do_install[dirs] = "${D} ${S} ${B}"
 # Remove and re-create ${D} so that is it guaranteed to be empty
@@ -365,11 +387,13 @@ python () {
     if use_nls != None:
         bb.data.setVar('USE_NLS', use_nls, d)
 
+    setup_checksum_deps(d)
+
     # Git packages should DEPEND on git-native
     srcuri = bb.data.getVar('SRC_URI', d, 1)
     if "git://" in srcuri:
         depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
-        depends = depends + " git-native:do_populate_staging"
+        depends = depends + " git-native:do_populate_sysroot"
         bb.data.setVarFlag('do_fetch', 'depends', depends, d)
 
     # unzip-native should already be staged before unpacking ZIP recipes
@@ -378,7 +402,7 @@ python () {
 
     if ".zip" in src_uri or need_unzip == "1":
         depends = bb.data.getVarFlag('do_unpack', 'depends', d) or ""
-        depends = depends + " unzip-native:do_populate_staging"
+        depends = depends + " unzip-native:do_populate_sysroot"
         bb.data.setVarFlag('do_unpack', 'depends', depends, d)
 
     # 'multimachine' handling
diff --git a/classes/bootimg.bbclass b/classes/bootimg.bbclass
index d58cf1f424..35b0d76b4e 100644
--- a/classes/bootimg.bbclass
+++ b/classes/bootimg.bbclass
@@ -12,10 +12,10 @@
 # ${APPEND} - an override list of append strings for each label
 # ${SYSLINUX_OPTS} - additional options to add to the syslinux file ';' delimited 
 
-do_bootimg[depends] += "dosfstools-native:do_populate_staging \
-                        syslinux-native:do_populate_staging \
-                        mtools-native:do_populate_staging \
-                        cdrtools-native:do_populate_staging"
+do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
+                        syslinux-native:do_populate_sysroot \
+                        mtools-native:do_populate_sysroot \
+                        cdrtools-native:do_populate_sysroot"
 
 PACKAGES = " "
 
diff --git a/classes/cross-canadian.bbclass b/classes/cross-canadian.bbclass
index bd738ecd4d..a149fd44b7 100644
--- a/classes/cross-canadian.bbclass
+++ b/classes/cross-canadian.bbclass
@@ -31,6 +31,8 @@ CFLAGS = "${BUILDSDK_CFLAGS}"
 CXXFLAGS = "${BUILDSDK_CFLAGS}"
 LDFLAGS = "${BUILDSDK_LDFLAGS}"
 
+DEPENDS_GETTEXT = "gettext-native gettext-nativesdk"
+
 # Change to place files in SDKPATH
 prefix = "${SDKPATH}"
 exec_prefix = "${SDKPATH}"
diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index 9a3d39cb49..4cf2b4cfe2 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -1,3 +1,6 @@
+# Disabled for now since the relocation paths are too long
+#inherit relocatable
+
 # Cross packages are built indirectly via dependency,
 # no need for them to be a direct target of 'world'
 EXCLUDE_FROM_WORLD = "1"
@@ -14,8 +17,6 @@ PACKAGE_ARCH = "${OLD_PACKAGE_ARCH}"
 OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}"
 BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}"
 
-PACKAGES = ""
-
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_VENDOR = "${BUILD_VENDOR}"
 HOST_OS = "${BUILD_OS}"
@@ -32,6 +33,16 @@ LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}"
 
 TOOLCHAIN_OPTIONS = ""
 
+DEPENDS_GETTEXT = "gettext-native"
+
+# Path mangling needed by the cross packaging
+# Note that we use := here to ensure that libdir and includedir are
+# target paths, not CROSS_DIR paths.
+target_libdir := "${libdir}"
+target_includedir := "${includedir}"
+target_base_libdir := "${base_libdir}"
+target_prefix := "${prefix}"
+
 # Overrides for paths
 prefix = "${CROSS_DIR}"
 base_prefix = "${prefix}"
@@ -39,10 +50,32 @@ exec_prefix = "${prefix}"
 base_sbindir = "${base_prefix}/bin"
 sbindir = "${exec_prefix}/bin"
 
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+}
+
 do_stage () {
-	oe_runmake install
+	autotools_stage_all
 }
 
-do_install () {
-	:
+#
+# Override the default sysroot staging copy since this won't look like a target system
+#
+sysroot_stage_all() {
+	sysroot_stage_dir ${D} ${SYSROOT_DESTDIR}
+	install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/
+	install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/  
+	if [ -d ${SYSROOT_DESTDIR}${target_base_libdir} ]; then
+		sysroot_stage_libdir ${SYSROOT_DESTDIR}${target_base_libdir} ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}
+	fi
+	if [ -d ${SYSROOT_DESTDIR}${target_libdir} ]; then
+		sysroot_stage_libdir ${SYSROOT_DESTDIR}${target_libdir} ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}
+	fi
 }
+
+#
+# Cross .la files have more path issues we have to correct
+SYSROOTEXTRALIBDIRSED = '-e "/^libdir=/s,.*,libdir=${STAGING_DIR_TARGET}${target_libdir},g" \
+                         -e "/^dependency_libs=/s,\([[:space:]']\)-L${STAGING_LIBDIR_NATIVE},,g" \
+'
+
diff --git a/classes/emit_data.bbclass b/classes/emit_data.bbclass
new file mode 100644
index 0000000000..127af4a44c
--- /dev/null
+++ b/classes/emit_data.bbclass
@@ -0,0 +1,55 @@
+# Emit the datastore to a file, and if it was previously emitted, display the
+# differences to the user.
+
+EMIT_DIR = "${TMPDIR}/emit-data"
+EMIT_BLACKLIST += "BUILDSTART DATE TIME DATETIME \
+                   __* _  PWD \
+                   DISPLAY XDG_SESSION_COOKIE \
+                   SSH_AUTH_SOCK SSH_TTY SSH_CLIENT SSH_CONNECTION \
+                   SESSION_MANAGER DESKTOP_SESSION COLORTERM TERM \
+                   XAUTHORITY GTK_RC_FILES DBUS_SESSION_BUS_ADDRESS \
+                   GREP_OPTIONS \
+                   GNOME_KEYRING GNOME_KEYRING_PID"
+
+def diff_datadict(d, old_data, data):
+    from itertools import chain
+    from difflib import Differ
+    from fnmatch import fnmatchcase
+
+    blacklist = d.getVar("EMIT_BLACKLIST", True).split()
+
+    keys = sorted(set(chain(old_data.iterkeys(), data.iterkeys())))
+    keys = [key for key in keys
+            if not any(fnmatchcase(key, pat) for pat in blacklist)]
+
+    old = ["%s: %s\n" % (key, old_data.get(key)) for key in keys]
+    new = ["%s: %s\n" % (key, data.get(key)) for key in keys]
+    return Differ().compare(old, new)
+
+
+python do_emit_data () {
+    import pickle
+
+    data = dict((key, repr(d.getVar(key, False))) for key in d.keys())
+    outfile = os.path.join(d.getVar("EMIT_DIR", True), d.getVar("PF", True))
+    bb.mkdirhier(os.path.dirname(outfile))
+    if os.path.exists(outfile):
+        f = open(outfile, "rb")
+        old_data = pickle.load(f)
+        f.close()
+
+        diff = diff_datadict(d, old_data, data)
+        differences = [line for line in diff if not line.startswith(" ")]
+        if differences:
+            bb.note(bb.data.expand("${PF}: data has changed:", d))
+            for line in differences:
+                bb.note(line.rstrip())
+
+    pickle.dump(data, open(outfile, "wb"))
+}
+do_emit_data[nostamp] = "1"
+addtask emit_data
+
+do_emit_data_all[recrdeptask] = "do_emit_data"
+do_emit_data_all[nostamp] = "1"
+addtask emit_data_all after do_emit_data
diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass
index f55ae2c2ae..30e7ef7591 100644
--- a/classes/gconf.bbclass
+++ b/classes/gconf.bbclass
@@ -5,14 +5,14 @@ if [ "$1" = configure ]; then
 	if [ "x$D" != "x" ]; then
 		exit 1
 	fi
-        SCHEMA_LOCATION=/etc/gconf/schemas
-        for SCHEMA in ${SCHEMA_FILES}; do
-                if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then
-                        HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-                                gconftool-2 \
-                                --makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null
-                fi
-        done
+	SCHEMA_LOCATION=/etc/gconf/schemas
+	for SCHEMA in ${SCHEMA_FILES}; do
+		if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then
+			HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+				gconftool-2 \
+				--makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null
+		fi
+	done
 fi
 }
 
@@ -30,7 +30,7 @@ fi
 }
 
 python populate_packages_append () {
-	import os.path, re
+	import re
 	packages = bb.data.getVar('PACKAGES', d, 1).split()
 	pkgdest =  bb.data.getVar('PKGDEST', d, 1)
 	
@@ -45,10 +45,9 @@ python populate_packages_append () {
 		if schemas != []:
 			bb.note("adding gconf postinst and prerm scripts to %s" % pkg)
 			bb.data.setVar('SCHEMA_FILES', " ".join(schemas), d)
-			postinst = '#!/bin/sh\n'
-			pkgpostinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
-			if pkgpostinst:
-				postinst += pkgpostinst
+			postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
+			if not postinst:
+				postinst = '#!/bin/sh\n'
 			postinst += bb.data.getVar('gconf_postinst', d, 1)
 			bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
 			prerm = bb.data.getVar('pkg_prerm_%s' % pkg, d, 1) or bb.data.getVar('pkg_prerm', d, 1)
diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass
index b2ff2849fa..a40e74f819 100644
--- a/classes/gettext.bbclass
+++ b/classes/gettext.bbclass
@@ -1,4 +1,3 @@
-DEPENDS =+ "gettext-native"
 def gettext_after_parse(d):
     # Remove the NLS bits if USE_NLS is no.
     if bb.data.getVar('USE_NLS', d, 1) == 'no':
@@ -12,5 +11,7 @@ python () {
     gettext_after_parse(d)
 }
 
-DEPENDS =+ "gettext-native"
+DEPENDS_GETTEXT = "gettext gettext-native"
+
+DEPENDS =+ "${DEPENDS_GETTEXT}"
 EXTRA_OECONF += "--enable-nls"
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 8e202f0665..2105195003 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -36,7 +36,7 @@ IMAGE_BASENAME[export] = "1"
 export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${IMAGE_BOOT}"
 
 # We need to recursively follow RDEPENDS and RRECOMMENDS for images
-do_rootfs[recrdeptask] += "do_deploy do_populate_staging"
+do_rootfs[recrdeptask] += "do_deploy do_populate_sysroot"
 
 # Images are generally built explicitly, do not need to be part of world.
 EXCLUDE_FROM_WORLD = "1"
@@ -47,7 +47,7 @@ PID = "${@os.getpid()}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-do_rootfs[depends] += "makedevs-native:do_populate_staging fakeroot-native:do_populate_staging"
+do_rootfs[depends] += "makedevs-native:do_populate_sysroot fakeroot-native:do_populate_sysroot"
 
 python () {
     import bb
@@ -55,9 +55,9 @@ python () {
     deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or ""
     for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split():
         for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []):
-            deps += " %s:do_populate_staging" % dep
+            deps += " %s:do_populate_sysroot" % dep
     for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split():
-        deps += " %s:do_populate_staging" % dep
+        deps += " %s:do_populate_sysroot" % dep
     bb.data.setVarFlag('do_rootfs', 'depends', deps, d)
 
     runtime_mapping_rename("PACKAGE_INSTALL", d)
@@ -119,8 +119,12 @@ fakeroot do_rootfs () {
 	mkdir -p ${IMAGE_ROOTFS}
 	mkdir -p ${DEPLOY_DIR_IMAGE}
 
+	mkdir -p ${IMAGE_ROOTFS}/etc
+
 	if [ "${USE_DEVFS}" != "1" ]; then
+		rm -rf ${IMAGE_ROOTFS}/etc/device_table
 		for devtable in ${@get_devtable_list(d)}; do
+			cat $devtable >> ${IMAGE_ROOTFS}/etc/device_table
 			makedevs -r ${IMAGE_ROOTFS} -D $devtable
 		done
 	fi
@@ -201,7 +205,7 @@ log_check() {
 # can decide if they want it or not
 
 zap_root_password () {
-	sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new
+	sed 's%^root:[^:]*:%root::%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new
 	mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd
 } 
 
@@ -256,7 +260,9 @@ if [ -e ${IMAGE_ROOTFS}/usr/bin/opkg-cl ] ; then
 
 	cat /tmp/wanted-locale-packages /tmp/available-locale-packages | sort | uniq -d > /tmp/pending-locale-packages
 
-	cat /tmp/pending-locale-packages | xargs ${OPKG} -nodeps install
+	if [ -s /tmp/pending-locale-packages ] ; then
+		cat /tmp/pending-locale-packages | xargs ${OPKG} -nodeps install
+	fi
 	rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/*
 
     for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 7e42f459d7..2118a27fbd 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -88,86 +88,6 @@ def package_qa_get_machine_dict():
 
        }
 
-# factory for a class, embedded in a method
-def package_qa_get_elf(path, bits32):
-    class ELFFile:
-        EI_NIDENT = 16
-
-        EI_CLASS      = 4
-        EI_DATA       = 5
-        EI_VERSION    = 6
-        EI_OSABI      = 7
-        EI_ABIVERSION = 8
-
-        # possible values for EI_CLASS
-        ELFCLASSNONE = 0
-        ELFCLASS32   = 1
-        ELFCLASS64   = 2
-
-        # possible value for EI_VERSION
-        EV_CURRENT   = 1
-
-        # possible values for EI_DATA
-        ELFDATANONE  = 0
-        ELFDATA2LSB  = 1
-        ELFDATA2MSB  = 2
-
-        def my_assert(self, expectation, result):
-            if not expectation == result:
-                #print "'%x','%x' %s" % (ord(expectation), ord(result), self.name)
-                raise Exception("This does not work as expected")
-
-        def __init__(self, name):
-            self.name = name
-
-        def open(self):
-            self.file = file(self.name, "r")
-            self.data = self.file.read(ELFFile.EI_NIDENT+4)
-
-            self.my_assert(len(self.data), ELFFile.EI_NIDENT+4)
-            self.my_assert(self.data[0], chr(0x7f) )
-            self.my_assert(self.data[1], 'E')
-            self.my_assert(self.data[2], 'L')
-            self.my_assert(self.data[3], 'F')
-            if bits32 :
-                self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32))
-            else:
-                self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64))
-            self.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) )
-
-            self.sex = self.data[ELFFile.EI_DATA]
-            if self.sex == chr(ELFFile.ELFDATANONE):
-                raise Exception("self.sex == ELFDATANONE")
-            elif self.sex == chr(ELFFile.ELFDATA2LSB):
-                self.sex = "<"
-            elif self.sex == chr(ELFFile.ELFDATA2MSB):
-                self.sex = ">"
-            else:
-                raise Exception("Unknown self.sex")
-
-        def osAbi(self):
-            return ord(self.data[ELFFile.EI_OSABI])
-
-        def abiVersion(self):
-            return ord(self.data[ELFFile.EI_ABIVERSION])
-
-        def isLittleEndian(self):
-            return self.sex == "<"
-
-        def isBigEngian(self):
-            return self.sex == ">"
-
-        def machine(self):
-            """
-            We know the sex stored in self.sex and we
-            know the position
-            """
-            import struct
-            (a,) = struct.unpack(self.sex+"H", self.data[18:20])
-            return a
-
-    return ELFFile(path)
-
 
 # Known Error classes
 # 0 - non dev contains .so
@@ -432,7 +352,7 @@ def package_qa_check_staged(path,d):
 
 # Walk over all files in a directory and call func
 def package_qa_walk(path, funcs, package,d):
-    sane = True
+    import oe.qa
 
     #if this will throw an exception, then fix the dict above
     target_os   = bb.data.getVar('TARGET_OS',   d, True)
@@ -440,10 +360,11 @@ def package_qa_walk(path, funcs, package,d):
     (machine, osabi, abiversion, littleendian, bits32) \
         = package_qa_get_machine_dict()[target_os][target_arch]
 
+    sane = True
     for root, dirs, files in os.walk(path):
         for file in files:
             path = os.path.join(root,file)
-            elf = package_qa_get_elf(path, bits32)
+            elf = oe.qa.ELFFile(path, bits32)
             try:
                 elf.open()
             except:
@@ -524,7 +445,7 @@ python do_package_qa () {
 
 
 # The Staging Func, to check all staging
-addtask qa_staging after do_populate_staging before do_build
+addtask qa_staging after do_populate_sysroot before do_build
 python do_qa_staging() {
     bb.debug(2, "QA checking staging")
 
@@ -535,6 +456,7 @@ python do_qa_staging() {
 # Check broken config.log files
 addtask qa_configure after do_configure before do_compile
 python do_qa_configure() {
+    configs = []
     bb.debug(1, "Checking sanity of the config.log file")
     for root, dirs, files in os.walk(bb.data.getVar('WORKDIR', d, True)):
         statement = "grep 'CROSS COMPILE Badness:' %s > /dev/null" % \
@@ -543,4 +465,24 @@ python do_qa_configure() {
             if os.system(statement) == 0:
                 bb.fatal("""This autoconf log indicates errors, it looked at host includes.
 Rerun configure task after fixing this. The path was '%s'""" % root)
+
+        if "configure.ac" in files:
+            configs.append(os.path.join(root,"configure.ac"))
+        if "configure.in" in files:
+            configs.append(os.path.join(root, "configure.in"))
+
+    if "gettext" not in bb.data.getVar('P', d, True):
+       if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
+          gt = "gettext-native"
+       elif bb.data.inherits_class('cross-canadian', d):
+          gt = "gettext-nativesdk"
+       else:
+          gt = "gettext"
+       deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "")
+       if gt not in deps:
+          for config in configs:
+              gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config
+              if os.system(gnu) == 0:
+                 bb.note("""Gettext required but not in DEPENDS for file %s.
+Missing inherit gettext?""" % config)
 }
diff --git a/classes/java-native.bbclass b/classes/java-native.bbclass
index 7b67c6041c..cade7b18de 100644
--- a/classes/java-native.bbclass
+++ b/classes/java-native.bbclass
@@ -6,6 +6,4 @@
 
 inherit native
 
-do_stage () {
-  java_stage
-}
+NATIVE_INSTALL_WORKS = "1"
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 7504c119ad..b0c65346f0 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -14,7 +14,7 @@ python __anonymous () {
     kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or ''
     if kerneltype == 'uImage':
     	depends = bb.data.getVar("DEPENDS", d, 1)
-    	depends = "%s u-boot-mkimage-openmoko-native" % depends
+    	depends = "%s u-boot-mkimage-native" % depends
     	bb.data.setVar("DEPENDS", depends, d)
 
     image = bb.data.getVar('INITRAMFS_IMAGE', d, True)
@@ -142,6 +142,7 @@ kernel_do_install() {
 
 	# Check for arch/x86 on i386
 	elif [ -d arch/x86/include/asm/ ]; then
+		mkdir -p $kerneldir/include/asm-x86/
 		cp -fR arch/x86/include/asm/* $kerneldir/include/asm-x86/
 		install -d $kerneldir/arch/x86/include
 		cp -fR arch/x86/* $kerneldir/arch/x86/
@@ -155,12 +156,15 @@ kernel_do_install() {
 	mkdir -p $kerneldir/include/asm-generic
 	cp -fR include/asm-generic/* $kerneldir/include/asm-generic/
 
-	for entry in drivers/crypto drivers/media include/generated include/linux include/net include/pcmcia include/media include/acpi include/sound include/video include/scsi include/trace; do
+	for entry in drivers/crypto drivers/media include/generated include/linux include/net include/pcmcia include/media include/acpi include/sound include/video include/scsi include/trace include/mtd include/rdma include/drm include/xen; do
 		if [ -d $entry ]; then
 			mkdir -p $kerneldir/$entry
 			cp -fR $entry/* $kerneldir/$entry/
 		fi
 	done
+	if [ -f include/Kbuild ]; then
+		cp -fR include/Kbuild $kerneldir/include
+	fi
 
 	if [ -d drivers/sound ]; then
 		# 2.4 alsa needs some headers from this directory
@@ -199,6 +203,7 @@ kernel_do_install() {
 
 sysroot_stage_all_append() {
 	sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
+	cp -fpPR ${D}/kernel/.config ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR}
 }
 
 kernel_do_configure() {
@@ -545,6 +550,6 @@ do_deploy() {
 }
 
 do_deploy[dirs] = "${S}"
-do_deploy[depends] += "fakeroot-native:do_populate_staging"
+do_deploy[depends] += "fakeroot-native:do_populate_sysroot"
 
 addtask deploy before do_build after do_package
diff --git a/classes/module-base.bbclass b/classes/module-base.bbclass
index bc53e1bad5..9aaaa4e8e3 100644
--- a/classes/module-base.bbclass
+++ b/classes/module-base.bbclass
@@ -7,7 +7,12 @@ export CROSS_COMPILE = "${TARGET_PREFIX}"
 
 # A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force
 # rebuilds for kernel and external modules
-PR = "${MACHINE_KERNEL_PR}"
+python __anonymous () {
+    machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)
+
+    if machine_kernel_pr:
+       bb.data.setVar('PR', machine_kernel_pr, d)
+}
 
 export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
 export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"
diff --git a/classes/module.bbclass b/classes/module.bbclass
index eef98292a7..83463ac84c 100644
--- a/classes/module.bbclass
+++ b/classes/module.bbclass
@@ -24,11 +24,12 @@ module_do_install() {
 }
 
 pkg_postinst_append () {
-	if [ -n "$D" ]; then
-		exit 1
-	fi
-	depmod -a
+if [ -n "$D" ]; then
+	exit 1
+else
+	depmod -a ${KERNEL_VERSION}
 	update-modules || true
+fi
 }
 
 pkg_postrm_append () {
diff --git a/classes/module_strip.bbclass b/classes/module_strip.bbclass
index 2650f71d50..998fb86461 100644
--- a/classes/module_strip.bbclass
+++ b/classes/module_strip.bbclass
@@ -1,5 +1,8 @@
 PACKAGESTRIPFUNCS += "do_strip_modules"
 
+# may be inherited by kernel.bbclass which sets KERNEL_MAJOR_VERSION
+KERNEL_MAJOR_VERSION ?= "${@get_kernelmajorversion('${KERNEL_VERSION}')}"
+
 do_strip_modules () {
 	if test -e ${PKGD}/lib/modules; then
 		if [ "${KERNEL_MAJOR_VERSION}" == "2.6" ]; then
diff --git a/classes/mono.bbclass b/classes/mono.bbclass
index cf8dd15bdf..c3dc87c905 100644
--- a/classes/mono.bbclass
+++ b/classes/mono.bbclass
@@ -152,7 +152,7 @@ do_mono_stage() {
 		fi
 	done
 }
-addtask mono_stage after do_package before do_populate_staging
+addtask mono_stage after do_package before do_populate_sysroot
 
 def mono_after_parse(d):
 	import bb
diff --git a/classes/native.bbclass b/classes/native.bbclass
index 6698b61cfc..3437836de7 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -1,8 +1,12 @@
+# We want native packages to be relocatable
+inherit relocatable
+
 # Native packages are built indirectly via dependency,
 # no need for them to be a direct target of 'world'
 EXCLUDE_FROM_WORLD = "1"
 
 PACKAGES = ""
+PACKAGES_virtclass-native = ""
 PACKAGE_ARCH = "${BUILD_ARCH}"
 
 BASE_PACKAGE_ARCH = "${BUILD_ARCH}"
@@ -37,6 +41,7 @@ STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
 STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
 
 STAGING_DIR_JAVA = "${STAGING_DATADIR_JAVA_NATIVE}"
+DEPENDS_GETTEXT = "gettext-native"
 
 # Don't use site files for native builds
 export CONFIG_SITE = ""
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 062f782129..77a20bf9c5 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -138,7 +138,7 @@ python () {
     if bb.data.getVar('PACKAGES', d, True) != '':
         deps = bb.data.getVarFlag('do_package', 'depends', d) or ""
         for dep in (bb.data.getVar('PACKAGE_DEPENDS', d, True) or "").split():
-            deps += " %s:do_populate_staging" % dep
+            deps += " %s:do_populate_sysroot" % dep
         bb.data.setVarFlag('do_package', 'depends', deps, d)
 
         deps = (bb.data.getVarFlag('do_package', 'deptask', d) or "").split()
@@ -197,7 +197,8 @@ def runstrip(file, d):
 
     os.system("%s'%s' --only-keep-debug '%s' '%s'" % (pathprefix, objcopy, file, debugfile))
     ret = os.system("%s%s" % (pathprefix, stripcmd))
-    os.system("%s'%s' --add-gnu-debuglink='%s' '%s'" % (pathprefix, objcopy, debugfile, file))
+    if (bb.data.getVar('PACKAGE_STRIP', d, True) != 'full'):
+        os.system("%s'%s' --add-gnu-debuglink='%s' '%s'" % (pathprefix, objcopy, debugfile, file))
 
     if newmode:
         os.chmod(file, origmode)
@@ -389,7 +390,7 @@ python populate_packages () {
 			package_list.append(pkg)
 
 
-	if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, True) != '1'):
+	if (bb.data.getVar('PACKAGE_STRIP', d, True) != 'no'):
 		for f in (bb.data.getVar('PACKAGESTRIPFUNCS', d, True) or '').split():
 			bb.build.exec_func(f, d)
 
diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
index 9fb16740d8..837efd8438 100644
--- a/classes/package_deb.bbclass
+++ b/classes/package_deb.bbclass
@@ -254,8 +254,8 @@ python do_package_deb () {
 python () {
     if bb.data.getVar('PACKAGES', d, True) != '':
         deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split()
-        deps.append('dpkg-native:do_populate_staging')
-        deps.append('fakeroot-native:do_populate_staging')
+        deps.append('dpkg-native:do_populate_sysroot')
+        deps.append('fakeroot-native:do_populate_sysroot')
         bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d)
 }
 
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 410fee30cc..435d59fb06 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -54,7 +54,7 @@ python package_ipk_install () {
 
 
 	if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or
-		not os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),os.R_OK):
+		not os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),os.R_OK)):
 		ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir))
 		if (ret != 0 ):
 			raise bb.build.FuncFailed
@@ -71,7 +71,7 @@ do_package_update_index_ipk[lockfiles] = "${DEPLOY_DIR_IPK}.lock"
 do_package_update_index_ipk[nostamp] = "1"
 do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk"
 do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk"
-do_package_update_index_ipk[depends] += "ipkg-utils-native:do_populate_staging"
+do_package_update_index_ipk[depends] += "ipkg-utils-native:do_populate_sysroot"
 
 #
 # Update the Packages index files in ${DEPLOY_DIR_IPK}
@@ -312,8 +312,8 @@ python do_package_ipk () {
 python () {
     if bb.data.getVar('PACKAGES', d, True) != '':
         deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split()
-        deps.append('ipkg-utils-native:do_populate_staging')
-        deps.append('fakeroot-native:do_populate_staging')
+        deps.append('ipkg-utils-native:do_populate_sysroot')
+        deps.append('fakeroot-native:do_populate_sysroot')
         bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d)
 }
 
diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index ab09bb24d3..56fa006bb9 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -209,8 +209,8 @@ python () {
        not bb.data.inherits_class('native', d) and \
        not bb.data.inherits_class('cross', d):
         deps = (bb.data.getVarFlag('do_package_write_rpm', 'depends', d) or "").split()
-        deps.append('rpm-native:do_populate_staging')
-        deps.append('fakeroot-native:do_populate_staging')
+        deps.append('rpm-native:do_populate_sysroot')
+        deps.append('fakeroot-native:do_populate_sysroot')
         bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d)
 }
 
diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass
index b905e170f4..4ba69c77d4 100644
--- a/classes/package_tar.bbclass
+++ b/classes/package_tar.bbclass
@@ -91,8 +91,8 @@ python do_package_tar () {
 python () {
     if bb.data.getVar('PACKAGES', d, True) != '':
         deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split()
-        deps.append('tar-native:do_populate_staging')
-        deps.append('fakeroot-native:do_populate_staging')
+        deps.append('tar-native:do_populate_sysroot')
+        deps.append('fakeroot-native:do_populate_sysroot')
         bb.data.setVarFlag('do_package_write_tar', 'depends', " ".join(deps), d)
 }
 
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index f3648d2f6a..62a78e4c67 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -10,14 +10,16 @@
 
 #
 # bitbake.conf set PSTAGING_ACTIVE = "0", this class sets to "1" if we're active
-# 
+#
 PSTAGE_PKGVERSION = "${PV}-${PR}"
 PSTAGE_PKGARCH    = "${BUILD_SYS}"
 PSTAGE_EXTRAPATH  ?= "/${OELAYOUT_ABI}/${DISTRO_PR}/"
 PSTAGE_PKGPATH    = "${DISTRO}${PSTAGE_EXTRAPATH}"
 PSTAGE_PKGPN      = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d).replace('_', '-')}"
 PSTAGE_PKGNAME    = "${PSTAGE_PKGPN}_${PSTAGE_PKGVERSION}_${PSTAGE_PKGARCH}.ipk"
-PSTAGE_PKG        ?= "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}"
+PSTAGE_PKG        = "${PSTAGE_DIR}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}"
+PSTAGE_WORKDIR   = "${TMPDIR}/pstage"
+PSTAGE_SCAN_CMD ?= "find ${PSTAGE_TMPDIR_STAGE} \( -name "*.la" -o -name "*-config"\) -type f"
 
 PSTAGE_NATIVEDEPENDS = "\
     shasum-native \
@@ -41,10 +43,12 @@ python () {
 
     # These classes encode staging paths into the binary data so can only be
     # reused if the path doesn't change/
-    if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d):
+    if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d):
         path = bb.data.getVar('PSTAGE_PKGPATH', d, 1)
         path = path + bb.data.getVar('TMPDIR', d, 1).replace('/', '-')
         bb.data.setVar('PSTAGE_PKGPATH', path, d)
+        scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMDPDIR_STAGE}"
+        bb.data.setVar('PSTAGE_SCAN_CMD', scan_cmd, d)
 
     # PSTAGE_NATIVEDEPENDS lists the packages we need before we can use packaged 
     # staging. There will always be some packages we depend on.
@@ -65,7 +69,7 @@ python () {
     # as inactive.
     if pstage_allowed:
         deps = bb.data.getVarFlag('do_setscene', 'depends', d) or ""
-        deps += " stagemanager-native:do_populate_staging"
+        deps += " stagemanager-native:do_populate_sysroot"
         bb.data.setVarFlag('do_setscene', 'depends', deps, d)
 
         policy = bb.data.getVar("BB_STAMP_POLICY", d, True)
@@ -79,8 +83,7 @@ python () {
         bb.data.setVar("PSTAGING_ACTIVE", "0", d)
 }
 
-DEPLOY_DIR_PSTAGE   ?= "${DEPLOY_DIR}/pstage"
-PSTAGE_MACHCONFIG   = "${DEPLOY_DIR_PSTAGE}/opkg.conf"
+PSTAGE_MACHCONFIG   = "${PSTAGE_WORKDIR}/opkg.conf"
 
 PSTAGE_PKGMANAGER = "stage-manager-ipkg"
 
@@ -99,6 +102,9 @@ def pstage_manualclean(srcname, destvarname, d):
 	for walkroot, dirs, files in os.walk(src):
 		bb.debug("rm %s" % walkroot)
 		for file in files:
+			# Avoid breaking the held lock
+			if (file == "staging.lock"):
+				continue
 			filepath = os.path.join(walkroot, file).replace(src, dest)
 			_package_unlink(filepath)
 
@@ -127,7 +133,7 @@ def pstage_cleanpackage(pkgname, d):
 			bb.note("Failure removing staging package")
 	else:
 		bb.debug(1, "Manually removing any installed files from staging...")
-		pstage_manualclean("staging", "STAGING_DIR", d)
+		pstage_manualclean("sysroots", "STAGING_DIR", d)
 		pstage_manualclean("cross", "CROSS_DIR", d)
 		pstage_manualclean("deploy", "DEPLOY_DIR", d)
 
@@ -143,13 +149,15 @@ do_clean_prepend() {
 
 	stagepkg = bb.data.expand("${PSTAGE_PKG}", d)
 	bb.note("Removing staging package %s" % base_path_out(stagepkg, d))
-	os.system('rm -rf ' + stagepkg)
+	# Add a wildcard to the end of stagepkg to also get its md5
+    # if it's a fetched package
+	os.system('rm -rf ' + stagepkg + '*')
 }
 
 staging_helper () {
 	# Assemble appropriate opkg.conf
 	conffile=${PSTAGE_MACHCONFIG}
-	mkdir -p ${DEPLOY_DIR_PSTAGE}/pstaging_lists
+	mkdir -p ${PSTAGE_WORKDIR}/pstaging_lists
 	if [ ! -e $conffile ]; then
 		ipkgarchs="${BUILD_SYS}"
 		priority=1
@@ -167,7 +175,28 @@ staging_helper () {
 	fi
 }
 
-PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_staging package_write_deb package_write_ipk package_write package_stage qa_staging"
+def staging_fetch(stagepkg, d):
+    import bb.fetch
+
+    # only try and fetch if the user has configured a mirror
+    if bb.data.getVar('PSTAGE_MIRROR', d) != "":
+        # Copy the data object and override DL_DIR and SRC_URI
+        pd = d.createCopy()
+        dldir = bb.data.expand("${PSTAGE_DIR}/${PSTAGE_PKGPATH}", pd)
+        mirror = bb.data.expand("${PSTAGE_MIRROR}/${PSTAGE_PKGPATH}/", pd)
+        srcuri = mirror + os.path.basename(stagepkg)
+        bb.data.setVar('DL_DIR', dldir, pd)
+        bb.data.setVar('SRC_URI', srcuri, pd)
+
+        # Try a fetch from the pstage mirror, if it fails just return and
+        # we will build the package
+        try:
+            bb.fetch.init([srcuri], pd)
+            bb.fetch.go(pd, [srcuri])
+        except:
+            return
+
+PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_sysroot package_write_deb package_write_ipk package_write package_stage qa_staging"
 
 SCENEFUNCS += "packagestage_scenefunc"
 
@@ -183,6 +212,8 @@ python packagestage_scenefunc () {
     pstage_cleanpackage(removepkg, d)
 
     stagepkg = bb.data.expand("${PSTAGE_PKG}", d)
+    if not os.path.exists(stagepkg):
+        staging_fetch(stagepkg, d)
 
     if os.path.exists(stagepkg):
         path = bb.data.getVar("PATH", d, 1)
@@ -251,6 +282,8 @@ python packagestage_scenefunc () {
             if ret != 0:
                 bb.note("Failure installing prestage package")
 
+            bb.build.exec_func("staging_package_libtoolhack", d)
+
             bb.build.make_stamp("do_stage_package_populated", d)
         else:
             bb.note("Staging package found but invalid for %s" % file)
@@ -277,26 +310,26 @@ python packagedstage_stampfixing_eventhandler() {
 		    _package_unlink(stamp)
 }
 
-populate_staging_preamble () {
+populate_sysroot_preamble () {
 	if [ "$PSTAGING_ACTIVE" = "1" ]; then
-		stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u || true
-		stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u || true
+		stage-manager -p ${STAGING_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-staging -u || true
+		stage-manager -p ${CROSS_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-cross -u || true
 	fi
 }
 
-populate_staging_postamble () {
+populate_sysroot_postamble () {
 	if [ "$PSTAGING_ACTIVE" = "1" ]; then
 		# list the packages currently installed in staging
-		# ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list         
+		# ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${PSTAGE_WORKDIR}/installed-list
 
 		# exitcode == 5 is ok, it means the files change
 		set +e
-		stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging
+		stage-manager -p ${STAGING_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/sysroots
 		exitcode=$?
 		if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then
 			exit $exitcode
 		fi
-		stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}
+		stage-manager -p ${CROSS_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}
 		if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then
 			exit $exitcode
 		fi
@@ -306,27 +339,27 @@ populate_staging_postamble () {
 
 packagedstaging_fastpath () {
 	if [ "$PSTAGING_ACTIVE" = "1" ]; then
-		mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/
-		mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/
-		cp -fpPR ${SYSROOT_DESTDIR}${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true
-		cp -fpPR ${SYSROOT_DESTDIR}${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ || /bin/true
+		mkdir -p ${PSTAGE_TMPDIR_STAGE}/sysroots/
+		mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/
+		cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/sysroots/ || /bin/true
+		cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ || /bin/true
 	fi
 }
 
-do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}"
-python populate_staging_prehook() {
-    bb.build.exec_func("populate_staging_preamble", d)
+do_populate_sysroot[dirs] =+ "${PSTAGE_DIR}"
+python populate_sysroot_prehook() {
+    bb.build.exec_func("populate_sysroot_preamble", d)
 }
 
-python populate_staging_posthook() {
-    bb.build.exec_func("populate_staging_postamble", d)
+python populate_sysroot_posthook() {
+    bb.build.exec_func("populate_sysroot_postamble", d)
 }
 
 
 staging_packager () {
 
 	mkdir -p ${PSTAGE_TMPDIR_STAGE}/CONTROL
-	mkdir -p ${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}
+	mkdir -p ${PSTAGE_DIR}/${PSTAGE_PKGPATH}
 
 	echo "Package: ${PSTAGE_PKGPN}"         >  ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
 	echo "Version: ${PSTAGE_PKGVERSION}"    >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
@@ -337,13 +370,22 @@ staging_packager () {
 	echo "Architecture: ${PSTAGE_PKGARCH}"  >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
 	
 	# Protect against empty SRC_URI
-	if [ "${SRC_URI}" != "" ] ; then		
-		echo "Source: ${SRC_URI}"               >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
-	else
-		echo "Source: OpenEmbedded"               >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+	srcuri="${SRC_URI}"
+	if [ "$srcuri" == "" ]; then
+		srcuri="OpenEmbedded"
 	fi
+	echo "Source: ${SRC_URI}"               >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+
+	# Deal with libtool not supporting sysroots
+	# Need to remove hardcoded paths and fix these when we install the
+	# staging packages.
+	# Could someone please add sysroot support to libtool!
+        for i in `${PSTAGE_SCAN_CMD}` ; do \
+                sed -i -e s:${STAGING_DIR}:FIXMESTAGINGDIR:g $i
+                echo $i | sed -e 's:${PSTAGE_TMPDIR_STAGE}/::' >> ${PSTAGE_TMPDIR_STAGE}/sysroots/fixmepath
+        done
         
-	${PSTAGE_BUILD_CMD} ${PSTAGE_TMPDIR_STAGE} ${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}
+	${PSTAGE_BUILD_CMD} ${PSTAGE_TMPDIR_STAGE} ${PSTAGE_DIR}/${PSTAGE_PKGPATH}
 }
 
 staging_package_installer () {
@@ -365,6 +407,23 @@ staging_package_installer () {
 	find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.list
 }
 
+python staging_package_libtoolhack () {
+	# Deal with libtool not supporting sysroots and add our new
+	# staging location
+        tmpdir = bb.data.getVar('TMPDIR', d, True)
+        staging = bb.data.getVar('STAGING_DIR', d, True)
+        fixmefn =  staging + "/fixmepath"
+        try:
+            fixmefd = open(fixmefn,"r")
+            fixmefiles = fixmefd.readlines()
+            fixmefd.close()
+            os.system('rm -f ' + fixmefn)
+            for file in fixmefiles:
+                os.system("sed -i -e s:FIXMESTAGINGDIR:%s:g %s" % (staging, tmpdir + '/' + file))
+        except IOError:
+            pass
+}
+
 python do_package_stage () {
     if bb.data.getVar("PSTAGING_ACTIVE", d, 1) != "1":
         return
@@ -447,9 +506,9 @@ python do_package_stage () {
 }
 
 #
-# Note an assumption here is that do_deploy runs before do_package_write/do_populate_staging
+# Note an assumption here is that do_deploy runs before do_package_write/do_populate_sysroot
 #
-addtask package_stage after do_package_write do_populate_staging before do_build
+addtask package_stage after do_package_write do_populate_sysroot before do_build
 
 do_package_stage_all () {
 	:
diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index 33184df0d0..7b0c44471a 100644
--- a/classes/patch.bbclass
+++ b/classes/patch.bbclass
@@ -3,472 +3,26 @@
 # Point to an empty file so any user's custom settings don't break things
 QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc"
 
-def patch_init(d):
-	class NotFoundError(Exception):
-		def __init__(self, path):
-			self.path = path
-		def __str__(self):
-			return "Error: %s not found." % self.path
-
-	def md5sum(fname):
-		# when we move to Python 2.5 as minimal supported
-		# we can kill that try/except as hashlib is 2.5+
-		try:
-			import hashlib
-			m = hashlib.md5()
-		except ImportError:
-			import md5
-			m = md5.new()
-
-		try:
-			f = file(fname, 'rb')
-		except IOError:
-			raise NotFoundError(fname)
-
-		while True:
-			d = f.read(8096)
-			if not d:
-				break
-			m.update(d)
-		f.close()
-		return m.hexdigest()
-
-	class CmdError(Exception):
-		def __init__(self, exitstatus, output):
-			self.status = exitstatus
-			self.output = output
-
-		def __str__(self):
-			return "Command Error: exit status: %d  Output:\n%s" % (self.status, self.output)
-
-
-	def runcmd(args, dir = None):
-		import commands
-
-		if dir:
-			olddir = os.path.abspath(os.curdir)
-			if not os.path.exists(dir):
-				raise NotFoundError(dir)
-			os.chdir(dir)
-			# print("cwd: %s -> %s" % (olddir, dir))
-
-		try:
-			args = [ commands.mkarg(str(arg)) for arg in args ]
-			cmd = " ".join(args)
-			# print("cmd: %s" % cmd)
-			(exitstatus, output) = commands.getstatusoutput(cmd)
-			if exitstatus != 0:
-				raise CmdError(exitstatus >> 8, output)
-			return output
-
-		finally:
-			if dir:
-				os.chdir(olddir)
-
-	class PatchError(Exception):
-		def __init__(self, msg):
-			self.msg = msg
-
-		def __str__(self):
-			return "Patch Error: %s" % self.msg
-
-	class PatchSet(object):
-		defaults = {
-			"strippath": 1
-		}
-
-		def __init__(self, dir, d):
-			self.dir = dir
-			self.d = d
-			self.patches = []
-			self._current = None
-
-		def current(self):
-			return self._current
-
-		def Clean(self):
-			"""
-			Clean out the patch set.  Generally includes unapplying all
-			patches and wiping out all associated metadata.
-			"""
-			raise NotImplementedError()
-
-		def Import(self, patch, force):
-			if not patch.get("file"):
-				if not patch.get("remote"):
-					raise PatchError("Patch file must be specified in patch import.")
-				else:
-					patch["file"] = bb.fetch.localpath(patch["remote"], self.d)
-
-			for param in PatchSet.defaults:
-				if not patch.get(param):
-					patch[param] = PatchSet.defaults[param]
-
-			if patch.get("remote"):
-				patch["file"] = bb.data.expand(bb.fetch.localpath(patch["remote"], self.d), self.d)
-
-			patch["filemd5"] = md5sum(patch["file"])
-
-		def Push(self, force):
-			raise NotImplementedError()
-
-		def Pop(self, force):
-			raise NotImplementedError()
-
-		def Refresh(self, remote = None, all = None):
-			raise NotImplementedError()
-
-
-	class PatchTree(PatchSet):
-		def __init__(self, dir, d):
-			PatchSet.__init__(self, dir, d)
-
-		def Import(self, patch, force = None):
-			""""""
-			PatchSet.Import(self, patch, force)
-
-			if self._current is not None:
-				i = self._current + 1
-			else:
-				i = 0
-			self.patches.insert(i, patch)
-
-		def _applypatch(self, patch, force = False, reverse = False, run = True):
-			shellcmd = ["cat", patch['file'], "|", "patch", "-p", patch['strippath']]
-			if reverse:
-				shellcmd.append('-R')
-
-			if not run:
-				return "sh" + "-c" + " ".join(shellcmd)
-
-			if not force:
-				shellcmd.append('--dry-run')
-
-			output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
-
-			if force:
-				return
-
-			shellcmd.pop(len(shellcmd) - 1)
-			output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
-			return output
-
-		def Push(self, force = False, all = False, run = True):
-			bb.note("self._current is %s" % self._current)
-			bb.note("patches is %s" % self.patches)
-			if all:
-				for i in self.patches:
-					if self._current is not None:
-						self._current = self._current + 1
-					else:
-						self._current = 0
-					bb.note("applying patch %s" % i)
-					self._applypatch(i, force)
-			else:
-				if self._current is not None:
-					self._current = self._current + 1
-				else:
-					self._current = 0
-				bb.note("applying patch %s" % self.patches[self._current])
-				return self._applypatch(self.patches[self._current], force)
-
-
-		def Pop(self, force = None, all = None):
-			if all:
-				for i in self.patches:
-					self._applypatch(i, force, True)
-			else:
-				self._applypatch(self.patches[self._current], force, True)
-
-		def Clean(self):
-			""""""
-
-	class GitApplyTree(PatchTree):
-		def __init__(self, dir, d):
-			PatchTree.__init__(self, dir, d)
-
-		def _applypatch(self, patch, force = False, reverse = False, run = True):
-			shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']]
-
-			if reverse:
-				shellcmd.append('-R')
-
-			shellcmd.append(patch['file'])
-
-			if not run:
-				return "sh" + "-c" + " ".join(shellcmd)
-
-			return runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
-
-
-	class QuiltTree(PatchSet):
-		def _runcmd(self, args, run = True):
-			quiltrc = bb.data.getVar('QUILTRCFILE', self.d, 1)
-			if not run:
-				return ["quilt"] + ["--quiltrc"] + [quiltrc] + args
-			runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir)
-
-		def _quiltpatchpath(self, file):
-			return os.path.join(self.dir, "patches", os.path.basename(file))
-
-
-		def __init__(self, dir, d):
-			PatchSet.__init__(self, dir, d)
-			self.initialized = False
-			p = os.path.join(self.dir, 'patches')
-			if not os.path.exists(p):
-				os.makedirs(p)
-
-		def Clean(self):
-			try:
-				self._runcmd(["pop", "-a", "-f"])
-			except Exception:
-				pass
-			self.initialized = True
-
-		def InitFromDir(self):
-			# read series -> self.patches
-			seriespath = os.path.join(self.dir, 'patches', 'series')
-			if not os.path.exists(self.dir):
-				raise Exception("Error: %s does not exist." % self.dir)
-			if os.path.exists(seriespath):
-				series = file(seriespath, 'r')
-				for line in series.readlines():
-					patch = {}
-					parts = line.strip().split()
-					patch["quiltfile"] = self._quiltpatchpath(parts[0])
-					patch["quiltfilemd5"] = md5sum(patch["quiltfile"])
-					if len(parts) > 1:
-						patch["strippath"] = parts[1][2:]
-					self.patches.append(patch)
-				series.close()
-
-				# determine which patches are applied -> self._current
-				try:
-					output = runcmd(["quilt", "applied"], self.dir)
-				except CmdError:
-					import sys
-					if sys.exc_value.output.strip() == "No patches applied":
-						return
-					else:
-						raise sys.exc_value
-				output = [val for val in output.split('\n') if not val.startswith('#')]
-				for patch in self.patches:
-					if os.path.basename(patch["quiltfile"]) == output[-1]:
-						self._current = self.patches.index(patch)
-			self.initialized = True
-
-		def Import(self, patch, force = None):
-			if not self.initialized:
-				self.InitFromDir()
-			PatchSet.Import(self, patch, force)
-
-			args = ["import", "-p", patch["strippath"]]
-			if force:
-				args.append("-f")
-				args.append("-dn")
-			args.append(patch["file"])
-
-			self._runcmd(args)
-
-			patch["quiltfile"] = self._quiltpatchpath(patch["file"])
-			patch["quiltfilemd5"] = md5sum(patch["quiltfile"])
-
-			# TODO: determine if the file being imported:
-			#	   1) is already imported, and is the same
-			#	   2) is already imported, but differs
-
-			self.patches.insert(self._current or 0, patch)
-
-
-		def Push(self, force = False, all = False, run = True):
-			# quilt push [-f]
-
-			args = ["push"]
-			if force:
-				args.append("-f")
-			if all:
-				args.append("-a")
-			if not run:
-				return self._runcmd(args, run)
-
-			self._runcmd(args)
-
-			if self._current is not None:
-				self._current = self._current + 1
-			else:
-				self._current = 0
-
-		def Pop(self, force = None, all = None):
-			# quilt pop [-f]
-			args = ["pop"]
-			if force:
-				args.append("-f")
-			if all:
-				args.append("-a")
-
-			self._runcmd(args)
-
-			if self._current == 0:
-				self._current = None
-
-			if self._current is not None:
-				self._current = self._current - 1
-
-		def Refresh(self, **kwargs):
-			if kwargs.get("remote"):
-				patch = self.patches[kwargs["patch"]]
-				if not patch:
-					raise PatchError("No patch found at index %s in patchset." % kwargs["patch"])
-				(type, host, path, user, pswd, parm) = bb.decodeurl(patch["remote"])
-				if type == "file":
-					import shutil
-					if not patch.get("file") and patch.get("remote"):
-						patch["file"] = bb.fetch.localpath(patch["remote"], self.d)
-
-					shutil.copyfile(patch["quiltfile"], patch["file"])
-				else:
-					raise PatchError("Unable to do a remote refresh of %s, unsupported remote url scheme %s." % (os.path.basename(patch["quiltfile"]), type))
-			else:
-				# quilt refresh
-				args = ["refresh"]
-				if kwargs.get("quiltfile"):
-					args.append(os.path.basename(kwargs["quiltfile"]))
-				elif kwargs.get("patch"):
-					args.append(os.path.basename(self.patches[kwargs["patch"]]["quiltfile"]))
-				self._runcmd(args)
-
-	class Resolver(object):
-		def __init__(self, patchset):
-			raise NotImplementedError()
-
-		def Resolve(self):
-			raise NotImplementedError()
-
-		def Revert(self):
-			raise NotImplementedError()
-
-		def Finalize(self):
-			raise NotImplementedError()
-
-	class NOOPResolver(Resolver):
-		def __init__(self, patchset):
-			self.patchset = patchset
-
-		def Resolve(self):
-			olddir = os.path.abspath(os.curdir)
-			os.chdir(self.patchset.dir)
-			try:
-				self.patchset.Push()
-			except Exception:
-				import sys
-				os.chdir(olddir)
-				raise sys.exc_value
-
-	# Patch resolver which relies on the user doing all the work involved in the
-	# resolution, with the exception of refreshing the remote copy of the patch
-	# files (the urls).
-	class UserResolver(Resolver):
-		def __init__(self, patchset):
-			self.patchset = patchset
-
-		# Force a push in the patchset, then drop to a shell for the user to
-		# resolve any rejected hunks
-		def Resolve(self):
-
-			olddir = os.path.abspath(os.curdir)
-			os.chdir(self.patchset.dir)
- 			try:
- 				self.patchset.Push(False)
- 			except CmdError, v:
- 				# Patch application failed
- 				patchcmd = self.patchset.Push(True, False, False)
- 
- 				t = bb.data.getVar('T', d, 1)
- 				if not t:
- 					bb.msg.fatal(bb.msg.domain.Build, "T not set")
- 				bb.mkdirhier(t)
- 				import random
- 				rcfile = "%s/bashrc.%s.%s" % (t, str(os.getpid()), random.random())
- 				f = open(rcfile, "w")
- 				f.write("echo '*** Manual patch resolution mode ***'\n")
- 				f.write("echo 'Dropping to a shell, so patch rejects can be fixed manually.'\n")
- 				f.write("echo 'Run \"quilt refresh\" when patch is corrected, press CTRL+D to exit.'\n")
- 				f.write("echo ''\n")
- 				f.write(" ".join(patchcmd) + "\n")
- 				f.write("#" + bb.data.getVar('TERMCMDRUN', d, 1))
- 				f.close()
- 				os.chmod(rcfile, 0775)
- 
- 				os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually"
- 				os.environ['TERMRCFILE'] = rcfile
- 				rc = os.system(bb.data.getVar('TERMCMDRUN', d, 1))
-				if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0:
- 					bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \
-					    + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', d, 1))
-
-				# Construct a new PatchSet after the user's changes, compare the
-				# sets, checking patches for modifications, and doing a remote
-				# refresh on each.
-				oldpatchset = self.patchset
-				self.patchset = oldpatchset.__class__(self.patchset.dir, self.patchset.d)
-
-				for patch in self.patchset.patches:
-					oldpatch = None
-					for opatch in oldpatchset.patches:
-						if opatch["quiltfile"] == patch["quiltfile"]:
-							oldpatch = opatch
-
-					if oldpatch:
-						patch["remote"] = oldpatch["remote"]
-						if patch["quiltfile"] == oldpatch["quiltfile"]:
-							if patch["quiltfilemd5"] != oldpatch["quiltfilemd5"]:
-								bb.note("Patch %s has changed, updating remote url %s" % (os.path.basename(patch["quiltfile"]), patch["remote"]))
-								# user change?  remote refresh
-								self.patchset.Refresh(remote=True, patch=self.patchset.patches.index(patch))
-							else:
-								# User did not fix the problem.  Abort.
-								raise PatchError("Patch application failed, and user did not fix and refresh the patch.")
-			except Exception:
-				os.chdir(olddir)
-				raise
-			os.chdir(olddir)
-
-	g = globals()
-	g["PatchSet"] = PatchSet
-	g["PatchTree"] = PatchTree
-	g["QuiltTree"] = QuiltTree
-	g["GitApplyTree"] = GitApplyTree
-	g["Resolver"] = Resolver
-	g["UserResolver"] = UserResolver
-	g["NOOPResolver"] = NOOPResolver
-	g["NotFoundError"] = NotFoundError
-	g["CmdError"] = CmdError
-
-addtask patch after do_unpack
-do_patch[dirs] = "${WORKDIR}"
-
-PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_staging"
-do_patch[depends] = "${PATCHDEPENDENCY}"
+PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot"
 
 python patch_do_patch() {
-	patch_init(d)
+	import oe.patch
 
 	src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split()
 	if not src_uri:
 		return
 
 	patchsetmap = {
-		"patch": PatchTree,
-		"quilt": QuiltTree,
-		"git": GitApplyTree,
+		"patch": oe.patch.PatchTree,
+		"quilt": oe.patch.QuiltTree,
+		"git": oe.patch.GitApplyTree,
 	}
 
 	cls = patchsetmap[bb.data.getVar('PATCHTOOL', d, 1) or 'quilt']
 
 	resolvermap = {
-		"noop": NOOPResolver,
-		"user": UserResolver,
+		"noop": oe.patch.NOOPResolver,
+		"user": oe.patch.UserResolver,
 	}
 
 	rcls = resolvermap[bb.data.getVar('PATCHRESOLVE', d, 1) or 'user']
@@ -485,32 +39,44 @@ python patch_do_patch() {
 	workdir = bb.data.getVar('WORKDIR', d, 1)
 	for url in src_uri:
 		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
-		if not "patch" in parm:
-			continue
-
-		bb.fetch.init([url],d)
-		url = bb.encodeurl((type, host, path, user, pswd, []))
-		local = os.path.join('/', bb.fetch.localpath(url, d))
 
-		# did it need to be unpacked?
-		dots = os.path.basename(local).split(".")
-		if dots[-1] in ['gz', 'bz2', 'Z']:
-			unpacked = os.path.join(bb.data.getVar('WORKDIR', d),'.'.join(dots[0:-1]))
-		else:
-			unpacked = local
-		unpacked = bb.data.expand(unpacked, d)
+		local = None
+		base, ext = os.path.splitext(os.path.basename(path))
+		if ext in ('.gz', '.bz2', '.Z'):
+			local = os.path.join(workdir, base)
+			ext = os.path.splitext(base)[1]
+
+		if "apply" in parm:
+			apply = parm["apply"]
+			if apply != "yes":
+				if apply != "no":
+					bb.msg.warn(None, "Unsupported value '%s' for 'apply' url param in '%s', please use 'yes' or 'no'" % (apply, url))
+				continue
+		elif "patch" in parm:
+			bb.msg.warn(None, "Deprecated usage of 'patch' url param in '%s', please use 'apply={yes,no}'" % url)
+		elif ext not in (".diff", ".patch"):
+			continue
 
-		if "pnum" in parm:
-			pnum = parm["pnum"]
+		if not local:
+			bb.fetch.init([url],d)
+			url = bb.encodeurl((type, host, path, user, pswd, []))
+			local = os.path.join('/', bb.fetch.localpath(url, d))
+		local = bb.data.expand(local, d)
+
+		if "striplevel" in parm:
+			striplevel = parm["striplevel"]
+		elif "pnum" in parm:
+			bb.msg.warn(None, "Deprecated usage of 'pnum' url parameter in '%s', please use 'striplevel'" % url)
+			striplevel = parm["pnum"]
 		else:
-			pnum = "1"
+			striplevel = '1'
 
 		if "pname" in parm:
 			pname = parm["pname"]
 		else:
-			pname = os.path.basename(unpacked)
+			pname = os.path.basename(local)
 
-                if "mindate" in parm or "maxdate" in parm:
+		if "mindate" in parm or "maxdate" in parm:
 			pn = bb.data.getVar('PN', d, 1)
 			srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
 			if not srcdate:
@@ -540,13 +106,17 @@ python patch_do_patch() {
 				bb.note("Patch '%s' applies to earlier revisions" % pname)
 				continue
 
-		bb.note("Applying patch '%s' (%s)" % (pname, base_path_out(unpacked, d)))
+		bb.note("Applying patch '%s' (%s)" % (pname, oe.path.format_display(local, d)))
 		try:
-			patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True)
-		except:
+			patchset.Import({"file":local, "remote":url, "strippath": striplevel}, True)
+		except Exception:
 			import sys
 			raise bb.build.FuncFailed(str(sys.exc_value))
 		resolver.Resolve()
 }
 
+addtask patch after do_unpack
+do_patch[dirs] = "${WORKDIR}"
+do_patch[depends] = "${PATCHDEPENDENCY}"
+
 EXPORT_FUNCTIONS do_patch
diff --git a/classes/python-dir.bbclass b/classes/python-dir.bbclass
index d631a5c3ff..7b0b80973a 100644
--- a/classes/python-dir.bbclass
+++ b/classes/python-dir.bbclass
@@ -4,7 +4,7 @@ def python_dir(d):
 	for majmin in "2.6 2.5 2.4 2.3".split():
 		if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin
 	if not "python-native" in bb.data.getVar( "DEPENDS", d, 1 ).split():
-		raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
+		raise Exception("No Python in STAGING_INCDIR. Forgot to build python-native?")
 	return "INVALID"
 
 PYTHON_DIR = "${@python_dir(d)}"
diff --git a/classes/relocatable.bbclass b/classes/relocatable.bbclass
new file mode 100644
index 0000000000..eb5b9e62ed
--- /dev/null
+++ b/classes/relocatable.bbclass
@@ -0,0 +1,93 @@
+SYSROOT_PREPROCESS_FUNCS += "relocatable_binaries_preprocess"
+
+CHRPATH_BIN ?= "chrpath"
+PREPROCESS_RELOCATE_DIRS ?= ""
+
+def process_dir (directory, d):
+    import subprocess as sub
+    import stat
+
+    cmd = bb.data.expand('${CHRPATH_BIN}', d)
+    tmpdir = bb.data.getVar('TMPDIR', d)
+    basedir = bb.data.expand('${base_prefix}', d)
+
+    #bb.debug("Checking %s for binaries to process" % directory)
+    if not os.path.exists(directory):
+        return
+
+    dirs = os.listdir(directory)
+    for file in dirs:
+        fpath = directory + "/" + file
+        if os.path.islink(fpath):
+            # Skip symlinks
+            continue
+
+        if os.path.isdir(fpath):
+            process_dir(fpath, d)
+        else:
+            #bb.note("Testing %s for relocatability" % fpath)
+
+            # We need read and write permissions for chrpath, if we don't have
+            # them then set them temporarily. Take a copy of the files
+            # permissions so that we can restore them afterwards.
+            perms = os.stat(fpath)[stat.ST_MODE]
+            if os.access(fpath, os.W_OK|os.R_OK):
+                    perms = None
+            else:
+                # Temporarily make the file writeable so we can chrpath it
+                os.chmod(fpath, perms|stat.S_IRWXU)
+
+            p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE)
+            err, out = p.communicate()
+            # If returned succesfully, process stderr for results
+            if p.returncode != 0:
+                continue
+
+            # Throw away everything other than the rpath list
+            curr_rpath = err.partition("RPATH=")[2]
+            #bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip()))
+            rpaths = curr_rpath.split(":")
+            new_rpaths = []
+            for rpath in rpaths:
+                # If rpath is already dynamic continue
+                if rpath.find("$ORIGIN") != -1:
+                    continue
+                # If the rpath shares a root with base_prefix determine a new dynamic rpath from the
+                # base_prefix shared root
+                if rpath.find(basedir) != -1:
+                    depth = fpath.partition(basedir)[2].count('/')
+                    libpath = rpath.partition(basedir)[2].strip()
+                # otherwise (i.e. cross packages) determine a shared root based on the TMPDIR
+                # NOTE: This will not work reliably for cross packages, particularly in the case
+                # where your TMPDIR is a short path (i.e. /usr/poky) as chrpath cannot insert an
+                # rpath longer than that which is already set.
+                else:
+                    depth = fpath.rpartition(tmpdir)[2].count('/')
+                    libpath = rpath.partition(tmpdir)[2].strip()
+
+                base = "$ORIGIN"
+                while depth > 1:
+                    base += "/.."
+                    depth-=1
+                new_rpaths.append("%s%s" % (base, libpath))
+
+            # if we have modified some rpaths call chrpath to update the binary
+            if len(new_rpaths):
+                args = ":".join(new_rpaths)
+                #bb.note("Setting rpath for %s to %s" %(fpath,args))
+                sub.call([cmd, '-r', args, fpath])
+
+            if perms:
+                os.chmod(fpath, perms)
+
+def rpath_replace (path, d):
+    bindirs = bb.data.expand("${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${libdir} ${base_libdir} ${PREPROCESS_RELOCATE_DIRS}", d).split()
+
+    for bindir in bindirs:
+        #bb.note ("Processing directory " + bindir)
+        directory = path + "/" + bindir
+        process_dir (directory, d)
+
+python relocatable_binaries_preprocess() {
+    rpath_replace(bb.data.expand('${SYSROOT_DESTDIR}', d), d)
+}
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index dc2b2cb02c..e077127144 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -4,7 +4,7 @@
 ROOTFS_PKGMANAGE = "run-postinsts dpkg"
 ROOTFS_PKGMANAGE_BOOTSTRAP  = "run-postinsts"
 
-do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging"
+do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot"
 do_rootfs[recrdeptask] += "do_package_write_deb"
 
 fakeroot rootfs_deb_do_rootfs () {
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 5483c7e077..9fa1d5ec6c 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -5,7 +5,7 @@
 # See image.bbclass for a usage of this.
 #
 
-do_rootfs[depends] += "opkg-native:do_populate_staging"
+do_rootfs[depends] += "opkg-native:do_populate_sysroot"
 
 IPKG_TMP_DIR = "${IMAGE_ROOTFS}-tmp"
 IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} -t ${IPKG_TMP_DIR} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}"
diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index e3e306450e..c018a03e2f 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -6,7 +6,7 @@ ROOTFS_PKGMANAGE = "rpm yum"
 
 ROOTFS_PKGMANAGE_BOOTSTRAP  = "run-postinsts"
 
-do_rootfs[depends] += "rpm-native:do_populate_staging yum-native:do_populate_staging createrepo-native:do_populate_staging fakechroot-native:do_populate_staging"
+do_rootfs[depends] += "rpm-native:do_populate_sysroot yum-native:do_populate_sysroot createrepo-native:do_populate_sysroot fakechroot-native:do_populate_sysroot"
 do_rootfs[recrdeptask] += "do_package_write_rpm"
 
 YUMCONF = "${IMAGE_ROOTFS}/etc/yum.conf"
@@ -203,7 +203,7 @@ python () {
         flags = bb.data.getVarFlag('do_rootfs', 'recrdeptask', d)
         flags = flags.replace("do_package_write_rpm", "")
         flags = flags.replace("do_deploy", "")
-        flags = flags.replace("do_populate_staging", "")
+        flags = flags.replace("do_populate_sysroot", "")
         bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d)
         bb.data.setVar('RPM_PREPROCESS_COMMANDS', "rpm_insert_feed_uris", d)
         bb.data.setVar('RPM_POSTPROCESS_COMMANDS', '', d)
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 4051d49557..dfb3010f82 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -83,7 +83,7 @@ def check_sanity(e):
 	if not check_app_exists('${BUILD_PREFIX}g++', e.data):
 		missing = missing + "C++ Compiler (${BUILD_PREFIX}g++),"
 
-	required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum"
+	required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum chrpath"
 
 	# If we'll be running qemu, perform some sanity checks
 	if data.getVar('ENABLE_BINARY_LOCALE_GENERATION', e.data, True):
@@ -141,6 +141,14 @@ def check_sanity(e):
 		if not abi.isdigit():
 			f = file(abifile, "w")
 			f.write(current_abi)
+                elif abi == "3" and current_abi == "4":
+			import bb
+			bb.note("Converting staging from layout version 2 to layout version 3")
+			os.system(bb.data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots", e.data))
+			os.system(bb.data.expand("ln -s sysroots ${TMPDIR}/staging", e.data))
+			os.system(bb.data.expand("cd ${TMPDIR}/stamps; for i in */*do_populate_staging; do new=`echo $i | sed -e 's/do_populate_staging/do_populate_sysroot/'`; mv $i $new; done", e.data))
+			f = file(abifile, "w")
+			f.write(current_abi)
 		elif (abi != current_abi):
 			# Code to convert from one ABI to another could go here if possible.
 			messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)
diff --git a/classes/signature.bbclass b/classes/signature.bbclass
new file mode 100644
index 0000000000..17f7f6c59d
--- /dev/null
+++ b/classes/signature.bbclass
@@ -0,0 +1,29 @@
+# Generate a signature / hash from the metadata
+#
+# Using a blacklist rather than a whitelist is safest, at least if you're
+# utilizing the signature in your pstage package filenames, as the failure
+# mode for blacklist is an unnecessary rebuild from source, whereas the
+# failure case for a whitelist is use of incorrect binaries.
+
+BB_HASH_BLACKLIST += "BUILDSTART DATE TIME DATETIME \
+                      __* *DIR \
+                      BB_*"
+
+def get_data_hash(d):
+    from fnmatch import fnmatchcase
+
+    try:
+        signature = d.hash()
+    except AttributeError:
+        blacklist = (d.getVar("BB_HASH_BLACKLIST", True) or "").split()
+        items = ((key, repr(d.getVar(key, False)))
+                 for key in d.keys()
+                 if not any(fnmatchcase(key, pattern) for pattern in blacklist))
+        signature = hash(frozenset(items))
+    return str(signature)
+
+SIGNATURE = "${@get_data_hash(d.getVar('__RECIPEDATA', False) or d)}"
+
+python () {
+    d.setVar("__RECIPEDATA", d)
+}
diff --git a/classes/sip.bbclass b/classes/sip.bbclass
index 30c08b1ed9..6bc248aeb3 100644
--- a/classes/sip.bbclass
+++ b/classes/sip.bbclass
@@ -55,7 +55,7 @@ sip_do_generate() {
 	done
 }
 
-do_generate[deptask] = "do_populate_staging"
+do_generate[deptask] = "do_populate_sysroot"
 
 EXPORT_FUNCTIONS do_generate
 
diff --git a/classes/sip3.bbclass b/classes/sip3.bbclass
index 7ecc63bf02..c2c4725377 100644
--- a/classes/sip3.bbclass
+++ b/classes/sip3.bbclass
@@ -53,7 +53,7 @@ sip3_do_generate() {
 	done
 }
 
-do_generate[deptask] = "do_populate_staging"
+do_generate[deptask] = "do_populate_sysroot"
 
 EXPORT_FUNCTIONS do_generate
 
diff --git a/classes/srctree.bbclass b/classes/srctree.bbclass
index dbf8ad2c3f..7232c26b12 100644
--- a/classes/srctree.bbclass
+++ b/classes/srctree.bbclass
@@ -26,8 +26,8 @@ def merge_tasks(d):
 	"""
 	merge_tasks performs two operations:
 	1) removes do_patch and its deps from the build entirely.
-	2) merges all of the operations that occur prior to do_populate_staging
-	into do_populate_staging.
+	2) merges all of the operations that occur prior to do_populate_sysroot
+	into do_populate_sysroot.
 
 	This is necessary, because of recipe variants (normal, native, cross,
 	sdk).  If a bitbake run happens to want to build more than one of
@@ -50,7 +50,7 @@ def merge_tasks(d):
 		__gather_taskdeps(task, items)
 		return items
 
-	newtask = "do_populate_staging"
+	newtask = "do_populate_sysroot"
 	mergedtasks = gather_taskdeps(newtask)
 	mergedtasks.pop()
 	deltasks = gather_taskdeps("do_patch")
@@ -86,14 +86,14 @@ def merge_tasks(d):
 	depends = (d.getVarFlag(task, "depends") or ""
 	           for task in mergedtasks[:-1]
 	           if not task in deltasks)
-	d.setVarFlag("do_populate_staging", "depends", " ".join(depends))
+	d.setVarFlag("do_populate_sysroot", "depends", " ".join(depends))
 
 python () {
     merge_tasks(d)
 }
 
 # Manually run do_install & all of its deps, then do_stage
-python do_populate_staging () {
+python do_populate_sysroot () {
 	from os.path import exists
 	from bb.build import exec_task, exec_func
 	from bb import note
@@ -112,4 +112,4 @@ python do_populate_staging () {
 	rec_exec_task("do_install", set())
 	exec_func("do_stage", d)
 }
-do_populate_staging[lockfiles] += "${S}/.lock"
+do_populate_sysroot[lockfiles] += "${S}/.lock"
diff --git a/classes/staging.bbclass b/classes/staging.bbclass
index 32038a5076..e80644961c 100644
--- a/classes/staging.bbclass
+++ b/classes/staging.bbclass
@@ -1,9 +1,9 @@
-python populate_staging_prehook () {
-       return
+python populate_sysroot_prehook () {
+	return
 }
 
-python populate_staging_posthook () {
-       return
+python populate_sysroot_posthook () {
+	return
 }
 
 packagedstaging_fastpath () {
@@ -38,6 +38,7 @@ sysroot_stage_dir() {
 	fi
 }
 
+SYSROOTEXTRALIBDIRSED ?= ""
 sysroot_stage_libdir() {
 	src="$1"
 	dest="$2"
@@ -52,6 +53,7 @@ sysroot_stage_libdir() {
 		sed -e 's/^installed=yes$/installed=no/' \
 		    -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
 		    -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
+		    ${SYSROOTEXTRALIBDIRSED} \
 		    -i $src/$i
 	done
 	sysroot_stage_dir $src $dest
@@ -68,6 +70,7 @@ sysroot_stage_dirs() {
 		sysroot_stage_dir $from${base_bindir} $to${STAGING_DIR_HOST}${base_bindir}
 		sysroot_stage_dir $from${base_sbindir} $to${STAGING_DIR_HOST}${base_sbindir}
 		sysroot_stage_dir $from${libexecdir} $to${STAGING_DIR_HOST}${libexecdir}
+		sysroot_stage_dir $from${sysconfdir} $to${STAGING_DIR_HOST}${sysconfdir}
 		if [ "${prefix}/lib" != "${libdir}" ]; then
 			# python puts its files in here, make sure they are staged as well
 			autotools_stage_dir $from/${prefix}/lib $to${STAGING_DIR_HOST}${prefix}/lib
@@ -94,6 +97,8 @@ def is_legacy_staging(d):
     legacy = True
     if stagefunc is None:
         legacy = False
+    elif stagefunc.strip() == "use_do_install_for_stage":
+        legacy = False
     elif stagefunc.strip() == "autotools_stage_all":
         legacy = False
     elif stagefunc.strip() == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":
@@ -106,21 +111,22 @@ def is_legacy_staging(d):
         legacy = True
     return legacy
 
-do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \
+do_populate_sysroot[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \
 			     ${STAGING_DIR_TARGET}/${includedir} \
 			     ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \
 			     ${STAGING_INCDIR_NATIVE} \
 			     ${STAGING_DATADIR} \
 			     ${S} ${B}"
 
-# Could be compile but populate_staging and do_install shouldn't run at the same time
-addtask populate_staging after do_install before do_build
+# Could be compile but populate_sysroot and do_install shouldn't run at the same time
+addtask populate_sysroot after do_install
 
 SYSROOT_PREPROCESS_FUNCS ?= ""
 SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/"
 SYSROOT_LOCK = "${STAGING_DIR}/staging.lock"
 
-python do_populate_staging () {
+
+python do_populate_sysroot () {
     #
     # if do_stage exists, we're legacy. In that case run the do_stage,
     # modify the SYSROOT_DESTDIR variable and then run the staging preprocess
@@ -147,11 +153,11 @@ python do_populate_staging () {
         if bb.data.getVarFlags('do_stage', d) is None:
             bb.fatal("This recipe (%s) has a do_stage_prepend or do_stage_append and do_stage now doesn't exist. Please rename this to do_stage()" % bb.data.getVar("FILE", d, True))
         lock = bb.utils.lockfile(lockfile)
-        bb.build.exec_func('populate_staging_prehook', d)
+        bb.build.exec_func('populate_sysroot_prehook', d)
         bb.build.exec_func('do_stage', d)
         for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split():
             bb.build.exec_func(f, d)
-        bb.build.exec_func('populate_staging_posthook', d)
+        bb.build.exec_func('populate_sysroot_posthook', d)
         bb.utils.unlockfile(lock)
     else:
         dest = bb.data.getVar('D', d, True)
diff --git a/classes/utils.bbclass b/classes/utils.bbclass
index 6081b1e652..4e352e3b9c 100644
--- a/classes/utils.bbclass
+++ b/classes/utils.bbclass
@@ -1,3 +1,44 @@
+# For compatibility
+def base_path_join(a, *p):
+    return oe.path.join(a, *p)
+
+def base_path_relative(src, dest):
+    return oe.path.relative(src, dest)
+
+def base_path_out(path, d):
+    return oe.path.format_display(path, d)
+
+def base_read_file(filename):
+    return oe.utils.read_file(filename)
+
+def base_ifelse(condition, iftrue = True, iffalse = False):
+    return oe.utils.ifelse(condition, iftrue, iffalse)
+
+def base_conditional(variable, checkvalue, truevalue, falsevalue, d):
+    return oe.utils.conditional(variable, checkvalue, truevalue, falsevalue, d)
+
+def base_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
+    return oe.utils.less_or_equal(variable, checkvalue, truevalue, falsevalue, d)
+
+def base_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
+    return oe.utils.version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d)
+
+def base_contains(variable, checkvalues, truevalue, falsevalue, d):
+    return oe.utils.contains(variable, checkvalues, truevalue, falsevalue, d)
+
+def base_both_contain(variable1, variable2, checkvalue, d):
+    return oe.utils.both_contain(variable1, variable2, checkvalue, d)
+
+def base_prune_suffix(var, suffixes, d):
+    return oe.utils.prune_suffix(var, suffixes, d)
+
+def oe_filter(f, str, d):
+    return oe.utils.str_filter(f, str, d)
+
+def oe_filter_out(f, str, d):
+    return oe.utils.str_filter_out(f, str, d)
+
+
 def subprocess_setup():
    import signal
    # Python installs a SIGPIPE handler by default. This is usually not what
@@ -28,53 +69,6 @@ def oe_system(d, cmd):
     """ Popen based version of os.system. """
     return oe_popen(d, cmd, shell=True).wait()
 
-# like os.path.join but doesn't treat absolute RHS specially
-def base_path_join(a, *p):
-    path = a
-    for b in p:
-        if path == '' or path.endswith('/'):
-            path +=  b
-        else:
-            path += '/' + b
-    return path
-
-def base_path_relative(src, dest):
-    """ Return a relative path from src to dest.
-
-    >>> base_path_relative("/usr/bin", "/tmp/foo/bar")
-    ../../tmp/foo/bar
-
-    >>> base_path_relative("/usr/bin", "/usr/lib")
-    ../lib
-
-    >>> base_path_relative("/tmp", "/tmp/foo/bar")
-    foo/bar
-    """
-    from os.path import sep, pardir, normpath, commonprefix
-
-    destlist = normpath(dest).split(sep)
-    srclist = normpath(src).split(sep)
-
-    # Find common section of the path
-    common = commonprefix([destlist, srclist])
-    commonlen = len(common)
-
-    # Climb back to the point where they differentiate
-    relpath = [ pardir ] * (len(srclist) - commonlen)
-    if commonlen < len(destlist):
-        # Add remaining portion
-        relpath += destlist[commonlen:]
-
-    return sep.join(relpath)
-
-def base_path_out(path, d):
-    """ Prepare a path for display to the user. """
-    rel = base_path_relative(d.getVar("TOPDIR", 1), path)
-    if len(rel) > len(path):
-        return path
-    else:
-        return rel
-
 # for MD5/SHA handling
 def base_chk_load_parser(config_paths):
     import ConfigParser
@@ -84,6 +78,15 @@ def base_chk_load_parser(config_paths):
 
     return parser
 
+def setup_checksum_deps(d):
+    try:
+        import hashlib
+    except ImportError:
+        if d.getVar("PN", True) != "shasum-native":
+            depends = d.getVarFlag("do_fetch", "depends") or ""
+            d.setVarFlag("do_fetch", "depends", "%s %s" %
+                         (depends, "shasum-native:do_populate_sysroot"))
+
 def base_chk_file_checksum(localpath, src_uri, expected_md5sum, expected_sha256sum, data):
     strict_checking =  bb.data.getVar("OE_STRICT_CHECKSUMS", data, True)
     if not os.path.exists(localpath):
@@ -91,25 +94,18 @@ def base_chk_file_checksum(localpath, src_uri, expected_md5sum, expected_sha256s
         bb.note("The localpath does not exist '%s'" % localpath)
         raise Exception("The path does not exist '%s'" % localpath)
 
-    try:
-        md5pipe = os.popen('PATH=%s md5sum "%s"' % (bb.data.getVar('PATH', data, True), localpath))
-        md5data = (md5pipe.readline().split() or [ "" ])[0]
-        md5pipe.close()
-    except OSError, e:
-        if strict_checking:
-            raise Exception("Executing md5sum failed")
-        else:
-            bb.note("Executing md5sum failed")
-
-    try:
-        shapipe = os.popen('PATH=%s oe_sha256sum "%s"' % (bb.data.getVar('PATH', data, True), localpath))
-        sha256data = (shapipe.readline().split() or [ "" ])[0]
-        shapipe.close()
-    except OSError, e:
-        if strict_checking:
-            raise Exception("Executing shasum failed")
-        else:
-            bb.note("Executing shasum failed")
+    md5data = bb.utils.md5_file(localpath)
+    sha256data = bb.utils.sha256_file(localpath)
+    if not sha256data:
+        try:
+            shapipe = os.popen('PATH=%s oe_sha256sum "%s"' % (bb.data.getVar('PATH', data, True), localpath))
+            sha256data = (shapipe.readline().split() or [ "" ])[0]
+            shapipe.close()
+        except OSError, e:
+            if strict_checking:
+                raise Exception("Executing shasum failed")
+            else:
+                bb.note("Executing shasum failed")
 
     if (expected_md5sum == None or expected_md5sum == None):
         from string import maketrans
@@ -205,76 +201,6 @@ def base_chk_file(pn, pv, src_uri, localpath, params, data):
     (expected_md5sum, expected_sha256sum) = base_get_checksums(pn, pv, src_uri, localpath, params, data)
     return base_chk_file_checksum(localpath, src_uri, expected_md5sum, expected_sha256sum, data)
 
-def base_read_file(filename):
-	try:
-		f = file( filename, "r" )
-	except IOError, reason:
-		return "" # WARNING: can't raise an error now because of the new RDEPENDS handling. This is a bit ugly. :M:
-	else:
-		return f.read().strip()
-	return None
-
-def base_ifelse(condition, iftrue = True, iffalse = False):
-    if condition:
-        return iftrue
-    else:
-        return iffalse
-
-def base_conditional(variable, checkvalue, truevalue, falsevalue, d):
-	if bb.data.getVar(variable,d,1) == checkvalue:
-		return truevalue
-	else:
-		return falsevalue
-
-def base_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
-	if float(bb.data.getVar(variable,d,1)) <= float(checkvalue):
-		return truevalue
-	else:
-		return falsevalue
-
-def base_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
-    result = bb.vercmp(bb.data.getVar(variable,d,True), checkvalue)
-    if result <= 0:
-        return truevalue
-    else:
-        return falsevalue
-
-def base_contains(variable, checkvalues, truevalue, falsevalue, d):
-	val = bb.data.getVar(variable,d,1)
-	if not val:
-		return falsevalue
-	matches = 0
-	if type(checkvalues).__name__ == "str":
-		checkvalues = [checkvalues]
-	for value in checkvalues:
-		if val.find(value) != -1:
-			matches = matches + 1
-	if matches == len(checkvalues):
-		return truevalue
-	return falsevalue
-
-def base_both_contain(variable1, variable2, checkvalue, d):
-       if bb.data.getVar(variable1,d,1).find(checkvalue) != -1 and bb.data.getVar(variable2,d,1).find(checkvalue) != -1:
-               return checkvalue
-       else:
-               return ""
-
-def base_prune_suffix(var, suffixes, d):
-    # See if var ends with any of the suffixes listed and 
-    # remove it if found
-    for suffix in suffixes:
-        if var.endswith(suffix):
-            return var.replace(suffix, "")
-    return var
-
-def oe_filter(f, str, d):
-	from re import match
-	return " ".join(filter(lambda x: match(f, x, 0), str.split()))
-
-def oe_filter_out(f, str, d):
-	from re import match
-	return " ".join(filter(lambda x: not match(f, x, 0), str.split()))
-
 oedebug() {
 	test $# -ge 2 || {
 		echo "Usage: oedebug level \"message\""
@@ -487,7 +413,7 @@ def check_app_exists(app, d):
 
 	app = data.expand(app, d)
 	path = data.getVar('PATH', d, 1)
-	return len(which(path, app)) != 0
+	return bool(which(path, app))
 
 def explode_deps(s):
 	return bb.utils.explode_deps(s)
diff --git a/classes/vala.bbclass b/classes/vala.bbclass
index 433b64e87e..11a85db061 100644
--- a/classes/vala.bbclass
+++ b/classes/vala.bbclass
@@ -1,19 +1,16 @@
 # Vala has problems with multiple concurrent invocations
 PARALLEL_MAKE = ""
 
+# Vala needs vala-native
 DEPENDS += "vala-native"
+DEPENDS_virtclass-native += "vala-native"
 
+# Vala looks in STAGING_DATADIR for .vapi files
+export STAGING_DATADIR
+
+# Package additional files
 FILES_${PN}-dev += "\
   ${datadir}/vala/vapi/*.vapi \
   ${datadir}/vala/vapi/*.deps \
+  ${datadir}/gir-1.0 \
 "
-
-VALA_DONT_STAGE_VAPIS ?= "\(/config.vapi$\)\|\(/config.deps$\)"
-
-# .vapi and .deps files are arch independent and need to be present in the
-# staging datadir for the native vala compiler
-do_stage_append() {
-	install -d ${STAGING_DATADIR_NATIVE}/vala/vapi
-	for VALAFILE in `find . -name "*.vapi" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done
-	for VALAFILE in `find . -name "*.deps" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done
-}
diff --git a/classes/xfce46.bbclass b/classes/xfce46.bbclass
index c24dfa4d8c..7e3e41877b 100644
--- a/classes/xfce46.bbclass
+++ b/classes/xfce46.bbclass
@@ -11,7 +11,7 @@ SECTION ?= "x11/xfce"
 
 XFCE_VERSION = ${PV}
 
-SRC_URI = "http://mocha.xfce.org/archive/src/xfce/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://mocha.xfce.org/archive/src/xfce/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2;name=archive"
 
 inherit autotools gtk-icon-cache pkgconfig
 
diff --git a/conf/abi_version.conf b/conf/abi_version.conf
index 7f190c38c1..92b6b5868a 100644
--- a/conf/abi_version.conf
+++ b/conf/abi_version.conf
@@ -4,7 +4,7 @@
 # that breaks the format and have been previously discussed on the mailing list 
 # with general agreement from the core team.
 #
-OELAYOUT_ABI = "3"
+OELAYOUT_ABI = "4"
 
 #
 # DISTRO_PR allows us to regenerate all packages when a fundamental change is
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 74d4da238e..12a5522029 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -257,7 +257,7 @@ RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPV})"
 
 FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
             ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
-            ${libdir}/matchbox-panel/.debug"
+            ${libdir}/matchbox-panel/.debug ${datadir}/gdb/autoload"
 SECTION_${PN}-dbg = "devel"
 ALLOW_EMPTY_${PN}-dbg = "1"
 RRECOMMENDS_${PN}-dbg = "${PN} (= ${EXTENDPV})"
@@ -295,7 +295,7 @@ D = "${WORKDIR}/image"
 S = "${WORKDIR}/${BP}"
 B = "${S}"
 
-STAGING_DIR = "${TMPDIR}/staging"
+STAGING_DIR = "${TMPDIR}/sysroots"
 
 STAGING_DIR_JAVA = "${STAGING_DIR}/java"
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
@@ -709,6 +709,7 @@ require conf/compatibility-providers.conf
 ##################################################################
 
 DL_DIR ?= "${TMPDIR}/downloads"
+PSTAGE_DIR ?= "${TMPDIR}/pstage"
 IMAGE_FSTYPES ?= "tar.gz"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 DEFAULT_TASK_PROVIDER ?= "task-base"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 6c3e83a663..e69de29bb2 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1,30564 +0,0 @@
-[http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz]
-md5=c6a2705f6210d8ede50a947b375f1c0b
-sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88
-
-[http://www.directfb.org/downloads/Extras/++DFB-1.0.0.tar.gz]
-md5=bfc2c45be253a5f25576587f61faff1b
-sha256=bc5b7766318ef6676defdf0103d1b53b48a3fee6b819fbe2076461caa9f94ec9
-
-[http://www.bat.org/~tomba/git/0001-DSS-OMAPFB-Check-that-var-pixclock-is-not-zero.patch]
-md5=a018019d71ceea27b7719942c236b71e
-sha256=9ab38538a43b4b664a138a5c886158694f40c7e1f13477e41ba24191d1a1827c
-
-[http://www.bat.org/~tomba/git/0001-debug-prints.patch]
-md5=92a71b8976ea869c66520e365f2cd2aa
-sha256=b488e1960ca873f1b853eae5f98a41401391572c079aafdbed4f119a1bcbc52f
-
-[http://hg.openjdk.java.net/hsx/hsx14/master/archive/09f7962b8b44.tar.gz]
-md5=600284e870609a7531163bf2972c573b
-sha256=6e8123c31e0e45648114606898599dfb31ec81a011875d471226dd58e24c6dc9
-
-[http://www.nopcode.org/0xFFFF/get/0xFFFF-0.1.tar.gz]
-md5=666fce75c418d7b72e2c9dc225fce3be
-sha256=2419708f8e0d7cd6875f4555da9c8a2bf9503374eb7c0bea08fed0841baa4655
-
-[http://www.nopcode.org/0xFFFF/get/0xFFFF-0.2.tar.gz]
-md5=31cd82986ccfabdf01a6a99aa00f975b
-sha256=6d061f8431b76ba1dd09401880c7029e490be8c04cac14ba89db7ea7d0ab77bf
-
-[http://daemonizer.de/prism54/prism54-fw/fw-fullmac/1.0.3.0.arm]
-md5=1f0a68fbe45963f76e525c9789f5609c
-sha256=56524bd14b2bd3318824312f1272ed417de726110ef1d5e99c2a1171f65482fa
-
-[http://daemonizer.de/prism54/prism54-fw/fw-fullmac/1.0.4.3.arm]
-md5=8bd4310971772a486b9784c77f8a6df9
-sha256=dce24156c57234dba131429fbe8cd1de8ba818c9481ddc33cf7e5af9d57a737c
-
-[http://www.red-bean.com/~proski/firmware/1.7.4.tar.bz2]
-md5=ff4a902f62b8a8c4ccf1474ce27bee41
-sha256=2660ad1f217e2cff5465cfb90b0cc2d5a6c57653fe769591af31da2e4f860c14
-
-[http://www.red-bean.com/~proski/firmware/1.8.3.tar.bz2]
-md5=0b04d2c4f8942e8ece2729ae6f058a8f
-sha256=5f22b7e3e34342127a4390898f1c70b5759c2a374d3e534b8f20646adc103275
-
-[http://www.red-bean.com/~proski/firmware/1.8.4.tar.bz2]
-md5=a47cfee4f322762881247558253ec037
-sha256=5782f645ab00224e733b018f82ea6e84d72a9f16a56ad645f4930145576bc8b5
-
-[http://rtpnet.nerim.net/ipaq/2.6.11-bk1/2.6.11-bk1-h1940.patch]
-md5=7f76fd173b550b1236025592be88f84c
-sha256=f09d4ae3365b876da9f40f49178ab7241bb7e4c1d67db9e2f310f9c76d5834a6
-
-[http://maxim.org.za/AT91RM9200/2.6/2.6.20-at91.patch.gz]
-md5=333b0e9328194f28af83c26d3717e4ac
-sha256=8930ebfdc8a606d8cb26f073d4700460c3289fb79e943e12948329e17336ca47
-
-[http://maxim.org.za/AT91RM9200/2.6/2.6.21-at91.patch.gz]
-md5=779472ae02c2a99937879a8d1d4b9b25
-sha256=cfb98e7635c985733dba0fb9c3cadee22ab70fb3b0db7eac8eacaebc65c92a59
-
-[http://maxim.org.za/AT91RM9200/2.6/2.6.22-rc1-at91.patch.gz]
-md5=2453815aba40e9487d24822d769fbab1
-sha256=95cec79fb6db261760421c1bb9df8a0f4955e0ee90e08cb9930a4c7a2482c1a6
-
-[http://maxim.org.za/AT91RM9200/2.6/2.6.23-rc3-at91.patch.gz]
-md5=822f2f85b658fb1f39b8a20fab781cfc
-sha256=e8ead43fa562cc76ac34d0d4841fd1e4f4964a830403801433e34961d1ce0e84
-
-[http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz]
-md5=4469d6336f9659f1725fedd4a52261ad
-sha256=7a960180e7873b1bdb522e76b0423b5c2c1b8efe1d30d7ca80c41eb97d822b2d
-
-[http://maxim.org.za/AT91RM9200/2.6/2.6.30-at91.patch.gz]
-md5=f13ab353b11329ce3d605b6f40e77fa6
-sha256=41991e8aa2e5fe8e5dfd47b1e5c446fa03c3ee96a5eae54fd6ec15d1d9afef30
-
-[http://maxim.org.za/AT91RM9200/2.6/2.6.31-at91.patch.gz]
-md5=bf420f0340e30b0a2c42b2b36d0b2577
-sha256=738b88daa31e1a033646900813a5f1ce40ba21e2836500fd848a984565f27584
-
-[http://www.ralinktech.com.tw/data/drivers/2009_0525_RT3070_Linux_STA_v2.1.1.0.tar.bz2]
-md5=705c5f8ba0f8a378218fef74859335f5
-sha256=b2a24265bb29f4d429ec42fefbfc545b898c8c046c01c577ca08d9cc65c860d7
-
-[http://hg.openjdk.java.net/hsx/hsx14/master/archive/25a020f13592.tar.gz]
-md5=dbd7aca5544d1aeebf0eadd45d29d08e
-sha256=02f10b35508cb11908bb908156daad1ea5e653840440d62482231efeb4cbe178
-
-[http://sense.net/zc/free42/42c_skins.tgz]
-md5=24b0e5bbfe21ea9c5a5c589bcc79c0f2
-sha256=ab877846c6caaff32efbf5be6fc5c63b7dec97a2e78c57c525da7705d2052bfc
-
-[http://monto.homelinux.org/89notifier]
-md5=6a197a3216abfd21ce2ae37b2be8da38
-sha256=7795a3c6339c35d172ced0e43785ff657c1430f9fab7e2e553411529e177e501
-
-[ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.8.tar.bz2]
-md5=81c1ff761c3431cd12c81337aa80d558
-sha256=96b70582d931a7e83c3ca31b3bc7e23957391e16dee4ae6ddf938c9574d50b27
-
-[http://www.amd.com/files/connectivitysolutions/geode/geode_lx/AES_Linux_LX_02.01.0100.tar.gz]
-md5=12cb241a9037fffe31ba7c68a48ed614
-sha256=a6068b4aa0e2330eed6e4741bad3191dc9ca7d7326f7bfab578ac55e2b8b91a2
-
-[http://downloads.sourceforge.net/artoolkit/ARToolKit-2.72.1.tgz]
-md5=4328b512711529309bad4bd1d791952c
-sha256=1a49a67c6e196b0e9990e90255ce840287ac47b5a53371a68a6dd93a5425d259
-
-[http://www.amd.com/files/connectivitysolutions/geode/geode_lx/AccessBus_Linux_5536_01.00.0401.tar.gz]
-md5=9e738b508a6031946ad15b6591d0e5d4
-sha256=d1edbe9c1c17cc3cc712b0b776c3eeab1f928f9e0a32467a4cb5a201c2902ab8
-
-[http://search.cpan.org/CPAN/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1902.tar.gz]
-md5=ff3e17ae485f8adfb8857b183991fbce
-sha256=c8b40dbf406770c6bcbd1a26a3f2343fa1563675085b63932d06f37e60098375
-
-[http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Archive-Tar-1.30.tar.gz]
-md5=89604ea8fadc990c7bb668259dacb439
-sha256=c456d5c73a57a567440bca5c138a549a21637aa2e4049228b5ba63cf68d75a1a
-
-[http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Archive-Zip-1.26.tar.gz]
-md5=a2e1cc1d99dbaebc41421295c93f61b5
-sha256=44d344bf7f9c304b3feb6f5f2dd54d30cc33163f881d39033f736666aa30c18a
-
-[http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Archive-Zip-1.30.tar.gz]
-md5=40153666e7538b410e001aa8a810e702
-sha256=f8b472ff77b7238e423bcb351968accc562f9d20700fbf2d8ed2a65fa0fa6318
-
-[http://gallium.prg.dtu.dk/HVSC/C64Music/MUSICIANS/G/Galway_Martin/Arkanoid_PSID.sid]
-md5=fe00539dbd185f9f9b7bbf716e063d49
-sha256=a22d0b958c9157c6c26c08de05b85ff89302ab2ed8ed772f7ede16ce6b0edfe0
-
-[http://mirror1.pdaxrom.org/source/src/AtiCore-1.0.1.tar.bz2]
-md5=b3d00a755e3be599b714f1f552db2752
-sha256=8f9124bd76c378ae2a25b6b421ebb8f0a88069da697ac6c96943571d93af8b15
-
-[http://www.amd.com/files/connectivitysolutions/geode/geode_lx/Audio_LinuxALSA_5536_1.00.0500.tar.gz]
-md5=8bd2a92fb94faa1b4fc43865d40bd988
-sha256=a317cd11719659892bdae6ec54ee2e37549d0df7d5bdce02036963acc2ad1486
-
-[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Axiom-0.5.30.tar.gz?format=raw]
-md5=8f0b3a27770e487ad08f4fafdccc4495
-sha256=4a4217e70e01e11d357c2c2c23bc72d244a78fa40a401cca48cd5f0a619c7060
-
-[http://search.cpan.org/CPAN/authors/id/D/DC/DCLINTON/Cache-Cache-1.05.tar.gz]
-md5=09e4d37979c8f8ce2518e1d1ccd10d99
-sha256=10106d94e0897c18cd5eb0b782c3212371c9785eba78a15f4623335e01dda23c
-
-[http://search.cpan.org/CPAN/authors/id/J/JS/JSWARTZ/Cache-Cache-1.06.tar.gz]
-md5=4425f44ddb138a799290802e5aad46ef
-sha256=703d93793ab0b3bd984cfde89943ce1a98c0991f94afc9d1d531c752f52a4793
-
-[http://downloads.sourceforge.net/cheetahtemplate/Cheetah-1.0.tar.gz]
-md5=aaa4907b8877093b9bb11e6cea6b029b
-sha256=ec27eff76846ec95cea4e156fbeac951946b6eb1d1b3e590e48c03904a625893
-
-[http://heanet.dl.sourceforge.net/cheetahtemplate/Cheetah-1.0.tar.gz]
-md5=dfc27276370279a00b6bd7f8d15bf8e5
-sha256=27ea8303e43e6641b72d24bba731c3620b68ec84a34e1c83f69444319d857209
-
-[http://downloads.sourceforge.net/cheetahtemplate/Cheetah-2.0.1.tar.gz]
-md5=7845a2950ea850a13c488a26b61ac50a
-sha256=70b618a03506831f59ba1ff8433907ee8d4ead5fc9f1b3f610d384e08a26938c
-
-[http://heanet.dl.sourceforge.net/cheetahtemplate/Cheetah-2.0.1.tar.gz]
-md5=7845a2950ea850a13c488a26b61ac50a
-sha256=70b618a03506831f59ba1ff8433907ee8d4ead5fc9f1b3f610d384e08a26938c
-
-[http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Class-Container-0.12.tar.gz]
-md5=6896bdb4464b96ad638e22b0400acbc9
-sha256=771206f2b7a916ce0dfb93d82200472beaeb910248482734179bf36808e486b1
-
-[http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.06.tar.gz]
-md5=86d95ee16854a5503dc9f86a2f2ffa83
-sha256=8750d58745e57654820aa9359891cb0d875d804dbfcfa2e1bb95c56531e423d1
-
-[http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.15.tar.gz]
-md5=7af92ddaee49815ade7c5886b74d5e64
-sha256=7b06802a72b1891c650fdf00d0ed0386caa379b37b0759c29d2d75aaa3dc3958
-
-[http://coherence.beebits.net/download/Coherence-0.6.0.tar.gz]
-md5=3180cf36a7bc401aefb236f4b5dbf14e
-sha256=2aa1906562387a5de05df25a3140ada89df648ccc4eac4ae7b583d0e029103e7
-
-[http://coherence.beebits.net/download/Coherence-0.6.2.tar.gz]
-md5=feaeeaa68cae420c0c365c3c27b2a21e
-sha256=1cb99720527ea0a5906f5e75152634b1797ff44bcc31f4014285bd5da41589cc
-
-[http://coherence.beebits.net/download/Coherence-0.6.6.2.tar.gz]
-md5=d7a1b4abf6831c61e37a3b9e2bdc560a
-sha256=0b54a6ba88c1ff6274aadb68ff37b8a3961b4c6acf5ded291c5dea936a311ba4
-
-[http://www.cpan.org/modules/by-module/Compress/Compress-Raw-Zlib-2.015.tar.gz]
-md5=6680d7ee3fbfd5171ccf239328c284fd
-sha256=8d75b2abbaca09528ce7e566684253b09a94f3f100947885a54ee22ec7f9d33c
-
-[http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.023.tar.gz]
-md5=3e2ce271f1eada6d192f424a1168b24c
-sha256=ec74b8d04e823ae40602b87c01c230a7c91979a06efcc2f672aceb7f2196128a
-
-[http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-1.42.tar.gz]
-md5=1ab76bfd6731d80f6abbd1643c90cabd
-sha256=7794d91711e8c9e526431da72c53bb08e14790f326d0e330d9e9d651f3f6fc6c
-
-[http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-2.015.tar.gz]
-md5=689ba2cc399b019d0bf76a0575c32947
-sha256=9b4c6fde1c972016fcbea1f019d143261ac0f5410652ea91571d7eedd22831cc
-
-[http://search.cpan.org/CPAN/authors/id/T/TL/TLINDEN/Config-General-2.42.tar.gz]
-md5=2b4d586151de7de521dd415be08b4cd5
-sha256=a978f94781dd91e6e289df492b71609fc73f12d5de8b93856a8cba0a2d91f864
-
-[http://people.freedesktop.org/~mccann/dist/ConsoleKit-0.3.0.tar.bz2]
-md5=43b02a52212330b54cfb34c4044d9ce0
-sha256=cbcfbb3df2dc76855c99c1cdff04a257ec5270fa62e1d21b0d057b08d88c0fd4
-
-[http://www.cpan.org/modules/by-module/Crypt/Crypt-Rijndael-1.07.tar.gz]
-md5=a362328753cdf781164b3963a5ac82e4
-sha256=a3e3d662d1ad5e5346c78db1426fdec552ada5415da2dc2672bfe975834017ab
-
-[http://search.cpan.org/CPAN/authors/id/B/BD/BDFOY/Crypt-Rijndael-1.08.tar.gz]
-md5=46c2e55d9fb97f2036ccd3b31b3a4533
-sha256=f17518340fdad559188c640e97087fcc61446b0986f314df2c7cde53f005130f
-
-[http://www.cython.org/Cython-0.10.3.tar.gz]
-md5=684103ed37472d9beef3a38e0d5c431d
-sha256=a9ac41b270743c067456272a1a0c788008b41f64f388488dfbac54e2a78303b8
-
-[http://pypi.python.org/packages/source/C/Cython/Cython-0.9.6.14.tar.gz]
-md5=edb342c7525119c2a924897873d215b4
-sha256=dde5d254cd00e4182680b1241e9a5feebbc9b4887f5d0bac2ba2935f213c97e7
-
-[http://www.cython.org/Cython-0.9.8.tar.gz]
-md5=dac0f6c217437819f620da18a97d505f
-sha256=ec9ba2f4ac57fea244639d3ddcdcb0307a4130b250a2b7f3b3ef416aaa5cdb53
-
-[http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.010.tar.gz]
-md5=a63c9f73afef70b6c80d899424b003e9
-sha256=7068295a5e35ed7dcf20446bee6d80a8de8ba7af5eb5fa35c0b60135c3445c2f
-
-[http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-1.607.tar.gz]
-md5=bd5785b39675213948a61dea1b400012
-sha256=7090a1e6a0d13be2f7e27a724351c61e44ffa5d165a7720bfe505aa2c4d47e14
-
-[http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-0.101.tar.gz]
-md5=6e9bb994a8716112a78c1306261f4164
-sha256=a96fb122261fb5f069341d7e69dcf07a2988da7cfd8df65d50843b8b102fb55c
-
-[http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/Date-Manip-5.54.tar.gz]
-md5=16c343329bad644b17f4f8ec5fb243cf
-sha256=b61f4f0e3e580723ca7f5c0e1952922c101875535bff04afd772fbd3f193e22a
-
-[http://search.cpan.org/CPAN/authors/id/R/RI/RICKM/DateTime-Format-Strptime-1.1000.tgz]
-md5=bf7f6b219e34411aa3f5d0de56fda393
-sha256=d6439f657d21da062ee78692c0fb2979fe92ce681e7126ee4b929431ec4c2cde
-
-[http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.13.tar.gz]
-md5=35d85c3f2c91c1de389b13436659551a
-sha256=fe044ec9817a31f2b76f701b2cfd980809676943a901ba3d49200162807fa1f9
-
-[http://www.cpan.org/modules/by-module/Device/Device-SerialPort-1.04.tar.gz]
-md5=82c698151f934eb28c65d1838cee7d9e
-sha256=d392567cb39b4ea606c0e0acafd8ed72320311b995336ece5fcefcf9b150e9d7
-
-[http://hal.freedesktop.org/releases/DeviceKit-003.tar.gz]
-md5=8b311547f4a2c8c6b6598e3318d66cd7
-sha256=d2d21f995d1a152ca2d8beea6d37f31e48cca034b82ceb7322f39422e849e9cf
-
-[http://hal.freedesktop.org/releases/DeviceKit-disks-004.tar.gz]
-md5=1ed8e1931f56ad3fc53ba485391434b5
-sha256=e9cc2ed4db0f48a9fdb353f6774df585ac1bc3a0f7c77fcede1c1c27497882bd
-
-[http://hal.freedesktop.org/releases/DeviceKit-power-009.tar.gz]
-md5=535703fa7b9c323d6388b5aff28cfeeb
-sha256=438ac7f22533e04f5b44e0cf23d8b51a5cb69906ea2bbdef0581dc3c7cf19e55
-
-[http://www.cpan.org/modules/by-module/Digest/Digest-SHA-5.47.tar.gz]
-md5=03ff8e4ea73a1c2c5de005d5e4160e94
-sha256=9d17d884d6a77005bbac581628d9e30cb5edde72cda1dce98c6536a25b8369f6
-
-[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz]
-md5=2449bfe21d6589c96eebf94dae24df6b
-sha256=3cebe0a6894daee3bfa5d9619fc90e7619cb6a77ac1b04d027341cd6033ae989
-
-[http://www.directfb.org/download/DirectFB/DirectFB-1.0.0.tar.gz]
-md5=ad746c49dc89ba6f99df71b17bbb1dc8
-sha256=125941749103c08a5263f2ace01aac1533420d2ff6741d2bdde79689e5d02a05
-
-[http://www.directfb.org/downloads/Old/DirectFB-1.0.0.tar.gz]
-md5=ad746c49dc89ba6f99df71b17bbb1dc8
-sha256=125941749103c08a5263f2ace01aac1533420d2ff6741d2bdde79689e5d02a05
-
-[http://www.directfb.org/download/DirectFB/DirectFB-1.1.0.tar.gz]
-md5=da30fa2748c7501913c8832a83e654ab
-sha256=0ee87256a278079955d78e4f235c15a174afbb507b5434f1966cd3e5f5a3f23a
-
-[http://www.directfb.org/downloads/Old/DirectFB-1.1.0.tar.gz]
-md5=da30fa2748c7501913c8832a83e654ab
-sha256=0ee87256a278079955d78e4f235c15a174afbb507b5434f1966cd3e5f5a3f23a
-
-[http://www.directfb.org/downloads/Old/DirectFB-1.1.1.tar.gz]
-md5=c75255049ca8d5c69afe4db58f603028
-sha256=f12ec5f0864d85268a8d67e4919cb7f3d7f0e06ed6cc278c952f6c342673d931
-
-[http://www.directfb.org/downloads/Old/DirectFB-1.2.3.tar.gz]
-md5=caea8bcfc9c1d391e56d85e437005a5d
-sha256=0875e553a17fe65e920ad810a67aa6faca582c53476d8dc75880a6b3da625d0b
-
-[http://directfb.org/downloads/Core/DirectFB-1.2.7.tar.gz]
-md5=59ca16f600e96c8c104a485ff7c322c6
-sha256=80ab8e34246a280bc380020cf331bcc0014cf816380cee3935ad455c108e661e
-
-[http://directfb.org/downloads/Old/DirectFB-1.2.7.tar.gz]
-md5=59ca16f600e96c8c104a485ff7c322c6
-sha256=80ab8e34246a280bc380020cf331bcc0014cf816380cee3935ad455c108e661e
-
-[http://directfb.org/downloads/Core/DirectFB-1.2/DirectFB-1.2.8.tar.gz]
-md5=ac13d21682aa368df4e177ae5b51ad2d
-sha256=cbf94eb10e9c305c81b24e298e55c7825df5ab9060d82443f7b9734f760f859d
-
-[http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.1.tar.gz]
-md5=e7df079ff44ec98187c24a00500e597a
-sha256=aa9d532ec4481a3c9f7b3298b1786a84825a3474b714690b901d0617743d8221
-
-[http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.2.tar.gz]
-md5=e4376c6c5b8e27d735edb7f62a7a8e86
-sha256=051847e21e88a9c32ee78f8920014602d8b21928602075c5266433cd58addbc6
-
-[http://www.directfb.org/downloads/Extras/DirectFB-examples-0.9.25.tar.gz]
-md5=835e850fddba8d8214d39ddd0646c3e8
-sha256=f83af60d53ab4319e5d71a4459cc10464ffd683efabacd6bd773bb807f8771fa
-
-[http://www.directfb.org/downloads/Old/DirectFB-examples-1.0.0.tar.gz]
-md5=0cdfb4dd248eada3dc35db4f8cf75f8d
-sha256=c54e779a720841126e23d692de85243e23b0d94fb7792a958b96b5bd097a8b85
-
-[http://www.directfb.org/downloads/Extras/DirectFB-examples-1.2.0.tar.gz]
-md5=ce018f681b469a1d72ffc32650304b98
-sha256=830a1bd6775d8680523596a88a72fd8e4c6a74bf886d3e169b06d234a5cf7e3e
-
-[http://media.djangoproject.com/releases/1.0.2/Django-1.0.2-final.tar.gz]
-md5=89353e3749668778f1370d2e444f3adc
-sha256=50a5d228743a69a682899b20141194bf8fd3fd75eaf33ba5f2932f43ea93ea0d
-
-[http://media.djangoproject.com/releases/1.0/Django-1.0.tar.gz]
-md5=84d0490e4126f31d1c23f640e1e86f2f
-sha256=4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf
-
-[http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-2.0a.tar.gz]
-md5=3bf4d8d285591a5b7f31170f9b87aba0
-sha256=c196988f55fc6633d9f9f6d9ddc2ae9b4dfa1f300edf4cbbad865c06a8656df7
-
-[http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Date-Format-1.002.tar.gz]
-md5=7ae25275da6ab272aa8b40141eac9f82
-sha256=0c7f3636dffa5ff151f6906baa17582c2efeb29109750f40f820fe5d2dc38e84
-
-[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Epsilon-0.5.11.tar.gz?format=raw]
-md5=39710dfdeb42e51c953b17b6cded163e
-sha256=a5907a3b7584d63be30b3f79b0422b2b0778e73c053be9ac5a11004f1c9097dc
-
-[http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Error-0.17004.tar.gz]
-md5=4dfca8732331a4f79c6803c3bc6b722f
-sha256=f464f0068772c276b81a7345f6788bdc3a243c13de24563346043d049a5497ba
-
-[http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Exception-Class-1.23.tar.gz]
-md5=560b42c0cf8b795bdc793459edb7ec13
-sha256=9ad5a063bac80f3e77a179c91b7ea4490181640c8c1893292fdc6f2d92f40406
-
-[http://www.cpan.org/modules/by-module/Expect/Expect-1.20.tar.gz]
-md5=9134ae3778285bcf8c3ffdba1a177886
-sha256=bbf70ce7cb39425a0f72c252491826747983ee82fb2d7b0a8a99d8940a58392f
-
-[http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.18.tar.gz]
-md5=d119f0c6c12787a8d5b255208c3c74c5
-sha256=fb707b2026de62c1de6ce7fb67e9f82d586211ac09c70e81b83631e77cb47fd1
-
-[http://search.cpan.org/CPAN/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-Depends-0.205.tar.gz]
-md5=02c22a93ec9efb8e457764114ce24eb4
-sha256=e098bfb3a50b0629434011a9b56314c9045c09fac7e5d06bf57d43ffd53c1918
-
-[http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.54.tar.gz]
-md5=003c04b33e8c8eed693f5001fe52b647
-sha256=1d3dd3aafe027d6b3743a7a4bde2609111f8d4157b3643dc1fcd1393c9900c01
-
-[http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.16.tar.gz]
-md5=c64fddf17ee2b27d8a90ceb455c3e570
-sha256=1f8504c7f08d2d59c71a70915fc834a285b99587444ee33e23ee3f135c071da0
-
-[http://search.cpan.org/CPAN/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-PkgConfig-1.07.tar.gz]
-md5=a8cf945d09c6458cb27228218e9a2f45
-sha256=8416e162d6fc921f14a61c8905e9f9a28dc25e67e1c71b75574360a13f0c28c7
-
-[http://downloads.sourceforge.net/fordiac/FORTE-0.3.5.zip]
-md5=d207d3b389ee9f2702df095681459f99
-sha256=2b87b331e931db2db07408c1b07bdb557227e0c16f8fe37f72e40b08fca0a09c
-
-[http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/File-Slurp-9999.13.tar.gz]
-md5=ac3cd9d466b99d1534762ff3549aaa66
-sha256=bb053bfcca0986958de1cf8a120250b25ed40ae2aaf17c5527fe9c1d098cb3e5
-
-[http://downloads.sourceforge.net/fnorb/Fnorb-1.3.tar.gz]
-md5=7de1500c7ef6592a603890b45e23261b
-sha256=d4380ab7fa8b8a9f564592b4e07c96117abd2d3f677b8a73c824cf4f904aa294
-
-[http://heanet.dl.sourceforge.net/fnorb/Fnorb-1.3.tar.gz]
-md5=7de1500c7ef6592a603890b45e23261b
-sha256=d4380ab7fa8b8a9f564592b4e07c96117abd2d3f677b8a73c824cf4f904aa294
-
-[http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-0.4.tar.gz]
-md5=797852a19505f7d919db96dd994d0484
-sha256=2c0de0243ce1853bf62ed9b2da122472b6682a117843af0cce4b4cf9588194ff
-
-[http://pypi.python.org/packages/source/F/FormEncode/FormEncode-1.2.1.tar.gz]
-md5=7030996497f3cf012bc9e99b4ca3e920
-sha256=be21e3d5fa2edd1f5ff5952f67e6574dae15a027b26415910dfe813902fd5985
-
-[http://downloads.sourceforge.net/freeimage/FreeImage3110.zip]
-md5=ad1db36414391417654ba7bf1c0277d3
-sha256=84021b8c0b86e5801479474ad9a99c18d121508ee16d363e02ddcbf24195340c
-
-[http://www.urban.ne.jp/home/kanemori/zaurus/FreeNote_1.12.0.tar.gz]
-md5=06b5aeb6cc97107090438a364f0ce89b
-sha256=e6a0a5b674c4803bfd1ffda9660c29f4399294623ed095b0d1c554367c7db73c
-
-[http://frodo.cebix.net/downloads/FrodoV4_1b.Src.tar.gz]
-md5=095b9f21c03204cc13f7f249e8866cd9
-sha256=ffae146dc20458698acf5ccc384dc32317cea1df0c95b44b5d47cca8b26bc986
-
-[http://www.j-raedler.de/media/Software/FuGrep-0.50.zip]
-md5=83b738d805e17c226f43bbac453a0631
-sha256=14b0fb8ce8a97a0bf7d8f5be57f6bb67dc9e5273f1f465f3babe994c44db3d87
-
-[http://ftp.gnome.org/pub/GNOME/sources/GConf/2.26/GConf-2.26.2.tar.bz2]
-md5=8b55d58dab13e821e048627aa4f92b8b
-sha256=717af270db891088394d154e3e22acc01af382306624c83679a4f8d6ba8467ed
-
-[http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-2.6.1.tar.bz2]
-md5=194fab4e2e87c7ae3c7fea926fd281bc
-sha256=31d894960e0d2eba8fa2746e4fde31983a1e49dc856a880adb59d5f251a690cf
-
-[http://gpephone.linuxtogo.org/download/gpephone/GPRS/GPRS-0.1.tar.bz2]
-md5=ef2fb8e53946387922ee9e98fb0fe94b
-sha256=fffcf07aba1ef5aef03defc88449f6ae0929813e9fcfda65c0d12d7b5c765248
-
-[http://gnosis.cx/download/Gnosis_Utils.More/Gnosis_Utils-1.1.1.tar.gz]
-md5=de859c386a1311d386b7080f4eb5c137
-sha256=89eb9c69c5637e5b40f1bcb6f33ef07ff6b25841677d84ec2fd455ce741612b7
-
-[http://gnosis.cx/download/Gnosis_Utils.More/Gnosis_Utils-1.2.2.tar.gz]
-md5=729984e5858fa626359a8d6447a24bae
-sha256=5673927f18790511f2a01004a51110e167f7950e7accf9e1bc6832a4bfed4feb
-
-[http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/HTML-Mason-1.35.tar.gz]
-md5=c09f77e2af500b51d22e0238c0534994
-sha256=01c75ebc523b77b88d5754fa93a283eeff77bcf799536db8697b61daf42f36bd
-
-[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.60.tar.gz]
-md5=fb97ea7e5bd832b079d8660732f9d8d9
-sha256=0f1365a546e8c54faf5e17c5d011d0b9db8784568fb6b03522ab558ad39d9a63
-
-[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.64.tar.gz]
-md5=26ceb6357e855b9e7aad5a5fd66d493e
-sha256=7e5396568c9cf12e773802c80507b7dac1bd4635e2c6a052bd994fe62638271a
-
-[http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz]
-md5=d2bfa18fe1904df7f683e96611e87437
-sha256=adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2
-
-[http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-3.23.tar.gz]
-md5=6352f50be402301f79b580dd235d7762
-sha256=f5175acf262f3710dce899796ea3e353049939400b100706d03df2f08803c8de
-
-[http://search.cpan.org/CPAN/authors/id/M/MA/MATTIASH/HTTP-Cache-Transparent-1.0.tar.gz]
-md5=e198345ce8eee2562c807e84d65e3b4f
-sha256=31b6b54d9488b35eb8ca54b6f5bcefd6eb1e208ca8a4038c1cee61042747f1d9
-
-[http://gallium.prg.dtu.dk/HVSC/random/HVSC_45-all-of-them.rar]
-md5=5394dac412dbe34d2dfe63cb91bdce8d
-sha256=6068499eeb3aad19d2f860390c65496cf38c5f5e5b54422db6ec2f67abbb8d10
-
-[ftp://download2.citrix.com/FILES/en/products/Linux10/ICAClient-10.6-1.i386.rpm]
-md5=f71aa1956ce18508d2438ebae2ad507c
-sha256=d3d77f54064f6b2df7ff3bf6a01e1f0b9d0e2088f31d69ba6b8e07bd587cb4f8
-
-[http://heanet.dl.sourceforge.net/imdbpy/IMDbPY-3.1.tar.gz]
-md5=90c44c69a6fb7184c483f344909c4ed7
-sha256=dd88d2f2b33855588471b6e60814c82136a2ca6d67260924f79d840d10a59eb4
-
-[http://downloads.sourceforge.net/imdbpy/IMDbPY-3.9.tar.gz]
-md5=8c7bef46f54451c809ffd99e2f1eee2d
-sha256=b677e2f0539b90d1c0a844b9ab0f19ac41424c7c2b9335d17695765f2d7b1b80
-
-[http://www.cpan.org/modules/by-module/IO/IO-Compress-Base-2.015.tar.gz]
-md5=009813067e40c73c28c23fde8d9abfd5
-sha256=0dbfafc713c8fa6bb798cf806e18af1c9e55ab6bd117cdb12d1a565014a7d282
-
-[http://www.cpan.org/modules/by-module/IO/IO-Compress-Zlib-2.015.tar.gz]
-md5=22f3b677a6f1782713c8451966598d3f
-sha256=9d25ffdfacb3d43cbae618c68b62264aab2f56a9cf65ad2f974af9dcbae97669
-
-[http://www.cpan.org/modules/by-module/IO/IO-Stty-.02.tar.gz]
-md5=db2919cf267fce93682f0f854359f04e
-sha256=5095bfac4c610e9e83b31a313c0e3a4a1280bbf39f17a274f5f25dfd8caf2b83
-
-[http://www.cpan.org/modules/by-module/IO/IO-Tty-1.07.tar.gz]
-md5=2a54e49b60a4092e93af5b8073ec5325
-sha256=44c3b00c7b33db6fc4d11e0d096520f2e870f8557f2e2a8f0e8d2efcf9506906
-
-[http://search.cpan.org/CPAN/authors/id/T/TO/TOMHUGHES/IO-Zlib-1.04.tar.gz]
-md5=1abf9e6161cc6c52ccd4c629e32e582e
-sha256=8401b31d22605e787edef75025eb048b2b3cfaee92ed8358bdcaedca5761f7ea
-
-[http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/IO-stringy-2.110.tar.gz]
-md5=2e6a976cfa5521e815c1fdf4006982de
-sha256=7e3cf438b3938a2692cb502704c0bbfa2c5ec4a5071ab77906a2432126b004ee
-
-[http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-0.09.tar.gz]
-md5=3942a55cfc5e6d3b612a46cc1a9515b9
-sha256=e6dafb82ddf7730ebe7ae2de0ce158d3052d782780b41a14c4fed304e463632e
-
-[http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip]
-md5=7cecfaae78431a851bc854264a5ee994
-sha256=31e1c0fb75d1463a6a8badd621d8169e2f8c681d9eb876ff9d5bb261f0e6b451
-
-[http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip]
-md5=9a6dc3846041b899edf9eff8a906fb11
-sha256=f764d0554e236357fc55d128a012cb6ac2ceb638023f4af88c8f509511f209fd
-
-[http://www.urban.ne.jp/home/kanemori/zaurus/IaiMaster_0.5.tar.gz]
-md5=6e3992e261e1fb7fbae08530d45886b7
-sha256=bb837de5130cdbe2c1f4dd7ded8c890ef11f37979526e480afd82b364605563b
-
-[ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-6.2.9-2.tar.bz2]
-md5=b12df56aedcfd0af2e61c503b3643f51
-sha256=8c03d7fec2bc1f43be6b1b4d91b88e79fed3f02bf0f993553083222d24da6190
-
-[ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-6.3.5-10.tar.bz2]
-md5=1b31777138ed78ae0e95b8480cb7e2c2
-sha256=a4d26fb438b15502cc4fb7842111d75d0bd4958c484b3d1bbe25dc60b4e63f84
-
-[ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-6.4.4-1.tar.bz2]
-md5=882ff241f6ad39655541d5055596f93b
-sha256=5a5b2779707bfd9816cf17d8f53d242c05005092da192a898ac10961b3b19dda
-
-[http://effbot.org/downloads/Imaging-1.1.5.tar.gz]
-md5=a64512e39469213ced0d091b9eba76c0
-sha256=14fd700b64d3060e356fc217d8539d1fb468d8688a451f9d6e2faaef1139a58c
-
-[http://effbot.org/downloads/Imaging-1.1.6.tar.gz]
-md5=3a9b5c20ca52f0a9900512d2c7347622
-sha256=7dd7358ab519161967c838df27465282d180a3206f693ba2db64273d688b3f90
-
-[http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz]
-md5=0f429212fdcfd99efe6bfd3904adece8
-sha256=272ddac7f039d12938f50c281f42941d6dea7ab940f1b3b3dd5ab28572678bd4
-
-[http://olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2]
-md5=cb5dcdaf07ccad18a921058138dedc4a
-sha256=0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c
-
-[ftp://sources.redhat.com/pub/lvm2/LVM2.2.01.15.tgz]
-md5=c71654baff263254fb5a226624ee8ef3
-sha256=80b47604ace83db4450f43d94a99fdf2ca317323fde8a591f57290d28ece7d3b
-
-[http://www.red-bean.com/~proski/firmware/Latest-prism.tar.bz2]
-md5=fdf22cdcfb70f15c89676ef0ebc9dfa8
-sha256=dbe5d8a0ac16a7953b3b2d34841dabd2b3071a2f66585ff25a538bd2ad1513ca
-
-[http://downloads.sourceforge.net/libvncserver/LibVNCServer-0.8.2.tar.gz]
-md5=17a18e398af6c1730f72068022a152aa
-sha256=f199f7558e6a071ae1ead06b9207c0819281b6b2094dcef6fc4201a4bdf8854d
-
-[http://downloads.sourceforge.net/libvncserver/LibVNCServer-0.9.1.tar.gz]
-md5=aa00efc3dabde82fde9509bfbab0aba4
-sha256=0fbda7fc37c1f360bdbeb586e48d6203a5ef56a8cfc3b78887d7d90db683f282
-
-[http://heanet.dl.sourceforge.net/libvncserver/LibVNCServer-0.9.1.tar.gz]
-md5=aa00efc3dabde82fde9509bfbab0aba4
-sha256=0fbda7fc37c1f360bdbeb586e48d6203a5ef56a8cfc3b78887d7d90db683f282
-
-[http://qa.debian.org/watch/sf.php/libvncserver/LibVNCServer-0.9.1.tar.gz]
-md5=aa00efc3dabde82fde9509bfbab0aba4
-sha256=0fbda7fc37c1f360bdbeb586e48d6203a5ef56a8cfc3b78887d7d90db683f282
-
-[http://downloads.sourceforge.net/libvncserver/LibVNCServer-0.9.tar.gz]
-md5=4769d70bcd9d8390afb64c5eddfcd60e
-sha256=0ef94a1857e03e826825c559b5b8f07a4b412112fb9326f5eb694d5216747071
-
-[http://heanet.dl.sourceforge.net/libvncserver/LibVNCServer-0.9.tar.gz]
-md5=4769d70bcd9d8390afb64c5eddfcd60e
-sha256=0ef94a1857e03e826825c559b5b8f07a4b412112fb9326f5eb694d5216747071
-
-[http://search.cpan.org/CPAN/authors/id/S/SB/SBURKE/Lingua-EN-Numbers-Ordinate-1.02.tar.gz]
-md5=e92078fafd9108a137972c4e9bae9e99
-sha256=350a6de884a6295974f2919c5af76d4103368e855ac8fe739460f4d55aee7719
-
-[http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Linux-DVB-1.0.tar.gz]
-md5=67f0139f422893eddd8d9be4985b276f
-sha256=abcb819e9fbca6d9bf740b2ab665cfaa82a8282746aefd997b2e093faa459303
-
-[http://kernel.org//pub/linux/libs/pam/pre/library/Linux-PAM-0.79.tar.bz2]
-md5=0b89b73970c7d490ad9a13718b74d27b
-sha256=5ed480cb76c91c2739ddba87f15437510e58c60dfdd7ead6f469149b2da94bb7
-
-[http://kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-0.79.tar.bz2]
-md5=0b89b73970c7d490ad9a13718b74d27b
-sha256=5ed480cb76c91c2739ddba87f15437510e58c60dfdd7ead6f469149b2da94bb7
-
-[http://kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.0.2.tar.bz2]
-md5=fc5e35645b75befae28c88b711b28ffb
-sha256=42d06febf4717dd43eb557027d1b00a484c22589793438778ed69449a073a3b8
-
-[http://kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.1.0.tar.bz2]
-md5=9cda791c827dfcd9f2888caf0a64cc4a
-sha256=139b1abb0f1c402e443ad9083b5ff0512f4a5ae7bc806528e9d7eced13384ed7
-
-[http://ltt.polymtl.ca/packages/LinuxTraceToolkitViewer-0.8.41-12052006.tar.gz]
-md5=de139052f234cf54d714c960524bd5ef
-sha256=a21431358d7f2a5deb76b1a95ee80dc870b0dc2426d4860c61144343d48eff3e
-
-[http://ltt.polymtl.ca/packages/LinuxTraceToolkitViewer-0.8.83-13062007.tar.gz]
-md5=c712a3c0feaf66ad926a1b4b013a2adb
-sha256=fa6ad3a400be3070eaea23813113a396877d289d5cb02692fb3e59fe1fa2670e
-
-[http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Log-Dispatch-2.13.tar.gz]
-md5=88349394af92f521e1ccc845d64fb9f2
-sha256=ab8fdcfdbb6c74ecef4cfaf9e83f955aa422e43f8cd8683c1f2648c70070b88c
-
-[http://search.cpan.org/CPAN/authors/id/M/MS/MSCHILLI/Log-Log4perl-1.06.tar.gz]
-md5=a7bda690ec0ad0bed457fa525e28034a
-sha256=ffac9cd4a6fbc59618bf4e79c389a927491a81b448528278e010a190e2483544
-
-[http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/MIME-Lite-3.024.tar.gz]
-md5=ca71d1d844f5c4f693e5079a2b4fa9a5
-sha256=886b57c7d8d9903b54dad07b68f58e398745d6d92522e89e2ce714472c09f903
-
-[http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2]
-md5=18c05d88e22c3b815a43ca8d7152ccdc
-sha256=8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063
-
-[http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2]
-md5=7e27e535c2d267637df34898f1b91707
-sha256=3875b7cc85e8e7df81c02a638db6b4a970d1e66a86dad6ebf29a1d19f38f5953
-
-[http://www.cpan.org/modules/by-module/Mail/Mail-Sendmail-0.79.tar.gz]
-md5=038f261afd091d8fad347d6c66d2833d
-sha256=8a5eb39d3b9a3a4219c6d6051328c62bd51e9b53723ee5b42cd66e8672e681b9
-
-[http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.6/Main.java]
-md5=fe0cff5db3e2f0f5d67a153cf6c783af
-sha256=aeebaece3b3a53972bb0ba0f810540386c267070ee9dca6ffa43c6ff74a54bd7
-
-[http://pypi.python.org/packages/source/M/Mako/Mako-0.2.2.tar.gz]
-md5=ffeb24b3ee71b2e6354efad1136898bd
-sha256=858b2ad7850db5e477ab81d7f355f82df33d90e4ed23a235184f380a925f2813
-
-[http://search.cpan.org/CPAN/authors/id/T/TE/TELS/math/Math-BigInt-GMP-1.18.tar.gz]
-md5=cd17afa7e9e7e9192457f6968d538f3f
-sha256=6948117f96cc9754bdbc53d92c48bca02f2de844a271a527b0a27065fcd06d24
-
-[http://heanet.dl.sourceforge.net/mesa3d/MesaDemos-7.0.2.tar.bz2]
-md5=11a10410bae7be85cf25bc7119966468
-sha256=ce39b26085acd8e5dffa8233618acac2605cc42203bc4f81c6e4504265f0ffaa
-
-[http://downloads.sourceforge.net/mesa3d/MesaDemos-7.2.tar.bz2]
-md5=22e03dc4038cd63f32c21eb60994892b
-sha256=3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4
-
-[http://heanet.dl.sourceforge.net/mesa3d/MesaDemos-7.2.tar.bz2]
-md5=22e03dc4038cd63f32c21eb60994892b
-sha256=3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4
-
-[http://downloads.sourceforge.net/mesa3d/MesaDemos-7.4.tar.bz2]
-md5=02816f10f30b1dc5e069e0f68c177c98
-sha256=c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897
-
-[ftp://ftp.freedesktop.org/pub/mesa/7.6/MesaDemos-7.6.tar.bz2]
-md5=0ede7adf217951acd90dbe4551210c07
-sha256=2fdf09fd7967fb1946e7f6af07d39c9fb695c373e1bad3855d3c3fbece5badd0
-
-[http://downloads.sourceforge.net/mesa3d/MesaGLUT-7.0.2.tar.bz2]
-md5=3a33f8efc8c58a592a854cfc7a643286
-sha256=fa31ca39f00ff92c7da59d9993d0eefb8d901eb8a519743942e523fde120eb6c
-
-[http://heanet.dl.sourceforge.net/mesa3d/MesaGLUT-7.0.2.tar.bz2]
-md5=3a33f8efc8c58a592a854cfc7a643286
-sha256=fa31ca39f00ff92c7da59d9993d0eefb8d901eb8a519743942e523fde120eb6c
-
-[http://downloads.sourceforge.net/mesa3d/MesaLib-6.0.1.tar.bz2]
-md5=b7f14088c5c2f14490d2739a91102112
-sha256=2de039f7abe10569b681ea1d9e21fb65fd0081c8f4db40fb62b332acb11679fb
-
-[http://heanet.dl.sourceforge.net/mesa3d/MesaLib-6.0.1.tar.bz2]
-md5=b7f14088c5c2f14490d2739a91102112
-sha256=2de039f7abe10569b681ea1d9e21fb65fd0081c8f4db40fb62b332acb11679fb
-
-[http://downloads.sourceforge.net/mesa3d/MesaLib-6.5.2.tar.bz2]
-md5=e4d894181f1859651658b3704633e10d
-sha256=137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
-
-[http://heanet.dl.sourceforge.net/mesa3d/MesaLib-6.5.2.tar.bz2]
-md5=e4d894181f1859651658b3704633e10d
-sha256=137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
-
-[http://downloads.sourceforge.net/mesa3d/MesaLib-6.5.tar.bz2]
-md5=61beda590bfc5b4a12e979d5f2d70d7a
-sha256=dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
-
-[http://downloads.sourceforge.net/mesa3d/MesaLib-7.0.2.tar.bz2]
-md5=93e6ed7924ff069a4f883b4fce5349dc
-sha256=9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e
-
-[http://heanet.dl.sourceforge.net/mesa3d/MesaLib-7.0.2.tar.bz2]
-md5=93e6ed7924ff069a4f883b4fce5349dc
-sha256=9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e
-
-[http://qa.debian.org/watch/sf.php/mesa3d/MesaLib-7.0.2.tar.bz2]
-md5=93e6ed7924ff069a4f883b4fce5349dc
-sha256=9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e
-
-[http://downloads.sourceforge.net/mesa3d/MesaLib-7.0.3.tar.bz2]
-md5=e6e6379d7793af40a6bc3ce1bace572e
-sha256=ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
-
-[http://heanet.dl.sourceforge.net/mesa3d/MesaLib-7.0.3.tar.bz2]
-md5=e6e6379d7793af40a6bc3ce1bace572e
-sha256=ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
-
-[http://downloads.sourceforge.net/mesa3d/MesaLib-7.1.tar.bz2]
-md5=6bff7f532d16f90f944a400c8bd7074d
-sha256=d63a29bf206a5304b3c319a47fa16892db3d2e14737f2c534acf1eb220e9c550
-
-[http://downloads.sourceforge.net/mesa3d/MesaLib-7.2.tar.bz2]
-md5=04d379292e023df0b0266825cb0dbde5
-sha256=a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
-
-[http://heanet.dl.sourceforge.net/mesa3d/MesaLib-7.2.tar.bz2]
-md5=04d379292e023df0b0266825cb0dbde5
-sha256=a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
-
-[http://downloads.sourceforge.net/mesa3d/MesaLib-7.4.tar.bz2]
-md5=7ecddb341a2691e0dfdb02f697109834
-sha256=6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4
-
-[ftp://ftp.freedesktop.org/pub/mesa/7.6/MesaLib-7.6.tar.bz2]
-md5=8c75f90cd0303cfac9e4b6d54f6759ca
-sha256=782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830
-
-[http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2805.tar.gz]
-md5=598bb59b86c2c4842eeffb03392fab5b
-sha256=8fd609d1e6b460b5c95ad5612cb823aa863d51360ed55caea987909a9bab50f5
-
-[http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Module-Load-0.16.tar.gz]
-md5=851a225e31621a66621f28a25ec53d9a
-sha256=f05c3300c988dc5f5f02d55f8ee241c05fbf4565c512f804f47c6e72e5f69e33
-
-[http://downloads.sourceforge.net/mysql-python/MySQL-python-1.2.1_p2.tar.gz]
-md5=e6b9ea21fd91cb4a5663304da727bb70
-sha256=59f44cd53cfa1189dcaa5bf2c48662d5765f347b03827feb807f4cd0ef18943e
-
-[http://heanet.dl.sourceforge.net/mysql-python/MySQL-python-1.2.1_p2.tar.gz]
-md5=e6b9ea21fd91cb4a5663304da727bb70
-sha256=59f44cd53cfa1189dcaa5bf2c48662d5765f347b03827feb807f4cd0ef18943e
-
-[http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Net-DBus-0.33.5.tar.gz]
-md5=fac4674945f53509ce8c3249646aaa11
-sha256=204b2f222f0b41ba969f5a508857edd5e825d8f3a7da816e41b3965ed8524181
-
-[http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Net-DBus-0.33.6.tar.gz]
-md5=a1dbce89b1b839fd0e46d74067ae2e35
-sha256=6697ad5e1efa3070bad75fd542561c65c81f92154c91b932895a5975adccd0ac
-
-[http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz]
-md5=a49c0b02a9b793ff60191cdafc0c202e
-sha256=4cd6e2202fd88c46d5458d19bbea80e257b6ba0ec57ea3ac8ae94ed48c9a60c7
-
-[http://www.cpan.org/modules/by-module/NetServer/NetServer-Generic-1.03.tar.gz]
-md5=bbb47b15e1b624e1b728d8ef6ea93268
-sha256=174415168e1fc0451f3f6e34beb5c8779b83521a477243cf4ef865be4e161834
-
-[http://www.handhelds.org/~mmp/files/NetworkManager-0.6.4-gpe.tar.gz]
-md5=832c91aa660c7b4e7220fa1263101fe3
-sha256=59eddefa715b3810af20b2b190ae16b46d0b733144d36dc7ddd51b32adac013e
-
-[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-0.6.5.tar.bz2]
-md5=b827d300eb28458f6588eb843cba418d
-sha256=4ba65d64599ca6937b44b98d1efd04957278679ddd733081d0d8c2ecf6c0143b
-
-[http://people.redhat.com/dcbw/NetworkManager/0.6.6/NetworkManager-0.6.6.tar.gz]
-md5=412ed4db5d2db04285799c4303ddeeed
-sha256=36d48a11957e1c4f53a685b0fcc7d060e8972b435501c92b10737bb844dd95e2
-
-[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/NetworkManager-0.7.0.tar.bz2]
-md5=64f780e7f95c252eaaed0201c3d9a4ca
-sha256=281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659
-
-[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/NetworkManager-0.7.1.997.tar.bz2]
-md5=12f12b2586043c21c3508b05e7994ba2
-sha256=a62a0f45d156cb190dd2ee3176aa3af4bf7b35c23a09ac65a309c9dc5af87826
-
-[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/NetworkManager-0.7.1.tar.bz2]
-md5=954742cfd47191204d62d8d57f2bc6dd
-sha256=7526a31de615a662cb09e915f26e5b151eda364240d983df6232aac8b9333f3a
-
-[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/NetworkManager-0.7.999.tar.bz2]
-md5=581cf6ea9ef358df874359cc8cb9af69
-sha256=6fa351b3efc78cff4daa1f42386ba8435474bc121b4358a7d08bd7c9fb63aaef
-
-[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/NetworkManager-0.8.tar.bz2]
-md5=d343e22f132754696654511acde354c2
-sha256=4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05
-
-[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.7/NetworkManager-openvpn-0.7.1.tar.bz2]
-md5=3637145716d5a2d55af0d713e4f05c68
-sha256=7c6a7b9b8c6ccf3e2fbf2431b9fb2035f99e1d78065f3344f667e2f108f38d5b
-
-[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.8/NetworkManager-openvpn-0.8.tar.bz2]
-md5=5039d6a840be45445db876cd71d64d20
-sha256=8fd6f25093ade66a98ce1327f24ef953351aabf02870c5dcf12500a6b7f08d43
-
-[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.32.tar.gz?format=raw]
-md5=75828090af2b26f69fe4a7f148a400f6
-sha256=bc35ce187481db91f047055b3edbce49c14d291b1a2eb3e915e9c1c511620f9a
-
-[http://downloads.sourceforge.net/numpy/Numeric-23.7.tar.gz]
-md5=8054781c58ae9cf6fe498316860b5ea8
-sha256=33225097777e84dfed251aee1265a9c0dd0976854e83f60e778a670027b12e7c
-
-[http://heanet.dl.sourceforge.net/numpy/Numeric-23.7.tar.gz]
-md5=8054781c58ae9cf6fe498316860b5ea8
-sha256=33225097777e84dfed251aee1265a9c0dd0976854e83f60e778a670027b12e7c
-
-[http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-2.10.2.tar.bz2]
-md5=c862e3261b52a84321e89f57e5600da6
-sha256=d43ff15c23f5391850f85a7d40e4bd26f82fe2c86669664fe56eff91f14c1594
-
-[http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.13/ORBit2-2.13.2.tar.bz2]
-md5=8d1e654f9b7e1399dc98da3bb4b96762
-sha256=fc87440d252c77f5c1afc17bb3015586cca264bc5fa8794bc54b869b8106265d
-
-[http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-2.14.0.tar.bz2]
-md5=bb1b4859522cb6e1a3a3dc4b7397db64
-sha256=412e4880d79533a2bbd33757e031a2bee24a7bc771f22cf4fed3cb81790b1b68
-
-[http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-2.14.12.tar.bz2]
-md5=6f4bf7d803d442e9d093a0daa203d506
-sha256=d60027a4a36e64d02723d00b76c08e8d92850cab6269b2edcda4a1bb30cc7723
-
-[http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-2.14.16.tar.bz2]
-md5=f4898b999f39c79d55c13c0e0f597c71
-sha256=e7bc69a316e6e2a263987a0aec5c6249dc152361e9559b4818a680681409aac1
-
-[http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-2.14.17.tar.bz2]
-md5=10bfb957fa4a8935a0b4afaee7d71df7
-sha256=62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c
-
-[http://downloads.sourceforge.net/openipmi/OpenIPMI-2.0.14.tar.gz]
-md5=f766680bb237ca2f837c005efba54efa
-sha256=fbd907dde45054227568f3117df0418a7819cfee02875d3723779432e8a66dc9
-
-[http://heanet.dl.sourceforge.net/openipmi/OpenIPMI-2.0.14.tar.gz]
-md5=f766680bb237ca2f837c005efba54efa
-sha256=fbd907dde45054227568f3117df0418a7819cfee02875d3723779432e8a66dc9
-
-[http://downloads.sourceforge.net/openjade/OpenSP-1.5.tar.gz]
-md5=87f56e79ae0c20397f4207d61d154303
-sha256=987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704
-
-[http://heanet.dl.sourceforge.net/openjade/OpenSP-1.5.tar.gz]
-md5=87f56e79ae0c20397f4207d61d154303
-sha256=987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704
-
-[http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.30.tar.gz]
-md5=210b764fca7c791f4387717185f589b5
-sha256=09917ebe3b088649f0767723a7e25ae08fb8db921a85183e2e8c3d2e79ae6d10
-
-[http://backpan.cpan.org/modules/by-module/POE/RCAPUTO/POE-1.007.tar.gz]
-md5=c7e8822bd11ed36a2f716f60e58da2e6
-sha256=5506b4e59aa455b026c4d92db083e7d6d36021b21a13be43d177276ab7d56a84
-
-[http://www.packagekit.org/releases/PackageKit-0.2.4.tar.gz]
-md5=87bf41fd021077c93549d47de6d5fe07
-sha256=3b1a6f451928ca7e36d25e6e5a2e3dec2adae11c20770406f8bdc484f38b1600
-
-[http://www.packagekit.org/releases/PackageKit-0.3.8.tar.gz]
-md5=5ed61e834fb18ec8d10b2c52ee6320a4
-sha256=4d8187c484a28c32f843b929b244bb2da07d74f7fdc2c49f843a555464f75236
-
-[http://www.packagekit.org/releases/PackageKit-0.4.5.tar.gz]
-md5=a335d299bb7e14d910c600d0975dd375
-sha256=84eb13052bf4d41c26bf689f4bf58cb8036b9846f0d1693073b89e3d125793f3
-
-[http://www.packagekit.org/releases/PackageKit-0.4.6.tar.gz]
-md5=66ef4281047ad51f499ec05420028f11
-sha256=4e44eb7be990cb62e57840f4b01b6c9af06c4655869d0cb565fc45749c20b82e
-
-[http://www.packagekit.org/releases/PackageKit-0.4.8.tar.gz]
-md5=955082ee50358b1cc3eddcb438b7fae4
-sha256=70e7fb5e8cc3a35a04213230e1e4340ddc8766a2615318086da7d51ec930f6f2
-
-[http://www.packagekit.org/releases/PackageKit-0.5.1.tar.gz]
-md5=8575a23e406fffa8d11ba2ad4b5d99f3
-sha256=d6ccb149de52c76993f0ed9a31f44690fa27254f91fe8b69bbd2f99b714aee29
-
-[http://www.packagekit.org/releases/PackageKit-0.5.2.tar.gz]
-md5=e406ad5e776e31c99e70c7cf6e7bcdc4
-sha256=8defbfdfe6937fd1d4320f2c2e599b5579fec14404a4e920ff2e5ac68516744b
-
-[http://www.packagekit.org/releases/PackageKit-0.5.4.tar.gz]
-md5=330f52c7576e78b270cd78016bb32dc3
-sha256=9d13f59594f00a1f1d67ab1b34208daadac67f7eba59a2bede35eecc287f7542
-
-[http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-0.20.tar.gz]
-md5=33c4466239c97cc3e1063eff0577206c
-sha256=29f7e05045a5699b211d2a8332d36113c22f9c2e96174f40939e79dbc356905d
-
-[http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-0.86.tar.gz]
-md5=99f6093ecf15717c1a888bb6040aea43
-sha256=cf381182872bedd5f70fdb297863373bdfcac4f10f1b276aa227e9722b258be5
-
-[http://www.amd.com/files/connectivitysolutions/geode/geode_lx/Patches_Linux2.6.11_Common_02.03.0100.patch]
-md5=e26f719ad845910de35ab123e548794b
-sha256=7bae2d456ede67312e1b34e4bfc277af7331e0eee55b95226de392e2d4fee340
-
-[http://www.amd.com/files/connectivitysolutions/geode/Patches_Linux_2.4.24_1.00.tar.gz]
-md5=5e47d51daf090c25635cf2c3597150bc
-sha256=5194ae0f07aaf274e46712cd3f2be553ca75970d2124ac388ce444adee5e2878
-
-[http://downloads.sourceforge.net/project/performous/performous/0.4.0/Performous-0.4.0-Source.tar.bz2]
-md5=d7eafad29a94e3099c849d3c7208bfac
-sha256=4688546a70b09837311e428c233bac091ce5301c7dd4efe21137ca8867af8be0
-
-[http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/Perl6-Junction-1.10.tar.gz]
-md5=b014170483cf85a93d08ee59196c53f9
-sha256=1428a61246a98411c2f16fcaf051c7acb53fb1507b1982da52d5b6aa70f78c2b
-
-[http://www.phidgets.com/downloads/libraries/Phidgetlinux_2.1.4.20080821.tar.gz]
-md5=3fff1ff147835d8e51adf964aa9d0d60
-sha256=e18dcb5c6615bc6153db568aa7f0c31388a8f5137def99c37c1091f0eb521d94
-
-[http://downloads.sourceforge.net/plone/Plone-2.1.2.tar.gz]
-md5=863311e29550f9b4bf6c2502fdbed1fa
-sha256=e9c0b53d887b53310daab656ef83b0abecdde39b679806a0f04f3cda222fbac2
-
-[http://heanet.dl.sourceforge.net/plone/Plone-2.1.2.tar.gz]
-md5=863311e29550f9b4bf6c2502fdbed1fa
-sha256=e9c0b53d887b53310daab656ef83b0abecdde39b679806a0f04f3cda222fbac2
-
-[http://launchpad.net/plone/3.1/3.1.7/+download/Plone-3.1.7.tar.gz]
-md5=d2690e2c6d9f477ee0d3851388c0fef9
-sha256=2522ac7aaf843f23bd948b664372549362ece5973555e7565a2d0dd4bca8ce54
-
-[http://launchpadlibrarian.net/19393495/Plone-3.1.7.tar.gz]
-md5=d2690e2c6d9f477ee0d3851388c0fef9
-sha256=2522ac7aaf843f23bd948b664372549362ece5973555e7565a2d0dd4bca8ce54
-
-[http://hal.freedesktop.org/releases/PolicyKit-0.9.tar.gz]
-md5=802fd13ae41f73d79359e5ecb0a98716
-sha256=f40c7c6bec19d7dba2335bddcffd0457494409a0dfce11d888c748dc892e80b7
-
-[http://hal.freedesktop.org/releases/PolicyKit-gnome-0.9.2.tar.bz2]
-md5=fc478b168d0c926a9766b0b415ff4bbf
-sha256=ecf4ce303a90a4580c54ee7b932ffaf01b7f115f40b17d75634c5bbfba085c8a
-
-[http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz]
-md5=865ca4e2496c215d301b57450137626f
-sha256=ad82569b809e29c19b8223feaa12923f97bb4bbc942ff985857f9d853db489cf
-
-[http://pybluez.googlecode.com/files/PyBluez-0.15.tar.gz]
-md5=104ad743d4bc999796ceff4f39d1003a
-sha256=593912fdf122d9a1499767bc305ca7b3b688ace7edcb93f53e07202aa1242c58
-
-[http://pybluez.googlecode.com/files/PyBluez-0.16.tar.gz]
-md5=2ce8ff0dbb94c6be14e92e9968f4c914
-sha256=cbe1f076a4947e29ded08ba9dd6dbbb86b25939fb4e50f508dd02f41681554e2
-
-[http://www.vanille.de/mirror/PyMP3-0.3.4.tar.gz]
-md5=28e884057750aa4f0da368678e5b20bd
-sha256=e534ea5505e2d0a571ca8baa4b34260953e796f6c762013756373f13411ebd6e
-
-[http://downloads.sourceforge.net/pyode/PyODE-1.0.0.tar.bz2]
-md5=cc88fde823368d6c7843491cc5b4399e
-sha256=d349f65afa841ebeaef7176a26613ff43f9c68857852ab70296b23760720c11b
-
-[http://downloads.sourceforge.net/pyode/PyODE-1.2.0.tar.bz2]
-md5=ab72f3acc635371fd454978e5a97591c
-sha256=117c8f06012e0c0004e69527580a56fac3d814da1051ec1aa73d97d16b60279b
-
-[http://heanet.dl.sourceforge.net/pyode/PyODE-1.2.0.tar.bz2]
-md5=ab72f3acc635371fd454978e5a97591c
-sha256=117c8f06012e0c0004e69527580a56fac3d814da1051ec1aa73d97d16b60279b
-
-[http://www.vanille.de/mirror/PyQt-x11-gpl-3.13.tar.gz]
-md5=a4145b39742a4d9df9b6bf06495f75f5
-sha256=10482fed3832ac804a495d4e5795838a1f99d1994e1247f9dd608a99a3ec3c66
-
-[http://cvs.fedora.redhat.com/repo/pkgs/PyQt4/PyQt-x11-gpl-4.4.3.tar.gz/89e84c36a8520bf8b3a8a2b20e765154/PyQt-x11-gpl-4.4.3.tar.gz]
-md5=89e84c36a8520bf8b3a8a2b20e765154
-sha256=a7bb7e08c67f1386e4666388ec04a07dc968745b0bbfcadae0824ed388c09564
-
-[http://www.vanille.de/mirror/PyQwt-20040118.tar.gz]
-md5=51a8550e9ffbce9f0a1ff11bfc2f4a01
-sha256=22cbbccabaea5262c1fae47bf475f06af6bb7b765898873c93149340cb2049b9
-
-[http://downloads.sourceforge.net/pyvisa/PyVISA-0.9.7.tar.gz]
-md5=706eae231519d9298c399c3b4878cc2a
-sha256=ff60b2c6d307022e223d1460825cfcd313b323669143e14a526f6083c7c5a8c1
-
-[http://heanet.dl.sourceforge.net/pyvisa/PyVISA-1.1.tar.gz]
-md5=7f69822a42b1f35467d97321772a3575
-sha256=23f1d4b942d706bc99d7048b75feb2bc728c5cc4361db7244f65fc72c63d9d39
-
-[http://downloads.sourceforge.net/pyvisa/PyVISA-1.3.tar.gz]
-md5=19ecf6cfcd000392c8405eceb488efb0
-sha256=35fe5623906ebb8ebe27b2d5c9f793f2dce1698e32d8bdada3b69e42349994d8
-
-[http://downloads.sourceforge.net/pyxml/PyXML-0.8.4.tar.gz]
-md5=1f7655050cebbb664db976405fdba209
-sha256=9fab66f9584fb8e67aebd8745a5c97bf1c5a2e2e461adf68862bcec64e448c13
-
-[http://heanet.dl.sourceforge.net/pyxml/PyXML-0.8.4.tar.gz]
-md5=1f7655050cebbb664db976405fdba209
-sha256=9fab66f9584fb8e67aebd8745a5c97bf1c5a2e2e461adf68862bcec64e448c13
-
-[http://pyyaml.org/download/pyyaml/PyYAML-3.05.tar.gz]
-md5=04ebb924a571cfb26d8143069068ce86
-sha256=27b69bf6f1452e8f41577646ddfe78f9528a437409927d5d543bc97d75e27a03
-
-[http://nz.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.3.1.tar.gz]
-md5=0415b95a023061679021323d9ce56fe0
-sha256=e93c6f74e425d4b9e65ecc7e7b7854c586a1448009ce873b30e7a2d6c8ca30ae
-
-[http://nz.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.5.1a.tar.gz]
-md5=0132c5cd2f8685e4948fb14dcb65f637
-sha256=7f34e865505bd467557220961b091fc54782114865e1c5b81e68395989ddbd53
-
-[http://nz.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.8.4.tar.gz]
-md5=100b95005bb93c8b95e96406aad661bc
-sha256=0f8f39a3c78a0d0ec947da1c19c7f8ecb41123755ff2bc31795a77946280f627
-
-[http://nz.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.8.5.tar.gz]
-md5=3b3d8397c2c9a58fc59a90e2b49c651a
-sha256=dd60bc66b1627d3cbd0950499017dfd57a0705bb12493bb0de2a7b9b5c0873bc
-
-[http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/Pyrex-0.9.8.5.tar.gz]
-md5=3b3d8397c2c9a58fc59a90e2b49c651a
-sha256=dd60bc66b1627d3cbd0950499017dfd57a0705bb12493bb0de2a7b9b5c0873bc
-
-[http://downloads.sourceforge.net/pyro/Pyro-3.8.1.tar.gz]
-md5=8ab110b43f891c9664628133753c903a
-sha256=d9e8073c7abb0fd9a94ec72c48f5bf4673de8e9333082dce6954d18a2fe35efd
-
-[http://www.python.org/ftp/python/2.4.4/Python-2.4.4.tar.bz2]
-md5=0ba90c79175c017101100ebf5978e906
-sha256=325fdc7351a08bd8d811e7fb53c41bff11764648ab1a671abd910afec946b38a
-
-[http://www.python.org/ftp/python/2.4/Python-2.4.tar.bz2]
-md5=44c2226eff0f3fc1f2fedaa1ce596533
-sha256=0b2245250d5e800d1b6b6a2c5ca9e697052cae00833bf90ca0488f5bffd38477
-
-[http://www.python.org/ftp/python/2.5.1/Python-2.5.1.tar.bz2]
-md5=70084ffa561660f07de466c2c8c4842d
-sha256=d0b5d4dce02c56d2eb0728db3ebd63afc3dae906d158be6532ae4480d311e167
-
-[http://www.python.org/ftp/python/2.5.2/Python-2.5.2.tar.bz2]
-md5=afb5451049eda91fbde10bd5a4b7fadc
-sha256=f2f80e2a62a039e9a1ffa0fdf58707b2d12b3ff33c56472b46bb6d53f45e083e
-
-[http://www.python.org/ftp/python/2.6.1/Python-2.6.1.tar.bz2]
-md5=e81c2f0953aa60f8062c05a4673f2be0
-sha256=cf153f10ba6312a8303ceb01bed834a2786d28aa89c7d73dba64714f691628f6
-
-[http://www.python.org/ftp/python/2.6.2/Python-2.6.2.tar.bz2]
-md5=245db9f1e0f09ab7e0faaa0cf7301011
-sha256=a1cdc4a8f6c1f947ea3b87d097af2db4371019bac941d92c3844124c5694328b
-
-[http://jerakeen.org/files/PythonDaap-0.4.tar.gz]
-md5=f7672bfd563787a76fb7e9a43c062f18
-sha256=5318946df77937e0b601c95a198790f9ba52d4afb4eb153480289350182bb739
-
-[http://jerakeen.org/files/PythonDaap-0.7.1.tar.gz]
-md5=b3db3d60b0ee83f5f23101d2c3bb99e0
-sha256=ea1d3a8141654781a0df31e6607c4722436fa33eb2e9934492770b3b61be8122
-
-[http://downloads.sourceforge.net/project/pythonwebdavlib/pythonwebdavlib/Python%20WebDAV%20Library%20-%200.1.2/Python_WebDAV_Library-0.1.2.zip]
-md5=8e49e0ecc5b4327c4f752a544ee10e1a
-sha256=72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23
-
-[http://downloads.sourceforge.net/pythonwebdavlib/Python%20WebDAV%20Library%20-%200.1.2/Python_WebDAV_Library-0.1.2.zip]
-md5=8e49e0ecc5b4327c4f752a544ee10e1a
-sha256=72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23
-
-[http://www.stats.bris.ac.uk/R/src/base/R-2/R-2.0.0.tar.gz]
-md5=3900bca37cabb4b76b8d736d51cc9251
-sha256=a06c3546400503e6d4ca4505c3f838b9bbd03fab6a3cbab7993f6d9115b68b64
-
-[http://sdgsystems.com/pub/ipaq/hx4700/src/RADIO0d.BIN]
-md5=bbd9673a8de1f15c660b80931ce91b25
-sha256=ee75c05bb8a17a7978abbbc0f38fb79b1915c1e2357889e65657a39024d5b3a3
-
-[http://sdgsystems.com/pub/ipaq/hx4700/src/RADIO11.BIN]
-md5=a150750ad33c512edc4afee5270b37cb
-sha256=e005a93a0b463e01edba2b79038b54c29a7932efee61c851a2ac644b8a4e5dd4
-
-[http://www.mediaassistent.se/jarl/files/RCF-04.zip]
-md5=5ba9e3eaa598d299718189d96514e8bb
-sha256=f69f44da154b204a1ca62faae67a87b9b2939b9b66013bb8f732456653b6370f
-
-[http://www.ralinktech.com.tw/data/RT61_Firmware_V1.2.zip]
-md5=d4c690c93b470bc9a681297c2adc6281
-sha256=481f113c505ed186049287bd8e9ad8fcb8dbbb32f3bb718f04e4dc148b63c8e4
-
-[http://www.ralinktech.com.tw/data/RT71W_Firmware_V1.8.zip]
-md5=1e7a5dc574e0268574fcda3fd5cf52f7
-sha256=e2d3ac1aaf4815e0c9531bc3fb7f56f30604cd52351332f1f8d6a28bb9a953bf
-
-[http://www.libsdl.org/release/SDL-1.2.11.tar.gz]
-md5=418b42956b7cd103bfab1b9077ccc149
-sha256=6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730
-
-[http://www.libsdl.org/release/SDL-1.2.12.tar.gz]
-md5=544b4554986e51eed6d34435cf9c5f3f
-sha256=df77eb883efdcc61220eaf7ade38324629c273c278ce8d700a5530369e9b6df9
-
-[http://www.libsdl.org/release/SDL-1.2.13.tar.gz]
-md5=c6660feea2a6834de10bc71b2f8e4d88
-sha256=94f99df1d60f296b57f4740650a71b6425da654044ca30f8f0ce34934429e132
-
-[http://www.libsdl.org/release/SDL-1.2.14.tar.gz]
-md5=e52086d1b508fa0b76c52ee30b55bec4
-sha256=5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6
-
-[http://www.libsdl.org/release/SDL-1.2.7.tar.gz]
-md5=d29b34b6ba3ed213893fc9d8d35e357a
-sha256=f5708b3909261df2043859e771601a5ec973197b2c59d18c6649c1096b5151bd
-
-[http://www.libsdl.org/release/SDL-1.2.9.tar.gz]
-md5=80919ef556425ff82a8555ff40a579a0
-sha256=d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9
-
-[http://downloads.sourceforge.net/sdlpango/SDL_Pango-0.1.2.tar.gz]
-md5=85bbf9bb7b1cee0538154dadd045418c
-sha256=7f75d3b97acf707c696ea126424906204ebfa07660162de925173cdd0257eba4
-
-[http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/SDL_gfx-2.0.11.tar.gz]
-md5=10f6432ede2b239796f2924bdc7224b4
-sha256=6a3ef9f5556a3d75832b2b9138bdf3551dc59994d2849307f88a9dcd9732d16c
-
-[http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/SDL_gfx-2.0.17.tar.gz]
-md5=a7ab98ad530fdc59a23f7dff502db8d3
-sha256=d08d8477ff1c6639bc7193b76a415f996c98604600e9fa4e718fd4e9283f83f4
-
-[http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.10.tar.gz]
-md5=6c06584b31559e2b59f2b982d0d1f628
-sha256=75e05d1e95f6277b44797157d9e25a908ba8d08a393216ffb019b0d74de11876
-
-[http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.3.tar.gz]
-md5=d55826ffbd2bdc48b09cc64a9ed9e59e
-sha256=2f710b94f547ec7e39844f7872e1fe8d6fe2a434c896cc8a54b5540854bb5a69
-
-[http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.6.tar.gz]
-md5=b866dc4f647517bdaf57f6ffdefd013e
-sha256=88fcb1dbf934af33163667a6677312065c7d0a7f01cd764e3374c4c19b386ec4
-
-[http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.10.tar.gz]
-md5=a357558552436b0b5ea0333b3e2327df
-sha256=75c4520cde3b1d10ae7846983bde66d114fea9479f6acef352850dae92a1100c
-
-[http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.11.tar.gz]
-md5=65ada3d997fe85109191a5fb083f248c
-sha256=86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9
-
-[http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.6.tar.gz]
-md5=2b8beffad9179d80e598c22c80efb135
-sha256=89f94840b1b42ddfe53a8aee415331516f1bbdd942b42d25e74906a332cdf22a
-
-[http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8.tar.gz]
-md5=0b5b91015d0f3bd9597e094ba67c4d65
-sha256=a8222a274778ff16d0e3ee49a30db27a48a4d357169a915fc599a764e405e0b6
-
-[http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.5.tar.gz]
-md5=e45b1048d2747480dcc65ece4130a920
-sha256=397dee6b7ac13dea70dd3dd2ae6044f45a632a1ba156da178c96df66fb8ccdcb
-
-[http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.7.tar.gz]
-md5=6bd4662d1423810f3140d4da21b6d912
-sha256=2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53
-
-[http://bloodgate.com/perl/sdl/pub/SDL_perl-1.20.3.tar.gz]
-md5=ab7fb92a1ed0db54a88839e64b9ce2c6
-sha256=ac6f511404457592b88fd57c4c77f7feba8e3b55d62c3c45c117fe84f1e07a7d
-
-[http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.3.tar.gz]
-md5=29d12d1b883bf834c291c93f52ba8dc5
-sha256=7e2e7b46088a7b9594b255b58123598d49c5c3d11bcc3c9a8f80969cd9caa6c5
-
-[http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz]
-md5=6dd5a85e4924689a35a5fb1cb3336156
-sha256=b4248876798b43d0fae1931cf8ae249f4f67a87736f97183f035f34aab554653
-
-[http://www.cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-1.03ii.tar.gz]
-md5=5bcb197fd42e67d51c739b1414d514a7
-sha256=f06895c0206dada9f9e7f07ecaeb6a3651fd648f4820f49c1f76bfeaec2f2913
-
-[http://www.switch.ch/misc/leinen/snmp/perl/dist/SNMP_Session-1.12.tar.gz]
-md5=5f6b365b4c3815b13d7a902d94e254af
-sha256=957053683ca36129565db5018dd219bcc740ae781c4fbc9bc03f263f691730e8
-
-[http://www.cpan.org/authors/id/M/MK/MKUTTER/SOAP-Lite-0.710.08.tar.gz]
-md5=e7869ad91fee76cc1782fe29fe3a989d
-sha256=efe7dd9a1c6993d475ae1a653c5fa97a76a36accd468d49b030d81880ca11bef
-
-[http://downloads.sourceforge.net/pywebsvcs/SOAPpy-0.11.3.tar.gz]
-md5=dbdcafe76f73dffaa6948b026607d51b
-sha256=a4a0984583c32fbf69e6f9495590b9e0c8a2a4aa42cb83f20b63a75208590845
-
-[http://downloads.sourceforge.net/pywebsvcs/SOAPpy-0.11.6.tar.gz]
-md5=51ac835366badedd932c64f26fa8336b
-sha256=42c8cb3e42b439bc36b6ba3f090ddb72a214ca9264a2babf102c98731dea8e6a
-
-[http://heanet.dl.sourceforge.net/pywebsvcs/SOAPpy-0.11.6.tar.gz]
-md5=51ac835366badedd932c64f26fa8336b
-sha256=42c8cb3e42b439bc36b6ba3f090ddb72a214ca9264a2babf102c98731dea8e6a
-
-[http://sun.dhis.portside.net/~sakira/archive/SPainter_1.5_src.tar.gz]
-md5=8bd0e7e1f4d6549baba4cbb2384de2ff
-sha256=4925a4503cf7650e7880740113ee747d1bf828b6783b24580fbcb0ec894c0801
-
-[http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyDI-0.9.3.tar.gz]
-md5=9f54fc8a40e26edd61ce67902b315a66
-sha256=07675051b60343820b235a818f2c2d528b86d2a19c2f56833213e3f574f9cd1a
-
-[http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyDI-0.9.7.tar.gz]
-md5=9ca1c604330643fca1e3847f77ac8f0a
-sha256=67e939a8c3e0f33fd2de5945b9e1e50b522890df025560215d6ca56ea7204b15
-
-[http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyRO-0.9.14.tar.gz]
-md5=2cf73a4d293e3e581a2af0246349a470
-sha256=524843cba2a8afb2cb3489d3439ffcd0a7f708bd7d2addb22140058dc42e89f2
-
-[http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyRO-0.9.22.tar.gz]
-md5=363ef32d2e4e611c208fc5f978d0d842
-sha256=e4b35232d6b579d9d824f1b4d64f425cc54fe76d4dbef3b5540af16a499e7b01
-
-[http://heanet.dl.sourceforge.net/sqlalchemy/SQLAlchemy-0.4.2p3.tar.gz]
-md5=378e1da246aa05c3776e38d945f6580d
-sha256=6612f6a25305b3affbb12dcc3fe30f5446d34c84e61afac71e392f6cd997d7ad
-
-[http://downloads.sourceforge.net/sqlalchemy/SQLAlchemy-0.5.0.tar.gz]
-md5=df49f403b2db3c54aace64aebe26cf90
-sha256=30c1649025f76e414400edd957f46b2932b5d3f8e2404779c76e693cb5776949
-
-[http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-0.10.4.tar.gz]
-md5=20039279c5b799c49e6496b9fe71f03f
-sha256=8204bf5aeaca5b72e6bf3bd11db440346f3ed6d13b856166e3b84c4b3ec7152f
-
-[http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-0.7.0.tar.gz]
-md5=dccb921b5df6a15312b56630ac4ac205
-sha256=f6696120e12a58a922dc13bf4f0430774a72d522a9063dc4e1fc4d26ad33723b
-
-[http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-0.9.1.tar.gz]
-md5=0cb952fc9d86200103c79ea52bde66b6
-sha256=ed367fde9d9b1de4de2d486ef4516d3a941028d13c3f829684f69536b2522046
-
-[http://downloads.sourceforge.net/zaurus-shopper/Shopper-1.2.1.tar.gz]
-md5=ed4d8ce2227abf7e68de687a8c930fa4
-sha256=0e1ab08b22742d18b9ee0288874f63ddd74591e1b9f29003fe66dd0ba2289bcf
-
-[http://heanet.dl.sourceforge.net/zaurus-shopper/Shopper-1.2.1.tar.gz]
-md5=ed4d8ce2227abf7e68de687a8c930fa4
-sha256=0e1ab08b22742d18b9ee0288874f63ddd74591e1b9f29003fe66dd0ba2289bcf
-
-[http://pypi.python.org/packages/source/S/Sphinx/Sphinx-0.5.1.tar.gz]
-md5=11456e362d75c1a4c5a5847921d3f4c7
-sha256=871c04e577625520091a2d3ea8ac09469ce2dcf7db9dbd6e54a57264879dac29
-
-[http://www.squeakvm.org/unix/release/Squeak-3.10-1.src.tar.gz]
-md5=7fbac029115831d18422f3079dbb0444
-sha256=d5e9cab31f25f842f42bde153e04b93547b559e75da08f1b997a47f70d003133
-
-[http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Exporter-0.970.tar.gz]
-md5=10eaa77a13de4c23640cdd1aaf0f2412
-sha256=d95895fc8a8277b3b8ff34e2eaaebfb56bbc044c8bf6522dbb47e2fb714b238c
-
-[http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Install-0.922.tar.gz]
-md5=48e8e9f72cdd5b3f5f7115b8b7de3ddf
-sha256=314de5dcc9550a9bff0784a7c9552f8092115452e2a5f4a59903c75bfbf658df
-
-[http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.13.tar.gz]
-md5=16ea7df857d28cbf50ef668fe19559f7
-sha256=c6e8d8ca900c3bee61b3c66888722b79d232731c9ee8f59533f06a4e486f23ec
-
-[http://downloads.sourceforge.net/supybot/Supybot-0.77.0.tar.bz2]
-md5=6d53a2a9901549d52fecfafb0012134b
-sha256=6fd69febfd804437a9d5b610502c6d3c2caabef7a4832a3bcac2357515adaa71
-
-[http://heanet.dl.sourceforge.net/supybot/Supybot-0.77.0.tar.bz2]
-md5=6d53a2a9901549d52fecfafb0012134b
-sha256=6fd69febfd804437a9d5b610502c6d3c2caabef7a4832a3bcac2357515adaa71
-
-[http://search.cpan.org/CPAN/authors/id/S/SW/SWALTERS/Sys-Mmap-0.13.tar.gz]
-md5=e65a007157e3e26807db52299497109d
-sha256=e064a939bf7e37774b89a39515ecf96c4d19c81e050bcf0dae28d1eab4d86196
-
-[http://install.source.dir.com/TI-C6x-CGT-v6.0.16-eval.tar.gz]
-md5=152fdf383df154b33478a0312752bade
-sha256=0eb1d3af0a02179edb91b5468972265f13c3a89990549f289233c0784937ab9e
-
-[http://install.source.dir.local/TI-C6x-CGT-v6.0.16-eval.tar.gz]
-md5=152fdf383df154b33478a0312752bade
-sha256=0eb1d3af0a02179edb91b5468972265f13c3a89990549f289233c0784937ab9e
-
-[http://install.source.dir.com/TI-C6x-CGT-v6.0.21-eval.tar.gz]
-md5=65c8166ad0edb468c5327d1109d84229
-sha256=6011f7a10fa71a540503fc8d54140728022ec89eb8bc2ef344002bb11cf25667
-
-[http://install.source.dir.local/TI-C6x-CGT-v6.0.21-eval.tar.gz]
-md5=65c8166ad0edb468c5327d1109d84229
-sha256=6011f7a10fa71a540503fc8d54140728022ec89eb8bc2ef344002bb11cf25667
-
-[http://sdgsystems.com/pub/ipaq/hx4700/src/TIInit_3.2.26.bts]
-md5=8741490a25b98230973446400971bba9
-sha256=c1f29cfd31c335a409bdc530c2e68661d20a1e3c2e5d64454470b6700a40681e
-
-[http://search.cpan.org/CPAN/authors/id/F/FL/FLUFFY/Term-ProgressBar-2.09.tar.gz]
-md5=440dfd04fe51a12d314e9adf2445f04a
-sha256=2c55c84684a05934d5421707d76c1b6f5f45618a818a10d8dcf607027d93065e
-
-[http://search.cpan.org/CPAN/authors/id/J/JS/JSTOWE/TermReadKey-2.30.tar.gz]
-md5=f0ef2cea8acfbcc58d865c05b0c7e1ff
-sha256=8c4c70bf487f2e432046dce07cf4b77ff181667d0905f9cb1203ff95ff5dd5ff
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/Terminal-0.2.12.tar.bz2]
-md5=adb419d279c9fc16d02291c052190717
-sha256=352205b03e9ed1b9080c61235fbc0fa15609410e724237441055a232a3b603dc
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/Terminal-0.2.8.tar.bz2]
-md5=cfe660ecf50e9d3b073576bbc4af6ab2
-sha256=20a58b96915f67c5b4f49fb1428e1876195f1f9fd7d37e0081352cadc13463e7
-
-[http://www.xfce.org/archive/src/apps/terminal/0.4/Terminal-0.4.2.tar.bz2]
-md5=9754afef6b79fa1df9aaf41fb8cc6374
-sha256=4d5a07f3a1b68c9825cc3b82fc2672785ba91247a34e4ac462841f0b1ea21079
-
-[http://search.cpan.org/CPAN/authors/id/M/MA/MARKF/Test-Builder-Tester-1.01.tar.gz]
-md5=4751252f1e33af4f582c8af4c7b7666f
-sha256=62bc416ccb3f01c3911d9744d6c865d9fa4d008bd47dbecc2adde5c3892ce868
-
-[http://search.cpan.org/CPAN/authors/id/R/RB/RBS/Test-Differences-0.47.tar.gz]
-md5=e4fa76bb11b0d1db2d4213390413f5af
-sha256=d7d17925c23a69d66073e44feee3177186b45ca64c23b73277a4b4100dcdeeeb
-
-[http://search.cpan.org/CPAN/authors/id/A/AD/ADIE/Test-Exception-0.22.tar.gz]
-md5=dcf44183af3d26b14d7f989fc5ee1117
-sha256=98b129aa38a729f9c63b3ae2118b500f76bcf3456bb03a5f049f67ddea7efc81
-
-[http://search.cpan.org/CPAN/authors/id/S/SI/SIMONFLK/Test-MockModule-0.05.tar.gz]
-md5=1b013aeeb221f83e7f325a2f98169296
-sha256=67c515258c76780009e58305ec56f195e1b110d0cabb52792d57dd1761396e07
-
-[http://search.cpan.org/CPAN/authors/id/S/SS/SSORICHE/Test-Output-0.10.tar.gz]
-md5=dcf67296e04a41a9f73f70c10fe5f825
-sha256=b72813be2639d49dda2a3f87928b7ce185633f3afaa25300afbfb844b12deea4
-
-[http://search.cpan.org/CPAN/authors/id/R/RB/RBS/Text-Diff-0.35.tar.gz]
-md5=4931662ea353384dec2a54a71b26ee8c
-sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/Thunar-0.9.0.tar.bz2]
-md5=0fc5008858661c0abd0399acbe30ef28
-sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037
-
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/Thunar-1.0.1.tar.bz2]
-md5=218373aa45d74b6ba8c69c4d5af3bb19
-sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/Thunar-1.0.1.tar.bz2]
-md5=218373aa45d74b6ba8c69c4d5af3bb19
-sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d
-
-[http://www.cpan.org/modules/by-module/Time/TimeDate-1.16.tar.gz]
-md5=b3cc35a7cabd106ac8829d2f2ff4bd9d
-sha256=7942ef0181b5828563a1b98a0a801a75bc0102773a1c942a09ac1d0b9fba6cb3
-
-[http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/TimeDate-1.20.tar.gz]
-md5=7da7452bce4c684e4238e6d09b390200
-sha256=f8251a791f6692c69952b4af697c01df93981ad1ab133279d034656a03cd3755
-
-[http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/Tk-804.028.tar.gz]
-md5=7153c1c411b0dd005a0660179e5c5900
-sha256=4c387eb285b2b0581cdf762c7145ebaec6ba57f67d830e92ac26ea8dbecf6c77
-
-[http://pypi.python.org/packages/source/T/Traits/Traits-3.0.2.tar.gz]
-md5=78622c7651113bbac544da2e63215f19
-sha256=68478923797c988569e2f478f7550b7ece0732336ea7fbfd72bea1a24c4ff40d
-
-[http://pypi.python.org/packages/source/T/Traits/Traits-3.0.3.tar.gz]
-md5=3b893056fadf3f0781b05b11413162ad
-sha256=77224e8464c01162b3afa54d8cec8304ba647fca26f037d454cb6a14e2757604
-
-[http://tmrc.mit.edu/mirror/twisted/old/Twisted-1.2.0.tar.bz2]
-md5=d5150e8de83a9d5134d175d068482ab7
-sha256=9e488e3ee3fc0f56d8f8898f4729819512dd43afff0fba4e32390d1af4bd53d5
-
-[http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-2.5.0.tar.bz2]
-md5=56df2ae66db57932515a491c03bf514f
-sha256=f3b2df3f4483752a42f1a775a1163da1f9e91bf5f19d302abc93544aca20d2cd
-
-[http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/Twisted-8.2.0.tar.bz2]
-md5=c85f151999df3ecf04c49a781b4438d2
-sha256=e0602bb05e31f6100b6f9ab35cfa93ab9f7a1c50a351a0ddfcd236a923bddfb0
-
-[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.35.tar.gz]
-md5=1a933b1114c41a25587ee59ba8376f7c
-sha256=1684cb64a6bd24e019532ae2e5d4a962d43d9215623e9d4dc77536f118fbf31b
-
-[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.52.tar.gz]
-md5=d6ba96cc3e650af6537675e016e83d3e
-sha256=3d325b52c9d1e7aa2fbf67131f1f5ee39964cbe54e864bcfb9808af274a9eb4a
-
-[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Unicode-String-2.09.tar.gz]
-md5=553e68e603723bf7c631f8701ab0d678
-sha256=c817bedb954ea2d488bade56059028b99e0198f6826482e2f68fd6d78653faad
-
-[http://search.cpan.org/CPAN/authors/id/G/GU/GUS/Unicode-UTF8simple-1.06.tar.gz]
-md5=1d90907170ed41690a572a2d6ed6e7da
-sha256=e1249ac08daceb8a83c170c00810001f15d73418e9595711bee663d0130c0fe5
-
-[http://snafu.freedom.org/Vmaps/Vmaps-1.1.tgz]
-md5=0ba6f2b97ff8eb3e975ed906f2311080
-sha256=f97b3c0a36c7422d38af67dd68855e5c25581f7b6e79f8671e298e66b4d0026e
-
-[http://sdgsystems.com/pub/ipaq/hx4700/src/WLANGEN.BIN]
-md5=9716488c2d1cf2e5f97b165be4de18db
-sha256=3d92318dadef22b1d1b062925ef66bac2ad48a0fd4fc83b88dcabba38c182b7b
-
-[http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/WWW-Mechanize-1.60.tar.gz]
-md5=bd3bf56f28881c5363d1c599ff43a632
-sha256=8844dbc7f695fbc9f87e04895295fc61260559df7176b3159cd3dc2c70863478
-
-[http://www.stud.uni-karlsruhe.de/~uvaue/chaos/bins/Wolf4SDL-1.6-src.zip]
-md5=61eed8ed819688663e399b5e79ed006f
-sha256=6a19418a074a7dec6fd67f00df74f3335e85eb38d2d2a17bd0e91cf8010537e3
-
-[http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/X10-0.03.tar.gz]
-md5=056b3d98fab545865148b948de6784c7
-sha256=2b34d7c2112e8b79856c63f43403bff1a7ed5005d9b98db5f94c6f4cc7ba5623
-
-[ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-1.tgz]
-md5=4f241a4f867363f40efa2b00dca292af
-sha256=5276b045e154948fce7abba7d686406c65862d90b43b50f2546b33e38378f0d7
-
-[http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-1.tgz]
-md5=4f241a4f867363f40efa2b00dca292af
-sha256=5276b045e154948fce7abba7d686406c65862d90b43b50f2546b33e38378f0d7
-
-[ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz]
-md5=844c2ee908d21dbf8911fd13115bf8b4
-sha256=0afbf41d0f4bcaceb1381fc1882b80f62548845b85c83c3eb0f3a9ac7f7f96ef
-
-[http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-2.tgz]
-md5=844c2ee908d21dbf8911fd13115bf8b4
-sha256=0afbf41d0f4bcaceb1381fc1882b80f62548845b85c83c3eb0f3a9ac7f7f96ef
-
-[ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz]
-md5=b82a0443e1b7bf860e4343e6b6766cb6
-sha256=19a830e3657851ad575ca895eb59932f1d90cd03735dec68f900dbc1bb6c3b7f
-
-[http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-3.tgz]
-md5=b82a0443e1b7bf860e4343e6b6766cb6
-sha256=19a830e3657851ad575ca895eb59932f1d90cd03735dec68f900dbc1bb6c3b7f
-
-[ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-4.tgz]
-md5=567903747018f2534965ab6cb3976b38
-sha256=f62081c6f8a70a35fb0b5b210329f6bba7f5e506e9b809e23ceba21a2c35278e
-
-[http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-4.tgz]
-md5=567903747018f2534965ab6cb3976b38
-sha256=f62081c6f8a70a35fb0b5b210329f6bba7f5e506e9b809e23ceba21a2c35278e
-
-[ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-5.tgz]
-md5=4dbdbe9a85c8f7f98dd0ee015a3c7b4f
-sha256=3b732ed179dd34c17d1ba17867b60a36f20d82a3f0eca7b084fcb5396aa2b30c
-
-[http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-5.tgz]
-md5=4dbdbe9a85c8f7f98dd0ee015a3c7b4f
-sha256=3b732ed179dd34c17d1ba17867b60a36f20d82a3f0eca7b084fcb5396aa2b30c
-
-[http://search.cpan.org/CPAN/authors/id/T/TJ/TJMATHER/XML-DOM-1.44.tar.gz]
-md5=1ec2032a06e5762984f7a332c199c205
-sha256=f6af32c74c84b3b173eca9baac521a0f9b030c9a0395fcafd4235a84d8ad0ae4
-
-[http://search.cpan.org/CPAN/authors/id/P/PA/PAJAS/XML-LibXML-1.70.tar.gz]
-md5=33d4294f708e20c298cfe534d1166844
-sha256=53e6cf06772ba9d85055dc6e4488dbd876d2376e48ef3578fa73246ee98b3ba0
-
-[http://www.cpan.org/modules/by-module/XML/XML-Parser-2.34.tar.gz]
-md5=84d9e0001fe01c14867256c3fe115899
-sha256=55386de7bf78f67ad2b9ef664a578db66ee53f512a28eb067cd2303f5e23d740
-
-[http://www.cpan.org/modules/by-module/XML/XML-Parser-2.36.tar.gz]
-md5=1b868962b658bd87e1563ecd56498ded
-sha256=9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f
-
-[http://search.cpan.org/CPAN/authors/id/T/TJ/TJMATHER/XML-RegExp-0.03.tar.gz]
-md5=5826b24e0d05714e25c2bb04e1f1c09b
-sha256=4608bd4aed51d6f31a1a77796bc42f7ddf9700fe9b33c86a6b75ccb6a9cf6abe
-
-[http://www.cpan.org/modules/by-module/XML/XML-Simple-2.18.tar.gz]
-md5=593aa8001e5c301cdcdb4bb3b63abc33
-sha256=a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826
-
-[http://www.angstrom-distribution.org/unstable/sources/XML-Twig-3.33-upstream-keeps-changing-this-tarball-so-we-mirror-our-own.tar.gz]
-md5=918f8fba33efe9cf5bc07907c6e46556
-sha256=630241ba64685a264d6037cbfed29476ab36fce652746ad5966fcfc9d810abdc
-
-[http://xmltwig.com/xmltwig/XML-Twig-3.33.tar.gz]
-md5=495fd8c320f67a0c8e0b90ccb060f0ea
-sha256=d87ff8c2e1d594808a58373ea72aa6f6e42a9a19d550a569b3f5fd22b53efebd
-
-[http://search.cpan.org/CPAN/authors/id/J/JO/JOSEPHW/XML-Writer-0.606.tar.gz]
-md5=178895f6b011594f425d0a2aef0ee069
-sha256=49c398574f7796f9f51abf8e13e864bbaa1792af781624a663c9182a9bf777ad
-
-[http://easynews.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.3.tar.gz]
-md5=f1d9a9f3d2097906754b8824ba925e64
-sha256=b15420bcfafeca09eb29e5961cedbbe0572d0fc7912f6c545458a346188516c1
-
-[http://www.apache.org/dist/xerces/j/Xerces-J-src.2.9.1.tar.gz]
-md5=e340cba4a2abf4f0f833488380821153
-sha256=13af0062a72a4a0d541ca5336391eafa4d580258cacf4a5e062ea584ca950592
-
-[http://projects.o-hand.com/matchbox/sources/optional-dependencies/Xsettings-client-0.10.tar.gz]
-md5=c14aa9db6c097e0306dac97fb7da1add
-sha256=f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599e06e43
-
-[http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-0.62.tar.gz]
-md5=4be042a043ec520074b0ab6f7ca0bded
-sha256=fa668e8f01fe43fdddb33f0c5e294698818f37519000b9f782f504ece071c740
-
-[http://www2.zoneminder.com/downloads/ZoneMinder-1.23.3.tar.gz]
-md5=ee803f0f71d6e67adf602c3557fb6bc9
-sha256=76cba999bf602b1d561921cfcbbf7a9eab64370f349a0b389efff75f4b0c3af2
-
-[http://zope.org/Products/Zope/2.7.1/Zope-2.7.1.tgz]
-md5=ae9d4bb3f7220dfffb6e91b42503b16c
-sha256=341f56aa4ece9001a118be8ff9675bfad6410dc1df86dd86aeb726adc732341b
-
-[http://zope.org/Products/Zope/2.9.2/Zope-2.9.2.tgz]
-md5=4e88a6c7215568a55d8714226da23a19
-sha256=7515a40396184cd82fd6a01d5b0e1fb79f009c5d35da8e59b8710c530e8e68b1
-
-[http://www.zope.org/Products/Zope3/3.3.1/Zope-3.3.1.tgz]
-md5=3c28888c51cc0a9e853c0f3032370bf9
-sha256=6189999de3190e4b0d5110490567d9f7ef92379ea555f738fc741d49d0807be3
-
-[ftp://ftp.gnu.org/gnu/a2ps/a2ps-4.13b.tar.gz]
-md5=0c8e0c31b08c14f7a7198ce967eb3281
-sha256=f4d2ac6f09f44eeb82621530b1970afe88fd97cfe82da43b61069800d0c06d12
-
-[http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz]
-md5=caa9f5bc44232dc8aeea773fea56be80
-sha256=a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33
-
-[http://downloads.sourceforge.net/amule/aMule-2.1.3.tar.bz2]
-md5=0aafdd159edb8ad5f0064da87998b47d
-sha256=6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
-
-[http://heanet.dl.sourceforge.net/amule/aMule-2.1.3.tar.bz2]
-md5=0aafdd159edb8ad5f0064da87998b47d
-sha256=6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
-
-[http://downloads.sourceforge.net/aa-project/aalib-1.4rc5.tar.gz]
-md5=9801095c42bba12edebd1902bcf0a990
-sha256=fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee
-
-[http://www.abiword.org/downloads/abiword/2.4.5/source/abiword-2.4.5.tar.gz]
-md5=e05f15936535c4b737deaa721adf8d09
-sha256=ac5a45d89ad334fa340868e0bcbda9fa48e4d66d8008f116b305b0f1d8d76be5
-
-[http://www.abiword.org/downloads/abiword/2.4.6/source/abiword-2.4.6.tar.gz]
-md5=30fbd0a9b539f15f54f90d3812a75266
-sha256=98105f03b1f33f26cddbfc18d64b04e64a85db3c861508837ab290d26ca2fed3
-
-[http://www.abiword.org/downloads/abiword/2.5.1/source/abiword-2.5.1.tar.gz]
-md5=11d022458e0e090846b35ed4873c2e6e
-sha256=482891fb0e376e2aaeee25afa8b4913e6dc50f4fdc280f9f152b3ee8745d735d
-
-[http://www.abiword.org/downloads/abiword/2.5.2/source/abiword-2.5.2.tar.gz]
-md5=bbc9c124f8072875129bd67092f0fa0b
-sha256=db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f
-
-[http://www.abiword.org/downloads/abiword/2.6.0/source/abiword-2.6.0.tar.gz]
-md5=d627a5d1061160c683f2257da498355b
-sha256=35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb
-
-[http://www.abiword.org/downloads/abiword/2.6.3/source/abiword-2.6.3.tar.gz]
-md5=40d9da8b04c70035b89f8ad7fcc4519d
-sha256=e5ffecc423e2a9214cb4abd9dbd086552a0d45387b7bc2072738f5e2a8dd90ec
-
-[http://www.abiword.org/downloads/abiword/2.6.4/source/abiword-2.6.4.tar.gz]
-md5=16748b2d6e318e0e2a25581005e1943a
-sha256=4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe
-
-[http://www.abiword.org/downloads/abiword/2.6.8/source/abiword-2.6.8.tar.gz]
-md5=fab04d8ef999c303f720197adf261310
-sha256=b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93
-
-[http://www.abisource.com/downloads/abiword/2.8.0/source/abiword-2.8.0.tar.gz]
-md5=f61c623cdb3c3b2aed05bbc868050ddd
-sha256=b0d0f723a08372ac0889e44a590ee1f13f8c5487b394181396f978191a627bdd
-
-[http://www.abisource.com/downloads/abiword/2.8.1/source/abiword-2.8.1.tar.gz]
-md5=284fe25289c160c3797b527a8aacad12
-sha256=f51b614b1202cf63a5f7ede093d31d638ece3c8e76da4036cc4aed589a9cd2ec
-
-[http://www.abiword.org/downloads/abiword/2.5.1/source/abiword-plugins-2.5.1.tar.gz]
-md5=b1ce7ca49a0ee4e04f828e10eaebe6a9
-sha256=37faf6ea346c9b6473c5b2dfd1bb599457faa06b6a7cdef58e3e9f3e2773976b
-
-[http://www.abiword.org/downloads/abiword/2.5.2/source/abiword-plugins-2.5.2.tar.gz]
-md5=0ad700d0cb6d176b39a191b16e3886c0
-sha256=5714753ce1e89e72c2ba7e7d7d95546d9965a4e86bf76c060a8779b08fc2ae85
-
-[http://www.abiword.org/downloads/abiword/2.6.0/source/abiword-plugins-2.6.0.tar.gz]
-md5=ebdc165d1b6c3c69f11148cf7841f257
-sha256=329521398105348ff466b90e1a7567574bd690639b048b6356ddc353d864b785
-
-[http://www.abiword.org/downloads/abiword/2.6.3/source/abiword-plugins-2.6.3.tar.gz]
-md5=92a2e98fb26595666cb68e9bb56babd0
-sha256=d3ddfd3dbd20ed9bb35dceb06a55ec13d66acb1c3fce28976a8d10929c39a194
-
-[http://www.abiword.org/downloads/abiword/2.6.4/source/abiword-plugins-2.6.4.tar.gz]
-md5=3bf973c5a1446ef3eaf980724821d6e9
-sha256=ec561e865387fa0a108ac135fc39ef0aa18e0dddd99f1f92749f67b029ba30eb
-
-[http://www.abiword.org/downloads/abiword/2.6.8/source/abiword-plugins-2.6.8.tar.gz]
-md5=421c49723e209c971ddb0798c1b313a9
-sha256=151517ae94e0f4c26370f31c903078bd0561b8088a63b532408ca128f0e65448
-
-[http://www.labyrinth.net.au/~trandor/abuse/files/abuse_sdl-0.7.0.tar.bz2]
-md5=59ea4498886642aa975f04233cc92558
-sha256=bda8a3c42733853444e1d4bee16e85990b78c2eaafc4b26e0769be2e14dab931
-
-[http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/acct-6.4-pre1.tar.gz]
-md5=9703f591801c5bbded35c9739d04f81c
-sha256=68b1d0acd1a6e17d91412635cd4f65ba58d293e62a01475a43f3712c49a46e7d
-
-[http://www.delorie.com/store/ace/ace-1.2.tar.gz]
-md5=03e5e7ab8ac3acc59661c6e9c09089b7
-sha256=fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d
-
-[http://downloads.vdm-design.de/aceofpenguins-launcher-0.3.tar.gz]
-md5=2fe7dcdbbdbf3b2821f627e02c406caa
-sha256=13013cd19cb165825f4ef5cc790b0e103705f68ece470fd12012db97e3e60839
-
-[http://downloads.vdm-design.de/aceofpenguins-launcher-0.4.tar.gz]
-md5=40f19a26cbfa35de8346efe582b5d984
-sha256=ea09581b3a31e3409968876461da3e384dcb0000abbb0060ae14e4fccb4994e1
-
-[http://mirror.its.uidaho.edu/pub/savannah/acl/acl-2.2.49.src.tar.gz]
-md5=181445894cca986da9ae0099d5ce2d08
-sha256=b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5
-
-[http://downloads.sourceforge.net/acpid/acpid-1.0.10.tar.gz]
-md5=61156ef32015c56dc0f2e3317f4ae09e
-sha256=22703ce0dd7305aca01bc9ac741659c32b1593f1d6fde492df7f01067a534760
-
-[http://downloads.sourceforge.net/acpid/acpid-1.0.2.tar.gz]
-md5=15884aaf0b82717954f9366b5c00808b
-sha256=7347042a5328b22965256d98462e8dd8f1cad37de992b135912f32c70163ae71
-
-[http://downloads.sourceforge.net/acpid/acpid-1.0.3.tar.gz]
-md5=8513c19d0f14ff396ea73caaea7f2ef8
-sha256=b36d6e83ecee4748cc3b8fa3cdbc8c59e620428ce77e22e241faa19c2e0e7dad
-
-[http://downloads.sourceforge.net/acpid/acpid-1.0.4.tar.gz]
-md5=3aff94e92186e99ed5fd6dcee2db7c74
-sha256=032a95967f8dd8a227ee1771de4a2646becc4d0f1123568faeca931006ec8f5f
-
-[http://heanet.dl.sourceforge.net/acpid/acpid-1.0.4.tar.gz]
-md5=3aff94e92186e99ed5fd6dcee2db7c74
-sha256=032a95967f8dd8a227ee1771de4a2646becc4d0f1123568faeca931006ec8f5f
-
-[http://downloads.sourceforge.net/acpid/acpid-1.0.6.tar.gz]
-md5=5c9b705700df51d232be223b6ab6414d
-sha256=aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160
-
-[http://heanet.dl.sourceforge.net/acpid/acpid-1.0.6.tar.gz]
-md5=5c9b705700df51d232be223b6ab6414d
-sha256=aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160
-
-[http://qa.debian.org/watch/sf.php/acpid/acpid-1.0.6.tar.gz]
-md5=5c9b705700df51d232be223b6ab6414d
-sha256=aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160
-
-[http://downloads.sourceforge.net/acpid/acpid-1.0.8.tar.gz]
-md5=1d9c52fe2c0b51f8463f357c2a3d3ddb
-sha256=d57ae5302c38c37d060a097fa51600fe06fbfffd575641d638407944f126b7b1
-
-[http://ftp.gnu.org/gnu/classpathx/activation-1.1.1.tar.gz]
-md5=de50d7728e8140eb404f2b4554321f8c
-sha256=b1b5ef560d30fcb11fbf537246857d14110ce4eb2b200d4c54690472305d87b7
-
-[http://svn.o-hand.com/repos/web/trunk/patches/add-dom-functions.patch]
-md5=041be9711a16e629d01487664ba97152
-sha256=42956fb41341cf82ae8bce18b4cf96a7e2aa631b1b60657afb6d7e9be7cd138c
-
-[http://svn.o-hand.com/repos/web/trunk/patches/add-end-element-signal.patch]
-md5=651b1601d8a1b21c8a3040fadb729043
-sha256=d067e8331bf9c6851f1c6067d991a7f54327f532900b405ebdf8e149c071f381
-
-[http://gpephone.linuxtogo.org/download/gpephone/addressbook-0.1/addressbook-0.1.tar.bz2]
-md5=b8a0821ef12a2243b537fde3207c8691
-sha256=85847b8e25d56f7d3af29207d6878601390e97dc5119e4d35bd0b096c27a478d
-
-[ftp://ftp.debian.org/debian/pool/main/a/adduser/adduser_3.102.tar.gz]
-md5=a22c8308248f7b829baa802e07fe9312
-sha256=7818e5b80240562864da18b4c900a56e0f9d6115f4cb2f5bd7805d16203a577f
-
-[ftp://ftp.gnu.org/gnu/adns/adns-1.0.tar.gz]
-md5=af4411ee10875b96c0d61f903018f438
-sha256=bed27a4ec5b71acc08333368e842a1248e83328018b582caf644985539967c5d
-
-[http://www.antigrain.com/agg-2.5.tar.gz]
-md5=0229a488bc47be10a2fee6cf0b2febd6
-sha256=ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f
-
-[ftp://ftp.suse.com/pub/people/mason/utils/aio-stress.c]
-md5=727e5fc3566837b3ea72f887d048769b
-sha256=3f32e5a1ef0ae84794cfdf7d60bd595a2b3c3995bb91bf79c2b96eb6be7e5529
-
-[http://www.wirelessdefence.org/Contents/Files/aircrack-2.41.tgz]
-md5=05a37c8a165efb11ea226829c809deb3
-sha256=0273c476875e5dd09c7e15e8de58ed18fa9f5f2f9482a78e4171b3f56d75efa4
-
-[http://download.aircrack-ng.org/aircrack-ng-0.7.tar.gz]
-md5=34c0447951d438d76fa32d08eab5da01
-sha256=90cbd5030938ce1622a8e399c95088bf464bceb95adc290640d4610eb8522aeb
-
-[http://download.aircrack-ng.org/aircrack-ng-0.9.1.tar.gz]
-md5=07488ff1e178b5b7fe04c6fd78da2b96
-sha256=dd76f20083aca758c71ce8b7d9f0a4c0042b9720d508e48339bf0949fad5300c
-
-[http://download.aircrack-ng.org/aircrack-ng-0.9.3.tar.gz]
-md5=f37fdb000d8bad77da6a0a43bc2ef67a
-sha256=71bca53eae0261d5bdd72e4363f43f5a6e40b2375dc4852a4029a061c789da58
-
-[http://repository.maemo.org/pool/maemo4.1/free/a/alarmd/alarmd_0.5.20.tar.gz]
-md5=9730a07d6990422a92559f9795a694f5
-sha256=0a2cfda6701b344eed3e760089e306c50bfd71699592e4e0711c4609814a23ba
-
-[http://downloads.sourceforge.net/albumshaper/albumshaper_2.1.tar.bz2]
-md5=242c260c50fd774f2301dba66deb668b
-sha256=67b43e51aa5afb22a7329fd78e9d17f489fceb4ac00d9861312993709739528e
-
-[http://heanet.dl.sourceforge.net/albumshaper/albumshaper_2.1.tar.bz2]
-md5=242c260c50fd774f2301dba66deb668b
-sha256=67b43e51aa5afb22a7329fd78e9d17f489fceb4ac00d9861312993709739528e
-
-[ftp://ftp.billsgames.com/unix/agenda/aliens/src/aliens_V1.0.0.tar.gz]
-md5=9d7cde75aecf4b85478c0e47343d4293
-sha256=0aa0084a74f912f4002f1c40a815ce62ac13331ec84787a954d8bea06e1c96c5
-
-[http://handhelds.org/~zecke/oe_packages/aliens_V1.0.0.tar.gz]
-md5=9d7cde75aecf4b85478c0e47343d4293
-sha256=0aa0084a74f912f4002f1c40a815ce62ac13331ec84787a954d8bea06e1c96c5
-
-[http://files.chumby.com/source/ironforge/build396/align.pl]
-md5=d1cbac52c52b956d9cbe6277a7f9a8c5
-sha256=67695e9af2b0938b6406eeed41954bf8317693aa7ef8ad2e30fcea5bea59777f
-
-[http://www.rpsys.net/openzaurus/patches/archive/allow_disable_deferrred-r0.patch]
-md5=1cc6aee6d128edf41775472764652435
-sha256=02657350458e7d82b8c926e1f027e408e1e2e8d9570f31e7b5f84472fe2e41c2
-
-[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.11.tar.bz2]
-md5=ef7ae78a0ef08cbeacb295f2518886ab
-sha256=6b25f3d22cdb2476233f6dd74880fd88fb65124d4c282704bb9f0bf3fbd4c8d2
-
-[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.13.tar.bz2]
-md5=d55a9d7d2a79d738a1b7a511cffda4b6
-sha256=7a17403ac478cae0d837461b7efcd9075b17c6e7f3e2221fe1f2fdbd14f11dcf
-
-[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.14.tar.bz2]
-md5=1ef39fb723f9209109134d6f4860cb21
-sha256=01e693daf4c0e2af2e10082a635559d390f9127556a86d25105abfa646a9b0a3
-
-[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.15.tar.bz2]
-md5=94254ea0d2c966a58184b134e9da29ff
-sha256=f24272f3a32262c5285fc5bae0b9aa65494e8b22ac536313dbb60b8e4231e952
-
-[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.17.tar.bz2]
-md5=9bbbdc502478cdc75074c9ba42c385b3
-sha256=bc691463af8506c1c84db0edab727ee8f8ee4ecd1777b0e264db2525d4500833
-
-[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.18.tar.bz2]
-md5=de60df7541fafe8c6a3397e0f105ff0e
-sha256=c487645d32b8124b9ae224b8929e5aa45e581bd8d8c8da666add423cf927d1ea
-
-[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.19.tar.bz2]
-md5=73db3666c211e5fb023bb77450cf430d
-sha256=32ee26d93a25963fdc49b4b5ccd014749d675e33f419022c646a61c31a4a2886
-
-[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.20.tar.bz2]
-md5=6e9080ba1faa5d3739d14dd76c62d8dc
-sha256=15f8d0eef1da10c62136107e7b585bc8beb9c9e9b7ad177654097f8c15e57a63
-
-[ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.11.tar.bz2]
-md5=3106c2d59a329263867fa3dd44133dda
-sha256=6b688a3895a14945d0622e16cfdb9292ef9f953ab2d195b08595736f76e5a790
-
-[ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.14.tar.bz2]
-md5=a24475b978982ff8cb2f25be793c6b83
-sha256=c8feb3eb9d4255a4aff7ca839555293c237c1b2f034c118127e826843c6f0184
-
-[ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.15.tar.bz2]
-md5=49fb5fbae8bf955b248e46ff9c9a2aa1
-sha256=85245d7666d82cc44010dfe14f6427a8586da2c8b033fb636f0f041dd7e5168b
-
-[ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.17.tar.bz2]
-md5=1b1850c2fc91476a73d50f537cbd402f
-sha256=8d009e23e2cbee1691ec3c95d1838056a804d98440eae7715d6c3aebc710f9ca
-
-[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.15.tar.bz2]
-md5=908c2dd7ec33bc8e1fcd5e92c7e5e125
-sha256=3fec2349a94254c82dd568a8f4f8b8ef9735aee7dc56a5cf93e80f5938df9e95
-
-[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.17.tar.bz2]
-md5=f37d0b2b19dfbe215144941ab8bb6e49
-sha256=35a7e1411ab7b34353136ecfbd2267201d37b671f48b946bf238a6d1f7fdf560
-
-[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.18.tar.bz2]
-md5=4a798b47ba10c17aed66dff234d31b24
-sha256=deb7652a3c1360febbbffb5d0150e5ad8547063d37969ad24d13359f75a424ba
-
-[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.19.tar.bz2]
-md5=29ae9cac05423cf6a49f66eeb1a79eb6
-sha256=67be087c24af9d2a380b29d6e90b7187b337a0c484c31438a0d38ff429c71100
-
-[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.20.tar.bz2]
-md5=819c4f21e3e913eacefd32993a8fbed7
-sha256=210ceedcb84bf3030e9f362d55b734312632ce72e348bd758536ec62a37aac97
-
-[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.11.tar.bz2]
-md5=ba9b8010120701d0f6daf061d392cfa2
-sha256=4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b
-
-[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.13.tar.bz2]
-md5=dfe4bb5d3217f3ec662b172ce8397cf0
-sha256=d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0
-
-[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.14.tar.bz2]
-md5=6d3009c157ac6fc803696d6590a48366
-sha256=307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb
-
-[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.15.tar.bz2]
-md5=287f46f891581c15018de4f8c0731575
-sha256=3bb546e873df39159812168180eeff14b13620c653d90739ac0a0912e898aeac
-
-[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.17.tar.bz2]
-md5=14ccd0c900bf663afb36eac6f92d41d6
-sha256=6a06f457d66eca75ac1ab065e64539e4ccf22ed4e53703a70194cb85203b3125
-
-[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.18.tar.bz2]
-md5=0a6b26d27cc2adfd591d91d8c155fdb7
-sha256=ea0ae914cc8d46254dc02ca2b227d379d0eb1d76a3960907e57f26f2ec584aef
-
-[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.19.tar.bz2]
-md5=5ff0379c707c1a29083233edc9ab4e06
-sha256=1f4924f5ae7857ce64a3d6ecbeb98133c74ff1ead2b0f48187623d6e4b838cad
-
-[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.20.tar.bz2]
-md5=6837e673ef19da96d8bd2f9e18cd9574
-sha256=07f08286b3860f60d1794cc0de4407a53adcd4b6f065531d6dcef02b0c56a0cf
-
-[http://www.panix.com/~gesslein/am.tgz]
-md5=df7535050d4bbe57c5d1243c8ec2479e
-sha256=13ab5d2045d902b627725e7cf4fc82df3ec2e714e85e42b93bd48af7af9bffdc
-
-[http://ichi2.net/anki/download/anki-0.4.3.tgz]
-md5=90434860945de4c09d55cdb5dbe984fc
-sha256=18a93fb46363ca34963fc2588cadf7415dd799dd647efa681859eb8b1b22f104
-
-[http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz]
-md5=e3619c07bd175ce5f73d67388c0c2ea5
-sha256=140828e8aa7d690d8f2a9a54faeac38bcbf40ea18c1f44a186af51bd6964cd13
-
-[http://osdn.dl.sourceforge.jp/anthy/29142/anthy-9100e.tar.gz]
-md5=1c328986005e61f503adc118909e12ac
-sha256=369fd18d406783acc92e6ced2b3536999aa0d33940398af2b4fb11dba46cbfa3
-
-[http://www.antlr.org/download/antlr-2.7.5.tar.gz]
-md5=1ef201f29283179c8e5ab618529cac78
-sha256=744d8f3a8206fbc45a5558d92163d5ef7e5e0cc0700283bb6a617fb1201629f9
-
-[http://www.antlr2.org/download/antlr-2.7.7.tar.gz]
-md5=01cc9a2a454dd33dcd8c856ec89af090
-sha256=853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9
-
-[http://downloads.sourceforge.net/aoetools/aoetools-29.tar.gz]
-md5=6a77c8a017ef8dc0a5310db944b30035
-sha256=caba504ca4f769c5f3f8b4e97ed0da1888bd0be2efd3c33cac9bf36e7c285bc3
-
-[http://ftp.hosting-studio.de/pub/linux/apache/ant/source/apache-ant-1.7.1-src.tar.bz2]
-md5=0d68db4a1ada5c91bcbf53cefd0c2fd7
-sha256=4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6
-
-[http://ftp.riken.jp/net/apache/ant/source/apache-ant-1.7.1-src.tar.gz]
-md5=2a44ff60456cf67bb83771cfcedb8e33
-sha256=1a2fceea38f04e6fea0c0cb8ad7312dc948004af4d9308b5e630d299d89dfb38
-
-[http://archive.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.tar.gz]
-md5=10f04abe4d68d5a89e8eb167e4e45e1a
-sha256=f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31
-
-[http://archive.apache.org/dist/tomcat/tomcat-4/v4.1.37/src/apache-tomcat-4.1.37-src.tar.gz]
-md5=fe50177a25a084ad1abf4a201d08c2a6
-sha256=65e4cc9d3ea4a7f30044bfd6c660c772adb75ac152d775342deb6049a0d19d74
-
-[http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.26/src/apache-tomcat-5.5.26-src.tar.gz]
-md5=642b6526354cb18c5b5d77ebef8109ae
-sha256=ddc677d7391c438e6102d0b3e9653eaca661344ef74b0260c1f488340d660395
-
-[ftp://ftp.buici.com/pub/apex/apex-1.4.11.tar.gz]
-md5=7259a49d93b1853b1b3435753893ab7c
-sha256=bce6638d95fa8d32b109176a7cef6aa71e40c130068fac71b0df369d1a36c82c
-
-[ftp://ftp.buici.com/pub/apex/apex-1.4.7.tar.gz]
-md5=ed2183311aacf5714afbd825f3671417
-sha256=a319f936af9df20cd173d2e4c486cb6f1a011287ebcbd429a7f38c3214f555f3
-
-[ftp://ftp.buici.com/pub/apex/apex-1.5.14.tar.gz]
-md5=22fb46e76c8221c7bcc9734602367460
-sha256=472e12897931d9e5dcf2d1e3332acfc467aafd0f62e612896a9c71dd0d16d950
-
-[ftp://ftp.buici.com/pub/apex/apex-1.5.8.tar.gz]
-md5=bb96cc8d50b4f00ee653f0800643ea8a
-sha256=4ad287720b87213154fa272afee5f442b0d8d61c1f56e43d0d056ae25849a926
-
-[ftp://ftp.debian.org/debian/pool/main/a/apmd/apmd_3.2.2.orig.tar.gz]
-md5=b1e6309e8331e0f4e6efd311c2d97fa8
-sha256=7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d
-
-[ftp://ftp.nl.debian.org/debian/pool/main/a/apmd/apmd_3.2.2.orig.tar.gz]
-md5=b1e6309e8331e0f4e6efd311c2d97fa8
-sha256=7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apmd/apmd_3.2.2.orig.tar.gz]
-md5=b1e6309e8331e0f4e6efd311c2d97fa8
-sha256=7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d
-
-[ftp://ftp.us.debian.org/debian/pool/main/a/apmd/apmd_3.2.2.orig.tar.gz]
-md5=b1e6309e8331e0f4e6efd311c2d97fa8
-sha256=7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d
-
-[http://www.mbedthis.com/software/appWeb-src-1.2.0-1.tar.gz]
-md5=3fb255992b2af8f61c60a9706effbfa6
-sha256=cc924ea10f77acae123194a33f46d8484642501cc6fe94b47491ecf3ad18419e
-
-[http://www.mbedthis.com/software/appWeb-src-2.0.4-1.tar.gz]
-md5=f2cb79a03bf17c0f66f0a3a1dc1e2c46
-sha256=17da486f983597f28c0efadb261b76b733155be7451ef34eefc65cb4058d883d
-
-[http://xorg.freedesktop.org/releases/individual/proto/applewmproto-1.0.3.tar.bz2]
-md5=d5d7c69837cc7dcbf2aa181ff423ab20
-sha256=a938c07ea331359f379802c50c33aa0307b913f742ad74087d45e7fb2a1f4d50
-
-[http://xorg.freedesktop.org/releases/individual/proto/applewmproto-1.2.0.tar.bz2]
-md5=44e18d01857f9dfeb8628e317e786f31
-sha256=4f549083df9db85e61d0b272645e3dc71bacde9b9156ca20a57440e794b71042
-
-[http://xorg.freedesktop.org/releases/individual/proto/applewmproto-1.4.1.tar.bz2]
-md5=76ca1c6e1d8904d2d885f81f7332eba6
-sha256=08069e1b7dd0e357c1ac7fa63aadcae094dc131d2a578eb1600a9bd16b8fde19
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/applewmproto-X11R7.0-1.0.3.tar.bz2]
-md5=2acf46c814a27c40acd3e448ed17fee3
-sha256=db738777fd573bede8e41f121f31692e8ec70bb822b5dcd263973533273fc5ec
-
-[http://xorg.freedesktop.org/releases/individual/app/appres-1.0.1.tar.bz2]
-md5=420e6cdf38bb771ec8b00228bf09e8ff
-sha256=15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962
-
-[http://xorg.freedesktop.org/releases/individual/app/appres-1.0.2.tar.bz2]
-md5=6f2f5d9f41669d498b56d73dc3206951
-sha256=37d0fbb16c553fa09878d107f29f26c2ca4206c98dd23c44a0cb670ace531e36
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/appres-X11R7.0-1.0.0.tar.bz2]
-md5=3327357fc851a49e8e5dc44405e7b862
-sha256=bbc15785d609c7f26176b91d26354ca7bfcc5d9fe72d15a78f2809eeba1cb6b0
-
-[http://www.thedirks.org/pub/v4l2/apps/apps20020317.tgz]
-md5=16d8cbed24945949956b6f7966f4a609
-sha256=9ec43259123b89980ad0b5a36b8d582cf877d918019f993f629a9fa5327a5c58
-
-[http://www.apache.org/dist/apr/apr-0.9.12.tar.bz2]
-md5=63fef787c263bd8025c6ab6a6cecdd01
-sha256=cd1da2119dd812127ab6e6e8cbb954d9b74fe01ec744364ba79c9845865ffdaa
-
-[http://www.apache.org/dist/apr/apr-1.2.12.tar.bz2]
-md5=c5da94517e3918f0f2b2e0a05f56aa21
-sha256=db22b34c0bfcab8546632475c6de2c63990214fb8ae5e2ada565410a85e22134
-
-[http://www.apache.org/dist/apr/apr-1.2.7.tar.bz2]
-md5=e77887dbafc515c63feac84686bcb3bc
-sha256=384437f3c4eb7d53ad27fdadce6cbc295ef16653b7f7739a480d91c784082ec9
-
-[http://www.apache.org/dist/apr/apr-1.3.2.tar.bz2]
-md5=a0631c63640176371dd4a5bf13beeee8
-sha256=bb0c58efdd252fcaf6f0ff06681d0ebecbecbaa3864047f32dec7f82d1c4994c
-
-[http://www.apache.org/dist/apr/apr-1.3.3.tar.bz2]
-md5=2090c21dee4f0eb1512604127dcd158f
-sha256=d95f3b78366c86317043304864bb08cb836312c87ea7d142a4c02154e7e0dd37
-
-[http://www.apache.org/dist/apr/apr-util-0.9.12.tar.gz]
-md5=8e9cc71a1303b67b3278fbeab9799f2e
-sha256=5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3
-
-[http://www.apache.org/dist/apr/apr-util-1.2.12.tar.gz]
-md5=e292942e22edd21b68609086352212e4
-sha256=7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f
-
-[http://www.apache.org/dist/apr/apr-util-1.2.7.tar.gz]
-md5=c3702668a640be1695956115857ec22e
-sha256=8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3
-
-[http://www.apache.org/dist/apr/apr-util-1.3.4.tar.gz]
-md5=a10e2ca150ff07f484c724c36142211f
-sha256=3f07ffdb18fb853290c9b83e82cd5cae66b8fbc357bd391e846c0afdd24fed7e
-
-[ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.5.28.6.tar.gz]
-md5=26b37525371cdaaec552237e0667305d
-sha256=57de084860870cccf510de62eb8ded252f5951a6e59e34a963d61d69de3aff10
-
-[ftp://ftp.nl.debian.org/debian/pool/main/a/apt/apt_0.5.28.6.tar.gz]
-md5=26b37525371cdaaec552237e0667305d
-sha256=57de084860870cccf510de62eb8ded252f5951a6e59e34a963d61d69de3aff10
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.5.28.6.tar.gz]
-md5=26b37525371cdaaec552237e0667305d
-sha256=57de084860870cccf510de62eb8ded252f5951a6e59e34a963d61d69de3aff10
-
-[ftp://ftp.nl.debian.org/debian/pool/main/a/apt/apt_0.6.25.tar.gz]
-md5=6569fd95e829036c141a5ccaf8e5948c
-sha256=fa00ce910ab6f0987c4a210962be357d4f013fc89ef72b015f39ae8649522b59
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.6.25.tar.gz]
-md5=6569fd95e829036c141a5ccaf8e5948c
-sha256=fa00ce910ab6f0987c4a210962be357d4f013fc89ef72b015f39ae8649522b59
-
-[ftp://ftp.us.debian.org/debian/pool/main/a/apt/apt_0.6.25.tar.gz]
-md5=6569fd95e829036c141a5ccaf8e5948c
-sha256=fa00ce910ab6f0987c4a210962be357d4f013fc89ef72b015f39ae8649522b59
-
-[ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.6.46.2.tar.gz]
-md5=67d439a252996357b0313b3ad999739a
-sha256=6f1a7340d0de2a9a524055d0ed4289aa919dc29e9e1fe60aae598f2019105686
-
-[ftp://ftp.nl.debian.org/debian/pool/main/a/apt/apt_0.6.46.2.tar.gz]
-md5=67d439a252996357b0313b3ad999739a
-sha256=6f1a7340d0de2a9a524055d0ed4289aa919dc29e9e1fe60aae598f2019105686
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.6.46.2.tar.gz]
-md5=67d439a252996357b0313b3ad999739a
-sha256=6f1a7340d0de2a9a524055d0ed4289aa919dc29e9e1fe60aae598f2019105686
-
-[ftp://ftp.us.debian.org/debian/pool/main/a/apt/apt_0.6.46.2.tar.gz]
-md5=67d439a252996357b0313b3ad999739a
-sha256=6f1a7340d0de2a9a524055d0ed4289aa919dc29e9e1fe60aae598f2019105686
-
-[ftp://ftp.nl.debian.org/debian/pool/main/a/apt/apt_0.7.14.tar.gz]
-md5=19efa18fb1ef20c58b9b44e94258b814
-sha256=8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.7.14.tar.gz]
-md5=19efa18fb1ef20c58b9b44e94258b814
-sha256=8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045
-
-[ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.7.19.tar.gz]
-md5=0ef50176aea36cb0cce633a9b62dc7eb
-sha256=c928f5eb2baffb50e7ccf02d07a16daf867945c8aa542d500bbbbaff7bbcef42
-
-[ftp://ftp.nl.debian.org/debian/pool/main/a/apt/apt_0.7.2.tar.gz]
-md5=c66f943203fa24e85ed8c48f6ac5ad1e
-sha256=e7d58e2b202713b4df8cd5fd58bc20ba8d31c0da6e5e3b3c89a138dbf0b24ad9
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.7.2.tar.gz]
-md5=c66f943203fa24e85ed8c48f6ac5ad1e
-sha256=e7d58e2b202713b4df8cd5fd58bc20ba8d31c0da6e5e3b3c89a138dbf0b24ad9
-
-[ftp://ftp.us.debian.org/debian/pool/main/a/apt/apt_0.7.2.tar.gz]
-md5=c66f943203fa24e85ed8c48f6ac5ad1e
-sha256=e7d58e2b202713b4df8cd5fd58bc20ba8d31c0da6e5e3b3c89a138dbf0b24ad9
-
-[ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.7.20.2.tar.gz]
-md5=e6ee1b594f6ed5fab5cb593ee46cfc21
-sha256=4dc935a520c65705795ada5942b658f6e86b22eefc7032342267272bd6566b05
-
-[ftp://ftp.us.debian.org/debian/pool/main/a/apt/apt_0.7.20.2.tar.gz]
-md5=e6ee1b594f6ed5fab5cb593ee46cfc21
-sha256=4dc935a520c65705795ada5942b658f6e86b22eefc7032342267272bd6566b05
-
-[ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.7.3.tar.gz]
-md5=e2e6e23f43bfdf135b923205659dfaf1
-sha256=d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710
-
-[ftp://ftp.nl.debian.org/debian/pool/main/a/apt/apt_0.7.3.tar.gz]
-md5=e2e6e23f43bfdf135b923205659dfaf1
-sha256=d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.7.3.tar.gz]
-md5=e2e6e23f43bfdf135b923205659dfaf1
-sha256=d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710
-
-[ftp://ftp.us.debian.org/debian/pool/main/a/apt/apt_0.7.3.tar.gz]
-md5=e2e6e23f43bfdf135b923205659dfaf1
-sha256=d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.7.6.tar.gz]
-md5=e0bb681ec46f6566e53fbda0ba25fd4b
-sha256=4a4eb39ea162df9c795b472326e9df676dbf249dc34436517b67354f32a8d23f
-
-[http://downloads.sourceforge.net/arabeyes/arabic-fonts-1.0.tar.gz]
-md5=c6b1aa28bfecdd0c693a2afc43d7679e
-sha256=d5b93fb8dbfa73e4a542bb8ad7d61c8b48dcf79948da26da9e9ef3b1a49c4221
-
-[http://heanet.dl.sourceforge.net/arabeyes/arabic-fonts-1.0.tar.gz]
-md5=c6b1aa28bfecdd0c693a2afc43d7679e
-sha256=d5b93fb8dbfa73e4a542bb8ad7d61c8b48dcf79948da26da9e9ef3b1a49c4221
-
-[http://www.auto.tuwien.ac.at/~mkoegler/eib/argp-standalone-1.3.tar.gz]
-md5=8a336796eeb2a765b76f68e3312adaab
-sha256=8b9067e77812c67c1e1b96ab9d92ab9af3a97e991d3c385b6e241d97f0e3cd28
-
-[http://downloads.sourceforge.net/argtable/argtable2-7.tar.gz]
-md5=a84130293aab3bc09631cbee717ede93
-sha256=f7bd2786309b6a7ce9c1e2b3fbdd75419ef0bcabfaa4444362bbe40897959f45
-
-[http://heanet.dl.sourceforge.net/argtable/argtable2-7.tar.gz]
-md5=a84130293aab3bc09631cbee717ede93
-sha256=f7bd2786309b6a7ce9c1e2b3fbdd75419ef0bcabfaa4444362bbe40897959f45
-
-[http://avr.auctionant.de/ark3116_linux_driver/releases/ark3116-0.4.1.tgz]
-md5=fb94d863514b2fa21ecd34571099a7a3
-sha256=7016b5e53e1e24803186e2719cf735109289c0f42cfc3006d468dbf72fae09ab
-
-[http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi.src.tar.bz2]
-md5=3313d991b6cfa993e10b68a6dbda3f0f
-sha256=49bb7e3bb94b4ff0b92596c2743db8b7ebef603b26a5b4b4f15bee057ccdb300
-
-[http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2]
-md5=088999bfbf73f7fe7fff11bffbae1063
-sha256=3179a3cb9d42cd9651622e911e18c6ebff58f338a9f2f4f36610ca74d8c54885
-
-[http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2]
-md5=c0d60035d45c7f43d2ddd3c021709220
-sha256=693609f59d0c0a6518a3654314aaef841305e029c8f7de4c42fbc0fd7f2dbb35
-
-[http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2007q3-53-arm-none-eabi.src.tar.bz2]
-md5=ada6a8dff4a147f41de02174f8703a0b
-sha256=adbc29af4d08e64a221e213597556bf2a7121503fd33a66a2ffceeeffb404e88
-
-[http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q1-126-arm-none-eabi.src.tar.bz2]
-md5=be1a8a4baeb745af388f4ce09ff7d3e3
-sha256=31ca43436520074e90482f54ffe26cc59ea76836add50d8b7d2c1adfefd19845
-
-[http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q3-39-arm-none-eabi.src.tar.bz2]
-md5=67196fcfe5c95bae1a5bb8a63a1bb74d
-sha256=68da29f515a26ca1b5722c940615ddc4b0550b2b1ad5d11129b1da636c353160
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/arm-ctl_bus_isa.patch]
-md5=88fa901c9a85633ab62365b0ee9df3b1
-sha256=6651eb15c9f6dabf21af4067b723cb29a87827f66570bfab74fdc00d80cab129
-
-[http://arora.googlecode.com/files/arora-0.10.1.tar.gz]
-md5=ac38282a2d9134687d9c30dbb73c0fbc
-sha256=1828cbd348d1418287b29337e1047cfc3d6c092e18691cd9c6dfc2d6535bcebd
-
-[ftp://ftp.ee.lbl.gov/arpwatch-2.1a15.tar.gz]
-md5=cebfeb99c4a7c2a6cee2564770415fe7
-sha256=c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
-
-[http://mesh.dl.sourceforge.net/project/asciidoc/asciidoc/8.5.1/asciidoc-8.5.1.tar.gz]
-md5=412fb0c86c3dcb4cc159ef63bd274c90
-sha256=ccb02db04e6e6eff2149435516e88557ca30c85bc4467420f40c895e25f17a20
-
-[http://downloads.sourceforge.net/asio/asio-1.1.1.tar.bz2]
-md5=3e6bcedc549cb4c014227f882969db5c
-sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e
-
-[http://heanet.dl.sourceforge.net/asio/asio-1.1.1.tar.bz2]
-md5=3e6bcedc549cb4c014227f882969db5c
-sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e
-
-[http://downloads.sourceforge.net/asio/asio-1.4.1.tar.bz2]
-md5=1879b246f9217d64bd3126aa16488bc2
-sha256=aeb5c997940e6afd399c62316f03f480557f2b721354adff065d230183ff2782
-
-[http://802.11ninja.net/~jwright/code/asleap-2.1.tgz]
-md5=eb74eca847fa71ba89a965548526f7ac
-sha256=ba77747cfb107d31cf4ae2eb27839cfa196c0fca08c98465256a4820b9d85d29
-
-[http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.3.patch]
-md5=ce753d3c06825e3e8d6801258d63f761
-sha256=1c6e90e00f3cb202f206e4b8f0524948ba295feb66aa6a68cf189f34dc851bde
-
-[ftp://ftp.gnu.org/gnu/aspell/aspell-0.60.5.tar.gz]
-md5=17fd8acac6293336bcef44391b71e337
-sha256=ee9e81d2e3e66b01ad91da736e48568ed8acd6dfb6b664d904066ecc5ea4e84b
-
-[ftp://ftp.gnu.org/gnu/aspell/aspell-0.60.6.tar.gz]
-md5=bc80f0198773d5c05086522be67334eb
-sha256=4f5b1520e26cf6bbb1b5ca8a2f9f22948c3ca38ac4c2dd9e02df042fee7c0e36
-
-[ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-6.0-0.tar.bz2]
-md5=16449e0a266e1ecc526b2f3cd39d4bc2
-sha256=24f0688711d2b893fa06c16d14d0aa3a8000e326226b839aad32611f7ace4898
-
-[ftp://ftp.gnu.org/gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2]
-md5=3139a69a1bd9ccb1d853d30aa024fc2b
-sha256=017741fcb70a885d718c534160c9de06b03cc72f352879bd106be165e024574d
-
-[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.2.13.tar.gz]
-md5=ad8fbe2198568f55c254045ecb3b7926
-sha256=8d197b118d9ee25bc8793b37d1daa6b54fd6074e6738f462368361e5698d98f8
-
-[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.2.14.tar.gz]
-md5=2ce03466b99e0b9471e6c791ed14a5f2
-sha256=115248cb7b1fc35dc2be24218f91a87272cf5c0d8c2050a36da2314fadc05cf4
-
-[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.2.16.tar.gz]
-md5=88cfcd5c3b2a8f2504e561cb93546299
-sha256=cc70d2ff8a2cafe3c7cce10dc5e90146111bc686ed6e08fc753e950c7050611e
-
-[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.2.24.tar.gz]
-md5=63dc8b7be4cd10375c5fbda893c780bc
-sha256=9debaf410636fa477e1e1f09fe0b16a1c2814afaf7195f34f29e4ce5b8debbbd
-
-[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.2.28.tar.gz]
-md5=922e42ca392656d1830ffd048c8167ec
-sha256=5a44c6e86d227f092825b9d1e4a17391c5e8ca51a077965c40c8b8e938075862
-
-[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.4.10.tar.gz]
-md5=69057e2916287f6e2a1e36dba6d6800d
-sha256=72bbb19e35ec304df06dca717b7ac2cae0d3409fe47c17c2dcf75850f61ddbe1
-
-[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.4.17.tar.gz]
-md5=ff25f56d775858c4de619f2f59a55099
-sha256=85331e63c90370c305121f134358e76cbb06846a12c04a7825d5869f331ee00d
-
-[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.4.19.1.tar.gz]
-md5=3b416557d2c395a36b97a819812e99b0
-sha256=2bcc5d5620f8533eb4300ba1b48c9d2a00092ce04588e32f7074cf2aadc34259
-
-[http://downloads.digium.com/pub/asterisk/releases/asterisk-1.4.23.1.tar.gz]
-md5=f5fdaa7e4a6d9b8dfc9e2bef8ee81681
-sha256=e78e73de5d9b920070b778cbb2ab077119a86a71a59755d67aa2c3a82b4239c4
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.4.8.tar.gz]
-md5=e708a5510a61217725b6ad663287dfa0
-sha256=5d5c305079eb9918d271fad28ac73248a7d2962347dbd80d16aac66fe35e2729
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.4.8.tar.gz]
-md5=febffdf865db7a773ce687b295cb19e9
-sha256=6829f56eaf0221125e83f5547c773895d00ddc725a0b3a7015d22bbcaf6675ed
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.8.tar.gz]
-md5=384e92a24153cf713af2dd7484b5fef3
-sha256=64efa42d1bc77e78c898c2461f45f51fa2b0679e75d36e180bc3969eb0cffd07
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.4.8.tar.gz]
-md5=05c620267e4653d48815b77d58e93247
-sha256=a48faee879bce9ec753b796b9449db0f2eba47f46845f5497ad6a4e3bae666ee
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.4.7.tar.gz]
-md5=ecc50bd2b9b29d8237911272248c5d35
-sha256=61ff59c7d1a180fbcbec2cf14965ad405fb10d90fc26310848a580bd99a1cf18
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.4.7.tar.gz]
-md5=0de5e5f75197b4e128815867443de775
-sha256=c2e17052da282533cc10a38fcd6c4d3e5b2de43d7909f7391f9fcf34c335c921
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-1.4.7.tar.gz]
-md5=c5ac7e08d98762d5cbb59b0838370fc9
-sha256=de15f3dbf5e1688ebb853e84439d2ef48fd7eab66b1e19469485ed6e47e66161
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.4.7.tar.gz]
-md5=b8063676b102076321b6d4640b4e6126
-sha256=94c2ba9290283851ddfba9e7b29c797412538d7a2002599508ce4122ad74c767
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-alaw.tar.gz]
-md5=ef6dca03deeaf1cfd2c97feb5af21538
-sha256=6dec5684b48cb375c226ed94aeee77e35b9db6c7e85abeb9bf5260e8df43cd9c
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-g729.tar.gz]
-md5=381497d57c39d786cc79200576c5b2cc
-sha256=fdb7b483b55457b488fcb788f0254c26ca87cab49dcfb8391d347454fb3a8b7f
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-gsm.tar.gz]
-md5=da0cbefb40b5670648e1d2cc0010ec9f
-sha256=e52b849febb308a6c6b6f4b6445d334e57178373ccf94b8660776c1a8fa45ad1
-
-[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-ulaw.tar.gz]
-md5=b1115a8c4daa2957a1da98b5eae37104
-sha256=b040f30b07c3277e3c5ef76699761dff2a88f5cfe979de7b46a6ce7676b534e9
-
-[http://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-1.2.1.tar.gz]
-md5=bed4259905a7d7bc070c6319142b2075
-sha256=bfa7def7d0f1190a111bde232920d2b3481d3932e2d1056573b3a9c4801c602a
-
-[http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch]
-md5=160c648e29637f2ed6301f4dfdecce21
-sha256=3ec786e6df9e1a935aff4848b6989cad8f87c1fa8813dc033b338e18b17138d8
-
-[http://ftp.gnome.org/pub/GNOME/sources/at-spi/1.26/at-spi-1.26.0.tar.bz2]
-md5=3f2f7d29b45eff08adf56af0d31d3984
-sha256=bb8c9473a277fa75f172fa16fb6ada85f4a919219818fd9c792f1a137bb2644d
-
-[http://ftp.gnome.org/pub/GNOME/sources/at-spi/1.28/at-spi-1.28.0.tar.bz2]
-md5=06f6da7873dffc8a26b04e304236e222
-sha256=ebe22221dc6a9852e6cf6c4d1e8d78bd19d0fda76a8eb8fc46655e9c9b096667
-
-[http://download.berlios.de/at76c503a/at76_usb-0.17.tar.gz]
-md5=b47d4fa958aaf83916b6a917626102cd
-sha256=9d1fff10d391cb64890bb8e0050d3f023520a8dd5aee43c4d3f9c6f8611da668
-
-[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.10.tar.bz2]
-md5=a3bcd50138d29c1d23a0d378edb52dfe
-sha256=019b98442d4debcd74d759043884b4b0ed48a2bef425649bfe3061d00e854fc5
-
-[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.11.tar.bz2]
-md5=8962bd639d189e1d3328b6c056d96099
-sha256=09ef85da45a086c27b6a43a457f81bf44913e7fa2e854e72281aa3c25c00874b
-
-[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.12.tar.bz2]
-md5=769bd07e6ae825d51b0d78e31ffcd87d
-sha256=c97f2328cfa89934b08dd226af3f645f7af0f7593c4b034e0b8c810b29d3f316
-
-[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.13.tar.bz2]
-md5=1f539d6db38111b6a1d7ab93eb0a648b
-sha256=93b01b723ed69f33316384f097da864f5d49c40520c87ccf5537518dbff9df86
-
-[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.3.tar.bz2]
-md5=a29b3f07e623d20894ab23335daf5da5
-sha256=d598d078c24a24b13eac8a219a4ab05499909404cbd4efcb8641fdcde28464c0
-
-[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.4.tar.bz2]
-md5=10161158f116e0b171582a2f66854af1
-sha256=c01e579401453ae97bd7671997d4b3d3b63e25e7e1e9cec02611a944ad1727fa
-
-[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.8.tar.bz2]
-md5=117b73e2bf1f8d52afe6e742e33444a6
-sha256=a5647ea3761560d7ee1baecea3f09c942f10441e60c6ddd3bad6a450d84a3918
-
-[ftp://ftp.debian.org/debian/pool/main/a/at/at_3.1.8-11.tar.gz]
-md5=81dbae5162aaa8a398a81424d6631c77
-sha256=0d77c73a3c151a7da647dd924f32151e5ee4574530568fd65067882f79cd5a44
-
-[ftp://ftp.nl.debian.org/debian/pool/main/a/at/at_3.1.8-11.tar.gz]
-md5=81dbae5162aaa8a398a81424d6631c77
-sha256=0d77c73a3c151a7da647dd924f32151e5ee4574530568fd65067882f79cd5a44
-
-[ftp://ftp.us.debian.org/debian/pool/main/a/at/at_3.1.8-11.tar.gz]
-md5=81dbae5162aaa8a398a81424d6631c77
-sha256=0d77c73a3c151a7da647dd924f32151e5ee4574530568fd65067882f79cd5a44
-
-[http://projects.linuxtogo.org/frs/download.php/222/atd-0.80.tar.gz]
-md5=b64a8ae8592b4d32ac9baebf0b915c1e
-sha256=456d2bf4550a37c70e829b3029acf3cb81f931908d35f1dbade7ec54f4cdb146
-
-[ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7-7.diff.gz]
-md5=03ccc8d178ee956feb46ab970e982e94
-sha256=71e8890e709ee77756368b8508f65c6c9bf8c6ed5e1501726ef30e1dc105d4f5
-
-[ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7.dfsg-3.diff.gz]
-md5=fa5ea0d162c41c197af48d717df1389f
-sha256=2bbf2b8fdf6e12dabb0cc751a973d9040f7ed9123cf87a7f794044f3429b0de0
-
-[ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7.dfsg-6.diff.gz]
-md5=b5d570affb1412e8e90b9dd24554ad96
-sha256=9aa41c8c88ecb1163b7ac69824ac390d6eaaa30ed31a0624486e43f414ec6b7a
-
-[ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7.orig.tar.gz]
-md5=3b27365772d918050b2251d98a9c7c82
-sha256=9c548c44d3cfdf259118d9fd4e468e1fe4567456dbff8ff59838c5f70ef62ea3
-
-[ftp://ftp.us.debian.org/debian/pool/main/a/atftp/atftp_0.7.orig.tar.gz]
-md5=3b27365772d918050b2251d98a9c7c82
-sha256=9c548c44d3cfdf259118d9fd4e468e1fe4567456dbff8ff59838c5f70ef62ea3
-
-[ftp://ftp.gtk.org/pub/gtk/v2.8/atk-1.10.3.tar.bz2]
-md5=c84a01fea567b365c0d44b227fead948
-sha256=c596baf95f6a6cd7748b1018336b2ac45ca2ef668816e6c703b01691e09b8a89
-
-[http://download.gnome.org/sources/atk/1.18/atk-1.18.0.tar.bz2]
-md5=9fc33ec48fd32933f7f630479dfad667
-sha256=be2d537642a43b5a1e85a2d0f813167b8585781ff83203a4f68206c3ecd6a315
-
-[http://ftp.gnome.org/pub/GNOME/sources/atk/1.18/atk-1.18.0.tar.bz2]
-md5=9fc33ec48fd32933f7f630479dfad667
-sha256=be2d537642a43b5a1e85a2d0f813167b8585781ff83203a4f68206c3ecd6a315
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-1.19.3.tar.bz2]
-md5=2babc7fa144688274ebede271072b8e2
-sha256=f616b4b636957e6387392ecacea4d60e4ad178baa3c9713e5db1733a42326786
-
-[http://ftp.gnome.org/pub/GNOME/sources/atk/1.2/atk-1.2.0.tar.bz2]
-md5=06a84758129554ae044af8865ecb6f1c
-sha256=feb2639dd385a828ec75c6af12ac44a44aced40fb7a24cb63252f0d056f993b7
-
-[http://download.gnome.org/sources/atk/1.20/atk-1.20.0.tar.bz2]
-md5=b1a9e28d9f54ea306bd85a4c84b25fb8
-sha256=1f3b2f2cbb5b0d8da0924970c66c3ecbfe13c4e4360b0af1db7545401a3747c9
-
-[http://ftp.gnome.org/pub/GNOME/sources/atk/1.26/atk-1.26.0.tar.bz2]
-md5=719229408019c548855673840679f156
-sha256=f7993d26c3606a9b0e32d1eebe716f2294ac37fac014c47744e986fc0ff5e6d1
-
-[http://ftp.gnome.org/pub/GNOME/sources/atk/1.27/atk-1.27.90.tar.bz2]
-md5=8906c67d015cc90e2e70a341d0752a6f
-sha256=b7255a400139d8c41bc7e2ac630ba4c6479e60e4a08295d0338e9edfdc3db00f
-
-[http://ftp.gnome.org/pub/GNOME/sources/atk/1.28/atk-1.28.0.tar.bz2]
-md5=010a85478adc053c016a0a5c9bb52004
-sha256=e4da9fe580d2d55f4e77a138c553b4b32654dfb06bf0715592cc9dbd6355fe87
-
-[ftp://ftp.gtk.org/pub/gtk/v2.4/atk-1.6.0.tar.bz2]
-md5=5e699af22a934ea3c1c1ed3742da0500
-sha256=a838937ee54c9e794df3b0995935c1e35cad4a360c83922380f9429195ea7059
-
-[ftp://ftp.gtk.org/pub/gtk/v2.4/atk-1.6.1.tar.bz2]
-md5=f77be7e128c957bd3056c2e270b5f283
-sha256=f9a05f797f0b23c7e2d88c428779c450718df2f187bd83dcf0a898adbda1b3ab
-
-[ftp://ftp.gtk.org/pub/gtk/v2.6/atk-1.9.0.tar.bz2]
-md5=7f41bd9c6dcd83c8df391dc1805be653
-sha256=6a33f5b7caab4e837ac671b4b6974059f62a2ef0fd62a9bc04c74d47f077ff14
-
-[http://www.thekelleys.org.uk/atmel/atmel-firmware-1.3.tar.gz]
-md5=415e16463151f2e953e9b3dceb7af45f
-sha256=f53160b0b4a824754957d8488f1eba68d3c6379d48c563464bd3924e7be19b3d
-
-[http://downloads.sourceforge.net/atmelwlandriver/atmelwlandriver-3.3.5.6.tar.bz2]
-md5=dd9a11d175ba0fbb62cf7fec5426f5de
-sha256=d80b88753725e2ce83add9f80d120c022112527adbf4425368387da1936345f2
-
-[http://downloads.sourceforge.net/atmelwlandriver/atmelwlandriver-3.4.1.0.tar.bz2]
-md5=288882c65cc13fbe48d5c5ed69aba1a8
-sha256=dd3629e6ba6f638962f3a60035208facf6155397000c86b5f2f7ca2990ef59e1
-
-[http://handhelds.org/~zecke/oe_packages/atomic_V1.0.1.tar.gz]
-md5=537dc236f4654dd5760e0f39484222a1
-sha256=818a18c1ace9bc3e5b92bc91db1d62c859023cd16444d41692ecb3606cc6868c
-
-[http://mirror.its.uidaho.edu/pub/savannah/attr/attr-2.4.44.src.tar.gz]
-md5=d132c119831c27350e10b9f885711adc
-sha256=9f6214b8e53f4bba651ac5a72c0f6193b12aa21fbf1d675d89a7b4bc45264498
-
-[ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_2.4.43-1.tar.gz]
-md5=91583a14bcbd637adaa9b07ea49c5d4b
-sha256=d358b233b3e2ad235e63fd8697e337006fc7506844e424b0d9dd7a24affec5bf
-
-[http://www.68k.org/~michael/audiofile/audiofile-0.2.6.tar.gz]
-md5=9c1049876cd51c0f1b12c2886cce4d42
-sha256=4b6167b56e21556fb07c9ef06962fe32817064c62181ba47afd3322e0d0f22a9
-
-[http://stage.maemo.org/pool/maemo/ossw/source/a/audiofile/audiofile_0.2.6-3osso4.tar.gz]
-md5=7fe7cfb5d6abcef8edab841c0198205b
-sha256=afb8b7286ad4e13c3e6d8393b8f9154ffead6dff48dfc73c5033b0aa2a550344
-
-[http://gpephone.linuxtogo.org/download/gpephone/audioplayer-1.0/audioplayer-1.0.tar.bz2]
-md5=7df1df597c655fc6e4c5630ec8052b53
-sha256=fce50bc26351bbbe31154d9a734cb433ec8fb404efc5febd50c149e5eaf62449
-
-[http://jpj.net/~trevor/aumix/aumix-2.8.tar.bz2]
-md5=dc3fc7209752207c23e7c94ab886b340
-sha256=636eef7f400c2f3df489c0d2fa21507e88692113561e75a40a26c52bc422d7fc
-
-[ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz]
-md5=9de56d4a161a723228220b0f425dc711
-sha256=f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
-
-[ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.57.tar.bz2]
-md5=407ea53787ce13f5ca427e9a51e05bc2
-sha256=e1035aa2c21fae2a934d1ab56c774ce9d22717881dab8a1a5b16d294fb793489
-
-[ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.59.tar.bz2]
-md5=1ee40f7a676b3cfdc0e3f7cd81551b5f
-sha256=f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7
-
-[ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.61.tar.bz2]
-md5=36d3fe706ad0950f1be10c46a429efe0
-sha256=93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1
-
-[ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2]
-md5=7565809ed801bb5726da0631ceab3699
-sha256=264d7c1c0e268bc77fbe0f308e085545535edfe73f33e27c80219cc0c9c71246
-
-[http://kernel.org//pub/linux/daemons/autofs/v3/autofs-3.1.7.tar.bz2]
-md5=4f602f82442b48ce9c2e0005d59c3408
-sha256=838c6e92c39827b54a37559a02c9b409a4f7ec3124cc6d20845aabfaabe2dd18
-
-[http://kernel.org/pub/linux/daemons/autofs/v3/autofs-3.1.7.tar.bz2]
-md5=4f602f82442b48ce9c2e0005d59c3408
-sha256=838c6e92c39827b54a37559a02c9b409a4f7ec3124cc6d20845aabfaabe2dd18
-
-[http://kernel.org//pub/linux/daemons/autofs/v4/old/autofs-4.0.0-1.tar.bz2]
-md5=eca614ef301b49aa8105876e8abd91b5
-sha256=f5555e41fc351644fd5ff935c2d2340719a18fa32d1f6ccdc6bbd4c18a694f88
-
-[http://kernel.org/pub/linux/daemons/autofs/v4/old/autofs-4.0.0-1.tar.bz2]
-md5=eca614ef301b49aa8105876e8abd91b5
-sha256=f5555e41fc351644fd5ff935c2d2340719a18fa32d1f6ccdc6bbd4c18a694f88
-
-[http://kernel.org//pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch]
-md5=6342d6908c35af72b29231ecc6a10b5a
-sha256=4fc5725c683405e0da29021aacb3674c71ce1b61f62b810430aa112644773cf8
-
-[http://kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch]
-md5=6342d6908c35af72b29231ecc6a10b5a
-sha256=4fc5725c683405e0da29021aacb3674c71ce1b61f62b810430aa112644773cf8
-
-[http://kernel.org//pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch]
-md5=2783f4498c7e90a2cbf93b44d4fc4b94
-sha256=91d852ae612b19862d3925a807c319c74a0a06cc7a8f7390715591b6e1110108
-
-[http://kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch]
-md5=2783f4498c7e90a2cbf93b44d4fc4b94
-sha256=91d852ae612b19862d3925a807c319c74a0a06cc7a8f7390715591b6e1110108
-
-[http://kernel.org//pub/linux/daemons/autofs/v4/autofs-4.1.4-non-replicated-ping.patch]
-md5=b7d81c9aa92884d55ce5a1075d49fe78
-sha256=398c921161a57f1d87a5829ea264deed9e2f3adc64ac011f7f0490257d31b633
-
-[http://kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.4-non-replicated-ping.patch]
-md5=b7d81c9aa92884d55ce5a1075d49fe78
-sha256=398c921161a57f1d87a5829ea264deed9e2f3adc64ac011f7f0490257d31b633
-
-[http://kernel.org//pub/linux/daemons/autofs/v4/autofs-4.1.4.tar.bz2]
-md5=7e3949114c00665b4636f0c318179657
-sha256=e25caa0e9639ea54dd7c4f21e8146ac9859a61fa126f397edf874b5fdc147430
-
-[http://kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.4.tar.bz2]
-md5=7e3949114c00665b4636f0c318179657
-sha256=e25caa0e9639ea54dd7c4f21e8146ac9859a61fa126f397edf874b5fdc147430
-
-[ftp://ftp.gnu.org/gnu/automake/automake-1.10.1.tar.bz2]
-md5=4510391e6b3edaa4cffb3ced87c9560c
-sha256=b26a3499672b0eddcbd87c8e61dfb60ae74d9ee0cc181a5d924fb73db62a25ec
-
-[ftp://ftp.gnu.org/gnu/automake/automake-1.10.2.tar.bz2]
-md5=1498208ab1c8393dcbd9afb7d06df6d5
-sha256=c38ac9fe53d9492b0a0a02a8e691cd2c96d7f4cc13aedeedc6d08613b77e640f
-
-[ftp://ftp.gnu.org/gnu/automake/automake-1.10.tar.bz2]
-md5=0e2e0f757f9e1e89b66033905860fded
-sha256=2efebda5dd64fd52599a19564041d63dcaba68fafacc0080ffa6e8f0df8da697
-
-[ftp://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.bz2]
-md5=c2972c4d9b3e29c03d5f2af86249876f
-sha256=5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae
-
-[ftp://ftp.gnu.org/gnu/automake/automake-1.7.7.tar.bz2]
-md5=4323c25644ed092c3d4fdfef434ab28d
-sha256=d2c98fb12188461b0542bd928e91c3767db2cb6cd951a222b6c305bd99a75878
-
-[ftp://ftp.gnu.org/gnu/automake/automake-1.8.2.tar.bz2]
-md5=7a8138b29361baec06548e6a0ac63189
-sha256=e17e114a281ea38cd75d8908d75f8616a0ab8a893b1d048a1d8eb01e7e70605b
-
-[ftp://ftp.gnu.org/gnu/automake/automake-1.8.4.tar.bz2]
-md5=57f405a10fc5990ed6120fbbef3ab502
-sha256=be1d6f04743ceef1799a144f26080e299a352de68d86776688f0940e0e9d6718
-
-[ftp://ftp.gnu.org/gnu/automake/automake-1.9.2.tar.bz2]
-md5=b5799f983d0a062ec59810f6b289cd27
-sha256=8f0dfa44cdd55c2df211afa6baa386a5cdb06f9b9612ce7bd793811297710fbc
-
-[ftp://ftp.gnu.org/gnu/automake/automake-1.9.3.tar.bz2]
-md5=0ee08fb0ee48d20a4f8da99137340efd
-sha256=181b64e23c8e3f70191e5d7aec07c0ad02c90496367b2f3138a6fb73f27e05ff
-
-[ftp://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.bz2]
-md5=c11b8100bb311492d8220378fd8bf9e0
-sha256=8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d
-
-[http://avahi.org/download/avahi-0.6.15.tar.gz]
-md5=94dbd41336d18c47fc8213735a3fbf8e
-sha256=21dc28f464dbf158ad15dc5ee9d0bad78215ef5633086e55b7201294d5841da0
-
-[http://avahi.org/download/avahi-0.6.16.tar.gz]
-md5=3cbc460bbd55bae35f7b57443c063640
-sha256=794d4d1c485d4dc24659a25feb92706eb8bff4552333a1df83e856db123c36ce
-
-[http://avahi.org/download/avahi-0.6.17.tar.gz]
-md5=29ebb2181958d5721ee5fc45f035a77c
-sha256=2cb6a15a9fff56c0d24f3a95b7f67c52436a88716e640c7f7afd48c9a5cbd740
-
-[http://avahi.org/download/avahi-0.6.19.tar.gz]
-md5=a06782435d1c994ecd00a66e95a5d9d4
-sha256=a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a
-
-[http://avahi.org/download/avahi-0.6.20.tar.gz]
-md5=6acdff79afa2631f765f3bbbc3e25a74
-sha256=89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9
-
-[http://avahi.org/download/avahi-0.6.21.tar.gz]
-md5=9cc68f79c50c9dd9e419990c3c9b05b9
-sha256=d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561
-
-[http://avahi.org/download/avahi-0.6.22.tar.gz]
-md5=c84b1a8a23126e188426728710414dc8
-sha256=9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52
-
-[http://avahi.org/download/avahi-0.6.23.tar.gz]
-md5=aab1a304851d8145ea5f6a85c10af9e9
-sha256=dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d
-
-[http://avahi.org/download/avahi-0.6.24.tar.gz]
-md5=068c1d220b07037e64caf87d4a7a0504
-sha256=260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950
-
-[http://avahi.org/download/avahi-0.6.25.tar.gz]
-md5=a83155a6e29e3988f07e5eea3287b21e
-sha256=9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59
-
-[http://www.apache.org/dist/excalibur/avalon-framework/source/avalon-framework-api-4.3-src.tar.gz]
-md5=d4cffb4ba1d07bdc517ac6e322636495
-sha256=a4d56a053609ddfc77f6a42c3f15a11708d5e0eb29ffc60a40b87e4cc7331d47
-
-[http://downloads.sourceforge.net/avetanabt/avetanaBluetooth-20060413.tgz]
-md5=3cb3be404950ef08e51adbe59c7b811e
-sha256=c3648f02dd7d4dc8c0ef9a48089fda4ca47b81a977c838b17f55e6abf7f51447
-
-[http://heanet.dl.sourceforge.net/avetanabt/avetanaBluetooth-20060413.tgz]
-md5=3cb3be404950ef08e51adbe59c7b811e
-sha256=c3648f02dd7d4dc8c0ef9a48089fda4ca47b81a977c838b17f55e6abf7f51447
-
-[http://downloads.sourceforge.net/ppc-evtd/avr_evtd_1.7.2.release.tar.gz]
-md5=782600479e7967ab104309ee467b57b0
-sha256=bf52cccf8d4a36f75ba364310c602210498b7642951aed5b838de2750d347d22
-
-[http://heanet.dl.sourceforge.net/sourceforge/bacula/bacula-1.38.11.tar.gz]
-md5=0d6d6614afdc468d214de4e66f9f5a26
-sha256=d095165d256771c918b80f836feaf837aedc1362b2d67171013d3ab7ac5ee47f
-
-[http://olofson.net/download/ballfield-1.0.tar.gz]
-md5=cdb21380b0584db2a69ac10094bb97e1
-sha256=926688080fd75a8d6eab6c6ea1168dc03c591625c21af492ec0c13d816573516
-
-[http://talinux.fi.tal.org/pub/talinux/sources/balsa-2.0.17.tar.bz2]
-md5=851db68728ed9adea615eb2f249fa1ee
-sha256=c450b49ce9903d97ed5e4aa788b388e014c0eddcfc038b000237f67cd4528a3b
-
-[http://pawsa.fedorapeople.org/balsa/balsa-2.4.0.tar.bz2]
-md5=47d68219a5ee768f1ebd2502a9c3c6f2
-sha256=f34f8eabb463815adbf18d78883e2e61c5ad0020e087152a4c7a604fcd5754ea
-
-[http://pawsa.fedorapeople.org/balsa/balsa-2.4.1.tar.bz2]
-md5=2ad6ebb3f058e5fbe9ec5e0f0017db28
-sha256=06d9807c4135a468a5def531585ead9ea0948b206794e848efe234aa02df39d5
-
-[http://pawsa.fedorapeople.org/balsa/balsa-2.4.2.tar.bz2]
-md5=1eb90a92c089e194a595072a57c57394
-sha256=48bde6ff926fcc5d47853b87242cc890bdb21b5c74a2454a2b5c0269e9340090
-
-[ftp://ftp.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
-md5=5afcef5d6047f14cd5f65d2fdbd86fb2
-sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
-
-[ftp://ftp.nl.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
-md5=5afcef5d6047f14cd5f65d2fdbd86fb2
-sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
-md5=5afcef5d6047f14cd5f65d2fdbd86fb2
-sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
-
-[ftp://ftp.us.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
-md5=5afcef5d6047f14cd5f65d2fdbd86fb2
-sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
-
-[ftp://ftp.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.20.tar.gz]
-md5=1f93b419b35f0b0b2ae78cf3cb1ef491
-sha256=3f4f59d07af4fccdf6aed0822b25422ad7cfaee442a3ab870dc031f173d456f2
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/b/base-passwd/base-passwd_3.5.20.tar.gz]
-md5=1f93b419b35f0b0b2ae78cf3cb1ef491
-sha256=3f4f59d07af4fccdf6aed0822b25422ad7cfaee442a3ab870dc031f173d456f2
-
-[ftp://ftp.us.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.20.tar.gz]
-md5=1f93b419b35f0b0b2ae78cf3cb1ef491
-sha256=3f4f59d07af4fccdf6aed0822b25422ad7cfaee442a3ab870dc031f173d456f2
-
-[ftp://ftp.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.9.tar.gz]
-md5=2dd8ad238abcbab478db690085554d90
-sha256=a9d7ac67598b2b004a53a9e70592e0f274d3c8731ed9395ed704fd0259f0c0af
-
-[ftp://ftp.nl.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.9.tar.gz]
-md5=2dd8ad238abcbab478db690085554d90
-sha256=a9d7ac67598b2b004a53a9e70592e0f274d3c8731ed9395ed704fd0259f0c0af
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/b/base-passwd/base-passwd_3.5.9.tar.gz]
-md5=2dd8ad238abcbab478db690085554d90
-sha256=a9d7ac67598b2b004a53a9e70592e0f274d3c8731ed9395ed704fd0259f0c0af
-
-[ftp://ftp.gnu.org/gnu/bash/bash-3.0.tar.gz]
-md5=26c4d642e29b3533d8d754995bc277b3
-sha256=72d3f9d80fb4622e79ee5019314668b7bd6747182fa0928c8742002b7568586f
-
-[ftp://ftp.gnu.org/gnu/bash/bash-3.2.tar.gz]
-md5=00bfa16d58e034e3c2aa27f390390d30
-sha256=26c99025b59e30779300b68adb764f824974d267a4d7cc1b347d14a2393f9fb4
-
-[http://www.caliban.org/files/bash/bash-completion-20040711.tar.gz]
-md5=90ee706965dbf7b24515220d3bdc1f85
-sha256=8e4ddca8aa5ae4261bfcba056292aec4c8bf26fe847e01b67f4b3065fc512a54
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001]
-md5=d8e10c754f477e3f3a581af566b89301
-sha256=beda60ce6186fafa36cd0a98db9ced42cff68daee4342cca73167fb0f2f43eaa
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002]
-md5=d38a5288b2f0ea6c9ac76b66cc74ef7d
-sha256=a0ca49a3c47678ad074c990bdc871fcec680749b7f04f2def6527f04c589c40a
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003]
-md5=0b90d37911827d8cb95f3b4353cc225e
-sha256=7ec9e5e7e402e43b12bfd3a9237f4f171029fc7f58e59335abf3ccb455a5a84d
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-004]
-md5=8062f3a59631f58d78b180d83759b68a
-sha256=3de0938673637089c3b0f0f355de377bb2be2d3fca68053dda267ca11b5998f2
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-005]
-md5=585b5943fadf0875ced243b245adde58
-sha256=e7fecdecb12320cd6fe9aca83fab1828b76aeb5313b991883764cb9139d845b7
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-006]
-md5=1d5732e01ea938aeed42f3def131fa4d
-sha256=8f14f81ced32bc057bc10abf6842f4a5ac172816631f2b87a5a3be4f01c0847d
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-007]
-md5=dcd0cc5d801607827f7c851e72b0eabc
-sha256=6863a712e5a68eccfb77162a9f947ffd80af648f0124c38f795ebba2be12eff8
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-008]
-md5=bb3c7dd11198c0ab93d0e960bebf6256
-sha256=ccf303b4d199d89d5efc659235f8a645376e86d294260dda4becbb61ec06667b
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-009]
-md5=434a6f29b0ca5f1ab784b2437ae8eaed
-sha256=ef30c579419106b4b4a2d0064ef7e57ceee6cdf657f4ccd7b89c8e4fd70560d8
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-010]
-md5=2efff04dd246fcf63bd4b99f77c9a081
-sha256=bb7df9fefe88d62ee371353edf62402a667cffba6ea202aa1c8b220308a0c612
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-011]
-md5=1dd104342f6920dfaf5efb3131e922e0
-sha256=85bf656cfc49b1447b061341a4b1cb93ba89a41d8d1699a65aa971d1853ba472
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-012]
-md5=4f24b696ab78bdfae4f9cb7eb59b835d
-sha256=45ef4ad98f2f218aa3acec15842ae1b833769c1dbe2f90c9bba00bbe4949fc43
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-013]
-md5=7c40addbf1187a26ae1c8373ed383442
-sha256=9fbf893c383f45d25e5bc5c9eae8d2b349521f288945b3bd21c781784b81f693
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-014]
-md5=28e88c9f8679e99ac590d4a4a8227c56
-sha256=62bb1a4d70f6f7938ca70a6aa7fe6f4b377ab5f450c7756b22b41de3bbd98ed6
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-015]
-md5=7c17d29675bd0d49470f162774385f80
-sha256=de40425e83628eb7431f39340ac09b42b5fcf484a565352851961b3e917d8771
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-016]
-md5=a1edaa98b4449fe2205fa75448b7b105
-sha256=7abf66bbba3ebd6b6428190f3ebca59abdc0bfa3957f1a725489de7391c2d9f1
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-017]
-md5=889ed119bbf9d363660b9a0127f35efa
-sha256=951aa2a07b38db8eea8e7368d3ac36af60af7f5ade455215006229ce3815dfe0
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-018]
-md5=a7d3f85fa687d2c1b5a134839f6d395d
-sha256=c85e2bca6084a79774adbf801698c62905662836334e54355b77fbf1c529074c
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-019]
-md5=f0399da4007e46fc5820ce25d07425b9
-sha256=d83f1d740cb103be444589dcd9da61c2802815e8c256a01cfa7e484c50a9eb85
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-020]
-md5=b76602281c3104d904fd064510fe0c21
-sha256=3e66a1d05566d5501c2f868d3c94b8d71821a21d0daf9baaf594369697793013
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-021]
-md5=923374ae4403c92820f711e62e1d01a5
-sha256=a5e54704e6867c969a3e60556a5fbacedecca7404c3ddbe8180a92b6898a2a58
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-022]
-md5=c82d3bd14e373878b2a680dce18d1596
-sha256=057e03d593b858637056c0458b168e9c012db914727abba964afcaf377f2c5a4
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-023]
-md5=987c949a77b4b0ffe4a2597141e77635
-sha256=869466d80807cde59c0eab9a39ef1909be4d5e8698ea1e3daa530ad59baaa97a
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-024]
-md5=5a2b976e761ab83f0fc7daae11451b86
-sha256=d13c59fa6b182f79bbf9ba35f72085aeb755f9785985eaf9f4a55d58045fe327
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-025]
-md5=08668dc2825f65eced9cac6b09ce1b45
-sha256=abfc1e1db3af956d4e71deb6a1ea9de1164c49fca4020b2546df3aa56f08cebe
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-026]
-md5=f35b2b217f088ff009f956894550d41d
-sha256=07985caacd6c150cf89c51965bd18db2c89a9f32f7a2aa946757007409c292b9
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-027]
-md5=b5ff2b9610c61290f773c4b02cc1a37d
-sha256=79647e3af94db8c2e636a293ee5b2f12516560b12aac0d4568a125d36cd21ddf
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-028]
-md5=016f5b56c93404d32aea09385f0fc13e
-sha256=37289390175097c23efac5cb00d66b8b87e41fc37398064d11ac00de0e9934b0
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-029]
-md5=a81420626d4d88d0dce2ffac0ac56341
-sha256=1f4e543171bd66bc28b197938811028ea70e9e406be2529326d2a586844b98e7
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-030]
-md5=11f91baf970c132949f9072ee93f2ea6
-sha256=5ed6ca19787f2285e0c080056f65a137e053387380b3d8f6133812dd8f824afb
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-031]
-md5=f6bbc1e8ec0246740731c728ef476191
-sha256=81ddc8f45e3272dd0e463fab87b58058be28d9c867674f3f53432dbd25cdfa48
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-032]
-md5=8180ec936770579bce69f0816c2dd878
-sha256=926a9115e5c885ff9f2ef8abc6c3c552652afc370ebf65a87f41ec6810bdb569
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-033]
-md5=3cec33c3711860c4c6b7614afeec7870
-sha256=9d7abee640dafbcdc6b75544015f3ffb5ed5aed2747465ec1412e959d3966740
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-034]
-md5=7bc6c5b5f38b7027152f8db0458a2e14
-sha256=adc52e3427b606fe9649980b01c5b2b18f0509c4dd6d59a84f85b6a2989f9f8e
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-035]
-md5=a2db61fe90e39371d0e6cd2285ec9208
-sha256=d3d906b23fce195d5d6f0db8969fa5264e80a98b5460008d6a05e4156ca73953
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-036]
-md5=95c70c7ae9de5bd3659c86284be7fb76
-sha256=bdb24d65d1170234379fe587f5dc8b990c5e0c2d61c394bb8c81b91c1c64ce23
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-037]
-md5=62b876a3d7cd192cc8db2476fbb6b7b9
-sha256=9688a352c0fb23d2ce6e685ce39cda1c49f4aa7819bde2508ff8c90003f484df
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-038]
-md5=aca3afc341bd3e5a0d8a3b4ca40dbb3f
-sha256=0e3649531c3a5675743980ecf5ff5fcbca2801afe4dca7fb4b250aae7ac3b782
-
-[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-039]
-md5=e240c34f979b64bcb83c5f6567110bb1
-sha256=46d427fd5b1509ec7dd980c07efd88634fde61cf07ab221dcbde9e1021bd2817
-
-[http://downloads.open-mesh.net/batman/stable/sources/batman/batman-0.3.2.tar.gz]
-md5=3f2f6b408828d34c5c2f1445e744e6ac
-sha256=2b0f22efc1bda016649db8d6e1214e381d034befa9c9835c3a6a75d5f95cf931
-
-[http://downloads.open-mesh.net/batman/stable/sources/batman-0.3.tar.gz]
-md5=54812e81f70a4155edcce88f0c7aeb02
-sha256=846f34019c6f30bbb88790088a0e205c7a4e7ee0ab656a5ea3b4b624a0a028cb
-
-[http://downloads.open-mesh.net/batman/stable/sources/batman/batman-0.3.tar.gz]
-md5=54812e81f70a4155edcce88f0c7aeb02
-sha256=846f34019c6f30bbb88790088a0e205c7a4e7ee0ab656a5ea3b4b624a0a028cb
-
-[http://bazaar.canonical.com/releases/src/bazaar_1.2.tar.gz]
-md5=1fdb0aa41d7db06bf3429118d0136c8a
-sha256=d1b657f52dea785ce1b1a8b5acfdee4492c5d779422f9b58e145162e2d33c241
-
-[http://prdownloads.sourceforge.net/aa-project/bb-1.2.tar.gz]
-md5=1fdf51aeb20d908c29e39ddca2b3459c
-sha256=6714d9c1285fc04d39f03b85ebad3723be6f8709ca8935e984b280ac42e97492
-
-[ftp://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz]
-md5=d44b5dddebd8a7a7309aea6c36fda117
-sha256=4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33
-
-[http://software-dl.ti.com/dsps/dsps_public_sw/apps_processors/OMAP35x_AM35x_Video_Texture_Streaming/1_0/exports/bc-cat-0.1.0.tar.gz]
-md5=c7fdd6041ca823ebe95d1a6b1da12ba7
-sha256=daa948e966ba3aec698e45987e85fa6e1c3b3f54b55f117573c9e0f206d02c92
-
-[http://archive.apache.org/dist/jakarta/bcel/source/bcel-5.2-src.tar.gz]
-md5=905b7e718e30e7ca726530ecf106e532
-sha256=68039d59a38379d7b65ea3fc72276c43ba234776460e14361af35771bcaab295
-
-[http://people.openezx.org/wyrm/bcm2035-tool.tgz]
-md5=437a39c6008ea6987af1bbaf2252e7b9
-sha256=a2e482900eb45154653a692565d81ddeb4b59cd438628c1b14beb822499afef7
-
-[http://www.auto.tuwien.ac.at/~mkoegler/eib/bcusdk_0.0.4.tar.gz]
-md5=14138f457d6530bf45cf6a966fde9d5f
-sha256=4d5cec9ae2d45e17ef2f566cb84f6895ae49255c86aacebc5af40839f1b5c0e9
-
-[http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.0.tar.bz2]
-md5=41f4ac6760ef5e671ba8d4baa7236f12
-sha256=8c01b85eab01f35ed6bc9d597d4c6c76cf9ddbe2596d9120d66e66135df1f9a1
-
-[http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.1.tar.bz2]
-md5=9685fab33d39954ab8a0d22e0969d5a4
-sha256=aaaa45ab361781aebda2093fdc7eb5c187f6215b4ba308dd6b9ff2b727e805d3
-
-[http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.2.tar.bz2]
-md5=148f20d28caaa69bbe7dcca7c2674fb6
-sha256=11017f0dd637fd3228bd56fdbbd72193fd747c10d893a711c25bf6734c4da06b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.bz2]
-md5=f43667fcf613054cae0679f5dc5a1e7a
-sha256=59760e300acf5b616400d08ac97d8ea265dfbb872b6131c65eb6246c61654803
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.gz]
-md5=a0de7e91aada7a6fdca2c5fc52ba003e
-sha256=7967b6349c7467acd9208e0b8225a6d354475d5f18633a78eaa485afbcfc72c6
-
-[http://downloads.sourceforge.net/beecrypt/beecrypt-3.1.0.tar.gz]
-md5=1472cada46e2ab9f532f984de9740386
-sha256=50b574d330fecbc9faed81746a1abfcec903c264ae753ac64d4edf22c701519f
-
-[http://heanet.dl.sourceforge.net/beecrypt/beecrypt-3.1.0.tar.gz]
-md5=1472cada46e2ab9f532f984de9740386
-sha256=50b574d330fecbc9faed81746a1abfcec903c264ae753ac64d4edf22c701519f
-
-[http://johnath.com/beep/beep-1.2.2.tar.gz]
-md5=d541419fd7e5642952d7b48cbb40c712
-sha256=5c0445dac43950b7c7c3f235c6fb21f620ab3fd2f3aafaf09896e5730fcf49a1
-
-[http://xorg.freedesktop.org/releases/individual/app/beforelight-1.0.2.tar.bz2]
-md5=8bc2e35cdcd2e6a80eab1b77c41f2a46
-sha256=00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7
-
-[http://xorg.freedesktop.org/releases/individual/app/beforelight-1.0.3.tar.bz2]
-md5=d55b0e7196dafcfeb4db3886af2e1969
-sha256=cae9427fa083a0ec3f2d1a3a6391508b31a2cf0220cb8d732c5d473a8c995c4e
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/beforelight-X11R7.0-1.0.1.tar.bz2]
-md5=e0326eff9d1bd4e3a1af9e615a0048b3
-sha256=76c42ee8e503a34b2a95fff59bc00e342f9a8f69e677ba63123f5f53cd41ce18
-
-[http://www.fftw.org/benchfft/benchfft-3.1.tar.gz]
-md5=9356e5e9dcb3f1481977009720a2ccf8
-sha256=1b4a5b5e48ad5e61a21586b7b59d5c0a88691a981e73e2c6dc5868197461791b
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/bfd-hash-tweak.patch]
-md5=b12426fd72bedf00c389a7fb458275a8
-sha256=5a4a5b82dd8f485b4fef941cc216eb052184cf138f72b512eb62d836b460acdb
-
-[http://downloads.sourceforge.net/bftpd/bftpd-2.3.tar.gz]
-md5=4ab1eb33135fa5eaaf050e6d3dd0b319
-sha256=0af27ca6c49f696c64bcfb3e50452cad240997993e0b7afb65624898d3d95ff2
-
-[http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_480p_surround-fix.avi]
-md5=ed7ed01e9aefba8ddd77c13332cec120
-sha256=40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db044634f
-
-[http://mirror.bigbuckbunny.de/peach/bigbuckbunny_movies/big_buck_bunny_720p_surround.avi]
-md5=0da8fe124595f5b206d64cb1400bbefc
-sha256=b957d6e6212638441b52d3b620af157cc8d40c2a0342669294854a06edcd528c
-
-[http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.0.2.tar.bz2]
-md5=95c29d9d10bf2868996c0c47a3b9a8dc
-sha256=30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee
-
-[http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.1.0.tar.bz2]
-md5=d30c5dbf19ca6dffcd9788227ecff8c5
-sha256=4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/bigreqsproto-X11R7.0-1.0.2.tar.bz2]
-md5=ec15d17e3f04ddb5870ef7239b4ab367
-sha256=69d82eff84b1cef08a30e3a79de26df0bce7f531a86d2144ee0d5e43fc21ce86
-
-[ftp://ftp.isc.org/isc/bind9/9.3.1/bind-9.3.1.tar.gz]
-md5=9ff3204eea27184ea0722f37e43fc95d
-sha256=9a9411115338d2554f2e99bc676c2e9a381a8d649bf9bd9c0b2ffa2cf74b563c
-
-[ftp://ftp.isc.org/isc/bind9/9.3.4-P1/bind-9.3.4-P1.tar.gz]
-md5=51007c8f185cd5a9b2e57f70073bf25b
-sha256=f5cf38954e9b973cda204ff13cfd6d433ac307a8e5c4e7f6d978483becda842c
-
-[ftp://ftp.isc.org/isc/bind9/9.3.5-P1/bind-9.3.5-P1.tar.gz]
-md5=1446984f552b18a0ff7db63971a0cb5a
-sha256=8bd6b53f5a2c5f0332aaba9a51ef3d7fc55c60f906f0c506e11b6600ed82a90b
-
-[ftp://ftp.isc.org/isc/bind9/9.3.6/bind-9.3.6.tar.gz]
-md5=58ea86efa5d20ffc282ef2e1690dc484
-sha256=275f4d19b8af8bbc93eda9d8532c21d32cd30195db82f15f10916c02416f9f03
-
-[http://fgouget.free.fr/bing/bing_src-1.1.3.tar.gz]
-md5=0ccd96cc01351c0562f1e4b94aaa2790
-sha256=3151893aa5597491b7cb7083b4e786017b522cac55dffacbe475c9abdd7fe61a
-
-[http://kernel.org//pub/linux/devel/binutils/binutils-2.14.90.0.6.tar.bz2]
-md5=71b99dba3045a359dc314dbebedcf502
-sha256=6f75f36f35d16fd1fdc6600926af3ceaaa3bdca4e91ae3bf22891594afa0116e
-
-[http://kernel.org/pub/linux/devel/binutils/binutils-2.14.90.0.6.tar.bz2]
-md5=71b99dba3045a359dc314dbebedcf502
-sha256=6f75f36f35d16fd1fdc6600926af3ceaaa3bdca4e91ae3bf22891594afa0116e
-
-[http://kernel.org//pub/linux/devel/binutils/binutils-2.14.90.0.7.tar.bz2]
-md5=b5b1608f7308c487c0f3af8e4592a71a
-sha256=204c2624b5712a3482d0e774bb84850c1ee6b1ccdfd885abfe1f7c23abf4f5c0
-
-[http://kernel.org/pub/linux/devel/binutils/binutils-2.14.90.0.7.tar.bz2]
-md5=b5b1608f7308c487c0f3af8e4592a71a
-sha256=204c2624b5712a3482d0e774bb84850c1ee6b1ccdfd885abfe1f7c23abf4f5c0
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/binutils-2.15-psignal.patch]
-md5=c59d06f1874732814eef3371e2dee72b
-sha256=e8df35e97d6789fd34268e8c2e4daba8aa17e7bf6f0432f6ea8123a2e344363c
-
-[http://ftp.kernel.org/pub/linux/devel/binutils/binutils-2.15.94.0.1.tar.bz2]
-md5=4a4cde8e5d0c97249bf6933f095813fe
-sha256=c4ad801a7ed5a4e3d5d943d73c82f0af75998c95b69184dc884460bf40e48ee9
-
-[http://kernel.org//pub/linux/devel/binutils/binutils-2.15.94.0.1.tar.bz2]
-md5=4a4cde8e5d0c97249bf6933f095813fe
-sha256=c4ad801a7ed5a4e3d5d943d73c82f0af75998c95b69184dc884460bf40e48ee9
-
-[http://kernel.org/pub/linux/devel/binutils/binutils-2.15.94.0.1.tar.bz2]
-md5=4a4cde8e5d0c97249bf6933f095813fe
-sha256=c4ad801a7ed5a4e3d5d943d73c82f0af75998c95b69184dc884460bf40e48ee9
-
-[ftp://ftp.gnu.org/gnu/binutils/binutils-2.16.1.tar.bz2]
-md5=6a9d529efb285071dad10e1f3d2b2967
-sha256=351a6846ee179a37ed87a487971547159a7f4f92a1dec598c727f184a0de61ae
-
-[http://kernel.org//pub/linux/devel/binutils/binutils-2.16.91.0.6.tar.bz2]
-md5=00ef9f1429d5f18702d08552f5c09441
-sha256=7cffa91af850d3fd5f086e3690eae05c1d9d5ad82f915b36f0de920a3c9920be
-
-[http://kernel.org/pub/linux/devel/binutils/binutils-2.16.91.0.6.tar.bz2]
-md5=00ef9f1429d5f18702d08552f5c09441
-sha256=7cffa91af850d3fd5f086e3690eae05c1d9d5ad82f915b36f0de920a3c9920be
-
-[http://ftp.kernel.org/pub/linux/devel/binutils/binutils-2.16.91.0.7.tar.bz2]
-md5=26c3fddb07bfe3128d2e09e628eb33a0
-sha256=af9cfdde06693ecaaf3b558e6a66e7245d04cb981812ce06d023de868aa92b41
-
-[http://kernel.org//pub/linux/devel/binutils/binutils-2.16.91.0.7.tar.bz2]
-md5=26c3fddb07bfe3128d2e09e628eb33a0
-sha256=af9cfdde06693ecaaf3b558e6a66e7245d04cb981812ce06d023de868aa92b41
-
-[http://kernel.org/pub/linux/devel/binutils/binutils-2.16.91.0.7.tar.bz2]
-md5=26c3fddb07bfe3128d2e09e628eb33a0
-sha256=af9cfdde06693ecaaf3b558e6a66e7245d04cb981812ce06d023de868aa92b41
-
-[ftp://ftp.gnu.org/gnu/binutils/binutils-2.16.tar.bz2]
-md5=bcb9fabaf0eaf91bd38c4ee148658df8
-sha256=5645c3371aac47cbbcc1354eab10ec32777837d7cb4ba47b94c9043612b12f36
-
-[http://ftp.gnu.org/gnu/binutils/binutils-2.16.tar.bz2]
-md5=bcb9fabaf0eaf91bd38c4ee148658df8
-sha256=5645c3371aac47cbbcc1354eab10ec32777837d7cb4ba47b94c9043612b12f36
-
-[http://downloads.sourceforge.net/mingw/binutils-2.17.50-20060824-1-src.tar.gz]
-md5=64905b00a89f4e7ba3b3991c89ba59a4
-sha256=1e041ad002aa2f7a06624afcb4a9832085c63abe0a9551cdbc40522aac18871a
-
-[http://kernel.org//pub/linux/devel/binutils/binutils-2.17.50.0.1.tar.bz2]
-md5=cfecfb29e260225fa192654f3763c2f8
-sha256=9a56b06e4f533745e9b7cde5b170f905f74d130b899f48498cbd6d376c664b7a
-
-[http://kernel.org/pub/linux/devel/binutils/binutils-2.17.50.0.1.tar.bz2]
-md5=cfecfb29e260225fa192654f3763c2f8
-sha256=9a56b06e4f533745e9b7cde5b170f905f74d130b899f48498cbd6d376c664b7a
-
-[http://kernel.org//pub/linux/devel/binutils/binutils-2.17.50.0.12.tar.bz2]
-md5=6f3e83399b965d70008860f697c50ec2
-sha256=7360808266f72aed6fda41735242fb9f1b6dd3307cd6e283a646932438eaa929
-
-[http://kernel.org/pub/linux/devel/binutils/binutils-2.17.50.0.12.tar.bz2]
-md5=6f3e83399b965d70008860f697c50ec2
-sha256=7360808266f72aed6fda41735242fb9f1b6dd3307cd6e283a646932438eaa929
-
-[http://kernel.org//pub/linux/devel/binutils/binutils-2.17.50.0.5.tar.bz2]
-md5=00eccd47e19a9f24410a137a849aa3fc
-sha256=bbfa06ee0173c5e9ae65ff14ba29502ddf4e355ac3419f88e3346299cfaf4e19
-
-[http://kernel.org/pub/linux/devel/binutils/binutils-2.17.50.0.5.tar.bz2]
-md5=00eccd47e19a9f24410a137a849aa3fc
-sha256=bbfa06ee0173c5e9ae65ff14ba29502ddf4e355ac3419f88e3346299cfaf4e19
-
-[http://kernel.org//pub/linux/devel/binutils/binutils-2.17.50.0.8.tar.bz2]
-md5=1441fe6fa44b344d0575cb66d3f89252
-sha256=016b0faa1bbe20c13a4b5f495a5a4071349f6385012b767c89bb908452faecf2
-
-[http://kernel.org/pub/linux/devel/binutils/binutils-2.17.50.0.8.tar.bz2]
-md5=1441fe6fa44b344d0575cb66d3f89252
-sha256=016b0faa1bbe20c13a4b5f495a5a4071349f6385012b767c89bb908452faecf2
-
-[http://ftp.gnu.org/gnu/binutils/binutils-2.17.tar.bz2]
-md5=e26e2e06b6e4bf3acf1dc8688a94c0d1
-sha256=e2c33ce6f23c9a366f109ced295626cb2f8bd6b2f08ff9df6dafb5448505a25e
-
-[http://kernel.org/pub/linux/devel/binutils/binutils-2.18.50.0.7.tar.bz2]
-md5=d5bce238060d631be60a3f1f1009a7ba
-sha256=6fe3c4b2d45a50582f832bc77deb4e3da74a15ea8e09dbb214b9c44e7c3378fc
-
-[ftp://ftp.gnu.org/gnu/binutils/binutils-2.18.tar.bz2]
-md5=9d22ee4dafa3a194457caf4706f9cf01
-sha256=487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b
-
-[http://downloads.sourceforge.net/mingw/binutils-2.19.1-src.tar.gz]
-md5=ad3f2b5fdcd599a772ad75fec2c384d8
-sha256=2df529b1ac0a621efb87b5b53dbc0167c566f8bebbd6a8ce19964b05845fd2e7
-
-[ftp://ftp.gnu.org/gnu/binutils/binutils-2.19.1.tar.bz2]
-md5=09a8c5821a2dfdbb20665bc0bd680791
-sha256=3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6
-
-[http://kernel.org/pub/linux/devel/binutils/binutils-2.19.51.0.3.tar.bz2]
-md5=c55a2b1eadf818d38e963060412fadca
-sha256=11a53d332d2295f447ab49402a34d82875bbf5da8dc239ebb909eafdf3c26a36
-
-[ftp://sourceware.org/pub/binutils/snapshots/binutils-2.19.51.tar.bz2]
-md5=fd59f36022f6ea802d1c844a2576e616
-sha256=52f350e2844e87f9e3bb60ade650ad806d020aafa66248ec2a55313d62ed60e4
-
-[ftp://ftp.gnu.org/gnu/binutils/binutils-2.19.tar.bz2]
-md5=17a52219dee5a76c1a9d9b0bfd337d66
-sha256=bd2ea10ffc2bf62a917b05f4fbe3d02212589c2bc177fa0c51a9c874d3da528a
-
-[ftp://ftp.gnu.org/gnu/binutils/binutils-2.20.tar.bz2]
-md5=ee2d3e996e9a2d669808713360fa96f8
-sha256=e1df09f0aa3b50154ef93bfefe86d65d01c22cfb44d73299ad95e772133a75b0
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/binutils-skip-comments.patch]
-md5=73e76bdd997fa945d71edcfbdd356c15
-sha256=18f72b922a9a346f6c43b20fd86eba76cfd27a8d118ea32fa879050ddebe0267
-
-[http://install.source.dir.com/bios_setuplinux_5_33_02.bin]
-md5=64f61b08d091625c0912cb9de33242af
-sha256=506e07715028811b8d945c85c54ae07bc33bdd8afff1611cbb30d154ba86d04e
-
-[http://install.source.dir.local/bios_setuplinux_5_33_02.bin]
-md5=64f61b08d091625c0912cb9de33242af
-sha256=506e07715028811b8d945c85c54ae07bc33bdd8afff1611cbb30d154ba86d04e
-
-[http://install.source.dir.com/bios_setuplinux_5_33_04.bin]
-md5=fcffe1618f20024fd6580f47cdc0059b
-sha256=2c1e7feec569a19d3093b136da6aa03574f94052810fe7a78cc81eb37adda24b
-
-[http://install.source.dir.local/bios_setuplinux_5_33_04.bin]
-md5=fcffe1618f20024fd6580f47cdc0059b
-sha256=2c1e7feec569a19d3093b136da6aa03574f94052810fe7a78cc81eb37adda24b
-
-[ftp://ftp.gnu.org/gnu/bison/bison-2.0.tar.gz]
-md5=c17f964fd5504b88b07a183420de25e3
-sha256=31b816846903d319a6f6cd1c9aada5ff83914206cb7df69c235ae909785109a1
-
-[ftp://ftp.gnu.org/gnu/bison/bison-2.3.tar.gz]
-md5=22327efdd5080e2b1acb6e560a04b43a
-sha256=52f78aa4761a74ceb7fdf770f3554dd84308c3b93c4255e3a5c17558ecda293e
-
-[http://download.berlios.de/bitbake/bitbake-1.6.2.tar.gz]
-md5=1e80b2a4e0d17aba3e377b3ee140ab5e
-sha256=a226f7b37694669aa6efe6c30462e2d44f5881ca70604dac15c23fce66992872
-
-[http://download.berlios.de/bitbake/bitbake-1.8.12.tar.gz]
-md5=01f6404d96cfa1d165d07921d754271e
-sha256=ee81df164f8476dfe44c1841a27b3a0db49dea382c38d5ffb7e19a4747ca17af
-
-[http://download.berlios.de/bitbake/bitbake-1.8.6.tar.gz]
-md5=0e0dacaae704aed08a940389250e61e9
-sha256=fd8a9e9e916314f9385f497d1f9b81d0885487f7741ad7be790972f44fc68b25
-
-[http://get.bitlbee.org/src/bitlbee-1.0.4.tar.gz]
-md5=b92e301930e2322a86b73b1f6c857674
-sha256=6f23f37ea641d67e56c61b70d3ac7d404243929c393302ead4758d4ffe6d5b1c
-
-[http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.2.tar.bz2]
-md5=78e8ab5c1830e2cdfbff7a952162a5a7
-sha256=83719927ac4309f42e3cadde125a52cfba2e9c951115ac4c017f292f6e4c14bc
-
-[http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.3.tar.bz2]
-md5=98200c358e5401d648b980564d9ae39d
-sha256=863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41
-
-[http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.4.tar.bz2]
-md5=7d0c1ac193be2491c72a91ccf37ef18e
-sha256=2517aaa015795a348435e4e83bafe7642d4b2fe1976ee982a5d652cf417f79d8
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/bitmap-X11R7.0-1.0.1.tar.bz2]
-md5=bbb3df097821d3edb4d5a4b2ae731de6
-sha256=ac6a5c3f4aa88f39e8f04fe43f00972f0235674ac3edb994c70ac802a1ed0219
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/bitmap-X11R7.1-1.0.2.tar.bz2]
-md5=5a6228512bcce7d9fabe8fc2d66269bf
-sha256=5cd1a5aeace83a9305f7221e9ec95127b5a26870c619fd00ae48f1962d59f48b
-
-[http://downloads.sourceforge.net/blackboxwm/blackbox-0.70.1.tar.gz]
-md5=2d173b95ca5e64ef478c6a5d2deee9df
-sha256=e394561d4426cf17e21eb5cc32e2972eb1af92d04a41808a41b1fb95320bd659
-
-[http://heanet.dl.sourceforge.net/blackboxwm/blackbox-0.70.1.tar.gz]
-md5=2d173b95ca5e64ef478c6a5d2deee9df
-sha256=e394561d4426cf17e21eb5cc32e2972eb1af92d04a41808a41b1fb95320bd659
-
-[http://www.blassic.org/bin/blassic-0.10.1.tgz]
-md5=ca1339d71c8bf2779613afefc5384b0a
-sha256=61e6e02a86d2da53e407b0a3724ed554fe2c85bab6775ae68e2e92a83e466406
-
-[ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4.orig.tar.gz]
-md5=62edc09c9908107e69391c87f4f3fd40
-sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
-
-[ftp://ftp.nl.debian.org/debian/pool/main/b/blktool/blktool_4.orig.tar.gz]
-md5=62edc09c9908107e69391c87f4f3fd40
-sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/b/blktool/blktool_4.orig.tar.gz]
-md5=62edc09c9908107e69391c87f4f3fd40
-sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
-
-[ftp://ftp.us.debian.org/debian/pool/main/b/blktool/blktool_4.orig.tar.gz]
-md5=62edc09c9908107e69391c87f4f3fd40
-sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
-
-[http://download.tuxfamily.org/blueman/blueman-1.10.tar.gz]
-md5=f9058305c42038678d5023fcabba22a4
-sha256=f4a92834a538dc9dbb93fde76933e849b24639faa1721b24549f209b8b590f71
-
-[http://download.tuxfamily.org/blueman/blueman-1.21.tar.gz]
-md5=26b70341b3d3da28da62c917c8b20377
-sha256=86200dab50b1595c9a9537586c07de90ccfa084b954bb74f3e8732cc000fe3af
-
-[http://gpe.linuxtogo.org/download/source/blueprobe-0.13.tar.gz]
-md5=33745b0e86603124654773c1361df33e
-sha256=b4318d0e1ba7422ba4415838448718e037efe4d8236cf12132075ccf36d1803d
-
-[http://gpe.linuxtogo.org/download/source/blueprobe-0.14.tar.gz]
-md5=66fe515418b39103d6b985762be7a28d
-sha256=ee48eb2d5cd06247697e4651f19d8ab671f59798cf58348a67d3ec556b2bdc8c
-
-[http://gpe.linuxtogo.org/download/source/blueprobe-0.15.tar.gz]
-md5=3fcec51fae99527473b2bedbd5869a4d
-sha256=9473a68a4202d0df5c6883a6d0045447afda1af8d13969038afdc13291989376
-
-[http://gpe.linuxtogo.org/download/source/blueprobe-0.16.tar.gz]
-md5=3c07786b7811c0bd6f3887ac389cce13
-sha256=01b3fd44ff335df5cc5c43628676c94c75fbd6fd897cd2802c99fcc91b57d383
-
-[http://gpe.linuxtogo.org/download/source/blueprobe-0.17.tar.gz]
-md5=a3b637d2aee211800b066493f6ae5ae0
-sha256=63eda6008b0c7a422e1b4fdda91b594d936188c29af49379447cb7fb445965d6
-
-[http://gpe.linuxtogo.org/download/source/blueprobe-0.18.tar.gz]
-md5=174a1f2c9ffea150c7abe4becd99f2cd
-sha256=5980de18e195be06f99afbc76f3c72e7ef7dbba03f16814351d20b8a2531c474
-
-[http://www.alighieri.org/tools/bluesnarfer.tar.gz]
-md5=ee1fcf2e12b74e8cf65f43cdd2c47b72
-sha256=5cff4c3269cf006bef9f66ec0a788139689425b96c6d7c60024f0841632b065b
-
-[http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/bluetooth.patch]
-md5=d76dbdbb59924ace618e48fbddbf3365
-sha256=eaa1a9746a4613a75a9fe9fc0c54a724758b899c5a898b8b50578066d8a82ead
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.24.tar.gz]
-md5=f8b14e9d87dfe9fa56a7549b16e0cf3e
-sha256=ad1cbca751301b5b8c735509b905bf7642de6110ec3dda939153cbb9df6db8cb
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.27.tar.gz]
-md5=4f0bd19dd04a32eba6149b82b26c3f30
-sha256=9e042fcf2d29a58bd60fe3743130095992c62da4c865d01e6fea2d8d6d20583a
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.29.tar.gz]
-md5=9198f428277693c16c212910996075b4
-sha256=4fe29e8b7c28e6802853867531307704a78f69f37a09d7565268141a2a462644
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.30.tar.gz]
-md5=f6a4b58907a6bec424247ee572d43a2c
-sha256=5a2e6e83062699fb01babfb5b211054e01dde097d3b31767135be5447bb05bde
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.31.tar.gz]
-md5=53a3347a1c38971bee4c4016b45bcf6d
-sha256=f6cfceb541a10849805f853b790bc8343309e7b21078a9c18a7a6a8cf2f94e3b
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.34.tar.gz]
-md5=2435f7a932cdeecce01211e06142795f
-sha256=1c46b6e219aec9bbd3286e9366de7e6dd05f68ed33b7487fbd211397c890fc40
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.35.tar.gz]
-md5=5919d6383cd9446f8b90fdca748dc961
-sha256=e5e592de95f50a1569d3e4a95c8b955a2535e265e24869e3ce30e19b0949b465
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.37.tar.gz]
-md5=c1106f56f8e5562cf7c49d3455d2c5f7
-sha256=2bfc5db7703cbcaaa4be2576609136450e1dac5d4782707dd0dc81754e3c2489
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.39.tar.gz]
-md5=ba06291b737077332e914d6d653501c6
-sha256=924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.40.tar.gz]
-md5=a25fa37c97c309338649f6a5fd4cea76
-sha256=1208d8e986f8b545659db21c8220ec28b48979627158123dd9018f9733d858d2
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.41.tar.gz]
-md5=4629236517df280be321f009917a52be
-sha256=0b22f518085528b71aa9eab8bbc44d2696458c85d902c6a6686076ae10d64549
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.42.tar.gz]
-md5=d24dfd3ca42847123e29f58b29af6948
-sha256=ed7631a6d22b456eb26b881bdbe46ea47f93d2f192da420408bad4bbc245f796
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.46.tar.gz]
-md5=ed24b291e9a724a37bc8e9d04adae413
-sha256=31f058fb722dfb96a7b496a064e0c46d634d7dffdd5b64c7dce3ab6ec2fa48bc
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.47.tar.gz]
-md5=b54a199004b578ec5652014a5e62aeaa
-sha256=830bb7da6836b0c709abee212ed8387e1ad8cd7087ed0b925fad3d16b0113b76
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.53.tar.gz]
-md5=432509193ea508da5ce23fe056625d0f
-sha256=bef741e8538f99baad6c32b4026cdecc636e8fa0c9f549542a4451e0987ceccf
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.56.tar.gz]
-md5=92ea2e86a5489f0d16567920f2ec9b36
-sha256=24c8ce0626edb9ef8799a95ecfc252635842038242fba8fe90301f1e0eabfb8b
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.59.tar.gz]
-md5=1c7cee215bc84656b1edee019cee78f5
-sha256=c1f4496a1c23038fc7924d0b3eaf83c6dfb22611196e2d07d4a81efef8ca55e5
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
-md5=2aa806940d2c841e57a9b2ab7302b750
-sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
-
-[http://bluez.sourceforge.net/download/bluez-gnome-0.14.tar.gz]
-md5=7c4106e6932683c12c1e30bfb166c13d
-sha256=cdc6ceea80bb1f3d951deae17dbb2854a13c214ac5f452765650d59c9014ffe6
-
-[http://bluez.sourceforge.net/download/bluez-gnome-0.26.tar.gz]
-md5=d1e68cf63458472eaeb70ef1b3f1df5d
-sha256=e03a131c26f1f1c51b8cadb4e68db8a3d0f64c43b4aefc706b07129336ebe5c2
-
-[http://bluez.sourceforge.net/download/bluez-gnome-0.6.tar.gz]
-md5=54334e3d7af70846eb4916191e46081c
-sha256=056ec158ea09b6be8b9ea07f37d8b58f6dec28da6dcb33f789ce9b3f932eb7cd
-
-[http://www.kernel.org/pub/linux/bluetooth/bluez-gnome-1.8.tar.gz]
-md5=7f34a08e36aa77d4476d0919c52b59b6
-sha256=481b48f3cde1f896650195b75c25994df11eca05bb6e8d1951a46b603228811a
-
-[http://bluez.sourceforge.net/download/bluez-hcidump-1.26.tar.gz]
-md5=6eca8534fd6f0384d29f04198363f19c
-sha256=cd016375e9082268af224b26891cbea162fac5cf83a984f3e3988e6cee380a56
-
-[http://bluez.sourceforge.net/download/bluez-hcidump-1.29.tar.gz]
-md5=4e72efe8b67c3558eb776ad14e60de3e
-sha256=b80b0d399cf962946130e70c864ddc3477b0ce8878943a48cf211199fddf556a
-
-[http://bluez.sourceforge.net/download/bluez-hcidump-1.31.tar.gz]
-md5=505a0843eccfea4e4467304d63be8396
-sha256=c3ac791dfdfb03af20ea649ecedd8918bfb18d4113e0ca508c5db2338d2171a3
-
-[http://bluez.sourceforge.net/download/bluez-hcidump-1.32.tar.gz]
-md5=3320121113cf31fe9180470edff2c71d
-sha256=75bbccac0596d42e3cba1c0d3fa2c9502a175eb600f8b4e8c476dec40a09e1d6
-
-[http://bluez.sourceforge.net/download/bluez-hcidump-1.33.tar.gz]
-md5=58fff2bc38594fe8ab0803f66cce2325
-sha256=f25791ae3c83fe739a3c810c5fe0d7ac3e2ed02df9d3a65edff382703f5d2c65
-
-[http://bluez.sourceforge.net/download/bluez-hcidump-1.40.tar.gz]
-md5=c5793b79c3e7fea3a367c08c26c8e23c
-sha256=00dbb7513115d2fcdb7ca3bd777e4bc38e5ed80964fec2d1454e4acadc950094
-
-[http://bluez.sourceforge.net/download/bluez-hcidump-1.42.tar.gz]
-md5=5704737aaf72104eeaf77335218a1827
-sha256=689e39f9432ab90af5f390d86cb46e06c35693d01ea29aec4e41c4f9e315f49f
-
-[http://bluez.sourceforge.net/download/bluez-libs-3.18.tar.gz]
-md5=9e091f2ce00b906c4c456fff24e69e55
-sha256=fe6de9ccfab9e9fbdbe1a2cbe4a9ea771d1a2efc7f2122a2350214394587ff39
-
-[http://bluez.sourceforge.net/download/bluez-libs-3.20.tar.gz]
-md5=9d7e02ea9a4c43d8f030500f282ee8bf
-sha256=cf37ac1eb3ec0c473e527f11f068fc5fcc7452d688acc89a0e52553f51fc36bb
-
-[http://bluez.sourceforge.net/download/bluez-libs-3.22.tar.gz]
-md5=b3bf8c92ed05633503be8a85d9785452
-sha256=d4e47060a4ba12f86d490891dd2e0cdf44aa02c11cd16be3e7d5362c4dcff95e
-
-[http://bluez.sourceforge.net/download/bluez-libs-3.23.tar.gz]
-md5=8f0368c6213abef36f1e563b44b2eed4
-sha256=3ea7817c91b8cff9cacba23392f4a4163412d92ee09236997622e0d19cad884e
-
-[http://bluez.sourceforge.net/download/bluez-libs-3.30.tar.gz]
-md5=60d48b5b83d98718ea642a887fa59b0b
-sha256=3eb55f212f554bdd6f41c10df8966e4ae90d89154756ffad396027c859d1e7b6
-
-[http://bluez.sourceforge.net/download/bluez-libs-3.33.tar.gz]
-md5=4b3403f1c61f7b7758cabf1ac5cb5092
-sha256=04ad733f88662470906a6f0d9894f670a07573f7f7d2698c5ada70b3ae1ba3da
-
-[http://bluez.sourceforge.net/download/bluez-libs-3.36.tar.gz]
-md5=8c2ca546c0e7bb73dbd0e906fce7f6b1
-sha256=692f994d8479143c18e781f9afa6c8265770a5affbf2e6147edc70b78aa3bfae
-
-[http://bluez.sourceforge.net/download/bluez-libs-3.4.tar.gz]
-md5=8b73b0ccbcef6a4270468487b1309990
-sha256=6c40f8b2dcf9359cc7f6afa803fc5744652c1d95669c134b975758a8748a87e8
-
-[http://bluez.sourceforge.net/download/bluez-libs-3.7.tar.gz]
-md5=d384893177b4241462a591668cc439d6
-sha256=c8a8f3ccb1e64cdd6701d0e0d2ab61dd132e5dce2f55a8b86f397d5013446d2e
-
-[http://bluez.sourceforge.net/download/bluez-libs-3.8.tar.gz]
-md5=9f55aa8445f26500a8500ed23c9cd971
-sha256=66c806ead70b1cc1f517071ea27a452097987de7d70fb171155084ae25e9b224
-
-[http://bluez.sourceforge.net/download/bluez-libs-3.9.tar.gz]
-md5=53275e1824886368f11f586899707e08
-sha256=8e722a732f53c070ad68b7a70f8e9568eeb186558af68334571917a11f40cb0e
-
-[http://bluez.sourceforge.net/download/bluez-utils-3.18.tar.gz]
-md5=2b6b4d519b8f75ef3990122934e660ba
-sha256=f8f242c6835ae826bf1f4eaee6c50d47d6208715e45450ba42c1769094c3f296
-
-[http://bluez.sourceforge.net/download/bluez-utils-3.20.tar.gz]
-md5=ef596746d656ed034ed64596f72ef3c2
-sha256=5ed4245e31fa43789a3090d02a25ed90eaee95819cce30cda59d4d09f4fc0db0
-
-[http://bluez.sourceforge.net/download/bluez-utils-3.22.tar.gz]
-md5=c183dedb12c79433adfaa102dce2b0d4
-sha256=9189908fbb4ef68fc7c7353cbe31e2bada51b3021912e005d549fe03d1729f71
-
-[http://bluez.sourceforge.net/download/bluez-utils-3.23.tar.gz]
-md5=767ad814bff4e1806f873ecf2434ba89
-sha256=4f3d52cc207e438018b3a4c307d9969862bf25c35b1e281c0d6201b624acd103
-
-[http://bluez.sourceforge.net/download/bluez-utils-3.30.tar.gz]
-md5=3d17bb712d243bb1b316f7e8a909fa82
-sha256=9ffeaa94b862edb7e753a2f97f50b872435a7d5fe9135f24690733a777e85ecb
-
-[http://bluez.sourceforge.net/download/bluez-utils-3.33.tar.gz]
-md5=2e02aabd1a48998a48a22797f59ccf14
-sha256=c9e8f3aa3a34a558293faa1cb2b2204061852d045aaa5311bb1481f89751ab1d
-
-[http://bluez.sourceforge.net/download/bluez-utils-3.36.tar.gz]
-md5=4fc292b635ba7b442c7aaf5680199012
-sha256=d5781c9b6604c63720020169df4081c364f3f8e79df951db0421e89667fb891d
-
-[http://bluez.sourceforge.net/download/bluez-utils-3.4.tar.gz]
-md5=f63b440396baee7dee9259395a205d48
-sha256=44a50104072a39e4f941ab68b6ffce5feb2fec7a94f3dd32f0945939d09eca39
-
-[http://bluez.sourceforge.net/download/bluez-utils-3.7.tar.gz]
-md5=89f7290907d098163a2fa59a55dfafe7
-sha256=919dc824fb702b398cbcfb00597eae278e8934e603c4f30b0f099231a29554b0
-
-[http://bluez.sourceforge.net/download/bluez-utils-3.8.tar.gz]
-md5=2e73f6398d834035f35941b31716b276
-sha256=c98be5f123fc410b3cf970f184ca136720d75a1f8c19ce45ace7dc6f258e76e8
-
-[http://bluez.sourceforge.net/download/bluez-utils-3.9.tar.gz]
-md5=023a5e6a436f86a28baeec91e4c62736
-sha256=e3daae6c2647ac8beed0f616f21c1c815deaec5e6eb661fb8cb1955f1ad4c9fe
-
-[http://bugcommunity.com/downloads/files/bmi_mdacc-1.0.tar.gz]
-md5=ee9dd3f5afb7b4508ee870c4c8035b09
-sha256=b0e65fa275afd2569b818f69430816a4fd4c03e27ff9ac184d95e893bbd5586e
-
-[http://people.suug.ch/~tgr/bmon/files/bmon-2.1.0.tar.gz]
-md5=3111a027907016c0902d67350c619df6
-sha256=36a5772fc0241298b15db3dc4fb2552dcbb43edeffd6fcea4cd8818e97ec99fe
-
-[http://downloads.sourceforge.net/beepmp/bmp-0.9.7.tar.gz]
-md5=5d74113f5de3d11a400d1d6c118d41c0
-sha256=7b458b6ca51c5f1c01ce328aedaab81e71028c796d37a953582e0deb55980c51
-
-[http://heanet.dl.sourceforge.net/beepmp/bmp-0.9.7.tar.gz]
-md5=5d74113f5de3d11a400d1d6c118d41c0
-sha256=7b458b6ca51c5f1c01ce328aedaab81e71028c796d37a953582e0deb55980c51
-
-[http://www.boa.org/boa-0.94.13.tar.gz]
-md5=c8d6f46f9aa60909f171529068813fe0
-sha256=e00bb50eb859c736f2afc913976e82e8fc68a1fbe34fa294e014aa95f4d87366
-
-[http://downloads.sourceforge.net/bochs/bochs-2.1.tar.gz]
-md5=30bdb17e11fb416f9d3c6243e02f6e73
-sha256=90ec337d482a0e766e1f24679324445057abfc2e01d9d2c1f561b40ac7f1915b
-
-[http://heanet.dl.sourceforge.net/bochs/bochs-2.1.tar.gz]
-md5=30bdb17e11fb416f9d3c6243e02f6e73
-sha256=90ec337d482a0e766e1f24679324445057abfc2e01d9d2c1f561b40ac7f1915b
-
-[http://downloads.sourceforge.net/bonnie/bonnie++-1.03a.tgz]
-md5=00b1eee7f98b68fa762c4efb3b34caa1
-sha256=2d1c6b2cfdc17d6348f25f0830e1fa5c1c1dd3f014caff74005294c9ed6a0cbf
-
-[http://www.coker.com.au/bonnie++/bonnie++-1.03a.tgz]
-md5=00b1eee7f98b68fa762c4efb3b34caa1
-sha256=2d1c6b2cfdc17d6348f25f0830e1fa5c1c1dd3f014caff74005294c9ed6a0cbf
-
-[http://www.coker.com.au/bonnie++/bonnie++-1.03c.tgz]
-md5=77a1ba78f37bdd7f024b67e1e36ad151
-sha256=c674f1182f4c20f1e6d038feceb0a6617fc3e7658dfbbac89396043b49612a26
-
-[http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz]
-md5=1a0926fe4c8228f14a2622b4182b801e
-sha256=ce6e6c3a6b9a3e7695cb7a0f83d4dbb58f1fb246eb706e3caf3fce3b77e186c0
-
-[http://downloads.sourceforge.net/boost/boost-jam-3.1.11.tgz]
-md5=b86fb56a824d4a3dedcbda12f8b1a2b3
-sha256=6cdb945ac41b5ac78e05435e742b3a9928e5d1a5ff22728656deff29249edc66
-
-[http://heanet.dl.sourceforge.net/boost/boost-jam-3.1.11.tgz]
-md5=b86fb56a824d4a3dedcbda12f8b1a2b3
-sha256=6cdb945ac41b5ac78e05435e742b3a9928e5d1a5ff22728656deff29249edc66
-
-[http://downloads.sourceforge.net/boost/boost-jam-3.1.16.tgz]
-md5=1fd96a38b1a33c365e8142eec53197e7
-sha256=e681f9ba5d622e0c98c249d3847359a12292a7bcc5769f6e1a35e930f7306f25
-
-[http://heanet.dl.sourceforge.net/boost/boost-jam-3.1.16.tgz]
-md5=1fd96a38b1a33c365e8142eec53197e7
-sha256=e681f9ba5d622e0c98c249d3847359a12292a7bcc5769f6e1a35e930f7306f25
-
-[http://downloads.sourceforge.net/boost/boost_1_33_0.tar.bz2]
-md5=43d87bbd827a8299f408df5efe5f0fd8
-sha256=d6bcb5ad03da810c24703dde423b28aca49109591764dfe447e8a2ad5713be1d
-
-[http://heanet.dl.sourceforge.net/boost/boost_1_33_0.tar.bz2]
-md5=43d87bbd827a8299f408df5efe5f0fd8
-sha256=d6bcb5ad03da810c24703dde423b28aca49109591764dfe447e8a2ad5713be1d
-
-[http://downloads.sourceforge.net/boost/boost_1_33_1.tar.bz2]
-md5=2b999b2fb7798e1737d1fff8fac602ef
-sha256=6232e93205acbc8c705f44f15977aae158550c99a384f41606cff26c16393be0
-
-[http://heanet.dl.sourceforge.net/boost/boost_1_33_1.tar.bz2]
-md5=2b999b2fb7798e1737d1fff8fac602ef
-sha256=6232e93205acbc8c705f44f15977aae158550c99a384f41606cff26c16393be0
-
-[http://downloads.sourceforge.net/boost/boost_1_34_1.tar.bz2]
-md5=2d938467e8a448a2c9763e0a9f8ca7e5
-sha256=0f866c75b025a4f1340117a106595cc0675f48ba1e5a9b5c221ec7f19e96ec4c
-
-[http://heanet.dl.sourceforge.net/boost/boost_1_34_1.tar.bz2]
-md5=2d938467e8a448a2c9763e0a9f8ca7e5
-sha256=0f866c75b025a4f1340117a106595cc0675f48ba1e5a9b5c221ec7f19e96ec4c
-
-[http://downloads.sourceforge.net/boost/boost_1_36_0.tar.bz2]
-md5=328bfec66c312150e4c2a78dcecb504b
-sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
-
-[http://heanet.dl.sourceforge.net/boost/boost_1_36_0.tar.bz2]
-md5=328bfec66c312150e4c2a78dcecb504b
-sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
-
-[http://downloads.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2]
-md5=e006cde4b4a28cfce95e43710cd126a9
-sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575
-
-[http://heanet.dl.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2]
-md5=e006cde4b4a28cfce95e43710cd126a9
-sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575
-
-[http://www.openezx.org/download/boot_usb-0.1.0.tar.bz2]
-md5=83687c351b2bee53f2d9f6418522afe0
-sha256=ca9006b7e5b568a1da84d2b0af00642f143247959ff45f9d9f2e9bd0a33d6c37
-
-[http://www.openezx.org/download/boot_usb-0.2.0.tar.bz2]
-md5=b9b11cf8ace05a30d0d6f53fcd407dc2
-sha256=e721987d891ce97ba7a4fc17115a1b48d7659b261d12e886b614999ab12246d2
-
-[http://downloads.sourceforge.net/bootchart/bootchart-0.9.tar.bz2]
-md5=4be91177d19069e21beeb106f2f77dff
-sha256=7738399ecfcfb2242e9f99a316b13a5f59e89052de05074dbf705ccf4edc327d
-
-[http://heanet.dl.sourceforge.net/bootchart/bootchart-0.9.tar.bz2]
-md5=4be91177d19069e21beeb106f2f77dff
-sha256=7738399ecfcfb2242e9f99a316b13a5f59e89052de05074dbf705ccf4edc327d
-
-[http://www.cosmicpenguin.net/pub/bootmenu/bootmenu-0.6.tar.gz]
-md5=d7d8343f90a149c1604e5a14ea2f967d
-sha256=3ff618bcbf9926f356aec2a604b1f1d617e3f87ad545b1d96c066ed712675845
-
-[http://www.cosmicpenguin.net/pub/bootmenu/bootmenu-0.7.tar.gz]
-md5=4bc23a411468c7fb579ec6c10d2684e2
-sha256=4e329b19c810d2a8dd5b9e98e56cfc5d6389798947e400e5fe541dbc1307278f
-
-[ftp://ftp.openbios.org/pub/bootsplash/rpm-sources/bootsplash/bootsplash-3.0.7.tar.bz2]
-md5=d7c7cdab692fb2edc5cf5ebb554f20a1
-sha256=9b20c37f2ae2247354b580e080bf0c3b650d3e63bf39c3d5573ef3b9c75fe0f0
-
-[http://www.boundarydevices.com/boundary-2.6.22-2007-07-22.patch.bz2]
-md5=7dac7a5cf401070ecccf42666a30fc0a
-sha256=da8a360035464defd133a4ba604aa7ae9ee077747511b98384862b4cbdde5906
-
-[http://dl.boxee.tv/boxee-0.9.7.4826-sources.tar.bz2]
-md5=f49cb4f9769c0a8fe2965724aa8f285b
-sha256=4103be6f8ca38a90c48b55172c7bdaab2205a1dad2bfcee877adb23bbdc6cfc1
-
-[ftp://ftp.billsgames.com/unix/agenda/brickout/src/brickout-2002.06.09.tar.gz]
-md5=f191a5658e4262e85499e5b69433af89
-sha256=56e0abb8697b62949ab085419a3b6f83dd13db02d322759f4cd6c5e5286c2240
-
-[http://downloads.sourceforge.net/bridge/bridge-utils-0.9.7.tgz]
-md5=e4a7b1a7df4417d82e3f0c4d600dd78e
-sha256=49020d3cc60b58a95fc94b5333c3c4a3b630c82287b08a3a94ad5a74cfe7bd75
-
-[http://heanet.dl.sourceforge.net/bridge/bridge-utils-0.9.7.tgz]
-md5=e4a7b1a7df4417d82e3f0c4d600dd78e
-sha256=49020d3cc60b58a95fc94b5333c3c4a3b630c82287b08a3a94ad5a74cfe7bd75
-
-[http://downloads.sourceforge.net/bridge/bridge-utils-1.0.4.tar.gz]
-md5=2cab42847c4654e58c4d0ba114bfe2c2
-sha256=3fd05b5b77b9913b93036b48ed28d23d794e67660ba2d2ad63b0b7701b22181d
-
-[http://heanet.dl.sourceforge.net/bridge/bridge-utils-1.0.4.tar.gz]
-md5=2cab42847c4654e58c4d0ba114bfe2c2
-sha256=3fd05b5b77b9913b93036b48ed28d23d794e67660ba2d2ad63b0b7701b22181d
-
-[http://downloads.sourceforge.net/bridge/bridge-utils-1.2.tar.gz]
-md5=1e6cff57ac90d7ab984d9512fdd9f2dd
-sha256=c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349
-
-[http://heanet.dl.sourceforge.net/bridge/bridge-utils-1.2.tar.gz]
-md5=1e6cff57ac90d7ab984d9512fdd9f2dd
-sha256=c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349
-
-[http://downloads.sourceforge.net/bridge/bridge-utils-1.4.tar.gz]
-md5=0182fcac3a2b307113bbec34e5f1c673
-sha256=876975e9bcc302aa8b829161ea3348b12b9b879f1db0dc98feaed8d0e5dd5933
-
-[http://www.ludd.luth.se/~torger/files/brutefir-1.0i.tar.gz]
-md5=33fcf84a41d38f5aac24c57a66a2c3ee
-sha256=e0f3988afb0a84a89f38153fd5617615e9bcf32bb747ee981c99c44d3c4236f6
-
-[http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-2.4.0.tar.gz]
-md5=7e58b2a009c0f70ab36bbef420b25c07
-sha256=5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9
-
-[http://www.holtmann.org/linux/bluetooth/bt950-0.1.tar.gz]
-md5=41d6a2dfe88693b5ec999d9ae4e97aac
-sha256=e3ff9a7f6dead90d55f1a4a2b1277e3bf5f0ec44ccb6ba8f375acbbedb1263c1
-
-[http://handheldshell.com/software/fso/btgps.tgz]
-md5=6e0443d09448a5cfdb1d560cfd699a6b
-sha256=ca567348c1f8d904f50fe06de83959dcc5b840e12e336251ab216ca5304e3bf0
-
-[http://www.pentest.co.uk/src/btscanner-1.0.tar.gz]
-md5=6bfaaad5a3730f10d07500fb3ec8c797
-sha256=ca7349c3621c929f9fda0345991b35f8a0d38d4a88b6c89b7ca50a7dbcc08832
-
-[http://www.pentest.co.uk/src/btscanner-2.0.tar.bz2]
-md5=1cb558f02bb6707fa1c160b78b490404
-sha256=017b1b022118d7dad371d65ab4b6f4d6d7be99482a4af3facd9360ce55210780
-
-[http://downloads.sourceforge.net/bluetooth-alsa/btsco-0.41.tar.gz]
-md5=5a7760ed42d7a8b02cbfc77c4e97647c
-sha256=0b71cda89cee84cba28cac91e90a30b9648ce09a16e761a370fb171a7ca12657
-
-[http://heanet.dl.sourceforge.net/bluetooth-alsa/btsco-0.41.tar.gz]
-md5=111efb0f7092c92c4dd376eec96aa2e7
-sha256=47d206a511347f0762f4fe02c71d5b3a6122dcf3947947723cdde1d91ebad01b
-
-[http://downloads.sourceforge.net/bluetooth-alsa/btsco-0.42.tar.gz]
-md5=b0b6bc4d6df04468349f2ad320b05fa9
-sha256=e4f5bc9be311a746bd37f5607d3c225462d7d9294e8b3c692f9a39717b65d843
-
-[http://heanet.dl.sourceforge.net/bluetooth-alsa/btsco-0.42.tar.gz]
-md5=b0b6bc4d6df04468349f2ad320b05fa9
-sha256=e4f5bc9be311a746bd37f5607d3c225462d7d9294e8b3c692f9a39717b65d843
-
-[http://www.saftware.de/bluetooth/btxml.c]
-md5=c17e047d1a6a3f3188de929dc8582e01
-sha256=58eb43e7e781a6b61e452fa36fa03198ef44c742da80c8a1b60be073e4ab949b
-
-[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch]
-md5=4149857c0b2c7f3d52a1f2cec5d7778d
-sha256=73706e7d77144a6270da02ede61cde3c2e3b0e716d879737ac9d478b29233ba9
-
-[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-iptun.patch]
-md5=6c5f498e0677fd91b5b0e85ec5ac3b23
-sha256=b80a8c173c7a7a40a504585c6af5c74396c8fdbbb1cec179de9edcc030aa6a9a
-
-[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-logger.patch]
-md5=43c292e93bf92623aaa29dd0e243e9a9
-sha256=5117584a563c512b68cd9678d3cf54e6186f5a062836398791385f8ed73cca86
-
-[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-tail.patch]
-md5=c211189556c59a2665af45bffe5a5878
-sha256=f44c3c2d7d9b3fc8a5f9fb6ac587ae4170d2515d72f9e76deb8c071ce9847abe
-
-[http://downloads.sourceforge.net/bvi/bvi-1.3.1.src.tar.gz]
-md5=b9d77c57bda2e019207a1874d9bb4dea
-sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
-
-[http://heanet.dl.sourceforge.net/bvi/bvi-1.3.1.src.tar.gz]
-md5=b9d77c57bda2e019207a1874d9bb4dea
-sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
-
-[http://downloads.sourceforge.net/bwmng/bwm-ng-0.6.tar.gz]
-md5=d3a02484fb7946371bfb4e10927cebfb
-sha256=c1134358e268329d438b0996399003b0f0b966034fb4b5b138761c2f3c62ffdd
-
-[http://downloads.sourceforge.net/bwmon/bwmon-1.3.tar.gz]
-md5=53c44b73aa67d5e0282adfe928f3ba44
-sha256=624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6
-
-[http://heanet.dl.sourceforge.net/bwmon/bwmon-1.3.tar.gz]
-md5=53c44b73aa67d5e0282adfe928f3ba44
-sha256=624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6
-
-[ftp://invisible-island.net/byacc/byacc-20081225.tgz]
-md5=b9715b9a2867c221176b597e8f73cbc9
-sha256=1364c7fe382de659e8b9841a1736b645345a460d2f4302303e80c02235a2a575
-
-[http://downloads.sourceforge.net/bzflag/bzflag-1.10.6.20040515.tar.bz2]
-md5=8e3e5fbef3cfa21079eb06269e6b3d8b
-sha256=0329e3d0a59e9cc167733ed2b89a0dc2249725642a065cfd385bf1206fe30b19
-
-[http://heanet.dl.sourceforge.net/bzflag/bzflag-1.10.6.20040515.tar.bz2]
-md5=8e3e5fbef3cfa21079eb06269e6b3d8b
-sha256=0329e3d0a59e9cc167733ed2b89a0dc2249725642a065cfd385bf1206fe30b19
-
-[ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz]
-md5=ee76864958d568677f03db8afad92beb
-sha256=4b526afa73ca1ccd6f5f1f5fd23813f159f715c3d0e00688f1df54b51f443cdd
-
-[http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz]
-md5=3c15a0c8d1d3ee1c46a1634d00617b1a
-sha256=f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22
-
-[http://daniel.haxx.se/projects/c-ares/c-ares-1.3.0.tar.gz]
-md5=badb4563a02d4188b478df31fa1b657d
-sha256=5c4594f71eab62e24d12c67ae6a6aead306c537cf71e946c4e9fbebbe9786243
-
-[http://daniel.haxx.se/projects/c-ares/c-ares-1.5.2.tar.gz]
-md5=23adb3729e09879cd2147b31ea5a986e
-sha256=41f2df62e8f267cfd0ea9b9d29398f02ec3e22225f06f705e3fa8055370f94a4
-
-[http://daniel.haxx.se/projects/c-ares/c-ares-1.5.3.tar.gz]
-md5=ec202543a8cb86647f52e1ed4b5c0b37
-sha256=3037156096ea9fee7c40c771207ab8f21b862cb38b6ca62cc0ac464223f9b643
-
-[http://c-nc.googlecode.com/files/c-nc-0.5.tar.gz]
-md5=ae0d222169d11a8ca790148347ac7d74
-sha256=141730e220eff50b5b3e644211e22a08bc0aacaa6da6fa16f260c57114d0cfdc
-
-[http://jalimo.evolvis.org/repository/sources/cacao-0.98+hg20071001.tar.bz2]
-md5=9ff10c929bd0cbf15909107c1aff7518
-sha256=fdfdbdfdebefb89af560297796d4861ef4fc939e9dbe8500750909dea8662bee
-
-[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.98/cacao-0.98.tar.bz2]
-md5=8b8907c8b925761c9410bcadb9705346
-sha256=cb9363add825cedf77764fc49a223aaf43f0a9f485b711ba8c92f16b13fff188
-
-[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.3/cacao-0.99.3.tar.bz2]
-md5=db93ab31c6d1b7f1e213771bb81bde58
-sha256=1ea5bd257f755ffcae2c7a1935c37147c7392478922410e0870361eea08b6c27
-
-[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.bz2]
-md5=63220327925ace13756ae334c55a3baa
-sha256=1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56
-
-[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.gz]
-md5=c5e6525c5212ddbb6026e4a7cde37ca6
-sha256=c6090c1d2ed3c60acda0076b62563598267be8dab270ce49ee1035002a2510cf
-
-[http://cairographics.org/releases/cairo-1.2.2.tar.gz]
-md5=2460487b1257a5583c889b1b9d2033ec
-sha256=9d53b8dd0bf76dd0da7cdbe65a6c6934be49bd3942dc5f7ef7bbcc7529d9ee02
-
-[http://cairographics.org/releases/cairo-1.2.4.tar.gz]
-md5=1222b2bfdf113e2c92f66b3389659f2d
-sha256=c1580ca951b2f57c4f8b34549997854bc48dbaf036ca1ca6c017c03db3504ddb
-
-[http://cairographics.org/snapshots/cairo-1.3.14.tar.gz]
-md5=08eef0800258bff5b3f13d787dd68402
-sha256=752918a5519a67a8ce05a740574116a26d98a44a37beba075f03b547903d3ff0
-
-[http://cairographics.org/snapshots/cairo-1.3.4.tar.gz]
-md5=bf3c1db35c8588022fa7c337688b4d63
-sha256=1c707e0ce129031ea3b8b27bbf61099f7537604e2eda2fc0ea33ee86a848d64a
-
-[http://cairographics.org/releases/cairo-1.4.0.tar.gz]
-md5=b0882df4621bcf5b69f024b9475f8d4e
-sha256=583f9ae2c9b7d2ef33cfbd194148e71a335dafc226e13e213f07ff2dc398bb47
-
-[http://cairographics.org/releases/cairo-1.4.10.tar.gz]
-md5=5598a5e500ad922e37b159dee72fc993
-sha256=594e78a66044898c321e378d47faf43b665b23ba638834d2787e344ba13e5132
-
-[http://cairographics.org/releases/cairo-1.4.14.tar.gz]
-md5=e8c442ff821c0719a69508fecba9038f
-sha256=8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c
-
-[http://cairographics.org/releases/cairo-1.4.2.tar.gz]
-md5=b254633046eafe603776d0bee791b751
-sha256=7cf292ae376e7120ec548ad6a807a2f0f4f0539a304229a3bd98921453becd47
-
-[http://cairographics.org/releases/cairo-1.4.8.tar.gz]
-md5=5b9db574c9fbb94ce52047600190a1ba
-sha256=a3e9b0f07910ee325406118cf3e136fc78a5155c47fdb19e66e895a3c587bc51
-
-[http://cairographics.org/snapshots/cairo-1.5.4.tar.gz]
-md5=2738af237fc125f7e7d3e7bf8c5728c4
-sha256=dafc9c43fe20977ece09aeff699d42b1f55a7f7465ca76baf96d42a379d36b57
-
-[http://cairographics.org/snapshots/cairo-1.5.6.tar.gz]
-md5=3ebb218d5625b9339df819c4c03e462e
-sha256=e6f900f10cec90b905588dff17b3c80b0fab928b93b4cd7520d39b5e3490d2bf
-
-[http://cairographics.org/releases/cairo-1.6.4.tar.gz]
-md5=a198d509f9e3a35b78de8bb02174ebb9
-sha256=7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42
-
-[http://cairographics.org/snapshots/cairo-1.7.6.tar.gz]
-md5=c612f581b18903b0751a171685fc38dd
-sha256=5268faa116a48a68dd74abb245b26b20f1729d3bd56a8414e429904eb1bae124
-
-[http://cairographics.org/releases/cairo-1.8.0.tar.gz]
-md5=4ea70ea87b47e92d318d4e7f5b940f47
-sha256=827acee89ba3e8e762fbb23165cf8d455e7d95e1e50984e6882b2070a7f3abae
-
-[http://cairographics.org/releases/cairo-1.8.8.tar.gz]
-md5=d3e1a1035ae563812d4dd44a74fb0dd0
-sha256=3c51d3de5dc4596e01a6675acd3c86c2c99c00f02e8fad5493758a29fe451c90
-
-[http://cairographics.org/snapshots/cairo-1.9.4.tar.gz]
-md5=872f460cda044c36c2b55e6307a8cc29
-sha256=5093fe09889ab2505b91ea4b73ddee06f8dbc998f354a6fba1f9417f7d7a15f7
-
-[http://download.berlios.de/cairo-dock/cairo-dock-1.6.2.3.tar.bz2]
-md5=15cfd709185dd9e3e94b981c51ae75a9
-sha256=2686277db174bced36d85ab64d310192fe4aeaac6f9bf14aee8c940f7b2cbd7c
-
-[http://cairographics.org/releases/cairomm-1.2.4.tar.gz]
-md5=5d862facfbd0098c9bae618b61f7c8e6
-sha256=a137ccd4a6cde6c9e9553966534702d2e7f6f44c755dfe128d9fb26ed2697fe7
-
-[http://cairographics.org/releases/cairomm-1.8.2.tar.gz]
-md5=24aa46a4f92bdb2af7cd80e6b335f07f
-sha256=9bf111528227dd414926ecc51e4a7a155a1c8640b919d41950beea5e0a9563af
-
-[http://gpephone.linuxtogo.org/download/gpephone/calendar-1.0/calendar-1.0.tar.gz]
-md5=eb7be3b85955a1bbe7a0154cbf2f70f9
-sha256=7e6425b688a2d4bbeef0904cac52737b232d03fdc4d35866fd03359f2d5f1794
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/callahan.patch]
-md5=455b0813f42723b1bd6c4b9f10964f7b
-sha256=31dbaa878b8e2d51109042c533f371c50aace927b45eda6c282fc632f3662620
-
-[http://gpephone.linuxtogo.org/download/gpephone/vochistory-0.1/callhistory-0.1.tar.bz2]
-md5=1a3ef24580667be35667b7eefd0f4efe
-sha256=1e321eb315eb8c60d5d8ae745d3b48cfe5cb388e73b71760440b590be58c74c7
-
-[http://devs.callweaver.org/release/callweaver-1.2.0-rc5.tar.bz2]
-md5=cc99a6b12613bbdb132fb5c8c56069f1
-sha256=1d4ec44d6124776009ddc7bf08d5f24f26a9b6814835456ab0b3ddbfc111b527
-
-[http://linuxbrit.co.uk/downloads/camE-1.7.tar.gz]
-md5=afdab327ca50ee15197d2d9e19491df7
-sha256=e29b73e0bf763dead4a6ed80e648aaaea683f1a5865e5c21fed31fb9428e9430
-
-[http://downloads.sourceforge.net/cameraassistant/camera-assistant_0.2.0.tar.gz]
-md5=538e8d4691062524c4181da487d83250
-sha256=9caa3e654af03e55582dd515bfcc9bf5aa93c9d22842af16a87a9a226ec581ed
-
-[http://heanet.dl.sourceforge.net/cameraassistant/camera-assistant_0.2.0.tar.gz]
-md5=538e8d4691062524c4181da487d83250
-sha256=9caa3e654af03e55582dd515bfcc9bf5aa93c9d22842af16a87a9a226ec581ed
-
-[http://downloads.sourceforge.net/camsource/camsource-0.7.0.tar.bz2]
-md5=ffd824f13f99011984399fc3b7526c71
-sha256=837ba51635e01209dc2886491afbc2e97629bfaf32e73566a1862ea0dc090756
-
-[http://heanet.dl.sourceforge.net/camsource/camsource-0.7.0.tar.bz2]
-md5=ffd824f13f99011984399fc3b7526c71
-sha256=837ba51635e01209dc2886491afbc2e97629bfaf32e73566a1862ea0dc090756
-
-[http://www.pengutronix.de/software/socket-can/download/canutils/v3.0/canutils-3.0.2.tar.bz2]
-md5=45787d61ba969bcf08b7a65143fad8e3
-sha256=3b10a3e62de58c593d53b7913e4d16b7785469b66fd9da0190b01fa3f6c73f92
-
-[http://downloads.sourceforge.net/cbrpager/cbrpager-0.9.14.tar.gz]
-md5=0ce88fc52025b44812d090d10244b2a4
-sha256=9c86a5668a2834f02ec44967737d6341c575e2a1deec76944f47be0292a3cfd7
-
-[http://heanet.dl.sourceforge.net/cbrpager/cbrpager-0.9.14.tar.gz]
-md5=0ce88fc52025b44812d090d10244b2a4
-sha256=9c86a5668a2834f02ec44967737d6341c575e2a1deec76944f47be0292a3cfd7
-
-[http://downloads.sourceforge.net/cbrpager/cbrpager-0.9.20.tar.gz]
-md5=e1aee9221ec69ca8cc3a55093095ecf3
-sha256=8838c53c49d2982c4d716ff5f241cf7168d5c4c5888cd73db21e73402dd5db39
-
-[http://samba.org/ftp/ccache/ccache-2.4.tar.gz]
-md5=73c1ed1e767c1752dd0f548ec1e66ce7
-sha256=435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0
-
-[http://ftp.gnu.org/pub/gnu/ccaudio/ccaudio2-0.9.0.tar.gz]
-md5=1596d3dac1549430e8e395d7441acce5
-sha256=b7fa79d5059b2fab03d7eb064b57f0fe3175b30fb1cc30f232a323d1887bc096
-
-[http://downloads.sourceforge.net/cccc/cccc-3.pre84.tar.gz]
-md5=7b3d8bd3cbb27d7b9debe5c3398f9f7f
-sha256=015c4237a532b873990aeeecdf351138ce5a811d062d6db73c611a4985de5435
-
-[http://heanet.dl.sourceforge.net/cccc/cccc-3.pre84.tar.gz]
-md5=7b3d8bd3cbb27d7b9debe5c3398f9f7f
-sha256=015c4237a532b873990aeeecdf351138ce5a811d062d6db73c611a4985de5435
-
-[http://openembedded.org/dl/ccdv.c]
-md5=b8c51a2e3cccb381428426c0fc543244
-sha256=f1e44d628cc4cbac192bf33f492ad8d1e1988cae576924128df36f3638e9a485
-
-[http://alioth.debian.org/download.php/2924/ccid-1.3.10.tar.bz2]
-md5=92220d7b7b0aae7bc141b09ba529458c
-sha256=54610f1a6cd65e8d2b5cb9f7917e509ebcdf130a565e71e06ad4e65ed0dad5ec
-
-[http://alioth.debian.org/download.php/2482/ccid-1.3.8.tar.bz2]
-md5=ebb5fc927d73cd63737a9114481e8957
-sha256=8cb892ef36321069eff7826aa732f1481715fe54bf96346fae1d25565b44c536
-
-[ftp://ftp.gnu.org/gnu/ccrtp/ccrtp-1.7.0.tar.gz]
-md5=eb86cd2ac06af27ea60b1a349122605c
-sha256=923cd26ffc43903ef33704e46fd57f659c3ad01554927fe323635a73082d56ae
-
-[http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/ccxstream-1.0.15.tar.gz]
-md5=c589fff48ce541f26b394c9d82ccbead
-sha256=2dec31ba4a176c921a653c0949a53c2d3497e047737724350897fd2534db18fe
-
-[ftp://invisible-island.net/cdk/cdk-5.0-20060507.tgz]
-md5=0ec2460a4484d5f5595d8faca61bc9c5
-sha256=e823bfcce52916727cb23d6d549a64347c45c364b3c628d6a352c407fce8f4b4
-
-[http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz]
-md5=b304bbe8ab63373924a744eac9ebc652
-sha256=005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df
-
-[http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz]
-md5=7218e778b5970a86c958e597f952f193
-sha256=1b79fae1aedc692f87d1344410f5c6b666961afccdc78bc5c4c257c450dfa008
-
-[http://cdrkit.org/releases/cdrkit-1.1.9.tar.gz]
-md5=cbc0647e5d85f0e8fb3a692ba1d42edd
-sha256=d5d58ab4c7bef036a53ef9742b4e57621f61310cd0cd28f558ba0b88c354efa2
-
-[ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.tar.bz2]
-md5=d44a81460e97ae02931c31188fe8d3fd
-sha256=728b6175069a77c4d7d92ae60108cbda81fbbf7bc7aa02e25153ccf2092f6c22
-
-[http://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.tar.bz2]
-md5=d44a81460e97ae02931c31188fe8d3fd
-sha256=728b6175069a77c4d7d92ae60108cbda81fbbf7bc7aa02e25153ccf2092f6c22
-
-[http://downloads.sourceforge.net/cdstatus/cdstatus-0.96.05.tar.gz]
-md5=cd7ea4ef72a08b388523c528d81ba3ca
-sha256=f33cbb551e494747b76bfbeba3954b4839fe7c849f200746fd7dc21bd665aa56
-
-[http://heanet.dl.sourceforge.net/cdstatus/cdstatus-0.96.05.tar.gz]
-md5=cd7ea4ef72a08b388523c528d81ba3ca
-sha256=f33cbb551e494747b76bfbeba3954b4839fe7c849f200746fd7dc21bd665aa56
-
-[http://downloads.sourceforge.net/cdstatus/cdstatus-0.97.01.tar.gz]
-md5=e53d3f8759251603c980b38982a85f1e
-sha256=548b5b402ee5fff34fe428eb69de560b56709337cd70c600ad21686c1321dd66
-
-[http://hinterhof.net/cdtool/dist/cdtool-2.1.8.tar.gz]
-md5=7b19b6f68d2c648296378b784d5f7681
-sha256=73de81ea2de2eae64b888e1b2739ef643ccea13c79790569f8e6278369976a21
-
-[http://ch.omoco.de/cellhunter/files/cellhunter-0.5.0.tar.gz]
-md5=1ac5c56a85fb12bea0bf0a4a2ea664de
-sha256=1210dab4e3b23c2a5083d12e9c1527bf099a89f06867e1210b7d9992204c24f8
-
-[http://pub.risujin.org/cellwriter/cellwriter-1.3.3.tar.gz]
-md5=09b2019e926d5ef42d52edb2dd33ceae
-sha256=3fb7c11ec5d802338a0bf522b11702c37820597c9a2c36f89b52872c6571e602
-
-[http://pub.risujin.org/cellwriter/cellwriter-1.3.4.tar.gz]
-md5=72b4e552a32d6acd888da0b88aeebbdd
-sha256=6ab6fa697938af0fc8b587ccd7c5889087800569e558b97797963c6ee2fada0c
-
-[http://centericq.de/archive/source/releases/centericq-4.11.0.tar.bz2]
-md5=bed5e7eeb60b5ac0045f201f13130964
-sha256=4f0f769a6e1cc7d76b527829deef34861ed8f79ae07e29d49566df3594308380
-
-[http://centericq.de/archive/source/releases/centericq-4.9.10.tar.bz2]
-md5=7def095ea14de6bef5fa217fe76a2f2c
-sha256=814f81d23596410c2ca7de314db8fcc795c4abd3b00a8fe305b9026415553283
-
-[http://centericq.de/archive/source/releases/centericq-4.9.7.tar.bz2]
-md5=955594716ba30b39f6634e9043e78c66
-sha256=0736510574fa44223bf01f526f06478edbe39b5f2ff3387dcdd0dba649208871
-
-[http://www.centerim.org/download/releases/centerim-4.22.5.tar.gz]
-md5=9bbbdb34ab678d29387171139ae835e1
-sha256=c68abb59043602a2b28fb55d45361d0b22fc1566848cc0c255580914df7b3eb3
-
-[http://linuxsh.free.fr/tools/cetools-0.3.tar.gz]
-md5=58e8706e6d858e48d317cadf550c1224
-sha256=dd74c8f27c7b3ff4c7320803674e2446afce93880f84d96dfb142a9fa73db940
-
-[http://files.gumstix.com/cf8385-5.0.16.p0-26306.tbz]
-md5=348588c3e6224fc3fcbd6bc5fe2ec2c4
-sha256=08a527d6b68ab4dda7da05d69159518924ea557d71b2c65c16f66e7e6c374e8b
-
-[http://www.ibiblio.org/pub/Linux/devel/lang/c/cflow-2.0.tar.gz]
-md5=09d6131980aa770289938f71401e8976
-sha256=f377e4be57862a260e924c3778a241a2a424772fb98ba8b8cc5f04050ff12ac5
-
-[http://www.cgicc.org/files/cgicc-3.2.3.tar.bz2]
-md5=cd7a7a5a1fd186bd8f481c4e17354a0b
-sha256=88fc878aa30d9529d3599891732143c5ac602f4d863126ca2a51d7f7692b7b2d
-
-[ftp://ftp.gnu.org/gnu/cgicc/cgicc-3.2.7.tar.gz]
-md5=f3bb4101e741fbef91e58613e51439f8
-sha256=9f57a21545b47ce1a6ca95c3e4a534af758c29d7da0f50dd22911cdbaa32bcb5
-
-[ftp://ftp.gnu.org/gnu/cgicc/cgicc-3.2.8.tar.gz]
-md5=7bfe01649f2b7bf582a8d0034ed0b32b
-sha256=8718e1b9919b6381d55ef7ebca42564278b76225e83ab94db99cee18668e4033
-
-[http://www.bangstate.com/changedfiles-1.0-rc1.tar.gz]
-md5=e44e2a833151632dae7b68e815400bc1
-sha256=26991b827f96a49ebd164409852d781b0a74a765c385c56c21a7ae44d030ab42
-
-[http://www.davehylands.com/gumstix-wiki/char-driver/char-driver-2.6.21.tar.gz]
-md5=70113b86db5dea86c282053e15f36cb7
-sha256=9a87282052a8c0807bbcb46367102f97896a1cf4fcc0d35cfe34b2e5a1456a31
-
-[http://downloads.sourceforge.net/check/check-0.9.2.tar.gz]
-md5=9a4d5665b8be07513f5ac4e6eec537e6
-sha256=fbd7a0595eba5cf0cb168d9893e883f5cc7a68a7d6fec23cb3688508b247fa22
-
-[http://heanet.dl.sourceforge.net/check/check-0.9.2.tar.gz]
-md5=9a4d5665b8be07513f5ac4e6eec537e6
-sha256=fbd7a0595eba5cf0cb168d9893e883f5cc7a68a7d6fec23cb3688508b247fa22
-
-[http://downloads.sourceforge.net/check/check-0.9.5.tar.gz]
-md5=30143c7974b547a12a7da47809a90951
-sha256=961b3c66869018d02226bbbc394e79362cd898962ce810bce8417b3c497f7ad6
-
-[http://handhelds.org/~zecke/oe_packages/checkers_V1.0.5ern.tar.gz]
-md5=82b08b1980ec6fbfc83b4dc0e2df10f7
-sha256=543435cb0988acc90a6e651e424eb331aba3f73361036d7af458bc1233973199
-
-[http://ftp.gnome.org/pub/GNOME/sources/cheese/2.26/cheese-2.26.0.tar.bz2]
-md5=17c991c695c3a7549da6e42d1b327d79
-sha256=297c7aa579e14c1c22fbbc19254fbefca3b79ef8e6643856c83be0fdb8721412
-
-[http://ftp.gnome.org/pub/GNOME/sources/cheese/2.28/cheese-2.28.0.1.tar.bz2]
-md5=843a64fb7392286dce9ac1dd0e2457c5
-sha256=8a55e8c5db5c90d77f53b48d00785fa3d2897570e1a4016cf4b0cf602a7ae2ed
-
-[http://www.0x50.org/download/0.4/0.4.29/cherokee-0.4.29.tar.gz]
-md5=854e6e61a69781746496012658d8ef98
-sha256=7091536ef2a51d2548ac6268cc846dda9c37f7f7348597868c793f42b9be7d78
-
-[http://www.cherokee-project.com/download/0.5/0.5.3/cherokee-0.5.3.tar.gz]
-md5=9e8dfc46f94ee150515be5d31bd40d16
-sha256=c91699fe8cd2140e3b236257e7cb5ca4cd42e587a8f3eb932363f82f0e7212ef
-
-[http://www.cherokee-project.com/download/0.5/0.5.5/cherokee-0.5.5.tar.gz]
-md5=fb891b3da7eb921c09a5eb93e296f5e1
-sha256=e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a
-
-[http://www.cherokee-project.com/download/0.98/0.98.0/cherokee-0.98.0.tar.gz]
-md5=9f1876232bdfdfa5b4e02ff0636e7241
-sha256=701721a58aa79b93a4f3aaf633f0b842a05b07c73996cd44e78a383a7387226d
-
-[http://www.cherokee-project.com/download/0.99/0.99.24/cherokee-0.99.24.tar.gz]
-md5=5afed8bdd6020dc5bf0ba9ec83b947f1
-sha256=0581b5eafba9a993d035467c51bfa85fa76ca46043fab95e6f7592ad8f4f38e1
-
-[http://www.call-with-current-continuation.org/chicken-2.6.tar.gz]
-md5=332edae079bb34d815369f4ba5181983
-sha256=32385c5393c7376035f911f3e887351b1ce8fb6e56498cc4258815bc6db06326
-
-[http://chicken.wiki.br/releases/3.3.0/chicken-3.3.0.tar.gz]
-md5=835401781fb606741ba3606fa3e89b78
-sha256=5ce2519bac9956de5700a5777b2bbc2cd89202ef2d2252a40a0d1e8c9854bec6
-
-[http://chicken.wiki.br/releases/4.2.0/chicken-4.2.0.tar.gz]
-md5=4705b7634447a571ff083f435c110fe3
-sha256=8dc3887b9907685c99aac6924980445506cccbe3ada29407aad80a0e34d3bb79
-
-[http://www.chillispot.org/download/chillispot-0.98.tar.gz]
-md5=4bcf48ec7a94f28faee8b7dc7a0dd97a
-sha256=bace8a6a0b27d09983a2c509d6e6bf8ab786935e269036f14dc158505feba602
-
-[http://www.chillispot.org/download/chillispot-1.0RC3.tar.gz]
-md5=9ad5f4181ae2e9e2d5ccb165c37dfdde
-sha256=395d082c2355369f958d8f12583f07bbac6c00f901266592959bfba09b825bb7
-
-[ftp://ftp.debian.org/debian/pool/main/c/chmlib/chmlib_0.380.orig.tar.gz]
-md5=2282c228ab3776c828e79b7b51f2ccc1
-sha256=36645bb9e89ba63c303591a4c365f1819a1dd435d46f227140640f4089bfe6f0
-
-[http://ftp.debian.org/debian/pool/main/c/chrpath/chrpath_0.13.orig.tar.gz]
-md5=b73072a8fbba277558c50364b65bb407
-sha256=c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b
-
-[http://files.chumby.com/resources/chumby_fw_1_2.zip]
-md5=87a60c6fc4f249605940fed86a141c54
-sha256=659a581cfb851c3469671fe8600d39b23024bcc564a24ebcc89045207f36b0fc
-
-[http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz]
-md5=f3b96692f679239488de30f2bd896825
-sha256=885eda0bbe68018b5770437e542473508f88205bb09cbfde7fc6e0c31f5a6f83
-
-[ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz]
-md5=5767ec5e6ff0857cbfe2d3ec1ee0e2bc
-sha256=39e7cd4892502344a635952843487d9b4bfa98e59d1e1acad5ef8aa969abba93
-
-[http://www.kokkinizita.net/linuxaudio/downloads/clalsadrv-1.2.2.tar.bz2]
-md5=7865b6c175e457ea9cb0148ce8baa746
-sha256=0fed89dd092936b5ffa74ad7df77a72b8cbeec8cea226ff48e107e326bd36f50
-
-[http://downloads.sourceforge.net/clamav/clamav-0.88.6.tar.gz]
-md5=db7f8b947bc21023f36e04bfdd555dd0
-sha256=cc7f90983aa61b3d893c3311e3f832c5faa204467143cff597ad80bf8ad24daa
-
-[http://downloads.sourceforge.net/clamav/clamav-0.88.7.tar.gz]
-md5=34a9d58cf5bcb04dbe3eb32b5367a3f8
-sha256=702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2
-
-[http://downloads.sourceforge.net/clamav/clamav-0.90.2.tar.gz]
-md5=39d1f07a399b551b55096b6ec7325c33
-sha256=30df6a5d4a591dcd4acd7d4cce54dcfd260280fce6bbc9d19d240967bcdabbfa
-
-[http://heanet.dl.sourceforge.net/clamav/clamav-0.90.2.tar.gz]
-md5=39d1f07a399b551b55096b6ec7325c33
-sha256=30df6a5d4a591dcd4acd7d4cce54dcfd260280fce6bbc9d19d240967bcdabbfa
-
-[http://downloads.sourceforge.net/clamav/clamav-0.90.3.tar.gz]
-md5=d42ccf7a32daeb7c7cc3c8c23a7793ea
-sha256=939913d15ad0dc583ba609274ae61a948f4fa18b848bd503d958feacdaab54a4
-
-[http://heanet.dl.sourceforge.net/clamav/clamav-0.90.3.tar.gz]
-md5=d42ccf7a32daeb7c7cc3c8c23a7793ea
-sha256=939913d15ad0dc583ba609274ae61a948f4fa18b848bd503d958feacdaab54a4
-
-[http://downloads.sourceforge.net/clamav/clamav-0.91.1.tar.gz]
-md5=60152bf1e24b3fbdf0473794199e5215
-sha256=f98edecae40473c142fe49a0e02f5ff7fb28d778c4bd510dad747d208d20cb00
-
-[http://heanet.dl.sourceforge.net/clamav/clamav-0.91.1.tar.gz]
-md5=60152bf1e24b3fbdf0473794199e5215
-sha256=f98edecae40473c142fe49a0e02f5ff7fb28d778c4bd510dad747d208d20cb00
-
-[http://downloads.sourceforge.net/clamav/clamav-0.94.2.tar.gz]
-md5=1181e6d62341b84708f126cc353f7ebf
-sha256=1aec7fecff375958d067aceeb9782d3ff0be7c13bed0eecf6240fb089f8d268c
-
-[http://memberwebs.com/nielsen/software/clamsmtp/clamsmtp-1.8.tar.gz]
-md5=04da6aab94934641fcf9e7a7598346fb
-sha256=c09b24c82f858845e235df4c8b2639240a7b786de66b595e351be86ab60663a5
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.14.tar.gz]
-md5=227beb20b927c042628539601c867614
-sha256=a4ac64ff980f1fd23f4cd21e1bdf8cebc1c4147264fbd5c94981553adcfbf292
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.15.tar.gz]
-md5=036c23aec7cb53a43b7b9dc63a92fbbe
-sha256=19368b2ccd7d51b51bc265969042d39d48bcfecf6b4b58190009037f92b037c9
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.17.tar.gz]
-md5=eb620987422878e05ea889d5e7496c63
-sha256=3516577166c963a8ee1b7a47ac5243cba7f47a60d659fc0324ad02a171fd3aa8
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.18.tar.gz]
-md5=c0650c257aa93eafb709553f172f0bbb
-sha256=f2b3962b279a1d8f98c24e39cd5d62d4e9fbf50b7b8a75e90fcf0ded822824c2
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.19.tar.gz]
-md5=0b93b1c1dd3d33ef7fb6a47dbb29e41d
-sha256=154153797eae72fe4c6e22718e8b630e56317e686ca40857ed3fa9a1dd046199
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.20.tar.gz]
-md5=21e34b8e8acb4f7b31296bfaf4ad560a
-sha256=6a068f70f908ee4de0ba4d7e1d5127b12ad548da371494c668966d1ff98e05a2
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.90.tar.gz]
-md5=cf5aaaf07fe43567fa605b33165355d7
-sha256=4f2824c42062dea269e489c1acb2769c015bf78cdaa929ee75441d412f10a03b
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.93.tar.gz]
-md5=ffa9e9cac31c5acbf0ea9eff9efa923d
-sha256=df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.95.tar.gz]
-md5=08638bb9221460cc311a1c5508083ed8
-sha256=5c274a7741c35c35529f5641e644f61431143dac8e7724ac994d1f20c0d9cce0
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.96.1.tar.gz]
-md5=a2ffb40f13fc76c2dda8f8311b30add9
-sha256=ee464d20ef9df2196e238302d5d06954cb96a11e73c4c44c6ef376859de2a078
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.97.2.tar.gz]
-md5=6a35347901ace03c31cc49751b338f31
-sha256=001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4
-
-[ftp://ftp.gnu.org/gnu/classpath/classpath-0.98.tar.gz]
-md5=90c6571b8b0309e372faa0f9f6255ea9
-sha256=501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f
-
-[http://downloads.sourceforge.net/sylpheed-claws/claws-mail-2.7.2.tar.bz2]
-md5=079f167fba6e17ae2c688a0dae858b0f
-sha256=a47a079f583581c2d049195f12a26524390e272c820b2c7233a37582e887a5b5
-
-[http://downloads.sourceforge.net/sylpheed-claws/claws-mail-2.9.1.tar.bz2]
-md5=c0e2718d4bcd932709a6e1bcc910c47a
-sha256=056500e4f61f28791390270636ef279c326b090c8634c15faa59497fb3086c8b
-
-[http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.0.2.tar.bz2]
-md5=97a0c627f91b51b6851b9a1ed9ee7afe
-sha256=d04db59df8b013651721312ed167df95d47c88d55eac0eb5b7950d6958f3636e
-
-[http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.3.0.tar.bz2]
-md5=646fea69bfa82be5f507e72e055957b6
-sha256=16d4a9ef3a2c62f879c688b7949f4d0b834b26c9905d16fee7d76432df29d8fd
-
-[http://heanet.dl.sourceforge.net/sylpheed-claws/claws-mail-3.3.0.tar.bz2]
-md5=646fea69bfa82be5f507e72e055957b6
-sha256=16d4a9ef3a2c62f879c688b7949f4d0b834b26c9905d16fee7d76432df29d8fd
-
-[http://www.penguin.cz/~utx/ftp/claws-mail/claws-mail-3.6.1-po-update.patch]
-md5=e8ff3fabf1ed47f3b11a9cdc36b026bd
-sha256=767258dd7c966e14ed519affe4c0da93e8fff66ee5fe9158413c8d163af72db8
-
-[http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.6.1.tar.bz2]
-md5=761b8ae2d574588460a0fb1ea4931ccb
-sha256=67337a4a1a5a5ce09f2a38422b7a6fc481e4747f74d4ddedd130d4fb06fc3907
-
-[http://downloads.sourceforge.net/clearlooks/clearlooks-0.6.2.tar.bz2]
-md5=451ef33d1bffa261c5cbe01182199f97
-sha256=be080113c9e9d137ee14eaf7f731c5ae58d24924748aaa725d0f061d59265f3b
-
-[http://heanet.dl.sourceforge.net/clearlooks/clearlooks-0.6.2.tar.bz2]
-md5=451ef33d1bffa261c5cbe01182199f97
-sha256=be080113c9e9d137ee14eaf7f731c5ae58d24924748aaa725d0f061d59265f3b
-
-[http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz]
-md5=ff4104b0e58bca1b61d528edbd902769
-sha256=71d8c6459a4be1912dbc445e2e9d46303be6623cea51563c21abe39c8b5b0bd2
-
-[http://repository.maemo.org/pool/maemo5.0alpha/free/c/clinkc/clinkc_2.0.orig.tar.gz]
-md5=b42b1317fa851ddaaea7afc07b53b110
-sha256=49100ff0a41de0ad4ddc2fbed0ea42b9a683fa0836a44a322a348b02eb7ae02f
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/c/clipboard-manager/clipboard-manager_0.6.8-4+0m5.tar.gz]
-md5=0f83d603651754e65931c0ad20134299
-sha256=9174d88eaa80c06339a3665b08df4cfca78940ed4b0fd071c7f868609115cc6f
-
-[http://downloads.sourceforge.net/clish/clish-0.7.1.tar.gz]
-md5=27d9b5c12f7d3a1877aeb34f2048e7fa
-sha256=5c7f2bf864b34d4bb17d7d046eca4f07f8174ce4ca3a73339b956fedd95c9752
-
-[http://heanet.dl.sourceforge.net/clish/clish-0.7.1.tar.gz]
-md5=27d9b5c12f7d3a1877aeb34f2048e7fa
-sha256=5c7f2bf864b34d4bb17d7d046eca4f07f8174ce4ca3a73339b956fedd95c9752
-
-[http://downloads.sourceforge.net/clish/clish-0.7.3.tar.gz]
-md5=81e20f7a888bcd8e2280e37804d342e4
-sha256=c8c2416848950ac452cd4010311554d7f232f81abd543fe9ba2d7146dbb6c96f
-
-[http://my-zaurus.narod.ru/downloads/clockapplet.tar.gz]
-md5=7265673901eacb0b72a11cd6732cc698
-sha256=80fd209d065887729fdeb81f5a91638626e7ed31dabab40c446bd12042df9057
-
-[http://www.kokkinizita.net/linuxaudio/downloads/clthreads-2.4.0.tar.bz2]
-md5=90b650f1f5c9f39f4d77f73aca3c53be
-sha256=a69fd566af24b85a10c5ecd957a85b7f5eb1c56995d2b999219b52f353ea1de9
-
-[http://heanet.dl.sourceforge.net/clucene/clucene-core-0.9.21.tar.bz2]
-md5=181cf9a827fd072717d9b09d1a1bda74
-sha256=ef9af373ea953362e42c9a3bdcbf8ef317bca4a407ffab9fe36c1b2807680630
-
-[http://downloads.sourceforge.net/clucene/clucene-core-0.9.21b.tar.bz2]
-md5=ba1a8f764a2ca19c66ad907dddd88352
-sha256=202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317
-
-[http://heanet.dl.sourceforge.net/clucene/clucene-core-0.9.21b.tar.bz2]
-md5=ba1a8f764a2ca19c66ad907dddd88352
-sha256=202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317
-
-[http://www.kokkinizita.net/linuxaudio/downloads/clxclient-3.6.1.tar.bz2]
-md5=bd47f80a855d3203fcf10365e79d85e4
-sha256=9de3e621d7acabb161b5926565a9c9373fedbc632222018f692346790149545d
-
-[http://www.cmake.org/files/v2.2/cmake-2.2.3.tar.gz]
-md5=c0b57a115e24005f9828ca7b53908779
-sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd
-
-[http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz]
-md5=4476c423b8f74266136964e42ea88028
-sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56
-
-[http://www.cmake.org/files/v2.4/cmake-2.4.8.tar.gz]
-md5=f5dd061c31765a49dc17ae8bdc986779
-sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1
-
-[http://www.cmake.org/files/v2.6/cmake-2.6.0.tar.gz]
-md5=e95ae003672dfc6c8151a1ee49a0d4a6
-sha256=4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27
-
-[http://www.cmake.org/files/v2.6/cmake-2.6.3.tar.gz]
-md5=5ba47a94ce276f326abca1fd72a7e7c6
-sha256=3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450
-
-[http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz]
-md5=50f387d0436696c4a68b5512a72c9cde
-sha256=9cdd2152e37b05d0d40d334a1bb2dfc0250021797360f971c6ea3d457ac9fdf2
-
-[http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz]
-md5=32b0df93b285ee094e053552d9301cb6
-sha256=eb9f4b4b5973f444d16920201dfea217fb30542fea23107cf80a1f189408b321
-
-[http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz]
-md5=6cacb7db6eb61c64395be4ddc737095d
-sha256=d391829686eb002ace3ffbfed75c35e877b42c1884c9359791634b5b57126797
-
-[http://install.tarball.in.source.dir/codec_engine_2_21_00_06.tar.gz]
-md5=d8f3bbfbcc337d9776991d9561f451f3
-sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d
-
-[http://install.source.dir.com/codec_engine_2_23_01.tar.gz]
-md5=581f548714a53d818ac355a1e4aacfa4
-sha256=32c96ec23642d827bcbc865ac490fe7f2eeec2e04448980c4eb70d0fb25f74d8
-
-[http://install.source.dir.local/codec_engine_2_23_01.tar.gz]
-md5=581f548714a53d818ac355a1e4aacfa4
-sha256=32c96ec23642d827bcbc865ac490fe7f2eeec2e04448980c4eb70d0fb25f74d8
-
-[http://install.tarball.in.source.dir/codec_engine_2_23_01.tar.gz]
-md5=581f548714a53d818ac355a1e4aacfa4
-sha256=32c96ec23642d827bcbc865ac490fe7f2eeec2e04448980c4eb70d0fb25f74d8
-
-[http://install.source.dir.com/codec_engine_2_24_01.tar.gz]
-md5=39b0002fc7c4f2b9ddb0bbc2eeb26dc6
-sha256=59567c414943d2c7c0135f402e0df58bf81bf5027c06bd84fefce5ad9f98254f
-
-[http://install.source.dir.local/codec_engine_2_24_01.tar.gz]
-md5=39b0002fc7c4f2b9ddb0bbc2eeb26dc6
-sha256=59567c414943d2c7c0135f402e0df58bf81bf5027c06bd84fefce5ad9f98254f
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec-r1.patch]
-md5=ed96c1bddce4b7e40a40bad1d3cd63b5
-sha256=c178b3a7460cfaeb58c11ef9641d72ee912818b2ecbf1c09edf628d9168c0971
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec.patch]
-md5=97cdbeb23bc8c8f4fe563d10a0c8c110
-sha256=2e5488039040e76bdedb08323f729a0ef0549d23b35bb740f541c960393ec378
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-ts.patch]
-md5=a62bacafed0ca1d8384b848a1de49728
-sha256=a3e0ad85beb1b3ae6e33978c540b2e83746e9c1e2766da2d59509d9c0345f218
-
-[http://www.rpsys.net/openzaurus/patches/archive/collie_frontlight-r6.patch]
-md5=64b298138220e7f192556c5462a34db2
-sha256=5dad5d521e2bebb3847e84a84d04cc546f4cdda55e467a1cfec149378b7923ef
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie_pm-2.patch]
-md5=4fbebfebf03cb47cf6444bdb6f6b79b4
-sha256=19681eedbb924eb253308befe12938ab53c7cb3e74fc3eded000d087d322b403
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie_pm-3.patch]
-md5=812ee8bf3ea5739acb0ab2f732ecdc20
-sha256=8bb75a2577c72b4ad95851e545aafc7b0b89c3c41f087aea76b28635786f11c7
-
-[ftp://ftp.logilab.fr/pub/common/common-0.4.4.tar.gz]
-md5=4cd3ce38efbd27c6cf4223f0ced2a5b5
-sha256=21341f1900b0fe919a2ad057c334f5d7172588e4262b3d1b0904da03a9db0cff
-
-[ftp://ftp.logilab.fr/pub/common/common-0.9.3.tar.gz]
-md5=bfbe68606f2448b58836fb79b2582e71
-sha256=6794620f5663442246f6ae1bb6695fd120a1a6024c455da457ae4037b3ee6826
-
-[ftp://ftp.gnu.org/gnu/commoncpp/commoncpp2-1.7.1.tar.gz]
-md5=e1041356c3129e4d3d3d6a44f281d905
-sha256=cc0a7b96fd103154de70e8abfa5c5e3a6c8b9f5ca88f78aada4885c92ae089ba
-
-[http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-1.8.0-src.tar.gz]
-md5=1bce3cfa4ae33c94686422e78abc0792
-sha256=aff3c8c772e4ff32f2d9a37a727a488583372e45535a3d5aad09662691851dcf
-
-[http://www.apache.org/dist/commons/cli/source/commons-cli-1.1-src.tar.gz]
-md5=ccc1aa194132e2387557bbb7f65391f4
-sha256=929eb140c136673e7f5029cd206c81b3c1f5e66bba0dfdcd021b9dd5596356d2
-
-[http://www.apache.org/dist/commons/codec/source/commons-codec-1.3-src.tar.gz]
-md5=af3c3acf618de6108d65fcdc92b492e1
-sha256=12effcf3fea025bd34edbfec60a6216ca453fb27e781d8e5783caf75fd33d90e
-
-[http://www.apache.org/dist/commons/collections/source/commons-collections-2.1.1-src.tar.gz]
-md5=3fc2e8f9d0647074cba992b534ecf6df
-sha256=73eb5907a31c8770480c70f6a6a8d9a9a2ffe602e1b461c045cff51ace4cab2a
-
-[http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.tar.gz]
-md5=031ce05872ddb0462f0dcce1e5babbe9
-sha256=9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d
-
-[http://www.apache.org/dist/commons/configuration/source/commons-configuration-1.5-src.tar.gz]
-md5=6a019d26d576a87eda2ef84c8ffc2e31
-sha256=06e5dd81c1302118298156f70b8138fa131ed8f258671b1b67e36a34d80357a0
-
-[http://www.apache.org/dist/commons/digester/source/commons-digester-1.8-src.tar.gz]
-md5=689f41905a68c67f7231f9afbb3e2147
-sha256=d9a965c82828a881d2ab6256fba7076f62815a9545b3af9d553dc5271577182b
-
-[http://www.apache.org/dist/commons/discovery/source/commons-discovery-0.4-src.tar.gz]
-md5=1275ad4c6ce54b9323269e30dc42dd0e
-sha256=596242302be4f0502073f5a934c608289bba6221591e7dbea53ce629f67498a3
-
-[http://www.apache.org/dist/commons/fileupload/source/commons-fileupload-1.2.1-src.tar.gz]
-md5=c2bdb9264aec564e3f4fbbdf4344a844
-sha256=08905cb3a0db4f7fa67f3b579b2c481060334d50d7f913c6974c7513243152f5
-
-[http://www.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz]
-md5=2c9b0f83ed5890af02c0df1c1776f39b
-sha256=f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2
-
-[http://www.apache.org/dist/commons/io/source/commons-io-1.4-src.tar.gz]
-md5=24b228f2d0c40ffed9204cdab015bccf
-sha256=eca986497f7b4d1b1ec41821b1b5df827bb31fc14833e4449cfa8bcd5d7f29bb
-
-[http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz]
-md5=9af6ed5d009061986d709a370829860e
-sha256=da314198d75c6da660e2603bd1543a8f5d0b640c5144b748e62e59afc278efe6
-
-[http://www.apache.org/dist/commons/lang/source/commons-lang-2.4-src.tar.gz]
-md5=625ff5f2f968dd908bca43c9469d6e6b
-sha256=2445238cd0eb167e99a1147394f61325490559f3df7e7e8f628043fb70cbf2f4
-
-[http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz]
-md5=e5cfa8cca13152d7545fde6b1783c60a
-sha256=b49a79fa78ebfae15dc46ae6f0144fee6b94ab608a25518c54609d3419909eb2
-
-[http://www.apache.org/dist/commons/net/source/commons-net-1.4.1-src.tar.gz]
-md5=ccbb3f67b55e8a7a676499db4386673c
-sha256=fdea779f261f70b9bbec40121c830b11e3e63b6188f662f95505045ff8d44add
-
-[http://www.apache.org/dist/commons/pool/source/commons-pool-1.4-src.tar.gz]
-md5=4dc988ee16e1471799af97763297b41b
-sha256=ca4452f2a2ce2daf6eaa1743ded2d3b36013200c48e3f2117b65584ca5cc1d9b
-
-[http://compcache.googlecode.com/files/compcache-0.6.tar.gz]
-md5=0a574643c0eb857b946adcd5d5a22eb0
-sha256=e5f697be6c1b7bfb9ac9ba5b8d836ff20f880c161f998c482caba83caf443c0c
-
-[http://compcache.googlecode.com/files/compcache-0.6pre3.tar.gz]
-md5=532fbc4e6a8ae0670ec15a49484f313f
-sha256=3e54f26665bd1b7ece4e4621a15f82da66a95bafd04286d447be5a596790a7db
-
-[http://amelang.net/composite_pixbuf.c]
-md5=97edf3cce3353b6cb5f822442a83aa5e
-sha256=bd6f9e5dc0a89e9918f78a550f6e688480f044cec2e8674d34c7c6212831d6bd
-
-[http://xlibs.freedesktop.org/release/compositeext-2.0.tar.bz2]
-md5=315ce9665059f1b2f4067cc8bd7ecf44
-sha256=a6d9b1e4e8720941e7fa7e68373a9a211c16bad0eb449438e0b8c6093190cab6
-
-[http://xorg.freedesktop.org/releases/individual/proto/compositeproto-0.4.1.tar.bz2]
-md5=3692f3f8b2ea10dff3d2cede8dc65e79
-sha256=e2744576731e1416503aade0d58a7861d0260f70b993351473a9f38ced606984
-
-[http://xorg.freedesktop.org/releases/individual/proto/compositeproto-0.4.tar.bz2]
-md5=6281344d656d4e0c8e9db4918efe3d1d
-sha256=6013d1ca63b2b7540f6f99977090812b899852acfbd9df123b5ebaa911e30003
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/compositeproto-X11R7.0-0.2.2.tar.bz2]
-md5=4de13ee64fdfd409134dfee9b184e6a9
-sha256=a30f75ce8d9fdfdee6c15d1b4428d0b08602b163debf7a8836c09838c2d795bc
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/proto/compositeproto-X11R7.1-0.3.1.tar.bz2]
-md5=8e85c1e19a3169a42c5e860c36ec3e3b
-sha256=dc022c1ca5fbe047fce3d22fec0cac4a2d2b444dd901e6b7bbc139d6e643c25b
-
-[http://unimut.fsk.uni-heidelberg.de/demi/comprec/comprec-0.01.tar.gz]
-md5=dba850728cfa65403d5b699fd302399f
-sha256=b3b8da5e458f56246f735b499b32bc2a3a039d2d4092b1b249c60a188c2314d5
-
-[http://unimut.fsk.uni-heidelberg.de/demi/comprec/comprec-0.02.tar.gz]
-md5=705eebe74d98397e26193e0db9612b03
-sha256=905ee280a38f479ab7da75e6dfba21f221b23bb068111ebddc4c2e853f3fff09
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/config.patch]
-md5=c8be31ffebdae0e007ea587a11994e75
-sha256=64dfe89e56167bde80c6a18831b5a4259215c78c34ca16f4cb9fde10ffe54437
-
-[http://pypi.python.org/packages/source/C/ConfigObj/configobj-4.5.3.tar.gz]
-md5=6e2b37301439705831bd510d2a198431
-sha256=4276fcc96d81f0ba923f3a8c44c3cb55ac72c00fa79d35f1e3ccb4d410b3d7c5
-
-[http://download.savannah.gnu.org/releases/confuse/confuse-2.5.tar.gz]
-md5=4bc9b73d77ebd571ac834619ce0b3582
-sha256=65451d8d6f5d4ca1dbd0700f3ef2ef257b52b542b3bab4bbeddd539f1c23f859
-
-[ftp://ftp.moblin.org/connman/releases/connman-0.1.tar.gz]
-md5=493aa462d01d7c5f0461d6d7f9f549b1
-sha256=1d56be1036de59926548e3defa4b9af894af9e2121d3598da13769da5c0f55b1
-
-[http://ftp.moblin.org/connman/releases/connman-0.10.tar.gz]
-md5=094743343e062ea370fcd461aa48a7fe
-sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
-
-[http://repo.moblin.org/connman/releases/connman-0.10.tar.gz]
-md5=094743343e062ea370fcd461aa48a7fe
-sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
-
-[http://www.kernel.org/pub/linux/network/connman/connman-0.10.tar.gz]
-md5=094743343e062ea370fcd461aa48a7fe
-sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
-
-[http://www.kernel.org/pub/linux/network/connman/connman-0.12.tar.gz]
-md5=c0d27961dbdcb92b79dfde9c532dd348
-sha256=2dda1ba0d18e2b6de5fddd33a18324c8e75cddfc7df61595babfc19931fa4507
-
-[http://www.kernel.org/pub/linux/network/connman/connman-0.14.tar.gz]
-md5=746dc6b68cb99536ed4e7f8d6125f02b
-sha256=79e7d8948e11b94ced41f030c495706baca4bd9dafdfe730cf537fd0907ed3ef
-
-[http://www.kernel.org/pub/linux/network/connman/connman-0.15.tar.gz]
-md5=c7d5cbcdaaf98f194c2a59b26436ce34
-sha256=73f3b92c0f85ab2bf0f9bb18f928a8b84cacdbb459f3a530df540d4ddf134405
-
-[http://www.kernel.org/pub/linux/network/connman/connman-0.16.tar.gz]
-md5=7bc5c89870d47c88f407fcfd666c739d
-sha256=102bb7a5d329dd6831bc8a923fa0b5d7634efa215e3d15377630d9b738df49da
-
-[http://www.kernel.org/pub/linux/network/connman/connman-0.18.tar.gz]
-md5=b58cb56d0403bfafb3972e82a339546c
-sha256=923ce04b8ff93aa9eec4df6c822f1c7d35e8aea1ab8680bd0d9a5e4d327dd3c6
-
-[http://www.kernel.org/pub/linux/network/connman/connman-0.19.tar.gz]
-md5=3d61c5db55d225c3efbf4c950dc0842f
-sha256=cc4a4b73d8d7b0e19dd2dd274ba91acb67b14c84fc448a921d1359e25e4d2df0
-
-[ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz]
-md5=bf48aa07d3c1e5fe272c7f139bc01fc9
-sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
-
-[ftp://ftp.moblin.org/connman/releases/connman-0.4.tar.gz]
-md5=f5b84040e99eeff3a18e11e83b1eb12a
-sha256=e3a35e2ee2cc729bd637a69c7f82d6672317738d29dacab067468bb0634eb0de
-
-[http://www.kernel.org/pub/linux/network/connman/connman-0.46.tar.gz]
-md5=9bcdc528f38bc17ecb92519a28b741f1
-sha256=1853ed3d6400e25ef61ba1c98a7ef0f3984a2bf59aaf3485721cbc1de036b75c
-
-[ftp://ftp.moblin.org/connman/releases/connman-0.8.tar.gz]
-md5=3f1995bf91846b601a25a37832c88cb6
-sha256=d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d
-
-[http://www.kernel.org/pub/linux/network/connman/connman-0.8.tar.gz]
-md5=3f1995bf91846b601a25a37832c88cb6
-sha256=d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d
-
-[ftp://ftp.moblin.org/connman/releases/connman-0.9.tar.gz]
-md5=a5ebd17ff19e8f9b4d5e783d345d135b
-sha256=9c626bda7e2cc460cdbfe9a14c13208253de6922a341ef60ba51a673c0317996
-
-[http://www.kernel.org/pub/linux/network/connman/connman-0.9.tar.gz]
-md5=a5ebd17ff19e8f9b4d5e783d345d135b
-sha256=9c626bda7e2cc460cdbfe9a14c13208253de6922a341ef60ba51a673c0317996
-
-[ftp://ftp.moblin.org/connman/releases/connman-gnome-0.4.tar.gz]
-md5=c9a3b384f080ed4cdf139ce9377ef2c8
-sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
-
-[http://repo.moblin.org/connman/releases/connman-gnome-0.4.tar.gz]
-md5=c9a3b384f080ed4cdf139ce9377ef2c8
-sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
-
-[http://www.kernel.org/pub/linux/network/connman/connman-gnome-0.4.tar.gz]
-md5=c9a3b384f080ed4cdf139ce9377ef2c8
-sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
-
-[http://www.kernel.org/pub/linux/network/connman/connman-gnome-0.5.tar.gz]
-md5=0e1c4c25d19cad9b08a216848a320716
-sha256=4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c
-
-[http://www.conserver.com/conserver-8.1.14.tar.gz]
-md5=f7825728e5af8992ed4a99fb560a3df8
-sha256=48a9e2f8a02054bc6740ae354433bfa1636a6e726f2d62af22752d7a6103410b
-
-[http://www.conserver.com/conserver-8.1.2.tar.gz]
-md5=7f53d7a0bb05ad16116fb99f17bf06f0
-sha256=cb007ea21edb0e11f9e3a8a72c1623ce2718c49b7ddcabe6b815504b13d47c56
-
-[http://downloads.sourceforge.net/lct/console-tools-0.3.2.tar.gz]
-md5=bf21564fc38b3af853ef724babddbacd
-sha256=eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1c126c2
-
-[http://heanet.dl.sourceforge.net/lct/console-tools-0.3.2.tar.gz]
-md5=bf21564fc38b3af853ef724babddbacd
-sha256=eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1c126c2
-
-[http://qa.debian.org/watch/sf.php/lct/console-tools-0.3.2.tar.gz]
-md5=bf21564fc38b3af853ef724babddbacd
-sha256=eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1c126c2
-
-[ftp://ftp.logilab.org/pub/constraint/constraint-0.2.3.tar.gz]
-md5=17fd01667356cf4d9298c46ed6f88a4f
-sha256=e77e1cb6cdeb30367f75accf62a7b94598ece4400c42eb9d8181b7da4fc87f82
-
-[http://xorg.freedesktop.org/releases/individual/app/constype-1.0.1.tar.bz2]
-md5=9f99bee77ff3c565b4898663810fbef5
-sha256=11403054cb407cdf31da48216f55d1b5943798cb442bcab69faa0a3d7d167541
-
-[http://xorg.freedesktop.org/releases/individual/app/constype-1.0.2.tar.bz2]
-md5=83f623f961400ecc56ff52a716308173
-sha256=70375ea6b3e17cabc35492f87b5b138295c8f0258d65b0fbba998e3ff69bb634
-
-[http://projects.o-hand.com/sources/contacts/contacts-0.4.tar.gz]
-md5=7d72fac4f0d6e1c771c37e4e80093e70
-sha256=e090ab64a02e4918f78312df19715bc2008aae7d44f6b0913c2a46a13d1881c4
-
-[http://pimlico-project.org/sources/contacts/contacts-0.7.tar.gz]
-md5=2117d9c96ce0d142eca957450794d876
-sha256=44549dcc5aa1aff1c62d0cf2a86412468f1498ecd3e846d278552ee50662242d
-
-[http://pimlico-project.org/sources/contacts/contacts-0.8.tar.gz]
-md5=dbcff54980ec6d6203c290dc409b5598
-sha256=7ab8f1fa23a432029242c046755875ac6558ea6e9c0871dd6c527b85adfafad8
-
-[http://pimlico-project.org/sources/contacts/contacts-0.9.tar.gz]
-md5=aab5affbf93d6fa7b978b323a8d44de0
-sha256=9cacec98f8123993033aaa255f3f4c04c86a1be65e487dd21f0aaa54384a6f6d
-
-[ftp://ftp.gnu.org/gnu/coreutils/coreutils-5.0.tar.gz]
-md5=d16b769d380a0492a4c5ee61d2619985
-sha256=c27ce75e3f62455f4facf4f3fd55bc9e3877d0ab1d5c0426c94da168cc349883
-
-[ftp://alpha.gnu.org/gnu/coreutils/coreutils-5.1.1.tar.bz2]
-md5=c7b0aa7d7bd352f4c9dda541a8c864f9
-sha256=ba798267ba4cea6888353ae0447949ef4967a1e3d548f50beac3208337d15197
-
-[ftp://alpha.gnu.org/gnu/coreutils/coreutils-5.1.3.tar.bz2]
-md5=ad19909ed6a7992f6917d6bc282f4a40
-sha256=7fd75a3accdfec1fb52fa5f715a54654f217361c4ec489db27ce0dd8423af1b1
-
-[ftp://alpha.gnu.org/gnu/coreutils/coreutils-5.3.0.tar.bz2]
-md5=903890208248639ac723d2c4988e04bd
-sha256=7c3181475402d2b547a407a77b1a8de986eb3a19ee2051f2748e968a7ab83a8c
-
-[ftp://alpha.gnu.org/gnu/coreutils/coreutils-6.0.tar.bz2]
-md5=c15219721e6590fa13bf50af49e712c2
-sha256=efa27532ec6dc12a21f703ad4a0f612e613e9cc2575147685db81cc701952ac9
-
-[ftp://ftp.gnu.org/gnu/coreutils/coreutils-7.1.tar.gz]
-md5=cbb2b3d1718ee1237b808e00b5c11b1e
-sha256=813cb19fa19a885f342664109c7c5810f0081b624ff317bba8d1b6ccd83c2a05
-
-[ftp://ftp.gnu.org/gnu/coreutils/coreutils-7.2.tar.gz]
-md5=427c2914d3eab956f317c9ec6a45e62a
-sha256=dd77bfec92e5a3ad48abd8a5bda3f8d40149c4e24744e4173abc3cc6a731fdb2
-
-[http://www.rpsys.net/openzaurus/patches/archive/corgi_rearrange_lcd-r0.patch]
-md5=c1bec44c92f5da5abad97137c73b1365
-sha256=d4dc8f0583e616e74ea41b103d5f6a29b6d079ce37eaf9f362825514c7082490
-
-[http://www.agroman.net/corkscrew/corkscrew-2.0.tar.gz]
-md5=35df77e7f0e59c0ec4f80313be52c10a
-sha256=0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be
-
-[http://downloads.sourceforge.net/corsair/corsair-0.2.6.tar.gz]
-md5=91dd4c6b5650aef03b293aa9a6f54d49
-sha256=db3782e57882a36ac42b69097a817dc3e2a4031cacb815a4e4a1115da108e519
-
-[http://heanet.dl.sourceforge.net/corsair/corsair-0.2.6.tar.gz]
-md5=91dd4c6b5650aef03b293aa9a6f54d49
-sha256=db3782e57882a36ac42b69097a817dc3e2a4031cacb815a4e4a1115da108e519
-
-[ftp://ftp.gnu.org/gnu/cpio/cpio-2.5.tar.gz]
-md5=e02859af1bbbbd73fcbf757acb57e0a4
-sha256=dbf79293d0cafa7d7a3a266c2b0b90c00d556e7b3185d4243c74153291da24c8
-
-[http://downloads.sourceforge.net/cppunit/cppunit-1.10.2.tar.gz]
-md5=0bc06cd219410f7d4f6bbfc9bdd7c824
-sha256=71b626958e3d8927d236f462b2becd192a113d1d6d38b8d567bdc181b5069ccf
-
-[http://heanet.dl.sourceforge.net/cppunit/cppunit-1.10.2.tar.gz]
-md5=0bc06cd219410f7d4f6bbfc9bdd7c824
-sha256=71b626958e3d8927d236f462b2becd192a113d1d6d38b8d567bdc181b5069ccf
-
-[http://downloads.sourceforge.net/cppunit/cppunit-1.12.1.tar.gz]
-md5=bd30e9cf5523cdfc019b94f5e1d7fd19
-sha256=ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a
-
-[http://pages.sbcglobal.net/redelm/cpuburn_1_4_tar.gz]
-md5=f9bb5ff68afb6ccfca11718c90bcab68
-sha256=1b2a1672f455545a28d0f038737e792e8c3b97789f2029f765847fc2a807244a
-
-[http://downloads.sourceforge.net/cpufreqd/cpufreqd-1.1.2.tar.gz]
-md5=d06dcf3e3b2f8eb25216431ec055aa4b
-sha256=c64eb1923366934357c917ff9a94237a8157de24a1fd96e0f91c4d5dfad83026
-
-[http://heanet.dl.sourceforge.net/cpufreqd/cpufreqd-1.1.2.tar.gz]
-md5=d06dcf3e3b2f8eb25216431ec055aa4b
-sha256=c64eb1923366934357c917ff9a94237a8157de24a1fd96e0f91c4d5dfad83026
-
-[http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-006.tar.bz2]
-md5=124b0de8f3a4d672539a85ce13eed869
-sha256=b8e77854a1400b0cc73295f3ee5d0a0c3650438e677526a199e08f6680c15aa1
-
-[http://www8.in.tum.de/~schneifa/group/sources/cpusage-0.1.tar.gz]
-md5=f779140995280de32817ec4a133f4d60
-sha256=feb0b8c73c771390a8771fc3a4ed01104c008bcd278a267eb00263794956778c
-
-[http://www8.in.tum.de/~schneifa/group/sources/cpusage-0.2.tar.gz]
-md5=4f2662346fa8e6feeebceafc4ec18090
-sha256=f301bca2f5999cd16fec01db58d0fbba781eb659ce30d532cc9569e7950b90bf
-
-[http://carlthompson.net/dl/cpuspeed/cpuspeed-1.1.tar.gz]
-md5=ed3972d0e4f77c0278e336392be47c65
-sha256=93da5b3a30c5c7c06583635e5b93e9f04f687c01a044779872a29050c4f860e8
-
-[http://downloads.sourceforge.net/cramfs/cramfs-1.1.tar.gz]
-md5=d3912b9f7bf745fbfea68f6a9b9de30f
-sha256=133caca2c4e7c64106555154ee0ff693f5cf5beb9421ce2eb86baee997d22368
-
-[http://heanet.dl.sourceforge.net/cramfs/cramfs-1.1.tar.gz]
-md5=d3912b9f7bf745fbfea68f6a9b9de30f
-sha256=133caca2c4e7c64106555154ee0ff693f5cf5beb9421ce2eb86baee997d22368
-
-[http://createrepo.baseurl.org/download/createrepo-0.9.tar.gz]
-md5=0a1b1e67e3c61cda41b41a8886a90e78
-sha256=21786abe80f2c06eb9bef107d8c79f50a088a894cddf793112ce0417e83be531
-
-[http://linux.duke.edu/projects/metadata/generate/createrepo-0.9.tar.gz]
-md5=0a1b1e67e3c61cda41b41a8886a90e78
-sha256=21786abe80f2c06eb9bef107d8c79f50a088a894cddf793112ce0417e83be531
-
-[http://crimson.seul.org/files/crimson-0.4.8.tar.bz2]
-md5=460920e64b07ea0ef139a0f5d51bd2d9
-sha256=95784b14539dec30565b0bf1da8a3b1d51636142bbf1207c6d87256c92172aa7
-
-[http://ibiblio.org/pub/Linux/system/daemons/cron/cron3.0pl1.tar.gz]
-md5=d9f12c3edfca4a4918b8d299cce5f2b4
-sha256=99602e966e12347f2728b2153537a14195b06fe130d047e8d91b4f72b24866a0
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/cross-gprof.patch]
-md5=9e5f053de38f3342a426dd580d7ec331
-sha256=7f8105cf71d2a5c7efa0f9e4b9cc61ac5f68a5b57f0daefb4b51b657f0eeac92
-
-[http://handhelds.org/~zecke/oe_packages/crossword_V0.0.3.tar.gz]
-md5=659d5c53cbace53f44fe7acb666bfe33
-sha256=8b718c344cf19417447cbc16867d2e04434654c13b330598b96720ead146b961
-
-[http://luks.endorphin.org/source/cryptsetup-1.0.5.tar.bz2]
-md5=0aa2f94c39123f1a0352983e5366179c
-sha256=4bab529afa00cafde3bc5df2769578c88438f80c5152d4257cd0e86986f95bc4
-
-[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_00/latest//exports/cs1omap3530_setuplinux_1_00_01-42.bin]
-md5=a1e19ef37638e977d059fd22af666301
-sha256=fc7ac2829df8d394635aa1cc704b78e93ca287111df1001e5738ae2282691219
-
-[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_00/latest//exports/cs1omap3530_setuplinux_1_00_01.bin]
-md5=779415872c771b580e4c6d10346b3a79
-sha256=0903c37aaa9ced2c12a9e7d4a418b7d57d5a92a0f1451afd29f70bd0da240bc8
-
-[http://svn.o-hand.com/repos/web/trunk/patches/css-media.patch]
-md5=d3fe4cda3545f3e4718f1acc186608ab
-sha256=3aefaa17ffa38143bf5df1161c51ab402d35bfbee41ab4643c313edf569165d5
-
-[http://svn.o-hand.com/repos/web/trunk/patches/css-stylesheet-user.patch]
-md5=05fc3627ca364095702dc804f41c8391
-sha256=df5cca50a8f95333505d7920929fea251daea3be25be6834a1c50a742d9eb674
-
-[http://downloads.sourceforge.net/ctags/ctags-5.5.4.tar.gz]
-md5=a84124caadd4103270e0b84596ecfe83
-sha256=7b83689a47efa627d4b5670317125de3d87ae9278cf69c3ac7e3b7be646e715d
-
-[http://heanet.dl.sourceforge.net/ctags/ctags-5.5.4.tar.gz]
-md5=a84124caadd4103270e0b84596ecfe83
-sha256=7b83689a47efa627d4b5670317125de3d87ae9278cf69c3ac7e3b7be646e715d
-
-[http://downloads.sourceforge.net/ctorrent/ctorrent-1.3.4.tar.bz2]
-md5=823010ec78215d476537c9eba9381cdd
-sha256=7e2ef5d0656ac23cecd03374d9b00291a55b274c972adfe94d6f41ae3ba60c73
-
-[http://heanet.dl.sourceforge.net/ctorrent/ctorrent-1.3.4.tar.bz2]
-md5=823010ec78215d476537c9eba9381cdd
-sha256=7e2ef5d0656ac23cecd03374d9b00291a55b274c972adfe94d6f41ae3ba60c73
-
-[http://downloads.sourceforge.net/dtorrent/ctorrent-dnh3.3.1.tar.gz]
-md5=9bfe42c2dd6a6aabd545fe332bc23e87
-sha256=e65d9c7a4da499314126d979a0a79ce5123e0f969c786bfddcee261f14cb648b
-
-[http://heanet.dl.sourceforge.net/dtorrent/ctorrent-dnh3.3.1.tar.gz]
-md5=9bfe42c2dd6a6aabd545fe332bc23e87
-sha256=e65d9c7a4da499314126d979a0a79ce5123e0f969c786bfddcee261f14cb648b
-
-[http://sources.nslu2-linux.org/sources/ctrlproxy-2.6.2.tar.gz]
-md5=37570a7f018f41d701cd29cd95b45241
-sha256=c8c42cc08b9b462f9c497441dacde1eac71fd717195ddfbeac68141bd0ad95a8
-
-[http://www.kflog.org/fileadmin/user_upload/cumulus_downloads/1.2.1/cumulus-1.2.1.src.tar.bz2]
-md5=a13e49376594c51fbfa74067f8d14d45
-sha256=e3ed263ee98971674f3f3cf55e42b7f2e79755b0f931f8a105676108185e8010
-
-[http://www.kflog.org/fileadmin/user_upload/cumulus_snapshots/cumulus-snapshot.tbz]
-md5=c5b0ca7f2164e47ef72889baf23690f6
-sha256=e862f8327a3ba42c7bc756fe846764754b3dab76d8ccbedd5a195b582070b791
-
-[ftp://ftp3.easysw.com/pub/cups/1.1.23/cups-1.1.23-source.tar.bz2]
-md5=4ce09b1dce09b6b9398af0daae9adf63
-sha256=87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
-
-[ftp://ftp.easysw.com/pub/cups/1.2.10/cups-1.2.10-source.tar.bz2]
-md5=aad696a480b618e61bc7dab11623d3ac
-sha256=601b3b9256c55361477427c3e8db56c9ee4e141762814aea590bcf110a95bb36
-
-[ftp://ftp3.easysw.com/pub/cups/1.2.10/cups-1.2.10-source.tar.bz2]
-md5=aad696a480b618e61bc7dab11623d3ac
-sha256=601b3b9256c55361477427c3e8db56c9ee4e141762814aea590bcf110a95bb36
-
-[ftp://ftp.easysw.com/pub/cups/1.2.12/cups-1.2.12-source.tar.bz2]
-md5=d410658468384b5ba5d04a808f6157fe
-sha256=b4ff8e934da7db32d5654360ea9068faa0ed5a00fde02161ae53c2052510d00f
-
-[ftp://ftp3.easysw.com/pub/cups/1.2.7/cups-1.2.7-source.tar.bz2]
-md5=bf44783d9b46130bee9f2995e6055470
-sha256=e7485d6b3dcbd338a2361aff66c516f8dfafc1c81ea5b01396f6ee5f365c4eb3
-
-[ftp://ftp.easysw.com/pub/cups/1.3.8/cups-1.3.8-source.tar.bz2]
-md5=90ed7449948994ad1b22b0b177ab6ba6
-sha256=d488980f84ad0e6044a67859144306980624cafb654eb0cab071b3e46fee6e1d
-
-[http://curl.haxx.se/download/curl-7.14.0.tar.bz2]
-md5=46ce665e47d37fce1a0bad935cce58a9
-sha256=72987b68c265c262f073f7a0273f3c2f57dfe8b455da0f92f03914418d86f081
-
-[http://curl.haxx.se/download/curl-7.15.1.tar.bz2]
-md5=d330d48580bfade58c82d4f295f171f0
-sha256=8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324
-
-[http://curl.haxx.se/download/curl-7.16.0.tar.bz2]
-md5=5819f56e93d04cde2992fe88b54cbfad
-sha256=fc8dcda5a933c370c15c832bf1e7316a0690f473fdd6000454d233edaa33bc23
-
-[http://curl.haxx.se/download/curl-7.16.2.tar.bz2]
-md5=37a1de15c4300ca9413d39d2bcea9b36
-sha256=2e833e81d43f6294e5bd0d1776d68bd147bdab31e86c7544dc1462e44db9bfa2
-
-[http://curl.haxx.se/download/curl-7.16.4.tar.bz2]
-md5=ffa6d1f4e28ca493a43f9dc17882c4d8
-sha256=45c69529126b6ff50e7ebe2c2b8157a4ecb405174a1349234903021e9ac5c87b
-
-[http://curl.haxx.se/download/curl-7.18.0.tar.bz2]
-md5=3e50dd887d6a354be312d874e1d3426c
-sha256=300561ef53ee5971b304142d8570a91f879228c2016e74a142fa3421dfcd3672
-
-[http://curl.haxx.se/download/curl-7.18.2.tar.bz2]
-md5=c389be5b0525276e58865956b7465562
-sha256=b1f47a0177a5b13d317ab1f6570510502739909ede550e7da08ba814c3c73ae8
-
-[http://curl.haxx.se/download/curl-7.19.0.tar.bz2]
-md5=c299c5e0f20f633791b4c4f7ced4effe
-sha256=a0e28b019f022942650ffa4bdf46e4c09bd8ec18e6ca5f08ad273668115f51f7
-
-[http://curl.haxx.se/download/curl-7.19.5.tar.bz2]
-md5=426d161661dce70c8ea9ad8f553363a3
-sha256=05ad84a9c8d340917370f357ad9fdce5ea595deb11f4cb70f946fa48c7b02cd0
-
-[http://curl.haxx.se/download/curl-7.19.6.tar.bz2]
-md5=8402c1f654c51ad7287aad57c3aa79be
-sha256=ea88f48c8415f7d3af482e4d241277b2bdbfaffaf285e8001c88c1376cbc1021
-
-[http://downloads.sourceforge.net/curlftpfs/curlftpfs-0.9.2.tar.gz]
-md5=b452123f755114cd4461d56c648d9f12
-sha256=4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958
-
-[http://heanet.dl.sourceforge.net/curlftpfs/curlftpfs-0.9.2.tar.gz]
-md5=b452123f755114cd4461d56c648d9f12
-sha256=4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958
-
-[http://www.blackie.dk/Zaurus/custominput/custominput-1.1.0.tgz]
-md5=7a0f97339a1caed5695715581306b83e
-sha256=9af88287720701691b58ee13898d248dd9afc63d9c593eb79c1149cc2a7f4e92
-
-[http://musthave.sunbase.org/progs/ccvs/Old/cvs-1.12.8/cvs-1.12.8.tar.bz2]
-md5=d320e4429755019e5058e726de753472
-sha256=52783a5b8bd195b1fa50453dfd5949e23a787d0db56f6acd3bbd92aad0f486fe
-
-[http://musthave.sunbase.org/progs/ccvs/cvs-1.12.9/cvs-1.12.9.tar.bz2]
-md5=41396dfe38c3c9f80de98ea53e6d55aa
-sha256=00383a2c79ea0956b2d4adb772895648ea774f46186d3e19a2f263c73a846963
-
-[http://abstrakraft.org/cwiid/downloads/cwiid-0.6.00.tgz]
-md5=8d574afdeedc5e5309c87a72d744316a
-sha256=8880378303d872ea65b037184ad6c96bc68f87764b503c152032f56344b5e81d
-
-[https://garage.maemo.org/frs/download.php/939/cx3110x-1.1.tar.gz]
-md5=18e5dc522aa9424cf9b32b86da19b85e
-sha256=b0e00a7c164711512549d3ad82707c53a20fd978c2448ec22d2ea76df1954eee
-
-[https://garage.maemo.org/frs/download.php/939/cx3110x-1.2.tar.gz]
-md5=18e5dc522aa9424cf9b32b86da19b85e
-sha256=b0e00a7c164711512549d3ad82707c53a20fd978c2448ec22d2ea76df1954eee
-
-[http://repository.maemo.org/pool/os2008/free/source/c/cx3110x-module-src/cx3110x-module-src_2.0.15-1.tar.gz]
-md5=6ac5db5e602ef205200428a6612b4036
-sha256=20416248378cb42cb294584d9c5e4359d3d309ab8e104d62b09848f88bc7fe10
-
-[http://www.fh-wedel.de/pub/fh-wedel/staff/herbert/misc/cxcrypt-1.0.tar.gz]
-md5=8b90c19943f1b893cd53072de34f2ca6
-sha256=100ec0afc6a5733f2b0c936058d8055d7965078c95ac187a573bf0a5a63cb268
-
-[ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-2.2.12.tar.gz]
-md5=70b3bba526a8d36d3bb23a87d37e9188
-sha256=3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b
-
-[ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/cyrus-imapd-2.2.5.tar.gz]
-md5=ad8e3ca17b04a38c934f8c7a80c8adec
-sha256=8f3b8a3076c16f21ef2912c29033975fb6072ceb68471f15d8a53d833f2873e7
-
-[ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-2.1.17.tar.gz]
-md5=4add6be2f194dc51aafc64193a1dd77b
-sha256=7a0b1d5135fa470d10b86f4efbf3f59d6412f1e539f7ea61604d44ac4505dba6
-
-[ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-2.1.18.tar.gz]
-md5=1eafae95f0289c10f187d8b2bc4032cf
-sha256=384279adfd582ad6f905197c46a5157f855462718530148fdbab3328cf621eb7
-
-[ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.19.tar.gz]
-md5=ea76410ad88fa7b6c17a6aac424382c9
-sha256=0ee2d5d04972a15c3154730f328467a5cf5c7e69766a73bab06664263666bfeb
-
-[http://www.cython.org/cython-0.9.6.9.zip]
-md5=5eba3f3d2ed1271adf85b39079ab0415
-sha256=b58768fd50c7eefde5a0943ce3c99843cfbdf736793e439a0df4ab7916c7fb58
-
-[http://xlibs.freedesktop.org/release/damageext-1.0.tar.bz2]
-md5=1d88a72b12b5ec505747069053d54847
-sha256=4488bee8994e45dfe91563e89fd7e862779ae02a67b8a121d2ec10b263f2d2f3
-
-[http://xorg.freedesktop.org/releases/individual/proto/damageproto-1.1.0.tar.bz2]
-md5=33ee591e0b1ca5ad7902934541db7d24
-sha256=9d2684fac835e9cdf78befff2a58292f54db90094acbfb9f2ed5316fa30d641d
-
-[http://xorg.freedesktop.org/releases/individual/proto/damageproto-1.2.0.tar.bz2]
-md5=434b931b02bd83ed9fc44951df81cdac
-sha256=a50250770a2eead9d6fd56577e3328d0a6a1c4d425b58faa0f5ca7683169ee8f
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/damageproto-X11R7.0-1.0.3.tar.bz2]
-md5=b906344d68e09a5639deb0097bd74224
-sha256=f71ae6f74fd43af078c052d5e9daa262b6bd28cc0d40938c3743391eaeb58bfc
-
-[http://snapshot.debian.net/archive/2005/07/11/debian/pool/main/d/dash/dash_0.5.2-6.diff.gz]
-md5=ff79ea963744833b64f53ea080e56727
-sha256=765e047005a7f712050e6dbded060681356b6bf96a694df98e9a40c2ddfe6138
-
-[http://ftp.debian.org/debian/pool/main/d/dash/dash_0.5.2.orig.tar.gz]
-md5=9f75e13d99fee819522ac05c64d3112e
-sha256=c13f16cf7d8bfd1a24211131530981c4884af0d6ad89fd707de5ab2f270b350a
-
-[http://ftp.debian.org/debian/pool/main/d/dash/dash_0.5.5.1-2.3.diff.gz]
-md5=be9cf0b148f4127d06cede66241175c0
-sha256=afa02603f39a9557c65f88702f41190fa69e41ebe5d7729b4a52ab04573539c5
-
-[http://ftp.debian.org/debian/pool/main/d/dash/dash_0.5.5.1.orig.tar.gz]
-md5=7ac832b440b91f5a52cf8eb68e172616
-sha256=1c6717a1014c73aa16bc78a4767f1e00b40ff2a01a6c2cf2cce9a5335c24493f
-
-[http://pimlico-project.org/sources/dates/dates-0.4.5.tar.gz]
-md5=13f2bb562a13610c005a4e6204112661
-sha256=3febeb76d5b3bf9ef978e1141987b5aa7f064b1a41bf428b9d7b2bcb0782753a
-
-[http://pimlico-project.org/sources/dates/dates-0.4.6.tar.gz]
-md5=27f51157253966676e99b539c24d2c68
-sha256=95227e87d030bffd5af9d04a89ed828586a3125b81bf086b1fae03579aebe44e
-
-[http://downloads.sourceforge.net/dav/davfs2-0.2.7.tar.gz]
-md5=c17d450b655bf4503c22f9f07bd9b087
-sha256=8e230254e8a1c426ddb6a78de62de931c0c8cfe0767686b7a10a5031c4340826
-
-[http://heanet.dl.sourceforge.net/dav/davfs2-0.2.7.tar.gz]
-md5=c17d450b655bf4503c22f9f07bd9b087
-sha256=8e230254e8a1c426ddb6a78de62de931c0c8cfe0767686b7a10a5031c4340826
-
-[http://downloads.sourceforge.net/dav/davfs2-0.2.8.tar.gz]
-md5=586bdead055993a4a06bdeee5449310d
-sha256=04f98a83e6339f490046d908c0fcca1275e79462f11592187eb23c7368a172f1
-
-[http://heanet.dl.sourceforge.net/dav/davfs2-0.2.8.tar.gz]
-md5=586bdead055993a4a06bdeee5449310d
-sha256=04f98a83e6339f490046d908c0fcca1275e79462f11592187eb23c7368a172f1
-
-[ftp://sleepycat1.inetu.net/releases/db-3.2.9.tar.gz]
-md5=4df5c7051b11411e0a970f6c91613942
-sha256=3eccaec87bca4ca0f5728cf4579650da9d12e331187f1e98321e5c9e9e04b108
-
-[http://download.oracle.com/berkeley-db/db-3.2.9.tar.gz]
-md5=4df5c7051b11411e0a970f6c91613942
-sha256=3eccaec87bca4ca0f5728cf4579650da9d12e331187f1e98321e5c9e9e04b108
-
-[http://download.oracle.com/berkeley-db/db-4.2.52.tar.gz]
-md5=8b5cff6eb83972afdd8e0b821703c33c
-sha256=f4bddd8d1b4cde0daf5e13e3493ed62a25b736b0bf258e1d929e47bc6a82a28c
-
-[http://downloads.sleepycat.com/db-4.2.52.tar.gz]
-md5=8b5cff6eb83972afdd8e0b821703c33c
-sha256=f4bddd8d1b4cde0daf5e13e3493ed62a25b736b0bf258e1d929e47bc6a82a28c
-
-[http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz]
-md5=200b9f5d74175875fcb3ee54adbf0007
-sha256=a1fa714482f25a67a19490303a0164326ac63bd7653ae3f4664c2536b14f3337
-
-[http://downloads.sleepycat.com/db-4.3.29.tar.gz]
-md5=200b9f5d74175875fcb3ee54adbf0007
-sha256=a1fa714482f25a67a19490303a0164326ac63bd7653ae3f4664c2536b14f3337
-
-[http://samba.org/ftp/tridge/dbench/dbench-3.04.tar.gz]
-md5=efd0c958da79c1cd941ecd3f63e637ae
-sha256=055e411081ae25fd358dd0f4c1547ee1bd7429bea0f1fad9156a50a09ddd668b
-
-[http://samba.org/ftp/tridge/dbench/dbench-4.0.tar.gz]
-md5=1fe56ff71b9a416f8889d7150ac54da4
-sha256=6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a
-
-[http://downloads.sourceforge.net/dbh/dbh_1.0-18.tar.bz2]
-md5=dca09e2949616471669320e3429a49ef
-sha256=62c8c36df69c48bed9e8a1406faa5df5d057876b34fc110492c87260a70692c6
-
-[http://heanet.dl.sourceforge.net/dbh/dbh_1.0-18.tar.bz2]
-md5=dca09e2949616471669320e3429a49ef
-sha256=62c8c36df69c48bed9e8a1406faa5df5d057876b34fc110492c87260a70692c6
-
-[http://qa.debian.org/watch/sf.php/dbh/dbh_1.0-18.tar.bz2]
-md5=dca09e2949616471669320e3429a49ef
-sha256=62c8c36df69c48bed9e8a1406faa5df5d057876b34fc110492c87260a70692c6
-
-[http://dbus.freedesktop.org/releases/dbus/dbus-1.0.1.tar.gz]
-md5=52c70d18fe0b398f5de3b8a18a589960
-sha256=6e0730a39485fb502d640841f0f328c1a0212743f17b3fa61c78e6e32925f061
-
-[http://dbus.freedesktop.org/releases/dbus/dbus-1.0.2.tar.gz]
-md5=0552a9b54beb4a044951b7cdbc8fc855
-sha256=8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
-
-[http://freedesktop.org/software/dbus/releases/dbus-1.0.2.tar.gz]
-md5=0552a9b54beb4a044951b7cdbc8fc855
-sha256=8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
-
-[http://dbus.freedesktop.org/releases/dbus/dbus-1.0.3.tar.gz]
-md5=ce328423db5743fe9006d39113b5324d
-sha256=4be82f4ef8f4657f997a44b3daddba3f95dbb6518487509767d803dd72bf529e
-
-[http://freedesktop.org/software/dbus/releases/dbus/dbus-1.0.3.tar.gz]
-md5=ce328423db5743fe9006d39113b5324d
-sha256=4be82f4ef8f4657f997a44b3daddba3f95dbb6518487509767d803dd72bf529e
-
-[http://dbus.freedesktop.org/releases/dbus/dbus-1.1.1.tar.gz]
-md5=545ce6d92cb1ed63a54b39d15aed36a6
-sha256=ec115ffefe0d1b6aa94bebd536f67b0f6fc0405bdcfb4fb1e481d2f1a8b20a91
-
-[http://dbus.freedesktop.org/releases/dbus/dbus-1.1.20.tar.gz]
-md5=c552b9bc4b69e4c602644abc21b7661e
-sha256=6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e
-
-[http://dbus.freedesktop.org/releases/dbus/dbus-1.2.1.tar.gz]
-md5=b57aa1ba0834cbbb1e7502dc2cbfacc2
-sha256=8016540602189e1dca6aca6b7c0735706387e4f85ced75217c6a874980fd0e86
-
-[http://dbus.freedesktop.org/releases/dbus/dbus-1.2.3.tar.gz]
-md5=f71641385768e99361bd298568207cee
-sha256=16ffaa4a8758f115cf02c78962b0849ed4d802872420fd460c433a9cd580ed1a
-
-[http://dbus.freedesktop.org/releases/dbus/dbus-1.3.0.tar.gz]
-md5=b3298d5ce0e4ad4731b1e4e1787d56bb
-sha256=fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae
-
-[http://freedesktop.org/software/dbus/releases/dbus-glib-0.71.tar.gz]
-md5=4e1e7348b26ee8b6485452113f4221cc
-sha256=b58a489fdd35a70d241f512bc08f3b6d9d8e05110f4a1d5341cff6a0b7d854b7
-
-[http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.72.tar.gz]
-md5=6e92993aed234f13ea41c674dec40889
-sha256=bc80a1933a77fc4cb47716d06aec3c2181976879ba771888af8b644086f24210
-
-[http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.74.tar.gz]
-md5=0923d825a0aff2e4eb23338b630286fb
-sha256=e870d8cd619834eda066e37fe69b441d629f9ad3a871ef2854fbbcd753b3abe2
-
-[http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.76.tar.gz]
-md5=d3b716a7e798faa1c6a867675f00306a
-sha256=8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3
-
-[http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.78.tar.gz]
-md5=d4aa04b9df35b4bd663be38e959941c8
-sha256=ca366fed6035f75c6ca038f99b780260a0e19f282067b2dd20243ba54105fc21
-
-[http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.82.tar.gz]
-md5=aa2a4517de0e9144be3bce2cf8cdd924
-sha256=ddfb062797341b5c5a22555ffe80138953cc61a67ba805647b2746f519bfbde1
-
-[http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.3.tar.gz]
-md5=eeec2c3ae0a857c75fd3ac96e0612921
-sha256=6ca8464a04d08232968d1ffca3d3f777f55dc39326040c487f50f52d4272e820
-
-[http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.4.tar.gz]
-md5=cd675550676b84601cd44f39246c4ea9
-sha256=24f31eac8f193771f70134ff7d3c5a7334250f9b50f0a476d12221be4773db32
-
-[http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.5.1.tar.gz]
-md5=1d1cb956a81be2168452cfea4912d613
-sha256=46db0d65ecadaa0bf90eb7b285609454a0b7439e09655dc722e3f61f2d01bdb2
-
-[http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.5.tar.gz]
-md5=0fa50b9d2bf5cb2f54e293acca9eb807
-sha256=2b2001aa2fccc6cc3eedfeb35d2c7b13e52811c27820f27f0f6ce0e8f547ad65
-
-[http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.71.tar.gz]
-md5=ee893bc87b784a8c2285f5041b5e7033
-sha256=4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57
-
-[http://freedesktop.org/software/dbus/releases/dbus-python-0.71.tar.gz]
-md5=ee893bc87b784a8c2285f5041b5e7033
-sha256=4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57
-
-[http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.82.4.tar.gz]
-md5=f491e0372128a6d1178b210a8b1a842f
-sha256=e34e30a4c0ea405f9e830aa0026e9c0632f526f242e90526ff0a7da8dd7f5e2e
-
-[http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.83.0.tar.gz]
-md5=562c78876219bf458d79a041af18293d
-sha256=89dd1d5aa5c2ba04677d1aa2616caa50274d8c08f3d6bc164e6f7b9930776191
-
-[http://packetstormsecurity.org/UNIX/scanners/dcetest-2.0.tar.gz]
-md5=74ee7617c8b01cc641992c1d13dc394b
-sha256=4a319a08ae0838234f5b6fbd0b4d2e0fac7560a7553a4e1b043527cc17032aa3
-
-[http://ibiblio.org/pub/Linux/system/daemons/cron/dcron-2.3.3.tar.gz]
-md5=537cda2dff7dfaf87660fee91b2cf78f
-sha256=bd7ce3b854678209e8624698a4000d3e5337339c3825c58a4b3a0a2fbf1a7819
-
-[http://downloads.sourceforge.net/ddccontrol/ddccontrol-0.4.2.tar.bz2]
-md5=b0eb367f3bc0564bd577e38d0b4107fc
-sha256=986f3b4b27ec04e1da493de3aaab01cd5ea9566d7572c1a40b8d43cd7a491e84
-
-[http://downloads.sourceforge.net/ddccontrol/ddccontrol-db-20061014.tar.bz2]
-md5=91951918e5bc553c251776cdff8cea9c
-sha256=ff88f8e5122a2ab7b69a961f267f74d09ec7c54e90453ee80930edf66955c7b8
-
-[http://downloads.sourceforge.net/ddclient/ddclient-3.6.3.tar.bz2]
-md5=42a3a420e492c0111adc58ac08ff6d04
-sha256=28be7102bde3bc9b39be2732b89da9fbab79b7ac3898075ed414a45258bb3026
-
-[http://heanet.dl.sourceforge.net/ddclient/ddclient-3.6.3.tar.bz2]
-md5=42a3a420e492c0111adc58ac08ff6d04
-sha256=28be7102bde3bc9b39be2732b89da9fbab79b7ac3898075ed414a45258bb3026
-
-[ftp://ftp.debian.org/debian/pool/main/d/debianutils/debianutils_2.17.3.tar.gz]
-md5=cc768faa584f6c31cc1e0a959a3b8c0c
-sha256=46c0991b71d1991aa2f90d6816d9efb737fc9f9b99713174fcdf8d323727a11c
-
-[ftp://ftp.debian.org/debian/pool/main/d/debianutils/debianutils_2.30.tar.gz]
-md5=7fdd5f8395162d8728d4b79e97b9819e
-sha256=d62e98fee5b1a758d83b62eed8d8bdec473677ff782fed89fc4ae3ba3f381401
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/debianutils/debianutils_2.30.tar.gz]
-md5=7fdd5f8395162d8728d4b79e97b9819e
-sha256=d62e98fee5b1a758d83b62eed8d8bdec473677ff782fed89fc4ae3ba3f381401
-
-[ftp://ftp.us.debian.org/debian/pool/main/d/debianutils/debianutils_2.30.tar.gz]
-md5=7fdd5f8395162d8728d4b79e97b9819e
-sha256=d62e98fee5b1a758d83b62eed8d8bdec473677ff782fed89fc4ae3ba3f381401
-
-[ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-1.4.4.tar.gz]
-md5=053f18fd5d00873de365413cab17a666
-sha256=d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d
-
-[http://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-2.23.tar.bz2]
-md5=ff871dff0b3e8a11cd5c54478f11073f
-sha256=243642a1c3f4b6fd00125f5772ac5c8e4d0bb6586f5abb05829ead4b83ad5233
-
-[http://heanet.dl.sourceforge.net/dejavu/dejavu-fonts-ttf-2.23.tar.bz2]
-md5=ff871dff0b3e8a11cd5c54478f11073f
-sha256=243642a1c3f4b6fd00125f5772ac5c8e4d0bb6586f5abb05829ead4b83ad5233
-
-[http://qa.debian.org/watch/sf.php/dejavu/dejavu-fonts-ttf-2.23.tar.bz2]
-md5=ff871dff0b3e8a11cd5c54478f11073f
-sha256=243642a1c3f4b6fd00125f5772ac5c8e4d0bb6586f5abb05829ead4b83ad5233
-
-[http://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-2.24.tar.bz2]
-md5=7b56c9db1e2a3bf9c80d20ea1c823623
-sha256=0f42b12ad2537ea32977809585fd066157394efc35ff5ddf5abb5f47411bd18d
-
-[http://downloads.sourceforge.net/dejavu/dejavu-ttf-2.15.tar.bz2]
-md5=2f8c073084c27d0df40e747eda7f79ba
-sha256=22b1f489afef6849919220591ffc51615b9cddbea61b66b43791fdeebb4dbe09
-
-[http://downloads.sourceforge.net/dejavu/dejavu-ttf-2.18.tar.bz2]
-md5=78012718a15d43e2c4952db7409c9e7e
-sha256=792776053c5842c4335d3f17d9f0c789063ad34c4fc0e2ccabbdefbd84f14726
-
-[http://arago-project.org/files/short-term/demo/demo-app-src.tar.gz]
-md5=92cea8c3ea5db7ad6073b0feb33cf911
-sha256=caf7aa9ea60947bf6fb03ecee8bf3ea2ddf250fe2486ae24b8349d6ff3b74d3d
-
-[http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.14.tar.gz]
-md5=e0b5057a4e3166f34635ac6f27c712c0
-sha256=97856d2621d4e3273340b7f1172c2e074c74263629b05bde0f0f077425ec0699
-
-[http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.15.tar.gz]
-md5=2fe8ebe222fc33cd4a959415495b7eed
-sha256=c463d851fb057acd53800cfc4f8ae39dcbcad7f03b4bd547288e95b6de53b022
-
-[http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-0.3.tar.gz]
-md5=40a93def0f37f1577c5edc638fcb35a5
-sha256=6e932e73818697ea9ec8909bed535a87ba34651031bbbedb63a42e4cdc423284
-
-[http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-0.6.tar.gz]
-md5=0d6b6d4fa861f73e0b4225e93077578f
-sha256=64c05a48e91850627cfaa7314d4b4b847547bc4333fa9345994fa49c79276f3d
-
-[http://gpe.linuxtogo.org/download/source/detect-stylus-0.10.tar.gz]
-md5=18934b6796441642847ce796bee3b23a
-sha256=9ae500ffb1af6e29da00114bad18b776c2f24872c254ee62f6283948beaefc15
-
-[http://gpe.linuxtogo.org/download/source/detect-stylus-0.13.tar.gz]
-md5=e52d681c5ca11f4a9491624ab8c4fa90
-sha256=e9f0cd45a82d2f60af7e927b1740b5971e9007bf7d05e39a900db2dcb7871916
-
-[http://ftp.gnome.org/pub/GNOME/sources/devhelp/0.23/devhelp-0.23.tar.bz2]
-md5=704c0c90616aeb1c52ca3af1df93fde6
-sha256=60f336ac396f67a0cce70d71ea931545727ab48e9d09bf36415098965f9a7ef2
-
-[ftp://sources.redhat.com/pub/dm/device-mapper.1.01.04.tgz]
-md5=42dd0610e24d4b4f2409a32a04e6e37f
-sha256=49c8303f58abf3a0efbbd42decdc5968688df32c154cffb20a1c3c1ae8b92048
-
-[ftp://sources.redhat.com/pub/dm/device-mapper.1.01.05.tgz]
-md5=074cf116cc2c7194f2d100bc5f743833
-sha256=963cc8a1f7e73a0929b7b527f6b4cfc5f78c932d673b5c13c889108d3182811a
-
-[ftp://sources.redhat.com/pub/dm/device-mapper.1.02.28.tgz]
-md5=c9ae0776994a419f9e1ba842164bb626
-sha256=24c7887fe896325a6cdc86b8beeb0d9c2de8b1c4cb20f53c2dc8f90963fc39bf
-
-[https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h]
-md5=c0124afc760d4fe8c24ffcf15ba7f391
-sha256=4e0c1726f9c565deec6d6af9eebda47ca6dea473f3280cc89beb321ae33ff962
-
-[http://www.burtonini.com/computing/devilspie-0.22.tar.gz]
-md5=4190e12f99ab92c0427e457d9fbfe231
-sha256=e06aba1d96889e1b58bd1b0ba4d3015f50adc3ade2824b5cb37a0ee7f2490aaf
-
-[http://downloads.sourceforge.net/devio/devio-1.0.tar.gz]
-md5=3f421c80bce00b8bfe68ef9f453932b7
-sha256=25380c3722c75b993d530c09d48f5941c0a640a4382f6a0e1878c4ee8459dd16
-
-[http://heanet.dl.sourceforge.net/devio/devio-1.0.tar.gz]
-md5=3f421c80bce00b8bfe68ef9f453932b7
-sha256=25380c3722c75b993d530c09d48f5941c0a640a4382f6a0e1878c4ee8459dd16
-
-[http://downloads.sourceforge.net/devio/devio-1.1.tar.gz]
-md5=fe2319ec57b6363c1da78a435ef714c5
-sha256=92984b9f18488d020459873c18503a08a3942469b510e7c0b6be73c590df7b39
-
-[http://heanet.dl.sourceforge.net/devio/devio-1.1.tar.gz]
-md5=fe2319ec57b6363c1da78a435ef714c5
-sha256=92984b9f18488d020459873c18503a08a3942469b510e7c0b6be73c590df7b39
-
-[http://downloads.sourceforge.net/devio/devio-1.2.tar.gz]
-md5=5d332c2bffc0791367bcf3368ba1a0d1
-sha256=a71e87f49f52cd90dbd45431f65e83d18e073fb2669f91c29c59019b175cd5a8
-
-[http://heanet.dl.sourceforge.net/devio/devio-1.2.tar.gz]
-md5=5d332c2bffc0791367bcf3368ba1a0d1
-sha256=a71e87f49f52cd90dbd45431f65e83d18e073fb2669f91c29c59019b175cd5a8
-
-[http://linux.dell.com/devlabel/permalink/devlabel-0.48.01.tar.gz]
-md5=1a4032b942d8b47544da1957374a9786
-sha256=1dd2cce79f93cb3483fefdc02f65ed0868754ad12360c830d5f5cbe95da8e0e4
-
-[http://www.abcsinc.com/small-linux/devmem2.c]
-md5=e23f236e94be4c429aa1ceac0f01544b
-sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639
-
-[http://www.lartmaker.nl/lartware/port/devmem2.c]
-md5=be12c0132a1ae118cbf5e79d98427c1d
-sha256=ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191
-
-[http://pknet.com/~joe/dgen-sdl-1.23.tar.gz]
-md5=b1896c1b21ddb152626aec2e8a157a3a
-sha256=44396b3b324433187cf7082d1059cd9f519f02accddd667e627a57ff8514d436
-
-[http://people.redhat.com/jvdias/dhcdbd/dhcdbd-1.14.tar.gz]
-md5=1180dee7a51a4384d55768650634cf93
-sha256=e5facfcab28377d32fd4c70aa1fe0820d3dba4abdfc48bd15eda712c8815e505
-
-[https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-1.14.tar.gz]
-md5=1180dee7a51a4384d55768650634cf93
-sha256=e5facfcab28377d32fd4c70aa1fe0820d3dba4abdfc48bd15eda712c8815e505
-
-[http://people.redhat.com/dcantrel/dhcdbd/dhcdbd-1.16.tar.gz]
-md5=002e9d7d85a2f0e6261b6bf501c53a3e
-sha256=f399428e0e191233b4dcead88afbe78a26cc16bd9a47e305f6dd3299e011ef18
-
-[https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-1.16.tar.gz]
-md5=002e9d7d85a2f0e6261b6bf501c53a3e
-sha256=f399428e0e191233b4dcead88afbe78a26cc16bd9a47e305f6dd3299e011ef18
-
-[http://dcantrel.fedorapeople.org/dhcdbd/dhcdbd-2.0.tar.bz2]
-md5=d71de5c2f8aea4c8a18659bfa8387414
-sha256=51d36747b8386e18631e5b2a278cf9ef077441cb116a66b72edddecb939724c4
-
-[https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-2.0.tar.bz2]
-md5=d71de5c2f8aea4c8a18659bfa8387414
-sha256=51d36747b8386e18631e5b2a278cf9ef077441cb116a66b72edddecb939724c4
-
-[http://dcantrel.fedorapeople.org/dhcdbd/dhcdbd-3.0.tar.bz2]
-md5=5316b1a0b3a3d53e972374627546d0bf
-sha256=c62d5916dbd4d3148bd4deff355c3dfcb8092c2d9918d62dd24030e01c28361a
-
-[https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-3.0.tar.bz2]
-md5=5316b1a0b3a3d53e972374627546d0bf
-sha256=c62d5916dbd4d3148bd4deff355c3dfcb8092c2d9918d62dd24030e01c28361a
-
-[ftp://ftp.isc.org/isc/dhcp/dhcp-2.0-history/dhcp-2.0pl5.tar.gz]
-md5=ab22f363a7aff924e2cc9d1019a21498
-sha256=ef0fa044354ea42983584fcf94838445d8c8167b07630ad1a1057ea4783794b7
-
-[ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-3.0.1.tar.gz]
-md5=44f72d16a12acc3fbe09703157aa42d2
-sha256=043dea4144a93b26358ed73cd8fab79be76834a719f13fbb4344a26e8288fc38
-
-[ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-3.0.2.tar.gz]
-md5=04800a111521e7442749b2ce883f962b
-sha256=21a6e0476fb880e704e0c3cfe7b2bc6a97f6b2b0654db10b38bdd317f511a03a
-
-[ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-3.1.2p1.tar.gz]
-md5=787b2924a1965f0d8558521b36dca73d
-sha256=e0cb405e0fef0ecebec7aaed294032a06178ff28be87498596e6069ccda4341e
-
-[http://savannah.nongnu.org/download/dhcp-fwd/dhcp-forwarder-0.6.tar.bz2]
-md5=cbe60c8c904394a8e38e12ac42c02284
-sha256=45b708fb49a9fab10d814eb1e340a0960dac91f92800b3d39ddf0245ac913e30
-
-[http://savannah.nongnu.org/download/dhcp-fwd/dhcp-forwarder-0.7.tar.bz2]
-md5=e7f876e615ebc3f96418f6477b4451e2
-sha256=eb20cb028176e52432a2b877b2e292100dc41b384e829bc9e6d4823075ed8188
-
-[http://www.phystech.com/ftp/dhcpcd-1.3.22-pl4.tar.gz]
-md5=dd627a121e43835bead3ffef5b1a72fd
-sha256=f435e14e1f54dc8792f4e655463d07f2bdbe6d8a8581bd62f5167334ab18bb87
-
-[http://www.gentoo.com/di/di-4.17.tar.gz]
-md5=be55b3a1693b318effa3db8d1c0243c1
-sha256=46e124670fb2b63cb7500a8b36b7856c15858cb35658263ddad4933935d5e210
-
-[ftp://ftp.gnome.org/pub/gnome/sources/dia/0.95/dia-0.95-pre3.tar.gz]
-md5=642f7e7d4c71dc144b60f51f9d65de62
-sha256=902da1b1e9d90dfda8aa1864846db8ad12386e7521fc9f8b18c8ba220dd0123a
-
-[http://ftp.gnome.org/pub/GNOME/sources/dia/0.96/dia-0.96.1.tar.bz2]
-md5=7b81b22baa2df55efe4845865dddc7b6
-sha256=7bb43d8b0cb287d728ea479fb65d1b57b8530af773018214e7f312dceed34237
-
-[ftp://invisible-island.net/dialog/dialog-1.1-20080819.tgz]
-md5=3caebd641a9f337b980becb4444336c5
-sha256=c5d49b39c5998bcecd124c05cc6f096d22ccdc378ad455214611ae41a2f4b7d9
-
-[ftp://ftp.us.debian.org/debian/pool/main/d/dialog/dialog_1.0-20050306.orig.tar.gz]
-md5=8ce5945be0660bd3152bd9eb0827f945
-sha256=e3968765ed916b348fce5e309029d25d068a61e1d422a69a506d0fc80ee6e976
-
-[http://home.htw-berlin.de/~s0526295/dictator-0.2.tar.gz]
-md5=8f5cb1d0b7c7d5437b260d9ba5362c74
-sha256=e43251af443eb72a803a6aac3e984feb1f5df8124c64b55fceac6140ab76161e
-
-[http://didiwiki.org/sources/didiwiki-0.2.tar.gz]
-md5=a8643526ced64ed066df407e013259e3
-sha256=a87cdc67ad367d6bde595811e7869f5c4715e4baeec7261bcfe45ab42621543a
-
-[http://didiwiki.org/sources/didiwiki-0.4.tar.gz]
-md5=412ba3aa58984d5783eb6393c5869857
-sha256=ca494bf9c1ccf2e74bee90cf903743eee78a0dfa5d9bf0840bc59c4ad498f9de
-
-[http://didiwiki.org/sources/didiwiki-0.5.tar.gz]
-md5=94d5fb06d091804b31658481f23b120f
-sha256=31e8e536f5efd7d7d1d5f4e4458b42aa9cd7910acf3da933cb7fa3507cf7f752
-
-[http://kernel.org//pub/linux/utils/kernel/hotplug/diethotplug-0.4.tar.gz]
-md5=1fd89c902006271f00a774cc3183c15d
-sha256=dcc1809e8477b95317a7ff503cdd8b6d3f85b8d83a3245252ff47cf631523620
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/diethotplug-0.4.tar.gz]
-md5=1fd89c902006271f00a774cc3183c15d
-sha256=dcc1809e8477b95317a7ff503cdd8b6d3f85b8d83a3245252ff47cf631523620
-
-[http://kernel.org/pub/linux/libs/dietlibc/dietlibc-0.31.tar.bz2]
-md5=acb98d469ee932d902fdf6de07802b7c
-sha256=99613d6a67f747f52e4184c613f7cba5cbb76af237c9acd04742e3ca24cf56cd
-
-[http://kernel.org/pub/linux/libs/dietlibc/dietlibc-0.32.tar.bz2]
-md5=0098761c17924c15e21d25acdda4a8b5
-sha256=6613a2cae3b39e340779735d7500d284f5a691c5ed67e59a6057e0888726e458
-
-[ftp://source.mvista.com/pub/xscale/pxa/diff-2.4.18-rmk7-pxa3.gz]
-md5=249c7a63a506d302c96be26517a70298
-sha256=ca569dfa1e5cfd2f4134f3f61f667bcfab5e15c7d43c8a6e835d384ac5b31a07
-
-[ftp://ftp.debian.org/debian/pool/main/d/diffstat/diffstat_1.39-1.diff.gz]
-md5=14d2853df66054f83d73f7601bc60c8b
-sha256=51e9b659b480d59ca3bb48ac1e4701d3b23c1efde15cf02c1904b43af6690fad
-
-[ftp://ftp.nl.debian.org/debian/pool/main/d/diffstat/diffstat_1.39-1.diff.gz]
-md5=14d2853df66054f83d73f7601bc60c8b
-sha256=51e9b659b480d59ca3bb48ac1e4701d3b23c1efde15cf02c1904b43af6690fad
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/diffstat/diffstat_1.39-1.diff.gz]
-md5=14d2853df66054f83d73f7601bc60c8b
-sha256=51e9b659b480d59ca3bb48ac1e4701d3b23c1efde15cf02c1904b43af6690fad
-
-[ftp://ftp.us.debian.org/debian/pool/main/d/diffstat/diffstat_1.39-1.diff.gz]
-md5=14d2853df66054f83d73f7601bc60c8b
-sha256=51e9b659b480d59ca3bb48ac1e4701d3b23c1efde15cf02c1904b43af6690fad
-
-[ftp://ftp.debian.org/debian/pool/main/d/diffstat/diffstat_1.39.orig.tar.gz]
-md5=2d29a68f8fb75b3bed7a18f3d0a002bb
-sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
-
-[ftp://ftp.nl.debian.org/debian/pool/main/d/diffstat/diffstat_1.39.orig.tar.gz]
-md5=2d29a68f8fb75b3bed7a18f3d0a002bb
-sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/diffstat/diffstat_1.39.orig.tar.gz]
-md5=2d29a68f8fb75b3bed7a18f3d0a002bb
-sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
-
-[ftp://ftp.us.debian.org/debian/pool/main/d/diffstat/diffstat_1.39.orig.tar.gz]
-md5=2d29a68f8fb75b3bed7a18f3d0a002bb
-sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
-
-[ftp://ftp.debian.org/debian/pool/main/d/diffstat/diffstat_1.47-1.diff.gz]
-md5=b49f997897f5dfc2d2b8e0b6ea3df83c
-sha256=56dcebb128d401cd5608fcd77739b42f9cfc5af531d85822287f631ad6328dcd
-
-[ftp://ftp.us.debian.org/debian/pool/main/d/diffstat/diffstat_1.47-1.diff.gz]
-md5=b49f997897f5dfc2d2b8e0b6ea3df83c
-sha256=56dcebb128d401cd5608fcd77739b42f9cfc5af531d85822287f631ad6328dcd
-
-[ftp://ftp.debian.org/debian/pool/main/d/diffstat/diffstat_1.47.orig.tar.gz]
-md5=c6d221ff4a032e1bbf227f5936a7841a
-sha256=0c398b749574b6bd54f5c5ac1d71118400cd54791e2f47a96a1ad07915d22832
-
-[ftp://ftp.us.debian.org/debian/pool/main/d/diffstat/diffstat_1.47.orig.tar.gz]
-md5=c6d221ff4a032e1bbf227f5936a7841a
-sha256=0c398b749574b6bd54f5c5ac1d71118400cd54791e2f47a96a1ad07915d22832
-
-[ftp://ftp.gnu.org/gnu/diffutils/diffutils-2.8.1.tar.gz]
-md5=71f9c5ae19b60608f6c7f162da86a428
-sha256=c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a
-
-[http://www.dillo.org/download/dillo-0.6.6.tar.gz]
-md5=01d681ba8bec7fdb074d1bbf99c13285
-sha256=bd72287adedccf493f046f0e6ca29ef47f2cd3741c62a98d5eb82a9068846b73
-
-[http://www.dillo.org/download/dillo-0.8.6.tar.bz2]
-md5=b65233d368bbd265a55effcf2c17f84b
-sha256=47e695a5d370eb656f5e41eeb917ad6281b1559bf60172c9eca89b5518a9f9b9
-
-[http://www.dillo.org/download/dillo-2.0.tar.bz2]
-md5=bb9999cabeb4db3d915687de465dbeb0
-sha256=847d1db31bd68ab9ab94b642b0cd40ac8d3cf816900f5d5652124986601df1e9
-
-[http://www.dillo.org/download/dillo-2.1.1.tar.bz2]
-md5=93f674f2a42d90a1cdb88a6972325954
-sha256=8eec025872030fc1419fb93ee41dbdf380a6d1f75f4d51aec5eee9a9a4aa4477
-
-[http://dircproxy.securiweb.net/pub/1.1/dircproxy-1.1.0.tar.gz]
-md5=066bd39d80f286ae5ce69a2adbbd01e4
-sha256=f0be78d2c2f0279cce26b0b2e87077bfe568f1da189eef2daec78b1e12699c4e
-
-[http://www.diskohq.org/downloads/disko-1.6.0.tar.gz]
-md5=c63bad58524501e367af9842f510b458
-sha256=fe578299be4031d0c2454ff4fd3b3034e332260b9695687adf27a776a61eb2e4
-
-[http://distcc.samba.org/ftp/distcc/distcc-2.11.tar.bz2]
-md5=f3458779c13255d88ee89ea7ccddda29
-sha256=00ca6747501d1b6034398ba5482dcb1e7cf3aff8739fbff0c72e58602d68774c
-
-[http://distcc.samba.org/ftp/distcc/distcc-2.18.3.tar.bz2]
-md5=0d6b80a1efc3a3d816c4f4175f63eaa2
-sha256=6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434
-
-[http://distcc.googlecode.com/files/distcc-3.1.tar.bz2]
-md5=a1a9d3853df7133669fffec2a9aab9f3
-sha256=f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89
-
-[http://0pointer.de/public/distcc-avahi.patch]
-md5=621dc7dc1e3b9b6770110117df45611a
-sha256=e6651e3de7fee6d953b6ee56732eafa7d4666cb4070db5a925ba071626067c9a
-
-[http://downloads.sourceforge.net/djvu/djvulibre-3.5.19.tar.gz]
-md5=0330d87ad337e408e21e1018eb511839
-sha256=57ffa154f45de309b352ce53aa6618af2f8639d1e330470c3c955241d44ccd78
-
-[http://downloads.sourceforge.net/djvu/djvulibre-3.5.20.tar.gz]
-md5=c94091de014b3aaf037d3d0f398d36c2
-sha256=d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3
-
-[http://heanet.dl.sourceforge.net/djvu/djvulibre-3.5.20.tar.gz]
-md5=c94091de014b3aaf037d3d0f398d36c2
-sha256=d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3
-
-[http://downloads.sourceforge.net/djvu/djvulibre-3.5.21.tar.gz]
-md5=4c6f3eb03ffbd067b6d2fe2344b0d9ad
-sha256=39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4
-
-[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/codecs/dm355_codecs_setuplinux_1_13_000.bin]
-md5=f6221188bea76b7aaf0c45e9bcf26329
-sha256=f1a6dea51be9798903a0543fb50f463b0594b1f11b897bc50e40825fb7527c61
-
-[http://install.source.dir.local/dm365_codecs_01_00_06.tar.gz]
-md5=64377716427bf26e9089cb78bd13a248
-sha256=fa8d4e4288559f1140d7e1fae6ab9dd2cd53bf45c2d9afdff030c1131dad446a
-
-[http://install.source.dir.local/dm365mm_01_00_01.tar.gz]
-md5=d7bb2ba3ebf459fb8cc28b3377cbe616
-sha256=09565470c00f6726e3acf90922614aada5cf067109303ea15cfa16e7912950f5
-
-[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/S1SDKLNX/DVSDK_2_00/exports/dm6446_codecs_setuplinux_2_00_00_22.bin]
-md5=2ce99015bb1ed1df0491403c5e8d99fb
-sha256=6467ea4854abbff3cbc224df1f163d01c7fb387f15483129a40a1f68e6742b62
-
-[http://dmalloc.com/releases/dmalloc-5.5.2.tgz]
-md5=f92e5606c23a8092f3d5694e8d1c932e
-sha256=d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a
-
-[http://savannah.nongnu.org/download/dmidecode/dmidecode-2.10.tar.bz2]
-md5=3c9c4d55a40b78600f3b43bfa64616f9
-sha256=4d74a3e93353320317a424816f9a045df06d9ed4b5b80881e16fdfcc74c9e2c0
-
-[http://savannah.nongnu.org/download/dmidecode/dmidecode-2.9.tar.bz2]
-md5=3dac4b1817012ffebd78671473d8f56c
-sha256=888eb2c25bdcef5ee34c38cd5cb0f491d7dd82029dc0f4ae96183a0088a5e015
-
-[http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.2.2.tar.bz2]
-md5=d80acad88411e7944b9b085463d53302
-sha256=aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2
-
-[http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.3.tar.bz2]
-md5=880a41720b2937e2660dcdc0d34a8791
-sha256=3a882ca43a1f359e3489468e6c407fd7d56d559f8895cf096a2ec877d6c403b0
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/dmxproto-X11R7.0-2.2.2.tar.bz2]
-md5=21c79302beb868a078490549f558cdcf
-sha256=531b957d9589950a96cbdbf6a8376f31203797948baed311553cc2d2870c78db
-
-[http://www.thekelleys.org.uk/dnsmasq/archive/dnsmasq-2.11.tar.gz]
-md5=02aa4ffb835cbc9bdf96fcb915901cb3
-sha256=2dac596d5150174d0a2d9170db698c1d72584a8ab3b5eedf907086f53f76cc87
-
-[http://www.thekelleys.org.uk/dnsmasq/archive/dnsmasq-2.15.tar.gz]
-md5=72f59fa070a1dc7f664603b20134c383
-sha256=9aec45b395b6206e8eb85417f58186cdd0a307ed0f26f4b73af7031023a52225
-
-[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.22.tar.gz]
-md5=b38f33cd0703fa664a37a4595d918189
-sha256=cc2c86cbd0ec020a4486ac9d195e6a848a0d11a280c3194e095719f60c9751a9
-
-[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.38.tar.gz]
-md5=ab066a97c226066485ad20e5ad5ce424
-sha256=54f3e9ac2bd9f622b28ab0d5149e9bc13d62d8826be085c32abc929bc30dda6a
-
-[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.45.tar.gz]
-md5=b7956e15c9766e05b3eca3ce88fdb616
-sha256=7b5b456e6ccb3a36cc96b84b79ba148850ab59ac45316b759a090a1121f93e13
-
-[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.46.tar.gz]
-md5=79ec740d1a10ee75f13efa4ff36d0250
-sha256=9888d96d7d91e518c96a034dc863f8f7d961acd9334a1acde849c6022e540212
-
-[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.47.tar.gz]
-md5=4524081e56d0b935717d493e8e8d3e11
-sha256=f2716a43eb05b232c640a4ad647fd0fc21dd0c4f4ad20c9f5303568742399e5d
-
-[http://www.docbook.org/sgml/3.1/docbk31.zip]
-md5=432749c0c806dbae81c8bcb70da3b5d3
-sha256=20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538
-
-[http://docbook.org/sgml/4.1/docbk41.zip]
-md5=489f6ff2a2173eb1e14216c10533ede2
-sha256=deaafcf0a3677692e7ad4412c0e41c1db3e9da6cdcdb3dd32b2cc1f9c97d6311
-
-[http://www.docbook.org/sgml/4.4/docbook-4.4.zip]
-md5=f89e1bd0b2c7a361e3f1f739e16b5d0d
-sha256=0ac7960409b032c8e517483523ecb92af4e59196a33b3e2c5617daa22b7a8a6c
-
-[http://downloads.sourceforge.net/docbook/docbook-dsssl-1.79.tar.bz2]
-md5=bc192d23266b9a664ca0aba4a7794c7c
-sha256=2f329e120bee9ef42fbdd74ddd60e05e49786c5a7953a0ff4c680ae6bdf0e2bc
-
-[http://heanet.dl.sourceforge.net/docbook/docbook-dsssl-1.79.tar.bz2]
-md5=bc192d23266b9a664ca0aba4a7794c7c
-sha256=2f329e120bee9ef42fbdd74ddd60e05e49786c5a7953a0ff4c680ae6bdf0e2bc
-
-[ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.13.tar.gz]
-md5=af785716b207a7a562551851298a3b1a
-sha256=f74e9485f1e1f7484be432f4979415afbd9d8c20d0bdf6eab42eb2931b9b5d97
-
-[ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz]
-md5=6b41b18c365c01f225bc417cf632d81c
-sha256=48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9
-
-[http://downloads.sourceforge.net/docutils/docutils-0.5.tar.gz]
-md5=dd72dac92fc8e3eb0f48c3effeef80f6
-sha256=747cf984edfca0575addbb42453274a1bdd98ec7780bd37a883dc8b2a66a610e
-
-[http://downloads.sourceforge.net/dom4j/dom4j-1.6.1.tar.gz]
-md5=1e7ef6d20939315714de4a8502f27b2d
-sha256=01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f
-
-[http://downloads.sourceforge.net/dosbox/dosbox-0.63.tar.gz]
-md5=629413e41224ae9cdd115fdafd55cbdc
-sha256=f4eeee90f076d891034faf1268b6352b8df9cb262b787384ed4386cf6ea4faa7
-
-[http://heanet.dl.sourceforge.net/dosbox/dosbox-0.63.tar.gz]
-md5=629413e41224ae9cdd115fdafd55cbdc
-sha256=f4eeee90f076d891034faf1268b6352b8df9cb262b787384ed4386cf6ea4faa7
-
-[http://downloads.sourceforge.net/dosbox/dosbox-0.70.tar.gz]
-md5=ea0a936e88eb294038e67eeb0d7129c4
-sha256=05fdfd561eee33de12d978795b7f12338327c6da1ce65971463b58f2e90b48e4
-
-[http://heanet.dl.sourceforge.net/dosbox/dosbox-0.70.tar.gz]
-md5=ea0a936e88eb294038e67eeb0d7129c4
-sha256=05fdfd561eee33de12d978795b7f12338327c6da1ce65971463b58f2e90b48e4
-
-[http://downloads.sourceforge.net/dosbox/dosbox-0.72.tar.gz]
-md5=262939cc28966c1f9b07c2bc472b699f
-sha256=1747d7d9f1e5c0635b5d2d3e6648e8dc36316b1bc88b3755bf96b7fde499ac79
-
-[http://heanet.dl.sourceforge.net/dosbox/dosbox-0.72.tar.gz]
-md5=262939cc28966c1f9b07c2bc472b699f
-sha256=1747d7d9f1e5c0635b5d2d3e6648e8dc36316b1bc88b3755bf96b7fde499ac79
-
-[ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-2.10.src.tar.gz]
-md5=59a02f311a891af8787c4c9e28c6b89b
-sha256=55a7b2f5ea4506bde935ee3145573e1773427fc72283a36796c7c2cf861dd064
-
-[ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-2.11.src.tar.gz]
-md5=407d405ade410f7597d364ab5dc8c9f6
-sha256=0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484
-
-[http://www.azzit.de/dotconf/download/v1.0/dotconf-1.0.13.tar.gz]
-md5=bbf981a5f4a64e94cc6f2a693f96c21a
-sha256=8955fad7d9e7aef36f7a82f9577c3ae4901db1ded6ce57aec0d93e39c8899b65
-
-[http://bundles.openttdcoop.org/download.php?file=opengfx%2Freleases%2Fopengfx-0.1.1.zip]
-md5=1f959407f2d4a1ab0e84c2e89438c922
-sha256=c0eefb2dda166f91e1bfb317cf681165029f6f2709fa966d84dc568ffef6a31e
-
-[http://bundles.openttdcoop.org/download.php?file=opensfx%2Freleases%2Fopensfx-0.1.0.zip]
-md5=1a43ee0a2026b7fecfd47c7c7e4b056f
-sha256=ea0d90e3e049aec2e0884bc117a46e5fb78411b7e3633b3802d4c5af8f29300c
-
-[ftp://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_1.13.22.tar.gz]
-md5=0fc9fffc2c2cfa7107d8f422815078c1
-sha256=c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f
-
-[ftp://ftp.nl.debian.org/debian/pool/main/d/dpkg/dpkg_1.13.22.tar.gz]
-md5=0fc9fffc2c2cfa7107d8f422815078c1
-sha256=c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/dpkg/dpkg_1.13.22.tar.gz]
-md5=0fc9fffc2c2cfa7107d8f422815078c1
-sha256=c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f
-
-[ftp://ftp.us.debian.org/debian/pool/main/d/dpkg/dpkg_1.13.22.tar.gz]
-md5=0fc9fffc2c2cfa7107d8f422815078c1
-sha256=c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f
-
-[ftp://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_1.13.24.tar.gz]
-md5=d8ec0b2bf86d5277fb50f8d391c0dd4a
-sha256=8b1ed52659c5f6723f37bf1122508d7f1b82e064aa9db04d18d726bde34c2713
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/dpkg/dpkg_1.13.24.tar.gz]
-md5=d8ec0b2bf86d5277fb50f8d391c0dd4a
-sha256=8b1ed52659c5f6723f37bf1122508d7f1b82e064aa9db04d18d726bde34c2713
-
-[ftp://ftp.nl.debian.org/debian/pool/main/d/dpkg/dpkg_1.13.25.tar.gz]
-md5=88effb358aa04d25036b662d588433a6
-sha256=a525f321e875a8c16f5b6942bc02ac66b0d284cc6c61704f93e74789ef89d817
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/dpkg/dpkg_1.13.25.tar.gz]
-md5=88effb358aa04d25036b662d588433a6
-sha256=a525f321e875a8c16f5b6942bc02ac66b0d284cc6c61704f93e74789ef89d817
-
-[ftp://ftp.us.debian.org/debian/pool/main/d/dpkg/dpkg_1.13.25.tar.gz]
-md5=88effb358aa04d25036b662d588433a6
-sha256=a525f321e875a8c16f5b6942bc02ac66b0d284cc6c61704f93e74789ef89d817
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/dpkg/dpkg_1.14.19.tar.gz]
-md5=dad1a4a08c475b31a6b62e7dc92fe9d2
-sha256=5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587
-
-[ftp://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_1.14.23.tar.gz]
-md5=9c1744d32ceed71cbe1db863f64d329d
-sha256=7d27f2389e05b8727c6a7126c0b65d67749c170ba143e648912a88f2fe707bca
-
-[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-1.1.tar.bz2]
-md5=1d70f0653b0b3a837853262dc5d34da4
-sha256=69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11
-
-[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.0.tar.bz2]
-md5=26f6515322ec50691584ac74291b4254
-sha256=1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4
-
-[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.1.tar.bz2]
-md5=5cb7987d29db068153bdc8f23c767c43
-sha256=2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d
-
-[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.2.tar.bz2]
-md5=3ca8ddb42cd4ee31b8690031303221af
-sha256=f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1
-
-[http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz]
-md5=8e11d77770452f97bb3c23f510489815
-sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d
-
-[http://matt.ucc.asn.au/dropbear/releases/dropbear-0.45.tar.gz]
-md5=29babade35e1d8a322e4726886473a84
-sha256=af1cdd2333404db92d33c674a8bd1b770ce65cec7ec250c9b72505895cc45e7b
-
-[http://matt.ucc.asn.au/dropbear/releases/dropbear-0.46.tar.gz]
-md5=3c6daae8f45dce5c838ab3df81c4b5f9
-sha256=4c2d2d41ff093dc2ba0b0dbfbc538ac9b225a7350d5a00acb7483452d40b1a4c
-
-[http://matt.ucc.asn.au/dropbear/releases/dropbear-0.47.tar.gz]
-md5=49a72d314592438eb0e56e85a3517ab1
-sha256=5f30c174714c3783cc5e83ffcc343adda874290f0bd47a559ae0dec2acaedeb0
-
-[http://matt.ucc.asn.au/dropbear/releases/dropbear-0.48.1.tar.gz]
-md5=ca8e53a766faec831882831364568421
-sha256=fa6c3567e293fa0aa249db695b9d5e43ef3f8c11bab74a9b42acc9a0a5c96742
-
-[http://matt.ucc.asn.au/dropbear/releases/dropbear-0.49.tar.gz]
-md5=7b20c85f1ee34f018a1b948eae003df9
-sha256=152f87b4fbfe3976c0409fb9e0812af17c9aa0907b04549604110c05248f810f
-
-[http://matt.ucc.asn.au/dropbear/releases/dropbear-0.50.tar.gz]
-md5=5c0f7405b915799c3d952d3a93a5df69
-sha256=39999c5bfb663404f6450da66d98d69193a5d0ab496d2d47cc53cd0202c4051c
-
-[http://matt.ucc.asn.au/dropbear/dropbear-0.51.tar.bz2]
-md5=95d900913bee4b27d7e9ce55f8a55427
-sha256=8daa89512f9349fc131d48555726ffe1187e0f7d9f4cef992464c8098d86e77c
-
-[http://matt.ucc.asn.au/dropbear/dropbear-0.52.tar.bz2]
-md5=a1fc7adf601bca53330a792a9c873439
-sha256=8c7b727a4c9066e90a14f7f01c47cab698afb5a854ffa0404da162d4286f04c1
-
-[http://www.monkey.org/~dugsong/dsniff/dsniff-2.3.tar.gz]
-md5=183e336a45e38013f3af840bddec44b4
-sha256=82e492455486e655c315f027d393dbeb49ad930804acccdc51b30d57e1294ff5
-
-[http://install.tarball.in.source.dir/dsplink_1_50.tar.gz]
-md5=f14e000ae17735568c9cb58bde504fb5
-sha256=677a8cd27d05b1401ddef152270a498fc4d34cb9ba94779c571f2f2794b20811
-
-[http://install.tarball.in.source.dir/dsplink_1_51_00_08.tar.gz]
-md5=a2d7803976f82db3edeb374109cba6df
-sha256=8ae0026054fb9f437d59a3bb932628fc2915af6697e430325e0950e960ca6c34
-
-[http://install.tarball.in.source.dir/dsplink_1_60.tar.gz]
-md5=e23c494004773b281ea0fc2b52355a1e
-sha256=15dd793e32fc9aba1266c2ccb8e98856c61be2e9de214285aa09152a47da1836
-
-[http://install.tarball.in.source.dir/dsplink_1_60_00_04.tar.gz]
-md5=2b53c067c683266379dddbb38e65cb45
-sha256=b1a0508444241c61585321eaadc32f476ef441f267636fbd0fb2f0c7ebf0fcbb
-
-[http://install.source.dir.com/dsplink_1_61_03.tar.gz]
-md5=9df12389c8b955b5f8cfefe6df20b1d6
-sha256=1037b9cb872590356d055dbf8006e25d68370721e0e5b4518529495db6de70d9
-
-[http://install.source.dir.local/dsplink_1_61_03.tar.gz]
-md5=9df12389c8b955b5f8cfefe6df20b1d6
-sha256=1037b9cb872590356d055dbf8006e25d68370721e0e5b4518529495db6de70d9
-
-[http://home.comcast.net/~SCSIguy/SCSI_FAQ/RMiller_Tools/ftp/dt/dt-source.tar.gz]
-md5=5776233a2d301a50b314306538257a45
-sha256=2f27fda643093e07161d128a9cc23cf30c0387f87cd911b904d84217f60a9a2a
-
-[http://www.jdl.com/pub/software/dtc-20070216.tgz]
-md5=8762121262ead127171c4fce40ccc289
-sha256=dd687b4f691bf9970f53ca2c84d8481b9f82d857de347375d29bacf648b8da71
-
-[http://www.jdl.com/software/dtc-v1.1.0.tgz]
-md5=46bcff355b60d85bd311fc95b9ff0630
-sha256=786f8a128394f978ee66b18b41cdfc87d74eea80f5b8e25beacc5e669c76d5e1
-
-[http://www.jdl.com/software/dtc-v1.2.0.tgz]
-md5=0f1841de79abbff57691adc31d5f3525
-sha256=dabbe5a77ffcffd906333589a75013e4b40113238b6b09f7f2ad280ba3bb6a1c
-
-[http://www.dtnrg.org/docs/code/dtn_2.5.0.tgz]
-md5=e6e608907a291016a39c9e3442dfd50c
-sha256=d8c6dedb4f828c90c1c0f36c35bc4539e81e2220c8b01cd5dc957f9116b4e478
-
-[http://downloads.sourceforge.net/duma/duma_2_5_7.tar.gz]
-md5=d3e981cdc2b78de652215da9b4ac399f
-sha256=6d851f4117002d3523354b70c3f9be4abe5325b084ff54d01ac6daa5ce9a5944
-
-[http://heanet.dl.sourceforge.net/duma/duma_2_5_7.tar.gz]
-md5=d3e981cdc2b78de652215da9b4ac399f
-sha256=6d851f4117002d3523354b70c3f9be4abe5325b084ff54d01ac6daa5ce9a5944
-
-[http://www013.upp.so-net.ne.jp/hn43o/dviviewer/dviviewer-1.0.2.tar.gz]
-md5=cc101da3b436607ee2265b5af5001484
-sha256=ab7c305be32708c4ede670e13783b718e6a28e35b5495e6c42c31c35a8b512a6
-
-[http://www.hugovil.com/repository/dvnixload-0.2.6.tar.gz]
-md5=33308f47405c0e96a8248c7b1229dee5
-sha256=5b76e9cb0ee843208c17053315926e0e168db8a89fe960655a0d0f4871e2b9da
-
-[http://install.source.dir.local/dvsdk_demos_3_10_00_00.tar.gz]
-md5=06b970d91d425a1b9d235e5d6a8db3d1
-sha256=95f72fea8a040d70861cd1df2bcb3c3f2119c4429ae8315b1964735dfe0f75c0
-
-[http://www.threekong.com/download/dweba/dweba-1.0.0-pre14.tar.gz]
-md5=6f0bd0bcda35c6a96cc3853f16ba82d4
-sha256=ea32ca58b6500d9061177da23ef03f918ef0c5bbbdd082a843f4834cef9c4957
-
-[http://rcdrummond.net/uae/e-uae-0.8.28/e-uae-0.8.28.tar.bz2]
-md5=9fc186f9256d04f940304044e29175ef
-sha256=afc8b30fb9aa0819a4e53b3eb0db8e658e5a2b23d7dbf436f6b5a49b2269da86
-
-[http://downloads.sourceforge.net/e17genmenu/e17genmenu-4.2.0.tar.gz]
-md5=57b38240d044c9752b4af3b6581bfeae
-sha256=a077754b500b7cf5df1b0bd1edf1f1d28ed4f68b4f6fe33d509b8fd37bc97d41
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.38.tar.gz]
-md5=d774d4412bfb80d12cf3a4fdfd59de5a
-sha256=c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7
-
-[http://heanet.dl.sourceforge.net/e2fsprogs/e2fsprogs-1.38.tar.gz]
-md5=d774d4412bfb80d12cf3a4fdfd59de5a
-sha256=c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.2.tar.gz]
-md5=1c1c5177aea9a23b45b9b3f5b3241819
-sha256=635d6d07e5a4d615e599c051166af965baa754f9ff7435e746de1a5d2a5c0d56
-
-[http://heanet.dl.sourceforge.net/e2fsprogs/e2fsprogs-1.41.2.tar.gz]
-md5=1c1c5177aea9a23b45b9b3f5b3241819
-sha256=635d6d07e5a4d615e599c051166af965baa754f9ff7435e746de1a5d2a5c0d56
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.4.tar.gz]
-md5=59033388df36987d2b9c9bbf7e19bd57
-sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
-
-[http://qa.debian.org/watch/sf.php/e2fsprogs/e2fsprogs-1.41.4.tar.gz]
-md5=59033388df36987d2b9c9bbf7e19bd57
-sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.5.tar.gz]
-md5=e218df6c84fc17c1126d31de9472a76c
-sha256=b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.9.tar.gz]
-md5=52f60a9e19a02f142f5546f1b5681927
-sha256=cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz]
-md5=c7545bb05e0c2fc59174f0dc455c6519
-sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703
-
-[http://heanet.dl.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz]
-md5=c7545bb05e0c2fc59174f0dc455c6519
-sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.34.tar.gz]
-md5=b51824f1c34be88e8581d96fc418d224
-sha256=2c505a14157fe591bd540b9a0dca11f5d842e3b6c34a23dbbbd9eafcc9fa33fa
-
-[http://heanet.dl.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.34.tar.gz]
-md5=b51824f1c34be88e8581d96fc418d224
-sha256=2c505a14157fe591bd540b9a0dca11f5d842e3b6c34a23dbbbd9eafcc9fa33fa
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.35.tar.gz]
-md5=d31301cc2756dc9b0254b6aac03c376e
-sha256=236f1c173fe378b1306db797dc31f1884208ceac3ab81ad52f69e01f7bf61277
-
-[http://heanet.dl.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.35.tar.gz]
-md5=d31301cc2756dc9b0254b6aac03c376e
-sha256=236f1c173fe378b1306db797dc31f1884208ceac3ab81ad52f69e01f7bf61277
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.39.tar.gz]
-md5=32a2f67223feb2d70233eb3f41e73311
-sha256=fe3c72d861f2a3791f31ea33043d25e29e9a4e3d6a3833b151237a62c5c703f9
-
-[http://heanet.dl.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.39.tar.gz]
-md5=32a2f67223feb2d70233eb3f41e73311
-sha256=fe3c72d861f2a3791f31ea33043d25e29e9a4e3d6a3833b151237a62c5c703f9
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.41.2.tar.gz]
-md5=258d0a8277ace7fab06c55fdb2b249c4
-sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56
-
-[http://heanet.dl.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.41.2.tar.gz]
-md5=258d0a8277ace7fab06c55fdb2b249c4
-sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56
-
-[http://qa.debian.org/watch/sf.php/e2fsprogs/e2fsprogs-libs-1.41.2.tar.gz]
-md5=258d0a8277ace7fab06c55fdb2b249c4
-sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.41.5.tar.gz]
-md5=c75f112d24bdc39c76dbec61d59a4a91
-sha256=dc1eb1b7bbad2edc030e50e7506c79562d98098f99a5d6cb5db5aa5ca92ffe48
-
-[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.41.8.tar.gz]
-md5=bd28f2ccce2c14f06091e04fd1a0c67e
-sha256=90428106333a38b93b6f4a306fff17749243862883a06598ff6e6ea11f8d24d2
-
-[http://www.pobox.com/~sheff/sw/e2tools/e2tools-0.0.16.tar.gz]
-md5=1829b2b261e0e0d07566066769b5b28b
-sha256=4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b
-
-[http://people.openmoko.org/stefan/e_nm-big-hack.patch]
-md5=91d8ce9e7bfcc0a61220ebc4ea83ab5f
-sha256=60ed501bd19b61f7d8456a2e906c890307e73f20ec1e4186d4eca312a74b0d05
-
-[http://activecampus2.ucsd.edu/apt/sarge/easysoap++/easysoap++_0.6.1-5.diff.gz]
-md5=fecfbc5272922f85635d0229d1b05260
-sha256=37e5aab00a316a22329c64848f467b0ce73bba3bcb08c4cba6d193ba8f5e9b90
-
-[http://activecampus2.ucsd.edu/apt/sarge/easysoap++/easysoap++_0.6.1.orig.tar.gz]
-md5=b87c02bf22b6697bce9df32be40d018f
-sha256=eac200dacbde374a7c8b3830a665b9926eb82f695f593b54a3256b29e39df29e
-
-[ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.3.2.tar.bz2]
-md5=408bbe0f8ed45d341bc36cc4ee6184e7
-sha256=4f5f71590eafa6c3599876806c8d655c3aeff5b2222643ff0ff41a6883ee5ea0
-
-[ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.3.tar.bz2]
-md5=f7aee92355cae7e4c81cf26df4345b07
-sha256=24da6f7466d1d7b42b9e03255079a3f31595fd4932def8f81f9886f347e98d1d
-
-[http://downloads.sourceforge.net/ebtables/ebtables-v2.0.6.tar.gz]
-md5=c4559af2366c764c6c42a3fdd40d60d3
-sha256=6b5a71790120977a96d5a468ed69987107c5079f14b0a4081f460b3b14fbf952
-
-[http://heanet.dl.sourceforge.net/ebtables/ebtables-v2.0.6.tar.gz]
-md5=c4559af2366c764c6c42a3fdd40d60d3
-sha256=6b5a71790120977a96d5a468ed69987107c5079f14b0a4081f460b3b14fbf952
-
-[http://dominion.thruhere.net/koen/OE/ecas-julius_acousticfiles.r962.tar.gz]
-md5=406df5cd8ffa096bdb51466691e16b82
-sha256=56cba0e065cdbc11dc74e379af9082b0f8a771ec5984733408c21163a8bea588
-
-[http://eciadsl.flashtux.org/download/eciadsl-usermode-0.11.tar.gz]
-md5=c3c60c83f6df30021e11da50a699dec9
-sha256=2382f315fda4241a0043bac1dfc669f006d8e93e87fa382b263b1672972f4077
-
-[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecj.jar]
-md5=412d8badd227807ef2f52608435240fb
-sha256=dfe24798ca067c75c84f01bf4ee3734fde3e32e4f270f7222025218d3baffbbb
-
-[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4.1-200809111700/ecjsrc-3.4.1.zip]
-md5=4c9fe7b0c4e760e13fa887b85f8db295
-sha256=b5725fa7f8b1f7dc28776e60591e9ef0c171629fe567ef49ab9be28516ff2cd6
-
-[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc-3.4.zip]
-md5=f7b84d912e61dfdd77b7173065845250
-sha256=a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4
-
-[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.5-200906111540/ecjsrc-3.5.zip]
-md5=356f1d337833670e34cf53b58513daeb
-sha256=f3f82d0b91f63fa3aab52f61ad8f5d50c0e4029479cf4b720b83a3424074bd38
-
-[http://mirror.calvin.edu/eclipse/downloads/drops/S-3.3M5eh-200702220951/ecjsrc.zip]
-md5=9e1fc1c86c85e72df5e141069b82041d
-sha256=f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
-
-[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip]
-md5=9e1fc1c86c85e72df5e141069b82041d
-sha256=f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
-
-[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3.2-200802211800/ecjsrc.zip]
-md5=9e1fc1c86c85e72df5e141069b82041d
-sha256=f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
-
-[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc.zip]
-md5=9e1fc1c86c85e72df5e141069b82041d
-sha256=f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
-
-[http://enlightenment.freedesktop.org/files/ecore-0.9.9.037.tar.gz]
-md5=ec6d00a39ca6648f12f58f8d4f2208cc
-sha256=2c31372ccfc9b411edc73785450c5212dc4a2fe286de9f49f38a02dd24895aea
-
-[http://enlightenment.freedesktop.org/files/edb-1.0.5.007.tar.gz]
-md5=e5d8dcb5995913ae6b7f205e7ac28dbe
-sha256=75a4861bf7dcc96a871611350276f10a87b0f7c44a1bbab1108374828bccf509
-
-[http://xorg.freedesktop.org/releases/individual/app/editres-1.0.2.tar.bz2]
-md5=9db49742bd4c17966fff7d76ac566d31
-sha256=978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df
-
-[http://xorg.freedesktop.org/releases/individual/app/editres-1.0.3.tar.bz2]
-md5=a25f931cc6c8d03daaed434f5db5df2d
-sha256=a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae
-
-[http://xorg.freedesktop.org/releases/individual/app/editres-1.0.4.tar.bz2]
-md5=1800dda934ebb7c588ea686278a10e9f
-sha256=d7ce4c0bb214e055cb7680d8b88b9f551610fc40c28269cb51649133862f3302
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/editres-X11R7.0-1.0.1.tar.bz2]
-md5=a9dc7f3b0cb59f08ab1e6554a5e60721
-sha256=1373ded7c35c38e479122ac1fd8a85682a533612538645c79d09992abcbaab10
-
-[http://enlightenment.freedesktop.org/files/edje-0.5.0.037.tar.gz]
-md5=e2f51f5e182201f0d22e042bca0ebfb1
-sha256=5160e0c79f533b1dc6ac2e4191569620e3833b844a4ef38a33ff173ee3d494d3
-
-[http://www.galago-project.org/files/releases/source/eds-feed/eds-feed-0.3.2.tar.gz]
-md5=1f6ac4910dc8bb0276549bd0308f8acb
-sha256=6b7448359284f5af75cbb7027c47616b28aca8b90f9a16b9ec954fa50e455ed3
-
-[http://ftp.gnome.org/pub/GNOME/sources/eel/2.12/eel-2.12.2.tar.bz2]
-md5=d78cd3e33c656a62b5bf1f8d0b8d271f
-sha256=df6c696f84bc9c2af12f3715f2703060ab1692a918fb221ea0403212c03e0b73
-
-[http://ftp.gnome.org/pub/GNOME/sources/eel/2.22/eel-2.22.2.tar.bz2]
-md5=f0dc46f4bc6a772da9e149c0018a8b09
-sha256=e91e576ed22e5ba9a930d4292e3dbec4fe4ec7276029d82188cc91db117e21d4
-
-[http://ftp.gnome.org/pub/GNOME/sources/eel/2.24/eel-2.24.1.tar.bz2]
-md5=b591df36af8f1b23dd175be33b5de073
-sha256=32cde7b589b49f439d82f76b6456983d36de7d20688f7c6ac2fdae4ce354e629
-
-[http://ftp.gnome.org/pub/GNOME/sources/eel/2.26/eel-2.26.0.tar.bz2]
-md5=dfa105ccabd53efe4166dcfac75e2393
-sha256=11ad07d8d371f9165fab6cc5462f59cd253f9cc835d77a54330fecafe9c0a555
-
-[http://ftp.gnome.org/pub/GNOME/sources/eel/2.6/eel-2.6.1.tar.bz2]
-md5=6dd46ef1905271cd1171a0bdddabee22
-sha256=889c8cff395bc488a6ccfb3fc22fd241a12c33f114bb7d7ec4138d5999da9c5d
-
-[http://enlightenment.freedesktop.org/files/eet-0.9.10.037.tar.gz]
-md5=05c65e4cd84b36baa42e3eee1e652c97
-sha256=8d5154877e0f8aa57401a288c5650e5c1dc0efe0b4104796aae1d4b303febace
-
-[http://downloads.sourceforge.net/ede/efltk-2.0.7.tar.gz]
-md5=f0300fd2fec47d4b05823297032ddb9f
-sha256=9636876e3c52f0dde5d6ac097568cad9fe8ea7088e28e27a3aad19b100d4e645
-
-[http://heanet.dl.sourceforge.net/ede/efltk-2.0.7.tar.gz]
-md5=f0300fd2fec47d4b05823297032ddb9f
-sha256=9636876e3c52f0dde5d6ac097568cad9fe8ea7088e28e27a3aad19b100d4e645
-
-[http://www.egenix.com/files/python/egenix-mx-base-2.0.6.tar.gz]
-md5=66841151728a06f92d0b8dd2ed317a29
-sha256=03b1ab04397745d22d6e76bd71a6e7fbaf6988e0d75bf2d6face1c910309ac36
-
-[http://downloads.egenix.com/python/egenix-mx-base-3.0.0.tar.gz]
-md5=e4d388137900b2e7f29b5a113b2a0b5b
-sha256=9ec176847b1e01cd2083cd578e804fda2c619d0f465cd752ec11b38099f75f7f
-
-[http://downloads.egenix.com/python/egenix-mx-base-3.1.1.tar.gz]
-md5=d0f3b1adca33a68867bf50f000060cd6
-sha256=a0d03208e335610defc3049d8dd03f4ec7fcf477f44c4897b3f68adc478237ee
-
-[http://cgit.freedesktop.org/~david/eggdbus/snapshot/eggdbus-0.6.tar.bz2]
-md5=0a111faa54dfba2cf432c2c8e8a76e06
-sha256=3ad26e271c1a879bafcd181e065fe0ed53b542299a773c3188c9edb25b895ed1
-
-[http://rogers.com/eject-2.1.5.tar.gz]
-md5=b96a6d4263122f1711db12701d79f738
-sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55
-
-[http://sources.openembedded.org/eject-2.1.5.tar.gz]
-md5=b96a6d4263122f1711db12701d79f738
-sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55
-
-[http://ekg.chmurka.net/ekg-1.6.tar.gz]
-md5=1094eee5062d9b9900c4b28bd68fb564
-sha256=c6dc601e20bb43c94f5689f05bca8e8501af4cff9dd760afdb3d6998c6952c28
-
-[http://www.ekiga.org/admin/downloads/latest/sources/ekiga_3.0.2/ekiga-3.0.2.tar.gz]
-md5=616930d9ab92fb21c238c13101ce5879
-sha256=fefd63c13ca28713f7f03320c1e341430ea2d016d3ab3e49163a12f4df2123e7
-
-[http://ftp.gnome.org/pub/GNOME/sources/ekiga/3.1/ekiga-3.1.0.tar.bz2]
-md5=ec8690ff84b364d2df5b2443a01ba529
-sha256=e0360be0eecee68649246c022825dd5422f895958ffa736886dd2a0b9ec7ebda
-
-[http://ftp.gnome.org/pub/GNOME/sources/ekiga/3.2/ekiga-3.2.0.tar.bz2]
-md5=01c4c944a1b900b5b3bfa95d3a820b22
-sha256=998b50e3920546cb43cd281d519394a2db23f5bf10223cac49120296407b3c6d
-
-[http://ftp.gnome.org/pub/GNOME/sources/ekiga/3.2/ekiga-3.2.4.tar.bz2]
-md5=3009f30e124a2062370824bb307c5313
-sha256=21032e8a420365d0539c6356d220bb8634e9c1ee839bfcceb3c03d9e427cd397
-
-[http://ftp.gnome.org/pub/GNOME/sources/ekiga/3.2/ekiga-3.2.5.tar.bz2]
-md5=a545490e03a6b49f00253bf0d692f362
-sha256=6a624b741b110b5b1d9cdff8179760f52b0a623bf597b8e6be757fc18af20a4c
-
-[http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip]
-md5=30e2fe5edd143f347e03a8baf5d60f8a
-sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad
-
-[http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-0.108.tar.gz]
-md5=fd318a634c8f67c7ac8a975f16965cc3
-sha256=794070c8108a2d8b7c6890ba42edb37510cc845bf601517cf4a0ea5443dfde29
-
-[http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-0.127.tar.gz]
-md5=905411e1deda0aee17ae99dbdeaf7506
-sha256=bb5d2a846dbb5c9e779cec37a0ebdb4b1c8071131cfcce05358a08367281c38a
-
-[http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-0.131.tar.gz]
-md5=f7963fba80c6f74cd6c4990d2a76d121
-sha256=947a9566a622f701a2fe2416d3b85b397d38d5f4189da91fc0a306b4d9950e6f
-
-[https://fedorahosted.org/releases/e/l/elfutils/elfutils-0.143.tar.bz2]
-md5=06e35c348e78dec58f6aeb51bd397760
-sha256=435c0c8a7ed5ca34ea5ac985041faedf56b21a6cdd24058e3c2f3b5347d238ff
-
-[http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.143-1.diff.gz]
-md5=c211d10508e3494cfce77f5807bbfff2
-sha256=d69dd1c9885752c2b1a00403d1ac2a876268701654a31723123e26ab72be4258
-
-[http://www.mowem.de/elitaire/elitaire-0.0.5.tar.bz2]
-md5=3fb7b6073f3171d446698eb963fb087e
-sha256=91f16720df83b15da8747506d17224e2b3e5dd5e606c91a7f76cc7d784aae694
-
-[ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz]
-md5=6831b8df3e4a530395e66c2889783752
-sha256=9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0
-
-[http://www.fh-wedel.de/pub/elvis/elvis-2.2_0.tar.gz]
-md5=6831b8df3e4a530395e66c2889783752
-sha256=9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0
-
-[ftp://ftp.gnu.org/gnu/emacs/emacs-22.3.tar.gz]
-md5=aa8ba34f548cd78b35914ae5a7bb87eb
-sha256=7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
-
-[http://enlightenment.freedesktop.org/files/embryo-0.9.1.037.tar.gz]
-md5=2a09c0355f33112e96ed253bd0bb308a
-sha256=0b46174c68b9cb19d0335f3f5194ee41e26865f4a9a62df9410f30693865e2d5
-
-[http://projects.collabora.co.uk/~xclaesse/empathy-0.1.tar.gz]
-md5=46ebd3c4bc873add9dedea15b0a69a8f
-sha256=d54b101f29b6a3e36a5f905d5b95d1d7515fa888683e891f975de2702b510045
-
-[http://ftp.gnome.org/pub/GNOME/sources/empathy/0.14/empathy-0.14.tar.bz2]
-md5=676154eddfb47f212e4716bebc0fdf26
-sha256=170d61f1387221b3034a777eb835d5b85d23ddb58d4d81ac42480e4e9ea138a6
-
-[http://ftp.gnome.org/pub/GNOME/sources/empathy/0.23/empathy-0.23.4.tar.bz2]
-md5=5a41033e3e41e9769628e0118f32d5c3
-sha256=c493b9a22c9580d49fd90d2bb6955435ccba9304ecb382411864041d914c94d6
-
-[http://ftp.gnome.org/pub/GNOME/sources/empathy/0.4/empathy-0.4.tar.bz2]
-md5=e965e57924607482f6d91bb578802a46
-sha256=4661b3440b8f8896efb42b334528a39eb9f4cb4b1b4411c759e24d60ecb43e48
-
-[http://ftp.gnome.org/pub/GNOME/sources/empathy/0.5/empathy-0.5.tar.bz2]
-md5=e363689295c78ad62d323111a0176ea5
-sha256=3807d778ea57b9a72a17d6f7c4c623f3b12546d9fc6a0b1da8c3f713fd6e4a15
-
-[http://ftp.gnome.org/pub/GNOME/sources/empathy/0.9/empathy-0.9.tar.bz2]
-md5=74c7255a56ffa8e37147a1a0cfe40565
-sha256=51eab13f16c48433035e84b8eb6c66afbbf3e48199323d25f4f9a09c8047d078
-
-[http://ftp.gnome.org/pub/GNOME/sources/empathy/2.23/empathy-2.23.90.tar.bz2]
-md5=9bd5b3aef85262f8ae3efdbe87a7dbf8
-sha256=ad2c7ca228cdc79405c3853e7fdbfd5c239a6e9ad9a1a237e7e1b0c0b10f3ad4
-
-[http://ftp.gnome.org/pub/GNOME/sources/empathy/2.24/empathy-2.24.0.tar.bz2]
-md5=89e6dc430ad198c8044f261645d8bc6c
-sha256=5e73cfe9bbe862391386b4d60776a22fc765c48fe9f2bfad17ebd691571da2b9
-
-[http://ftp.gnome.org/pub/GNOME/sources/empathy/2.26/empathy-2.26.1.tar.bz2]
-md5=1edc492c0fd339dc30f0a443adad5fbe
-sha256=bb3b3663b11e3e573a13dd1b51d8a5b02797a43c53a64efc529f6604f40503c7
-
-[http://ftp.gnome.org/pub/GNOME/sources/empathy/2.28/empathy-2.28.2.tar.bz2]
-md5=8d578d82d1e51dc8c83642b81c0fb65a
-sha256=8f1dc1cbf7bda0dcb9804d5aa5d5d0e625c35dee10bfba7050aa3a8b6d491f3b
-
-[http://download.berlios.de/emul/emul-1.0.5.tar.gz]
-md5=f713b4d3c6a733b429de2673e4427483
-sha256=b91c7fb6420f6787d34b88b1e0d2e705e1006b5bce17235356f84a3c14329612
-
-[http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/en_GB.zip]
-md5=6fb885d57899c3e6aa2b27f3510deb37
-sha256=f4b43083923e2998298fd270a8a9f9ed570f4fbebeaa46ce5f1788b76920308b
-
-[http://trific.ath.cx/Ftp//enca/enca-1.9.tar.bz2]
-md5=b3581e28d68d452286fb0bfe58bed3b3
-sha256=02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d
-
-[http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-1.9.tar.bz2]
-md5=b3581e28d68d452286fb0bfe58bed3b3
-sha256=02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d
-
-[http://download.sourceforge.net/abiword/enchant-1.1.3.tar.gz]
-md5=c95186755fe46b27a78d9a85fef2175c
-sha256=6a8bce57437c514f2578e7ff09f8a48ff3b20e7ed746c3113372d2c75d382c83
-
-[http://www.abisource.com/downloads/enchant/1.2.5/enchant-1.2.5.tar.gz]
-md5=e64ec808ed2cb687c242ebb835faeb61
-sha256=15348bf21125536b3bce1e477e50310e4b192c43c35476e949f41280bc7123d8
-
-[http://www.abisource.com/downloads/enchant/1.3.0/enchant-1.3.0.tar.gz]
-md5=f7edafae875616b83e7a17a7e5c2d585
-sha256=e65015aa0e6ada88a001b07b092265f4cbaf377d99b4233972995cdb94e698ef
-
-[http://xorg.freedesktop.org/releases/individual/font/encodings-1.0.2.tar.bz2]
-md5=11adda157b03d63fd61d95ad7ef00466
-sha256=6d19107b66bbc96c085b0c2dd286ece22dcb73ba56a17fc95b0f2cbc5d6f4eac
-
-[http://xorg.freedesktop.org/releases/individual/font/encodings-1.0.3.tar.bz2]
-md5=29637480e7ce12546668631067c19ced
-sha256=07d9766d4aebe05ac572599f8f903a4fe06ab667a8182f2b6cc03e5fb3b80f53
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/encodings-X11R7.0-1.0.0.tar.bz2]
-md5=385cbd4093b610610ca54c06cbb0f497
-sha256=6bf1203487811d81e792db04fa347f4269dfd96de6ecd6cc590edb3999695d8e
-
-[http://downloads.mozdev.org/enigmail/src/enigmail-0.92.0.tar.gz]
-md5=50c369ce6d6fcb2d275cd30319a601ff
-sha256=de820405e4f3ca5531108ca99fc2bb1f260670f2fc4b45c7fb70ef9aa164bf6c
-
-[http://enlightenment.freedesktop.org/files/enlightenment-0.16.999.037.tar.gz]
-md5=7ca0359905aecc81bca85208148d9264
-sha256=33d0d4542945685661b7344713a91d76f9eb0eb5153a61b5ed1cf1180637a492
-
-[ftp://ftp.debian.org/debian/pool/main/e/enscript/enscript_1.6.4.orig.tar.gz]
-md5=b5174b59e4a050fb462af5dbf28ebba3
-sha256=45299a4db47c9c08c3649d4f62b211ae79ef5143360c264a40371a728f6ad99b
-
-[ftp://ftp.nl.debian.org/debian/pool/main/e/enscript/enscript_1.6.4.orig.tar.gz]
-md5=b5174b59e4a050fb462af5dbf28ebba3
-sha256=45299a4db47c9c08c3649d4f62b211ae79ef5143360c264a40371a728f6ad99b
-
-[ftp://ftp.us.debian.org/debian/pool/main/e/enscript/enscript_1.6.4.orig.tar.gz]
-md5=b5174b59e4a050fb462af5dbf28ebba3
-sha256=45299a4db47c9c08c3649d4f62b211ae79ef5143360c264a40371a728f6ad99b
-
-[http://enlightenment.freedesktop.org/files/entrance-0.9.0.007.tar.gz]
-md5=b789d09fa76e76a6466a786f0628d0ff
-sha256=789846f0a3df54b03a07cd117ee59b53f63a8677662cb2ff754a9be94032ec44
-
-[http://ftp.gnome.org/pub/GNOME/sources/eog/2.28/eog-2.28.2.tar.bz2]
-md5=ee5fd7f3cdd37467cb86052a858757c3
-sha256=9d7ec3f8a94f5fdc051d9ee5dc5f4f8e46d83b44d9b0a40d68beaaa738a91a08
-
-[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.2.tar.bz2]
-md5=a7d4a62ad148182944ad60f7a3647cba
-sha256=baa8c7f981b3fb9c72a4cf7194c2fa6a3b7aa039f2a266b8ccdf74aec931cbc3
-
-[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.3.tar.bz2]
-md5=33d30b47e39dca2ea680a990ab2d73be
-sha256=69c03286f90945b79f2a757b011eca5778db486977c56a6b72346c5a292a86c3
-
-[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.4.tar.bz2]
-md5=2e1e5500dbab0b1f19b3631df6d8ea02
-sha256=af38ecbffded26fd6caf3216ce0d1286322c461498630a2c83ab8722b8a8b712
-
-[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.5.tar.bz2]
-md5=70b4c5c36781b6e1d5d2ed30a79db9c5
-sha256=d437b49f40f61e3ba5a3ed8edad783895dcbdfc3cd4cbe6ef37a56f7eea59573
-
-[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.6.tar.bz2]
-md5=cce9edb41b4a8308e0ef0eea24b5a1ab
-sha256=61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f
-
-[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.7.tar.bz2]
-md5=1919bb19c16ef0a97d48b0a8303d3c7b
-sha256=0afbb0f348d4ba916cf58da48b4749b7cca6a9038136b27dc652161913704ae8
-
-[http://enlightenment.freedesktop.org/files/epeg-0.9.0.007.tar.gz]
-md5=383db51e46d13d986966459e4918d236
-sha256=bb12585b433fd0eca11865541bdb877166b9e53b0ea12624776f11cce3ce189b
-
-[http://gstaedtner.net/projects/epiano/epiano-0.3.1.tar.gz]
-md5=7966c489329cff971d97441d69abe19b
-sha256=17e02481c2fec1912241c6a12e8a277f87c3664b73c3a0946ea93461c5a937ae
-
-[http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.21/epiphany-2.21.92.tar.bz2]
-md5=2e0199851122ecb9d5f2863d92e18aa8
-sha256=904275567e54f5fcdb068d544b42da34c0361d3b8d143dfecd878950850a54c9
-
-[http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.22/epiphany-2.22.1.tar.bz2]
-md5=f3354751f7e293c03ffb9f26bd00b17f
-sha256=6faf0aaf8a44ad119baa921a634eb8dd2d02c4f501af176f294164f7d49dca5e
-
-[http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.24/epiphany-2.24.0.tar.bz2]
-md5=d46089988045c17adaa70af963b3e47a
-sha256=aafb7b16fd23e34315d511c0568e8c4d680be93e2547e8f18dfa4471bc0a6a0b
-
-[http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.24/epiphany-2.24.2.tar.bz2]
-md5=7650df6cc08292cd6faf8bbcfbf9e901
-sha256=6cf629d628ee2ae908c9aa3c530fa05344dfe47a9b770c1d9d1e7cc16d7528b3
-
-[http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.24/epiphany-2.24.3.tar.bz2]
-md5=af51614c7b78f8b8c68e9ece3d8f4d8f
-sha256=cc6ff7b30911bf80d8d72d6db7cc7ecbf51b2f5bb66796b79da33f8f680402ac
-
-[http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.27/epiphany-2.27.1.tar.bz2]
-md5=840fb2dc0511039de378927e3bccd802
-sha256=36d2b3652b5bbf7b459fda95ac0f25c429aa2e05e42fede3e88ce463879bdb8b
-
-[http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.28/epiphany-2.28.0.tar.bz2]
-md5=b88ac1168fc271892cabf73b749cac16
-sha256=23e0379c41c378221338fb327d747f3e42b2b98cdf1512c9df7cbeab45f311ea
-
-[http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.28/epiphany-extensions-2.28.0.tar.bz2]
-md5=7fca4c4d487e3a43ef5adb2a764b9aaf
-sha256=17c450622752cbda0e41fffd496d3022a533659f3db942e14da8015c47623856
-
-[http://enlightenment.freedesktop.org/files/epsilon-0.3.0.007.tar.gz]
-md5=408d3c63f9efa06e93e29a691c28985e
-sha256=6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc
-
-[http://downloads.sourceforge.net/project/epydoc/epydoc/3.0.1/epydoc-3.0.1.tar.gz]
-md5=cdd6f6c76dd8bab5e653a343a0544294
-sha256=d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1
-
-[http://www.inf.fu-berlin.de/~rschuste/er-refresh-tools-1.3.1.tar.gz]
-md5=f100632e67f94ef4fffa4da32d25427a
-sha256=748359a51e008c179dc5dd5e2974f4b1279c78e09a2613a73d15cd22cb55e8d8
-
-[https://garage.maemo.org/frs/download.php/4737/erminig_3.0.3-3.tar.gz]
-md5=d710853b0559c9919c730e503c0f05e2
-sha256=45490d585d62e2a36d202f7ca9b91883f257c24b51471894bf23b64e76ba89c9
-
-[http://www.burghardt.pl/files/esekeyd-1.2.4.tar.gz]
-md5=5eb8d1b02cdd99d0681e946768e529db
-sha256=7267db1685b04e766b782e4c5aab9729bf3f23b86d568a3a513c77eb91aaed03
-
-[http://enlightenment.freedesktop.org/files/esmart-0.9.0.007.tar.gz]
-md5=a65b4a08818ac9ef9de3dd9d4f20f148
-sha256=5df5b02c568f5e4b744252fbd62f5fae71bf0eddecc423d2b396a0ffbfe94465
-
-[http://downloads.sourceforge.net/esmtp/esmtp-0.5.1.tar.bz2]
-md5=9f0b809e891a548910f099efc4315b02
-sha256=ae023107f8e0c872a2bb6f23a9a5f019b254e9b7eebd20a309af996d9cb7e38e
-
-[http://heanet.dl.sourceforge.net/esmtp/esmtp-0.5.1.tar.bz2]
-md5=9f0b809e891a548910f099efc4315b02
-sha256=ae023107f8e0c872a2bb6f23a9a5f019b254e9b7eebd20a309af996d9cb7e38e
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2]
-md5=3facb5aa0115cc1c31771b9ad454ae76
-sha256=68bf399fcbd45c5e9ba99cd13a3a479e4ef2bc5dc52e540ffa00aef1e1b19a76
-
-[https://launchpad.net/ubuntu/breezy/+source/esound/0.2.36-1ubuntu5/+files/esound_0.2.36-1ubuntu5.diff.gz]
-md5=44b4d713387fb3f18666d289f88ae00c
-sha256=9bd7db657b8e9622910b9d3188096e37ee627ac0651c78ddce58e205e7487932
-
-[http://downloads.sourceforge.net/espeak/espeak-1.37-source.zip]
-md5=5c7b292d0537232868b4ac1317d76c02
-sha256=77f406c345362185ec4f362bf49f61d202e01ac9b9cd5c14f803195a544ce6d3
-
-[http://heanet.dl.sourceforge.net/espeak/espeak-1.37-source.zip]
-md5=5c7b292d0537232868b4ac1317d76c02
-sha256=77f406c345362185ec4f362bf49f61d202e01ac9b9cd5c14f803195a544ce6d3
-
-[http://downloads.sourceforge.net/espgs/espgs-7.07.1-source.tar.bz2]
-md5=d30bf5c09f2c7caa8291f6305cf03044
-sha256=7e0ed705da90a4c65368675d68ccecb871f89cb06d2efc61ddd0bb5fee5570f2
-
-[http://heanet.dl.sourceforge.net/espgs/espgs-7.07.1-source.tar.bz2]
-md5=d30bf5c09f2c7caa8291f6305cf03044
-sha256=7e0ed705da90a4c65368675d68ccecb871f89cb06d2efc61ddd0bb5fee5570f2
-
-[http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/8.15.3/espgs-8.15.3-source.tar.bz2]
-md5=4ec87a3da20c1b433ffbe0ffe3675fcd
-sha256=c1f5eefc058b08113f90bc583436399d71644b61872fa39ab4982a58a80baa62
-
-[http://www.secdev.org/projects/etherpuppet/files/etherpuppet.c]
-md5=6180d3a7001e528e0f87d258116ee1c9
-sha256=71416d34294c584cf9e8b9b4d72a34ed412b94f9928010891e786fe7b0cd98c9
-
-[http://ludovic.lange.free.fr/CETools/ethload-1.2.tar.gz]
-md5=0e8cac9311ece27bed363d842c63dc50
-sha256=8a27bae79247f893592b9e919f80c6f01c082d8ac7320602490106c758a9c762
-
-[http://downloads.sourceforge.net/gkernel/ethtool-3.tar.gz]
-md5=b4e71f7fa2629250677eefcb338442c5
-sha256=015d7c6084a668d7c2868d074e41a9cdd80bb6f0c7c6b9d275802e1629dd301f
-
-[http://heanet.dl.sourceforge.net/gkernel/ethtool-3.tar.gz]
-md5=b4e71f7fa2629250677eefcb338442c5
-sha256=015d7c6084a668d7c2868d074e41a9cdd80bb6f0c7c6b9d275802e1629dd301f
-
-[http://downloads.sourceforge.net/gkernel/ethtool-4.tar.gz]
-md5=3882c7c9cb9b4c37b08846dea9370245
-sha256=4536d6bc9ce52b9f4d505ff36aefca23c1042a92fd2f9a54308eff6e09b1a22b
-
-[http://heanet.dl.sourceforge.net/gkernel/ethtool-4.tar.gz]
-md5=3882c7c9cb9b4c37b08846dea9370245
-sha256=4536d6bc9ce52b9f4d505ff36aefca23c1042a92fd2f9a54308eff6e09b1a22b
-
-[http://downloads.sourceforge.net/gkernel/ethtool-5.tar.gz]
-md5=5df7f165974e096e2de890e099f87a12
-sha256=9eaad6076e57a5e2019733e4387705dc66829ea17cce04701b436cf5f374bb8f
-
-[http://heanet.dl.sourceforge.net/gkernel/ethtool-5.tar.gz]
-md5=5df7f165974e096e2de890e099f87a12
-sha256=9eaad6076e57a5e2019733e4387705dc66829ea17cce04701b436cf5f374bb8f
-
-[http://downloads.sourceforge.net/gkernel/ethtool-6.tar.gz]
-md5=3b721ec27f17ebf320ba8c505cf66d9c
-sha256=5046f573e7dd77f689c33c5f0aa0f2b7f96c79e0b37d6ecc78bae74c094fb4c6
-
-[http://heanet.dl.sourceforge.net/gkernel/ethtool-6.tar.gz]
-md5=3b721ec27f17ebf320ba8c505cf66d9c
-sha256=5046f573e7dd77f689c33c5f0aa0f2b7f96c79e0b37d6ecc78bae74c094fb4c6
-
-[http://dev.laptop.org/pub/sugar/sources/etoys/etoys-3.0.2076.tar.gz]
-md5=9cd0026f5bc89c96cafbd6d1d3500a3b
-sha256=4a2a9f54f3fc68250a92eab43a030b6b96c4b6e251b698b3378bfee751f1cbd8
-
-[http://download.sugarlabs.org/sources/sucrose/glucose/etoys/etoys-4.0.2212.tar.gz]
-md5=3eeb43af8c6bc0a30b46739707e27259
-sha256=8b5499c26860c8a11750e9e03b9a7d70dd8e7ffce16457e9ee9d7850d554e7ab
-
-[http://downloads.sourceforge.net/ettercap/ettercap-0.6.b.tar.gz]
-md5=f665cf82347a91f216184537f8f2c4bd
-sha256=2b6b0d1af5b8af63eb5edf7052fdc9f46c55b6f7b607c8772b18927cb481ecf9
-
-[http://downloads.sourceforge.net/ettercap/ettercap-NG-0.7.3.tar.gz]
-md5=28fb15cd024162c55249888fe1b97820
-sha256=c74239052d62565c13a82f9bbf217a4fdcce4b34949e361b53bb3f28e3168543
-
-[http://heanet.dl.sourceforge.net/ettercap/ettercap-NG-0.7.3.tar.gz]
-md5=28fb15cd024162c55249888fe1b97820
-sha256=c74239052d62565c13a82f9bbf217a4fdcce4b34949e361b53bb3f28e3168543
-
-[http://projects.gstaedtner.net/euphony/euphony-0.1.1.tar.gz]
-md5=0263344899dfcda7d26183f63d716b00
-sha256=34a398c1c27b22652ceacf29b1b3f33feff33f612802ed0c9b57afc1dce9b27e
-
-[http://projects.gstaedtner.net/euphony/euphony-0.1.2.tar.gz]
-md5=f939fb9a2c7aab5877f7e420827af027
-sha256=fedcf1b669873de67d69d3e81ad88a47414ccfede4a6a73ffa15ab82b1378460
-
-[http://projects.gstaedtner.net/euphony/euphony-0.1.3.tar.gz]
-md5=47d5663f0c66177e3529b9062f9b071f
-sha256=30f035bc39967f72f3ac8740d78f4d5e611577ea2b90f47f4cd72d6729fd4ce5
-
-[http://enlightenment.freedesktop.org/files/evas-0.9.9.037.tar.gz]
-md5=21cb713b01be39992a7c48d0ea23429b
-sha256=400046d55db03c3ac2de9e3346e38d0a75753501fb85ea953a497cdafc1340a1
-
-[http://www.balabit.com/downloads/files/eventlog/0.2/eventlog-0.2.5.tar.gz]
-md5=a6bdba91f88540cc69b398fd138d86cd
-sha256=914319726bcd01a4055b1c5e09671085875af6de2b0d8589841916139574ee11
-
-[http://www.balabit.com/downloads/syslog-ng/2.0/src/eventlog-0.2.5.tar.gz]
-md5=a6bdba91f88540cc69b398fd138d86cd
-sha256=914319726bcd01a4055b1c5e09671085875af6de2b0d8589841916139574ee11
-
-[http://xorg.freedesktop.org/releases/individual/proto/evieext-1.0.2.tar.bz2]
-md5=2507b5d0f4b2848147fbddd155aa6cfe
-sha256=0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125
-
-[http://xorg.freedesktop.org/releases/individual/proto/evieext-1.1.0.tar.bz2]
-md5=5c74f61d6f77b2e6a083b2b31000be42
-sha256=47881a52a8d9da1e41e4f028ed32a8b44f738afbead819c0a07253fdc1641885
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/evieext-X11R7.0-1.0.2.tar.bz2]
-md5=411c0d4f9eaa7d220a8d13edc790e3de
-sha256=d7dad048a9496058ec19c63e958e5216c27964d8cb766926fd5dcb96ff879f23
-
-[http://ftp.gnome.org/pub/GNOME/sources/evince/0.5/evince-0.5.2.tar.bz2]
-md5=732df368435cebddd4cc8132a8a280bd
-sha256=c3f923e9becee6aa59cc4dafbc36d376a88099cf4017a5e928f367bd428174de
-
-[http://ftp.gnome.org/pub/GNOME/sources/evince/0.6/evince-0.6.1.tar.bz2]
-md5=55a1d4af3cac209c7cfbe83b7ffcee1d
-sha256=ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e
-
-[http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/evince-0.9.0.tar.bz2]
-md5=620294cf13a7b98e966bfa64a9eec08f
-sha256=60def1544481ed99f6ecf853eddde61c5b35df9853ec9e5c487372d46bbee7c2
-
-[http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/evince-0.9.2.tar.bz2]
-md5=defd7e5f9e8299da9d65b0ad025ccfac
-sha256=aab3a4c14612664edfee07b305994d375843be998c5154058458a7afe886a179
-
-[http://ftp.gnome.org/pub/GNOME/sources/evince/2.20/evince-2.20.0.tar.bz2]
-md5=f9414b4dbfdff9a8f7f2f146a351e05a
-sha256=30dbad09953d92e48cc27681d601d0a55e30dc8e82a89c173098187bd7b35e61
-
-[http://ftp.gnome.org/pub/GNOME/sources/evince/2.22/evince-2.22.2.tar.bz2]
-md5=3661f901ab40cee44d5350a045a8bdb1
-sha256=4dcbdbd253b1978dcd70452780d7804ade912f4ede90f122f30d5322f53c5c3e
-
-[http://ftp.gnome.org/pub/GNOME/sources/evince/2.23/evince-2.23.4.tar.bz2]
-md5=4e353edd6481f67ee534a40d4b7f3b8c
-sha256=c424e6dd5cc0d998a311f5c49835de9803da4dbcb74ca7fbda29c1b953bf6d6b
-
-[http://ftp.gnome.org/pub/GNOME/sources/evince/2.24/evince-2.24.1.tar.bz2]
-md5=ad0e463ab1fe596fc52c03403a9b9f1e
-sha256=d8803313e2a0b3fa3fe20fe613ac3ec85ec6848d5d446dd02e9cc5be8194f65c
-
-[http://ftp.gnome.org/pub/GNOME/sources/evince/2.26/evince-2.26.2.tar.bz2]
-md5=ed8b9fb5c5d6feafd19f0114b736c9ef
-sha256=5165adb77af7dd355c600bc1fce4bcc7de2538ed02d0f87028660096a61af489
-
-[http://ftp.gnome.org/pub/GNOME/sources/evince/2.28/evince-2.28.0.tar.bz2]
-md5=66548bf1467f92924a7230869139adb5
-sha256=90b341d5e4be1f37d8f775591a9c209f8216a0c4c3a425dc0f1e0e637980d683
-
-[http://beagleboard.googlecode.com/files/evtest.c]
-md5=da26fda6df8835a7cb95182e1fabe912
-sha256=ba2bdf6887eb0ef606402d51a2f4e68510d68dec5afd9f4d30d787950dece770
-
-[http://enlightenment.freedesktop.org/files/ewl-0.0.4.007.tar.gz]
-md5=29bc8aec80b53480c2ea53aea1796e15
-sha256=0a0dba00517013082b8e094b4b7753162cf5fb71a170eb54cbc2eaa35717d5f6
-
-[http://www.exiv2.org/exiv2-0.15.tar.gz]
-md5=bb18d19e1d6fb255dadda456cadec00e
-sha256=b72d82e9117308063471993f3832e58064c0599dec3df2bf2a7ce54450984a3e
-
-[http://projects.o-hand.com/sources/exmap-console/exmap-console-0.4.1.tgz]
-md5=55aec784e214037e61400287a55b5426
-sha256=53082354ae893fd385051c96214640cbeba527131ccf9f5320626252a4aef8d5
-
-[http://projects.o-hand.com/sources/exmap-console/exmap-console-0.4.tgz]
-md5=eb8b6d834d2224e17561593dc4158e4d
-sha256=418c3b9e099b96f7b8e1456c34b585b2f4bd10af88fb976116a154e4cb54fa9b
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/exo-0.3.101.tar.bz2]
-md5=1c0eebb360f53eab70454b70e1bde36e
-sha256=0016f6ff0d1d22ed42fb5c9bcecc5559a62572781446fdfd1444786b5d33e324
-
-[http://mocha.xfce.org/archive/src/xfce/exo/0.3/exo-0.3.105.tar.bz2]
-md5=ba87f84894498bf23ae39d849c55f98c
-sha256=278f702d890c89bd3923ce1bdaf29bd9f2c800c2e4cfd9e902d99663bba337e5
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/exo-0.3.4.tar.bz2]
-md5=7a1af943b1df32b6f89ae91823118a22
-sha256=a5373e9bd6055caa7cd5d06128f6236cfd2f4f6657ea4a85d7bd9eafe5bf0538
-
-[http://downloads.sourceforge.net/expat/expat-1.95.6.tar.gz]
-md5=ca78d94e83e9f077b5da2bfe28ba986a
-sha256=b48761f9b67715bb1f85371d0059d744a60ed71e72065da7d5326bbb04e26a92
-
-[http://heanet.dl.sourceforge.net/expat/expat-1.95.6.tar.gz]
-md5=ca78d94e83e9f077b5da2bfe28ba986a
-sha256=b48761f9b67715bb1f85371d0059d744a60ed71e72065da7d5326bbb04e26a92
-
-[http://downloads.sourceforge.net/expat/expat-1.95.7.tar.gz]
-md5=2ff59c2a5cbdd21a285c5f343e214fa9
-sha256=c94817c67c8ff0d244092c19f5713ea8c76a9a19075ff6031d4ef93ec7b66256
-
-[http://heanet.dl.sourceforge.net/expat/expat-1.95.7.tar.gz]
-md5=2ff59c2a5cbdd21a285c5f343e214fa9
-sha256=c94817c67c8ff0d244092c19f5713ea8c76a9a19075ff6031d4ef93ec7b66256
-
-[http://qa.debian.org/watch/sf.php/expat/expat-1.95.7.tar.gz]
-md5=2ff59c2a5cbdd21a285c5f343e214fa9
-sha256=c94817c67c8ff0d244092c19f5713ea8c76a9a19075ff6031d4ef93ec7b66256
-
-[http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0.patch]
-md5=fe38d8a308c47dad87977f19631d73d5
-sha256=316f69529608abb6cb378bd705b784e176e36b3c1979ef8ddf14b4bffe5498b9
-
-[http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch]
-md5=8ab51e8ff728f4155db64b9bb6ea6d71
-sha256=75d4c6ddbfc5e4fff7690a3308e2574f89a0e2709fb91caccb29067a9dad251a
-
-[http://www.rpsys.net/openzaurus/patches/archive/export_atags-r1.patch]
-md5=c501f6cbfc366103e5b4267e147a21ff
-sha256=14fbf10de1fc3b58cfeb00bcfebf54e0182cc7cc346c4bbc90248cfc61add462
-
-[http://www.rpsys.net/openzaurus/patches/archive/export_atags-r2.patch]
-md5=987956757c3707ba0e62ce2cd133011b
-sha256=7754930742d3c3cc2a05af38263ba58ba416b7359f8a0c598ae0f7377277d3b3
-
-[http://downloads.sourceforge.net/eyeos/eyeOS_1.8.7.1.zip]
-md5=020b1ffd9edc3fe7af25b0d6cca430ae
-sha256=660cd2de4fbd511b767839cb5caa734ebfa9cc5935aa58604f764d7e295768d4
-
-[http://www.ez-ipupdate.com/dist/ez-ipupdate-3.0.10.tar.gz]
-md5=6505c9d18ef6b5ce13fe2a668eb5724b
-sha256=f7ff9bf972139b303616018a6937aa4c6df4e93c935ffd004b30845e2ad41ea6
-
-[http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/f9d938ede196.tar.gz]
-md5=c8f78d48ac83987bc2adebeebcd354e9
-sha256=89952cf8bbe1bcce91c2c1fcf9a071991a890b3f8a783dee741cdb23c8ac763a
-
-[http://downloads.sourceforge.net/faac/faac-1.24.tar.gz]
-md5=e72dc74db17b42b06155613489077ad7
-sha256=a5844ff3bce0d7c885af71f41da01395d3253dcfc33863306a027a78a7cfad9e
-
-[http://heanet.dl.sourceforge.net/faac/faac-1.24.tar.gz]
-md5=e72dc74db17b42b06155613489077ad7
-sha256=a5844ff3bce0d7c885af71f41da01395d3253dcfc33863306a027a78a7cfad9e
-
-[http://downloads.sourceforge.net/faac/faad2-2.0.zip]
-md5=b6807fba02d52747ebb92097daee71e8
-sha256=50cf7188f6f99b75566f14d417915dcff1446d36d05982971c126893ae74a97a
-
-[http://heanet.dl.sourceforge.net/faac/faad2-2.0.zip]
-md5=b6807fba02d52747ebb92097daee71e8
-sha256=50cf7188f6f99b75566f14d417915dcff1446d36d05982971c126893ae74a97a
-
-[ftp://ftp.debian.org/debian/pool/main/f/fakechroot/fakechroot_2.5.orig.tar.gz]
-md5=b885951b98f4316f9686699e9853513d
-sha256=990cd830ea362ba2cb88ca7b59cd3f4d115a054621450b5cf211cadebed23ee0
-
-[ftp://ftp.nl.debian.org/debian/pool/main/f/fakechroot/fakechroot_2.5.orig.tar.gz]
-md5=b885951b98f4316f9686699e9853513d
-sha256=990cd830ea362ba2cb88ca7b59cd3f4d115a054621450b5cf211cadebed23ee0
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakechroot/fakechroot_2.5.orig.tar.gz]
-md5=b885951b98f4316f9686699e9853513d
-sha256=990cd830ea362ba2cb88ca7b59cd3f4d115a054621450b5cf211cadebed23ee0
-
-[ftp://ftp.us.debian.org/debian/pool/main/f/fakechroot/fakechroot_2.5.orig.tar.gz]
-md5=b885951b98f4316f9686699e9853513d
-sha256=990cd830ea362ba2cb88ca7b59cd3f4d115a054621450b5cf211cadebed23ee0
-
-[http://www.hostname.org/fake_connect/fakeconnect-1.2.1.tar.gz]
-md5=55220ebadef5f541d705b72fe222b5b1
-sha256=4b891e1d58c8cdf397737ac81a9328d8c663743b41f835bb2267831866d75a3e
-
-[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.11.4.tar.gz]
-md5=61d29fcb868c5f9c3d0a3686ce45263e
-sha256=7796adabf4514ba535ccd518bb377c839c098cd2a28ba46984a627b2e9382e26
-
-[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.12.1.tar.gz]
-md5=87970d6784f536cde84f9bcbaaa52720
-sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.12.1.tar.gz]
-md5=87970d6784f536cde84f9bcbaaa52720
-sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef
-
-[ftp://ftp.us.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.12.1.tar.gz]
-md5=87970d6784f536cde84f9bcbaaa52720
-sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef
-
-[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.12.4.tar.gz]
-md5=aaefede2405a40c87438e7e833d69b70
-sha256=dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.12.4.tar.gz]
-md5=aaefede2405a40c87438e7e833d69b70
-sha256=dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d
-
-[ftp://ftp.us.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.12.4.tar.gz]
-md5=aaefede2405a40c87438e7e833d69b70
-sha256=dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d
-
-[http://openzaurus.org/mirror/fakeroot_1.2.13.tar.gz]
-md5=cf25d5d4c943ebf2293fe6f23ecba0fd
-sha256=6f51ebdf0e18bea58d18f79e8ffebb797fe57bdf44b96dff9d84b70467af7841
-
-[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz]
-md5=3654bbbf01deeb0d804df194e1b1a2b3
-sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
-
-[ftp://ftp.gentoo.mesh-solutions.com/mirrors/gentoo/distfiles/fakeroot_1.7.1.tar.gz]
-md5=3654bbbf01deeb0d804df194e1b1a2b3
-sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz]
-md5=3654bbbf01deeb0d804df194e1b1a2b3
-sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
-
-[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.8.3.tar.gz]
-md5=f123ffb457eb3577fcbb5e2c2432a922
-sha256=fd2ae24fc5bc14bfe63e0be551134a0f7906659f45803a427a2377b67d193867
-
-[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.1.tar.gz]
-md5=163a846e51b39fd626b43548c2cdda7c
-sha256=6a3a993ab90540719e47b4968f60f8023a3cbb93f2a1ce611cd7a2d52ac1c38e
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.9.1.tar.gz]
-md5=163a846e51b39fd626b43548c2cdda7c
-sha256=6a3a993ab90540719e47b4968f60f8023a3cbb93f2a1ce611cd7a2d52ac1c38e
-
-[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.4.tar.gz]
-md5=c324eb1e157edad17d98b1b2c8b99e25
-sha256=8c55b1640c726bd421b68a1119f20b002eb29d95ae58d480a1d5d7d8afba1e81
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.9.4.tar.gz]
-md5=c324eb1e157edad17d98b1b2c8b99e25
-sha256=8c55b1640c726bd421b68a1119f20b002eb29d95ae58d480a1d5d7d8afba1e81
-
-[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.5.tar.gz]
-md5=95c0c78c734b9782ec8d47e99c8e3fc8
-sha256=2cbf95aef9e3f9a32b6859ae35723eaa76b5ed483ddaa654cf627d1eacdea5fa
-
-[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz]
-md5=9441c981bfd4e521abcd5d93385f71d8
-sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
-
-[ftp://ftp.nl.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz]
-md5=9441c981bfd4e521abcd5d93385f71d8
-sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz]
-md5=9441c981bfd4e521abcd5d93385f71d8
-sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
-
-[ftp://ftp.us.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz]
-md5=9441c981bfd4e521abcd5d93385f71d8
-sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
-
-[http://ftp.pwr.wroc.pl/debian/pool//main/f/fakeroot/fakeroot_1.9.6.tar.gz]
-md5=9441c981bfd4e521abcd5d93385f71d8
-sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
-
-[ftp://oss.sgi.com/projects/fam/download/stable/fam-2.6.10.tar.gz]
-md5=1c5a2ea659680bdd1e238d7828a857a7
-sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e
-
-[ftp://oss.sgi.com/projects/fam/download/stable/fam-2.7.0.tar.gz]
-md5=1bf3ae6c0c58d3201afc97c6a4834e39
-sha256=1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
-
-[http://downloads.sourceforge.net/fann/fann-2.0.0.tar.bz2]
-md5=4224efa533265dcf39237667973d0e20
-sha256=762a1313a9b935300cb66ebf052d469d04823ca721fe6dd2a49c01e13e8ab30a
-
-[http://telepathy.freedesktop.org/releases/farsight/farsight-0.1.5.tar.gz]
-md5=2aaf871471a9ec037763c5dc7c193c57
-sha256=6b9785167934948a582839f9723e37214cab1607a9764c35f10d555f8e662575
-
-[http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.9.tar.gz]
-md5=f2d4fad95009bc7eae29f97c6f560dcd
-sha256=84553ff12c5245705806107448e85c96950b4b7a5eaf85461c89987be8ea644d
-
-[http://download.savannah.nongnu.org/releases/fastjar/fastjar-0.95.tar.gz]
-md5=92a70f9e56223b653bce0f58f90cf950
-sha256=ca03811490c965abc9f466e75418ae48bb71f14d8e8ed4c43e8109207b85ce54
-
-[http://download.savannah.nongnu.org/releases/fastjar/fastjar-0.98.tar.gz]
-md5=d2d264d343d4d0e1575832cc1023c3bf
-sha256=f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145
-
-[http://ftp3.ie.freebsd.org/pub/gentoo/distfiles/fbgetty-0.1.698.tar.gz]
-md5=1705bc0f8f1e03fe50d324ba84ac4e56
-sha256=332cbffa7c489b39a7d13d12d581c27dfc57ba098041431a6845b44785cf2d35
-
-[http://hem.bredband.net/gmogmo/fbgrab/fbgrab-1.0.tar.gz]
-md5=7af4d8774684182ed690d5da82d6d234
-sha256=9158241a20978dcc4caf0692684da9dd3640fd6f5c8b72581bd099198d670510
-
-[http://people.openezx.org/ao2/fbgrab_network_mode.diff]
-md5=71bf1218c52a6e4a1f38406748285255
-sha256=e8cf4fe15d7e99e86016db3ddc1f403c35c49f40c4d37209d76cd5785c541aa8
-
-[http://dl.bytesex.org/releases/fbida/fbida-2.07.tar.gz]
-md5=3e05910fb7c1d9b2bd3e272d96db069c
-sha256=6510dee7c4f45cb63094d540e66aa39d53215c59f46944b8bb050c26b71bdb44
-
-[http://downloads.sourceforge.net/fbpanel/fbpanel-4.12.tgz]
-md5=12528e7b2936a3548840fe01acaf39f5
-sha256=9f665777df5023e3d3c33598a0f5d81d0b79314b75a128c16c07126ef0fc607f
-
-[http://qa.debian.org/watch/sf.php/fbpanel/fbpanel-4.12.tgz]
-md5=12528e7b2936a3548840fe01acaf39f5
-sha256=9f665777df5023e3d3c33598a0f5d81d0b79314b75a128c16c07126ef0fc607f
-
-[http://downloads.sourceforge.net/fbpanel/fbpanel-4.3.tgz]
-md5=2d2f3713cf3c17b71997064f39d4c888
-sha256=e4db7a6305ffe2333fae08c940ded8f7e5b02999e0917b0ea4ef3764c80f58c8
-
-[http://heanet.dl.sourceforge.net/fbpanel/fbpanel-4.3.tgz]
-md5=2d2f3713cf3c17b71997064f39d4c888
-sha256=e4db7a6305ffe2333fae08c940ded8f7e5b02999e0917b0ea4ef3764c80f58c8
-
-[http://www.fbreader.org/fbreader-sources-0.10.7.tgz]
-md5=145f4d2ba24c54288bad2d66ddd2baf2
-sha256=d7bcc7cafb1c78f00b380dc2facdb82c5a2fb1475e1ddfc8e5d44a2b855cec1a
-
-[http://www.fbreader.org/fbreader-sources-0.12.1.tgz]
-md5=7236d094a91f26d19a3cfd3db8fcf946
-sha256=02a6a143abf3b5ab875392acef8d67f5cc991ea364e3bd250628e6a31b1f9923
-
-[http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-0.7.3d.tgz]
-md5=705a89bb03860fb312a7afa25db0310e
-sha256=ec9f93968147526a9b2dd17e31a6d2795356b2eeed309f796f655b37b98abd83
-
-[http://only.mawhrin.net/fbreader/fbreader-sources-0.7.4q.tgz]
-md5=17062ae0f1d7d093e61cd002e39885ae
-sha256=190e2b5ae8467d4b0c26b10e091c74509e00d4bd895c240842ee02a870caa3eb
-
-[http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-0.7.4q.tgz]
-md5=17062ae0f1d7d093e61cd002e39885ae
-sha256=190e2b5ae8467d4b0c26b10e091c74509e00d4bd895c240842ee02a870caa3eb
-
-[http://only.mawhrin.net/fbreader/fbreader-sources-0.8.2a.tgz]
-md5=3b4944bf0d37b42249bef84d59918ce0
-sha256=4e505820b150ae35a40c39a3d2aeb7a8dcb6bd9b599055c40f566d874e4d1c82
-
-[http://www.fbreader.org/obsolete/fbreader-sources-0.8.2a.tgz]
-md5=3b4944bf0d37b42249bef84d59918ce0
-sha256=4e505820b150ae35a40c39a3d2aeb7a8dcb6bd9b599055c40f566d874e4d1c82
-
-[http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz]
-md5=40ed9608f46d787bfb65fd1269f7f459
-sha256=517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338
-
-[http://home.comcast.net/~fbui/fbui-0.9.14c.tar.bz2]
-md5=e97c609af171cceb85d08f366406374a
-sha256=112ba595859ad6e42f5ad522ada27a08da7702e3ea8c84df48ae1c5d6177ae8e
-
-[http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz]
-md5=3e466375b930ec22be44f1041e77b55d
-sha256=9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c
-
-[http://sdgsystems.com/download/fbvncserver-0.9.4.tar.gz]
-md5=01a37f17857641253541307f59dd8cc5
-sha256=e22ed10ecba059904649f344be260512fdb3cbecbd95ca965f8b5cc3ea1785b5
-
-[http://downloads.sourceforge.net/fceultra/fceu-0.98.13-pre.src.tar.bz2]
-md5=1977214a15a341a4fd8bad14eda76866
-sha256=a227f2d8a3b79462a895435be26c1622f03c5978d2e3e5456d6284592e88a6c2
-
-[http://heanet.dl.sourceforge.net/fceultra/fceu-0.98.13-pre.src.tar.bz2]
-md5=1977214a15a341a4fd8bad14eda76866
-sha256=a227f2d8a3b79462a895435be26c1622f03c5978d2e3e5456d6284592e88a6c2
-
-[http://www.fastcgi.com/dist/fcgi-2.4.0.tar.gz]
-md5=d15060a813b91383a9f3c66faf84867e
-sha256=66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9
-
-[http://andrzejekiert.ovh.org/software/fconfig/fconfig-20060419.tar.gz]
-md5=abc1aca11ee9c9d9b65057c3cf1ca88c
-sha256=d109960dd5e306d4a8ab73e99bfd519ef1c7c674b33b9cfd8fdd61cbd43dac60
-
-[http://linuxbrit.co.uk/downloads/feh-1.2.6.tar.gz]
-md5=6d40889465181de51bb26fbbe57fbfac
-sha256=281cec4cec724b53ba501718e8010bbff0ef49415649e4e7fe6431ec62ebea7d
-
-[http://linuxbrit.co.uk/downloads/feh-1.2.7.tar.gz]
-md5=a25a4ace719a69bab1df5929ad7b9716
-sha256=08db3709424613680c0400c6ab0bd28f623928e5f33f4d7469ecd71328fbf1c2
-
-[http://catb.org/~esr/fetchmail/fetchmail-6.2.3.tar.gz]
-md5=e131bdb6c3977fd47a3e122c43dcf19d
-sha256=d0867cf1dbc58031a6b65375cf899f565569a818400f762dcee3b50de9da9f56
-
-[ftp://ftp.debian.org/debian/pool/main/f/fetchmail/fetchmail_6.2.5.orig.tar.gz]
-md5=9956b30139edaa4f5f77c4d0dbd80225
-sha256=c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac
-
-[ftp://ftp.nl.debian.org/debian/pool/main/f/fetchmail/fetchmail_6.2.5.orig.tar.gz]
-md5=9956b30139edaa4f5f77c4d0dbd80225
-sha256=c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac
-
-[ftp://ftp.us.debian.org/debian/pool/main/f/fetchmail/fetchmail_6.2.5.orig.tar.gz]
-md5=9956b30139edaa4f5f77c4d0dbd80225
-sha256=c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac
-
-[http://downloads.sourceforge.net/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz]
-md5=ea5587e3c66d50b1503b82ac4179c303
-sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
-
-[http://heanet.dl.sourceforge.net/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz]
-md5=ea5587e3c66d50b1503b82ac4179c303
-sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
-
-[http://ffmpeg.org/releases/ffmpeg-0.5.tar.bz2]
-md5=be8503f15c3b81ba00eb8379ca8dcf33
-sha256=16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
-
-[http://folks.o-hand.com/dodji/0xdeadbabe/ffmpeg_xine.tar.bz2]
-md5=e67e1c2eb134d2fba50a524188b6a3b4
-sha256=61ba89c0deaaf324485b2bf480fdb90941b74e2c47b4810e34f530b77005bb8c
-
-[http://www.fftw.org/fftw-3.1.2.tar.gz]
-md5=08f2e21c9fd02f4be2bd53a62592afa4
-sha256=e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf
-
-[http://www.fftw.org/fftw-3.2.2.tar.gz]
-md5=b616e5c91218cc778b5aa735fefb61ae
-sha256=6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f
-
-[http://www.fftw.org/fftw-3.2.tar.gz]
-md5=280960ddbad368ebb96c073a2b642f5d
-sha256=205a021a87cae27146741d15bff260353497d219332a97718c0c649ab81483d0
-
-[http://www.fftw.org/fftw-3.2alpha3.tar.gz]
-md5=a657ef428d0643942ec3e472b61b56d9
-sha256=4fc8fbe0cf94a0d281ddc309fa91e2b6e2fb14f4cafe525d20635a196c2cc245
-
-[ftp://ftp.feep.net/pub/software/fget/fget-1.3.3.tar.gz]
-md5=a556eef04aeb574ac8ab0dd8c868fcab
-sha256=ceaa67f19a1c5462f5e739fcd3b53dd42b0173d9deee579c55e5088801559e43
-
-[http://ftp.sh.cvut.cz/MIRRORS/rock/ROCK-2.0/gnome2/figment/figment-0.3.5.tar.bz2]
-md5=4b317749c7a75c4f283c6ef5aaad4146
-sha256=ebafecd9a34dbcb83bcbf69db3e9655e92af2eb0ede33d9f92d13ed5f2e7d8b2
-
-[http://handhelds.org/~mallum/downloadables/figment/figment-0.3.5.tar.gz]
-md5=e20c642ffe7c8a492c0ddc7ee3016f44
-sha256=39fcbdea0c1e31338bca4ae60db700a3f0fce7b6cb75087abd559022e22a2927
-
-[ftp://ftp.astron.com/pub/file/file-4.18.tar.gz]
-md5=ce1aa9b0316feb57d40a48cfe6b606e4
-sha256=5090d5123ea642842d04d3f93a821e1372e5d9e434c74c08ee2483cc150a6273
-
-[ftp://ftp.astron.com/pub/file/file-4.20.tar.gz]
-md5=402bdb26356791bd5d277099adacc006
-sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7
-
-[ftp://ftp.fi.debian.org/pub/gentoo/distfiles/file-4.21.tar.gz]
-md5=9e3503116f4269a1be70220ee2234b0e
-sha256=6f5644d56cc603138533158076a6cb41cd33c33d27e5310cb76cb6576151ca67
-
-[ftp://ftp.astron.com/pub/file/file-5.04.tar.gz]
-md5=accade81ff1cc774904b47c72c8aeea0
-sha256=4c9e6e7994e74cb3386374ae91b055d26ac96b9d3e82fd157ae2d62e87a4260c
-
-[http://ftp.gnome.org/pub/GNOME/sources/file-roller/2.28/file-roller-2.28.0.tar.bz2]
-md5=dcb0c887d5d287a28ebb5c0ea69bedfa
-sha256=499fe835b297720f4e4054b4ab34a3fb619c3460c5da82b1519d9b86aa2f3ac2
-
-[http://ftp.gnome.org/pub/gnome/sources/file-roller/2.6/file-roller-2.6.1.tar.gz]
-md5=68a1b645b2e44227f7aca604fd42f8d1
-sha256=21e68eeb291ab5a9f4d618f2985c16c26cdfeb0f0f37d3b88550446678dab30a
-
-[ftp://ftp.gnu.org/gnu/findutils/findutils-4.2.29.tar.gz]
-md5=24e76434ca74ba3c2c6ad621eb64e1ff
-sha256=1a9ed8db0711f8419156e786b6aecd42dd05df29e53e380d8924e696f7071ae0
-
-[ftp://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz]
-md5=351cc4adb07d54877fa15f75fb77d39f
-sha256=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.7/source/firefox-1.0.7-source.tar.bz2]
-md5=5704a8c36de84b408e069afb0c5bc1df
-sha256=10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.5.0.6/source/firefox-1.5.0.6-source.tar.bz2]
-md5=3a659d384744cab77f90920f6d529c89
-sha256=79e47279d839914e5052e1b1f21588c51d7f62c3f5e32205f790a60cafdbb5ac
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0/source/firefox-2.0-source.tar.bz2]
-md5=03709c15cba0e0375ff5336d538f77e7
-sha256=dba581583ef390fab90c39c9a667bf1a5bfbeaec75e6fbb2a9cedcc857d26800
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.1/source/firefox-2.0.0.1-source.tar.bz2]
-md5=7a1fc804ed735c5b7e9b1498bac8b5db
-sha256=b7db1a7d7ee37707dd5736a656982d1deaea7b29654f49564c2aa54c59ba1e24
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.3/source/firefox-2.0.0.3-source.tar.bz2]
-md5=24398e3d98673a2a92a01a8f771ca12a
-sha256=02169e4e7a095c426fd5caf56c6cfc2415f4fe54cef7f4e78556f350e2c94007
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0/source/firefox-3.0-source.tar.bz2]
-md5=4210ae0801df2eb498408533010d97c1
-sha256=606e84ac02322aff692b9d4612cb8e27f5fa0da29e14bce7744927e0dad9c4b9
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.1/source/firefox-3.0.1-source.tar.bz2]
-md5=406d67174f8f74ab154a1b17d0881b27
-sha256=e16c9794b624188a85af52a2f61131189f422cb99c7fb9777686741cb330dc33
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.4/source/firefox-3.0.4-source.tar.bz2]
-md5=8a1ac4a5940108a96458c5307a74c98d
-sha256=685df7c7f33fc71a8c2d0fb71e190d59e2dd92007c2ace1ad176e655fb3012d7
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.8/source/firefox-3.0.8-source.tar.bz2]
-md5=5fb6c6f3e973516df83a573348377a2f
-sha256=e0c279546d99d3d21c30cdae6649e0d3710a5db44edd1347b4f31e04cb729040
-
-[http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0b2/source/firefox-3.0b2-source.tar.bz2]
-md5=77f0455cc0dcfaaf020f9ce54c065fb0
-sha256=57a2d9cdbe69a507d2294c081bc74aeb4d6cbf4e72dc764cfc9b972151535f57
-
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.1a2-candidates/build1/firefox-3.1a2-source.tar.bz2]
-md5=f1925157149f4a0c0375e0232290d676
-sha256=a1b5f230b152af6e5191536f25de0d021768f73cc3b35ff41a12f3daedcafb92
-
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.1b1-candidates/build2/source/firefox-3.1b1-source.tar.bz2]
-md5=d101c02c8ad670eeb2095e449c79c085
-sha256=5382518ad10313c4c22fbfd2bf5cbf1a6e88160e7e29ab5dcd07362147d04c8d
-
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.1b2-candidates/build2/source/firefox-3.1b2-source.tar.bz2]
-md5=c315e06cdfe9ee76aa4831ece1ed5df3
-sha256=402ca3641f1724f5a4ec1ac3e283cd1334bd85c4b5de7744bd267454ef31259e
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.2/source/firefox-3.5.2-source.tar.bz2]
-md5=136867f95c86f3988b7f825e874b85de
-sha256=d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.4/source/firefox-3.5.4.source.tar.bz2]
-md5=0b6ccb1e50d96b7127a18a69399fcf05
-sha256=b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.5/source/firefox-3.5.5.source.tar.bz2]
-md5=b3d92dfb40584141dc1068efc9bdfccc
-sha256=2abe7b5561267c230df27951d1d8c6c5853d06ca2426997fdf0a63c5db689feb
-
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5b4-candidates/build1/source/firefox-3.5b4-source.tar.bz2]
-md5=ff6bf463300cb56bcf750973b2af3d80
-sha256=b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d
-
-[http://handhelds.org/~zecke/oe_packages/fish_V1.1.0.tar.gz]
-md5=78770f1abce09fbbaa0a46ce8ccc607f
-sha256=9d13db38c065d70f48ce70580c7d8cd940d923192c04bc3cb356cc98879b5788
-
-[http://xlibs.freedesktop.org/release/fixesext-2.0.1.tar.bz2]
-md5=6cc725db32346058a4adeef283335ae1
-sha256=c7ce53b1678268ec2f08d0a32580c2783b6e297941de36d8b880c0533ed51c26
-
-[http://xorg.freedesktop.org/releases/individual/proto/fixesproto-4.0.tar.bz2]
-md5=8b298cc3424597f8138c7faf7763dce9
-sha256=b3fe971ccc8152db6c78da7117c31fc4cd2fcb2b6a4df3db0f8fed13d4ceb08f
-
-[http://xorg.freedesktop.org/releases/individual/proto/fixesproto-4.1.1.tar.bz2]
-md5=4c1cb4f2ed9f34de59f2f04783ca9483
-sha256=e72a32916ad4bbd03847f8945c55582bdbafc039d286ded7365d402a7ff164ef
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/fixesproto-X11R7.0-3.0.2.tar.bz2]
-md5=ff8899d2325ed8a5787cde372ca8f80f
-sha256=dd7f67b0f01c253512b53a8a051271144316e82783d5f8391df77fc8c21ed327
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/proto/fixesproto-X11R7.1-4.0.tar.bz2]
-md5=7ba155d9209fa7320fc387b338457bc6
-sha256=ea55da5c73aa0ca733f6e6efe5e4e77ff24779578a4170eb868da808a7e24f93
-
-[http://downloads.sourceforge.net/flac/flac-1.1.0.tar.gz]
-md5=19b456a27b5fcf502c76cc33f33e1490
-sha256=897b0ac415b36ea241932c56852b8d6f3e083d0db66be9a96fc83c9cc42932a1
-
-[http://heanet.dl.sourceforge.net/flac/flac-1.1.0.tar.gz]
-md5=19b456a27b5fcf502c76cc33f33e1490
-sha256=897b0ac415b36ea241932c56852b8d6f3e083d0db66be9a96fc83c9cc42932a1
-
-[http://downloads.sourceforge.net/flac/flac-1.1.2.tar.gz]
-md5=2bfc127cdda02834d0491ab531a20960
-sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
-
-[http://heanet.dl.sourceforge.net/flac/flac-1.1.2.tar.gz]
-md5=2bfc127cdda02834d0491ab531a20960
-sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
-
-[http://downloads.sourceforge.net/flac/flac-1.2.1.tar.gz]
-md5=153c8b15a54da428d1f0fadc756c22c7
-sha256=9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
-
-[http://fpdownload.macromedia.com/get/flashplayer/current//flash-plugin-10.0.12.36-release.i386.rpm]
-md5=8845d4536fcd3a329690c93bce9bbf8e
-sha256=c7345faf10b269b3556f2e1373c4afc35f08891f8bbd54e45d49151a8c8e4ac0
-
-[http://fpdownload.macromedia.com/get/flashplayer/current//flash-plugin-10.0.22.87-release.i386.rpm]
-md5=a3bb1f9a8e2b1238ffaf89193e60be02
-sha256=ec5ace49df7cfe69b7c02c8d1b6df8089f32076a390b931051feed2a9762d554
-
-[http://www.w1hkj.com/fldigi-distro/fldigi-3.11.4.tar.gz]
-md5=85457a57ac97210ee23299ccf25e5c60
-sha256=1614d6720994a5b794d50b05d95dfd1f1cc556fcd500352f0203daeae88be0dd
-
-[http://downloads.sourceforge.net/flex/flex-2.5.31.tar.bz2]
-md5=363dcc4afc917dc51306eb9d3de0152f
-sha256=701353279a17655d78e3b3678ad78d0375f5bf45877ad8b3507d589c42427f26
-
-[http://heanet.dl.sourceforge.net/flex/flex-2.5.31.tar.bz2]
-md5=363dcc4afc917dc51306eb9d3de0152f
-sha256=701353279a17655d78e3b3678ad78d0375f5bf45877ad8b3507d589c42427f26
-
-[http://qa.debian.org/watch/sf.php/flex/flex-2.5.31.tar.bz2]
-md5=363dcc4afc917dc51306eb9d3de0152f
-sha256=701353279a17655d78e3b3678ad78d0375f5bf45877ad8b3507d589c42427f26
-
-[http://www.Vanille.de/mirror/flexis-zaurus-1.0.0.tar.bz2]
-md5=e7737236f1eccadd4cf8cfcc0c82e005
-sha256=ca7653a03f562057098c9fb956de34021a14017c2a44eedd3ab0963dc877e7e5
-
-[http://download.dajobe.org/flickcurl/flickcurl-1.9.tar.gz]
-md5=d701fcc8d764e634ee979f18ff9db322
-sha256=573ae52509289ed366a161facf390aa6ce530da143c760ca546868c8b0a0d034
-
-[http://www.speech.cs.cmu.edu/flite/packed/flite-1.2/flite-1.2-release.tar.bz2]
-md5=24c1576f5b3eb23ecedf4bebde96710f
-sha256=10ff42ce08a628c7fd84d26b5228d549e9eecb1eb03cb158e87d8be66bc58ae2
-
-[http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/flite-1.3-release.tar.gz]
-md5=ae0aca1cb7b4801f4372f3a75a9e52b5
-sha256=922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b
-
-[ftp://ftp.microwindows.org/pub/microwindows/flnx/flnx-0.17.tar.gz]
-md5=d44da0fc0fd495f580b9174d3beb6f7e
-sha256=84fa995c461066ed39c587c834414ef1a320f605b6b6e1db2d10d12fa6a587db
-
-[ftp://ftp.microwindows.org/pub/microwindows/flnx/flnx-0.18-tar.gz]
-md5=2dfdb9b44a1a08a675985bb92d1439e6
-sha256=4a0d868889d5221cc6e4b96f6e8de19bd4fc770fa8e05012c6c169686088088b
-
-[ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2]
-md5=a1765594bc427ff892e36089fe1fa672
-sha256=37ada22bf2586b8dd30d84209b8b58bdcb864627e5d02ae3f2c323a29261b19a
-
-[ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-1.1.4-device.tar.gz]
-md5=826c6afa88c9c4da734fe7393ed59639
-sha256=a0e31ad5088414aaee003586a23127a5ace7717ba4f8fb4e02cf56bb9a5c30f4
-
-[ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.7/fltk-1.1.7-source.tar.bz2]
-md5=2e29319119adc9d63b2f26b72cae0a88
-sha256=855a97e35da823f205253b865758715872cd2c7720e4dcf134a3b6dc18bfb96a
-
-[ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.9/fltk-1.1.9-source.tar.bz2]
-md5=e146fd264e1001b1313acfd41ef75552
-sha256=facba5a97a20ca92b32504174474775c6b12fb67a6f646fa0de18db709c3edde
-
-[http://ftp.easysw.com/pub/fltk/snapshots/fltk-2.0.x-r6671.tar.bz2]
-md5=6bcef5fd51eb3bc4dd0702f3ae6da6ba
-sha256=4c9a67f0d32c05af92bf95d5feec8eb4a8d56bfbfe2cd4364b32009cfd609b54
-
-[http://members.cheese.at/woody/fltk-chess/fltk-chess-0.5.tgz]
-md5=ee34788a2dc9fdc088a6dc66c31eba34
-sha256=c789b355d0ba03b018513c3904bba6d6fab01b3a83a460fbe1b20a79052f46a4
-
-[http://members.cheese.at/woody/zaurus/src/fltk-chess-0.51.tgz]
-md5=df1f73bdf32f30923d9a2a5717a70913
-sha256=3fffcaf0653c13b249931f76b12119dce8a5b01df056e4b5444f150fec1d5311
-
-[http://savannah.nongnu.org/download/fluid/fluidsynth-1.0.8.tar.gz]
-md5=e2abfd2e69fd8b28d965df968d7d44ee
-sha256=45e7c9967d0fb0344f4da539ab343fb979384b36a429a8594c94cf466dff4320
-
-[http://www.flumotion.net/src/flumotion/flumotion-0.4.1.tar.bz2]
-md5=85563f1167a3265cf61c8886c318dda7
-sha256=a24640d8ca9c485d7611880193f18e5ae62af07e3b9464904f3602277f1d4097
-
-[http://www.flumotion.net/src/flumotion/flumotion-0.6.1.tar.bz2]
-md5=22a9047871c5aebc84fc7fe4f3e4613d
-sha256=fe348102ecb0a11faab0bfc6b4b48fb9d99c49e4565a9fb52db64bb7cd4ca78a
-
-[http://pypi.python.org/packages/source/f/flup/flup-1.0.1.tar.gz]
-md5=414181781fb0923f884a38503e8e56da
-sha256=270e2e423a0b8e90091fd6f38422c488b67a23494d671764b9ed2e17ca802e16
-
-[http://pypi.python.org/packages/source/f/flup/flup-1.0.2.tar.gz]
-md5=24dad7edc5ada31dddd49456ee8d5254
-sha256=4bad317a5fc1ce3d4fe5e9b6d846ec38a8023e16876785d4f88102f2c8097dd9
-
-[http://pypi.python.org/packages/source/f/flup/flup-1.0.tar.gz]
-md5=530801fe835fd9a680457e443eb95578
-sha256=dd943b9746997bb6e49820187998dd26a58b2d0f886a45c166209e6d7d35aa32
-
-[http://downloads.sourceforge.net/fluxbox/fluxbox-1.0.0.tar.gz]
-md5=1f389177e17cd1e8dbed07c80812961f
-sha256=98afcaae49cd3cb1ca5fa32b379d630ec88a75e64cb8472a1023db1d1c35c12a
-
-[http://downloads.sourceforge.net/fluxbox/fluxbox-1.0rc.tar.gz]
-md5=2575d0b605bcacc406c5b8f89fb0d3c5
-sha256=84cabad81bb78fc08ae3d8abae57840cf575a0ca6ca719c7d9bed19505d06ea3
-
-[http://heanet.dl.sourceforge.net/fluxbox/fluxbox-1.0rc.tar.gz]
-md5=2575d0b605bcacc406c5b8f89fb0d3c5
-sha256=84cabad81bb78fc08ae3d8abae57840cf575a0ca6ca719c7d9bed19505d06ea3
-
-[http://downloads.sourceforge.net/fluxbox/fluxbox-1.1.1.tar.gz]
-md5=e0be927617be4ffc1ddc79513f4eb0f9
-sha256=7306ee55a8e95a4d07bee339ffb3be2d88ef8cc08b86edd6c63d7b28f559ec88
-
-[http://mirrors.igsobe.com/nongnu/flvstreamer/source/flvstreamer-2.1a.tar.gz]
-md5=7b1d1a3ab3cd0d93edd69e7b50ce6aca
-sha256=5df6649dfcfd6c4d7259a99b6cb2f031491fc88ca9b2751632e4e78105f58df5
-
-[http://www.stanford.edu/~blp/fmtools/fmtools-1.0.2.tar.gz]
-md5=4bae0e5feeb8cbf4cfcb950301e9509d
-sha256=60a55ba4a57b5ed430c62662283e9cb6de685c8497173f1f2065f684b2aceabd
-
-[http://xorg.freedesktop.org/releases/individual/font/font-adobe-100dpi-1.0.0.tar.bz2]
-md5=443acfe70e26716282f9068730fe92c4
-sha256=f16c1b3a1625c9a225aff2ac12067bd3907d157b0c60625689a5080f092e9a19
-
-[http://xorg.freedesktop.org/releases/individual/font/font-adobe-100dpi-1.0.1.tar.bz2]
-md5=c754c3f4a5e08442bf6972b9466625ed
-sha256=a742bca8d6f8fb76b511f11c2ad2a1d326687fe9f0490a9cf64524c3782cb52c
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-adobe-100dpi-X11R7.0-1.0.0.tar.bz2]
-md5=f5de34fa63976de9263f032453348f6c
-sha256=88a76f7d261b5a4466ab28f2985a8af838a03ae03ee83ce3a441ca8332742cc3
-
-[http://xorg.freedesktop.org/releases/individual/font/font-adobe-75dpi-1.0.0.tar.bz2]
-md5=813b5d3723c84388a938ab6732e1329c
-sha256=d62745bee0f5e4f355f237020667d783ae9fea5f18a864d748ae1287bd176339
-
-[http://xorg.freedesktop.org/releases/individual/font/font-adobe-75dpi-1.0.1.tar.bz2]
-md5=a47681c97bd012196691c95e34d400f1
-sha256=4de51765d26b70728a8b6573be89d731be0384466290dbbb216cb05becdf9f71
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-adobe-75dpi-X11R7.0-1.0.0.tar.bz2]
-md5=361fc4c9da3c34c5105df4f4688029d0
-sha256=f1c7377f6b3b1d91ef384b81f44853e9dc23ff62c11f9f30291e34e9cf6c9d87
-
-[http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2]
-md5=5d28a30efef966f8dbbaff9a6619f01a
-sha256=1943e1aa70c169b13bc7a308c8e949267f9ce6327479803203fbf10c06a9b5fe
-
-[http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-100dpi-1.0.2.tar.bz2]
-md5=1c3a2c26bd3f6e406fbadc7380efa369
-sha256=dd8c3f5509589f9232b26273fecde2694bd2bb069c6aaa8f504ad3d24775955e
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-adobe-utopia-100dpi-X11R7.0-1.0.1.tar.bz2]
-md5=b720eed8eba0e4c5bcb9fdf6c2003355
-sha256=b962d55a91510e70c108b0c34ee928f8016391b40a8bc26d6df85d59c1283af5
-
-[http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2]
-md5=dd912284e4750023f9682812532fa033
-sha256=ebd4e2194bbc727e3bbda0f5dc1493fe3a211c7cf77e3d41f93135dd04ca7089
-
-[http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.2.tar.bz2]
-md5=71dffebeeb702d10876555c361fb69cf
-sha256=3b3ca4ba5b5b73e13b3662b5be16ea92a244adb3303a3625437ff7d385ba6557
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-adobe-utopia-75dpi-X11R7.0-1.0.1.tar.bz2]
-md5=a6d5d355b92a7e640698c934b0b79b53
-sha256=168b326dbad59381d0e0a9544d26f1fb8bd23d3b5478fcc426f7ce470ee8a2f7
-
-[http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-type1-1.0.1.tar.bz2]
-md5=aa7ff4bd20b961afda9c15d103b972a5
-sha256=e9c672c8ff275fd5c2d76dda9a9f11138766e246e31e45763cd7e14d8824c0dc
-
-[http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-type1-1.0.2.tar.bz2]
-md5=ad945b19b2db64dec3a19507848ff63b
-sha256=8c5f2752e44af6219c1b4cfc178f9721f6dd573039e973f61029136c2756e233
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2]
-md5=db1cc2f707cffd08a461f093b55ced5e
-sha256=0ba76231d9af3422376d9c1652ab3f8614bdd52acc2e2a839d911e1a54b5d5b6
-
-[http://xorg.freedesktop.org/releases/individual/font/font-alias-1.0.1.tar.bz2]
-md5=c4776b6f0f2ecdb7670b6fe64b5d2a2d
-sha256=77db60d63224b9d856129d23c0b0d0e9154a166137daf749d39abfd56a4f89b6
-
-[http://xorg.freedesktop.org/releases/individual/font/font-alias-1.0.2.tar.bz2]
-md5=9d40dba6fb8cb58dacb433fc7bcaafca
-sha256=438bd6f3f9305edb6ea9905dc92c135d6067bbd7e01df913cb3ef27162b38270
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-alias-X11R7.0-1.0.1.tar.bz2]
-md5=de7035b15ba7edc36f8685ab3c17a9cf
-sha256=9c929ad5631e078d97835e5b631532edc8e3690d5068e59393d4aa04288022f4
-
-[http://xorg.freedesktop.org/releases/individual/font/font-arabic-misc-1.0.0.tar.bz2]
-md5=81595016e2ff859716fc256ebb136ba6
-sha256=90e9dfa3f33805ea2ffe06faa7258d8335cdf415826f963a1d0a76bd8df7bc94
-
-[http://xorg.freedesktop.org/releases/individual/font/font-arabic-misc-1.0.1.tar.bz2]
-md5=817ceb99636c873ad7679fe2a468678d
-sha256=f4b0305afd47844d337a87d03aab4359b576dc36464317f86541324ee6ea6f60
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-arabic-misc-X11R7.0-1.0.0.tar.bz2]
-md5=b95dc750ddc7d511e1f570034d9e1b27
-sha256=264119a6bda478c5cb226161d660fdc1c24c957b124c1e1cc8e693a06607c6a0
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-100dpi-1.0.0.tar.bz2]
-md5=e5592de74a5c04e3a2608800dd079197
-sha256=ae8a11777579a2242f52ed19b5fdd6c6ef6fe2c2661a49d0599188de78cfee4a
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-100dpi-1.0.1.tar.bz2]
-md5=8af580b87e17ddacdf0ce3d775248387
-sha256=c46d68487b09993266f34ac87a47e035af8a3f42c38f33d26ff18ac0c31c3397
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bh-100dpi-X11R7.0-1.0.0.tar.bz2]
-md5=29eeed0ad42653f27b929119581deb3e
-sha256=8f74dea65f4d39236f29cdf29ffbfe948d1e8a99963ceb9b1b87b081765dba55
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-75dpi-1.0.0.tar.bz2]
-md5=6e51cd02f4ce32e1393e34ab17a9b211
-sha256=c79467b440cc9389c75d55fba64d0126d0f2e1e6c019dfafb7d89d07802c05bf
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-75dpi-1.0.1.tar.bz2]
-md5=53785d2688392aec5cba79fc0ddb23a2
-sha256=8a3175a977f169f0882054ac5bf86c97bfee1dc031415092f75b2cfb57b69d40
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bh-75dpi-X11R7.0-1.0.0.tar.bz2]
-md5=7546c97560eb325400365adbc426308b
-sha256=73ce25f055e0e5b1dc1fa41e7cf7ef3c2903715db9b3a240c1a9c391c1e298ba
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2]
-md5=c44d3f730564da465993e9292a33c235
-sha256=36d47dcba591037b6af35fc151e3d7a6c9f16f42b3182e083ea140cb584d7013
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2]
-md5=a2b3951dbc6ddb2e4c7e09519dd13333
-sha256=8156f7c4e5a3fbd478c287154c7e3c55c6631c148a7b185f604753d118018da9
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0.tar.bz2]
-md5=8a56f4cbea74f4dbbf9bdac95686dca8
-sha256=9359a40738e7199d3b77ad0e55e02d0e27a6101aede4bc2a50e3c80d2c02cf03
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2]
-md5=fdd9be5b9db94ef363a33e39b7977e2b
-sha256=50f2f36f533a49c65842568052fe4d065354ff6f39ab36dd2129f465741da046
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2]
-md5=6397062f2b346ce5bbe5472f3353a9a9
-sha256=20ff9c5914c6916c96647eeb3ba700468952fdf01925e62516219a7dd6eb3841
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bh-lucidatypewriter-75dpi-X11R7.0-1.0.0.tar.bz2]
-md5=e5cccf93f4f1f793cd32adfa81cc1b40
-sha256=8d55580d9cf032127bd17b8d4a6bdcdb09392e76fe8ec075ce7472bc3de8e5d6
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-ttf-1.0.0.tar.bz2]
-md5=ad43cf739b3d46ba1e7dc778a0608a52
-sha256=7a1a5e72f7e42398b98d70aa64252837e85ed76eea77a1b9a4cd0f1203d7d644
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-ttf-1.0.1.tar.bz2]
-md5=664df71cb510b744b4a10e778445c37b
-sha256=1ce72f84a6c4df7f0e949f915346026ebfeaa5b2e47f7bbc29117ebbf3a7a7c8
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bh-ttf-X11R7.0-1.0.0.tar.bz2]
-md5=53b984889aec3c0c2eb07f8aaa49dba9
-sha256=a268245101a49b1e4c2785a9d809d43fe8564b8243dcf7898a37f25abf4d9edf
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-type1-1.0.0.tar.bz2]
-md5=46588b22678e440741d6220bc3945cbf
-sha256=5a8a5513f2c829d56043a0f74980efc11b4b4522f21116f16711998f72c3645b
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bh-type1-1.0.1.tar.bz2]
-md5=374d954c61363206c93d1ce7e9445c31
-sha256=da3b5f26c6cde0baf3831f50c79a7a107806f885e0205073855bfbc5a357bb45
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bh-type1-X11R7.0-1.0.0.tar.bz2]
-md5=302111513d1e94303c0ec0139d5ae681
-sha256=f7cede14e92d83d6c3d36eeb9d3d66fdd60372c39e8571cb9ae40a7d8c5182d5
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-100dpi-1.0.0.tar.bz2]
-md5=173352ddec3d26e2b91df1edcf1ae85b
-sha256=0c705a74d7b52e41a1f1aa6732f0200877ba2d4303b79513a524e7cc1b30e2d2
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-100dpi-1.0.1.tar.bz2]
-md5=3b8748f8029c53595e4a4a1b23fa790a
-sha256=3e05c9b74d0dc00e6e46ec758888e66514ab24fc75930877d4ba6db7d49f0347
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bitstream-100dpi-X11R7.0-1.0.0.tar.bz2]
-md5=dc595e77074de890974726769f25e123
-sha256=3e9b85774a062d8a9c997d57d45164179e403061f0bb3765e593b6a465c523e6
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-75dpi-1.0.0.tar.bz2]
-md5=beb476657d50d07d17eef7c325a5ed08
-sha256=2ddfeaccca97524e1b0f4fb37b2fd0f1338698e35f8b05b22b594fe29e201bfb
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-75dpi-1.0.1.tar.bz2]
-md5=aed54fb53d2d24aff10c92985286d1e5
-sha256=cf9e1cb1c21517a566e5678791778d40c7c915d792bd29d319928f4e4234662b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bitstream-75dpi-X11R7.0-1.0.0.tar.bz2]
-md5=408515646743d14e1e2e240da4fffdc2
-sha256=71b1b6416e0018ad954225f53c0c9f2eaf8d663e1084657f3cb9b930073b7f6b
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-speedo-1.0.0.tar.bz2]
-md5=1399dc18aeb9571b0951d9570ea1059d
-sha256=99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-speedo-1.0.1.tar.bz2]
-md5=5b1856a24b1b46414950febc63880307
-sha256=3d231566856c754f48f568f41c15376730d45d9c3ffd37e1d2476097519f22b8
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bitstream-speedo-X11R7.0-1.0.0.tar.bz2]
-md5=068c78ce48e5e6c4f25e0bba839a6b7a
-sha256=f44bc571753fd04c09eac7b266d1e0256db9efd0d40ab834920b9dfbb4297d52
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-type1-1.0.0.tar.bz2]
-md5=6610475e2e231242f8f2122a709c3695
-sha256=4fce492dcf168837342ea1787ac35b53e4d30361239cba207c9520c42454d903
-
-[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-type1-1.0.1.tar.bz2]
-md5=a4e8e229a051c0ede9eb525e4006d93a
-sha256=51027cc1d49140153620c1a2b653f1773fe92cb694b221396d68265343e113ab
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bitstream-type1-X11R7.0-1.0.0.tar.bz2]
-md5=f4881a7e28eaeb7580d5eaf0f09239da
-sha256=f6f09d398a89595bec5825043d36056c0a080aa2d47ae3e52c01a7258119fd6d
-
-[http://xorg.freedesktop.org/releases/individual/font/font-cronyx-cyrillic-1.0.0.tar.bz2]
-md5=22b451e7230b8c003cfc496ee2d360cc
-sha256=06c94e7033f5cae77b9ba27b84af7c1d3e7f73a7239346aabf98eda6c7f484ee
-
-[http://xorg.freedesktop.org/releases/individual/font/font-cronyx-cyrillic-1.0.1.tar.bz2]
-md5=15f86f5e572df21218617982eb4b3bfc
-sha256=f7b43a428afe3111513e8ff0ebccc00fbddf2b57cec261ad9017d582fc9a3422
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-cronyx-cyrillic-X11R7.0-1.0.0.tar.bz2]
-md5=447163fff74b57968fc5139d8b2ad988
-sha256=28593d204b638c430d3ba1ecd3c87d1416d72d8dd1874a44588371970dc44b34
-
-[http://xorg.freedesktop.org/releases/individual/font/font-cursor-misc-1.0.0.tar.bz2]
-md5=305fa22cdfefb8f80babd711051a534b
-sha256=955de27117581ba501d7c2abae7f38b0a65662e4ab2e2b54b9eb2dc07aa5f3c5
-
-[http://xorg.freedesktop.org/releases/individual/font/font-cursor-misc-1.0.1.tar.bz2]
-md5=13c21c4d74155c662152a1a74f249d96
-sha256=deee02861beaa335448e9aba4320c88c30a174bc3dcfb05a434b4ddb137dc1b3
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-cursor-misc-X11R7.0-1.0.0.tar.bz2]
-md5=82e89de0e1b9c95f32b0fc12f5131d2c
-sha256=5a67c7201388653eda3efaaa62c2f8d4db4ce980a666436418c45575034c42b4
-
-[http://xorg.freedesktop.org/releases/individual/font/font-daewoo-misc-1.0.0.tar.bz2]
-md5=61f9eab48c619af5494d3e384d8d7d79
-sha256=f198eac92e343a38b1e23288880bac91c439bdc90c61a79a7cb0718e9a468926
-
-[http://xorg.freedesktop.org/releases/individual/font/font-daewoo-misc-1.0.1.tar.bz2]
-md5=05597e2b193a7b7de2ca525468276b1d
-sha256=e2283e4280c66fec7c986f0b4a476811f3419b9517280cd8b59a01563de6e491
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-daewoo-misc-X11R7.0-1.0.0.tar.bz2]
-md5=2fd7e6c8c21990ad906872efd02f3873
-sha256=c279ef1d730625a1cee74527529be25d0cbc91f7a8bb310ced871ce58cdc148d
-
-[http://xorg.freedesktop.org/releases/individual/font/font-dec-misc-1.0.0.tar.bz2]
-md5=284e554db1c64fb7580a06df01444a2b
-sha256=83386d1225dab1ebc58e7d197acc4c310ed4e29840abf291b1fa2ffac1b68bb9
-
-[http://xorg.freedesktop.org/releases/individual/font/font-dec-misc-1.0.1.tar.bz2]
-md5=05714516824c680ce747c6ef9d2fbbdd
-sha256=fb20da4afddc07e236e830939de0fdfc9a93c5c1c7048fafe669fac19b496552
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-dec-misc-X11R7.0-1.0.0.tar.bz2]
-md5=7ff9aba4c65aa226bda7528294c7998c
-sha256=e7ee982884f0c1fca409b6b9a946493afb23c9e61d33ac84ec29819717a66b75
-
-[http://xorg.freedesktop.org/releases/individual/font/font-ibm-type1-1.0.0.tar.bz2]
-md5=8e8733051371e2b51123376b49f5d3ea
-sha256=30d091c2e3506943f8a6e152c4be973c462ba19293a864bbb48b82c6cf9c461e
-
-[http://xorg.freedesktop.org/releases/individual/font/font-ibm-type1-1.0.1.tar.bz2]
-md5=1646179ff224b3e2c9b1e7f59042897f
-sha256=887ea895cc0fdd5c50d4960aee7cb6ed813cf90f53b53ce0e0e068dd606cc919
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-ibm-type1-X11R7.0-1.0.0.tar.bz2]
-md5=fab2c49cb0f9fcee0bc0ac77e510d4e5
-sha256=534210f571a2166f3b6d4d8e1c37f74574c0130a4a1ed4c7d37b50a98fc95cfc
-
-[http://xorg.freedesktop.org/releases/individual/font/font-isas-misc-1.0.0.tar.bz2]
-md5=ec709a96b64b497a5cb5658c93bd38dc
-sha256=97e61313ce0bf229da5d489fc5a05562fdca14f9acc17c40d0b272a345ba4ea2
-
-[http://xorg.freedesktop.org/releases/individual/font/font-isas-misc-1.0.1.tar.bz2]
-md5=88b5b32c5a27576e9d00675bcc966806
-sha256=52fe0469eb91e94dc7a0e8164e947fee439f398b0eb63c210f682524f12cea7b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-isas-misc-X11R7.0-1.0.0.tar.bz2]
-md5=c0981507c9276c22956c7bfe932223d9
-sha256=c845cfe0b4bc02ac2da322f4dbf6dab1ccfd204e926c40634b91c260316f55f7
-
-[http://xorg.freedesktop.org/releases/individual/font/font-jis-misc-1.0.0.tar.bz2]
-md5=61febb49a71065723a1fba17cbf23c67
-sha256=3721eefd4ffc47c6948065f7acf9d5c731c4e8e54105d096735876d3712dc7ba
-
-[http://xorg.freedesktop.org/releases/individual/font/font-jis-misc-1.0.1.tar.bz2]
-md5=5835c99d056f4a29d7d6a5ae873cf00e
-sha256=a63b98c204395b61949214db199c38094489336731d4a4179eb053a5bb54e8cf
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-jis-misc-X11R7.0-1.0.0.tar.bz2]
-md5=3732ca6c34d03e44c73f0c103512ef26
-sha256=7f4c3ce6ddfa52232d00e09b0bc20316b2ab9edd8007c57c8f08a742dd78b546
-
-[http://xorg.freedesktop.org/releases/individual/font/font-micro-misc-1.0.0.tar.bz2]
-md5=8c8bffd7540f05caa0dbb4e6e1d6c58e
-sha256=16b17b5939e12e9381c8096c1f77f064ee0073fa9cb09297dec278bade17a572
-
-[http://xorg.freedesktop.org/releases/individual/font/font-micro-misc-1.0.1.tar.bz2]
-md5=6350117efebe340f33e818f4a33e4e4b
-sha256=a5b987ea38bf53f63968a6cad1c052ca6d0fc678d9409c1953701f0159e4972b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-micro-misc-X11R7.0-1.0.0.tar.bz2]
-md5=eb0050d73145c5b9fb6b9035305edeb6
-sha256=23b9c222618a1ea090b3a2b688f4c958b8469ed5f30a5c3e3d54bb02b235b222
-
-[http://xorg.freedesktop.org/releases/individual/font/font-misc-cyrillic-1.0.0.tar.bz2]
-md5=3596907d7a2a99c81d8de99bc4552b6a
-sha256=7c0bac1302129d3bf40ec7d9830e728b0251dc20dda8c8979227b478663290ff
-
-[http://xorg.freedesktop.org/releases/individual/font/font-misc-cyrillic-1.0.1.tar.bz2]
-md5=c79d7921d95b2c4f10fad464bb121090
-sha256=dafafbfd93d95820449972fd86ec312266eb73e5297966ee6e0163d294d8af75
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-misc-cyrillic-X11R7.0-1.0.0.tar.bz2]
-md5=58d31311e8e51efbe16517adaf1a239d
-sha256=e332497fe6220c019c411912653a96d26c8706c03456ac8ff3ff5ef38b1cc77c
-
-[http://xorg.freedesktop.org/releases/individual/font/font-misc-ethiopic-1.0.0.tar.bz2]
-md5=0b271fc617087d77560bdca20c0cdbb0
-sha256=58d2868801ca063797fa88fb4aea59f7c550473be4e9a4f96d84fe39b967d141
-
-[http://xorg.freedesktop.org/releases/individual/font/font-misc-ethiopic-1.0.1.tar.bz2]
-md5=4c88c79b8e5d47af90b21e948d42755f
-sha256=bf3b3a994b6c4047b2d79f590e7113ed429b8b7a83992cb753a83e6e8bd3d948
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-misc-ethiopic-X11R7.0-1.0.0.tar.bz2]
-md5=190738980705826a27fbf4685650d3b9
-sha256=04025084b8f4e7559e34938cab9a70b28cad8174ef5f5f6103abd633b54048d9
-
-[http://xorg.freedesktop.org/releases/individual/font/font-misc-meltho-1.0.0.tar.bz2]
-md5=ccb212a7badf7aefdc9f9a92af428d32
-sha256=c7e12b9926b6053f3567eae548840f0b3d283ce34f842b06309a81c1d98d3924
-
-[http://xorg.freedesktop.org/releases/individual/font/font-misc-meltho-1.0.1.tar.bz2]
-md5=345f1a78312e30cd2c41d24ea3f3276f
-sha256=5366d7a0f38a189e504676a9cddd8430113f9957919f0a3dc181bcaaaed92618
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-misc-meltho-X11R7.0-1.0.0.tar.bz2]
-md5=8812c57220bcd139b4ba6266eafbd712
-sha256=cacbf0c055b95db07e4e61716a549195f6ed054ba98d0b443879f57876ca253d
-
-[http://xorg.freedesktop.org/releases/individual/font/font-misc-misc-1.0.0.tar.bz2]
-md5=2a57f6188c41d4bc1b88ca3d08ad011d
-sha256=26a02560ad1f1648e7c36be6daf42910762131d3974422d1b306e6cae13f17db
-
-[http://xorg.freedesktop.org/releases/individual/font/font-misc-misc-1.1.0.tar.bz2]
-md5=878bfd4e9f14c1279cea3a8392e0dbdd
-sha256=50f7528ab94f319a11efcd555dd5a7120191a42cf892c87cd6bdea8b908d497b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-misc-misc-X11R7.0-1.0.0.tar.bz2]
-md5=4a5a7987183a9e1ea232c8391ae4c244
-sha256=bdc1b9407305a88bb687caa46443abddef6149d2e681597e12f1c48ec5bf3678
-
-[http://xorg.freedesktop.org/releases/individual/font/font-mutt-misc-1.0.0.tar.bz2]
-md5=648b409b7eb78ad1cd5f6d7fac3eef88
-sha256=f219183bd0f2b8ceca42a8a345c921f2a8ee19f4d86fef11c4ce8918d41aedff
-
-[http://xorg.freedesktop.org/releases/individual/font/font-mutt-misc-1.0.1.tar.bz2]
-md5=aab7ac62b960e77aa11d032bafe1d460
-sha256=77bf33cbf5d1849bef4e516698eb45b7d16263a84dcc2299fd61383501906e25
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-mutt-misc-X11R7.0-1.0.0.tar.bz2]
-md5=139b368edecf8185d16a33b4a7c09657
-sha256=386a8d522ffc427e00df8034a8ce834767643e104b0aac141cf1cbf3113dd1a4
-
-[http://xorg.freedesktop.org/releases/individual/font/font-schumacher-misc-1.0.0.tar.bz2]
-md5=f1c6063d2fadc57e696a0aab69afd6e0
-sha256=454e6cf885a4475569ce24ad3d4a82cb331d74e1a25f0747694a71098b56ef7a
-
-[http://xorg.freedesktop.org/releases/individual/font/font-schumacher-misc-1.1.0.tar.bz2]
-md5=86f4b7d8b11a2e6da70884c59b5866a3
-sha256=3003915fb53930fee5e6086ee7546ea0857ef0fc2311aaf84ed937b1b4de1b4d
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-schumacher-misc-X11R7.0-1.0.0.tar.bz2]
-md5=d51808138ef63b84363f7d82ed8bb681
-sha256=d5c6c9f293ffa4d2cdb312b463381271bb8ad763738396671fdea19456fb38df
-
-[http://xorg.freedesktop.org/releases/individual/font/font-screen-cyrillic-1.0.0.tar.bz2]
-md5=aea02d9dff03e0e1a3de85364367c0c6
-sha256=01de82644a9b765599ba8c36c6b689035a85b6590486842067f707f2cb0cf268
-
-[http://xorg.freedesktop.org/releases/individual/font/font-screen-cyrillic-1.0.2.tar.bz2]
-md5=c912a976b66073acd80c9d5c624f3aae
-sha256=c5dd881fb13ff16d358acb27f99f6c281415d3824beb342f3a02603f0efebe11
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-screen-cyrillic-X11R7.0-1.0.0.tar.bz2]
-md5=c08da585feb173e1b27c3fbf8f90ba45
-sha256=0c6da93cecc16e4ddc6897e90b941d72087bc82cfcbb26ef54e9a59d371c601d
-
-[http://xorg.freedesktop.org/releases/individual/font/font-sony-misc-1.0.0.tar.bz2]
-md5=0dfddd1a946e4497f009094c0ae1bdd5
-sha256=1ae93ae76020b57cb0054ba9f33b4d5aec71342c6596750c07303d5c53452e23
-
-[http://xorg.freedesktop.org/releases/individual/font/font-sony-misc-1.0.1.tar.bz2]
-md5=7b6f5117814599b86ed3470de6c62aa3
-sha256=da9526844c74ce395d3912d3d8f538cd57102d6bcd9f73fd0a5dccf53bfc56ca
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-sony-misc-X11R7.0-1.0.0.tar.bz2]
-md5=014725f97635da9e5e9b303ab796817e
-sha256=4ea7d0a314b6c7ec65c92f44a3dad39ac9535b1bb9f54768573f60b69902e5cd
-
-[http://xorg.freedesktop.org/releases/individual/font/font-sun-misc-1.0.0.tar.bz2]
-md5=e17d43a7c6c0d862cfba0908ff132ffa
-sha256=03c12d8f4d8e7f0178f501ea3ee0709ee3a1deda733afecd631807e6ba5729e5
-
-[http://xorg.freedesktop.org/releases/individual/font/font-sun-misc-1.0.1.tar.bz2]
-md5=5a185c5549a650bf062d343e128682ca
-sha256=411522f5ea8f951a7432ab946a92f524493e3a1a6e1ca3c48f09c46cb5ae9d09
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-sun-misc-X11R7.0-1.0.0.tar.bz2]
-md5=0259436c430034f24f3b239113c9630e
-sha256=80094cd7060a08bda61eef0e481800e8f94d4bbb08b8297dcf6aecea99a09a07
-
-[http://xorg.freedesktop.org/releases/individual/font/font-util-1.0.1.tar.bz2]
-md5=b81535f78fe05732931f02841e5ca37b
-sha256=048c23b17ea32ee3abb341f0b1105ad07517b2e78efe2e95a4a8218089600612
-
-[http://xorg.freedesktop.org/releases/individual/font/font-util-1.1.1.tar.bz2]
-md5=5c735ae6916b65186f3c876d76c27ce3
-sha256=a33f1e3b0d7c3fd7c3505ce68888fec3cf897353084187d96e1e821fe3c02f88
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-util-X11R7.0-1.0.0.tar.bz2]
-md5=73cc445cb20a658037ad3a7ac571f525
-sha256=02eefdacc36d5df3707b3e454f5842d06c9c2eb9591e4cae93ccd3d66c78368f
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-util-X11R7.0-1.0.0.tar.gz]
-md5=63bb524570a6bb55dd398445dc1a9cb3
-sha256=0f7eb7e9b8d5c97e6da80e8e54d65d2587ebd0a0c2b0401a89273274ac970b94
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/font/font-util-X11R7.1-1.0.1.tar.bz2]
-md5=69ba2181665e291ea09908a11136c21a
-sha256=ffa19c42c70589996077380a297fe73edb480d20767199459695eca5463448c5
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/font/font-util-X11R7.1-1.0.1.tar.gz]
-md5=a868cad6703290e40b46609ffb17946e
-sha256=6ec8f7024e93568062b5e824f6799d3efcef97c03f798a094a60599a32180718
-
-[http://xorg.freedesktop.org/releases/individual/font/font-winitzki-cyrillic-1.0.0.tar.bz2]
-md5=b99b02aff36a88ca3379715423c60303
-sha256=478a7f6881fce6a335b409e1326449af4162a147d268f1978b8dd81c834beee3
-
-[http://xorg.freedesktop.org/releases/individual/font/font-winitzki-cyrillic-1.0.1.tar.bz2]
-md5=92bf4ecb373faac545cef2dcbe40be35
-sha256=7c57c29f70db18e543a3eb8f785b6b5d1372b78eee27707dbb10359d8ddb1446
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-winitzki-cyrillic-X11R7.0-1.0.0.tar.bz2]
-md5=6dc447609609e4e2454ad7da29873501
-sha256=5b6997057658e6b9e46c350c76fbeb32e597a6bb61c1e86b24494f5327742d1d
-
-[http://xorg.freedesktop.org/releases/individual/font/font-xfree86-type1-1.0.0.tar.bz2]
-md5=e66f36a6d68203cc4cf7b56ebbb192dd
-sha256=ef76d3b91d1bdaa9ff73cc1e5905ad4bbdc028f06157d0d2319d38e7b7f84a4d
-
-[http://xorg.freedesktop.org/releases/individual/font/font-xfree86-type1-1.0.1.tar.bz2]
-md5=d7e965776c7f0c30b0f09742176fb77a
-sha256=8fd9f9b81120d8afc25ea8901a8a91d7428c45cd9cfe7a7bef2b15c8b8d5f341
-
-[http://xorg.freedesktop.org/releases/individual/font/font-xfree86-type1-1.0.2.tar.bz2]
-md5=a966f5a8aade9e63af86d8a6bf3e8586
-sha256=7a026aeaafe5a619b2c1b35cd361125b169b2212eaf0f2f5ce796038b1cf06cd
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-xfree86-type1-X11R7.0-1.0.0.tar.bz2]
-md5=27a6bbf5c8bbe998ff7e8537929ccbc8
-sha256=cda4fed7e7d462257f7282db3459fa94f94ab70934a401b7a90f5decb044f94f
-
-[http://xorg.freedesktop.org/releases/individual/proto/fontcacheproto-0.1.2.tar.bz2]
-md5=60df6b625074a9790e28543dcea71651
-sha256=48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9
-
-[http://xorg.freedesktop.org/releases/individual/proto/fontcacheproto-0.1.3.tar.bz2]
-md5=a8a50e5e995bfacb0359575faf7f6906
-sha256=1dcaa659d416272ff68e567d1910ccc1e369768f13b983cffcccd6c563dbe3cb
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/fontcacheproto-X11R7.0-0.1.2.tar.bz2]
-md5=116997d63cf6f65b75593ff5ae7afecb
-sha256=72a6200a586f27c55b837cc6e537f15499a2f07783a826521c9ad2eaf35a6461
-
-[http://fontconfig.org/release/fontconfig-2.2.95.tar.gz]
-md5=6e64304b91cfea887558154d465bb752
-sha256=9d1eb5813a7d3e7907da4e6a69c93f4689c49a2ed8320c35ce4570f63448f2d0
-
-[http://freedesktop.org/fontconfig/release/fontconfig-2.2.95.tar.gz]
-md5=6e64304b91cfea887558154d465bb752
-sha256=9d1eb5813a7d3e7907da4e6a69c93f4689c49a2ed8320c35ce4570f63448f2d0
-
-[http://fontconfig.org/release/fontconfig-2.3.91.tar.gz]
-md5=098a36ec53ec893f6511712ec4010d38
-sha256=a906c3193de44e5a8d93174bb86e91f39e415f92ad9319b318fd3a46a2ad9b35
-
-[http://fontconfig.org/release/fontconfig-2.3.95.tar.gz]
-md5=6860be35882f6d34636d52345efd5944
-sha256=3c0901c0df62e5588370cbab13cd847e056c6a4d36fb69faa303d8edd5b41c09
-
-[http://fontconfig.org/release/fontconfig-2.4.1.tar.gz]
-md5=108f9a03fa9ed9dd779cc7ca236da557
-sha256=13f59a7cd5190983412689495c399444cf73c1ced0813149e4480c8848bb9f17
-
-[http://fontconfig.org/release/fontconfig-2.4.2.tar.gz]
-md5=f035852f521b54677f2b5c9e2f6d54a4
-sha256=63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363
-
-[http://fontconfig.org/release/fontconfig-2.6.0.tar.gz]
-md5=ab54ec1d4ddd836313fdbc0cd5299d6d
-sha256=a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5
-
-[http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono.tar.gz]
-md5=890615fa4b3e6c82cd1b9807b106f042
-sha256=42c15ed555719c27f67990454cdda791cbcd26ab98712fd88ca7e20e6ce3f1fd
-
-[http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.0.2.tar.bz2]
-md5=c946f166107b016a21cc7a02e1132724
-sha256=83bd547131aa11a232717a0f06d3c6cd58a0b2f6d541660bbe9ebf43073a8b7b
-
-[http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.1.0.tar.bz2]
-md5=f3a857deadca3144fba041af1dbf7603
-sha256=5a9af61dc9142488c9ba6e4ae30a9d970ea0f889a1ab7f59de1c1898c83aeb35
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/fontsproto-X11R7.0-2.0.2.tar.bz2]
-md5=e2ca22df3a20177f060f04f15b8ce19b
-sha256=90a5d9ad2328e682a58c179a7df9eac1193db06423e832b107bd4e7802f660b4
-
-[http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.3.tar.bz2]
-md5=b0ebd86029571239b9d7b0c61191b591
-sha256=9d2b0149ea49a097ab6c563801c06af9975e98f9fa4c8af1a8ac3238e4fd5243
-
-[http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.4.tar.bz2]
-md5=07607b26fce3bdc2b204ff3bc43d3ac3
-sha256=3feaaab499b3f9c7e9b8bdc725dd40fde65b2fbb73794845d7f682746470f594
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/fonttosfnt-X11R7.0-1.0.1.tar.bz2]
-md5=89b65e010acaa3c5d370e1cc0ea9fce9
-sha256=77fb4d23dfa8c12d69ccfda71f482af9804132fab800610970cd5fe9944a3016
-
-[http://kent.dl.sourceforge.net/sourceforge/fordiac/forte-0.3.zip]
-md5=2d01a3d3b9b16bf646e6bb89cb9b0faf
-sha256=c3a61174f6a69252983a9b26ea87005bcab6a72b0bd34ea693e3de89e70eaea6
-
-[ftp://ftp.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1-2.diff.gz]
-md5=5f059f7c997adbc0a260f27947605be1
-sha256=d68c7c8ff6fe94341a3a73d22ab976da42921e3bec9bed628a428518c2c5f67a
-
-[ftp://ftp.nl.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1-2.diff.gz]
-md5=5f059f7c997adbc0a260f27947605be1
-sha256=d68c7c8ff6fe94341a3a73d22ab976da42921e3bec9bed628a428518c2c5f67a
-
-[ftp://ftp.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz]
-md5=f208805b3b712e32997d7667e0ec52d8
-sha256=fc51aee1f73c936c885f4e0f8b6b48f4f68103e3896eaddc6a45d2b71e14eace
-
-[ftp://ftp.nl.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz]
-md5=f208805b3b712e32997d7667e0ec52d8
-sha256=fc51aee1f73c936c885f4e0f8b6b48f4f68103e3896eaddc6a45d2b71e14eace
-
-[ftp://ftp.us.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz]
-md5=f208805b3b712e32997d7667e0ec52d8
-sha256=fc51aee1f73c936c885f4e0f8b6b48f4f68103e3896eaddc6a45d2b71e14eace
-
-[http://linuxtogo.org/~florian/themes/foxbox-0.1.tar.gz]
-md5=77bc0cc71d61af699e29f4b5c09b37bb
-sha256=bcf668c1123f4d73a4c503ff189446cf4b30d64466fea49628999cdce8661c67
-
-[http://ftp.iasi.roedu.net/mirrors/gentoo.org/distfiles/fpconst-0.6.0.tar.gz]
-md5=5eaf8e8d1978ca4bbead5b3f163b23a1
-sha256=b8e60157a14739da9382e23e296a0236b0c246b486b4803a1baaa4a73c5bf8d9
-
-[http://pypi.python.org/packages/source/f/fpconst/fpconst-0.7.2.tar.gz]
-md5=10ba9e04129af23108d24c22c3a698b1
-sha256=bd54e294c056c6d52b2037e91d7b2782d6805b24a74923dc80e1c9107acac707
-
-[http://www.fpdf.org/en/download/fpdf153.tgz]
-md5=6106c8d0aba37563b7ca9ccc94bc6c95
-sha256=44b7e18ba9ae5667dd64c89f7b04627bda5807a3a90255a125702d63c0c4ee17
-
-[http://fping.sourceforge.net/download/fping.tar.gz]
-md5=d5e8be59e307cef76bc479e1684df705
-sha256=9f3b3ed7c9fffccefefa9af432eee7244a65592118851f75b5897814cb79b86f
-
-[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/2_25_00_04/exports/framework_components_2_25_00_04.tar.gz]
-md5=11410b5cf4142ae415b683af0e9929b5
-sha256=161432f5cf184f96de290f807a4a6fddf11f2612d5b2efd91f8187c0ac612a40
-
-[http://downloads.sourceforge.net/free42/free42.tgz]
-md5=1fc21e04b3b77150846027dc7cb5210d
-sha256=9d348a9d2d5bf8eabc7e7bb6f0907e611403e4abe6dc1e11b1b2ad1118b3088a
-
-[http://heanet.dl.sourceforge.net/free42/free42.tgz]
-md5=82c67dd2bdef911d63703a785caef501
-sha256=e3c9c80ec3d1895507e374916077ab0fc68af7f9cd145003b251f23ac82b1ac5
-
-[ftp://ftp.freeciv.org/freeciv/stable/freeciv-1.14.1.tar.bz2]
-md5=d328f65e7fca5252f27161f5f9e97a03
-sha256=8a963570e5c4ea432b0e31d77d3605705bda91a9f97ff377c5c3204ca768e342
-
-[http://downloads.sourceforge.net/freeciv/freeciv-2.0.8.tar.gz]
-md5=7d597d59236cc0cc1cfaa0cbbda24bd4
-sha256=784b6eb132d37c51f7d9cd50a92138f4520146715f64b8fd64c410b5997f77de
-
-[http://heanet.dl.sourceforge.net/freeciv/freeciv-2.0.8.tar.gz]
-md5=7d597d59236cc0cc1cfaa0cbbda24bd4
-sha256=784b6eb132d37c51f7d9cd50a92138f4520146715f64b8fd64c410b5997f77de
-
-[http://ovh.dl.sourceforge.net/sourceforge/freedoom/freedoom-iwad-0.3.zip]
-md5=9a26ec9743e45915e296e3e3ba9fe489
-sha256=cd563cdceae558e2b9f9a2239b9d7d48a9776125c9d5f5f5be3076d574747aee
-
-[http://downloads.sourceforge.net/freedoom/freedoom-iwad-0.6.2.zip]
-md5=832dfd51ac653f7c64fa44dc4badb6bb
-sha256=70ee4b5502c65c77a59ac40b3a86a4904d2f78c2edf058503d1c35ae6a75dcd6
-
-[http://heanet.dl.sourceforge.net/freedoom/freedoom-iwad-0.6.2.zip]
-md5=832dfd51ac653f7c64fa44dc4badb6bb
-sha256=70ee4b5502c65c77a59ac40b3a86a4904d2f78c2edf058503d1c35ae6a75dcd6
-
-[http://downloads.sourceforge.net/freedroid/freedroid-1.0.2.tar.gz]
-md5=585a65f61c2cd308ab45d5c514f695dc
-sha256=0934bd29fb2ad0367ea3bdfdce47537179f9af6aa960cbcc897c40da2e1a0ee3
-
-[http://heanet.dl.sourceforge.net/freedroid/freedroid-1.0.2.tar.gz]
-md5=585a65f61c2cd308ab45d5c514f695dc
-sha256=0934bd29fb2ad0367ea3bdfdce47537179f9af6aa960cbcc897c40da2e1a0ee3
-
-[http://ftp.gnu.org/gnu/freefont/freefont-ttf-20090104.tar.gz]
-md5=1128bb17763cde6990eacd5996f7def7
-sha256=2b8e7164b0c362d5c5e90275b25772514d76d5fda3d54c026445611e467d638e
-
-[http://dfn.dl.sourceforge.net/sourceforge/freeglut/freeglut-2.4.0.tar.gz]
-md5=6d16873bd876fbf4980a927cfbc496a1
-sha256=269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052
-
-[http://download.berlios.de/freenx/freenx-client-0.9.tar.bz2]
-md5=777b3cda7a245e3870d4870a9460cb73
-sha256=dfc6c8dd89c26171411d8f7fa92613004eb8947ff509459151fdb03de7fe9608
-
-[http://downloads.sourceforge.net/freetype/freetype-2.1.10.tar.bz2]
-md5=a4012e7d1f6400df44a16743b11b8423
-sha256=fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
-
-[http://heanet.dl.sourceforge.net/freetype/freetype-2.1.10.tar.bz2]
-md5=a4012e7d1f6400df44a16743b11b8423
-sha256=fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
-
-[http://downloads.sourceforge.net/freetype/freetype-2.1.8.tar.bz2]
-md5=f717615787a1aadbdb164d1bc23c2308
-sha256=9466fa75380ddcbea4e99a6b47474acd85d7abe46fa08f9316778f5c9419006b
-
-[http://heanet.dl.sourceforge.net/freetype/freetype-2.1.8.tar.bz2]
-md5=f717615787a1aadbdb164d1bc23c2308
-sha256=9466fa75380ddcbea4e99a6b47474acd85d7abe46fa08f9316778f5c9419006b
-
-[http://downloads.sourceforge.net/freetype/freetype-2.2.1.tar.bz2]
-md5=5b2f827082c544392a7701f7423f0781
-sha256=0e8eb40392752b306d3a3de21f9fa479d53c17bd774b8051771cb258e162e006
-
-[http://heanet.dl.sourceforge.net/freetype/freetype-2.2.1.tar.bz2]
-md5=5b2f827082c544392a7701f7423f0781
-sha256=0e8eb40392752b306d3a3de21f9fa479d53c17bd774b8051771cb258e162e006
-
-[http://downloads.sourceforge.net/freetype/freetype-2.3.0.tar.bz2]
-md5=5b331456e0357e90d57cab5943dbe560
-sha256=1b1bb146b8d2fd04ea03106da5f8abfd83e44c04a060fd7a38d06d6a224390bd
-
-[http://heanet.dl.sourceforge.net/freetype/freetype-2.3.0.tar.bz2]
-md5=5b331456e0357e90d57cab5943dbe560
-sha256=1b1bb146b8d2fd04ea03106da5f8abfd83e44c04a060fd7a38d06d6a224390bd
-
-[http://downloads.sourceforge.net/freetype/freetype-2.3.1.tar.bz2]
-md5=11e1186ca5520c5a284fa0a03f652035
-sha256=be38eecd22880089223dc7e49ac79ce4fdfd1cb7ea09b3a4ef9bd1966f0d6155
-
-[http://heanet.dl.sourceforge.net/freetype/freetype-2.3.1.tar.bz2]
-md5=11e1186ca5520c5a284fa0a03f652035
-sha256=be38eecd22880089223dc7e49ac79ce4fdfd1cb7ea09b3a4ef9bd1966f0d6155
-
-[http://downloads.sourceforge.net/freetype/freetype-2.3.3.tar.bz2]
-md5=c0367b4059f672789b7a41e65f7a4b4a
-sha256=6ce667f4beafed9fb15895ac5dbe81504febfd8e32cf94d85dfa31c21eee2f7b
-
-[http://downloads.sourceforge.net/freetype/freetype-2.3.4.tar.bz2]
-md5=1a6c59a7723d637c78672e7784da865d
-sha256=7157876cf358d1fb68b890c7da4f7025288a4e7b756af7b01009c5055637c954
-
-[http://heanet.dl.sourceforge.net/freetype/freetype-2.3.4.tar.bz2]
-md5=1a6c59a7723d637c78672e7784da865d
-sha256=7157876cf358d1fb68b890c7da4f7025288a4e7b756af7b01009c5055637c954
-
-[http://downloads.sourceforge.net/freetype/freetype-2.3.5.tar.bz2]
-md5=65234327c5ac46ee00ebda15995d4c1c
-sha256=1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e
-
-[http://heanet.dl.sourceforge.net/freetype/freetype-2.3.5.tar.bz2]
-md5=65234327c5ac46ee00ebda15995d4c1c
-sha256=1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e
-
-[http://downloads.sourceforge.net/freetype/freetype-2.3.6.tar.bz2]
-md5=fb182d508017cb608e9df8c7dca648dc
-sha256=d5a698c30376d14c1ce6540ed6d5627796421e6e97576620ea4562411a110e77
-
-[http://heanet.dl.sourceforge.net/freetype/freetype-2.3.6.tar.bz2]
-md5=fb182d508017cb608e9df8c7dca648dc
-sha256=d5a698c30376d14c1ce6540ed6d5627796421e6e97576620ea4562411a110e77
-
-[http://qa.debian.org/watch/sf.php/freetype/freetype-2.3.6.tar.bz2]
-md5=fb182d508017cb608e9df8c7dca648dc
-sha256=d5a698c30376d14c1ce6540ed6d5627796421e6e97576620ea4562411a110e77
-
-[http://downloads.sourceforge.net/freetype/freetype-2.3.9.tar.bz2]
-md5=d76233108aca9c9606cdbd341562ad9a
-sha256=51a033bce9904d73e0821e8e2bba24bd319619d7d1b2e9eeccac611580242ab6
-
-[http://downloads.sourceforge.net/fribidi/fribidi-0.10.4.tar.bz2]
-md5=0f6e7ecca08e6e108dc06337f5b5cabf
-sha256=f3ecdb9d108bd61ec9394df75f5fd68ba886a8da0863ba6258338893aec6c04f
-
-[http://heanet.dl.sourceforge.net/fribidi/fribidi-0.10.4.tar.bz2]
-md5=0f6e7ecca08e6e108dc06337f5b5cabf
-sha256=f3ecdb9d108bd61ec9394df75f5fd68ba886a8da0863ba6258338893aec6c04f
-
-[http://fribidi.org/download/fribidi-0.19.2.tar.gz]
-md5=626db17d2d99b43615ad9d12500f568a
-sha256=49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177
-
-[http://www.tads.org/frobtads/frobtads-0.8.tar.gz]
-md5=c31b44a7bea51f04958358e575bde731
-sha256=1aa4fe2f4a8d79f7f4542d96f0b179886c04cbdfd6a972a19ab80437e6150549
-
-[http://www.cs.unc.edu/~scheuerm/froot/froot-0.7.1.tar.gz]
-md5=ac310580a6a54b692b977e11a0e80242
-sha256=210a55754c4ff0fa4143c22334a22bb2768f0c8ded2f6efa60144ea1b0abed6a
-
-[http://www.cs.csubak.edu/~dgriffi/proj/frotz/files/frotz-2.42.tar.gz]
-md5=a1cf81b39f749ea96e4585238ffc1b3f
-sha256=cbdd2b2911aaf57a3efa6e12d4b45036b80efbb3ede30e88118fc528d90a4768
-
-[http://www.cs.csubak.edu/~dgriffi/proj/frotz/files/frotz-2.43.tar.gz]
-md5=efe51879e012b92bb8d5f4a82e982677
-sha256=f831eae9182e4a1407a34cb1098a4f5ad5ad6c6632e34eed734b9601a06a764b
-
-[http://zarb.org/~gc/fb//frozen-bubble-1.0.0.tar.bz2]
-md5=2be5ead2aee72adc3fb643630a774b59
-sha256=fe7e46e529c7c3c969946c41efb519462f98dd5c280e247bd98ff629dcca1433
-
-[http://www.frozen-bubble.org/data/frozen-bubble-2.2.0.tar.bz2]
-md5=f7987201470d6755ed309762d348e0dd
-sha256=dada92322ef3adb75df7a4270b2e76c572c3f8e42006ed3a5aaeefa68fcaa5b7
-
-[http://heim.ifi.uio.no/~jorgenam/h5400/fsi-client-20040803.tar.gz]
-md5=99adcf3275943c109d27a781addf7d63
-sha256=b0474b223a130e9412bb88f464138f40921e84f63b6024bf2ce5b32bd78d4bd8
-
-[http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.1.tar.bz2]
-md5=c7b2f8a938749d41dc86db6bd1e6a4ca
-sha256=3feb006a25f36856924e26249fe84b27142678f97175780960f085e1e263a62e
-
-[http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.2.tar.bz2]
-md5=a61be25c87ee42169ee4dc8344acc9e2
-sha256=9c8e7d573284272c633b5cf18e3358830b27bde72f4bc1ae83a1ab337d463a92
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/fslsfonts-X11R7.0-1.0.1.tar.bz2]
-md5=c500b96cfec485e362204a8fc0bdfd44
-sha256=662c12ac9aa7009d3fdf1d1682417a86a5a332c46f6f2f17887d370c9adf8b21
-
-[http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.2.tar.bz2]
-md5=99144743ab3cbb9cf37090fdc9e747db
-sha256=690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22
-
-[http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.3.tar.bz2]
-md5=49a6225380f6c18fff664a043cd569b1
-sha256=f2242720045c69f69dc9e18320a1c6402e92234d40c237367560fae3d210f7b0
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/fstobdf-X11R7.0-1.0.1.tar.bz2]
-md5=233615dca862b64c69bc212090a22b4c
-sha256=568896b458a4a8682a78a03248463a182bf3a34c18753a72cb9ca2c1bec3498c
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/fstobdf-X11R7.1-1.0.2.tar.bz2]
-md5=e6f102e10f0861c972a250e4fc57fdc2
-sha256=d8e6067ae7b24bbb4bd32ea1fadc119d72b58a71dc537bf8fb2635f3122d6906
-
-[http://www.firestorm.cx/fswebcam/files/fswebcam-20070108.tar.gz]
-md5=f7619566779f4484d3acd806cdc30f5f
-sha256=82dd976a64919383aabccf760257bcef52621e428b0af922a7d4886b54477937
-
-[http://www.codemonkey.org.uk/projects/fsx/fsx-linux.c]
-md5=0ee07cbdfe8c5f838f653c0fb7328c4d
-sha256=fa1b97a6d9d2f7d7699f6b0ccd433ab132c7d10835b449ed14b12b48e7749aad
-
-[http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/ftdi_eeprom-0.2.tar.gz]
-md5=d133e77f625c496ae9d58629d7443596
-sha256=b3e0409d69783ecfa90c893c817bb584296b4c45d9f17b0f2fdd7c07ef411a3f
-
-[http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch]
-md5=d7ec27a9b44eed194426038640af5460
-sha256=70e8e8230390fb355d62270764f18f6b553bcb9383ddabfbed4a1238b0e79b80
-
-[http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/full.patch]
-md5=230b98276779339a4102abdb1c36197a
-sha256=866d1e45a575f448148c227f60cde4c8b607c51f179da3a7ec1acb5036b8e3ec
-
-[http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/full.patch]
-md5=230b98276779339a4102abdb1c36197a
-sha256=866d1e45a575f448148c227f60cde4c8b607c51f179da3a7ec1acb5036b8e3ec
-
-[http://ftp.mozilla.org/pub/mozilla.org/addons/1568/full_fullscreen-3.3-fx.xpi]
-md5=d69dd28c0d19777b32bd15720512027a
-sha256=abe2607b6b823bd3355ae2a93368143628ad3e18ec244581dfe034386a0505af
-
-[http://downloads.sourceforge.net/fuse/fuse-2.5.3.tar.gz]
-md5=9c7e8b6606b9f158ae20b8521ba2867c
-sha256=19f9e27a35e65b61c25b999c44d0c35ba858ad586379226849d097d638579057
-
-[http://heanet.dl.sourceforge.net/fuse/fuse-2.5.3.tar.gz]
-md5=9c7e8b6606b9f158ae20b8521ba2867c
-sha256=19f9e27a35e65b61c25b999c44d0c35ba858ad586379226849d097d638579057
-
-[http://downloads.sourceforge.net/fuse/fuse-2.6.0.tar.gz]
-md5=fa6c7b07a0be3a3e30d6cf3a6bad5817
-sha256=782137879b964139e2dc4767114b763cb0e11ae322476404920cf767728e659e
-
-[http://downloads.sourceforge.net/fuse/fuse-2.6.3.tar.gz]
-md5=3f4f5d07d12dedc0a3fd23472171fe94
-sha256=804d7fae424c97dc3790ad12d798e7b27dc6c12e4116f8bd69ca0130773d3f9d
-
-[http://downloads.sourceforge.net/fuse/fuse-2.6.5.tar.gz]
-md5=66bd30503df55a87b9868835ca5a45bc
-sha256=ab91922367ca4c7ae5b176823eca579b2323c463e5d8b71fe5cdfc1061860124
-
-[http://heanet.dl.sourceforge.net/fuse/fuse-2.6.5.tar.gz]
-md5=66bd30503df55a87b9868835ca5a45bc
-sha256=ab91922367ca4c7ae5b176823eca579b2323c463e5d8b71fe5cdfc1061860124
-
-[http://downloads.sourceforge.net/fuse/fuse-2.7.0.tar.gz]
-md5=7c3d52f81816e3a8e0cc2b5822a37e86
-sha256=a26117fb74b3bf6a3c6867611c46c53b75d6749198933486ec8a778ac315f855
-
-[http://downloads.sourceforge.net/fuse/fuse-2.7.1.tar.gz]
-md5=f95b4a238a3df5a92e9013ecb55c2c17
-sha256=e4639f9e08f0b8cc9f4a0bb8cbe47da06fa57cb310b2c5a82221e0a9ba969e9a
-
-[http://heanet.dl.sourceforge.net/fuse/fuse-2.7.1.tar.gz]
-md5=f95b4a238a3df5a92e9013ecb55c2c17
-sha256=e4639f9e08f0b8cc9f4a0bb8cbe47da06fa57cb310b2c5a82221e0a9ba969e9a
-
-[http://downloads.sourceforge.net/fuse/fuse-2.7.2.tar.gz]
-md5=813782a4f23211386c1ea91dc0ac7ded
-sha256=fb390948aa27628e4fb48aa6658a20ad8c1ee304fe76bb60ac29b81c63d3baff
-
-[http://heanet.dl.sourceforge.net/fuse/fuse-2.7.2.tar.gz]
-md5=813782a4f23211386c1ea91dc0ac7ded
-sha256=fb390948aa27628e4fb48aa6658a20ad8c1ee304fe76bb60ac29b81c63d3baff
-
-[http://downloads.sourceforge.net/fuse/fuse-2.7.4.tar.gz]
-md5=4879f06570d2225667534c37fea04213
-sha256=c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6
-
-[http://downloads.sourceforge.net/fuse/fuse-2.8.1.tar.gz]
-md5=0e3505ce90155983f1bc995eb2cf6fa7
-sha256=007f1056ce329a7c9976ab7b68d3361991261e188f36364d0406f8ee457d2eaf
-
-[http://downloads.sourceforge.net/fuse/fuse-python-0.2.tar.gz]
-md5=68be744e71a42cd8a92905a49f346278
-sha256=89f3e9ac096759e10b6292632216c9653d7e35c2c99847267173d94afdf85b92
-
-[http://downloads.sourceforge.net/foosh/fush-0-9-0.tar.gz]
-md5=d7077d40a4bc18f05bc3a4895012646a
-sha256=ad4a64117094eafde12d7aa8c81f6425113d1ebf5b561c6cc93cfda46a2fef41
-
-[http://heanet.dl.sourceforge.net/foosh/fush-0-9-0.tar.gz]
-md5=d7077d40a4bc18f05bc3a4895012646a
-sha256=ad4a64117094eafde12d7aa8c81f6425113d1ebf5b561c6cc93cfda46a2fef41
-
-[http://pypi.python.org/packages/source/f/fusil/fusil-1.1.tar.gz]
-md5=e7dfc39fd169e8ba72b0aeb304acb25b
-sha256=85f9a52578c9af3d2a062097144cb6dc507fff7df7e286479010e65cf6b6f23d
-
-[ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-2.5.26.tar.bz2]
-md5=a1c225fe6497bf86a59cac561abd9064
-sha256=84aca15165f600c5c09095c94b3ad1f0bfe16ba25cf2097f76312a0fba89251d
-
-[http://dfn.dl.sourceforge.net/sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz]
-md5=cafd71a5bff0c57bcd248273b2541c05
-sha256=15116da28bc90e961bd5fea454adf79272bc741f86d9636ed8b9b771d74814c3
-
-[http://downloads.sourceforge.net/g15daemon/g15daemon-1.2.6a.tar.bz2]
-md5=ba220f1fda33283af307c109cc520f61
-sha256=583c4bece816b712959aba51f49d78bb587e215fbb6a322efe832477c74f2564
-
-[http://heanet.dl.sourceforge.net/g15daemon/g15daemon-1.2.6a.tar.bz2]
-md5=ba220f1fda33283af307c109cc520f61
-sha256=583c4bece816b712959aba51f49d78bb587e215fbb6a322efe832477c74f2564
-
-[http://ftp.gnome.org/pub/GNOME/sources/gail/1.20/gail-1.20.0.tar.bz2]
-md5=697f83db831816946bb8944b8d34ec17
-sha256=2e547b33a1f0abffb1a9860e5dc09330fbf6fbb45b7fe90dc5d12cea5fbe829e
-
-[http://ftp.gnome.org/pub/GNOME/sources/gail/1.6/gail-1.6.6.tar.bz2]
-md5=0741e06cd58088d4973dda98d3995a99
-sha256=8bbd4713f9bbd752ae3116ec4d6e4f4f04f0f8f774e98dd989626d5e00c121f5
-
-[http://ftp.gnome.org/pub/GNOME/sources/gail/1.8/gail-1.8.5.tar.bz2]
-md5=7587a0a9ee643bb59ef6b2dea06c5a28
-sha256=1313a35d6cc4d3ae466dbb6b4f1588b341f339c071557fd66830c0daf72f09b4
-
-[http://downloads.sourceforge.net/gaim/gaim-1.0.3.tar.bz2]
-md5=d0c40cbb57a80813fd495d3ffc6259df
-sha256=dfcc3ed2a7fd919f8f5937bdaae9424cc12f0525c89cb1ffe661e7085abb62c7
-
-[http://downloads.sourceforge.net/gaim/gaim-1.1.0.tar.bz2]
-md5=231f30505d7377bbdde0f350a4bcb838
-sha256=63b05733e09d611c0f5645fe6c6315586916de80a42d7aeedb368737feff2cce
-
-[http://downloads.sourceforge.net/gaim/gaim-1.1.1.tar.bz2]
-md5=5d554be5ccb2064a5b3d43117c7d6d4b
-sha256=77fbf159af9a5382cf437e9c7f6e36f881aac628600b7fa947159db29fa9e91b
-
-[http://downloads.sourceforge.net/gaim/gaim-1.1.2.tar.bz2]
-md5=d4bb61059214cfdbc75f85fe185b0e01
-sha256=39781205840b8b38fbb3ef86accc885a4267958b8aeea396806d0521dfd969e5
-
-[http://downloads.sourceforge.net/gaim/gaim-1.4.0.tar.bz2]
-md5=d7717cb771e556012ecd5b7f3bdb02ba
-sha256=9f44792ea9df64e0a1df9c9efe3baefb6150e4c93b8b414f0a2b398e3f8eb32c
-
-[http://downloads.sourceforge.net/gaim/gaim-1.5.0.tar.bz2]
-md5=9205321ac11fad271c90f2f0d7c5e7ce
-sha256=58e3b0340cfc9e54e46f8d8835e5a02e31201c9ed8820bbb4cea36c59b9682aa
-
-[http://ftp.gnome.org/pub/GNOME/sources/gal/1.99/gal-1.99.11.tar.bz2]
-md5=906c0640d3160a55aac98974aecfb316
-sha256=bb76484f73f5d6bc58d4e9990422043663af01204728aee73a1ce4565f8ef2ed
-
-[http://ftp.gnome.org/pub/GNOME/sources/gal/2.1/gal-2.1.10.tar.bz2]
-md5=27843dc0ad9b775c0f6bb0d173e49264
-sha256=44282f7939ce5a09cb2f0e0f0091ea27754309a605a5105a643f0c80f38094c4
-
-[http://www.galago-project.org/files/releases/source/galago-daemon/galago-daemon-0.3.4.tar.gz]
-md5=958ea4a9e1be61cb5e5f35f75a9bfede
-sha256=958ae2ddc89d218e7b3fe4f00a61f4ade48c8fefa768854c67425f5495387eed
-
-[http://www.galago-project.org/files/releases/source/galago-daemon/galago-daemon-0.5.1.tar.gz]
-md5=fdb81f938f86f380b127158ebb542279
-sha256=db42a0d1d0f8b069ea5ac1203207f9178f25ac1367f4910bd48547f5be1db4c2
-
-[http://downloads.sourceforge.net/galculator/galculator-1.2.3.tar.bz2]
-md5=f42148bcaac4b6b097cf2055c780bcfc
-sha256=0ded02d0e6e648024f593f3c3748a73f8f569f680256c393c571144dd77b6fd6
-
-[http://heanet.dl.sourceforge.net/galculator/galculator-1.2.3.tar.bz2]
-md5=f42148bcaac4b6b097cf2055c780bcfc
-sha256=0ded02d0e6e648024f593f3c3748a73f8f569f680256c393c571144dd77b6fd6
-
-[http://easynews.dl.sourceforge.net/sourceforge/gallery/gallery-1.5.5-pl1.tar.gz]
-md5=d2f52d92776f47bf353787237607f23c
-sha256=9f17181cd8bf46203a288e3fc1d9bd82d5dc011fe419d33bee2f62bace081f08
-
-[http://{SOURCEFORGE_MIRROR}/sourceforge/gallery/gallery-1.5.5-pl1.tar.gz]
-md5=d2f52d92776f47bf353787237607f23c
-sha256=9f17181cd8bf46203a288e3fc1d9bd82d5dc011fe419d33bee2f62bace081f08
-
-[http://www.gnome.org/~veillard/gamin/sources/gamin-0.1.10.tar.gz]
-md5=b4ec549e57da470c04edd5ec2876a028
-sha256=28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1
-
-[http://www.gnome.org/~veillard/gamin/sources/gamin-0.1.8.tar.gz]
-md5=985022c8b1b993e471d528fd0e14ffbe
-sha256=be22f69b4797db510f4270ff0e228dd027e99e561ac5f5d38be595be7e82d203
-
-[http://dl.cihar.com/gammu/releases/gammu-1.10.0.tar.bz2]
-md5=05b623c30cfd69ea97f0bc054b19928d
-sha256=91062db1fd62095bdda21782e076157a343e0181e684738c2edbfff5fc860f64
-
-[http://dl.cihar.com/gammu/releases/gammu-1.17.0.tar.bz2]
-md5=292c86bbf826fbaaeaa860bfddf2acae
-sha256=1bb7e12f80b7133c8b45965c4886abb1a7d3e87c74ccaf16b828605ad376f2b8
-
-[http://dl.cihar.com/gammu/releases/gammu-1.20.0.tar.bz2]
-md5=e39930e94babd42731e20fc7b33ed12e
-sha256=7848b7c1992ef202d54a5602904e7d7e190bce0195af69174baa79e741d07e87
-
-[http://dl.cihar.com/gammu/releases/gammu-1.23.0.tar.bz2]
-md5=bc547e99535a5a05bb7093fa8b4f36a6
-sha256=32ff5fed107ca5eb94976bf22bc5b82ff45c72b8e62f35dc6dba75a2f11e6425
-
-[http://dl.cihar.com/gammu/releases/gammu-1.24.0.tar.bz2]
-md5=f805d6d93ca7064f6d04eb3c6b24168f
-sha256=dbbacb5685b84d3ee181f9172e2818ebbb3b59b088149ebf320ce0c73e71ba1d
-
-[http://dl.cihar.com/gammu/releases/gammu-1.26.1.tar.bz2]
-md5=ba8caab6b21a2ce0fa668f9403b8319a
-sha256=668eb037af6aa81cc104067dcb8e1cf44000b82a58638cfd485297eec76fda8d
-
-[ftp://ftp.gnu.org/gnu/gawk/gawk-3.1.4.tar.gz]
-md5=3c8935efb9fdc7202720894279ad04a7
-sha256=5cdfe0c0919895e2ec87773c583cc6ebf2b84cba7617d5ec6cfd0150749e190f
-
-[http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz]
-md5=2ff9924c7249ef7f736ecfe6f08f3f9b
-sha256=e3cef6028fe3efe7de3bcf4107c880eae50b3ee79841450d885467c09bcebf30
-
-[http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz]
-md5=00bf95cdcbedfa7321d14e0133b31cdb
-sha256=217df8b36d848a85eb81ec6fa2a411e9bf186a747c2ddb223cb82b5001e4d80b
-
-[http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.7.tar.gz]
-md5=be780413a0360306ad3b701e45fa8871
-sha256=b678dd4354e0305fc57fef9aa4fd1f316e8a5de33e5048e712fbc32d42ecea7c
-
-[http://download.gnome.org/sources/gcalctool/5.21/gcalctool-5.21.4.tar.gz]
-md5=c4e5d90974591ffadb4c934b490146fc
-sha256=c0c315c4190ce1f4ac977cb1e425a11879d5e7d78067207257387299f4d111ed
-
-[http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.27/gcalctool-5.27.5.tar.bz2]
-md5=abaaedfdba2f5905d9c57ae73105b84f
-sha256=f117903e3753920d16ca2e9f7185a02b3925fe94958a4c65efc2663cf61ca4de
-
-[http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.28/gcalctool-5.28.0.tar.bz2]
-md5=03d8f034ee844888e7ec9ad317096028
-sha256=4271a17bbca56d7b335f18c1ebf350b931565d90e92925b9e5c0585b416f3765
-
-[http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.5/gcalctool-5.5.21.tar.bz2]
-md5=130baf0910aec9c0c5afad8007da90de
-sha256=e5a0f289969d070f4f10f25fb77efdf693805177b07d4eb2dbfe9fe91c2fdab0
-
-[http://download.gnome.org/sources/gcalctool/5.7/gcalctool-5.7.32.tar.gz]
-md5=c4d4234f6951389027399e9c596a8abe
-sha256=c232fc4b36d063b714d4470c603f462c9e6ccfcd9fb7c071e08356869376381e
-
-[http://download.gnome.org/sources/gcalctool/5.8/gcalctool-5.8.17.tar.gz]
-md5=dd9d4f326d7d925a5ad9fbb1c5b32142
-sha256=8806e7696eeee62f2df21135fc488ba99f7d55dfd2a40bb9615e2edd95391589
-
-[ftp://ftp.gnu.org/gnu/gcc/releases/gcc-3.3.3/gcc-3.3.3.tar.bz2]
-md5=3c6cfd9fcd180481063b4058cf6faff2
-sha256=9ac6618495b7dd2ff0cd50abd76fe3c51287efcc724340687407f9fc250bdc6a
-
-[ftp://ftp.gnu.org/gnu/gcc/releases/gcc-3.3.4/gcc-3.3.4.tar.bz2]
-md5=a1c267b34f05c8660b24251865614d8b
-sha256=3f409186acee739641341e5486e30ea9acecc039452e97a9eb850afbc6c3a691
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.1/gcc-3.4.1.tar.bz2]
-md5=31b459062499f9f68d451db9cbf3205c
-sha256=5f3685533f8dc4b42b926fe70bb371b31e1368223a0ad7398ba27ea3a20e8e7a
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.2/gcc-3.4.2.tar.bz2]
-md5=2fada3a3effd2fd791df09df1f1534b3
-sha256=522c53b92ff9096089f3074c50e17a5169952d32f4c883c6fdae350e8f1b344e
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.3/gcc-3.4.3.tar.bz2]
-md5=e744b30c834360fccac41eb7269a3011
-sha256=63dc1c03a107ec73871151bb765da7d5dfc1d699c0d0d6a3d244cf5ccb030913
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.4/gcc-3.4.4.tar.bz2]
-md5=b594ff4ea4fbef4ba9220887de713dfe
-sha256=3444179840638cb8664e8e53604900c4521d29d57785a5091202ee4937d8d0fd
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2]
-md5=4a21ac777d4b5617283ce488b808da7b
-sha256=7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.0.0/gcc-4.0.0.tar.bz2]
-md5=55ee7df1b29f719138ec063c57b89db6
-sha256=38a9a01e195000976dcd04ec854c398478ada839510b1de384ffbd5f99791bdc
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.0.2/gcc-4.0.2.tar.bz2]
-md5=a659b8388cac9db2b13e056e574ceeb0
-sha256=37b3286c2bfb68da9df983f60721f868e29897f7a426306748fee93b25c5fb61
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2]
-md5=88785071f29ed0e0b6b61057a1079442
-sha256=1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606
-
-[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2]
-md5=88785071f29ed0e0b6b61057a1079442
-sha256=1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2]
-md5=ad9f97a4d04982ccf4fd67cb464879f3
-sha256=985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7
-
-[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2]
-md5=ad9f97a4d04982ccf4fd67cb464879f3
-sha256=985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2]
-md5=a4a3eb15c96030906d8494959eeda23c
-sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc
-
-[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2]
-md5=a4a3eb15c96030906d8494959eeda23c
-sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc
-
-[http://ftp.nluug.nl/languages/gcc/snapshots/4.2-20060513/gcc-4.2-20060513.tar.bz2]
-md5=ac6d19831220c4aeef4475492725486f
-sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.1/gcc-4.2.1.tar.bz2]
-md5=cba410e6ff70f7d7f4be7a0267707fd0
-sha256=ca0a12695b3bccfa8628509e08cb9ed7d8ed48deff0a299e4cb8de87d2c1fced
-
-[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.1/gcc-4.2.1.tar.bz2]
-md5=cba410e6ff70f7d7f4be7a0267707fd0
-sha256=ca0a12695b3bccfa8628509e08cb9ed7d8ed48deff0a299e4cb8de87d2c1fced
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2]
-md5=7ae33781417a35a2eb03ee098a9f4490
-sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1
-
-[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2]
-md5=7ae33781417a35a2eb03ee098a9f4490
-sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2]
-md5=ef2a4d9991b3644115456ea05b2b8163
-sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80
-
-[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2]
-md5=ef2a4d9991b3644115456ea05b2b8163
-sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2]
-md5=d79f553e7916ea21c556329eacfeaa16
-sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a
-
-[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2]
-md5=d79f553e7916ea21c556329eacfeaa16
-sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2]
-md5=4afa0290cc3a41ac8822666f1110de98
-sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5
-
-[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2]
-md5=4afa0290cc3a41ac8822666f1110de98
-sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2]
-md5=5dfac5da961ecd5f227c3175859a486d
-sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
-
-[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2]
-md5=5dfac5da961ecd5f227c3175859a486d
-sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2]
-md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
-sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
-
-[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2]
-md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
-sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
-
-[http://gcc.releasenotes.org/releases/gcc-4.3.3/gcc-4.3.3.tar.bz2]
-md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
-sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.4/gcc-4.3.4.tar.bz2]
-md5=60df63222dbffd53ca11492a2545044f
-sha256=e572453bdb74cc4ceebfab9ffb411d9678343dff5bf86e9338d42fdd0818aa65
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.0/gcc-4.4.0.tar.bz2]
-md5=cf5d787bee57f38168b74d65a7c0e6fd
-sha256=c5fe6f4c62ee7288765c3800ec9d21ad936bdcb5a04374cc09bd5a4232b836c9
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.1/gcc-4.4.1.tar.bz2]
-md5=927eaac3d44b22f31f9c83df82f26436
-sha256=cbefa9abd4adac0931e1b556072dcd8b32a360d4b95a94d7822c86bded803d5b
-
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.2/gcc-4.4.2.tar.bz2]
-md5=70f5ac588a79e3c9901d5b34f58d896d
-sha256=1126b6a7b585b3a178bfb7d559221779eb7eba12ce01bc9ca5896f6f9ee639de
-
-[http://downloads.sourceforge.net/mingw/gcc-ada-3.4.5-20060117-2-src.tar.gz]
-md5=30154205636c12c6abcc462ce07550cf
-sha256=404358fe19326679f602de6f7d6a2db180e27af83813150f58ab28eec197b646
-
-[http://downloads.sourceforge.net/mingw/gcc-core-3.4.5-20060117-2-src.tar.gz]
-md5=d0dc9d57d493889bc1ca88b127290b9d
-sha256=a21c2f48bb48d62935ee955ac8fa318658861f6316f30feb3cdec5337abf7f05
-
-[http://downloads.sourceforge.net/mingw/gcc-g++-3.4.5-20060117-2-src.tar.gz]
-md5=ca81c8420ab9d1d05ff9c73a9d4f7d63
-sha256=d54078fdccaa3776927b3931c15b880c43e76cb6a0fb59594d1b85cfc89356e9
-
-[http://downloads.sourceforge.net/mingw/gcc-g77-3.4.5-20060117-2-src.tar.gz]
-md5=57d489658743f0d9048e440b312740c8
-sha256=3ea32832e07571be317cdb1f9b9dc678a51ad2c2f066f91e155c449d0cf7d796
-
-[http://downloads.sourceforge.net/mingw/gcc-java-3.4.5-20060117-2-src.tar.gz]
-md5=96b039f4e11bff4d3d8a4e7da6e3998d
-sha256=ec7a963c0dfd986697350be26e53577b0a39c86970b4e9485d85ca99b0cb2197
-
-[http://downloads.sourceforge.net/mingw/gcc-objc-3.4.5-20060117-2-src.tar.gz]
-md5=2bffc1e314f2efb1034b3d3ea1ce2f7d
-sha256=a8a3c0f0a38f819b87ff9282f1e40536f5050153f0f60db5c869509a70497c2c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.22/gconf-editor-2.22.0.tar.bz2]
-md5=7ca99aec214dd855b5de7dacc8937055
-sha256=e701134a1f5293070ca7d8d6311468f61e3a9765ebc520fcca6a0a38b214b7dc
-
-[http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.24/gconf-editor-2.24.0.tar.bz2]
-md5=845321d47b34f6ae19ac7e930c454e3d
-sha256=666ba1186b2697c3a99ee943775fbc7a7aa18f3c8cc3d335a2581dea62f812bf
-
-[http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.26/gconf-editor-2.26.0.tar.bz2]
-md5=2dc76415b22d805cfacfcd5fb98f185c
-sha256=2801ff7d595039292850d4f7d87b3f7c950e92dbcb39facfe62c6fb184640e1f
-
-[http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.28/gconfmm-2.28.0.tar.bz2]
-md5=dad2999d8bbf88cf581fa512041d735e
-sha256=3daa3719f773cfc9fcee84766f60eab4579209978425221997120662bd621a52
-
-[http://www.boutell.com/gd/http/gd-2.0.21.tar.gz]
-md5=3134158635f5048dba99281c6b712a54
-sha256=c3b8b7b57019927dad40870c379eecfa6389443f7e2096aa0157a0224d400da1
-
-[http://www.boutell.com/gd/http/gd-2.0.22.tar.gz]
-md5=e1a41daf3bfc221afaf56751dc506f95
-sha256=e6bff5c00d7d93bade78535573494673f581118c38a8ca13c3afd63809335ba0
-
-[http://downloads.sourceforge.net/gdado/gdado-2.2.tar.gz]
-md5=b84114df6ca8b20560524afed0e21b25
-sha256=cc272f097832e074804bf405f2c013b4f941ad57f0f5f5ec6c08edecc9ad17fa
-
-[http://heanet.dl.sourceforge.net/gdado/gdado-2.2.tar.gz]
-md5=b84114df6ca8b20560524afed0e21b25
-sha256=cc272f097832e074804bf405f2c013b4f941ad57f0f5f5ec6c08edecc9ad17fa
-
-[http://www.gdal.org/dl/gdal-1.3.2.tar.gz]
-md5=67ed02dcea21e93f5e123bb0d322898a
-sha256=00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87
-
-[http://www.gdal.org/dl/gdal-1.5.2.tar.gz]
-md5=1939de5fe43d12884d85fa5d7797e3c2
-sha256=243dabf3c45530cac8be092f9a1d838a46b46a92d4138870423006ffd6ae4001
-
-[http://gdata-python-client.googlecode.com/files/gdata-2.0.1.tar.gz]
-md5=d646b8f6e32911df61ea0e7379b4bc35
-sha256=a9dba7645ccda502bfeedd3d15f34672b3dec668d8953188b87df36f17c6b849
-
-[http://gdata-python-client.googlecode.com/files/gdata.py-1.2.4.tar.gz]
-md5=521f33a377d64f8a6505ba119415b787
-sha256=fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde
-
-[ftp://ftp.gnu.org/gnu/gdb/gdb-6.3.tar.gz]
-md5=812de9e756d53c749ea5516d9ffa5905
-sha256=c06bf9715436b3a28c189163aa5ca42b46af8286659827f033eaaf7d8b1fc342
-
-[ftp://ftp.gnu.org/gnu/gdb/gdb-6.4.tar.bz2]
-md5=f62c14ba0316bc88e1b4b32a4e901ffb
-sha256=af6777836ab72b563a9e55467f990250e07e56c292cfac98762745c1512167ef
-
-[ftp://ftp.gnu.org/gnu/gdb/gdb-6.4.tar.gz]
-md5=7dc98022ee96bba5331f195dc8a5491a
-sha256=719f2bbd79d55cdd6f5e31b49cec49df71ddb32a4439dba678de0e09330096da
-
-[ftp://ftp.gnu.org/gnu/gdb/gdb-6.6.tar.gz]
-md5=18be4e7a1ac713bda93d00fee20bbef8
-sha256=c119ce82f0e42d3412420c42c1ead75e0b9de67131a5c9dd3cdab509f65ddfdd
-
-[http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2]
-md5=8a5cf43042a84ec0da0aca301bd1dae4
-sha256=2c8bbd8cc3323899e698fad071cc0e4e8880c178deaa849073ca4a2c9bc176f2
-
-[ftp://ftp.gnu.org/gnu/gdb/gdb-6.7.1.tar.gz]
-md5=7a74dcafdd39d18678e5b5cc2c50bb0c
-sha256=66e6ff871a7ed71ea433b8341ffebbe48590119e43a42953d392f5ce517c95e4
-
-[ftp://ftp.gnu.org/gnu/gdb/gdb-6.8.tar.gz]
-md5=925695333524108291dc4012c4c9cbb8
-sha256=a3c5455f30ffb3e6eeafb9e54598b48f9fbf46e3e99f431120360c183ddcc889
-
-[ftp://ftp.gnu.org/gnu/gdb/gdb-7.0.tar.gz]
-md5=67b4144db385620d7b93f7b0c26800f7
-sha256=ccff6cab0e847c486d30b70bdddac4e6646bafcecaa3b63134d6e3d4d5a4b91d
-
-[ftp://ftp.gnu.org/gnu/gdbm/gdbm-1.8.3.tar.gz]
-md5=1d1b1d5c0245b1c00aff92da751e9aa1
-sha256=cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9
-
-[http://gdevilspie.googlecode.com/files/gdevilspie-0.31.tar.bz2]
-md5=a414f4ed6c2ab135b9be3d2cc27e3c4d
-sha256=1e677b41a6f3f256f759a48f92c613e68dafc3c5a2586230c61591481faf76b2
-
-[http://ftp.gnome.org/pub/GNOME/sources/gdm/2.14/gdm-2.14.9.tar.bz2]
-md5=7e46bc3b0a5b08e79f1f2f1b869caf40
-sha256=0483dac71c88ca0da5ee85729c0c1dd6793d928109ac79ad56583aa1a5ff43d2
-
-[http://ftp.gnome.org/pub/GNOME/sources/gdm/2.24/gdm-2.24.1.tar.bz2]
-md5=31139d7a79096463b127b4790058b056
-sha256=8869f464818a1626e481bba5c562bdb972ffb74f1a9da91d01199fa860ee040f
-
-[http://ftp.gnome.org/pub/GNOME/sources/gdm/2.26/gdm-2.26.1.tar.bz2]
-md5=c2c15f8b741962f278fa7e790aaa9a2b
-sha256=34abc69bdfd1b6bb6d1f64dd1e34652c61310dc69305712d7aeec6203678fa4c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/gdm-2.28.0.tar.bz2]
-md5=7724929a6b75ba269fd519d4a4995bbb
-sha256=b83db2613192df8a8865ca59877de5181df6247cd17be42418cc5a39d314d5a4
-
-[http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/gdm-2.28.1.tar.bz2]
-md5=917dc80f5ef6adcdc15193de238476db
-sha256=da77a6fd9d4cc76b68dd4354839f953f8df5fb7921c7777b80256916533a3e7a
-
-[http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/gdm-2.28.2.tar.bz2]
-md5=9607c6bac31c9d8bd3446e66a4576c2e
-sha256=0165b4bf70e4a6d41d9e42877840805890c438bd655805b961e51adccbd9602a
-
-[http://downloads.sourceforge.net/geany/geany-0.14.tar.bz2]
-md5=c6c22c7f9feff81a15f5c8ece03b87c1
-sha256=619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7
-
-[http://heanet.dl.sourceforge.net/geany/geany-0.14.tar.bz2]
-md5=c6c22c7f9feff81a15f5c8ece03b87c1
-sha256=619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7
-
-[http://download.geany.org/geany-0.18.tar.bz2]
-md5=d8e301f6933c828e2c36b3afdb3f4c34
-sha256=7cb387d394b58b9ee1119dc6770b437e4a4c9e72b591b0bd431e54558f51212d
-
-[http://gecko-mediaplayer.googlecode.com/files/gecko-mediaplayer-0.8.0.tar.gz]
-md5=bd46f98eac274a8572a61afce7fcd8d4
-sha256=6a830e06dc71f5168909cbe5aa805959ef1fa2e49d799f61dcd54204ee19633f
-
-[http://gecko-mediaplayer.googlecode.com/files/gecko-mediaplayer-0.9.8.tar.gz]
-md5=4df009d21b1a95c35c9adfdb6fbc96fe
-sha256=a51ebf00021b1d5d43837edebd0fb28d8f6d2626111c4c391e8b0f6515004aa1
-
-[http://www.geda.seul.org/devel/20050820/geda-20050820.tar.gz]
-md5=e8d903d84515cc518e545b6f2e3d7a9d
-sha256=8e46a48d581f8b835f305bb17ffbb7776d53b9214113524819e96be842f9db98
-
-[http://geda.seul.org/release/v1.4/1.4.1/geda-docs-1.4.1.tar.gz]
-md5=44009c42e98943fbb868638032d5c8d6
-sha256=6b9c73f34f498b12851ac32e1225b72228e4ea629d321b0426d505ad18309e54
-
-[http://geda.seul.org/release/v1.4/1.4.3/geda-docs-1.4.3.tar.gz]
-md5=6305083c37a86f2353a8be40bcf70b99
-sha256=26e0d0aa9a24e75af57c27c5710521ed9005dcf4242d912ac0c497653b9a1959
-
-[http://geda.seul.org/release/v1.4/1.4.1/geda-examples-1.4.1.tar.gz]
-md5=9d3daac1be22186784929b56ea181738
-sha256=29e3a1b65212b30847ac5c9f3d51a3add492a1597237085279b6ff82d1a1479f
-
-[http://geda.seul.org/release/v1.4/1.4.3/geda-examples-1.4.3.tar.gz]
-md5=923fe9d9cc843b5eb7b26c91ad0ef2d4
-sha256=38a7c6d39a8b298aa1baeadaf7a174ed2ae6397ef227f19cb0bee22757b6e553
-
-[http://geda.seul.org/release/v1.4/1.4.1/geda-gattrib-1.4.1.tar.gz]
-md5=0b8bc020cacda9c3fc21bb7f49332c85
-sha256=e6ab108a7ec3b4431ffa1831a6c23937baf8a7815243d4c145e68f5ee8b11105
-
-[http://geda.seul.org/release/v1.4/1.4.3/geda-gattrib-1.4.3.tar.gz]
-md5=e1f68401e7ca5fff16292358f0dfd553
-sha256=5eb48772d374dad446bfcd69990231fa6c6b52ba9b30048991632557512a7565
-
-[http://www.geda.seul.org/devel/20050820/geda-gattrib-20050820.tar.gz]
-md5=6ff8e6343b621199dde7fcd9a7ff264a
-sha256=c3b2751303d18c5d685b2d2c380065a93dab17a233657a6d1a09d9f2da64800f
-
-[http://geda.seul.org/release/v1.4/1.4.1/geda-gnetlist-1.4.1.tar.gz]
-md5=b9b8dcb2818eb1fcc51002921f32b203
-sha256=66cff8c99bd0cd4d594b50c3d2cf7af35cc48adce23e6471f1926f3cc9b50d20
-
-[http://geda.seul.org/release/v1.4/1.4.3/geda-gnetlist-1.4.3.tar.gz]
-md5=ef31d47010108518c6d214516f3d0cad
-sha256=0793ec9d173dbe600c14a0a8cf8b89f418271176d75b5a02e0a840a55910c119
-
-[http://www.geda.seul.org/devel/20050820/geda-gnetlist-20050820.tar.gz]
-md5=94f2a666701e06438fda0a9ce00e5ae3
-sha256=3df3a23c73df7a9c2cc553836e6df797d01da094f6a947049f9fcc182110ef43
-
-[http://geda.seul.org/release/v1.4/1.4.1/geda-gschem-1.4.1.tar.gz]
-md5=065c22125b75269188321d315ccb64bc
-sha256=6929dd56d14cfcc9fcbdd4dfc056ef8f0bab5ef72a01055fe6cda7280e59748e
-
-[http://geda.seul.org/release/v1.4/1.4.3/geda-gschem-1.4.3.tar.gz]
-md5=76eef656ba4e27c6083fa29b3a5dfb08
-sha256=6952601966e0f28b9436286178a488849a78da1581c282944d2be34e9a09eec7
-
-[http://www.geda.seul.org/devel/20050820/geda-gschem-20050820.tar.gz]
-md5=8ac2387999ec98016c3b004c95fab424
-sha256=166abaa8b0c98e6c826a7c7273b7ddfb57f82be9929e4afbf00e0e3de5d45ef9
-
-[http://geda.seul.org/release/v1.4/1.4.1/geda-gsymcheck-1.4.1.tar.gz]
-md5=1dc7c628acc946731b1e67fb2b910e52
-sha256=15f99bb807dcf6116844847c72bcdde98c8c2232a0e0961cc2ff072a022ccfc6
-
-[http://geda.seul.org/release/v1.4/1.4.3/geda-gsymcheck-1.4.3.tar.gz]
-md5=764613c24a752281a4f5d5432e53d0d2
-sha256=e6d9517eaea4383e724502c607d720a3cd4bf560459f5f2196e19d0c5bb3da2c
-
-[http://www.geda.seul.org/devel/20050820/geda-gsymcheck-20050820.tar.gz]
-md5=c339abc4956987852b948c44118b2e2f
-sha256=3526fd4c30f351c3d548cb2632eda150eb632846b1273349aa2061d0400f9816
-
-[http://geda.seul.org/release/v1.4/1.4.1/geda-symbols-1.4.1.tar.gz]
-md5=a9dda9a87edefaac2a99b70a85d0fd1c
-sha256=188d398c8e7a19bf4492419bbb44754451ebfa9f1810b0eb8b6eb84f708bf0f4
-
-[http://geda.seul.org/release/v1.4/1.4.3/geda-symbols-1.4.3.tar.gz]
-md5=e93f0c9747a66ce229702418b49e128f
-sha256=97c2dec953e21bfa2633077d084fc0b9aff0c79030f96680ebdef9f97e294cc7
-
-[http://www.geda.seul.org/devel/20050820/geda-symbols-20050820.tar.gz]
-md5=a05c9bb11a31c246be3c9a799685bb0e
-sha256=0534ccda5d9136a120abd18ebe3bccd3dbcc6414ec321ad2fd5f9258389ae13d
-
-[http://geda.seul.org/release/v1.4/1.4.1/geda-utils-1.4.1.tar.gz]
-md5=50d39c9af0577a42f3d769794930a74f
-sha256=dfe4d3d3033e92254aa5e00fa7ab6921589747604269bc7b01e59ba9b630e82c
-
-[http://geda.seul.org/release/v1.4/1.4.3/geda-utils-1.4.3.tar.gz]
-md5=55ab23cad7aee2e65fcc742c424e68d4
-sha256=d4814c6c11b38a3cce88b193f7a6d18cba46c44f8226716fdde53f0ccc58de49
-
-[http://www.geda.seul.org/devel/20050820/geda-utils-20050820.tar.gz]
-md5=6555466492f3273dbefb772bd4ffd486
-sha256=8140ff430e89c8564efabbc24da0d9b2858d5ac5e982dab9923eaf3b46a8aacb
-
-[http://geda.seul.org/dist/geda-xgsch2pcb-0.1.2.tar.gz]
-md5=bcae4dc646440ba8129854621f56acc6
-sha256=5af6001401a6bc04c075474be5d8aeb2bdb2ca3e509022c2fc55ca7c7f310256
-
-[http://ftp.gnome.org/pub/GNOME/sources/gedit/2.26/gedit-2.26.2.tar.bz2]
-md5=ef8c98051c03d0caf0c75456e48c25b0
-sha256=7ce4919b4742ad6aad9dbfb2b962434d70dbcf9c63bb513870f3276deb28bee0
-
-[http://ftp.gnome.org/pub/GNOME/sources/gedit/2.28/gedit-2.28.0.tar.bz2]
-md5=d5e8f9f2806c9662693f292b155dd238
-sha256=f12699367ec4f48ffce87f8b116b55561a03e055c4bf74cc96e5adb3b4e2fce6
-
-[http://ftp.gnome.org/pub/GNOME/sources/gedit-plugins/2.28/gedit-plugins-2.28.0.tar.bz2]
-md5=7a0068ef250f2cfe8d60a5cf0e7a7c93
-sha256=d615d2f26e66d7a23f37205089096a60faa2cb6e9108f9034cf2e66b940bf2ca
-
-[ftp://ftp.billsgames.com/unix/x/gemdropx/src/gemdropx-0.9.tar.gz]
-md5=fd0337e89778e2dba74461c555ea8e42
-sha256=e50495d292a1d456c28044efbf07c16d8865f8d95e1caba86f4c5b2e3fb1d28f
-
-[http://downloads.sourceforge.net/genext2fs/genext2fs-1.4.1.tar.gz]
-md5=b7b6361bcce2cedff1ae437fadafe53b
-sha256=404dbbfa7a86a6c3de8225c8da254d026b17fd288e05cec4df2cc7e1f4feecfc
-
-[http://downloads.sourceforge.net/genext2fs/genext2fs-1.4rc1.tar.gz]
-md5=664431bf6737df1c265500e1f0b5d40c
-sha256=e60f88763ee12c02a5c7ade1a58925ef0ab198f9ec6aaf404747dfc29074c7be
-
-[http://heanet.dl.sourceforge.net/genext2fs/genext2fs-1.4rc1.tar.gz]
-md5=664431bf6737df1c265500e1f0b5d40c
-sha256=e60f88763ee12c02a5c7ade1a58925ef0ab198f9ec6aaf404747dfc29074c7be
-
-[http://qa.debian.org/watch/sf.php/genext2fs/genext2fs-1.4rc1.tar.gz]
-md5=664431bf6737df1c265500e1f0b5d40c
-sha256=e60f88763ee12c02a5c7ade1a58925ef0ab198f9ec6aaf404747dfc29074c7be
-
-[ftp://ftp.debian.org/debian/pool/main/g/genext2fs/genext2fs_1.3.orig.tar.gz]
-md5=1342f26b75d8edb1daa01999ce330d29
-sha256=8e7dfa34f3919226550dc6507a23753f9fda55e78b15b264291ecf5940d837e9
-
-[ftp://ftp.nl.debian.org/debian/pool/main/g/genext2fs/genext2fs_1.3.orig.tar.gz]
-md5=1342f26b75d8edb1daa01999ce330d29
-sha256=8e7dfa34f3919226550dc6507a23753f9fda55e78b15b264291ecf5940d837e9
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/g/genext2fs/genext2fs_1.3.orig.tar.gz]
-md5=1342f26b75d8edb1daa01999ce330d29
-sha256=8e7dfa34f3919226550dc6507a23753f9fda55e78b15b264291ecf5940d837e9
-
-[ftp://ftp.us.debian.org/debian/pool/main/g/genext2fs/genext2fs_1.3.orig.tar.gz]
-md5=1342f26b75d8edb1daa01999ce330d29
-sha256=8e7dfa34f3919226550dc6507a23753f9fda55e78b15b264291ecf5940d837e9
-
-[http://geos.refractions.net/geos-3.0.0rc4.tar.bz2]
-md5=90d4dba51dd75f8f1f12378e0f910d76
-sha256=7cd1b2266f5ae85a6d338c1c36ebe34e7c641ceb6a362e4526435c82d1e6fc5d
-
-[http://linuxcentre.net/get_iplayer/get_iplayer-2.64/get_iplayer]
-md5=77949602460e30ea1aec0ee6684b90e2
-sha256=63a4e394f38ae530c37e05e95806f358c6802d3159b868848a9604efdabc5ca0
-
-[ftp://ftp.gnu.org/gnu/gettext/gettext-0.14.1.tar.gz]
-md5=78f4b862510beb2e5d43223dd610e77d
-sha256=41f20c469c7759acb34cfa7e0b3cac9096d59a58ad800e471f07424a8e7adbb7
-
-[ftp://ftp.gnu.org/gnu/gettext/gettext-0.17.tar.gz]
-md5=58a2bc6d39c0ba57823034d55d65d606
-sha256=209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba
-
-[http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz]
-md5=f3d3f474a1458f37174c410dfef61a46
-sha256=27367f3dc1be79c9ed178732756e37e4cfce45f9e2a27ebf26e1f40d80124694
-
-[http://www.gftp.org/gftp-2.0.18.tar.bz2]
-md5=44b19442d06f6dc68c7211d66029d826
-sha256=8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2
-
-[http://ftp.belnet.be/packages/ggzgamingzone/ggz/0.0.14.1/ggz-client-libs-0.0.14.1.tar.gz]
-md5=299eaa93721b1d867b5bf7dc6ac764b0
-sha256=0a7bec1a381a450f650890b36253893df0001873ba1f414573a4247298107680
-
-[http://www.wardriving.ch/hpneu/blue/perl/ghettotooth.pl]
-md5=dc94cb07c6e43fc8c4745b728b0ce32b
-sha256=71e285da2f8f03dd0c6f6a969d1f541ab2a2f1a9d91e26f6f60779897d68824e
-
-[http://fnord.csbnet.se/giftcurs/giFTcurs-0.6.2.tar.gz]
-md5=9a34b924ea10ce0a1d62441ee2bacfff
-sha256=80db72ac16463ce084e76dc9aaae5b54ce8db085610c98fe2975c5b8f51a598d
-
-[ftp://ftp-fourier.ujf-grenoble.fr/xcas/giac-0.8.4.tar.gz]
-md5=c0bdb493cfef3dd058cc3750101a4f47
-sha256=354923541221670d48ea2d713abd3fcad94e7f0d220ac9d53e9bcee0eda6ed4a
-
-[http://linuxbrit.co.uk/downloads/giblib-1.2.3.tar.gz]
-md5=06ae3113fdfe9f05a642bd844cc85eab
-sha256=42eb6bff68e88ef12a7ac2aa69848aeb29a8b69176b3bd3d9d67cf9a1233fe85
-
-[http://linuxbrit.co.uk/downloads/giblib-1.2.4.tar.gz]
-md5=c810ef5389baf24882a1caca2954385e
-sha256=176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac
-
-[http://www.catb.org/~esr/gif2png/gif2png-2.5.1.tar.gz]
-md5=85bb8ee345fc41c218de19dda0164806
-sha256=90825b05b675890bd405767a973d3c8c90eae36d22a7be6307e07a2e3c760d89
-
-[http://downloads.sourceforge.net/giflib/giflib-4.1.6.tar.bz2]
-md5=7125644155ae6ad33dbc9fc15a14735f
-sha256=e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed
-
-[http://heanet.dl.sourceforge.net/giflib/giflib-4.1.6.tar.bz2]
-md5=7125644155ae6ad33dbc9fc15a14735f
-sha256=e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed
-
-[http://downloads.sourceforge.net/gift/gift-0.11.4.tar.bz2]
-md5=decc82159c6723be999b1306a808077f
-sha256=68149059b807b2fac505e376c18320e64104fbe0190e359f98059e73a63693dc
-
-[http://heanet.dl.sourceforge.net/gift/gift-0.11.4.tar.bz2]
-md5=decc82159c6723be999b1306a808077f
-sha256=68149059b807b2fac505e376c18320e64104fbe0190e359f98059e73a63693dc
-
-[http://downloads.sourceforge.net/gift/gift-0.11.5.tar.bz2]
-md5=f492b6e3607aed801b77657f3808f5c1
-sha256=3d3013fb5648b6060202a63c13c160899da8baf756140c7fd8f4ed432b40fdd2
-
-[http://heanet.dl.sourceforge.net/gift/gift-0.11.5.tar.bz2]
-md5=f492b6e3607aed801b77657f3808f5c1
-sha256=3d3013fb5648b6060202a63c13c160899da8baf756140c7fd8f4ed432b40fdd2
-
-[http://files.uvena.de/gigolo/gigolo-0.3.2.tar.bz2]
-md5=e810a525b495d08bce69317aa37d6134
-sha256=e4b20c058ba70f3aa0258ff16817e238303f5d1efb87dbac4acf016e628a7151
-
-[ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-2.2.10.tar.bz2]
-md5=aa29506ed2272af02941a7a601a7a097
-sha256=41f4befa851177e2ca9bbab2fad19926178c831454ca51f2cb91fec0ed9e243e
-
-[ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-2.3.10.tar.bz2]
-md5=a46acb413484300583ffca1fa54e0874
-sha256=38ddc0ebc452968db653efce31864d61bc4a5e521a9694a8b9b8f4fe49a2d131
-
-[http://ftp.gnome.org/pub/GNOME/sources/gimp/2.3/gimp-2.3.10.tar.bz2]
-md5=a46acb413484300583ffca1fa54e0874
-sha256=38ddc0ebc452968db653efce31864d61bc4a5e521a9694a8b9b8f4fe49a2d131
-
-[ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-2.3.19.tar.bz2]
-md5=9b5cc6aef0baca3735ce9bc4fdc949d9
-sha256=f4e388b7b52db1e91e052dcd0aeab0844fcf83a14ccd24228bf033e7937007f0
-
-[http://ftp.gnome.org/pub/GNOME/sources/gimp/2.3/gimp-2.3.19.tar.bz2]
-md5=9b5cc6aef0baca3735ce9bc4fdc949d9
-sha256=f4e388b7b52db1e91e052dcd0aeab0844fcf83a14ccd24228bf033e7937007f0
-
-[ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-2.3.7.tar.bz2]
-md5=dfc47a29b3a7ade07bd17244f0e83311
-sha256=2a6c869ba61c1b18bbafa95bdf89cdc8fe1f07b068aa37dc9332a158b7e295eb
-
-[ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-2.3.8.tar.bz2]
-md5=393e7fb4e5e141faa2e3b44da3f301e3
-sha256=ea5cb59c739357003b3c7fb0d1166e8d8f913be6e9f4737c1905e62b93b0246f
-
-[http://ftp.gnome.org/pub/GNOME/sources/gimp/2.3/gimp-2.3.8.tar.bz2]
-md5=393e7fb4e5e141faa2e3b44da3f301e3
-sha256=ea5cb59c739357003b3c7fb0d1166e8d8f913be6e9f4737c1905e62b93b0246f
-
-[ftp://ftp.gimp.org/pub/gimp/v2.4/gimp-2.4.0.tar.bz2]
-md5=35fecf14cd5237065aef624b93030d5e
-sha256=ddeafb632050bba9163416c4a18c4cb8706b922c0fa99a0c216176584826a9dc
-
-[ftp://ftp.gimp.org/pub/gimp/v2.5/gimp-2.5.2.tar.bz2]
-md5=98add4a1ca6af2e20f80ae3f5a84a922
-sha256=78d209885768790be6d610d275430e6e775392b6384d326401a7ecc13606c539
-
-[ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-2.6.0.tar.bz2]
-md5=e5ac955fee8b376d431e4693027d7640
-sha256=f4055ea8f1815d7dcca6bf0159af70489243d63a14dcfaf2a994af062d829ca8
-
-[ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-2.6.3.tar.bz2]
-md5=39c30867511b79391eb9177c86c8b79a
-sha256=08e4d272471d377cd7c6cac6a6089a540436961c00ddd09de4f29a3148ec71ef
-
-[ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-2.6.8.tar.bz2]
-md5=a4d9462c9420954824a80c9b1963f9d9
-sha256=d5d4218b742390157fca23a9d2cce436904546a2ea419ffeb44a5f43c99a3332
-
-[http://downloads.sourceforge.net/g-inspector/ginspector-20050529.tar.bz2]
-md5=0a8474e0d90b139b1baa70b097a4fd51
-sha256=7f55ec02b5ab9e86c64f5718be64854fd9c64899908e580e1a9759421ac3b436
-
-[http://heanet.dl.sourceforge.net/g-inspector/ginspector-20050529.tar.bz2]
-md5=0a8474e0d90b139b1baa70b097a4fd51
-sha256=7f55ec02b5ab9e86c64f5718be64854fd9c64899908e580e1a9759421ac3b436
-
-[http://ftp.gnome.org/pub/GNOME/sources/gio-standalone/0.1/gio-standalone-0.1.2.tar.bz2]
-md5=6c3ae062f5b32f20eeaf91603f92652e
-sha256=a142efdd4508c7af90db878ded6f4713eb9bca47b508f60b294e62d7905ecff2
-
-[http://www.kernel.org/pub/software/scm/git/git-1.4.4.2.tar.bz2]
-md5=c4f72d96f62ae97c6e8d5cdb4afd55ca
-sha256=907138a7537ff8cef5a9bb258cbba3e32fa46b240f66cd16d5bf530e081ac6b9
-
-[http://www.kernel.org/pub/software/scm/git/git-1.5.2.3.tar.bz2]
-md5=8bb8995f098826154178d5f2d926b6c6
-sha256=d7a92ec68849cc8b333f10263ea3c9c19ccc99fe9b581b5769fb729b14ac54ac
-
-[http://www.kernel.org/pub/software/scm/git/git-1.5.3.tar.bz2]
-md5=798e5784670e0a3e0daaea048e60851d
-sha256=aeef281072cf3e045b73e7047bd9830a71128b828920b3d389a5b7b7cbd0beff
-
-[http://www.kernel.org/pub/software/scm/git/git-1.5.4.4.tar.bz2]
-md5=f754d2ddea7107c5dff5f846f9426d30
-sha256=69b3269a6b1ca26357e1e72c6be7f0ed742cd88d2042243c0bb9ba76e4acac99
-
-[http://www.kernel.org/pub/software/scm/git/git-1.5.6.5.tar.bz2]
-md5=5175d142ad0745b9e22a64904aa86c45
-sha256=692901194603cc4fb4072d8f907487d867caef6b62161f50f0f44dbeb001066e
-
-[http://downloads.sourceforge.net/gizmod/gizmod-2.3.tar.bz2]
-md5=b7200b08149599c4c0f56d88f0c7f208
-sha256=53af32530e58ba23cbb752f063364612bbea57b31de2ee35814973452c2f63f2
-
-[http://heanet.dl.sourceforge.net/gizmod/gizmod-2.3.tar.bz2]
-md5=b7200b08149599c4c0f56d88f0c7f208
-sha256=53af32530e58ba23cbb752f063364612bbea57b31de2ee35814973452c2f63f2
-
-[http://downloads.sourceforge.net/gizmod/gizmod-3.4.tar.bz2]
-md5=f9185cc10aded1b8d32329369fb00dcb
-sha256=46b84f8850f39c2d329abedbe40eb827644c11e2a05929911d54181bac663921
-
-[http://heanet.dl.sourceforge.net/gizmod/gizmod-3.4.tar.bz2]
-md5=f9185cc10aded1b8d32329369fb00dcb
-sha256=46b84f8850f39c2d329abedbe40eb827644c11e2a05929911d54181bac663921
-
-[http://familiar.handhelds.org/source/v0.8.2/gkdial-1.8.1.tar.gz]
-md5=b21c6f87b16e398a188a2ed7c5dcd387
-sha256=851ce45628729684bfcb2fab53f18e9be8fecb5ec8b6805071706a0e8f5bf983
-
-[http://members.dslextreme.com/users/billw/gkrellm/gkrellm-2.2.10.tar.bz2]
-md5=57ef0525c0997ac2e7720712811f5a84
-sha256=d7676d7734d4821454a840a1ef05020c9c4f4797ab96ec54f2351e26d437c88c
-
-[http://members.dslextreme.com/users/billw/gkrellm/gkrellm-2.2.7.tar.bz2]
-md5=6ff47bc8e66ba88f42932365a947f9f3
-sha256=f921da7c8beb396278591b5ca7159b432a38902f1f872c4ae2d40aeb38f9cf01
-
-[http://people.debian.org/~kov/gksu/gksu-2.0.2.tar.gz]
-md5=cacbcac3fc272dce01c6ea38354489e2
-sha256=a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a
-
-[http://downloads.sourceforge.net/project/glew/glew/1.5.1/glew-1.5.1-src.tgz]
-md5=759a59853dfaae4d007b414a3c1712f2
-sha256=89e63d085cb563c32a191e3cd4907a192484f10438a6679f1349456db4b9c10a
-
-[ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz]
-md5=6fe30dad87c77b91b632def29dd69ef9
-sha256=6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-2.12.10.tar.bz2]
-md5=82d44a53690b0eff8f7a5dc65e592f61
-sha256=00f2a189ed6b16ef654c2097ad14cb4c9da42cd4c3fbae54fcb61f3c1c85e8d1
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-2.12.11.tar.bz2]
-md5=077a9917b673a9a0bc63f351786dde24
-sha256=706aa9da1c096af8d27b3ddb5da4e321dd6b10f881887639e280e4e10b81c4b3
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-2.12.12.tar.bz2]
-md5=0b3a42098243d054475ff6eb51ed2be1
-sha256=debc507172093ef7c74e8a83bf49e090cc24057b1807d3be22e5d7cbfab60054
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-2.12.13.tar.bz2]
-md5=d76124236e4e216e8c0861341e967a76
-sha256=1253d563ca2e50292d924849fe3a23c3b7bc707ab8b79bda19319f9d192b0e8e
-
-[http://download.gnome.org/sources/glib/2.12/glib-2.12.4.tar.bz2]
-md5=ef7b9595fa788e245a0f883bddba8a25
-sha256=1b1a0dc746a07c67aad15e22e3d751c3e7068c889d171efb1ab45efbab87c75d
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-2.12.6.tar.bz2]
-md5=b13d971e7de0b844fc4ced7367702003
-sha256=142d5d4795bef093eb9cfd50e384ae87ba9b9934d22b667174535d377ad47f1b
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-2.12.9.tar.bz2]
-md5=b3f6a2a318610af6398b3445f1a2d6c6
-sha256=10113e7b91f858557c7edb4b611cc009855c5ff8663af54977a65acb69445058
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.0.tar.bz2]
-md5=6fabf21f68631043bc6924e01398e3af
-sha256=92e0aed2b5816bfcdfcd943215a7b59e9000f89ae7824218b7959c90161560a8
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.1.tar.bz2]
-md5=196d7944a8ddc1f7c3d1e9c7146dd560
-sha256=6f36ca624a12dce03cdea59c9eb900eda49ea2f463b329737eb9f2a8f3ac144d
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.2.tar.bz2]
-md5=fca5d26c8efea4e6e547c81c801bf67c
-sha256=bd6767cc7c8d9551df0fb3e6d40706746723f6daa0ecd4a78facffc40f9d8a97
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.3.tar.bz2]
-md5=d6e695a2dc96dcdd9d120d8efe265862
-sha256=9aab688e48771f49072ba5b483d17d9275959db404d623452fa36b85cd776993
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.4.tar.bz2]
-md5=7ee7874108cbe9ea7fff1f4ab3389ce8
-sha256=10e6ebecc2cbd07f193a5d26b88c3bf2107e32b2a4d024f10f77f59a98d579ff
-
-[http://download.gnome.org/sources/glib/2.14/glib-2.14.5.tar.bz2]
-md5=c7eedaacd39d3606c307da5ea7fc7018
-sha256=5207471194106e4e4f7606814d24552e8a8f14ab648c30058dcf3f7b37bb05d0
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.5.tar.bz2]
-md5=c7eedaacd39d3606c307da5ea7fc7018
-sha256=5207471194106e4e4f7606814d24552e8a8f14ab648c30058dcf3f7b37bb05d0
-
-[http://download.gnome.org/sources/glib/2.14/glib-2.14.6.tar.bz2]
-md5=3b340946d6916ee9cbf2c348e7c099f1
-sha256=78dfbbd339ff1049275f76a2a6e6c8f0cf124d5cdbea62a2b36e9d76c0ea24ba
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.6.tar.bz2]
-md5=3b340946d6916ee9cbf2c348e7c099f1
-sha256=78dfbbd339ff1049275f76a2a6e6c8f0cf124d5cdbea62a2b36e9d76c0ea24ba
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.15/glib-2.15.6.tar.bz2]
-md5=62b1a3c1fa52b8d91b4535e4a4ab3057
-sha256=90e5e5d555479456f13f0ef8bb3518816994785fccb18fc2e65d432f8dd34272
-
-[http://download.gnome.org/sources/glib/2.16/glib-2.16.1.tar.bz2]
-md5=9852daf0605f827bfd7199ffe4f5b22d
-sha256=f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.1.tar.bz2]
-md5=9852daf0605f827bfd7199ffe4f5b22d
-sha256=f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695
-
-[http://download.gnome.org/sources/glib/2.16/glib-2.16.3.tar.bz2]
-md5=195f9a803cc5279dbb39afdf985f44cb
-sha256=562742a234c7b842d891ec8ed4c9bead093c33863cca01e31912f59f6c8e887d
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.3.tar.bz2]
-md5=195f9a803cc5279dbb39afdf985f44cb
-sha256=562742a234c7b842d891ec8ed4c9bead093c33863cca01e31912f59f6c8e887d
-
-[http://download.gnome.org/sources/glib/2.16/glib-2.16.4.tar.bz2]
-md5=2ab79b3c93258827cc6ea8ee50128e49
-sha256=16ac93dc0da95cb20e4f14507fab688c4be1d23bcd2f28bc069c8ca7dc9d7e9d
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.4.tar.bz2]
-md5=2ab79b3c93258827cc6ea8ee50128e49
-sha256=16ac93dc0da95cb20e4f14507fab688c4be1d23bcd2f28bc069c8ca7dc9d7e9d
-
-[http://download.gnome.org/sources/glib/2.16/glib-2.16.5.tar.bz2]
-md5=039f02d47d4071322a3f00abf031e5d9
-sha256=cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.5.tar.bz2]
-md5=039f02d47d4071322a3f00abf031e5d9
-sha256=cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-2.18.0.tar.bz2]
-md5=06e5afe4ce055085dc5fd9fdab527bf7
-sha256=624b9cfccc14781e699c9a3b2e332a51d63bba392c82d57b510d07a3f702362e
-
-[http://download.gnome.org/sources/glib/2.18/glib-2.18.1.tar.bz2]
-md5=51a9a33f49a4896d4d95d8e980666b9e
-sha256=57a47d4cd19757de0a7764488e6d4d8b0afa4849356a332b721a5219a991a0d0
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-2.18.1.tar.bz2]
-md5=51a9a33f49a4896d4d95d8e980666b9e
-sha256=57a47d4cd19757de0a7764488e6d4d8b0afa4849356a332b721a5219a991a0d0
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-2.18.3.tar.bz2]
-md5=f13996a7bd57525d796a6593f26a7771
-sha256=9f769e8449c8cc1d8789ba987e446bdac3ed22671d71f946c973c7aadccc0b36
-
-[http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-2.2.3.tar.bz2]
-md5=aa214a10d873b68ddd67cd9de2ccae55
-sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-2.20.0.tar.bz2]
-md5=05188e560dbd8bddd568e24ce10dd003
-sha256=6fb4269a187bee6f7825c358fd6f0e0e99e6ad71f7f995ddcbfe9466ec8f6631
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-2.20.3.tar.bz2]
-md5=1173688c58b4b62809c83bb07a2cf71a
-sha256=37f098617c2fac11eee4c6289d576300abd0a01825d4c809462f5b698d1127b0
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-2.20.4.tar.bz2]
-md5=346916673c0eab72191cf44b4afe535f
-sha256=af709f0eabfbbfa5c59a02764ca1dd5e6509bbe7fb67a474b2c448bda7b06fb9
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-2.21.4.tar.bz2]
-md5=5092c5b479ba80065dc164d27e63000f
-sha256=b772e4bdf1b28dd23cdb4c4d7f1d219ddb748226d0207e57c75992bf0100182d
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-2.21.6.tar.bz2]
-md5=3b0452fbd877db53dafabdc074600cb8
-sha256=8b4750523a07102c90c7eecf1743f852ce2aadcb7a43284a9e06baf70beb9b8a
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-2.22.0.tar.bz2]
-md5=e0bc5b08d467cc3763550923087772d3
-sha256=f77cda95fa7cea5e7ad189ac18a165bb3886a66bc5f97c6398a9e5dc16c8a671
-
-[http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-2.22.1.tar.bz2]
-md5=12297a7da577321647b38ade0593cb3c
-sha256=4898d340c830a5903115412ec5b95eb03b410efdfb1c5316d36f12f8be85577d
-
-[ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.6.tar.bz2]
-md5=a45db7d82480da431f6cd00ea041a534
-sha256=d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2
-
-[ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.4.tar.bz2]
-md5=af7eeb8aae764ff763418471ed6eb93d
-sha256=acaff937432e26158c398e888fdcdd4eaf5a16ead75b46ecec194167b80c1fbd
-
-[ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.5.tar.bz2]
-md5=777d2e34a60edad28319207b576cda91
-sha256=ca061bbd41c6484b4b0eabbee08f99e51ebf5f3a0c63e8b0787b8d37546cc2ca
-
-[ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.6.tar.bz2]
-md5=6e22b0639d314536f23ee118f29b43de
-sha256=de4f25424840b8e3b1fb03e6bac0c095affc3ca9c228f8b780817489914bdebf
-
-[ftp://ftp.gtk.org/pub/gtk/v2.8/glib-2.8.6.tar.bz2]
-md5=fce6835fd8c99ab4c3e5213bc5bcd0ed
-sha256=e2da2eec8c87dccdbce16dcd77489d225b613074764f2f39f2815db15b5deeea
-
-[http://repository.maemo.org/pool/maemo5.0alpha/free/g/glib2.0/glib2.0_2.18.1-1maemo2.tar.gz]
-md5=53aab0522a833be6d3c63d1ef8dc1d57
-sha256=dbd1aaa3867f6c1afa2b8686f7ef38239e25aa39f8b4b797c30b43c08696db12
-
-[http://www.cse.iitm.ac.in/~rkirti/glib2.0_2.18.1-1maemo4+0m5.tar.gz]
-md5=87e815f25c79a63e852dc78ef0289c45
-sha256=788366022de42e1fcf3af7150d7c42bf8a8a97d8021addb68e82f6db84401445
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/g/glib2.0/glib2.0_2.20.1-1maemo3+0m5.diff.gz]
-md5=49f0739a891c8cdaf03b373ebbaf6ac2
-sha256=1fe541521d7f5b9039c672f90d2fd8e412cbcc7ee9c1c6bbd7b805b75fd66657
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/g/glib2.0/glib2.0_2.20.1.orig.tar.gz]
-md5=855be1b668ceaec3320c702212c95638
-sha256=442026315d172309884686fe45721a4451d7439f2f05647159f06b9bde3575f8
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.10.1.tar.bz2]
-md5=ee71dedf724dc775e4efec9b823ed3be
-sha256=cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667
-
-[ftp://ftp.gnu.org/gnu/glibc/glibc-2.2.5.tar.gz]
-md5=e4c3eb8343b5df346ceaaec23459f1dc
-sha256=58dc8df59aed1e4d9d50eef9e4c4c0789fa283b50f7a093932d0f467424484ee
-
-[ftp://ftp.gnu.org/gnu/glibc/glibc-2.3.2.tar.gz]
-md5=2d72df1e1dd599dbdf3835b7c2951860
-sha256=dbf0deb003531cbd2493986718a1b34a113c914238a90de8b5b3218217257d82
-
-[ftp://ftp.gnu.org/gnu/glibc/glibc-2.3.3.tar.gz]
-md5=b45c4cfa714a4688c319149c15a1e060
-sha256=0ae1b1dc1ee870d307ae6ad4546778377b04055520d3771dab1290e60ab13286
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/glibc-2.3.5-sh-lowlevellock.patch]
-md5=bb8da838930b8c6d06bafdbaad5dab1a
-sha256=43cb2a382f30d189f0cacb71cbfa0b153a45a49e5fd73330893d24731fca4eb6
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/glibc-2.3.5-sh-memset.patch]
-md5=1acb1e6c444ad45bb1390e7800dc4d7c
-sha256=b301918536819d00b824e134fbdeba3cf4048da060e70e75c8ea56fd92689ad9
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/glibc-2.3.6-allow-gcc-4.0-arm.patch]
-md5=709cb2283068145e557912b0907341a3
-sha256=9dba644da5db0ec5104698706854dcd4ae8d6a10e9419eb049e3d6fcad9d81fe
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/glibc-2.3.6-allow-gcc-4.0-elf.patch]
-md5=79ddbf5e5721442c5753344e4ecdda1c
-sha256=c1ab6923fa4388407cd1dcb2ed441f25c2b9fa18cacf6aad549c31fed3c08f8c
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/maybe/glibc-2.3.6-allow-gcc-4.0-powerpc32.patch]
-md5=b89be3e1653ec6df317e30a10a0933b5
-sha256=0b5dd58a5240440ab6dcc0e2278bb99ebb20d0b558578652da59007bf27ae2fe
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/glibc-2.3.6-configure-apple-as.patch]
-md5=c4d41a712bf40dfb852e7bc18e1b6c52
-sha256=81611592bf30b4c1fa0c58d170d74c970dbc145127e16cb90d648663e2970cbf
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/glibc-2.3.6-fix-pr631.patch]
-md5=336ce18c81fe8d7c17d2f7a0dbd62766
-sha256=9487f1d4c05b9c94d94f8bcb34541ef04b77cfc0526dbb0b344c67f2ab388c5b
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.3.6.tar.bz2]
-md5=bfdce99f82d6dbcb64b7f11c05d6bc96
-sha256=e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.4.tar.bz2]
-md5=7e9a88dcd41fbc53801dbe5bdacaf245
-sha256=27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.5.tar.bz2]
-md5=1fb29764a6a650a4d5b409dda227ac9f
-sha256=9b2e12bb1eafb55ab2e5a868532b8e6ec39216c66c25b8998d7474bc4d4eb529
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.6.1.tar.bz2]
-md5=11cf6d3fc86dbe0890b8d00372eb6286
-sha256=3ded3a3c3ba2cf02d72479a5cc0829c7c261a9d0934e49a79233de9fa276ec22
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.7.tar.bz2]
-md5=065c5952b439deba40083ccd67bcc8f7
-sha256=4224a522ac4ee0fd89eb337e7505e280dfb05e2fe1ad44339ba8874081c0451a
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.9.tar.bz2]
-md5=fc62e989cf31d015f31628609fc3757a
-sha256=098baa84c74af5b21d27ec6e8ba6f1a393de88327cefbcd9e90c9b4edda9a36c
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/glibc-fp-byteorder.patch]
-md5=c89aac92d100761a767b9d5619fe582f
-sha256=3033d84fd9a62d20a8cb0d42645d7cd5a28d2d108afcb4cc2d89db3dc1e328df
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.10.1.tar.bz2]
-md5=8ef88560ec608d5923ee05eb5f0e15ea
-sha256=0fa72d1dd06a30642d3bb20a659f4ed0f4af54a205d7102896b68169b38676dc
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.4.tar.bz2]
-md5=e2d892b40d654c523ab26a26b7dd86a1
-sha256=2f29ec2b2b2f75f787a1eed8fdea20aff212dc3bad97651ca376914c49181977
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.5.tar.bz2]
-md5=8787868ba8962d9b125997ec2f25ac01
-sha256=de77e49e0beee6061d4c6e480f322566ba25d4e5e018c456a18ea4a8da5c0ede
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.6.1.tar.bz2]
-md5=503f1315afd808728ebaa75b3d87a7d9
-sha256=67c98ca1299f5f25eaece256d033e0e63bcf6876b920ca62a1fe61ac62c5c451
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.7.tar.bz2]
-md5=226809992fb1f3dc6ea23e0f26952ea4
-sha256=07de78810a5320d696792b67131c4cf3d6654aee015a6b74820d66fb00799000
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.9.tar.bz2]
-md5=99536b508af988e7cc6275944d12b491
-sha256=27ac255ee701036191118f7a6a4191b24741f5909dccfc9eec4ab611a39e182f
-
-[ftp://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.2.5.tar.gz]
-md5=c766a79a51668d7fa33f175a249655b4
-sha256=c027824ee6593a838e0883bdd4bf8bd455b3dcf4ff0aa77fe82452819d882f47
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.2.tar.gz]
-md5=993efdb74f75990f4a5cb6f7e69c40b4
-sha256=74ec1a4a28f854a27deeb9dfd0673f9d8f8fb948b3db0b45503c287c1ec9d15f
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.3.tar.gz]
-md5=9006b8bff18beb864f6053857f25b410
-sha256=2d7af8211cda81abde3e0bb8ccedbd18924a27b244ff35d4eacafcf899038c56
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.6.tar.bz2]
-md5=d4eeda37472666a15cc1f407e9c987a9
-sha256=6c3bc4a247d1e5308fb14f81956802f09095d3683219859fcad5795aa3aea638
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/glibc-mips-bootstrap-gcc-header-install.patch]
-md5=dc31c9e01df62cba9457af7e9b9c968e
-sha256=a69760ed0ea54b66c31d58cb32c7b23185a6b1d16f38dab8380ec4f2183b122d
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.10.1.tar.bz2]
-md5=816b2d48a95ddc23b27fea03a1996443
-sha256=b1f1ec9720036a3a33598b8478eef102535444a083d5b5813a6981ed74ab4071
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.4.tar.bz2]
-md5=7bb1b35654e94994925e66676acabd4e
-sha256=2fbbcaad8a9f8560485c398a9066959fe2713c8bc7e653ec476fb56fed21d19a
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.5.tar.bz2]
-md5=183f6d46e8fa5e4b2aff240ab1586c2e
-sha256=80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.6.1.tar.bz2]
-md5=53d88ca624642dd267752ccce77b19d0
-sha256=d094028bc6d6691f56b4efeff7cd7e1c7ca10733e0cb5efc36e8fb08d8324bf1
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.7.tar.bz2]
-md5=eaeb8527b8fa286c2d887157214f9998
-sha256=3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
-
-[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.9.tar.bz2]
-md5=7d5d86031cb15403e4d246658209ee81
-sha256=824c97b83f1ec2894ee0e824db6d542c40b978d2f6c4364c7411777e44b15a64
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.16/glibmm-2.16.2.tar.bz2]
-md5=408054366f0acc01014f4c4af2304da5
-sha256=f033f6f39c32fc17ecce63087e41408671a3a43d698c83de2528af3fc7276d28
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-2.18.0.tar.bz2]
-md5=1a0df362e15e7f850b8361b5102f1f16
-sha256=ca6c46b87748cabd61e7d5ef892f09f433eaea324e63637f7de1f0217465cd31
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.21/glibmm-2.21.2.tar.bz2]
-md5=3d0f763e408a71700090fff4d3dd110c
-sha256=5fb1f4f68625811a70fb580b945c2f93925569591af5444eb074aed6956366ca
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.22/glibmm-2.22.1.tar.bz2]
-md5=1a96c7fde75ddbb421bc23fb4aa7adba
-sha256=f105ff4afdcdf7da7f310affdbe698058958f01e94ab65ac1c35e46e20ecb6c0
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-2.8.4.tar.bz2]
-md5=952cdde2d6aef201c528d431036d71e1
-sha256=7ff592b6687caefa367b33d8cb8f66f3c0273fa86d4b688c0758d0d9fee7a2cb
-
-[http://handhelds.org/~zecke/oe_packages/glider_V1.0.0.tar.gz]
-md5=78fe56143bab9a7df232fa15e35a54a6
-sha256=972da0f1c35df459b99b24f5bbed5ddec150b714540e2254b6b37035117167ed
-
-[http://glista.googlecode.com/files/glista-0.4.tar.gz]
-md5=db4afe3ba157232a6debe58885c693e6
-sha256=39289c0fc3efd3b003730212201ce7d8a56b06fcf080188ecc76d4ad9375c807
-
-[http://camaya.net/download/gloox-0.8.1.tar.bz2]
-md5=9054d072f5972d5e567c428531734ad5
-sha256=7f836c8189b55ef4ec8f3387673687d0a5c1a713abc9617144638b28e6857bd2
-
-[http://camaya.net/download/gloox-0.8.9.tar.bz2]
-md5=dc590e34107de5cb296c238afa8e843b
-sha256=9d9ef356cc4478499442573556787125dc76c8acd1e55e5001fb11f1e224d27f
-
-[http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.10.tar.bz2]
-md5=c9f8cebfba72bfab674bc0170551fb8d
-sha256=7fb83a28ae24d4f56eca88bc48f0fe414faee1afb2574bfb6257b52e8c716fcf
-
-[http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.11.tar.bz2]
-md5=78e7c4dc7dcb74b1869fee7897e00f59
-sha256=fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451
-
-[http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.8.tar.bz2]
-md5=3dfbd17203c0c88b94b6f579f24c11cc
-sha256=2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c
-
-[http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.9.tar.bz2]
-md5=e60951628422663e60faeb400f27bac1
-sha256=69d7fb7be4f0f56bd3a67b6c8c88dc677892eb99fd1b13e166b43b39d64764a3
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/glproto-X11R7.0-1.4.3.tar.bz2]
-md5=0ecb98487d7457f0592298fe9b8688f0
-sha256=bbdf932d306065435c98ef5893dc9da46c5929dcdc6ae9a77367ea0f973a8ba5
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/proto/glproto-X11R7.1-1.4.7.tar.bz2]
-md5=26744ff426147b2400b20e5c8b1eb735
-sha256=769fbff3cc640b4ef14823ec3bd1c7364e30b37702cf7df391bdec5fc21666ab
-
-[http://downloads.sourceforge.net/grift/glrr-20050529.tar.bz2]
-md5=a78f1d1ee403ad3bb2959159f7ae0e69
-sha256=2bec403b16ebdcc2a82ea6523eea230e1d651e68094e4bb1af716b36f951ba06
-
-[http://heanet.dl.sourceforge.net/grift/glrr-20050529.tar.bz2]
-md5=a78f1d1ee403ad3bb2959159f7ae0e69
-sha256=2bec403b16ebdcc2a82ea6523eea230e1d651e68094e4bb1af716b36f951ba06
-
-[http://downloads.sourceforge.net/grift/glrr-widgets-20050529.tar.bz2]
-md5=97bd37e930e4e3837ee3fae45a4eec8f
-sha256=62a88525ae1deb3112221c4e1068e8d940afb3b8e5664e353cf3360ab403b845
-
-[http://heanet.dl.sourceforge.net/grift/glrr-widgets-20050529.tar.bz2]
-md5=97bd37e930e4e3837ee3fae45a4eec8f
-sha256=62a88525ae1deb3112221c4e1068e8d940afb3b8e5664e353cf3360ab403b845
-
-[http://downloads.sourceforge.net/glurp/glurp-0.11.3.tar.gz]
-md5=cffb7c11906b71a54d4cd8e9d4bd043c
-sha256=dd419074ed74f5685d1a9d55249544bb3527f7e4ee86facd480ca5b7f3618f30
-
-[http://heanet.dl.sourceforge.net/glurp/glurp-0.11.3.tar.gz]
-md5=cffb7c11906b71a54d4cd8e9d4bd043c
-sha256=dd419074ed74f5685d1a9d55249544bb3527f7e4ee86facd480ca5b7f3618f30
-
-[http://richard.jones.name/google-hacks/gmail-filesystem/gmailfs-0.7.2.tar.gz]
-md5=895ee1c3f02973d39e73ccbee9552296
-sha256=bff4adc856dcd14cc9d50c63177d1dd465ecd71c9d80594c26ff98afbf57b251
-
-[http://richard.jones.name/google-hacks/gmail-filesystem/gmailfs-0.7.3.tar.gz]
-md5=306a58990ae299083bc9d704899ed1c5
-sha256=3539e060e3d02f4732c79c9a02e93898c562e2f2d77828ef4825ac6b1447a444
-
-[http://richard.jones.name/google-hacks/gmail-filesystem/gmailfs-0.8.0.tar.gz]
-md5=828417eb7355b61b0f474eabc826317f
-sha256=69d8553b351c461a8e36ed633aa2da14fdb79423b9ce0e6d3174e5ace09fadd8
-
-[http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-2.1.7.tar.gz]
-md5=ed99c382471294896f576e5f77694142
-sha256=39ef812217a76982947a7ac3b4a97e8303466a3dd93709366d1559e0a7ec8a46
-
-[http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.2/gmime-2.2.23.tar.bz2]
-md5=9f254eb989e0506243da6fde7f164998
-sha256=d5420eef50372d24eaecde93ea4c8ec55f5bf24c9e0f6abbded76e5dbd6a2d76
-
-[http://ftp.gnome.org/pub/GNOME/sources/gmime/2.4/gmime-2.4.10.tar.bz2]
-md5=f0700515d5d715ae6b34289fdca90451
-sha256=59c71aa8d0f06c66f863bc0462868237a770ce30d1402af2515235fa41db51ca
-
-[http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.4/gmime-2.4.7.tar.bz2]
-md5=0fb23dbb1ed6934ab577e90269cd901f
-sha256=bf75214018bb1ae82c797e79d52db2c37a8d3d9f002a737f12960fa2b1022dbd
-
-[http://download.gna.org/getfem/stable/gmm-3.0.tar.gz]
-md5=e543571d8812357374699491014abd58
-sha256=f7fad050ce4641a43c2249fd691e514a0ee6afc09b4ec54c8c30038d0c2783d1
-
-[ftp://ftp.gnu.org/gnu/gmp/gmp-4.1.2.tar.bz2]
-md5=ed39b34dd14014cc504840776af5ba10
-sha256=51ba8551092510ef5c61798584f4cff054e0fbbe7c46fea2c8ff9ea9a52edcd1
-
-[ftp://ftp.gnu.org/gnu/gmp/gmp-4.1.4.tar.bz2]
-md5=0aa7d3b3f5b5ec5951e7dddd6f65e891
-sha256=1a6ed0ea17b24ea8864c4df516d20c41fac97a448559ddee5a8477aeeecca1a3
-
-[ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.1.tar.bz2]
-md5=091c56e0e1cca6b09b17b69d47ef18e3
-sha256=d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941
-
-[ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.2.tar.bz2]
-md5=7ce52531644e6d12f16911b7e3151f3f
-sha256=2b2c0aacafa2dc41f4604b381349d49596921e38a58bf782b0d70b33f548657b
-
-[ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.4.tar.bz2]
-md5=fc1e3b3a2a5038d4d74138d0b9cf8dbe
-sha256=5420b0e558a69a53b36f2b2c70a69f547e075d98366a585fc80cbbcce1efe368
-
-[http://mercury.chem.pitt.edu/~shank/gmpc-0.11.2.tar.gz]
-md5=a7cc8c0734fef9e0b05be76cea3c0a20
-sha256=cacf881ccdbc3fe5568636bf279392b5d339a481a5fb2c03d5c70a2de58f7407
-
-[http://download.qballcow.nl/programs/gmpc-0.13/gmpc-0.13.0.tar.gz]
-md5=dbbb1880feb8b9c2493ece670520299b
-sha256=7b47fd0d2e5a2f2d626b3e9e903ff8a0c0ce7c926925944dcea1f9ca3e6cfda1
-
-[http://downloads.sourceforge.net/musicpd/gmpc-0.17.96.tar.gz]
-md5=8876ca25ae70a379b62b6b407dc4f5ba
-sha256=c04149c5ea4325bf63a847649d9ae5e0ed9b3b6b1804856753b756782e02329c
-
-[http://downloads.sourceforge.net/gmpy/gmpy-sources-101.zip]
-md5=7b2e951912d4bee9613c35244ca32673
-sha256=5cd061fa5d4906d6aa7183393c98d070dc689cbb946c13bebab6d6e4ecdc2231
-
-[http://heanet.dl.sourceforge.net/gmpy/gmpy-sources-101.zip]
-md5=7b2e951912d4bee9613c35244ca32673
-sha256=5cd061fa5d4906d6aa7183393c98d070dc689cbb946c13bebab6d6e4ecdc2231
-
-[http://downloads.sourceforge.net/gmyth/gmyth-0.7.1.tar.gz]
-md5=ab6b7525fd9c71cf5203f9e61abec0c3
-sha256=ce7cbf087b377f027516d90525bbea6130f70b42f176b2d17386b7247b290fdb
-
-[http://heanet.dl.sourceforge.net/gmyth/gmyth-0.7.1.tar.gz]
-md5=ab6b7525fd9c71cf5203f9e61abec0c3
-sha256=ce7cbf087b377f027516d90525bbea6130f70b42f176b2d17386b7247b290fdb
-
-[http://downloads.sourceforge.net/gmyth/gmyth-upnp_0.7-indt1.tar.gz]
-md5=29e58ea47e1548d70e4498cabca249a6
-sha256=f028ae7b331fdac9e5e70e4827fe1bcfa0274a9539e4224a9a49441776b2b517
-
-[http://heanet.dl.sourceforge.net/gmyth/gmyth-upnp_0.7-indt1.tar.gz]
-md5=29e58ea47e1548d70e4498cabca249a6
-sha256=f028ae7b331fdac9e5e70e4827fe1bcfa0274a9539e4224a9a49441776b2b517
-
-[ftp://ftp.gnu.org/pub/gnu/gnash/0.8.0/gnash-0.8.0.tar.bz2]
-md5=b3a3b22d608b5050b1b2743bc348c536
-sha256=ff8c3ca6f297ad4fa7cc8fecea45119dbaf8fef7f95901c04eccbf0d6424ef84
-
-[ftp://ftp.gnu.org/pub/gnu/gnash/0.8.1/gnash-0.8.1.tar.bz2]
-md5=5f80a25cb7a37fb351d28fd2097d8f3e
-sha256=30fb283e707bc209109ca313c83b069b1c482497b62f8c4cc37e9a23e0ba8993
-
-[ftp://ftp.gnu.org/pub/gnu/gnash/0.8.2/gnash-0.8.2.tar.bz2]
-md5=05cac831181be3fb40cbf3c00ab25c0f
-sha256=4c81e71e6619b79da9641a90ed2c73c362603103bcdcc7b9cc5cc53739d06baa
-
-[ftp://ftp.gnu.org/pub/gnu/gnash/0.8.3/gnash-0.8.3.tar.bz2]
-md5=5033ef2602ea1234a9ccb73000a0dedb
-sha256=af1fd8454472e0ac588c015b09c67449392f32aa6297d4a625b8344dce11c39a
-
-[ftp://ftp.gnu.org/pub/gnu/gnash/0.8.4/gnash-0.8.4.tar.bz2]
-md5=b47a7ed4b7c66b8c2ebacc2286ef0d4b
-sha256=6ffe4bdbc22de712e59205a27b46aa93a5372c67829c7f02d6b1c1778e9f9224
-
-[ftp://ftp.gnu.org/pub/gnu/gnash/0.8.5/gnash-0.8.5.tar.bz2]
-md5=366f703c2eb1747e4109602b75439ff4
-sha256=16f272214eed2ab50bcd9507d6299b82ed7d20e7e8eb253ab160e594eeb210b3
-
-[http://gnokii.org/download/gnocky/gnocky-0.0.3.tar.bz2]
-md5=239cfb4b743dc69723acbd01c44e7128
-sha256=fb11b959c039f1a2c5471b2dc1270607acfc15fb667a69c2d4bdb0970b3595bb
-
-[http://www.gnokii.org/download/gnokii/gnokii-0.6.14.tar.bz2]
-md5=89449d613c7a7e765a0d8da57ef1bb88
-sha256=cea63cddf79864d306198c7a84091af0b4685816b352ae253a3e2bfac5e67cb7
-
-[http://www.gnokii.org/download/gnokii/0.6.x/gnokii-0.6.4.tar.bz2]
-md5=7f2a8cee97e62ebfa284363dc93b3178
-sha256=9605f7aee1b8d58cac10dd514c2bdfa340089d85b149db828816d18ac3ebaff8
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.28/gnome-applets-2.28.0.tar.bz2]
-md5=9eb00e9dc468d2c5c71b70c9fb2b751c
-sha256=73aa1d5b9636ea3293d206986115473f30581dd4a937267873573880eb1bec7b
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/2.27/gnome-bluetooth-2.27.1.tar.bz2]
-md5=4a7c977086af47fe43ea08b29ab93503
-sha256=939c8a8f819b8c39e4e355a764b2a47c6959d57029c5134a51a282d7cccd60c5
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/2.27/gnome-bluetooth-2.27.4.tar.bz2]
-md5=e34180aa90d5d718b819572b21b76d08
-sha256=250fede462d5ec0576c0ab9c7f965fb56dc5de6e1180405da8cf0e867a2eca3a
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.18/gnome-common-2.18.0.tar.bz2]
-md5=567172e685fc0783b1d6ab9843a85d6a
-sha256=ba28c1017e7e4212db16ada3f44cb446b6637c9c4fe16c0e2c2a51c94c46bc5b
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.20/gnome-common-2.20.0.tar.bz2]
-md5=89e47677fb72695c75d2cefac84ff9f1
-sha256=0e807cfe74a684c494a0949b7f96d231660f323253a89053e3ec32c4f518c8d9
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.26/gnome-common-2.26.0.tar.bz2]
-md5=196daa38cb21d91da1d6ec085f1e158b
-sha256=f6233ee73886c5ac31890c1a9b9f216e5f14558467dea7b0a61ef3c4cf51d84d
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.28/gnome-common-2.28.0.tar.bz2]
-md5=30daabb0ca4898fea2647999e7813e8f
-sha256=dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.4/gnome-common-2.4.0.tar.bz2]
-md5=9f5163e616b2a02af633de9c82557fa0
-sha256=9509137496606b101c6f570579b9d10ae11f531a8f8d9bfc5d113534b62376d7
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.24/gnome-control-center-2.24.0.tar.bz2]
-md5=6a4f4037a386bb8988e88033d8251488
-sha256=dac690bc6806603fe9e9b9979b0cc8d80c2449c3a8b9f4964f378567d31e06cc
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.28/gnome-control-center-2.28.0.tar.bz2]
-md5=c0e009ed5d94d12a183b61136dd908de
-sha256=d7e925a6247ff03b5c1bbb50aedc8bcf69e7497d6a47c42e1b867e5c6c3b1f54
-
-[http://ftp.gnome.org/pub/gnome/sources/gnome-cups-manager/0.31/gnome-cups-manager-0.31.tar.bz2]
-md5=4144b2cf05e381e89fed066793e3b249
-sha256=8ccfd3816757fa8127cf96a530e374c81a449fbcd9391d2d3e1bac29f54ab3e6
-
-[http://ftp.gnome.org/pub/gnome/sources/gnome-cups-manager/0.33/gnome-cups-manager-0.33.tar.bz2]
-md5=a48eb85cd239760913c936d824062473
-sha256=9d4fdefc8f69c0e1b330bb399b162f1f1005afdadf346e4f5d739de75c660dca
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.10/gnome-desktop-2.10.2.tar.bz2]
-md5=b912a6878ea307af9e3d015864ec0678
-sha256=de8ba10bf7321b70ba5b3bdd45b61411b5a9fbd401fbe639041a875be01bd8f4
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.16/gnome-desktop-2.16.1.tar.bz2]
-md5=e92edb17cd75faca45a4fe2d6806bdd8
-sha256=56c7dbe56e6a9fbcd3730c55892734a9daff23a86d69f49a381a4c965732f9d1
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.18/gnome-desktop-2.18.3.tar.bz2]
-md5=98de3b7d0da690da8b94cddc74f3914b
-sha256=8997a2ceca2dbb28fb402e23ea5f255b68c59ea4f932b253e2843bfe62af7c64
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.22/gnome-desktop-2.22.2.tar.bz2]
-md5=6d6271cfa135ce016126414d929b8fb7
-sha256=4bd3141b2c668b24b43ac10a7a7040ce0717d8f088aee8a93ef261e446d88818
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.24/gnome-desktop-2.24.0.tar.bz2]
-md5=a2cc0424619f271bf1a65cc0fbe782f0
-sha256=7ebe5b0c2bb296386f1d62c3a5d30ed50e353c8d9dc390b77e0b5fdf56e4dad9
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.26/gnome-desktop-2.26.0.tar.bz2]
-md5=796fc830e0baff24381809a7abe012f8
-sha256=3b3fe18bc30ad60f1bbbb2bc2d2ec14a2f9babb9312eb4834395b5839b7d7ee9
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.28/gnome-desktop-2.28.0.tar.bz2]
-md5=73927d3c43d783f5d7d6cdbb4359d7d6
-sha256=976fde6c0764b7b26b633030032b992c4dcbbaefd29d118303de5f7258794ae5
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.7/gnome-desktop-2.7.90.tar.bz2]
-md5=16691f6bdc7c09445c457387adaba1f1
-sha256=6a1499a1e50ac89210a9a1fdb36bc070ef6d1a02764a0f8d90de314dba01972e
-
-[http://hal.freedesktop.org/releases/gnome-device-manager-0.2.tar.bz2]
-md5=b833a90c940dd6cc992c42ad05ca6831
-sha256=fecb3bf79c3f10bebf0601c044344b0105738c1533f5da62f27dc84d0a3b30d3
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.10/gnome-doc-utils-0.10.3.tar.bz2]
-md5=43f3a4086ec1254cbe20b85948192d18
-sha256=19b5b4425bc578af8a1c58b61f1b9a416743d0b1fae3356cd9a0071f1f66632c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.12/gnome-doc-utils-0.12.0.tar.bz2]
-md5=5934c08d12407d8233416343cd73df24
-sha256=6bb8ec068558e380aff1e3f0aa130b52161ad68f8d495fce45c55783bbba9076
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.19/gnome-doc-utils-0.19.2.tar.bz2]
-md5=e2509ab1a7719902cf544cb288df438d
-sha256=ee5798361e4396269820aa7571bcf173e77c454ed2b1a38b9fc1dcbd7f58abae
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.7/gnome-doc-utils-0.7.1.tar.bz2]
-md5=21fe881ab473fdc9246c36bd8ef929b0
-sha256=5b51e0dfae64e7f48883fce6657fcf47a03f6429e2c67024203e31cc29032a22
-
-[http://launchpad.net/gnome-dvb-daemon/trunk/0.1.14/+download/gnome-dvb-daemon-0.1.14.tar.bz2]
-md5=f7a840620f10e5ecf86516c5cb721eb2
-sha256=fc8d5d3918cae739d86718b6e9124dae2ca5ea033a7d3b4e71fc16b2b6463288
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.23/gnome-games-2.23.6.tar.bz2]
-md5=9f13ed34427d4c19d423464cd59dba08
-sha256=af2ebf32fe93817e06333b94d3fabcf72fa5675f402c1bbdb7bed3be0b3b3a3e
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.24/gnome-games-2.24.0.tar.bz2]
-md5=23bf4e795725a74ebb37daacda784adb
-sha256=3105dfb490c187adbe1c14582daa5a134ec672c396af3dd4e0e29cc9fbb4a6ea
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.24/gnome-games-2.24.3.tar.bz2]
-md5=e416e2922fe119c41ec224fab97f7909
-sha256=6ad3c849ea10f47c76cbf9c34a5e413b2549c919c5c388be0c42c59bcf3a388d
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.25/gnome-games-2.25.1.tar.bz2]
-md5=886ab09752d3b420b744865342f07eb0
-sha256=a29eca01be141a9208ef2be3dc497d05faf4d2c0ca3e3d9edeec611ca3388b28
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.26/gnome-games-2.26.3.tar.bz2]
-md5=32c69a25671d8d23b19f234efcc177ca
-sha256=f29849507bd2a29a747b73f412fcbc8c74f3a9b5bf38d4b763b4242ac84cf46f
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.27/gnome-games-2.27.92.tar.bz2]
-md5=306b7d85a9b7985fde570e672edb9e3c
-sha256=88522f18843c5dc7a91b45aaf01ab4ed8e9c79560e1ce1c413560d7343c889d6
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.28/gnome-games-2.28.2.tar.bz2]
-md5=6dcd006d4393524c1e4f39ca0310ac8d
-sha256=7afca16831eff95cf3e9ea4f1344d26ed30b274b89b06403adf0757221b36899
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.6/gnome-games-2.6.1.tar.bz2]
-md5=6ea145547bfd8aa828b22cbbe34cbedf
-sha256=d7a823601f569589437d671d12b1b12f53abc08aeb7d25280bb3242299353086
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/1.3/gnome-icon-theme-1.3.3.tar.bz2]
-md5=e5fbfa461612916143a1321c9e0efde4
-sha256=9d31e7ff0ebed5c7213bf45c5a810656b079ad03ebe3cc8fb952d984a52d6ddb
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/2.22/gnome-icon-theme-2.22.0.tar.bz2]
-md5=a4c03092da28ad53ed3867aef83f29d9
-sha256=98e4202a7745e0533c7a665fc6d2cc6b4ee851debf159a61d8de706b952ac748
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/2.24/gnome-icon-theme-2.24.0.tar.bz2]
-md5=17ba571e5dd83434dc5b2b06ada7b56e
-sha256=b71f89f9ead65a7d3ccb92f6a6c2fb1719be25d6661dd67a14b5d820ee6831b2
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/2.26/gnome-icon-theme-2.26.0.tar.bz2]
-md5=36a4e5e1b2c7c053779a9a399f6146a2
-sha256=4320c937d4d211ac39633aa39b55e770b9a996697c857e2b8033c40323384709
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/2.28/gnome-icon-theme-2.28.0.tar.bz2]
-md5=1b6a782e3f733a5dbb8e62e87a7bdc61
-sha256=31ecbd459ae059672793e46c773742897cb95e22ca5900ccdfb2a22aa30f3884
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.2/gnome-keyring-0.2.1.tar.bz2]
-md5=2fe5fb39cc18d1a6792fd3281223dfff
-sha256=1c6d5a1732742469ec32ab7297f3b8eacfc0f4bfae5fdb096b603877dde12612
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.4/gnome-keyring-0.4.4.tar.bz2]
-md5=dc17fa8b04172d3b1993caa6959a7648
-sha256=f6799acf59bc91054c4832e7956cb3126effdf911f746139478dcfa8ec727653
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.6/gnome-keyring-0.6.0.tar.bz2]
-md5=1e3a3a12b19fc5ebe95363658c2256d8
-sha256=649f2a0d5298b896781d0ac563b8ea1be7f3fe07fd17ea43b0ec0562be47769f
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.8/gnome-keyring-0.8.1.tar.bz2]
-md5=24b15dedcf40c1c60d0fb989370d80ff
-sha256=ad28558e2c0e5496cdfec3f8badf84d64af3aebc3fc9f5632066591e20ce3943
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.20/gnome-keyring-2.20.0.tar.bz2]
-md5=effc946bf3fa05d70b1251801383efd2
-sha256=6fadcd85a16672381857de0e1cf2b6fe16ec3393931f92427deb13153eeabe1c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.20/gnome-keyring-2.20.tar.bz2]
-md5=f37c71974323cc79f59e274d97110047
-sha256=70752dc8b33930655b82392e4f149f93bedf6cbc640b30dcfcf986d43470b306
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.24/gnome-keyring-2.24.1.tar.bz2]
-md5=aa5552dc129f3509ee39145b7f0bf977
-sha256=3c9eb7f45dd0026340635b9e1ee18c36a47541610aa5a7ef604ca645aa4763f9
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.26/gnome-keyring-2.26.0.tar.bz2]
-md5=0395fcf79b990465030a2795dcddacb9
-sha256=7acda11db2eb07b2f68a1a506203fe95141954acb10c394850418fd04ed80a07
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.28/gnome-keyring-2.28.0.tar.bz2]
-md5=07fa253d8506c22640d74eb4fc90a092
-sha256=1b3234f1feac6a619a9a61a0b5f67ab8cd89d94aeeec9a5cc2d78b81d9d8cab4
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.28/gnome-keyring-2.28.2.tar.bz2]
-md5=97ea6823e88b39284187764c1ca95a59
-sha256=d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.29/gnome-keyring-2.29.5.tar.bz2]
-md5=13c0da5743242313400fe86a363a5f69
-sha256=cf63c162845929a1b1f407a334afdafdc2bc3769001d51d214bc22284a9fba9f
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.26/gnome-media-2.26.0.tar.bz2]
-md5=3d519bc7d812aed8f6e4288b6d3cdf26
-sha256=39e7646d0790e05a010da1eb2d7552dcb5311abd72f001477c9c465d7146b9f7
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.28/gnome-media-2.28.0.tar.bz2]
-md5=1a1dc2638012d47f67c0ccac9e3ac719
-sha256=f715947e42f166c4dba1caeb36f897018d638fcd8031fbc2f077e0cd1d6a1a55
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.10/gnome-menus-2.10.2.tar.bz2]
-md5=97b0ad03ea219cc8f5c02585db1d237e
-sha256=0968a399590d94cf9e1640b647cc10f972a3a802cbd9602c0839f56fd2864193
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.12/gnome-menus-2.12.0.tar.bz2]
-md5=615392c4f729f70c03aa3aa7dbe40a95
-sha256=f77192ca0b909000f675ad3cd520c313431ee117d554102c7ea486f76f396f6b
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.16/gnome-menus-2.16.1.tar.bz2]
-md5=a5c467abe68003d23ec09a795ebfd29f
-sha256=72238f33406ada505fde8555ff93c00e7fec055a41500339b434c5445b09c87b
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.22/gnome-menus-2.22.2.tar.bz2]
-md5=2bb185643632b28f4dba4b8201b8e230
-sha256=b3ef17eb05308e35e1627e5ca56b6951e9aea69cf112164ef698cdad6f44ed23
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.24/gnome-menus-2.24.0.tar.bz2]
-md5=1816a0d21ef99d5b3a8bcd033c88f732
-sha256=f19ac5af961be1d6244f9526311af8a67518c7403ef71209dcee94b68f77d58e
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.26/gnome-menus-2.26.0.tar.bz2]
-md5=55fd07e67d8334de2e03e4e23c011452
-sha256=84a97b6d74b14e27888a0f54759e570cb701400c5b176471871bc08a6acafb15
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.28/gnome-menus-2.28.0.1.tar.bz2]
-md5=279316228fd84917acb9405476f74b53
-sha256=75e73554cd0b0a8356956e76ccb517def5382eafa7bdb14336499cd271570dbc
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2]
-md5=541858188f80090d12a33b5a7c34d42c
-sha256=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.4/gnome-mime-data-2.4.1.tar.bz2]
-md5=a8bd52c6876a5294abc402f8a581ac1a
-sha256=74846344de2c24a76408ee9c598dbc75d6c33a02f888f8b5491cb1af9a097cb4
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.4/gnome-mime-data-2.4.2.tar.bz2]
-md5=37242776b08625fa10c73c18b790e552
-sha256=e8ee6534bd142ee0ed55134a5eb95f6e7f4b8640df2d3669ebd202f6d82f9a0d
-
-[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.5.3.tar.gz]
-md5=d4c9de56f77f5cd86ac67ab53e027181
-sha256=8823fe08890b287684c3c16fe06d1be4a3c299bd8bcd9a5ca49063ce8a88a9ef
-
-[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.8.0.tar.gz]
-md5=a431750fe518f4dba882318b680e8e0f
-sha256=093fadbe83af253531b8d96375ec8ab94c3be69e347d3e70d41b921811f718bd
-
-[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.9.5.tar.gz]
-md5=02d01f1cca7ff3af511c59198f3c35a7
-sha256=4cefb2afa08d8e75c1273980e2cad0e13f4b872e2f90019f1ac0d75ec9fa41b7
-
-[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.9.8.tar.gz]
-md5=540630654db044198c435f32c04b1b53
-sha256=b275bae3f75e95e5b4e8b7596a7a362ba0ff9e5028e715540e4215bc8781af60
-
-[http://www.packagekit.org/releases/gnome-packagekit-0.2.3.tar.gz]
-md5=eb12e6eea8413d35c033aedee61b89ee
-sha256=015f415748fa90d51b2bfd2dd41906ee918eb4e5d900d7b6b3ac698e4016e5c0
-
-[http://www.packagekit.org/releases/gnome-packagekit-0.2.5.tar.gz]
-md5=05b03bd236a5bda56ea85122f356a68f
-sha256=ff507ea3421f410ab0faf59b6146f65fa073b01c556f017ce211557b51ba3804
-
-[http://www.packagekit.org/releases/gnome-packagekit-2.27.1.tar.gz]
-md5=7a38bcdfda3e712365f674c51565e845
-sha256=1d77646aa7291dcf8e5ab78955f5e5755faac982e795fa70f7ecf5aa98da6f9e
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.10/gnome-panel-2.10.1.tar.bz2]
-md5=a2719f5c79a9e48bca086f08a77a6889
-sha256=dc60f7f6e9b9ce52ad4e2ce1f7d6dca643590e86e49c749d513d9f8a25068a7a
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.12/gnome-panel-2.12.1.tar.bz2]
-md5=a532717e8ac7f67b7198c256909cd7dd
-sha256=61a01f535b50ca0a4c35b4b59513287f17e0665c0b678952cae663b883b13827
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.18/gnome-panel-2.18.1.tar.bz2]
-md5=6c325f5b5f9f424faa494665720bcfb9
-sha256=c04b53bcc0057ed042169baa725ed3769194864e5824643cc0af8c58cf773d2c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.22/gnome-panel-2.22.2.tar.bz2]
-md5=3d8aab9d476a593e731afcd60272454a
-sha256=e1ecc0ddc5a09481deb2daa1f30fa14472bfed541db46bb4f49f3d0d728b0a45
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.24/gnome-panel-2.24.0.tar.bz2]
-md5=0d246880611a4c58fe2ff99614b96918
-sha256=6d6d0f013594f1d5f685bc9d35ad2c64d7817339a932d8e17eede5b8a3c8196a
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.26/gnome-panel-2.26.0.tar.bz2]
-md5=27965de9b12952b22b7e232af6acb0de
-sha256=e8e21b008d4afcebfc3241d0f91dd2dcc0b171b16f5675fc1b7ed699e79b56f3
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.28/gnome-panel-2.28.0.tar.bz2]
-md5=9f0ea283d44bbcce67dc2e8a02fe9fad
-sha256=c1168c0c8f84692002557d60870c782f4831635080d2c52cd2a3665fb7718465
-
-[http://downloads.sourceforge.net/gnome-power/gnome-power-0.0.5.tar.gz]
-md5=db310dadcc958a781a2752a6a7748e60
-sha256=78f7dc6946e178513202f06afc19496c8ac1e3ac6c43c56c40f4db1a23762179
-
-[http://heanet.dl.sourceforge.net/gnome-power/gnome-power-0.0.5.tar.gz]
-md5=db310dadcc958a781a2752a6a7748e60
-sha256=78f7dc6946e178513202f06afc19496c8ac1e3ac6c43c56c40f4db1a23762179
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.18/gnome-power-manager-2.18.3.tar.bz2]
-md5=3341092fc87ced400631c3d635979426
-sha256=0bcc8a35d52279cd24de93e957bf0f8b3359d096cd891e5bed07cb4b912f920b
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.24/gnome-power-manager-2.24.2.tar.bz2]
-md5=c8971e0c4ed060e0182785321f19b961
-sha256=ebf81236c9405ba47e7a21767c2372f2c3abb44cc671bac8662d2aeb3e746dbc
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.22/gnome-python-2.22.1.tar.bz2]
-md5=02054115dc86617da2a80eb87a1f988b
-sha256=559b5d857b4fbc31418bc677f3391182ba1c357cabb8dfee04a1e709a7a63d01
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.26/gnome-python-2.26.1.tar.bz2]
-md5=e5dcae40b2c291126843680dbed924a8
-sha256=ede0203f1eec22b3ed4a91c7b769e437859e5bc4b89a8f8e80b3f7ca62317098
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.28/gnome-python-2.28.0.tar.bz2]
-md5=b627abbb0ed912e221cc072e3dd6f9d6
-sha256=f2c984587450086dff8eb0a72a8d8c616d51fecfcc790601c35641be140efa0c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.23/gnome-python-desktop-2.23.0.tar.bz2]
-md5=d8f8e61d99402e8b0a82d3c8d6e873be
-sha256=7ad66f99a1bad1ae0bbb02bd7a7cf8ed17fdc3fd104fa5c68e04961459ad5c50
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.26/gnome-python-desktop-2.26.0.tar.bz2]
-md5=fbcf4ef5ec4a8c4eec4d390c5889c80f
-sha256=400a5401a591e271c3357d0a8cb05a7927b4c218130497d06f75df9763d4efd8
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.28/gnome-python-desktop-2.28.0.tar.bz2]
-md5=d97bb3d8e1adc00505be060fbc832f44
-sha256=92948d2dd0d03a56abe565f3c24725242251db261bd0a12aad5a742326cb3c7f
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-python-extras/2.19/gnome-python-extras-2.19.1.tar.bz2]
-md5=08896c63d71ce44d20fafbaf9c0edc78
-sha256=c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2]
-md5=9f3b7ec5c57130b96061cb486b79c076
-sha256=ca346264e00e193f0866cabd8801d3b7ce70dae7b8b296e41e5b3a45c9b0275c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver/2.28/gnome-screensaver-2.28.0.tar.bz2]
-md5=b37d4a210cac22a7312f9736f0c4356f
-sha256=4e1a9c1054a8473b73f2bf3e9adee778e0918e793df6e1c2fa6230485f895412
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.24/gnome-session-2.24.1.tar.bz2]
-md5=5bf6f5753eab034638aee80d993801d2
-sha256=9fc3f6d0dc7e664ff2b1507369183e5d0f1b17fc9f6643bf5e6a3ff8b6e7c211
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.28/gnome-session-2.28.0.tar.bz2]
-md5=b1a2307b02e833010d6c5312b9ff9048
-sha256=83e89a04fb090f1a1f6b609bdc39f1e69390269b885b7da6b32e980f4e765c0c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/2.24/gnome-settings-daemon-2.24.0.tar.bz2]
-md5=2e30e9d17b810103d493e474fbfd20e5
-sha256=98377ed6d7c4abb75b746570f07e00a4346ba6f5924574130211beca764bb99d
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/2.28/gnome-settings-daemon-2.28.0.tar.bz2]
-md5=66c4e3651cb0e022b114d30ac217b095
-sha256=df3203d804c6522f5c76a0e4d7d900595ac5942308fcd924ffcc8c3af436a4d5
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.23/gnome-system-monitor-2.23.6.tar.bz2]
-md5=bc7e7e252465948b122e267713bba4a0
-sha256=4fbd2eccb335fa92487b3307bd83c4f468342f1787856377abbb6ad862271451
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.24/gnome-system-monitor-2.24.0.tar.bz2]
-md5=edd7f02e30683054b94a89aa62c74d1e
-sha256=cf2f96f3c91749fdcec39d3eb89273f6d3a47cc7bc0c5faa0915808409c9d563
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.28/gnome-system-monitor-2.28.0.tar.bz2]
-md5=341c8fda9b518729e04465705da62994
-sha256=638875c6041cd2b0ad7219fecd8fe86eb9d4c8b0662166a84d7659bd6a9db1d3
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-system-tools/2.27/gnome-system-tools-2.27.1.tar.bz2]
-md5=1c44b84966fda9eb7a09bfdd27d191dd
-sha256=6ae2d4c7f649fe17fdae4d5e4c6a08437d708ab17b28cef8a088a9f1b57b4e70
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.26/gnome-terminal-2.26.2.tar.bz2]
-md5=f4f64b9b67c7a3147799ee10f7cf00e1
-sha256=f937939eca0082dc7f3f9ddab72d612433ad948aac7e158ed75f5d7053e8d0e0
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.28/gnome-terminal-2.28.0.tar.bz2]
-md5=9cdc3581a03a44dd693663991d1c1e9f
-sha256=c3f1ce6248e47cac5f3c5c0a79a079d5c7756ba1c4867eb43e20e929087b4a5a
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/2.22/gnome-themes-2.22.2.tar.bz2]
-md5=1989167d700e835fe57993c6be90434c
-sha256=b6047835d6fae7269825028c4f7da2c1ff380c023fbd58ac69fdea8a707bac77
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/2.24/gnome-themes-2.24.0.tar.bz2]
-md5=0dd3fc0d034d7f51379ea6f335d1d257
-sha256=7a7fd49793c790c508cebce5e4ff99c83ddcaa6fd57266ce46ff9ac4cc3b9063
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/2.28/gnome-themes-2.28.0.tar.bz2]
-md5=c89c3e08e45c4e94d76a9a7d40b74214
-sha256=46e8a91464843ab21cade3c470494f3f831932e2b72ca36d484f4fd6efd75a47
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/2.6/gnome-themes-2.6.2.tar.bz2]
-md5=4aae39232d77e1497f3180202b501adf
-sha256=471191e942fdd1d691095c71fb22c0a645b3644c3b2b1c58a6d6f1a2435fb818
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-utils/2.28/gnome-utils-2.28.0.tar.bz2]
-md5=156e38fdf348bf2db4fcb7b84ddcc2aa
-sha256=40c99392e6c06ff31d735c41cf285f02b7b8c0419f1954c533b7da900e7b9752
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.12/gnome-vfs-2.12.0.tar.bz2]
-md5=3323e7472a736716150337d2fc564a43
-sha256=c371e303363d087204e639f4a494bcdd3ea87a25b5d07459052222b08b5f8e38
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.16/gnome-vfs-2.16.3.tar.bz2]
-md5=586d6fe3740385c000a864d5e2cf8215
-sha256=657df4d40dd1c8cbc9a266b9f38fea36019ef8a917eafcd3c38c840b8e9c7777
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.18/gnome-vfs-2.18.1.tar.bz2]
-md5=bf4a6d95180d05981893e5d021c6695c
-sha256=098d920cb7d4a50e245deaafabfd8e06b86c88771d56be567597c09c09207f5e
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.20/gnome-vfs-2.20.0.tar.bz2]
-md5=b9fe0a066d0e693e74a000e55338235b
-sha256=cd95ec5a4808799f033dcb9daf37ed38436c594d4014e5804967fa9e5893e91f
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.22/gnome-vfs-2.22.0.tar.bz2]
-md5=369105fd82cb99e69e63acab8f3b89b7
-sha256=622cf50cefa2c4187e0a23f29d665f010f7a0815864fc35a61caefd5a7d4ebb1
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-2.24.1.tar.bz2]
-md5=100f9af16dc659e375ee8da45175a28d
-sha256=bc59144e303b152b84b86f209347a3e87a91d5ed7172d8503ee19c232dcabeb6
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.6/gnome-vfs-2.6.0.tar.bz2]
-md5=4d0323cf015dd006210fcacd4bfe7420
-sha256=e2094c83a810319674e9c5ea24ac1325e8ea31e3df2e2efd41c70a07742caa6d
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.6/gnome-vfs-2.6.2.tar.bz2]
-md5=61bf3e145652089c63edd423ecbc9eba
-sha256=bd6b432e48532942475ea9cc814131054de1b30e8f5520017a42369ea2224c89
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs-extras/0.99/gnome-vfs-extras-0.99.13.tar.bz2]
-md5=29f6997c0523254b54f8d36f0361b824
-sha256=482bda65d8083a66f84d88d808388fac34b2c5d808676105d200ac9049efb82e
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs-obexftp/0.4/gnome-vfs-obexftp-0.4.tar.bz2]
-md5=6e38828738301fb3ec88c0461ff53a60
-sha256=2a50b2bb76c521f588e14ee2ed5411f5abad750050d929dcea32ebd0de3499f8
-
-[http://downloads.sourceforge.net/gnomebaker/gnomebaker-0.6.0.tar.gz]
-md5=351363497017121d3a1d43b0e3a0f515
-sha256=b1639296a7c5de7fbc37464ed70d68007edcb884eb4b5983a1c5f9028f50fb0b
-
-[http://heanet.dl.sourceforge.net/gnomebaker/gnomebaker-0.6.0.tar.gz]
-md5=351363497017121d3a1d43b0e3a0f515
-sha256=b1639296a7c5de7fbc37464ed70d68007edcb884eb4b5983a1c5f9028f50fb0b
-
-[http://downloads.sourceforge.net/gnomesword/gnomesword-2.1.2.tar.gz]
-md5=ce1171f19a40256cfdd31f42c979d91c
-sha256=77cb4bd39a4cec2aa3d61b0519134f9e4a65613960b3b3ee34dd2452d5e12ba7
-
-[http://heanet.dl.sourceforge.net/gnomesword/gnomesword-2.1.2.tar.gz]
-md5=ce1171f19a40256cfdd31f42c979d91c
-sha256=77cb4bd39a4cec2aa3d61b0519134f9e4a65613960b3b3ee34dd2452d5e12ba7
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnote/0.1/gnote-0.1.2.tar.bz2]
-md5=905a8df3513a519096bcf7d8efc35118
-sha256=f08d0f214db875eac602bec37b20042f0ee4f14427f9559477a040ef39003538
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnote/0.5/gnote-0.5.0.tar.bz2]
-md5=ca9e67a92945af7230eae72b2e8430ec
-sha256=19a1f79c42b37ee3c90ba6298442b52438f1c67d311ebd33db72210cee2d99d2
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnote/0.6/gnote-0.6.2.tar.bz2]
-md5=f58bbfd7f1665690198a07499556290a
-sha256=6a2af8f4e4f0d68e67cef8c796dd4a048d99601d7192d19127a88e273b91b648
-
-[ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-8.16.tar.gz]
-md5=c42dfaebc37fe81eab0b5676b124ab63
-sha256=417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8
-
-[ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-8.64.0.tar.bz2]
-md5=e62a3a6db85be6473c99f0e7fecd3ee1
-sha256=618b4eccb9f7d5e4991c8f099e1778471408759ce1e796ea464ae9011cdd242d
-
-[ftp://ftp.gnu.org/gnu/chess/gnuchess-5.05.tar.gz]
-md5=008820142c414517512ab0ad3e036c8b
-sha256=d97ee0f1c45e1bfa880305a33e7e0ef695927094adce100cc76a76a0f57ef789
-
-[http://members.cheese.at/woody/fltk-chess/gnuchess_5.02.tar.gz]
-md5=01a9e1dc12613543f10ca3bc09acc0af
-sha256=64483bf3e98124e3490509a6054da0ff70b69ca0baa04f53444d7cf054deee06
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.6/gnumeric-1.6.3.tar.bz2]
-md5=78ffd75ae6abc3bb20dd04407a082a26
-sha256=badaa6899f71ef112515ce81aee02e559e18b5fa87c7f2262390764aaf9b1dc0
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.8/gnumeric-1.8.2.tar.bz2]
-md5=f60edc6ca42daa2fb3717f3c90fa8a6e
-sha256=8418ed3a2e8dad923a6626d22eaffe796aab9cbcf827a17ab95bf99956e22a6d
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.8/gnumeric-1.8.3.tar.bz2]
-md5=3ce6ba6483ccd6fe9974cface582337a
-sha256=173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.8/gnumeric-1.8.4.tar.bz2]
-md5=338f0084f04a16f78797ad01f85d3251
-sha256=a3c7fdbbafa6c9cfee7f16c067b043c3041cd0240292aa92b653a2221ae04503
-
-[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.9/gnumeric-1.9.14.tar.bz2]
-md5=6781d0df02e603c556758d90e96e37f6
-sha256=0f934eddd2204f938f0359d8c39ef590ab4fec60d6922853e6c8c23e3069d7f4
-
-[ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-4.0.0.tar.gz]
-md5=66258443d9f93cc4f46b147dac33e63a
-sha256=a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48
-
-[http://downloads.sourceforge.net/gnuplot/gnuplot-4.2.3.tar.gz]
-md5=6b6d22662df5101b308c465a722c43ce
-sha256=4aae09bf99ab2642308b0042eb18b75bc18ff33969a7431bba60b09cc2f600f4
-
-[http://downloads.sourceforge.net/gnuplot/gnuplot-4.2.4.tar.gz]
-md5=3cde3b9232a2d81715bbaf75e1c87ecc
-sha256=2a20701410a21307c404a9d10ad9fdf699bb92fa0a919797213208d80b080913
-
-[http://heanet.dl.sourceforge.net/gnuplot/gnuplot-4.2.4.tar.gz]
-md5=3cde3b9232a2d81715bbaf75e1c87ecc
-sha256=2a20701410a21307c404a9d10ad9fdf699bb92fa0a919797213208d80b080913
-
-[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.0.4.tar.gz]
-md5=d04b446fc76687272e64259d36d78b0e
-sha256=2374cbf6df3568d7cef16ba6a11802e52e37d88719f704dff40d4fff9f81d313
-
-[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.1.2.tar.gz]
-md5=0208be69c598b37c8a0c4f59437e55d9
-sha256=f215b31c55da6f6111ab473565689eb3d0e23523a20a889efefe5ac612a8ceeb
-
-[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.1.3.tar.gz]
-md5=c1eb3de26b67ddc08a61a7c2fc636203
-sha256=36480bce862b6d424f4b34bbfeed838b80bcbb484602dee43c412a7d0dc4b42b
-
-[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.1.tar.gz]
-md5=f0721c5dce7cb02c75ac4e7bb9cc0ec9
-sha256=a12b0fcd08508a85ee7ec7003ec0f3418378d479304ce85e8453d46bacc0ce9f
-
-[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.tar.gz]
-md5=9d91d0f8f2cb35bc86435784fa8e72d8
-sha256=a780490056b1f1f95c7bf91e175773e00f4be23e1b7e5147ccd507b6f32097af
-
-[ftp://ftp.gnutls.org/pub/gnutls/gnutls-1.4.4.tar.bz2]
-md5=de5e060eeb2da36654e9e8af6b8b012a
-sha256=dfcdcd622b80b00d28ee40881ee56fec771213110b7fc07048bce07df7cec035
-
-[ftp://ftp.gnutls.org/pub/gnutls/gnutls-1.4.5.tar.bz2]
-md5=30b8449e079c50a952926fd288dc6773
-sha256=88580ab55ddcb2c6f3585ef22e3a349f453d15ce546549f9dae34d333b6d7341
-
-[ftp://ftp.gnutls.org/pub/gnutls/gnutls-1.6.1.tar.bz2]
-md5=fc3cc2509aa93e150cafd39619de7428
-sha256=7711a351913731db25e12b20bc6f51e488f28df9c2673efdfa6e35034884cb41
-
-[ftp://ftp.gnutls.org/pub/gnutls/gnutls-1.6.3.tar.bz2]
-md5=73da68a4248d34c4d38491ce2119af0f
-sha256=885b22a93b97116cd69824b91905dd909828943d78de069508a56cdf0d8d9203
-
-[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.2.2.tar.bz2]
-md5=90fb4b7c74d29bb6ee5bd8de85942f42
-sha256=cbb0e76c28a8b8ee93d49e1fea4cb31549904d95cd8f488309126f7f5046d616
-
-[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.2.3.tar.bz2]
-md5=71d9b7ec32a2a67854940a8848c2b229
-sha256=cc78e52e9afc3006e4d97bf1c4e232fa6253f8be15ee6ebb7272ce885213f34b
-
-[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.2.5.tar.bz2]
-md5=ebd3dc3ed4dffde781a2dc4eb4e39f3b
-sha256=cf2689bd5b5f095e27f7a1aa2246212ef9322c0707aeb104238e9eb0f925ae57
-
-[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.4.0.tar.bz2]
-md5=dce4000841ba5f80d310c4972b5f3efe
-sha256=c682bca6f1ccc28bdc15751168893e0b28107217b275168b456d519292e44d87
-
-[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.4.2.tar.bz2]
-md5=148bde1f43cae2ea4265439df0da6399
-sha256=1c70e916c691c7c31ea3c8f2abeedae6c7dfda754e02b373287ceb5b46bfbb0e
-
-[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.8.3.tar.bz2]
-md5=72b77092c5d1ae01306cd14c0f22d6e4
-sha256=f08f49d6f0df2618bb4f995e73d2e1fe0ae5a999939b38954b067111da7d7998
-
-[http://ftp.5z.com/pub/gob/gob2-2.0.14.tar.gz]
-md5=f8721af6f4e90ff48bd7cb4c96a5a94c
-sha256=c2977b18d1166c62e3f04373feefc0e2af704da3cb98e32612be4a55fd77a3f9
-
-[http://ftp.5z.com/pub/gob/old/gob2-2.0.14.tar.gz]
-md5=f8721af6f4e90ff48bd7cb4c96a5a94c
-sha256=c2977b18d1166c62e3f04373feefc0e2af704da3cb98e32612be4a55fd77a3f9
-
-[http://releases.0x539.de/gobby/gobby-0.4.1.tar.gz]
-md5=a2c79bdda652a2d74fec104235d27bc0
-sha256=aad2ed23638f5a6aa655dc13395228cefc4c28e46b05eb05ac12481fac36aba3
-
-[http://ftp.gnome.org/pub/GNOME/sources/goffice/0.2/goffice-0.2.1.tar.bz2]
-md5=73b733556db5721ddfd5c72fc6428a15
-sha256=158258dcb85fd4f3e4ee5a61df49560f8b65d94682ef9322cbb20fb2d3e93034
-
-[http://ftp.gnome.org/pub/GNOME/sources/goffice/0.3/goffice-0.3.2.tar.bz2]
-md5=bb86c6ee2d953da77519cac4e1a5c609
-sha256=fb35c1ae8dcd8cf81836a65536b7f62a274a90ccab6f579519c0885a575095bc
-
-[http://ftp.gnome.org/pub/GNOME/sources/goffice/0.6/goffice-0.6.2.tar.bz2]
-md5=f52d78cffbcfc3c13336fd308ea3926e
-sha256=b126902259875a24ece29bdf1f93cc7fd4fd7b83508cae1c15dabd10b4d537cd
-
-[http://ftp.gnome.org/pub/GNOME/sources/goffice/0.6/goffice-0.6.3.tar.bz2]
-md5=3d8d3357f9d58af901cd1d6eb42e2973
-sha256=a252aff88d801175b27fd7c20e00b0b5f674a5a70e64cd95091abdcab87db35c
-
-[http://ftp.gnome.org/pub/GNOME/sources/goffice/0.7/goffice-0.7.14.tar.bz2]
-md5=c48a89bfceeb604f163aa55540088021
-sha256=0fe2f4d7c39e85b5b577c6fa7a88c9a135ae5819cc521083af888e4c23deaacd
-
-[http://downloads.sourceforge.net/grecipe-manager/gourmet-0.15.2.tar.gz]
-md5=d18be0dd5faf7249f657c4cc87105c31
-sha256=d1130c71a876f333707aa8dd8b9689a0aaf115e782ec4a033359eb2995942848
-
-[http://downloads.sourceforge.net/gparted/gparted-0.3.3.tar.bz2]
-md5=f3d16ccfda72fa1dac9fa1ff9ded2c42
-sha256=c7c86abd344055bdf1f840a037d04064759f52039cb075260b60369b721f245c
-
-[http://heanet.dl.sourceforge.net/gparted/gparted-0.3.3.tar.bz2]
-md5=f3d16ccfda72fa1dac9fa1ff9ded2c42
-sha256=c7c86abd344055bdf1f840a037d04064759f52039cb075260b60369b721f245c
-
-[http://downloads.sourceforge.net/gparted/gparted-0.4.1.tar.bz2]
-md5=38762b12b8dfeb0518e24b470b1b5675
-sha256=333f07ca8579f69f6b79e2ed1cf28c6b9353a64f7bab458950d7667abb3d8a3e
-
-[http://gpe.linuxtogo.org/download/source/gpe-aerial-0.2.11.tar.gz]
-md5=4b06838f0ad963f8c01640e8311130cb
-sha256=30be2c450915938957bcb077bc5cf17b84eb9163ebe043e7324c359fb965c721
-
-[http://gpe.linuxtogo.org/download/source/gpe-aerial-0.2.12.tar.gz]
-md5=dcf115e16bcc393b2b45fe34ef06fdbc
-sha256=6280881516f851edb075882d8114bd9bee6906b924a9923645793e937e4d6e68
-
-[http://gpe.linuxtogo.org/download/source/gpe-aerial-0.2.13.tar.gz]
-md5=528f95a23999a248f4425436d67585a7
-sha256=0cd7a9229a0c583dc9dc74ef3a2c542ee5f64f8e6c641d50cadc11c664c0c109
-
-[http://gpe.linuxtogo.org/download/source/gpe-aerial-0.3.0.tar.bz2]
-md5=b0d4967f8d0af9d2c647ce6cfa2c7ab9
-sha256=c22a17a07acfa8f2f7243afe6e00005e09a4ebe8adeb78dbe83c06ccbfa7ec0f
-
-[http://gpe.linuxtogo.org/download/source/gpe-announce-0.10.tar.gz]
-md5=3791be9e14d08687fff3d6520cbd4e09
-sha256=a332aa05f21c9e977cf07bbe0a9a81e64fa0e3f8b807531609448f09976d8b2a
-
-[http://gpe.linuxtogo.org/download/source/gpe-announce-0.12.tar.gz]
-md5=111714426410274e8ba1a9abe2804d90
-sha256=8895c046511d06c47dcc8d8608cb220e0b608cede1ea169174ab3bc451d111c5
-
-[http://gpe.linuxtogo.org/download/source/gpe-announce-0.13.tar.gz]
-md5=74ca3a6e37c9d9ae9fe2c50fc6d8350f
-sha256=63490b00244b0e6d7b54205e0d27ab22784ad0b328c7fa3e56aa0133677884fe
-
-[http://gpe.linuxtogo.org/download/source/gpe-announce-0.14.tar.gz]
-md5=4ec782fb49dd0e5549817d9e8601f9fc
-sha256=447c23943d4c004ceb25c7079058f79e270915cf6650e31c92498865dbed22a6
-
-[http://gpephone.linuxtogo.org/download/gpephone/gpe-applauncher-0.10/gpe-applauncher-0.10.tar.bz2]
-md5=466f9316024ed82ee1921b56376f04ce
-sha256=916ef522cbd2af8cc9623c2e4a34a8d1e45f9852bbb63a40ac056ba2c773eada
-
-[http://gpephone.linuxtogo.org/download/gpephone/gpe-applauncher-0.11/gpe-applauncher-0.11.tar.bz2]
-md5=e02616d1fbbeb441187f3e2db17517ca
-sha256=a5186b3099643f74e41e2a805489df8edc453bf1ab6eae1cef821a5b814e5035
-
-[http://gpephone.linuxtogo.org/download/gpephone/gpe-applauncher-0.7/gpe-applauncher-0.7.tar.gz]
-md5=2eaedfe736b88624c360ddda2b6fa777
-sha256=2afd5a23705fe95f6abc12e842f2ebaaa038bd4c8cf8a971a848a48a14e100bc
-
-[http://gpephone.linuxtogo.org/download/gpephone/gpe-applauncher-0.8/gpe-applauncher-0.8.tar.bz2]
-md5=a4f874b54620e3a5f6c6cfac9e6ba87c
-sha256=2955cc5249550f44af484a21aad970b923a5d27a9326f63ed285191a8472239e
-
-[http://gpephone.linuxtogo.org/download/gpephone/gpe-applauncher-0.9/gpe-applauncher-0.9.tar.bz2]
-md5=afe554c858175317266701fd18a30a68
-sha256=e6d323d29dded45661e158fce101fbc557c88da56ffdd2576934dcca81464edf
-
-[http://gpe.linuxtogo.org/download/source/gpe-appmgr-2.8.tar.gz]
-md5=2dd3d56eee8905451e9c31cfda620f7a
-sha256=1a797188e9786936c32fee6ba3e20f01d562583f6407cf8d83f729ab708e1342
-
-[http://gpe.linuxtogo.org/download/source/gpe-autostarter-0.11.tar.gz]
-md5=d993818295e00754592ee6c13db4a723
-sha256=702c3336d96fb49678c1b0a95e16c76e398c63f58c947df6ba275e9cacad4629
-
-[http://gpe.linuxtogo.org/download/source/gpe-autostarter-0.12.tar.gz]
-md5=254a580e67d8e804adb3583281ae8586
-sha256=532e1b0122c845295987deddf72ebbfd3c319f6b714f033f5daa74f068acb1f2
-
-[http://gpe.linuxtogo.org/download/source/gpe-autostarter-0.6.tar.gz]
-md5=798085fd2e2b25f5145a05104d39ebc6
-sha256=8ce9aee873a337f876f82d54eb10a258911a03b3abb4eb79f9b2f04c8c304bbb
-
-[http://gpe.linuxtogo.org/download/source/gpe-autostarter-0.7.tar.gz]
-md5=f098c17601426c696f45c1b244fa1f73
-sha256=094157f59ac1a5146953bc74e5dac9f4b28fa14545bc12df87899f61cdfe18d6
-
-[http://gpe.linuxtogo.org/download/source/gpe-beam-0.2.3.tar.gz]
-md5=6133ef2870d2a9eacd967b1d4c3c066d
-sha256=8521f9584b83133bee7fd7c330d043e22139941cb6ee3147717e28091db23f6d
-
-[http://gpe.linuxtogo.org/download/source/gpe-beam-0.2.6.tar.gz]
-md5=4bd3894de194ee023a4c7af6c2a2e9cd
-sha256=86a0fe68a93308b6d5c0e19da85789a6e48d88ba08dee98516f21b3b0ed85854
-
-[http://gpe.linuxtogo.org/download/source/gpe-beam-0.2.7.tar.gz]
-md5=d68b45964816a6a3d98d1501bc520b6f
-sha256=386dd48c7bce7900291c27deef3a68fd00257f6072a1644517ce49a4b0cb1936
-
-[http://gpe.linuxtogo.org/download/source/gpe-beam-0.2.8.tar.gz]
-md5=2730dc64c643d4503346eca41bf40cc2
-sha256=056227431c47301b9ebfd9e12a5b2597d0f625697299b7027babf81d335b9d45
-
-[http://gpe.linuxtogo.org/download/source/gpe-beam-0.2.9.tar.gz]
-md5=a22e4b7ca7d5730e564cb92146de4b86
-sha256=656685f167454f577a5b6441ffb55a51d38b53a4b449fde7758a80852cfc0bc7
-
-[http://gpe.linuxtogo.org/download/source/gpe-bluetooth-0.49.tar.bz2]
-md5=fd8e7708a0ca7ef70b60741ad210c4c2
-sha256=0f6a83697edbab14ee47d9f2a84de12eb66a1f76169328b2410b2cb90604a487
-
-[http://gpe.linuxtogo.org/download/source/gpe-bluetooth-0.51.tar.bz2]
-md5=202ddaf102791f504e543593b88eff1d
-sha256=d6c2534e5e54bb24dbdb0e28085f92a076532a890655db7d37a56aa64d73e521
-
-[http://gpe.linuxtogo.org/download/source/gpe-bluetooth-0.52.tar.bz2]
-md5=ed12955524a0f65f83b33b23f260cf94
-sha256=7d85be0973837d5499f0410179f84ac1351dba88eea22eabb13f86b65c7250ee
-
-[http://gpe.linuxtogo.org/download/source/gpe-bluetooth-0.53.tar.bz2]
-md5=274dc2392120177ab88c5ecaca92ffde
-sha256=a20f1fc9b1f5d1a2d6e4cd85cf8e81301f63dc94f93b913318a737752be3f545
-
-[http://gpe.linuxtogo.org/download/source/gpe-bluetooth-0.54.tar.bz2]
-md5=197603d957dda95a92c92038fb9f8341
-sha256=5ffb41e7375c55450fc55428fd7b19e158a93ee91ae6b9519953363ec05f82c7
-
-[http://gpe.linuxtogo.org/download/source/gpe-bluetooth-0.55.tar.bz2]
-md5=33faa8e3650bc82dec54da1f4d7654d7
-sha256=f509c52ba12d378cba031e280d59489dbd7d5e08ff3dd22d14f40d669db0668c
-
-[http://gpe.linuxtogo.org/download/source/gpe-bootsplash-1.13.tar.gz]
-md5=8be734730d5c241bc36fa9b65b1445a8
-sha256=842d0c6d40201cba0361b9a2d85e4e3363d9de34601d054e42582c82c637d239
-
-[http://gpe.linuxtogo.org/download/source/gpe-bootsplash-1.14.tar.gz]
-md5=cc11d81a1772cbf5629028dd39419abf
-sha256=3926b7ef0ccd68d6bd83797ca925945673e4ca0a938302d265ed0e4b1eea5657
-
-[http://gpe.linuxtogo.org/download/source/gpe-bootsplash-1.15.tar.gz]
-md5=205b47792c4adc4e1d07d6e4ce8cc466
-sha256=586c4635a104e6566284d5edf5d64fbd6d944a92b5c1b493baf16e78db540060
-
-[http://gpe.linuxtogo.org/download/source/gpe-buttonbox-0.5.tar.bz2]
-md5=c5c4bd13cbe72f05b72f182bdb466d96
-sha256=2a40c9cff09def44f3032d9165c0040ff13efef84f6b8a5940c787bd43391311
-
-[http://gpe.linuxtogo.org/download/source/gpe-calculator-0.2.tar.gz]
-md5=6dc5eed9b200a45cf007f7a7ed4c2d23
-sha256=e51bdbba46d7d6950c1f4d3139a167f4c823e403f8a53b30a16cea32c7d540dc
-
-[http://gpe.linuxtogo.org/download/source/gpe-calendar-0.72.tar.bz2]
-md5=b10a91ce3fb39b87656fc5c5510b68d6
-sha256=780ddb4f2bb72e3e8d970ebc647c8040cfef0fccd405773cf7776074c26175b6
-
-[http://gpe.linuxtogo.org/download/source/gpe-calendar-0.90.tar.bz2]
-md5=e2834f77e3e9a476fd9a114411cdfa22
-sha256=b70e8a2d20c206cfc978d918d73356a4a46f948ce109714d07b82c5327308498
-
-[http://gpe.linuxtogo.org/download/source/gpe-calendar-0.91.tar.bz2]
-md5=478ed24de48860712f45563640041301
-sha256=75581218e2871c8bd1ab645977318050d9ba60c5cf632a51c05c4339fa9365ae
-
-[http://gpe.linuxtogo.org/download/source/gpe-calendar-0.92.tar.bz2]
-md5=7fbe3cf31139b52f755f613c2006ad7e
-sha256=13cd337f72215fc51eca9ab24bd7c7c7fc70b2ff27e23709ffae811d489e078b
-
-[http://gpe.linuxtogo.org/download/source/gpe-clock-0.14.tar.gz]
-md5=367d329ff8af75abcb7f214e9b669c9c
-sha256=fb5790c58430e1ce9cfdccef117de4937c35a411894642aea622638519e5b764
-
-[http://gpe.linuxtogo.org/download/source/gpe-clock-0.20.tar.gz]
-md5=3084a12de394a252048603128afe7c08
-sha256=a6e74b2a9a7ccc24e095dbbc473c9ad7e69e06e8a30cd9581941763a75237b78
-
-[http://gpe.linuxtogo.org/download/source/gpe-clock-0.21.tar.gz]
-md5=b0b2c843a562f72df32a66993a215e3c
-sha256=ff0dfe70c1ac68180dfb26da83d9aee9f0e9007d428dae225abe7dc3bba512b9
-
-[http://gpe.linuxtogo.org/download/source/gpe-clock-0.23.tar.gz]
-md5=050943c68ee61ef8f2a25410a60d725e
-sha256=5a1d21538353fbb2038b3948385fa32faec1951162cd0d2c52a2687c7fc6669b
-
-[http://gpe.linuxtogo.org/download/source/gpe-clock-0.24.tar.gz]
-md5=4e51de389b881d730f56d439e8573271
-sha256=2d40ea6851c2b90261b88941dc7a8ee83c4a333e7a2acdd4eb0afbc87b5e5da1
-
-[http://gpe.linuxtogo.org/download/source/gpe-clock-0.25.tar.gz]
-md5=75e087fcf8345cf1bfde7e172844e949
-sha256=0070e1c622f3f0cf9c40556f551de3e6059c7f8b3070516c0e4173dd09f57759
-
-[http://gpe.linuxtogo.org/download/source/gpe-clock-0.27.tar.gz]
-md5=93fcd53df14e2005edbadeb128d0a274
-sha256=c4c8a6d759e06ce9fd339ccd75479c8b62c9da434c4bb1246832419e5068e1df
-
-[http://gpe.linuxtogo.org/download/source/gpe-conf-0.2.3.tar.bz2]
-md5=beec965857c6fb5f55dd2a322cae7e37
-sha256=75bfe61f49bad95ff4220581c04af4fa3617cb639d98141d833e6aef68b77468
-
-[http://gpe.linuxtogo.org/download/source/gpe-conf-0.2.4.tar.bz2]
-md5=c8685a71cfba4a78dd7eecd29e52fa72
-sha256=ffdc3070784c50487c0463d2c166da340f6f94eede18c37883c6c5bac3d5338b
-
-[http://gpe.linuxtogo.org/download/source/gpe-conf-0.2.5.tar.bz2]
-md5=11b9e8b7d7978fc44e5f079e7daa657f
-sha256=6a246caeb7d29c2afb48e8c70ef8e1f2ba2a4642faeef3defd266522304d278b
-
-[http://gpe.linuxtogo.org/download/source/gpe-conf-0.2.6.tar.bz2]
-md5=849e9c42564174921f9bc9a1b08722ef
-sha256=0d46c8ec7b443d37630ef0625df3ac824f590a3048c6b973be83c305ab4de079
-
-[http://gpe.linuxtogo.org/download/source/gpe-conf-0.2.7.tar.bz2]
-md5=7fe086de357f209df9413fb07a515724
-sha256=f69273239546ea212f862e0c86a8288f63dad78359ce3c1081b98bddd778b378
-
-[http://gpe.linuxtogo.org/download/source/gpe-conf-0.2.8.tar.bz2]
-md5=faa798f698eead5f1fd31619b95e33ea
-sha256=0f8c72783b2faf51c3f1a71dfedc0eab26097d7bf8924ebee7615bfce5725491
-
-[http://gpe.linuxtogo.org/download/source/gpe-confd-0.16.tar.gz]
-md5=2677260df7d834ec416450e09ae5ba72
-sha256=9ffba12d92466f9e34fed21e38baae5cbb6608436ee53fa3704fe3be5fceb4af
-
-[http://gpe.linuxtogo.org/download/source/gpe-contacts-0.40.tar.bz2]
-md5=bd846bb88824dc58c7919e4354ab9b11
-sha256=6fcbd13db6ee9c4b01504c4f7fcc940b5634775c71d61db98b8daf4ca71fff67
-
-[http://gpe.linuxtogo.org/download/source/gpe-contacts-0.42.tar.bz2]
-md5=3df07fc223f781fe7d6e3e9ec820ecd2
-sha256=e2c141aba89e8e0c88c2b4b7af3bf3a62d95a3e74d8564715e2175fd86706547
-
-[http://gpe.linuxtogo.org/download/source/gpe-contacts-0.45.tar.bz2]
-md5=8d7af11536ce8d7a732ed62d2b36bba6
-sha256=f35c5e664ba0e9c3b3d694cdb1ee9af7c9195b6ace8e2ddeec0a0c21d7632df0
-
-[http://gpe.linuxtogo.org/download/source/gpe-contacts-0.46.tar.bz2]
-md5=5fcffd454e9c8f0b14804283c32da0ee
-sha256=5ceab2c275036da754ae7b7cbe162f9f2a5936334050beb34838d4f82e89843c
-
-[http://gpe.linuxtogo.org/download/source/gpe-contacts-0.47.tar.bz2]
-md5=c956ed93b8a163c046e9a7c19256432d
-sha256=aa9656db3e46b27abf7564f2a04799f4b32e4c342e3036d069d456b103717bc5
-
-[http://gpe.linuxtogo.org/download/source/gpe-contacts-0.49.tar.bz2]
-md5=baa489f258844a65167e75345857acf6
-sha256=9d98d52c3915ca966abd02208847d50f7190aab6f95c5f156f7c20285fe2d9f6
-
-[http://gpe.linuxtogo.org/download/source/gpe-dm-0.48.tar.gz]
-md5=92e81fc34bb4643088efeaf1f6423483
-sha256=4a78e69b44209d1c79a8649024584175aea518e5862d39c582944719a9a5e995
-
-[http://gpe.linuxtogo.org/download/source/gpe-dm-0.50.tar.bz2]
-md5=f7b53abf39bd3fa48cd3e0378bd47534
-sha256=bc656eb1846509539bbfaf9269f07588f6f3c05c847b41b351a7571a252f6fee
-
-[http://gpe.linuxtogo.org/download/source/gpe-dm-0.51.tar.bz2]
-md5=8064121d3b13ea34c5fb77d2907c78f1
-sha256=4f7546bc5f8df7eb9511b919e34eb08945db4359fd3db07c555b83959923a1cf
-
-[http://gpe.linuxtogo.org/download/source/gpe-dm-0.52.tar.bz2]
-md5=ea157a2b47d932cea9738882df887ae1
-sha256=b2ef45fbe57bdc73a6a5fb244da782fc912c105453bf120128c93284fc05c4ce
-
-[http://gpe.linuxtogo.org/download/source/gpe-edit-0.29.tar.gz]
-md5=108d1739f06678d45d1529301de6a7c8
-sha256=ec3805a8d7b1577f30379f8b3bd59f5f1e1786aa574f75aa254a30bc19b6b79e
-
-[http://gpe.linuxtogo.org/download/source/gpe-edit-0.31.tar.gz]
-md5=68d5642f42a169a26bdf71e3e3f3ce50
-sha256=29e0fb191988afa5e7df2cb7ffcdb4650c49bb7ed44f4b1f01fc2644b793dbb0
-
-[http://gpe.linuxtogo.org/download/source/gpe-edit-0.32.tar.gz]
-md5=ea6fa0be7c84d69ab45c21c45c5a798b
-sha256=40f1753f39199bf88c128f2cd6b25e4ce3bd93c46395e12dd7a8cfa73cdbdc51
-
-[http://gpe.linuxtogo.org/download/source/gpe-edit-0.40.tar.bz2]
-md5=26bca78fb1619de3a36b6b242997339b
-sha256=9aee93207a4f48b16c17bf59fe151f2a8890731b73e07bfcb73d2fcc297eb848
-
-[http://downloads.sourceforge.net/gpe-expenses/gpe-expenses-0.0.6.tar.gz]
-md5=ee998780d384e68cdd15748392f59980
-sha256=9ce4624ca3ca7e641fac7513dcef6614bce611c338466c742a0e19346cf94f82
-
-[http://heanet.dl.sourceforge.net/gpe-expenses/gpe-expenses-0.0.6.tar.gz]
-md5=ee998780d384e68cdd15748392f59980
-sha256=9ce4624ca3ca7e641fac7513dcef6614bce611c338466c742a0e19346cf94f82
-
-[http://gpe.linuxtogo.org/download/source/gpe-filemanager-0.23.tar.gz]
-md5=2ddfe35b6bcf3269de704bfb44b568e1
-sha256=434991a5c562ebb1e381e05dddc6c8916f5a8c851dc4d2a6b3781db1222a8f69
-
-[http://gpe.linuxtogo.org/download/source/gpe-filemanager-0.24.tar.gz]
-md5=8590fa6cee86c3ae66c449470da62b20
-sha256=172e19d8ccaec35329064184790f9e4e64f1b31f412ba8b12c21860208a4e35e
-
-[http://gpe.linuxtogo.org/download/source/gpe-filemanager-0.25.tar.gz]
-md5=625cb4e7a316c3a17f5cedca90dc3cb7
-sha256=debebb0d6572ebaeabcd7581d688f69e20024f25be5fde01e6d0d8aaa149ebb3
-
-[http://gpe.linuxtogo.org/download/source/gpe-filemanager-0.30.tar.bz2]
-md5=aecfb8d03fbfe11dfe6bc17db9591aee
-sha256=6b4b4ee697472c7073e3ef9fa2e2ff89bcee07be452942814857cad3ef4f55ff
-
-[http://gpe.linuxtogo.org/download/source/gpe-filemanager-0.31.tar.bz2]
-md5=2edb97e768f380da0b5c4e993ceb129b
-sha256=3d117a3c9174d07a6d5dd5bb63d3841bf185e90732e8426678d7928c0c27f623
-
-[http://dominion.kabel.utwente.nl/koen/pda/files/gpe-fsi.tar.bz2]
-md5=e485b0c8424dc9666078d482d22447da
-sha256=6a7455e4a066d5ecd9520feb9cd7bb1a7ecfe267faef32cd04a97b5c1738f8ec
-
-[http://gpe.linuxtogo.org/download/source/gpe-gallery-0.97.tar.gz]
-md5=ba488fac2b1484862c2e52cd017793cb
-sha256=84ae88670b1e7ab5b94d2db83644b85f2e0c85eb7d91fe909fb7366c8a7fe2b3
-
-[http://gpe.linuxtogo.org/download/source/gpe-go-0.05.tar.gz]
-md5=79a077b7434e7964afe4c116c9da7295
-sha256=d6fdfd927c926145c488d099d6984c291218f898902bb9607ddef340201ae142
-
-[http://stag.mind.be/gpe-helpviewer-1.0.tar.bz2]
-md5=2d2c0ea709fdbc251e5d2fb9943d5409
-sha256=3b3dd5fe64b24536a6f089bc03c7a4dd05792dbd25005b160e93f15522d8c971
-
-[http://gpe.linuxtogo.org/download/source/gpe-icons-0.25.tar.gz]
-md5=9845af06d8337fa41725c731ba3dab08
-sha256=2914804f6dc63fd19247674cb6c8490f21ab66de9c267d0c55a9f891eebe0c72
-
-[http://gpe.linuxtogo.org/download/source/gpe-irc-0.08.tar.gz]
-md5=0f934a03d8c4d18a9a977ff704a741c5
-sha256=4731b10ca33f1a4cdf01dea88144d602bc23a8f5a8f12d925b59ce56e837b79c
-
-[http://gpe.linuxtogo.org/download/source/gpe-keylock-0.12.tar.gz]
-md5=933848f1db682edba169c34ea280a564
-sha256=3904c2dcf6d309247e1f8138ffba94ecd1d14e48c1b9306beebcccb28dbbd87b
-
-[http://gpe.linuxtogo.org/download/source/gpe-life-0.2.tar.gz]
-md5=dbba547ab6ec998ea35e110fa4daf823
-sha256=37cc3abf96ccbc2fc1e5d2691144154d80ad911d63614d6baa65b016268ebccd
-
-[http://gpe.linuxtogo.org/download/source/gpe-lights-0.12.tar.gz]
-md5=91d4344ab6d00115ee73f7d97c58acee
-sha256=98ce715b8627de958cbd4fbc11f72cfb7aed42825eb21995d4d46a676510c126
-
-[http://gpe.linuxtogo.org/download/source/gpe-lights-0.13.tar.gz]
-md5=fa4677ecb8640c5d85c421dcaebf64fb
-sha256=e9de4a153ee3adc66363a583cd7db6676e92f010d783e517ef935aa35e96370e
-
-[http://gpe.linuxtogo.org/download/source/gpe-login-0.87.tar.gz]
-md5=d6939028883ecbb36f0fa2988922065b
-sha256=c87b5b67205dded1df87436badf0af307937e8d8d67c6279e961ee043dd23388
-
-[http://gpe.linuxtogo.org/download/source/gpe-login-0.88.tar.gz]
-md5=459167b93c5ec6965d841e680243713f
-sha256=dde5a6aea6c997fa7621278c3c9fa95d4e18e1019409dd94a7e36b72615fa761
-
-[http://gpe.linuxtogo.org/download/source/gpe-login-0.90.tar.bz2]
-md5=1c2f4993ce0355e364c3d0c5abd04c84
-sha256=e6441d0c64dde18f8cf3b6f733dfdc697708e982fb1dda122aa0d8877e0e826d
-
-[http://gpe.linuxtogo.org/download/source/gpe-login-0.91.tar.bz2]
-md5=edfd1b07de39b4e5a0908cef8159b21d
-sha256=0fead38b9078842f847cfcc49fc903637d8185a0eca0be493078adfba799b7bf
-
-[http://gpe.linuxtogo.org/download/source/gpe-login-0.93.tar.bz2]
-md5=cb537b8091f91e5d6776f5435c26d2cf
-sha256=6dd6f9b558ef7306578b4be1a83712e1080104570499fa9329072973bd2ed50f
-
-[http://gpe.linuxtogo.org/download/source/gpe-login-0.95.tar.bz2]
-md5=4e6dfd761f62764f98b9f6c2c09f3715
-sha256=8bea38af14c98354b1ee023475315ae3ba462d33b136a73cde9d83303b659d84
-
-[http://gpe.linuxtogo.org/download/source/gpe-memo-0.2.tar.bz2]
-md5=3ec65b008347d4eb4fa0477787ebfc12
-sha256=769faaf00a6da6b86e624407d636ec268593537a394fd99437aeb3e3f74c17eb
-
-[http://stag.mind.be/gpe-mini-browser-0.11.tar.bz2]
-md5=ebdb2eebb1ca1a5cb8ca7f1e4e3bb817
-sha256=372836198e10982525f01e8bf9d959777ab66f93d0688274c43200c4b8c959f8
-
-[http://handhelds.org/~philippe/gpe-mini-browser-0.14.tar.bz2]
-md5=38cf27404443d95db41a4f6b8a5b5540
-sha256=73231d3a600662ea5a0ce80b8562ce465ef49783f2601070e207daa8f74e3817
-
-[ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-0.15.tar.gz]
-md5=b048cee7254d7fe6eb1e2821ce8706df
-sha256=aa9c2dbe8d763b4461a42d46378cc49335a266a7d6dcd794ecd46fac037c8913
-
-[http://gpe.linuxtogo.org/download/source/gpe-mini-browser-0.15.tar.gz]
-md5=b048cee7254d7fe6eb1e2821ce8706df
-sha256=aa9c2dbe8d763b4461a42d46378cc49335a266a7d6dcd794ecd46fac037c8913
-
-[ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-0.16.tar.gz]
-md5=858f3e7219cde7b18e69293526020416
-sha256=36d2487895d3579ae3e8693ebe789b5de454506fc572937dac2fb7ef512f105f
-
-[http://gpe.linuxtogo.org/download/source/gpe-mini-browser-0.16.tar.gz]
-md5=858f3e7219cde7b18e69293526020416
-sha256=36d2487895d3579ae3e8693ebe789b5de454506fc572937dac2fb7ef512f105f
-
-[ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-0.17.tar.gz]
-md5=749c571ec28e2ea4f31602f3d5609e4b
-sha256=19d345571344f65e35b06c3faad6cfc86afeb8a41533d39bfbf364e1da34188c
-
-[http://gpe.linuxtogo.org/download/source/gpe-mini-browser-0.17.tar.gz]
-md5=749c571ec28e2ea4f31602f3d5609e4b
-sha256=19d345571344f65e35b06c3faad6cfc86afeb8a41533d39bfbf364e1da34188c
-
-[ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-0.18.tar.gz]
-md5=dff468aa9b5306d68d60685a7b04a90e
-sha256=bdd64d7a7b47bb348bba2d9aecbb1b68d020bccfc7f54a1dd842c7efaa616ec6
-
-[http://gpe.linuxtogo.org/download/source/gpe-mini-browser-0.19.tar.gz]
-md5=922640f40f67d15892d9ea8ec6c8ffea
-sha256=ece034b916a7760cfb854baab474b7931246bdb078c814366bf90a9fbff246af
-
-[http://gpe.linuxtogo.org/download/source/gpe-mini-browser-0.20.tar.gz]
-md5=1a7a4095cafed9cda21e500842b686a1
-sha256=ddba5fea0424c9c121269e96ea202014a29568263d478ac5682022973d2986f1
-
-[http://gpe.linuxtogo.org/download/source/gpe-mini-browser-0.21.tar.gz]
-md5=a1297dfd14c008e3415f89b01eef75cd
-sha256=ec0358d104fa992f1437b37cdf70e83ab152794d2989ef2e9715ab8659dc46e3
-
-[http://gpe.linuxtogo.org/download/source/gpe-mininet-0.5.tar.gz]
-md5=4d199db47e91da9c89817e8bfbc2cded
-sha256=288d2470e6c8febb717ed0affa1f55484a0d0a4cdb8a331fae08d56d298a5653
-
-[http://gpe.linuxtogo.org/download/source/gpe-mininet-0.6.tar.bz2]
-md5=4ac59b3a7718dea0e5eca05ee783a316
-sha256=80586b5691b9f0173d9280387258e49ff6740a6ef3d5f4dbad237a5de79fc86d
-
-[http://gpe.linuxtogo.org/download/source/gpe-mininet-0.7.tar.bz2]
-md5=5630b45b1862f4032dd3a177c2b74402
-sha256=980320814b23cc51303436afb110397b15b950896f7f229484005f81d5cb6346
-
-[http://gpe.linuxtogo.org/download/source/gpe-mixer-0.42.tar.gz]
-md5=41b1ef201e4583e55a7462f1404de70d
-sha256=f8eb8f0c3af15acd5ad8c17fcc6d1ed2a43c35877d68a403eeb5bc1a1f0b3ccf
-
-[http://gpe.linuxtogo.org/download/source/gpe-mixer-0.50.tar.bz2]
-md5=67765a32def3ee408e84b9814b4e9759
-sha256=e7a13c0fd3eb0768034008778cb724aed8fbdf63d460d4df7212c3d2c14325b9
-
-[http://gpe.linuxtogo.org/download/source/gpe-nmf-0.17.tar.gz]
-md5=3fd22f7d95f9e1f328d768dedf7313a5
-sha256=6c11e7af568bf13602dec79cba5aacea590a2ec585f96dc96f87fa8950ffc31d
-
-[http://gpe.linuxtogo.org/download/source/gpe-nmf-0.19.tar.gz]
-md5=380627dc5b640af23bcc5b25033dc9a8
-sha256=ef5e8fe2a95a8ffbf825b6955db8f8028b35f4247bbb3ce089d2a74858d01e3b
-
-[http://gpe.linuxtogo.org/download/source/gpe-nmf-0.20.tar.gz]
-md5=28e1ff870af9b38d0cce345d339b857a
-sha256=e3f89854fde8db448bd60fad1dce9a89aae994e75fa0cfdf97888891563e7232
-
-[http://gpe.linuxtogo.org/download/source/gpe-nmf-0.21.tar.gz]
-md5=3181586b20fa77d1bd83024bc0aaa584
-sha256=2629167d8d27b083e34a6b39e0c8fffa035c84819f8058fdc6dceab60e3a0cf9
-
-[http://gpe.linuxtogo.org/download/source/gpe-nmf-0.22.tar.gz]
-md5=c19ffe9fc19508c4b4fe82d322e926e2
-sha256=5ec530b1b0dc1b68d455106cf5b40e82bbda92448171a56c13b939e06701ac21
-
-[http://gpe.linuxtogo.org/download/source/gpe-othello-0.2-1.tar.gz]
-md5=2997e14b0956e73580e6c19ade35eb4f
-sha256=8beb35d6bc48e083adc6dd39851632f042ad364b5b8579c14bf8cdcf7dd91552
-
-[http://gpe.linuxtogo.org/download/source/gpe-ownerinfo-0.23.tar.gz]
-md5=172ce9f0a83b11eb1bb36a5b87e74e00
-sha256=bfd89166940eba6139173d922af4834e2dd36e75c29c0f5ac6702f5188d7ae7b
-
-[http://gpe.linuxtogo.org/download/source/gpe-ownerinfo-0.24.tar.gz]
-md5=c199248a2100398445542af9cab43338
-sha256=e997f5fda35c635533d37827c8a76361e124426ac5a130a18deebbd77b7502a8
-
-[http://gpe.linuxtogo.org/download/source/gpe-ownerinfo-0.25.tar.gz]
-md5=bdfe3aef56a0fa27e10af29dedd96083
-sha256=d06d917ce07cb3fedcd98aa558bc9f16473c8eeb9817ab8e68baeabd2a9152bd
-
-[http://gpe.linuxtogo.org/download/source/gpe-ownerinfo-0.26.tar.gz]
-md5=db85239008c08072c7fca7de528d2f84
-sha256=9616a0cf943e72974bc27fd4c90d76871ba9642f9f45e2119a3b8180930ce534
-
-[http://gpe.linuxtogo.org/download/source/gpe-ownerinfo-0.27.tar.gz]
-md5=30e0da89ab7610e53d5d15f7489d7982
-sha256=9011bf84c445b45aff1aedff23370df2877585d60d5c5e9fe2119095e5440b7f
-
-[http://gpe.linuxtogo.org/download/source/gpe-ownerinfo-0.28.tar.gz]
-md5=25b02a6d7fbbb2966e2481930bd55591
-sha256=3072876709e8fb58eda893ec0acb50b3eb6b8a7c808f4fbd74657c139933971a
-
-[http://gpe.linuxtogo.org/download/source/gpe-package-0.2.tar.gz]
-md5=764e50856c99140d20842e05ebb95e3e
-sha256=f82ddcf48e582eb1743727c1767a5dc81fa533c1a5ca40f3ac99a50a4479aefd
-
-[http://gpe.linuxtogo.org/download/source/gpe-package-0.3.tar.gz]
-md5=229ba1d7755cc3e77d1e711281ae3554
-sha256=4226c983948521ead98ea0b02939de6b28bacba6f929b9404b9154ffbfb3718e
-
-[http://gpe.linuxtogo.org/download/source/gpe-package-0.4.tar.gz]
-md5=f131eed187483620916b7e624b9e3367
-sha256=a1fbdb1e8357b0b2362df9ee457c90dcaafbe7a11723117cb0cbee1ea0f6315c
-
-[http://gpephone.linuxtogo.org/download/gpephone/gpe-phonepanel-0.7/gpe-phonepanel-0.7.tar.gz]
-md5=2c60de78f2e539ea242c4ba891d3e5ed
-sha256=4b1e77ff0a5a74165bae6e842f122fc17a6331e0566a2b83d1ad8ac3ef5fe4b8
-
-[http://gpephone.linuxtogo.org/download/gpephone/gpe-phonepanel-0.9/gpe-phonepanel-0.9.tar.bz2]
-md5=36bb2575a246b036049f42d0f5b03594
-sha256=8864d8be79e16820861254d51a0bfdcfd045d8b41a46ef5833f6bb5b30a9b1c4
-
-[http://gpe.linuxtogo.org/download/source/gpe-plucker-0.4.tar.gz]
-md5=05e4285049e9458bf1bb52a56f5ffc26
-sha256=5a97f5365d97b7332c9aa32e134ec7ae32587873416ec2b6eca2b73635c3f62d
-
-[http://gpe.linuxtogo.org/download/source/gpe-question-0.04.tar.gz]
-md5=8187ca6f6e5da27a3b224469a3cbb76d
-sha256=14fb095d231343a576da5e8aa7807b09cd7bde2df59a5a569495dc03a434d178
-
-[http://gpe.linuxtogo.org/download/source/gpe-scap-1.2.tar.bz2]
-md5=875ed73f43584cd3ece4a7ac28dd692a
-sha256=a7ec60003a96975523598c2ef5f2927c9a362e689e7159b268c7fe431754635a
-
-[http://gpe.linuxtogo.org/download/source/gpe-scap-1.3.tar.bz2]
-md5=7ba3d2592585c8bcf9d3bf1aafeefef3
-sha256=609e24aa1413b1053ee3fd42c36c6ccf05d8067867021511c7d50d4829875b44
-
-[http://gpe.linuxtogo.org/download/source/gpe-scap-1.4.tar.bz2]
-md5=eaf545561b0ad981c9d01833f30fcf95
-sha256=762778421fae7c62d5ec6a9d27986166c0dbbe2ff51fc10bb9b8baff5c367534
-
-[http://gpe.linuxtogo.org/download/source/gpe-session-scripts-0.67.tar.gz]
-md5=774c64ed54455f1297ecbeeffdc52eed
-sha256=da051f5049d44415fff02b48368db4e3e3b6154135a50f990844d73896d18e19
-
-[http://gpe.linuxtogo.org/download/source/gpe-session-scripts-0.68.tar.gz]
-md5=af6941561f0ef676b4536531cd4c40bf
-sha256=f0cc9809776f77649287e88455657d47e804b11296c0f9f503ea0b1603b2e377
-
-[http://gpe.linuxtogo.org/download/source/gpe-shield-0.9.tar.gz]
-md5=1373a00d9dba5508da579c585c585d6d
-sha256=07d2a2d1c1868b292e3c362e4df4bf32c2aa4b6b22e394a9c5448b8cff4075dc
-
-[http://gpe.linuxtogo.org/download/source/gpe-sketchbook-0.2.8.tar.gz]
-md5=72d9e5468cf1a53b66a378ee2e85dc1a
-sha256=6335c48b8cf61ad49d01470354fa9e2a9ec072871cd9fbbdfd872461d012359a
-
-[http://gpe.linuxtogo.org/download/source/gpe-sketchbook-0.2.9.tar.gz]
-md5=e95606bf33779b67acbfd626ad80000f
-sha256=dc0648a0f1eabbf42a5ec8d04e02a576097b68cc1ce0558546d9081cd89b5e1b
-
-[http://www.telefonica.net/web2/mteirap/gpe-snes-0.1.tar.gz]
-md5=28ec6921d665c8ccde521181a9d26e24
-sha256=ae9c0fcdc13c3fa69038a0471f459602a6a45de6c44a0fa8c5c3241b6925e3bd
-
-[http://www.telefonica.net/web2/mteirap/gpe-snes-0.2.tar.gz]
-md5=24562cd0cf481d6912621ad9c60cb9cb
-sha256=1807b46c5859c0933dba2a795374fff0270c0fd792874d1b256ec0899ab08d69
-
-[http://gpe.linuxtogo.org/download/source/gpe-soundbite-1.0.6.tar.gz]
-md5=9eac057d9a91b5b12b2b1cd7d88b60a6
-sha256=44278e12358531f588501b2d79bb3a32c69e3cddb243674a414df20e3990f196
-
-[http://gpe.linuxtogo.org/download/source/gpe-soundserver-0.4-1.tar.gz]
-md5=b9abca6437f13c4fc5bbb244738de9ea
-sha256=07c91f5433d7c6c44c54640e9f5b65addedaf0eec5c5705175608404bee6de37
-
-[http://gpe.linuxtogo.org/download/source/gpe-su-0.11.tar.gz]
-md5=557d54b0d55fa5134436e8b4afb1e624
-sha256=2ab8f54d65d1555fe71307a685b1be9b2d0e04f862feb5e2487f54ef140dad2b
-
-[http://gpe.linuxtogo.org/download/source/gpe-su-0.14.tar.gz]
-md5=d7a0b0ac64f60a7cceb77b65d50176e1
-sha256=405a5137e9de5487e942d54cc5ee8edb66c54cec48925ff90368b36e38942536
-
-[http://gpe.linuxtogo.org/download/source/gpe-su-0.15.tar.gz]
-md5=3830c34b4482f892607c3b768e6dc7f3
-sha256=468a61461e0569dc55eca454a5e8676163b6544f0af41241e97479604f029791
-
-[http://gpe.linuxtogo.org/download/source/gpe-su-0.18.tar.gz]
-md5=7e22069a6c59138f8b6e3f9cbc6bb616
-sha256=bf1df54e88dbfa94be7b9f9a4c897635dca1ec56885352d8ebeac99f747b0554
-
-[http://gpe.linuxtogo.org/download/source/gpe-su-0.19.tar.gz]
-md5=1225673cf9cc1671a031f0eb2b57b3f9
-sha256=b0a7db0fceeda65b88bb8abd8743afb9bf0d5674ed3fe6444439c0dad90da27b
-
-[http://gpe.linuxtogo.org/download/source/gpe-su-0.20.tar.gz]
-md5=157cb20e41953d2148193d7e3eab173a
-sha256=b5e3917a2a2fb1cbce5cc724cd4c6f523c84890b7f97d520808122cf04e89139
-
-[http://gpe.linuxtogo.org/download/source/gpe-synctool-0.2.tar.bz2]
-md5=83823c3d7abf80f71decea7abc4c7020
-sha256=97428039697b9486a136d2f0ac54286af887853a38e0cec971407f52d29a2114
-
-[http://gpe.linuxtogo.org/download/source/gpe-taskmanager-0.17.tar.gz]
-md5=fd52d952a11913f98c833f6af012099d
-sha256=7d5938bea991f00e33268305ae11c977b92e4ab3392576f59132cd71fb7d782c
-
-[http://gpe.linuxtogo.org/download/source/gpe-taskmanager-0.18.tar.gz]
-md5=dc5db99c16780086f76f48fc7d2e7ce5
-sha256=d6c219bbcb01db0bce13da92bcba618206a057b6cf191dcac788e8b1d6e858a0
-
-[http://gpe.linuxtogo.org/download/source/gpe-taskmanager-0.19.tar.gz]
-md5=b82b56730f927335f20c6eaf20f509e0
-sha256=406fe2dbc8cb6e8b56fa653f3d7b674203171233da097ee9ebb4413703f132ad
-
-[http://gpe.linuxtogo.org/download/source/gpe-taskmanager-0.20.tar.gz]
-md5=3754287bfccdcc7d219a3118ea2dd53f
-sha256=71c07e58b9eaa66ff140f5baa76c14d0fe3120223687bbb4b9817fe55b5e52e4
-
-[http://gpe.linuxtogo.org/download/source/gpe-tetris-0.6-2.tar.gz]
-md5=5c80c48fb82b88955214786843561e78
-sha256=592d66d654f8f9ffce6c811ae740e076e4be43c25f16c9945bacaa8eea1060c7
-
-[http://gpe.linuxtogo.org/download/source/gpe-tetris-0.6-4.tar.gz]
-md5=cd15add33be3857018eef8b57fc262a9
-sha256=f43b452ac845b7406fe6b6d7aa9ca64fad731142cd9912e79f03fc5c6b8c10ad
-
-[http://dominion.kabel.utwente.nl/koen/pda/files/gpe-theme-clearlooks-0.2.tar.gz]
-md5=043c21b35c7f00b21745c8a3a61c12ac
-sha256=a04f41837a995c1f1834a66be41bc0b7237ee181314607dfb0ef733984765d04
-
-[http://dominion.thruhere.net/koen/pda/files/gpe-theme-clearlooks-0.2.tar.gz]
-md5=043c21b35c7f00b21745c8a3a61c12ac
-sha256=a04f41837a995c1f1834a66be41bc0b7237ee181314607dfb0ef733984765d04
-
-[http://dominion.kabel.utwente.nl/koen/pda/files/gpe-theme-clearlooks-0.3.tar.gz]
-md5=949d3329e9b9904814302db7132d468a
-sha256=f2f1e03e3283f6182d02928cbdb5ea8160f786037d4a135947794da488ebe805
-
-[http://dominion.thruhere.net/koen/pda/files/gpe-theme-clearlooks-0.3.tar.gz]
-md5=949d3329e9b9904814302db7132d468a
-sha256=f2f1e03e3283f6182d02928cbdb5ea8160f786037d4a135947794da488ebe805
-
-[http://linuxtogo.org/~koen/gpe/themes/gpe-theme-e17-0.1.tar.gz]
-md5=c6e9d80180861d0a744b313c59691655
-sha256=40df3e20e7c563b49ae0d5b4ff9151d0b9062815e7222f361b949cb60d9b0b59
-
-[http://dominion.kabel.utwente.nl/koen/pda/files/gpe-theme-industrial-0.1.tar.gz]
-md5=75898910db553923aa312ed2b1545364
-sha256=6aeb1dd991f0e0bcc11562061148051520562c81dc6bf18c03f0cc86a72f6093
-
-[http://dominion.thruhere.net/koen/pda/files/gpe-theme-industrial-0.1.tar.gz]
-md5=75898910db553923aa312ed2b1545364
-sha256=6aeb1dd991f0e0bcc11562061148051520562c81dc6bf18c03f0cc86a72f6093
-
-[http://dominion.kabel.utwente.nl/koen/pda/files/gpe-theme-industrial-0.2.tar.gz]
-md5=756f38d53eaae09d87655f3ed3a660c2
-sha256=4524df3931041dc31985014b5f581396217b0b3f6aa00225d98060f1a9cc1b67
-
-[http://dominion.thruhere.net/koen/pda/files/gpe-theme-industrial-0.2.tar.gz]
-md5=756f38d53eaae09d87655f3ed3a660c2
-sha256=4524df3931041dc31985014b5f581396217b0b3f6aa00225d98060f1a9cc1b67
-
-[http://gpe.linuxtogo.org/download/source/gpe-timesheet-0.18.tar.gz]
-md5=07f5ede2c7865fc542d7a0957aef55d3
-sha256=a066ca50bfc3ca7fc1dcab619e042c9b2d4789acda61eaa43483d561ed8a0fcb
-
-[http://gpe.linuxtogo.org/download/source/gpe-timesheet-0.19.tar.gz]
-md5=431332c11b64a26f6254b6622456296b
-sha256=5b47401344ea3aa0af789be813cd5208b60abca4207c40b4b126b40c5a3bafc7
-
-[http://gpe.linuxtogo.org/download/source/gpe-timesheet-0.20.tar.gz]
-md5=7ec3e1680ee6604ba76c1e60d9262c47
-sha256=835ce8239beb7ec1c7b3441f7929914d42c0e7aef8683c457a2e39bbd3d5aa16
-
-[http://gpe.linuxtogo.org/download/source/gpe-timesheet-0.21.tar.gz]
-md5=0a5195862477696ce007e1cd2a6ce0b9
-sha256=865ebb06c3350d17df6fc827661ed396ab3bb9fff06302e3ec94169bfcd9e7d4
-
-[http://gpe.linuxtogo.org/download/source/gpe-timesheet-0.30.tar.bz2]
-md5=52697e77fb05181432f3278424954f25
-sha256=addaf005bbcc23482bb655a0bfe476b4cc5fb303c29a7d6633165f3cbea02571
-
-[http://gpe.linuxtogo.org/download/source/gpe-timesheet-0.31.tar.bz2]
-md5=402b0dcfff28bc5d2bfbcf7b1f644afe
-sha256=1200fd739898ce71303c758149150910faa803722bd790811b754a48e0ef944d
-
-[http://gpe.linuxtogo.org/download/source/gpe-timesheet-0.32.tar.bz2]
-md5=dc99875e4bcc5d4c41b0c471270c3736
-sha256=9360cadc13eea2906089df5fd5f79d94efb14a72081a3d02ea165ee45a792ae2
-
-[http://gpe.linuxtogo.org/download/source/gpe-today-0.10.tar.gz]
-md5=7cd5e86b94d84a48077ec6ab6357be60
-sha256=1b007d46df292109147f4b270a2a555a5e8c2a90804c37028f1e7d10db512729
-
-[http://www.kernelconcepts.de/~fuchs/files/gpe-today-0.11.tar.gz]
-md5=f5a9745d479879aaa1e1287a2c725ea4
-sha256=f9271db0ab5bd4cdc2e09d6185320c2041f62b1e64ba7fb78cab28d104ec7d79
-
-[http://gpe.linuxtogo.org/download/source/gpe-todo-0.50.tar.gz]
-md5=9732adc87bad946f18a060806feef134
-sha256=3b20b87f537c7cabd59c6e5fd453735f443ec4a6f439a11237f6d18802e2fb17
-
-[http://gpe.linuxtogo.org/download/source/gpe-todo-0.51.tar.gz]
-md5=cc3b6b7676671b81251fb237118daada
-sha256=ffaa97570c9d1a1f3c2081e208ec16a6b24e2700060b8cc3caad44ff447f16c7
-
-[http://gpe.linuxtogo.org/download/source/gpe-todo-0.53.tar.bz2]
-md5=b96e83e2e02ef55474878500587fd2a2
-sha256=b9b7a165ffd1998ac09ddf9359d2005f4f2dbc995887b9c9a4fec959e3f32646
-
-[http://gpe.linuxtogo.org/download/source/gpe-todo-0.54.tar.bz2]
-md5=8fdd52954a7a29691013900b65eb5702
-sha256=b3f51635b3ce6408fdfbd0283e1d8036c23b6ecb5adf0d66882e7e48eb5d97b9
-
-[http://gpe.linuxtogo.org/download/source/gpe-todo-0.55.tar.bz2]
-md5=e8c08165d9723779473e3390a949afac
-sha256=ec2ef95c967acce5834c8b4985c610014c16242d223d233947d67b4514ebe298
-
-[http://gpe.linuxtogo.org/download/source/gpe-todo-0.56.tar.bz2]
-md5=d60eda0b82431bc4dd92cf7c40c0efe9
-sha256=85124fe55ecd1ad303a3a333b9d8501deb627beeca85bfb6f66832389bc73f49
-
-[http://gpe.linuxtogo.org/download/source/gpe-todo-0.57.tar.bz2]
-md5=149ba7a31c7a7855146faa8f321d7cca
-sha256=b8304c9f69922b30064a4e8637576034fe0be3a4b699a04968e1b1f899974df1
-
-[http://gpe.linuxtogo.org/download/source/gpe-watch-0.10.tar.gz]
-md5=0c1cc9a5e7086194c1d2ff462759f135
-sha256=4e3cc87dfde964eda9092f72f6a945765795d00dad5bb2368d9cb0a500f21fc8
-
-[http://gpe.linuxtogo.org/download/source/gpe-what-0.30.tar.gz]
-md5=cc4d46ec2000c17f1df047657a06f3f6
-sha256=780b89c09fb1cd9fea2368ddf5cffa4fdea706f1790e72d175d8612e3e6f6e85
-
-[http://gpe.linuxtogo.org/download/source/gpe-what-0.31.tar.gz]
-md5=da51ef2882dbad8e4a3e9c8a0d3afbeb
-sha256=a868777679b03b3293a454aee26002b5f1a7c78e04b9495f88641a0ec9e853c5
-
-[http://gpe.linuxtogo.org/download/source/gpe-what-0.33.tar.gz]
-md5=03d878dccd6c1215ef92ac668ef73dfe
-sha256=bc4f531f63bdaa2162867bab3e14ca5c37372d321efe7ce7c1004b4f4e57c00a
-
-[http://gpe.linuxtogo.org/download/source/gpe-what-0.41.tar.bz2]
-md5=92ff9623a237da368c23d5694c4d6b71
-sha256=8cfa56399576b2f166d34a94e05995a16038deabb086401644971726059d1c69
-
-[http://gpe.linuxtogo.org/download/source/gpe-what-0.42.tar.bz2]
-md5=96c6bcd7bf99ef35bf8c0a8153646ded
-sha256=a240c8a09292381c8aabc2207d720b2f285f19fb7e6953cb8bf2b63f65858499
-
-[http://gpe.linuxtogo.org/download/source/gpe-what-0.43.tar.bz2]
-md5=f04e358d686a48157248a7a3ba115bf9
-sha256=35b4b6a48f09221c220fb397a3db8725c3c1053a950534310db719fc71123736
-
-[http://gpe.linuxtogo.org/download/source/gpe-windowlist-0.1.tar.bz2]
-md5=4aebe132c5365706266838a73d2bcd2d
-sha256=4fcdbbfc8c965f93abee1d7b5c212e3f49b5daa6257271f10b40b3e81452b1aa
-
-[ftp://ftp.gnu.org/gnu/gperf/gperf-3.0.3.tar.gz]
-md5=cc20e58975a38075440423c8fb85fd00
-sha256=63287527c8d9e27e801cf0804436f3494bd569db05d49dcdd2a942ae72fa9055
-
-[http://gperiodic.seul.org/downloads/gperiodic-1.3.3.tar.gz]
-md5=8b6344276252635b18572bca17aa62f6
-sha256=5858eb726867e8c28f42101dbff7a5234b960f5944c7800939bf39a775147322
-
-[http://gpe.linuxtogo.org/download/source/gpesyncd-2.0.tar.bz2]
-md5=399bbb65ddd5d7c4bcd328d2e3880532
-sha256=26db3e8e03af47ffdbf5951e3bbfa2b7ccfd13e03fdac9f4b2d9111a436bc8f7
-
-[ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.0.tar.gz]
-md5=1abf7accd905c435da567d0852c080af
-sha256=685e0162af08d90e01251a02c2f916de59b2b4fa903e9a3a119208b6bcca6092
-
-[ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.3.tar.gz]
-md5=4d33cbdf844fcee1c724e4cf2a32dd11
-sha256=376796ba50ee251af63c1fe2aa17603aaac04b64527ba3bc89e4fa023322282f
-
-[ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.bz2]
-md5=3b133a3703f16835e55d1a2f8cfdfa70
-sha256=e8dddaf7abc51a33b635bcb6b1864fca72f31fe8e9de3eb70a58e631eed99959
-
-[ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.gz]
-md5=0a2d20f70e6e01a4869ad6b7497404ae
-sha256=9b5c1d9dd51c4c8909219619412c7a983512b6ac958ab4cf661322d930c2a665
-
-[http://downloads.sourceforge.net/gphoto/gphoto2-2.1.4.tar.bz2]
-md5=5bbee55d4e59b063d3cff0fbc9121006
-sha256=c52e77a52ad11a02ae9f0b8491915f3f09fec23f8f740cc6079570241caf63cb
-
-[http://heanet.dl.sourceforge.net/gphoto/gphoto2-2.1.4.tar.bz2]
-md5=5bbee55d4e59b063d3cff0fbc9121006
-sha256=c52e77a52ad11a02ae9f0b8491915f3f09fec23f8f740cc6079570241caf63cb
-
-[http://downloads.sourceforge.net/gphoto/gphoto2-2.1.5.tar.gz]
-md5=9bd1a033389f9e4e6425dda4f6e603c9
-sha256=fefaabea8aede51ae9560ba71e2a7c31f4d856b0bb1fc0de7297d12e1215698c
-
-[http://heanet.dl.sourceforge.net/gphoto/gphoto2-2.1.5.tar.gz]
-md5=9bd1a033389f9e4e6425dda4f6e603c9
-sha256=fefaabea8aede51ae9560ba71e2a7c31f4d856b0bb1fc0de7297d12e1215698c
-
-[http://downloads.sourceforge.net/gphoto/gphoto2-2.1.6.tar.gz]
-md5=2de2bcc62599b8a7337b54b0a067c50b
-sha256=82330519effc421a39c196d2a2806dc9c3cdcc891b7ec34dee04b3fe4ef4534a
-
-[http://heanet.dl.sourceforge.net/gphoto/gphoto2-2.1.6.tar.gz]
-md5=2de2bcc62599b8a7337b54b0a067c50b
-sha256=82330519effc421a39c196d2a2806dc9c3cdcc891b7ec34dee04b3fe4ef4534a
-
-[http://downloads.sourceforge.net/gphoto/gphoto2-2.4.0.tar.bz2]
-md5=5fd1f711ca806adb687b33c55964d898
-sha256=8aa5ac34dae18284f3f04db874648a6dc70ecee3045ace674351b7326ae1c4e5
-
-[http://heanet.dl.sourceforge.net/gphoto/gphoto2-2.4.0.tar.bz2]
-md5=5fd1f711ca806adb687b33c55964d898
-sha256=8aa5ac34dae18284f3f04db874648a6dc70ecee3045ace674351b7326ae1c4e5
-
-[http://downloads.sourceforge.net/gphoto/gphoto2-2.4.2.tar.bz2]
-md5=9c57dd8b89ccfeafdd2037516185f6e9
-sha256=c9ef8c2f61bbe9978b38341ca2bf09786416ddd82d4708066a26a0483341ca72
-
-[http://heanet.dl.sourceforge.net/gphoto/gphoto2-2.4.2.tar.bz2]
-md5=9c57dd8b89ccfeafdd2037516185f6e9
-sha256=c9ef8c2f61bbe9978b38341ca2bf09786416ddd82d4708066a26a0483341ca72
-
-[http://downloads.sourceforge.net/gphoto/gphoto2-2.4.4.tar.bz2]
-md5=bcc5621e09802e114c7f72a6f6172230
-sha256=68cd94664882fdab5fa781b4b8fabe1ac49db7d97bdf3aa917563439afa9b9b6
-
-[http://downloads.sourceforge.net/gphoto/gphoto2-2.4.7.tar.bz2]
-md5=a0bd7629040735f16e510b63edf386dd
-sha256=16e21ab5387220ad885e1d27f936f3add4081d15a1039577002682be521b2c03
-
-[http://downloads.sourceforge.net/lxde/gpicview-0.1.5.tar.gz]
-md5=5c484ea089f5a6455265e1e1f472240e
-sha256=7663e1849f3b1f2225a3310f907f86068d7ac5c8957d68fc4a684059b49211ca
-
-[http://heanet.dl.sourceforge.net/lxde/gpicview-0.1.5.tar.gz]
-md5=5c484ea089f5a6455265e1e1f472240e
-sha256=7663e1849f3b1f2225a3310f907f86068d7ac5c8957d68fc4a684059b49211ca
-
-[http://davehylands.com/gumstix-wiki/gpio-event/gpio-event-2.6.21-1444-select.tar.gz]
-md5=b5cc96cba5a70e19d58534c250de67e2
-sha256=a937f4ba6b450b1330049c90e5e787490eff5bb376dbfe9099abbcdc7a8f6b6c
-
-[ftp://arcana.linux.it/pub/gpm/gpm-1.20.1.tar.bz2]
-md5=2c63e827d755527950d9d13fe3d87692
-sha256=11fabe7f27a205ff1ea6aee23e1dc2bb2dc5dbfc45ff0320fca0cd559806a936
-
-[http://www.nothingisreal.com/gpp/gpp-2.21.tar.bz2]
-md5=0be03c6da8d1551a262be11798c00478
-sha256=c29373b752730195fc52e6ab0fc871f259284e2175bf2baf1701f027da60d200
-
-[http://downloads.sourceforge.net/gpsbabel/gpsbabel-1.2.5.tar.gz]
-md5=cf9f349fec33760c8026c9b12c6f7a9d
-sha256=539d5c703799b12f5785286a689fd16f5fe957c2eaf460360e79f5f51d8c132e
-
-[http://heanet.dl.sourceforge.net/gpsbabel/gpsbabel-1.2.5.tar.gz]
-md5=cf9f349fec33760c8026c9b12c6f7a9d
-sha256=539d5c703799b12f5785286a689fd16f5fe957c2eaf460360e79f5f51d8c132e
-
-[http://downloads.sourceforge.net/gpsbabel/gpsbabel-1.3.3.tar.gz]
-md5=0ba7f4c623518e6bfe8da12d0691fb96
-sha256=b5d1021b0ea755d6b3bee57b0720a22021b6c8bad88acbda314874987f7fc1a6
-
-[http://download.berlios.de/gpsd/gpsd-2.28.tar.gz]
-md5=a49e1bd180a4ad4b1f5f9c3bd7f0e15d
-sha256=2e81676f9bcb01249216c413d253acddd1358a0dd982e77c5e14d15e6a45cabe
-
-[http://download.berlios.de/gpsd/gpsd-2.32.tar.gz]
-md5=4bb9b0c1642d36265c807a04da3d6f60
-sha256=95bee94daaf0168387152223fac186ba40d7b02657bfc0336c90edc5ea15bf10
-
-[http://download.berlios.de/gpsd/gpsd-2.33.tar.gz]
-md5=03b57754091e4a34e27c78e1dc35c55e
-sha256=e6a055689ad05f6adba7dbb9490891a18a240d1a30e34424b3a034f4152f2c28
-
-[http://download.berlios.de/gpsd/gpsd-2.34.tar.gz]
-md5=1ad07e10f34e46ffdaf10688743f2f43
-sha256=39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8
-
-[http://download.berlios.de/gpsd/gpsd-2.36.tar.gz]
-md5=bb54e89ddb4fdc7af8bbc5534652f9ce
-sha256=0c9bf796b932dab2baab70829780eccde4113c08ce649768facd5010d6da640a
-
-[http://download.berlios.de/gpsd/gpsd-2.37.tar.gz]
-md5=6c96cc0b2df0279cb7baac1ebc5881d3
-sha256=8860e61edc26f0665ad6ea0b34be4e3fd2cc7c51c5fd63b25c857a1870e8e137
-
-[http://download.berlios.de/gpsd/gpsd-2.38.tar.gz]
-md5=725c320ca6fa35bcdaa1de2d8908f392
-sha256=ae828da850ac0590fd47768856c4ec29021332204182abe4ad94098d72168474
-
-[http://download.berlios.de/gpsd/gpsd-2.39.tar.gz]
-md5=3db437196a6840c252fca99b6c19d4d0
-sha256=ee3b2fb403112c3871e7e4fdb915cdc25b020f3208318ba61e9ac37692832a21
-
-[http://www.gpsdrive.cc/gpsdrive-2.10pre2.tar.gz]
-md5=28b13b7253c8f019433be68686070558
-sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227
-
-[http://www.gpsdrive.de/gpsdrive-2.10pre2.tar.gz]
-md5=28b13b7253c8f019433be68686070558
-sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227
-
-[http://www.gpsdrive.de/packages/gpsdrive-2.10pre2.tar.gz]
-md5=28b13b7253c8f019433be68686070558
-sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227
-
-[http://www.gpsdrive.de/packages/gpsdrive-2.10pre4.tar.gz]
-md5=5d0c7dc9163b2fd9a92ddd886ed7cfab
-sha256=ebefe385ec41e3ff26fa55c0fcecbed75d4cd5581ae5ae39038aac796af126c6
-
-[http://downloads.sourceforge.net/gpstk/gpstk-1.2-src.tar.gz]
-md5=541ec5a5b86cf9e56f0b23cf6c80dd6e
-sha256=c1378384b1737b2fa330f8d63d7777db311c976bb20e0c0e0fcd5dac0e78672a
-
-[http://heanet.dl.sourceforge.net/gpstk/gpstk-1.2-src.tar.gz]
-md5=541ec5a5b86cf9e56f0b23cf6c80dd6e
-sha256=c1378384b1737b2fa330f8d63d7777db311c976bb20e0c0e0fcd5dac0e78672a
-
-[http://people.defora.org/~khorben/projects/gputty/gputty-0.9.8.tar.gz]
-md5=d227a37a8a7b036eed44e4278db45735
-sha256=fcee22d7e31a936cde4672ac318ffabb9d39b7fc3b74de391bdade1419c59dfd
-
-[http://downloads.sourceforge.net/gqview/gqview-2.1.1.tar.gz]
-md5=2cd110305cfe4c530fcd6e34bb52e1f2
-sha256=948d389d72906b798db3b5013a1769d1f8c9c9f3b6dff66c8820dfa0820b02e2
-
-[http://downloads.sourceforge.net/gqview/gqview-2.1.5.tar.gz]
-md5=4644187d9b14b1dc11ac3bb146f262ea
-sha256=12fea494e607a69eff31cdca13d306ef1b0b3b7850be0f8b236f267d8f2e9546
-
-[http://heanet.dl.sourceforge.net/gqview/gqview-2.1.5.tar.gz]
-md5=4644187d9b14b1dc11ac3bb146f262ea
-sha256=12fea494e607a69eff31cdca13d306ef1b0b3b7850be0f8b236f267d8f2e9546
-
-[http://downloads.sourceforge.net/granule/granule-1.2.4-1.tar.gz]
-md5=7f4e11d04e369391de27fca82ee60f11
-sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c
-
-[http://heanet.dl.sourceforge.net/granule/granule-1.2.4-1.tar.gz]
-md5=7f4e11d04e369391de27fca82ee60f11
-sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c
-
-[http://downloads.sourceforge.net/granule/granule-1.4.0-7.tar.gz]
-md5=4e327db531133ffeb650392042341443
-sha256=356463f586b8b6147a05ab00ca8b5e7f8f85d2ec3981fbb9c0c0c2e2da6f58c9
-
-[http://grass.osgeo.org/grass62/source/grass-6.2.3.tar.gz]
-md5=75c8832f90e445ff361d767c8a2c3ece
-sha256=a172d233fcbfc7f2c2de01af1f6fc7828e46867785dcaf861cf87238775e4a61
-
-[http://grass.osgeo.org/grass63/source/grass-6.3.0.tar.gz]
-md5=7dce50a076e2481733148ba34cbebc07
-sha256=a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4
-
-[http://download.savannah.nongnu.org/releases/grdesktop/grdesktop-0.23.tar.gz]
-md5=46f8f3e2d4aa2433b8b1537fefa8a4b7
-sha256=a94632ed42273d280ad4f8eec6a803024666ed5c8737ae34585c2d9d2eed5193
-
-[ftp://ftp.gnu.org/gnu/grep/grep-2.5.1.tar.bz2]
-md5=ddd99e2d5d4f4611357e31e97f080cf2
-sha256=fca0532a4b58021863b6673dc65b275f3e34cafd3b327dcf47da265af359778a
-
-[ftp://ftp.gnu.org/gnu/grep/grep-2.5.tar.bz2]
-md5=5e7bd36e089b637ab3795354ec25dcae
-sha256=cb47ab7e7e472e1cb27948d2ce055632ad68557f5ed5af989278e43117a611cd
-
-[http://downloads.sourceforge.net/grip/grip-3.2.0.tar.gz]
-md5=9b51933a03dd7d7ddfbb3643fc82c2d0
-sha256=5a51a67f2828aa679a46bbb95cdc5346d6d4516f8ba74b7744b6049ccbe805ca
-
-[http://heanet.dl.sourceforge.net/grip/grip-3.2.0.tar.gz]
-md5=9b51933a03dd7d7ddfbb3643fc82c2d0
-sha256=5a51a67f2828aa679a46bbb95cdc5346d6d4516f8ba74b7744b6049ccbe805ca
-
-[http://ftp.gnu.org/gnu/groff/groff-1.19.1.tar.gz]
-md5=57d155378640c12a80642664dfdfc892
-sha256=e07c495a18679b79c7c6f6f475689a33ab2a8ee5af4783e915f08134d1f546d2
-
-[http://ftp.gnu.org/gnu/groff/groff-1.19.2.tar.gz]
-md5=f7c9cf2e4b9967d3af167d7c9fadaae4
-sha256=d864fbd0bf6dea24e4f71736da9902a1cae86d0a1a893b5fe17118927257ec3e
-
-[ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz]
-md5=cd3f3eb54446be6003156158d51f4884
-sha256=4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
-
-[http://grun.googlecode.com/files/grun-0.9.3.tar.gz]
-md5=7788783e5a18221ae591606075d3a8ee
-sha256=c484d80e4636a69c6ad6491a4769f555be20595e67cb4bfd34c3c91e501b95dd
-
-[ftp://ftp.gnu.org/gnu/gsl/gsl-1.10.tar.gz]
-md5=d67be4f2e5560d6cf907e18a428becdc
-sha256=ea3968b58bfc7619f47bf5ff64a7198a38c72419d24b844e71e48823a4776ff0
-
-[ftp://ftp.gnu.org/gnu/gsl/gsl-1.12.tar.gz]
-md5=3ec101903c8157756fa1352161bd4c39
-sha256=22019188d24c769acafc250ddc247105eb9cab099529b627078cbd8012c7b7b9
-
-[ftp://ftp.gnu.org/gnu/gsl/gsl-1.4.tar.gz]
-md5=7513e13525c073dc07e02cc4354294e2
-sha256=850b4512fa5e4bbb964c67c215fe8ce64fe6f7e6b704180a783d8c2a04169ccb
-
-[http://www.netsw.org/audio/convert/gsm-1.0.10.tar.gz]
-md5=4b148480f82e96d274248e13880ec873
-sha256=ddab700db455e13bcf9bc0592b320e61c6a7c692fb3cef7881b14b2df1a39069
-
-[http://user.cs.tu-berlin.de/~jutta/gsm/gsm-1.0.12.tar.gz]
-md5=8909828c601e82e842e6a0ceade60a4e
-sha256=dde4e62e4ce35af29a15d26beca2fc0f98c0219553927453425cda01f16e4de4
-
-[http://pyneo.org/downloads/gsm0710muxd-1.7.tgz]
-md5=b4756f5e521dd2df552862c9766faf11
-sha256=5149991a219e8f2059350ed9d52bb110c0695da6eb9fe256e9e213e69f83929f
-
-[http://download2.berlios.de/gsmmux/gsmmux-alpha-2.tar.gz]
-md5=5bfa5605d9565ff01138d7a574cc2614
-sha256=fc029984019736eab2b0f10ce28d48ff88f8ceed7a1739cb4b71b851c4b89b91
-
-[http://downloads.sourceforge.net/gsoap2/gsoap_2.7.13.tar.gz]
-md5=fffb49eb1db7ff03643a4313115dc3b1
-sha256=3d40a528b8f3309f392945dca2ecaee5a698f4ee00a6036907a57c4f25a6a479
-
-[http://downloads.sourceforge.net/gsoap2/gsoap_2.7.7.tar.gz]
-md5=a0bbbfdc135034cd778537f979121df7
-sha256=7b531f1b6481fbe1a21620a86649f42cb2de9cf086e7bdde46335137d3ca11dc
-
-[http://heanet.dl.sourceforge.net/gsoap2/gsoap_2.7.7.tar.gz]
-md5=a0bbbfdc135034cd778537f979121df7
-sha256=7b531f1b6481fbe1a21620a86649f42cb2de9cf086e7bdde46335137d3ca11dc
-
-[http://gpe.linuxtogo.org/download/source/gsoko-0.4.2-gpe5.tar.gz]
-md5=da4e3d05f18a44af4b43c76829ba110a
-sha256=741af12ec81dff5ba79e6ce284146e26557f267b5a77ccc4c5644f2d5619dcf3
-
-[http://gpe.linuxtogo.org/download/source/gsoko-0.4.2-gpe6.tar.gz]
-md5=b10893acb76c5d016c9bcfff6ba9418b
-sha256=484f528602bd64df26a1d1db6e249476df80fe31ee8b3f85bc246a1ab73e7fe7
-
-[http://mxhaard.free.fr/spca50x/Download/gspcav1-20070110.tar.gz]
-md5=1e3fa004490a07b7b76de03d70b3e8ea
-sha256=f05d6793b943b7d1115e2b4b047ec1131c07c9ef0fd890d1616e5be0edd4a555
-
-[http://mxhaard.free.fr/spca50x/Download/oldrelease/gspcav1-20070110.tar.gz]
-md5=1e3fa004490a07b7b76de03d70b3e8ea
-sha256=f05d6793b943b7d1115e2b4b047ec1131c07c9ef0fd890d1616e5be0edd4a555
-
-[http://mxhaard.free.fr/spca50x/Download/oldrelease/gspcav1-20070508.tar.gz]
-md5=e18a21b80e1728c6b51b799d1e671f8c
-sha256=1185165125b890ea9a4312440c32bae9214947596b0b3ec31febec0d3c18b008
-
-[http://mxhaard.free.fr/spca50x/Download/gspcav1-20071224.tar.gz]
-md5=14853ba1f4edc1e685039fca56e5ebf2
-sha256=2151063706709bd79b40d892d1d0f21c9b02e3e1260fa6bf88bdd0ac252fbb35
-
-[http://gupnp.org/sources/gssdp/gssdp-0.6.2.tar.gz]
-md5=aac3f73343a82db7a9acd5233ab32719
-sha256=01ba0c34c3bf3bc4ea7728550e3bcfca779a48907ea4d6d9e5a83e8678df5096
-
-[http://gupnp.org/sources/gssdp/gssdp-0.6.3.tar.gz]
-md5=dbb085088337e2dd8c0216c36523ea06
-sha256=68a114ece326b258b26259d31b9bb59c10049ff0162bcaa0f4f7a7dea9d244dc
-
-[http://gupnp.org/sources/gssdp/gssdp-0.7.1.tar.gz]
-md5=725c32e8f92a072cc34f0e091937df2a
-sha256=8eaab799f699836770ec2fcc08abfef2f824a82ae959c6af7b39ffb6968b9fd7
-
-[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.1.tar.bz2]
-md5=e21aef9a84d67dea9a68c1379781f763
-sha256=a2c877c38d057875c7dfbf1803030c5cc9707020b77f91673500d6ea8d858607
-
-[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.2.tar.bz2]
-md5=3c7fb1cd1308b1972a76b86bb29fc890
-sha256=ffa7c89bccab5d1be53b6fcedcf7a5c071d585cf522fee5864add05d350f5842
-
-[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.3.tar.bz2]
-md5=c07fd2da0835989fc4eae291cbc05f09
-sha256=b85899ac1c792db2e12d7063c45c0c6638dc8cc234d3ac6786b739cc6486439f
-
-[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.4.tar.bz2]
-md5=761cbbc0b5f077449082d0ea7527941e
-sha256=840015b4e0f0e7248b178eafc37476d6eb9aea3876eb3b07e2a66b430b526da2
-
-[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.6.tar.bz2]
-md5=063a8184916426d6b79a97dea9636a78
-sha256=c9a5f4c9b1eddd7cb042d83390072f832f19f3712d023e4d6568391e5eb4878a
-
-[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.7.tar.bz2]
-md5=6be89b26592f36ef631b22a68b8e06c4
-sha256=94bd5110a03837145afe5c81760f22bd7bef9ef455f4417340eeeb2b12e54fb0
-
-[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.8.tar.bz2]
-md5=a7177f85c87d404a3c0d511b835129d1
-sha256=d9e056793d05bf0b6f4989b27d3107c2f223a14205ee54be403bbe52945c8853
-
-[http://core.fluendo.com/gstreamer/src/gst-fluendo-mp3/gst-fluendo-mp3-0.10.2.tar.bz2]
-md5=f3c32e0bc3ec1be461ce43e407a6a67f
-sha256=cba1eac94de8de8c181c6c60dfc59f8069d388761aba71bcd8c48b8ba9b2edf5
-
-[http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-0.10.23.tar.bz2]
-md5=dd1923a4b3c397b16286bc7a903f5e75
-sha256=e8da54a2cc35e6cc4876cb64b00b20e9b7058806ff1ff7f4da002b14f4652b4f
-
-[http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-0.10.7.tar.bz2]
-md5=ee93b63fb9a7a3081c3d68fdd83949be
-sha256=8e6e078161d9cc020ac9a403c3e7c0f124684c994d66b01895b147bf618bdc13
-
-[http://gstreamer.freedesktop.org/src/gst-openmax/pre/gst-openmax-0.10.0.2.tar.bz2]
-md5=7887664f95687aa72519f3bcd49091dc
-sha256=4dc7305cdca586ef8d31b7a587c36d5eaa242ec0ddd50db32c3159fdcfab42bb
-
-[http://gstreamer.freedesktop.org/src/gst-openmax/pre/gst-openmax-0.10.0.4.tar.bz2]
-md5=5c250ac8027ba855bc46b1bf8aefa658
-sha256=79e3618edd959e29c877b9f8b0c9156d8249d725096582dffdd5308ba6a0e645
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.1.tar.bz2]
-md5=398729b82b911eebb14156c2fa02525b
-sha256=05d83a609aaea44ea8c979897f336cb8b5537a39b271af2831e6cca3851d3007
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.11.tar.bz2]
-md5=75a3359ece6a1c11a9e5463d79e274e8
-sha256=b50072ff6f36087b8ecebf509e6d44ab2e91292b1a3a5806a7f1437a382723e9
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.12.tar.bz2]
-md5=63309cf0bb21f3efd4e43868c314f919
-sha256=18387f78b721ce6b56c02f886ec89774a4e58b7883c70ab2ae6c1af58f1661c9
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.3.tar.bz2]
-md5=8545a02c408976c5e9f0c2cf3c6a362e
-sha256=648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.5.tar.bz2]
-md5=395f3ed705928e77e5620cccf11a8cff
-sha256=9ac7eb27c9975d4cd24cd3da9b457e69790e4a8cbec75077f0f42fc8b0060eed
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.6.tar.bz2]
-md5=fb47838aa0ccef52683cea5d89364053
-sha256=c702dab34d3b330ec06d915a91a937dadb0a93ace25bbe8e337223ddb834efe6
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.8.tar.bz2]
-md5=ddc8f92dab0081f131650ad6c95908b8
-sha256=da4d8b06d3cb3d35940c2313b9c4b52e24d46eb94d3e8b346f0c144362b612a4
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.9.tar.bz2]
-md5=ff555a86e74a9249e56b43405c8df3e4
-sha256=d8215aa4c3069531609091619386abfa2f331ed95607b1525d9464a06d814e4f
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.11.tar.bz2]
-md5=2e78ff25635b31d948def7c2b2d79054
-sha256=2193e3f940f0fd2ca10a137efbb79bc1edc8a12543b618b9a97f680f9d15bfb4
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.14.tar.bz2]
-md5=ef9bcc88c84e47684a901da339a7c6b3
-sha256=ffd88d23227f54aae30fdc0ef60ea8eaffe8cc03c069b234ed23c4ea82dcff46
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.16.tar.bz2]
-md5=f7b5645d956bd43103f62922be1f94cc
-sha256=9d7bd85694e2d563ce30b01b902055149ce93a5fe45060ae9c06413f7ecee4c1
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.17.tar.bz2]
-md5=151b66228e08ab0c7601713030fb1c3f
-sha256=f82cfd5669c756726f503dde5936e2fbe2969631095f0efc40df1fae1a74f70d
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.20.tar.bz2]
-md5=180dd3452438b31fba732d2216e55eb6
-sha256=aa3d5ce29232ee5b24b6c032194ac1fc757309ea50ac850c0db46e45ab0a78ff
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.21.tar.bz2]
-md5=0e0cd485311502ad1c0c028148e3186a
-sha256=673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.22.tar.bz2]
-md5=5d0f1e07f8f6db564971b50f75261e8a
-sha256=184c5aed03ebfe38a276fc03cb7d8685d9a6da5a48bf6a0565c83e11a29cd5f9
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.23.tar.bz2]
-md5=641cc7def2d8667b9b4df15e69dba25f
-sha256=1c11d98eb9a1b1bc54becf465e74c2aa4019bb57a31dd70686269af6a9b9e93b
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.25.tar.bz2]
-md5=d29669dd79276c5cd94e1613c03cd9ab
-sha256=0ab2f7e1d818e7af1be99c4eae02ba69d4a1b8f7e3527929a6426f1daa0d4607
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.5.tar.bz2]
-md5=2b5958fb0baaf8d1b4eae18f7b13d49b
-sha256=fe2fb4fe446a1d3f8ccd4284ae7ffd25cb9f1b836b3d0e29d2494d10c1ae3eac
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.6.tar.bz2]
-md5=d8069d1026896d1379072b520de20ebc
-sha256=0ef1b8cbe6d7e898d0636342479de46a780f720033c1b4f7217c903aac6d80ad
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.7.tar.bz2]
-md5=21ec9c7ac4b02de019a6d8e8c2aaa2a3
-sha256=7be5984162333dae48d8f7e58e6c7f4b43726c78e2ca13aca6618b1342af8d37
-
-[http://telepathy.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-0.10.1.tar.gz]
-md5=578ef83efd03124e7085abe719513bac
-sha256=623e187f87037a690b5d0beef5991b3f2a58bb5058fad8c75329f48f0b07da4b
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.11.tar.bz2]
-md5=79b086c2dc0e07ae0c8ddc91512bab3a
-sha256=05323f065080e3df5f5c9cadceca977598ba106b3eebf2bbec46099becf796b1
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.13.tar.bz2]
-md5=27f27151ccefad1157c9eaa322e14ac4
-sha256=dfffb80ef01b8fee9af3576311e65b60c378d9985099dea532be090ede54ebaa
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.14.tar.bz2]
-md5=a861ccbb90a176d1242608502f45f0ac
-sha256=12205d01cb99900ed6f936a09ac31b5849f8a7ff3c9a93e5857a76dc3e30788a
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.15.tar.bz2]
-md5=19bc6cc07951b3382d1ac8525b20e83f
-sha256=831f450a0fa18c881b00ec50e8916ed66ca0fecb53cd1939f0abcc02930f9847
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.17.tar.bz2]
-md5=833546cd2b8bbf86b8ed083b00897918
-sha256=4f41fbd325270416c9f55d900e470482a7d1e7efbdbb725ed03a085dec307ad6
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.2.tar.bz2]
-md5=03d3d0b5f19014fe0065234a3ea65ee6
-sha256=dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.4.tar.bz2]
-md5=e189496e7987898823d28d26b79f63dc
-sha256=f2b90ef5fb4b2d0b06d5fd8193a7c19b1d08d4f737abeafabf04d39673ea703b
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.5.tar.bz2]
-md5=c45fc9ace9feb4d3df32da0a6d262d84
-sha256=dcf56a49b8fc0db16985bf133d4085d84602a19c15acb79890ac012d7cf9f962
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.6.tar.bz2]
-md5=25f111360c2930705b91b4fcf93ae5c5
-sha256=9e9cd6a5e134c29400b9dc302e523684dca55d0f7f11eb4b06535b24e5032d66
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.7.tar.bz2]
-md5=e02d729b22451f75414a27456ae5c16a
-sha256=9e12c58a794e61c0124b7d239eae731d4ac4863a4fc28147202d3811c3bce39d
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.9.tar.bz2]
-md5=c6d873b254eda073d722064003e304b6
-sha256=077bb0e095e5dd6dd16d697efd8d51761f3b5418efc808ed6ca7c60b34df51f8
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.10.tar.bz2]
-md5=031205d5599fce73fc36766f928b2515
-sha256=ced80afedd105cb9b1b72749f8bda29c71fa9eda06120d6b07e7362f705c9987
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.11.tar.bz2]
-md5=dfe2e201e066a3e86a9598b6769d9739
-sha256=681d3cf7ae124bff1949187db858e5439a41be162bdad59dd69b52b70fd62dfa
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.2.tar.bz2]
-md5=cf604b6acd80b57dc5173db7e93fc116
-sha256=c882c7485faec9803d2f61efbaedd02742e78d224a7d29d61a0a884cd962a09f
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.4.tar.bz2]
-md5=c10f40e3641d827ca7853b0a3d560257
-sha256=4871c52b2421b582330a0f9dc6a42da3b706140c346aa0cd690eb40758afe152
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.6.tar.bz2]
-md5=f1016148ecbfba968c0ef1773066988b
-sha256=9c514d4002fb2a2efc5c60e009c330be2ee05c28649d73de3aa45530161c2c62
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.7.tar.bz2]
-md5=cff4f55138d12152cf580a3ee71c2519
-sha256=556ba24072bdb32ee568adc682d69add1241d77936bc9563e50cdb953097be35
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.8.tar.bz2]
-md5=090d87a1716eee45a9804ca8558668da
-sha256=643a9414e3c883f4a87d0d4f1bc88a43045667fa0afc995cdbedecc90c8da4de
-
-[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.9.tar.bz2]
-md5=07a0b04875dea00fe90fd43b58ee9f39
-sha256=30c8b7832de6a6424365e52e4b921f1d304a0511c446c3b250f90d58dbc04d7d
-
-[http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-0.9.4.tar.gz]
-md5=7c60018e8b9ce7f62c7078bee5851f07
-sha256=3cbce4b90328530980c6af3b4ec0c818b98df9e63a6bb4b2b350d806f0fd8d98
-
-[http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-0.9.7.tar.gz]
-md5=166164eb07eacd1d70b965731eb6cbdb
-sha256=b9f1bb98917d9879d46b6a959ce9068471908763f2ca98e480837485e290b106
-
-[http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.10.tar.bz2]
-md5=6183d61e434b5d34f232248a35571627
-sha256=c875753a6cccd40a79f5824ea5ec51ee4615a4f22103e4adfc6a0221bf615d8e
-
-[http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.17.tar.bz2]
-md5=3998753de6500ee8c18ce1456df43df6
-sha256=70cef839b429dcea0cae342d24bc2e0e5deae01e902a8858e2c7dd76a724cde9
-
-[http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.7.tar.bz2]
-md5=16dd6515fd011ad449e5ce191dbb94be
-sha256=24520b3e33f98a3bcc79ad68f7d426475cbacf12e4c56338f58a05158523d71d
-
-[http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.8.tar.bz2]
-md5=c9a7a6324104dc84502fc066c4fc4220
-sha256=f1aeb28d27ea4078467125e7eb5ee2b16b08443c9f5f3aa1010d262c37aacc0b
-
-[http://people.freedesktop.org/~wtay/gst-rtsp-0.10.4.tar.bz2]
-md5=8daaca1299aeb42c6aac47b30291005b
-sha256=1ebf3571d16dbab401f2ebf0362e3d67457fb88711ad15a4ab51bd3730267fb7
-
-[http://people.freedesktop.org/~wtay/gst-rtsp-0.10.5.tar.bz2]
-md5=caca55e2ff497c0a327df3bc65a4a662
-sha256=a6f0a0c6c466683ee688aa8475623850fdacb549b2339a502831fdd3d74f984e
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.11.tar.bz2]
-md5=67240094e08c845b7bbcfba755c95695
-sha256=d7130fbcbcac945c28402361b60e8d24d97f75d795ba91401617f81e595a7dd5
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.14.tar.bz2]
-md5=eb83767c877990c8a7540693d196c822
-sha256=e684179e63262c7271dbc50e64ead205cae013daac7264d8effbf60fed3f2438
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.16.tar.bz2]
-md5=d3ce3f670b7c48129c7d7d272ae15a4f
-sha256=522d674bd9884bb1aff8e5e16fe64d7b8d190a329323db6a1795c4f5fd66ae2e
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.17.tar.bz2]
-md5=3232416ea6fceab628236d67a7d0a44a
-sha256=442862dc93e734aa58f13bcf3914dc7a40d3fa28f0ae2152c80457438dc3569c
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.20.tar.bz2]
-md5=d5af70413a65ebf855f788f965685e2b
-sha256=c839c3872510890bdbdfb43a79fd8b5646f3b9164b637127fb550351dc147eba
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.21.tar.bz2]
-md5=7bad90af3fd81a1535363cf85359125c
-sha256=94c185a0452b5fcddb538f6b686ff959b7afca8340c48fdbe47c87a2a459c3d3
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.22.tar.bz2]
-md5=35dd8598837af4074753afe5b59e8ef2
-sha256=61489e0192b1362e6dc760154204c73c1edd9ad9d8c754535483ec00ad7e389e
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.23.tar.bz2]
-md5=f7b2e300d2d85756407ec529424ab237
-sha256=cf750821040102d2c9fbfed56472a86fd0d8c24ada37901c41867c88438a776d
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.25.tar.bz2]
-md5=88544e034a051baf472983791d233076
-sha256=39b2ba7b3bfa8df6d998a9461e7091c27757e36a53e93969d7d9982a56526578
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.4.tar.bz2]
-md5=263a7800ecf44d0f38d0cbc80bce65ff
-sha256=7b8add7db1e0b0e3671f374469ef32b151fa96bc9eb2aa265eefd79548752ffc
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.5.tar.bz2]
-md5=f088c1303f19f0423f35d699deed92e3
-sha256=1c055d04fc31ac5730a766743ece1402f93f967c8f815cd5c97112dfab8f4aa1
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.6.tar.bz2]
-md5=3b0ba3698bfdb0a59918563ca285cefd
-sha256=11d65e787ad24596af3f84744655f7c6ad0c747e2c285248dda4e5893d0b317a
-
-[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.8.tar.bz2]
-md5=a094ea86d4cea4f23ef2eb8c6e7bfc10
-sha256=e17b33586d9f4ff656ed04559ed765b50affc19309074ef5bdf4ff62f5a1c863
-
-[http://ftp.gnome.org/pub/GNOME/sources/gthumb/2.10/gthumb-2.10.11.tar.bz2]
-md5=498c583800a05593f7493e8f27991c7d
-sha256=68ac6835afdbe32cba09504b4d61ad4f5d98a97776bfb58698338add56eb520e
-
-[http://downloads.sourceforge.net/gthumb/gthumb-2.6.9.tar.gz]
-md5=2819ec911a7cc4f46b95240b65f2b3e2
-sha256=b02423f0dc9f82a3e1a56cfd470c1cee5d351654fdc55c1a3cd5cff150828b3c
-
-[http://heanet.dl.sourceforge.net/gthumb/gthumb-2.6.9.tar.gz]
-md5=2819ec911a7cc4f46b95240b65f2b3e2
-sha256=b02423f0dc9f82a3e1a56cfd470c1cee5d351654fdc55c1a3cd5cff150828b3c
-
-[ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz]
-md5=4d5cb2fc7fb7830e4af9747a36bfce20
-sha256=3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
-
-[ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.10.tar.bz2]
-md5=73967e62a2e2e588ace772ac9db1bc32
-sha256=f6b3448fcb0eaad1be873eb33c4b733414288b9aada6b51c6ac44140001e89b1
-
-[ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.14.tar.bz2]
-md5=018d7dd0fa7de01cfdb77c7c55e7ba26
-sha256=d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
-
-[ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.9.tar.bz2]
-md5=20d763198efb38263b22dee347f69da6
-sha256=3aab107fb97a280b77fa30d07540e325d1511907bbce1e7efa5b4db2dffa28a3
-
-[http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.0.tar.bz2]
-md5=e9c280afec29b11772af5a7c807abf41
-sha256=faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd
-
-[http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.11.tar.bz2]
-md5=f7aab88e856a813386f797aade5867ad
-sha256=c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9
-
-[http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.3.tar.bz2]
-md5=dc8455144f27945f2fcbe91e75acd118
-sha256=e77dcec1b2f7ab7606afdaf63a1ddf80af4c5f518e1fcc7260dadb679dd858fa
-
-[http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.5.tar.bz2]
-md5=588c7fb3d9ebadf4f5a1ab4c534e4db5
-sha256=9e364df3d7368c1e69dab1b2352a68bc8ac07e35bf647bf23f3445d902bb4a4c
-
-[http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.7.tar.bz2]
-md5=57132c4a921ef00e241a0fc991787556
-sha256=ef1be6d109b8a4a05c604944616043a4647510f5c1ff5eb84a1eaecc3d5425d3
-
-[http://download.gnome.org/sources/gtk+/2.14/gtk+-2.14.1.tar.bz2]
-md5=c6e66ffe92724d83391187f0af016b23
-sha256=516d981d1d696bb00a8c451fe928efd64ce0bd674ccc3024a0aefb292343231b
-
-[http://download.gnome.org/sources/gtk+/2.14/gtk+-2.14.2.tar.bz2]
-md5=b693a2c1c2dd95457b87d0d042aa5bba
-sha256=efc277e87e3b7e0315eb3c2837fad6a06aab92b38e08fec6f30beb53e7e56e09
-
-[http://download.gnome.org/sources/gtk+/2.16/gtk+-2.16.0.tar.bz2]
-md5=139528802794287427fd4d18875b5cf5
-sha256=ff25cbf43dd5c5f8cddc1b2094505c1d079a576b873a6d3d6b62d95da1bdd1d7
-
-[http://download.gnome.org/sources/gtk+/2.16/gtk+-2.16.4.tar.bz2]
-md5=d666f9f5a544e9d4d45804d88b1b5c4d
-sha256=afcdc5b67974054b111a4c283641303647d1ffa5677ffb8c4ce8621f12e17f88
-
-[http://download.gnome.org/sources/gtk+/2.16/gtk+-2.16.6.tar.bz2]
-md5=416412b336d9f3b6b78ca887395d1726
-sha256=18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af
-
-[http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.0.tar.bz2]
-md5=bb7ef5463a74a80454ced2c1d47a0192
-sha256=05fce9327dbe78a74ad4cd45383d541f96f19d40d3c03076cdf6908ad28ad241
-
-[http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.3.tar.bz2]
-md5=369e173600efc272131b53b1902679e8
-sha256=1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf
-
-[http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.6.tar.bz2]
-md5=3b32073cf1fad755f7c2b2db71aebe90
-sha256=5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d
-
-[http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
-md5=c6697665e06cad01e87c2cf8d0913725
-sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
-
-[http://ftp.gnome.org/pub/gnome/sources/gtk+/2.2/gtk+-2.2.4.tar.bz2]
-md5=605332199533e73bc6eec481fb4f1671
-sha256=9e6d32b850a45d9c9824fe96cf0cfbb3ad7697552817c9c5b4d60e9abcdd6545
-
-[ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-2.4.13.tar.bz2]
-md5=3a438e1010704b11acaf060c9ba0fd7b
-sha256=9952cd6f167446d32d9d9e1f19101877deb86ba67ec2d406dcdfb6c60e849779
-
-[ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-2.6.10.tar.bz2]
-md5=520090ef291e35ba93397060e20f5025
-sha256=d408b606c8dd414dfbf220ccc168a0bc85a419945439796792a5357a96ff02af
-
-[ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.16.tar.bz2]
-md5=6dea9b6f546bd858401729d12bbd5919
-sha256=5073cb676347d7bfb4438795f586867fbcce68b197eb9c0683b0b82af77d5b8f
-
-[ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.9.tar.bz2]
-md5=e7a94132ae6353106c80cd4a1106a368
-sha256=e8fb1f414288e1c2b1ee6408280477ee361e0a19564e9113bd98f433aaa81195
-
-[http://repository.maemo.org/pool/maemo5.0alpha/free/g/gtk+2.0/gtk+2.0_2.12.12-1maemo12+0m5.tar.gz]
-md5=209c0b06a3dadf7c9ca0580232fcc85b
-sha256=e0bdab6d558aa7c504332a2b6c9f9d4fc85dc763a8c35a9addc02ffa5cd777f2
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/g/gtk+2.0/gtk+2.0_2.12.12-1maemo12+0m5.tar.gz]
-md5=209c0b06a3dadf7c9ca0580232fcc85b
-sha256=e0bdab6d558aa7c504332a2b6c9f9d4fc85dc763a8c35a9addc02ffa5cd777f2
-
-[http://downloads.sourceforge.net/scigraphica/gtk+extra-2.1.1.tar.gz]
-md5=1a933ca1286829383a0554cc2deb9e04
-sha256=82d179fd2eb3fd5acbc9fc4d74507c559c6bc3269c488dc8642f9bca47a5dbe4
-
-[http://heanet.dl.sourceforge.net/scigraphica/gtk+extra-2.1.1.tar.gz]
-md5=1a933ca1286829383a0554cc2deb9e04
-sha256=82d179fd2eb3fd5acbc9fc4d74507c559c6bc3269c488dc8642f9bca47a5dbe4
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.10/gtk-engines-2.10.2.tar.bz2]
-md5=01de081b24d7b5d92093cad5c5e4b8c7
-sha256=9c72b0b3a42c2db05e245706d2345e5d529775ddaf029864fc1dc22ae0a190ef
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.12/gtk-engines-2.12.0.tar.bz2]
-md5=8f17f5ab09f9f8e17db3101c0133b811
-sha256=fa0b33c43cc5bc48fba031d4d801e0e80b751cc1b3db9f5e3cc274653a1f57a1
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.14/gtk-engines-2.14.0.tar.bz2]
-md5=c4784ceacddbf818c22ce36b13f6c7a1
-sha256=15aa3a926307b4b3e40f3a9b05c604df6811eb48814b1534db32aed414aefb0c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.15/gtk-engines-2.15.4.tar.bz2]
-md5=060ea25c471e5f4cf5c1baeac27d0345
-sha256=0d8b6630c546327ddc67c700859731036eebdf77e51ad8b71e4d19d28ca2ff2c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.18/gtk-engines-2.18.1.tar.bz2]
-md5=5dc748cfb0587bb412adc49b666fb6f8
-sha256=d7e2672fcf80f5c35d481c24e0ab5b7d0f6526dcc3d8821ab76468c1816dc3bc
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.2/gtk-engines-2.2.0.tar.bz2]
-md5=78e9276c28b509f3203de4873c20a263
-sha256=140541cae8b003d2f7210e2ef060ac328d7e45a04e2cf5fa943fff73c9955dd6
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-2.6.1.tar.bz2]
-md5=87849bc511cdba018c87fe5d6f7ba347
-sha256=f01b79ff49394c925978d4842c16d1859c9a122fa597b8067c8d62378dafbd15
-
-[http://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.6/gtk-engines-2.6.11.tar.bz2]
-md5=0fbcfcf59b8e057ad5994fcacef52494
-sha256=bff6180fee848d0d59b7df0a89cf3c8a78d7fd9a2e6861ed6d0e03f4cd48efc0
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-2.6.3.tar.bz2]
-md5=ba5975f8ab390fa43fc0bf94f4a3b023
-sha256=6d7f9686855225243ee3d56c4d1d17b3485a780ba60cc83b183c361ab7e3b7a0
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-2.6.5.tar.bz2]
-md5=28469a797ba1e6aaa3f7eea4c9f5f9b7
-sha256=0d7b79b2a369d99f155e85f3f01fca9efb1a5059b5c4406357686a7d8bbfe0d3
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.7/gtk-engines-2.7.4.tar.bz2]
-md5=b0f27c0f6d5f610ca445a3d82d5779da
-sha256=0a40b43898a898e60bca29ed023034e362467573de52f5e841079c02528cc76c
-
-[ftp://ftp.debian.org/debian/pool/main/g/gtk-industrial-engine/gtk-industrial-engine_0.2.46.0.tar.gz]
-md5=c0f131c265a585e5cfd84e2da6b6d3a0
-sha256=5e58ce65e7fe08eb28bd258a5de9c56c75998cdb48c3867b392b5ea74160aa32
-
-[http://go-mono.com/sources/gtk-sharp210/gtk-sharp-2.10.2.tar.bz2]
-md5=7d509a677c58b2e6a8c85db51d0b1451
-sha256=8dc7f6180109a529b3216b6527f34a01e1e4484e42ebbd28d551e8f6ce0c243d
-
-[http://downloads.sourceforge.net/smooth-engine/gtk-smooth-engine-0.5.8.tar.gz]
-md5=7b4aebf85040b357124de926807dc22a
-sha256=cb2b353839a7f1dcd8f93a6cb32b5c54a6fe560dee432585edb2f5eebe526c50
-
-[http://heanet.dl.sourceforge.net/smooth-engine/gtk-smooth-engine-0.5.8.tar.gz]
-md5=7b4aebf85040b357124de926807dc22a
-sha256=cb2b353839a7f1dcd8f93a6cb32b5c54a6fe560dee432585edb2f5eebe526c50
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/gtk-xfce-engine-2.4.2.tar.bz2]
-md5=00eb6a62defe6867d28a18569b96d151
-sha256=6fecdb590fa024db698de9027314c1be044f28feab9850f592aa60c3a79ede78
-
-[http://mocha.xfce.org/archive/src/xfce/gtk-xfce-engine/2.6/gtk-xfce-engine-2.6.0.tar.bz2]
-md5=e836705d2933d0a77c6628285e10d982
-sha256=c817050b2526ac107e1971d344aa20e06b98b80b60c912e83fa96d7804b4e8ca
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/gtk-xfce-engine-2.6.0.tar.bz2]
-md5=e836705d2933d0a77c6628285e10d982
-sha256=c817050b2526ac107e1971d344aa20e06b98b80b60c912e83fa96d7804b4e8ca
-
-[http://src.gentoo.pl/distfiles/gtk2-ssh-askpass-0.3.tar.gz]
-md5=14ca8c653ad19699b7299198d7a94e0a
-sha256=5b0a2b2ea2cbe26d7738a360ba5aad57d7d03297a662cf209a032c0b9725d33c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.0/gtkhtml-3.0.10.tar.bz2]
-md5=b05b8551f7803f32ecfcf505a6310f3f
-sha256=47492876466dcbcd82e371264c6a1422f82feb80e40fe25a42ccc1fb7897180c
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.1/gtkhtml-3.1.16.tar.bz2]
-md5=a16fc3d5e2c7b3d94791bf797588adc3
-sha256=a5b138e5cfa1f5c2c4dbb0a071d5492d49142c363ec9b92da8d7e3a6e6bb35b5
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.12/gtkhtml-3.12.3.tar.bz2]
-md5=b580590014988b02e51b66be65319570
-sha256=666849b22375efbaf2ab506b33868ac64126728a8e509f055882ae6940999847
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.13/gtkhtml-3.13.91.tar.bz2]
-md5=debaf8eb4468dc1c084cb3f1b527bafd
-sha256=e739290102fed3fb616e27578dee61a33c84301ec875bcf6af9493e8959dbeaa
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.18/gtkhtml-3.18.0.tar.bz2]
-md5=ec541b078ea9fbb1dd93f77075f77bd8
-sha256=867036b10dd4b21f79bc0d8b303d348ff55cb4ded896c8cb384b2bb4bbf378d7
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.6/gtkhtml-3.6.2.tar.bz2]
-md5=37465fde0f1e1d7ba2284c5a4fd06fe7
-sha256=0c34357bd2b4ed3584e18a30f13a9f5d4c70738872ef90db97c1298013b2f7b9
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.8/gtkhtml-3.8.2.tar.bz2]
-md5=4455e24142cc914f00f1e8b81940df68
-sha256=d8fc9e7111773448bb07cc2619fbc3b8534a14a9b3075724465c7567cf1a94d0
-
-[http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2]
-md5=1a3e312cec38645c2f811282566d12b0
-sha256=a16751d55a1a635eb2d04613353884c5bdb2ad2fc3afa4b951aa2868552602a9
-
-[http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-0.14.1.tar.gz]
-md5=6282cc4d9e9cc9445c9d3736ac3aadf3
-sha256=a9cbed1b4d3491b4e22b80c9f066224ffb80eb7e1113869534ce53b599c7ea5b
-
-[http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-0.15.tar.gz]
-md5=64d0040925043c0a5d9a8add76a0f98c
-sha256=99ce4d10541d964d809036970f53579813bb563495070ab09c742cc1e2cdef38
-
-[http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-0.17.1.tar.gz]
-md5=db9d27569903cf09c89c1e57765d3dcc
-sha256=aae832e99a04e49c55b0493684aeb4484dda48b5d9010c6980626dc62d6b6fdc
-
-[http://www.angstrom-distribution.org/unstable/sources/gtkimageview-1.3.0.tar.gz]
-md5=574789e014988398dca2debc65c02097
-sha256=6a2f50c1a6e83c94618a271cc9b7ce0460fd1fe58adb12e05d0b1b07b43e4beb
-
-[http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-0.7.6.tar.gz]
-md5=4bb348c98367228f0de0a2216a13d48f
-sha256=4b104ab94774ca429aa639a1a6f0adec1ca1443bfd444f2100c063e3cf70e6bb
-
-[http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-0.8.0.tar.gz]
-md5=b53564e553728d4b69f7d366dfeb5299
-sha256=1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.12/gtkmm-2.12.7.tar.bz2]
-md5=ad199f4a392799134c128deab48fee30
-sha256=4e58c9ad827759a2375b3c0d39952b5b2983111ab16ee329b10a34792fb1d9eb
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.14/gtkmm-2.14.1.tar.bz2]
-md5=0209b424987a74c956ea6b70fddaaa37
-sha256=f8675340d929346333b5a58cd4d05482dd8b76cf8606fed85b526022bf9c5e47
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.18/gtkmm-2.18.1.tar.bz2]
-md5=7b36f7ea10f183d14b20cad8c1f70daa
-sha256=142fdf93ba3daa344517807e0270aed6ef57f8248556195ff18e2913cf33a625
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/gtkmm-2.4.8.tar.bz2]
-md5=c2aee4c259a75fa0dc766d402bef253b
-sha256=218420f1c091846fa5f860e5f12c57650d8719f6cf9b922e7c6a69e0505aac32
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/gtkmm-2.8.3.tar.bz2]
-md5=578dca71e56db17f400abd21ca8e7ce5
-sha256=c1c2e1fb0168ecb3a5e773ac0cd74a0e5caeaaf402f108479337794dab8aa75f
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/1.7/gtksourceview-1.7.2.tar.bz2]
-md5=a56ea78c74fe93a604357d7c555af0e5
-sha256=38c238ec57bf22023bbc50f70ecbaee8c06b817b9e11f1a3a0ae7faf95cc1f26
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/2.6/gtksourceview-2.6.0.tar.bz2]
-md5=dd065ab2e96e51aade949249c5556439
-sha256=92ddd976721e26377eaa59fea07707a0caa85eb874500868c1e6fdd9a21fe0dd
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/2.7/gtksourceview-2.7.3.tar.bz2]
-md5=ea30aecfbd55ebf40c6cf5a0f254f9ba
-sha256=bf4c6285683a70addedd3ae6b9d4b450d928be497834272c4cd705471333f1ec
-
-[http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/2.9/gtksourceview-2.9.1.tar.bz2]
-md5=1e3a378af5f6319d53413394620c4e4a
-sha256=b5ebdc5e7d33b99790c6dda14a717711963039f8ea6242c889f540b24ed6678f
-
-[http://downloads.sourceforge.net/gtkterm/gtkterm2-0.2.3.tar.gz]
-md5=a49f93d15909dbd2e7011428ae01f0f0
-sha256=fb68b18d752ae2379f144186b94743be991af1a42c88bc1e6f0685e45cb1d573
-
-[http://heanet.dl.sourceforge.net/gtkterm/gtkterm2-0.2.3.tar.gz]
-md5=a49f93d15909dbd2e7011428ae01f0f0
-sha256=fb68b18d752ae2379f144186b94743be991af1a42c88bc1e6f0685e45cb1d573
-
-[http://downloads.sourceforge.net/gtracer/gtracer-0.0.10.tar.bz2]
-md5=8f21636a60ed57265feb34806ffe4b00
-sha256=ce2a88a784c73d49b3600b5927f65624f665460684dc4b479989ad1c53e565c5
-
-[http://heanet.dl.sourceforge.net/gtracer/gtracer-0.0.10.tar.bz2]
-md5=8f21636a60ed57265feb34806ffe4b00
-sha256=ce2a88a784c73d49b3600b5927f65624f665460684dc4b479989ad1c53e565c5
-
-[http://guichan.googlecode.com/files/guichan-0.7.1.tar.gz]
-md5=275c5bad231d2ce55e654d80cb1e05be
-sha256=7f017522d0c3235f2399f8b615493f3880fbe10a54dfa377f638016ede715a2a
-
-[http://ftp.gnu.org/pub/gnu/guile/guile-1.6.4.tar.gz]
-md5=a4aceb5f185878c1de4e8aa7c38b6d1d
-sha256=6391c9735615ee929f4ae23bbfa8373c97ae64923c7fbe72cc4b0e262c4759e0
-
-[http://ftp.gnu.org/pub/gnu/guile/guile-1.8.2.tar.gz]
-md5=a4b64a992deae0532f8015bcc6c40784
-sha256=1f7667c30228737e3cea58ff2b384bcc0eed8cb679392de827821e4d540c760e
-
-[http://ftp.gnu.org/pub/gnu/guile/guile-1.8.5.tar.gz]
-md5=a3f8216544509a74a4441f689a0410d2
-sha256=e2f63d2d445ffeb072638eab885b1a629e372d1db711c8afb26a62bc56096289
-
-[http://ftp.gnu.org/pub/gnu/guile/guile-1.8.6.tar.gz]
-md5=9e23d3dbea0e89bab8a9acc6880150de
-sha256=69a2f9491480ff756d1cc4c8ea2bdc13d40ea8ddc8f93f26957bade8219a1d86
-
-[http://ftp.gnu.org/pub/gnu/guile/guile-1.8.7.tar.gz]
-md5=991b5b3efcbbc3f7507d05bc42f80a5e
-sha256=bfee6339d91955a637e7f541d96f5b1d53271b42bb4a37b8867d186a6c66f0b3
-
-[http://gupnp.org/sources/gupnp/gupnp-0.12.2.tar.gz]
-md5=5350f5f28fb3742779702a496ab75d72
-sha256=9e4edb3ca6d11e397d9f98537fa8954851dc044d13ecafd4f4547117cefbdd28
-
-[http://gupnp.org/sources/gupnp/gupnp-0.12.4.tar.gz]
-md5=91b4337d22f6dd931888a33553ab945a
-sha256=f78e4b0a361b67805892c1a0e72f3cef92fbc96112157895660a478979ddeef4
-
-[http://gupnp.org/sources/gupnp/gupnp-0.12.5.tar.gz]
-md5=bfb12195c76bb6632bd917f2c2bc12d6
-sha256=241e416cbe2c02f413fde82a8587bfe2fe9915fbed3a6fb20c86520b8d7543ef
-
-[http://gupnp.org/sources/gupnp/gupnp-0.13.1.tar.gz]
-md5=9b5fcf8146ba9a2bd84382f61717aa0e
-sha256=e97faaebf0da42617a43de4c7c1148a51148f2a2cdaa2a10855e377b968a07fd
-
-[http://gupnp.org/sources/gupnp-av/gupnp-av-0.2.tar.gz]
-md5=ab485bf263d0a3d2f771817241c970b9
-sha256=782e4e45abcba1b3fe34276580653f4dbfbe8a26eee69a290675dfa7faa309f8
-
-[http://gupnp.org/sources/gupnp-av/gupnp-av-0.3.tar.gz]
-md5=f6e813591ff89e8e61a46f416046450f
-sha256=34b6e104b480e501e430daa68fca63906a939a6cb02bc43814ed06d2856a72ac
-
-[http://gupnp.org/sources/gupnp-av/gupnp-av-0.5.2.tar.gz]
-md5=15ccfbb17553bf1cb00bf8e1d801005e
-sha256=dfd438f40e31047d6f06db30db05d5f876c6294a8509f170482d712f552e9892
-
-[http://gupnp.org/sources/gupnp-tools/gupnp-tools-0.6.1.tar.gz]
-md5=27d3a55eae2243661f49a7cf40e1e195
-sha256=c4004de997674bb54d5844391dd824c6aee78184b075e7ea5d8f816e0d031e25
-
-[http://gupnp.org/sources/gupnp-tools/gupnp-tools-0.7.tar.gz]
-md5=a96674de9bfdc42c70e8b9f801e2822e
-sha256=cd085871881f6c10d6ddc1206787ff692eb6b37a746a53b64f55aa9e91defeae
-
-[http://gupnp.org/sources/bindings/gupnp-vala-0.4.tar.gz]
-md5=5806534e2bd3a68552f620e4b35dd292
-sha256=6874cc3ee7daa9695cf5d24c635d98e3fb9e7291df36fbd0b0ba8f46825473a8
-
-[http://downloads.sourceforge.net/gimp-print/gutenprint-5.1.3.tar.bz2]
-md5=276196ad27fa7d4b8b3ed3ca9c4af64c
-sha256=6be13b32d9f222506368bf214f8ba0a3ef08a36b1ebbed8be61cfe38ca2f35c7
-
-[http://heanet.dl.sourceforge.net/gimp-print/gutenprint-5.1.3.tar.bz2]
-md5=276196ad27fa7d4b8b3ed3ca9c4af64c
-sha256=6be13b32d9f222506368bf214f8ba0a3ef08a36b1ebbed8be61cfe38ca2f35c7
-
-[http://ftp.gnome.org/pub/GNOME/sources/gvfs/0.0/gvfs-0.0.2.tar.bz2]
-md5=1267b82b481340eadf212cf47b735b62
-sha256=7249197b75a61c36398f7458f12c0318ccf03639ae8404771fb4ff414fa17683
-
-[http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.0/gvfs-1.0.1.tar.bz2]
-md5=0d123f87e3e660271cd9d11b8c592c5a
-sha256=67e7dd1dca32a99eb1102a853d2df1bac782d50a4361511409572cfe8ea51147
-
-[http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.0/gvfs-1.0.2.tar.bz2]
-md5=04c44757a265f787d6606655b6bbc593
-sha256=f3606dc28b1fa140c7d0191478097a89f7ef7a3183a811a1410a230052b71eb4
-
-[http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.0/gvfs-1.0.3.tar.bz2]
-md5=a41e8b7d99e390cef8312f7ce5f312a5
-sha256=17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd
-
-[http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.2/gvfs-1.2.1.tar.bz2]
-md5=df8f624587adfabe7009838ce6d8d5fd
-sha256=0e3c3469721ff1d4296bf4af7e1f131201d2dc6a36c772d99e1630f8cce31da2
-
-[http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.3/gvfs-1.3.2.tar.bz2]
-md5=73a7aecfba767f80146cbd5d37598e8b
-sha256=f4bddab378a3a197418e5e2229e7ff967c03adf049e33c5516745db35538b6de
-
-[http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.3/gvfs-1.3.3.tar.bz2]
-md5=2f1c65dcde8fc4d0603e11a8ec3fc178
-sha256=453476904745e355a69987bcd20c5db1bc9a1757022f8dd8c0f3b7142f3a00fd
-
-[http://sebdelestaing.free.fr/gweled/Release/gweled-0.5.tar.gz]
-md5=238f5ef66317bb24c3d4018a7d1e9ec3
-sha256=d5baec578b22407e3fc78cc47393942f9704f1ab7b8d1c012577037d3421f90e
-
-[http://downloads.sourceforge.net/xine/gxine-0.4.1.tar.gz]
-md5=4a04df0d971a8952fb395b6eb0bc8dab
-sha256=48d93ef10f17cffe1ecbfec3078932ae48e08e3c172437e4bdfb22ae87d25421
-
-[http://heanet.dl.sourceforge.net/xine/gxine-0.4.1.tar.gz]
-md5=4a04df0d971a8952fb395b6eb0bc8dab
-sha256=48d93ef10f17cffe1ecbfec3078932ae48e08e3c172437e4bdfb22ae87d25421
-
-[http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/h1940_batt.patch]
-md5=2810d6a0aa41a349faf711bfc9facf14
-sha256=0d68bfb125997599470dbc4822d43e777a831da2f1cfa5356b5dc791cdd8b27f
-
-[http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/h1940_leds.patch]
-md5=f1c690a1c94a4178cf71ddeba3d52acc
-sha256=efa90d22a191b1bf2511b722dc2b9ed823fa7dbdab4a6be4c5f0609f5ed83af3
-
-[http://freedesktop.org/~david/dist/hal-0.2.98.tar.gz]
-md5=cc289e50e00330032604e02392ffde3a
-sha256=b011f194e1ab90e753744405bb5b85949cdda1a02320cb174b8d4a8e5e182dc3
-
-[http://hal.freedesktop.org/releases/hal-0.5.11.tar.gz]
-md5=750cf074e88b6fb7012f26d99cd39b9b
-sha256=730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90
-
-[http://hal.freedesktop.org/releases/hal-0.5.12.tar.gz]
-md5=bb7c36e142437f7363f9a80ae8391926
-sha256=c444e0485e4361eec0e6f06580c45b9fcf6f20a119634a5f0a5c13218cfdfd02
-
-[http://hal.freedesktop.org/releases/hal-0.5.13.tar.gz]
-md5=46ecc5d2e5bd964fb78099688f01bb6a
-sha256=ebcf22a373761530920643add1a791af40954dc7349f027d1c35b0e0f7f9c8af
-
-[http://freedesktop.org/~david/dist/hal-0.5.2.tar.gz]
-md5=3b351822ba359669646026013a3d5a03
-sha256=46d0a75f90058909269da4cc42986cd51d5163a6af669e9d7fb4a7d170217d17
-
-[http://freedesktop.org/~david/dist/hal-0.5.4.tar.gz]
-md5=2f84ddbc22bc35baa9388e7794d1fa31
-sha256=ff837f077dcc4a29c4dd8c9c3b7115cbbd1362aa0c0cce1435e8bca0d966dc42
-
-[http://freedesktop.org/~david/dist/hal-0.5.7.tar.gz]
-md5=4163afb8285db64e00e7b1392b401d92
-sha256=63c78e9b9c8308914372f9a762b02fa057bca2c6a1c7478ab595ba0fa92781d5
-
-[http://freedesktop.org/~david/dist/hal-0.5.8.1.tar.gz]
-md5=568d7ce9831c18a5e6e502abd6781257
-sha256=0c51b41f5c8729e3568df26266485b4d32ec6ba04567f7a08d8e68cd76e59714
-
-[http://freedesktop.org/~david/dist/hal-0.5.9.1.tar.gz]
-md5=6a40f49f964e64358e53652038f3059f
-sha256=5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
-
-[http://freedesktop.org/~david/dist/hal-0.5.9.tar.gz]
-md5=a6f532770cf9286e1de38d6570cbc6bc
-sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
-
-[http://hal.freedesktop.org/releases/hal-0.5.9.tar.gz]
-md5=a6f532770cf9286e1de38d6570cbc6bc
-sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
-
-[https://fedorahosted.org/releases/h/a/hal-cups-utils/hal-cups-utils-0.6.19.tar.gz]
-md5=58e1c8f5597dd39e57dcf3c4aabe60f8
-sha256=f40a7ebd1453d471a8a6bfd8c635708dd739a6160bb661813f936d936ba85618
-
-[http://hal.freedesktop.org/releases/hal-info-20070618.tar.gz]
-md5=c7005ccb1765d8359fd2348350770495
-sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0
-
-[http://people.freedesktop.org/~david/dist/hal-info-20070618.tar.gz]
-md5=c7005ccb1765d8359fd2348350770495
-sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0
-
-[http://hal.freedesktop.org/releases/hal-info-20080313.tar.gz]
-md5=a391649c5d5baa1a8998b2e1c1ad6464
-sha256=120e6b8019b5d608038d8f9a5a14bb97c4162b803118bb8530d9735d65b553a9
-
-[http://hal.freedesktop.org/releases/hal-info-20080508.tar.gz]
-md5=6fc99d15d38945c17a291ea93e664664
-sha256=80655b3531ea56a5d64085e572dfb8d3ecabffd28af482cd130f72dfdd6254b0
-
-[http://hal.freedesktop.org/releases/hal-info-20090414.tar.gz]
-md5=ae7177ab8f0163d3ef2df71f0de2b357
-sha256=33dd87dc9452227375b8b9cdad940581714a55d55ff18ae2990905ac2f81fa0f
-
-[http://downloads.sourceforge.net/hamlib/hamlib-1.2.10.tar.gz]
-md5=29f0d30779a8ffe0444eb523a6ad8344
-sha256=9b50825666519b0b86469f1988a0de09ce2ffc08fa221f9aa40d18c7b7f6c651
-
-[http://downloads.sourceforge.net/hamlib/hamlib-1.2.8.tar.gz]
-md5=74eaf1be4cf1cbdecee54808c6930788
-sha256=be81153a6e2830234d62818c8aa5658b1410b538a3676686a3f1373f03036b81
-
-[http://downloads.sourceforge.net/hamlib/hamlib-1.2.9.tar.gz]
-md5=9515288826284d6c8dd569354dacc8e0
-sha256=ba75e64e1b6d5ffaa41e2063e475eca5b35ad68cb4ee6e888e0fc73bd6fa9fba
-
-[http://www.soft.uni-linz.ac.at/~vogl/bluez/handsfree-040326.tar.gz]
-md5=488b0f2f346361bba7996b459c5d7b6f
-sha256=dbd0c389a160c9f6dcd9eac81b6c4d5a02866968a33f06201556d6860012f6c3
-
-[http://downloads.sourceforge.net/haserl/haserl-0.8.0.tar.gz]
-md5=bd9195d086566f56634c0bcbbbcbebea
-sha256=ba261a21539e1f204ba74590d313c501007e546b54aa9ae7210a99eaf3c097be
-
-[http://heanet.dl.sourceforge.net/haserl/haserl-0.8.0.tar.gz]
-md5=bd9195d086566f56634c0bcbbbcbebea
-sha256=ba261a21539e1f204ba74590d313c501007e546b54aa9ae7210a99eaf3c097be
-
-[http://downloads.sourceforge.net/haserl/haserl-0.9.23.tar.gz]
-md5=31d1f505afe3ba1b351e18612aa57a70
-sha256=bbe44edc3d519028761a22b282b912ab8f43db2003c6791c295c4a52f5db48bf
-
-[http://heanet.dl.sourceforge.net/haserl/haserl-0.9.23.tar.gz]
-md5=31d1f505afe3ba1b351e18612aa57a70
-sha256=bbe44edc3d519028761a22b282b912ab8f43db2003c6791c295c4a52f5db48bf
-
-[http://downloads.sourceforge.net/haserl/haserl-0.9.25.tar.gz]
-md5=906c634a2af4ac3a4b656ef4e244c4cd
-sha256=d33ba27082c8bc4427ccebd8a56cf9aef190391f0361398197efb03210910f0e
-
-[http://www.server-side.de/download/havp-0.82.tar.gz]
-md5=9e6a16b7d074782d1c62f1f7316e56ab
-sha256=e2db8d3383cd8eca6a18ebee85875de895f3ac7414eab091a87f052d79a87b09
-
-[http://www.server-side.de/download/havp-0.86.tar.gz]
-md5=c99c8da224c72844882623086e2b1618
-sha256=1649ab227c7fd7b4af5ab602a3cdff16c038965c6673c09a239d5df35fa88da8
-
-[http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2]
-md5=8b829339e1ae9df701684ec239021bb8
-sha256=618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b
-
-[http://downloads.sourceforge.net/hdparm/hdparm-6.3.tar.gz]
-md5=0c12672f3a09c14ad0b0882f15fc9389
-sha256=08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d
-
-[http://heanet.dl.sourceforge.net/hdparm/hdparm-6.3.tar.gz]
-md5=0c12672f3a09c14ad0b0882f15fc9389
-sha256=08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d
-
-[http://downloads.sourceforge.net/hdparm/hdparm-6.6.tar.gz]
-md5=ecea69f775396e4ab6112dcf9066239f
-sha256=7e2db39a4e1f41bb327a9a8ef9e5e8359aaed0cc78e642a4ca67659629e3048b
-
-[http://heanet.dl.sourceforge.net/hdparm/hdparm-6.6.tar.gz]
-md5=ecea69f775396e4ab6112dcf9066239f
-sha256=7e2db39a4e1f41bb327a9a8ef9e5e8359aaed0cc78e642a4ca67659629e3048b
-
-[http://downloads.sourceforge.net/hdparm/hdparm-6.9.tar.gz]
-md5=62749c6cdf28ce31aae335092fa107df
-sha256=cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06
-
-[http://heanet.dl.sourceforge.net/hdparm/hdparm-6.9.tar.gz]
-md5=62749c6cdf28ce31aae335092fa107df
-sha256=cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06
-
-[http://downloads.sourceforge.net/hdparm/hdparm-9.15.tar.gz]
-md5=0524dd10ad986285ff4eeb3507f7471c
-sha256=689a413119c4d670ed95b9ac24511655c4805db678ad93866ab1036a0ba4d6bf
-
-[ftp://ftp.gnu.org/gnu/help2man/help2man-1.36.4.tar.gz]
-md5=d31a0a38c2ec71faa06723f6b8bd3076
-sha256=a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2
-
-[http://handhelds.org/~zecke/oe_packages/hexatrolic-103beta3-zecke1.tar.bz2]
-md5=1d9420e8b5a6d5fa491c458ffafd4adb
-sha256=b60a5358e56e676529e7d3d655d5107a76b9a2434e38952711fea794f65721ce
-
-[http://penguinppc.org/historical/hfsplus/hfsplusutils-1.0.4-4.src.rpm]
-md5=e8760b432b7e95d03158b4bbca404149
-sha256=741577b91c091fc9d6732b57732bdafb85739c65cd65194e506e1d01425bda56
-
-[ftp://ftp.mars.org/pub/hfs/hfsutils-3.2.6.tar.gz]
-md5=fa572afd6da969e25c1455f728750ec4
-sha256=bc9d22d6d252b920ec9cdf18e00b7655a6189b3f34f42e58d5bb152957289840
-
-[http://www.suspend2.net/downloads/all/hibernate-script-1.12.tar.gz]
-md5=0fb7c524a30daacf200f27de2e398646
-sha256=dd1c1bb297fc4bfdce73614322cb60d92d99db719e473b9cbb4c62e0ea444147
-
-[http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.10.tar.gz]
-md5=3534f7b8e59785c7d5bfa923e85510a7
-sha256=9d73af8f61240fbb3c522321582cd693c5b81ef344067a3949f0aa624610adee
-
-[http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.11.tar.gz]
-md5=5cf5527e803a554f43319ee53c771e0b
-sha256=44eb1f158a9b2a92cd626541a24c44387162b3d792e4b238c84e6f3d8ed1dd9a
-
-[http://freedesktop.org/software/icon-theme/releases/hicolor-icon-theme-0.5.tar.gz]
-md5=947c7f6eb68fd95c7b86e87f853ceaa0
-sha256=8643ddab3b5afd2f94a2db771bae6710ec49d76a6c6890debaa711de8f3bf12e
-
-[http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.9.tar.gz]
-md5=1d0821cb80d394eac30bd8cec5b0b60c
-sha256=a6abad5dd62f12870ff5b32ae414e0c611f0922b905aeab6db2676b607bb1643
-
-[http://www.access-company.com/downloads/hiker-0.9.1.tar.gz]
-md5=30efc3312b2e08e9ee9d73569cb987b2
-sha256=3391a651df8c011dc2cb0f81118069ce22c2d13b86090b2c0ced4e80c4fa662d
-
-[http://www.access-company.com/downloads/hiker-0.9.tar.gz]
-md5=f4cbf05743ccb34282e4dc3aef489f72
-sha256=6633c4124c41d9a1ca526161062fd276f352b4228bde4f565d38d35c15a3005c
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/h/hildon-application-manager-l10n-public/hildon-application-manager-l10n-public_6.0+r6710+0m5.tar.gz]
-md5=4a91a5bee89cf90f0e0ce4037eab18d4
-sha256=5bee5611942ea9ac41e72707778fcab2d5d735d293c0c5b435c674a8c5cc67c1
-
-[http://repository.maemo.org/pool/bora/free/source/hildon-base-lib_0.11.1-1.tar.gz]
-md5=d53afb4ef8ae2b02ddba6587e371f407
-sha256=1379b222f81a86f10f5ba0113f43d52a13b5700cd6c57ea4416c8e8650f28300
-
-[http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-base-lib/hildon-base-lib_0.8.6-2.tar.gz]
-md5=388d916894122be839ba09d804eefeb5
-sha256=c8eabb77f72efaedb2ed4f1f18e2f3ca84164e0a9fa4dd313a23e3b0cc1ca3d4
-
-[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-common-strings-l10n-public/hildon-common-strings-l10n-public_5.0+r6160.tar.gz]
-md5=c882f41d9fa63090bc311d474a5f60ee
-sha256=9abc9651c9998aae27ec3b2efa1901e24b502965e56922fc77682d7ab8ee3c84
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/h/hildon-common-strings-l10n-public/hildon-common-strings-l10n-public_6.0+r6710+0m5.tar.gz]
-md5=18807a5d4d1682b680ec3373da7adc90
-sha256=eb6fd50a25bbb3c11fcb3a8faf0be2772d5070a6bc68f0783093164e775c4f88
-
-[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-control-panel-l10n-public/hildon-control-panel-l10n-public_5.0+r6088.tar.gz]
-md5=ace44f0019c459cec92a8650944dafe9
-sha256=33b1621daf7cee020a6edcb0268fb71991c691b1412ea84bb9b60f1e2a166460
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/h/hildon-control-panel-l10n-public/hildon-control-panel-l10n-public_6.0+r6710+0m5.tar.gz]
-md5=8b4371952abc12ef95cd1cf6484a27e2
-sha256=70bf7524d9a220e1b7ae5cfce22718dd3a39d31705a76aa0596c711577a422e0
-
-[http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-control-panel/hildon-control-panel_0.9.1-1.2.tar.gz]
-md5=72c8b814ebeec8668cea575e08bb1548
-sha256=bbe77d297c7560d3fdad343ab49f23c9c0aa1574db77108d1b97845fb7bb26d5
-
-[http://repository.maemo.org/pool/os2008/free/source/h/hildon-control-panel/hildon-control-panel_2.0.1-1.tar.gz]
-md5=b2247355c2fa3763904d698ec03ee78f
-sha256=bc532113a4e4f4646fb523393e1c3da4dbd5cb2955f223bcbfc794216a7ab8b0
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/h/hildon-control-panel/hildon-control-panel_2.2.6-1+0m5.tar.gz]
-md5=157520e5cde5513737b6bb2d36506ff9
-sha256=39eb832a7829524620f23d77e850b4c89224ffb377390165808e13d64bb05537
-
-[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-desktop/hildon-desktop_2.0.18-1.tar.gz]
-md5=b559f191ffa21d3bcc9defdaff5ec2a2
-sha256=10e4321f8d30d629f67749f93cec129da1535b087ec1d67d95c23daf8afeb16d
-
-[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-fm-l10n-public/hildon-fm-l10n-public_5.0+r6135.tar.gz]
-md5=732e11dbca619dd7d24b1f5291f30517
-sha256=1e3200c9a1c04236a73c82151d538a33ed87bb97e4a8c362977c4795b604591c
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/h/hildon-fm-l10n-public/hildon-fm-l10n-public_6.0+r6710+0m5.tar.gz]
-md5=5b82a5fcc1fae041b7e397e7189c35ce
-sha256=74d29812ca4f36171a271da4bbdff2717ab1b41968a45888c224621b7d2b98fe
-
-[http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-fm/hildon-fm_0.9.1-2.tar.gz]
-md5=6d2646bf0ef3da795a34245b870f7983
-sha256=9305aff5ec4eefe462e94b49c0e1ec3037e9d3ae5a6fa47c8cb7136dadcb1e8c
-
-[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-games-wrapper/hildon-games-wrapper_1.9.4-1.tar.gz]
-md5=b6fd35baddd7f275c3ad980030ab937f
-sha256=b523e63ceef6cc7773f0b80e604ee3a9c032855c1a2de49207e8ed1963f8f62c
-
-[http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-home/hildon-home_0.8.20-2.tar.gz]
-md5=dd62148b18abe1e02182abba91e1d55b
-sha256=1b62825a44d7058e56162d6fc08d06454d30889cfaad6ff0bbd9e32bf4b0ce5c
-
-[http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-initscripts/hildon-initscripts_0.8.14-1.tar.gz]
-md5=1dbed6346a9db52b4089cbea8786b365
-sha256=0dadf64980c5653336a0008b1fd8d77e54596710f5ae59b68115923731b2438f
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/h/hildon-input-method-l10n-public/hildon-input-method-l10n-public_6.0+r6710+0m5.tar.gz]
-md5=82667050cf53f6bd872b2fa033c640a6
-sha256=294da9da3e55c585e7945568b6ccce83f46db55b1386f5821a2db355d079e743
-
-[http://repository.maemo.org/pool/bora/free/source/hildon-lgpl_0.12.1-4.tar.gz]
-md5=ef2ee64157e161978b07e5adb82e79d5
-sha256=8899a280fb8d54594aa2423b7dea2c959070ae3fe4eb86458abdc8bb167ef483
-
-[http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-lgpl/hildon-lgpl_0.9.14-2.tar.gz]
-md5=5218b2d7864f6f8af3ab6ea0cc27a313
-sha256=43a532c99b8cdcc0e2f60d95769dee89f2e03a37c5d5931b8de6e4c39ad721ad
-
-[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-libs-l10n-public/hildon-libs-l10n-public_5.0+r6160.tar.gz]
-md5=ac1f91e1e631c20adc4c4b9fe923020e
-sha256=feacb7f38d7d859b982acf593ecaca6eeec34d6da34d3a28175dea020eda2aec
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/h/hildon-libs-l10n-public/hildon-libs-l10n-public_6.0+r6710+0m5.tar.gz]
-md5=9dfec06a11c89175be2cb9018c471ac7
-sha256=3df08411574c432c30953d9df9310d5a2b11fc301fa5e2cae5a8a56c34629159
-
-[http://launchpadlibrarian.net/7598381/hildon-libs_0.15.1-1ubuntu2.tar.gz]
-md5=562d712b5cce9989b8b640e877384b47
-sha256=13d1330f1154d3eec92e06a9f15b246434ffef0e4947b3f4787a581dcc34f236
-
-[http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-libs/hildon-libs_0.9.6-2.tar.gz]
-md5=cba9fb4c6d61720d03aa4a4d543e2c5b
-sha256=763bd538f0647c373383c2d91fc0c76ae4840d64158509347162b20425a4c8f9
-
-[http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-navigator/hildon-navigator_0.9.6-2.tar.gz]
-md5=e2c2bdfb741f4e2a7d3d696597890139
-sha256=51005d8161b45a422158f04e76b244394aa5eb99b5098b2846f989ee9845b9e6
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/h/hildon-notify/hildon-notify_0.0.2-1-recomp1.tar.gz]
-md5=069b8f9100f71b0f955f15994a7f1b2e
-sha256=762f75d487234e59f1f76d96804aa0d3d3a9381b0ddb3058b39c523df214894c
-
-[http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-status-bar/hildon-status-bar_0.8.11-1.tar.gz]
-md5=7948087bfe3b1bf8025a37fbb64bde44
-sha256=eca16f42de8e4a213acb3ba0978fa56fbdf2f38e5be5882163753068ab4a15cd
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/h/hildon-theme-cacher/hildon-theme-cacher_0.4.3-1-recomp1.tar.gz]
-md5=a7aa2ea8cc31f510baff6f345aef52db
-sha256=67d675976073c5dcd4c6f46a1e85cc8034caf88f53001841f1a0a75d6bfc6a01
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/h/hildon-theme-layout-4/hildon-theme-layout-4_0.14.8-1.tar.gz]
-md5=d532976e8d9bbc14515be2dd7dd14645
-sha256=d2f3b941703f4f4189356e09e16493ac7b1e5fdff61fbd04829eb409458eaa50
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/h/hildon-theme-tools/hildon-theme-tools_0.5.2-1.tar.gz]
-md5=45af1aebe1e6fe1febbed55452c16cd9
-sha256=08f0c7cc15d55c0699233dbf67af053ad09ea7ed504e0b5e55e6cbbdacc96548
-
-[http://repository.maemo.org/pool/sardine/main/source/h/hildon-thumbnail/hildon-thumbnail_0.11.tar.gz]
-md5=25d8cc1cf817489a255a5bc6541b8bb6
-sha256=0dbce673dd0b32731994aaee276ad990ad0437174ef7887e51868d5841c3002a
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/h/hildon-thumbnail/hildon-thumbnail_0.14.tar.gz]
-md5=07ae084214ff2c8645a7f7b9337b525a
-sha256=f7bdf832d3e44b552d9bd1824598c72f5bb9c1644531c5b6e830a541ea2c84dc
-
-[http://ftp.gnome.org/pub/GNOME/sources/hippo-canvas/0.3/hippo-canvas-0.3.0.tar.bz2]
-md5=9a0f64eb0258a3e8ba710eff9798a7d0
-sha256=21d0f3f7eb1c448fd6eaec1979b1474011b541249edaaab6e1dfb772ac8eb514
-
-[ftp://ftp.logilab.org/pub/hmm/hmm-0.4.tar.gz]
-md5=9cd5734e1a54fdcec60ebf345e2e83c3
-sha256=a6ca7fc30502b5d724c1ef52fbb2e587755831270fcfeb2e32a83984a6256b3c
-
-[http://hnb.sourceforge.net/.files/hnb-1.9.18.pre7.tar.gz]
-md5=65196f236b40ecc8bfccf8aec36e91f6
-sha256=0102d55afe4d2071b088624f401f8b830659cb63c3364d3c6e089b4e74138bcc
-
-[http://hostap.epitest.fi/releases/hostap-driver-0.3.10.tar.gz]
-md5=e861a032ab716e14864243e01db32ba7
-sha256=7cb8860a201f54036e78f830cfa4b099ca194267f34f3eb3d5638661d5c619fd
-
-[http://hostap.epitest.fi/releases/hostap-driver-0.3.7.tar.gz]
-md5=9d56a65386fd8e688f039ef927ac2ccb
-sha256=6f9bd7bc4dd59559e5b5ec1c7d76600572fa52690322b24f79b89713538a9425
-
-[http://hostap.epitest.fi/releases/hostap-driver-0.3.9.tar.gz]
-md5=6eac8910802c5535bc5248eae259b228
-sha256=8e6c0913b33542e5680bb5401f1745bda9b9857a7562cebd2f9c0af8a3287a40
-
-[http://hostap.epitest.fi/releases/hostap-driver-0.4.4.tar.gz]
-md5=e9b4a5cb992e06c3c6bf2bc99eca6625
-sha256=7b9ad6bb5cf6c485e320bd8901d2e398cb6661cda633ba6360200a9bf94eb5fb
-
-[http://hostap.epitest.fi/releases/hostap-driver-0.4.7.tar.gz]
-md5=ee495686cf27011b4e401963c2c7f62a
-sha256=e9a3e035a1483b371269936c6fde46bfbae71dc38fa04685c1338ca8ffe900a5
-
-[http://hostap.epitest.fi/releases/hostap-utils-0.3.7.tar.gz]
-md5=529a31e987924116b8c7409dbf5794f2
-sha256=9b98acd0e70fab72615f66f7e03f06231c9c35a367003c420291d1589f8911f0
-
-[http://hostap.epitest.fi/releases/hostap-utils-0.4.0.tar.gz]
-md5=c6775ca98721affeb336392def22289e
-sha256=2ce613f46985359eb1208cfe876899f133d4d1656936c424a60c1b40b2f64876
-
-[http://hostap.epitest.fi/releases/hostap-utils-0.4.7.tar.gz]
-md5=afe041581b8f01666e353bec20917c85
-sha256=c6f598d8e356c1620fa009eca0a700bf1105e16817eefd77d891994261009355
-
-[http://hostap.epitest.fi/releases/hostapd-0.1.3.tar.gz]
-md5=54563fb51f143c4bf26ddec2516e8f9f
-sha256=d14b56996ba9aa9cb6c78c889831113cc55a400bd1d237cec6eec7549a358c97
-
-[http://hostap.epitest.fi/releases/hostapd-0.3.7.tar.gz]
-md5=12ad3a43bf4a774f347b129c973bbe57
-sha256=b66e74bd493359c83e12f3c2a88fee57587c14b0cfbd68cc51feb211885e7ca5
-
-[http://hostap.epitest.fi/releases/hostapd-0.4.4.tar.gz]
-md5=79810ff32f6f12a37dc7827ce18af533
-sha256=684636fd31ad2cbe989a19f2ce844b7d1c46c1e009cda37c92f5d9ead9ba18b8
-
-[http://hostap.epitest.fi/releases/hostapd-0.4.8.tar.gz]
-md5=b8f30f23c04b74f18b2e4e6d8e0ee014
-sha256=4675ae608a9f16e0ac519af2003ef694e7e13a4ecda2fcbe29f12a306e460551
-
-[http://hostap.epitest.fi/releases/hostapd-0.5.1.tar.gz]
-md5=3e38533604187e291f45a2f6873b71cc
-sha256=f4754629eb70a63e9774ac97ebd28f3dea22fb5b422dd43d02ab5053d37ca61c
-
-[http://hostap.epitest.fi/releases/hostapd-0.5.10.tar.gz]
-md5=ed669d96346dfc7d9f9fad079731853f
-sha256=a99908d5765757ad6025b57d5ecf43b412aaaaf2ca379c02aafa33ca5c9d35c1
-
-[http://hostap.epitest.fi/releases/hostapd-0.6.9.tar.gz]
-md5=83630d11fa66ade9091f1b304fccd74c
-sha256=4430fe2c7a2176c6890ac3a726a8b3d234a77beb3ca987b4349c467331343e67
-
-[http://kernel.org//pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz]
-md5=167bd479a1ca30243c51ca088e0942b3
-sha256=397e06eefc4639342e9f650cc47336ebc8c86a37fdcd9b857e55f99d37d8da9f
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz]
-md5=167bd479a1ca30243c51ca088e0942b3
-sha256=397e06eefc4639342e9f650cc47336ebc8c86a37fdcd9b857e55f99d37d8da9f
-
-[http://kernel.org//pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz]
-md5=9e6b06dfa3b91f051b55e1483adb5a68
-sha256=3f2d989f7cbef92612b1ecd913398fc42165e29f214fdf68fa997a8e5b2a138f
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz]
-md5=9e6b06dfa3b91f051b55e1483adb5a68
-sha256=3f2d989f7cbef92612b1ecd913398fc42165e29f214fdf68fa997a8e5b2a138f
-
-[http://gpe.linuxtogo.org/download/source/hotplug-dbus-0.9.tar.gz]
-md5=75245aa9adc5acb9d6ac8eae45533c96
-sha256=96144ffbb24f23acd3615594344902a3fad241bc05127d38e5dde8df300c27c0
-
-[http://kernel.org//pub/linux/utils/kernel/hotplug/hotplug-ng-001.tar.gz]
-md5=e81d4159a01620b37721b2a05d6a4740
-sha256=af40399fe434678454ae8ea100db6cba0482aa65b8972a05098c779cac57bc48
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/hotplug-ng-001.tar.gz]
-md5=e81d4159a01620b37721b2a05d6a4740
-sha256=af40399fe434678454ae8ea100db6cba0482aa65b8972a05098c779cac57bc48
-
-[http://kernel.org//pub/linux/utils/kernel/hotplug/hotplug-ng-002.tar.gz]
-md5=faa08f321fefd2c61ce4c9355a62fe31
-sha256=ca7ef124cde06883fbf28c7e78ce1e4c5526434bbe5672ef0a3e85a61a9d0b5f
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/hotplug-ng-002.tar.gz]
-md5=faa08f321fefd2c61ce4c9355a62fe31
-sha256=ca7ef124cde06883fbf28c7e78ce1e4c5526434bbe5672ef0a3e85a61a9d0b5f
-
-[http://isteve.bofh.cz/~isteve/hotplug2/downloads/hotplug2-1.0-beta.tar.gz]
-md5=353656ea499d395260c0de143983da4d
-sha256=54e2fa375506d92a8ac94b5ed332c4c0bf1b69c252692b332c92702670bba583
-
-[http://www.porchdogsoft.com/download/howl-0.9.7.tar.gz]
-md5=85fbe016e2ebad99108b1212ae4b1d6f
-sha256=f8766c44291aac92b2b4abc762e1b11e3504dd9f2a855fdde371b5abd730fe9f
-
-[http://www.porchdogsoft.com/download/howl-1.0.0.tar.gz]
-md5=c389d3ffba0e69a179de2ec650f1fdcc
-sha256=6f0145ab1802092308adeb8dfa285f58e104f0822fa266e5ec97e9d27f0e1923
-
-[http://www.hping.org/hping2.0.0-rc3.tar.gz]
-md5=029bf240f2e0545b664b2f8b9118d9e8
-sha256=f59292de39b9a4010414bd120a494226399767148efa37278bd53d9613167964
-
-[http://downloads.sourceforge.net/hplip/hplip-1.6.7.tar.gz]
-md5=b1e814c7f5ef2a5033e4c3e5162ac694
-sha256=27b3703a0d6470e03e1574b481d6d05d652c787a793854f2f0e06d06c998a601
-
-[http://downloads.sourceforge.net/hplip/hplip-2.8.10.tar.gz]
-md5=a9ad78c4f0d884caac6b176b3cb9bf21
-sha256=8e34e2bc5974fd0f4ab71fbb42ac76fe3074fb2a09960452e4a1a157a77e00f1
-
-[http://thegraveyard.org/files/hsetroot-1.0.2.tar.gz]
-md5=f599770a6411dcfe216c37b280fad9bc
-sha256=d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7
-
-[http://downloads.sourceforge.net/hsqldb/hsqldb_1_8_0_10.zip]
-md5=17410483b5b5f267aa18b7e00b65e6e0
-sha256=d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
-
-[http://downloads.sourceforge.net/htbinit/htb.init-v0.8.5]
-md5=1713d9a4941120235cb0721ceba6493b
-sha256=acfda369dff72b9073a8b70f2b05b1397a61a1cdb23970e5ed216d632ff33586
-
-[http://heanet.dl.sourceforge.net/htbinit/htb.init-v0.8.5]
-md5=1713d9a4941120235cb0721ceba6493b
-sha256=acfda369dff72b9073a8b70f2b05b1397a61a1cdb23970e5ed216d632ff33586
-
-[http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2]
-md5=35589e7b8fe9c54e11be87cd5aec4dcc
-sha256=89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613
-
-[http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-1.9.x-r1571.tar.bz2]
-md5=eda75ba1abe14ed8e71c6f40438def85
-sha256=b4c78ff6b47521e980533e52cbe46fe86874c75b3d6bc18bcc2500a2ba854c3e
-
-[http://downloads.sourceforge.net/htop/htop-0.7.tar.gz]
-md5=4afc961fa709167e1b434682897991f9
-sha256=1361f4f0b92d7e6bdac25a4b7ee138a7ee83b5a9368820f5aa518051ca82862b
-
-[http://heanet.dl.sourceforge.net/htop/htop-0.7.tar.gz]
-md5=4afc961fa709167e1b434682897991f9
-sha256=1361f4f0b92d7e6bdac25a4b7ee138a7ee83b5a9368820f5aa518051ca82862b
-
-[http://apache.mirrors.tds.net/httpd/httpd-2.2.14.tar.bz2]
-md5=a5226203aaf97e5b941c41a71c112704
-sha256=b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
-
-[http://www.apache.org/dist/httpd/httpd-2.2.14.tar.bz2]
-md5=a5226203aaf97e5b941c41a71c112704
-sha256=b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
-
-[http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2]
-md5=887bf4a85505e97babe1d90635361c0d
-sha256=dd86e8221f9efb85497c46229d0f04237d4e66d293fabe98eb0745166aaf4b6c
-
-[http://www.apache.org/dist/httpd/httpd-2.2.3.tar.bz2]
-md5=887bf4a85505e97babe1d90635361c0d
-sha256=dd86e8221f9efb85497c46229d0f04237d4e66d293fabe98eb0745166aaf4b6c
-
-[http://downloads.sourceforge.net/httppc/httppc-0.8.5.tar.gz]
-md5=365684629378365de02e127f4a085628
-sha256=bedfd45364948a08ecaa212c5eda6667a83ac8bb547e2eb8478ade885898cad7
-
-[http://heanet.dl.sourceforge.net/httppc/httppc-0.8.5.tar.gz]
-md5=365684629378365de02e127f4a085628
-sha256=bedfd45364948a08ecaa212c5eda6667a83ac8bb547e2eb8478ade885898cad7
-
-[http://htun.runslinux.net/dist/htun-0.9.5.tar.gz]
-md5=f720686c841e9fefc06db76458fd9908
-sha256=1f8259a3a8ae583170816f5028329f3a7157f87f927da9c0a911a5fb9be263a1
-
-[http://www.netsurf-browser.org/projects/releases/hubbub-0.0.1-src.tar.gz]
-md5=58c6e2b5a5906f3f0bf136c0c71b5403
-sha256=3ba0bdf71376429bb3ce8ae51595fc25e6a5147cdcc26e47b6da17386eb78cdf
-
-[http://cvs.haskell.org/Hugs/downloads/Nov2003/hugs98-Nov2003.tar.gz]
-md5=e80a6739ead9a260087fe4d3fc6a8359
-sha256=9f90613de73e1b8e90d9bbcb09046e83680f15a46fc630c3e26e9aa4ca0e6a1d
-
-[https://launchpad.net/ubuntu/lucid/+source/human-icon-theme/0.35/+files/human-icon-theme_0.35.tar.gz]
-md5=dd9bad3b7f95619a6536932300fe202a
-sha256=d234a562fc4af10982b138b3e67e7f61f44b572d0493c776e639508e4faa0a29
-
-[http://downloads.sourceforge.net/hunkyfonts/hunkyfonts-0.3.0.tar.bz2]
-md5=36444795a356fb8a56c63b2840729bab
-sha256=e0b1849c545b6af276407d93025c73094dd74fc259b07c1d91594fdbb9a0b829
-
-[http://heanet.dl.sourceforge.net/hunkyfonts/hunkyfonts-0.3.0.tar.bz2]
-md5=36444795a356fb8a56c63b2840729bab
-sha256=e0b1849c545b6af276407d93025c73094dd74fc259b07c1d91594fdbb9a0b829
-
-[http://archive.ubuntu.com/ubuntu/pool/main/h/hwdata/hwdata_0.191-1.diff.gz]
-md5=0719e6cccf5279b4d2fb0a3ddbecd874
-sha256=8276d76e45e3e827fc109940fcc3afe010ec8ddd583f44b3c946af6c29f2d828
-
-[http://archive.ubuntu.com/ubuntu/pool/main/h/hwdata/hwdata_0.191.orig.tar.gz]
-md5=7a261b9eb813406f73b5eca2570f949a
-sha256=3cc7f3ef2cd0f789ef1665102e214fe2e6b29b5eb285c3c8a3216c5c98fa563d
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_base-r27.patch]
-md5=9e5284df77ba4a7505a1ddc27d79d162
-sha256=c7425707af4c9dbd021f6420a9b173bbcc803035b63ca0d3740bd43bef9ea87e
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_base-r28.patch]
-md5=436be960e8e0a5bab662bc3488482677
-sha256=92459580e8a1d81b23478c9ab45bf6fb432df8439ea3d39fc164ffdd363dcb7a
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_base-r29.patch]
-md5=362aa4d1318108a3515510ea1bbe31a1
-sha256=66b557a709a87a6d90c5a1d6d385b1bb5a725144b3f6a3c7c466c48702f4ad87
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_base-r30.patch]
-md5=c93f94106139f927baa23e31529049c2
-sha256=c231f87d4103293b119c3231574f67dcda29d383e0c0cbb420b4d10d7add4189
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_base-r33.patch]
-md5=e9ef4b8b78ab64cd7dbd0d41b05e932c
-sha256=ed4f25e0da55714c618c2721209a2d22a7296b5dc85af028d20aff6062a4a13b
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_base-r34.patch]
-md5=38e1ea5768cba4be72088a8a12d4b1af
-sha256=837b95b128815f3d6689d2ecfbdc9a28023bae5f45879513f3b4c2ad12f459ee
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_bl-r7.patch]
-md5=059e56be476891e84715c897b5935431
-sha256=e01b7efcfafa5c00cd1786d71b526f963dcd5129b518cab2b597d21c5d68eaa8
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_bl-r8.patch]
-md5=e03eb32c8e2a2329a424d92ea08566af
-sha256=ba4ecafacfc25dddfafee84a5cb71a3d70d8f76ab3008047523036b0feafb84a
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_bl-r9.patch]
-md5=ebb78f58e9c84c73b90e9cbdde5f89d6
-sha256=7578448fc2adbfc820158b2467dbb127ab012b3a97ad95366d8d1af002defbce
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_pcmcia-r2.patch]
-md5=f61363f48e8fbc1086dd3a9c66385a32
-sha256=f3ab5ae2056960612886adce53ed46f4b5516744b1394f40c85cedbf0ec2e29e
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_pcmcia-r3.patch]
-md5=896d3e29ab5715b7558b972fba626425
-sha256=29f21117a17f945783f2eee5d5c89e10959fed44ac423ad9809d6afc0db5996c
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_test1-r4.patch]
-md5=29ca87c4388537e847060508007bf72c
-sha256=f3fe7ae0efdf3f2bff52af99022c61667f6a30271906bf5b8952dd3f1dca11a0
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_test1-r6.patch]
-md5=c969dee224097cac8f55bfefc1715bc8
-sha256=39165a98755fa1f8c5b184af4b7db12f8005bed278d58ab385786f0d03c16786
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_test1-r7.patch]
-md5=1d102d122b9697b9bdbd209349af1645
-sha256=359a3839deeba78534bba50c3a2929736d823c3cdb7164a910226c4559ae97a2
-
-[http://www.rpsys.net/openzaurus/patches/archive/hx2750_test1-r8.patch]
-md5=33eed5a26b2776508500532c07956dc4
-sha256=a93c7f0caa8e212a4515ce209918e250e80d2643317732d707d4f25649457545
-
-[http://thc.org/releases/hydra-4.4-src.tar.gz]
-md5=3a2e76b03f2e534119517aaa18083322
-sha256=1019b3fbeb3e7e2d0c8faf81191e722bfabc714ee03ec08703faf91dab443b64
-
-[http://thc.org/releases/hydra-4.5-src.tar.gz]
-md5=01f5cc3adbe9d161cf8e1855cec4fa15
-sha256=9a9b7092f2e48786e8f83e5bef99fd31988f87140ad9ca840583f91b3623d628
-
-[http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.0.1.tar.bz2]
-md5=0f5c7ce5fd3c65113909db0ef3a3a8c8
-sha256=8cf39f7c447b0b8f7a24eaed243ad4d8c654c2e94a146a796dba9ed08e857209
-
-[http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.0.2.tar.bz2]
-md5=b546345ac19db56719dea6b8199f11e0
-sha256=0b4d6455a30a3264a60b4d3be55855d996d52ea4f162a2f04ffff378e24f98a2
-
-[http://svn.o-hand.com/repos/web/trunk/patches/iain-mem-leak.patch]
-md5=4e11dc7899d68f2be2e06ccee01d296d
-sha256=1e2cc080e654c1839c5cb4b4adf4c62a23e7da208427f3ba0b16cfed9e5cfa98
-
-[http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-2.20.tar.bz2]
-md5=51d584b7b6115528c21e8ea32250f2b1
-sha256=754038a9eb8f1d0d6559d5b124a68e1e530a76366cff251d79536ec89e2fda21
-
-[http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/ibrdtn-0.1.1.tar.gz]
-md5=eb19ac9c283e63afd77215973193f136
-sha256=28e9d09e9d2f24f688f66c4fb4b60c374840cb4f754396889bf7725a1ad29e3d
-
-[http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.2.tar.bz2]
-md5=7ab8b64edf0212a9d9a3c8129901a450
-sha256=06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb
-
-[http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.3.tar.bz2]
-md5=975ade3f238c1eb10705da0a91e6e8e7
-sha256=abca3ff6c9f2da2600a474f0e92ae5e62c43914f7bd3d948b91b0a7f9117d81e
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/iceauth-X11R7.0-1.0.1.tar.bz2]
-md5=92035bd69b4c9aba47607ba0efcc8530
-sha256=46a02c0dddbe80fbd802da47d0a9eac03002deb538b109dae804553fbbdfa7bd
-
-[http://handhelds.org/~zecke/oe_packages/icebloxx_V1.0.0.tar.gz]
-md5=f134dc7324525cd41aa0096072a25449
-sha256=13a3c3dc16eb6aaa3a5854a80633f4b047a9396cfb92a30c910b460492fe8f26
-
-[http://repository.maemo.org/extras/pool/chinook/free/source/i/icebreaker/icebreaker_0.2.6.tar.gz]
-md5=cebdfc23cf6ce656cd36c887f8eebd18
-sha256=ef6b1c8def236f16ea914eccbb050c84ee314c0028b03c560ed20ff96776f74c
-
-[http://www.digital-opsis.com/openembedded/icecc-create-env-0.1.tar.gz]
-md5=641ec45fe377529c7fd914f77b11b44f
-sha256=9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834
-
-[http://icedtea.classpath.org/download/source/icedtea6-1.3.1.tar.gz]
-md5=6865c25cbc087e4142031a846b71ae56
-sha256=c15fb24475ad93e064ba252f2739c020f9981a808bde6cbd6c41eae38dd0143d
-
-[http://icedtea.classpath.org/download/source/icedtea6-1.4.tar.gz]
-md5=6428ca1b0c38111cca230f5b69460b03
-sha256=4f23aadcee80a9a03c858e36a8eaaa92149987ce0a3eac276e3003c9b2462739
-
-[http://icedtea.classpath.org/download/source/icedtea6-1.5.tar.gz]
-md5=a67303675a53781c4e42bdb02ec78e40
-sha256=1ec328f41f8adfbf797599bc7bf4c07de162ac6d565d2b9fd95685b1cbc99ac8
-
-[http://icedtea.classpath.org/download/source/icedtea6-1.6.1.tar.gz]
-md5=f1c98bb31de87a5e15550b9672ea4027
-sha256=650e8c0f9ad2f757ec8c3cc12a314751cf791bc585676e4ee982a05f9d556a87
-
-[http://jalimo.evolvis.org/repository/sources/icepick-0.0+hg20080118.tar.bz2]
-md5=ce7b1827e6f4cbe73b9ffa90b0d45a6a
-sha256=63170836095f8451498c813a1f93a9ec70a1164d82aa30650c0f2216ca4377ab
-
-[http://ftp.de.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0.1-1.diff.gz]
-md5=7124ea3c13369ff27bcff0080aca678f
-sha256=1d70e21e1c20e8d88bf3d2590de75c3e65b12da335097716adc58712cea41dad
-
-[http://ftp.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0.1-1.diff.gz]
-md5=7124ea3c13369ff27bcff0080aca678f
-sha256=1d70e21e1c20e8d88bf3d2590de75c3e65b12da335097716adc58712cea41dad
-
-[http://ftp.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0~rc2-2.diff.gz]
-md5=acfc72473215e2f498ac8dafea78eefa
-sha256=15c64c5854e2151be3f1d583a1087c2058c541a73588ba46c1cb78ce346aa48a
-
-[http://downloads.sourceforge.net/icewm/icewm-1.2.20.tar.gz]
-md5=6c94dae56fbf9aa085a1d780538018c1
-sha256=0138dc364ee23156a58d890a5b2c61685bd91ea0017accf90118b38fef2df1d3
-
-[http://downloads.sourceforge.net/icewm/icewm-1.2.26.tar.gz]
-md5=097b12d3f8e0f57a964e4821bc1825ed
-sha256=96ed51cbaead5bd8c33522be5bf0baac4c051db0a826f764eb8528b2ec0c5497
-
-[http://downloads.sourceforge.net/icewm/icewm-1.2.30.tar.gz]
-md5=8a302c5e629bb81d87cc02004a694ece
-sha256=4b802cf77ecf09bc44345f8fba3c11fd08dca0e8272e628b447ecf7289637e1d
-
-[http://heanet.dl.sourceforge.net/icewm/icewm-1.2.30.tar.gz]
-md5=8a302c5e629bb81d87cc02004a694ece
-sha256=4b802cf77ecf09bc44345f8fba3c11fd08dca0e8272e628b447ecf7289637e1d
-
-[http://xorg.freedesktop.org/releases/individual/app/ico-1.0.2.tar.bz2]
-md5=5711827c5c2563620b56c33aababbc63
-sha256=db2e96e18a2bcc29b91b9de7b758a7c67cebee27772fb540c44c7bc2c2218aa5
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/ico-X11R7.0-1.0.1.tar.bz2]
-md5=9c63d68a779819ba79e45d9b15d26b1f
-sha256=9c8a1d037135642ab85391f92332fdfc22ceeb3ad1f2c0c9911ac5a62a12ee7d
-
-[http://tango.freedesktop.org/releases/icon-naming-utils-0.8.2.tar.gz]
-md5=76e6afde567bd17b4fe095aa0ec90531
-sha256=87fe398d5f4853400afb6afbb41835db3cde954845369e406d739d66b3058056
-
-[http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz]
-md5=4abe604721ce2ccb67f451aa7ceb44d6
-sha256=1cb49ce6a04626939893a447da696f20003903d61bd80c6d74d29dd79ca340d2
-
-[http://freedesktop.org/software/icon-slicer/releases/icon-slicer-0.3.tar.gz]
-md5=5c5374d4f265b0abe4daef1d03f87104
-sha256=05f0216dd0c25a17859de66357f64da5033375b6fbf5f31ca54867311160b64d
-
-[ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz]
-md5=6243f7a19e03e05403ce84e597510d4c
-sha256=5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041
-
-[http://downloads.sourceforge.net/id3lib/id3lib-3.8.3.tar.gz]
-md5=19f27ddd2dda4b2d26a559a4f0f402a7
-sha256=2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079
-
-[http://heanet.dl.sourceforge.net/id3lib/id3lib-3.8.3.tar.gz]
-md5=19f27ddd2dda4b2d26a559a4f0f402a7
-sha256=2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079
-
-[http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz]
-md5=805c0320a2efb21c40ce06fa13cd7c4b
-sha256=9f03b59ccc8826a5be55a3dcde2f889067d58bdc72bf846416a198c9b933704c
-
-[http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.20.tar.gz]
-md5=7d259502c75f5ea9aebcd57c1a3d0739
-sha256=1f8967e1a3d3a7f88bdc2aeaf54fdaea86e60ecf7424af912947193a9d2a4092
-
-[http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.25.tar.gz]
-md5=cbb45e24684fe5ba7a60730248cf250b
-sha256=a43c0621dac846e42a3917f4f73e7976b2ac4b545712e8bc4bae5bac6158e07e
-
-[ftp://ftp.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.6.8.tar.gz]
-md5=0c4cf072305b1e798e9e704558ec01f1
-sha256=7305d27b5718e83872329e0ade92fc3b9710226c63418188744a3ce8c4030ceb
-
-[ftp://ftp.nl.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.6.8.tar.gz]
-md5=0c4cf072305b1e798e9e704558ec01f1
-sha256=7305d27b5718e83872329e0ade92fc3b9710226c63418188744a3ce8c4030ceb
-
-[ftp://ftp.us.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.6.8.tar.gz]
-md5=0c4cf072305b1e798e9e704558ec01f1
-sha256=7305d27b5718e83872329e0ade92fc3b9710226c63418188744a3ce8c4030ceb
-
-[http://www.linuxprinting.org/ijs/download/ijs-0.35.tar.bz2]
-md5=896fdcb7a01c586ba6eb81398ea3f6e9
-sha256=11a5f5084488c480f3ff5a24d64d7147bb64272bf60a0ba51330a56c5b50cab9
-
-[http://files.jabberstudio.org/iksemel/iksemel-1.2.tar.gz]
-md5=82e7c8fdb6211839246b788c040a796b
-sha256=a606e230b22d9d029998b84e5d6311a8ba35a304fe457e254eb5fd19943cd639
-
-[http://arago-project.org/files/short-term/demo/images.tar.bz2]
-md5=a080f5a4ed42c56767c07e55c1266727
-sha256=9c6f58c44051563a788f7e9202957d839822081d99ecb001314265166c20eb95
-
-[ftp://ftp.cac.washington.edu/imap/imap-2007a1.tar.Z]
-md5=828a84c64ef933bfcc805b838576a774
-sha256=8ba0eda3157193643eb3c5ccd46c0ca8060d702f260df60f89656cb891cbeeb8
-
-[ftp://ftp.cac.washington.edu/imap/imap-2007b.tar.Z]
-md5=4d59ce6303cf8ef93ff51341b1ce2df7
-sha256=b3170bef59f416be1f710be58333f9b0c2c8b0fe137062accd4f5f13a3785cd0
-
-[http://downloads.sourceforge.net/imdbpy/imdbpy-2.5.tar.gz]
-md5=dbbb53f835fd3f7aebcf7601dd902920
-sha256=edaad2859a4f0785a34c3c0bb5a1e09d8f16efa3c0e4616f6a5a6cf18c282aa6
-
-[http://gpephone.linuxtogo.org/download/gpephone/ptim-engine-1.0/imengine-1.0.tar.bz2]
-md5=c6735cb4a8f5bc7da74001ca895fd174
-sha256=3d733f8a1cfeb60b3a83a03340e80e7a23a5d3141f8958fad1441142817cc077
-
-[http://gpephone.linuxtogo.org/download/gpephone/ptim-headers-1.0/imheaders-1.0.tar.bz2]
-md5=33226da8468acccdcac483ea25c99a91
-sha256=255b3b869e3945f8b031e9fa23649f7e342211713335ea447e40975bfed96fa8
-
-[http://gpephone.linuxtogo.org/download/gpephone/ptim-helper-1.0/imhelper-1.0.tar.bz2]
-md5=46616e5897a51b3935d1c683a410a0d9
-sha256=e0a4b8e21a7c8efbc4b48c53403edbe367681052d8f3079d170c0b692c735d36
-
-[http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-1.9.15.tar.bz2]
-md5=7db987e6c52e4daf70d7d0f471238eae
-sha256=4e6a270308a9ae16586bfc133c1a3dfb2e56f431edb66aaa3a80e36e5ed84ce0
-
-[http://enlightenment.freedesktop.org/files/imlib2-1.2.2.001.tar.gz]
-md5=ca9ad2142464f34a5716990aa162c94f
-sha256=beb929f4ceff865375a9e56c0156ffbfb197dff82299071bdb641bb60299f84b
-
-[http://gpephone.linuxtogo.org/download/gpephone/ptim-manager-1.0/immanager-1.0.tar.bz2]
-md5=cafd1d222ae30fa496e299950de19ae7
-sha256=e8e5144314fd2cd13722835338105c0236bf3da4dbf383a6ce052574c1ba7230
-
-[http://downloads.sourceforge.net/imposter/imposter-0.3.tar.gz]
-md5=5bcaa0fe3fec26840c8f1ecefc891887
-sha256=53b67c08477623bb03436f79bf2ca859d7cd9684c57775ea539e1db449658236
-
-[http://heanet.dl.sourceforge.net/imposter/imposter-0.3.tar.gz]
-md5=5bcaa0fe3fec26840c8f1ecefc891887
-sha256=53b67c08477623bb03436f79bf2ca859d7cd9684c57775ea539e1db449658236
-
-[http://ftp.gnu.org/gnu/classpath/inetlib-1.1.1.tar.gz]
-md5=aaa24be4bc8d172ac675be8bdfa636ee
-sha256=1b078a39e022f86e4e2c8189b4d2789a5da414e8f1cb285587b7800b950a44de
-
-[ftp://ftp.gnu.org/gnu/inetutils/inetutils-1.4.2.tar.gz]
-md5=df0909a586ddac2b7a0d62795eea4206
-sha256=9f001daa0f3d571ae35aac88f04d5dd982a14e90257e4dfb535c143fa18d5830
-
-[ftp://ftp.gnu.org/gnu/inetutils/inetutils-1.5.tar.gz]
-md5=aeacd11d19bf25c89d4eff38346bdfb9
-sha256=345c73b4afd7a4ff8d23af820ccc4d01c4c3ccc01ea9c964c85cdafe5cf11511
-
-[http://iniparse.googlecode.com/files/iniparse-0.2.3.tar.gz]
-md5=194a04cc93fe123f244ca33e7724bdf6
-sha256=f1252122f09cc63a57843ec1b8a51ce30c7bfcbc857f476a996b374006433a48
-
-[http://downloads.sourceforge.net/inkscape/inkscape-0.38.1.tar.bz2]
-md5=dffa08601c822de29b8c3e436a3994bf
-sha256=dc1d3525483fa503ad4312c3b6aa3742951c8e7428674de9f43077c26f353122
-
-[http://heanet.dl.sourceforge.net/inkscape/inkscape-0.38.1.tar.bz2]
-md5=dffa08601c822de29b8c3e436a3994bf
-sha256=dc1d3525483fa503ad4312c3b6aa3742951c8e7428674de9f43077c26f353122
-
-[http://downloads.sourceforge.net/inkscape/inkscape-0.39.tar.bz2]
-md5=3542a646c6742686557b2f0e52c5f6dc
-sha256=9436f3c01dc69a1e7781633cd85936a40b3a84325e01930188bbae45e13fdbdc
-
-[http://heanet.dl.sourceforge.net/inkscape/inkscape-0.39.tar.bz2]
-md5=3542a646c6742686557b2f0e52c5f6dc
-sha256=9436f3c01dc69a1e7781633cd85936a40b3a84325e01930188bbae45e13fdbdc
-
-[http://downloads.sourceforge.net/inkscape/inkscape-0.42.tar.bz2]
-md5=4af587b942647bf9e27861e2238844c8
-sha256=00f94678fff587288f8e7848466b35c3f894dcc007e7101f467c46d155cddfb8
-
-[http://heanet.dl.sourceforge.net/inkscape/inkscape-0.42.tar.bz2]
-md5=4af587b942647bf9e27861e2238844c8
-sha256=00f94678fff587288f8e7848466b35c3f894dcc007e7101f467c46d155cddfb8
-
-[http://downloads.sourceforge.net/inkscape/inkscape-0.43.tar.bz2]
-md5=97c606182f5e177eef70c1e8a55efc1f
-sha256=74d6088a6f7521c36b73550baa9dd0381505d66658f0bc01802aa2dfc7430fbc
-
-[http://heanet.dl.sourceforge.net/inkscape/inkscape-0.43.tar.bz2]
-md5=97c606182f5e177eef70c1e8a55efc1f
-sha256=74d6088a6f7521c36b73550baa9dd0381505d66658f0bc01802aa2dfc7430fbc
-
-[http://downloads.sourceforge.net/inkscape/inkscape-0.46.tar.bz2]
-md5=59997096c3640b2601c2b4afba8a3d75
-sha256=f2ea624b98544b9d780bae1b5f042eae97bbd2779c7779ba21390b7bf6a9ca8e
-
-[http://downloads.sourceforge.net/inkscape/inkscape-0.47.tar.bz2]
-md5=7b497c8f673e40b05295a29f6e2111f4
-sha256=4985bc5bf1938d818fee31c72151a2d889300c0be00fab5dc94ccd84df39ef3a
-
-[http://www.geocities.co.jp/SiliconValley-Oakland/4550/inkwp-0.1.1.tar.gz]
-md5=a19896b756f1b29a33411a1fb2842c4b
-sha256=4afa4f4ddfdc40a32ef2c6034b2fa3bca415088b7eac4b7ad2b814202153f1e0
-
-[http://rohanpm.net/files/inotify-tools-2.1.tar.gz]
-md5=8053f441fc3fe0f0c73cf483399da17b
-sha256=84a111a6a979152cd25b60825b4945da4b167f19fb9ec115f9c59b4b49927547
-
-[http://downloads.sourceforge.net/inotify-tools/inotify-tools-3.12.tar.gz]
-md5=a593b2eabde56f122e2bb3d2d45f7ca7
-sha256=90f69ae24cc21fa6d33dc406077f16c06113b3000f7d267e7056e52f50d0abc0
-
-[http://heanet.dl.sourceforge.net/inotify-tools/inotify-tools-3.12.tar.gz]
-md5=a593b2eabde56f122e2bb3d2d45f7ca7
-sha256=90f69ae24cc21fa6d33dc406077f16c06113b3000f7d267e7056e52f50d0abc0
-
-[http://downloads.sourceforge.net/inotify-tools/inotify-tools-3.13.tar.gz]
-md5=35d7178297390f18bae451e083362acf
-sha256=464146acec2c118be63a6c2a090d9252fbe9689c093db85b695d0502fa229445
-
-[http://www.rpsys.net/openzaurus/patches/archive/input_modalias_fix-r0.patch]
-md5=291fdc77615d56d1ec8a9d4ad3dcc39e
-sha256=04f8f5890cc45beb1305f6b94f3a4cdd480132703277ed53c32e1d8e0975702e
-
-[http://www.rpsys.net/openzaurus/patches/archive/input_power-r10.patch]
-md5=6ddb822c5ee92a58b667795b41f31963
-sha256=d42ec6f70b00100aa8816740259e3d70686aeae8c05a4f76b67f76b84c79833c
-
-[http://www.rpsys.net/openzaurus/patches/archive/input_power-r5.patch]
-md5=4d08cc2b3d54d88f7b68939d85d2dfab
-sha256=713a67e88d5e4a838823e5340f23d7862ff986a82c4ed0a2aed8fe44f9935120
-
-[http://www.rpsys.net/openzaurus/patches/archive/input_power-r6.patch]
-md5=ee641ee6fda72f4b3c4e388d97fe8c17
-sha256=73c23893ee42b4bc98e84576ab833e9bc40e3a773fcb95747204fc811a33dca6
-
-[http://www.rpsys.net/openzaurus/patches/archive/input_power-r7.patch]
-md5=25bbe0e1412dce7f36f54392872c673c
-sha256=8526befd5b233a5911ccc6b6db4bba29ca3156db2828c11b5c696aa2e506c621
-
-[http://www.rpsys.net/openzaurus/patches/archive/input_power-r9.patch]
-md5=1bd8229ec73078c5d7025d28774bc866
-sha256=fb86683341f1d09471d9301c43e77c0c50cc1cc8e2462e282d50951ca017daa3
-
-[http://www.rpsys.net/openzaurus/patches/archive/input_power_fix-r0.patch]
-md5=3cbfedcd6e0b815b495da731f13aa899
-sha256=2780b5e3747cf9dfa665f0a6f8b4bd9fec309f8fd7e08a72111d5dd6f85bfbc2
-
-[http://tbox.jpn.org/data/inputhelper_1.0.0_src.tar.gz]
-md5=d99128113077a9b0c8f4aebeaec38d27
-sha256=4bf2d82a434863737cb505d03c7edf4e09ae3dfb3aa2c250079b68a60aaa629f
-
-[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.1.tar.bz2]
-md5=563cc41eeb590cf5eb2127807b838dfc
-sha256=913ff534aa777e3c36f3e9fe3e8638c3ccfe398daeb7532fa917e7bcd6fed07d
-
-[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.2.1.tar.bz2]
-md5=aa948a7469168ddd9c33f11c5dff55ac
-sha256=9b6db77037de7c52b9a17862b99bc435bd5c20e5d3faf5aec943b206cdaff3ed
-
-[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.2.tar.bz2]
-md5=e2c4cf4c2ad59d1e27f09381f6b4a3c3
-sha256=62ba68a056daa89f5b21a02b27f6a4c858933e1c5547c9d16985d9ed182014e6
-
-[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.3.tar.bz2]
-md5=a0f0d8cf6fbf0db8ba3937d0cc16138d
-sha256=627119ff21391314b88e5f34da837473151a54ab980d2f76d7f3c6bd3d560d4a
-
-[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.4.tar.bz2]
-md5=3a532379f226c34b36a5c585999f75e4
-sha256=63278ef492d6babb9e3efaef84a67a982e5362c51623714c9428f0384007dfe5
-
-[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.tar.gz]
-md5=3faf4bc1e2bb9353590d7b1fe50ec306
-sha256=5360e221354bbdfd67bf9834c2c1d7a0d83f22c17e057f92194411911fbb81f5
-
-[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.5.0.tar.bz2]
-md5=dcc36554aea1338b3813943daf1e9988
-sha256=ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461
-
-[http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.0.tar.bz2]
-md5=0f7acbc14a082f9ae03744396527d23d
-sha256=472f57f7928ab20a1303a25982c4091db9674c2729bbd692c9a7204e23ea1af4
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/inputproto-X11R7.0-1.3.2.tar.bz2]
-md5=0da271f396bede5b8d09a61f6d1c4484
-sha256=3b48f495f9af74fc7cca2fe913e10ce3d947d1aa5e677722e87620b32f1068d0
-
-[ftp://ftp.suse.com/pub/projects/init/insserv-1.11.0.tar.gz]
-md5=252e8602205e733f1a4cbde09df8dcfb
-sha256=ccec9cb7b6a5c9137918efac8a80ef0c80a16afa132a5ef2640263cf255e710f
-
-[http://www.Vanille.de/mirror/insttrain-1.0.5.tgz]
-md5=2cec5b79969d0fc64c510edfe7113319
-sha256=2dd29e066dece7062cb30daeedad7e5baa0b5cb993c67ba700ebacd6e0212487
-
-[http://www.rpsys.net/openzaurus/patches/archive/integrator_rgb-r1.patch]
-md5=15a09026135382c716a11633344ba3c4
-sha256=49521feb1a6e2bc9b355e93b3251e3c74ebe2327eb89c6e681347464e81e3664
-
-[http://kernel.org//pub/linux/kernel/people/ck/apps/interbench/interbench-0.30.tar.bz2]
-md5=d197c4077ce15460a1c411f88f6a8053
-sha256=a77d4a82573b07a9f6c6d256b399accea1f6cd433f3f1e6d038272cf0d320365
-
-[http://kernel.org/pub/linux/kernel/people/ck/apps/interbench/interbench-0.30.tar.bz2]
-md5=d197c4077ce15460a1c411f88f6a8053
-sha256=a77d4a82573b07a9f6c6d256b399accea1f6cd433f3f1e6d038272cf0d320365
-
-[ftp://ftp.cm.nu/pub/people/shane/intercom/intercom-0.15.tar.gz]
-md5=11d11d1e5ec6dd9ec22bb0bd85b0e5c7
-sha256=734ff159feedf6198889d4daba233347ff7966e8fd6c22a89c9087c1c85cc5c3
-
-[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.30/intltool-0.30.tar.bz2]
-md5=7285d5f792966b563519996ea3af58d5
-sha256=7eb8133f019feedcf02ee1ea6308b58776c4271b091630f94225fd09016cd6f5
-
-[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.31/intltool-0.31.tar.bz2]
-md5=ea8e0d71175c0d542b900e63fb426792
-sha256=2e384061f43317d0eb08d46ecd13a53ab148b0be158fcdd5260aed3e52b9a143
-
-[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.34/intltool-0.34.tar.bz2]
-md5=32c196ae14a90c262310890b498d3512
-sha256=2bf2e0a4055148cda35eae442a98f7c6c80b0403467cde4248ca6c485b271e1d
-
-[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.35/intltool-0.35.0.tar.bz2]
-md5=95c4bd2a91419083ee880a3f53f86edf
-sha256=4ebece4bb752e22b2f15a9fe24e83aec59a3a41b67a9fa9ffd6b805c519e90ba
-
-[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.35/intltool-0.35.2.tar.bz2]
-md5=7cf1a436882a62d420a0fa00ace02a55
-sha256=04aed43abc77fccf20e91b1ba3659c0870c50091d9ce3472ac73a40a704c2fe2
-
-[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.35/intltool-0.35.5.tar.bz2]
-md5=f52d5fa7f128db94e884cd21dd45d2e2
-sha256=38bd74418bbac5a34884221e2b710a81876d445d8acfc7d22bde67fe882f96d8
-
-[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.36/intltool-0.36.1.tar.bz2]
-md5=1822943ce6745596b2510d2b425cb90d
-sha256=b27763c368ceb6744bf687ba371566697a2828d11b576cd4ac853f0a582b0845
-
-[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.37/intltool-0.37.1.tar.bz2]
-md5=860d392f04299c2740d0752501639c3b
-sha256=76cceaaaf188dfac032b21eb5dc4c7d231efe7ff180dee85dbf5e18bc5d27fe7
-
-[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.40/intltool-0.40.3.tar.bz2]
-md5=7adee54938b22d32c63ecb5223fd4249
-sha256=f30cbb62345310a27f74a43fef17f146d99203c097c6460002da0a22d969a594
-
-[http://modeemi.fi/~tuomov/ion/dl/ion-3ds-20041104.tar.gz]
-md5=e187a0ca83642afddf3b21898b683ced
-sha256=b47388c35922bc0f3419a2b059c77b80fee1c5b6d0ffcde7442c854fac6e90d6
-
-[http://guichaz.free.fr/iotop/files/iotop-0.2.1.tar.bz2]
-md5=127e038106492de258a206433f4c3a96
-sha256=c2a7032057f9e1a6515f8062c13b52a6f0b77609677839399521da67dc123b7c
-
-[http://www.iozone.org/src/current/iozone3_263.tar]
-md5=44fd88df361ec4508e10c8d6615245fa
-sha256=920fde1a3843539570e2df4aa611e74df102e52d363c5973d5a9d15bdf976461
-
-[http://gpe.linuxtogo.org/download/source/ipaq-sleep-0.7-9.tar.gz]
-md5=d16782bc55d03d431ae7dabf9f97323c
-sha256=b1b447e2141d4466d9150e2ce22aec154a543a4c1dccd5f5026316e913fd0744
-
-[http://gpe.linuxtogo.org/download/source/ipaq-sleep-0.8.tar.gz]
-md5=81931d4a4048f7f9f57ce80dfa84592f
-sha256=5de3cac55af090069227c6137fa7d20e570eb7e04c33d47486c173a280a1615a
-
-[http://gpe.linuxtogo.org/download/source/ipaq-sleep-0.9.tar.gz]
-md5=6163ba21421d47d449991f88959a06cb
-sha256=6e8c4f0ecc24c36436227ebb4cba2abbc0737be83103cb156f80ffa00aabbd8c
-
-[http://downloads.mozdev.org/enigmail/src/ipc-1.1.3.tar.gz]
-md5=64ba4c6e3b52568468c4f6680ec7e679
-sha256=0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725
-
-[http://dast.nlanr.net/Projects/Iperf/iperf-1.7.0-source.tar.gz]
-md5=3e4aea85822bcf10ed14040f4b26bd26
-sha256=f54fabaf344b1120e8682c7e5f1ef80d08d88f0b8640037f92e261e51c9c1672
-
-[http://dast.nlanr.net/Projects/Iperf2.0/iperf-2.0.2.tar.gz]
-md5=bb658aba58a5af0356f5b1342dfe8f53
-sha256=e9baea8cb516b5d83013f746f9fa104abb45fcf15d444a03add06769916e41d6
-
-[http://downloads.sourceforge.net/iperf/iperf-2.0.4.tar.gz]
-md5=8c5bc14cc2ea55f18f22afe3c23e3dcb
-sha256=3b52f1c178d6a99c27114929d5469c009197d15379c967b329bafb956f397944
-
-[http://www.handhelds.org/pub/packages/ipkg/ipkg-0.99.163.tar.gz]
-md5=0b10ad2924611bccaea8ddf98481a192
-sha256=405743e1ba320ed6095d42a898f1486e3af1d745cae2bd45dfe1d8403a4d8995
-
-[http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.16-060323.tar.gz]
-md5=f31d4516b35bbfeaa72c762f5959e97c
-sha256=e382a4c0de31a5196e0c7829d6f7e29d0263cf90a4def10302db694fc2f30da2
-
-[http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.18-061002.tar.gz]
-md5=193b570128cf852afba337438413adf9
-sha256=038aabd2894f46d3a4a7583ab2bff13b2da51682ccb921ceb7c87326ec1d344f
-
-[http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.20-070313.tar.gz]
-md5=7bc5883aadf740761fa2dd70b661e8cc
-sha256=3b3960f867bf878a6561428a3c572e87dcccadb7123aa47d7aaca77b32adecc8
-
-[http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.22-070710.tar.gz]
-md5=20ef2767896a0f156b6fbabd47936f79
-sha256=3c6b48af9e655e4f0a34c7718e288960a1dc84a3ac7eb726e855adb45fbd953a
-
-[http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.29.tar.bz2]
-md5=a3ecfaa091289656fae786b027b44eda
-sha256=ff7b78ebb112ebeb3901fe36823328c4af89040b890c25db43d8e35ccbc663b3
-
-[http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.31.tar.bz2]
-md5=230f35282a95451622f3e8394f9cd80a
-sha256=56875eaed9c581645422d89e00fa7da512256c82ac3dae3c5051ff6827e83152
-
-[http://downloads.sourceforge.net/ipsec-tools/ipsec-tools-0.5-rc1.tar.bz2]
-md5=74fc66f01937076f65079e194dd2b0d0
-sha256=325bfc9607ccf56e7de0e7973e18fac76678e50b8cf24d3818b4feb734a0e45d
-
-[http://downloads.sourceforge.net/ipsec-tools/ipsec-tools-0.5rc2.tar.bz2]
-md5=16cc2cea0a882c8df1da1393011d9cbe
-sha256=e1c8b396b8753cce4107ad3df76feba0a4bf0f0f9d2791d16eee1c07f662a174
-
-[http://downloads.sourceforge.net/ipsec-tools/ipsec-tools-0.6.6.tar.bz2]
-md5=e908f3cf367e31c7902df5ab16fbe5c3
-sha256=2291dd75794a4fc307eb420eb035087a4cf56d3ef6b187f1a1386d3e33851044
-
-[http://heanet.dl.sourceforge.net/ipsec-tools/ipsec-tools-0.6.6.tar.bz2]
-md5=e908f3cf367e31c7902df5ab16fbe5c3
-sha256=2291dd75794a4fc307eb420eb035087a4cf56d3ef6b187f1a1386d3e33851044
-
-[http://downloads.sourceforge.net/ipsec-tools/ipsec-tools-0.6.7.tar.bz2]
-md5=4fb764f282dc21cf9a656c58e13dacbb
-sha256=4239f836dc610a2443ded7ba35cb3b87de9d582c800e5d9eb5eed37defd61ef2
-
-[http://heanet.dl.sourceforge.net/ipsec-tools/ipsec-tools-0.6.7.tar.bz2]
-md5=4fb764f282dc21cf9a656c58e13dacbb
-sha256=4239f836dc610a2443ded7ba35cb3b87de9d582c800e5d9eb5eed37defd61ef2
-
-[http://www.netfilter.org/files/iptables-1.2.11.tar.bz2]
-md5=0a5f5f226e41ce408a895bec995e8c05
-sha256=be7bd67232fddbe3ce81f40f5b79123380a2e67cd166ec06e650842f8acb373d
-
-[http://www.netfilter.org/files/iptables-1.2.9.tar.bz2]
-md5=8299db6ffbe98496d7f57dbb00f17e7d
-sha256=56a84c6e8f38357525fbc8839d0c5ae2748097fba97692c78377d7296109fb13
-
-[http://www.netfilter.org/files/iptables-1.3.3.tar.bz2]
-md5=86d88455520cfdc56fd7ae27897a80a4
-sha256=84ac04a28ae41e17df0f181d8bc0049ae7a83baae07296e890ea5977a2952318
-
-[http://netfilter.org/projects/iptables/files/iptables-1.3.8.tar.bz2]
-md5=0a9209f928002e5eee9cdff8fef4d4b3
-sha256=c5c8a091ed9a1fa2dab86b4d87719064b50c202e8503046f50f299a361e6211c
-
-[http://netfilter.org/projects/iptables/files/iptables-1.4.6.tar.bz2]
-md5=c67cf30e281a924def6426be0973df56
-sha256=6e732798cad62163d6e033aa52e22b771246556a230c0f66cd33fe69e96d72a4
-
-[ftp://ftp.debian.org/debian/pool/main/i/iptraf/iptraf_3.0.0-6.diff.gz]
-md5=fe0e2944addbd5803b42e91f7e4ec5d7
-sha256=5803c3f3653887896b75567daf617a8f200cecdd28beb870219b3954d9931efa
-
-[ftp://ftp.debian.org/debian/pool/main/i/iptraf/iptraf_3.0.0.orig.tar.gz]
-md5=377371c28ee3c21a76f7024920649ea8
-sha256=9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163
-
-[http://downloads.sourceforge.net/iptstate/iptstate-2.2.1.tar.bz2]
-md5=6b08f09b9917f644629efea1febec4b3
-sha256=004f8358f4f84d90a260a76ac46ce8512126ac490d73460fcee6c11effd34362
-
-[http://heanet.dl.sourceforge.net/iptstate/iptstate-2.2.1.tar.bz2]
-md5=6b08f09b9917f644629efea1febec4b3
-sha256=004f8358f4f84d90a260a76ac46ce8512126ac490d73460fcee6c11effd34362
-
-[http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz]
-md5=b5493f7a2997130a4f86c486c9993b86
-sha256=25d45acf19e3acd09745df47581ac7a13e3694ee51fe4e642108f9f228cacca9
-
-[http://ftp.de.debian.org/debian/pool/main/i/iputils/iputils_20071127.orig.tar.gz]
-md5=a1d0aca33da380d6045c5c0e5002c09d
-sha256=9e4ab143828fefb3b67ce2bc3ad63a91cacc45d97161822915778683fb80343b
-
-[http://ipython.scipy.org/dist/ipython-0.10.tar.gz]
-md5=dd10cd1b622c16c1afca2239fcc0dfdf
-sha256=60d602637dc5f078b083a4ca5ab64364ba816bd72439844012ed11a30f88228c
-
-[http://ipython.scipy.org/dist/ipython-0.9.1.tar.gz]
-md5=8a1bd1a9be272f4ddf4de99e5c1ad0dc
-sha256=5540bc1a01f11ca66c3d7c31a43af670fd0f0044b8e38d142614872956548006
-
-[http://www.vanille.de/mirror/iqnotes-2.0.2-src.tar.bz2]
-md5=9d9504055b37247ece87b31895eb2e5b
-sha256=27badd5d9f3167443099c6b6cf66b05b9e32cc71f03d692cff474c2279c4f4cd
-
-[http://download.berlios.de/iqnotes/iqnotes-2.1.0rc1.tar.bz2]
-md5=6b4bbf1b97d1fe777c881c0576e4cb65
-sha256=e3c0d1991f6a35f789bf305bc56971e2ced6208d19443ccea8d1d64417a90faf
-
-[http://bitchx.sourceforge.net/ircii-pana-1.1-final.tar.gz]
-md5=611d2dda222f00c10140236f4c331572
-sha256=7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57
-
-[http://www.bitchx.org/files/source/ircii-pana-1.1-final.tar.gz]
-md5=611d2dda222f00c10140236f4c331572
-sha256=7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57
-
-[http://downloads.sourceforge.net/openobex/ircp-0.3.tar.gz]
-md5=a77124e7efa6b31369404371485179b2
-sha256=729da519ffeb604ac0b9b6c6d8123a3fdf17956134e105c04778f13c4d4ce4ae
-
-[http://heanet.dl.sourceforge.net/openobex/ircp-0.3.tar.gz]
-md5=a77124e7efa6b31369404371485179b2
-sha256=729da519ffeb604ac0b9b6c6d8123a3fdf17956134e105c04778f13c4d4ce4ae
-
-[http://downloads.sourceforge.net/irda/irda-utils-0.9.15.tar.gz]
-md5=b69b75464d6ee72e6600a8459d9b68ac
-sha256=27df093409e65279b5cf60777c3310feb50a522bebd4f5038cfebe41a7a46809
-
-[http://heanet.dl.sourceforge.net/irda/irda-utils-0.9.15.tar.gz]
-md5=b69b75464d6ee72e6600a8459d9b68ac
-sha256=27df093409e65279b5cf60777c3310feb50a522bebd4f5038cfebe41a7a46809
-
-[http://downloads.sourceforge.net/irda/irda-utils-0.9.16.tar.gz]
-md5=2ff18f0571b5a331be7cd22fc3decd41
-sha256=09a30fa12d81014b2877e8b5c36f5a341788579669d72f2dec0e29d22efe11e9
-
-[http://heanet.dl.sourceforge.net/irda/irda-utils-0.9.16.tar.gz]
-md5=2ff18f0571b5a331be7cd22fc3decd41
-sha256=09a30fa12d81014b2877e8b5c36f5a341788579669d72f2dec0e29d22efe11e9
-
-[http://www.openzaurus.org/download/3.5.4/sources/irk-0.11.0.tgz]
-md5=5b39a7fb06fd24edfb543a3a0130065c
-sha256=5eeba81a5e5163e0b0b92b5e5aaf91c07b412a743a98f59975c75d28c133a85f
-
-[http://www.openzaurus.org/download/3.5.4/sources/irk-current.tgz]
-md5=a77eaea6930b9af5bbcd59bf9f8859c8
-sha256=942240421710da8a04fa6c7071f50f0737ab7198e31c1d96f1e0b73330e0d066
-
-[http://www.irssi.org/files/irssi-0.8.10.tar.bz2]
-md5=4b83d4047670eb75bd14ae1bdd68dc38
-sha256=47344b444d78ad5965eb40cc4c8df8450fdc54135e2b058710ee8c500b958d6c
-
-[http://www.irssi.org/files/irssi-0.8.12.tar.bz2]
-md5=e407b557b3cfc7c91ce4de2571dd79cb
-sha256=462d634bb509cc2bdd550ee5c7b269495f3173721b7404f162ad1f69b49bfff0
-
-[http://www.irssi.org/files/irssi-0.8.13.tar.bz2]
-md5=0d6fc2203832b514eff014fffd574664
-sha256=896541ac837421290934e2658ab364d4d3f0326259489a94a0cd166e2b05d735
-
-[http://www.irssi.org/files/irssi-0.8.14.tar.bz2]
-md5=00efe7638dd596d5930dfa2aeae87b3a
-sha256=63ea70eb1ce6fb3c995e984f919dcd18882e916478779dd899de9385ef8fdf28
-
-[http://heanet.dl.sourceforge.net/iscsitarget/iscsitarget-0.4.16.tar.gz]
-md5=c7ea3192f1717b40e4c483c9d630082d
-sha256=e6605ae5f9ed2e2fdbe84df967236678579a4fbe536b75a93277cbb607bead7d
-
-[http://downloads.sourceforge.net/iscsitarget/iscsitarget-0.4.17.tar.gz]
-md5=e79b437695fc50e7d054631855a16b1b
-sha256=bc554508174f2657c93ddb0501adad0256d1c6801a3c1ee54ff721bc92ff8778
-
-[ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-1.4.tar.bz2]
-md5=4073466e57df23d39721513219e4f7ae
-sha256=0a7cf177c25b3f0d77c60a5f1149aab9e03ba70f69bac70138a867efe19a1d97
-
-[http://download.ikaaro.org/itools/itools-0.13.0.tar.gz]
-md5=007ff9e08e26504f5c28462d7bbdaa3e
-sha256=c682a23faf732203a7de9b82ffb736396e5948e000ab10c1a42b0e936b6cc329
-
-[http://download.ikaaro.org/itools/itools-0.16.5.tar.gz]
-md5=38f42b91b99645d606d1633736aa844d
-sha256=7f2794f64b83955787457fc30562313119c43021046cbc152584d1663c2f8eb2
-
-[http://downloads.sourceforge.net/ivman/ivman-0.6.14.tar.bz2]
-md5=ebef12559268e2c5ea932cbb5aaa789e
-sha256=62a6f9cb90999694e48528e16f427433c13a99424b5dca4cb38cda99e13d10e8
-
-[http://heanet.dl.sourceforge.net/ivman/ivman-0.6.14.tar.bz2]
-md5=ebef12559268e2c5ea932cbb5aaa789e
-sha256=62a6f9cb90999694e48528e16f427433c13a99424b5dca4cb38cda99e13d10e8
-
-[http://wireless.kernel.org/download/iw/iw-0.9.18.tar.bz2]
-md5=9734080d8a5c4b768c5e0da665a48950
-sha256=b02e26efc72cb23129431e478dbb2f2abd16e8cc4f4130762d98c54f106aabd0
-
-[http://www.kokkinizita.net/linuxaudio/downloads/jaaa-0.4.2.tar.bz2]
-md5=e3013bb1e287b495b0668f4b6e2887c7
-sha256=0bae72d819963c40e0a202bb08bc55a600fe7c453749601a3836bc9272cffb3a
-
-[http://downloads.sourceforge.net/jackit/jack-audio-connection-kit-0.103.0.tar.gz]
-md5=03a0f63b997ce7b83a1eeaa6b80f4388
-sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
-
-[http://heanet.dl.sourceforge.net/jackit/jack-audio-connection-kit-0.103.0.tar.gz]
-md5=03a0f63b997ce7b83a1eeaa6b80f4388
-sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
-
-[http://jackaudio.org/downloads/jack-audio-connection-kit-0.116.2.tar.gz]
-md5=9c0ae9880e9b6e081f1a238fe6a28bd5
-sha256=ce6e1f61a3b003137af56b749e5ed4274584167c0877ea9ef2d83f47b11c8d3d
-
-[http://downloads.sourceforge.net/jackit/jack-audio-connection-kit-0.99.0.tar.gz]
-md5=a891a699010452258d77e59842ebe4a0
-sha256=2096acc56c314e689faad0036bbc1d86dea1b9d9620f711d471de76b1dd6859e
-
-[http://downloads.sourceforge.net/tcljava/jacl1.4.1.tar.gz]
-md5=a7ec8300e8933164e854460c73ac6269
-sha256=0edac0a7d2253c29c44ccc92427fa9ad4ee81b6c82142e417f72399a8584b749
-
-[http://www.apache.org/dist/jakarta/oro/source/jakarta-oro-2.0.8.tar.gz]
-md5=6f7690c6ba9750e3cbb8ebd10078a79a
-sha256=4c4f3c7c479994c3ce09f542d4fbdc03eed58a2d7f320d32f2baf238b5b6f566
-
-[http://archive.apache.org/dist/jakarta/regexp/source/jakarta-regexp-1.5.tar.gz]
-md5=b941b8f4de297827f3211c2cb34af199
-sha256=79e80af8cbeb68ddad75a1aa6244d7acd62176bfd69bcdc0640d11177dcde97d
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.4.5.tar.gz]
-md5=3f538bab6e1c77aed331e5e71f754f5b
-sha256=f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5
-
-[http://heanet.dl.sourceforge.net/jamvm/jamvm-1.4.5.tar.gz]
-md5=3f538bab6e1c77aed331e5e71f754f5b
-sha256=f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.5.0.tar.gz]
-md5=a965452442cdbfc94caba57d0dd25a8f
-sha256=18b269b1bfad7230384681e89189c6af18584e19cddbf92208c0acef814046ab
-
-[http://heanet.dl.sourceforge.net/jamvm/jamvm-1.5.0.tar.gz]
-md5=a965452442cdbfc94caba57d0dd25a8f
-sha256=18b269b1bfad7230384681e89189c6af18584e19cddbf92208c0acef814046ab
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.5.1.tar.gz]
-md5=5a82751b50391eb092c906ce64f3b6bf
-sha256=663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a
-
-[http://heanet.dl.sourceforge.net/jamvm/jamvm-1.5.1.tar.gz]
-md5=5a82751b50391eb092c906ce64f3b6bf
-sha256=663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.5.2.tar.gz]
-md5=2a564045670b459e9aed857b5f8a3391
-sha256=76c976616d344a3b1abd8896be6610c4d97a58af6960e1bc2f442b774bdda839
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.5.3.tar.gz]
-md5=ce886163658d748113b0570dfae12aea
-sha256=f2795ab62635df1c9bc6c4a7b90f53d0d846c0c26f5ec7b352f687506407ebd8
-
-[http://downloads.sourceforge.net/gakusei/jards_gakusei.cvs.sourceforge.net__20070212.tar.gz]
-md5=1282913edd226bc9e865f39d79573117
-sha256=3c884982ebf40aade899379902ec92c41782d18c19506cf0ec40bcf6a7df8e3b
-
-[http://heanet.dl.sourceforge.net/gakusei/jards_gakusei.cvs.sourceforge.net__20070212.tar.gz]
-md5=1282913edd226bc9e865f39d79573117
-sha256=3c884982ebf40aade899379902ec92c41782d18c19506cf0ec40bcf6a7df8e3b
-
-[http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip]
-md5=a342b2b4495b3e1394e161eb5d85d754
-sha256=6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494
-
-[http://www.jasspa.com/release_20060909/jasspa-memacros-20060909.tar.gz]
-md5=d4d7f84744fedb933bcc408734940f0a
-sha256=0d5ac080cafe6ad08e4b8eda0c85df48950c0cd3056c9f8896b1474172616b12
-
-[http://www.jasspa.com/release_20060909/jasspa-mesrc-20060909-2.tar.gz]
-md5=6606ec40da39352e5cbb644090a13820
-sha256=2cb80e403a1c76c6a3405ccbf67e457e2f558e19f80c96baa608635f3e917299
-
-[http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/java-gnome-4.0.3.tar.gz]
-md5=f7d91dc6de7944c3046756dae13f417c
-sha256=7fdf0abe382a89ef4b8dfaab40e10a99b4549097c6bfbec2c8bd8b778597b8da
-
-[http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/java-gnome-4.0.9.tar.gz]
-md5=77ee839fd22b72a3f846bab21d55c19d
-sha256=85c2a782fbaa65ca172facd806323dac25d740f9389d6f45d464a801a921a84d
-
-[http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz]
-md5=8b11edfec13c590ea443d0f0ae0da479
-sha256=7e6dc5be74ae56c7e86e69ad0ad88dae3b2847afa9e73a76635918a6b1eb75cd
-
-[http://www.ch-werner.de/javasqlite/javasqlite-20080130.tar.gz]
-md5=842932cfb22d44d8ebf85d1e184b4c55
-sha256=ea216b2fa82e784fe7572074246fb0bbaaeac46e655f554d44da827f82b95231
-
-[http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.1-src.tar.gz]
-md5=b598ae6b7e765a92e13667b0a80392f4
-sha256=f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca
-
-[http://www.clarkware.com/software/jdepend-2.9.zip]
-md5=4e979c0dda766ba1dd719905ca975c7b
-sha256=202de62e2f3d0667cc464720d5897d0ccb29767ec24e0a4d4c5bd6c4d37425a4
-
-[http://download.java.net/dlj/binaries/jdk-6u10-dlj-linux-i586.bin]
-md5=b70924c697584ab7955050d7a9b4de57
-sha256=dae79e8c56090ac3fb4ac3fe0df9faf6a0c9694a89ef978dce0ab970557ad264
-
-[http://www.jdom.org/dist/binary/archive/jdom-1.1.tar.gz]
-md5=22745cbaaddb12884ed8ee09083d8fe2
-sha256=a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056
-
-[http://www.jdom.org/dist/binary/jdom-1.1.tar.gz]
-md5=22745cbaaddb12884ed8ee09083d8fe2
-sha256=a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056
-
-[http://www.rpsys.net/openzaurus/patches/archive/jffs2_longfilename-r1.patch]
-md5=1e30c4f6d5148d8462c41b7f58738531
-sha256=f01a8f0975905597aaccd2d6647331aac14615b67a37ccf626bb2ea45db13294
-
-[http://jfs.sourceforge.net/project/pub/jfsutils-1.1.13.tar.gz]
-md5=14ad3a2eb26e55ef34ac0569f5739ccc
-sha256=668ac8bbef3c153efa9bdaaea3228de93142e7e1cff6b8793b0c8970a62ad2ec
-
-[http://www.sentex.net/~mwandel/jhead/jhead-2.6.tar.gz]
-md5=fa3f1d3243fab7bc3b81688a3f2eec25
-sha256=55a65214c19f9a61265fdef21ae4d7f59b725248d06c0595152c14774bd31065
-
-[http://downloads.sourceforge.net/jikes/jikes-1.21.tar.bz2]
-md5=4e45eeab4c75918174e16ea2b695d812
-sha256=30093eab8df4cad8ef94a1c4197272b75c719bbbbdf077c8b64e7cfbb9cbc9ae
-
-[http://heanet.dl.sourceforge.net/jikes/jikes-1.21.tar.bz2]
-md5=4e45eeab4c75918174e16ea2b695d812
-sha256=30093eab8df4cad8ef94a1c4197272b75c719bbbbdf077c8b64e7cfbb9cbc9ae
-
-[http://downloads.sourceforge.net/jikes/jikes-1.22.tar.bz2]
-md5=cda958c7fef6b43b803e1d1ef9afcb85
-sha256=0cb02c763bc441349f6d38cacd52adf762302cce3a08e269f1f75f726e6e14e3
-
-[http://heanet.dl.sourceforge.net/jikes/jikes-1.22.tar.bz2]
-md5=cda958c7fef6b43b803e1d1ef9afcb85
-sha256=0cb02c763bc441349f6d38cacd52adf762302cce3a08e269f1f75f726e6e14e3
-
-[http://downloads.sourceforge.net/joe-editor/joe-3.1.tar.gz]
-md5=2a6ef018870fca9b7df85401994fb0e0
-sha256=252390e4bc687957f09f334095904c8cc53b39c7b663ed47861ae1d11aef5946
-
-[http://heanet.dl.sourceforge.net/joe-editor/joe-3.1.tar.gz]
-md5=2a6ef018870fca9b7df85401994fb0e0
-sha256=252390e4bc687957f09f334095904c8cc53b39c7b663ed47861ae1d11aef5946
-
-[ftp://aeneas.mit.edu/pub/gnu/ghostscript/jpegsrc.v6b.tar.gz]
-md5=dbd5f3b47ed13132f04c685d608a7547
-sha256=75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d
-
-[http://www.ijg.org/files/jpegsrc.v6b.tar.gz]
-md5=dbd5f3b47ed13132f04c685d608a7547
-sha256=75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d
-
-[http://ftp.mozilla.org/pub/mozilla.org/js/js-1.5.tar.gz]
-md5=863bb6462f4ce535399a7c6276ae6776
-sha256=ef72a154320c9949f8de0732e8dbfa186b83feb0a5e890d90807757de9998585
-
-[http://ftp.mozilla.org/pub/mozilla.org/js/older-packages/js-1.5.tar.gz]
-md5=863bb6462f4ce535399a7c6276ae6776
-sha256=ef72a154320c9949f8de0732e8dbfa186b83feb0a5e890d90807757de9998585
-
-[http://ftp.mozilla.org/pub/mozilla.org/js/js-1.60.tar.gz]
-md5=bd8f021e43a8fbbec55ac2cd3d483243
-sha256=cffbcf6721b897ca1259661f418f3d81c1193702f59a29f0f3232c9b8f24faa3
-
-[http://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz]
-md5=5571134c3863686b623ebe4e6b1f6fe6
-sha256=44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b
-
-[http://downloads.sourceforge.net/jsch/jsch-0.1.40.zip]
-md5=b59cec19a487e95aed68378976b4b566
-sha256=ca9d2ae08fd7a8983fb00d04f0f0c216a985218a5eb364ff9bee73870f28e097
-
-[http://oss.metaparadigm.com/json-c/json-c-0.6.tar.gz]
-md5=2d8b899aeeebbbe68158d25adf8a4f1e
-sha256=915ee6c4b8f1ffd5313d990875cd44e5e7092a51de259707daca797fd5c42b46
-
-[http://downloads.openmoko.org/sources/juce_1_29.zip]
-md5=7965d33e47a7cc97c4084c2e9aa0bf82
-sha256=bc4f62cbac4716c2c1a25cf53b73343a03883964576d9dd590a9e4c7a70f465a
-
-[http://downloads.sourceforge.net/juce/juce_1_46.zip]
-md5=a746183ea41aebc27a0f771036f668e1
-sha256=1b8f50169bc2d827c6efe6bc98bbef2161f615219e4e8921e68227888fd50a9e
-
-[http://iij.dl.sourceforge.jp/julius/37582/julius-4.1.2.tar.gz]
-md5=886a114b391aa1992567019213efc63e
-sha256=542c7f1042679c8484dc2f5f5536ed0c79fa79b2b9dd6cf6881278a6fdb37a84
-
-[http://osdn.dl.sourceforge.jp/julius/37582/julius-4.1.2.tar.gz]
-md5=886a114b391aa1992567019213efc63e
-sha256=542c7f1042679c8484dc2f5f5536ed0c79fa79b2b9dd6cf6881278a6fdb37a84
-
-[http://downloads.sourceforge.net/junit/junit-4.3.1-src.jar]
-md5=170f9645a41398388e8553b32ff5f630
-sha256=57d1e49ee3fd0dbdc0a68a852925c973af5c30b1725b6aa63bfb42df6f7c3349
-
-[http://downloads.sourceforge.net/junit/junit3.8.2.zip]
-md5=9b8963ba2147a64bd5f1574b6fd289cb
-sha256=aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a
-
-[http://downloads.sourceforge.net/justreader/justreader_2.0k.tgz]
-md5=74b2b89b12668cbbbb093b6343e9f52d
-sha256=55b0dd7ac3f9860a4cba0797213fdaa898b77f3228612e3499d54e6fe6144514
-
-[http://heanet.dl.sourceforge.net/justreader/justreader_2.0k.tgz]
-md5=74b2b89b12668cbbbb093b6343e9f52d
-sha256=55b0dd7ac3f9860a4cba0797213fdaa898b77f3228612e3499d54e6fe6144514
-
-[http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz]
-md5=3c52a0afb970e8a1fb2d34f30d330a83
-sha256=20923a3f771a14c58c8cddfff2b589d568aff09f8a931919dc63ddaabb32407a
-
-[http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-1.1.5.tar.gz]
-md5=928c578d4808012fe5ba5587071d2aa2
-sha256=f4ed45720d76f5182f2dede135c1856ad01bdf9875f54459b6baa1071af67280
-
-[http://kakasi.namazu.org/stable/kakasi-2.3.4.tar.gz]
-md5=4eff51aafbd56c9635791a20c03efa8f
-sha256=c272560f5c11fe45b011c4e26ada66218fb0109d5582c5876aa49c5e24718534
-
-[http://clay.ll.pl/download/kanatest-0.3.6.tar.gz]
-md5=cd1eb1ce62a52cf69f4df9041a886794
-sha256=559c3d5e9336a56c9f83fcece75ab5211e62a1a868b3a6f539e9b7bd15f46576
-
-[http://clayo.org/kanatest/kanatest-0.4.8.tar.gz]
-md5=b97b0521314f634e454354cb7ba2013d
-sha256=a31682604bc6db9c0cb2e15429b8a5b64c04f1ed96df912cab71d4337567c513
-
-[ftp://ftp.debian.org/debian/pool/main/k/kanatest/kanatest_0.3.6.orig.tar.gz]
-md5=cd1eb1ce62a52cf69f4df9041a886794
-sha256=559c3d5e9336a56c9f83fcece75ab5211e62a1a868b3a6f539e9b7bd15f46576
-
-[http://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz]
-md5=bdfe75534322840b3ff566e0a91c472d
-sha256=28272f61ec09c607a3578e3626e9e4fd43d1d9d1e21cb64328745766d00ee9e1
-
-[http://osdn.dl.sourceforge.jp/kazehakase/24791/kazehakase-0.4.5.tar.gz]
-md5=2171f02d58a575e148436c7102686afb
-sha256=87ad1345e1d6df6ffdb1b43af92cfd87a16eade7de4060c5ce2fabd4d37bf99a
-
-[http://iij.dl.sourceforge.jp/kazehakase/25610/kazehakase-0.4.7.tar.gz]
-md5=44d7105f394b982661ba0567a0d23b90
-sha256=0d52a80161b5dccfa904afd58dac4b5c79944943e7d81649459d2419362a014d
-
-[http://ftp.debian.org/debian/pool/main/k/kbd/kbd_1.12.orig.tar.gz]
-md5=7892c7010512a9bc6697a295c921da25
-sha256=f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803
-
-[http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.3.tar.bz2]
-md5=6092cdb0a1225f95356ddbe6c2abaad5
-sha256=7000005ebbd07a28a71477d72bcb76c47064e043a4ead26fcf4d5af394ce19df
-
-[http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.4.tar.bz2]
-md5=7f439166a9b2bf81471a33951883019f
-sha256=1baa29931313d0c3eb81dffd42662768cc76ce49ce94024d5fe32ef5a4e8603c
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/kbproto-X11R7.0-1.0.2.tar.bz2]
-md5=403f56d717b3fefe465ddd03d9c7bc81
-sha256=abfea195d72a6355dddacaf1ca37187ba9e8ca271af4bf6c38efaba4023b36a4
-
-[ftp://download.kde.org/pub/kde/stable/3.5.8/src/kdelibs-3.5.8.tar.bz2]
-md5=acaa37e79e840d10dca326277a20863c
-sha256=779f563fdf0385b973f2238f04d82b5729aefe1c949e4d29482b6bb170aa3fe6
-
-[http://www.basyskom.de/uploads/175/37/kdenox_snapshot_qt2_20070316.tar.bz2]
-md5=3a9e14a245d293d143715c0318e3d0bd
-sha256=63a7d777cfb610c06c3778b4fc780a7e3f4158b5a7125588ccbc0c59f11b48b8
-
-[http://downloads.sourceforge.net/kdepimpi/kdepimpi-2.2.10.tar.gz]
-md5=1b918fa70812b24df0c4de00bb2c8896
-sha256=88f68d15052932ac763c007570a6e12e7be6e0d177706f96ddda7c358adcf871
-
-[http://heanet.dl.sourceforge.net/kdepimpi/kdepimpi-2.2.10.tar.gz]
-md5=1b918fa70812b24df0c4de00bb2c8896
-sha256=88f68d15052932ac763c007570a6e12e7be6e0d177706f96ddda7c358adcf871
-
-[http://downloads.sourceforge.net/kdepimpi/kdepimpi-2.2.3.tar.gz]
-md5=b452510c392d852c7a94bb08547f4e9a
-sha256=d6b21f0dad8277925abbb15d3c9cbc0a58af5b5119bbd1fde8637b600bae0489
-
-[http://heanet.dl.sourceforge.net/kdepimpi/kdepimpi-2.2.3.tar.gz]
-md5=b452510c392d852c7a94bb08547f4e9a
-sha256=d6b21f0dad8277925abbb15d3c9cbc0a58af5b5119bbd1fde8637b600bae0489
-
-[http://downloads.sourceforge.net/kdepimpi/kdepimpi-2.2.7.tar.gz]
-md5=9ea0265229fab492d4ec70d734e823f3
-sha256=ad5d912a4c726015e351981b5c71014f6cbd6b9d79d6b58d89ea8b4ffa31bb76
-
-[http://kernel.org//pub/linux/kernel/people/ck/apps/kernbench/kernbench-0.41.tar.bz2]
-md5=50dda4c865dba5c341422e2d848fb6be
-sha256=6d5de792b0a3b119da3b584eb64076ed192d050516f7d44a36f95ecd8cf32362
-
-[http://kernel.org/pub/linux/kernel/people/ck/apps/kernbench/kernbench-0.41.tar.bz2]
-md5=50dda4c865dba5c341422e2d848fb6be
-sha256=6d5de792b0a3b119da3b584eb64076ed192d050516f7d44a36f95ecd8cf32362
-
-[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx.patch]
-md5=165364e207bd2e122d9f5e7d94a683eb
-sha256=897b6d576526c305b0e8b4a3d1cd02f334606429aacf4969094925cd321c5a3b
-
-[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_armtskit_update2.patch]
-md5=4074fe1f0af60b416e73ab4754dd59b3
-sha256=17c543853daed8f99d6a721a34c509aea262d6868d7680fe808971b401fe5761
-
-[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_ea3250.patch]
-md5=38af08bbd067ef50a9e09c64840e56db
-sha256=52cbdf4307c270a6396008a30c32c9012d155a7b0cf26a8430bda3632bee8f7d
-
-[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update2.patch]
-md5=59f8fafa796bcbe6367c4f10ef8d9491
-sha256=96153e5b741c2ef4157c22aef9e1a6f1b91a796f3a646bdfb21bc3adbb4fe4b3
-
-[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update3.patch]
-md5=2675cd2b70baad7ecc9fb5f64dc1854b
-sha256=b1528917ec3d9fc784173795838bf413761b15f5381b6c5885b27b96af418659
-
-[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update4.patch]
-md5=2f21f8455945759a5af8060224f2a1e2
-sha256=14a15c6c8080189066d4e5914e365c5f0253a1578008ced42d7e32746e6f4666
-
-[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update5.patch]
-md5=e65e51b0d8b5710a270fce38f1c6b05b
-sha256=2d323344b949de7ad5fb783136a1e6093d616f0a0fe5f7f79c4f1aa6c1869c6f
-
-[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-update1.patch]
-md5=7533dc7dda4d8ff56dfa25b202632dff
-sha256=ff46bb7501f23c331b1ba6057ff2eab56690d9cb39a67f92ee7261bdd0947881
-
-[http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz]
-md5=4610c31506e86b81323ce45465ec73eb
-sha256=09e3fceea73bea972ce580232c5ca669836c892c6bfb303f8053463a2c534e93
-
-[http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz]
-md5=8fb083c028ad66a3ebcc7d780e4d7f4d
-sha256=afe5bddd14c06e1e9350742c5569511039ceaf82a2437b89a62c7ae8c82df245
-
-[http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz]
-md5=f2a893efdc2712b70ee8fbb65da2a70e
-sha256=f219303e60f81b3cf6206b6c1851bd42069bd018ed18482ab04dded0b4339f8a
-
-[http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20094803.3+0m5.diff.gz]
-md5=fdd13af46cbaf8594b9fc3d82070aecc
-sha256=78ab82b0d6647d196fe3f6185a743da4b1846730668b078beb814c717fdd0bb5
-
-[http://www.kerneloops.org/download/kerneloops-0.11.tar.gz]
-md5=a0daa9437f0638912a91afe66f51545b
-sha256=2f23a1a2f1b928b2ad44f13a98c704c3d7abd5e3c7157f6a8915acc74c8dcd71
-
-[http://www.rpsys.net/openzaurus/patches/archive/kexec-arm-r3a.patch]
-md5=e86438fb4fff46bda188c2211eede1bf
-sha256=54bfe3995975d17355152c7bd1c5b0dbe61973e15135d52a799be890bc979467
-
-[http://www.rpsys.net/openzaurus/patches/archive/kexec-arm-r4a.patch]
-md5=6ddd28b065a4d31685fe5551ecf5df46
-sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d
-
-[http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-1.101.tar.gz]
-md5=b4f7ffcc294d41a6a4c40d6e44b7734d
-sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38
-
-[http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.0.tar.gz]
-md5=bf87c53f36b4454ad3cc50aa9c72faf3
-sha256=f8244b8c4691faf0c9765ec3acba730a5620c8077f9bed667b9ac835dd959ba2
-
-[http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.1.tar.gz]
-md5=a7710a89fb0096002bccc57ab202a874
-sha256=95f352870df977271d912b6093f034bd3345e47a157493db96d1047b7654564d
-
-[http://kexecboot.home.linuxtogo.org/kexecboot-0.3.tar.gz]
-md5=3c3b8edb739146183b3ddff3e0af5f1c
-sha256=61a918b38a4b0b97e1469cbe3d9c4307af956bd95abec2067aa2fd278739cd96
-
-[http://projects.linuxtogo.org/frs/download.php/221/kexecboot-0.3.tar.gz]
-md5=3c3b8edb739146183b3ddff3e0af5f1c
-sha256=61a918b38a4b0b97e1469cbe3d9c4307af956bd95abec2067aa2fd278739cd96
-
-[http://kexecboot.home.linuxtogo.org/kexecboot-0.4.tar.gz]
-md5=b4a4509ca3f546cfedd23aa6f99ab81d
-sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890
-
-[http://projects.linuxtogo.org/frs/?group_id=50/kexecboot-0.4.tar.gz]
-md5=b4a4509ca3f546cfedd23aa6f99ab81d
-sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890
-
-[http://projects.linuxtogo.org/~jay7/kexecboot-0.4.tar.gz]
-md5=b4a4509ca3f546cfedd23aa6f99ab81d
-sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890
-
-[http://kexecboot.home.linuxtogo.org/kexecboot-0.5.tar.gz]
-md5=a937303d7ef3fc645f9dccf89e1494e2
-sha256=49c95d62e32b66c9f97e791f667afa82f0714bc0a0e0ad48df010f4f36de42ab
-
-[http://projects.linuxtogo.org/frs/?group_id=50/kexecboot-0.5.tar.gz]
-md5=a937303d7ef3fc645f9dccf89e1494e2
-sha256=49c95d62e32b66c9f97e791f667afa82f0714bc0a0e0ad48df010f4f36de42ab
-
-[http://projects.linuxtogo.org/frs/download.php/226/kexecboot-0.5.tar.gz]
-md5=a937303d7ef3fc645f9dccf89e1494e2
-sha256=49c95d62e32b66c9f97e791f667afa82f0714bc0a0e0ad48df010f4f36de42ab
-
-[http://gpe.linuxtogo.org/download/source/keylaunch-2.0.10.tar.gz]
-md5=2d81de20b26eac5ad44b759eb412e8eb
-sha256=38715fcc508740deb3f169a01092f03ea4ce92c9ec3c2589a9510534aa52a540
-
-[http://jabberstudio.2nw.net/kf/kf-0.5.4.1.tar.gz]
-md5=f963f289b7a1221f192a540fbda5cd55
-sha256=70068af405b4a18c84babded6a1d3fee1b87687d725c1c0456570f06c3841ef3
-
-[http://www.kismetwireless.net/code/kismet-2005-04-R1.tar.gz]
-md5=19b4f192eb11a418ed3f6bf65c1226af
-sha256=921fcd3033ecfd97d33cad2d940c0a5e5bbf8cb36fd7a62646fd486993a5a96f
-
-[http://www.kismetwireless.net/code/kismet-2005-08-R1.tar.gz]
-md5=17edb7688e04dd28028d5268a77d0ce7
-sha256=27e657212881186d356907a7c45b168e7431a2f83f3411d2a90366afccf03916
-
-[http://www.kismetwireless.net/code/kismet-2006-04-R1.tar.gz]
-md5=8ec2de513f2911df1b7edfcba5ad1c26
-sha256=eb8a1c688b07adede53c362355e639d8ac29d30536d69eaee97235d14e6d7e76
-
-[http://www.kismetwireless.net/code/kismet-2007-01-R1b.tar.gz]
-md5=a1dcea71f0c3f881ef72f5bca2db7b39
-sha256=1b998b34e2e9377f5ac7704295d64507234fe7656e49d384f8bf95604e97e05b
-
-[http://www.kismetwireless.net/code/kismet-2007-10-R1.tar.gz]
-md5=2100c667e69db0cde35fa2d06c8516e2
-sha256=023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9
-
-[http://www.kismetwireless.net/code/kismet-2008-05-R1.tar.gz]
-md5=6ee365d36354b4dee4945e67f8149294
-sha256=a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3
-
-[http://kernel.org//pub/linux/libs/klibc/Stable/klibc-0.190.tar.bz2]
-md5=6c96f954676c7b898dfe230e0f2a1fb5
-sha256=5767cbb094300c5e26eb0bab588ecdbf9e5db2a637e9ae73c2efb8a62e05217e
-
-[http://kernel.org/pub/linux/libs/klibc/Stable/klibc-0.190.tar.bz2]
-md5=6c96f954676c7b898dfe230e0f2a1fb5
-sha256=5767cbb094300c5e26eb0bab588ecdbf9e5db2a637e9ae73c2efb8a62e05217e
-
-[http://kernel.org//pub/linux/libs/klibc/Stable/klibc-1.1.1.tar.bz2]
-md5=baa1f6e0b6acbf9576bb28cca5c32c89
-sha256=6a2efdfc757c518a8185f457799506086084b59498f53db37cfb6728008127e0
-
-[http://kernel.org/pub/linux/libs/klibc/Stable/klibc-1.1.1.tar.bz2]
-md5=baa1f6e0b6acbf9576bb28cca5c32c89
-sha256=6a2efdfc757c518a8185f457799506086084b59498f53db37cfb6728008127e0
-
-[http://kernel.org/pub/linux/libs/klibc/Testing/klibc-1.5.15.tar.bz2]
-md5=db2152a8a03bd81e21a5f451f537ae3d
-sha256=8b5334ef88b075f374b031695181b4302c3e5621bf2737a39fdf28262b0f80f4
-
-[http://kernel.org/pub/linux/libs/klibc/Stable/klibc-1.5.tar.bz2]
-md5=481dfdef7273f2cc776c2637f481f017
-sha256=27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7
-
-[http://downloads.sourceforge.net/klimt/klimt-src-0.6.1.zip]
-md5=d12f56384b4ccde11cd756db2b14065c
-sha256=48ae508d72e453e2a1f5748870362259786b475548c545feaec1aea71d2f8fdb
-
-[http://heanet.dl.sourceforge.net/klimt/klimt-src-0.6.1.zip]
-md5=d12f56384b4ccde11cd756db2b14065c
-sha256=48ae508d72e453e2a1f5748870362259786b475548c545feaec1aea71d2f8fdb
-
-[http://www.openzaurus.org/mirror/knights.tar.gz]
-md5=fea3047d5501a1abea868bb661cbc0c8
-sha256=1f6d50b3602f01b852810ab1e62f3328edee5130fe3ba21fd868f376c89e66fd
-
-[http://devel-home.kde.org/~hausmann/snapshots/Attic/konqueror-embedded-snapshot-20030705.tar.gz]
-md5=30dc3e109124e8532c7c0ed6ad3ec6fb
-sha256=305a7178d3351ea5e1faad157c2f056b633fbbabc006e19165a55314e9352d7b
-
-[http://downloads.sourceforge.net/kdepimpi/kphone_pi_1.0.0.tar.gz]
-md5=90d1517db39d4e3f7934af566ea18fca
-sha256=a1b86dc2ef641bc644ff5a206b5e2d3a61dacf58c2c489e0669ba1d71d0534a0
-
-[http://heanet.dl.sourceforge.net/kdepimpi/kphone_pi_1.0.0.tar.gz]
-md5=90d1517db39d4e3f7934af566ea18fca
-sha256=a1b86dc2ef641bc644ff5a206b5e2d3a61dacf58c2c489e0669ba1d71d0534a0
-
-[http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.3-signed.tar]
-md5=2dc1307686eb1c2bf1ab08ea805dad46
-sha256=7a1bd7d4bd326828c8ee382ed2b69ccd6c58762601df897d6a32169d84583d2a
-
-[http://kstars.sourceforge.net/kstars-embedded-0.8.5.tar.gz]
-md5=ae02647516a4a5c47674316ef8343c11
-sha256=650f0b3ae4d30282b191e456ebf2679a4ec549da83f69667bd4396bad9abf9f5
-
-[http://kernel.org//pub/linux/utils/kernel/ksymoops/v2.4/ksymoops-2.4.9.tar.bz2]
-md5=231b6ea3afbc318c129ec770d10f8ec8
-sha256=125fcecc9f650dc2ec82db3194d17c0af40b48900204fedb0c695b5fcc5a99e3
-
-[http://kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/ksymoops-2.4.9.tar.bz2]
-md5=231b6ea3afbc318c129ec770d10f8ec8
-sha256=125fcecc9f650dc2ec82db3194d17c0af40b48900204fedb0c695b5fcc5a99e3
-
-[http://downloads.sourceforge.net/kdepimpi/ktimetracker_pi097.tar.gz]
-md5=c2701d7f8e094b41aa5a7c771b981393
-sha256=204156fadfdefb31f6cbd3d0d7e5cb032af40c037a0682c75651c3191de09150
-
-[http://heanet.dl.sourceforge.net/kdepimpi/ktimetracker_pi097.tar.gz]
-md5=c2701d7f8e094b41aa5a7c771b981393
-sha256=204156fadfdefb31f6cbd3d0d7e5cb032af40c037a0682c75651c3191de09150
-
-[http://downloads.sourceforge.net/kxml/kxml2-src-2.3.0.zip]
-md5=cb830720148bad0c555a02b27e1e7f9a
-sha256=f2441575236be69a460c6a54344b6ba8b8ba03fd0bab242b989f4f0976944cd8
-
-[http://heanet.dl.sourceforge.net/kxml/kxml2-src-2.3.0.zip]
-md5=cb830720148bad0c555a02b27e1e7f9a
-sha256=f2441575236be69a460c6a54344b6ba8b8ba03fd0bab242b989f4f0976944cd8
-
-[http://sump.org/projects/analyzer/downloads/la-src-0.8.tar.bz2]
-md5=dc8f16011da37ee3114616b96dc80798
-sha256=c735f3c0b32f379020a52965e5af45fcd00330b94f94d51603ab5a05b06675fb
-
-[http://handhelds.org/~zecke/oe_packages/labyrinth-0.7-zecke1.tar.gz]
-md5=027e5fd07dd6bd6c1f25161a266a0646
-sha256=547088fbbc3c3f4e60544dca8500c5f7097911427fd7dd04ad082db03f117001
-
-[http://downloads.sourceforge.net/lame/lame-3.96.1.tar.gz]
-md5=e1206c46a5e276feca11a7149e2fc6ac
-sha256=f4f093e371c999a2a079607b74582a8ef5c1c3c9b322e3e997a47c1ea2afe2a5
-
-[http://heanet.dl.sourceforge.net/lame/lame-3.96.1.tar.gz]
-md5=e1206c46a5e276feca11a7149e2fc6ac
-sha256=f4f093e371c999a2a079607b74582a8ef5c1c3c9b322e3e997a47c1ea2afe2a5
-
-[http://downloads.sourceforge.net/lame/lame-398-2.tar.gz]
-md5=719dae0ee675d0c16e0e89952930ed35
-sha256=a17a28569d8ed1e514915c1f12bdf4eedac506e5fbdf9a429ba97d5d42c9af32
-
-[http://lasertraq.googlecode.com/files/lasertraq-0.8-r213.tar.bz2]
-md5=c24cc9ba196b32134186843324bfe784
-sha256=7a2162c783f98a2de9658a217cd0409a7bd16d40040c34a6077df376a2135aea
-
-[http://eaglet.rain.com/rick/linux/schedstat/v10/latency.c]
-md5=56a9be3b788ad32a169069f332ebf0f3
-sha256=cc1fc10fe3e8473efd3af315a47500d646665554fe6fe5993028adb1f189334b
-
-[http://www.latencytop.org/download/latencytop-0.4.tar.gz]
-md5=ad8d107699608b024d697c941371bb37
-sha256=4c5bb829390f266f6ba4430b725a4210d7e71d96168731dfd790c0f945c317b8
-
-[http://downloads.sourceforge.net/lgames/lbreakout2-2.6beta.tar.gz]
-md5=41d6e0be4654b1716b1b3f5b53abf014
-sha256=3e406c76874827c236c7070c1349f8b4ee058aa664fc3066435c938bf6d5f0e8
-
-[http://heanet.dl.sourceforge.net/lgames/lbreakout2-2.6beta.tar.gz]
-md5=41d6e0be4654b1716b1b3f5b53abf014
-sha256=3e406c76874827c236c7070c1349f8b4ee058aa664fc3066435c938bf6d5f0e8
-
-[http://xorg.freedesktop.org/releases/individual/app/lbxproxy-1.0.1.tar.bz2]
-md5=9d5045a5c76b1fe360221b967a5aa0e9
-sha256=e2e757986724a5d2ee299aa7616a3d9985af45e363021b486b7abbcac4ca01c2
-
-[http://xorg.freedesktop.org/releases/individual/app/lbxproxy-1.0.2.tar.bz2]
-md5=0aa9284354552ce6700485a36d2803c3
-sha256=7ec5dee387bb6f3125392c0faca1c9712898b31e1410de9767e0d933b21cb679
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/lbxproxy-X11R7.0-1.0.1.tar.bz2]
-md5=d9c05283660eae742a77dcbc0091841a
-sha256=35360dd6160d94a981d923486a026fe91dfc3e0db2f5923aeb782b7e9c5e606f
-
-[http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.10.1-RC2.tar.gz]
-md5=a64c40feb74862cb4a91281bc7737f72
-sha256=9e69ded08dc9a8c75f36a3c020e7aa96b90313d91b2f58add6d4dfff1f8861b0
-
-[http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.11.0-SVN.tar.bz2]
-md5=afbbaf37b2d27dfd41f7ba6cef0cc992
-sha256=96386bc45ab7b2a6ab4ac0aaef8634a1e524399d6252e2081581af073ef3b2f8
-
-[http://downloads.sourceforge.net/lcdproc/lcdproc-0.4.5.tar.gz]
-md5=c1e74364963054b26b2a77a37bd2bf36
-sha256=a2163b474d75dc87891c6a81ce9e89f0c9ceab7cbef14b50f066bf3508eec977
-
-[http://heanet.dl.sourceforge.net/lcdproc/lcdproc-0.4.5.tar.gz]
-md5=c1e74364963054b26b2a77a37bd2bf36
-sha256=a2163b474d75dc87891c6a81ce9e89f0c9ceab7cbef14b50f066bf3508eec977
-
-[http://downloads.sourceforge.net/lcdproc/lcdproc-0.5.0.tar.gz]
-md5=4b67e421c19063fa322611a849ab5b80
-sha256=a7567f3f68517008e68d15b33630f36ba539540fbb361a2f9c440ce2ceb8393b
-
-[http://heanet.dl.sourceforge.net/lcdproc/lcdproc-0.5.0.tar.gz]
-md5=4b67e421c19063fa322611a849ab5b80
-sha256=a7567f3f68517008e68d15b33630f36ba539540fbb361a2f9c440ce2ceb8393b
-
-[http://downloads.sourceforge.net/lcdproc/lcdproc-0.5.1.tar.gz]
-md5=ad13d6cce7a7e068d85a66d30285af95
-sha256=f459280eb4eeb70be584895364c97ffab22b888235b2351a31e1c87ca9710727
-
-[http://heanet.dl.sourceforge.net/lcdproc/lcdproc-0.5.1.tar.gz]
-md5=ad13d6cce7a7e068d85a66d30285af95
-sha256=f459280eb4eeb70be584895364c97ffab22b888235b2351a31e1c87ca9710727
-
-[http://downloads.sourceforge.net/lcms/lcms-1.13.tar.gz]
-md5=902ea29818ab4f3c86225ec7d6b5d5b6
-sha256=28e1648256cd18ccb3d0df149d3c33f94e7e2e0384b344f2792aa62309f825d6
-
-[http://heanet.dl.sourceforge.net/lcms/lcms-1.13.tar.gz]
-md5=902ea29818ab4f3c86225ec7d6b5d5b6
-sha256=28e1648256cd18ccb3d0df149d3c33f94e7e2e0384b344f2792aa62309f825d6
-
-[http://www.littlecms.com/lcms-1.15.tar.gz]
-md5=76c921973fdea4f880944a024197f924
-sha256=930ef7de15eb028c1cdbfe3f1170aaa1d5b0b4d45a8fa496d944216e155122c2
-
-[http://downloads.sourceforge.net/lcms/lcms-1.17.tar.gz]
-md5=07bdbb4cfb05d21caa58fe3d1c84ddc1
-sha256=5ef3b4dab30956772009e29dba33fe1256cf9da161106a1e70b0966c96d14583
-
-[http://heanet.dl.sourceforge.net/lcms/lcms-1.17.tar.gz]
-md5=07bdbb4cfb05d21caa58fe3d1c84ddc1
-sha256=5ef3b4dab30956772009e29dba33fe1256cf9da161106a1e70b0966c96d14583
-
-[http://savannah.nongnu.org/download/leafpad/leafpad-0.8.15.tar.gz]
-md5=f3570c052f4987f4122cd48d2c629f64
-sha256=f294a7894efc8eee0c0c4238f41cc97492c61dd3dcceae4fcf555e31e841d86a
-
-[http://savannah.nongnu.org/download/leafpad/leafpad-0.8.9.tar.gz]
-md5=66a502c2c9e87b8f7ef0370ecb83cbbb
-sha256=5e8014be4fbebd0ced491d16eef8ef38a03382c25ef0ce41f0ee22a9ada30a6f
-
-[ftp://ftp.gnu.org/gnu/less/less-381.tar.gz]
-md5=40c2dd4ac137b61b6a55a6478817daf4
-sha256=bb892b14965e1cf7c431cd8c6b2c744a57d6d6fc940ffd78ab4efa2b0bbc51d3
-
-[ftp://ftp.gnu.org/gnu/less/less-382.tar.gz]
-md5=103fe4aef6297b93f0f73f38cc3b1bd7
-sha256=d33cc51f220647d015fd526b3782cde03c5d8b18c5233e6388a0047a70446fe7
-
-[http://www.greenwoodsoftware.com/less/less-406.tar.gz]
-md5=c6062663b5be92dfcdfd6300ba0811e4
-sha256=5cb93fa75cce38f472ac91503bdd56c601037551cda3f999447773dfa1279130
-
-[ftp://ftp.gnu.org/gnu/less/less-418.tar.gz]
-md5=b5864d76c54ddf4627fd57ab333c88b4
-sha256=f532fcd61b012379d3258196a8588fd9d51ecdfb5c795485ab2f78d439b103b4
-
-[http://repository.maemo.org/pool/maemo/ossw/source/l/lessertunjo/lessertunjo_0.0.10-3.tar.gz]
-md5=b6d7ca9e9740286f0ce918da9fb8438b
-sha256=0ee6a3caee4812827b8e167d4a07dbf859cb08a00a20f09568c3baae379d6ce8
-
-[http://downloads.sourceforge.net/lesstif/lesstif-0.95.0.tar.bz2]
-md5=ab895165c149d7f95843c7584b1c7ad4
-sha256=e5ef90ff30897448a7c090c2e31ceb302ed064a60411436e8995580848ed1a63
-
-[http://heanet.dl.sourceforge.net/lesstif/lesstif-0.95.0.tar.bz2]
-md5=ab895165c149d7f95843c7584b1c7ad4
-sha256=e5ef90ff30897448a7c090c2e31ceb302ed064a60411436e8995580848ed1a63
-
-[ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/lftp-3.5.1.tar.bz2]
-md5=c6d48782cdad4759000bf7cd24555723
-sha256=463f0b46ce3a0fc09ef9ad7a5429959034d50a1eadbed5dfeae36c25dca31130
-
-[http://ftp.yars.free.net/pub/source/lftp/old/lftp-3.5.1.tar.bz2]
-md5=c6d48782cdad4759000bf7cd24555723
-sha256=463f0b46ce3a0fc09ef9ad7a5429959034d50a1eadbed5dfeae36c25dca31130
-
-[http://xorg.freedesktop.org/releases/individual/lib/libAppleWM-1.0.0.tar.bz2]
-md5=48a403c45be2206ee900729ced3a0e62
-sha256=ecd2ff407a418eb4ac673f48b4d0a9c5b6860a13cef7211a32fe8f3d3db0407e
-
-[http://xorg.freedesktop.org/releases/individual/lib/libAppleWM-1.2.0.tar.bz2]
-md5=d58b5a03ba36c661ff48f38048c2edd3
-sha256=82f9b9dff544fc3d8bcda5878930cdc3817d478f34b3790c599fe185c138f160
-
-[http://xorg.freedesktop.org/releases/individual/lib/libAppleWM-1.4.0.tar.bz2]
-md5=75e27245bc15aed845fe0505f4f21ca6
-sha256=c8e92616ad465ce2ae86360ff216a9711bdd1156dbb06af6d86009c6773e1c82
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libAppleWM-X11R7.0-1.0.0.tar.bz2]
-md5=8af30932ebc278835375fca34a2790f5
-sha256=66d5b9d53816cc158a0f241772cbde60a52aa0a722e28d3ef76a5eb6c82840d5
-
-[http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.0.tar.bz2]
-md5=dfd5de47e232db0891410bec8ee6707b
-sha256=2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde
-
-[http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.1.tar.bz2]
-md5=81521249353fa33be7a4bb0062c2fbb9
-sha256=9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5
-
-[http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.2.tar.bz2]
-md5=ecf2d6a27da053500283e803efa2a808
-sha256=af2a5fe5eaa2b026e10bddb4e3f39976dc13deb5dbdc714abe1f016435ce3049
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libFS-X11R7.0-1.0.0.tar.bz2]
-md5=12d2d89e7eb6ab0eb5823c3296f4e7a5
-sha256=15bedd7f892fbb130e2b9c17d4f927c4904362a7be5b73d07d56d8aa7025f6f1
-
-[http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.3.tar.bz2]
-md5=071f96648ac25c8e87a3de11a7de2d8a
-sha256=ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d
-
-[http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.4.tar.bz2]
-md5=4ab4e67e0b8845aa201e984153087f4a
-sha256=13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04
-
-[http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.6.tar.bz2]
-md5=2d39bc924af24325dae589e9a849180c
-sha256=a8346859505d2aa27ecc4531f1c86d72801936d96c31c5beaeff4587441b568b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libICE-X11R7.0-1.0.0.tar.bz2]
-md5=c778084b135311726da8dc74a16b3555
-sha256=e37cffdb45bbb193e5cb75e74e7e0410554f4b3c3a1fe436debea907778e6aac
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libICE-X11R7.1-1.0.1.tar.bz2]
-md5=b372dcd527fd5b5058e77ee1b586afdf
-sha256=feb4abd0ea31b5a0b8344bfcb0e5987eefad723fa45f1d8e1e95c62acebab524
-
-[http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.10.tar.bz2]
-md5=9e10a77ff225587e59c0a28c66b4faa7
-sha256=91a5b69435f10002b222be022c832d9860a93e0bc181e3f94abc150486ab031a
-
-[http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.13.tar.bz2]
-md5=b43b289a859eb38a710f70622c46e571
-sha256=bccc7e10dae979518ff012f8464e47ec4b3558a5456a94c8679653aa0b262b71
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2]
-md5=a75d2dbf3a3c66b567047c94245f8b82
-sha256=1c9529f7245778a4f1422d6257d446b7c90a19c3b603b1a25db1669552c464b3
-
-[http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2]
-md5=a75d2dbf3a3c66b567047c94245f8b82
-sha256=1c9529f7245778a4f1422d6257d446b7c90a19c3b603b1a25db1669552c464b3
-
-[http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.3.tar.bz2]
-md5=39640ea026d81e721b0c78a8aaeb7d59
-sha256=808cd8e7b499a3519f8492a5bda75c55e770f976c98b2c2c21edcca4b9c30168
-
-[http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.6.tar.bz2]
-md5=2fde1aed5ea77d532f9e11442f761b81
-sha256=9b9e93c0d7cf62c3c56652445843b7df0cd839376a6a7b89c49dea9f72a13aa8
-
-[http://xorg.freedesktop.org/releases/individual/lib/libSM-1.0.2.tar.bz2]
-md5=a254771550c01db372e88d1a1dc2e13a
-sha256=e290614797bd626c1b92bac8f83e8954b99bd66e6ecdaa1e935e176df099eba8
-
-[http://xorg.freedesktop.org/releases/individual/lib/libSM-1.0.3.tar.bz2]
-md5=184cbf502b3cd5d7ba5f9d1290a99606
-sha256=57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04
-
-[http://xorg.freedesktop.org/releases/individual/lib/libSM-1.1.0.tar.bz2]
-md5=05a04c2b6382fb0054f6c70494e22733
-sha256=7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82
-
-[http://xorg.freedesktop.org/releases/individual/lib/libSM-1.1.1.tar.bz2]
-md5=6889a455496aaaa65b1fa05fc518d179
-sha256=f50d184d8c6a031b3ff4f0d52efcfd4ffa811b0362b166a9ff9ba4c2e9aa7ce0
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libSM-X11R7.0-1.0.0.tar.bz2]
-md5=8a4eec299e8f14e26200718af7b2dcfc
-sha256=df219b7d5c2fac93bc7c8eb411ed365492eaeb3727ecbb04999890fd694d4e80
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libSM-X11R7.1-1.0.1.tar.bz2]
-md5=dc10726abe267727fa5e3c552594e3c8
-sha256=efde1a974723b9a0bf3c731903766bce9dd1ead3d0550eb2a4f2396d7b402e17
-
-[http://xorg.freedesktop.org/releases/individual/lib/libWindowsWM-1.0.0.tar.bz2]
-md5=337b379fd00a67345b083100c4e6ba95
-sha256=6ad87266173d21ba7e0e4506db0c094769fd58c3f0b741b37f30c297deec166a
-
-[http://xorg.freedesktop.org/releases/individual/lib/libWindowsWM-1.0.1.tar.bz2]
-md5=274b2b5620a524fd7bb739edb97317f5
-sha256=25f07cf847cbe91d36c20f348b4b9494c4504fe02966e8cdf65cf56316a70edc
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libWindowsWM-X11R7.0-1.0.0.tar.bz2]
-md5=d94f0389cd655b50e2987d5b988b82a5
-sha256=76ccdb6adfc51a4c40e90fe66f599ee4de4787fca44860b851dd4bbf97f7889d
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.0.1.tar.bz2]
-md5=58f0537f21183e27149cf906a1b6bef9
-sha256=f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.0.3.tar.bz2]
-md5=60b787a812c92d33f71860e4e19cb59d
-sha256=fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.1.1.tar.bz2]
-md5=848b80f77b20ae1fa5c882bbfa531ebc
-sha256=5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.1.2.tar.bz2]
-md5=710bf38a9477a5a1b235bc94f1d0593c
-sha256=b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.1.3.tar.bz2]
-md5=4d43d3e472c552d2f191ecdd4e75112c
-sha256=4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.1.4.tar.bz2]
-md5=1469a5a8aa8d288dce6f4c45d2f68dc3
-sha256=bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.1.5.tar.bz2]
-md5=d1512d65dadd4f48c779d4749e7753a8
-sha256=da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.2.1.tar.bz2]
-md5=2f2beb98e71f397e1209beaca4e97cb1
-sha256=d172e5a401a2607f4ff145db4e8e09c193a1980bbb2c5c7f824e61ee3fdfdff3
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.2.tar.bz2]
-md5=c6265b59ea2b594fd68e33f9125b4d20
-sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.2.tar.bz2]
-md5=001d780829f936e34851ef7cd37b4dfd
-sha256=4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.3.tar.bz2]
-md5=5d74971360f194ce33d2bd2e4d9b066c
-sha256=8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac
-
-[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.tar.bz2]
-md5=0545089013213e90aac19b8f8045d32e
-sha256=34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libX11-X11R7.0-1.0.0.tar.bz2]
-md5=dcf59f148c978816ebbe3fbc5c9ef0e1
-sha256=89a3c2d8324ff9d0d91682503407310f7df30a74915cd253be3a75247b044248
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libX11-X11R7.1-1.0.1.tar.bz2]
-md5=f592bec1848e55c377b45e629eb09df4
-sha256=b78ebc6a15b40e84d06b709c927d3659306bb333ade3ad07d5d739931489ac7c
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.1.2.tar.bz2]
-md5=ac2d697dd02f51e5c15f7104f4be5328
-sha256=6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.1.3.tar.bz2]
-md5=93f84b6797f2f29cae1ce23b0355d00d
-sha256=4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.0.tar.bz2]
-md5=33e54f64b55f22d8bbe822a5b62568cb
-sha256=5b067bec0f2eb6405226bde5f20ca107eb0e5c11f5e5e24b455930c450487f85
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXScrnSaver-X11R7.0-1.0.1.tar.bz2]
-md5=b9deb6ac3194aeab15d8f6220481af6d
-sha256=66287d18ebe2b239b7b0adc02f4d40b6ea918761e5fde6b8db9c180742618c94
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXScrnSaver-X11R7.1-1.1.0.tar.bz2]
-md5=e9a4ed1a499595003b75a34a5633e93e
-sha256=ba067e1e054ce21032cb3cc767c39545496d155681a965fd856783b5793f6608
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXTrap-1.0.0.tar.bz2]
-md5=1e2d966b5b2b89910e418bb0f78e10de
-sha256=cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXTrap-X11R7.0-1.0.0.tar.bz2]
-md5=8f2f1cc3b35f005e9030e162d89e2bdd
-sha256=c7e50c85803e326b3207bcae2bfcb05353f3de18238fb9082bc7ae8f6e329003
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.3.tar.bz2]
-md5=75a9f2b85cd1617b5ca98c9095323853
-sha256=d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.4.tar.bz2]
-md5=0f2b88d857e0a3f5898e4759c541af46
-sha256=10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.5.tar.bz2]
-md5=993b3185c629e4b89401fca072dcb663
-sha256=a503b3e88d29fa9c45cce1b2d1af54106c2ce21491348c394e251a071d8108ee
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXau-X11R7.0-1.0.0.tar.bz2]
-md5=51ceac78ae0eaf40ffb77b3cccc028cc
-sha256=9500d088e1b3cbf107a93703b81d4636f778492c1c1d14dea6aca7b8354e39e8
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXau-X11R7.1-1.0.1.tar.bz2]
-md5=ae91d7080784df34b2fab7bff75cfb41
-sha256=fc4be4e8649324531c1c75b143a50e64e560d975aa970cc8f3e473258413ff80
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.3.tar.bz2]
-md5=ee215536ea78798268ab3a444d10135a
-sha256=45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.4.tar.bz2]
-md5=73671d8f1cf36fdd81395328cc3539c9
-sha256=11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.5.tar.bz2]
-md5=64e7782db4653cb57c7f7e660b2431c3
-sha256=2503f3e3348ee3cf38368161dfab8112d3aea2a26deea34f3136898c13cfb88d
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.6.tar.bz2]
-md5=066218dceb82eb8da0e11d259ed3ceda
-sha256=20c1ecad21474187b340cd6056b1083da8cfa5d919d208feac360644108db587
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.7.tar.bz2]
-md5=815e74de989ccda684e2baf8d12cf519
-sha256=740aaee9b09586b1c80f80890381c5ee70ea11efa4b6159f707c0f3684c6f328
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXaw-X11R7.0-1.0.1.tar.bz2]
-md5=ded3c7ed6d6ca2c5e257f60079a1a824
-sha256=076ed9c4b07379b1a957753a3c8fd2a1d93ba460587d450787630f81a85f9741
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXaw-X11R7.1-1.0.2.tar.bz2]
-md5=99f2e6a3ff8e5535710150aa30f5b3c3
-sha256=d555a43a3a96ee2ab797baa357fab3e04856e264d693c7b76fd269d892d0e51e
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.3.1.tar.bz2]
-md5=a80650d660486ea7bb2e5fd84a83799a
-sha256=d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.0.tar.bz2]
-md5=7e95395dea89be21bae929b9b7f16641
-sha256=7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.1.tar.bz2]
-md5=0f1367f57fdf5df17a8dd71d0fa68248
-sha256=3715a25565222d8eb0468805db1113b514128ee5e9bc6908400f189f680d7a13
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXcomposite-X11R7.0-0.2.2.2.tar.bz2]
-md5=5773fe74d0f44b7264bd37c874efc7b1
-sha256=d3d0e8883171a38802400836ba2bf7a40f3b22f669db80e01509c400137c5228
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXcomposite-X11R7.1-0.3.tar.bz2]
-md5=f5229a7a38bc3d90380b7c18de10db5e
-sha256=142cd1c1958e2cb92ff2975a092a2c519dd5f4c433c9d1d8b6cc9ca967aad283
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.10.tar.bz2]
-md5=7dcdad1c10daea872cb3355af414b2ca
-sha256=b9446df62203f2c3204b6bcc0057dc909d0dc792f0dd97bc491581b08be36cbd
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.8.tar.bz2]
-md5=ec2acd10a7736a85dd1e1ed9ea5bec96
-sha256=8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.9.tar.bz2]
-md5=99b7554037a92b260891091e81815a0a
-sha256=1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXcursor-X11R7.0-1.1.5.2.tar.bz2]
-md5=048e15b725d8e081ac520e021af9a62c
-sha256=52bbd6e05de84e94ec11f2734029183411c91e2297779098fb17e162aca5e191
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXcursor-X11R7.1-1.1.6.tar.bz2]
-md5=a69f8735a0c1fc1df260ca4feaf4be87
-sha256=4da4a8c0268cf999ae89e870e16d66265b7553eaa1b1adf3c16cfdeba1fb2207
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.0.4.tar.bz2]
-md5=4d0eece7a8372a7754db1de08c2be324
-sha256=5df90f0efa77e1d6f9e1768a2b0adfc896d09c7a3d8680ed0980511b3625c636
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.1.tar.bz2]
-md5=ac0ce6b0063a9858c8f24ddb4c60487d
-sha256=0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.2.tar.bz2]
-md5=b42780bce703ec202a33e5693991c09d
-sha256=a56a10acb34827c4d1a0ee282a338cbb04baa03d7fc7bc69e5690915c8fc7c0a
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXdamage-X11R7.0-1.0.2.2.tar.bz2]
-md5=e98c6cc1075db5f6e7e6c8aef303c562
-sha256=bba5acb547fee5c33d582cbd55ad8d03965b582808912a20a457c8b78ca04184
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXdamage-X11R7.1-1.0.3.tar.bz2]
-md5=e9cd3688623c9c5a86d7ddb62fd88d76
-sha256=96d4b70a3853894ceb4c71c3b44a0816014894bad63f494ddfcd30a89caa76c8
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.0.2.tar.bz2]
-md5=10facf2bc7cbd5e5c1a698b8a210a582
-sha256=f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.0.3.tar.bz2]
-md5=d60941d471800f41a3f19b24bea855a7
-sha256=d8033a2fae20fed6de4f16b73ad69ca1c511e7da31c88e9bc6e75976187378cb
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXdmcp-X11R7.0-1.0.0.tar.bz2]
-md5=509390dc46af61e3a6d07656fc5ad0ec
-sha256=a9f12dc2d3dff9a36904fd1d14fed3cc1b84dfa5661349e88ad164a4107cc878
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXdmcp-X11R7.1-1.0.1.tar.bz2]
-md5=d74e6e52d598544f92e2c185e114e656
-sha256=2ac23a961df72cd91ff0dd8d6f3f7f9bb92b13afceaca9e70c36fecac8dd0f84
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXevie-1.0.2.tar.bz2]
-md5=88e9bf535364e7c821ef4014fb1ca2dd
-sha256=ff70b81ad145932db2d206735cefcb698dadad241001df7ba6b97e8081d174da
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXevie-X11R7.0-1.0.0.tar.bz2]
-md5=70b1787315d8d5f961edac05fef95fd6
-sha256=f12576dd82c1467be311bcd18d30f0c8bad6e515302857cec0e8ba011dac9752
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXevie-X11R7.1-1.0.1.tar.bz2]
-md5=0f0eb4c5441a26341d3b774bc9db35ba
-sha256=7d5e274dc78dce6f140c63619aecc3cd7e09753540cf3358235e66f8275d098f
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXext-1.0.2.tar.bz2]
-md5=cce89c5b941a493512b534f4847c6111
-sha256=368e4cf5117febd998e6fc40d096b3af19a571adccc5ed49b9d16e482b3a8f8e
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXext-1.0.3.tar.bz2]
-md5=1bf6fa1c26f9957d7cc0bd90b038dfa6
-sha256=2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXext-1.0.4.tar.bz2]
-md5=a91f1f722ac80c597cf0b75dcb8b48c0
-sha256=2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXext-1.0.5.tar.bz2]
-md5=aa11d859cc8e9a0bad3bb55e1666547b
-sha256=1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXext-1.1.1.tar.bz2]
-md5=c417c0e8df39a067f90a2a2e7133637d
-sha256=110ce3bc7fb3a86659556994d0801c74bedcbd8ba8d1f90ee33d4c47a91e9bb3
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXext-X11R7.0-1.0.0.tar.bz2]
-md5=9e47f574ac747446ac58ff9f6f402ceb
-sha256=5ccefe638c3dfc12fd8c2f2de38ec7e0e0b54bb271fa75f687e474a58edbad28
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXext-X11R7.1-1.0.1.tar.bz2]
-md5=273845ee8a2d5e272bb3fa08810512f3
-sha256=322db66638b6db7144ca8028ea968e7aa92d0381e08b99f00ec12193ed624bdc
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.3.tar.bz2]
-md5=1990d19725a3c7f32290037f02d3737f
-sha256=547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.4.tar.bz2]
-md5=7f2c40852eb337b237ad944ca5c30d49
-sha256=ba31d7e5c5c1907c30cba50bfd669aa7fe860555287c29f6e786612e4be33b48
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXfixes-X11R7.0-3.0.1.2.tar.bz2]
-md5=5a027e5959dae32b69dce42118938544
-sha256=bdcb52a46967aca4367e276f88de35354daa5a62b4d0776e6a89dc43c2d336e6
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXfixes-X11R7.1-4.0.1.tar.bz2]
-md5=d6e91a6d366a72c090cae83da88af184
-sha256=2f0aebe1e3fed4038e3fa08a60d5736fe9fb42895ad040ef351171ebe198dd2e
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.2.0.tar.bz2]
-md5=038315ade283d8da92422baebac553a2
-sha256=130d6991971a10ba8b54f52848bcb00cbb7b4229eb839f88500972e11fecf8f0
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.2.7.tar.bz2]
-md5=2f2085310f75900044d9dcd469637d26
-sha256=2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.2.8.tar.bz2]
-md5=83b8e21f6ee22512a8f72ba51e2d74f6
-sha256=374a2ca12f62a4d9f09a17a34765a5289cefa9db7f9f0913e1c3731b4088aad8
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.3.0.tar.bz2]
-md5=d1d3fa170d74b066f1f23ca8574e7c90
-sha256=07567b9880f28d1a404389c024a185419bfe81136aef3d9eda52407f34c3d3dd
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.3.1.tar.bz2]
-md5=b2f396b62633819bbdd9748383876e21
-sha256=dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.3.2.tar.bz2]
-md5=64f510ebf9679f3a97a3d633cbee4f50
-sha256=c167cfd529b7c67f496ee0bed3c0b43e0107de0f689d387c1c0e23ef7cf3d2f2
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.3.3.tar.bz2]
-md5=4f174b9613f87cf00d731da428a1b194
-sha256=6171e6bca4bd6333611bd9c63cccc8e8e412d876c72097f0dddc490a9df51d5a
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.0.tar.bz2]
-md5=3a8e06b25912ef339d70a8ba003da9b5
-sha256=eafff0157f2c7172214449d4b6b0c72328cad7026ecace226189b511791c5f75
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.1.tar.bz2]
-md5=4f2bed2a2be82e90a51a24bb3a22cdf0
-sha256=112bfc30820b98deec4c9914536c5aa2f8b5162bd2b0bdb342343168e06f7679
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXfont-X11R7.0-1.0.0.tar.bz2]
-md5=955c41694772c9fd214e3e206f5d2178
-sha256=47d4de6986f6ca85bc48ecd76188d7f3f009e1aeb640008cab12ac5ca5896622
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXfont-X11R7.1-1.1.0.tar.bz2]
-md5=d25a2c90b882c5f2ff7f13a300aa18f4
-sha256=cdd0f39c99d02b38e804c7dc2c7fdbdd956b8a0b68d2ebcaf7bf434533f58f1e
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfontcache-1.0.4.tar.bz2]
-md5=1adca018aa7bf2d215f20a69c10828ad
-sha256=ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXfontcache-1.0.5.tar.bz2]
-md5=bbd37768c87f63cf2eb845b2c0f56515
-sha256=0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXfontcache-X11R7.0-1.0.1.tar.bz2]
-md5=1e3c7718ffaf4f617d3f67ada5a7601e
-sha256=3ae73ba79b28499082ea81527caf032004d5a884bf69ec8b8508dedd913556b8
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXfontcache-X11R7.1-1.0.2.tar.bz2]
-md5=87299d9c6d74b3b68e60bb4b693f5d62
-sha256=9a1d1c4c494203fcc64e697c7d341ccd12ecfcf2983b09746f8a7113443fe3a4
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXft-2.1.12.tar.bz2]
-md5=1309301e2d979bd475dc58325cb8c056
-sha256=68b46f85caaf0b30c876bd983abe144c25755bee7532e8738ab7ebe29a428986
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXft-2.1.13.tar.bz2]
-md5=bc8881851f3bd8dcc625fac37350a1c6
-sha256=ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXft-2.1.14.tar.bz2]
-md5=254e62a233491e0e1251636536163e20
-sha256=700e9d594b81cad3dfd5fac4a5cfd0c4cf7780c812507ef04eb40139ebf5175e
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXft-X11R7.0-2.1.8.2.tar.bz2]
-md5=c42292b35325a9eeb24eb0f8d3a6ec52
-sha256=0473d1db21968f05b39ff9832b18545ba6b93be76d2e61b04a14208c515680f3
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.0.2.tar.bz2]
-md5=4a5207a29a6b220e5462129854689844
-sha256=7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.1.0.tar.bz2]
-md5=c25abbe604029855eb11a3a75fb1f386
-sha256=0f90d7e27d8a7d6bccf9350b6283ffe122e5347fa51d4ea9055653b297339989
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.1.2.tar.bz2]
-md5=9c4dd85f3e2a75bfb60bd288502bc288
-sha256=4deda13613f03e4524d3cf0ac14b9e20be5044d415cb8478713ecbe47f4de862
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.1.3.tar.bz2]
-md5=7c510abb0cad8dc20493fb27ff7859d8
-sha256=c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.2.0.tar.bz2]
-md5=4b88e07d7dd77ca1e786f09066b58c02
-sha256=7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.2.1.tar.bz2]
-md5=cfb36307e8e7ffafe40848dba24e0b11
-sha256=a0cef8deaccedb877137782a7e77441c8231b2da848bd145788a12fe05034fc5
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.3.tar.bz2]
-md5=8df4ece9bd1efb02c28acb2b6f485e09
-sha256=362b8c0c60386841063bd7e01afa72e37eb87ada6e64e539d960f88c780a944b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXi-X11R7.0-1.0.0.tar.bz2]
-md5=99503799b4d52ec0cac8e203341bb7b3
-sha256=64e8ece13fc778b9dd86ef93c4b782de9a1176a005ed7d895552a73acb103d9b
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXi-X11R7.1-1.0.1.tar.bz2]
-md5=2e3782d25d5fa6c98cfcaf055556f5c7
-sha256=c29f0009f525ab002b788236fe5a2288ba6a360b460df61f007a119bbc9bd6cb
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.0.2.tar.bz2]
-md5=f6fb08eafd3c2909d515f1a07bfca8fd
-sha256=d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.0.3.tar.bz2]
-md5=cd9f7c46439ac40e0517a302d2434d2c
-sha256=07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.tar.bz2]
-md5=a2ac01fc0426cdbb713c5d59cf9955ed
-sha256=e0d39e74c2e131b44cc98dd4910165c9b8d937df93be58e6afb7c2a56772bf34
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXinerama-X11R7.0-1.0.1.tar.bz2]
-md5=1a1be870bb106193a4acc73c8c584dbc
-sha256=72b5a499ddce72f1e18963586f7fb67e8ef69f989be455ba2c5d7f4d9b5f467a
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.0.3.tar.bz2]
-md5=b926b95b811ece3e19cd590db85ee615
-sha256=b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.0.4.tar.bz2]
-md5=fb372a5f3ab42b5ba16d7af4d833a0cb
-sha256=f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.0.5.tar.bz2]
-md5=fc4d66be7a1a1eb474954728415e46d6
-sha256=0692b6b0ec1019cfaa8418020b1127bfb0975f5a579a0b1f9eb7fd8f2f7126d7
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXmu-X11R7.0-1.0.0.tar.bz2]
-md5=df62f44da82c6780f07dc475a68dd9fa
-sha256=537ba847b3a7665e7c84dfa3d6d1719db495e780f87a3e4583671c5aafbd0e29
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXmu-X11R7.1-1.0.1.tar.bz2]
-md5=d68cacb66ee72e43d0a6b1f8b2dc901a
-sha256=8e29c2936c5f251dd68f1ccaf48f08927436d4b520b6ab37bd608649e644b8e5
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXp-1.0.0.tar.bz2]
-md5=0f4ac39108c1ae8c443cdfac259b58fa
-sha256=7e64b1550ce85b05762e960459ac676a0406c786756b200ff29c57f84bce9cae
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXp-X11R7.0-1.0.0.tar.bz2]
-md5=63c3048e06da4f6a033c5ce25217b0c3
-sha256=7f58cb9039eff4f65a60d718797afaf2dfd0bd674e68d1fa83c72a35c54941ee
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.6.tar.bz2]
-md5=37b7d1826c6a02107269632a93b8791f
-sha256=2d5c5242b8417db6aa758e5be387de33385d9960ff21c801af7d6a4730b4fd0d
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.7.tar.bz2]
-md5=cd15ee542d9f515538b4462a6f79d977
-sha256=64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.8.tar.bz2]
-md5=38e58e72d476a74298a59052fde185a3
-sha256=02a77aaa32e6e335e1ee04aeb9ad1008045d98274d64ed33bc5fc6c3a3542c4c
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXpm-X11R7.0-3.5.4.2.tar.bz2]
-md5=f3b3b6e687f567bbff7688d60edc81ba
-sha256=58bb490a8c97e8b7e57525f105378a65dc5f7571765aea6a8f473d93e8713807
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXpm-X11R7.1-3.5.5.tar.bz2]
-md5=00d91c2bcc4d2941e08339f3989c2351
-sha256=10a51e48294376f7e5a8563c64185f657efa053a3f59bd858863f4402fd73ddc
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXprintAppUtil-1.0.1.tar.bz2]
-md5=d2de510570aa6714681109b2ba178365
-sha256=24606446003379dbf499ef57e9294ce622c0f7f8a8f10834db61dc59ef690aa5
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXprintAppUtil-X11R7.0-1.0.1.tar.bz2]
-md5=6d3f5d8d1f6c2c380bfc739128f41909
-sha256=8349266b3cc8cf743a02e810d67ad500fbd1bdfd5188470d19f4bf97663510f4
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXprintUtil-1.0.1.tar.bz2]
-md5=22584f1aab1deba253949b562d1f0f45
-sha256=72b6ae0420b9601f55be147e8d068f670b951ae73a81423ba25be5875d826e6c
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXprintUtil-X11R7.0-1.0.1.tar.bz2]
-md5=47f1863042a53a48b40c2fb0aa55a8f7
-sha256=bb9fab969dc0320a3f47aec440d06f6524cbb64f0ba413b3ae8ffca1a5a60f0e
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.1.2.tar.bz2]
-md5=962946952a01650bb43206043a3c0e12
-sha256=ba5adedc37da835a5c9e5a5d457dce13feead64fc364bc4719c41720ca0a3c50
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.2.1.tar.bz2]
-md5=5860360f5b038cc728f388f875ce525d
-sha256=2d2df642eb8e0527936cdf4ed1c096f69df53e9b95e2532c8ed0cabd06a45407
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.2.2.tar.bz2]
-md5=1b244b5d19f0ccab01d7083436cd3558
-sha256=206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.2.3.tar.bz2]
-md5=5cd67cc02a50c9644ba0a1846ea3b08e
-sha256=f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.3.0.tar.bz2]
-md5=68eb59c3b7524db6ffd78746ee893d1d
-sha256=5961ce0f77c5173a8208b3ed669ac01719f2bf4a10517ffa6c33a5e064802e78
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXrandr-X11R7.0-1.1.0.2.tar.bz2]
-md5=e10aed44c2e1e5d9e6848a62ff2c90c7
-sha256=6b6a3fcf44621bf163ba2db6dbcc518bff4e8cf74695d1b86595387a3ff3c6fb
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXrandr-X11R7.1-1.1.1.tar.bz2]
-md5=021e870b637f26be58b4b1acbdea19ca
-sha256=5cfaac877aca06e3be09380037a68c6d2c4a57641fa6994bc14f07c0105cca25
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.2.tar.bz2]
-md5=2f1b2c6e8dcbcb6d760e59f445abd92c
-sha256=0f749183ab1a0ece14d33c3299b3f70893122349c0bfa9d7bd0e66ce19d1802a
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.3.tar.bz2]
-md5=307132fce2e551ad2c641bddf8480f16
-sha256=9882ba2d74e9ca5cfd0c2231ac8eba14d8fc59d538c787fa639f8d77c996bbef
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.4.tar.bz2]
-md5=dc266e850c51368f964e0d67bf5fb5e6
-sha256=5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.5.tar.bz2]
-md5=276dd9e85daf0680616cd9f132b354c9
-sha256=bc0590438a4be2b674cbac6f4ad46e5a89acd02aa94817da0fa8eb3ef05ed5d5
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXrender-X11R7.0-0.9.0.2.tar.bz2]
-md5=3f0fa590dd84df07568631c91fbe68ab
-sha256=f240490ce348cedcf09c2c5d170c7d79002790d72ea5dc3d7d702005684ff713
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXrender-X11R7.1-0.9.1.tar.bz2]
-md5=54dbd492753409496066383a500a6e3e
-sha256=0ddcb6f9dcffd4c4c896012bf82da350ff6f1550fb53a99327f21e483c39c8a2
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXres-1.0.3.tar.bz2]
-md5=de66ffb657aba64c9d6dbdeabb757f3e
-sha256=a6d5ba7573f5ec0f091095f01b51d1e671dd0f14acb5b8559cdf366e398a0230
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXres-1.0.4.tar.bz2]
-md5=4daf91f93d924e693f6f6ed276791be2
-sha256=457f567a70ef8798cfb32f897ffa52c3f010923b07414b3a42277f56877572df
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXres-X11R7.0-1.0.0.tar.bz2]
-md5=cc5c4f130c9305e5bd973fbb7c56a254
-sha256=b8f68d40797e1baadb77053f7834428894696cb345591f732c8c8c7e1ff1f3b8
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXres-X11R7.1-1.0.1.tar.bz2]
-md5=60e5bc7d04f8995bd16febcd14c034ba
-sha256=7e293ecf534f1574dc81250ec40db8dc879aa651a83c20396c584de1a25f06e5
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.4.tar.bz2]
-md5=937735f342c046db239852fec0413f6c
-sha256=ec7088b2ffe8f56c177525283601fb048decaf6f175d9ee5db01e12810a4d345
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.5.tar.bz2]
-md5=f3bdd67785ace8cd0b23249e9d8c9975
-sha256=43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.7.tar.bz2]
-md5=96f3c93434a93186d178b60d4a262496
-sha256=706d5248b061c8455f74ce5269ecc5ef59c27d0f52d22b07138f781928dda9ec
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXt-X11R7.0-1.0.0.tar.bz2]
-md5=d9c1c161f086a4d6c7510a924ee35c94
-sha256=dad0c901d3a542866dae53df27994498f320fb1981be2820d2ded81f4bf840f5
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXt-X11R7.1-1.0.2.tar.bz2]
-md5=a617ba32277ecffbb79be6bac49792d1
-sha256=fdfa4fb41234fbda904e796da5f70fce5f8edebf2fd2518fe064677aea5f943b
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.0.2.tar.bz2]
-md5=032d5c1d3914fc0224837328c88aef96
-sha256=eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.0.3.tar.bz2]
-md5=090c1ad04e34982eada5cf3b1a0792fd
-sha256=b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.1.0.tar.bz2]
-md5=dd6f3e20b87310187121539f9605d977
-sha256=bd440f4779e06957211ba83782a5a1cfbf1d42b14fd3510a6dce440489a4eb26
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXtst-X11R7.0-1.0.1.tar.bz2]
-md5=3a3a3b88b4bc2a82f0b6de8ff526cc8c
-sha256=93d9c1fb831e2aaaab4627835e79ae0550837cbe18a0d6bc91edc2aa3ea67ad3
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.3.tar.bz2]
-md5=f1c4109fa804aeaf7188b66c5cdd9f57
-sha256=f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.4.tar.bz2]
-md5=723a0275227165383e967a1ca8899b52
-sha256=4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.5.tar.bz2]
-md5=1d97798b1d8bbf8d9085e1b223a0738f
-sha256=d549afdf22feefb97cca85dee12242af9f08c4d2435255dc7c30bd17d1d96010
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXv-X11R7.0-1.0.1.tar.bz2]
-md5=9f0075619fc8d8df460be8aaa9d9ab5d
-sha256=b3bcacd212b1aac947cdfe7e64175255f0302bc5a461e2c8925e3cf491532b10
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.4.tar.bz2]
-md5=b54600573daf9d1a29b952e8d35b389e
-sha256=1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.5.tar.bz2]
-md5=16c3a11add14979beb7510e44623cac6
-sha256=0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXvMC-X11R7.0-1.0.1.tar.bz2]
-md5=c3eb4f526f08862489355a99e3eda1bd
-sha256=fa18853a6cb877e59433fdc1455e5b7fde9bd47c617d97208c7e3e32ff84d774
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXvMC-X11R7.1-1.0.2.tar.bz2]
-md5=f5fe1d950925e5d70401570df3ca8ebb
-sha256=9fd90dd49e89c7e71c41816ad73129cb1d69f9f7e24f99e9f5d757109838b196
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.0.1.tar.bz2]
-md5=5b0e752c71a23e9d1290cad44a7c7c75
-sha256=8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.0.2.tar.bz2]
-md5=6f5f621804ee652b6cc6f2025c517c78
-sha256=59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.1.tar.bz2]
-md5=368837d3d7a4d3b4f70be48383e3544e
-sha256=8d37f8895ecff15cb821a3e77bd505598983a5c6eae546e77e2d3070a8de5616
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86dga-X11R7.0-1.0.0.tar.bz2]
-md5=d2154a588953d8db4ae6252ebc7db439
-sha256=8bc2f9b7efe25f9765db6963501bcb06efef292006e184d5fe3f8b8f2a9c5199
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXxf86dga-X11R7.1-1.0.1.tar.bz2]
-md5=8350ee065737f68072c4b59bc0c66df1
-sha256=ed3bd1cc72252aebe8268c7357692dcdb72f003c2c36ee7a74da312b750afdb7
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXxf86misc-1.0.1.tar.bz2]
-md5=7cee0df63903cef7f7a3fb68cdd99eef
-sha256=2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXxf86misc-1.0.2.tar.bz2]
-md5=51fed53e8de067d4b8666f75a0212400
-sha256=8e64b6b1bf34fcd112b1fd866d77e110b47794e825a996e4492c0ee408957cb3
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86misc-X11R7.0-1.0.0.tar.bz2]
-md5=338568c9ca48b801f314c89c97327397
-sha256=94ea1585a426e1d36f9067d65b176c27d3fbecfdf59a076263014292d10862c5
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXxf86misc-X11R7.1-1.0.1.tar.bz2]
-md5=19ba9ff3f98d769a46525b0d8ce0d1e2
-sha256=4adbde13bbb3109897fc7b5d05bdab4709c4dd1aa7313f47b8093f52f10e617c
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.0.1.tar.bz2]
-md5=8de1ca6c55aaad7d8cae19b4f0b3da32
-sha256=e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.0.2.tar.bz2]
-md5=304d37bd0a10d9b58aa9b64469ad73e5
-sha256=3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de
-
-[http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.0.tar.bz2]
-md5=b431ad7084e1055fef99a9115237edd8
-sha256=7cc5e577b337c5267f4e65741f27229111ada8cb833e24b47713a683e8838de8
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86vm-X11R7.0-1.0.0.tar.bz2]
-md5=ed59db622581b33ec2a62e12b2f9c274
-sha256=f972bbd632cf9047a28b4c467a2f7c2c72f9b36959a98649b3dfef6bf898b8df
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libXxf86vm-X11R7.1-1.0.1.tar.bz2]
-md5=3a5d54d0d2321c3d61c9cd9f3e2204a3
-sha256=494636571ae72af7524c3a7703324ef68dbf755f753054317489fe79ac895ae0
-
-[ftp://ftp.namesys.com/pub/reiser4progs/old-versions/libaal-1.0.4.tar.gz]
-md5=bdcdb1b8ca13dba897c0a2138d1643f5
-sha256=694ea8352edf845b0a7dc0c2e0e990bcb8507f64e405edc048ad115c6578e5f7
-
-[http://gpephone.linuxtogo.org/download/gpephone/libabenabler-0.1/libabenabler-0.1.tar.bz2]
-md5=49fe67302fd76543a7574a73c01395ba
-sha256=512674419ac2013d11eccf4f106d6cfc719c9c2b49215a8f0e89c5327d176a84
-
-[http://gpephone.linuxtogo.org/download/gpephone/libabenabler-1.0/libabenabler-1.0.tar.bz2]
-md5=1264bd213c631d29d1b4bc04696de66a
-sha256=0f34656e262d7c41c1499dbe1aa3bc91c1fe8dc230ab79d5cf027ab6d141ee56
-
-[http://gpephone.linuxtogo.org/download/gpephone/libabenabler2-1.0/libabenabler2-1.0.tar.bz2]
-md5=6bb28fc35f7589b8fae2ed73f9e5e08e
-sha256=901eb2cd2b817f70ee400565f714ee95b3ebed692ba37a579b6d71a21dab1a43
-
-[http://www.ngolde.de/download/libacpi-0.2.tar.gz]
-md5=05b53dd7bead66dda35fec502b91066c
-sha256=13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29
-
-[http://search.belnet.be/packages/lineox/4.0/updates/SRPMS/libaio-0.3.103-3.src.rpm]
-md5=3d6ca28cb7cf73ca1d9fe902924bdc84
-sha256=9f578643db9fff6ae088a492e6a4aca3cac4c2cbc51afce551687f4f0d36465f
-
-[http://oss.oracle.com/projects/libaio-oracle/dist/files/libaio-oracle-0.3.0.tar.gz]
-md5=165bbd6c75b8c1916e4b03988bafb372
-sha256=953e39b44b80bb89e52b00f7a7c4045fdd9c698e265bfa14a3d2291e64dffaf1
-
-[ftp://ftp.debian.org/debian/pool/main/liba/libaio/libaio_0.3.106.orig.tar.gz]
-md5=9480e31cce6506091080d59211089bd4
-sha256=89f47d77d0f660cef80efeecc1cbd194ebf4afdd3be5ab2c3584bd8a90ac44c0
-
-[ftp://ftp.nl.debian.org/debian/pool/main/liba/libaio/libaio_0.3.106.orig.tar.gz]
-md5=9480e31cce6506091080d59211089bd4
-sha256=89f47d77d0f660cef80efeecc1cbd194ebf4afdd3be5ab2c3584bd8a90ac44c0
-
-[ftp://ftp.us.debian.org/debian/pool/main/liba/libaio/libaio_0.3.106.orig.tar.gz]
-md5=9480e31cce6506091080d59211089bd4
-sha256=89f47d77d0f660cef80efeecc1cbd194ebf4afdd3be5ab2c3584bd8a90ac44c0
-
-[http://www.xiph.org/ao/src/libao-0.8.4.tar.gz]
-md5=0525549b0bf665f617913c916064cc87
-sha256=a2f434898bd5319024a97294cc4c7ba1d89bda4951af2015a887feca116e162f
-
-[http://downloads.xiph.org/releases/ao/libao-0.8.6.tar.gz]
-md5=12e136a4c0995068ff134997c84421ed
-sha256=99565c6f8a560abc24bf6c07726737d54db64daae08c8708fc9e8f3aeb723985
-
-[http://downloads.xiph.org/releases/ao/libao-0.8.8.tar.gz]
-md5=b92cba3cbcf1ee9bc221118a85d23dcd
-sha256=e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954
-
-[http://www.25thandclement.com/~william/projects/releases/libarena-0.2.tgz]
-md5=dc51d2466493d16a81af10ae0390b292
-sha256=560a17bc5d9e8ef71579391703c2a138d365e68396a5d8b21b1d9e1b232e16d0
-
-[http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-2.3.16.tar.bz2]
-md5=6bb13292b00649d01400a5b29a6c87cb
-sha256=18dc03fcf7514b0b0b0597e39c79353e00dd9d057aedaa5e14d4f08b8f92065f
-
-[http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-2.3.19.tar.bz2]
-md5=ac885805d1918026a18b560f4015bc66
-sha256=46d66be76f962cd6f921011c60409c1d5070db4b01619e6d3e5093705665e7a7
-
-[http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-2.3.20.tar.bz2]
-md5=d0ce67f2ebcef1e51a83136c69242a73
-sha256=d5531ae3a206a9b5cc74e9a20d89d61b2ba3ba03d342d6a2ed48d2130ad3d847
-
-[http://downloads.sourceforge.net/libassa/libassa-3.4.2-2.tar.gz]
-md5=f619b4f01aeda6d5f2679be9dcec5a51
-sha256=ae2d5d228a1251666f9f80248178b40fb22513597cf78b976e4c3f15d8fc260c
-
-[http://heanet.dl.sourceforge.net/libassa/libassa-3.4.2-2.tar.gz]
-md5=f619b4f01aeda6d5f2679be9dcec5a51
-sha256=ae2d5d228a1251666f9f80248178b40fb22513597cf78b976e4c3f15d8fc260c
-
-[http://downloads.sourceforge.net/libassa/libassa-3.5.0.tar.gz]
-md5=9b61dfd94bf4e083829ffb0231243d8b
-sha256=72a627c74e82ff679cb16ebe3a625b9032d8d1feed4c1da63ebb5106a80b1314
-
-[ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz]
-md5=db4e6939fafbaae80cab11a67f28771d
-sha256=c72dc7b2a3bb2945d1fb693b401ddff44f3eefbe248f2e6d29c86487b69c1dd4
-
-[ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz]
-md5=7f8aff75d034159b84faf2358263f444
-sha256=e62ac18effcbd578f7fae14c9384795321c9a954d258f6bd9da3a620b37f4106
-
-[http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz]
-md5=1b65e48271c81e3fa2d7a9a69bab7504
-sha256=a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781
-
-[http://downloads.sourceforge.net/bedic/libbedic_1.0-0.tgz]
-md5=f0f55eec32c641d0e8602c92acabd56c
-sha256=f490172a14c264f390d682c25cf33353ac5e6f9876722c8348c1e2d4b11dd1dd
-
-[http://downloads.sourceforge.net/bedic/libbedic_1.1-0.tgz]
-md5=211ea5a881b5691ec7a1aedbe7fc406c
-sha256=0cb299278f17d4580d9b1b56df8b7c356afb016f2a68ce7d13a8169f74e2a16b
-
-[http://heanet.dl.sourceforge.net/bedic/libbedic_1.1-0.tgz]
-md5=211ea5a881b5691ec7a1aedbe7fc406c
-sha256=0cb299278f17d4580d9b1b56df8b7c356afb016f2a68ce7d13a8169f74e2a16b
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-2.10.0.tar.bz2]
-md5=68179b91f5043ce0ef050dbbed04979b
-sha256=b1a185c6e20ac50c95ec3ba1aca486819984cd213e9cea69ab0dbca21db78b92
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.14/libbonobo-2.14.0.tar.bz2]
-md5=f1f0255f94e3354250d142b688013fad
-sha256=d49cc01bf85a185836689013191f92c21b625e7f38bcfcd06b41e19201765754
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.22/libbonobo-2.22.0.tar.bz2]
-md5=998a576ad26784ac87eab99e96013527
-sha256=5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.24/libbonobo-2.24.1.tar.bz2]
-md5=8868b6083392964a6969547ceb8d7cd1
-sha256=42b2ac58b86b2cc93fbbc65f94a3d1fcf5e8f33f728384653b30dbe456e91274
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.24/libbonobo-2.24.2.tar.bz2]
-md5=5c7c5ea9c2f78a3c1e9ff2f1e27ad751
-sha256=95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-2.6.0.tar.bz2]
-md5=078942cb9c6a1a31f93958e993353f45
-sha256=cd579e8dff38882d685be01449db92dad7c78900885d5a9abf6160756f83a7a8
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-2.6.2.tar.bz2]
-md5=d99ababb4569c66c3002cba97b076c31
-sha256=631f5a27399497fd8bc58be5337ea2cde153c9e6b8e5aa5077704fd887844fd0
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.10/libbonoboui-2.10.0.tar.bz2]
-md5=bd4fb92f993b7fb7e660bb999465ef3b
-sha256=1ba905987dacedaacec7fbea8575bf9569ad4b65c47fbca4a855630858a89afd
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.14/libbonoboui-2.14.0.tar.bz2]
-md5=dc26dc17cddc625cac37ecfab263a51a
-sha256=2dd02787e5bad91e1efbfe2fe041eefe8cf13ebce9607d6dd9764c69f37233a8
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.18/libbonoboui-2.18.0.tar.bz2]
-md5=22bd67a0a8b7f156c02c5fc08fb1fa24
-sha256=2963b3f0f348faa43eb84083ce93070ec82844205744219dec2df46ed2305775
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.24/libbonoboui-2.24.1.tar.bz2]
-md5=9ff3ec1c7aefd0b1a15a5b21ecc7b4e4
-sha256=322536bdc23a70287f229168af2538a7b36c1b5041626ba15e22902228750c29
-
-[http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.6/libbonoboui-2.6.1.tar.bz2]
-md5=ee26630368b541dc101a65e46e67f5c4
-sha256=9a7596434959dbecc975c5c90021da2990189016f3fc65d7362362162a4156aa
-
-[http://gpephone.linuxtogo.org/download/gpephone/libcalenabler-1.0/libcalenabler-1.0.tar.gz]
-md5=7f815fa70e9c3085897f755e124155f2
-sha256=97f63ed9c2d685a25306bd5ffa4bdf0a5e296c9ad28fd7210e6e53f75cf6dcc4
-
-[http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz]
-md5=2623370bfcecaeecaeb85e5ec445f340
-sha256=b0e3cb59e605412a52352cf9cf36344b165463d4e65916c95deb73fc51838272
-
-[http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz]
-md5=01a1952e861defa6de9d193558f2a732
-sha256=04a70135de89ec7971a7ffa6516cf7699329cc01056595d524a6250a9d049709
-
-[http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz]
-md5=b182ab134a911ba6c42ea2b727eda13e
-sha256=879f9ab798ae287048518ebb55132bbab905bea4b830a90f27a04df6d08d2a5e
-
-[http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz]
-md5=d1f5c5956d65d289566197e620be1a2e
-sha256=5f41fa3cc992721709d3761601dcd9d57e4ec26f113e115005feb7aab9920257
-
-[http://kernel.org//pub/linux/libs/security/linux-privs/kernel-2.4/libcap-1.10.tar.bz2]
-md5=4426a413128142cab89eb2e6f13d8571
-sha256=66c3f033fdc8f9ba0bd9d0ae2d1f2c11f9fa51bf0d1418e5cb75e29e6577a5bc
-
-[http://kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/libcap-1.10.tar.bz2]
-md5=4426a413128142cab89eb2e6f13d8571
-sha256=66c3f033fdc8f9ba0bd9d0ae2d1f2c11f9fa51bf0d1418e5cb75e29e6577a5bc
-
-[http://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.16.tar.bz2]
-md5=6e2c9d0f3c3118e41cd07288ba9577ce
-sha256=9c5a41a5577d6f702fe4d29e92f91f1d586a2ef272f6b7fa137bae3f0e76cc2f
-
-[http://downloads.sourceforge.net/libcdaudio/libcdaudio-0.99.12p2.tar.gz]
-md5=15de3830b751818a54a42899bd3ae72c
-sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
-
-[http://heanet.dl.sourceforge.net/libcdaudio/libcdaudio-0.99.12p2.tar.gz]
-md5=15de3830b751818a54a42899bd3ae72c
-sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
-
-[http://ftp.gnu.org/gnu/libcdio/libcdio-0.81.tar.gz]
-md5=2ad1622b672ccf53a3444a0c55724d38
-sha256=ddeafa5965eaa07f3bd46b0e39b65cba6fa9940d684f7b15bfd615f77eccb51c
-
-[http://libchamplain.pierlux.com/release/0.2.8/libchamplain-0.2.8.tar.gz]
-md5=fa4a620efa1a1c1036b6701b7d4dafe1
-sha256=01e17811a85e93e5158f5d721b9b1b249db44683735a172fa0debd9759d3175c
-
-[http://libchamplain.pierlux.com/release/0.2.8/libchamplain-gtk-0.2.8.tar.gz]
-md5=c3e62c1912c0dba013c8f3df28fc809d
-sha256=03d751bd836174e2d6766d8036fc72e130dd090b13256d40a58ba6ab659475ef
-
-[http://gpephone.linuxtogo.org/download/gpephone/libchenabler-0.1/libchenabler-0.1.tar.gz]
-md5=866fd13611a8de946428db1df9be8468
-sha256=74def55ba6a61e966e0873a4081fd3dd65089b94b837810d3bc056221d7e41c7
-
-[http://libcli.googlecode.com/files/libcli-1.9.4.tar.gz]
-md5=b917617d21b90db214971efe64a33416
-sha256=c1e56ff2e55a879b7c89b5808aea76063512d9a24cffd601aa3d9a84cd6a7928
-
-[http://repository.maemo.org/pool/maemo5.0alpha/free/libc/libconbtui/libconbtui_1.4.1.tar.gz]
-md5=68ac3177685c577aadf8d2e9f47b1878
-sha256=c3540df46bd9716c6a6f521806c70ae548822a5e62d245900cc28b5fa9fc3eb3
-
-[http://www.hyperrealm.com/libconfig/libconfig-1.3.1.tar.gz]
-md5=f02bfa27a21b3040089026975b9dc0b8
-sha256=5677f32eff184883d7ca402234f92142f35bea7d04d503becdd104ae8343cb1c
-
-[http://www.hyperrealm.com/libconfig/libconfig-1.3.2.tar.gz]
-md5=094a82afd382aa2305c6cc3c06025c2d
-sha256=2a680bb33e290c3c799e3a90cf2c0fb9f5482dd930ad93d9f83ce39923258c0a
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/libc/libconic/libconic_0.13-0.8.tar.gz]
-md5=b4078390c459ae4df3acdabca36f53da
-sha256=1ee5bf796367d27987098f73dad866359e188cafe32f1871c12b4469f262c846
-
-[http://repository.maemo.org/pool/bora/free/source/libconic_0.13.tar.gz]
-md5=f852e61c2700b5bc571a730c6516e4ce
-sha256=1a9caf3ab9fd4d84fb2d8bb2fa1459e41d896a778d63cfd515cd55e1181379b0
-
-[http://repository.maemo.org/pool/maemo4.1/free/libc/libconic/libconic_0.16.tar.gz]
-md5=f1eb01149548d59956e7aaeb5e929ee1
-sha256=d90517115be58a29de7cf87e006e5e7cb2ae1786792d7d73042563f7b33f55ca
-
-[http://gpe.linuxtogo.org/download/source/libcontactsdb-0.1.tar.bz2]
-md5=575442be0c61e4b1e05f2188e2ae3141
-sha256=33a61a28617e5513e58bde9c16ef21c82c582c1513a0a325735c090ebbd9aefe
-
-[http://gpe.linuxtogo.org/download/source/libcontactsdb-0.3.tar.bz2]
-md5=1398bee49a23bd33bbc3dfd9ac3555f4
-sha256=5912c1b64dd09a0cbeaa678772fae00e0eb64ffcad35f5dd80424fa7d4f33f7e
-
-[http://gpe.linuxtogo.org/download/source/libcontactsdb-0.4.tar.bz2]
-md5=a74c72dc7d9acf01109562d9a5f761e6
-sha256=8b48efab70ba1322e6f012b78d7614d6012411afe47107a5e2c1f27e1eaef3b7
-
-[http://gpe.linuxtogo.org/download/source/libcontactsdb-0.5.tar.bz2]
-md5=aba090380cc30c553b2e880382bc788e
-sha256=ec8f6bb5c8e0bfbf53cae21c8e5c3cfd3b442aa7ffb4eaa646c81c0449dc0bc9
-
-[http://ftp.gnome.org/pub/GNOME/sources/libcroco/0.6/libcroco-0.6.0.tar.bz2]
-md5=78fb2bf78d469df83b1fc94ce196c1c4
-sha256=39d348bc3b821f7042c4018555c3beffaf887a42e8b084c1bb521c96421c38b2
-
-[http://ftp.gnome.org/pub/GNOME/sources/libcroco/0.6/libcroco-0.6.1.tar.bz2]
-md5=b0975bd01eb11964f1b3f254f267a43d
-sha256=d23619f37fbc175027315ca641adbc51cae8a055fb78f169a35b965d6ebf3059
-
-[http://puzzle.dl.sourceforge.net/sourceforge/libcwd/libcwd-0.99.44.tar.gz]
-md5=baee4e3f0a765eb664922fc78f346014
-sha256=9aa09bb2de91727de68ee57b1a1e4c03059cbbc7166f9f181ee8b5c2792e724d
-
-[http://downloads.sourceforge.net/libcwd/libcwd-0.99.47.tar.gz]
-md5=9f734d279fa7a91f81d07fb9fd5de049
-sha256=8e9bfe9838fce18bb55d41ec883be5b7330aeead265feec0347745e8e589822a
-
-[http://heanet.dl.sourceforge.net/libcwd/libcwd-0.99.47.tar.gz]
-md5=9f734d279fa7a91f81d07fb9fd5de049
-sha256=8e9bfe9838fce18bb55d41ec883be5b7330aeead265feec0347745e8e589822a
-
-[http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.10.tar.gz]
-md5=6812a5e4063b5016f25e9a0cebbd3dd9
-sha256=83004489cce844d4f9180fb74cc4781bb79e31aecf60d529608a510cf114484e
-
-[http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.11.tar.gz]
-md5=b99a608ae9a762e809b667bfa20d86dd
-sha256=d54efe38aad450363c46eaa32b1bf29cbd3b7f8c870c0ffcaec8891c22681eb0
-
-[http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.12.tar.gz]
-md5=76596823cc1a6d1cdf7779b782ff0ee6
-sha256=39e7c9f8644d1af310d076c1a5cc648040033e4724e7edfd85eb983ad88336d0
-
-[http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.13.tar.gz]
-md5=ae9113fcd825d5a7f07e5ddccb3c3102
-sha256=bd949d459d2da54f1cdfbd1f4592e32541e8a195aca56fa7a8329ed79836d709
-
-[http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.6.tar.gz]
-md5=5b83dd22fd72130cc4fdd46bd1a7fe8a
-sha256=1f918fc7c51e8de4b97aa3556b829a03ef7a06bd44c344a494326dc222785a6a
-
-[http://downloads.sourceforge.net/libdbi/libdbi-0.7.2.tar.gz]
-md5=308e5746a2d0804be1d638319ad7b9c0
-sha256=bd518b930f76c976bf693c247f0742d88808c776a2aeb51ab7830dedb0eb692d
-
-[http://heanet.dl.sourceforge.net/libdbi/libdbi-0.7.2.tar.gz]
-md5=308e5746a2d0804be1d638319ad7b9c0
-sha256=bd518b930f76c976bf693c247f0742d88808c776a2aeb51ab7830dedb0eb692d
-
-[http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz]
-md5=ca66db78d479cbfa727cf3245b5864ae
-sha256=72e41856bebb1da7b1fd1e6369358c294913f329c5e594e338b3983e6369a5e3
-
-[http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.7.1.tar.gz]
-md5=f11020119ceb7a6dee3969cb0589d4bc
-sha256=5ae76aff042249750437ab7e490ae7d9e19a10f0005cd9bb525106365998aca8
-
-[http://heanet.dl.sourceforge.net/libdbi-drivers/libdbi-drivers-0.7.1.tar.gz]
-md5=f11020119ceb7a6dee3969cb0589d4bc
-sha256=5ae76aff042249750437ab7e490ae7d9e19a10f0005cd9bb525106365998aca8
-
-[http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz]
-md5=4de79b323162a5a7652b65b608eca6cd
-sha256=4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72
-
-[http://nchipin.kos.to/libddmpeg/libddmpeg_1.5.orig.tar.gz]
-md5=89e59638d31384987d912741986398b6
-sha256=9422e73c55aa921fbbce06e5e01bba0b98bb7a0f1640c27cfd307c290dba792c
-
-[http://www.agentpp.com/libdes-l-4.01.tar.gz]
-md5=6c5b6fff276c3a1171ceb41c6d4b6e34
-sha256=76866075a54aa04f4f18f2cf09cf19c84dee4ed22c45b741dc4067f5e224430d
-
-[http://www.des-testbed.net/sites/default/files/libdessert0.86.14.tar.gz]
-md5=7c9f9ecfcc36217ac2af3dba7828e284
-sha256=4cea899ab0fc3d96a6ba1e5e7e28253636f4ceb3ed3cba88da4cbaa328e42285
-
-[http://handhelds.org/~paxanima/files/libdictionary.tar.gz]
-md5=10ee733c70e96e8e9f01d3de2cc0c78c
-sha256=46f0a85f340e099e9010c8eb9a28d727830aedb32be48fe0a2f0cd081e0623fd
-
-[http://users.musicbrainz.org/~matt/libdiscid-0.2.2.tar.gz]
-md5=ee21ddbe696a3c60e14827a75f3bcf5b
-sha256=974b5d5ab23fb45910a4fe171045a22a749cd8cb9833168f7178839993a58402
-
-[http://gpe.linuxtogo.org/download/source/libdisplaymigration-0.28.tar.gz]
-md5=f976234f9dfd6a8e1288710b49d29964
-sha256=f776abe417432b3c4ff8b063201c4b4b45479a563fb43e6fd64504b538ef4689
-
-[http://gpe.linuxtogo.org/download/source/libdisplaymigration-0.99.tar.gz]
-md5=181f063344a0e674e5c2546544d5e27f
-sha256=b0159537f22453fcf30d7c4d7d9a39b6996233217c1f80a49ede135cf6ed32ca
-
-[http://libdlna.geexbox.org/releases/libdlna-0.2.3.tar.bz2]
-md5=2c974f95b711e5fd07f78fc4ebfcca66
-sha256=8eb7941cbae088026dd394fbe6f465cae6dd848edc430c6313f04cf57d1192b4
-
-[http://downloads.sourceforge.net/libdmtx/libdmtx-0.5.2.tar.gz]
-md5=129d960e30498f2a68d31c2c40b145af
-sha256=bd9669e5f1a43d1cfcff4d3dc5f18736ba7c950c8ba7b71b1d9cf4436a3783b3
-
-[http://heanet.dl.sourceforge.net/libdmtx/libdmtx-0.5.2.tar.gz]
-md5=129d960e30498f2a68d31c2c40b145af
-sha256=bd9669e5f1a43d1cfcff4d3dc5f18736ba7c950c8ba7b71b1d9cf4436a3783b3
-
-[http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.0.2.tar.bz2]
-md5=4d866967210d06098fc9f302ed4c79b1
-sha256=fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4
-
-[http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.1.0.tar.bz2]
-md5=a2fcf0382837888d3781b714489a8999
-sha256=1904a8f848cc5d76105cb07707890aca095540a37fb0a63d359f71da51d3e2d5
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libdmx-X11R7.0-1.0.1.tar.bz2]
-md5=ae6b3c48f1349fc5dfa7d7c4b9cf4718
-sha256=3dfb83a88826c7250e41180442e891ac39898e46e0c9c1c2aba352d4a4aa9973
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libdmx-X11R7.1-1.0.2.tar.bz2]
-md5=fbc2c1fa3ef95a69e1a816fbe81372f8
-sha256=1f5e0f1c1afdea4548a226d242edf597fc931b7ad262c09b7bee5498f472e9ba
-
-[http://gpe.linuxtogo.org/download/source/libdotdesktop-0.11.tar.gz]
-md5=7904caa236fe1797d2b033de7ea70e91
-sha256=e0089d1b643bf70626159bfacb367118015f69a589740458ec10000e40b9508e
-
-[http://dri.freedesktop.org/libdrm/libdrm-2.3.0.tar.bz2]
-md5=01a1e1ee0268a2403db42fa630036ab2
-sha256=f8c711427fea50845811360c92f6350ff3dacb9533741470d54ae5d0a2f6848e
-
-[http://dri.freedesktop.org/libdrm/libdrm-2.3.1.tar.bz2]
-md5=620fe7dd02c3236c3e9881a3a238173d
-sha256=ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c
-
-[http://dri.freedesktop.org/libdrm/libdrm-2.4.11.tar.bz2]
-md5=e0e66fae165d0b665b61e9516bf33ade
-sha256=5e07ec4b644f50160900d4281a74dd1cbf1535cfe4ab24e0c28ae5b038836a8c
-
-[http://dri.freedesktop.org/libdrm/libdrm-2.4.17.tar.bz2]
-md5=667d81f993f7fd8a1b1b1b830a28a748
-sha256=b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
-
-[http://www.metzlerbros.org/dvb/libdvb-0.5.5.1.tar.gz]
-md5=47612d2f8a4d4dee746a166d8b7f6f77
-sha256=941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a
-
-[http://download.videolan.org/pub/libdvdcss/1.2.10/libdvdcss-1.2.10.tar.bz2]
-md5=ebd5370b79ac5a83e5c61b24a214cf74
-sha256=2394a75013ab66b592d8c91d53529ede392bc9faee37fe279bd29b455eff2220
-
-[http://downloads.sourceforge.net/dvd/libdvdnav-0.1.10.tar.gz]
-md5=c8ddee96ba1182d73447eaf0bb6fde81
-sha256=c2c6ee274cbd5759715a786b949df8ac3e848ffc771173c4f006b88c665346d0
-
-[http://heanet.dl.sourceforge.net/dvd/libdvdnav-0.1.10.tar.gz]
-md5=c8ddee96ba1182d73447eaf0bb6fde81
-sha256=c2c6ee274cbd5759715a786b949df8ac3e848ffc771173c4f006b88c665346d0
-
-[http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-0.9.6.tar.gz]
-md5=329401b84ad0b00aaccaad58f2fc393c
-sha256=509503979441e078866d75a628d8a6483e67737454feaa5366f609ecf2a0f5cf
-
-[http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-0.9.7.tar.gz]
-md5=078788c9241ae16763529e1235502337
-sha256=e01f70cba5cfbc577b853ae69d73f00db7161e1704dc2359c4377aac4232a184
-
-[http://download.savannah.nongnu.org/releases/exosip/libeXosip2-2.2.3.tar.gz]
-md5=837a35f085890eac3328ac402b24383b
-sha256=a09e97847f3983431c5453bf2f3de1629e629c1b4ea9ddc5e3aa6caaf7417b05
-
-[http://download.savannah.nongnu.org/releases/exosip/libeXosip2-3.1.0.tar.gz]
-md5=ed6005a146501a5f9308e28108ae7bca
-sha256=eed72871201e2c1deae3d7c0b618bf16f306d91fc7ebcb53956ab7468663514f
-
-[ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/libedit-20050118.tar.bz2]
-md5=c261f059f71cef79d0f793ba944a5891
-sha256=494c19b29d2880d92361bb5bd0e02b8db9cd2dd9c1c3b330170a91e215911f89
-
-[http://bolgo.cent.uji.es/files/libeina/libeina-0.96.7.tar.gz]
-md5=72fade0fea5b67e92c2e1ff9e2c07f52
-sha256=d4fda4fc89cc5492f3cdf0445e84ab93311f9e1b22e487f3d95f3f86c90fe4f5
-
-[http://www.mr511.de/software/libelf-0.8.3.tar.gz]
-md5=f85d6dc4b4ef1c126080d86cf0ce63fd
-sha256=644262514d0f6c3572f66935921a5290383a15e804e9b085e293ab78102d3513
-
-[http://www.mr511.de/software/libelf-0.8.6.tar.gz]
-md5=d444fb0068cdfed01bb1fd1e91d29270
-sha256=6ff7a5dbb5ccf14995f6bde7f1fca6be5f7f91f62b2680a00d32e82b172c9499
-
-[http://www.stud.uni-hannover.de/~michael/software/libelf-0.8.6.tar.gz]
-md5=d444fb0068cdfed01bb1fd1e91d29270
-sha256=6ff7a5dbb5ccf14995f6bde7f1fca6be5f7f91f62b2680a00d32e82b172c9499
-
-[https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-1.04.tar.gz]
-md5=4846797ef0fc70b0cbaede2514677c58
-sha256=0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1
-
-[http://fedorahosted.org/liberation-fonts/export/807b6dfd069b998cd9b4d3158da98817ef23c79d/F-9/liberation-fonts-ttf-3.tar.gz]
-md5=77728078a17e39f7c242b42c3bf6feb8
-sha256=174cf27c57612971434ec8cc4a52bfd37bad8408e9b9219539c6d5113df6ff8f
-
-[http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz]
-md5=77728078a17e39f7c242b42c3bf6feb8
-sha256=174cf27c57612971434ec8cc4a52bfd37bad8408e9b9219539c6d5113df6ff8f
-
-[http://www.stafford.uklinux.net/libesmtp/libesmtp-1.0.4.tar.bz2]
-md5=8b4e8a794adc46268f0c6a0b3fb79486
-sha256=407ec85a4c3ce2c4045608d28c36a8e19f1cfbad02bf3de784f6b6fa83d15a56
-
-[http://downloads.sourceforge.net/libetpan/libetpan-0.46.tar.gz]
-md5=afa4abd73665e1a46b0510c4f4efa9a9
-sha256=74c81e8c29de3fda2e196ce7082a5ec35aad9399a6c7f67bb906b3c9d91dc6f3
-
-[http://heanet.dl.sourceforge.net/libetpan/libetpan-0.46.tar.gz]
-md5=afa4abd73665e1a46b0510c4f4efa9a9
-sha256=74c81e8c29de3fda2e196ce7082a5ec35aad9399a6c7f67bb906b3c9d91dc6f3
-
-[http://downloads.sourceforge.net/libetpan/libetpan-0.48.tar.gz]
-md5=493de1bfc84c1e0f82fd865795e48ffb
-sha256=039861766d330b8ff2309334feb97d384e16d927dd859fdc0fad4c4a13d66b7c
-
-[http://heanet.dl.sourceforge.net/libetpan/libetpan-0.48.tar.gz]
-md5=493de1bfc84c1e0f82fd865795e48ffb
-sha256=039861766d330b8ff2309334feb97d384e16d927dd859fdc0fad4c4a13d66b7c
-
-[http://downloads.sourceforge.net/libetpan/libetpan-0.52.tar.gz]
-md5=119eb4ac27fb75540ca74d8997f7fc7f
-sha256=dddf7b94e3547436beca1ed5ed22616f350d7e79cd1d72c83b122c1707237525
-
-[http://heanet.dl.sourceforge.net/libetpan/libetpan-0.52.tar.gz]
-md5=119eb4ac27fb75540ca74d8997f7fc7f
-sha256=dddf7b94e3547436beca1ed5ed22616f350d7e79cd1d72c83b122c1707237525
-
-[http://downloads.sourceforge.net/libetpan/libetpan-0.54.tar.gz]
-md5=0214de45b1b92277fbfc6c9a00af5316
-sha256=f4547fae43a30265dd1d1e7f88c556d067a3ba67ca7ec0d46e540e6dc561a010
-
-[http://downloads.sourceforge.net/libetpan/libetpan-0.57.tar.gz]
-md5=8ce8c6c071e81884a475b12b7f9a9cc0
-sha256=1f3fda5c9e2961d1a6298dc8aadae321493d37727d8db45bc2e8d58f20547011
-
-[http://monkey.org/~provos/libevent-1.1a.tar.gz]
-md5=6cc776458ecaf9247550863702a44d7c
-sha256=1725cd3dd9ec87a68316c36a50ab653c7e9581c91f9b1b7e9af42a9c7c499d8e
-
-[http://monkey.org/~provos/libevent-1.3d.tar.gz]
-md5=664a429247e7737162bd667e166b2761
-sha256=444c89dc9362ba849a537169e03a217fddde1a5e15392ad705ac1dfad5cb345a
-
-[http://gpe.linuxtogo.org/download/source/libeventdb-0.17.tar.bz2]
-md5=61a3bc3b4e33b01142b0d18cbef42f4c
-sha256=fcf56cc61742ed09b285cf11b3a67bd64689b503adc6b5681124fda26ab58aee
-
-[http://gpe.linuxtogo.org/download/source/libeventdb-0.18.tar.bz2]
-md5=b8612abfa0f7c104980bc5f11df5c6a5
-sha256=cf658f4be3e8ff301f1539b70a8c31f5a7e4893344cf7ea9f7abae12a0a53baf
-
-[http://gpe.linuxtogo.org/download/source/libeventdb-0.19.tar.bz2]
-md5=89e7e82ee764cadd21ec35e5b66f5009
-sha256=dd62e0614bef0de870b4626af398040ce8c5a29b59575625c079482443bd557d
-
-[http://gpe.linuxtogo.org/download/source/libeventdb-0.21.tar.bz2]
-md5=6f04df7771c575d5ec087de14669c810
-sha256=b6fa6a83fde364d69cc4592da45aa9b2016c843679f3c1421a57b5629a9bd170
-
-[http://gpe.linuxtogo.org/download/source/libeventdb-0.30.tar.bz2]
-md5=aeab2ac484b9cbb5a950f1f4ca2a32ad
-sha256=2905109d2331bdb1ad82b3e3386f78315182e6b4cfb52661b9b52d123730ddef
-
-[http://gpe.linuxtogo.org/download/source/libeventdb-0.90.tar.bz2]
-md5=fd7975bb5f3ddb46e6f318e69c3d92d4
-sha256=b3bc81803e890514e9e0ed491c05af701dfc58e985b071a4a408ba99dd858180
-
-[http://www.25thandclement.com/~william/projects/releases/libevnet-0.3.1.tgz]
-md5=65884ee4548e2d7c48b9c59acec5ba70
-sha256=3bc2b8d1cd657b2f8f8ec82168791f7b0fce8c8161ab24eee4b577d5876026e0
-
-[http://downloads.sourceforge.net/libexif/libexif-0.5.12.tar.gz]
-md5=97e17fa05cb638eed5e8e59db431ed3a
-sha256=8daa7618787b3af2218eee9e074f90664bff5676896b997a760f8034383d70d6
-
-[http://heanet.dl.sourceforge.net/libexif/libexif-0.5.12.tar.gz]
-md5=97e17fa05cb638eed5e8e59db431ed3a
-sha256=8daa7618787b3af2218eee9e074f90664bff5676896b997a760f8034383d70d6
-
-[http://downloads.sourceforge.net/libexif/libexif-0.6.13.tar.bz2]
-md5=1b1e2b495c5aa20c08725f30545a110b
-sha256=830802525700e65809afdd56ccdb5cd9950747044ab50666257bbb3d59a82754
-
-[http://heanet.dl.sourceforge.net/libexif/libexif-0.6.13.tar.bz2]
-md5=1b1e2b495c5aa20c08725f30545a110b
-sha256=830802525700e65809afdd56ccdb5cd9950747044ab50666257bbb3d59a82754
-
-[http://downloads.sourceforge.net/libexif/libexif-0.6.16.tar.bz2]
-md5=deee153b1ded5a944ea05d041d959eca
-sha256=db6885d5e40e3a273ff8bb9708ab739c8ace3c5abdd75509eec8ea31a31aac43
-
-[http://heanet.dl.sourceforge.net/libexif/libexif-0.6.16.tar.bz2]
-md5=deee153b1ded5a944ea05d041d959eca
-sha256=db6885d5e40e3a273ff8bb9708ab739c8ace3c5abdd75509eec8ea31a31aac43
-
-[http://qa.debian.org/watch/sf.php/libexif/libexif-0.6.16.tar.bz2]
-md5=deee153b1ded5a944ea05d041d959eca
-sha256=db6885d5e40e3a273ff8bb9708ab739c8ace3c5abdd75509eec8ea31a31aac43
-
-[http://downloads.sourceforge.net/libexif/libexif-0.6.17.tar.bz2]
-md5=f7cf4e623a48c9a3b13f7f95f0a41015
-sha256=dceb9355b148a8ee6aa96e3dff82a06c066c81e6ab18c190c946ed3b30fc7353
-
-[http://downloads.sourceforge.net/libexif/libexif-0.6.9.tar.gz]
-md5=0aa142335a8a00c32bb6c7dbfe95fc24
-sha256=a2f309c702ee72967676d96b1a9d06806d069fde8e88076200cca6479c3d3c38
-
-[http://heanet.dl.sourceforge.net/libexif/libexif-0.6.9.tar.gz]
-md5=0aa142335a8a00c32bb6c7dbfe95fc24
-sha256=a2f309c702ee72967676d96b1a9d06806d069fde8e88076200cca6479c3d3c38
-
-[ftp://sourceware.org/pub/libffi/libffi-3.0.8.tar.gz]
-md5=188a4f79fdac2310044b44b7d3918ef9
-sha256=2c7c5b88a68fb362262889ba25ef25dc27864b7bbf03547a8a36b8d567569406
-
-[http://klaus.geekserver.net/libflv/libflv.tar.gz]
-md5=5eb6b38393d81f16fb4155fe406e527c
-sha256=b53afe2a88fa24bdd53e2a3dd51ab660b89b46b1ba4918735d7331b2e56548d6
-
-[http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.0.4.tar.bz2]
-md5=5cd16a2e51ca7b96a3081c7486ff98b9
-sha256=b993aa3d17e845a12a49160b5d96993059ce919c7ba902005b910b867b6258c8
-
-[http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.0.5.tar.bz2]
-md5=4f0d8191819be9f2bdf9dad49a65e43b
-sha256=7f3cde0331e9ad3da720b1a8255e121673701199df0802b62380436e74222700
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libfontenc-X11R7.0-1.0.1.tar.bz2]
-md5=d7971cbb2d1000737bba86a4bd70b900
-sha256=448a4e35a8685b60829d1b51b498e2a6e4107549fd0458fa17dcc801d29d5f72
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libfontenc-X11R7.1-1.0.2.tar.bz2]
-md5=d8ca3192867c98669bd7d6a41ed26b09
-sha256=2cbce6d32c31c53df3e3f6fdd9d74c81b02ca1295598acd56061effa2b299b65
-
-[http://launchpad.net/libfreespace/0.4/0.4/+download/libfreespace-0.4.tar.gz]
-md5=96a081e3b7fe2337344b8adc61259eb4
-sha256=cc1e5f6751e27b2f403e85d394312c283b74f55e095c8ed8a3327a23549263de
-
-[http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-0.13.tar.gz]
-md5=7b4a660fd644980f3d45873d156d021a
-sha256=98ceb0a3174564f310c4ff1c021bdca52558bf693003a410cdb95c8388aa11f3
-
-[http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-0.8.tar.gz]
-md5=0de290c864b64efbd02c265a683478a3
-sha256=c0516891d36c6987f7a573dab556630a1e5390b0cb2ef6ffcf177ae018622979
-
-[http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-0.9.tar.gz]
-md5=6b1bf276ba8d623332083477f91deefd
-sha256=1ffb6284de02c75a2cd6709b6148eac0336cd0297742500da12aedd151838295
-
-[http://downloads.sourceforge.net/g15tools/libg15-1.2.1.tar.bz2]
-md5=51d42e50ec00315f71be184ba1ddf32b
-sha256=fd9468704d55fc6796604380ee63454e954720519f827e5ac563e2144b719155
-
-[http://heanet.dl.sourceforge.net/g15tools/libg15-1.2.1.tar.bz2]
-md5=51d42e50ec00315f71be184ba1ddf32b
-sha256=fd9468704d55fc6796604380ee63454e954720519f827e5ac563e2144b719155
-
-[http://downloads.sourceforge.net/g15tools/libg15render-1.2.tar.bz2]
-md5=a5a2a833d098926c3d289aeae452cc53
-sha256=d22335af6a17ec44799da82671778d2072499b26c5773ab913d9ba20d159d20f
-
-[http://heanet.dl.sourceforge.net/g15tools/libg15render-1.2.tar.bz2]
-md5=a5a2a833d098926c3d289aeae452cc53
-sha256=d22335af6a17ec44799da82671778d2072499b26c5773ab913d9ba20d159d20f
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgail-gnome/1.20/libgail-gnome-1.20.1.tar.bz2]
-md5=5c5b71af5a8ab2a9403bdae52b20e46c
-sha256=848485971628ff9be294e2b3ad5410b184e4bf99c1112a767f7ac78bdc0b5d5d
-
-[http://www.galago-project.org/files/releases/source/libgalago/libgalago-0.3.3.tar.gz]
-md5=94d5223445deb1ed95973424d4958386
-sha256=148bc83e4ab6e87a6f26b60efdffc1258752a42079783e6f2b080f287e8b15fc
-
-[http://www.galago-project.org/files/releases/source/libgalago/libgalago-0.5.2.tar.gz]
-md5=7ec92f2ecba1309ac4b71b4b4d8d0a0d
-sha256=9b7c9845e2f661dbf5c2595e67bc7afd48f090ac2c033726c89d7f0e90791dfa
-
-[ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/libgcrypt-1.1.91.tar.gz]
-md5=8f3581d2d2a66c8f42b16f6ce13dedc3
-sha256=9ea092029d2b32dc5eb06b38494dcc264d1a46835296ac1ed0433fff25030b83
-
-[ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.2.0.tar.gz]
-md5=5c508072d8387ce17d1ab05075c2be40
-sha256=75eb60ff711496c7e367f32344e832607034de3bd381bcb5600b2f48ee32390f
-
-[ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.2.1.tar.gz]
-md5=215b242586cbe85716a9198b28209f8c
-sha256=bc7df42e61aadd212e82853795e22d5518e93af79ec8a9ddee4bf44c4e7e0b5f
-
-[ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.2.2.tar.gz]
-md5=1a4f886e4c1eb9b6908d39831c6f75b3
-sha256=d4423a582510a1e3f47af9995337b590b9c480248821116b5397bc0652aeb52e
-
-[ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.2.3.tar.gz]
-md5=64304da2d9e21239246c66f1d449b2c6
-sha256=2b384172b54074aef4ec23b3fcc8292c86c7c4fb0efb943e7dea9d886a1d4846
-
-[ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.2.4.tar.gz]
-md5=be20ee47778ff90703afd58c090f07b9
-sha256=cf3c3f313ebeb9165d80439beaeb7f621b73856a2159e4b84c70f32b455fd9ec
-
-[ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.0.tar.gz]
-md5=4f80e46b38a71767479a3d953af22bdd
-sha256=14d457c3ed1d4751664f7196cbcd20e7db82532025f35634812f0cb7470fc43e
-
-[ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.1.tar.gz]
-md5=555488ddfc81a6e0df1fb5112e7eee13
-sha256=7562042a6210947363bd6a9bbcdd03f8d02470c0347970b507f689d25a907844
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgdata/0.4/libgdata-0.4.0.tar.bz2]
-md5=06b14f1cd96432b0717ed03fe013ca4d
-sha256=55c616b0761faaa9fb028434de97b02d5145dfc52b1db632671ebc6cc6905575
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgdata/0.5/libgdata-0.5.1.tar.bz2]
-md5=fc9be11d2f823bb16d6e03e2a0dda85d
-sha256=2b90f206063405ae6cf579ed3a090b0130e849e1ead02b2ad2ed4fc6d7f585a0
-
-[http://geda.seul.org/release/v1.4/1.4.1/libgeda-1.4.1.tar.gz]
-md5=16f2e3176eb489838bad57c8728c7388
-sha256=c0598428fc25e79b7ac1da35d44133e3fc50763b32fcdfffd5e6654f2f94682d
-
-[http://geda.seul.org/release/v1.4/1.4.3/libgeda-1.4.3.tar.gz]
-md5=f4254f345b5d1a1f3ae4e2e27ae38b0a
-sha256=f3687c7308231634619de278b5880cccd6b9b3fc04a4c1b1cf8b2e3131f6f158
-
-[http://www.geda.seul.org/devel/20050820/libgeda-20050820.tar.gz]
-md5=356182f379af726045a70de3024c7e6d
-sha256=c2fdec2c186c11aac2f941dc238ee89f51412707bd7c952e02faefa70e38d700
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/libgee/0.1/libgee-0.1.2.tar.bz2]
-md5=8e977443e2b4c8f2014cfedd0559bcf3
-sha256=01cb83ef0e765c9856bed79c18a766eed2027f2b2576e8eaa14e02c15c7658fd
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/libgee/0.1/libgee-0.1.4.tar.bz2]
-md5=1ac35c278299fcbc69b7dde79a642d89
-sha256=26c7d9c1b7a41f28fea5213484b274be55dcf2bbf5eac723ad795c0c5fb85df6
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/libgee/0.1/libgee-0.1.6.tar.bz2]
-md5=9bf21c1d832fc0313d08829446983fe6
-sha256=d319b87691dfae207d1deeb4ff8bd9e342c1b85d9277be25defb402ae10b496d
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/libgee/0.3/libgee-0.3.0.tar.bz2]
-md5=1ca2b8a87950ef1b14342fb32db3e558
-sha256=fd373e48bbe7a8f4903bd405f6310223321bc1ab22c7c3a7bc6ab0a11256b597
-
-[http://gpephone.linuxtogo.org/download/gpephone/libgemwidget-0.1/libgemwidget-0.1.tar.bz2]
-md5=95d269ad7e7cb7d3032498ad2e47643b
-sha256=b8a1da871aa34362caf0c76dcbd3df42aef7313a4ed08f38eddcb159b80302c5
-
-[http://gpephone.linuxtogo.org/download/gpephone/libgemwidget-1.0/libgemwidget-1.0.tar.bz2]
-md5=37916e6f12bff470fb457ad2d382789b
-sha256=b178c610fbbf2613ed1edeba2a11ed9c1ea042274465b2f3cd0a29cf1c7ebd9c
-
-[http://ftp.belnet.be/packages/ggzgamingzone/ggz/0.0.14.1/libggz-0.0.14.1.tar.gz]
-md5=603739504648833779aa13b0327a1c3d
-sha256=54301052a327f2ff3f2d684c5b1d7920e8601e13f4f8d5f1d170e5a7c9585e85
-
-[http://people.debian.org/~kov/gksu/libgksu-2.0.12.tar.gz]
-md5=c7154c8806f791c10e7626ff123049d3
-sha256=22f9cfc3627dcb6774b9aff66c6ea6554f3b34b82bbfa2467b821e67874c3faf
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-2.0.1.tar.bz2]
-md5=4d93f6b01510013ae429e91af432cfe2
-sha256=6386901d84cb41fb8a584f7aa1b54c984e0590f36f45ee016ef30aa45554194d
-
-[http://ftp.gnome.org/pub/GNOME/sources/libglade/2.4/libglade-2.4.0.tar.bz2]
-md5=c8367c58b2f2c98b76ca0667f0f13bf5
-sha256=33b82b27b63368c2022af4f5697905ee704d847730d6a7d078fe862ce28618cc
-
-[http://ftp.gnome.org/pub/GNOME/sources/libglade/2.4/libglade-2.4.2.tar.bz2]
-md5=83d08f9ab485a10454bd5171d2d53fb0
-sha256=c08209650ac1d0f94cf7e4bf692bb3ce61beeeab62b6f375ac652947a386655f
-
-[http://ftp.gnome.org/pub/GNOME/sources/libglade/2.5/libglade-2.5.1.tar.bz2]
-md5=e4734a59f1f2308d7714dc0ebf8163f1
-sha256=15e4c95402caa3c97394189a6b1b693eced23d80e292fcca12585317434adc2e
-
-[http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/libglade-2.6.2.tar.bz2]
-md5=da4f9d1c6cd1337f6ef5e2db768d8557
-sha256=7c79a2afaef4fd6726bad0530e29d2bc19689e07720a05c3ad32012e5aed3138
-
-[http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/libglade-2.6.4.tar.bz2]
-md5=d1776b40f4e166b5e9c107f1c8fe4139
-sha256=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/libglademm/2.4/libglademm-2.4.1.tar.bz2]
-md5=81688d8499028aee8132db48a71e90eb
-sha256=4efb4fe267c19bf96e56f01f0d7a5508c1619cfac139a8e2e5c7f99a8d9cf97c
-
-[http://downloads.sourceforge.net/libgmail/libgmail-0.0.7.tgz]
-md5=804674b6c3efbf8a02f9a7f15a041897
-sha256=868b9320127904a96656a2852b602265f858c8d87116274836b1bdb9e3da5c42
-
-[http://downloads.sourceforge.net/libgmail/libgmail-0.1.11.tar.gz]
-md5=247477ac98b39658fdcdee8d65639e51
-sha256=2d94f1230f591dfa6d1b726338063f28b89b2f82ba5b866ab077c86c598de43e
-
-[http://downloads.sourceforge.net/libgmail/libgmail-0.1.3.3.tar.gz]
-md5=ebef72abd4fbccdad9291378ac625d9a
-sha256=24285b0d5d8ba33a900db27e8d2c55ae8bb0a0d5c753d01764978b83f4c70b5e
-
-[http://heanet.dl.sourceforge.net/libgmail/libgmail-0.1.6.tar.gz]
-md5=7adb94dea0b687eb46da4b36f5712921
-sha256=8c4d31673f51a5e0eae8930f1a2e9c208ff74df33098ed55eb8b1205f587c888
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.10/libgnome-2.10.1.tar.bz2]
-md5=dfb1a9b5fd25da8680a166c83ce0b6a8
-sha256=9cf2d20f528470b2fc7995aea314c5898fad654fde265880002de0669b869c27
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.12/libgnome-2.12.0.1.tar.bz2]
-md5=f239a7ab132d2ec9039bb2537cca1e92
-sha256=f4cd8f6df545328b2b969d1fa8762d5398f7f6c517c7fac730f1d2196e4cf624
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.14/libgnome-2.14.1.tar.bz2]
-md5=bf53815df10db62bbf00defd4100b8d8
-sha256=4d091bd00e01392d65a856ca5b9fe648025c5988c844d58b25341a275b760fa7
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.16/libgnome-2.16.0.tar.bz2]
-md5=b3f030f6c677b0e1bcfca7c7e58d6c4a
-sha256=78a2d66bea1d856f06fbd3348abceded8975f09c767a17f58e1d9cd8011ab710
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.18/libgnome-2.18.0.tar.bz2]
-md5=73426589d7c6fa3266fe4e8f3be2f5b5
-sha256=53e3b241343c7ea9c4a8db4ca898fd7020c281f1400826d899b841d760dd5ba9
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.24/libgnome-2.24.0.tar.bz2]
-md5=35a2b6f214ddd9b6732b3b361140115a
-sha256=aaff55f25077f4e4b1264d561a724e8d98a8842cd7d00ab7973c59bd040554ee
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.28/libgnome-2.28.0.tar.bz2]
-md5=5c7efe21dc28c137aa766a77a84c0c29
-sha256=9b5b05085b814406f75abfaa1a85395bcf92c8f933248219e1bd738d500d0c0e
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.6/libgnome-2.6.1.1.tar.bz2]
-md5=8fb8d073987cb4c5d9bfe577550d11c2
-sha256=eda475bdbc875fcb2c0b53acdb6de0f403bafc7941dd42f076353366d4f348b2
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.10/libgnomecanvas-2.10.2.tar.bz2]
-md5=976eada7b499ae6e74966f8888c015d1
-sha256=82e7700a83aa203afc0c8903642546945b66472c66950cfc443f807b629ecc5a
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.12/libgnomecanvas-2.12.0.tar.bz2]
-md5=62c0edd3d27803d341662fd9088b2d9b
-sha256=77c57dab746a312cd188ce9fcf91bb99b9a7e06d164f438530d65d018afd35da
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.14/libgnomecanvas-2.14.0.tar.bz2]
-md5=516c46fb4a1401b05cfef58c350fbd3d
-sha256=5ceadd704327c2967868b3c0c81b5e600e1c6fd4f8efcbaaf89f9b18aa8bb5cf
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.20/libgnomecanvas-2.20.0.tar.bz2]
-md5=109b71b02e0c976d65b46129d0ad69d1
-sha256=c1d7301ecea3719e307182222ba19375b74017580d58e4a25f4ae15c8c8f9c3f
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2]
-md5=9bbc635e5ae70e63af071af74ba7e72f
-sha256=80b480acc33d7303f651e9c5bc8fea51c9e9a9ed59ebfdbbb730dd798bcbc58d
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.6/libgnomecanvas-2.6.1.1.tar.bz2]
-md5=040257b0231fd5fc507f731d73d9738b
-sha256=fd117570a94e527f76241bc54d2dd53cbea5e17455f5795b5e52afee25eccaca
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomecups/0.2/libgnomecups-0.2.2.tar.bz2]
-md5=959d5524fe9c37efb55ccfa02e3a063b
-sha256=f70599274dbb575fbbc83bb58179b757800e5d87e59e35f5d95e618c7ec31444
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2]
-md5=dc4920c15c9f886f73ea74fbff0ae48b
-sha256=e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomekbd/2.24/libgnomekbd-2.24.0.tar.bz2]
-md5=43e4d090bc67a1984bebf551637783fd
-sha256=60f093b4fcbdfa12212d6e29dc2f7802a3234d8035f45efed4b426c0bb293c5a
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomekbd/2.28/libgnomekbd-2.28.0.tar.bz2]
-md5=b0989c4a2dbe2b5dd892d14195674f2b
-sha256=72da2cc218de666a0ffa8896ae2d01bce3f46fde7072f2aa937c2bcd2d312668
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.18/libgnomeprint-2.18.5.tar.bz2]
-md5=c325baf4487335259e050619185787b1
-sha256=0ead99d6e227192d09902bdb37ec6aac25555a453ff4c338b49700fc477070c5
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.6/libgnomeprint-2.6.2.tar.bz2]
-md5=f742bb321fab833b67270f7b86af0fdb
-sha256=4c8c61d56cded77108d74467a4312e7b9d3bb5236fd1e09f6c3b1205ef5d3d32
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.8/libgnomeprint-2.8.2.tar.bz2]
-md5=8361c4e1bc3d87b91435807d0c06a3e4
-sha256=155ea46d59a2f366f8c72f97ed3e2f64f6afd259f1049f1d6da93f64ed503389
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.3.tar.bz2]
-md5=f2c5796f15d6b6701bfa224d856098ce
-sha256=4f7c75e54474a76eff41b6e3da15afadd2d5207a04bc82d85b728395563cf747
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.6/libgnomeprintui-2.6.2.tar.bz2]
-md5=b26f7f70eb67fe29f20f6312d4f3085e
-sha256=7869603bbda88f35652d9b70af178836ca7612119ab36084ccc35f2d51c83f13
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.8/libgnomeprintui-2.8.2.tar.bz2]
-md5=b38d1f6813dd52879ba4174ddc3f1b1c
-sha256=5c4ba52ca52cdb2d89e2fb7a638891ded38e844c08dd992e482f0793cfbc71c7
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.12/libgnomeui-2.12.0.tar.bz2]
-md5=342a5b8a9d427ff950a71a245a5f4485
-sha256=b29baf52bf2c80bf896d59cfd4c4c1515b7df56b14069834b0e78910b9088dfe
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.15/libgnomeui-2.15.2.tar.bz2]
-md5=ec5841c2c01d79e97bc363414e446240
-sha256=3bb709d3dbb7287482d236e418e9ca4b858f28dfd374c6840f0aebae6b206894
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.16/libgnomeui-2.16.1.tar.bz2]
-md5=d9b975952bf5feee8818d3fb18cca0b3
-sha256=552c34d20f30847429e342e6c6ddeece707b69a5abe9aeeafcfeb65cec2eebd7
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.18/libgnomeui-2.18.1.tar.bz2]
-md5=dbdb274517ad643d9397dd6868788631
-sha256=d6eef491e70fcc2c1e5b94f6a8dbb3774443b3b76b1ca5d62bfb5b802df14120
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.23/libgnomeui-2.23.90.tar.bz2]
-md5=310ede3d7fd6dbdb0f53bfa7af46f09a
-sha256=1f112ea46c51e063f4085e27b97c88d4e23164eb07056edbbee1a190abe713ec
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.24/libgnomeui-2.24.0.tar.bz2]
-md5=7d50e1fc4c1ee3c268b26e8dfe7e677b
-sha256=9ecf81d3ad2e1ec0b371d720b37154e8b716af1cd464dbeb06232f8fa4c5e07d
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.24/libgnomeui-2.24.1.tar.bz2]
-md5=8e7d36dd1decfcf5cc4d5cb93bc4d217
-sha256=a2ed289b7b35956eff7ddd4d9f4e2507260a7fcb5d7d01969f2e3bb8278e8dc1
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.6/libgnomeui-2.6.1.1.tar.bz2]
-md5=16e6717b5d7da982db00fea6167188ef
-sha256=0c6c91a59e411d196fe56c814bd368224b04e11a341a8ad552398035e8f19d93
-
-[http://gpe.linuxtogo.org/download/source/libgpelaunch-0.14.tar.bz2]
-md5=cac106e90f57753511a4436ca2cdbc3b
-sha256=23425f74f304072f48d295e9d7168a6ecfb44c049074b34b71cfbf1f4d19ec85
-
-[http://gpephone.linuxtogo.org/download/gpephone/libgpephone-0.3/libgpephone-0.3.tar.bz2]
-md5=009af2f3554caaf547bbc282da0e83c6
-sha256=c40ea6d2282503ede882efe85ad526358683c311ea4592d41eaab0725ca75934
-
-[http://gpephone.linuxtogo.org/download/gpephone/libgpephone-0.4/libgpephone-0.4.tar.bz2]
-md5=fae122bd44d6da9a006f65aedbd6461e
-sha256=cd84dc0e4b903871339e5e097a51d09a76ee9e1495783a47bb5ba81d633810da
-
-[http://gpe.linuxtogo.org/download/source/libgpepimc-0.2.tar.gz]
-md5=74e36fd1c34dc668801366d5aa11e93e
-sha256=19556cc4d3469f61c7b50db7a9979a669af0b03c0c2243441e34a8a5f737fa9d
-
-[http://gpe.linuxtogo.org/download/source/libgpepimc-0.3.tar.gz]
-md5=5142dd86386e1106a29f90837f57c3eb
-sha256=f6a27c361b7ca41e32f4fedcf588e19745437ad5955fa68612ed21f45e828fc5
-
-[http://gpe.linuxtogo.org/download/source/libgpepimc-0.4.tar.gz]
-md5=7aaa9220d1ffa77b70c1cf8355141b29
-sha256=260c329ca2e197e8c85f21da4186cf8a4746ad0398fb708fbb266453f570734a
-
-[http://gpe.linuxtogo.org/download/source/libgpepimc-0.5.tar.bz2]
-md5=bbb0efe3359510fc0393f3f305c1c6e7
-sha256=b0d1236dbb27f054f8b8a6f8ed4d735db89eb466be641bed67363f4dd76385ad
-
-[http://gpe.linuxtogo.org/download/source/libgpepimc-0.6.tar.bz2]
-md5=3e5ffa6c4e556c5ccc8ec8f53a27eb69
-sha256=71c7d6ab2ca142f100241d5256c58b67ac01a3d34d52722178e4da9d6ac0729f
-
-[http://gpe.linuxtogo.org/download/source/libgpepimc-0.8.tar.bz2]
-md5=308f75a47ab738cb2955f8a8051728e5
-sha256=b914f2cf05353e2f4471648b37782a82d73ebf895a50ab1e238e3a325cce2c65
-
-[http://gpe.linuxtogo.org/download/source/libgpepimc-0.9.tar.bz2]
-md5=0d22564e0a897b3be2eb9d2fc71fbd65
-sha256=8954f7179d2172f8d561d42209e25027a1eece832e35986d9637c404c1a3add0
-
-[http://gpe.linuxtogo.org/download/source/libgpevtype-0.14.tar.bz2]
-md5=66e2996cd89545827cba6d195904346f
-sha256=157d54ac1248a430dcbbef0ddd0c486d76e67712b4ebccf63c23603fb75b23aa
-
-[http://gpe.linuxtogo.org/download/source/libgpevtype-0.15.tar.bz2]
-md5=6bef54f2dbc76e77d5ba49c16e4f04e5
-sha256=a49c0a9d7b8e1edc7659469c524237ce55202b91dad61e08d95eb6749b2eb020
-
-[http://gpe.linuxtogo.org/download/source/libgpevtype-0.16.tar.bz2]
-md5=dc7b99c3799ac1b5b7ef1e21450f20e4
-sha256=9a272b4c133be4d828aa58c506ea729bc472434f6475d97ea60b388a40fe444d
-
-[http://gpe.linuxtogo.org/download/source/libgpevtype-0.17.tar.bz2]
-md5=c9c031ee32bcdb3c8bf0d31083330d63
-sha256=21c026c120861d8b1b1178e8744a3626a56ff231c35cce0a5176305a977949ff
-
-[http://gpe.linuxtogo.org/download/source/libgpevtype-0.50.tar.bz2]
-md5=4d7a20b215c53b73786690e895f05750
-sha256=a390032e637621ef8a8ff2ae3f73cf8f74f10b2f999b359253b137f1341f482e
-
-[http://gpe.linuxtogo.org/download/source/libgpewidget-0.102.tar.bz2]
-md5=9eb90850adf65ec0d0ff26833f7cb8c6
-sha256=ac25c961899ac71b0df93b517ac12b7b3c3083397abe9053a77f1e763e573822
-
-[http://gpe.linuxtogo.org/download/source/libgpewidget-0.114.tar.bz2]
-md5=36007105704bdc030c2c241c94bba165
-sha256=db67f8fd78da55e71fe61eb28263d823f1bcda8d878bc6f2ffd9254a925dc84a
-
-[http://gpe.linuxtogo.org/download/source/libgpewidget-0.115.tar.bz2]
-md5=88d53855c41fa7713263e913871a5fcc
-sha256=ebbbc25a27587c21ed640b5d87b7c7783f4820c59c22f7b07e29e2306f1bbd65
-
-[http://gpe.linuxtogo.org/download/source/libgpewidget-0.117.tar.bz2]
-md5=b85a839264a35d0faf9a1a38c486e189
-sha256=f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868a9e18c
-
-[ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-0.6.tar.gz]
-md5=516623893401d391b6c346cba543681d
-sha256=32fe6ccae632a2d6ede51477dbdd5b39a0816510031bae0b5e5059099044a58c
-
-[ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-0.7.tar.gz]
-md5=5340fa28c365049c995996e8dc0f880c
-sha256=e8eb2c3a844a080144cbb994118e5110b08bc0f608f8c3f2f1977211167bda76
-
-[ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.0.tar.gz]
-md5=ff409db977e4a4897aa09ea420a28a2f
-sha256=7baf0a33a717c5d5b24faf592ba16fc5e962f1537f46b11f6ed003010a8ff1e9
-
-[ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.3.tar.gz]
-md5=aae34a35b00c547f2e41c747cf87f8b7
-sha256=d815a1a5445fc26de5c7b10192acb77cf4277a100124842b616f85a5a4fbfe3b
-
-[ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.4.tar.gz]
-md5=86e60e9a03205fb706e99be101a2387e
-sha256=fff67ec5ffc93cf91fc62350a19a9f677c9bc6eb2730395d22f9d40c754ed619
-
-[ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.6.tar.bz2]
-md5=f3e9870e213518b407a959f8d29cd554
-sha256=aa7df632134dfd3d4e65f5a98edd6bb9a97b498db911f4287bbaeb5ae83a1bad
-
-[http://downloads.sourceforge.net/gphoto/libgphoto2-2.1.4.tar.bz2]
-md5=a201650482bbc2edbd948449cf4d3f5a
-sha256=98af9747179c4d284104fc155b624c6cda4e91a554de0a04e6a6878c0e852c63
-
-[http://heanet.dl.sourceforge.net/gphoto/libgphoto2-2.1.4.tar.bz2]
-md5=a201650482bbc2edbd948449cf4d3f5a
-sha256=98af9747179c4d284104fc155b624c6cda4e91a554de0a04e6a6878c0e852c63
-
-[http://downloads.sourceforge.net/gphoto/libgphoto2-2.1.5.tar.gz]
-md5=210844f0d88f58842917af6eaff06382
-sha256=4691bc87f567eba4938d1465e7a2ddfaf7bdea86629390830111bd03bd227ed5
-
-[http://heanet.dl.sourceforge.net/gphoto/libgphoto2-2.1.5.tar.gz]
-md5=210844f0d88f58842917af6eaff06382
-sha256=4691bc87f567eba4938d1465e7a2ddfaf7bdea86629390830111bd03bd227ed5
-
-[http://downloads.sourceforge.net/gphoto/libgphoto2-2.1.6.tar.gz]
-md5=1938cbd9718595fd419907bf2f7c3195
-sha256=f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80
-
-[http://heanet.dl.sourceforge.net/gphoto/libgphoto2-2.1.6.tar.gz]
-md5=1938cbd9718595fd419907bf2f7c3195
-sha256=f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80
-
-[http://downloads.sourceforge.net/gphoto/libgphoto2-2.4.0.tar.bz2]
-md5=a60154772635b693ff08b4f34dea7f61
-sha256=0dc26b7a8568dee7634bebbaf9f7d3e3ab9460424e6297a595e41c4fddbbdb79
-
-[http://heanet.dl.sourceforge.net/gphoto/libgphoto2-2.4.0.tar.bz2]
-md5=a60154772635b693ff08b4f34dea7f61
-sha256=0dc26b7a8568dee7634bebbaf9f7d3e3ab9460424e6297a595e41c4fddbbdb79
-
-[http://downloads.sourceforge.net/gphoto/libgphoto2-2.4.2.tar.bz2]
-md5=714859617c0b616855f6906280010c5d
-sha256=f319655b272186ad76ab73317b7e8c5e3b87d51c1265ce676f02e8c312745226
-
-[http://heanet.dl.sourceforge.net/gphoto/libgphoto2-2.4.2.tar.bz2]
-md5=714859617c0b616855f6906280010c5d
-sha256=f319655b272186ad76ab73317b7e8c5e3b87d51c1265ce676f02e8c312745226
-
-[http://downloads.sourceforge.net/gphoto/libgphoto2-2.4.4.tar.bz2]
-md5=8aff5ac4ca72cba17de633078cf1612e
-sha256=2582362ae318b62c31832edfcaf401397fcc98fd307347ee15babff94770784d
-
-[http://downloads.sourceforge.net/gphoto/libgphoto2-2.4.7.tar.bz2]
-md5=3c1f1b1e56214e83b97e2bc7aadba4c5
-sha256=9e7613f21ac3dd7cf1decbab5c47c1e9a16d39c32062d7f8632adb4fc8d0271f
-
-[http://kent.dl.sourceforge.net/sourceforge/gtkpod/libgpod-0.6.0.tar.gz]
-md5=b44d8aee3f6610370b6faf61770c5f3c
-sha256=a2c8c998588361d8aaa4c662a38f50db164b8b4fce4e7bc49ac445a9ac87f80f
-
-[http://repository.maemo.org/pool/bora/free/source/libgpsbt_0.1-18.tar.gz]
-md5=ce884aff8d063f9d51ebf75d899747fa
-sha256=495ebd711a63bee4eeaae7f0766323f2070bf30ab9b54f5ac18912baa1b41084
-
-[http://repository.maemo.org/pool/bora/free/source/libgpsmgr_0.1-10.tar.gz]
-md5=99ceada8d73504b5147f0ad6fa4af20f
-sha256=ebc670611d304d362fa082cf8773a8ac0c10fda455f29ba777fbdc830002ef68
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.10/libgsf-1.10.0.tar.bz2]
-md5=d3b650ccef7e5278baf546025d4b3848
-sha256=ef86adadcb944cbfaa512c5ad2161c753b21000cd0550c4134364c791c333bfb
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.12/libgsf-1.12.0.tar.bz2]
-md5=34c4672edd2e4e814fb82d7b94d71ffd
-sha256=d471b74e778be690d39dad4d41758bc779fc00bba8e87e9fad0457d09d987dd1
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.12/libgsf-1.12.1.tar.bz2]
-md5=76473db3245f2f384475f2e40c4ca432
-sha256=d09305b12de8130be558ff0d81d2043e15d726316a255e6a873351c4e6a32f07
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.12/libgsf-1.12.2.tar.bz2]
-md5=fe5007f3a21bf7ab707af6c5c0d24489
-sha256=5c8957da8042df34ff447f0911190ef5f212f251e9b6f5ab11c552080d188b1b
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.13/libgsf-1.13.2.tar.bz2]
-md5=0894afd88f9e43eada27e52cb22cd0f1
-sha256=ef7833047caf66ed3de7b0195223911d28e45c78617d25c6bd05a53fd6c30a0c
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.13/libgsf-1.13.3.tar.bz2]
-md5=b35e95f6bd7b8add9981b6cf6336674a
-sha256=458e7b2ca26f0d212f91b445f0a93db62a679ec671bd3cc980f3c1ac65f06b96
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.16.tar.bz2]
-md5=8478d83fda0b6e57f36550c11a693ee1
-sha256=11fd8fca1bdbcfa426276a124ad083cca9632f03cf766523bcdfb2fca0b08908
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.2.tar.bz2]
-md5=aea16a8408b65f95c308b0db3e3d3d47
-sha256=8b78905b3c61f67dbe9b50782b7005ee5a44cdb48dd0f654f42732b4807c829d
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.5.tar.bz2]
-md5=0c1a70ca77aef5706544c1b4082a632a
-sha256=54a1432c73e2df93dfe16bd6c11eb56c949da0967479be2e31e2c08ea0ee1901
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.8.tar.bz2]
-md5=09e4b6639be79fa888cabc751f73674f
-sha256=d5f635ea86f8417dd777c32bcf7ef86cf3af3912f34ae21db9933a0e48e54748
-
-[http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz]
-md5=29690b14762a970b9ff725c85627c24b
-sha256=ee8dcb9cb850f94e75e374273b0860bcf214fd242651ee22ac74cbfd37449b4f
-
-[http://gpe.linuxtogo.org/download/source/libgtkinput-0.3.tar.bz2]
-md5=259328c5749a0075502bd474dcb9a383
-sha256=3915bd4e713b2a30f6af86d415d49edaad0846ecd440a6b7062d0c0935ad8f93
-
-[http://gpe.linuxtogo.org/download/source/libgtkstylus-0.1.tar.bz2]
-md5=fea0cf7333623ca2d8954b202d2cd89f
-sha256=be7359f95c926bc40d6be82aea835cd8a53459719249a625cdca879827470593
-
-[http://gpe.linuxtogo.org/download/source/libgtkstylus-0.3.tar.bz2]
-md5=211bd08961ad78bdeeaab4f33f20c639
-sha256=1964a9fb46e5f57bda75bfc37e19036b32c6a7d57bf13020776dfaaca348920b
-
-[http://burtonini.com/temp/libgtkstylus-0.5.tar.gz]
-md5=fa1c82cd9fd2fafd7ff10d78eb5781c5
-sha256=383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgtop/2.23/libgtop-2.23.4.tar.bz2]
-md5=bb37766ba407983a8e055eb4705a1a81
-sha256=7d9b0e68b4e84e7938197c5240023d3b6840026cfc9f83bdab202fbab4029a9b
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgtop/2.24/libgtop-2.24.0.tar.bz2]
-md5=f0e3584b9157d3425184a9e21e3ac482
-sha256=af9643abf15887c9cb501a4dcc6f432ec0896b7087ef8739526f284ed1461a18
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgweather/2.22/libgweather-2.22.3.tar.bz2]
-md5=151e03d925579241decc92afa4d07182
-sha256=d5a799e1d11cd91865cb716a11de970de97d7ef679684db0a893fc6a65a9acd0
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgweather/2.24/libgweather-2.24.0.tar.bz2]
-md5=d006328ec5cebc5dbf3a18834db95bba
-sha256=0abae1eef7210e4decab7f89ea5b3a012c06859e91923a7212ca50856bffd500
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgweather/2.26/libgweather-2.26.0.tar.bz2]
-md5=b96016d7b35c66cf251189e9851ee252
-sha256=c1efdeb59fe87145d13d99b7bb6f51b56505081fb2ebc2f7fe7dc3f7699da45e
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgweather/2.26/libgweather-2.26.2.1.tar.bz2]
-md5=cef0447b62235c4662aa9691dd9a6c92
-sha256=70cf977060a5e71ade98346070856f09fbf33f6d88f4d49632d7ae0f6b314834
-
-[http://ftp.gnome.org/pub/GNOME/sources/libgweather/2.28/libgweather-2.28.0.tar.bz2]
-md5=9f4457144d32d4004e0e045240ab51dc
-sha256=65fd8e4d7b617de7aac5a5d7d9bebde63ead828bcdc3e8f73f038ce03e669654
-
-[http://www.handhelds.org/~mmp/files/libhal-nm-0.0.2.tar.gz]
-md5=2f0882a711759113b2388a790abe8fd8
-sha256=68dd467cf8bd54283da874af54ac35de58b88444371ea48bb5cef289a0942981
-
-[http://gpe.linuxtogo.org/download/source/libhandoff-0.1.tar.bz2]
-md5=8ec44fda9476391ed372f835d5358fe8
-sha256=9505377f6b4d4b657889e8468fca8049c8c2c46c3ddd03bb4eef0e7b2e1bad3b
-
-[http://kldp.net/frs/download.php/3733/libhangul-0.0.4.tar.gz]
-md5=a32301e03a381917cb2ec836a43a9664
-sha256=939bbcacd49487f830cd9d8bf56f81043f519bb7bfbcfb568fd87bf484120a10
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/libh/libhildon/libhildon_1.99.0-1.tar.gz]
-md5=0ac69c278bd9f531a93b3c535f7ff145
-sha256=67e74666b49b0d17ff16e209196674dc23faa8c45b4f9b2ad33b94ffb6f3be4c
-
-[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildon/libhildon_2.0.4-1.tar.gz]
-md5=2708e643dbfaa722486d71c2516a0480
-sha256=44a7942eaa7ed7f640b3c3b700289f2363bb7264a7443853bdc0786e92ed6346
-
-[http://repository.maemo.org/pool/sardine/main/source/libh/libhildonfm/libhildonfm_1.9.41.tar.gz]
-md5=204be732181d57af01a35ec5fbe072bf
-sha256=f77ecd176be0c470d25431e2f8868bb78179ff1c52f5dd96bb093b13c2718ae2
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/libh/libhildonfm/libhildonfm_1.9.46.tar.gz]
-md5=2077191776071a94af3194dbeefdab38
-sha256=8df5de457571e93ffd9220b6c45378ffe8742f047d386a3c56e265baeb33607f
-
-[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildonfm/libhildonfm_2.0.5.tar.gz]
-md5=0196b326a048e4d1a1ac009f71e235ec
-sha256=5065b98c01d9cbd4f7c5a769e659ce1f81cf3396f7c6e7af7785215cd18d7910
-
-[http://repository.maemo.org/pool/sardine-experimental/main.disabled/source/libh/libhildonhelp/libhildonhelp_1.9.1-1.tar.gz]
-md5=7388ddc8b191f1ee450c0cb150d36969
-sha256=80272253b0ac6a6e3abe4c8a5398f65bf303f1654a44be7d8ceb1e7a3213b519
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/libh/libhildonhelp/libhildonhelp_1.9.6-1.tar.gz]
-md5=6f3328136f1b8dabf667d954b0698189
-sha256=b2219de48715579d589705cb7b88af8d3dd3cf18de0fd3d799241720b2384bdf
-
-[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildonhelp/libhildonhelp_2.0.3-0.tar.gz]
-md5=f02c47001669ef103a22dbde4aa97d2b
-sha256=46ad5df524cc74ab728e2a23b4ddc17f2624feb517c2d011b2b32c95ace3ecaf
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/libh/libhildonmime/libhildonmime_1.10.0-1.tar.gz]
-md5=1ff70dcec31b796602d6fb9bb0c14837
-sha256=65d47c8678689d04c3bede17bde3aefffa0ce5527f72b1a0c5356fa0588b784d
-
-[http://archive.ubuntu.com/ubuntu/pool/universe/libh/libhildonmime/libhildonmime_1.9.5-1ubuntu1.tar.gz]
-md5=2320b71819d44dc40a974cb67084f2a7
-sha256=6815f0a46de672711866b031c09ed8a94e1cbbe193c6a6b5cb72286ff90cfe54
-
-[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildonmime/libhildonmime_2.0.2-1.tar.gz]
-md5=b36a6332cbdd8deb73cd97f6e7bd4804
-sha256=a1dd25b7b4a8979f1d78596c2c65f062c30b5db794be71508ceb4d662052a8ee
-
-[http://gpephone.linuxtogo.org/download/gpephone/libiac-0.1/libiac-0.1.tar.bz2]
-md5=cf829bb82f84728194c64a41e9f1cf32
-sha256=10197df9daee806453c5a7e99e538d7eac0421796f2a9ae114d4369d85fcf3af
-
-[http://gpephone.linuxtogo.org/download/gpephone/libiac-1.0/libiac-1.0.tar.bz2]
-md5=6bb2fd1841d9c1be22edc999970a55a3
-sha256=821290104ef79b6a35a4a7456d50aff0536f66f05a5d6c255e7155d1cacd12b6
-
-[http://downloads.sourceforge.net/freeassociation/libical-0.27.tar.gz]
-md5=87d48321bff08de08794132d60b55d94
-sha256=7f1fa404e5540c880cc747c4a680a89d88b87b10a1c77655f512780fcb0ca5d0
-
-[http://heanet.dl.sourceforge.net/freeassociation/libical-0.27.tar.gz]
-md5=87d48321bff08de08794132d60b55d94
-sha256=7f1fa404e5540c880cc747c4a680a89d88b87b10a1c77655f512780fcb0ca5d0
-
-[http://downloads.sourceforge.net/freeassociation/libical-0.44.tar.gz]
-md5=e0403c31e1ed82569325685f8c15959c
-sha256=20a4750df8f4dedd718b55117b8351989e0dfa4ad2c966a383550ed43e6a72d8
-
-[ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.tar.gz]
-md5=b77a17e4a5a817100ad4b2613935055e
-sha256=fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
-
-[ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz]
-md5=c2be282595751535a618ae0edeb8f648
-sha256=a99e244fd78babb95ea3c9a5c88b964994edaa1d15fd8dde5b4067801e23f0cd
-
-[http://download.tangent.org/libid3-1.1.tar.gz]
-md5=e089e8c8c7276373db0a856c508bd8f9
-sha256=117831ba06b255ede3cc318278108d19db972b6365c3d80d374d8f888f834c98
-
-[ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.0b.tar.gz]
-md5=a625307d2cda4f3c609b79c1e3a93d87
-sha256=794092368890321ffbb9cb1b260808d732658af093bd0a3e01c9b54c4bd657e5
-
-[ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.1b.tar.gz]
-md5=e5808ad997ba32c498803822078748c3
-sha256=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
-
-[http://downloads.sourceforge.net/mad/libid3tag-0.15.1b.tar.gz]
-md5=e5808ad997ba32c498803822078748c3
-sha256=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
-
-[http://alpha.gnu.org/gnu/libidn/libidn-0.5.19.tar.gz]
-md5=440835808c577073db7d571357223dce
-sha256=4f707c189259d7b3dda908d78a995366d388fe051aa3554b82cb324426997a23
-
-[http://josefsson.org/libidn/releases/libidn-0.5.19.tar.gz]
-md5=440835808c577073db7d571357223dce
-sha256=4f707c189259d7b3dda908d78a995366d388fe051aa3554b82cb324426997a23
-
-[ftp://ftp.gnu.org/gnu/libidn/libidn-1.15.tar.gz]
-md5=482a25b7b223e52f967fafd284a1a992
-sha256=db75022eff366bd5646ab1e6d7bcd1c2048473a7dbdf0cd0421de92c88bbdc18
-
-[http://www.cpan.org/authors/id/G/GU/GUIDO/libintl-perl-1.16.tar.gz]
-md5=7dfcd9ac3a4ff41038a2c67a733d42b9
-sha256=1a64895c9a6cdbb5cdfff81f1520541fee28e85fb940d9b0484de656d69ae8f5
-
-[http://www.cpan.org/authors/id/G/GU/GUIDO/libintl-perl-1.20.tar.gz]
-md5=cb36f58a7d2e15974f25b35381548b1b
-sha256=3036a9d2df85f200631b55a0b01082898c20819d9aabdb9b871508054bee5c67
-
-[http://downloads.sourceforge.net/tapioca-voip/libjingle-0.3.10.tar.gz]
-md5=7ee7d8c834f1e06093130a86cbb9e79a
-sha256=3453c1426fdc06b32bc5f4e7d3ce039ec7f38f0fa4018d505e515099b209dd25
-
-[http://heanet.dl.sourceforge.net/tapioca-voip/libjingle-0.3.10.tar.gz]
-md5=7ee7d8c834f1e06093130a86cbb9e79a
-sha256=3453c1426fdc06b32bc5f4e7d3ce039ec7f38f0fa4018d505e515099b209dd25
-
-[http://launchpad.net/liblauncher/0.1/0.1.8/+download/liblauncher-0.1.8.tar.gz]
-md5=b220357aaccc581c05337d05c5a1356f
-sha256=e2d7c0eb9702e83e28551b89e3cbc283c6835e42c8336bd251c3b5c50dfdc9e5
-
-[http://xorg.freedesktop.org/releases/individual/lib/liblbxutil-1.0.1.tar.bz2]
-md5=b73cbd5bc3cd268722a624a5f1318fde
-sha256=94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258
-
-[http://xorg.freedesktop.org/releases/individual/lib/liblbxutil-1.1.0.tar.bz2]
-md5=273329a78c2e9ea189ac416c7fde94a1
-sha256=c6b6ff7858ec619cafa8205debca6bf78c5610a2844a782ed643c7fd017cf8ae
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/liblbxutil-X11R7.0-1.0.0.tar.bz2]
-md5=1bcffde85723f78243d1ba60e1ebaef6
-sha256=e485f36d74f477f3d235a05bb67b502dc744092569842d9ab45e2f785f74f556
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/liblbxutil-X11R7.1-1.0.1.tar.bz2]
-md5=6cef76df73f86482fa478ad8252d9055
-sha256=d9ca5d502f8a4a6c146d1f0458ac27c95cc59724caa6d845e24946d299463bc5
-
-[http://downloads.sourceforge.net/project/vimgadgets/liblinebreak/1.2/liblinebreak-1.2.tar.gz]
-md5=d18039259001ccb24b5dd4648c49c5ad
-sha256=9efcb0cb1afc75ad1e92d2b2dbf4d9c77b072d6656c5f1a150af8b718d0c7b76
-
-[ftp://ftp.debian.org/debian/pool/main/libl/liblinebreak/liblinebreak_0.9.6.orig.tar.gz]
-md5=e898200ac89815365e89b7c6cc2f78fd
-sha256=f23ac7320379d8e950340fe37633c21a56a5f4320d29c34a65819558fe6cdaa1
-
-[ftp://ftp.us.debian.org/debian/pool/main/libl/liblinebreak/liblinebreak_0.9.6.orig.tar.gz]
-md5=e898200ac89815365e89b7c6cc2f78fd
-sha256=f23ac7320379d8e950340fe37633c21a56a5f4320d29c34a65819558fe6cdaa1
-
-[ftp://ftp.debian.org/debian/pool/main/libl/liblockfile/liblockfile_1.06.tar.gz]
-md5=2de88389da013488bfd31356523070c0
-sha256=14f9690328318d11f9ba13a9356a2c008bdd169b7a817f38cb7f9eb32cf7240e
-
-[ftp://ftp.nl.debian.org/debian/pool/main/libl/liblockfile/liblockfile_1.06.tar.gz]
-md5=2de88389da013488bfd31356523070c0
-sha256=14f9690328318d11f9ba13a9356a2c008bdd169b7a817f38cb7f9eb32cf7240e
-
-[ftp://ftp.mars.org/pub/mpeg/libmad-0.15.0b.tar.gz]
-md5=2e4487cdf922a6da2546bad74f643205
-sha256=5666a1dec6956a9b9869aacc3b05a10222639651790be3a9c43772890eb49cd6
-
-[ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz]
-md5=1be543bc30c56fb6bea1d7bf6a64e66c
-sha256=bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690
-
-[http://downloads.sourceforge.net/mad/libmad-0.15.1b.tar.gz]
-md5=1be543bc30c56fb6bea1d7bf6a64e66c
-sha256=bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690
-
-[http://heanet.dl.sourceforge.net/mad/libmad-0.15.1b.tar.gz]
-md5=1be543bc30c56fb6bea1d7bf6a64e66c
-sha256=bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690
-
-[http://qa.debian.org/watch/sf.php/mad/libmad-0.15.1b.tar.gz]
-md5=1be543bc30c56fb6bea1d7bf6a64e66c
-sha256=bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690
-
-[http://projects.o-hand.com/matchbox/sources/libmatchbox/1.2/libmatchbox-1.2.tar.bz2]
-md5=cf28ace4e666a8a9875c2397aa1ef9fd
-sha256=fc4fd138fe7efcbedd84ac99bb6dd2fa68ac44268c1bfc13712a2f051428a3ae
-
-[http://projects.o-hand.com/matchbox/sources/libmatchbox/1.3/libmatchbox-1.3.tar.bz2]
-md5=5c51480071ed590c38fd63ccaa517934
-sha256=f10daa2aee157605611c0ca3c0692e1ee9648c753c6999518d166f968a27f40b
-
-[http://projects.o-hand.com/matchbox/sources/libmatchbox/1.4/libmatchbox-1.4.tar.bz2]
-md5=6e667e5b963f64dd508080ed85a3354e
-sha256=9217887fbe9c0d75b92a5316042702cd676569c4444482aa21a4f549f6267627
-
-[http://projects.o-hand.com/matchbox/sources/libmatchbox/1.5/libmatchbox-1.5.tar.gz]
-md5=db2145115042fe1c8257a3f3c1437167
-sha256=1d5f4cd19fad6184dd1a7f149674954965af8aaf3a3f3cd17988e1ce0d6ba832
-
-[http://projects.o-hand.com/matchbox/sources/libmatchbox/1.6/libmatchbox-1.6.tar.gz]
-md5=239932b294cd29690b3358110301144a
-sha256=70a03ad0d377201f2d96204b8a0f87db6dd242d6abe3c4e5a39efd2c752c7124
-
-[http://projects.o-hand.com/matchbox/sources/libmatchbox/1.7/libmatchbox-1.7.tar.gz]
-md5=71dde5a06df6c755ed33f111aecaaf8c
-sha256=666ba9284bbdd91946c64cf2dc1bdab3e8290bb71af86881c157629e1cbd68fd
-
-[http://projects.o-hand.com/matchbox/sources/libmatchbox/1.8/libmatchbox-1.8.tar.gz]
-md5=8a91deea65388002bbd75c965e5b9d6f
-sha256=58169f20fa59b3f2a41ee39191d6f4ee7a121e63a3aba241e3323952054703fb
-
-[http://projects.o-hand.com/matchbox/sources/libmatchbox/1.9/libmatchbox-1.9.tar.gz]
-md5=465fa15c43bf0091a3810e7702fe143f
-sha256=f7054f93c57ba6b758d0e4f47d4d2dd96a7fe487e1157eb70a4d642910275aea
-
-[http://www.matthew.ath.cx/projects/java/libmatthew-java-0.7.1.tar.gz]
-md5=6a4db221129f230c64a0f937d00bb703
-sha256=003c44be21859d1495c0571e249ce17edd5ac58636f67b6a8bc4f395a6c7e6a2
-
-[ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.4.2.tar.gz]
-md5=2853d8f32417e3c5f3b18fda38f96e52
-sha256=1e095469f7d159e5b9c91106484e10f0b3ce3265c55b9864407bd4ea5952111f
-
-[http://mikmod.raphnet.net/files/libmikmod-3.1.11.tar.gz]
-md5=705106da305e8de191549f1e7393185c
-sha256=2d7598cd2a8c61c023f27c9c7c1aca8bbfd92aadbee2f98b7a6d421eae35c929
-
-[http://downloads.sourceforge.net/mikmod/libmikmod-3.1.12.tar.gz]
-md5=9f3c740298260d5f88981fc0d51f6f16
-sha256=891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32
-
-[http://heanet.dl.sourceforge.net/mikmod/libmikmod-3.1.12.tar.gz]
-md5=9f3c740298260d5f88981fc0d51f6f16
-sha256=891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32
-
-[http://qa.debian.org/watch/sf.php/mikmod/libmikmod-3.1.12.tar.gz]
-md5=9f3c740298260d5f88981fc0d51f6f16
-sha256=891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32
-
-[http://mikmod.raphnet.net/files/libmikmod-3.2.0-beta2.tar.gz]
-md5=19fc0879aebd1610813a23bd84726362
-sha256=857b66ef04d695f70414188b985e08b04f1f62cc250d72a43d0e0609dfbdba03
-
-[http://www.rittau.org/mimedir/libmimedir-0.3.1.tar.gz]
-md5=0ae54d1b2ddcd37f66bf60e4c034de51
-sha256=ac400327f564031b0297ea86bd1b0466ceb8ee60138ccb186791375a5d947d77
-
-[http://gpe.linuxtogo.org/download/source/libmimedir-0.4.2.tar.gz]
-md5=f1e314b35923a3786e4f32b75d3d605a
-sha256=dbe106443b7221b50bd50fe9463fe233dbaf6ee15f052cceedd382dedd021510
-
-[http://gpe.linuxtogo.org/download/source/libmimedir-snapshot-20040307.tar.gz]
-md5=7c24a8ec76ad3342c642ac32976c8b04
-sha256=9841831972bebef827348a9f9b0875d8dd0f5079b0f1cb6b8283ceb43befd584
-
-[http://downloads.sourceforge.net/libmng/libmng-1.0.8.tar.gz]
-md5=d688ca879c934e9cde8b323cf3025f89
-sha256=321c2dc105dfbe61ddde859040c79dec65e4daef8fb44167484d1ce99119c14c
-
-[http://heanet.dl.sourceforge.net/libmng/libmng-1.0.8.tar.gz]
-md5=d688ca879c934e9cde8b323cf3025f89
-sha256=321c2dc105dfbe61ddde859040c79dec65e4daef8fb44167484d1ce99119c14c
-
-[http://downloads.sourceforge.net/modplug-xmms/libmodplug-0.7.tar.gz]
-md5=b6e7412f90cdd4a27a2dd3de94909905
-sha256=c80da366576501be18a987c28609bd8ffa340ed20fc03249c70c43634f077052
-
-[http://downloads.sourceforge.net/modplug-xmms/libmodplug-0.8.4.tar.gz]
-md5=091bd1168a524a4f36fc61f95209e7e4
-sha256=84890249b3ecf12ef040b9121b6238248fc8da0fee948661d70375049e5131ee
-
-[http://downloads.sourceforge.net/modplug-xmms/libmodplug-0.8.7.tar.gz]
-md5=d2d9ccd8da22412999caed076140f786
-sha256=3cfdebb60833a082e2f2b8faa3892bc9201d05c64051503e8007d8c98ae9e4c2
-
-[http://downloads.sourceforge.net/modplug-xmms/libmodplug-0.8.tar.gz]
-md5=cea399626e2a074e2a77c8cd98387a48
-sha256=ef2269cc4ba5c8574d38321349d76063c6b200857f0c9256ea97e608583e8857
-
-[http://heanet.dl.sourceforge.net/modplug-xmms/libmodplug-0.8.tar.gz]
-md5=cea399626e2a074e2a77c8cd98387a48
-sha256=ef2269cc4ba5c8574d38321349d76063c6b200857f0c9256ea97e608583e8857
-
-[http://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2]
-md5=7f7a060e83b4278acf4b77d7a7b9d2c0
-sha256=4bd54929a80850754f27b568d7891e1e3e1b8d2f208d371f27d1fda09e6f12a8
-
-[http://downloads.sourceforge.net/musicpd/libmpd-0.17.96.tar.gz]
-md5=dfbe478c4d4e9bf8e450c7349e104e2a
-sha256=f7e11c6137a1628d63985799ebcb78577832fca3ca4aeb2fc53d0e667cf699c0
-
-[http://www.autistici.org/bakunin/libmrss/libmrss-0.17.2.tar.gz]
-md5=54935c6cff42df2f1daada267b701392
-sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1
-
-[http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz]
-md5=a6f66b72898d27270e3a68007f90d62b
-sha256=071416adcae5c1a9317a4a313f2deb34667e3cc2be4487fb3076528ce45b210b
-
-[http://gpephone.linuxtogo.org/download/gpephone/libmsgenabler-1.0/libmsgenabler-1.0.tar.bz2]
-md5=32f04482d3905f05a4f36ac946e7f95d
-sha256=c8568dbd5d3ffa200bf81ffbc7baf94902b41998d5c65455a1fbadce15db9953
-
-[http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.2.tar.gz]
-md5=88d35af903665fecbdee77eb6d5e6cdd
-sha256=f40f0318e8c8f7eee802de91ee8a9b5673c0f28a15527883bd20826e74dff54c
-
-[http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.3.tar.gz]
-md5=330cb7e3da57d7a4800bdc22e4608c51
-sha256=e9e3f157c5c75acef702da9b41c17daa7ea7bb8d0952e6c6960f26980497477e
-
-[http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.5.tar.gz]
-md5=d5e19bb77edd6ea798ce206bd05ccc5f
-sha256=c6629c4bed428f9df3f89efc065b2d96f05eba36286532ebe8b8e404022371a0
-
-[http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-3.0.1.tar.gz]
-md5=d42110ae548dae1eea73e83b03a1a936
-sha256=243311225a6bdcee065aaabc63334086cdd4298f13def45c7e798201f88d08cc
-
-[ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-3.0.2.tar.gz]
-md5=648ecd43f7b80852419aaf73702bc23f
-sha256=b9a35e56826239add731cf083108cbc313d4a2d1770e6f5006966daa66a21eda
-
-[ftp://ftp.debian.org/debian/pool/main/libn/libnet0/libnet0_1.0.2a.orig.tar.gz]
-md5=bf4983ea440542f3ec019cc1bb6ca87d
-sha256=cf6bf75d590884fa9d0725d4d86afa93211e29cf0c5f333a60bb4e4eb347dc29
-
-[ftp://ftp.nl.debian.org/debian/pool/main/libn/libnet0/libnet0_1.0.2a.orig.tar.gz]
-md5=bf4983ea440542f3ec019cc1bb6ca87d
-sha256=cf6bf75d590884fa9d0725d4d86afa93211e29cf0c5f333a60bb4e4eb347dc29
-
-[ftp://ftp.us.debian.org/debian/pool/main/libn/libnet0/libnet0_1.0.2a.orig.tar.gz]
-md5=bf4983ea440542f3ec019cc1bb6ca87d
-sha256=cf6bf75d590884fa9d0725d4d86afa93211e29cf0c5f333a60bb4e4eb347dc29
-
-[ftp://ftp.debian.org/debian/pool/main/libn/libnet/libnet_1.1.2.1.orig.tar.gz]
-md5=be845c41170d72c7db524f3411b50256
-sha256=ab01882a3d0556176018c09342cd0731f7cbc8e687795009894c3326942c76ff
-
-[ftp://ftp.nl.debian.org/debian/pool/main/libn/libnet/libnet_1.1.2.1.orig.tar.gz]
-md5=be845c41170d72c7db524f3411b50256
-sha256=ab01882a3d0556176018c09342cd0731f7cbc8e687795009894c3326942c76ff
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/libn/libnet/libnet_1.1.2.1.orig.tar.gz]
-md5=be845c41170d72c7db524f3411b50256
-sha256=ab01882a3d0556176018c09342cd0731f7cbc8e687795009894c3326942c76ff
-
-[ftp://ftp.us.debian.org/debian/pool/main/libn/libnet/libnet_1.1.2.1.orig.tar.gz]
-md5=be845c41170d72c7db524f3411b50256
-sha256=ab01882a3d0556176018c09342cd0731f7cbc8e687795009894c3326942c76ff
-
-[http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-0.0.13.tar.bz2]
-md5=660cbfd3dc8c10bf9b1803cd2b688256
-sha256=1d6b180272befbfb19fedd80b5641354b82d6e719bf3d9ffa2d8287c62046536
-
-[http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-0.0.16.tar.bz2]
-md5=b36664e6cd39edbfe46b416a86118add
-sha256=977491a20928cd40fa91a51b99c625fe0aa7efb47d4207a551b5f2f5e5e4c391
-
-[http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-0.0.30.tar.bz2]
-md5=7fd3c8ddc03d42fa9f0177a17a38f163
-sha256=a6a336a5b3e063748d93ae910bbf6b2d36ead9f9ecd6011b14325b8814b54bc2
-
-[http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-0.0.39.tar.bz2]
-md5=348fed8c1edbe5b873ffc7b192140093
-sha256=9cd2317dac67fd2161565a21c7b3f9f43b6b6cd93441233226310478ffd4bf50
-
-[http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.20.tar.gz]
-md5=9233cb77876eb642374a0d2bcaba1170
-sha256=c2ae0a07d863536261b8a0562f3f77aa224fa1f413d85d824a765d00e37c5de4
-
-[http://nice.freedesktop.org/releases/libnice-0.0.6.tar.gz]
-md5=055e3eedf735ee1257fd4bb9ce86d04e
-sha256=adf3612367456328609c65ecc39c9bb08c0fef84cebbd1a3b5fcfe5e9614ac82
-
-[http://downloads.sourceforge.net/libnids/libnids-1.18.tar.gz]
-md5=9ee6dcdfac97bae6fe611aa27d2594a5
-sha256=b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd
-
-[http://heanet.dl.sourceforge.net/libnids/libnids-1.18.tar.gz]
-md5=9ee6dcdfac97bae6fe611aa27d2594a5
-sha256=b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd
-
-[http://people.suug.ch/~tgr/libnl/files/libnl-0.5.0.tar.gz]
-md5=c58ec5032f393f569ef7f489436651b3
-sha256=89a6b5086987460ddd9b24723f35a3a951ccf2886cabe26bef89b8c53528fec5
-
-[http://people.suug.ch/~tgr/libnl/files/libnl-1.0-pre6.tar.gz]
-md5=0f57cb7085dc27e054691bff858613c9
-sha256=c1d5b4edeb1f2b20ce35ab13b2c0464b6e03a43934d626161a780578bbbb8161
-
-[http://people.suug.ch/~tgr/libnl/files/libnl-1.1.tar.gz]
-md5=ae970ccd9144e132b68664f98e7ceeb1
-sha256=35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3
-
-[http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.2.tar.gz]
-md5=25585318503079a513af7064bb59c04d
-sha256=9e95499badd1b0da67b1422caa4198dbe61c961300b7001173eace18b8b2c38e
-
-[http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.3.tar.gz]
-md5=5c81a26b461b2abd4c02a918b8486539
-sha256=15b0492ac252f6e8ce57c106bda0722413196d16d198c97f20a05908d1b977af
-
-[http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.4.tar.gz]
-md5=ba76f68b7e3bd284ac2c2a1b9c5ecb06
-sha256=2389a9b8220f776033f728a8d46352cfee5c8705066e34887bfb188f9f0d3856
-
-[http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.5.tar.gz]
-md5=472e2c1f808848365572a9b024d9e8f5
-sha256=0799db8ea1500b65a477421a8c930cc8c8b0bbc0596e55ea1601e2542f3fb0d9
-
-[http://www.netsurf-browser.org/projects/releases/libnsbmp-0.0.1-src.tar.gz]
-md5=61e1e5703580c1bc7d950a1aacea7bad
-sha256=424d12aae7a6ea8c90438cf4ccff486dc01a3a2a7b68eb602ee2b8c28178b6d1
-
-[http://www.netsurf-browser.org/projects/releases/libnsgif-0.0.1-src.tar.gz]
-md5=a547da766fccacd00fd05190baf644da
-sha256=54f316f530caaacd55dc23f546537759382a45ac6378ead249b5a5d51cf4db52
-
-[http://www.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz]
-md5=85b6a42a9e17a23c01b2f2ed0ece0563
-sha256=6154872089834b0ffd34e92612d07e2d1ccec572698bd861da752eeeaab7ca78
-
-[http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz]
-md5=857f43970e7f0724d28f4ddc87085daf
-sha256=0f9460e3ba16b347001caf6843f0050f5482e36ebcb307f709259fd6575aa547
-
-[http://www.vorbis.com/files/1.0/unix/libogg-1.0.tar.gz]
-md5=382a7089f42e6f82e7d658c1cb8ee236
-sha256=920fa2a0924d66884825d36a2e843de069cfdf1af01945d05da25999bbd6396c
-
-[http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz]
-md5=eaf7dc6ebbff30975de7527a80831585
-sha256=bae29e79fbc50bbedf1235852094b71c8c910a1ef0cd42fe4163b7b545630b65
-
-[http://downloads.xiph.org/releases/ogg/libogg-1.1.4.tar.gz]
-md5=10200ec22543841d9d1c23e0aed4e5e9
-sha256=9354c183fd88417c2860778b60b7896c9487d8f6e58b9fec3fdbf971142ce103
-
-[http://www.vorbis.com/files/1.0.1/unix/libogg-1.1.tar.gz]
-md5=461d7097bf47864b872085a94ff94e10
-sha256=01453d561255b5fcb361997904752860e4f8c6b9742f290578a44615fcc94356
-
-[http://liboil.freedesktop.org/download/liboil-0.3.10.tar.gz]
-md5=770f656bca8166dab33b322d5886a4bf
-sha256=4587753a023550a066abe59a7e467c1af35b9f5e81bfb40a12463ad2df8f088c
-
-[http://liboil.freedesktop.org/download/liboil-0.3.11.tar.gz]
-md5=65ce3266be385d0c7cd9a1157433332f
-sha256=deb6530d40ecad2b849d68912500e6d03bab4ac63de7a97340d05af1d7cf0ad4
-
-[http://liboil.freedesktop.org/download/liboil-0.3.14.tar.gz]
-md5=7a9f719e50656b795c06c0167012a84f
-sha256=a40c09db6ee24e03aa81f58329a57e45e55462a2e0f619b3796d4bf942c23f2f
-
-[http://liboil.freedesktop.org/download/liboil-0.3.15.tar.gz]
-md5=11dd39b1ca13ce2e0618d4df8303f137
-sha256=ae5e3b03a72dd4d12accbe7a6022e4e8570fa309defec9846341384d0a657fd4
-
-[http://liboil.freedesktop.org/download/liboil-0.3.9.tar.gz]
-md5=5d139b1fb16f0e93f0c84290ad2aaff8
-sha256=dd4d680ce95e586a1bbe767e1a7b25e1c53f842b8be6cf4e30e89cfa8232dd90
-
-[http://www.balabit.com/downloads/files/libol/0.3/libol-0.3.16.tar.gz]
-md5=1f29be3f4bcddb5b2f3d965e78f04006
-sha256=68bebda39f43fd5fa13b4011a91c40b2684fe262af2a409e282f7d9a7d28ec9e
-
-[http://www.balabit.com/downloads/libol/0.3/libol-0.3.16.tar.gz]
-md5=1f29be3f4bcddb5b2f3d965e78f04006
-sha256=68bebda39f43fd5fa13b4011a91c40b2684fe262af2a409e282f7d9a7d28ec9e
-
-[http://www.balabit.com/downloads/files/libol/0.3/libol-0.3.18.tar.gz]
-md5=cbadf4b7ea276dfa85acc38a1cc5ff17
-sha256=9de3bf13297ff882e02a1e6e5f6bf760a544aff92a9d8a1cf4328a32005cefe7
-
-[http://www.balabit.com/downloads/libol/0.3/libol-0.3.18.tar.gz]
-md5=cbadf4b7ea276dfa85acc38a1cc5ff17
-sha256=9de3bf13297ff882e02a1e6e5f6bf760a544aff92a9d8a1cf4328a32005cefe7
-
-[http://xorg.freedesktop.org/releases/individual/lib/liboldX-1.0.1.tar.bz2]
-md5=6b81ffe486d76c380d08f92285758d84
-sha256=1091d301f5e28f84e5d755a5cde9d2f7edb82b799d051522751874571e10340f
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/liboldX-X11R7.0-1.0.1.tar.bz2]
-md5=a443a2dc15aa96a3d18340a1617d1bae
-sha256=98a06dfb046c0bf064c12361333a88c6f624df311d8acbc0d25c93fdd6f2c1fe
-
-[http://downloads.sourceforge.net/omxil/libomxil-B-0.3.3.tar.gz]
-md5=2003ba5397e6d7f5446c03b2321b7b3e
-sha256=ad2336edd245788a528e55555e92a11bd434360fb7ff092e9edaeafb0442f3ab
-
-[http://downloads.sourceforge.net/omxil/libomxil-bellagio-0.9.0.tar.gz]
-md5=6d6b6a75bc8751a7421b5e739c53ef6e
-sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c
-
-[http://heanet.dl.sourceforge.net/omxil/libomxil-bellagio-0.9.0.tar.gz]
-md5=6d6b6a75bc8751a7421b5e739c53ef6e
-sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c
-
-[http://downloads.sourceforge.net/omxil/libomxil-bellagio-0.9.1.tar.gz]
-md5=757371e21e4f3653ce4d12d3ba0be1e0
-sha256=9a0864cd442c43e5b69072dc0617b56252bc933fce26f6bfd6d47909287a353a
-
-[http://downloads.sourceforge.net/omxil/libomxil-bellagio-0.9.2.tar.gz]
-md5=42ab7383c4ca4093000ec7062289112b
-sha256=dc5d3cf256390d5419ea7dc3fc35761999a1da99fa4b645ac3e92a6a279c38fc
-
-[http://ftp.gnome.org/pub/GNOME/sources/liboobs/2.22/liboobs-2.22.0.tar.bz2]
-md5=1b090ecd6c0df58b131795ff9a5c9057
-sha256=b35760855d7d1def532e9e808cecde29b75cec455b238590072abf4a8206536e
-
-[http://download.ofb.net/liboop/liboop-1.0.tar.bz2]
-md5=88fc8decf99fd75d2af40e0a005fa0d3
-sha256=4a973d28466fde0b689099192f9bcd081b129d90b3c5a9815e5ade73052cf8d2
-
-[http://libopenraw.freedesktop.org/download/libopenraw-0.0.2.tar.gz]
-md5=eae40ecaa92f69d99b27ae3bad8aa8ae
-sha256=2c3f58a4dff1b74ad93da0468d8806207488134d51b2d81947932a1bca8553ae
-
-[http://ewi546.ewi.utwente.nl/OE/source/libopensync-0.18.tar.gz]
-md5=ce94a69fb7ae7533d1f8828b6402cec8
-sha256=f9c803ba28d5deb18d9feb5c7818ce99325b09204b7dc0447798f2f47a657a46
-
-[http://www.openembedded.org/sources/libopensync-0.20.tar.gz]
-md5=c685e69929333a763c51987b4a19d50d
-sha256=5da9e72de291e7654fb59bf40b647633f3afb3cde924bd11b80d6ed26c911feb
-
-[http://www.opensync.org/attachment/wiki/download/libopensync-0.22.tar.bz2?format=raw]
-md5=f563ce2543312937a9afb4f8445ef932
-sha256=3394bae1e3bcfe463d139a367ba5ebe73d968df128c871842dcb4965a725d0dc
-
-[http://opensync.org/download/releases/0.36/libopensync-0.36.tar.bz2]
-md5=d8cc7835663566e3626e959d8fb531bf
-sha256=c686d27f0818e2d8cc6277ba123c74d7210e70fa2b320c5a828eaaedd598e908
-
-[http://www.opensync.org/attachment/wiki/download/libopensync-plugin-evolution2-0.22.tar.bz2?format=raw]
-md5=c4419dd2451bd1595fe42fcf96a9ba45
-sha256=2a309178a1aafaa147b792502a241e0036889e2f4153065a10313e7db3c26e65
-
-[http://opensync.org/download/releases/0.36/libopensync-plugin-evolution2-0.36.tar.bz2]
-md5=ed3aca114a81ad8cc543b3dd68af657a
-sha256=19f1a24d54daec7b6e1321548799e500893b8aebe6dda995dc8eb162f77932c2
-
-[http://ewi546.ewi.utwente.nl/OE/source/libopensync-plugin-file-0.18.tar.gz]
-md5=a9ffd002169406fb31eee885c9742c26
-sha256=c03ad432d46e8f562ad4eaa08972c5bd229fdc45e5c01ac9af094cbfc38cdf59
-
-[http://www.opensync.org/attachment/wiki/download/libopensync-plugin-file-0.22.tar.bz2?format=raw]
-md5=d600836ab5182751d07ea42c6b997eb4
-sha256=52231306a388f7ad49b273e0a90e3320811cfcad6c222669d05fe92e4c157825
-
-[http://opensync.org/download/releases/0.36/libopensync-plugin-file-0.36.tar.bz2]
-md5=785a79d70e3d6e0637c7f21b2a09987c
-sha256=932726d69b398686b9d6a1e2afd53c537c03ae8a476df1b8b00ba1f8b4abbf44
-
-[http://opensync.org/download/releases/0.36/libopensync-plugin-google-calendar-0.36.tar.bz2]
-md5=69b382845fb62a58e1976bc74a82dd86
-sha256=df3b64322b5f7e0e67317e58b46e9884837a771c69d9513dfb16dafeaeaaa2bb
-
-[http://ewi546.ewi.utwente.nl/OE/source/libopensync-plugin-gpe-0.18.tar.gz]
-md5=6b35732f34aad4becfc24ee500d32c9b
-sha256=218e8d5194d866109db3419c66d071cdbd319446288e7012ed135d4a6b8a3762
-
-[http://ewi546.ewi.utwente.nl/OE/source/libopensync-plugin-irmc-0.18.tar.gz]
-md5=52f86db50d653f5af0adefeb76cf9a31
-sha256=db7250647b86dc8d0bd45c73d454d73ca182c88f6ffe2ccf1760f40be81080f2
-
-[http://www.opensync.org/attachment/wiki/download/libopensync-plugin-irmc-0.22.tar.bz2?format=raw]
-md5=ecec872b2bccd824b1c5cbb2ec1d5399
-sha256=4bed935f596bd5ae11f6263a97e3cd25029a911f7e476e9b8f11b8036d89a0f6
-
-[http://opensync.org/download/releases/0.36/libopensync-plugin-irmc-0.36.tar.bz2]
-md5=21f9789fa41c2f06c547a17bc13c6081
-sha256=f7ccff0bc136d3aa21ab961f31414f4856a94e9f1a1b17c44c8ec33b67ace4ac
-
-[http://opensync.org/download/releases/0.36/libopensync-plugin-moto-0.36.tar.bz2]
-md5=8dcecd4afb87e4645a152194fd3b5e55
-sha256=341c05e78a3254a979c073881cc1b2d3be3eb505a925dc99adc8124a4dd31bc7
-
-[http://opensync.org/download/releases/0.36/libopensync-plugin-palm-0.36.tar.bz2]
-md5=ee05ffadee75094d78a15e2704f5e64f
-sha256=e05b862d11af137e31f28279f7a6356d583cc4adb1293ffedfdcf86728882e52
-
-[http://opensync.org/download/releases/0.36/libopensync-plugin-python-0.36.tar.bz2]
-md5=6247a7e96de3fa55c1fb58b2f364fb5e
-sha256=9ecfa677d155a8e9e2674fabfa76adbeb45b887a321368cdab082618d27603a3
-
-[http://opensync.org/download/releases/0.36/libopensync-plugin-syncml-0.36.tar.bz2]
-md5=3c83493143fbfabf6600aea8d310167c
-sha256=d0db5ccdbf98012a9b70671c7b90cf8eed1f5133ac61563e97d7abf1533dc6e9
-
-[http://opensync.org/download/releases/0.36/libopensync-plugin-vformat-0.36.tar.bz2]
-md5=f3d1efdc1e7142fc74364e92f2066ee0
-sha256=926e6125b4be2d206c6618f8e9445a465df44fe013f23ec339679af307b342c9
-
-[http://handhelds.org/packages/libosip/libosip-0.9.7-hh2.tar.gz]
-md5=ffc20af80f77653ab534d2a103a2276d
-sha256=b67c0218b7cd2d521783bf055b13c598bd04b623cbf4adbb3cc76bd3ac57dc5d
-
-[ftp://ftp.gnu.org/gnu/osip/libosip2-2.2.2.tar.gz]
-md5=40ee3ec89030f0d6dfdb2cf6100e6685
-sha256=4e13febd65a2f8f18cb55151cd10f5f0888bf1e7dc2a4c0d54f39f170255de1c
-
-[ftp://ftp.gnu.org/gnu/osip/libosip2-3.1.0.tar.gz]
-md5=7eb305608256ac2a7a27b66ce52627c8
-sha256=245911a9a48bbe868c4518faf86191f6568fb99d9967d368164a17a83671e8fb
-
-[http://repository.maemo.org/pool/bora/free/source/libosso-gsf_1.11.10.4-1.tar.gz]
-md5=4c5b31154943108ba0fecf00c8af9f3c
-sha256=687f46d5d5eb5ced18534f3cfcfdd82db6b25679437602f1519cae48d019b55d
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/libo/libosso-gsf/libosso-gsf_1.11.10.4-1.tar.gz]
-md5=4c5b31154943108ba0fecf00c8af9f3c
-sha256=687f46d5d5eb5ced18534f3cfcfdd82db6b25679437602f1519cae48d019b55d
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/libo/libosso-gsf_1.11.10.4-1.tar.gz]
-md5=4c5b31154943108ba0fecf00c8af9f3c
-sha256=687f46d5d5eb5ced18534f3cfcfdd82db6b25679437602f1519cae48d019b55d
-
-[http://repository.maemo.org/pool/maemo/ossw/source/libo/libosso-help/libosso-help_1.0.01.tar.gz]
-md5=dbc3c68809e39bd6681aab8ad16ffe3c
-sha256=ef6f6fda31dfbf7b3186b6f1d0ffd12ee0675d9a057ad2994f81b5164213a693
-
-[http://repository.maemo.org/pool/sardine-experimental/main.disabled/source/libo/libosso-help/libosso-help_2.1.2-2.tar.gz]
-md5=fc5a1f4598670cec9ac40fb603f80570
-sha256=ecbff97da422f1498eae8f9b8a17389c0ccdd7eee1ca0259f035e712c8e0a405
-
-[http://repository.maemo.org/pool/maemo4.1/free/libo/libosso-help/libosso-help_2.1.2-3.tar.gz]
-md5=af766ed86b10dc14ed75d7ed256cbc8e
-sha256=3e19a9940c3afb6e55623844f687e7ab0fa5599a1d01313d094f6ea0fe1367a4
-
-[http://repository.maemo.org/pool/maemo/ossw/source/libo/libosso/libosso_0.8.9-1.tar.gz]
-md5=f40c4c73f58cf62859129c3ff08d159d
-sha256=d832126b22dec3a60ee6cdbd476c908f7715fc94d6f1ee11731b1b1ffaf41d47
-
-[http://repository.maemo.org/pool/bora/free/source/libosso_1.20-1.tar.gz]
-md5=6bb3f309371d398d321e52c9e52ca605
-sha256=90febc4d50cb7b383f4afe67aa80acce9a246ba6a927b5bf805e8f401f16b7bd
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/libo/libosso/libosso_2.13-1.1fix.tar.gz]
-md5=92c51a937120eb1f230f84f58ce08da7
-sha256=998a13a713c826a6ddbc69f956fbb78deef18b63e65f450a430df39930bcadb4
-
-[http://repository.maemo.org/pool/maemo4.1/free/libo/libosso/libosso_2.16-1.tar.gz]
-md5=7be17731c65497c3122a562a6e117db4
-sha256=7a61e8b686ae7d659835175018da3a1baa959329b77c18e6e9381a197937296f
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/libp/libpaper/libpaper_1.1.20.tar.gz]
-md5=7075f580606a84e63b7d6d9fa3124c31
-sha256=7ff5f355bb254a3d4ed4541377e6304432ee8678e7c9ec29e7d43488903004c9
-
-[http://downloads.sourceforge.net/parchive/libpar2/libpar2-0.2.tar.gz]
-md5=94c6df4e38efe08056ecde2a04e0be91
-sha256=074fbf840f73b1e13e0405fce261078c81c8c0a4859e30a7bba10510f9199908
-
-[http://www.netsurf-browser.org/projects/releases/libparserutils-0.0.1-src.tar.gz]
-md5=5999c2d52f8c07eeef2a8808fee4f858
-sha256=5aed4edfd2023ed3ccd566fe76131d10faf43c8c3efa2e90978eed37c5503165
-
-[http://www.at.tcpdump.org/release/libpcap-0.9.3.tar.gz]
-md5=0ad921c881fdd3d278046afcd352a151
-sha256=f20d19b1f32e4ee465169ff1e17a3755bfda8c697cfed11fe36cbf6959c80441
-
-[http://www.tcpdump.org/release/libpcap-0.9.3.tar.gz]
-md5=0ad921c881fdd3d278046afcd352a151
-sha256=f20d19b1f32e4ee465169ff1e17a3755bfda8c697cfed11fe36cbf6959c80441
-
-[http://www.tcpdump.org/release/libpcap-0.9.5.tar.gz]
-md5=b0626ad59004fe5767ddd2ce743a2271
-sha256=6a6568bc082c266864687674707628d1531e86cffad439af72b865ac3169c322
-
-[http://www.tcpdump.org/release/libpcap-0.9.6.tar.gz]
-md5=2e1b5e983654c1d5991450e3e0e525ca
-sha256=cac67ef8837a2bdd20d7fb5e990e233d80a9ff398cf08a62bb7fac068a419b3e
-
-[http://www.tcpdump.org/release/libpcap-0.9.8.tar.gz]
-md5=5208f24d0328ee7c20b52c43eaa9aa0e
-sha256=c4158398de4411627b14f52626e4cef39443f4d5c1b9bce8c07f8526d18362f9
-
-[http://www.tcpdump.org/release/libpcap-1.0.0.tar.gz]
-md5=9ad1358c5dec48456405eac197a46d3d
-sha256=a214c4e1d7e22a758f66fe1d08f0ce41c3ba801a4c13dd1188e1e38288ac73c0
-
-[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.10.3.tar.bz2]
-md5=6d5468debf76fac84576ca26c9535821
-sha256=2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc
-
-[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.10.6.tar.bz2]
-md5=ba25eb7582f69428648e8c67564d68e5
-sha256=b9532db51a093221f82e6659ab2979d357eac770d6eb9e9361efead0aca709ce
-
-[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.10.9.tar.bz2]
-md5=685cb20e7a6165bc010972f1183addbd
-sha256=5ccb9683b8be76edfceab4bf006e1cce9018e0d3dea5e54aa72e82798213fead
-
-[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.11.0.tar.bz2]
-md5=686320dcec98daad0bdfb8894d4f2a2b
-sha256=6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab
-
-[http://www.xmailserver.org/libpcl-1.4.tar.gz]
-md5=6d63c462911349de80109c0161ed6d37
-sha256=3c64155a9218c0367f3b0afd4bd8a4a46cc467ad6c85e98952a4ef517b183686
-
-[http://cairographics.org/snapshots/libpixman-0.1.5.tar.gz]
-md5=756107dd2b23553df2f85cd92cab82d5
-sha256=4d18f3d9dbbe877b4cfd240891b711179e2ac8b8ad61392aa309e35d9c912d63
-
-[http://cairographics.org/snapshots/libpixman-0.1.6.tar.gz]
-md5=4af4bbf35840016f40f287a0bb6526b1
-sha256=e4ad16bd198722ba4ea41be77b17fe1c2b6e60de7a96fc4aac6a7b20f3fa448d
-
-[http://downloads.sourceforge.net/libpng/libpng-1.2.12.tar.bz2]
-md5=2287cfaad53a714acdf6eb75a7c1d15f
-sha256=7d06103ce32bffa39730d1c12c4b4dcfd50a8f1c18d2462807cfe7c0c3ca0e64
-
-[http://heanet.dl.sourceforge.net/libpng/libpng-1.2.12.tar.bz2]
-md5=2287cfaad53a714acdf6eb75a7c1d15f
-sha256=7d06103ce32bffa39730d1c12c4b4dcfd50a8f1c18d2462807cfe7c0c3ca0e64
-
-[http://downloads.sourceforge.net/libpng/libpng-1.2.16.tar.bz2]
-md5=7a1ca4f49bcffdec60d50f48460642bd
-sha256=3a14200862cf4fe59fd66340364537d9973b032b7831b7fe33eb827baebc0019
-
-[http://downloads.sourceforge.net/libpng/libpng-1.2.20.tar.bz2]
-md5=8c186d9da3d011e2c3076b28f9c6be7b
-sha256=f5e1037be2cb2a47a7f50181a42fac289a662e78d0ec4c68971f557d5451b8c2
-
-[http://heanet.dl.sourceforge.net/libpng/libpng-1.2.20.tar.bz2]
-md5=8c186d9da3d011e2c3076b28f9c6be7b
-sha256=f5e1037be2cb2a47a7f50181a42fac289a662e78d0ec4c68971f557d5451b8c2
-
-[http://downloads.sourceforge.net/libpng/libpng-1.2.24.tar.bz2]
-md5=1e676c5cc7dfa4ef78affe8fb8f1011d
-sha256=502bbf08f55dc5a3fed9740881930e3b98230004b9f09f6d14f01736d5c4a04d
-
-[http://downloads.sourceforge.net/libpng/libpng-1.2.31.tar.bz2]
-md5=78d2f8c4e0d64f8948819563587302d3
-sha256=24b354dcd8843274a20e1625e04d618d43f9851082254cb9dae6f33f15c2a5cd
-
-[http://heanet.dl.sourceforge.net/libpng/libpng-1.2.31.tar.bz2]
-md5=78d2f8c4e0d64f8948819563587302d3
-sha256=24b354dcd8843274a20e1625e04d618d43f9851082254cb9dae6f33f15c2a5cd
-
-[http://qa.debian.org/watch/sf.php/libpng/libpng-1.2.31.tar.bz2]
-md5=78d2f8c4e0d64f8948819563587302d3
-sha256=24b354dcd8843274a20e1625e04d618d43f9851082254cb9dae6f33f15c2a5cd
-
-[http://downloads.sourceforge.net/libpng/libpng-1.2.35.tar.bz2]
-md5=b8b8d09adf6bee2c5902c8e54c4f2e68
-sha256=cafe6431f9e6d561fb7b396bf94ff73a9cd0f4279f3eea2fc714ab90e345eee6
-
-[http://downloads.sourceforge.net/libpng/libpng-1.2.37.tar.bz2]
-md5=6d1ee0888dbb711214943cb19c294b49
-sha256=682960b55527b54bada90e959c2d42679444a1db43677c77eb645a29645f86d1
-
-[http://downloads.sourceforge.net/libpng/libpng-1.2.40.tar.bz2]
-md5=29bbd1c3cbe54b04bfc2bda43067ccb5
-sha256=a6197352ad5b79a9a1ce0dd59f5e737cfbf909e0f3c5f64631cf0d93549e4e40
-
-[http://downloads.sourceforge.net/libpng/libpng-1.2.41.tar.bz2]
-md5=2faa7f8d81e6a35beb991cb75edbf056
-sha256=a172c5afe4668a31eb090d14be7fc2811a9fec8568a785badd30280f47a27e00
-
-[http://downloads.sourceforge.net/libpng/libpng-1.2.42.tar.bz2]
-md5=9a5cbe9798927fdf528f3186a8840ebe
-sha256=a044c4632a236bbf99527da81977577929a173c1f7f68a70a81ea2ea7cffa6a7
-
-[http://downloads.sourceforge.net/libpng/libpng-1.2.8.tar.bz2]
-md5=00cea4539bea4bd34cbf8b82ff9589cd
-sha256=9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
-
-[http://libproxy.googlecode.com/files/libproxy-0.2.3.tar.gz]
-md5=86b635e1eb2d665cfbef4c6134fe6604
-sha256=59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a
-
-[http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2]
-md5=774eabaf33440d534efe108ef9130a7d
-sha256=004dae11e11598584939d66d26a5ab9b48d08a00ca2d00ae8d38ee3ac7a15d65
-
-[http://xcb.freedesktop.org/dist/libpthread-stubs-0.2.tar.bz2]
-md5=2ba9ce2d46da0a2a1090384ece3387ff
-sha256=d4c47c24e5ec07e974a7ef8f55b2907dd7fa8de82e291a02b15f8c4a7028bf48
-
-[http://gpephone.linuxtogo.org/download/gpephone/librecord-0.1/librecord-0.1.tar.bz2]
-md5=a9e90187c1dc183f497bcae34718e415
-sha256=6fb70d0b8f410f05988e1f3a3e8c86990c3e84c9958041803e6d0658faae91ea
-
-[http://gpephone.linuxtogo.org/download/gpephone/librecord-1.0/librecord-1.0.tar.bz2]
-md5=a487a98a40d64b9f6ee118b10b9cb97a
-sha256=7cadb398c106ba8df3b297e345ab1db750ad058c6c2e78b184f18a7f685bf8ef
-
-[http://gpephone.linuxtogo.org/download/gpephone/librecord2-0.1/librecord2-0.1.tar.bz2]
-md5=782dc4ea50518d5dfce4b47a7c9b56b6
-sha256=7131cf051d6a98d29358ea56a60db3d8e104bf97d9e9473622cc3523391839e5
-
-[http://gpe.linuxtogo.org/download/source/librewrite-0.1.tar.bz2]
-md5=f25a9f8aefde5e2bf0dc5c8318020a00
-sha256=3a892543df587f645911289af7fead594bb161913ce04619360f25cb3adeefad
-
-[http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.11/librsvg-2.11.1.tar.bz2]
-md5=28400811169e8ed3cc31b5bb0e9555af
-sha256=55b6ce75d0526ddf53006ab6838ccc5eb4a04736b7f52d2df081296f4a6e3ac7
-
-[http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.16/librsvg-2.16.0.tar.bz2]
-md5=dc6385e62ed278732146bca5aab74568
-sha256=2a918455246e8541ce737ea499fd0bcfa207d712cb4efa5583031b9c23c51c66
-
-[http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.16/librsvg-2.16.1.tar.bz2]
-md5=37e046571097ff7ce77ae6e07f096324
-sha256=2989d6a969b6f80d354f8120a5dd625d2c0b4e9e04bf178e9e7b34ae28e2ac69
-
-[http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.18/librsvg-2.18.2.tar.bz2]
-md5=4691ad687281e943260021272c28043e
-sha256=ff30a5f1a99c61caebcdce9f59417b3f7a0dbed15c6786368f4a4a1d05c67eb1
-
-[http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.22/librsvg-2.22.2.tar.bz2]
-md5=aae602677ce201b1a0ed6a0c18c207f2
-sha256=2bfc1853ecdc545bf3767ed92c93b8796f2075f522c8eab1693c96f11d55a59e
-
-[http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.26/librsvg-2.26.0.tar.bz2]
-md5=65dbd726a514fe8b797d26254b8efc1e
-sha256=fdcab5f0d86198d8cbd4ffe5b333076f75e707f6d7e4af5e87a8644ff7533bea
-
-[http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.6/librsvg-2.6.5.tar.bz2]
-md5=2d1d16f9493c80ce8214e585727334ae
-sha256=11b97cbc654e366adedc28a93e334d34d46365b09a3adb028449119ab67cd643
-
-[http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.9/librsvg-2.9.5.tar.bz2]
-md5=44799d75e940eb4150acdae4f63cbe2a
-sha256=33a5ae2cf0a4056d46f0f09d4bd464ccfa7fa8768a1f03833e2fad5081b9bba2
-
-[http://downloads.sourceforge.net/librsync/librsync-0.9.7.tar.gz]
-md5=24cdb6b78f45e0e83766903fd4f6bc84
-sha256=6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6
-
-[http://heanet.dl.sourceforge.net/librsync/librsync-0.9.7.tar.gz]
-md5=24cdb6b78f45e0e83766903fd4f6bc84
-sha256=6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6
-
-[http://www.mega-nerd.com/SRC/libsamplerate-0.1.2.tar.gz]
-md5=06861c2c6b8e5273c9b80cf736b9fd0e
-sha256=98b8766323c78b7b718dfd4ef6b9292bbf0796b742abb2319b8278cbeee731d4
-
-[http://www.mega-nerd.com/SRC/libsamplerate-0.1.7.tar.gz]
-md5=ad093e60ec44f0a60de8e29983ddbc0f
-sha256=e0a646224a0323ac63f56ef009b2d7fee11452a7b8af139b19ae71d2890dbc9c
-
-[http://gpe.linuxtogo.org/download/source/libschedule-0.14.tar.gz]
-md5=f4fd8f525e2cd4100db89bd6b4f92934
-sha256=d86d490bada35c041b1134b15f1abc94364c798dedc974d2c5ff2127d1b80487
-
-[http://gpe.linuxtogo.org/download/source/libschedule-0.15.tar.gz]
-md5=58ac7e5b3d9b0a1b8adf0a57fd265c76
-sha256=9b3577052db92ac9282f4912eaa487729de34bf058585cfcbc79478831207889
-
-[http://gpe.linuxtogo.org/download/source/libschedule-0.16.tar.bz2]
-md5=da63b0ed460c0f44b9f85774caf3fb0d
-sha256=a33977201ff13a4c08d3a74de0fcdbe7f072e4a92a261d5f39fbf16aab069050
-
-[http://gpe.linuxtogo.org/download/source/libschedule-0.17.tar.bz2]
-md5=ba3a1063a9e8cd5a730b3871e468c227
-sha256=802c72f5f11d60f5cb75ef8acc116c5ab0600e3bc099fc5accf8a997e463b374
-
-[http://downloads.sourceforge.net/libserial/libserial-0.5.2.tar.gz]
-md5=7a3766e354c31513ff6d7859a4b2c1b8
-sha256=898012c30596bba605cdee76a80dd6a7a42506cc04d0137e23e2c40681573f03
-
-[http://heanet.dl.sourceforge.net/libserial/libserial-0.5.2.tar.gz]
-md5=7a3766e354c31513ff6d7859a4b2c1b8
-sha256=898012c30596bba605cdee76a80dd6a7a42506cc04d0137e23e2c40681573f03
-
-[http://gpephone.linuxtogo.org/download/gpephone/libsettings-0.3/libsettings-0.3.tar.gz]
-md5=9219923ee3f4d465757f23ac0c2be584
-sha256=01c4d4bcf893be8f86007280f231985117c16faf15a007bd6ec41624463abf6b
-
-[http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.10.tar.gz]
-md5=c009b0c89e5cf91dba17261f4cccfc4c
-sha256=e7720307f3fafb210963b6d91c608f25ae2088880260b3e39508c27aab13a3a0
-
-[http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.11.tar.gz]
-md5=33c079a253270ec8bfb9508e4bb30754
-sha256=8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e
-
-[http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.6.tar.gz]
-md5=495d8d986f0caa23b001f8e09d11eaf3
-sha256=835265bb0d39689e8a8580b5ffb53222b3f5f483d58aa533a5c7ebfc3d273d50
-
-[http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.8.tar.gz]
-md5=ddc52cc8196f9f0bf48a5c7569b6bb38
-sha256=83e82b9afe296584a6c9f1f8b3e3a70d324209021e0049f68d28bd1de8c18136
-
-[http://downloads.us.xiph.org/releases/libshout/libshout-2.2.2.tar.gz]
-md5=4f75fc9901c724b712c371c9a1e782d3
-sha256=912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160
-
-[ftp://ftp.uni-frankfurt.de/pub/Mirrors2/gentoo.org/distfiles/libsidplay-1.36.59.tgz]
-md5=37c51ba4bd57164b1b0bb7b43b9adece
-sha256=3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024
-
-[http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-1.36.59.tgz]
-md5=37c51ba4bd57164b1b0bb7b43b9adece
-sha256=3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024
-
-[http://ftp.debian.org/debian/pool/main/libs/libsidplay/libsidplay_1.36.59-5.diff.gz]
-md5=c2945a19ebfc94cb3a04b394ba2e07ed
-sha256=a6b13f25e5e6b91ad490fe9e8afac22c484f372e4e245d397a813ea6563abdb3
-
-[http://downloads.sourceforge.net/libsigc/libsigc++-1.2.5.tar.gz]
-md5=d0d1ffcae0eced97ef4f17ce0ba81352
-sha256=dcd6d3ea9a2c185b5286f80eefe9ac1402036b8fa21cfc742442d99579bd2b3e
-
-[http://heanet.dl.sourceforge.net/libsigc/libsigc++-1.2.5.tar.gz]
-md5=d0d1ffcae0eced97ef4f17ce0ba81352
-sha256=dcd6d3ea9a2c185b5286f80eefe9ac1402036b8fa21cfc742442d99579bd2b3e
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-1.2.7.tar.bz2]
-md5=212f48536019e1f003d2509b4c9b36df
-sha256=d9163d90e259bfde9164c7b218475a7664a7907a1b3197f17bc1035f36112225
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-2.0.17.tar.gz]
-md5=556c5f66c58ef02906e22ab199c35222
-sha256=2023cabe7a502232177c9bdca574e3ad97bd81d2a7badbb427f561e1703ae7db
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-2.0.6.tar.gz]
-md5=9eab84e54790093be3aa93fb4163c4b9
-sha256=25d21557dccebbed2c7ff704fded0399194164d0a5e318791b4594a7db1cfa6b
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/libsigc++-2.2.2.tar.gz]
-md5=e27a20ac9bc9100f48effdfca8e8c595
-sha256=53258864f9fc951c26b491bbc958ebccf4b1cc287cd71209e86e5aff67d0f12e
-
-[http://downloads.sourceforge.net/libsigcx/libsigcx-0.6.4.tar.gz]
-md5=02e78c3cfbdb4be285d97653e563f65a
-sha256=bd55717374674ed69de46c13b52aaba0420d5c68582cac34d863e44f6f1d560e
-
-[http://heanet.dl.sourceforge.net/libsigcx/libsigcx-0.6.4.tar.gz]
-md5=02e78c3cfbdb4be285d97653e563f65a
-sha256=bd55717374674ed69de46c13b52aaba0420d5c68582cac34d863e44f6f1d560e
-
-[ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/libsmi-0.4.8.tar.gz]
-md5=760b6b1070738158708649ed2c63425e
-sha256=f048a5270f41bc88b0c3b0a8fe70ca4d716a46b531a0ecaaa87c462f49d74849
-
-[http://www.mega-nerd.com/libsndfile/libsndfile-1.0.16.tar.gz]
-md5=773b6639672d39b6342030c7fd1e9719
-sha256=79e305112a4d9598b93b614a7747604f9ef10d9a2dee52c5903b554bbeaedd7c
-
-[http://www.mega-nerd.com/libsndfile/libsndfile-1.0.17.tar.gz]
-md5=2d126c35448503f6dbe33934d9581f6b
-sha256=1792e4e60386b450ef8ec07c756e8f3ecfe96ebda7d0b09148da5f436d065ef2
-
-[http://www.mega-nerd.com/libsndfile/libsndfile-1.0.20.tar.gz]
-md5=e0553e12c7a467af44693e95e2eac668
-sha256=7517eb966579f8814b5efe307cb919c5b4e7b5c6729209ba1da95f31e8368dc7
-
-[http://seafelt.unicity.com.au/downloads/libsnmp-0.1.1.tar.gz]
-md5=752653ae88159a00c796c891af334f1b
-sha256=13447233b19f7a9d4e14b362f28f1dbe4bb6652bdc182bba974234b0bc15e791
-
-[http://gpe.linuxtogo.org/download/source/libsoundgen-0.3.tar.gz]
-md5=5a36bc38b8b70a0951fb3acc479503f5
-sha256=d74ed600fab1bf5bab86a4815a5170157607317030bd9316e587486e29e815f8
-
-[http://gpe.linuxtogo.org/download/source/libsoundgen-0.5.tar.bz2]
-md5=de41eed3de2bb441969db8254dc0c889
-sha256=08bc3bf18fdd5b27eb554e3cb0c2f0c2805f470909f21a09df26bc8fb8732fd7
-
-[http://gpe.linuxtogo.org/download/source/libsoundgen-0.6.tar.bz2]
-md5=ce7e2c206c612e2dd09ec42e1179c9a7
-sha256=b4d9050bf46dab0f2f3a47911eac255c08159ab3965f5f10c4ab4e903eee1e31
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.2/libsoup-2.2.100.tar.bz2]
-md5=936e29d705aab0483b9a5b8860f68c13
-sha256=fa9f33e96a11133adbfd10538d95ed9704e582ef334c0a119a2a0bfca302877d
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.2/libsoup-2.2.7.tar.bz2]
-md5=fd1d6bf0ec3e57c8a1498b935d13ace4
-sha256=bd5992ab97ae7da9dafce67a58513580831bb1f8ab61e00daed8c12cd7d7dc3f
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.2/libsoup-2.2.93.tar.bz2]
-md5=08f9c570a4331778da95c0bc317f6bf4
-sha256=9196f6bd888ade327cb475e95187ebd323594b13ddde7c2202e4e5cb16920a19
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.2/libsoup-2.2.96.tar.bz2]
-md5=2704961ca2b9597819f21b40d4a0e0aa
-sha256=e69f4cc9baee9be87400371cbdca1cb03428394c624640e64397089d090dbf0d
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.2/libsoup-2.2.98.tar.bz2]
-md5=c779f84c4add124e704e6ea3ccc4039c
-sha256=d98203f017c6e1de7dca2037c533000705fc86b12f29694ddb4db17854e5498a
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.24/libsoup-2.24.3.tar.bz2]
-md5=118967f097a7e1e9d5023f1f06e0b65a
-sha256=30055988d990f0f4db4dcffd5088115f1065a6fd7c22b555686449628375376b
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.26/libsoup-2.26.0.tar.bz2]
-md5=9df9d2b3304213641d3214a774d75ee1
-sha256=47b749b20717df24393c83adcce9a3a10f0690517c18da8d0a1ddcb410a0ac1d
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.26/libsoup-2.26.2.tar.bz2]
-md5=61abd9bf1435e37def0956248a03832c
-sha256=afcedda15bde2395dec31a82a243871a0540ea2e13e7a14d15846ad0c1f09a7b
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.27/libsoup-2.27.4.tar.bz2]
-md5=c9b676621f1b89245ec5cec0c67198b7
-sha256=4d67aa8d2d3c719b67bde58ca3b8a94aa1d172bc242672401d7f3d22685065b9
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.27/libsoup-2.27.91.tar.bz2]
-md5=58e5518a483fbef0b72f142e63f43e9f
-sha256=b39fd86e555cc530ec587db8860b084e95555e044c0cf8b213e636aff043e4f3
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.28/libsoup-2.28.2.tar.bz2]
-md5=31d7ad416005eed4b78f07ac01b6b9f0
-sha256=9dd1fce9a051f8176e35c263fcb59b10bf4ffb572b78ca23d1f7f266a0ec5300
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.29/libsoup-2.29.3.tar.bz2]
-md5=f2b0f1bfd1657b74f6dfbec20bb94e08
-sha256=4b38450a74b569a63bd36a793de25dd84570e47948bf63889c4b808c9f18cf3e
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.29/libsoup-2.29.5.tar.bz2]
-md5=7ce3eac3d862c963290e2042c2c1c361
-sha256=3718610c6b6ce118c1f61f9dc0e98a439dbfd7bc7ef3f7ce541617fec8fbce2f
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup-2.4/2.4/libsoup-2.4.1.tar.bz2]
-md5=d0fc91ccb9da401e9e40d2f4612bdac9
-sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
-
-[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.4/libsoup-2.4.1.tar.bz2]
-md5=d0fc91ccb9da401e9e40d2f4612bdac9
-sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
-
-[http://downloads.sourceforge.net/libspiff/libspiff-0.7.2.tar.bz2]
-md5=3b291762e0149c975dab9f5ea15bad15
-sha256=6b498c1070e17f665625dc3e5113e8af55da5ce3d4d5abf0ae3fec344b8208d4
-
-[http://downloads.sourceforge.net/libspiff/libspiff-0.8.2.tar.bz2]
-md5=e6505bdff9048bf61533c00caf48d553
-sha256=8451c7182a99f0f4a88b3c19234c5182689f91444c50fcb510452b5e5b8a7805
-
-[http://heanet.dl.sourceforge.net/libspiff/libspiff-0.8.2.tar.bz2]
-md5=e6505bdff9048bf61533c00caf48d553
-sha256=8451c7182a99f0f4a88b3c19234c5182689f91444c50fcb510452b5e5b8a7805
-
-[http://downloads.sourceforge.net/libspiff/libspiff-0.8.3.tar.bz2]
-md5=0f989402e5edcbd84c456be56c856f25
-sha256=8b4ebd22dcfa7511109c2f6fa9e304c2ef3acaa492d55423cdf9a6f54a2fdb22
-
-[http://www.0xbadc0de.be/libssh/libssh-0.11.tgz]
-md5=ad703c4702646c83ca4fcace92c220d3
-sha256=94ca32ac10615a7c0ba19180e67f2e40e2bfa4cc8de6ceb2a3a54d2dd83141cb
-
-[http://www.0xbadc0de.be/libssh/libssh-0.2.tgz]
-md5=8a76c03579a3e27046e6bafe88ffd171
-sha256=46c3831fd563c54283ebef56e2cb11c27f47b1be9f6cb44f1465897dd7aea5ff
-
-[http://snowball.tartarus.org/dist/libstemmer_c.tgz]
-md5=8358a9ddaaffeeca7cb00725770f7cdb
-sha256=f3e93a41ad76e91f08e3115fa5065df8b69fd3f2dbdd9e982ae890b892ac6477
-
-[http://www.etla.net/libstroke/libstroke-0.5.1.tar.gz]
-md5=51b9a4e309ac15cfcab96191eed03cb2
-sha256=0da9f5fde66feaf6697ba069baced8fb3772c3ddc609f39861f92788f5c7772d
-
-[http://cairographics.org/snapshots/libsvg-0.1.4.tar.gz]
-md5=ce0715e3013f78506795fba16e8455d3
-sha256=4c3bf9292e676a72b12338691be64d0f38cd7f2ea5e8b67fbbf45f1ed404bc8f
-
-[http://cairographics.org/snapshots/libsvg-cairo-0.1.5.tar.gz]
-md5=422fe94b86ca92fc8f3a9d7c1e14de0a
-sha256=091f50b57dcd5e755be71ca8932892abccbbf8ae59c7131d5f06108033fec921
-
-[http://cairographics.org/snapshots/libsvg-cairo-0.1.6.tar.gz]
-md5=d79da7b3a60ad8c8e4b902c9b3563047
-sha256=a380be6a78ec2938100ce904363815a94068fca372c666b8cc82aa8711a0215c
-
-[http://ewi546.ewi.utwente.nl/OE/source/libsyncml-0.4.0.tar.gz]
-md5=a6b5becd4b61e246ed2ee95db9f6e746
-sha256=2be78a947bdbfd24aa4f35ae97d2b7bafa60162c5e824cf3dd085b40eddee8ff
-
-[http://libsyncml.opensync.org/download/releases/0.4.6/libsyncml-0.4.6.tar.bz2]
-md5=d524b18c1eafe5805f83e29c01a91b66
-sha256=818740eb5df3cf7913ab7e7979874ccf403831744c89efa4ebaf74c7e2c090bc
-
-[http://downloads.sourceforge.net/libsyncml/libsyncml-0.5.4.tar.gz]
-md5=84879ed7cb94618530fbcb801a1a4f95
-sha256=05d6513637adb1300a3a58b6e29d53ab6373c8f370807d0d925bae72b2920e53
-
-[ftp://ftp.gnutls.org/pub/gnutls/libtasn1/libtasn1-1.7.tar.gz]
-md5=ebfd69b3514d8e8830057f0e9df6a5f9
-sha256=9431f8e41acbeb5b5b89ec87a092b1a1fe9ef0a229a9a90806f4774707ca1f1f
-
-[http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-0.0.53.tar.gz]
-md5=015611ff5cbd3b3718fcb49adc47bd13
-sha256=dfc90b2c92bc313c67d80611945823799581b5b4eb5758d6d77846d4e22666de
-
-[http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-0.0.55.tar.gz]
-md5=2cbbbeaf97c154a7fb9b088b95deb70e
-sha256=53e8740a3a36ece8078b371b95c79646dc69f0ad3ee2665e5fb659412c0baf35
-
-[http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-0.2.0.tar.gz]
-md5=a2083338ed480fd507925e00a93fd96b
-sha256=c33ef2820ea954aa2aa6d048f4540aa75f09cfc4c7915558d736dcedc1b8fa07
-
-[http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-0.3.1.tar.gz]
-md5=594e9999483cdd5cd913b6ea8cf9b076
-sha256=413ac7973fb4a353d98079b4ace1adaa8dcf8ce858113544c1ddb45660441b91
-
-[http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-0.3.3.tar.gz]
-md5=490ca1a0c614d4466394b72d43bf7370
-sha256=e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878
-
-[http://downloads.xiph.org/releases/theora/libtheora-1.0.tar.bz2]
-md5=c963937053f45a7878954bed37ceb182
-sha256=3ae9df56e8fc75ffe26e63a13cae2ce79d079416175fb0baffe0e2de8dc91a6d
-
-[http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.gz]
-md5=55ee3c6db3e0927e7918309891a8f52b
-sha256=f5c7730ded0273a8615b12b46a32b800bbcb9e861e3a18aa92b1c062981a2fef
-
-[http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2]
-md5=292ab65cedd5021d6b7ddd117e07cd8e
-sha256=b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc
-
-[http://downloads.sourceforge.net/tilp/libticables-3.9.2.tar.gz]
-md5=354675bfbd881082a9447efde9935226
-sha256=1c091859f09d5a38c76f0d64a93db46aa2b5d637c8a7370d348f21e7be324c37
-
-[http://heanet.dl.sourceforge.net/tilp/libticables-3.9.2.tar.gz]
-md5=354675bfbd881082a9447efde9935226
-sha256=1c091859f09d5a38c76f0d64a93db46aa2b5d637c8a7370d348f21e7be324c37
-
-[http://downloads.sourceforge.net/tilp/libticalcs-4.5.9.tar.gz]
-md5=8e93f2a4f4e67a9558d97166b4a4155f
-sha256=d9bc0f2f19eb8d21d8319a40dd85c2b1ef45a01499187a424a50173bbdd4ff12
-
-[http://heanet.dl.sourceforge.net/tilp/libticalcs-4.5.9.tar.gz]
-md5=8e93f2a4f4e67a9558d97166b4a4155f
-sha256=d9bc0f2f19eb8d21d8319a40dd85c2b1ef45a01499187a424a50173bbdd4ff12
-
-[http://downloads.sourceforge.net/tilp/libtifiles-0.6.5.tar.gz]
-md5=cfac4188328b888e80995f0ef3f6e0bf
-sha256=2216944bee1bafe60bf64ec01f6b8cd27ed9adfd2d1a185b43617d6e80d8b2c8
-
-[http://heanet.dl.sourceforge.net/tilp/libtifiles-0.6.5.tar.gz]
-md5=cfac4188328b888e80995f0ef3f6e0bf
-sha256=2216944bee1bafe60bf64ec01f6b8cd27ed9adfd2d1a185b43617d6e80d8b2c8
-
-[http://tinymail.org/files/releases/pre-releases/v0.0.1/libtinymail-0.0.1.tar.bz2]
-md5=fea9081686f1157157fd2b0e68b9aeee
-sha256=40bc855073422f893a919896a915e1f3d98f24a269c4c38be0072ad76feb5ca4
-
-[http://tinymail.org/files/releases/pre-releases/v0.0.3/libtinymail-0.0.3.tar.bz2]
-md5=de3fd5f8c838ba9c876783d21ebf43bb
-sha256=e234d314f0bdfcc54f52111519624fcd3d1ff37a267c39848b5de7a272367976
-
-[http://tinymail.org/files/releases/pre-releases/v0.0.5/libtinymail-0.0.5.tar.bz2]
-md5=8c8d1f7378734231fd0458569346b9d4
-sha256=9269060f1a8c36c66748520a44d6ffc5059ae736de1e282bb8b6fd65d7890813
-
-[http://tinymail.org/files/releases/pre-releases/v0.0.9/libtinymail-0.0.9.tar.bz2]
-md5=674db3cb4750ba0a3e90aa95ec28bcc7
-sha256=82c4fa4315807af48ed0585b6efd03a42022016364474ead931634e689bce9a5
-
-[http://gpe.linuxtogo.org/download/source/libtododb-0.07.tar.gz]
-md5=5df2e1f7564d066dce6ec24344605528
-sha256=bc3fb1a20ec97149f6e81285a22bdc48fea9c4fbc9abad6919b87ce2f44acbc3
-
-[http://gpe.linuxtogo.org/download/source/libtododb-0.08.tar.gz]
-md5=90b0b326aea78019aff9b85b37b99cc2
-sha256=4dc7c72cf11407ab6e7edddf09273d82fa46b3662077473503b75a69972140b1
-
-[http://gpe.linuxtogo.org/download/source/libtododb-0.09.tar.bz2]
-md5=5a45e6b0a84b1ad0bb7fddb2d11cd9ad
-sha256=8b8ed9c5d14330b5f6c79def8b54656b3e5241f2c5bd22e8fdc975af028f8f89
-
-[http://gpe.linuxtogo.org/download/source/libtododb-0.10.tar.bz2]
-md5=9d2fe77ad48a31476896dddc55eddda5
-sha256=f4e06f992f3237ad974a931c8c86e43b1025ffdc1fddc1f2cc98b77c8315b0ad
-
-[http://gpe.linuxtogo.org/download/source/libtododb-0.11.tar.bz2]
-md5=d3fa3b6093eefdb374a78f0fa5d2eb9a
-sha256=8841680d9de5b30637719f62cf1c45579700e8eadb5d35b3ece5a637ee85d488
-
-[http://keihanna.dl.sourceforge.jp/tomoe/17171/libtomoe-gtk-0.1.0.tar.gz]
-md5=e9b887189ee408902a0f85d9b1cde06f
-sha256=de00404262d5601edd953d2c83adc8e4897c2a34dfa2d8248f521136c266cc52
-
-[ftp://ftp.gnu.org/gnu/libtool/libtool-1.5.10.tar.gz]
-md5=e2093a85f6d48f1562c36920087502d6
-sha256=6524e6d7a4adbda7fcda27ecd7b08bbeab88ad59d81bc6b166c617530f3dee1a
-
-[ftp://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz]
-md5=8e0ac9797b62ba4dcc8a2fb7936412b0
-sha256=88e9ffaaade21c1ddaf6297723dd2fb4ca18ccaef0499a28b6e672f02c8ceb5d
-
-[ftp://ftp.gnu.org/gnu/libtool/libtool-1.5.24.tar.gz]
-md5=d0071c890101fcf4f2be8934a37841b0
-sha256=1e54016a76e9704f11eccf9bb73e2faa0699f002b00b6630df82b8882ff2e5b2
-
-[ftp://ftp.gnu.org/gnu/libtool/libtool-1.5.6.tar.gz]
-md5=f9b709f4ac6d094afdee9cdbe1c6ffe7
-sha256=eb95567b78f00208c4932b8ea2f157059db9b58efcec515fa62c5bcb95670f04
-
-[ftp://ftp.gnu.org/gnu/libtool/libtool-2.2.2.tar.gz]
-md5=9281a5f1976da110be872b1ba048d8ac
-sha256=c3963d969e13588fb142001d5a81c07962dc2ce7c03e2f4f551a29760e844a10
-
-[ftp://ftp.gnu.org/gnu/libtool/libtool-2.2.4.tar.gz]
-md5=0b87e84c7aad3b5e979bbe35312fd4c1
-sha256=b8839214df514d560a202f54c30d1b2e2f443f0798193c9e926c9f9e11218b9c
-
-[ftp://ftp.gnu.org/gnu/libtool/libtool-2.2.6a.tar.gz]
-md5=8ca1ea241cd27ff9832e045fe9afe4fd
-sha256=eb6b8f8272c5a5cad0c7c6b949aa75632f45c295f09b2e1e90b6bce15b32b796
-
-[http://libtorrent.rakshasa.no/downloads/libtorrent-0.12.0.tar.gz]
-md5=76c818b095248ea9e4b140fff4e2fa2a
-sha256=3287c9be61f9ec8ddab99f9b679bbf58610d024bce980307f88151a552ecd1e3
-
-[http://libtorrent.rakshasa.no/downloads/libtorrent-0.12.3.tar.gz]
-md5=db7c7a2236c2f6af5e02cf3e9384eb67
-sha256=6044618e37c2925615a08517e8b69ef84147ef5287a222fc451968b36a0a9be7
-
-[http://libtorrent.rakshasa.no/downloads/libtorrent-0.12.4.tar.gz]
-md5=7e4b4c29a69c86c38e3e60ec11fc2255
-sha256=a48c307fdcc77a28ee3a2ba0b68501a42e3709bf693c52df4831b87c71c8c359
-
-[http://downloads.sourceforge.net/giflib/libungif-4.1.3.tar.bz2]
-md5=8c198831cc0495596c78134b8849e9ad
-sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36
-
-[http://downloads.sourceforge.net/libungif/libungif-4.1.3.tar.bz2]
-md5=8c198831cc0495596c78134b8849e9ad
-sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36
-
-[http://heanet.dl.sourceforge.net/giflib/libungif-4.1.3.tar.bz2]
-md5=8c198831cc0495596c78134b8849e9ad
-sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36
-
-[http://ftp.gnome.org/pub/GNOME/sources/libunique/1.0/libunique-1.0.8.tar.bz2]
-md5=02b9e41c70ca738e1aa914f400fc1f05
-sha256=d627a10f523af14e9ead655ebab3a26e7faeea006bdfa7739bc4c04058ddf4c6
-
-[http://ftp.gnome.org/pub/GNOME/sources/libunique/1.1/libunique-1.1.2.tar.bz2]
-md5=f33749109768d43ef69ca7e8ffa7cfb7
-sha256=73fb130295fc42b237aa3d808905f65ead9f979acbe49434eca830c6085f0c6e
-
-[http://downloads.sourceforge.net/upnp/libupnp-1.3.1.tar.gz]
-md5=6646be5e31e58188e8f47c6ce64faa4c
-sha256=4d0d6a5302222757fb36ee21d8f8e1b3de849c2de658ab1105272f32ff78767d
-
-[http://heanet.dl.sourceforge.net/upnp/libupnp-1.3.1.tar.gz]
-md5=6646be5e31e58188e8f47c6ce64faa4c
-sha256=4d0d6a5302222757fb36ee21d8f8e1b3de849c2de658ab1105272f32ff78767d
-
-[http://downloads.sourceforge.net/pupnp/libupnp-1.6.5.tar.bz2]
-md5=2b0370e7c405a5bc80880085e6d7d827
-sha256=95b11e2db04c2e714c2f4fb05d9d31351d3388dababd4e1dd5300f4b0d5e8767
-
-[http://heanet.dl.sourceforge.net/pupnp/libupnp-1.6.5.tar.bz2]
-md5=2b0370e7c405a5bc80880085e6d7d827
-sha256=95b11e2db04c2e714c2f4fb05d9d31351d3388dababd4e1dd5300f4b0d5e8767
-
-[http://downloads.sourceforge.net/libusb/libusb-0.1.10a.tar.gz]
-md5=c6062b29acd2cef414bcc34e0decbdd1
-sha256=2f0ed0261074beaa6e060f9539c54017a3f3b4d2b272311e6cf60ba09c4aeadc
-
-[http://heanet.dl.sourceforge.net/libusb/libusb-0.1.10a.tar.gz]
-md5=c6062b29acd2cef414bcc34e0decbdd1
-sha256=2f0ed0261074beaa6e060f9539c54017a3f3b4d2b272311e6cf60ba09c4aeadc
-
-[http://downloads.sourceforge.net/libusb/libusb-0.1.12.tar.gz]
-md5=caf182cbc7565dac0fd72155919672e6
-sha256=37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44
-
-[http://heanet.dl.sourceforge.net/libusb/libusb-0.1.12.tar.gz]
-md5=caf182cbc7565dac0fd72155919672e6
-sha256=37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44
-
-[http://downloads.sourceforge.net/libusb/libusb-0.9.0.tar.bz2]
-md5=a23f06379e05f04a77aec1c1428082a0
-sha256=49aaecc7b8ff57903801745ad56e918b25df8a3839cff526c8a210c5cf5a2995
-
-[http://downloads.sourceforge.net/libusb/libusb-0.9.2.tar.bz2]
-md5=f28e7ae610147a057e481bc731749bc5
-sha256=d112f79489d5deabc0cbb48c6192353d488d9e62c28752eda091f585f2e41176
-
-[http://heanet.dl.sourceforge.net/libusb/libusb-0.9.2.tar.bz2]
-md5=f28e7ae610147a057e481bc731749bc5
-sha256=d112f79489d5deabc0cbb48c6192353d488d9e62c28752eda091f585f2e41176
-
-[http://qa.debian.org/watch/sf.php/libusb/libusb-0.9.2.tar.bz2]
-md5=f28e7ae610147a057e481bc731749bc5
-sha256=d112f79489d5deabc0cbb48c6192353d488d9e62c28752eda091f585f2e41176
-
-[http://downloads.sourceforge.net/libusb/libusb-1.0.0.tar.bz2]
-md5=df2447c23750ef2b4a314200feacc2ee
-sha256=c9bdc5820bc283dcfefba4d4f632c9083adffe5a06c21e089ee123209d229ecf
-
-[http://downloads.sourceforge.net/libusb/libusb-1.0.1.tar.bz2]
-md5=8fb0e066678a0d294894b5b2969cb4b3
-sha256=510b9c7339e878324066ec1cb74c0f67d5df858065155a3239999ff911257d45
-
-[http://downloads.sourceforge.net/libusb/libusb-1.0.2.tar.bz2]
-md5=dc8865eaff167aabe78e5799762b8067
-sha256=9f5737019f3e4c14f68a2f829deb690330e89b634d1337683e453b94137669f1
-
-[http://downloads.sourceforge.net/libusb/libusb-1.0.4.tar.bz2]
-md5=a1f2206f1b4bd800e2461157faaa887f
-sha256=6de182e93c946d432ed04362f0b93d889072438448dad20a21d4fcfa34cffa1d
-
-[http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta1.tar.bz2]
-md5=3d9f7c3966d24c6e2d58becac96e4e27
-sha256=9365108d71cecb78055de4df6eeb2fadf0fe9143ef105bcb6934dcf391983a49
-
-[http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta2.tar.bz2]
-md5=1fd5b9457e662531a48993191c1dfb64
-sha256=4ab03b0d1d41db6a5c4e10c6dd819ad90876e712fd66a2de2b824a2fd3ce7dee
-
-[http://heanet.dl.sourceforge.net/libusb/libusb-compat-0.1.0-beta2.tar.bz2]
-md5=1fd5b9457e662531a48993191c1dfb64
-sha256=4ab03b0d1d41db6a5c4e10c6dd819ad90876e712fd66a2de2b824a2fd3ce7dee
-
-[http://qa.debian.org/watch/sf.php/libusb/libusb-compat-0.1.0-beta2.tar.bz2]
-md5=1fd5b9457e662531a48993191c1dfb64
-sha256=4ab03b0d1d41db6a5c4e10c6dd819ad90876e712fd66a2de2b824a2fd3ce7dee
-
-[http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0.tar.bz2]
-md5=652e1d9e6c6912fd924a5ad204f6d48b
-sha256=69ad5d62946885a60368381a3354b8fd19597bc6fc9ee25b4598977771429b8d
-
-[http://downloads.sourceforge.net/libusb/libusb-compat-0.1.2.tar.bz2]
-md5=efcef8350b47bd63bee65d42a796e14b
-sha256=476eb0d48981ea05e2f82955d59a3445e32be41c0afeb8a2827b9361bb560560
-
-[http://people.atrpms.net/~hdegoede/libv4l-0.5.7.tar.gz]
-md5=a5056dcf337e240e5370984f95d9ad68
-sha256=676840669a82763ccc7b46ba033a6a01df815c46486f7b30916951769331b6d6
-
-[http://people.atrpms.net/~hdegoede/libv4l-0.5.8.tar.gz]
-md5=4f8ae9c743b215c8ac0e553eaa01e980
-sha256=9d006377ec51ca149ed415fbea5c3298b0fe7bae4cbd3bc2f54fd25a24ed9eb2
-
-[http://downloads.sourceforge.net/libvisual/libvisual-0.1.3.tar.gz]
-md5=e70e91d2e90831c0eb78944b6a9605ef
-sha256=fc04f2f2bae4b3eef7eb331330e2e3fd336d1894dbf4cae631c8b635622cdd52
-
-[http://heanet.dl.sourceforge.net/libvisual/libvisual-0.1.3.tar.gz]
-md5=e70e91d2e90831c0eb78944b6a9605ef
-sha256=fc04f2f2bae4b3eef7eb331330e2e3fd336d1894dbf4cae631c8b635622cdd52
-
-[http://downloads.sourceforge.net/libvisual/libvisual-0.4.0.tar.gz]
-md5=f4e78547c79ea8a8ad111cf8b85011bb
-sha256=0b4dfdb87125e129567752089e3c8b54cefed601eef169d2533d8659da8dc1d7
-
-[http://heanet.dl.sourceforge.net/libvisual/libvisual-0.4.0.tar.gz]
-md5=f4e78547c79ea8a8ad111cf8b85011bb
-sha256=0b4dfdb87125e129567752089e3c8b54cefed601eef169d2533d8659da8dc1d7
-
-[http://downloads.sourceforge.net/libvisual/libvisual-plugins-0.1.3.tar.gz]
-md5=9c3012e7a648540ac8c7053a0801830f
-sha256=7f681c64c5940a757a636281915d170d715fc4936e294052957f635ea1af0d67
-
-[http://heanet.dl.sourceforge.net/libvisual/libvisual-plugins-0.1.3.tar.gz]
-md5=9c3012e7a648540ac8c7053a0801830f
-sha256=7f681c64c5940a757a636281915d170d715fc4936e294052957f635ea1af0d67
-
-[http://gpephone.linuxtogo.org/download/gpephone/libvocenabler-0.1/libvocenabler-0.1.tar.gz]
-md5=536cd97488c0882913c097a833cb2ca2
-sha256=748a9a5a1b2e6bf1db4cc767742acf58d836e551e56a493bd34ad759d3bb4f53
-
-[http://www.vorbis.com/files/1.0.1/unix/libvorbis-1.0.1.tar.gz]
-md5=4d6726fd02ce02f6e24824e594b0949a
-sha256=20b3cbdb4b05322d470404a7d2e8cdae1e0ce5372113218ae3cada3b29da70f7
-
-[http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz]
-md5=478646358c49f34aedcce58948793619
-sha256=6eb7040048e35448fe224fa3fd993eb4e49a905c57893886082f1674d43b0e73
-
-[http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.3.tar.gz]
-md5=5aa77f55c0e0aab8eb8ed982335daac8
-sha256=c679d1e5e45a3ec8aceb5e71de8e3712630b7a6dec6952886c17435a65955947
-
-[http://downloads.sourceforge.net/libwbxml/libwbxml-0.10.7.tar.gz]
-md5=ef3e66df3c4223ce5ce0a70ded5c5221
-sha256=24112231e70c21f90348cefeea362de36aa7bace4088355efcbf4efe0dd242d0
-
-[http://downloads.sourceforge.net/libwiimote/libwiimote-0.4.tgz]
-md5=0d8d61dc989d8ad83e1005a26136d388
-sha256=a1e9d45a0d4dd367f1371dd477e30ecaa95e59b9fb8635dc9e7f26e4eb231d90
-
-[http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.10/libwnck-2.10.2.tar.bz2]
-md5=d8276da50ce560c5e66ed94e4238d9ef
-sha256=d03295e5cb22ed7d086ce1ce754c498ed6bc2388c45e4547417d922580d3cd7c
-
-[http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.12/libwnck-2.12.1.tar.bz2]
-md5=f7aad7b8dad79b38d3055d84c3838e2c
-sha256=e881c527398904f450f3983dcebb71094b5f558f823fe57d0af5a4c1fa6f6f7f
-
-[http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.13/libwnck-2.13.5.tar.bz2]
-md5=cb2da2795f517c713ec98560d078a102
-sha256=ce959b7349de056205e992b05c9c914994bc269d2b1d02de85eacd398263aab6
-
-[http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.23/libwnck-2.23.6.tar.bz2]
-md5=9c6d134dc1d454b4c5a717638caa56c6
-sha256=ea7945a131b67d4cf6bd02e41b0008d6aa1575d1aed75a0019d3c63cb61d07ea
-
-[http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.24/libwnck-2.24.0.tar.bz2]
-md5=860cd0ddce03c41a328e580d4efd4654
-sha256=8cf49cf1d882ceb0b7b3a984ec350e5e2e4d608fec97911a0b0acf36a18d4df4
-
-[http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.28/libwnck-2.28.0.tar.bz2]
-md5=a9311661aa954e7c918439b6dd578792
-sha256=d90be36d2fefa33a9287ed6dc41141213a06463f91d69d847da6b2e59c16b947
-
-[http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.8/libwnck-2.8.1.tar.bz2]
-md5=c0a5a8478064287e167c15e3ec0e82a1
-sha256=e9d15538a0bb97f6a440b23a5b372c41387773065dac69cab9fd1dc1d22a432b
-
-[http://downloads.sourceforge.net/libwpd/libwpd-0.8.14.tar.gz]
-md5=64d66018897d759358f454010b6e75d2
-sha256=01744fa637ad16a8ffaefb1aa7b9b42a56e92f0a2a18753f6720a85aa289d4eb
-
-[http://heanet.dl.sourceforge.net/libwpd/libwpd-0.8.14.tar.gz]
-md5=64d66018897d759358f454010b6e75d2
-sha256=01744fa637ad16a8ffaefb1aa7b9b42a56e92f0a2a18753f6720a85aa289d4eb
-
-[http://downloads.sourceforge.net/libwpd/libwpd-0.8.4.tar.gz]
-md5=0461d4bf2da534b4bed041b67d7f7064
-sha256=b6393088bf6c49b72a07d2aec7d84d14f6cab0ab00ad177c17157f03095f2096
-
-[http://heanet.dl.sourceforge.net/libwpd/libwpd-0.8.4.tar.gz]
-md5=0461d4bf2da534b4bed041b67d7f7064
-sha256=b6393088bf6c49b72a07d2aec7d84d14f6cab0ab00ad177c17157f03095f2096
-
-[http://downloads.sourceforge.net/libwpd/libwpd-0.8.6.tar.gz]
-md5=464a390c66511831821de81b887d3e61
-sha256=05a67a8b8d907ebcbac0e8505fc59fc50731ba9f73b8c177898ce41d0575bb17
-
-[http://heanet.dl.sourceforge.net/libwpd/libwpd-0.8.6.tar.gz]
-md5=464a390c66511831821de81b887d3e61
-sha256=05a67a8b8d907ebcbac0e8505fc59fc50731ba9f73b8c177898ce41d0575bb17
-
-[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.808.tar.gz]
-md5=72120d9195ab1649c2d787eb1102a90c
-sha256=22e0778a16bb9ac0526efc99f7e03265e19ca5844aee7540f3f47a643ad5b9e4
-
-[http://xcb.freedesktop.org/dist/libxcb-0.9.91.tar.bz2]
-md5=8bb01876468dd08d8e921e32ec9ff116
-sha256=a54ecc4ff5240876d49ec534a21e6ff682f3602da89b1540f5cd0b6f8e9089b7
-
-[http://xcb.freedesktop.org/dist/libxcb-0.9.92.tar.bz2]
-md5=6f01c8fa200deebb20b019f7401a2606
-sha256=64337d31564f3239ccb8f0d7f8e1c4987f570985af3ab83a38cf9af5736ef9b1
-
-[http://xcb.freedesktop.org/dist/libxcb-0.9.93.tar.bz2]
-md5=7967d0d4347502bc9af5373767afc748
-sha256=106b3747c3c49c2940973b18b487c604a5dffc8995fb02a4c46136d6ff267122
-
-[http://xcb.freedesktop.org/dist/libxcb-0.9.tar.bz2]
-md5=578037c76d791d4623f0f8b3e14fbabc
-sha256=824fed10aea3bfb3504b0c5f4e3a5208ae795e88f64730a5b07d5f5de3e771a8
-
-[http://xcb.freedesktop.org/dist/libxcb-1.0.tar.bz2]
-md5=0eb951fd0fa9542dbe4fc3530b81a3b6
-sha256=19d6b2ac380fd3e613a3730e791f197f186f940bffec97f8a4f9443bb727d11d
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/libxfce4mcs-4.2.2.tar.gz]
-md5=06c3d8ea6826d9a2fbcc1da6b86f1361
-sha256=95b84b2b109f20e0fa6e2489dda55c5931a438ebfa21c8b4238350b0abdd0a6f
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/libxfce4mcs-4.3.99.2.tar.bz2]
-md5=7ee4eab238e773b9dbf3fa1472643f6e
-sha256=8f3cd90d4ea258ffa35b8723c1eae7ace31409baa85361889664084c6c5d1b6d
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/libxfce4mcs-4.4.2.tar.bz2]
-md5=5ffe66a3eeb884839806ce929e5d2776
-sha256=192843e8fdd63e10ba431ca12265c654dbce9677ec9d330038eea462ca0e5c8e
-
-[http://mocha.xfce.org/archive/src/xfce/libxfce4menu/4.6/libxfce4menu-4.6.1.tar.bz2]
-md5=5dc9343885c2c6f931318b2a1cdcc9db
-sha256=5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/libxfce4menu-4.6.1.tar.bz2]
-md5=5dc9343885c2c6f931318b2a1cdcc9db
-sha256=5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/libxfce4util-4.2.2.tar.gz]
-md5=5f27635aa0ba5e40ffaf3031b530b36b
-sha256=8efb3416a37654050089234115fe7db9268c8da0ee0369ff3f5330cef3f15a66
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/libxfce4util-4.3.99.2.tar.bz2]
-md5=4b327c64c292b2e672f69a0789deb2b7
-sha256=988efce9b4fd7252475234be3ca3fe8b737125ebaadc8c448d1c5d4cbc8bb521
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/libxfce4util-4.4.2.tar.bz2]
-md5=261e7a5df039493ad746e0c359211092
-sha256=f717dcdb4d8ee8f967ed0882e82aad06abe66c32481b9954737273312c937a6d
-
-[http://mocha.xfce.org/archive/src/xfce/libxfce4util/4.6/libxfce4util-4.6.1.tar.bz2]
-md5=eac51d58179cbcadc3f802450a8ec9cd
-sha256=ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/libxfce4util-4.6.1.tar.bz2]
-md5=eac51d58179cbcadc3f802450a8ec9cd
-sha256=ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/libxfcegui4-4.2.2.tar.gz]
-md5=e88d6e8379eae60cee6dd6122bf3ae59
-sha256=bdd542e60ffbe4987b5ae765e581fe5bcfdfc4d623341d09aaff7794e90d4454
-
-[http://www.us.xfce.org/archive/xfce/4.2.3/src/libxfcegui4-4.2.3.tar.gz]
-md5=5d2bae78c5ef66e914ae7a930bbdeb57
-sha256=655c8c8657c16cf4fb9400722beb1a65841c0851e27a138c08b1908d5e254142
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/libxfcegui4-4.3.99.2.tar.bz2]
-md5=98679c67ac65c376833deacec9fcbecf
-sha256=a3da5f3b70e65d6679cfb21fd2baf10baedceb8b099347987f9b6c5fa7cd329b
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/libxfcegui4-4.4.2.tar.bz2]
-md5=799a4869138c605126e8e71d58189bfd
-sha256=622c2585f61666d9c46841829ba141e86861c73bd9041a3a73452d1c8df5ee91
-
-[http://mocha.xfce.org/archive/src/xfce/libxfcegui4/4.6/libxfcegui4-4.6.1.tar.bz2]
-md5=539cff747634b8ee6f0d2362ee78a286
-sha256=3468a9cb348bf54f8a0afa386366683eff1987b722d2e81326f9e7ec7dfbe093
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/libxfcegui4-4.6.1.tar.bz2]
-md5=539cff747634b8ee6f0d2362ee78a286
-sha256=3468a9cb348bf54f8a0afa386366683eff1987b722d2e81326f9e7ec7dfbe093
-
-[http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.4.tar.bz2]
-md5=12b4ceb5d42b520228b5fb40a96ae6c5
-sha256=468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae
-
-[http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.5.tar.bz2]
-md5=0726a845fe5a56551de2718c9f6b0e35
-sha256=0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f
-
-[http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.6.tar.bz2]
-md5=b01156e263eca8177e6b7f10441951c4
-sha256=2ca43c1f6b2782994167a328471aa859d366cd7303c6dcbc8bda951a84a06039
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libxkbfile-X11R7.0-1.0.1.tar.bz2]
-md5=0b1bb70a1df474c26dd83feab52e733d
-sha256=2260663af7613e35996e7aa1e8911a062e849619bce88086529031e6c479c9ed
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libxkbfile-X11R7.1-1.0.3.tar.bz2]
-md5=598ce15a8b8c9da26944ab4691df6984
-sha256=65e80effea1d03ef0808393a343ab62e254f6ae0bf8d5ddf80fc26a9fbe6af53
-
-[http://xorg.freedesktop.org/releases/individual/lib/libxkbui-1.0.2.tar.bz2]
-md5=1143e456f7429e18e88f2eadb2f2b6b1
-sha256=20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libxkbui-X11R7.0-1.0.1.tar.bz2]
-md5=1992547d377b510517fc7681207eead5
-sha256=6bdd9529c9c3f37f93f6b6fa51541f380b92639b0456c5328638cc6a426e075c
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/lib/libxkbui-X11R7.1-1.0.2.tar.bz2]
-md5=e66230bc7f369e113112d1d282f7833d
-sha256=a69d690af93646be28228553c05b71d9830e3bf2ea301f6ed369a2c1cddf2ddf
-
-[http://ftp.gnome.org/pub/GNOME/sources/libxklavier/3.7/libxklavier-3.7.tar.bz2]
-md5=ee167645becd11309d64c6ff3a1600ff
-sha256=477b72ba4968e9a49c78e08a5335df7f71f71d787222224345f33f0b888f801b
-
-[http://ftp.gnome.org/pub/GNOME/sources/libxklavier/4.0/libxklavier-4.0.tar.bz2]
-md5=1b714ba04835fb49511f9e1444a5ea4c
-sha256=210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71
-
-[http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.14/libxml++-2.14.0.tar.bz2]
-md5=4f5644788dfd6ba87ce7c9b6cc28890d
-sha256=dcb0cc5d1871e91859071a0bfa9de1a66703f0482ef5fc745300aa1a2df04cbf
-
-[http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.26/libxml++-2.26.0.tar.bz2]
-md5=a52fc7e6e44bb5cc187672930b843f72
-sha256=3287545d7e40bb24451f1afac6c77d545433d7efaf01ca8a60bcf9f6eacaf80a
-
-[http://gpe.linuxtogo.org/download/source/libxsettings-0.11.tar.gz]
-md5=ea623deae839c41ef68c9a31233157ef
-sha256=4cae17ea07445660cedb34a8a0222055954ed67de3d5a527850d8b9e923e3543
-
-[http://gpe.linuxtogo.org/download/source/libxsettings-client-0.12.tar.gz]
-md5=43c0e93e2f96878856ad9475c702b2bb
-sha256=4fa21cc5118b66986f067e064971159849242662f7ad49faeff2d4e20f746bc1
-
-[http://gpe.linuxtogo.org/download/source/libxsettings-client-0.13.tar.gz]
-md5=6a9d49b146abafcc9a7e67baed800cf6
-sha256=3e9f5e5e61611e8df234aedd48286407ae57e40e8f6e6499eb66accb09d6b5c4
-
-[http://gpe.linuxtogo.org/download/source/libxsettings-client-0.16.tar.bz2]
-md5=bd572a17dce9bb5826441a8d1d5f3da5
-sha256=1622c837f0a7fef79b523b07d936bb807404974610a239cf3ada04fce2b13a11
-
-[http://gpe.linuxtogo.org/download/source/libxsettings-client-0.17.tar.bz2]
-md5=2c052bbe613d2d83abad391824b217ad
-sha256=900e9b131bd357a3e6bcc5fe9a94d42018d9cf52e85d1c772a7e69a7f99ea9ab
-
-[http://www.nih.at/libzip/libzip-0.9.tar.bz2]
-md5=56b9f11c1eee5eed189a20183d7e06b0
-sha256=23a8c3624122a3777bb4ac3be4a867fd0bed7f3aacb8f1d0b68fc459cfb035fc
-
-[http://downloads.sourceforge.net/lightblue/lightblue-0.3.3.tar.gz]
-md5=fb3761c8fff39a792035db4767847169
-sha256=90b3271e5ce4de91d3651ba11b92e64fc7afb2a54ebe01826023e5bb2b53a3bc
-
-[https://garage.maemo.org/frs/download.php/4626/lightmediascanner-0.2.0.0.tar.bz2]
-md5=ee1494b6dff3a50be64a3266819056d5
-sha256=98f980e8971fa4d04a589215c3b90d2eaf317ed70fd0d4988089e0fe5808c853
-
-[http://www.lighttpd.net/download/lighttpd-1.4.13.tar.gz]
-md5=d775d6478391b95d841a1018c8db0b95
-sha256=62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739
-
-[http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.18.tar.gz]
-md5=5db3204d57436a032f899ff9dbce793f
-sha256=97d0ac5957745eeaf311ec38ebbbf3b30a5316b01c320a759af47129c994c20c
-
-[http://www.lighttpd.net/download/lighttpd-1.4.18.tar.gz]
-md5=5db3204d57436a032f899ff9dbce793f
-sha256=97d0ac5957745eeaf311ec38ebbbf3b30a5316b01c320a759af47129c994c20c
-
-[http://twibble.org/dist/sh4/src/lilosh/lilo-21.tar.gz]
-md5=1e975d827ad96e1942df73f63512178e
-sha256=da2340aca2eaf451243d2e4c2bf66aa4b80cc0abaef96860da8daf5db1cae12f
-
-[http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-0.6.tar.gz]
-md5=c3e1b6c428218968e2963182c1df1fdc
-sha256=cba8ac22d77bbf8f6ed4a98933242b89ee2426cbc216f54415eafcac1274547a
-
-[http://www.handhelds.org/~aquadran/distro/latest/sources/linda-0.6.tar.gz]
-md5=c3e1b6c428218968e2963182c1df1fdc
-sha256=cba8ac22d77bbf8f6ed4a98933242b89ee2426cbc216f54415eafcac1274547a
-
-[http://downloads.sourceforge.net/lineak/lineakd-0.8.3.tar.gz]
-md5=fc1d3add18afbb8e61b8277b89c525c6
-sha256=cfde4a06df9fb4f26f8629d4ed3320ea813ba05a25217ec4ff55bbe5da04f504
-
-[http://heanet.dl.sourceforge.net/lineak/lineakd-0.8.3.tar.gz]
-md5=fc1d3add18afbb8e61b8277b89c525c6
-sha256=cfde4a06df9fb4f26f8629d4ed3320ea813ba05a25217ec4ff55bbe5da04f504
-
-[http://downloads.sourceforge.net/linknx/linknx-0.0.1.26.tar.gz]
-md5=21956fe0ca7072e08b8fe096c61c4f2d
-sha256=cbc7e781fad9ac4704b7bf24b95e3de480fbcce6884e595109d18d0027d3b2fa
-
-[http://links.twibright.com/download/links-2.1pre26.tar.bz2]
-md5=841af2540c789e254b8465e07e24c684
-sha256=c89f10d42be2a0be8a017e1084897b1aabc5bca76817e9dab43b758dff051c56
-
-[http://links.twibright.com/download/links-2.1pre30.tar.bz2]
-md5=f0f107cc824b71e43f0c6ab620209daf
-sha256=f32314d851e86ec463967ddce78d051e3953b529878cbaeecf882c625ad29c75
-
-[http://www.xora.org.uk/oe/links2.png]
-md5=477e8787927c634614bac01b44355a33
-sha256=eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47
-
-[http://handhelds.org/packages/linphone/linphone-0.12.2.hh1.tar.gz]
-md5=b1e3bdcd92f57aa5f3e68cd84ab330eb
-sha256=460d29f603864281bef60a919e79d84d5477ac14e930da446e765d17f2706a6c
-
-[http://simon.morlat.free.fr/download/0.12.2/source/linphone-0.12.2.tar.gz]
-md5=86c01dbbcdb41786229f51ec0994ff67
-sha256=02b7d27564cb06f56f7fb14cd4a4eb60093c441decfec9b475d892518a5509a1
-
-[http://download.savannah.nongnu.org/releases/linphone/unstable/source/linphone-1.3.99.8.tar.gz]
-md5=5e87231bc214a003a7d2c3a998ea6a8e
-sha256=6855707d72e64ebdec3907fbaaa5d031255cb4b1118159d4b59f26b3704b6929
-
-[http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/linphone-1.5.0.tar.gz]
-md5=e9b01b74a3bb989aa5859d06e56162bd
-sha256=8178dcf9552bf34cbb7098bbe6168fa1780232dbb649a2d1642eda18c87fa06f
-
-[http://download.devbase.at/voip/linphone-1.6.0-pl0.patch]
-md5=e713ab5a1cda18a1bcf01fb2a199ce28
-sha256=9f141c606cc93d0550eeb3532626f26ced56687c2bc9f2b8dad387798b929340
-
-[http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-1.6.0.tar.gz]
-md5=fb345125e23c787df0818ff7caad5515
-sha256=ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b
-
-[http://download.savannah.nongnu.org/releases/linphone/3.1.x/sources/linphone-3.1.0.tar.gz]
-md5=ed40cf4088c306400b005bbd63ac36be
-sha256=e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b
-
-[http://mirror.lihnidos.org/GNU/savannah/linphone/3.1.x/sources/linphone-3.1.0.tar.gz]
-md5=ed40cf4088c306400b005bbd63ac36be
-sha256=e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b
-
-[http://developer.ezaurus.com/sl_j/source/c860/20031107/linux-2.4.18-rmk7-pxa3-embedix-slc860-20031107-rom1_10.bz2]
-md5=d74fc9ea01384bead3925434b932d6b7
-sha256=3dcafe41355fcc688f4a376a5dc71901ea2fbb95698397c87c6a6b12aa058c69
-
-[http://kernel.org//pub/linux/kernel/v2.4/linux-2.4.18.tar.bz2]
-md5=ad92859baaa837847b34d842b9f39d38
-sha256=90d9a45ba395f742050f791b6944f6263d0ab03c84aad8a32967ca866906490e
-
-[http://kernel.org/pub/linux/kernel/v2.4/linux-2.4.18.tar.bz2]
-md5=ad92859baaa837847b34d842b9f39d38
-sha256=90d9a45ba395f742050f791b6944f6263d0ab03c84aad8a32967ca866906490e
-
-[http://kernel.org//pub/linux/kernel/v2.4/linux-2.4.24.tar.bz2]
-md5=1e055c42921b2396a559d84df4c3d9aa
-sha256=9a6c37e048376cd2a9845f6f75cb44fb27c244d719e9d9dd81063a525f081e1f
-
-[http://kernel.org/pub/linux/kernel/v2.4/linux-2.4.24.tar.bz2]
-md5=1e055c42921b2396a559d84df4c3d9aa
-sha256=9a6c37e048376cd2a9845f6f75cb44fb27c244d719e9d9dd81063a525f081e1f
-
-[http://kernel.org//pub/linux/kernel/v2.4/linux-2.4.25.tar.bz2]
-md5=5fc8e9f43fa44ac29ddf9a9980af57d8
-sha256=877af8ed89e56af004bb0662c1a9cfc785b40c602f71a8bf81521991026cf2f0
-
-[http://kernel.org/pub/linux/kernel/v2.4/linux-2.4.25.tar.bz2]
-md5=5fc8e9f43fa44ac29ddf9a9980af57d8
-sha256=877af8ed89e56af004bb0662c1a9cfc785b40c602f71a8bf81521991026cf2f0
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2]
-md5=f00fd1b5a80f52baf9d1d83acddfa325
-sha256=1fa39c202efe168bfeb0ddd74c8e4814f77da7dc78993e47826bad9173b95808
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2]
-md5=f00fd1b5a80f52baf9d1d83acddfa325
-sha256=1fa39c202efe168bfeb0ddd74c8e4814f77da7dc78993e47826bad9173b95808
-
-[http://kernel.org//pub/linux/kernel/v2.6/testing/linux-2.6.12-rc2.tar.bz2]
-md5=b8b75ddeca0f48221f085703f2f72692
-sha256=2e36150665e7268d5dd03b70621a0e80c4f7abb04584694dba540774030f6a54
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc2.tar.bz2]
-md5=b8b75ddeca0f48221f085703f2f72692
-sha256=2e36150665e7268d5dd03b70621a0e80c4f7abb04584694dba540774030f6a54
-
-[http://kernel.org//pub/linux/kernel/v2.6/testing/linux-2.6.12-rc5.tar.bz2]
-md5=0f9afd619a10872b3383362d55c892c3
-sha256=4cc5ca6e2ea8583f026620169e5d6eceb6c620181ba0633efbeb74cdb8c2fc59
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc5.tar.bz2]
-md5=0f9afd619a10872b3383362d55c892c3
-sha256=4cc5ca6e2ea8583f026620169e5d6eceb6c620181ba0633efbeb74cdb8c2fc59
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.12.6.tar.bz2]
-md5=1592bb2a8ec0deb1ff32e8238f25ecc5
-sha256=d8bbdd8064c3564e6ec74fec3332776733e7982e67af66c5311fd1955bf309dd
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.6.tar.bz2]
-md5=1592bb2a8ec0deb1ff32e8238f25ecc5
-sha256=d8bbdd8064c3564e6ec74fec3332776733e7982e67af66c5311fd1955bf309dd
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.12.tar.bz2]
-md5=c5d2a1b62e1dad502c871bba267337d5
-sha256=727b55291a2c52f9f6b9f7ef03b2cd9fc54f7d4d1b0b2baed4c3dd6d9a890c71
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.bz2]
-md5=c5d2a1b62e1dad502c871bba267337d5
-sha256=727b55291a2c52f9f6b9f7ef03b2cd9fc54f7d4d1b0b2baed4c3dd6d9a890c71
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2]
-md5=66d02cbd723876c6d69846a067875a22
-sha256=cc56285834bed461fd405c00a34d3c3095673333b94621580eeeb0c65237af15
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2]
-md5=66d02cbd723876c6d69846a067875a22
-sha256=cc56285834bed461fd405c00a34d3c3095673333b94621580eeeb0c65237af15
-
-[http://files.chumby.com/source/ironforge/build396/linux-2.6.16-chumby-1.2.tar.gz]
-md5=efb128aed7aba5d47b72bfa8d42d97c4
-sha256=69468ffe7dade5448c498230bd67fd5a9b843ef1b11ea3fe7161b2c7fc26ea77
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2]
-md5=9a91b2719949ff0856b40bc467fd47be
-sha256=1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2]
-md5=9a91b2719949ff0856b40bc467fd47be
-sha256=1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2]
-md5=37ddefe96625502161f075b9d907f21e
-sha256=ab0f647d52f124958439517df9e1ae0efda90cdb851f59f522fa1749f1d87d58
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2]
-md5=37ddefe96625502161f075b9d907f21e
-sha256=ab0f647d52f124958439517df9e1ae0efda90cdb851f59f522fa1749f1d87d58
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2]
-md5=296a6d150d260144639c3664d127d174
-sha256=c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2]
-md5=296a6d150d260144639c3664d127d174
-sha256=c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz]
-md5=bc483723670bda09198d72293e712d42
-sha256=eae56a8a9c788518e88604fff343ce6139cecbc7e44356bf1ff4dc7aaf4e9b33
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2]
-md5=ca0ce8f288e8ae93ac243b568f906bf8
-sha256=c55c52caa613d1f25718b35811e4614d9712b9e1de56a91aa73c867f351a540b
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2]
-md5=443c265b57e87eadc0c677c3acc37e20
-sha256=c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2]
-md5=443c265b57e87eadc0c677c3acc37e20
-sha256=c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58
-
-[http://www.at91.com/repFichier/Project-217/linux-2.6.20-at91-exp.diff.bz2]
-md5=691a9fd94de318aebb4b241fcff22cc6
-sha256=4f8529718a45a570cfbf452760009960264028467f398769236b501c9338fc1e
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2]
-md5=34b0f354819217e6a345f48ebbd8f13e
-sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2]
-md5=34b0f354819217e6a345f48ebbd8f13e
-sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
-
-[http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2]
-md5=34b0f354819217e6a345f48ebbd8f13e
-sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2]
-md5=1b515f588078dfa7f4bab2634bd17e80
-sha256=f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942
-
-[http://mobots.epfl.ch/mx31moboard/linux-2.6.22-moboard.patch.bz2]
-md5=1748ebd019755e7e9452f7945f592a8d
-sha256=9ebfddb396465533944f2c3c3a2c6725ca33f5bfd260e491a8d98cff1abe7953
-
-[http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.19.tar.bz2]
-md5=4db27facb78aeb79d06e6ae6bf0ac0b6
-sha256=9879bb214a12b15a6a589fe15c2acad3177b3a49fd03a26e79ae558755e98a4b
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.22.5.tar.bz2]
-md5=f36616d74f2fde72040bccf50db03522
-sha256=7904cd53bf681611dff65d04afcdab6205f6e06cb0c40a568174d83a3a5d8a01
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.5.tar.bz2]
-md5=f36616d74f2fde72040bccf50db03522
-sha256=7904cd53bf681611dff65d04afcdab6205f6e06cb0c40a568174d83a3a5d8a01
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.6.tar.bz2]
-md5=20af4d1e05bd725e89b691da483276e9
-sha256=914424a9ae14cf6fa2debbfed327e071b43b06daf5085282cdb133a02fab1ca3
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2]
-md5=2e230d005c002fb3d38a3ca07c0200d0
-sha256=73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2]
-md5=2e230d005c002fb3d38a3ca07c0200d0
-sha256=73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7
-
-[http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2]
-md5=2e230d005c002fb3d38a3ca07c0200d0
-sha256=73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2]
-md5=2cc2fd4d521dc5d7cfce0d8a9d1b3472
-sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
-
-[http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2]
-md5=2cc2fd4d521dc5d7cfce0d8a9d1b3472
-sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/linux-2.6.24-SIMpad-rtc-sa1100.patch]
-md5=f0e143ed696bb064804cf0970718b414
-sha256=7aad0d9df138fa99332a82ca69eb07504b04e9b0a3cdb405ce872ca3bd4f44ac
-
-[http://palm.cdnetworks.net/opensource/1.1.0/linux-2.6.24-patch.gz]
-md5=1c5547aa497a7eae9fa52ed4df4b0f11
-sha256=5f7c232f9216ce45f0ab0045098cd2b21b6f2f8a7668bffd2e06040a5b87ba84
-
-[http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.3.atmel.3.tar.bz2]
-md5=952715cc523f4a77e7c5f94f608594c0
-sha256=d26a1de101692958fbca1d1be40fe52bd605636baea616a3e8ed96e422a3648d
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2]
-md5=3f23ad4b69d0a552042d1ed0f4399857
-sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
-
-[http://kernel.orgpub/linux/kernel/v2.6/linux-2.6.24.tar.bz2]
-md5=3f23ad4b69d0a552042d1ed0f4399857
-sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
-
-[http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2]
-md5=3f23ad4b69d0a552042d1ed0f4399857
-sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
-
-[http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.10.atmel.2.patch.bz2]
-md5=9100112d9be5a696a31b131bf1eadff4
-sha256=f601cbb903b18219aafde2e75921553deb03612361aa06acfc82efd04daebdee
-
-[http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/linux-2.6.25.4-ronetix-08-11-02.2228.patch]
-md5=90f4ad08acff6c206fd08e38db047ea4
-sha256=db5f14e0d2f2b8d7aa7b7048f858a999a0aee51c422eca92eb814ad4244004e9
-
-[http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.6.atmel.1.patch.bz2]
-md5=816a3d8315ff089ddee3c22c04b403a9
-sha256=03dcb188379fa94cc109d2b7733031de51d6c53d2a7e6701c72ba2ea60e580bc
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2]
-md5=db95a49a656a3247d4995a797d333153
-sha256=108b2a3f2b05c0e57d1d0977619525e46f8d4b425aef4b38b47dcf94292f2dd2
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2]
-md5=5169d01c405bc3f866c59338e217968c
-sha256=666488e2511393fdb901eaf1e67275bcc38ab37c930e8a9adb290a95c1721a2a
-
-[http://downloads.thecus.nas-central.org/N1200/Kernels/linux-2.6.27-foonas-git.tar.gz]
-md5=0d0f5b5d4ef7b8916b5a733bbf8dc05c
-sha256=cb5837924f7234045b4841998987b257977e64d141291068e5b145a3a276df7a
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.10.tar.bz2]
-md5=ef06a3ea963f556948e77971df912303
-sha256=8527c8a9b235a370db3aac606d9262f5e549ef202f114157b45f62564e3dd3bc
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.7.tar.bz2]
-md5=db323884c7dc46e4cd33d0d944fa59a9
-sha256=8e7075fc855ffbcf3c24cbd70b22791759224f98839886d50bba8d659193a950
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.8.tar.bz2]
-md5=cbdc1b350ef79dd323b9aeda5cf7f1b6
-sha256=330aa3059309c589c3abb2d743e5f391dac6671b75004dccde32b54ade17f05d
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2]
-md5=b3e78977aa79d3754cb7f8143d7ddabd
-sha256=0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.28-rc7.tar.bz2]
-md5=58aa3b21a7fee1fa39f2c011922522eb
-sha256=5c7226b4c65b8420960eea372547b29236df3757d005bc1d7912b44b978d5669
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2]
-md5=d351e44709c9810b85e29b877f50968a
-sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.28.tar.bz2]
-md5=d351e44709c9810b85e29b877f50968a
-sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2]
-md5=64921b5ff5cdadbccfcd3820f03be7d8
-sha256=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.30.tar.bz2]
-md5=7a80058a6382e5108cdb5554d1609615
-sha256=d7b9f19b92fd5c693c16cd62f441d051b699f28ec6a175d1b464e58bacd8c78f
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.31.tar.bz2]
-md5=84c077a37684e4cbfa67b18154390d8a
-sha256=0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.32.tar.bz2]
-md5=260551284ac224c3a43c4adac7df4879
-sha256=5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.8.1.tar.bz2]
-md5=f00fd1b5a80f52baf9d1d83acddfa325
-sha256=910f4af05f40ed9a6ab3bc8ccf7ca77365fb7bfe9b5dcfa7ff316e03b354d4ff
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
-md5=e921200f074ca97184e150ef5a4af825
-sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
-md5=e921200f074ca97184e150ef5a4af825
-sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
-
-[http://heanet.dl.sourceforge.net/sourceforge/linux-atm/linux-atm-2.4.1.tar.gz]
-md5=84fef49cc39ff2605204246666f65864
-sha256=a812816ee1742bf3bf8977a391b369a7351f54a1917dc90b27e666679dd1742a
-
-[http://kernel.org//pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2]
-md5=f1fc22939d71224923f168ba179b3e51
-sha256=35b9045edc5992c2d168fc72ca04a57f4e1c81a0ea987fa88342e54f7c79fbd4
-
-[http://kernel.org/pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2]
-md5=f1fc22939d71224923f168ba179b3e51
-sha256=35b9045edc5992c2d168fc72ca04a57f4e1c81a0ea987fa88342e54f7c79fbd4
-
-[http://www.omapzoom.org/pub/kernel/linux-ldp-v1.2.tar.gz]
-md5=8f22aa4396711f7a7791886bcd623749
-sha256=01f083599014e22ee2ca4894dbe96dd103b7be9d3796b7e075b040a5c324704d
-
-[http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-2.6.11.1.tar.bz2]
-md5=1df3e4fbf2670712cecb4953e2d24834
-sha256=8dffedf772a9f75a8cee2a603e1b14e4b7848010dcfa0e6b087afcf4f66da6de
-
-[http://ewi546.ewi.utwente.nl/OE/eabi/linux-libc-headers-2.6.15.99.tar.bz2]
-md5=0ab7fdfc84522e16bfe78b8e0cc66bfa
-sha256=c8630034519e525347e0cb8435bdf0edf9fbad2d16392768ba142c06681b2305
-
-[http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-2.6.7.0.tar.bz2]
-md5=ac14861e5fa7e52d98a6174add34084d
-sha256=455f352e2ec707e4abf02091c4c49ffa5611294eb75959c25d77967a02636577
-
-[http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-2.6.8.1.tar.bz2]
-md5=a75c264f90b07b4f3ba05febc7386f4b
-sha256=384c0e97100170b4566a0b335a18246c42c76df682377cae6ed1c72be8aadc0e
-
-[http://downloads.myigep.com/sources/kernel/linux-omap-2.6.28.10-igep0020b-0.tar.gz]
-md5=c50ae11485ca9b2ee1612d531c5321d9
-sha256=f7a944bab388ed87d5535e21af52054917eb55999a654e1b2c160cbf0c1a8d5a
-
-[ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-0.2.1-pre26.tar.bz2]
-md5=fff64e543e094b2007d614697f505344
-sha256=0dd50d400ab39619b20e50183ec7d357ad4b96bdebd64eca916e764542616e1a
-
-[ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-0.2.3.tar.bz2]
-md5=f26e41336a2838d69a366ab3a2d93ea0
-sha256=97004d6cefd1b5c5f37efc1603e4103f9a809d79f8cc0faf2397fa882cdd6ee6
-
-[ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-0.2.7.tar.bz2]
-md5=b2b0ffd11d27c72a9c01b8a9ef3832b7
-sha256=9dbd0f6c92b33ae8b96c5a045a341a00b2454492c2229839d056e4fd1488bca5
-
-[ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-0.2.8.tar.bz2]
-md5=5d86ca7bb4ed458743acd922ff09dae6
-sha256=e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade
-
-[http://palm.cdnetworks.net/opensource/1.3.1/linuxkernel-2.6.24-patch.gz]
-md5=651e9c518db317d11ae5b9076fb0e3ee
-sha256=f9c0327a9fa379f2db6bf4b599bd1e37b65e7224aa3fd2bd860a5e0dc5b06040
-
-[http://linuxtv.org/downloads/linuxtv-dvb-apps-1.1.1.tar.bz2]
-md5=de958cdb8d00e74792dd69f3c945b037
-sha256=371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057
-
-[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/linuxutils/2_25_01_06/exports/linuxutils_2_25_01_06.tar.gz]
-md5=15486b27c9960f06b53f8a60e90f941d
-sha256=61b86cdb5c1b2f9eb766fece6ea5ae89f29cf84d0c3eecbcc9b5d0ffd42d2bcb
-
-[http://gpephone.linuxtogo.org/download/gpephone/liblipsevent-0.1/lips_event-0.1.tar.gz]
-md5=1fd0f41f9676ef0c882921bc37628d07
-sha256=7182cf3f63e11e7ea6c6a994f9e70ef3bf6e430a5db643f5b29a0fd0996ddfd5
-
-[http://gpephone.linuxtogo.org/download/gpephone/libim-0.2/lips_im-0.2.tar.gz]
-md5=375091bb5df956f0049962defad3cbbc
-sha256=381d88261fa307ffa97edab6ba8488533b9fb45cccc5ae6cda5ccb64ef65adc0
-
-[http://downloads.sourceforge.net/lirc/lirc-0.8.0.tar.gz]
-md5=596e05980f75372fa998d50eb1dcade0
-sha256=4097abc39b928970ba3232942ac5a6db7ec4ed4164593b9223c90470c9c994dc
-
-[http://heanet.dl.sourceforge.net/lirc/lirc-0.8.0.tar.gz]
-md5=596e05980f75372fa998d50eb1dcade0
-sha256=4097abc39b928970ba3232942ac5a6db7ec4ed4164593b9223c90470c9c994dc
-
-[http://downloads.sourceforge.net/lirc/lirc-0.8.1.tar.gz]
-md5=5687331324ff5fc551f37ce419b2a926
-sha256=d701ba12a96d913fc963eb7e5cc751bbd12fefb921dae4e70c8549a43a108dd6
-
-[http://heanet.dl.sourceforge.net/lirc/lirc-0.8.1.tar.gz]
-md5=5687331324ff5fc551f37ce419b2a926
-sha256=d701ba12a96d913fc963eb7e5cc751bbd12fefb921dae4e70c8549a43a108dd6
-
-[http://downloads.sourceforge.net/lirc/lirc-0.8.3.tar.gz]
-md5=056d3ff0d855427da9628d2ff2ab4f57
-sha256=8bc1c6cfc6a9c312c8f5b8cc79b501e26b438c96a2d245f42e50bfb353617716
-
-[http://downloads.sourceforge.net/lirc/lirc-0.8.4a.tar.gz]
-md5=1101c44d542807a4f9f5e33349b5bf56
-sha256=d6e68935e69c82bba091cb102bbc4b63428eb8deb94c7d00e14ea3b673e10712
-
-[http://downloads.sourceforge.net/lirc/lirc-0.8.5.tar.gz]
-md5=a9e44df2adbd71be586e0df6304605cc
-sha256=ab5752e9af2df5f4cd2bd6d4f13872fbb519d7fa1bd3f187cc14dcb163440234
-
-[http://lisa-home.sourceforge.net/src/lisa-0.2.2.tar.bz2]
-md5=cba116a4880f77205e0813d93bf14310
-sha256=986a923a5247468db1d2a03e93268f4025ae5dc27e911dafc7b37e6a802122db
-
-[http://xorg.freedesktop.org/releases/individual/app/listres-1.0.1.tar.bz2]
-md5=827a1ac5adf9aadd0c13b54a897e297b
-sha256=7156e58025e240a501d5b32244b923b283bb35014ea5a4081b70044af8aef7a3
-
-[http://xorg.freedesktop.org/releases/individual/app/listres-1.0.2.tar.bz2]
-md5=3c0d5d8d6abaf411cd0647bc7073ac38
-sha256=4d9e24b95619bc961936d241106ffcc483995de55629567113ad78ba0b37ffb7
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/listres-X11R7.0-1.0.1.tar.bz2]
-md5=2eeb802272a7910bb8a52b308bf0d5f6
-sha256=41711ff3c94144b8a561146948b9b5fd49a55756532fa4d254d9a959e6622d87
-
-[http://www.litestream.org/litestream/litestream-1.3RC3.tar.gz]
-md5=68698f62d9eb9e620501f31c6f9acc42
-sha256=ee3edf1ea89a90f2b7f82ad09b83c25dc8ea8ca7cf0fce2aa921f897929b2bb9
-
-[http://downloads.videolan.org/pub/videolan/vlc/0.8.5/contrib/live.2005.10.05.tar.gz]
-md5=6f15406664ef31172c68d46567569bb8
-sha256=9532b981c9b8974ceedd3d25a8f9a0e167a92c9da0dece47f34a4ec34e34b1cf
-
-[http://www.angstrom-distribution.org/unstable/sources/live.2009.06.02.tar.gz]
-md5=088f848b64cef1d54034bc24cfa3c156
-sha256=66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758
-
-[http://www.live555.com/liveMedia/public/live.2009.06.02.tar.gz]
-md5=088f848b64cef1d54034bc24cfa3c156
-sha256=66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758
-
-[http://llvm.org/releases/1.9/llvm-1.9.tar.gz]
-md5=866ba97420f5ce978b6a6b1cb4338890
-sha256=17b82323151925ff5a7ad09a21781a0fa50ead4b87a339cee262271e4ededa13
-
-[http://llvm.org/releases/2.0/llvm-2.0.tar.gz]
-md5=6f88002301a25f31a492052695f6138e
-sha256=84d7ca0331963d2b2be7e18af61a80f49653c692f0bad63c5d26b2a2f7bc3375
-
-[http://llvm.org/releases/2.1/llvm-2.1.tar.gz]
-md5=b930e7213b37acc934d0d163cf13af18
-sha256=8cabd422f249ada736d864fc8a1f4d14aabefacb6f860c9beefbc53f93e0f96c
-
-[http://llvm.org/releases/2.4/llvm-2.4.tar.gz]
-md5=bf43eee98c364fd79c7d2b72e645a15e
-sha256=5fc295b3cf3de019962aee3be1c5efb49d6bf5041dae59451f6c0f544eb36bdc
-
-[http://llvm.org/releases/2.5/llvm-2.5.tar.gz]
-md5=55df2ea8665c8094ad2ef85187b9fc74
-sha256=8f3d69e63bc5d1ee2c2ee49ff07ccb7e070070a0e937813d2a6179b9e2e173ed
-
-[http://llvm.org/releases/2.6/llvm-2.6.tar.gz]
-md5=34a11e807add0f4555f691944e1a404a
-sha256=4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84
-
-[http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-2.10.1.tar.gz]
-md5=cdc857b78e813b88cbf8be92441aa299
-sha256=a332cacfa9d0eed6e9158c394db714e536f38c27451d7df08b9634952118fa1b
-
-[http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-2.10.8.tar.gz]
-md5=1e4ece01157f5d7b5b054a76a8ceae7c
-sha256=d1410d41304ad601d8475f790a23a05e75f612c6b425df105784f5e3aee34f7d
-
-[http://downloads.sourceforge.net/lmbench/lmbench-2.0.4.tgz]
-md5=eddf56af6f248812e3016a9e34b42bbd
-sha256=5a729a49ce591a58d241ac39979cb496ab30687556633782557196d2b262921e
-
-[http://heanet.dl.sourceforge.net/lmbench/lmbench-2.0.4.tgz]
-md5=eddf56af6f248812e3016a9e34b42bbd
-sha256=5a729a49ce591a58d241ac39979cb496ab30687556633782557196d2b262921e
-
-[http://downloads.sourceforge.net/lmbench/lmbench-2.5.tgz]
-md5=d5b05498af26d5c09b372caab82a0337
-sha256=e7431530a4cf4c44b5068e23454f95765dc0b51e7d98bc2bd70451b17d505bd9
-
-[http://heanet.dl.sourceforge.net/lmbench/lmbench-2.5.tgz]
-md5=d5b05498af26d5c09b372caab82a0337
-sha256=e7431530a4cf4c44b5068e23454f95765dc0b51e7d98bc2bd70451b17d505bd9
-
-[http://wl500g.dyndns.org/loader/loader-0.04.tar.gz]
-md5=c0b7c36232d3910c425d03e56d0f532b
-sha256=6f11fc04a1f3f04ebb996723fc86ca363c3959ca1ef76d1057db9db3ea5a98d0
-
-[http://install.source.dir.com/local_power_manager_1_24.tar.gz]
-md5=1a11261872f683e0699af64258e5f68a
-sha256=106ce2ddb3f35fc72ab00a1391bca21f57b04f75b12115bcadd37516e2a0ee28
-
-[http://install.source.dir.local/local_power_manager_1_24.tar.gz]
-md5=1a11261872f683e0699af64258e5f68a
-sha256=106ce2ddb3f35fc72ab00a1391bca21f57b04f75b12115bcadd37516e2a0ee28
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo-r0.patch]
-md5=db9ec09fb75c7326527f1f8b2cbf2ec2
-sha256=2f6d619ebbab25f5b5091555f96dc29159fa3c214d1c5fdc5673af97515d18e6
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo-r1.patch]
-md5=31c32cadae5a7469cf94bf8bae658515
-sha256=788f1cc9c699c60408591eba0a057bfdf51cedef539b52fe8ddba39dd948aee6
-
-[http://www.rpsys.net/openzaurus/patches/archive/locomo_kbd_tweak-r1.patch]
-md5=6c0d60bcc357365af056baa812c45960
-sha256=830ef8c4b65ed34954afc2581447fd0a9afcf5f9de354772352c8da54dceb676
-
-[http://www.rpsys.net/openzaurus/patches/archive/locomo_kbd_tweak-r1a.patch]
-md5=f126bdd73fa79a770b8c0caa95c5bae8
-sha256=a80748d7438ffa589eaee6d4870c74cebc90cc5c8134d070c8f4090fe9bab58c
-
-[http://www.rpsys.net/openzaurus/patches/archive/locomo_kbd_tweak-r2.patch]
-md5=c51ae4d5fa800ec81660fdf5b776fae6
-sha256=af92b078cb52f9c58964d49b074a5d09de601435c8e84cec817b636fc53c8eeb
-
-[http://www.rpsys.net/openzaurus/patches/archive/locomo_led_default_trigger-r0.patch]
-md5=38ac643c7e12b808a7f4463ef862aee1
-sha256=0c629eac7ba7fcfc86228d3070579eff774bf0d61ea9b1c4ed93d5c13af97b53
-
-[http://www.rpsys.net/openzaurus/patches/archive/locomo_led_fix-r0.patch]
-md5=f80615d9020c2d56a4a41dfa93ba8429
-sha256=34202206b33ebab7c34be20bd41fc8249745011a355be690ba997aa8e7d77943
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo_spi-6.patch]
-md5=44bb0f9f1fb07efbbb41619a44ed04ce
-sha256=50502256533d1fc62ac3f4a29a7e212835592bfbfd47f36b607c20e72297a63d
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo_spi-r3.patch]
-md5=e7773693243f7a7b4b0a76ae61e4881f
-sha256=2e5bd2c74f01832945a27400bfbc779633b0e679d0bfe967744795e39b5d3165
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomokeyb_suspendkey-2.patch]
-md5=1928476f81aa970b84aec7eee6d89b1e
-sha256=138b70379317b4d2962694879c26f7579f7771256bd67d462012bed17f1fcba5
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomokeyb_suspendkey.patch]
-md5=9b9b6da3612b629f40b97d295c8854f0
-sha256=aeab92eb4f81b3ae12a1d4e3d8d9b3650cc0f37ce7f9d1562c29364567d87acb
-
-[http://archive.apache.org/dist/logging/log4cxx/log4cxx-0.9.7.tar.gz]
-md5=fd09abc90b8c0c8af1d5146a75590792
-sha256=5b41b2fc267595bdb0fa4cd1152309413bc70e6d9196293113ebb82751eb7ec6
-
-[ftp://ftp.logilab.fr/pub/common/logilab-common-0.37.1.tar.gz]
-md5=39561a45c74f8ff11e2ddd872f4ee5bc
-sha256=c5974c1e98bed62bb3153a8144069c43229c6b208ef599bc77c84fb493c2291b
-
-[http://www.apache.org/dist/avalon/logkit/source/logkit-1.2.2-src.tar.gz]
-md5=996ee20d6b5785ab71f4692f64d10f9c
-sha256=2c81edc87571fbd05797da7f65515e089c62cbb735bdbd10f93e29bd3aa3ddb8
-
-[http://www.rpsys.net/openzaurus/patches/archive/logo_oh-r0.patch.bz2]
-md5=bda8ae4e55b99f1815987bde365c4585
-sha256=1eb0d211898a91a06063fb52a6d3e1ed45815e3b4563bc252b869e73af5bc1e7
-
-[http://www.rpsys.net/openzaurus/patches/archive/logo_oh-r1.patch.bz2]
-md5=959b91235cb2ebd45c5f3dc755c744fa
-sha256=d56a238d3378012c965f25c12b136bd380f9faf27a6b5f08e79c252a724129a5
-
-[http://www.rpsys.net/openzaurus/patches/archive/logo_oz-r2.patch.bz2]
-md5=851ae2974a18f7e87e65274be88d37c0
-sha256=69f9aa82c7e3c7792f6428199033120bf02c6be42f5c02b9f74ba072e8488a7c
-
-[http://www.rpsys.net/openzaurus/patches/archive/logo_rotate_fix-r1.patch]
-md5=20e419d116484ef16ebde416587701b4
-sha256=b9cb8a5b3d0a373cac74fa0ed084dabc73f79a019edaa2a2eb43d03f601dd7df
-
-[http://ftp.debian.org/debian/pool/main/l/logrotate/logrotate_3.7.1.orig.tar.gz]
-md5=552639142e163745f6bcd4f1f3816d8a
-sha256=7e79b03d65105541a5fdcc05087bee29ebc9e33149ac33d6563d0b20eddf79e0
-
-[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.0.1.tar.gz]
-md5=d43408ecb82dcbacfc965b4bb989e9c3
-sha256=c7cdd8ebffedf878e7b7d5d3848ecaacec4a7d57afd29602c2c9d64f0d8b5a63
-
-[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.1.1.tar.gz]
-md5=7abcba853b45a8595333da9aa807623c
-sha256=f7614a14e2ae31b2ba22e419f78ba0d21afbb98fdeb24ae117327c3c8af05f1d
-
-[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.2.2.tar.gz]
-md5=b80fb99e263dc67c2e8270bc22db8155
-sha256=d7efb5a6c777ed0f375444a57e4de75e8406adb61d1f52829f84bc5404cfb03b
-
-[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.2.3.tar.gz]
-md5=64daa4872972b85230b8746655ef5427
-sha256=e0daa5f5113d03f515aa918ec8b67b0cae5a21eff5e81e224d94f69174430743
-
-[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.3.2.tar.gz]
-md5=459fc597caea350951f647a92c9c272f
-sha256=361a2861a5cd5bc7bd3320b60165c3bede06056ade7d75ab370d13a6b203d629
-
-[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.4.0.tar.bz2]
-md5=d9504bb4251d4e5b32cb379debda634d
-sha256=67cad76c18a138b9b55bf6ff88a5796128371cf9339b3761b36f79fb4e7459d7
-
-[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.4.3.tar.gz]
-md5=7ca8bf7c2313d7b7f27088c373d195e2
-sha256=db252747e974b6be3e31d1b11089dc6aec3780989083df9bd75d76ddae7fb613
-
-[http://www.bplan-gmbh.org/data/toshiba/topas/linux/2.6.26.5/lowlevel_topas910.tar.bz2]
-md5=3959ea1a2acaae196173b0283541c428
-sha256=b1f136a1d89daa4b1b9711eb81ad120b53c9357d159f262021b84ef8c9d128be
-
-[http://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz]
-md5=b5ce6a74abc9b9eb2af94dffdfd372a4
-sha256=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1
-
-[ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.77.tar.bz2]
-md5=7b0de0d1283f2d86407a98e5c2f05f04
-sha256=fe6fde629a97a2855e608cd6ae1f89e66ae42d7045499b1a6faca5cfb50f5f3b
-
-[ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.78.tar.bz2]
-md5=00360ce2b62de3015fa7e0f8f92179a8
-sha256=898db51a4016efca7d408163578443238373773357949e1b4978e26807a1fb2b
-
-[http://downloads.sourceforge.net/ltp/ltp-full-20070228.tgz]
-md5=afd35e0770f28121a9f8d6093d20a62b
-sha256=bfc8cf4258574b48d33e9d622627db496e6533a469a6a87fd7ed76098dabb8a6
-
-[http://heanet.dl.sourceforge.net/ltp/ltp-full-20070228.tgz]
-md5=afd35e0770f28121a9f8d6093d20a62b
-sha256=bfc8cf4258574b48d33e9d622627db496e6533a469a6a87fd7ed76098dabb8a6
-
-[http://downloads.sourceforge.net/ltp/ltp-full-20080229.tgz]
-md5=5860835de7e8d6f76a856243fd5f299e
-sha256=e4c56dbbbf2d1a4d641624234b561e9402c00e47b5b253ae126aa444182310a4
-
-[http://heanet.dl.sourceforge.net/ltp/ltp-full-20080229.tgz]
-md5=5860835de7e8d6f76a856243fd5f299e
-sha256=e4c56dbbbf2d1a4d641624234b561e9402c00e47b5b253ae126aa444182310a4
-
-[http://downloads.sourceforge.net/ltp/ltp-full-20090131.tgz]
-md5=397b376dd659459e4a431474b42263a8
-sha256=5fa4353d826b719cc313e370dd8f4ab0793432e4d797a96cb5bb01e078ff1e10
-
-[ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz]
-md5=89c0ebdd0a27bc7f68726100f4bb079b
-sha256=27c0b2051949b88514d4a32300377d531db314d7c93750b0abff049c2b93d739
-
-[ftp://ftp.nl.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz]
-md5=89c0ebdd0a27bc7f68726100f4bb079b
-sha256=27c0b2051949b88514d4a32300377d531db314d7c93750b0abff049c2b93d739
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz]
-md5=89c0ebdd0a27bc7f68726100f4bb079b
-sha256=27c0b2051949b88514d4a32300377d531db314d7c93750b0abff049c2b93d739
-
-[ftp://ftp.us.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz]
-md5=89c0ebdd0a27bc7f68726100f4bb079b
-sha256=27c0b2051949b88514d4a32300377d531db314d7c93750b0abff049c2b93d739
-
-[ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4.orig.tar.gz]
-md5=8dbadad76ee360c2ed2caa915f5b1c8e
-sha256=28bbab4a69a3c78539b2588d2219327009d93cafc74fb59b9a4ea5f5b794f8db
-
-[ftp://ftp.nl.debian.org/debian/pool/main/l/ltrace/ltrace_0.4.orig.tar.gz]
-md5=8dbadad76ee360c2ed2caa915f5b1c8e
-sha256=28bbab4a69a3c78539b2588d2219327009d93cafc74fb59b9a4ea5f5b794f8db
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/l/ltrace/ltrace_0.4.orig.tar.gz]
-md5=8dbadad76ee360c2ed2caa915f5b1c8e
-sha256=28bbab4a69a3c78539b2588d2219327009d93cafc74fb59b9a4ea5f5b794f8db
-
-[ftp://ftp.us.debian.org/debian/pool/main/l/ltrace/ltrace_0.4.orig.tar.gz]
-md5=8dbadad76ee360c2ed2caa915f5b1c8e
-sha256=28bbab4a69a3c78539b2588d2219327009d93cafc74fb59b9a4ea5f5b794f8db
-
-[ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.3-2.diff.gz]
-md5=969baa0900646c0262b2d505b9fef154
-sha256=f647d7c2f2b0d1dbddd632f3a17fef670aed3ebf5fbe6c1633337acac1eba8e3
-
-[ftp://ftp.us.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.3-2.diff.gz]
-md5=969baa0900646c0262b2d505b9fef154
-sha256=f647d7c2f2b0d1dbddd632f3a17fef670aed3ebf5fbe6c1633337acac1eba8e3
-
-[ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.3.orig.tar.gz]
-md5=3fa7fe715ab879db08bd06d1d59fd90f
-sha256=5c6627d6d5a98a92ca4661cfc16378b182cc46a9ec479ebf7e6121ee3fe2be32
-
-[ftp://ftp.us.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.3.orig.tar.gz]
-md5=3fa7fe715ab879db08bd06d1d59fd90f
-sha256=5c6627d6d5a98a92ca4661cfc16378b182cc46a9ec479ebf7e6121ee3fe2be32
-
-[http://ltt.polymtl.ca/lttng/ltt-control-0.12-21062006.tar.gz]
-md5=053abb5ce58363ae09340e00de28c520
-sha256=c53f07c095642303e22b283212bb0da45020b0714e24310ed0e396c560a78e1f
-
-[http://ltt.polymtl.ca/lttng/ltt-control-0.42-16072007.tar.gz]
-md5=52f8a4fbae3ecf8aeab44d5e2550547a
-sha256=31341e33c2aa2d2c453a41d215445084a121fc627a5f43f31280de421a2b9e28
-
-[http://ltt.polymtl.ca/lttng/ltt-control-0.43-10082007.tar.gz]
-md5=246318850766d823529547f9cc84569e
-sha256=e08067d89e306fad7f4be56821998c073fc457d9444a18f6eb55dc7c0710a9d5
-
-[http://www.lua.org/ftp/lua-5.0.2.tar.gz]
-md5=dea74646b7e5c621fef7174df83c34b1
-sha256=a6c85d85f912e1c321723084389d63dee7660b81b8292452b190ea7190dd73bc
-
-[http://www.lua.org/ftp/lua-5.1.4.tar.gz]
-md5=d0870f2de55d59c1c8419f36e8fac150
-sha256=b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
-
-[http://luaforge.net/frs/download.php/989/lua-gtk2-0.3.tar.gz]
-md5=a2788c45d60ef8ce30168811d7e72334
-sha256=b3dd85e34b22cf757eafb6ef15c5505d5ec5e71803caef4b69ddc7fd5d46fabe
-
-[http://xorg.freedesktop.org/releases/individual/app/luit-1.0.2.tar.bz2]
-md5=aacda46598ce3af8ca16e2a8132db1b2
-sha256=c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c
-
-[http://xorg.freedesktop.org/releases/individual/app/luit-1.0.3.tar.bz2]
-md5=b01e4f71c20fc1c79ed727759c1df40c
-sha256=2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7
-
-[http://xorg.freedesktop.org/releases/individual/app/luit-1.0.4.tar.bz2]
-md5=4e45233e310d72dce307709761cf241b
-sha256=d11cd500975f652060f89d79cb8034011d99ee9aa6c82951680fc0621ecb8252
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/luit-X11R7.0-1.0.1.tar.bz2]
-md5=30428b8ff783a0cfd61dab05a17cfaa7
-sha256=fb423dc3ae75e64a256172c873732fe869ae482409cf1f3e7d980d222f070cee
-
-[http://downloads.sourceforge.net/lxde/lxde-common-0.3.2.1.tar.bz2]
-md5=f30eee998071ace04e7be33aa8ac6a5b
-sha256=bd9e9a368affb5565b50b0b79a3d04138d10f19d55ab13c8ea3ba3e32790876e
-
-[http://qa.debian.org/watch/sf.php/lxde/lxde-common-0.3.2.1.tar.bz2]
-md5=f30eee998071ace04e7be33aa8ac6a5b
-sha256=bd9e9a368affb5565b50b0b79a3d04138d10f19d55ab13c8ea3ba3e32790876e
-
-[http://downloads.sourceforge.net/lxde/lxmenu-data-0.1.tar.gz]
-md5=1c35ad4bf05cd076ce4a9bb64a246351
-sha256=73e111f64d777f35b3ad2805aa39e7746c1d223ea4fa8f805e5767b595bfdfb6
-
-[http://qa.debian.org/watch/sf.php/lxde/lxmenu-data-0.1.tar.gz]
-md5=1c35ad4bf05cd076ce4a9bb64a246351
-sha256=73e111f64d777f35b3ad2805aa39e7746c1d223ea4fa8f805e5767b595bfdfb6
-
-[http://codespeak.net/lxml/lxml-1.0.2.tgz]
-md5=bcebff4526b02dad4070cbbcb3d1b7e0
-sha256=2ac2154e3f66b5b32ca25d47e3977db115ac6dc52ddb7442ce16e65a4ac1afee
-
-[http://codespeak.net/lxml/lxml-1.3.3.tgz]
-md5=2baa9f8ad14aa6dcfb763cfa0ce3bbcb
-sha256=88903347bde122d50d358471788a6cc3f5dee18f2adee8c177d708f8c2773aae
-
-[http://codespeak.net/lxml/lxml-2.1.5.tgz]
-md5=22567ccc6ab8ec8c90c335c810cabe11
-sha256=8136076333789dc1b586858f30920aebe32512934c526ef0cb492be49c150b09
-
-[http://downloads.sourceforge.net/lxde/lxpanel-0.3.8.1.tar.gz]
-md5=18b03bd5556d14b8bd1adf00f4e95574
-sha256=b3d3a06b946dba977007a84035da6667bbaa3617e1aecb83483d6a207c319021
-
-[http://qa.debian.org/watch/sf.php/lxde/lxpanel-0.3.8.1.tar.gz]
-md5=18b03bd5556d14b8bd1adf00f4e95574
-sha256=b3d3a06b946dba977007a84035da6667bbaa3617e1aecb83483d6a207c319021
-
-[http://downloads.sourceforge.net/lxde/lxpanel-0.3.99.tar.gz]
-md5=91f020d385ee29dcfff820d5c77a0e4f
-sha256=0edf3fe88faf41c72c1da4522ba22ba2493d900061a79603858a6a3f6a74a735
-
-[http://qa.debian.org/watch/sf.php/lxde/lxpanel-0.3.99.tar.gz]
-md5=91f020d385ee29dcfff820d5c77a0e4f
-sha256=0edf3fe88faf41c72c1da4522ba22ba2493d900061a79603858a6a3f6a74a735
-
-[http://downloads.sourceforge.net/lxde/lxsession-lite-0.3.6.tar.gz]
-md5=909c3b0f4c6e4855f64dfbb47467c0b3
-sha256=3754ee460942bfde94e6a7fdf20c337a1b6a069cea6972d0c33a115db828dba4
-
-[http://qa.debian.org/watch/sf.php/lxde/lxsession-lite-0.3.6.tar.gz]
-md5=909c3b0f4c6e4855f64dfbb47467c0b3
-sha256=3754ee460942bfde94e6a7fdf20c337a1b6a069cea6972d0c33a115db828dba4
-
-[http://www.xtreefanpage.org/download/lxt-1.0.tgz]
-md5=c703192481d94dfa3f4e24eed22c8182
-sha256=daa670b686f959ab15e457425e57c50f0b973ee4d24d6a4171c33f467961ad1d
-
-[http://lyx.cybermirror.org/stable/lyx-1.5.1.tar.bz2]
-md5=0ae3b9ccb2aa74776be4af8c199dbbe9
-sha256=d720ff082ed29d385c52e7ad370499d23275e595e9d7a321b383609f68acf23e
-
-[ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-1.6.1.tar.bz2]
-md5=fdac2fc40b435857afa1089fc04c1fcb
-sha256=8f45da9653fc9ea927f3b8c7c96390fc8277d7c969b735a7b615c06e4e5c03d7
-
-[ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-1.6.4.1.tar.bz2]
-md5=c1a0da5aee3b7e1a2f74e8018805c7b1
-sha256=56f3120f814de0fc55866d92b08b2513ad0d0532fc6675aeaf36154eb73c403b
-
-[http://downloads.sourceforge.net/sevenzip/lzma417.tar.bz2]
-md5=b1ab85e4dc1eb1323d77fef47a2cb71c
-sha256=84124d4501798ecb284fceb28931db023850535e1b1146c884add7b3b0331cbc
-
-[http://heanet.dl.sourceforge.net/sevenzip/lzma417.tar.bz2]
-md5=b1ab85e4dc1eb1323d77fef47a2cb71c
-sha256=84124d4501798ecb284fceb28931db023850535e1b1146c884add7b3b0331cbc
-
-[http://www.7-zip.org/dl/lzma417.tar.bz2]
-md5=b1ab85e4dc1eb1323d77fef47a2cb71c
-sha256=84124d4501798ecb284fceb28931db023850535e1b1146c884add7b3b0331cbc
-
-[http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2]
-md5=29d5ffd03a5a3e51aef6a74e9eafb759
-sha256=c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e
-
-[http://www.oberhumer.com/opensource/lzo/download/lzo-1.08.tar.gz]
-md5=ab94d3da364c7cbd5b78d76f1875b0f6
-sha256=bcead46b0bd887c3987e977a0a7d4c547b0f70f926d45e253784137569f57b9a
-
-[http://www.oberhumer.com/opensource/lzo/download/lzo-2.02.tar.gz]
-md5=6760e5819f4238328709bf93bf10071c
-sha256=a2fbecb4dd7c1dab498e3d8b5a0e574e6b8be09c63329b0d29c6fa9adb4a2fc5
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_crypto-r0a.patch]
-md5=ed24c3496f8b1fd22360422ac4dfd42b
-sha256=9cd89808a3c63e48ea809510e25a0277a53c7cb2e039f35afae7d2db2ab25b4a
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_crypto-r0b.patch]
-md5=7c4b0de088db249cd94ec0001c4d3edd
-sha256=f91accabee3408cc318affb01b1dd764cad555441a2c8ee23c598880f5825807
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_crypto-r2.patch]
-md5=29162001c88d9dbe0ccb25103a1aefb4
-sha256=0b68f2d73dc54404d29015455ba84021a925aa2cfb6f1fe75705fe2268b2e2e8
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_fix-r0.patch]
-md5=e25fcfb882d16e9715e54e7289f2bc7f
-sha256=078209d70d2b913d760b9af92d7d5caabe48b11c558c08e4fe6630fa45312c7b
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_jffs2-r0.patch]
-md5=397be20b7a23c6d540bd6cb05ed782b6
-sha256=9fb2878799a6f80687bf5623a94cc96ba72272041f1a5f18fddf24831c4e3764
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_jffs2-r2.patch]
-md5=e265aeb2c203fa1a0e47f978287fa7ef
-sha256=86bed4992530c80827cbb494282cf0270605b31e2d7717aca9ae6b10fffaa147
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_jffs2-r3.patch]
-md5=ef03ab6e24b5f365b7040213f0046e62
-sha256=c7a4c68192d54ff0d4c1b0dc87459b950f685125528d9c8d127e8996b6094c62
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_jffs2_lzomode-r0.patch]
-md5=07ad218dee6afd77cf25092f8f10672f
-sha256=ad0d651697da09d56645a53ece0b7037aae1ed0709ac3644bc15a6b0edc53668
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_jffs2_lzomode-r1.patch]
-md5=ca58d9992106f5131539ff0d9a6b824b
-sha256=9e2e57632135cdcf9e72743b94d69d0cab002cccdb63f8e3e368f40bfa0b3af2
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_jffs2_sysfs-r0.patch]
-md5=feb7a4252b3257e3a5b31fb60cfa8aff
-sha256=c21877e59bb25d2d4061511da4386dcddeb99db885afe4ed50bc8b6e7d93d0bd
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_jffs2_sysfs-r1.patch]
-md5=a8b75ef4190dfc0afcfa8789d3e4c64c
-sha256=3fed945b590db46a902fa434054b967dd1bf4af1ee5f5643e00d1d66a9d69543
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_kernel-r0.patch]
-md5=58f444edda4cc611236cfc2641905ca2
-sha256=932760a92ad3b7bad483a9587dddf7784f9084676cfe7fbb2352681165b594d7
-
-[http://www.rpsys.net/openzaurus/patches/archive/lzo_kernel-r3.patch]
-md5=b9a7ca30c141e73d5888616fcbdfdc68
-sha256=144a6f296dd4d85fdba2caa150b75a5a166d97af0f5c7e84eaf43fed231ca698
-
-[http://downloads.openwrt.org/sources/m102.tar.gz]
-md5=c7817035dc41cb02e7cfb565cf9b7401
-sha256=d7ee2e668455f9a092418e5475f32676eb0b37c54ae38a7fcdf2d14e0fb80c91
-
-[http://sandbox.rulemaker.net/ngps/Dist/m2crypto-0.13.zip]
-md5=be2790a34349ab452dddbcfe4c95606a
-sha256=c1c67839d4af290aecd8f7743312aacc0a39ae99757f0910918531ef9a63e14f
-
-[http://chandlerproject.org/pub/Projects/MeTooCrypto/m2crypto-0.18.2.tar.gz]
-md5=445dce53fcfc7ec8f6fd31f54da8a067
-sha256=62ed44c8b2d392bdc757981ac37f05d808a0d917e4f9d95de2fbf3c2bdad41a7
-
-[http://www.opensource.apple.com/darwinsource/tarballs/other/mDNSResponder-107.6.tar.gz]
-md5=aa4e0e5c57f94489463ea6576591ce9d
-sha256=43d427d3d5c78aef57a49898def469cc4cae28190462205368be1f3a0fcc0165
-
-[ftp://ftp.gnu.org/gnu/macchanger/macchanger-1.5.0.tar.gz]
-md5=79b7cdaeca3d8ebafa764c4b0dd03ab7
-sha256=d44bfa27cb29c5a718627cb3ef3aa42eb5130426545eb2031120826cd73fa8fe
-
-[http://heanet.dl.sourceforge.net/sourceforge/usb-midi-fw/madfuload-1.2.tar.gz]
-md5=6a2c68021e2e05c4eb35e67158b9414e
-sha256=324d0a55f73c82ad48635a94a8d72277a2280030df6d036eafe3498c933dee6d
-
-[ftp://ftp.mars.org/pub/mpeg/madplay-0.15.2b.tar.gz]
-md5=6814b47ceaa99880c754c5195aa1aac1
-sha256=5a79c7516ff7560dffc6a14399a389432bc619c905b13d3b73da22fa65acede0
-
-[http://downloads.sourceforge.net/madwifi/madwifi-0.9.3.tar.bz2]
-md5=26c31e8e1528fd098e3aaa11c0d34d99
-sha256=847596646417abbdce9cfd0e1dca2cced29c6a8b814d1bd28d0c7301e9e4e9d8
-
-[http://heanet.dl.sourceforge.net/madwifi/madwifi-0.9.3.tar.bz2]
-md5=26c31e8e1528fd098e3aaa11c0d34d99
-sha256=847596646417abbdce9cfd0e1dca2cced29c6a8b814d1bd28d0c7301e9e4e9d8
-
-[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r1844-20061208.tar.gz]
-md5=9ab58ff1c9b3803f76b064eba3555679
-sha256=da423f508cc3624a1f510e9c153ebb7c5413e765546e9d44d55818358862cc64
-
-[http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r1844-20061208.tar.gz]
-md5=9ab58ff1c9b3803f76b064eba3555679
-sha256=da423f508cc3624a1f510e9c153ebb7c5413e765546e9d44d55818358862cc64
-
-[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2100-20070210.tar.gz]
-md5=e7e0f50615b48c4ea70e6d219d141728
-sha256=49d42bcb9e13534f357240890c4e6b344e5f2fe951d5d39bc4caee55fdf3c5b7
-
-[http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2100-20070210.tar.gz]
-md5=e7e0f50615b48c4ea70e6d219d141728
-sha256=49d42bcb9e13534f357240890c4e6b344e5f2fe951d5d39bc4caee55fdf3c5b7
-
-[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2156-20070225.tar.gz]
-md5=8cee25705f94e1ffcf84cc084d5a6996
-sha256=d609af1a5bb6ecf6b00ae89ef338c607ee7f9ddba693085c3b7773f9be00b2e0
-
-[http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2156-20070225.tar.gz]
-md5=8cee25705f94e1ffcf84cc084d5a6996
-sha256=d609af1a5bb6ecf6b00ae89ef338c607ee7f9ddba693085c3b7773f9be00b2e0
-
-[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2182-20070308.tar.gz]
-md5=8e6f80c2e5cc828b6cceeda1c66c687d
-sha256=d509a0d9cb791c0633c35b48c502fc972990ba0dcb963690edbe3261704d0af0
-
-[http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2182-20070308.tar.gz]
-md5=8e6f80c2e5cc828b6cceeda1c66c687d
-sha256=d509a0d9cb791c0633c35b48c502fc972990ba0dcb963690edbe3261704d0af0
-
-[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2187-20070309.tar.gz]
-md5=a43d24457cb99fcf4c32c31923be9b6a
-sha256=955d5382d079327679c3a601361fb752f1caf2f8a832f1c1bffe945708e37dca
-
-[http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2187-20070309.tar.gz]
-md5=a43d24457cb99fcf4c32c31923be9b6a
-sha256=955d5382d079327679c3a601361fb752f1caf2f8a832f1c1bffe945708e37dca
-
-[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2702-20070903.tar.gz]
-md5=b65e6b712836cd0121bd1746e8920d10
-sha256=46a30f2cd62c66099d4b87a32fb82751598758c213a1486ec7f44c23a33f5529
-
-[http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2702-20070903.tar.gz]
-md5=b65e6b712836cd0121bd1746e8920d10
-sha256=46a30f2cd62c66099d4b87a32fb82751598758c213a1486ec7f44c23a33f5529
-
-[http://snapshots.madwifi-project.org/madwifi-ng/madwifi-ng-r2826-20071105.tar.gz]
-md5=fe1758398de89fce57f05f9c1d1bb923
-sha256=70cfa5eacd27d46a5e6f562b01769c64794d20ce4636cf133def7db7f0715efb
-
-[http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2826-20071105.tar.gz]
-md5=fe1758398de89fce57f05f9c1d1bb923
-sha256=70cfa5eacd27d46a5e6f562b01769c64794d20ce4636cf133def7db7f0715efb
-
-[http://snapshots.madwifi-project.org/madwifi-trunk/madwifi-ng-r3314-20080131.tar.gz]
-md5=2c7352cbbdac995de8c3bce5b80db5f2
-sha256=0599c75b95ba63bdc554cb8124192e62c75fbeb71b9e8a5a7bc351c8e0666758
-
-[http://snapshots.madwifi.org/madwifi-trunk/madwifi-ng-r3314-20080131.tar.gz]
-md5=2c7352cbbdac995de8c3bce5b80db5f2
-sha256=0599c75b95ba63bdc554cb8124192e62c75fbeb71b9e8a5a7bc351c8e0666758
-
-[http://snapshots.madwifi-project.org/madwifi-trunk/madwifi-trunk-r3837-20080802.tar.gz]
-md5=d6e04fa7fb0bea5079f24a753633fb29
-sha256=d504e1e7b8f0d01b5441a86d1086aa4088c8896d87d8aabd6dabace76997467a
-
-[http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3837-20080802.tar.gz]
-md5=d6e04fa7fb0bea5079f24a753633fb29
-sha256=d504e1e7b8f0d01b5441a86d1086aa4088c8896d87d8aabd6dabace76997467a
-
-[http://snapshots.madwifi-project.org/madwifi-trunk/madwifi-trunk-r3878-20081204.tar.gz]
-md5=bf12d0f9f306dad91bf7530586712dee
-sha256=3b8ea233bee05edc346c66577b6beb5ccc81db9d9440982624d7b39aecc79c77
-
-[http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3878-20081204.tar.gz]
-md5=bf12d0f9f306dad91bf7530586712dee
-sha256=3b8ea233bee05edc346c66577b6beb5ccc81db9d9440982624d7b39aecc79c77
-
-[http://snapshots.madwifi-project.org/madwifi-trunk/madwifi-trunk-r4029-20090525.tar.gz]
-md5=aa88865c0fd11a0c0736af17a13c4f5a
-sha256=d42b59fdac3972a9b0876789ed61e78ea13c34fefe7d819ac0fbf748070fecef
-
-[http://repository.maemo.org/pool/maemo4.1/free/m/maemo-af-desktop-l10n-public/maemo-af-desktop-l10n-public_5.0+r6160.tar.gz]
-md5=5e13cc37619d6a79459ef1b36d671597
-sha256=28d1dbeb0c6db7a4155fb87c838b0d814e583147fb0cc23bdf64691014f69add
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/m/maemo-af-desktop-l10n-public/maemo-af-desktop-l10n-public_6.0+r6710+0m5.tar.gz]
-md5=30ccf555d6ca9ebb2338903d112b07d7
-sha256=45959c6e60183b482db2f775c2b4febdf1af03b4675c43dbca9406c82c7a8b96
-
-[http://repository.maemo.org/pool/maemo4.1/free/m/maemo-launcher/maemo-launcher_0.30-1.diff.gz]
-md5=751fc2d7b3425b6e08ef2513418d8dce
-sha256=d711152bf23b96aa55c6db3af61650353e88e95ffb61ce73760e0fdfde67d1dd
-
-[http://repository.maemo.org/pool/maemo4.1/free/m/maemo-launcher/maemo-launcher_0.30.orig.tar.gz]
-md5=e188cd39bc29cdc27f60156961cd6328
-sha256=600b0284d6f2281d16307f176b45626891b2369ec2481b61885917daad86f46c
-
-[http://home.tal.org/%7Emilang/n770/maemo-mapper-desktop-20061114-001.patch]
-md5=b391fd0d13f5cabbcb2aba3237156f32
-sha256=7701fa20a835f3ae504a6e04d2e449b0be2d2380e7522fa5736791a55abacf4c
-
-[http://repository.maemo.org/extras/pool/chinook/free/source/m/maemosweeper/maemosweeper_0.2.0-7.tar.gz]
-md5=4ece4fdf0314b7310bc4228ca00d7d8e
-sha256=d9afa1fa7db43b66db22ebe7a98f8370f4935c53d0eeb54b7e166ab7f7d43f5f
-
-[http://handhelds.org/~zecke/oe_packages/mahjongg_V1.0.0.tar.gz]
-md5=83587af02f53eb222242d0d84380735a
-sha256=a059a2b0f438140a3bb1e30f410a28863eec61ebbb90c925209c7a473a89b76b
-
-[http://ftp.gnu.org/gnu/classpathx/mail-1.1.2.tar.gz]
-md5=0a94ff4328ceb6a4131be96946976a33
-sha256=5eb09597a8f81bfc943206e3e0f45b963ba605a646051c353374f1b475bb9f04
-
-[http://www.claws-mail.org/downloads/plugins/maildir-0.24.4.tar.gz]
-md5=de207f0148ef52dfda3aba85509d53be
-sha256=f98e843a9b3012f61b1223958275687dcc0b6af46d12f1a84037e002b257a47d
-
-[http://www.claws-mail.org/downloads/plugins/mailmbox-1.12.4.tar.gz]
-md5=9802b55e3872dc2ea04e2cb457869ae5
-sha256=f066c03bfe4c8efb0c6a7ca2971cb03fb723fda9591e0c57a7afeec05f606adc
-
-[http://www.claws-mail.org/downloads/plugins/mailmbox-1.13.tar.gz]
-md5=13a91cfd9b26182edbbdcd2a0d27c80f
-sha256=e41470fbea5322aabdca21b3ee7ebc2b3ddb1638d25902ee96fcb10698b35dd4
-
-[http://www.claws-mail.org/downloads/plugins/mailmbox-1.14.tar.gz]
-md5=0a5907628c1112cf8e5fe251ed1db551
-sha256=d8d948807b4a09eb6da392161564c4bcee01070c9c86483889f93f1b14fd0870
-
-[ftp://ftp.gnu.org/gnu/mailutils/mailutils-0.3.1.tar.bz2]
-md5=d2f0192b3dd95b33e764a0d480085cdd
-sha256=1d145c55cf9ef1cd9ad996bd7efe0df7765e0ec8ef60a0b95f5c239172efebdd
-
-[ftp://ftp.debian.org/debian/pool/main/m/mailx/mailx_8.1.2-0.20020411cvs-1.diff.gz]
-md5=816b337e1fb83a2ebac164412f8ea1fe
-sha256=f37d1c04b88f430a77aea1bea7048e114dc37990e64a6b7d49974511c6d4b7e0
-
-[ftp://ftp.debian.org/debian/pool/main/m/mailx/mailx_8.1.2-0.20020411cvs.orig.tar.gz]
-md5=61bb0ce78f7828b4fb9f6fe13eb4e425
-sha256=38fedc49b0b38018b3b5249499d28c6581b43a45a412f0c144341bee52575498
-
-[ftp://ftp.debian.org/debian/pool/main/m/mailx/mailx_8.1.2-0.20040524cvs-4.diff.gz]
-md5=e51180fe1b43fcdf3125fd9be4734b0c
-sha256=131fe674be66bd3f464ee40aa457a9613f3d2a17ea83c724c4145a5d072a252e
-
-[ftp://ftp.nl.debian.org/debian/pool/main/m/mailx/mailx_8.1.2-0.20040524cvs-4.diff.gz]
-md5=e51180fe1b43fcdf3125fd9be4734b0c
-sha256=131fe674be66bd3f464ee40aa457a9613f3d2a17ea83c724c4145a5d072a252e
-
-[ftp://ftp.debian.org/debian/pool/main/m/mailx/mailx_8.1.2-0.20040524cvs.orig.tar.gz]
-md5=b7d8c2b5f64ac0b0ce51fdda482ec399
-sha256=b8a15528701669c728bbdc74060512eb41ce6284601c87f4ba6820b92380bec0
-
-[ftp://ftp.nl.debian.org/debian/pool/main/m/mailx/mailx_8.1.2-0.20040524cvs.orig.tar.gz]
-md5=b7d8c2b5f64ac0b0ce51fdda482ec399
-sha256=b8a15528701669c728bbdc74060512eb41ce6284601c87f4ba6820b92380bec0
-
-[ftp://ftp.debian.org/debian/pool/main/m/mailx/mailx_8.1.2-0.20050715cvs-1.diff.gz]
-md5=38de40f8b082f4d592262c04275e2f30
-sha256=2fb891f912624766d0bef765d69cec75ad3334dda1aa58659f3c3c1d0579c2c3
-
-[ftp://ftp.nl.debian.org/debian/pool/main/m/mailx/mailx_8.1.2-0.20050715cvs-1.diff.gz]
-md5=38de40f8b082f4d592262c04275e2f30
-sha256=2fb891f912624766d0bef765d69cec75ad3334dda1aa58659f3c3c1d0579c2c3
-
-[ftp://ftp.debian.org/debian/pool/main/m/mailx/mailx_8.1.2-0.20050715cvs.orig.tar.gz]
-md5=3ba08abd8bbd0a87ea5bad05cded3bc3
-sha256=5c578a8c573b4430358d4f6523f8acd8b2c5039579d907c88ec09dab13b226d3
-
-[ftp://ftp.nl.debian.org/debian/pool/main/m/mailx/mailx_8.1.2-0.20050715cvs.orig.tar.gz]
-md5=3ba08abd8bbd0a87ea5bad05cded3bc3
-sha256=5c578a8c573b4430358d4f6523f8acd8b2c5039579d907c88ec09dab13b226d3
-
-[ftp://ftp.us.debian.org/debian/pool/main/m/mailx/mailx_8.1.2-0.20050715cvs.orig.tar.gz]
-md5=3ba08abd8bbd0a87ea5bad05cded3bc3
-sha256=5c578a8c573b4430358d4f6523f8acd8b2c5039579d907c88ec09dab13b226d3
-
-[ftp://ftp.gnu.org/gnu/make/make-3.80.tar.bz2]
-md5=0bbd1df101bc0294d440471e50feca71
-sha256=a99b39e7b04c333724f48c38fede709481cfb69fafe7e32ae4285b7fadf92f1b
-
-[ftp://ftp.gnu.org/gnu/make/make-3.81.tar.bz2]
-md5=354853e0b2da90c527e35aabb8d6f1e6
-sha256=f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/make-install-lib-all.patch]
-md5=b94605c3b7ba90bc01648ca6e5cc1aaf
-sha256=16ff3ea972065925338da1a1f37322dc4d8774f6d34d2dde2ce85121c08c99e0
-
-[ftp://ftp.debian.org/debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz]
-md5=89c4b6b4a89f6502626783716fc7d887
-sha256=8599712f2b2b3778eea344f59e1512cea284e802560317fac436585885a41dfa
-
-[ftp://ftp.nl.debian.org/debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz]
-md5=89c4b6b4a89f6502626783716fc7d887
-sha256=8599712f2b2b3778eea344f59e1512cea284e802560317fac436585885a41dfa
-
-[ftp://ftp.us.debian.org/debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz]
-md5=89c4b6b4a89f6502626783716fc7d887
-sha256=8599712f2b2b3778eea344f59e1512cea284e802560317fac436585885a41dfa
-
-[http://handhelds.org/~zecke/oe_packages/maki_V1.0.4ern.tar.gz]
-md5=cb5e4656fc3b13aa02d94096966ef2a9
-sha256=6d5f1f771de97e08378940070b28dd75ac394ea611965ed1751600adbd099a59
-
-[http://kernel.org//pub/linux/utils/man/man-1.5p.tar.bz2]
-md5=3800006ccd2f1f16124a2ac3abf04b30
-sha256=5431073fb315f9b8dd43f430d7a9082e0a6232e20af559604da573270df8236b
-
-[http://kernel.org/pub/linux/utils/man/man-1.5p.tar.bz2]
-md5=3800006ccd2f1f16124a2ac3abf04b30
-sha256=5431073fb315f9b8dd43f430d7a9082e0a6232e20af559604da573270df8236b
-
-[http://kernel.org//pub/linux/docs/manpages/man-pages-2.41.tar.bz2]
-md5=7b193c2fcf1d8f625e998df54582fee9
-sha256=bc9e3fe06a550d6eb48fd84eaf58415c78fbc29ba042e4a074adb62736f50760
-
-[http://kernel.org/pub/linux/docs/man-pages/Archive/man-pages-2.41.tar.bz2]
-md5=7b193c2fcf1d8f625e998df54582fee9
-sha256=bc9e3fe06a550d6eb48fd84eaf58415c78fbc29ba042e4a074adb62736f50760
-
-[http://kernel.org/pub/linux/docs/manpages/man-pages-2.41.tar.bz2]
-md5=7b193c2fcf1d8f625e998df54582fee9
-sha256=bc9e3fe06a550d6eb48fd84eaf58415c78fbc29ba042e4a074adb62736f50760
-
-[http://kernel.org/pub/linux/docs/man-pages/Archive/man-pages-2.79.tar.bz2]
-md5=1775f4ab1529db175a95f83bacc562b0
-sha256=e88295f9d6fe792784ea7dd546a12b0e7bb96b023d4248e728a43eb6ad885135
-
-[http://kernel.org/pub/linux/docs/man-pages/Archive/man-pages-3.21.tar.bz2]
-md5=14b3f971348f4d59ae8b8362d8eb15ff
-sha256=272ac90813e4301873d46229b216622bb7bc6a0b3adb15577b20b5083f92a169
-
-[http://download.berlios.de/mapnik/mapnik-0.6.1.tar.bz2]
-md5=44093af694321ef2034b1fd2edc998c9
-sha256=59b1c19817ed65ba8f0d3a2ac8f06ecf5c12f452d10170fa04f6824ea257437f
-
-[http://www.maradns.org/download/1.0/maradns-1.0.39.tar.bz2]
-md5=5ac39978f55ecaf6e887cd5be027b1c3
-sha256=4ac5940d25a9b5a52d0ff1f8223bb85462f9cfcceb4ac547e3ca9b6690aad394
-
-[ftp://ftp.debian.org/debian/pool/main/m/masqmail/masqmail_0.2.21.orig.tar.gz]
-md5=7e989a8b0562054aea22c654507f2cb5
-sha256=2257099c760c12daf094744c6b2269d476e3bc6b523366168ad81bdd2ebd2445
-
-[ftp://ftp.nl.debian.org/debian/pool/main/m/masqmail/masqmail_0.2.21.orig.tar.gz]
-md5=7e989a8b0562054aea22c654507f2cb5
-sha256=2257099c760c12daf094744c6b2269d476e3bc6b523366168ad81bdd2ebd2445
-
-[ftp://ftp.us.debian.org/debian/pool/main/m/masqmail/masqmail_0.2.21.orig.tar.gz]
-md5=7e989a8b0562054aea22c654507f2cb5
-sha256=2257099c760c12daf094744c6b2269d476e3bc6b523366168ad81bdd2ebd2445
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-common/0.8/matchbox-common-0.8.tar.bz2]
-md5=107ac7cfb5f5ad3eacd14388a34a706b
-sha256=39672384843942210eca6e16396768b979e479a8e1a8d42d092ad517f561c20d
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-common/0.9/matchbox-common-0.9.1.tar.gz]
-md5=90acc81aeebc0dca8f88fbaa40166607
-sha256=cb56d6a1031c33b98751cb06b2fce73feba49cb38a1e4db1a104e8efdfb9a7dc
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-common/0.9/matchbox-common-0.9.tar.gz]
-md5=42f76caa0d51ecefc92979fc659ac29c
-sha256=9ceab55677a404db7ca83ae3b3c678fb1f292e0fee055079ad95f967a98a6e04
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.8/matchbox-desktop-0.8.1.tar.bz2]
-md5=f7838ae67134e60bc2afb68022404b5f
-sha256=9587182aab427103a8a1f9714dc16603c3a861076f7cd18d73321c3878b2048f
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.8/matchbox-desktop-0.8.tar.bz2]
-md5=7b2aab7fc14b8690b436a22a6c041695
-sha256=bced4bcb32dba30feee0da6e4d7c726f4c0c72dc29c2d7bbb648f9208357bc19
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-0.9.1.tar.bz2]
-md5=3335a30b1a1aacfb39f23b505254765c
-sha256=ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-0.9.tar.gz]
-md5=5621a74ac59ef1a42e0e1971ec996e1a
-sha256=b104d1bda4b68a49f22106d8c0692961f7a2c39e839caf6e968cf870d7c0ec7b
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.8/matchbox-panel-0.8.1.tar.bz2]
-md5=cfdfb6b006af834513be839d128a4cd7
-sha256=771608e1e2baa2e16781024faa93b24a38556d383158883deff78f7093017534
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.8/matchbox-panel-0.8.3.tar.bz2]
-md5=7e37e776d63c2f2596d786500ca4138e
-sha256=4fb8b6801dde49d4d37dadc3a5b73bc124bdb3798a554ff1c372c9eb3496bbcd
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.8/matchbox-panel-0.8.tar.bz2]
-md5=053df6ffb53a80d0f06c6ea683f830cd
-sha256=e064cf0ab966d14212a4490f341aad574713282e54dc0ec9813a99c3cc2bc453
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.9/matchbox-panel-0.9.1.tar.gz]
-md5=c047afdd9344c0103624d43a01bcecb7
-sha256=03af017c7d1b17b1fd511b9f84058f59dee548110770043964f1d1fa87a37643
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.9/matchbox-panel-0.9.2.tar.gz]
-md5=3122b8d8a796824f9266235b38b0ff1f
-sha256=d89d292942e03459f1239e4b3b2e4933aa713f9a606dfe444718f18ff99c7241
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.9/matchbox-panel-0.9.3.tar.gz]
-md5=48b58a2e9ada4ae4de6555315ee3506f
-sha256=1ec04f3660fecc9c47afd75a9197950ecf8ca5d051b428da188f0262ff982500
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.9/matchbox-panel-0.9.tar.gz]
-md5=709bde40465d44eb12db7e74c1a2d1fe
-sha256=23247d33e26c95a7501908a9e907da05cd004faabd6cf39dd0efb8d4142fbb0c
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-panel-manager/0.1/matchbox-panel-manager-0.1.tar.bz2]
-md5=0ea7b03abd7b90eda601b8658a859fb6
-sha256=32136aaaf66ff0083158476707f69aa5ee128bc4b3bd62a2be9f9db2dc5804b6
-
-[http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz]
-md5=72ae272ef7803141a3dcb69e670cff97
-sha256=5b59f9646edbfb907a309332db3bd6fa7080dc1fe24df549480cfae7d974a3fb
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-themes-extra/0.3/matchbox-themes-extra-0.3.tar.bz2]
-md5=04312628f4a21f4105bce1251ea08035
-sha256=98a1c8695842b0cd7f32e67b0ef9118fd0f32db5297f3f08706c706dee8fc6be
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-0.8.3.tar.bz2]
-md5=b52024f7a121f5eafc70a8d4c2089d2d
-sha256=7292fab73c7c0539fd4be41e89e00933d1b78c4ddad2ba29ba3986a617f2c918
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-0.8.4.tar.bz2]
-md5=f7f4f5a66edfe29055848efac2202243
-sha256=13728dd551dcb8b6ccb448a8c58e960b2cb6b609bd60e891fd9d9fdcde390a0c
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-0.9.2.tar.gz]
-md5=659a2111c51d53503954af72cd873b1f
-sha256=89dde8c3dd8669f78f2034d1072893e7b6ae82084d5effdcca76b39c95adc262
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-0.9.3.tar.gz]
-md5=76243628e632348526c209746fb8bda7
-sha256=81b33171ace87360a73037421b41d2bc94af2239fca05586bb49da44681bbad7
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-0.9.4.tar.gz]
-md5=e8381a3b43c2a32cb9739259810d433e
-sha256=3be0a40e83bd417cb22da1de0ebd9e887a1423a8001f82d4e7d3c394b42cb186
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-0.9.5.tar.gz]
-md5=7343855f03e962307a350c1cfd03c740
-sha256=4580fe7345b57268da624f38c2797bd7171f84fa93bc5b1c9827f8adb7b74f54
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-0.9.tar.gz]
-md5=3cf2d404b5024d4cb1bcc08fc63ce84e
-sha256=2717520d41d3b69232e6b4ec84a91461ae0d52c2e75103ba0791ef0d52ac8e1c
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/matchbox-window-manager-1.0.tar.gz]
-md5=2a28fdcfd6c71a5edb1618b9449b7486
-sha256=f54035309b2a4d45a90979c2b56ab2488546826862062bfc22cd7e7ed8b5ebf6
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-1.1.tar.gz]
-md5=42187ec7b3db21ba237a3a2858bf9acd
-sha256=fdf06c44ff8d7bc1d1a33d890e1dad8962d2a83c4521abce8381b6d1a4429cf2
-
-[http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2]
-md5=3e158dcf57823b55c926d95b245500fb
-sha256=81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff
-
-[http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2]
-md5=3e158dcf57823b55c926d95b245500fb
-sha256=81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff
-
-[http://openembedded.org/dl/matrixssl-1-1-1.tar.gz]
-md5=0f867a7b5ce70650f36caf00c4941ebf
-sha256=b46ade42d080851ba4c5a10d3c520eb169fc33ab5c259ee8ca147eff57741246
-
-[http://wiki.openembedded.org/dl/matrixssl-1-1-1.tar.gz]
-md5=0f867a7b5ce70650f36caf00c4941ebf
-sha256=b46ade42d080851ba4c5a10d3c520eb169fc33ab5c259ee8ca147eff57741246
-
-[http://212.10.30.205/rc12/src/mb-applet-cards-1.0.2.tar.bz2]
-md5=83661e2f9b67fd910f9ca0b1db06d9e8
-sha256=52980096f4dbe5ea52a8c1bded74e7c657f934de5320da3f30cf7baf4274c749
-
-[http://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/mb-applet-cards-1.0.2.tar.bz2]
-md5=0c4f6da5da1196a60af9a7943e583d58
-sha256=b1bdff4c61d320fdbcf9c13a1cb3c3afa4908bdda1d7aad224c6145ab5128706
-
-[http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/0.5/mb-applet-input-manager-0.5.tar.bz2]
-md5=bf36926ac97d0419a141f9d18ffab103
-sha256=7a1298ea42a976e7a133ec160400daee055450872dcc40d671f08376fc08850a
-
-[http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/0.6/mb-applet-input-manager-0.6.tar.gz]
-md5=d56ac682c94c7f8ef07bab6348d3f0e2
-sha256=e0ff8ad4d565247c480eb41a284bb947ba1ca0dd70aae9f4dde118320699cba4
-
-[http://matchbox-project.org/sources/mb-applet-startup-monitor/0.1/mb-applet-startup-monitor-0.1.tar.gz]
-md5=6d06e7542c3e927adee7e67f3c734858
-sha256=be52ed8fc2fdd0747e4aea25650de398efa284f7712838f5c90494b694c3719a
-
-[http://projects.o-hand.com/matchbox/sources/mb-applet-startup-monitor/0.1/mb-applet-startup-monitor-0.1.tar.gz]
-md5=6d06e7542c3e927adee7e67f3c734858
-sha256=be52ed8fc2fdd0747e4aea25650de398efa284f7712838f5c90494b694c3719a
-
-[http://www.pdaxrom.org/download/1.1.0beta4/src/mb-applet-tasks-1.0.0.tar.bz2]
-md5=3442d374f459c607395fd56998a6d7b0
-sha256=ae72570a433f4e928c4b424dde003c5035fee765fad23c8df76f4062d67c53a0
-
-[http://projects.o-hand.com/matchbox/sources/mb-applet-volume/0.1/mb-applet-volume-0.1.tar.gz]
-md5=d778eb73932dbaa944680f93b153b2bb
-sha256=7c43a4169b4bea9db1e86a9d16609ae62424b1743696d35ba58eb5665eddd26a
-
-[http://projects.o-hand.com/matchbox/sources/mb-desktop-xine/0.4/mb-desktop-xine-0.4.tar.bz2]
-md5=3805f463cbd1817c75fed5f9c4cd2f8b
-sha256=a550138cac9fcbb620a154fdf251d97e3420a5b9ac2017225b35d9df745e49f3
-
-[http://handhelds.org/~pb/mb-panel-0.9.2-msgcancel.patch]
-md5=61a2f2be6d947618fc0f2e0c93dad6e1
-sha256=320634eacb957779f77a8632b1339276e5d2f7c6877933610250163f6862fc19
-
-[http://handhelds.org/~pb/mb-panel-0.9.2-polling.patch]
-md5=aef0c3abfdd35aefc7f1328204bc337e
-sha256=398484870bc78296c3186776fa7db5abf63036bbe1df674d049edd68d0af7ea8
-
-[http://gpe.linuxtogo.org/download/source/mbmerlin-0.8.1-2.tar.gz]
-md5=c379c781ac05d3b64228f48362aecaca
-sha256=d2a482d4b7bce5cc41bacddc8ef48ebd21fecbe6585b74036e432c030595b11f
-
-[http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-4.6.0.tar.gz]
-md5=70804dc9e2049e24f294ff7090a82a12
-sha256=396a2de3eed6d5d3c4604b372e11f6c0f18644ef3d8ee14978b715ec26aa0974
-
-[http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-4.6.1.tar.gz]
-md5=18b20db6e40480a53bac2870c56fc3c4
-sha256=086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e
-
-[http://www.midnight-commander.org/downloads/mc-4.6.2.tar.gz]
-md5=ec92966f4d0c8b50c344fe901859ae2a
-sha256=d34c913e7fff4ea61cf8640b10f9118829cc5359045a1821b6510f3c8b1be26e
-
-[http://www.lilotux.net/~mikael/mcabber/files/mcabber-0.9.9.tar.bz2]
-md5=189fb9d23f5a8412bc660884528475ea
-sha256=2a231c9241211d33745f110f35cfa6bdb051b32791461b9579794b6623863bb1
-
-[http://archive.ubuntu.com/ubuntu/pool/universe/m/mce-dev/mce-dev_1.5.6.tar.gz]
-md5=b3a28fe9bcec2fc7ae70f5d819bf3d1a
-sha256=aaaae4e3a25880d9f6af2dcf504b03f98946dcfb79e4c0a77adb9223aaa5cbc4
-
-[http://repository.maemo.org/pool/bora/free/source/mce-dev_1.5.6.tar.gz]
-md5=b3a28fe9bcec2fc7ae70f5d819bf3d1a
-sha256=aaaae4e3a25880d9f6af2dcf504b03f98946dcfb79e4c0a77adb9223aaa5cbc4
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/m/mce-dev/mce-dev_1.6.3.tar.gz]
-md5=c3e128f6b99a00d5ef029b52af236453
-sha256=f6ea98fb44e978966d41bf5ad7f662df33dd0ef236403753bfbbea93a1c34701
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mcp-sa11x0-r0.patch]
-md5=04468563b3b6942e72844904f1c34e9b
-sha256=1112d3ea07f519ca7a45b6c82b43a9d368ba2d8a4a4244172b5e66f63eee6fb8
-
-[http://kernel.org//pub/linux/utils/raid/mdadm/mdadm-1.12.0.tar.bz2]
-md5=736705240e918294740929518477fc6f
-sha256=22831449225cc39948b187c9e3bd89ba12d5c8abee18b2d0242da883cb7d9490
-
-[http://kernel.org/pub/linux/utils/raid/mdadm/mdadm-1.12.0.tar.bz2]
-md5=736705240e918294740929518477fc6f
-sha256=22831449225cc39948b187c9e3bd89ba12d5c8abee18b2d0242da883cb7d9490
-
-[http://kernel.org//pub/linux/utils/raid/mdadm/mdadm-2.5.5.tar.bz2]
-md5=099bb5f340c5d334445dd003a6d86460
-sha256=d54ae28bdafdbd3c71bfafa8f8814583356714b6a1436783161413a1e34a38c9
-
-[http://kernel.org/pub/linux/utils/raid/mdadm/mdadm-2.5.5.tar.bz2]
-md5=099bb5f340c5d334445dd003a6d86460
-sha256=d54ae28bdafdbd3c71bfafa8f8814583356714b6a1436783161413a1e34a38c9
-
-[http://homepages.tu-darmstadt.de/~p_larbig/wlan/mdk2-v33.tar.bz2]
-md5=c02004f4588fdc19e5e861df896f5e2c
-sha256=38294fb58a3dfcc21d64f263370d039a2411dda0aa472d1e0d94b7864f1f8fc9
-
-[http://homepages.tu-darmstadt.de/~p_larbig/wlan/mdk2-v36.tar.bz2]
-md5=fbe3aaefc220556a03bf06a7811dc83c
-sha256=87aa1784ffba9131b9fe3bbe7b1fa5d2fcb3ddffe9f8b73435894923467b981a
-
-[http://www.tu-darmstadt.de/~p_larbig/wlan/mdk3-v2.tar.bz2]
-md5=06ed66c2f6651004b436199d1aa9a3cb
-sha256=3fa27adcc60b090b22b510343818f8076dd87ea5a911ebee7709ae8dadb6d4d0
-
-[http://downloads.sourceforge.net/mediatomb/mediatomb-0.11.0.tar.gz]
-md5=661f08933830d920de21436fe122fb15
-sha256=25e0b3d761e41fc6793c780eb7f638719867cdc6d3429ec24f72d1e9556ac1d2
-
-[http://heanet.dl.sourceforge.net/mediatomb/mediatomb-0.11.0.tar.gz]
-md5=661f08933830d920de21436fe122fb15
-sha256=25e0b3d761e41fc6793c780eb7f638719867cdc6d3429ec24f72d1e9556ac1d2
-
-[http://downloads.sourceforge.net/mediatomb/mediatomb-0.9.0-pre.tar.gz]
-md5=bd6bf1a44393ef96c490319606df70bb
-sha256=d48eca88957ba7c972a379321fb8165e67dae0e5a0039fe553183da1207b2ad6
-
-[http://heanet.dl.sourceforge.net/mediatomb/mediatomb-0.9.0-pre.tar.gz]
-md5=bd6bf1a44393ef96c490319606df70bb
-sha256=d48eca88957ba7c972a379321fb8165e67dae0e5a0039fe553183da1207b2ad6
-
-[http://downloads.sourceforge.net/mediatomb/mediatomb-0.9.0.tar.gz]
-md5=bfa110c41623ff689a60844430f91a34
-sha256=5876c28d5015c9a947ba87b5005e23d0eeaffd5de9eea2f321d6f42c8a71ed17
-
-[http://heanet.dl.sourceforge.net/mediatomb/mediatomb-0.9.0.tar.gz]
-md5=bfa110c41623ff689a60844430f91a34
-sha256=5876c28d5015c9a947ba87b5005e23d0eeaffd5de9eea2f321d6f42c8a71ed17
-
-[http://downloads.sourceforge.net/mediatomb/mediatomb-0.9.1.tar.gz]
-md5=3cb8a14b17102ec828853679d879f7bc
-sha256=64821ec2c678e5da1582ee116d919ce2beef166301586e42c547e4482fb8d945
-
-[http://heanet.dl.sourceforge.net/mediatomb/mediatomb-0.9.1.tar.gz]
-md5=3cb8a14b17102ec828853679d879f7bc
-sha256=64821ec2c678e5da1582ee116d919ce2beef166301586e42c547e4482fb8d945
-
-[http://www.pengutronix.de/software/memedit/downloads/memedit-0.7.tar.gz]
-md5=3d0f372fb213e09b8d04826f3a0bc2eb
-sha256=9bb7412a03a76da4219215d2f92addf71305ab3fcc7d9315bb6f9c41fbe851fd
-
-[http://pyropus.ca/software/memtester/old-versions/memtester-4.0.5.tar.gz]
-md5=f6328b4863caf8f2013489c82c26cd1d
-sha256=cd907918ff4a7d1eea4ed618c181da0e0894bcfcdb1e3e4909a2795da120ae4c
-
-[http://pyropus.ca/software/memtester/old-versions/memtester-4.0.6.tar.gz]
-md5=0e6f7335075443ed0863a0df75689359
-sha256=2a4bf8bdac96d6498e323b93954099fb13a9d92ddd5704aa6553940b86a071bb
-
-[http://downloads.sourceforge.net/lxde/menu-cache-0.2.2.tar.gz]
-md5=2ebce9f1217553112ac35abc35360050
-sha256=ee28209d7cdcb759338ef0061e2f7c6ec7a021369659790adeef2cd888b58696
-
-[http://qa.debian.org/watch/sf.php/lxde/menu-cache-0.2.2.tar.gz]
-md5=2ebce9f1217553112ac35abc35360050
-sha256=ee28209d7cdcb759338ef0061e2f7c6ec7a021369659790adeef2cd888b58696
-
-[http://ftp.gnome.org/pub/GNOME/sources/metacity/2.24/metacity-2.24.0.tar.bz2]
-md5=d4aa782d5f71b6c42514b239684a4aa3
-sha256=90eed0a36aae302db52af12220c4cf863c9cccebd233015104f2d88cb17ec076
-
-[http://www.equi4.com/pub/mk/metakit-2.4.9.3.tar.gz]
-md5=89a25775fee5db536937f36deb5223f6
-sha256=4d6c46289b1f1dea4e8bbc78332901491bde0c552727c27431ca9cb0234658da
-
-[http://www.equi4.com/pub/mk/older/metakit-2.4.9.3.tar.gz]
-md5=89a25775fee5db536937f36deb5223f6
-sha256=4d6c46289b1f1dea4e8bbc78332901491bde0c552727c27431ca9cb0234658da
-
-[http://downloads.sourceforge.net/metalog/metalog-0.7.tar.gz]
-md5=40940eb9829de7d5776b9bbd514f9d7e
-sha256=738f39e2bc4ff8a80a5f01f163b2dd30525466aca87b9791e140b9900402fe1c
-
-[http://heanet.dl.sourceforge.net/metalog/metalog-0.7.tar.gz]
-md5=40940eb9829de7d5776b9bbd514f9d7e
-sha256=738f39e2bc4ff8a80a5f01f163b2dd30525466aca87b9791e140b9900402fe1c
-
-[http://nslu.sf.net/downloads/mgetty_1.1.30.orig.tar.gz]
-md5=ff7872dbef3332dd8f550da78d387f2e
-sha256=008f0bea1fe7fd0f6484536442e660e533bad209ad7a57af3ee6f0a0300fd671
-
-[http://downloads.sourceforge.net/miau/miau-0.5.3.tar.gz]
-md5=7f6a372f1f9371094d0dd433b89ec48d
-sha256=ebede057bf1c312182d069b958eccfafbb18fca4cbba0a41f0c5f35094cb15e2
-
-[http://heanet.dl.sourceforge.net/miau/miau-0.5.3.tar.gz]
-md5=7f6a372f1f9371094d0dd433b89ec48d
-sha256=ebede057bf1c312182d069b958eccfafbb18fca4cbba0a41f0c5f35094cb15e2
-
-[http://downloads.buffalo.nas-central.org/Users/timtimred/kuropro/micro-evtd-3.3.0.tar.gz]
-md5=2a5353aa1fd028c3cbfdfdec9e38c1bb
-sha256=fe3730d1bcca4eaa86f9e39f6524328a58d134b73f1d9261f21e0f89f7b3ca10
-
-[ftp://ftp.microwindows.org/pub/microwindows/microwindows-0.90.tar.gz]
-md5=203188db254cc418e9d9dd9791543b9a
-sha256=8253a341c3bdd49467ecfdb5ccc03b359eacec5aec0b35bd77cdce341e157399
-
-[ftp://ftp.microwindows.org/pub/microwindows/microwindows-src-0.91.tar.gz]
-md5=901e912cf3975f6460a9bb4325557645
-sha256=c0a8473842fc757ff4c225f82b83d98bba5da0dca0cf843cfc7792064a393435
-
-[ftp://ftp.microwindows.org/pub/microwindows/microwindows-src-snapshot.tar.gz]
-md5=934348f3ccfb457f8faad0b17dc900cb
-sha256=319d155e2032b97c799faaf0c47dca0a247b4f6893d6d92153600329af32c9b7
-
-[http://software.twotoasts.de/media/midori/midori-0.0.10.tar.gz]
-md5=7a4a20e21fb3f3109c81f6ff9cc4647e
-sha256=b79b8aad657d2a2b59fb773fed4ef7567fb28e5a3f3bd645ff904f69d50a0555
-
-[http://software.twotoasts.de/media/midori/midori-0.0.11.tar.gz]
-md5=dea8fba05c35333c0c984745cb397acb
-sha256=f3b82db4c4edd81087aa37e747501af903dfd2d1e6e2063f20a345e4e7924116
-
-[http://software.twotoasts.de/media/midori/midori-0.0.12.tar.gz]
-md5=f69826ece3b8a34ef431d2de57b60d96
-sha256=13831ee98f4daaee9b5569a6ac8924a1e5f3223b928f408ab7e8b013daa4921c
-
-[http://software.twotoasts.de/media/midori/midori-0.0.13.tar.gz]
-md5=e67bc748c11606013a90a0760a843967
-sha256=5261c2e9d7a3d10832bedf3970dad89d8c9e39b54269111d719c6e60aa422aac
-
-[http://software.twotoasts.de/media/midori/midori-0.0.15.tar.gz]
-md5=0b6eebdcedd224b2b9f437b706471762
-sha256=3b449713a164d574031843ca38f37be12e3ac40804995b3e5a252562a598482f
-
-[http://software.twotoasts.de/media/midori/midori-0.0.17.tar.gz]
-md5=58d1b7ed282540030eb1b5803b760865
-sha256=affeddb78d9342e961e868270872c166ac2eba7d43e5f629d91f03219d6e0df8
-
-[http://software.twotoasts.de/media/midori/midori-0.0.18.tar.gz]
-md5=aa9c10bbf6fe3502a65633c4fac0fb80
-sha256=36c20ca7c59e6c35deb04a9febde8aa8040c78c6ba21f595442b94ab78ec137c
-
-[http://goodies.xfce.org/releases/midori/midori-0.0.21.tar.bz2]
-md5=0b9298d00c598137431beb51dbe1f302
-sha256=e561f66262eaf6b9cbd8e84688184b7f3ba6cba0e34e9791e578bdef9adc7731
-
-[http://software.twotoasts.de/media/midori/midori-0.0.8.tar.gz]
-md5=069275806e0224b1de3e080c23c95dc5
-sha256=7861535eef2c0804dbdc6993db76574b4a812164bed7545a3697a3b97e36d2dd
-
-[http://archive.xfce.org/src/apps/midori/0.1/midori-0.1.10.tar.bz2]
-md5=97b6a3a3ccb8458c68c335b2ee8e9197
-sha256=1f6a3af09ea9b9669c4b1a7ca2a8cbee5114dac2612e6f5ced1ea7ea4967fbfc
-
-[http://goodies.xfce.org/releases/midori/midori-0.1.2.tar.bz2]
-md5=5169ead6783f374cedf3f89bf399bd75
-sha256=a966641cf1b6e18e4f58aa3585a9a63905ed50252883804c006a3263674a32ec
-
-[http://goodies.xfce.org/releases/midori/midori-0.1.4.tar.bz2]
-md5=a9b21027ba894fed3055d7074c5f073d
-sha256=4a84422c270625162f6e9e1e4e8151d9546457d64c61c2b3c896cbf43fb54ce5
-
-[http://goodies.xfce.org/releases/midori/midori-0.1.5.tar.bz2]
-md5=dccaddeb49d7def8a19cf497cb7eabf8
-sha256=cea3848006631801709588b8ae6808dbc768f62b6da4085073075f276309fd0d
-
-[http://goodies.xfce.org/releases/midori/midori-0.1.6.tar.bz2]
-md5=afed64074b2ed195aae171b2178650e1
-sha256=e6cc1b6da8a7af99ba9298e0cb4aac790595f04e04497ea8c2bb4b48c44feb5f
-
-[http://goodies.xfce.org/releases/midori/midori-0.1.7.tar.bz2]
-md5=c6299ecf93417526f37bc0154c18b126
-sha256=9b74a776831c3680c10ad5c3d04985a1368c4fdf2f383a0e8efcc3cda925baaf
-
-[http://goodies.xfce.org/releases/midori/midori-0.1.8.tar.bz2]
-md5=06935203b20e9794121a2c354fc9dea5
-sha256=3b0e4a2c5c3e4457ce8f44e6cbb9f14ddfb66a515017b430f4f4484893e8ce9d
-
-[http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.0.tar.bz2]
-md5=805e2e59a93a0a4b7652d6547b2bd923
-sha256=97c79d20807899bad4b241385c7cbf3a4f85d2673b1b6c12059878450e3e971a
-
-[http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.1.tar.bz2]
-md5=3cee94c9a22316504a3ba99bc92e0245
-sha256=7d79a45331cfcf002ccd5a386b5597f91e0ee048b2b040a57c6faebc02bba79c
-
-[http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.2.tar.bz2]
-md5=14f81a7a10f80a173da1b5e88713400b
-sha256=bec38745947b79a80352374937cecb81fd21d30c35f11b11290fabdad1e4cb07
-
-[http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2]
-md5=d50f0a9683dee60685bcd48e04970949
-sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee
-
-[http://git.xfce.org/kalikiana/midori/snapshot/midori-f30dff433056e239ca775d16f343bdb249f1a338.tar.bz2]
-md5=24f6c176246300b66c036de65fed0565
-sha256=6151809d337ea8d07769618acd4ac470c5ccd310790e40805b93cf8781904048
-
-[http://downloads.sourceforge.net/midpath/midpath-0.3rc2.tar.gz]
-md5=d03cd88f51f82bbcfcfa5b65df0da5b0
-sha256=e235ca7470e7cdfb90e3806fbcc1b2c450db286276136a2523c7ae26a804a100
-
-[http://mikmod.raphnet.net/files/mikmod-3.2.2-beta1.tar.bz2]
-md5=006378681d520fa8ee1dacca965bbd3c
-sha256=0e760acb85584ea3e828989c5588f827f0dd845d3dd6948e2aea12bb6278651d
-
-[ftp://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.28-1.tar.gz]
-md5=d779a0b8f58776c28296ae62f253784e
-sha256=8ee3e48da07e20899a11adb9f2dd4dfc4922b43bcb1dc7bd78c55aceeb5eccc1
-
-[ftp://ftp.nl.debian.org/debian/pool/main/m/mime-support/mime-support_3.28-1.tar.gz]
-md5=d779a0b8f58776c28296ae62f253784e
-sha256=8ee3e48da07e20899a11adb9f2dd4dfc4922b43bcb1dc7bd78c55aceeb5eccc1
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/m/mime-support/mime-support_3.28-1.tar.gz]
-md5=d779a0b8f58776c28296ae62f253784e
-sha256=8ee3e48da07e20899a11adb9f2dd4dfc4922b43bcb1dc7bd78c55aceeb5eccc1
-
-[ftp://ftp.us.debian.org/debian/pool/main/m/mime-support/mime-support_3.28-1.tar.gz]
-md5=d779a0b8f58776c28296ae62f253784e
-sha256=8ee3e48da07e20899a11adb9f2dd4dfc4922b43bcb1dc7bd78c55aceeb5eccc1
-
-[ftp://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.44-1.tar.gz]
-md5=048aa29c31f067382cd669ee20934b9e
-sha256=4f65183200955540c097b82bfb18f5d21b636ca79f47cd018a4ea8b89cd2998c
-
-[ftp://ftp.us.debian.org/debian/pool/main/m/mime-support/mime-support_3.44-1.tar.gz]
-md5=048aa29c31f067382cd669ee20934b9e
-sha256=4f65183200955540c097b82bfb18f5d21b636ca79f47cd018a4ea8b89cd2998c
-
-[http://downloads.sourceforge.net/mingw/mingw-runtime-3.14-src.tar.gz]
-md5=7d049a8331efcfe34600c0cda6934ac6
-sha256=a145a90d0824c65cfc11c3fc843ba484585983e1e8ee14b79f4d09cf1d38b98b
-
-[http://downloads.sourceforge.net/mingw/mingw32-make-3.81-20080326-src.tar.gz]
-md5=7c21ed475aa72a0fd3115dcc12eaeaa2
-sha256=f05c64eaa334cf6a59aacdfff3213fc53d0b670e79662fb25f029bfb78148bac
-
-[http://downloads.sourceforge.net/mingw/mingwrt-3.15.1-mingw32-src.tar.gz]
-md5=0411b98fd5eeac0706e2abb7122526bb
-sha256=4f4d19f3e15fdf00957932211be609b6bf4e689ad5938ce7bff666a638bde0e7
-
-[http://downloads.sourceforge.net/mingw/mingwrt-3.15.2-mingw32-src.tar.gz]
-md5=7bf0525f158213f3ac990ea68a5ec34d
-sha256=64d7c31354d318ec2085e39e724287c78742a66302fd0b27dab7a3f705d5c54d
-
-[http://www.denx.de/twiki/pub/Know/MiniFOHome/mini_fo-0-6-1-pre1.tar.bz2]
-md5=7e192e01b08023c7f3e63bf1c796bc14
-sha256=68c64a38f0b29347f86871248f0399e7e1b12645dc6263af7b2e4940f1392eaa
-
-[http://www.acme.com/software/mini_httpd/mini_httpd-1.19.tar.gz]
-md5=7c68293ad265ecfe2edea917912f6f1f
-sha256=f7f36533b1338ea16d916ea525ea7006ab38fdd3544ac7df93a4688a8e270241
-
-[http://gpe.linuxtogo.org/download/source/miniclipboard-0.3.tar.gz]
-md5=8bea461bf4136aedbe110b6aec184d72
-sha256=7f9c937c0f04760d215f7e7d9ca2709f8148e69be2693206d1ae81e2c88a656e
-
-[http://alioth.debian.org/download.php/123/minicom-2.1.tar.gz]
-md5=1c8f3b247c38fb16c3c2170df9fc102a
-sha256=7f04535b3839fbbb0affa780108c32c330b924caf4e41dacd57dd23aa1fec392
-
-[http://alioth.debian.org/frs/download.php/2332/minicom-2.3.tar.gz]
-md5=0ebe7a91898384ca906787cc4e2c3f25
-sha256=2acbc3d4a07e1134ee285a72fa44bbc27703b02dba02be68db9e6fd8320356fb
-
-[http://gpe.linuxtogo.org/download/source/minilite-0.41.tar.gz]
-md5=135996a65350d5c40a2c020a2ddaf5ef
-sha256=2e01c8375e7d876a44b8703e00958aea88967124c1a9631031c4ea8019f5dd32
-
-[http://gpe.linuxtogo.org/download/source/minilite-0.43.tar.gz]
-md5=93fef25a7fecc7e6caa73c7fd34e6d28
-sha256=62fbcfbba464b13f857c054554b62593039f83f0363cb335b1a2f9f683d41e26
-
-[http://gpe.linuxtogo.org/download/source/minilite-0.44.tar.gz]
-md5=d9da95ba27ad0bd96fc9093f728c9f90
-sha256=c32a90c6ffd2f9bf018dde29f3b09d5e1a90369b4128b3e59003892efc72f31e
-
-[http://gpe.linuxtogo.org/download/source/minilite-0.47.tar.gz]
-md5=d0d91387df0897de8304f69af86e9d15
-sha256=8cadb3e56c19c3c5bca5e15074deb5ee451d8871d7f72a06c6d24e150ec352f5
-
-[http://gpe.linuxtogo.org/download/source/minilite-0.48.tar.gz]
-md5=aef833f6f80ccb1c7b6a57a25f3562bc
-sha256=b126f705c0be143acb5f14a832fd3e03ec25ae0c102269889b1c386ff77b73db
-
-[http://gpe.linuxtogo.org/download/source/minilite-0.49.tar.gz]
-md5=d60d58356ed9a9937e21711a9ceb0b79
-sha256=a018e95645ceed535e6df7fbf6fc22ba37fa26778f7e58e5ffface625bf97775
-
-[http://gpe.linuxtogo.org/download/source/minilite-0.50.tar.gz]
-md5=d81cecf269ad7bab0da960e6e7228332
-sha256=2b299425203246090a4949e034f1d0efb3ff99cd1591d0e16c57370a530b361e
-
-[http://gpe.linuxtogo.org/download/source/minimix-0.7.tar.bz2]
-md5=348ca2789f2a1ebc553ab187192f07bd
-sha256=cdea38d41a67dac16243e068d25dfe1560519a065c9445055595b6397fa1ccd5
-
-[http://gpe.linuxtogo.org/download/source/minimix-0.8.tar.bz2]
-md5=0cfb89bf2596710543935e31ad1d5a17
-sha256=aad022ce6fdefad1caf904bb66568e1f487b7b23301417a5a38faf826b418b5d
-
-[http://gpe.linuxtogo.org/download/source/minimix-0.9.tar.bz2]
-md5=087e60bbf0de3b8f14660977596bf6a1
-sha256=6023a460561b02f9682213f10c4fcfd1dd848e94a3de99caf8cf9385bae8b093
-
-[http://handhelds.org/~paxanima/files/minipredict.tar.gz]
-md5=d6793818b10c9af0f1c424a2e81009e1
-sha256=73edd3f8e7c36c81c895ea723e7faefd3ee5a3671d0b1e0ea7b3a960b169231e
-
-[http://www.mobile-ipv6.org/software/download/mipv6-1.1-v2.4.26.tar.gz]
-md5=d9b86e649ee49cc5be2024d24e55cc3a
-sha256=d801b5ecdfce599b54142d32b0d89966cb33d97cbac94416907666d94c1a80a6
-
-[http://www.mobile-ipv6.org/software/download/mipv6-2.0.2.tar.gz]
-md5=2cf58dca0ab3c38223e25dbecba8ed37
-sha256=474443cd4c80d958ea34e3645dab641868e5b6714854a4122b7e3753a20a2eb9
-
-[http://linux-h4000.sourceforge.net/mirror/mk-layouts-gui.git_5b42aeff36d930dc3a9b75eedc74dacfec45f43f.tar.gz]
-md5=bae81f5b80e7e923ee32e1b10c87de7f
-sha256=593d74ba14e8f1c6263f612f0f5ee53eb4a41d05d873d0019aa1542e6971a952
-
-[http://icedtea.classpath.org/hg/release/icedtea6-1.6/raw-file/7c131a5e1ccf/mkbc.c]
-md5=798aa000ddc0a29fac6a8d3aded6c43e
-sha256=7c5e271afc028dae493c5aabf34e935200d1773d64f9a0340ab218b6ecac18ee
-
-[http://hp.vector.co.jp/authors/VA013651/lib/mkbold-mkitalic-0.11.tar.bz2]
-md5=2384f0eb2e0d2d8f70ee292b81522619
-sha256=efddffd87681f0e8f3fc140c99ba6f4e15be4f144d2488886fb493cb3d85e990
-
-[http://files.fredemmott.co.uk/mkbot-0.3.tar.bz2]
-md5=094b5693c602c5d872e49e24d2747ef2
-sha256=c1cace2663ee1ff32f95d14fc60a6b7eee3ec8e3d0e7c531e9a778bbf29960a1
-
-[http://xorg.freedesktop.org/releases/individual/app/mkcfm-1.0.1.tar.bz2]
-md5=d5d560ea77541591d2a6656991286457
-sha256=7fbadfa5cb38f7d754214b792854c4a0cb32fd1c9b5ae8ff05434cb3b3acbe01
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/mkcfm-X11R7.0-1.0.1.tar.bz2]
-md5=912e6305998441c26852309403742bec
-sha256=25cba395022c878cf0323da5b2b4aba1cca03001311a4e2d7632d6a199806294
-
-[http://xorg.freedesktop.org/releases/individual/app/mkcomposecache-1.2.1.tar.bz2]
-md5=25b774e1b64833d0cdc00663931efc73
-sha256=c9ee54d18cb9a8a0c5fcd8d2dd08ed8ed869f3a538af46caff08ca9bc9cf2caf
-
-[http://xorg.freedesktop.org/releases/individual/app/mkcomposecache-1.2.tar.bz2]
-md5=c8237b4aea1ae0c15441deab6b12c5c0
-sha256=8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb
-
-[http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.3.tar.bz2]
-md5=4d0f89a23f77e22f1671a77bf0898955
-sha256=2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074
-
-[http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.4.tar.bz2]
-md5=35394bf3f746a57fba624dba52fdbba3
-sha256=6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3
-
-[http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.5.tar.bz2]
-md5=9365ac66d19186eaf030482d312fca06
-sha256=a534650cff503619f9101577d816cde283da993bc039273477bd8dfbd01a2d0b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/mkfontdir-X11R7.0-1.0.1.tar.bz2]
-md5=29e6e5e8e7a29ed49abf33af192693cb
-sha256=409f2fdfd87b5185ca651197c1d1facc22619bc1399bfb8dda8fda1fbb6205b2
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/mkfontdir-X11R7.1-1.0.2.tar.bz2]
-md5=384ee10787c455c520bcf031989de6f3
-sha256=94c4ab96ad858524b64864482f5623bd18f844b98788d7d4be1f8065a4f13a0d
-
-[http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.3.tar.bz2]
-md5=1d608771aca9695b828cec1e34178fd1
-sha256=0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020
-
-[http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.4.tar.bz2]
-md5=e5d7373c4266973b3b13aac5d1a4655b
-sha256=dc9b946cc23490c960fbca8b32e4bba4bc23ce404a8d7e1c0e916894c83b4227
-
-[http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.5.tar.bz2]
-md5=5e6e210b70adfef1264b0212aab1f758
-sha256=f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850
-
-[http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.7.tar.bz2]
-md5=96ca346f185c0ab48e42bf5bb0375da5
-sha256=8306b229cca233216a6582cb1ff60af78e37c47d6412ac823d7d41c3d7de7127
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/mkfontscale-X11R7.0-1.0.1.tar.bz2]
-md5=75bbd1dc425849e415a60afd9e74d2ff
-sha256=e83b80b4ccd7863223fac4a2d54974a64a79c635d6bdda0c6e7039f966eae9e2
-
-[ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.6.tar.gz]
-md5=3e66f91f8a39c7dc0a67b158aeb9c2ac
-sha256=a1275889c7bb6b3c353d5b9ebb983064e8ef1d29ef8688bd132cec065642d2d9
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mmc-spi.patch]
-md5=329fd64f8ccdb2731c54f6a1b8c6de14
-sha256=27934de6da3f5ac94ed60ba4bfdd3acc2d93b01a2f932b576f87fb4508dcde6e
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mmc_spi-r4.patch]
-md5=85922650d2e640e2cb723e71fd00a471
-sha256=34cf9ceb9e811ee85c74ae2c217548e1d193741fbf9a43d37116f1d4e404f496
-
-[http://www.rpsys.net/openzaurus/patches/archive/mmcsd_large_cards-r0.patch]
-md5=e331b314ab194a87bdd23aac1ee43bbe
-sha256=5e1e6967a9a4784f802947cf8569903ed91d8444b5c197d9572aeaf704583751
-
-[http://www.rpsys.net/openzaurus/patches/archive/mmcsd_large_cards-r1.patch]
-md5=9b69a1f5951ebd26d5b29ac326c5c414
-sha256=8de4e1a8696c2f47ed1b9009498b4f89ba9dd3fbda6083531ef40c35ce001996
-
-[http://www.rpsys.net/openzaurus/patches/archive/mmcsd_no_scr_check-r0.patch]
-md5=a4c22e99760309988262f0672d30e92f
-sha256=afdd27de4e0026a0b8601db6e5ed523a1dafeece4964ec6d49dd7e48f0aab6b0
-
-[http://www.rpsys.net/openzaurus/patches/archive/mmcsd_no_scr_check-r1.patch]
-md5=aeb3c62bf676952696b5dc9733d2dc0a
-sha256=f3207b70d719892faec1ea9719fe56c235c06ad9171f0101934fb11ecbe1d1e9
-
-[http://www.rpsys.net/openzaurus/patches/archive/mmcsd_no_scr_check-r2.patch]
-md5=b60a6035a3e84ba68771fef999ccc96f
-sha256=fe3dcba12eab368a5c14e6c247886bcbaa3fafc662ea8de00fd579f956a21a71
-
-[http://meshcube.org/download/mobilemesh_1.2.tgz]
-md5=b3bb74dd4f5d5a1c427ad93d5cc401f5
-sha256=9e0e4da4c414449efc1c38e908ba81dfc6a095d5c8e5f346c07589b5df8748c1
-
-[ftp://ftp.daper.net/pub/soft/moc/stable/moc-2.4.0.tar.bz2]
-md5=5b31665390fb0b30d19dadec4e90abb8
-sha256=9fffb28f0edb020dffe605b0d69d94f1b3abe3d1e8beffa2ea7809daecaff136
-
-[ftp://ftp.daper.net/pub/soft/moc/stable/moc-2.4.3.tar.bz2]
-md5=8808082848e90eeec5415baaec7e98ad
-sha256=8598bb4f65e0b7d2a669e06222e6ba5eb1127b52b9a30136b2a823ccee10929f
-
-[http://gnu.ethz.ch/linuks.mine.nu/modplugplay/modplugplay-1.0.tar.gz]
-md5=ac8e98865d90dca25c85748b3916bf07
-sha256=d78a39b4158901695c59d0757e8fe622e9b4cebcfb77eedfc20b937e5a0d521d
-
-[http://www.linuks.mine.nu/modplugplay/modplugplay-1.0.tar.gz]
-md5=ac8e98865d90dca25c85748b3916bf07
-sha256=d78a39b4158901695c59d0757e8fe622e9b4cebcfb77eedfc20b937e5a0d521d
-
-[http://kernel.org//pub/linux/utils/kernel/module-init-tools/module-init-tools-3.2.1.tar.bz2]
-md5=29aa770c6ce92cbbc6da00161d2784d8
-sha256=f7c66e151d3d89df02c41f82cae5c384cad76ad3956519a872d98d5676bddd47
-
-[http://kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.2.1.tar.bz2]
-md5=29aa770c6ce92cbbc6da00161d2784d8
-sha256=f7c66e151d3d89df02c41f82cae5c384cad76ad3956519a872d98d5676bddd47
-
-[ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.2.2.tar.bz2]
-md5=a1ad0a09d3231673f70d631f3f5040e9
-sha256=c080f7e42e60456eab33051026da388b5d21a360e9d2bee26ce9991427a758aa
-
-[http://kernel.org//pub/linux/utils/kernel/module-init-tools/module-init-tools-3.2.2.tar.bz2]
-md5=a1ad0a09d3231673f70d631f3f5040e9
-sha256=c080f7e42e60456eab33051026da388b5d21a360e9d2bee26ce9991427a758aa
-
-[http://kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.2.2.tar.bz2]
-md5=a1ad0a09d3231673f70d631f3f5040e9
-sha256=c080f7e42e60456eab33051026da388b5d21a360e9d2bee26ce9991427a758aa
-
-[http://kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.4.tar.bz2]
-md5=db6ac059e80e8dd4389dbe81ee61f3c6
-sha256=96c7a1b313722a5203d7a6c4cb89f09ac186f8565bb1666a6053979072633d87
-
-[http://kernel.org//pub/linux/utils/kernel/modutils/v2.4/modutils-2.4.27.tar.bz2]
-md5=bac989c74ed10f3bf86177fc5b4b89b6
-sha256=ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0
-
-[http://kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-2.4.27.tar.bz2]
-md5=bac989c74ed10f3bf86177fc5b4b89b6
-sha256=ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0
-
-[http://projects.openmoko.org/frs/download.php/271/mofi.0.02.tar.gz]
-md5=3a2efecc54880a6708d7ddfa88df3df9
-sha256=33a25af95a6aa3a810f5fdf0070ba7744988ad8c60cfc38193ed79b8b4059c9f
-
-[http://downloads.sourceforge.net/moin/moin-1.2.2.tar.gz]
-md5=4032f2305a3393ab18e02efe6550e1aa
-sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e
-
-[http://heanet.dl.sourceforge.net/moin/moin-1.5.8.tar.gz]
-md5=79625eaeb65907bfaf8b3036d81c82a5
-sha256=569c9b4f7b2cf411718a3ac5e6427c1babacbaf1b085276f822d8d08040e4a8f
-
-[http://static.moinmo.in/files/moin-1.8.1.tar.gz]
-md5=4a0dbe4e0cfdc15d30958bdc571bbfd7
-sha256=2492f6bd7e2140e62436f11e14b21ec36d17d784fa8271e61f8f06012c83a1d2
-
-[http://mokomaze.projects.openmoko.org/files/mokomaze-0.5.5+git8.tar.gz]
-md5=f4e1dbd444b4049c361f9c1c3d40d32b
-sha256=515d842b79a2c34f5789fa10110bc9d7b15c65a7b1fa623131a1e03599fe7362
-
-[http://www.tildeslash.com/monit/dist/monit-4.10.1.tar.gz]
-md5=d3143b0bbd79b53f1b019d2fc1dae656
-sha256=f6a29300648381538a403f24506e75b94164e26c69c6861ca112d425edc9d193
-
-[http://go-mono.com/sources/mono/mono-1.2.2.1.tar.gz]
-md5=b67ef657b83ca26249d7b9e9c5e7da69
-sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5
-
-[http://go-mono.com/sources/mono/mono-1.2.5.1.tar.bz2]
-md5=dfede0c8c29384a8f8a6953a9bd06224
-sha256=434f91032e48c03e1202ba3cef1648e2708eeefcf51143d3547e34acc9c68a96
-
-[http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2]
-md5=391f85b4f962269e044ceac2b5235310
-sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
-
-[http://ftp.novell.com/pub/mono/sources/mono/mono-1.9.1.tar.bz2]
-md5=6610c3b999d791553a9dc21059ca9d35
-sha256=990af2fa20ad4e99ae5000df1afdb2e3b70400ba22d62e8917123d6a9d966397
-
-[http://bec-systems.com/pub/mono/mono-2.2-rc1.tar.bz2]
-md5=6dfc8364f6e761d558f134a707bae421
-sha256=44fc0eddf56c0abe861190051fceec6e223122c5835967459c69fbf98ee52067
-
-[http://bec-systems.com/pub/mono/mono-2.2-rc2.tar.bz2]
-md5=a311545a0003f1a599297d57e4e27916
-sha256=4cf6094f64f3446e83b968cbee3f0ed5d579b635644dd8cbd51bbbe184446600
-
-[http://ftp.novell.com/pub/mono/sources/mono/mono-2.4.2.3.tar.bz2]
-md5=696f25afc8453cd0d1c78de6e905dcf2
-sha256=1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae
-
-[http://venge.net/monotone/downloads/monotone-0.20.tar.gz]
-md5=3bdf4da35ff576a401483815952f4045
-sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93
-
-[http://venge.net/monotone/downloads/monotone-0.21.tar.gz]
-md5=c30c96b97ae56268cac567bd8837b991
-sha256=a96adda6067adaeb01477c2fc58947c8567a7c5866a5f40c272bc7df728b72f5
-
-[http://venge.net/monotone/downloads/monotone-0.22.tar.gz]
-md5=ee0f25577b8a640df3015113e67bb718
-sha256=b1b65dacbeef990cd0cf9ba0b5ee8e2e6617e69c41a17cbb0d92d7e705c2532f
-
-[http://venge.net/monotone/downloads/monotone-0.23.tar.gz]
-md5=6d9e909480c2be0b23e2820c3a42e6f1
-sha256=2779f3ddb291516f03936c37425c6c9c8c3fbe71f545960be88d47ef14f3ec8a
-
-[http://venge.net/monotone/downloads/monotone-0.24.tar.gz]
-md5=8193203c8b48104500d956f9e524bfcd
-sha256=84fb5aac33ddd640a321f45b8f78f0f6f003d0e29ece1fd376fdf65b39ecc998
-
-[http://venge.net/monotone/downloads/monotone-0.25.2.tar.gz]
-md5=108c18666ce6ff9c05643f923027de8e
-sha256=ea95a2778e3dba087112dc6c42903f9629af17156c4da58c0ba3ac9761690159
-
-[http://venge.net/monotone/downloads/monotone-0.26.tar.gz]
-md5=21b902d1b48ffb868536d04c4ad38155
-sha256=4ced85ad82f7f74bc75f08d93009fa2f25b7516f11e78ece1f775a3db433054a
-
-[http://venge.net/monotone/downloads/monotone-0.27.tar.gz]
-md5=cf3d8f26b7570d0d65834c3949913e2d
-sha256=0a817e08b06141d78f2b8b0073aafd7110147679efb49c3e88c96a486532cacd
-
-[http://venge.net/monotone/downloads/monotone-0.31.tar.gz]
-md5=5a5feb8d053a5993ab516a1186bb5883
-sha256=ceda1a42c23d9cfd0bf609f059ee32f228f78384dcf155adb36a742c78976c84
-
-[http://monotone.ca/downloads/0.33/monotone-0.33.tar.gz]
-md5=bfbc7842c13e9be23299ca0348b2d0c2
-sha256=21a0502ae8b888d046d889478e7a0244f4761c4162edf70ec42399d3c2911947
-
-[http://monotone.ca/downloads/0.34/monotone-0.34.tar.gz]
-md5=b7a3cd2d4fcb17287641ee2e33f660fd
-sha256=57cc436480dd29ac7e751c4d5adbc2b0289ba2273bda388352be15446894bc56
-
-[http://monotone.ca/downloads/0.37/monotone-0.37.tar.gz]
-md5=d06193f2738626570692bed2173144c1
-sha256=061e2f6aa0a1c0105b105946744d84c44eb49e9a4fe4628e872c518533b6ec2d
-
-[http://www.venge.net/monotone/downloads/monotone_0.19-1.tar.gz]
-md5=cd636aba15508940e202ff43dc483aa3
-sha256=e17c283be0afa5abdf0be276e0240b3f1805afaea76537aacadc8e2ff626f9ef
-
-[http://downloads.sourceforge.net/motion/motion-3.2.10.1.tar.gz]
-md5=5ffdc958313345c69d3e0d5ec5c013cd
-sha256=2798b2a5e4d248244d5f40cce32dfb0f027e103dd8469a800b6b934467bf6117
-
-[http://downloads.sourceforge.net/motion/motion-3.2.11.tar.gz]
-md5=3a26c00f3250eacf6fa93c7a7e0249d9
-sha256=f1e187c61702a727bbd20bf5a66a310363257acc04b1f1c6e0b2e06e9b5dfa6e
-
-[http://heanet.dl.sourceforge.net/motion/motion-3.2.11.tar.gz]
-md5=3a26c00f3250eacf6fa93c7a7e0249d9
-sha256=f1e187c61702a727bbd20bf5a66a310363257acc04b1f1c6e0b2e06e9b5dfa6e
-
-[http://downloads.sourceforge.net/motion/motion-3.2.6.tar.gz]
-md5=71e6bd13fcca70372e9b7c7806d62b30
-sha256=48c456dfcadec2db472320e317fa37dc697f184e12f99006a1ec0b6512d2ebcd
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/mousepad-0.2.13.tar.bz2]
-md5=326075ac933e5da38cedbc20e80b7026
-sha256=f32cc263fb73b05c5bad17121073a2b37a7d5c8e411f780312c2701902e6637a
-
-[http://mocha.xfce.org/archive/src/apps/mousepad/0.2/mousepad-0.2.16.tar.bz2]
-md5=d98854edb76d823ac20b266fdf5a64a1
-sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
-
-[http://mocha.xfce.org/archive/src/xfce/mousepad/0.2/mousepad-0.2.16.tar.bz2]
-md5=d98854edb76d823ac20b266fdf5a64a1
-sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/mousepad-0.2.16.tar.bz2]
-md5=d98854edb76d823ac20b266fdf5a64a1
-sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
-
-[http://www.stack.nl/~brama/mp3blaster/src/mp3blaster-3.1.3.tar.gz]
-md5=38beb6a5648cbca4ec87ee14b0982283
-sha256=c1b110f2aa5ed8744f7f6eeabf24d6cd1cecc50f4b5473ec6ddf622935f360ee
-
-[http://www.stack.nl/~brama/mp3blaster/src/mp3blaster-3.2.0.tar.gz]
-md5=d01a36de2ebb5b4f7c407ae6cc7668b1
-sha256=723b4674980e378efe07e097cf909894852054dd52d44f3d6f948d847c940815
-
-[http://downloads.sourceforge.net/mp3blaster/mp3blaster-3.2.3.tar.gz]
-md5=0d892d7c99df175eb0efb2bc31086285
-sha256=6dae6f0a018010fbf65985eb03684c3da8ef5024edfc80cace22162377c96f2d
-
-[http://heanet.dl.sourceforge.net/mp3blaster/mp3blaster-3.2.3.tar.gz]
-md5=0d892d7c99df175eb0efb2bc31086285
-sha256=6dae6f0a018010fbf65985eb03684c3da8ef5024edfc80cace22162377c96f2d
-
-[http://mercury.chem.pitt.edu/~shank/mpc-0.11.2.tar.gz]
-md5=c8411da7936662312cf9483f3490e285
-sha256=1c35520f74ec932e8635896eca747925624574550813bcf71d1d77826385b633
-
-[http://www.musicpd.org/uploads/files/mpc-0.12.0.tar.bz2]
-md5=9ec03c5f3d136a9a58ef665dfb100e52
-sha256=55bdff5fefa619682c4da7cf25c8e1281f21f405e98580b24d3cfb7ff781a87d
-
-[http://www.musicpd.org/uploads/files/mpc-0.12.1.tar.bz2]
-md5=a93a390315aacfec061c8df89fb5e35f
-sha256=76e151048a736cf490630ace4909f2d4b65f1afe2447c7fd794d270eb956e045
-
-[http://downloads.sourceforge.net/musicpd/mpc-0.15.tar.bz2]
-md5=48897aeb3a7ee5c64f30e56789f105a8
-sha256=7b549ca4af77fc5b0472df1ecd9e76d2f8415258ddcfb63dfa64a55a04e1e590
-
-[http://www.multiprecision.org/mpc/download/mpc-0.8.1.tar.gz]
-md5=5b34aa804d514cc295414a963aedb6bf
-sha256=e664603757251fd8a352848276497a4c79b7f8b21fd8aedd5cc0598a38fee3e4
-
-[http://downloads.sourceforge.net/musicpd/mpd-0.11.2.tar.gz]
-md5=b6e913dc4b63b161bb1b96030763c3a7
-sha256=e784f78b3cce93367c105619c690465b78a88d3e4c616cc829f4cb5e66f2bbe0
-
-[http://downloads.sourceforge.net/musicpd/mpd-0.11.5.tar.gz]
-md5=1a9a1a9d31f00a43838b3752024f7ebe
-sha256=30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
-
-[http://heanet.dl.sourceforge.net/musicpd/mpd-0.11.5.tar.gz]
-md5=1a9a1a9d31f00a43838b3752024f7ebe
-sha256=30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
-
-[http://downloads.sourceforge.net/musicpd/mpd-0.14.2.tar.bz2]
-md5=66817a4b4c05454e6488f6b821f2a6a3
-sha256=0b3926a141873f179efc3c3b9d296b65d332dbb898340ac5e5d1dd0c3dd9fb20
-
-[http://downloads.sourceforge.net/musicpd/mpd-0.15.tar.bz2]
-md5=2ed93a60bd703ba46d6794e12cfb5f1d
-sha256=38d4c4073e81585c0f0b1a3b4909f7fecd0305de90f373a9a1c087090e6ddc20
-
-[http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0b.tar.gz]
-md5=52d10ea80595ec83d8557ba7ac6dc8e6
-sha256=9416376952812e5b479745d67a2bf874fbcad10137517314ce7de37abb756df8
-
-[http://bmrc.berkeley.edu/ftp/pub/multimedia/mpeg/encode/mpeg_encode-1.5b-src.tar.gz]
-md5=ff125fb82118efc7c852f0d26d5552c6
-sha256=dd8db42f88393bb0ff0d738defa271729a8aa9b8de24ed13bc6bd27014f2daf5
-
-[http://www.mpfr.org/mpfr-2.1.1/mpfr-2.1.1.tar.bz2]
-md5=843422d90349800ee721f6710d051c87
-sha256=df551fb075d5e6d0824b74d231962cf0e104c43f646e233675d952ef3c03debc
-
-[http://www.mpfr.org/mpfr-2.3.0/mpfr-2.3.0.tar.bz2]
-md5=cf7c743e4be122e63eb6f372fc58b657
-sha256=359f0d344f92d1f145ddcd37adf54f9b8069aa2ce89c4a19603d080ef17d2d48
-
-[http://www.mpfr.org/mpfr-2.3.1/mpfr-2.3.1.tar.bz2]
-md5=8352b619e04dcc73411a38b39dd855f6
-sha256=d857f9df4a6cf50d0bc57dd11296dd1a8d1ac709442875ea4fcd757a89da8430
-
-[http://www.mpfr.org/mpfr-2.3.2/mpfr-2.3.2.tar.bz2]
-md5=527147c097874340cb9cee0579dacf3b
-sha256=18e078c996e182b7ceab32f2ab840e6a151b593e0cd5b83cb9d2960f212fba4c
-
-[http://downloads.sourceforge.net/mpg123/mpg123-0.66.tar.bz2]
-md5=6753c7ce5bb35bd65c535b2b6322a9aa
-sha256=2cdcb3b78412034f787ae52e213d04455132f6c94c8b7f3f4b21c21c38d9afa5
-
-[http://heanet.dl.sourceforge.net/mpg123/mpg123-0.66.tar.bz2]
-md5=6753c7ce5bb35bd65c535b2b6322a9aa
-sha256=2cdcb3b78412034f787ae52e213d04455132f6c94c8b7f3f4b21c21c38d9afa5
-
-[http://downloads.sourceforge.net/mpg321/mpg321-0.2.10.tar.gz]
-md5=bb403b35c2d25655d55f0f616b8f47bb
-sha256=db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4
-
-[http://heanet.dl.sourceforge.net/mpg321/mpg321-0.2.10.tar.gz]
-md5=bb403b35c2d25655d55f0f616b8f47bb
-sha256=db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4
-
-[http://downloads.sourceforge.net/libw100/mplayer-imageon.patch]
-md5=d605b6068b6c9aa2bc7550f49c60958c
-sha256=7e5e1768db0201981f90256fa94db3f09f23285ffd60dc60a51a753825084848
-
-[http://heanet.dl.sourceforge.net/libw100/mplayer-imageon.patch]
-md5=d605b6068b6c9aa2bc7550f49c60958c
-sha256=7e5e1768db0201981f90256fa94db3f09f23285ffd60dc60a51a753825084848
-
-[http://downloads.sourceforge.net/materm/mrxvt-0.5.2.tar.gz]
-md5=ed87b7dd9f4fb482de0f14f085085027
-sha256=558491d1f112362780abaf7429d14216e658b7768dd30f82f102ce646d3065cf
-
-[http://heanet.dl.sourceforge.net/materm/mrxvt-0.5.2.tar.gz]
-md5=ed87b7dd9f4fb482de0f14f085085027
-sha256=558491d1f112362780abaf7429d14216e658b7768dd30f82f102ce646d3065cf
-
-[http://downloads.sourceforge.net/msmtp/msmtp-1.4.10.tar.bz2]
-md5=38c63aae762d5a31c5f6f5e58961cb52
-sha256=30261e2f1ab064e089784578e0c63f31d5696a198db5f6ec793776ce70ccddb3
-
-[http://heanet.dl.sourceforge.net/msmtp/msmtp-1.4.10.tar.bz2]
-md5=38c63aae762d5a31c5f6f5e58961cb52
-sha256=30261e2f1ab064e089784578e0c63f31d5696a198db5f6ec793776ce70ccddb3
-
-[http://packetstorm.linuxsecurity.com/sniffers/msn-cap.c]
-md5=900be0beea498b18f03e2d67656d9d32
-sha256=f03c69e064f1269dfd5adbc668204d0a7e0eafb86317e293e9d6c1ce0a4f5761
-
-[http://www.opensync.org/attachment/wiki/download/msynctool-0.22.tar.bz2?format=raw]
-md5=3ddc55209e682a8b99a47cf3d0053dbf
-sha256=5a3008eaaf61dc9f7cc0cd0c762d700dfa8cc1aa65c07ec5bf12abe252f2d280
-
-[http://www.opensync.org/download/releases/0.36/msynctool-0.36.tar.bz2]
-md5=9ef1c03d1e087493dbca67dabb612e6b
-sha256=de08e22708348216e0e1ea3c32b4cf0c04d5acae5057b5995fc087790f0ae1a5
-
-[http://downloads.sourceforge.net/mt-daapd/mt-daapd-0.2.1.1.tar.gz]
-md5=87356d2750ad82388a58d901aa566465
-sha256=92d9abd2d0cabaea198b9434100ebf1d5524283de8df02b0f04d907b2274959b
-
-[http://heanet.dl.sourceforge.net/mt-daapd/mt-daapd-0.2.1.1.tar.gz]
-md5=87356d2750ad82388a58d901aa566465
-sha256=92d9abd2d0cabaea198b9434100ebf1d5524283de8df02b0f04d907b2274959b
-
-[http://downloads.sourceforge.net/mt-daapd/mt-daapd-0.2.2.tar.gz]
-md5=e5aee70f66d383f37ef650941cd7703d
-sha256=5e06d8ed89ba98092c2cda16ecd9cdfeaa08b6c0e77ac459f49ae6e5dd64d639
-
-[http://heanet.dl.sourceforge.net/mt-daapd/mt-daapd-0.2.2.tar.gz]
-md5=e5aee70f66d383f37ef650941cd7703d
-sha256=5e06d8ed89ba98092c2cda16ecd9cdfeaa08b6c0e77ac459f49ae6e5dd64d639
-
-[http://downloads.sourceforge.net/mt-daapd/mt-daapd-0.2.3.tar.gz]
-md5=17aa3fa0601cbe172d18f53489141e5a
-sha256=17e3966a9da7acb0560af1d2c1a5c0162da8e01de195aa096d594ab6248c4930
-
-[http://heanet.dl.sourceforge.net/mt-daapd/mt-daapd-0.2.3.tar.gz]
-md5=17aa3fa0601cbe172d18f53489141e5a
-sha256=17e3966a9da7acb0560af1d2c1a5c0162da8e01de195aa096d594ab6248c4930
-
-[http://downloads.sourceforge.net/mt-daapd/mt-daapd-0.2.4.2.tar.gz]
-md5=67bef9fb14d487693b0dfb792c3f1b05
-sha256=50d89f77bdc3fd0ca408d52cabff528224fcc7319acc3b9456db0e3164a3b6cf
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mtd-sharp-flash-hack-r2.patch]
-md5=8c63b0b47af4de62b48ea745faa11584
-sha256=7206aaf289cd349ed0c52bf081b9a29a25d03e83eaf3e6de4a6070c4de1abe9d
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mtd-sharp-flash-hack-r3.patch]
-md5=dd6ca5b6006aa03febb611f481cdd7ba
-sha256=c7b9cd542fd9076d9a7cd5c033665fb05c6f412b3b235cb4379b0f8fe84fb351
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mtd-sharp-flash-hack-r4.patch]
-md5=a8ad16ca9b91a72c0e1c01952af5693d
-sha256=2037e99cb87c350b6a2b155c5c780e724d50b1233d6e30689fc2e1ea3468f55a
-
-[ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.0.0.tar.gz]
-md5=442bdbdb024db27dc9c89207fac16f95
-sha256=c3ed189e314d0f1d106df3ecb80b1f1147e86fe6cd05ceb53652c1396b67ab2e
-
-[ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.1.0.tar.bz2]
-md5=05aa9b015625aa20afba728fb7ee47b3
-sha256=a74b0cc7ec668418389d9f56f85ca8a4619b8674a2d90f5e51bfb8ae9a0667de
-
-[ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.2.0.tar.bz2]
-md5=ca41f1fbaa056e8b8d71e8d52c0b1bad
-sha256=05c6ee9dd87d4a323c37b69009769f2912fe67e8f9a5c9f98b169b8b2bd9dbc4
-
-[http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/mtd_partition.patch]
-md5=0f7cdd68da77a62e77f9012de052c513
-sha256=2e56fe35b6f3b93dac201c55764b8bf6d899c995e0d165381368cfca886c6739
-
-[http://www.rigacci.org/wiki/lib/exe/fetch.php/tecnica/download/local_software/mtkbabel-0.7.tar.gz]
-md5=66fa4f8efdeb993b2f280e1bdc664130
-sha256=0ae0d53ecafdaa9cac7c62aafe8898fe0f5df30ee128385a4895be552721d524
-
-[http://downloads.sourceforge.net/sourceforge/mtkbabel/mtkbabel-0.8.tar.gz]
-md5=d5518b678bffb58ceeae898d950ee27e
-sha256=591597c0787822c9fd56c7a3da214e81edd3c98f32d16858221e02dfc0f63779
-
-[http://mtools.linux.lu/mtools-3.9.11.tar.gz]
-md5=3c0ae05b0d98a5d3bd06d3d72fcaf80d
-sha256=3415d425d37338aa4e18e7d60147db23cfbe6192565c697f201f44426665ce42
-
-[http://folks.o-hand.com/richard/poky/sources/mtools-3.9.9.tar.gz]
-md5=3e68b857b4e1f3a6521d1dfefbd30a36
-sha256=af083a73425d664d4607ef6c6564fd9319a0e47ee7c105259a45356cb834690e
-
-[http://mtools.linux.lu/mtools-3.9.9.tar.gz]
-md5=3e68b857b4e1f3a6521d1dfefbd30a36
-sha256=af083a73425d664d4607ef6c6564fd9319a0e47ee7c105259a45356cb834690e
-
-[http://ftp.gnu.org/gnu/mtools/mtools-4.0.10.tar.bz2]
-md5=750c2beba968a5d46dbaae24551a82b9
-sha256=860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded
-
-[http://downloads.sourceforge.net/mtpaint/mtpaint-3.02.tar.bz2]
-md5=828013176f135fc24ffdf16a011c51e6
-sha256=991a1376dc23d0663d45b3b395c0e5c5542fee3906a120889583d67f854f5206
-
-[http://heanet.dl.sourceforge.net/mtpaint/mtpaint-3.02.tar.bz2]
-md5=828013176f135fc24ffdf16a011c51e6
-sha256=991a1376dc23d0663d45b3b395c0e5c5542fee3906a120889583d67f854f5206
-
-[ftp://ftp.bitwizard.nl/mtr/mtr-0.65.tar.gz]
-md5=32de3cb8f0763e352124ff4fd74690ab
-sha256=82da36fd013f33237a26f1a291e21fc041ebfeac90177a82cb8862732d824bc6
-
-[http://folks.o-hand.com/dodji/0xdeadbabe/multimedia-2007-06-08.tar.bz2]
-md5=d6a679845dd48cb343abbde0f668d5bf
-sha256=c7bc72443c17b5c169d43475ddd35d8ab78689d38a196b268f3b404fef718861
-
-[http://ewi546.ewi.utwente.nl/OE/source/multisync-0.90.18.tar.gz]
-md5=d55d8eaeecb825b87a25eeceaef92cb9
-sha256=c1454fdf5d3658f492253106c12bbf89a3bcc5789c36851a5f2f345d61a4ac0c
-
-[http://osm.andi.de1.cc/mumpot-0.3.1.tar.gz]
-md5=115dc5380ffdb03ec2e71ff9d6d97e72
-sha256=50bfab6d4b1b9af37ca6832b979f5c891f2dd9259a68700b37214d7897927c17
-
-[http://www.mumpot.org/download/mumpot-0.4.tar.gz]
-md5=52d1e64c63d70604f13985f1f326a802
-sha256=302bea9f0903fecf13ee0e9c24ed090203f2c77f7164a2a0f68c35fc8e1b9f10
-
-[http://www.dotaster.com/~shuu/linux/murasaki/0.8/8/murasaki-0.8.8.tar.gz]
-md5=ea7afa7e0bd9cfa0df7c04a9b270df88
-sha256=2033168723ffd612336acb8a64b33fcd91f7dedeaf78949d3dfce231cb962ce9
-
-[http://www.sacredchao.net/~piman/software/mutagen-1.15.tar.gz]
-md5=c346e1290711a38c123727c31f3602f8
-sha256=636d816aa4c7e754496b9daec8a00d7e5f62b67d640440c91dea6d694c83c944
-
-[ftp://ftp.mutt.org/mutt/devel/mutt-1.5.15.tar.gz]
-md5=b2c1eb45fd958f6589ee52a98f2a3ce1
-sha256=03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a
-
-[ftp://ftp.mutt.org/mutt/devel/mutt-1.5.19.tar.gz]
-md5=73b3747bc7f7c805921e8d24ebac693f
-sha256=b160baedf2676a4c2c1a5c74049e2c63f00fccff43ee2594367087a08bfd63c8
-
-[ftp://ftp.mutt.org/mutt/devel/mutt-1.5.4i.tar.gz]
-md5=3d4088f25892af6d71148eef26604f33
-sha256=f89af1816b839736eaf5fd188c4574fc52bdd37a7dabc465edafe6d8c3914847
-
-[ftp://ftp.mutt.org/mutt/devel/mutt-1.5.9i.tar.gz]
-md5=c5318eba3404ebd78a15c680fa1b6056
-sha256=d80142bfe7dd2c8ee9c2345c71fedded8b971267a9a29a853d48c562dd0605d4
-
-[http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx31/mx31ads-2.6.19rc6-lg1.patch.bz2]
-md5=f814fa7be7f81b26bcdf1d26901aefa8
-sha256=278f4e36a46b04a6355979fd2138e090823bd1a4bf1bbb1fe781497d576d8a07
-
-[http://downloads.mysql.com/archives/mysql-4.1/mysql-4.1.18.tar.gz]
-md5=a2db4edb3e1e3b8e0f8c2242225ea513
-sha256=7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd
-
-[http://downloads.mysql.com/archives/mysql-4.1/mysql-4.1.22.tar.gz]
-md5=37b4479951fa0cf052269d27c41ca200
-sha256=6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9
-
-[http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.40.tar.gz]
-md5=32e7373c16271606007374396e6742ad
-sha256=2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432
-
-[ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22.tar.bz2]
-md5=09c8fa1058399a0c5db169a71561e985
-sha256=75c53f4b3017a9a8fcb9ff3bf7e2709a41a579b8a4e2ae1c600dc6ce6341cd31
-
-[ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22.tar.bz2]
-md5=a5f00f152fb430a20c70aaa3bf456347
-sha256=6720a16a0bdfb9bfb95bd729b50d95f75f8494b932a7dc44ad4014f06ecd36c2
-
-[ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22.tar.bz2]
-md5=e8f8b5b6a51cd7be700e215b2a1bf2c0
-sha256=bb7212bac2cfc792c59a15a80caee8bbf469e250e6f48dc6b0856a60cb07b6fb
-
-[http://kldp.net/frs/download.php/3742/nabi-0.17.tar.gz]
-md5=8746890ea666ac1b7ae6db77993c6592
-sha256=1a239a7bb0644441ca781459fbf5a1c5fb95e823351bf308aa680eb60cc45b94
-
-[http://optusnet.dl.sourceforge.net/sourceforge/nail/nail-11.21.tar.bz2]
-md5=2478bff31a9223afffcb74e4dd021770
-sha256=e8caa07c0a841fab2f11db43809c073485b0c1aa12be5dc1b90ca72fa6660175
-
-[http://naim.googlecode.com/files/naim-0.11.8.3.1.tar.bz2]
-md5=239f8865b6f044aed26e3124a0721652
-sha256=a629efbd182552712009b0636c7b8be0c190052a3303c8de66a3649a9df4f224
-
-[http://www.nano-editor.org/dist/v1.2/nano-1.2.1.tar.gz]
-md5=188d24b9cc4c1041ac58d6b6f7941eb4
-sha256=f12483dbe029836cad6c58e53077281d9e71a062b1145e57342ea9671296ca40
-
-[http://www.nano-editor.org/dist/v1.3/nano-1.3.9.tar.gz]
-md5=8de48d0de02ed2332a4f7a07563c67af
-sha256=7052f6ce989040d9f16c50337c438d030f26e8d2bc90439d25e9c0ae1921eb20
-
-[http://www.nano-editor.org/dist/v2.0/nano-2.0.6.tar.gz]
-md5=619107f0fc3c4383d668cef15aa3ca32
-sha256=0d10d8f70a6fadfb9cfaa7b66c5fe7eba17e64ecb96104c4ddedc82f89765d5c
-
-[http://www.nano-editor.org/dist/v2.0/nano-2.0.7.tar.gz]
-md5=16187fed2bdefec6275ece6401ce4cd2
-sha256=5dc783c412c4d1ff463c450d2a2f9e1ea53a43d9ba1dda92bbf5182f60db532f
-
-[http://www.nano-editor.org/dist/v2.0/nano-2.0.9.tar.gz]
-md5=2be94dc43fb60fff4626a2401a977220
-sha256=6d212385680d29dcda35dda7801da19c80182a8bc6bc6d5cf7533034c853d37f
-
-[http://downloads.sourceforge.net/nas/nas-1.9.1.src.tar.gz]
-md5=d975efefba50b985446bb2c2cb4ee91f
-sha256=df25cc35f119deb05e42b01b541d7cd2f47f14dffb787637756c2911d995308a
-
-[http://downloads.sourceforge.net/nasm/nasm-0.98.38.tar.bz2]
-md5=9f682490c132b070d54e395cb6ee145e
-sha256=87e64eff736196862ed46c04a3dffa612d765df980fa974fc65e026d811bd9d0
-
-[http://heanet.dl.sourceforge.net/nasm/nasm-0.98.38.tar.bz2]
-md5=9f682490c132b070d54e395cb6ee145e
-sha256=87e64eff736196862ed46c04a3dffa612d765df980fa974fc65e026d811bd9d0
-
-[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.12/nautilus-2.12.2.tar.bz2]
-md5=1c1304e458eda551da11ed8c52b1faa2
-sha256=9b1a11fde474d0bc0891afeef912aaa01bf8189e453bb555b2977f60f98d5455
-
-[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.22/nautilus-2.22.5.tar.bz2]
-md5=b2f65d5b01399a5d3daca5f3ba280f9b
-sha256=14ddc03f05f6116c2d0545ef264f6dc5a9064ba321cba94547b02911fa5bd440
-
-[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.24/nautilus-2.24.1.tar.bz2]
-md5=ccb5497397dfba46569b6dd1d2f41cef
-sha256=48f1d25af102d216fdc2ebcd6396ffce963558c119b88730dc02fb1c158fcc4c
-
-[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.24/nautilus-2.24.2.tar.bz2]
-md5=783e5f7be6391d6c46b4725e38af475a
-sha256=a793ebe4245656f0ae23d5a87895555182f62943e02e9667303ad20c4e690c1d
-
-[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.26/nautilus-2.26.1.tar.bz2]
-md5=5d75f5de2806e9003e36a4613866b8d1
-sha256=86c8839ad5c8a1c5674eb3617bbe15e9c9bb2358a7435a0e2d22cd25ab7718ff
-
-[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.28/nautilus-2.28.0.tar.bz2]
-md5=14d9464043848eddd0bd0d35bbe63415
-sha256=3761b27da474b71194ff900e7941c005be608a00fe0ba1f216390ce1ba9cba72
-
-[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.28/nautilus-2.28.1.tar.bz2]
-md5=e759af11a0844828e2b484ff42ee0498
-sha256=197147d04529ee14e63609fa4755c9effff19842f77594ff8cce6e2433d0bec0
-
-[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.6/nautilus-2.6.1.tar.bz2]
-md5=50c5732c0c9736b7026bce1c6b0007dc
-sha256=83f1d6623e142af30a9b3fa9135ecf973fbb8c89f1dc36a218de0c0fef6ddf07
-
-[http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.24/nautilus-cd-burner-2.24.0.tar.bz2]
-md5=eb211dd03d0518263fa4eadccc3caa88
-sha256=d4ff952115a2fca28c613ce6a2b46740ce1000b0c213c482bcf3f127ceab99ad
-
-[http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.8/nautilus-cd-burner-2.8.5.tar.bz2]
-md5=970173a3f93270950ca9fd247bdf07a7
-sha256=978d470f5f0cc314fab20ad8b4f771c568915fb78e933960bf33444ac44f9a39
-
-[http://downloads.sourceforge.net/navit/navit-0.0.1.tar.gz]
-md5=521fbc102a804f7c26d4240b3f970380
-sha256=d79151209bf6b2d470773968b62258c56313bf857cda8ef27f8e321dd1a9d084
-
-[http://downloads.sourceforge.net/navit/navit-0.0.2.tar.gz]
-md5=bbb0f5d9f0d2ecfe75c472075672e924
-sha256=a28132fbdb9fd97b2e0e28c2cca516096e3607e50efe3175c51a8d6000774c6f
-
-[http://downloads.sourceforge.net/navit/navit-0.0.4.tar.gz]
-md5=c2ec1ddff62c2b248dbaeab1ab656d74
-sha256=c069e983ea8bb9b6706d35126350d4d14619b9ce0ac888adbcdda3ff13362ab4
-
-[http://heanet.dl.sourceforge.net/navit/navit-0.0.4.tar.gz]
-md5=c2ec1ddff62c2b248dbaeab1ab656d74
-sha256=c069e983ea8bb9b6706d35126350d4d14619b9ce0ac888adbcdda3ff13362ab4
-
-[http://downloads.sourceforge.net/navit/navit-0.1.0.tar.gz]
-md5=92b0653189f34742f9960ba309a77f35
-sha256=9a2418f4651feaaf773ddd8617bf04e3695fa38a41b9387c5a3b959c940573fe
-
-[http://downloads.sourceforge.net/nbd/nbd-2.8.7.tar.bz2]
-md5=bc7995b4961385269abc645575bcaf4d
-sha256=a69d1690ad587d81b85c34d1ef9bf47abf0ba21dc96876d95dd6a9a193a859f1
-
-[http://heanet.dl.sourceforge.net/nbd/nbd-2.8.7.tar.bz2]
-md5=bc7995b4961385269abc645575bcaf4d
-sha256=a69d1690ad587d81b85c34d1ef9bf47abf0ba21dc96876d95dd6a9a193a859f1
-
-[http://www.tux.org/~mayer/linux/nbench-byte-2.2.3.tar.gz]
-md5=285dfab361080759d477ea1fe7d3093a
-sha256=723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac
-
-[http://dev.yorhel.nl/download/ncdu-1.3.tar.gz]
-md5=204bacb8376819059bec6c8287a87a67
-sha256=f556a4b07c07bb66eabb5f2a20b3c52ea22020a68f2b5302d03e7b93b0ffee54
-
-[ftp://ftp.ncftp.com/ncftp/ncftp-3.2.0-src.tar.bz2]
-md5=384b7f01d725c89ccd30692628b3ac1b
-sha256=2ebc7b51af96cb0fa8b703c7cb995bfb46ccf5312e335270d0420e260544c376
-
-[ftp://ftp.ncftp.com/ncftp/older_versions/ncftp-3.2.0-src.tar.bz2]
-md5=384b7f01d725c89ccd30692628b3ac1b
-sha256=2ebc7b51af96cb0fa8b703c7cb995bfb46ccf5312e335270d0420e260544c376
-
-[http://mercury.chem.pitt.edu/~shank/ncmpc-0.11.1.tar.gz]
-md5=c90668b12f3676c73913a863482ec405
-sha256=aa0a6162e8543e01304f7dc2f6b227babebda9f2430664e6deae0277444cb817
-
-[ftp://ftp.gnu.org/gnu/ncurses/ncurses-5.3.tar.gz]
-md5=5dcc9faa93157eafa572494bffed131a
-sha256=6cac973dd31f9e7a505e45ffa9bb82cfa6b41f84b4832fd775e15857ee9b35d4
-
-[ftp://ftp.gnu.org/gnu/ncurses/ncurses-5.4.tar.gz]
-md5=069c8880072060373290a4fefff43520
-sha256=5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36
-
-[http://www.remlab.net/files/ndisc6/ndisc6-0.6.7.tar.bz2]
-md5=77f4154d78304e87698d6da4f5f9ff86
-sha256=0b60f1101d49f99111232eb6034ec851a46434bf90a056fd087b4a62451ec9ed
-
-[http://www.webdav.org/neon/neon-0.25.5.tar.gz]
-md5=b5fdb71dd407f0a3de0f267d27c9ab17
-sha256=b5513f88cb54c5f11e4c8348ee6c7ace9767b45c263c3a3ba8a5ce4e2b40a07a
-
-[http://www.webdav.org/neon/neon-0.26.0.tar.gz]
-md5=076072f11c5278f4c4b7de189ea1506e
-sha256=76472e51576b42bfc129e487ae7dd3a5e1f1f380105b422fc14ee408e3a881df
-
-[http://www.webdav.org/neon/neon-0.28.1.tar.gz]
-md5=516c576c0ca5c0a01ad24d018093cfee
-sha256=8a29457052b73ac0139e3b2824a74323256dd7631b1691239ddb18124e231a71
-
-[http://www.webdav.org/neon/neon-0.28.2.tar.gz]
-md5=b99b3f44e8507ae2d17362f1b34aaf02
-sha256=d9cd601613db6affb25655e0908b0bf8c266669cef31999b6b4121d585ff9094
-
-[http://downloads.sourceforge.net/net-snmp/net-snmp-5.1.2.tar.gz]
-md5=8080555ab3f90011f25d5122042d9a8d
-sha256=1fca69e934c3d526e308450cc5af2478d440e012922dd0bb10388fcf093ef32e
-
-[http://heanet.dl.sourceforge.net/net-snmp/net-snmp-5.1.2.tar.gz]
-md5=8080555ab3f90011f25d5122042d9a8d
-sha256=1fca69e934c3d526e308450cc5af2478d440e012922dd0bb10388fcf093ef32e
-
-[http://downloads.sourceforge.net/net-snmp/net-snmp-5.4.1.tar.gz]
-md5=6c974df7a5a5b1579f72115e6b045bda
-sha256=0ea976722c993c87dede8eb6348e6feb059e3851bbef2de824bf18ac97cdb565
-
-[http://heanet.dl.sourceforge.net/net-snmp/net-snmp-5.4.1.tar.gz]
-md5=6c974df7a5a5b1579f72115e6b045bda
-sha256=0ea976722c993c87dede8eb6348e6feb059e3851bbef2de824bf18ac97cdb565
-
-[http://downloads.sourceforge.net/net-snmp/net-snmp-5.4.2.1.tar.gz]
-md5=984932520143f0c8bf7b7ce1fc9e1da1
-sha256=11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c
-
-[http://download.berlios.de/net-tools/net-tools-1.60.tar.bz2]
-md5=888774accab40217dde927e21979c165
-sha256=7ae4dd6d44d6715f18e10559ffd270511b6e55a8900ca54fbebafe0ae6cf7d7b
-
-[http://releases.0x539.de/net6/net6-1.2.2.tar.gz]
-md5=8a551a2d9785b2b0ed431bb9eeb6cfd6
-sha256=ccdf8bfec6098b9da9a82c8d3a4d85266a5c2fd8e0240bb9448448ea39f3a68a
-
-[http://releases.0x539.de/net6/net6-1.3.1.tar.gz]
-md5=79ea8c9cfa4025e93fb12d98befd37b6
-sha256=9d5e27f290bbb954d512f37912d39a94ae03536a7ba3ef4dacec4df5f2476f47
-
-[http://developer.irexnet.com/pub/iOn/Sources/1.0/Third%20party/all/netbase-4.21.tar.gz]
-md5=b91eeb701d1733b3efb174b9463c5875
-sha256=cc74bd934a33e80e0218d9b2482d986191879d184ffd03deaefa78b0c8d7a76a
-
-[ftp://ftp.debian.org/debian/pool/main/n/netbase/netbase_4.21.tar.gz]
-md5=4e4582ed5f84fa074137c1a7ee39a689
-sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
-
-[ftp://ftp.nl.debian.org/debian/pool/main/n/netbase/netbase_4.21.tar.gz]
-md5=4e4582ed5f84fa074137c1a7ee39a689
-sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/n/netbase/netbase_4.21.tar.gz]
-md5=4e4582ed5f84fa074137c1a7ee39a689
-sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
-
-[ftp://ftp.us.debian.org/debian/pool/main/n/netbase/netbase_4.21.tar.gz]
-md5=4e4582ed5f84fa074137c1a7ee39a689
-sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
-
-[http://linuxtogo.org/~koen/netbook-base-r3.patch]
-md5=b6e67a96e2f84bb70912da8c7e0d5ec1
-sha256=e836560ffae454d4ca0c4cacd1f2a3e8528c5744372a77968bba3b947328ca38
-
-[http://launchpad.net/launch-lite-proj/trunk/alpha-0.2.0/+download/netbook-launcher-efl-0.2.0.0.tar.gz]
-md5=33088cb4a03b71082f2722b40cef11e0
-sha256=04e6f182f7d1421d06597c5b0909810b9db836a40763d92df0d1a6c798ccb61f
-
-[http://launchpad.net/launch-lite-proj/trunk/0.2.2/+download/netbook-launcher-efl-0.2.2.tar.gz]
-md5=2fb0b0d31f187a40179b397ae3ee995c
-sha256=b1e31652be694731d2565a36f98b6e2fa5b22a2a06c53afe079b76f63dabd587
-
-[http://launchpad.net/launch-lite-proj/0.2/0.2.3/+download/netbook-launcher-efl-0.2.3.tar.gz]
-md5=d38cd496c427ba240ac20770939bee70
-sha256=182b97e9b2f230ee9bf378ca0d62ec8a033acbf882d7cbd94b9a1d94d3d305de
-
-[http://downloads.sourceforge.net/netcat/netcat-0.7.1.tar.bz2]
-md5=0a29eff1736ddb5effd0b1ec1f6fe0ef
-sha256=b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb
-
-[http://heanet.dl.sourceforge.net/netcat/netcat-0.7.1.tar.bz2]
-md5=0a29eff1736ddb5effd0b1ec1f6fe0ef
-sha256=b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb
-
-[ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-0.17.tar.gz]
-md5=1f0193358e92559ec0f598b09ccbc0ec
-sha256=16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332
-
-[ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ftp-0.17.tar.gz]
-md5=94441610c9b86ef45c4c6ec609444060
-sha256=61c913299b81a4671ff089aac821329f7db9bc111aa812993dd585798b700349
-
-[http://ftp.de.debian.org/debian/pool/main/n/netkit-ftp/netkit-ftp_0.17-19.diff.gz]
-md5=f7c82f2f78f26dcb869eca2ed633c464
-sha256=2168b592ce254ab6f6daf04b4eafb5607b664c48d85f74698a9376e2cc4503aa
-
-[ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rpc-0.17.tar.gz]
-md5=67212720482ea1aea9182a98653a9642
-sha256=421d63b414162237a72867061f1bd3e3752a0d962cd5d30b5e933ddad8a14d3b
-
-[ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-0.17.tar.gz]
-md5=d6beabaaf53fe6e382c42ce3faa05a36
-sha256=9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00
-
-[ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-0.17.tar.gz]
-md5=b7262c798e2ff50e29c2ff50dfd8d6a8
-sha256=3a43c0010d4e61f412563fd83769d4667d8b8e82903526d21cb9205fe55ad14d
-
-[http://downloads.sourceforge.net/netpbm/netpbm-10.28.tgz]
-md5=18ed6d0f1adf75a748df55d5e924fabb
-sha256=e42d3b3f30de0c1ad0a86aa039b35cf2bf64c7f64c29ee333cbf934784639973
-
-[http://heanet.dl.sourceforge.net/netpbm/netpbm-10.28.tgz]
-md5=18ed6d0f1adf75a748df55d5e924fabb
-sha256=e42d3b3f30de0c1ad0a86aa039b35cf2bf64c7f64c29ee333cbf934784639973
-
-[ftp://ftp.netperf.org/netperf/archive/netperf-2.4.4.tar.bz2]
-md5=0e942f22864e601406a994420231075b
-sha256=28e76af491ea3696885e4558ae2f5628a4b9ebdbefc2f1d9cf1b35db2813e497
-
-[ftp://ftp.netperf.org/netperf/netperf-2.4.4.tar.bz2]
-md5=0e942f22864e601406a994420231075b
-sha256=28e76af491ea3696885e4558ae2f5628a4b9ebdbefc2f1d9cf1b35db2813e497
-
-[ftp://ftp.debian.org/debian/pool/non-free/n/netperf/netperf_2.3.orig.tar.gz]
-md5=b50e49d5f0d3780438af0027a182b997
-sha256=0578f4fafb309adf3413c9f56076b1b16476cb71e83c02ff7efafad172d91adb
-
-[ftp://ftp.nl.debian.org/debian/pool/non-free/n/netperf/netperf_2.3.orig.tar.gz]
-md5=b50e49d5f0d3780438af0027a182b997
-sha256=0578f4fafb309adf3413c9f56076b1b16476cb71e83c02ff7efafad172d91adb
-
-[ftp://ftp.us.debian.org/debian/pool/non-free/n/netperf/netperf_2.3.orig.tar.gz]
-md5=b50e49d5f0d3780438af0027a182b997
-sha256=0578f4fafb309adf3413c9f56076b1b16476cb71e83c02ff7efafad172d91adb
-
-[ftp://ftp.debian.org/debian/pool/non-free/n/netperf/netperf_2.4.2.orig.tar.gz]
-md5=c747042975c2965b2cd45ebf8525c5f8
-sha256=844ba97e745a0b9f37afc7daa323cafcef00108cd0254667da0a00558eb323a7
-
-[http://web.purplefrog.com/~thoth/netpipes/ftp/netpipes-4.2-export.tar.gz]
-md5=36f7b3120e00c9c74cb6619334de419f
-sha256=6eed89b661ae9f2ac0d383414ca964abea8a115f8fba0f7ab37b49b565ffb2a8
-
-[http://www.netsurf-browser.org/downloads/releases/netsurf-2.1-src.tar.gz]
-md5=f0a34fd076b492c1a13b45432e8d7e49
-sha256=cda2cf41c852938c226c47c2b995d527387120141f68b416ea745e50a7165a81
-
-[http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.6/network-manager-applet-0.6.5.tar.bz2]
-md5=1c94a41e2399d261985a75f0cd3b895b
-sha256=9cca3e34e23f00c82bc5e7237aa81639874e90d43a689e26fbfd938279ca31c9
-
-[http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.7/network-manager-applet-0.7.0.tar.bz2]
-md5=856fc7c4cf43c8614445d9fcf78177d1
-sha256=7c9fcb0b18c72071ad42316ff5e0369a418f92d05ef419874a67826fd9d8406a
-
-[http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.7/network-manager-applet-0.7.1.997.tar.bz2]
-md5=3183f5ae3553da0ce9c381dadbcc19e0
-sha256=34316707a323b883f347b2566fd2dc7a3134b2bf432fb3a8b31d88829b0947e3
-
-[http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.7/network-manager-applet-0.7.1.tar.bz2]
-md5=d90a997e3e2051ce8866fe24f765141f
-sha256=b22a90e6252d798b3889843910a016d185f9e87dd23e203003b1072013f670a6
-
-[http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.8/network-manager-applet-0.8.tar.bz2]
-md5=27071402152a7f8f62c4825f25ca9a3a
-sha256=6379e0acd3eadeb71e3ba2e3cf05d351caf6b794dff5777a5e86a591df603bd4
-
-[http://downloads.sourceforge.net/nfs/nfs-utils-1.0.6.tar.gz]
-md5=f17e9983457e1cf61c37f0be4493fce6
-sha256=aa99fcb016971290f9a871331eed60150ebdd84785dda1b252556a54760b97bf
-
-[http://heanet.dl.sourceforge.net/nfs/nfs-utils-1.0.6.tar.gz]
-md5=f17e9983457e1cf61c37f0be4493fce6
-sha256=aa99fcb016971290f9a871331eed60150ebdd84785dda1b252556a54760b97bf
-
-[http://downloads.sourceforge.net/nfs/nfs-utils-1.1.2.tar.gz]
-md5=76ee9274c2b867839427eba91b327f03
-sha256=1d09b1c133e4eed9d2df07ead4eba813e6993875c39e66d7b4081287029d4033
-
-[http://heanet.dl.sourceforge.net/nfs/nfs-utils-1.1.2.tar.gz]
-md5=76ee9274c2b867839427eba91b327f03
-sha256=1d09b1c133e4eed9d2df07ead4eba813e6993875c39e66d7b4081287029d4033
-
-[http://sysoev.ru/nginx/nginx-0.7.51.tar.gz]
-md5=c2455e4c8656b72eb31abcf6a9798df7
-sha256=f155372c309ccd1cfc3bcdd2e7e705cdbbbeb034dbe7b3393604d4755daed818
-
-[http://downloads.sourceforge.net/ngrep/ngrep-1.42.tar.bz2]
-md5=35e821cfd888e9523a90fb7e5074a072
-sha256=fd5a85b48613452fbfc9ce6d6e3fa3f37992731422eb2843235fbf4e02d6f1e9
-
-[http://heanet.dl.sourceforge.net/ngrep/ngrep-1.42.tar.bz2]
-md5=35e821cfd888e9523a90fb7e5074a072
-sha256=fd5a85b48613452fbfc9ce6d6e3fa3f37992731422eb2843235fbf4e02d6f1e9
-
-[http://www.nilfs.org/download/nilfs-utils-2.0.13.tar.bz2]
-md5=2621a9f9145c5edfa38e6e5ee79ceca1
-sha256=2f79bba49c075c101963aeff8abbf7acc77f489f0b5d7dddb1e5405f48cbd4d4
-
-[http://ftp.debian.org/debian/pool/main/n/nkf/nkf_2.07.orig.tar.gz]
-md5=af11dcd3fe71d67831c020e3bfd5073b
-sha256=71d2ba992df209a00bb1dca45e3336729dc16e51b71526bd20f897cc6127a275
-
-[http://people.redhat.com/dcbw/NetworkManager/0.6.6/nm-applet-0.6.6.tar.gz]
-md5=16e95a3515e4255d034b14045a9effd5
-sha256=8eb264d5838d1f9e2e507a570cb23dc54e11505023b71b6868cee31da2dff38d
-
-[http://download.insecure.org/nmap/dist-old/nmap-3.81.tar.bz2]
-md5=0713306dda85aee2c95ef31b4b7d2838
-sha256=1cfb120008f636a874b871f1625409082badaaf64177c9ac873480630390356c
-
-[http://www.stack.nl/~brama/projects/nmixer/src/nmixer-2.0.tar.gz]
-md5=02108108f5b0aafdf10207aa86d1b976
-sha256=aac281c7437e4007236eb461a668311eb3453e85012acf619aa3d62683330a6a
-
-[http://handhelds.org/~zecke/oe_packages/nmm_V0.0.2.tar.gz]
-md5=af4c4ad64196f26a245c385a234f462f
-sha256=5d6c456b30318cc05b19915aa601ea4c2cf46ddf43a39e33948dea6280ac5395
-
-[http://downloads.sourceforge.net/materm/no_debug_x.patch]
-md5=021613030ae67c5c9868ec2a0c031172
-sha256=a41c3eb4cf94fe7b059468983a2f533e0669d0204088fa5ece365b1663b560c7
-
-[http://heanet.dl.sourceforge.net/materm/no_debug_x.patch]
-md5=021613030ae67c5c9868ec2a0c031172
-sha256=a41c3eb4cf94fe7b059468983a2f533e0669d0204088fa5ece365b1663b560c7
-
-[http://zaurus.vivaphp.net/nogravity.tar.bz2]
-md5=42d9e4cfd86b15826426797a0fb6d499
-sha256=f9c86a163bd27dc4fd05abb958bb857109a556a4a58f8d06663d49ac0559ac92
-
-[http://downloads.sourceforge.net/notecase/notecase-1.2.6_src.tar.gz]
-md5=0b8b1a58bfdb60fa41df46771a464b82
-sha256=a99b07c2193eebeb766bc422dd2ebba6649680457d58a4f5a86f2567ce49b3fa
-
-[http://heanet.dl.sourceforge.net/notecase/notecase-1.2.6_src.tar.gz]
-md5=0b8b1a58bfdb60fa41df46771a464b82
-sha256=a99b07c2193eebeb766bc422dd2ebba6649680457d58a4f5a86f2567ce49b3fa
-
-[http://downloads.sourceforge.net/notecase/notecase-1.6.9_src.tar.gz]
-md5=da3267f271cd6e2c82d4efa4176ae583
-sha256=2d814209506cb52db87f4dae5cbb3de6165e1d46c845114d0eee242385165fb0
-
-[http://heanet.dl.sourceforge.net/notecase/notecase-1.6.9_src.tar.gz]
-md5=da3267f271cd6e2c82d4efa4176ae583
-sha256=2d814209506cb52db87f4dae5cbb3de6165e1d46c845114d0eee242385165fb0
-
-[http://downloads.sourceforge.net/notecase/notecase-1.7.2_src.tar.gz]
-md5=ad8b93c16e740988b5114826c47a53bb
-sha256=763529033d4858285401d9e68c6412d21ed62624fb65e8150d8c703012a4ca49
-
-[http://heanet.dl.sourceforge.net/notecase/notecase-1.7.2_src.tar.gz]
-md5=ad8b93c16e740988b5114826c47a53bb
-sha256=763529033d4858285401d9e68c6412d21ed62624fb65e8150d8c703012a4ca49
-
-[http://www.holtschneider.com/notez/notez-1.1.0.tar.gz]
-md5=c348a626fc09265fa74a12470c83c113
-sha256=11ee0a660faca7993a2f525d2964391d135b9552d9e94abad6cb6c5f3983f964
-
-[http://www.galago-project.org/files/releases/source/notification-daemon/notification-daemon-0.3.5.tar.gz]
-md5=7977c4c15139f9d53ddbfa8af707270f
-sha256=83a15eb99bb7a895d52e31be1c1548789a8bc29e83d30e758cf034a6627a1184
-
-[http://www.galago-project.org/files/releases/source/notification-daemon/notification-daemon-0.3.6.tar.gz]
-md5=a5a9aa63205e624da8468e35722b08bf
-sha256=a187976c1957a7a0e17014ed97cbb4341f6898d5f60301f1b0c37e52188ebd13
-
-[http://www.galago-project.org/files/releases/source/notification-daemon/notification-daemon-0.3.7.tar.gz]
-md5=7fa369bff1031acbe4ca41f03bee7d02
-sha256=53d2f92c3d14423b49c2ff077855cf3987d38def963c82fd26fba5de379ca540
-
-[http://monto.homelinux.org/notifier]
-md5=24d87301da8843e2dbc3330ece57677f
-sha256=896c6942a9a3b0b2d6846eab1de8c471c9fcf860ca182ce18e12f1ce255f42cc
-
-[http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.gz]
-md5=8f0ef0939cc8edd2efd896ce5ba80cf4
-sha256=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022
-
-[http://hauppauge.lightpath.net/de/nova-pci218c.exe]
-md5=139a1ed50a1a12e47b1f7deedf4f40c3
-sha256=4310a3a526ae5461e17f57353fc29f71d13820a215eaa62c629190cc2a026173
-
-[http://downloads.pf.itd.nrl.navy.mil/olsr/nrlolsrdv7.8.1.tgz]
-md5=46291de38362acdcd335bcf259055046
-sha256=0e6b18e3bf77dd20395881535e3e7043bcd5171c220728310215d708f44f3b1c
-
-[http://nslu.sf.net/downloads/nslu2-linksys-firmware-2.3r63.tar.bz2]
-md5=d4daf9d424a182e7ca2747d9db004581
-sha256=703c9083f2f114588eb54442f7e621cbf3e0f1398c3381b5ad8d1fc56f6468a5
-
-[http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.7.1/src/nspr-4.7.1.tar.gz]
-md5=7c6e75a0867ce2b9ec62e399a908b5ac
-sha256=58782b11423359f2a247f0217aab6fe041f32984aac1f411da6d43bd34cfd0db
-
-[http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_RTM/src/nss-3.12.tar.gz]
-md5=917f4e05f3982bd7fceaede197f0e1d4
-sha256=d30a7470b82a73ed442525b365afaf00427204e3771edfeab05743acca97122b
-
-[http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz]
-md5=03938f17646efbb50aa70ba5f99f51d7
-sha256=1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d
-
-[http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.7.tar.gz]
-md5=f384fb230145f90fb75df1e33062583f
-sha256=3c45afef8390d8eae65e1415f7de159b7fdcef649218238a6cac8e9952fde7d5
-
-[http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.9.tar.gz]
-md5=bc72f5b19cc6ce8cacde448236b30868
-sha256=0bf226bb3a1716e6eb97355e08a7ffcf09aadfb91ba41ccef2ef1ba7a01719a2
-
-[http://www.ntfs-3g.org/ntfs-3g-1.0.tgz]
-md5=873a8de662849d129fc7c475ad3f5447
-sha256=b5bbf81230bb21573d69fc471721b0b0c404eaa5040ef28e7dcec38320a1b2e4
-
-[http://www.ntfs-3g.org/ntfs-3g-2009.1.1.tgz]
-md5=56e4aed24d0c2543597de0ba52b3ed64
-sha256=0e02ff891645658c1801ba7d665c0ff3a4231e5570b974a803ffc2974ef68e45
-
-[http://www.ntfs-3g.org/ntfs-3g-2009.4.4.tgz]
-md5=e0b5c170f088a8d82968f0a6b34d31da
-sha256=bcd39ebe90541f512e605b62911f14f6107239c4ff032d56d5da3dc3c05e0d0f
-
-[http://downloads.sourceforge.net/ntop/ntop-3.0.tgz]
-md5=1ec6055c75f1acbb5d5600492481ef85
-sha256=c50cdf2c6cf7309f88c7ec0a56158eca76c80532502b36f3378eeca433423d83
-
-[http://heanet.dl.sourceforge.net/ntop/ntop-3.0.tgz]
-md5=1ec6055c75f1acbb5d5600492481ef85
-sha256=c50cdf2c6cf7309f88c7ec0a56158eca76c80532502b36f3378eeca433423d83
-
-[http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.1/ntp-4.1.2.tar.gz]
-md5=98e16c7aa4ecd4c004b51bff18962e95
-sha256=9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a
-
-[http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.0.tar.gz]
-md5=0f8fabe87cf54f409b57c6283f0c0c3d
-sha256=da784d5c0363d4f708a25f3aad23ba9a3486aafd464444d2aa6a9f8d29213f25
-
-[http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.2p3.tar.gz]
-md5=45cee6d1ebf8fe46e412fd818b8e7b74
-sha256=385a606007eb14f5847f033ac6fa8ea48366597ad1f93aa99864e1f82e23ac88
-
-[http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.4p7.tar.gz]
-md5=8c19ff62ed4f7d64f8e2aa59cb11f364
-sha256=5681883ce5cd0666d73c1b907e284653964a25ad4c02a308ab11b54aca8f01c3
-
-[http://doolittle.icarus.com/ntpclient/ntpclient_2003_194.tar.gz]
-md5=94e84d5c6023c5e1f3890b28d0a08c92
-sha256=3f515a043bcd3b778d33938da224214e727faa528256d4a1a213bc8617ac2d0b
-
-[http://doolittle.icarus.com/ntpclient/ntpclient_2007_365.tar.gz]
-md5=cb98711f11769cdd22fc592844cef414
-sha256=295ed5ecfab595901cbe2cd41998d1715913318d30c22349784733e79de0e8f8
-
-[http://downloads.sourceforge.net/numpy/numarray-1.1.1.tar.gz]
-md5=40cec6ce8ca2e95a4fbc7a28879bf4a5
-sha256=7a6f7f2745cbcb02bf79cc7cd365a3f80679f2558dfaa378010675f40a7aff3b
-
-[http://heanet.dl.sourceforge.net/numpy/numarray-1.1.1.tar.gz]
-md5=40cec6ce8ca2e95a4fbc7a28879bf4a5
-sha256=7a6f7f2745cbcb02bf79cc7cd365a3f80679f2558dfaa378010675f40a7aff3b
-
-[http://wwwpub.zih.tu-dresden.de/~mkluge/numptyphysics_setup.tgz]
-md5=24a031f628cc91825bb80ee2aaa21b77
-sha256=3a60d6a6327f3ad8653e1de5dbf5c36f2a591d409d3e3ae7f6c84d25dbc3e7da
-
-[http://downloads.sourceforge.net/numpy/numpy-1.1.1.tar.gz]
-md5=af066b59a50bf5dbe1a14d6be3df6937
-sha256=d430273a77aed959c007595d969fefa36c59249807212d7d89f5d6cf2a701dd6
-
-[http://heanet.dl.sourceforge.net/numpy/numpy-1.1.1.tar.gz]
-md5=af066b59a50bf5dbe1a14d6be3df6937
-sha256=d430273a77aed959c007595d969fefa36c59249807212d7d89f5d6cf2a701dd6
-
-[http://downloads.sourceforge.net/gakusei/nunome-1.0.2.tar.bz2]
-md5=e5c9d2351de250aaa7abf581a1f2c0f4
-sha256=7bda9302036facd65b323d7042a809b08d55d5b61b38d4d40f22f41f27fec83c
-
-[http://heanet.dl.sourceforge.net/gakusei/nunome-1.0.2.tar.bz2]
-md5=e5c9d2351de250aaa7abf581a1f2c0f4
-sha256=7bda9302036facd65b323d7042a809b08d55d5b61b38d4d40f22f41f27fec83c
-
-[http://www.networkupstools.org/source/2.2/nut-2.2.1.tar.gz]
-md5=c7ae871961a7dbe12b22d504267dc132
-sha256=9aad15d8cdd8694839b54342c8b4c26ddce508f6fb29ff4bee3abbe1555771f4
-
-[http://64.34.161.181/download/3.2.0/sources/nxcomp-3.2.0-7.tar.gz]
-md5=5ea64a557c770d9f5cc4b9a7a9d1343c
-sha256=ec1b9a9447bcbfe36cff46aaf4aaa6b3f8f945487438a92d0b8e70d9b7814f97
-
-[http://64.34.161.181/download/3.3.0/sources/nxcomp-3.3.0-3.tar.gz]
-md5=2327cca8e6116fd6a96345566336d81d
-sha256=069b3baa000b4a6125b86bddaf67c1b7fcd082eaf14b64113558fc30d6c71dd7
-
-[http://64.34.161.181/download/3.2.0/sources/nxcompshad-3.2.0-3.tar.gz]
-md5=6edfa4f65f579306f05af2451249c2bf
-sha256=e0da5cccacff237c5cf856d81a51ea4cf7e4356a1241f0e4898366758ad364bb
-
-[ftp://ftp.microwindows.org/pub/microwindows/nxlib-0.45.tar.gz]
-md5=9a1e3b81df0e32189fa873fd6fc086e5
-sha256=8e63251e1599474d18912ad82b2e6b0c6c612e7eb9507958ab0f60f92d7ea454
-
-[http://64.34.161.181/download/3.2.0/sources/nxproxy-3.2.0-1.tar.gz]
-md5=ac31e8f2f112e3720f3c00cec67c0734
-sha256=5642ce40e2f34caeed433e8c0ac010e2e7e738c2c5aa8fc59bba892a8b542d84
-
-[http://64.34.161.181/download/3.3.0/sources/nxproxy-3.3.0-2.tar.gz]
-md5=047206e5a811b915aac4ae09bddef207
-sha256=dc1b5e26c4629d35b59dcb25852bcf705c29053a20763a7339b5d890614a9e87
-
-[http://64.34.161.181/download/3.2.0/sources/nxssh-3.2.0-1.tar.gz]
-md5=6d4955376ea1dfcb6971b2b46d31ece1
-sha256=d6af9952eacf10982754ea5131112d3f0fe17f8f4a860fba1b310a4bc3030549
-
-[http://64.34.161.181/download/3.3.0/sources/nxssh-3.3.0-1.tar.gz]
-md5=e9bb4c1cd61c42db9626894845fcf3f7
-sha256=797dab52e18592d340c36ef6e126368bc1c9c98bbb873bef9ba9fc70911616b9
-
-[http://meshcube.org/download/nylon-statistics_20050909.tgz]
-md5=103c5c821474ae6df7a3055ee72f4d00
-sha256=c80d9ea7ebca32b63ea23d2a52ac799cff32f8f30c66b491d2b8f93da05585e4
-
-[http://downloads.sourceforge.net/nzbget/nzbget-stable/nzbget-0.6.0.tar.gz]
-md5=eb95b3930abffb570e37af8d284c1f9d
-sha256=b0bc8740db7ed9ea269b29e9a936cb2c4dd61a911b80b623fe18729b94de3030
-
-[http://downloads.sourceforge.net/nzbget/nzbget-stable/nzbget-0.7.0-testing-r342.tar.gz]
-md5=4250d8166969367b4feff4204b42ecb9
-sha256=37c595e78c4a5c86fa1c39d4dba39786d9546ae0a078b936832df9d17bafba10
-
-[http://releases.0x539.de/obby/obby-0.4.1.tar.gz]
-md5=b79146369fc76a61d6d4056a937c71c8
-sha256=b69a259795762881a5384072085bb501d77c6fb974e0b7a16ca573565ffe3629
-
-[http://tadas.dailyda.com/software/obex-data-server-0.4.4.tar.gz]
-md5=4aad0182812c770dde21246522be9f5e
-sha256=aa567d986c74a4c8b4abb1cc454c099f67ab01b049b4c69aa6e703c7f18b594d
-
-[http://www.kernel.org/pub/linux/bluetooth/obexd-0.10.tar.gz]
-md5=b9fbc1386b24f59b36aeb9d764c11fb5
-sha256=8ed452371010117e183ade4e1e3ae4b489485b792722bf3b97b817cf0ed66ac8
-
-[http://www.kernel.org/pub/linux/bluetooth/obexd-0.13.tar.gz]
-md5=8764dcbcd7b5ed80e17b1279a82701b0
-sha256=c986121e520897af6c326ece8a26eca87bdb4641a93913b63a5c29521cefaf66
-
-[http://www.kernel.org/pub/linux/bluetooth/obexd-0.15.tar.gz]
-md5=f9adc013e0e4b26c992cc0ca05328f3d
-sha256=44ba0d99e1bf8fa2caf9f7a85d569e513208c0710c1ad00032e271289e87b63f
-
-[http://www.kernel.org/pub/linux/bluetooth/obexd-0.18.tar.gz]
-md5=5674f746b55439d32bc765d2c5baad16
-sha256=6dbabd9345967120ad21cc25489a6d244aed7975cee9297cc5716af4debc7228
-
-[http://www.kernel.org/pub/linux/bluetooth/obexd-0.19.tar.gz]
-md5=2f03b81411a1f7c359ada35459d946a5
-sha256=37fb4cffad7e361daffa9915ee6a37e615d0bf4d1f24760e585d5ac922515ca8
-
-[http://www.kernel.org/pub/linux/bluetooth/obexd-0.21.tar.gz]
-md5=3f2a7ae4ddca69001a23c034f8b28db6
-sha256=d29e9694e09fc2a504b84e6929768a90ac76ced5492e755d50c55c350df5bf31
-
-[http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz]
-md5=085b9edc0504c0d79e7479a54e2018c5
-sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
-
-[http://heanet.dl.sourceforge.net/openobex/obexftp-0.20.tar.gz]
-md5=085b9edc0504c0d79e7479a54e2018c5
-sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
-
-[http://downloads.sourceforge.net/openobex/obexftp-0.22.tar.bz2]
-md5=d167cfdea244e3a5f973a7b16864419c
-sha256=09687012d5e016277fa638f22b8c784aea6803056c70d14614e3b75158aae877
-
-[http://heanet.dl.sourceforge.net/openobex/obexftp-0.22.tar.bz2]
-md5=d167cfdea244e3a5f973a7b16864419c
-sha256=09687012d5e016277fa638f22b8c784aea6803056c70d14614e3b75158aae877
-
-[http://downloads.sourceforge.net/openobex/obexftp-0.23.tar.bz2]
-md5=f20762061b68bc921e80be4aebc349eb
-sha256=44a74ff288d38c0f75354d6bc2efe7d6dec10112eaff2e7b10e292b0d2105b36
-
-[http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz]
-md5=edb66ba97fe6c84b6160c670c4bcdea8
-sha256=341c6865aa392b6cf056e1bd9cda53d2f31a942460087ad22d6f6dc91bb0bd0e
-
-[http://xorg.freedesktop.org/releases/individual/app/oclock-1.0.1.tar.bz2]
-md5=91f49547f9ed3cd0137c8b7c3183e360
-sha256=49ab7d4f6402fbbe30714012ee38b49da17789f3a29ac41917987ce18c74217c
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/oclock-X11R7.0-1.0.1.tar.bz2]
-md5=e35af9699c49f0b77fad45a3b942c3b1
-sha256=341d98894e76b4e3531c923b22bbb7603788a6f614a795c6285c339f6534bee9
-
-[ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.1.71.tar.gz]
-md5=811df48dfc472013e2d858cc5d1cad00
-sha256=158ea1d061855ebb0bff92530f4975dd34e8e83d22ee0e425b49920ff2146351
-
-[ftp://ftp.octave.org/pub/octave/obsolete/octave-2.1.73.tar.gz]
-md5=e75a109620e57de081ee73e0489e5990
-sha256=d44d23b09165e1d7008dbd4d0e052bb3fa3641de7705c9c0302c9cff583de609
-
-[ftp://ftp.octave.org/pub/octave/octave-3.0.0.tar.gz]
-md5=60ed361c7310eccce01395470b711a57
-sha256=b99b6e2c1a0977fbe2f0c19210694ed44ff182d17d3920c485fb6ce725b89816
-
-[ftp://ftp.octave.org/pub/octave/octave-3.0.3.tar.gz]
-md5=6b11065c9dbd3c9743d234c2f785fb7b
-sha256=fb093e267e5b9656f767896a33d664e5ee921e28898a481542bdb4db31f7604e
-
-[http://downloads.sourceforge.net/opende/ode-0.11.1.tar.gz]
-md5=5f79628b7b10a7a59092759a5af77775
-sha256=4c225b76d57a5a8094653fba48f3169ac1a99622f3ce98f2be55fbd5a1b76519
-
-[http://downloads.sourceforge.net/opende/ode-0.5.tgz]
-md5=b33b21e04ee9661f27802b6b6c8eefd2
-sha256=5388c4cd4666f270f18216c90ab6526229c53fdc7e82f93ddb0824e69521df1c
-
-[http://downloads.sourceforge.net/opende/ode-src-0.9.zip]
-md5=4c03759b76a0649a6d5108c8e172e1e4
-sha256=460d0851b743b1f144ef2a8259004d6774504c95d08e9357a96a296111496feb
-
-[http://heanet.dl.sourceforge.net/opende/ode-src-0.9.zip]
-md5=4c03759b76a0649a6d5108c8e172e1e4
-sha256=460d0851b743b1f144ef2a8259004d6774504c95d08e9357a96a296111496feb
-
-[ftp://ftp.debian.org/debian/pool/main/o//offlineimap/offlineimap_4.0.14.tar.gz]
-md5=b374415d7f5d485993fa697ab9a678b4
-sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1
-
-[ftp://ftp.debian.org/debian/pool/main/o/offlineimap/offlineimap_4.0.14.tar.gz]
-md5=b374415d7f5d485993fa697ab9a678b4
-sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1
-
-[ftp://ftp.nl.debian.org/debian/pool/main/o/offlineimap/offlineimap_4.0.14.tar.gz]
-md5=b374415d7f5d485993fa697ab9a678b4
-sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1
-
-[ftp://ftp.us.debian.org/debian/pool/main/o/offlineimap/offlineimap_4.0.14.tar.gz]
-md5=b374415d7f5d485993fa697ab9a678b4
-sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1
-
-[http://downloads.sourceforge.net/ogre/ogre-v1-6-1.tar.bz2]
-md5=6fbd72e81dd4c135a2cc4f78d596aeb4
-sha256=68b8978071f31615ad89119583e629ca7c3069ae0c2fb8f7c390c19807cce0bb
-
-[http://downloads.sourceforge.net/wgois/ois_1.2.0.tar.gz]
-md5=6a8cedad04f095127ca1455162fec955
-sha256=175414df5d7b924779fa513ea614081ae55ae708a5e29473e74911297e4be708
-
-[http://www.olsr.org/releases/0.4/olsrd-0.4.10.tar.bz2]
-md5=9807d4451e65cb4ec385155eef7bf3cf
-sha256=af04bdd8abd85bb4715fd6011566054847c75fcbac5e5e9cdee80858ac2957d3
-
-[http://www.olsr.org/releases/0.4/olsrd-0.4.8.tar.bz2]
-md5=4d8636af067f90822a47a062497680de
-sha256=b935aaf1e389f767ba8238c7a5c0b4387a345168acddf4f38bb6914149953a28
-
-[http://www.olsr.org/releases/0.4/olsrd-0.4.9.tar.bz2]
-md5=593c0861fa10d2a8d0e7d8617479c5cf
-sha256=b3404a5a5dd78c0e1ba12b8aa1445589fa7861fa4d9ecafb53b38be760876913
-
-[http://www.olsr.org/releases/0.5/olsrd-0.5.3.tar.bz2]
-md5=786fdf52adeb0d421905332312e5b75f
-sha256=9c495773e9605a67b6cdbbc3fb70449b830ed55eb6e0082778a0ccf941b4b426
-
-[http://www.olsr.org/releases/0.5/olsrd-0.5.5.tar.bz2]
-md5=bd1cd216c318c1359ab6e832adbb1962
-sha256=2fab4646166cc887a87933f52e51ce07c23f4e0395d380ee2f8557805c4884bc
-
-[http://people.openmoko.org/olv/om-maps/20080430/om-maps-berlin-20080430.eet]
-md5=25b515f30606b3f78d5d77c96663185d
-sha256=3ebb791e9bf6b00127b4961d8f15b4d1e48d209468b01365300d3ea5a5cacf37
-
-[http://people.openmoko.org/olv/om-maps/20080430/om-maps-buenos-aires-20080430.eet]
-md5=306c1d9537f510b30273a030f5ace118
-sha256=8486baf16bbc6dd4ad3820330a28546996f9383de96c1b6bf784999dcf4b712e
-
-[http://people.openmoko.org/olv/om-maps/20080919/om-maps-hong-kong-20080919.eet]
-md5=fdb477186a9a8deb6f62b93e2fd8ab72
-sha256=bb8b04b2befc76ad913cd1f8d4bb90764a13ce3ea015c51bdcdf553184c36a77
-
-[http://people.openmoko.org/olv/om-maps/20080430/om-maps-london-20080430.eet]
-md5=fa05427d09f98ea6cbceaa4c88f4c51d
-sha256=1776ba1ec93984d0ff755a677a769e200a6e435fd1385e699e106c9cec83b04c
-
-[http://people.openmoko.org/olv/om-maps/20080430/om-maps-low-levels-20080430.eet]
-md5=c4e4fe25075d3843b6a8430e78321c4e
-sha256=de7bba6c6418782f3af45e8a5988b1d945f276bcc6f1174107b66c7d27316727
-
-[http://people.openmoko.org/olv/om-maps/20080430/om-maps-new-york-20080430.eet]
-md5=3fd0065397e6ae78d43b159a3e9d3660
-sha256=43df4b1407baf3b647e30abf7e5461d86c3145d6df21f4d27a2fb2d8b2b08ec9
-
-[http://people.openmoko.org/olv/om-maps/20080430/om-maps-paris-20080430.eet]
-md5=f93c90a1cfaf3113a1577331582c0cd1
-sha256=b27f67834142417e35dc911fa51f13595bb3271800b9963ed481749bbb17466b
-
-[http://people.openmoko.org/olv/om-maps/20080430/om-maps-providence-20080430.eet]
-md5=105cd93f37409631fd99d23cdd033420
-sha256=ca2a91115445ce8dfb758099158e31425695181909e94f928feef6077a6cba0a
-
-[http://people.openmoko.org/olv/om-maps/20080430/om-maps-san-francisco-20080430.eet]
-md5=c23e48390885391a3b403c8d7863e031
-sha256=a7f00540ac487fa26050a2aaf5a9b7fbb82af0a32c6f5d60043d4228a652151e
-
-[http://people.openmoko.org/olv/om-maps/20080430/om-maps-sydney-20080430.eet]
-md5=5b83060995bade39a80dafb83571f627
-sha256=66150243fa43052fc762ec1d5d141b44c98a49bec49f726c7db7c54968d605c5
-
-[http://people.openmoko.org/olv/om-maps/20080430/om-maps-taipei-20080430.eet]
-md5=5e82e0fb27f1ae480c5099f3bd572cf3
-sha256=5dafd06260fe58847fb92f2e063f8fb0ae8ad4a3fb082f0871217d3ba88b162c
-
-[http://dominion.thruhere.net/koen/OE/omap3-sgx-modules-1.2.12.838.tar.bz2]
-md5=964e447fb8525f1fea63fb6020a8049a
-sha256=1bb805b13ca5fe4b889f21b74feff0cdbf2a4603c9570a2b0050ae51db7c6306
-
-[http://dominion.thruhere.net/koen/OE/omap3-sgx-modules-1.3.13.1397.tar.bz2]
-md5=1b48bbb5df6b4c12ebb42b92ae1bf1f9
-sha256=908a69340b020f7d865acf70724e37837016a81a0cb499fb83441759cbef7616
-
-[http://software-dl.ti.com/sdo/sdo_apps_public_sw/omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa-3_16-Linux-x86.bin]
-md5=8347c8980ccf6cc46039ca75e8b0f543
-sha256=f9bd3921377ab64138c7dd550d5753e3668e99de37d743cf112b88ad933d4420
-
-[http://software-dl.ti.com/sdo/sdo_apps_public_sw/omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa-3_16_01-Linux-x86.bin]
-md5=a231257e79fffbd4aa87dde13642df4c
-sha256=92ecc9be2c638220ebbd7de467a0944d49f1bef84b977421709afadd4508c2b9
-
-[http://www.devzero.net/openmoko/dist/omext-0.2.tar.gz]
-md5=3c1fcd85f0a0cd3ccc4d7b4f26996b47
-sha256=3d3cc3e4f92f7e0b6a352c3f68a337a599a90f4e4b6e6743adc0c70b570639f5
-
-[http://downloads.sourceforge.net/omniorb/omniORB-4.0.7.tar.gz]
-md5=9d478031be34232e988f3d5874396499
-sha256=e4c0875794a74ac627b7b74b6098e75c8413bd156856dc434a49c4c112a68af2
-
-[http://heanet.dl.sourceforge.net/omniorb/omniORB-4.0.7.tar.gz]
-md5=9d478031be34232e988f3d5874396499
-sha256=e4c0875794a74ac627b7b74b6098e75c8413bd156856dc434a49c4c112a68af2
-
-[http://www.daidouji.com/oneko/distfiles/oneko-1.2.sakura.5.tar.gz]
-md5=456b318fa6e61431bf4f0a42b110014a
-sha256=2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f
-
-[http://download.go-oo.org/OOH680/ooo-build-2.4.1.5.tar.gz]
-md5=c82e17dd3308476b3bac40bbd9c9cba1
-sha256=50643ee658f0b5e28701ba6b1ca4645e8a66fb461fd5aca2d9335b9853c4e5fd
-
-[http://www.ekiga.org/admin/downloads/latest/sources/ekiga_3.0.2/opal-3.4.4.tar.bz2]
-md5=01e76bc1261ab6c5b537387a81e7fdd9
-sha256=3ed39e1dc74b4e1adb3d8a3430b18bcfd19d21406375faf420cbdcd5499a4594
-
-[http://downloads.sourceforge.net/opalvoip/opal-3.5.2.tar.bz2]
-md5=7a1e7424b346ee0a0b719217a1081cfd
-sha256=c11daf4e0baf1bc70d30411944f9a3238d61e3c1972c33443dbe0cb078cfe2d7
-
-[http://downloads.sourceforge.net/opalvoip/opal-3.6.1.tar.bz2]
-md5=c2b4f12822cef2182267ea0d020bddf6
-sha256=e6b48a294b35449c851c2a6ea6969041ed7f4148e92b3faa03a330b7bb5a59af
-
-[http://downloads.sourceforge.net/opalvoip/opal-3.6.2.tar.bz2]
-md5=88076eeadee1351704afb2aeb3532c17
-sha256=09ffe451256fafdd74d4dc35ed153b93c81328c397d36872cca1f0104877caca
-
-[http://downloads.sourceforge.net/opalvoip/opal-3.6.4.tar.bz2]
-md5=d894c176818a33d34a04b21386798c4f
-sha256=b1fb3bad0c8581b82f0da9c69673f43ad9aed7868a7e4f2a68c6c72ed656237b
-
-[http://downloads.sourceforge.net/opalvoip/opal-3.6.6.tar.bz2]
-md5=43b363c860780e7f1a0361cfee8f9f4a
-sha256=60c9d75703bedfeca7140cb76b23fae7179ce1f86e7e8b0026b72d66acd75c82
-
-[http://www.open-iscsi.org/bits/open-iscsi-2.0-871.tar.gz]
-md5=0c403e8c9ad41607571ba0e6e8ff196e
-sha256=bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb
-
-[http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz]
-md5=641cf53761f35ee979f3e888614797a0
-sha256=723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe
-
-[http://downloads.sourceforge.net/openbabel/openbabel-2.2.0.tar.gz]
-md5=643a18c7ba09254d36e93afd6277346f
-sha256=a898b79336c7372c901bcc7e5f83db7b8e79f8e864be6a262f515b3e088bc607
-
-[http://downloads.sourceforge.net/myposition/openbmap-logger-0.2.0.tar.gz]
-md5=5c9c1639bdff3bd35c63697d398f1a68
-sha256=3d6c58830e50373d0dc2a72f6fc65afd7ef30aabf2d1078e6878c911270dec16
-
-[http://downloads.sourceforge.net/myposition/openbmap-logger-0.3.2.tar.gz]
-md5=edeea53ea62d241d472912417b5cc248
-sha256=0a6bf110bf108416d85aabd42f01e52860be26a45bd1f0c7fb76252d47f9b19f
-
-[http://downloads.sourceforge.net/myposition/openbmap-logger-0.4.0.tar.gz]
-md5=52b71c33ce0d2da8d5c29db293132630
-sha256=93820366128b394d84b1b37830344b70f349c2896b60b601e884f9d857ff5d84
-
-[http://icculus.org/openbox/releases/openbox-3.4.7.2.tar.gz]
-md5=9e7589e90519bc6ac2f4656ea6869439
-sha256=d11f2137a0fe1de6c36c999d29523ad68c05f22c5935ce8628a8cab7a2e4b000
-
-[http://downloads.sourceforge.net/opencvlibrary/opencv-1.0.0.tar.gz]
-md5=146a05005f2d2c16c4ee10ebd7f1dd58
-sha256=3a6ee888e4dd4ab7f2bc80d046688c099c6a95d1267af554b7c8f1543b66f21e
-
-[http://heanet.dl.sourceforge.net/opencvlibrary/opencv-1.0.0.tar.gz]
-md5=146a05005f2d2c16c4ee10ebd7f1dd58
-sha256=3a6ee888e4dd4ab7f2bc80d046688c099c6a95d1267af554b7c8f1543b66f21e
-
-[http://downloads.sourceforge.net/openjade/openjade-1.3.2.tar.gz]
-md5=7df692e3186109cc00db6825b777201e
-sha256=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
-
-[http://heanet.dl.sourceforge.net/openjade/openjade-1.3.2.tar.gz]
-md5=7df692e3186109cc00db6825b777201e
-sha256=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
-
-[http://download.java.net/openjdk/jdk6/promoted/b12/openjdk-6-src-b12-28_aug_2008.tar.gz]
-md5=b53e1ef643909ce82721ee4c970d958b
-sha256=f099b3b1f3c22b8cea950403b992267ec69f43ad8a80bbcb84448b26340807ab
-
-[http://download.java.net/openjdk/jdk6/promoted/b14/openjdk-6-src-b14-25_nov_2008.tar.gz]
-md5=9f9773a822156dd3d576d83d794364ce
-sha256=1272f975052e51d3faf2d7ac13d0b8b4ac68019a688bffe03d9b684a9e3b4480
-
-[http://download.java.net/openjdk/jdk6/promoted/b16/openjdk-6-src-b16-24_apr_2009.tar.gz]
-md5=850a29b70206bc7fa083cd26acc781f3
-sha256=96159489d8b70db275c125b627c6e6912e6c078279d76b968d2e0969359c9420
-
-[http://jalimo.evolvis.org/repository/sources/openjdk-langtools-jdk7-b31.tar.bz2]
-md5=670931f67b2e4ac46c6e0cd15418f2fa
-sha256=f8b8820e410c137d279d14dec7e7a93217cc371acdfe1b3343b2278d1728932e
-
-[ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.2.29.tgz]
-md5=6c4c72a1336aa45b463e738034c078d6
-sha256=82ed5a27d2b340826b2e10625e687627ccefc883a426314952e4a253d5a6af29
-
-[ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.3.11.tgz]
-md5=fbde128a8421b8d2ea587a25057a281e
-sha256=63d1c60a49277a4e95dcfb7f45dbb66a902d9e9023f8aca3a01cda4ff221d6a9
-
-[ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.17.tgz]
-md5=5e82103780f8cfc2b2fbd0f77c47c158
-sha256=4a18ce70154f5c0ffc1804698dba609d8f4aab3e74f01bbddf31b28b96403fc3
-
-[http://www.zip.com.au/~dtucker/openntpd/release/openntpd-3.7p1.tar.gz]
-md5=10ed8eefd760e5819efcf3277b118f47
-sha256=313509a7ccb15565e911f61c599055afc705cfe4bf6370bdc1c30582d52a9ea9
-
-[http://www.zip.com.au/~dtucker/openntpd/release/openntpd-3.9p1.tar.gz]
-md5=afc34175f38d08867c1403d9008600b3
-sha256=83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49
-
-[http://downloads.sourceforge.net/openobex/openobex-1.2.tar.gz]
-md5=c92746ae7bd69255c2c41f51e9349c65
-sha256=501c611a73d2f7d8a3de5ef83202ff3f9ab21d2c467e39548737e344b085f931
-
-[http://heanet.dl.sourceforge.net/openobex/openobex-1.2.tar.gz]
-md5=c92746ae7bd69255c2c41f51e9349c65
-sha256=501c611a73d2f7d8a3de5ef83202ff3f9ab21d2c467e39548737e344b085f931
-
-[http://downloads.sourceforge.net/openobex/openobex-1.3.tar.gz]
-md5=feaa5dfe5151c0e70e8f868fa4648a43
-sha256=3a80ba2524c66a46db3ac17a788a759015a1f79de6a495fcdf3a316e19fe7c23
-
-[http://heanet.dl.sourceforge.net/openobex/openobex-1.3.tar.gz]
-md5=feaa5dfe5151c0e70e8f868fa4648a43
-sha256=3a80ba2524c66a46db3ac17a788a759015a1f79de6a495fcdf3a316e19fe7c23
-
-[http://www.kernel.org/pub/linux/bluetooth/openobex-1.5.tar.gz]
-md5=0d83dc86445a46a1b9750107ba7ab65c
-sha256=e602047570799a47ecb028420bda8f2cef41310e5a99d084de10aa9422935e65
-
-[http://www.openpbx.org/releases/openpbx.org-1.2_rc3.tar.gz]
-md5=e270c40626dfa2131cc39dd1352b46f9
-sha256=934e1e5438c46927236f1f3254265e94c7e38e7c0e02d92abb7efc4e03ce91e9
-
-[http://downloads.sourceforge.net/openrdate/openrdate-1.1.3.tar.gz]
-md5=af4785f615b9d87b9c86a32af4ecc225
-sha256=0f8a034107fc7593f28e77b276f964c1309343b4702ecdf0d61bb3e57ad0cb5f
-
-[http://heanet.dl.sourceforge.net/openrdate/openrdate-1.1.3.tar.gz]
-md5=af4785f615b9d87b9c86a32af4ecc225
-sha256=0f8a034107fc7593f28e77b276f964c1309343b4702ecdf0d61bb3e57ad0cb5f
-
-[http://qa.debian.org/watch/sf.php/openrdate/openrdate-1.1.3.tar.gz]
-md5=af4785f615b9d87b9c86a32af4ecc225
-sha256=0f8a034107fc7593f28e77b276f964c1309343b4702ecdf0d61bb3e57ad0cb5f
-
-[http://openredalert.googlecode.com/files/openredalert-r438-src.tar.gz]
-md5=12dc7a8042c023bc77b7830946fc8492
-sha256=68058b6ffd9a286111c1860ca6d53af0d98d3f0c2a53875efd72ab381a3f9d6d
-
-[ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.7.1p1.tar.gz]
-md5=f54e574e606c08ef63ebb1ab2f7689dc
-sha256=61d9b805f255e143dbbc50c6c60c24f55bc4f8f319909dd399b3a3a1ef7c77f9
-
-[ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.7.1p2.tar.gz]
-md5=61cf5b059938718308836d00f6764a94
-sha256=c77c45cda120a2df844639ed9545243e9c9a436bd723e556c9ea06c15a682d06
-
-[ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.8p1.tar.gz]
-md5=7861a4c0841ab69a6eec5c747daff6fb
-sha256=4304eebd70fb7e8a565fc8bb32930abb0682b274db9fca4b50f47677bf9966b6
-
-[ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-4.0p1.tar.gz]
-md5=7b36f28fc16e1b7f4ba3c1dca191ac92
-sha256=5adb9b2c2002650e15216bf94ed9db9541d9a17c96fcd876784861a8890bc92b
-
-[ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-4.3p2.tar.gz]
-md5=7e9880ac20a9b9db0d3fea30a9ff3d46
-sha256=4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f
-
-[ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-4.6p1.tar.gz]
-md5=6a7fa99f44d9e1b5b04d15256e1405bb
-sha256=7bbe277faa80c8d8d9cb96111db65fc0007d451784cc459207cd46b746a6f23a
-
-[ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.2p1.tar.gz]
-md5=ada79c7328a8551bdf55c95e631e7dad
-sha256=4023710c37d0b3d79e6299cb79b6de2a31db7d581fe59e775a5351784034ecae
-
-[http://www.openssl.org/source/openssl-0.9.7e.tar.gz]
-md5=a8777164bca38d84e5eb2b1535223474
-sha256=25121b5dbd2b830929519325e033086ce45861cff2d0000d928f48261b1e0b7c
-
-[http://www.openssl.org/source/openssl-0.9.7g.tar.gz]
-md5=991615f73338a571b6a1be7d74906934
-sha256=e7e1a287141dd1be7f4b4fedd54ec29fa904655ed76a13ac87ae69a3fc76b062
-
-[http://www.openssl.org/source/openssl-0.9.7m.tar.gz]
-md5=74a4d1b87e1e6e1ec95dbe58cb4c5b9a
-sha256=c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572
-
-[http://www.openssl.org/source/openssl-0.9.8g.tar.gz]
-md5=acf70a16359bf3658bdfb74bda1c4419
-sha256=0e26886845de95716c9f1b9b75c0e06e9d4075d2bdc9e11504eaa5f7ee901cf0
-
-[http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz]
-md5=5c54040bba6fea2bfb47df01056e953f
-sha256=d35213dc854f1e1a08512154c7a92fb94d9f0506cc5107f8b2f248412679fb53
-
-[http://www.openswan.org/download/old/openswan-2.2.0.tar.gz]
-md5=f5f83204652627cf51d2567c53df5520
-sha256=62d36b998b9ec21864263d17e83aeb30a300a8f0d336a057ca9610b447b9ce7a
-
-[http://www.openswan.org/download/old/openswan-2.4.7.tar.gz]
-md5=70f22e8adc39e07a165f75eccb7cd079
-sha256=b839b024fd717a404711f5ec14ee9b9e412a080f23e90841cde14f20970dc5dd
-
-[http://www.openswan.org/download/openswan-2.4.7.tar.gz]
-md5=70f22e8adc39e07a165f75eccb7cd079
-sha256=b839b024fd717a404711f5ec14ee9b9e412a080f23e90841cde14f20970dc5dd
-
-[http://downloads.sourceforge.net/openttd/openttd-0.4.0.1-source.tar.gz]
-md5=ddd9790c86b7ccc68f60761704cbcf81
-sha256=56e844da580761ddbb580683fc455a8d9eb3179df631568c26b7188d1ff16363
-
-[http://binaries.openttd.org/releases/0.6.3/openttd-0.6.3-source.tar.bz2]
-md5=d05b9ebf67c83f07e8286d0d2b1fc293
-sha256=2d60e8a08768a9c81f37e699df6890c12d53f4d56b5562724c3a9ffa302c7197
-
-[http://binaries.openttd.org/releases/0.7.4-RC1/openttd-0.7.4-RC1-source.tar.bz2]
-md5=416a2ec6aa01b322100fb4e2f039f992
-sha256=8f57475e37a7b8544741c563bdc34463ce98e43ed3c1a7543a3fdd35647b8ea1
-
-[http://downloads.sourceforge.net/openvpn/openvpn-1.5.0.tar.gz]
-md5=55d7ce958bb2ccf3d3204d1350c27179
-sha256=d34d0a1a29de12cbb4fc6f8d80eced7b674ee3574e3df3d678fb0467283f7826
-
-[http://downloads.sourceforge.net/openvpn/openvpn-1.6.0.tar.gz]
-md5=9eab3719b280a12d19ef1fda286cc363
-sha256=22072a24bcaef8038a1e84363f3e209f65eb7c7ab37741752172a334acb31fb8
-
-[http://openvpn.net/release/openvpn-1.6.0.tar.gz]
-md5=9eab3719b280a12d19ef1fda286cc363
-sha256=22072a24bcaef8038a1e84363f3e209f65eb7c7ab37741752172a334acb31fb8
-
-[http://openvpn.net/release/openvpn-2.0.2.tar.gz]
-md5=862f8788f080f669b1ae00a74ef68001
-sha256=927512af1c0bc2af29690e205ce16c0cc920477be85742ebbedd8472ba01f807
-
-[http://openvpn.net/release/openvpn-2.0.9.tar.gz]
-md5=60745008b90b7dbe25fe8337c550fec6
-sha256=347c551e7c88affc1f4b7a4b715080253c9298dcc512ed29fe8ca5cd26d015d9
-
-[http://openvpn.net/release/openvpn-2.0.tar.gz]
-md5=7401faebc6baee9add32608709c54eec
-sha256=063f00d5b889beee910eb113c8cfbb4fc85cd404693494bcaaf79dd09a98335c
-
-[http://openvpn.net/release/openvpn-2.1_rc19.tar.gz]
-md5=ba2ee667a8b7606b125b7d32f47ca578
-sha256=d7f52e2217ed1cf367ca93257b27c8acb29fcae4fcaa31b4a94146a3c7a7de33
-
-[http://openvpn.net/release/openvpn-2.1_rc20.tar.gz]
-md5=8187f8f21507faac5e320e32747203b8
-sha256=4d423b48cb3ccc66b5669b9404dcb028cb62af410361c09e6056db0c5d2a1267
-
-[http://downloads.sourceforge.net/gakusei/openwrt-imagetools-svn-rev7641.tar.bz2]
-md5=7f35543286911b827dcbf8d07a7d72be
-sha256=bad49b59646dbea380cc88be13a77d17c70488b8e11e85f7dd474930fa9cf36a
-
-[http://heanet.dl.sourceforge.net/gakusei/openwrt-imagetools-svn-rev7641.tar.bz2]
-md5=7f35543286911b827dcbf8d07a7d72be
-sha256=bad49b59646dbea380cc88be13a77d17c70488b8e11e85f7dd474930fa9cf36a
-
-[http://downloads.sourceforge.net/oprofile/oprofile-0.9.2.tar.gz]
-md5=9af4e1e1aab89131516736bb60e9efba
-sha256=4b3780ee09efe665a69151c994e0e5f01a56c57338660c18df30916904df83a6
-
-[http://heanet.dl.sourceforge.net/oprofile/oprofile-0.9.2.tar.gz]
-md5=9af4e1e1aab89131516736bb60e9efba
-sha256=4b3780ee09efe665a69151c994e0e5f01a56c57338660c18df30916904df83a6
-
-[http://downloads.sourceforge.net/oprofile/oprofile-0.9.3.tar.gz]
-md5=bb91e4d5bd45ff0d5c3e6214653422b7
-sha256=4f86ab165dabcc7bc4008710a66fa0ed391c083e2a8bdf8a8f5bf11c0244b2cb
-
-[http://heanet.dl.sourceforge.net/oprofile/oprofile-0.9.3.tar.gz]
-md5=bb91e4d5bd45ff0d5c3e6214653422b7
-sha256=4f86ab165dabcc7bc4008710a66fa0ed391c083e2a8bdf8a8f5bf11c0244b2cb
-
-[http://downloads.sourceforge.net/oprofile/oprofile-0.9.4.tar.gz]
-md5=82b059379895cf125261d7d773465915
-sha256=cb1452159036ba7d3003b75dfef38fcbc61503f76adfca2879ebf7766931cade
-
-[http://heanet.dl.sourceforge.net/oprofile/oprofile-0.9.4.tar.gz]
-md5=82b059379895cf125261d7d773465915
-sha256=cb1452159036ba7d3003b75dfef38fcbc61503f76adfca2879ebf7766931cade
-
-[http://downloads.sourceforge.net/oprofile/oprofile-0.9.5.tar.gz]
-md5=4b2ceca3fa013c95cc8d47c790807dc2
-sha256=1cb7c3968e3e01e7597f54b87ebc87a48c6c8e569db7e353adb91841db5b4190
-
-[http://www.rpsys.net/openzaurus/patches/archive/oprofile_always_bt_arm-r0.patch]
-md5=9d1e6a9bd4d6dc9cae3c54c18c303ace
-sha256=e0e33fae512e54ff27474c926a758cf687e35d2c3007f69d4c647b69d47352ae
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/orage-4.4.2.tar.bz2]
-md5=0c69e4c20350c3000d49350991d3a520
-sha256=ef08b96e5529f19a2f609525300fbea2019f1afb75fb3c85e474e6041f425abd
-
-[http://mocha.xfce.org/archive/src/apps/orage/4.6/orage-4.6.1.tar.bz2]
-md5=24fa43dd86ec5af5a4766620fd972cf2
-sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
-
-[http://mocha.xfce.org/archive/src/xfce/orage/4.6/orage-4.6.1.tar.bz2]
-md5=24fa43dd86ec5af5a4766620fd972cf2
-sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/orage-4.6.1.tar.bz2]
-md5=24fa43dd86ec5af5a4766620fd972cf2
-sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
-
-[http://ozlabs.org/people/dgibson/dldwd/orinoco-0.13e.tar.gz]
-md5=4cea186648c335752bc241418fd54038
-sha256=07fbed267421ee26ee4b6bc410b68a10a284072d78e1e495c74865db0470306e
-
-[http://downloads.sourceforge.net/orinoco/orinoco-0.15rc1.tar.gz]
-md5=fb2b24560c993aba6a6badfdc5e666a6
-sha256=78b6313164702e2907ea0f746e5cff443c82a16433c3b4f62831ca5755f451e9
-
-[http://heanet.dl.sourceforge.net/orinoco/orinoco-0.15rc1.tar.gz]
-md5=fb2b24560c993aba6a6badfdc5e666a6
-sha256=78b6313164702e2907ea0f746e5cff443c82a16433c3b4f62831ca5755f451e9
-
-[http://ozlabs.org/people/dgibson/dldwd/orinoco-0.15rc2.tar.gz]
-md5=2246f0879439d74f7aabc7935cec90c0
-sha256=2997613ab33ad42dc8269a63b7c40a6938b3552e196780a4a269cc7340dd23bd
-
-[http://thekonst.net/download/orpheus-1.5.tar.bz2]
-md5=9613e6be14ba7a0ca5d42a88e6ed3516
-sha256=45145ea27333be1552624065297b4d9d76feadf2a4a89fdf0ddafc830ced3a98
-
-[http://projects.openmoko.org/frs/download.php/581/orrery_2.4_clean.tar.gz]
-md5=03da10cffda64a0927a1d929c20eb8f8
-sha256=0a8fd606d12b98e439a95d608c317849b7fe151dca8e1b8b3dee329a3a75292b
-
-[http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-0.13.1.tar.gz]
-md5=293f16da6dd434e68652f0f725b7f97c
-sha256=2ba471a2a4f1d7f10fb70de5b68dbb7d32b43494efcecb88b3bd8445f630494c
-
-[http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-0.7.1.tar.gz]
-md5=e69ba3f5a2ac76e3b6117826d0c536b2
-sha256=2f2fc74a13df58f560c40385cd78683c66623d7a8271cb17941a9de7be07d43f
-
-[http://downloads.sourceforge.net/gtk-webcore/osb-browser-0.5.0.tar.gz]
-md5=4dad43f6e1291dfefaec6e9209928a0d
-sha256=78bed1f7a227c7844f4f1c3fd4eaa8c1c15f3ba6133ab1186f5b35371344de96
-
-[http://heanet.dl.sourceforge.net/gtk-webcore/osb-browser-0.5.0.tar.gz]
-md5=4dad43f6e1291dfefaec6e9209928a0d
-sha256=78bed1f7a227c7844f4f1c3fd4eaa8c1c15f3ba6133ab1186f5b35371344de96
-
-[http://downloads.sourceforge.net/gtk-webcore/osb-jscore-0.5.0.tar.gz]
-md5=969cda923c419e35a319911b30b1d4b8
-sha256=f5ad6961288687b8dc44a3f5cd6d1901b1b5b293e592da7a63c201eee1089464
-
-[http://heanet.dl.sourceforge.net/gtk-webcore/osb-jscore-0.5.0.tar.gz]
-md5=969cda923c419e35a319911b30b1d4b8
-sha256=f5ad6961288687b8dc44a3f5cd6d1901b1b5b293e592da7a63c201eee1089464
-
-[http://downloads.sourceforge.net/gtk-webcore/osb-nrcit-0.5.0.tar.gz]
-md5=b02f4a0dcaac722ad7cdc112db964df4
-sha256=8977c50529ecd51441897d675a3eca980d50e2b33fb0885f9dae1f3c9fd417c8
-
-[http://heanet.dl.sourceforge.net/gtk-webcore/osb-nrcit-0.5.0.tar.gz]
-md5=b02f4a0dcaac722ad7cdc112db964df4
-sha256=8977c50529ecd51441897d675a3eca980d50e2b33fb0885f9dae1f3c9fd417c8
-
-[http://downloads.sourceforge.net/gtk-webcore/osb-nrcore-0.5.0.tar.gz]
-md5=16d9a9a322025cae1a7fe8225690695a
-sha256=39123e386671e18873392fe221616bbfc2be5ca6ddc3660d6cc001a6aa1f59a8
-
-[http://heanet.dl.sourceforge.net/gtk-webcore/osb-nrcore-0.5.0.tar.gz]
-md5=16d9a9a322025cae1a7fe8225690695a
-sha256=39123e386671e18873392fe221616bbfc2be5ca6ddc3660d6cc001a6aa1f59a8
-
-[http://downloads.sourceforge.net/re-aim-7/osdl-aim-7.0.1.13.tar.gz]
-md5=925eb6675ce86cb011699f38468a1fd1
-sha256=52d87bcb19fef6360d2e36274c2b5fe512e8427550eae04c5fa897ee77d34273
-
-[http://heanet.dl.sourceforge.net/re-aim-7/osdl-aim-7.0.1.13.tar.gz]
-md5=925eb6675ce86cb011699f38468a1fd1
-sha256=52d87bcb19fef6360d2e36274c2b5fe512e8427550eae04c5fa897ee77d34273
-
-[http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-settings/osso-af-settings_0.8.5-1.tar.gz]
-md5=e24a9a9fb2167197ad6d141c891be9cf
-sha256=c243adca37a6b80e1ccd43da53e61d1794d4dede6787c9beebacd2c1932271ce
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/o/osso-af-settings/osso-af-settings_0.9.2-1.tar.gz]
-md5=e970269ac728e70680aaa8f7d753f784
-sha256=7b5f28f447d2bf4ede28f54d2f2c0a9decc3bea6532ef0c8be90e7372bd831cd
-
-[http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-startup/osso-af-startup_0.28-1.tar.gz]
-md5=dc36e212d738944ded9d05bc16171523
-sha256=b14cfdcedea92cef74c58cead4981c349f8e2cc7bbc24ace5e953dd3b6e83668
-
-[http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-utils/osso-af-utils_0.4-1.tar.gz]
-md5=8a10a5b3bb494d8bc2241fd041f0e4d4
-sha256=6a92a4bb2876fdfb7454723f0235ce9962f72cf41938aed58b1b49562c693a77
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/osso-app-killer/osso-app-killer_0.4-3.tar.gz]
-md5=54a7df1fcef0cc67f83797bd6b882195
-sha256=011efde2376624c70760417d0ca75a9a1fde1ebb6f925326b99ba3586a4b50c1
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/osso-application-installer/osso-application-installer_1.0.03-1.tar.gz]
-md5=05e47346d432bd4c78736b12f262d612
-sha256=f7129c56cd7e561c10457d101f37ebf3a8b02df83f42a30cb90b46eb0de5dede
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/osso-bttools/osso-bttools_0.25.1.tar.gz]
-md5=528eaa3b27b51e9823f2ca4261dc8354
-sha256=ad2e75c857888ab6fcb26b45a792729d42d42f3293090bcdb09256eebb0ed8be
-
-[http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-core-config/osso-core-config_200515.1.tar.gz]
-md5=efa6dc867cec4b38febab2f0fe24a4d2
-sha256=fed674a5ae64cb65328eecc752403e5e75e9ce486c19d86c5fa633afb23e0969
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/osso-dsp-headers/osso-dsp-headers_0.1.orig.tar.gz]
-md5=ebf60b7d98260aeefec24d4dc22a3c2b
-sha256=53704f6b0aace1b2f24b5366530f6df51bf4ffea7209055e9eadee541c2c221f
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/osso-esd/osso-esd_0.5.orig.tar.gz]
-md5=7f110e130db541b1aa9fc428b2620602
-sha256=1a84b7d4939313e9b7ec0ce8f50934251fe1569e6144931dd323de8ee8dacccd
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/o/osso-games-l10n-public/osso-games-l10n-public_6.0+r6710+0m5.tar.gz]
-md5=7a721092e6a8cfa4eef5c142a4d78340
-sha256=b011e8ca27bf5c01cc72f3083f6806913c7138e02fd28affc43a86991b5b6501
-
-[http://repository.maemo.org/pool/maemo4.1/free/o/osso-games-startup/osso-games-startup_1.5.18-0.tar.gz]
-md5=a3752aae572d3a621990d0b1db38a0eb
-sha256=9cf40c2e07cbc55576bb4b09fc406351533e0b06064e935c73f7c5aedde13b81
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/o/osso-gnome-vfs2/osso-gnome-vfs2_2.16.3-1osso31.tar.gz]
-md5=dc5d48a94d4d41db9e34a6ddf646a355
-sha256=01e4e2331df788bddd1e3453ee490c086d4f669c4cbca7a41ff2c15d3b7d6b84
-
-[http://repository.maemo.org/pool/maemo5.0alpha/free/o/osso-gnome-vfs2/osso-gnome-vfs2_2.16.3-2osso3+0m5.tar.gz]
-md5=bbbbd2c8c5a11f247b2dab7189dcfa22
-sha256=b430d99e36d12d80fb94cea38a4e4e1446eceadf8045afb62e39503c03dee67b
-
-[http://repository.maemo.org/pool/maemo5.0alpha/free/o/osso-gnomevfs-extra/osso-gnomevfs-extra_1.9.6-3.tar.gz]
-md5=f0c77abaeb6f87a0e1dcfb8410434abc
-sha256=0604dafb8888be213f2eba17db57b42a155677db2f568aa7da1c6950983e52ec
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/osso-gwconnect/osso-gwconnect_0.70.1.tar.gz]
-md5=e4a87e616807dfd8557663a28990e948
-sha256=1bebf4c6adf9d383014bf0da8f133c0dbb6aa420033347e8e1f307f79051bc86
-
-[http://repository.maemo.org/pool/maemo4.0/free/source/o/osso-gwconnect/osso-gwconnect_1.0.12.tar.gz]
-md5=067de342f812811e6585b58049895168
-sha256=015b5b318c74650d1e85319ee05e8c506dd7a30daf280d7c1e23b914c1e4c7f8
-
-[http://repository.maemo.org/pool/bora/free/source/osso-gwconnect_1.0.8.tar.gz]
-md5=23b4b9319dbe5b4f3818ddbd1548ead9
-sha256=02d0f7ac6a015a5183eca2c517aa50effbde19884e24f9e63c9daf530d2329e6
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/osso-gwobex/osso-gwobex_0.26.1.tar.gz]
-md5=804ad2ed142c9ef31bee42a68704315c
-sha256=f5e784be11151f927c68f09ba4e2881a95b67c99de9ba597b8155a6d5421598f
-
-[http://repository.maemo.org/pool/bora/free/source/osso-ic-oss_1.0.4.tar.gz]
-md5=6868cbd4dfc78abd7c651428d517e723
-sha256=16a0da4d947bd9c64379870646bf321853c7627d7894843a9e394182ae70315e
-
-[http://repository.maemo.org/pool/maemo4.1/free/o/osso-mahjong/osso-mahjong_1.5.15-0.tar.gz]
-md5=e304a3797ea19f5db3628f5891d97457
-sha256=6ca464db290b9576e55cb0a9b70cb3f592dca681023526e9997e90d977919213
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/osso-screenshot-tool/osso-screenshot-tool_1.20-1.tar.gz]
-md5=d07be50f058ef53fbdc5c1720f26b9ad
-sha256=c01553daef241e425afd17f421f0cd2b8bf8ba03f55f5a3e30192c36511aa199
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/osso-sounds/osso-sounds_0.3-1.tar.gz]
-md5=27e905aad10d3e29f03a7d1d1180ea3a
-sha256=90c601d2ed52b2ce967e76678894e74569f59104614cf35de20dab78eb0144b5
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/o/osso-system-lock-l10n-public/osso-system-lock-l10n-public_6.0+r6710+0m5.tar.gz]
-md5=bb97e1f8b20804495e1d5e49bbe926b6
-sha256=51dc6b0463dc7155244d9f3fef5ec224dd9d1edb06aa5470fcb5c605e4091e53
-
-[http://repository.maemo.org/pool/maemo4.1/free/o/osso-systemui-dbus-dev/osso-systemui-dbus-dev_0.1.2.tar.gz]
-md5=f172f015008a10de78097b969c98f14b
-sha256=185e27dc0481056be87088b4abdade9f52e0be65e556565541567604703132e1
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/osso-thumbnail/osso-thumbnail_0.3.1-1.tar.gz]
-md5=95d35782e17404fa4c4b634ed7cd898d
-sha256=bec82e8b1b695f14403931a61ff438ebb62853a398598b540faabeea5fc774ad
-
-[http://repository.maemo.org/pool/bora/free/source/osso-thumbnail_0.7-1.tar.gz]
-md5=8873509c136c0a14105c0201ae792186
-sha256=dd9b3210a6f3168f7cf2c5ee1a36f7f19fd6f3dd834681cc561c813303077ebd
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/o/osso-uri-l10n-public/osso-uri-l10n-public_6.0+r6710+0m5.tar.gz]
-md5=5112c0d2af555a3a034c7c0fe150a4be
-sha256=27ac7d7244ced3e12a7b417db105de455ad42125ac8327f663e854aab57d039b
-
-[http://repository.maemo.org/pool/maemo4.1/free/o/osso-xterm/osso-xterm_0.14.mh12.tar.gz]
-md5=dadb84bbea954dfc1b38bc9760209fbc
-sha256=56f7a4c8ed79a7f00d171a83b6c0be7dc508c21f809d15dfa89887cfc9c40c2d
-
-[http://killa.net/infosec/otpCalc/otpCalc-0.97.tar.gz]
-md5=73c9a9e95462afda725fdf17a301f0b0
-sha256=e2c19fa6178ed42f0576650db6f94942cac366feadf82c2a679b35197c65f745
-
-[http://erlang.org/download/otp_src_R11B-1.tar.gz]
-md5=1fe3707d9bed898bc51444cb529fdd79
-sha256=d5a8530dfee0b2348c4ad0107409fa73ac3233f31e2300ece625a2abd9eb4da7
-
-[http://erlang.org/download/otp_src_R13B01.tar.gz]
-md5=b3db581de6c13e1ec93d74e54a7b4231
-sha256=f0964946f3cdd224500a7a6df1c2ee2bf9ef2d3684ab82c2dd6c22b98986bc80
-
-[ftp://ftp.bitrot.de/pub/otpkeygen/otpkeygen-src_1.3.0.tar.gz]
-md5=ec1c0a93a586361298faebce4fac9dbd
-sha256=b6129acb788726ab159ed790a85a625651fff5cdff3a2cd0517f19ccd41c2a54
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/outo/outo_0.1.1-2.diff.gz]
-md5=8e6f3899761533d990f1bcfb01d86cb3
-sha256=225a63cdebb1490a47f3af5d17d301cd3e9382395f21776c5b04e4cf17fdf2b7
-
-[http://repository.maemo.org/pool/maemo/ossw/source/o/outo/outo_0.1.1.orig.tar.gz]
-md5=798eb3a03c519bd5f829775f5b219a91
-sha256=49b2e7ecaac26c3d87ccd26279bc0536baa50f1e140b36e14fbeedde76aad0ef
-
-[http://downloads.sourceforge.net/owfs/owfs-2.7p21.tar.gz]
-md5=8aea6f3bb0dc9fdb52ed3f0e9d84fa79
-sha256=070a3368e9400e900618f8a704f487baf3671f6764715b4de04b151c66d3306d
-
-[http://downloads.sourceforge.net/owfs/owfs-2.7p23.tar.gz]
-md5=654dcf9f3987d49a35b4bb92e464234a
-sha256=1391df01a619c6df0049706fb7bd4c690c55439b7bee4d5e8c564525cefdede2
-
-[http://downloads.sourceforge.net/owfs/owfs-2.7p24.tar.gz]
-md5=e52d87fafbeed156354dff3c34203d3d
-sha256=aec28206a8345f982a3e98b7b889721340899483e579a81aaf72c2cd59bb144e
-
-[http://downloads.sourceforge.net/owfs/owfs-2.7p28.tar.gz]
-md5=2d6a4311f7275eb04466e36678bacabe
-sha256=3b35a5c2d6fa0814d3c689dd490e829d3dd7729d09ae95f9205757cbb3ee52f0
-
-[http://openzaurus.org/mirror/oz-compat_0.5.tar.gz]
-md5=0005d4068b2227e26f4583c1a7415e97
-sha256=8db9b3948c607315f0ba0df61b32f747bec5479c38051d3e0e55b31b82c81af5
-
-[http://downloads.sourceforge.net/p3scan/p3scan-2.9.05d.tar.gz]
-md5=7f54ae7ebe9adbefc2a2ad55c62589da
-sha256=2c23dac41ef0ec0b74b38c4c1dc4b0f6f21386c97a0062a745a2896cdf026e8d
-
-[http://heanet.dl.sourceforge.net/p3scan/p3scan-2.9.05d.tar.gz]
-md5=7f54ae7ebe9adbefc2a2ad55c62589da
-sha256=2c23dac41ef0ec0b74b38c4c1dc4b0f6f21386c97a0062a745a2896cdf026e8d
-
-[http://filehost.perforce.com/perforce/r04.2/bin.linuxarm/p4]
-md5=ba983759366018ad2d90a7e088f509eb
-sha256=de8bce2b3ae085a973dca4f7208c3cb1ab1fdc9bbcc9e3496ad3d56a4923dba0
-
-[http://filehost.perforce.com/perforce/r05.2/bin.linuxarm/p4]
-md5=9bc57695db5885ffac0a352fc17a7f84
-sha256=56dd1cb2364b8c8618f9019b641d17d6b307a5a797f3ac31c16a01247554e10c
-
-[http://filehost.perforce.com/perforce/r05.2/bin.linuxmips/p4]
-md5=ada4419eca356ab2f784a34b4b0c5e9c
-sha256=c8450262c6b4232b75eb90c61c76bb1c3cfdb790f3827c9a9d49bb77a4e613eb
-
-[http://filehost.perforce.com/perforce/r04.2/bin.linuxarm/p4api.tar]
-md5=1eb1fb53531e09a03f158957016d55a6
-sha256=7d5455c9aa77aea548f3b52f579bf41fff034f0be1c283840b88be401f817792
-
-[http://filehost.perforce.com/perforce/r05.2/bin.linuxarm/p4api.tar]
-md5=7bdb4d9f59a231cc90a8e93709ec1595
-sha256=2e742bf3358f9b8b38f692f4222f96d6901a6faedca155942f58435cee385614
-
-[http://filehost.perforce.com/perforce/r04.2/bin.linuxarm/p4d]
-md5=690a404af3d916dc7c1cfa5a14a51171
-sha256=e41d44dbc5bd60f2140f0774945154105759b2dabf4c26c097cf754797274e39
-
-[http://filehost.perforce.com/perforce/r05.2/bin.linuxarm/p4d]
-md5=9a72849bb39cfe19da018271824a3ae1
-sha256=d67bc483b3cbccdcf32db6af21f02d20793a4c3ccc4b758c3a66374b410b73e8
-
-[http://filehost.perforce.com/perforce/r04.2/bin.linuxarm/p4ftpd]
-md5=c099df674fb3c249cb1d1984f00d573e
-sha256=9839564335035bc92041fafd93d05a811dc4243bb72269b3afe5ba823f016418
-
-[http://filehost.perforce.com/perforce/r05.2/bin.linuxarm/p4ftpd]
-md5=eb47a4e532fca795893f0c727ae59c84
-sha256=bb5de57d0098e1c6f0d238cc4e658c64579b26fc1df58b9ce59c057fcb5b2f4c
-
-[http://filehost.perforce.com/perforce/r04.2/bin.linuxarm/p4p]
-md5=02de68f26da402689f661662217cd77f
-sha256=24d153529f669ff5fd9dc0d7a09bf7c6e658ee2d2496ab8025a2aaf12425907c
-
-[http://filehost.perforce.com/perforce/r05.2/bin.linuxarm/p4p]
-md5=eed70a3a6af7e59a44d614d4a8022ff0
-sha256=b4b6546d16f161a50337bf9f5dfaf3a4795a3c9b56931e7ee2ace8bcf1863d6e
-
-[http://filehost.perforce.com/perforce/r04.2/bin.linuxarm/p4web]
-md5=7bf9967719351c7a0758e20641978358
-sha256=70ebe07343989de042b9ef7866cfca540cfb28458e6c475d516c6916f4feb468
-
-[http://filehost.perforce.com/perforce/r05.2/bin.linuxarm/p4web]
-md5=e97b15e64be5a3773880f7d66e87a541
-sha256=ce72ef785a92aa8c71b6525e37da49bebab670a046b2ee0c023713f5aa497826
-
-[http://internap.dl.sourceforge.net/sourceforge/p910nd/p910nd-0.92.tar.bz2]
-md5=94a43d28794f2445cd5f9c8b970898c4
-sha256=a2295e525febfc3a1a93ad21c0843021e2b22e6720f148bf1c4822a83aea2b8c
-
-[http://www.portaudio.com/archives/pa_stable_v19_20071207.tar.gz]
-md5=d2943e4469834b25afe62cc51adc025f
-sha256=06a17727d56d382a69036de2ed9aee9a15cac0329b995b8cfcd69b357f47bf2b
-
-[http://0pointer.de/lennart/projects/padevchooser/padevchooser-0.9.3.tar.gz]
-md5=6a9b52ad349f3fb3d5a3ccdf85958710
-sha256=3238f19ea5a3c54efef31e4f86c712232c92704d68c9d2bbef0339ba9b4cb674
-
-[http://handhelds.org/~zecke/oe_packages/pairs_V1.1.1.tar.gz]
-md5=399e794dde87508b4214f1312cd79d06
-sha256=7526d8de006817e5c6bc79826f810a15490611dcbd2d4fb9d8e9b9991c7ed506
-
-[http://mirror1.pdaxrom.org/source/src/pak0.tar.gz]
-md5=677c4817c156136a3042025191ed243b
-sha256=3dfe058a121e5ff2d2c7675af74a7309b0048ff9fc6dd6129d2c37cef44f0105
-
-[http://www.fastpath.it/products/palantir/pub/palantir-2.7.tgz]
-md5=3a5b1fb340857f6d8e357bf39b77583e
-sha256=dbe9c8317e66e7239a53e9bcb68595cd31ec949474bb3d9fc15f51f3773c167b
-
-[ftp://ftp.gtk.org/pub/gtk/v2.8/pango-1.10.2.tar.bz2]
-md5=7302220d93ac17d2c44f356d852e81dc
-sha256=677d3a943cfeedebf138024de6e4a773f7f6626236613401f3a797f82f04eba7
-
-[http://download.gnome.org/sources/pango/1.12/pango-1.12.0.tar.bz2]
-md5=86c3e08169a18200e64a0c5ee1be7fd9
-sha256=92cb2441d436e10dc811f4aeb85b7cc32210a1ea250b1c3f5ba7e9dc1e6924a2
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.13/pango-1.13.3.tar.bz2]
-md5=9441c965bbf50d637a3e8016c628ee7e
-sha256=8b617cb4555c487a2b6f6a0e89a869506f9b4f320387068621c234c37e69c5ae
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.14/pango-1.14.0.tar.bz2]
-md5=39144843f377ec6b60dbbf1a25d2a49a
-sha256=db8b220a88cbebd51f29c0fbd9cbed7f0f875c1cc198abe1b119c0b7d2c3a3fe
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.14/pango-1.14.8.tar.bz2]
-md5=ed0add14bcfe8a6939ea6a5996aa8032
-sha256=857b832f893ef5fca761910873d96ef09a5879b61944f3713725ca3c9d7eca7f
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.15/pango-1.15.1.tar.bz2]
-md5=bb24f4fd3d303e84827f852b38a682f7
-sha256=80670a6205a52b036c9f17ff85f23c358be8cf41eaa7d9ea48ca4f4c00840a86
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.15/pango-1.15.2.tar.bz2]
-md5=3a57ff08498a210892fe665bf4812011
-sha256=940017c6868a4a3d43f44427a12edf2a9d49a98d4d9a5113f6e7b1c360f36e27
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.16/pango-1.16.0.tar.bz2]
-md5=3ff23998479e98c5dd9a7eaf08f6249d
-sha256=5d83329f9f6c7922b6790841d06794475c57926c9d7f981c49b7d64cbb719de2
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.16/pango-1.16.4.tar.bz2]
-md5=025e2ac5e40cac163aae4653aeef559c
-sha256=1bdef802f138fabdaea10b97a4a86060a4aac63db970ea3aa1df697b33954ffc
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.18/pango-1.18.1.tar.bz2]
-md5=282dcff56292359f6a5c75be0b4fe3df
-sha256=420e3508c74873f9b4c106d7c4d1b0800c138e8f3c07d1ec57aa5995f126899b
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.18/pango-1.18.3.tar.bz2]
-md5=4a9862b5151f16dcad8e30dd6ef08549
-sha256=a1547a88ba9330956ce9f2f9e2ab74491e7344cc25fee4310b7f72c7e5f38db3
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.20/pango-1.20.5.tar.bz2]
-md5=052b60a12f6b2eb4f251ab961f2b2b84
-sha256=86f5a94bad18a24c32d6c95f4aad0de643189471825d07e1c1bcaf7cc5a8fab2
-
-[ftp://ftp.gtk.org/pub/gtk/v2.6/pango-1.22.0.tar.bz2]
-md5=37a185a3cb5c1a39ade7fdc3e6c75349
-sha256=75fa65f965c8b9b80b1a0a270ad5dfbe71eaa980451790a0c86fdd19f55cd150
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.22/pango-1.22.0.tar.bz2]
-md5=37a185a3cb5c1a39ade7fdc3e6c75349
-sha256=75fa65f965c8b9b80b1a0a270ad5dfbe71eaa980451790a0c86fdd19f55cd150
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.24/pango-1.24.2.tar.bz2]
-md5=7bc6c884d847cabc613e4c6d663771f5
-sha256=f3617f8f32c45c57f19c0aa1d7334e1dc979b9b54e5bb4e78fba8ec80193c23c
-
-[http://ftp.gnome.org/pub/GNOME/sources/pango/1.24/pango-1.24.4.tar.bz2]
-md5=f2eeaf183930e00ed28fca3a6ed1deb0
-sha256=adbd11f182ec63939d6364cbb59e86991a48582e7d3641cda80529b40b399559
-
-[ftp://ftp.gtk.org/pub/gtk/v2.4/pango-1.4.1.tar.bz2]
-md5=39868e0da250fd4c00b2970e4eb84389
-sha256=4f35ba6d3537c9386d6262bfe601a418bf34fe0be3bb0139ec2d3bd9435d4d3f
-
-[ftp://ftp.gtk.org/pub/gtk/v2.6/pango-1.8.2.tar.bz2]
-md5=f5b5da7a173f0566d8217ec112fde993
-sha256=4cf04489ff291f3f1835783b8cfa8347d99f6a05d7d9da21c8d737f441bea3ac
-
-[ftp://ftp.gtk.org/pub/gtk/v2.7/pango-1.9.1.tar.bz2]
-md5=91f386893ff483e14dc4571e352150e4
-sha256=97cc77b93ce65e4f138e284f799c9ae7153b6f81720553c3c120b7317692b537
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/pangomm/2.14/pangomm-2.14.0.tar.bz2]
-md5=85be0a654ed521e5594f64efdb3fa7d8
-sha256=211a0092cfd50923eaad75c20630c0a1818e56605d4b6fbc10702d5a34ea7107
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/pangomm/2.26/pangomm-2.26.0.tar.bz2]
-md5=37f54dc8e6cb73ed923b22f313352156
-sha256=bf26ebe42c12c81e5c32ceca80ff226a01c8d80d4db2a4cc3463d5bf241b095e
-
-[http://xlibs.freedesktop.org/release/panoramixext-1.1.tar.bz2]
-md5=129f8623dc4f70188a015e3cbd7eae82
-sha256=74188aff5f2e5b77515a8cf3979199a598d58da8e4f573462b59cbf94cf1c99d
-
-[http://0pointer.de/lennart/projects/paprefs/paprefs-0.9.9.tar.gz]
-md5=0592ccb28c8f601a8fe3607b64e9f5bc
-sha256=1237939f0cea478ecd51452e817e08877e914c919239fcb63aa2471a389769a9
-
-[ftp://ftp.gnu.org/gnu/parted/parted-1.6.23.tar.gz]
-md5=7e46a32def60ea355c193d9225691742
-sha256=5144f413dcce1a0b94263ebf3730f2a2afe6a9557bf261f9d6f48c890423f4c8
-
-[ftp://ftp.gnu.org/gnu/parted/parted-1.6.25.1.tar.gz]
-md5=8ad8b2c8aa865d9d6a43a4ecfe021782
-sha256=b8f151450dc71e2477d44b7f9ebb77a9ccf8d08776b77edb9bddee07885f1b02
-
-[ftp://ftp.gnu.org/gnu/parted/parted-1.8.0.tar.gz]
-md5=52d3e565fc3369d3388a9e02d4b17410
-sha256=6c57feb082c23e52f38366fff4ffa3961e5dc294d4ebb61ffa31462b5ae3681e
-
-[ftp://ftp.gnu.org/gnu/parted/parted-1.8.2.tar.gz]
-md5=cce5bce8fa1d430e1ca3de3722807e01
-sha256=2f67c40e2589e7804213493f24ebf80cd10847b47c95098854db0250511c3ed1
-
-[ftp://ftp.gnu.org/gnu/parted/parted-1.8.7.tar.gz]
-md5=2ec5cb88b146f1a8ccd5b389455503c6
-sha256=bffb732ab47a8dfb528ab2513f6ae82a4f795c119decfe1f96310bf32c4dfc9e
-
-[ftp://ftp.gnu.org/gnu/parted/parted-1.8.8.tar.gz]
-md5=0d494591731082ec57cc18627728124a
-sha256=db59b77b7ef46f00d83eddedde8a4126bffa6bff5fa94a335dd5d30bf72d4286
-
-[http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.initials.gz]
-md5=414606ce18de730d1bb6478899532644
-sha256=9385915adb106abba6f1576be58901f368688b1d55ef454e3993394828ee17e1
-
-[http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.nntp.2.gz]
-md5=f4724392ca865125bc2be80b643d175c
-sha256=ed0dc2337148ab4a884a94fd9472a76a13f74659372facef771f8b0eda5e4846
-
-[http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.quote.gz]
-md5=93276f86e544e69a0e83808279f3b175
-sha256=4afe6cc178b08ebd735d04053198f6539c87a0cdc1c5a8a51affc3598504e3a5
-
-[http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.rr.compressed.gz]
-md5=a7b37150c35ea65049b3cd1edab5079d
-sha256=a4780e1dcfe717567ef6a676fa4f9b9d9f2d44bb27dbc2374d7e3a01667f53bd
-
-[http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.initials.gz]
-md5=d92517da934f5c32692aecf7ece596b7
-sha256=16b5845600aa2839d0ea2ff71868f2a15109542a693b8b2f305c0a18574cab4f
-
-[http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.nntp.gz]
-md5=d0cb0f609aa0461d1b17137bd49c14cb
-sha256=f3e5fd05f7a1b9d57513f369c85c3af56bc4c7e75d765506da53b43c342073d4
-
-[http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.quote.gz]
-md5=80d91491679b426b0f670fa965ae3777
-sha256=92e2dc76784a3cb49ac4d03b80d47830ee4cafd2d48323ddb81382a6f249d428
-
-[http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.rr.compressed.gz]
-md5=9d9ef4ec0e970f9fc3de2d5c6219a349
-sha256=f28c30428119c9a82a91799ddd513c211db5b699b2c1d4868bbf2db6c38ccd1d
-
-[http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.vvv.initials.gz]
-md5=149c52991b23b9ab3d6add27cb27e151
-sha256=fddb48945e979c3e179ff6a90ab3d0c27f32c4c32910d51d32e904965865504d
-
-[http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.vvv.nntp.gz]
-md5=f7cf37af82169eefe94c6c42c6f3b9cd
-sha256=a09388316dff4346bf9e5ea4966157886c182a32d88f13d92877b1ccd37cd6e1
-
-[http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.vvv.quote.gz]
-md5=08329134d8995c05a28dd8258174a668
-sha256=f4664f3d8f616a440e8b6d8b10d40087961cb6d0892809d12975c83e54a9b79d
-
-[ftp://ftp.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.18-rmk7.gz]
-md5=90c1cfbc47c7069a14a5cb584a5ada9a
-sha256=8cbde563f5b77a7cf5ab900e7e627c493c1e36948b2c021b4738de82ca686d00
-
-[http://www.simtec.co.uk/products/SWLINUX/files/patch-2.4.25-vrs1-bast1.bz2]
-md5=1f942ff4ffda9ae764a4e54e7e7935ec
-sha256=3dcee0a8e7ed320396fec2e7eaee380957f3b25350d2f04770e48bf1b724b41d
-
-[ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.25-vrs1.bz2]
-md5=ed2909e7dcf11950503e438457086765
-sha256=f7f3c7bb493df1f19da32fd2001a8d52cc6ab3c7286781ebdc4d7d2367debc1d
-
-[ftp://ftp.gnu.org/gnu/patch/patch-2.5.4.tar.gz]
-md5=ee5ae84d115f051d87fcaaef3b4ae782
-sha256=dd2fc5a745bfca5450d13d7032fdc47ab102514aae3efb3fe334a6eff87df799
-
-[http://kernel.org//pub/linux/kernel/v2.6/snapshots/old/patch-2.6.11-bk1.gz]
-md5=92d8225c6b75b142054ad2321a992a42
-sha256=2886eb4ceedac69f3924dbc9d979869b8a188dfb5b94a3e1068932859b4c9b3f
-
-[http://kernel.org/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.11-bk1.gz]
-md5=92d8225c6b75b142054ad2321a992a42
-sha256=2886eb4ceedac69f3924dbc9d979869b8a188dfb5b94a3e1068932859b4c9b3f
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.12-rc2-omap1.bz2]
-md5=39df92d9fa916779ab5e596c21c51081
-sha256=f3d8a74aee678e9d941fe4335d87b481a39fc568c761916dcc05f0cc8e536837
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.12-rc5-omap2.bz2]
-md5=e52cf4f24b46bee3df0d9e9e257eecc3
-sha256=457ec3ccb135b80ce3b5c79ad356b142080405f7bd510b52c349567fff82fa46
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.14-omap2.bz2]
-md5=f9c9b0fe2ce0eef71c50ef45ddd0075d
-sha256=e4ac37531a455776ace04e234001c2849cbe2b1a3563409d23e4a6b3390c3e2d
-
-[http://www.muru.com/linux/omap/patches/old/patch-2.6.16-omap2.bz2]
-md5=b8de4aa518292ad3aef913645898218a
-sha256=34beecc0dd156267e8004fb79efea9bf97e1157ed597bdde1841c16def2e9195
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2]
-md5=b8de4aa518292ad3aef913645898218a
-sha256=34beecc0dd156267e8004fb79efea9bf97e1157ed597bdde1841c16def2e9195
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.18-omap1.bz2]
-md5=955088e5139ef5914d44fe15b4a50b90
-sha256=924c27b95f0c3792bf3d48ff854ef145e8916452b917067d653f59102f03c0d4
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.18.8.bz2]
-md5=090f582d2a0e1951d500b2e55f7df7b4
-sha256=cde777361d2a4818ea9c215e195a87da4847dafa94a10ac8c9f4bd8dc49fde3f
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.19-omap1.bz2]
-md5=3590e42e1a6ea4676df5b187b830b402
-sha256=b7cba2e38e81abb4d1d33c3f7f7c028310b392d5ee1ed5e3b2137e024598d903
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2]
-md5=e786ab1f9c8ee97f054462811a89aaba
-sha256=58007ec7430c5d954d2eccd64879797dfbcce68561c9de232cb59aca4fd2c1f4
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.19/patch-2.6.19-rc6.bz2]
-md5=e786ab1f9c8ee97f054462811a89aaba
-sha256=58007ec7430c5d954d2eccd64879797dfbcce68561c9de232cb59aca4fd2c1f4
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.20-omap1.bz2]
-md5=b220d8b8489003f3df03d897fbefa432
-sha256=f85096df0acc179f676497e75b9ba8d9b8685b92b0b2b8b1d6871619ed879fbd
-
-[http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.20.bz2]
-md5=08b2c1e9759ca409a0d2ca49db1bbedb
-sha256=0417fc3609f5746bce6016862e7f83e83e98e17e5ae77887bf66b37748ab261c
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.21.bz2]
-md5=10319d634fa66ae8a758e03a227ff79f
-sha256=1e0b8c7c5c923b396dcd0a0a1aa3108676f6ad67b35132d0c068ee59fd48408f
-
-[http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.6.bz2]
-md5=a42300de8720552d70470dd3e4afc75f
-sha256=808ca62a66d7cfe40123301c2f51fc0dcd817ee3bb0df96d1e9e97cc3bad6a9c
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.21.7.bz2]
-md5=b9c8734471a454806c77f040fcf9869b
-sha256=5ee24e1c5636bcffed155b1c01d7d09fedb135fa2458c190a0da03a82c8c2f60
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2]
-md5=a05c1a0bc0d3a8a11aea38a069f477ec
-sha256=d787151df658a8bffcab9ad681f0dd23cf17b8919a5f7e35b15a73e56efbefc2
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.22/patch-2.6.22-rc1.bz2]
-md5=9bc06492dce31c87f1cdfa2ce5b0cf4c
-sha256=dd33f3e9059bed043194ee5200239f26d3ad607ab5c872e7ce92595c1eb5d0e4
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.22.19.bz2]
-md5=066cc3bdd2783dcd01f6ff466e449ec0
-sha256=829c48b49c71d89468f2a5a05587714811197545eeba31e9643cabacf344d33a
-
-[http://kernel.org//pub/linux/kernel/v2.6/patch-2.6.22.5.bz2]
-md5=27544a58763bbd4ce497a77658af744a
-sha256=0f96188e8d1c6e0934f8e8dc2455e1f94a47c10cb17268364bcd77df68c83c2a
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.22.5.bz2]
-md5=27544a58763bbd4ce497a77658af744a
-sha256=0f96188e8d1c6e0934f8e8dc2455e1f94a47c10cb17268364bcd77df68c83c2a
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.22.6.bz2]
-md5=f2948e364ab3e4736b9e34f02173472f
-sha256=a85c8ce79cdc126b32aa9a74dbc64c368f0e7e9ec33e156af746003e1b5a8c4d
-
-[http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.23-git9.bz2]
-md5=e89c566908bb21e43937fe8bc33062c4
-sha256=126057524ae9707137b0c478753edc8072e1710160b0604a43e4625d0fde519e
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.23-omap1.bz2]
-md5=d23e6c5bb8294d61f0d9a4957c22eb20
-sha256=c2085fc8fc6df586ef8c19a4562b84162f0b77956d691aa4fbee5e90c9800cb7
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.23-rc3.bz2]
-md5=736ea68a03158c24e55aa95e0ab15ceb
-sha256=4d2c13dee5ea7bd8b5cdbf63afa9383b45f6bad1f75b163c49e086a5030a04de
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.23/patch-2.6.23-rc3.bz2]
-md5=736ea68a03158c24e55aa95e0ab15ceb
-sha256=4d2c13dee5ea7bd8b5cdbf63afa9383b45f6bad1f75b163c49e086a5030a04de
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.23/patch-2.6.23-rc5.bz2]
-md5=8253467313749aee6065093cd3c5fd9c
-sha256=c8c2068183aca79c46182f3d3fe6d7579cd60809681d42c52d71cf1873cd1a0e
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.23.1.bz2]
-md5=896c5d4e7fd68d37b8c16e5d2842563b
-sha256=55e811b4d4b0cbfde500bdd5455b7180d3def3dbdc52314520b7327d32b23f42
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.23.12.bz2]
-md5=5932b5043abe8ca1ac7ee1ed73fa5e91
-sha256=bd83c501ff86103f054421496de31e6bc86d40d6bec6eafd2712bb0fb9da9d07
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.23.17.bz2]
-md5=7d2dbdf18868b496548d4375d8c67d3a
-sha256=04dfd3f22dc3abce7d7509c0836350540b60cadd19292be70a2a2900c5fbe7b8
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc1.bz2]
-md5=4f5daa28c871d9edd6d61f712f4b358d
-sha256=2512a51923318bde6175e073b3eec0e58ae07123bcdc49afa11f286b0d4bd06d
-
-[http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc1.bz2]
-md5=4f5daa28c871d9edd6d61f712f4b358d
-sha256=2512a51923318bde6175e073b3eec0e58ae07123bcdc49afa11f286b0d4bd06d
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc5.bz2]
-md5=ae984c2ba6bf54e3f7d139c197563792
-sha256=fc8edda5992a3d45bb0b2cfbad9c9a683f74be110f8d767745182c49a86072fd
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.24/patch-2.6.24-rc5.bz2]
-md5=ae984c2ba6bf54e3f7d139c197563792
-sha256=fc8edda5992a3d45bb0b2cfbad9c9a683f74be110f8d767745182c49a86072fd
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc6.bz2]
-md5=d3f31d6564386938e18e8f74646de9da
-sha256=95880162dd0839d9b509152e34cf9356b051dff7daf2216ff50474efbe68f6c3
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.24/patch-2.6.24-rc6.bz2]
-md5=d3f31d6564386938e18e8f74646de9da
-sha256=95880162dd0839d9b509152e34cf9356b051dff7daf2216ff50474efbe68f6c3
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc8.bz2]
-md5=527687c63f4252989dba6fb92baf9707
-sha256=1daafd156f00c2b3b7981f197465d78e689fda506054d011ba0da6513319fe2c
-
-[http://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.24.2.bz2]
-md5=5e7fb6b61bd5af063ddd50b548355e94
-sha256=147c19d31c97c847ac09901dc5e40f27ed4dcf7e47ad81e84c6acde5cf214945
-
-[http://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2]
-md5=0c1c5d6d8cd82e18d62406d2f34d1d38
-sha256=b6bbb0dea427aa733c37d58a94b819b523c8649d7605f498348de159380c28a1
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2]
-md5=0c1c5d6d8cd82e18d62406d2f34d1d38
-sha256=b6bbb0dea427aa733c37d58a94b819b523c8649d7605f498348de159380c28a1
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.25-omap1.bz2]
-md5=b0aac48e4528aa1fa2b6759f53508643
-sha256=6ae71591d0184debcafb134896577447574c8b29545af6e99f6ff09dc3448571
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.25/patch-2.6.25-rc4.bz2]
-md5=a4cc0fd5bda60e498246b6d69c873895
-sha256=781656a17fe24b018ab2c33c2481c2a07e9abfa9c6203995e2fbf7c852adda3a
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.25.20.bz2]
-md5=9d870b9947ce0618cf18445e4be33e15
-sha256=c4d69706880f274b84c8f5ef36ce955b3173e6ea3c083f724c0371096b27e738
-
-[http://kernel.org/pub/linux/kernel/projects/rt/older/patch-2.6.25.4-rt6.bz2]
-md5=be6ff6fc5eb746e66a1a15629d05bedd
-sha256=513dd1ef58c6f3b2668731f078fb16df2e2152f5a7b66d153c2d41c4dca5b186
-
-[http://kernel.org/pub/linux/kernel/projects/rt/patch-2.6.25.4-rt6.bz2]
-md5=be6ff6fc5eb746e66a1a15629d05bedd
-sha256=513dd1ef58c6f3b2668731f078fb16df2e2152f5a7b66d153c2d41c4dca5b186
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.25.4.bz2]
-md5=f12f43dd78b765f3d1402aa9d2170cf5
-sha256=5bad39b0d28f294f10690d15bc1e54ba549324a7ce26db1406f3c3a50cd1d504
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.26-rc4.bz2]
-md5=b5f96d823b1183ba0c4e61516e1a23c0
-sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.26/patch-2.6.26-rc4.bz2]
-md5=b5f96d823b1183ba0c4e61516e1a23c0
-sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.26.5.bz2]
-md5=2bceb4747e65394d34066f3db778fd0f
-sha256=ea4a8fcab04cdb08e5bba9589c3ecc1370d4a68d32bb83bd54032c03cb450d6b
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.26.8.bz2]
-md5=e27c07bb82e02532e874758980141281
-sha256=611f7e118b5b09898493eab4c3071771742f2f3826b5733fa2f47284a38fbcf3
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.27-omap1.bz2]
-md5=4a3c56484b11438b0a911c432cae08bc
-sha256=2cfa3174db86acd9297d9ac641b299c7b8cb7ca6e0f2fb2243a4a5b523ea541c
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.27-rc1.bz2]
-md5=948b25bab0082d1db5bd8c9fac824891
-sha256=2b35a35a0ab3b82b77bb2996782ef70ec15a13b9331b15bac814b891ae8f4867
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.10.gz]
-md5=b87c962be07875486a6b57f81f35ca82
-sha256=7fc735b85225850dae3c3acfe4bf0fe59f4c884d7c37f89395867dc73bf8f8af
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.37.bz2]
-md5=e75d87c11065955871b2e005d0242c99
-sha256=0e5e633e81f1dcc0dcd2372494fbd2d6a72b28bb177a3285c4766a9659b454bd
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.41.bz2]
-md5=a431f1f68badcfa5a6cecc6b4d52d319
-sha256=ed3ec802ccb3585bf0a57724471fa24b98cce5caef8f35d6c26fed7c9213168d
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.42.bz2]
-md5=79782ebd9672c39dd7303d7442756556
-sha256=ad9e0c07e709e9e9a60abe0b15a61482645f3aa64b30fa72c27f1bd13d7aa84d
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.44.bz2]
-md5=da09ddd041a3fb35d236d37ec6de88e9
-sha256=a63144608d5fa72b23151022d9d716e9ebc5b428e6307535481a4f48adb2cfe8
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.45.bz2]
-md5=9ad766753f54ba0a4df7c42873e7aa16
-sha256=fb78c95e902194ac62facdbad1a89430c991271a35e4bd30ce9dad2f948d99c8
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.8.bz2]
-md5=ec23e3dce22b23ca681199fe515f10fb
-sha256=31c35db09289c6e0436a258745d7180e0cd8f567949f27b3dab5a57a3664ed2f
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.28-rc7.bz2]
-md5=4550a418f0480b39e839735a7e0e8d82
-sha256=fbb5ee21210a4e4e1fe25941c6e16ec0fe8634817e6c96145128f376ba0c640b
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.28.10.bz2]
-md5=64e6b226f1dc469755d82d0d8b677feb
-sha256=f4a2f97f59d272571a4977916392628642a8e4388f94417a723dc4bdb0e47dc2
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.28.4.gz]
-md5=464f663266e2c18371e213adab3c0077
-sha256=4862e7bf53553f645d9d730d3657bbec79f7c03482a984259b38e10e25b54382
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.29-rc5.bz2]
-md5=60193569887cb6fe98b9c0d483f911e7
-sha256=e5ad0ec9b0facaab5982a0d48534292e6d3a6a3e6dca60e798e8b8eeda2f8a8e
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.29-rc6.bz2]
-md5=26f67d99666834cc579094619821d3c8
-sha256=035bbd4c1ac9c5b3a42e58777446e0370ca66d9258dc30a9f4c5ad48ebfacd65
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.29.6.bz2]
-md5=0317760b52c9ac7a11de997da19a366e
-sha256=0294d475cbbc6cf43db25e64b92616309086cad6be4ee463f7f4b1d16d285c27
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2]
-md5=05daeda25430fd13bbdb47b3481f7320
-sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc3.bz2]
-md5=cd69d16ea42bbf20d0a505690be45868
-sha256=7d07783e7ba793c8e043a83a2aabcf23ef29174a1963643a407f3a02fcb4542b
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.30/patch-2.6.30-rc4.bz2]
-md5=1672a3064a2bfe049715a1103f03561c
-sha256=25a9aff47cc568e4bcaa4377cacbcae11ea454aeeea9519aa3a1b6dbffea713c
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc5.bz2]
-md5=2f399a5e286a9fe7cb40bfd3d42a7a3d
-sha256=79a9913a74e58af6431bb952aac2cf0a1f4422287f420844f24ca6bc5ed0fdc4
-
-[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.30/patch-2.6.30-rc5.bz2]
-md5=2f399a5e286a9fe7cb40bfd3d42a7a3d
-sha256=79a9913a74e58af6431bb952aac2cf0a1f4422287f420844f24ca6bc5ed0fdc4
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.30.10.bz2]
-md5=6485fe0cf0f0220493647505bfd2f7b0
-sha256=a1ffb806d7d0083aa8d0525cbccede4172f4a44c8df1ddfeece629b6d8304201
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.30.4.bz2]
-md5=d0fc44b54ba5953140b3f2aa9a1f2580
-sha256=b7716971e73c8fa96ecd9cdb598c8bd3a2a946e289cfef5dcfaa11a0022737ce
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.30.5.bz2]
-md5=47841c7ff5c81a7b349a79f2fa8e9138
-sha256=95550343a0f013301c20a0d27f681b97fbf61379b7bb14ecee4057141891b5f2
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.30.9.bz2]
-md5=ae8a07de27292d2957772e89f2dd921b
-sha256=0f32fb48b0c13991bc1a29f378e6435ff3d56408e8952e790ad25597e8870540
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.1.bz2]
-md5=43977a0a264dd7d173b6ef122c62fb20
-sha256=34586de4c7d1517842dfe32a8621f945cd6b8ee55096f8f053a66accd3d17a41
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.12.bz2]
-md5=ce365b2c72ad0855e1746a80b7abdade
-sha256=7dea28a76ca6362ad949ec1bf45fada4a6fc888b40360d90d2f56f01d18f72ae
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.3.bz2]
-md5=24d60ad6645211e2c08dc1c1c578b249
-sha256=ed167dcbdf52c2563a30e7c81a0f2b3d79eb04acc5728e6d484166a4fe8a39e4
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.4.bz2]
-md5=02078f4231baee4f0004212f2875df2b
-sha256=bc670682ed9b81d5d3859130c600601bd72053fd738b51b2daf8ddf3f4614a66
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.5.bz2]
-md5=6cac5e59d5562b591cdda485941204d5
-sha256=41e7d98a205d58a62901daf4e46ecf5fb0b177e5a233a3c0ad3250a3a0abe8aa
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.7.bz2]
-md5=801b9c379a12339c0210dc5d1a8e9537
-sha256=f9edbb3c15c4094d840d5954131bb91c4513d333b30bced7b5c906d36c843d5e
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.8.bz2]
-md5=0fda994c76a981a67464f43c766f2180
-sha256=c120bf7018749fca765773975b3d4444fa244781ceb844e4b9bab9b478cad213
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.9.bz2]
-md5=819f1552906be755b53154fd570866eb
-sha256=958c0dff262e4e434d4d51995ad2ae928c5c0bcdb6ea3f458e8323de5bff4da0
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.1.bz2]
-md5=abc24a9beb8431a75301dd3884b37a3c
-sha256=26f6fad3259ad6d2356cfa04462ace5fd3b5cecec410bbcefe7d5f6dbeb00baa
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.2.bz2]
-md5=924b7aa0fcd6e54c12ecc9b3c3082f59
-sha256=d207f4217c4b3fef9c5a19620b6ca90dbd9b9583ed9c686b5636eec973a7cc60
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.5.bz2]
-md5=49e6bc73c7a7f690fe7ddf09fe2b5d06
-sha256=b4d0d667db5094fd430ed58955f4f9ed71d278d5ce70e63d287c53f8db028ac3
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.8.bz2]
-md5=eabf01da4c72f7ea5b4e4bf8e8535e5f
-sha256=50c08a7ffcad1e7cd2e7c2c906795896dd36ce71249d816914c306dcc5875fd2
-
-[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.9.bz2]
-md5=7f615dd3b4a3b19fb86e479996a2deb5
-sha256=8aeb15c31fb09c769f004c8dc51e29aa26be8e84d70db418af70ecefc463459a
-
-[http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
-md5=d6249654087f0bcafaa860ac573316a4
-sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
-
-[http://www.bplan-gmbh.org/data/toshiba/topas/linux/2.6.26.5/patch_2.6.26.5_topas910.bz2]
-md5=092957fc9e029010106c4fa59ef2c098
-sha256=eefecb157633d2be256c0f6a2d46ab764027bbb906cf5c250be67b95e80767bb
-
-[http://www.holgerschurig.de/files/linux/patcher-20040913.tar.bz2]
-md5=08649756a41358b24e1857201a90f8bf
-sha256=bad7cc70c773ecc05edf7d511f37f50a3e753fa8cddea0a81f2fc8f582a10489
-
-[http://www.openezx.org/download/patches-2.6.16-2.6.16.13-ezx9.tar.bz2]
-md5=d63f298e12cf7580a257c901e026b2da
-sha256=e4fc7ea4e9719a038dbe2b5c738cab3d432af47994fb7a45e2dc8233f019ca29
-
-[http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.2.25.tar.bz2]
-md5=4a86341ad45eff6bc961c45f3af2348d
-sha256=cb3a710e9dfe7776aab45362e0cb28fe5440ab6e9e6983fa02eb174c010108d6
-
-[http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.2.26.tar.bz2]
-md5=798d68d9d7ec3499d63b075ca4d4a6a9
-sha256=7630c3f1b0f7f8e3f3c9b814a553e910adaa2a13778ee095e86af27f6cb646dc
-
-[http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.2.27.tar.bz2]
-md5=421c627f149ff261d07ac9e8afd4226e
-sha256=7b7abe4b63c506e3c487d2bf148d95037c7017a1e925133b070b668bfc778712
-
-[http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.2.28.tar.bz2]
-md5=cb063425ae2d7065737857b4b58ae18a
-sha256=46e20652ae4b9ceab5879ab939ec3eb2e57de742ea734272749ca53c93a20339
-
-[http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.2.30.tar.bz2]
-md5=6a33888e34c23f7fde09a6e94e4f5950
-sha256=6e3549b8586d8ac3ae8b2251b6cff9065f12a5d648c9c464543988ddb670545b
-
-[http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.2.31.tar.bz2]
-md5=3aa902cb7a57a4aa09427de603ebf17b
-sha256=3d087c88f6e2cc8fde8d2ab12ff2f85ca3ecb2c67754d0483d158f2e5802b015
-
-[http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-0.9.8.tar.gz]
-md5=ec37148c658fa5110bc991ab17ea82f0
-sha256=e0ac5d5a0e936d564785270c6dab756d156c7d24d06a9ab71e1c87362b221447
-
-[http://dev.gentoo.org/~solar/pax/pax-utils-0.1.13.tar.bz2]
-md5=5f09df47a16e83462384b44b75310539
-sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36
-
-[http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/pax-utils-0.1.13.tar.bz2]
-md5=5f09df47a16e83462384b44b75310539
-sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36
-
-[http://gentoo.osuosl.org/distfiles/pax-utils-0.1.13.tar.bz2]
-md5=5f09df47a16e83462384b44b75310539
-sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36
-
-[http://gentoo.osuosl.org/distfiles/pax-utils-0.1.19.tar.bz2]
-md5=98f6b9fe17a740a8cc577255422c6103
-sha256=3918628e9f2508708a1a28f5ed4cb39d07cbd5711747bbb3ddf63816d056c11e
-
-[http://the.earth.li/pub/e3/pbltool-0.2.c]
-md5=c8fd507f831d2b017dfecf60bc55e28a
-sha256=2a1e31d4ae859e530895882273fad0170374a2d5b838bb4558303e59236e9cb6
-
-[http://www.vanille.de/mirror/pbserver-1.2.5.tar.gz]
-md5=7afe4cb20d36b7d00002a522cbe724a8
-sha256=c64986ede63deda10a4b0aa5fd3fda1ae7fcd28d91ecc149fceec4ccffd9c620
-
-[http://geda.seul.org/dist/pcb-20081128.tar.gz]
-md5=e192ee993b04749f82dd3e8b529d40c0
-sha256=2e55067741a5f48ca6962c135fcbe6d1c1b70b95c825156c7db046277929cf28
-
-[http://kernel.org//pub/software/utils/pciutils/pciutils-2.1.11.tar.bz2]
-md5=2b3b2147b7bc91f362be55cb49fa1c4e
-sha256=8817295a7db11f31837c7c23f49e768131700b2b729d9fc724520d94a8b00f4b
-
-[http://kernel.org/pub/software/utils/pciutils/pciutils-2.1.11.tar.bz2]
-md5=2b3b2147b7bc91f362be55cb49fa1c4e
-sha256=8817295a7db11f31837c7c23f49e768131700b2b729d9fc724520d94a8b00f4b
-
-[ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-2.2.4.tar.bz2]
-md5=10bab01d3c8856426cdf79f124fd4173
-sha256=61fd2a9225aad67d4e21727a297e571ddd6a973b845646cf10b24a92b88467bc
-
-[ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-3.1.2.tar.bz2]
-md5=46387fd7a18c33fbb5311fdb3ab9ea12
-sha256=f66e40b8df5a7b6a93c463b0fb734ea6451c5f0c2cc772f58640b6c7f0d69397
-
-[http://downloads.sourceforge.net/pcmanfm/pcmanfm-0.3.0.1.tar.gz]
-md5=ac676498175495a37bef0b41bca9ace9
-sha256=1f7dec1a275774cb6eff9a491b74bbea7a2276140d640c15ed260c798c8334ed
-
-[http://heanet.dl.sourceforge.net/pcmanfm/pcmanfm-0.3.0.1.tar.gz]
-md5=ac676498175495a37bef0b41bca9ace9
-sha256=1f7dec1a275774cb6eff9a491b74bbea7a2276140d640c15ed260c798c8334ed
-
-[http://downloads.sourceforge.net/pcmanfm/pcmanfm-0.3.2-beta.tar.gz]
-md5=a0843bc54c60aac63cb04b55a6766402
-sha256=f840326e6d6569444adf1d1c5d0fb8e93e7d16f0ef71dca4b1eeefddab8282c5
-
-[http://heanet.dl.sourceforge.net/pcmanfm/pcmanfm-0.3.2-beta.tar.gz]
-md5=a0843bc54c60aac63cb04b55a6766402
-sha256=f840326e6d6569444adf1d1c5d0fb8e93e7d16f0ef71dca4b1eeefddab8282c5
-
-[http://downloads.sourceforge.net/pcmanfm/pcmanfm-0.3.2.2.tar.gz]
-md5=e735c8effc941912b5253a31d4136417
-sha256=601c607115befa22567c7dae3399416787a549daaefcb03820851dcd8d8b4d50
-
-[http://downloads.sourceforge.net/pcmanfm/pcmanfm-0.5.tar.gz]
-md5=fe1a836eed6a42107e7d71a01a52f7ec
-sha256=87ebb12f012dc948e3c049936a14d757ac304087f662c17fb94e6c27864fe622
-
-[http://qa.debian.org/watch/sf.php/pcmanfm/pcmanfm-0.5.tar.gz]
-md5=fe1a836eed6a42107e7d71a01a52f7ec
-sha256=87ebb12f012dc948e3c049936a14d757ac304087f662c17fb94e6c27864fe622
-
-[http://downloads.sourceforge.net/pcmcia-cs/pcmcia-cs-3.2.8.tar.gz]
-md5=0d6d65be8896eff081aee996049afaa5
-sha256=ef93921e8555862df4c24b1c357430ff3d5ba1d3b6b7e324862ea37b511270c0
-
-[http://heanet.dl.sourceforge.net/pcmcia-cs/pcmcia-cs-3.2.8.tar.gz]
-md5=0d6d65be8896eff081aee996049afaa5
-sha256=ef93921e8555862df4c24b1c357430ff3d5ba1d3b6b7e324862ea37b511270c0
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/pcmcia_suspend.patch]
-md5=52423f0766882809c5ace9ed4ccb2131
-sha256=c701207f506e3975510a9abc07eaab59f3e7e1fb13b8045ff1fff33964f4be89
-
-[http://kernel.org//pub/linux/utils/kernel/pcmcia/pcmciautils-010.tar.bz2]
-md5=ff3cb012fd1a8801e912054b45420ac2
-sha256=9ed7fe56197b4e1328a94842b602aef0a3a2e3380dacc95b4366661582e05661
-
-[http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-010.tar.bz2]
-md5=ff3cb012fd1a8801e912054b45420ac2
-sha256=9ed7fe56197b4e1328a94842b602aef0a3a2e3380dacc95b4366661582e05661
-
-[http://kernel.org//pub/linux/utils/kernel/pcmcia/pcmciautils-013.tar.bz2]
-md5=5882b7c84f095a7492b1ebe7577dce5a
-sha256=7c1adf1a5ebeba124cef4102cbbf9ca65b8493ad6b8fcfb48091e27e983ffc41
-
-[http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-013.tar.bz2]
-md5=5882b7c84f095a7492b1ebe7577dce5a
-sha256=7c1adf1a5ebeba124cef4102cbbf9ca65b8493ad6b8fcfb48091e27e983ffc41
-
-[http://kernel.org//pub/linux/utils/kernel/pcmcia/pcmciautils-014.tar.bz2]
-md5=3f07c926875f6c5dcb83240f39725177
-sha256=6bef7c05ba9fad231fe7a188043c61c116c24bab5fa79d9d72c1d8e11ff38925
-
-[http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-014.tar.bz2]
-md5=3f07c926875f6c5dcb83240f39725177
-sha256=6bef7c05ba9fad231fe7a188043c61c116c24bab5fa79d9d72c1d8e11ff38925
-
-[http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-015.tar.bz2]
-md5=9e12435c8b6cf7bf59894e90e480b4aa
-sha256=4847485c412b47e3d88fa83ef811229e0e7941217303bc8449c30a3dc2128b6e
-
-[ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-4.4.tar.bz2]
-md5=89fc389191d9611b314c3fc23235377b
-sha256=1849733ce494a51334bd1cbf4cc96c63b037256ddab8cb2dc3672db916bb3094
-
-[http://downloads.sourceforge.net/pcre/pcre-4.4.tar.bz2]
-md5=89fc389191d9611b314c3fc23235377b
-sha256=1849733ce494a51334bd1cbf4cc96c63b037256ddab8cb2dc3672db916bb3094
-
-[http://downloads.sourceforge.net/pcre/pcre-7.6.tar.bz2]
-md5=2af38e083fb90ef60fa9eda7cc290e86
-sha256=362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735
-
-[http://heanet.dl.sourceforge.net/pcre/pcre-7.6.tar.bz2]
-md5=2af38e083fb90ef60fa9eda7cc290e86
-sha256=362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735
-
-[http://alioth.debian.org/download.php/2479/pcsc-lite-1.4.102.tar.bz2]
-md5=b97d3a725ab93662adf09acfbc49efeb
-sha256=56fc9e6324539537324b071e5b51c3388df9bfa92fb7e210b989b463122fc333
-
-[https://alioth.debian.org/frs/download.php/2795/pcsc-lite-1.5.2.tar.bz2]
-md5=d7d466621bec39354351f09349f6374c
-sha256=a0c11b0b5cc46d4c4ec499b875cfdc4e766fdf12fe2f6ea635e1b11ab7b8821e
-
-[http://handhelds.org/~zecke/oe_packages/pdamaze_V1.0.0.tar.gz]
-md5=bf27dd51fe03c8b475080b74de043a13
-sha256=99d6bc6b360baabd6044e8883d467cc6ed7955f9ab66d8f87f61e3cc757fb97a
-
-[ftp://ftp.funet.fi/pub/CPAN/src/perl-5.8.4.tar.gz]
-md5=912050a9cb6b0f415b76ba56052fb4cf
-sha256=89dcc463f88e0b785ee2cf2662d97c6b7d045393283664876370970a09b8cbef
-
-[http://ftp.funet.fi/pub/CPAN/src/perl-5.8.4.tar.gz]
-md5=912050a9cb6b0f415b76ba56052fb4cf
-sha256=89dcc463f88e0b785ee2cf2662d97c6b7d045393283664876370970a09b8cbef
-
-[ftp://ftp.funet.fi/pub/CPAN/src/perl-5.8.7.tar.gz]
-md5=dacefa1fe3c5b6d7bbc334ad94826131
-sha256=916d7e1393ed09ca4c61b3c1ecb5f5564266c955db81ff587d2da8af7a7abaab
-
-[http://ftp.funet.fi/pub/CPAN/src/perl-5.8.7.tar.gz]
-md5=dacefa1fe3c5b6d7bbc334ad94826131
-sha256=916d7e1393ed09ca4c61b3c1ecb5f5564266c955db81ff587d2da8af7a7abaab
-
-[ftp://ftp.funet.fi/pub/CPAN/src/perl-5.8.8.tar.gz]
-md5=b8c118d4360846829beb30b02a6b91a7
-sha256=e15d499321e003d12ed183601e37ee7ba5f64b278d1de30149ce01bd4a3f234d
-
-[http://ftp.funet.fi/pub/CPAN/src/5.0/perl-5.8.8.tar.gz]
-md5=b8c118d4360846829beb30b02a6b91a7
-sha256=e15d499321e003d12ed183601e37ee7ba5f64b278d1de30149ce01bd4a3f234d
-
-[http://ftp.funet.fi/pub/CPAN/src/perl-5.8.8.tar.gz]
-md5=b8c118d4360846829beb30b02a6b91a7
-sha256=e15d499321e003d12ed183601e37ee7ba5f64b278d1de30149ce01bd4a3f234d
-
-[http://downloads.sourceforge.net/pexpect/pexpect-2.1.tar.gz]
-md5=fd3d67ac085332f074cd665424dcd631
-sha256=d986dcbd954435e0ba78aaef391106c71a9b548a1cbd29cfb4eec3cb8c841313
-
-[http://heanet.dl.sourceforge.net/pexpect/pexpect-2.1.tar.gz]
-md5=fd3d67ac085332f074cd665424dcd631
-sha256=d986dcbd954435e0ba78aaef391106c71a9b548a1cbd29cfb4eec3cb8c841313
-
-[http://downloads.sourceforge.net/pexpect/pexpect-2.3.tar.gz]
-md5=bf107cf54e67bc6dec5bea1f3e6a65c3
-sha256=d315e7f3a8544fd85034d7e17fd7c5854e8f0828f5791f83cf313f8fa5740b75
-
-[ftp://ftp.math.muni.cz/pub/math/people/Dobes/phalanx-22.tar.gz]
-md5=8120f6383bb6d19e0c06ea47f69c2bda
-sha256=6eb45f17b50d864157dac2028ee5d45f4f54548825f5a732e1a430d5aa2dd889
-
-[http://ftp.debian.org/debian/pool/main/p/phalanx/phalanx_22.orig.tar.gz]
-md5=e4e6155530a23ea0ea4ca59f8c5fda8c
-sha256=e86a0a81ce1b989a4d06e0c07d64e1fcbba2456fa8e22ae24f333f186f3fc663
-
-[http://gpephone.linuxtogo.org/download/gpephone/phoneserver-1.0/phoneserver-1.0.tar.bz2]
-md5=6f6450c4e762059e790216b15b5930e6
-sha256=a1f05eba12369fb8bafb53559ae5ab2855ab1e83746049a100ce5a6d69bec2a6
-
-[http://de3.php.net/distributions/php-4.4.4.tar.bz2]
-md5=bc6fa8908e2ac36e93bab9f7d42cda3a
-sha256=9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b
-
-[http://museum.php.net/php4/php-4.4.4.tar.bz2]
-md5=bc6fa8908e2ac36e93bab9f7d42cda3a
-sha256=9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b
-
-[http://us2.php.net/distributions/php-5.1.4.tar.bz2]
-md5=66a806161d4a2d3b5153ebe4cd0f2e1c
-sha256=b55253e9557eceb901d83217ec192da22c28c7b2fdf714d3f151f1db663b5a32
-
-[http://de3.php.net/distributions/php-5.1.6.tar.bz2]
-md5=08e423aa314369d4392a36b3f7246afc
-sha256=3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996
-
-[http://us2.php.net/distributions/php-5.2.0.tar.bz2]
-md5=e6029fafcee029edcfa2ceed7a005333
-sha256=e105b6aad55589aecf20ae70ab7aa81eb202296fc52531f62e546af23077cca1
-
-[http://us2.php.net/distributions/php-5.2.5.tar.bz2]
-md5=1fe14ca892460b09f06729941a1bb605
-sha256=5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3
-
-[http://us2.php.net/distributions/php-5.2.6.tar.bz2]
-md5=7380ffecebd95c6edb317ef861229ebd
-sha256=1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81
-
-[http://us2.php.net/distributions/php-5.3.0.tar.bz2]
-md5=846760cd655c98dfd86d6d97c3d964b0
-sha256=83c9d86f830f8b188c70d3554d07b7416af90fd9e06d84340ffda58c09e58357
-
-[http://efault.net/npat/hacks/picocom/dist/picocom-1.3.tar.gz]
-md5=21865bf2891222082afc44afdd80aeaa
-sha256=ed3e0190a1940cf08a167429aa3fd25b3ae7313fdf126f851a9abccc89845ee6
-
-[http://efault.net/npat/hacks/picocom/dist/picocom-1.4.tar.gz]
-md5=08fcc5f6bb9e7676a2569386d5ea9f70
-sha256=437c5fac2376e416b4427501d1b074da5aa6b8fea756a0d61aec22686f025721
-
-[http://downloads.sourceforge.net/pidgin/pidgin-2.2.1.tar.bz2]
-md5=f1703430d4b8ffc96b493fc36cd46131
-sha256=6efbefe325f6eab711a5fbdc4b758b4585a4cda68c98dd2e11ccfc8d98075823
-
-[http://downloads.sourceforge.net/pidgin/pidgin-2.4.2.tar.bz2]
-md5=2d10f9b6a5f0162cf88016ea2ca0a36d
-sha256=3f09878883c6980083e7774371ec57d8bdc320a325342965afb120d52780d15f
-
-[http://downloads.sourceforge.net/pidgin/pidgin-2.5.1.tar.bz2]
-md5=f76c269c02fafee9b45cc2a50b43b1f3
-sha256=13e87a88b43804be72f8566402afa4c1c3756396aed4ef6b6b9d86d384e75b77
-
-[http://heanet.dl.sourceforge.net/pidgin/pidgin-2.5.1.tar.bz2]
-md5=f76c269c02fafee9b45cc2a50b43b1f3
-sha256=13e87a88b43804be72f8566402afa4c1c3756396aed4ef6b6b9d86d384e75b77
-
-[http://downloads.sourceforge.net/pidgin/pidgin-2.5.3.tar.bz2]
-md5=4abc4ce9e1ad62bbf098f05f305147d7
-sha256=912c934425fc40535fc79eb9082f6f823808d8ea8ecdd370d0b8ceec4b97ad82
-
-[http://downloads.sourceforge.net/pidgin/pidgin-2.5.8.tar.bz2]
-md5=c207407dca71c6357c82135875e472f0
-sha256=2f79da1f127dd05f9404494ebc794f8cda919764fd2424f79df31f3b0f9dfd21
-
-[http://downloads.sourceforge.net/pidgin/pidgin-2.6.2.tar.bz2]
-md5=a1bbb3c9be7d4ee1f53590d319cbfa72
-sha256=acbadfd4d725e628ab8906f87438b26ebf86e67d219bbdcf07a9ccd18bdaafd6
-
-[http://downloads.sourceforge.net/pidgin/pidgin-2.6.4.tar.bz2]
-md5=6e1dc8b9dd6983a54ff3a6de33efa778
-sha256=fa907ace507708e4a4bae32cc81a6271fb6da8bc0458fd8fc97cc4429ec8be11
-
-[http://downloads.sourceforge.net/pidgin/pidgin-2.6.5.tar.bz2]
-md5=90847ed22ec830db5d9768748812b661
-sha256=3c459e4093fca679591e35ea34da4a0e45b15f2bb7ca00314a1486dc022f3d0e
-
-[ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z]
-md5=75af127948cc0c701d424d22d621f792
-sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4
-
-[http://pingus.seul.org/files/pingus-0.7.2.tar.bz2]
-md5=88756802d483f922d0910a14cd26a951
-sha256=8d24fbab29ca9401ae1a6a34f7a52eda5de0a9320940e771c6f04f991f5d0052
-
-[http://handhelds.org/~zecke/oe_packages/pipeman_V1.0.0.tar.gz]
-md5=8d8a69d0fea184dda5f4a15168039fbb
-sha256=a2d8473577c2b3b51ebf29e2c6cb31463158676a5d5b44438ff0db18e8aab949
-
-[http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-0.1.1-source.tar.gz]
-md5=1d5e267c57b126038689ce3bf26eea24
-sha256=468f25a70ef2dac90088caa6599c41ade6768e0cdc328dc3e82ab578903e69d4
-
-[http://xorg.freedesktop.org/releases/individual/lib/pixman-0.10.0.tar.bz2]
-md5=fb23e17a8a0308e8fad6dc153753ba9a
-sha256=2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4
-
-[http://cairographics.org/releases/pixman-0.10.0.tar.gz]
-md5=41804ac38025102dcc9891dfd4a3d105
-sha256=48625f6b5ce130672942503c683d306d957ee40f59f8e59be6ca30a245ad47d0
-
-[http://cairographics.org/releases/pixman-0.11.4.tar.gz]
-md5=8c8afc259af61d42aa9b3d8ec5a9a03b
-sha256=d034f4afb4329c38e8789a5a7a384194c7402094b4c2b7600d2d86d8589e8571
-
-[http://cairographics.org/releases/pixman-0.11.8.tar.gz]
-md5=7b5db768c51337b5e5e954fc9c961cd3
-sha256=720db5ef6ed0e744b9bac5360ade9a7c024f9fb3fab05c83a90ee28b08e66e01
-
-[http://cairographics.org/releases/pixman-0.12.0.tar.gz]
-md5=09357cc74975b01714e00c5899ea1881
-sha256=2b16516ef147bb604e1cf50c883143a052a7ff92d2930b70e571da0603b7d9ce
-
-[http://cairographics.org/releases/pixman-0.13.2.tar.gz]
-md5=837df4a02c61a60a880644393b57faed
-sha256=45d491879791140dc1f20287e6489f32dc59ae37628038d991d9511abede3fc2
-
-[http://cairographics.org/releases/pixman-0.15.18.tar.gz]
-md5=9b60fe7623621b546b76777b8b7d2490
-sha256=3a5003cf6c7d5b03ed5977c108ee11410cfd7849eea370eb4feae98f2822c795
-
-[http://cairographics.org/releases/pixman-0.15.6.tar.gz]
-md5=fe922698df46b21d7e19f28ded4ca100
-sha256=3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22
-
-[http://cairographics.org/releases/pixman-0.16.2.tar.gz]
-md5=02bd3669f53c404c19980d5efb6f86fb
-sha256=05f78c2fd3a5f054c0d716e8ba1b67a0c04a7a7e642d6946828ec383b389d185
-
-[http://cairographics.org/releases/pixman-0.17.4.tar.gz]
-md5=734f70667d0a6454a1b1e332f8d50083
-sha256=dd2f4a7c9c9373d20720d78718c0e9603741a83d66da3316a020b097b1c918a9
-
-[http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.4.tar.bz2]
-md5=c354ab5b0da10227226d3ef604254875
-sha256=261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa
-
-[http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.5.tar.bz2]
-md5=f9fea77e46ec7a3a16e925e137f146e7
-sha256=a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8
-
-[http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.6.tar.bz2]
-md5=7681334f55d41a705339228145d02c11
-sha256=c504db9338d67c388824ebbf805a424d2cc0fab681e33bff6733603539d6335b
-
-[http://cairographics.org/releases/pixman-0.9.6.tar.gz]
-md5=d2b1071cdbb0b8da18039111ba2dfd22
-sha256=179abc613f5100081cdef833f24a35fe7b646b8a4f0c79647d9609f6bf8222d8
-
-[http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz]
-md5=fd5c547e9d66ba49bc735ccb8c791f2a
-sha256=7e0761b47d604847006e7c6caa9b9cf044530a516ff84395450edcfa3c2febe6
-
-[http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz]
-md5=d922a88782b64441d06547632fd85744
-sha256=08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53
-
-[http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz]
-md5=a7e4f60a6657dbc434334deb594cc242
-sha256=a0aff7f241d74db8fcf42fed4d2c5d7737193a3781faf9a78473ceeab92d152a
-
-[http://www.gpsbabel.org/plan9.php?dl=gpsbabel-1.3.5.tar.gz]
-md5=1bea8cd22c24ee9c0cc769770c86a340
-sha256=fd49f87432b707c487805a4291689eaf4a379dceb71c023560ef8ac34f18e76c
-
-[http://www.gpsbabel.org/plan9.php?dl=gpsbabel-1.3.6.tar.gz]
-md5=1571b31f8f06f722995449dbff01ca49
-sha256=08bd5d04fc93fe18ccc580f223cc551bde1d581723fd9f92f91b48ddd8a5a9b6
-
-[http://www.rpsys.net/openzaurus/patches/archive/pm_changes-r1.patch]
-md5=e10058b52841d138630b69b954bea0b9
-sha256=779561c658ccb190f3a2cd7626e4a229834c5f9b093be8f7a06bbfaf12121b9c
-
-[http://www.ba.cnr.it/~paolo/pmacct/pmacct-0.7.9.tar.gz]
-md5=4964e093254d04873d34f282a7110413
-sha256=63ed71d9b9c0f0e1283a5345f27e7e95f71a2cda8bab4150e2a4937cd8834b5d
-
-[http://xaxxon.slackworks.com/pme/pme-1.0.3.tar.gz]
-md5=da0da7ed1689469b45c8d62fa2dfb204
-sha256=25b84792473fa17d118e69b588f32fe940d13a01c3b3db89290ce6516ad01b2e
-
-[http://alioth.debian.org/frs/download.php/2247/pmount-0.9.17.tar.gz]
-md5=24a676bf495bec367b2d971cdca1c54c
-sha256=2632d931b5732eb1d0de7a2e2d92c75d64412438958ee96dceb4443e4fc2a62f
-
-[http://alioth.debian.org/frs/download.php/2624/pmount-0.9.18.tar.gz]
-md5=d04973bde34edac7dd2e50bfe8f10700
-sha256=b216936e6e011b58fefee8e3f80d01008cb078b7fe2a5632b2ce98bc7bcb05c2
-
-[https://alioth.debian.org/frs/download.php/2867/pmount-0.9.19.tar.gz]
-md5=2fd9fe103375dbd0c91af2f302250a8c
-sha256=e2174f1249ea79121648bb0e9353729767654e6d430fb2d28da342ec25a179be
-
-[http://downloads.sourceforge.net/gakusei/pobox-1.2.5.tar.bz2]
-md5=d1c988c2ac06d3111f80d59d30bb8bbb
-sha256=73bbc333d2a51d0e1cd73030012f2727ac26f5b1d41333994b01a47486fc16db
-
-[http://heanet.dl.sourceforge.net/gakusei/pobox-1.2.5.tar.bz2]
-md5=d1c988c2ac06d3111f80d59d30bb8bbb
-sha256=73bbc333d2a51d0e1cd73030012f2727ac26f5b1d41333994b01a47486fc16db
-
-[http://www.staikos.net/~staikos/pocketcellar/pocketcellar-1.1.tar.gz]
-md5=ef65260b37a0c11898c680a576846c94
-sha256=5ae5e9816bc8503b768f831f058bd1c379bb821e8c0776015ffeb998e1d912f8
-
-[http://downloads.sourceforge.net/cmusphinx/pocketsphinx-0.2.1.tar.bz2]
-md5=65408ad948c0b9e21dd5813e68ef76ad
-sha256=74c83c3283178656a6fc1ee571fb1ebbddda8f3b7c32ad405477ae278b0cf867
-
-[http://heanet.dl.sourceforge.net/cmusphinx/pocketsphinx-0.2.1.tar.bz2]
-md5=65408ad948c0b9e21dd5813e68ef76ad
-sha256=74c83c3283178656a6fc1ee571fb1ebbddda8f3b7c32ad405477ae278b0cf867
-
-[http://downloads.sourceforge.net/cmusphinx/pocketsphinx-0.4.1.tar.bz2]
-md5=8c1bc9d5bdd6f6298222125669d16e1e
-sha256=5a31aa10668b93e8283c58592b46368c26aa92e097cea0bda9b0554042bd6643
-
-[http://heanet.dl.sourceforge.net/cmusphinx/pocketsphinx-0.4.1.tar.bz2]
-md5=8c1bc9d5bdd6f6298222125669d16e1e
-sha256=5a31aa10668b93e8283c58592b46368c26aa92e097cea0bda9b0554042bd6643
-
-[http://downloads.sourceforge.net/podget/podget_0.5.8.tar.gz]
-md5=6619557b02559ac3191d4cc2054bf325
-sha256=ab6e33b09bfbd407ee444ef37d769658e651cfe6eee96ce7aac5be8860e069e5
-
-[http://heanet.dl.sourceforge.net/podget/podget_0.5.8.tar.gz]
-md5=6619557b02559ac3191d4cc2054bf325
-sha256=ab6e33b09bfbd407ee444ef37d769658e651cfe6eee96ce7aac5be8860e069e5
-
-[http://www.timwise.co.uk/src/podpooch-0.2.0.7.tar.gz]
-md5=e2e0045bf13e017bbaa5f5855475e516
-sha256=d978d3cb4ec99187309b906a636312827c8fef091df28ba9d7e07a5014017c0a
-
-[http://www.apache.org/dist/jakarta/poi/release/src/poi-src-3.0-FINAL-20070503.tar.gz]
-md5=1fb488c4061256197a667f1c480ffc33
-sha256=48a5aabb873d4cc654c95acf6576868d7a8a3ee97e1c6418e1d716698b6efa76
-
-[http://hal.freedesktop.org/releases/polkit-0.96.tar.gz]
-md5=e0a06da501b04ed3bab986a9df5b5aa2
-sha256=3426ca917210b2a5525732559368c18f983a4c39a6a55c5dddba26071bd8054a
-
-[http://hal.freedesktop.org/releases/polkit-gnome-0.96.tar.bz2]
-md5=611cf39fba2945320fc7a9ec49087e69
-sha256=0d96c8032d658a2e1eef8adfbeafff0f569ef0cf68b35915423acc00873c8a92
-
-[http://www.rpsys.net/openzaurus/patches/archive/poodle_asoc_fix-r1.patch]
-md5=7c766563674dec668baa5f650a14b7cd
-sha256=3f78e714248cdaa0b83f530a3b7f80da02446b179e86fbb043d57c3e05ae0d7e
-
-[http://www.rpsys.net/openzaurus/patches/archive/poodle_audio-r7.patch]
-md5=0d8f29339995c6740364cf4abc522f14
-sha256=5ea0cd55babf415a0d76a140bd2bf5fbe0b0109622e626afbe5899eb792e5e64
-
-[http://www.rpsys.net/openzaurus/patches/archive/poodle_lcd_hack-r0.patch]
-md5=05766128b2b0abdd01048e5e08430600
-sha256=5fcd54adf3c8e7e99078a585683926224b5b49a99e4e675694621c3e08e6aad0
-
-[http://www.rpsys.net/openzaurus/patches/archive/poodle_mmcsd_fix-r0.patch]
-md5=c459aa9fc1dbe7bc6a12c059c92704bb
-sha256=e47eca9232874c4d45efce3f16fff91f60245577ea38f33a1a6704e068b01564
-
-[http://www.rpsys.net/openzaurus/patches/archive/poodle_partsize-r0.patch]
-md5=dce8fc956242c276895c7c84429ec11d
-sha256=1b99810ed9959cfea2bf2cd6ed1f7ba9dc23d46af0db7cac69b525c13c2956bf
-
-[http://www.rpsys.net/openzaurus/patches/archive/poodle_pm-r3.patch]
-md5=6d09ec34f8c8f235ab81b94bb3f4ab57
-sha256=38c9749ccc98e25d3f3273a01da998c3da909b05601f3e5cfcd13b2fa1c08af2
-
-[http://www.rpsys.net/openzaurus/patches/archive/poodle_pm-r4.patch]
-md5=cf3e0ca3f9e8e0cab03700fde9143617
-sha256=a5781c8a4c0c71224b23f1c4155609baeee0eca8ce7cd34c1c969a65d6c6bab2
-
-[http://www.rpsys.net/openzaurus/patches/archive/poodle_pm-r5.patch]
-md5=3ed63ce3884d6cdd71b6d471e3c49407
-sha256=e87d44d5a77c591db83598295109c033708a458797247a31cfa20d54c52d7b41
-
-[http://www.rpsys.net/openzaurus/patches/archive/poodle_pm-r6.patch]
-md5=e897eb0dc64c2862091f97e20f580de6
-sha256=66283a36122d77a4118a1b2e48af92c03ae09b3e53fe7875e7fe3db1486a522c
-
-[http://www.rpsys.net/openzaurus/patches/archive/poodle_serial_vcc-r0.patch]
-md5=6db3d4256756ae8d209a2d7623c6d71b
-sha256=796f210200129e478bcb0f9c40c09998f2c47b346d4c734d94756e84989fd8b3
-
-[http://www.rpsys.net/openzaurus/patches/archive/poodle_ssp-r1.patch]
-md5=8efe67bc46564512bd1de09fce5971ab
-sha256=3238cc3553f721c110822bdc7fbfe7c57f33f59a05e406a19e956e71a1712aa8
-
-[http://poppler.freedesktop.org/poppler-0.11.3.tar.gz]
-md5=28f9dbdc74e9aadbf27aff16d06f4990
-sha256=2ec40a8d9d9b80ebebea594c407c31962845376287c19e37345371236ed180d5
-
-[http://poppler.freedesktop.org/poppler-0.12.1.tar.gz]
-md5=3432046ee111efa5b85e5f2cdde8af5c
-sha256=6316a3618efd411e34a48a102a1949b1fdcc562f6e69c4d28f0669913451bbb6
-
-[http://poppler.freedesktop.org/poppler-0.12.3.tar.gz]
-md5=d0ca8344d8d94e27aaba6d432688365d
-sha256=7a4ffe6d2950c446c285700d3b2dc399540a27ce635dd712aff646f02f8dfbcc
-
-[http://poppler.freedesktop.org/poppler-0.5.4.tar.gz]
-md5=053fdfd70533ecce1a06353fa945f061
-sha256=ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
-
-[http://poppler.freedesktop.org/poppler-0.5.9.tar.gz]
-md5=8d1ac008614c0e413bcac95b8102fa07
-sha256=bee251e5149ac9dd8824aac316456b78a82f4e1954eb3c1a94db3625340ef61e
-
-[http://poppler.freedesktop.org/poppler-0.6.4.tar.gz]
-md5=13d12ca4e349574cfbbcf4a9b2b3ae52
-sha256=54269075e4d611a61792a374986e920744c8ca39c2df45911233873c7e714354
-
-[http://poppler.freedesktop.org/poppler-0.6.tar.gz]
-md5=96883867572aa1e55e979ec75369c562
-sha256=ef4bb8fd1bb4dffd5dc689509bf3e33260774550425ee78995a8d0297f76bfae
-
-[http://poppler.freedesktop.org/poppler-0.8.4.tar.gz]
-md5=29d341f295d01bff64c63a29a6abb274
-sha256=45bd5740b07e6c15db9859a5ee82e2acc9eeec62be537735ae5872fc3648257a
-
-[http://poppler.freedesktop.org/poppler-data-0.1.tar.gz]
-md5=5c700eb06dda9dafec09cd85225e34d4
-sha256=6bd37c49ab4b22c67ab457c531f841968a3acdebbf9361acea7d7275c903dbc5
-
-[http://poppler.freedesktop.org/poppler-data-0.4.0.tar.gz]
-md5=6975bf8e9ea2cfb42b9ecdbcc257cf57
-sha256=5caf7e10b7b0c6a4e1e753af09be52224e88bb8fbcb47794ad72b99b9e24b109
-
-[http://freshmeat.net/redir/popt/72854/url_bz2/popt-1.13.tar.gz]
-md5=b5c47ce0185c83f947953c77000533bf
-sha256=722b939b14e8b510bbb24e3109a075c7d86b33bec05cb583e76769df9ef2661f
-
-[http://rpm5.org/files/popt/popt-1.13.tar.gz]
-md5=b5c47ce0185c83f947953c77000533bf
-sha256=722b939b14e8b510bbb24e3109a075c7d86b33bec05cb583e76769df9ef2661f
-
-[http://rpm5.org/files/popt/popt-1.14.tar.gz]
-md5=4f90a07316eb825604dd10ae4f9f3f04
-sha256=175be17571e9af3ad622531b494a0738ae632c60c8c6329273778b2b6fbbad74
-
-[ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-1.7.tar.gz]
-md5=5988e7aeb0ae4dac8d83561265984cc9
-sha256=4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1
-
-[http://rpm.org/releases/historical/rpm-4.1.x/popt-1.7.tar.gz]
-md5=5988e7aeb0ae4dac8d83561265984cc9
-sha256=4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1
-
-[http://downloads.sourceforge.net/poqetp/poqetp_0.0.6_src.tar.gz]
-md5=b003614237445d23b512cb9571565524
-sha256=4347a70fe84bd2ccecc90738fb121d28298cf0bfdb4963ceee088c56d3109899
-
-[http://heanet.dl.sourceforge.net/poqetp/poqetp_0.0.6_src.tar.gz]
-md5=b003614237445d23b512cb9571565524
-sha256=4347a70fe84bd2ccecc90738fb121d28298cf0bfdb4963ceee088c56d3109899
-
-[http://downloads.sourceforge.net/portabase/portabase_1.9.tar.gz]
-md5=3319e8eff133de0bc9e8fe810e052202
-sha256=6b3d91811b098fb9e1a0f91d11a6c935c2d7e41d4431f022023d606d270fe0fc
-
-[http://heanet.dl.sourceforge.net/portabase/portabase_1.9.tar.gz]
-md5=3319e8eff133de0bc9e8fe810e052202
-sha256=6b3d91811b098fb9e1a0f91d11a6c935c2d7e41d4431f022023d606d270fe0fc
-
-[http://neil.brown.name/portmap/portmap-6.0.tgz]
-md5=ac108ab68bf0f34477f8317791aaf1ff
-sha256=02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de
-
-[http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz]
-md5=ac108ab68bf0f34477f8317791aaf1ff
-sha256=02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de
-
-[ftp://ftp.debian.org/debian/pool/main/p/portmap/portmap_5-25.diff.gz]
-md5=b78c2ecfe378b03b8f1b36d2aed94eac
-sha256=09595393c56b24d45476bf414f9e32cf13d675711c8ac3f7e0754c938814e085
-
-[ftp://ftp.nl.debian.org/debian/pool/main/p/portmap/portmap_5-25.diff.gz]
-md5=b78c2ecfe378b03b8f1b36d2aed94eac
-sha256=09595393c56b24d45476bf414f9e32cf13d675711c8ac3f7e0754c938814e085
-
-[ftp://ftp.debian.org/debian/pool/main/p/portmap/portmap_5-26.diff.gz]
-md5=11118c91a095e8ff7f4a3f5f09062be7
-sha256=8478eee317686f53e24519657f4653293bd120fae9815153d7cf54e0f8be9feb
-
-[ftp://ftp.nl.debian.org/debian/pool/main/p/portmap/portmap_5-26.diff.gz]
-md5=11118c91a095e8ff7f4a3f5f09062be7
-sha256=8478eee317686f53e24519657f4653293bd120fae9815153d7cf54e0f8be9feb
-
-[ftp://ftp.debian.org/debian/pool/main/p/portmap/portmap_5-9.diff.gz]
-md5=8b77092f74e5638e90825973f0274729
-sha256=a9ab1930048038d80a9e48e69a6f0d57e86a355545d6db3e2c67e06ec909b80a
-
-[ftp://ftp.nl.debian.org/debian/pool/main/p/portmap/portmap_5-9.diff.gz]
-md5=8b77092f74e5638e90825973f0274729
-sha256=a9ab1930048038d80a9e48e69a6f0d57e86a355545d6db3e2c67e06ec909b80a
-
-[ftp://ftp.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz]
-md5=781e16ed4487c4caa082c6fef09ead4f
-sha256=e8fb4429ecf03809f60b2e194be120a811be1c5cc3cc5d933ede938114357b61
-
-[ftp://ftp.nl.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz]
-md5=781e16ed4487c4caa082c6fef09ead4f
-sha256=e8fb4429ecf03809f60b2e194be120a811be1c5cc3cc5d933ede938114357b61
-
-[ftp://ftp.us.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz]
-md5=781e16ed4487c4caa082c6fef09ead4f
-sha256=e8fb4429ecf03809f60b2e194be120a811be1c5cc3cc5d933ede938114357b61
-
-[ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.0.20.tar.gz]
-md5=92479b64d132262be505a17ec02bc2a8
-sha256=78c03b41d75f7402a63a5e5e13f3690005411a85299bc6ec9edbe04888db6d18
-
-[ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.2.12.tar.gz]
-md5=e73299c07407da60a53c0cf089b4abe8
-sha256=a736ed4936ad20c2b012fde699a033360c38ae6201ebb8a98d3bfaca6737d4b3
-
-[ftp://ftp-archives.postgresql.org/pub/source/v8.1.4/postgresql-8.1.4.tar.bz2]
-md5=a65bdc5d833169d28bf6fbaaa8d57fcf
-sha256=ac7e7d311b07abd27b084041bcc943398df303bc86601f281891537bdf1a4e0b
-
-[ftp://ftp-archives.postgresql.org/pub/source/v8.1.8/postgresql-8.1.8.tar.bz2]
-md5=b05e1d7f0cac9cc4e096aa21409dee55
-sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3
-
-[ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/source/v8.1.8/postgresql-8.1.8.tar.bz2]
-md5=b05e1d7f0cac9cc4e096aa21409dee55
-sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3
-
-[ftp://ftp-archives.postgresql.org/pub/source/v8.2.4/postgresql-8.2.4.tar.bz2]
-md5=af7ec100a33c41bfb8d87b5e0ec2f44a
-sha256=8ff6afab743e894c0d96e668dcf9b3d3c1044719d6def45ef7390c64b54ed268
-
-[http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/povray-3.6.1.tar.bz2]
-md5=b5789bb7eeaed0809c5c82d0efda571d
-sha256=4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
-
-[http://www.povray.org/redirect/www.povray.org/beta/source/povray-src-3.7.0.beta.25b.tar.bz2]
-md5=cfb405e2ca3c3f3b30abd5dbef9a78e8
-sha256=ef54965dec05c8063c40eab768f3fb722eb0ed72ae7918afe45d7a6bd553abc8
-
-[http://linux.tlk.fr/games/Powermanga/download/powermanga-0.79.tgz]
-md5=3a4f00658496921b7327413ac476c1b7
-sha256=99a9737480224be47362387d2d2389bee61d7685510b3a161b2b1db6c0556c26
-
-[http://www.deater.net/john/powernowd-0.96.tar.gz]
-md5=9c7131bce36bbb3e8b688478e8dc34c7
-sha256=44ea3e6777c471a514d1e0a53b60cd5a4e2e56802ba23ec67331b69f122ec3d7
-
-[http://www.lesswatts.org/projects/powertop/download/powertop-1.10.tar.gz]
-md5=e09f631f60d50299d8885193e6fd3756
-sha256=cc60000bbe5f4d7b9beae8a84e1cd1ba69339a489a7d1a7365a3d8fe8fd73d6b
-
-[http://www.lesswatts.org/projects/powertop/download/powertop-1.11.tar.gz]
-md5=3498f5983c683c3a57dce7379a722082
-sha256=70e7cc53e5fbade5e447bda9f0ca12f2153bf426e074dbac3a2e97adf46180f2
-
-[http://www.lesswatts.org/projects/powertop/download/powertop-1.8.tar.gz]
-md5=38fd8a6825cd62b6c22df8a44b4e27d0
-sha256=7325ea46e5af59c12ea024e69622ac7753010c8de615d668e1f03b0fc05bad3a
-
-[http://www.linuxpowertop.org/download/powertop-1.8.tar.gz]
-md5=38fd8a6825cd62b6c22df8a44b4e27d0
-sha256=7325ea46e5af59c12ea024e69622ac7753010c8de615d668e1f03b0fc05bad3a
-
-[http://www.linuxpowertop.org/download/powertop-1.9.tar.gz]
-md5=7e2cd799941350a45586edac43760ac9
-sha256=41899a12c3436a3e623744f41b459d4a7a7aa96da32b22a3b301037b54062594
-
-[http://ppp.samba.org/ftp/ppp/ppp-2.4.1.tar.gz]
-md5=fbc256801d5fcd8015039b149ae95eb0
-sha256=c8f2c4f125b1b4ac1b9c76172e3215c80e123e35ae4c2d473e310bc44c1baa9e
-
-[ftp://ftp.samba.org/pub/ppp/ppp-2.4.3.tar.gz]
-md5=848f6c3cafeb6074ffeb293c3af79b7c
-sha256=1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11
-
-[http://ppp.samba.org/ftp/ppp/ppp-2.4.3.tar.gz]
-md5=848f6c3cafeb6074ffeb293c3af79b7c
-sha256=1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11
-
-[http://ppp.samba.org/ftp/ppp/ppp-2.4.4.tar.gz]
-md5=183800762e266132218b204dfb428d29
-sha256=58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea
-
-[http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-1.7.1.tar.gz]
-md5=b47735ba5d6d37dfdbccb85afc044ede
-sha256=8e3fa9f17c22818eae68419f66966865423206d736eb74d212a3501f62423276
-
-[http://heanet.dl.sourceforge.net/sourceforge/pptpclient/pptp-1.7.1.tar.gz]
-md5=b47735ba5d6d37dfdbccb85afc044ede
-sha256=8e3fa9f17c22818eae68419f66966865423206d736eb74d212a3501f62423276
-
-[http://downloads.sourceforge.net/pptpclient/pptp-linux-1.5.0.tar.gz]
-md5=281ee37788bdf3260426eca56a9af858
-sha256=a2a10abcdfcfbd7da0ba173d2996d6555908069108d59296bf3e1c5c48b5be60
-
-[http://heanet.dl.sourceforge.net/pptpclient/pptp-linux-1.5.0.tar.gz]
-md5=281ee37788bdf3260426eca56a9af858
-sha256=a2a10abcdfcfbd7da0ba173d2996d6555908069108d59296bf3e1c5c48b5be60
-
-[http://downloads.sourceforge.net/poptop/pptpd-1.3.0.tar.gz]
-md5=75d494e881f7027f4e60b114163f6b67
-sha256=4f6fe4eb08ca7a69c83658ab13b23a77aa153ec1a2663596ddcbbf35768b0cee
-
-[http://heanet.dl.sourceforge.net/poptop/pptpd-1.3.0.tar.gz]
-md5=75d494e881f7027f4e60b114163f6b67
-sha256=4f6fe4eb08ca7a69c83658ab13b23a77aa153ec1a2663596ddcbbf35768b0cee
-
-[http://downloads.sourceforge.net/poptop/pptpd-1.3.4.tar.gz]
-md5=b38df9c431041922c997c1148bedf591
-sha256=c23a9bdd219a0a36ae7ca20e7c9749f2efdcdbf108aabeeeb5066ba442ec88b6
-
-[http://heanet.dl.sourceforge.net/poptop/pptpd-1.3.4.tar.gz]
-md5=b38df9c431041922c997c1148bedf591
-sha256=c23a9bdd219a0a36ae7ca20e7c9749f2efdcdbf108aabeeeb5066ba442ec88b6
-
-[http://downloads.sourceforge.net/prboom/prboom-2.2.6.tar.gz]
-md5=ef0abe0aad017514857552434b5c6aaa
-sha256=200d3c50b082ae46be8c014bb576b4e2d23b1704508fd528c47e3e2b3b04759e
-
-[http://heanet.dl.sourceforge.net/prboom/prboom-2.2.6.tar.gz]
-md5=ef0abe0aad017514857552434b5c6aaa
-sha256=200d3c50b082ae46be8c014bb576b4e2d23b1704508fd528c47e3e2b3b04759e
-
-[http://downloads.sourceforge.net/prboom/prboom-2.3.1.tar.gz]
-md5=c53231604fe6cf7352e73911ad44c90d
-sha256=6465b37ef96c04d95dcb887f907da1af43a33783e8c5e80527bceda97202876a
-
-[http://heanet.dl.sourceforge.net/prboom/prboom-2.3.1.tar.gz]
-md5=c53231604fe6cf7352e73911ad44c90d
-sha256=6465b37ef96c04d95dcb887f907da1af43a33783e8c5e80527bceda97202876a
-
-[http://downloads.sourceforge.net/prboom/prboom-2.4.7.tar.gz]
-md5=9942f521764d7f89df2218a456da4f02
-sha256=de22dbaacd25a0f0b16c507aa2326a90b7f5dcfcf862c3dc7076996c6187cd2f
-
-[http://heanet.dl.sourceforge.net/prboom/prboom-2.4.7.tar.gz]
-md5=9942f521764d7f89df2218a456da4f02
-sha256=de22dbaacd25a0f0b16c507aa2326a90b7f5dcfcf862c3dc7076996c6187cd2f
-
-[http://downloads.sourceforge.net/prboom/prboom-2.5.0.tar.gz]
-md5=a8a15f61fa2626ab98051ab2703378c4
-sha256=226c1c470f8cc983327536404f405a1d026cf0a5188c694a1243cc8630014bae
-
-[ftp://ftp.debian.org/debian/pool/main/p/prelink/prelink_0.0.20060712.orig.tar.gz]
-md5=f897774889b14e5414983c3bf65e1fad
-sha256=ffe91ca709c381b94f8ed99a51ea8d865dad9667186c572dcfd5711a1700b232
-
-[ftp://ftp.debian.org/debian/pool/main/p/prelink/prelink_0.0.20061027.orig.tar.gz]
-md5=9b01aae72da2bb262f29392597847545
-sha256=e70697c0c23da6b82b330c7db41537ee00dd770da87c92591682f486ab8d1752
-
-[ftp://ftp.nl.debian.org/debian/pool/main/p/prelink/prelink_0.0.20061027.orig.tar.gz]
-md5=9b01aae72da2bb262f29392597847545
-sha256=e70697c0c23da6b82b330c7db41537ee00dd770da87c92591682f486ab8d1752
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/p/prelink/prelink_0.0.20061027.orig.tar.gz]
-md5=9b01aae72da2bb262f29392597847545
-sha256=e70697c0c23da6b82b330c7db41537ee00dd770da87c92591682f486ab8d1752
-
-[ftp://ftp.us.debian.org/debian/pool/main/p/prelink/prelink_0.0.20061027.orig.tar.gz]
-md5=9b01aae72da2bb262f29392597847545
-sha256=e70697c0c23da6b82b330c7db41537ee00dd770da87c92591682f486ab8d1752
-
-[ftp://ftp.debian.org/debian/pool/main/p/prelink/prelink_0.0.20071009.orig.tar.gz]
-md5=6617a6681f4e5e3d8ddc48955d73d7ab
-sha256=a1c6170e508a3516d0a23963d7fa5cf0a457be431c210096f6b1cecd0731a9f4
-
-[ftp://ftp.nl.debian.org/debian/pool/main/p/prelink/prelink_0.0.20071009.orig.tar.gz]
-md5=6617a6681f4e5e3d8ddc48955d73d7ab
-sha256=a1c6170e508a3516d0a23963d7fa5cf0a457be431c210096f6b1cecd0731a9f4
-
-[ftp://ftp.us.debian.org/debian/pool/main/p/prelink/prelink_0.0.20071009.orig.tar.gz]
-md5=6617a6681f4e5e3d8ddc48955d73d7ab
-sha256=a1c6170e508a3516d0a23963d7fa5cf0a457be431c210096f6b1cecd0731a9f4
-
-[ftp://ftp.debian.org/debian/pool/main/p/prelink/prelink_0.0.20090925.orig.tar.gz]
-md5=ed90412ad4ee7f5b5e8fff3d6649e49b
-sha256=2110261aedd8423fa3f1dba5ecb08bd61beb708883f82753b09835076cba2e36
-
-[http://www.red-bean.com/~proski/firmware/primary.tar.bz2]
-md5=0c7c82264602ee2b7ad832d5cd1e1940
-sha256=3b5bd68653ff5054586f9fad7ad729bd2d551e76949aec2d14b8a89308393a36
-
-[http://xorg.freedesktop.org/releases/individual/proto/printproto-1.0.3.tar.bz2]
-md5=0f4e7982c6d4ec3b2cf38502dd1293a3
-sha256=8b375f8cda83dfc7d84be44af41eedd484d0e2499acbd19bdca5b4056dec7235
-
-[http://xorg.freedesktop.org/releases/individual/proto/printproto-1.0.4.tar.bz2]
-md5=7321847a60748b4d2f1fa16db4b6ede8
-sha256=f059a93188e7143dbb6cc55e31ccf81b976776aa3023bfa57f47501fd1bfd3be
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/printproto-X11R7.0-1.0.3.tar.bz2]
-md5=15c629a109b074d669886b1c6b7b319e
-sha256=23bfd57906a1787814480f57763ded8fc10a696a903a4768869c56061283e972
-
-[http://downloads.sourceforge.net/prismstumbler/prismstumbler-0.7.2.tar.bz2]
-md5=3ef1bf7bfa9a144013155a144aaaa091
-sha256=3a568fbb3a68238d79731bcf933602171bb8d7d51226a7af722d357ab7d2a96b
-
-[http://heanet.dl.sourceforge.net/prismstumbler/prismstumbler-0.7.2.tar.bz2]
-md5=3ef1bf7bfa9a144013155a144aaaa091
-sha256=3a568fbb3a68238d79731bcf933602171bb8d7d51226a7af722d357ab7d2a96b
-
-[http://downloads.sourceforge.net/prismstumbler/prismstumbler-0.7.3.tar.bz2]
-md5=3232b2a12136c6ec097bb2544cd7ab16
-sha256=57c30824fc0fb901545e888f2cdefd7f2e848a698d5ac724e1a7701245e63b68
-
-[http://heanet.dl.sourceforge.net/prismstumbler/prismstumbler-0.7.3.tar.bz2]
-md5=3232b2a12136c6ec097bb2544cd7ab16
-sha256=57c30824fc0fb901545e888f2cdefd7f2e848a698d5ac724e1a7701245e63b68
-
-[http://projects.linuxtogo.org/frs/download.php/14/prismstumbler-0.7.4pre1.tar.gz]
-md5=5b2e91311c94579e4f5e1d4fdd9bc4fe
-sha256=81d536d5307b8d5b96587ff673e69b9e5049d11d56643b3ea6984b31baa0ab56
-
-[http://downloads.sourceforge.net/ijbswa/privoxy-3.0.3-stable-src.tar.gz]
-md5=b0710be8af09409bfb03f52523a17010
-sha256=4dab0049049c1ae6cfb00faea606d981535d0f0a65aab17e3179cc3d75de9f84
-
-[http://heanet.dl.sourceforge.net/ijbswa/privoxy-3.0.3-stable-src.tar.gz]
-md5=b0710be8af09409bfb03f52523a17010
-sha256=4dab0049049c1ae6cfb00faea606d981535d0f0a65aab17e3179cc3d75de9f84
-
-[http://procps.sourceforge.net/procps-3.1.15.tar.gz]
-md5=496d9f87be5eaebcd1080bb5b9999da4
-sha256=dda7201dc74e4c247f3feab8eea53cceeb55e8a6994ecb8ca3ca139f7ccfc15a
-
-[http://procps.sourceforge.net/procps-3.2.1.tar.gz]
-md5=2672014ec05deb20680713a7b750cb16
-sha256=6d1643b0c12771d26b4e8c50910c63124ada6d709d7c7efacda3cf830e608cc3
-
-[http://procps.sourceforge.net/procps-3.2.5.tar.gz]
-md5=cde0e3612d1d7c68f404d46f01c44fb4
-sha256=6d52c706401af197bd9d7e0187c35b4a3463ea720392ffa0c020d94899b361e5
-
-[http://procps.sourceforge.net/procps-3.2.7.tar.gz]
-md5=f490bca772b16472962c7b9f23b1e97d
-sha256=b439e04adab9b1e66e11f59c4331680da48f1722f2123123f7c16dfbed2c38dc
-
-[http://downloads.sourceforge.net/progear/progear-ac-0.1.tar.gz]
-md5=60a89c2c907fb5ff2293ce3dfbcdace6
-sha256=4124e24726369b42ed0a7aff33e5c572de5e4a0f46edd4e1e81125412c4bdf24
-
-[http://downloads.sourceforge.net/progear/progear-battery-0.3.tar.gz]
-md5=a3bb00cc8e6f5b9f9ef91f9eca1fe2b6
-sha256=68a862f63e77b7acb08095b969e372ae1bfd53836f0635f44b1722efae4f29d7
-
-[ftp://ftp.remotesensing.org/proj/proj-4.4.9.tar.gz]
-md5=3cc5c2407c213aadfd154c8df80efd6c
-sha256=672b753f911bfb7cbf996ece57f46dd91d3bac9aa852178e3a56b5e111672aa9
-
-[http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/proxy-libintl-20080418.zip]
-md5=63047fcbe5ff853db0d04981dd9f1888
-sha256=b8519dfd77939b23ca599a724b536f48340f2c795552aa2a600155230571141c
-
-[http://xorg.freedesktop.org/releases/individual/app/proxymngr-1.0.1.tar.bz2]
-md5=aad44d0f65b97fd6d564b1d2ae510bb1
-sha256=e9f5d4553411562477a0605fb0f0ec728016499e37230138a5e207dec79525c5
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/proxymngr-X11R7.0-1.0.1.tar.bz2]
-md5=0d2ca6876d84302f966fd105a3b69a8e
-sha256=f1ce23f66ed90c4be505f23c5b659ce48578099521663e788733315f3c36fdb2
-
-[http://downloads.sourceforge.net/psmisc/psmisc-20.2.tar.gz]
-md5=f0d40e38a150ee31123362e7c50bcf9d
-sha256=e2592a857ccc2b5ad6f327ce2acc7b5a0874ec10755476aa2cf6bfa054230214
-
-[http://heanet.dl.sourceforge.net/psmisc/psmisc-20.2.tar.gz]
-md5=f0d40e38a150ee31123362e7c50bcf9d
-sha256=e2592a857ccc2b5ad6f327ce2acc7b5a0874ec10755476aa2cf6bfa054230214
-
-[http://downloads.sourceforge.net/psmisc/psmisc-21.8.tar.gz]
-md5=d6276e071c10ddf4b0d98856e5573e1a
-sha256=495463860415171d9019798ed4fdf5848ffe93f8a380662a39dd2690a04717ed
-
-[http://heanet.dl.sourceforge.net/psmisc/psmisc-21.8.tar.gz]
-md5=d6276e071c10ddf4b0d98856e5573e1a
-sha256=495463860415171d9019798ed4fdf5848ffe93f8a380662a39dd2690a04717ed
-
-[http://downloads.sourceforge.net/psmisc/psmisc-22.2.tar.gz]
-md5=77737c817a40ef2c160a7194b5b64337
-sha256=6bca237485a352362133792e000a3c8e367a26b0312c5c607db7c2a97717d15f
-
-[http://heanet.dl.sourceforge.net/psmisc/psmisc-22.2.tar.gz]
-md5=77737c817a40ef2c160a7194b5b64337
-sha256=6bca237485a352362133792e000a3c8e367a26b0312c5c607db7c2a97717d15f
-
-[http://downloads.sourceforge.net/psmisc/psmisc-22.6.tar.gz]
-md5=2e81938855cf5cc38856bd4a31d79a4c
-sha256=a13c81897c94b3d6e705fc9da07c610492e28cf7abd5ff8e992f0ec95a269d62
-
-[http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.4/linux-i686/xpi/pt-BR.xpi]
-md5=29c672886aa9ca41428ba04196938545
-sha256=1474828a58f893bed20f0e0cd26bc310c7472d69bf7a1ae01c00a371de256b1a
-
-[ftp://ftp.ossp.org/pkg/lib/pth/pth-2.0.0.tar.gz]
-md5=f84a87295fef3b41499f3b728b1f0050
-sha256=1935a06368c1555d5f80329ba1e53f5b1a7dd9efb7fc9354427f2d1a583c81a3
-
-[ftp://ftp.gnu.org/gnu/pth/pth-2.0.2.tar.gz]
-md5=fc4d81a1dbf3d1af9a099b765f9a1be3
-sha256=2f18dc8e553b2eb9e40e429ccc829e2b8e25d2f82929cfbc4149b1147d00eee1
-
-[ftp://ftp.gnu.org/gnu/pth/pth-2.0.7.tar.gz]
-md5=9cb4a25331a4c4db866a31cbe507c793
-sha256=72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232
-
-[https://www.auto.tuwien.ac.at/~mkoegler/pth/pthsem-2.0.7.tar.gz]
-md5=b277716ee1224ca9925176fa29e1f0c5
-sha256=6226f92f3a0950c6f3da8f9dcb7c76d08634515519bf35cd916b3cdcc1aeb130
-
-[http://www.ekiga.org/admin/downloads/latest/sources/ekiga_3.0.2/ptlib-2.4.4.tar.bz2]
-md5=221ea2f96ff6bae9cf604d8766eae526
-sha256=c9ef4267490507fc9699634551b50c0c1c225d48e0c095a81be6fa5a1fa96a3a
-
-[http://downloads.sourceforge.net/opalvoip/ptlib-2.5.2.tar.bz2]
-md5=7d8dcd999827d51ad4a15afe74aad181
-sha256=c99897464bd07c73dbb72095a9806ddc0c26141230e34b181d7e742e78259e4b
-
-[http://downloads.sourceforge.net/opalvoip/ptlib-2.6.1.tar.bz2]
-md5=122ab96fcc44110ce05153f259b3285a
-sha256=b8301389c1ee9968df8075942061665e33198d3865f92d8fb26e519068517305
-
-[http://downloads.sourceforge.net/opalvoip/ptlib-2.6.2.tar.bz2]
-md5=d478121cfc82da7c0f0ce0e53fc7c2fd
-sha256=941ead5179f5bab8dd6e81806b6e52120dc5b98c6ced8128df24639af1eabedd
-
-[http://downloads.sourceforge.net/opalvoip/ptlib-2.6.4.tar.bz2]
-md5=bcc8e2d5bb6be7e3fea857ce2f7fce5c
-sha256=22eae4f6c72247f8ac79c57ce4469797ad3df67614758c5096b7ce9290bd10b4
-
-[http://downloads.sourceforge.net/opalvoip/ptlib-2.6.5.tar.bz2]
-md5=db7fd581b66998cd76d96f8b7c3f22a1
-sha256=78e290d3cf78d4dc15c7397b0edd138b4d29cf2ad0a7311bfc1c4dfb88f2a400
-
-[http://downloads.sourceforge.net/project/ptpd/ptpd/1.0.0/ptpd-1.0.0.tar.gz]
-md5=b112b2bedc7f6e6e11a838608b9e0357
-sha256=8ac1fdcad1e246b0395097dd9af29966c6823533d7e6989aae91506048fb51bc
-
-[http://pypi.python.org/packages/source/p/ptrace/ptrace-0.3.2.tar.gz]
-md5=8108c2474bef16d126e956dce3c5073b
-sha256=634fe75e195179adafb6218040724f38252bd0fc8f796bb3e3e9bdba065890c5
-
-[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.10.tar.gz]
-md5=9187ac1b302b9ab45f355242f453882e
-sha256=1ae8b587759b33ad954e717728fab6df58bd28088d0ac8faf22e90253b774975
-
-[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.11.tar.gz]
-md5=fa121f8e5dd4b98d65096de1b6c84021
-sha256=6cc4aff778275f087cfbd65d2040b1587cafc588749499a452eb496329505ab0
-
-[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.14.tar.gz]
-md5=0ed1115222d1d8c64cc14961cccb2eb0
-sha256=e6129f9239235981d329de40eeffa55041e6815a93aaa994d1eae242ea7446b5
-
-[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.15.tar.gz]
-md5=4510364eeab219fd100bd1b373b1a002
-sha256=1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
-
-[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.19.tar.gz]
-md5=02adc2b99252675f0271db3b9edd432e
-sha256=e47e27083deb79571fb2b9215874ddc26d77c3dec2a7dc8de5ecec9058e4b806
-
-[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.21.tar.gz]
-md5=76e623c4c72e2258bc8bdeb1599bad74
-sha256=94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254
-
-[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.5.tar.gz]
-md5=99b5d9efd4fce35cabb4ae5d0ebb230d
-sha256=cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
-
-[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.6.tar.gz]
-md5=669d52a70fb9a7a83c2507005bfa2a6f
-sha256=b7a5f14eb8cf7076f1df8fb78d4a05c83e1e655474688c48364fa1b96f478d64
-
-[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.9.tar.gz]
-md5=8fa6f7a9611bb194d94311764022b197
-sha256=9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d
-
-[http://ftp.de.debian.org/debian/pool/main/p/pump/pump_0.8.24.orig.tar.gz]
-md5=866fc9f62b8161eb1514a6a06597edc9
-sha256=cbb423942a4295a07a23b76a02d645b76b4ac0b58c3a30076ad42c2ab80c2dba
-
-[http://downloads.sourceforge.net/pushover/pushover-0.0.1.tar.gz]
-md5=aeb0f0927f596623c5a1ea9cc27220e0
-sha256=612050d95b78a3c355a0f9630e4c7c2230ce3e9bdaa43f5a1392ad4d62608230
-
-[http://www.warmi.net/zaurus/files/puzz-le_2.0.0.tar.gz]
-md5=76535893b779926874f618d3fbf3e92b
-sha256=e4b4217b81ab0885db11cf7e0f18afdeaa969392fc15647a10c2aab9cbf583d8
-
-[http://pipeviewer.googlecode.com/files/pv-1.1.4.tar.bz2]
-md5=63033e090d61a040407bfd043aeb6d27
-sha256=c8613c240ab4297f6ad346f0047138f551a093c603eeb581d5e83091cad3a559
-
-[http://www.isely.net/downloads/pvrusb2-mci-20050911.tar.bz2]
-md5=8522d37df012c70a954a966d40df1ad3
-sha256=2831d99c1f60074f6f348643b13ae7d6ff1224075ae153125dd59db5f21efa3c
-
-[http://www.isely.net/downloads/pvrusb2-mci-20050921.tar.bz2]
-md5=4ca12aedfb41e55ce49bbb8d75d3c4f6
-sha256=e20c6f60b93b0e85aa93c482e4a16a117c955c77d08c2d2fd6fed54bb14a7ee4
-
-[http://www.isely.net/downloads/pvrusb2-mci-20051016.tar.bz2]
-md5=983adf2ec776da2496b7c42263b4d8f3
-sha256=be8f3ed14623664aeb89d72e7837431be97a1285e7273a70e25b3572a0e40b64
-
-[http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2]
-md5=30e85fc2c581fa48e37d8d895bd47b0d
-sha256=e32fa324aff803c6aff7c00e8b740bbccdb39dd619b474e3b0061ed5af1bc3fc
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060101.tar.bz2]
-md5=d4557bb7497a8f991c4fdfbeabd2cf47
-sha256=594913a6e4c4eeac70d0b72b96e3abf9b28991c998d7273f1b57ceb255bf1c6b
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060103.tar.bz2]
-md5=74ca87784518920a2d0b117c1033f98c
-sha256=bef886360cab9a8005893ad477b5984a5b4df489bad51f43160903d0e5ed5b1c
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060121.tar.bz2]
-md5=3f88a67067a557517e092bafe6aad651
-sha256=9a65085b186557bf13b14182902ac04cfe8c071b58b5ee32fe8dbb173a37dcfa
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060209.tar.bz2]
-md5=6fc6a4684540eb782ef52f206e0443cb
-sha256=7e9c3f626703507197f253b7ba3cff9459b5d15f13993303be91639aac978763
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060326.tar.bz2]
-md5=291180edf473d702c5c99d7ae1e11f93
-sha256=fc3a61c5407e338dfbd82d365e38287959e3122aad641c5f95c78674e7db048b
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060329.tar.bz2]
-md5=609f332b7cfa12e100ae37b58bcc126b
-sha256=4c1e0a88a239e60e336f634af08de05e65741c19d9626277678ce1f7684a0c88
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060423.tar.bz2]
-md5=0e94972a75042051da3b017ddcd444de
-sha256=3673170003ced7e6af4721aee4de7da79f18a291c3650348747f59116a638223
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060517.tar.bz2]
-md5=bccc0d7c2e8b39a419a449c3ba889d07
-sha256=5bc12a647109915f1dd57c78991d816ab1ef1173c8d7ee18a77f4f678c10683c
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060607.tar.bz2]
-md5=b9187e8b0aacc6744d7df726ec993f0e
-sha256=75e3a5db048f5253f2e4339916e2b94b1f37508e9ce026780a844d07c305ab94
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060626.tar.bz2]
-md5=61e3f9367694537ccd2fbee7abd3e75f
-sha256=820f93704cbf60ca8d228ed0112ed1e96a5684a71c9d3788070acf7004f37550
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060702.tar.bz2]
-md5=b858b031d9c3816832701c5f15c0d8ff
-sha256=219042fda606860d52f4d5a0bdee5bf18bf20ec7caba152a7ebadafc0fd1dd44
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060726.tar.bz2]
-md5=90ad2a77ac4ae508326992a63d02c37a
-sha256=5190166e88f2f5cc1190fe2259b7a8e6796d472ced8436b5f90493075ecc0387
-
-[http://www.isely.net/downloads/pvrusb2-mci-20060903.tar.bz2]
-md5=64805cf3efcd43f39e500229ff511b5a
-sha256=fe73f3e7586cead55920d7fcdaca3924776b55d335d815042d14b16aa68d74fa
-
-[http://www.isely.net/downloads/pvrusb2-mci-20080210.tar.bz2]
-md5=52a45595560645fb36979c85f35f8578
-sha256=012882309a06987397beb3484e91467bb1be47e23850750ecaaa415be015cb79
-
-[http://www.saillard.org/linux/pwc/files/pwc-10.0.12-rc1.tar.bz2]
-md5=8763f3d6fd0f9738ef9854de205a126d
-sha256=dad803c34e902e286a3d6fb052f48b826c62a8ad19a54ced2936da7641b62907
-
-[http://kernel.org//pub/linux/utils/net/NIS/OLD/pwdutils/pwdutils-2.6.tar.bz2]
-md5=8567328b1ad7609f8851eec57658f1a0
-sha256=19c6eeb42f2688464cf4fc7dadecf58faeebfa6a13f05974f6dad910f5fd6b98
-
-[http://kernel.org/pub/linux/utils/net/NIS/OLD/pwdutils/pwdutils-2.6.tar.bz2]
-md5=8567328b1ad7609f8851eec57658f1a0
-sha256=19c6eeb42f2688464cf4fc7dadecf58faeebfa6a13f05974f6dad910f5fd6b98
-
-[http://downloads.sourceforge.net/pwgen/pwgen-2.06.tar.gz]
-md5=935aebcbe610fbc9de8125e7b7d71297
-sha256=61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454
-
-[http://heanet.dl.sourceforge.net/pwgen/pwgen-2.06.tar.gz]
-md5=935aebcbe610fbc9de8125e7b7d71297
-sha256=61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454
-
-[http://www.angstrom-distribution.org/unstable/sources/pwlib_1.5.2.tar.gz]
-md5=0fa33ba1b32b254abe0b731a52c0f2f9
-sha256=62b254548ad7a9e71231a160275827d67ff39022ee8e2854a7c9d9fe9a688e65
-
-[http://www.openh323.org/bin/pwlib_1.5.2.tar.gz]
-md5=0fa33ba1b32b254abe0b731a52c0f2f9
-sha256=62b254548ad7a9e71231a160275827d67ff39022ee8e2854a7c9d9fe9a688e65
-
-[http://downloads.sourceforge.net/pwsafe/pwsafe-0.2.0.tar.gz]
-md5=4bb36538a2772ecbf1a542bc7d4746c0
-sha256=61e91dc5114fe014a49afabd574eda5ff49b36c81a6d492c03fcb10ba6af47b7
-
-[http://heanet.dl.sourceforge.net/pwsafe/pwsafe-0.2.0.tar.gz]
-md5=4bb36538a2772ecbf1a542bc7d4746c0
-sha256=61e91dc5114fe014a49afabd574eda5ff49b36c81a6d492c03fcb10ba6af47b7
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa-linking-bug.patch]
-md5=ce6d8a7a25cc1c9593417746bcf84ca0
-sha256=24aac1d158095007a10a47e38320a1618fab2d536f19caff94f4dd0ab29f306b
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa25x_cpufreq-r0.patch]
-md5=860d5fcdd12177d6b6ec357bc37f4333
-sha256=23601850840ac8f888400e5a235ff11adc167a80cdf34764199eebb30a21a96f
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa25x_cpufreq-r2.patch]
-md5=c076ac1f2368d9e8399e64a3adf3a036
-sha256=34358aa53caaf393af550d9771f02f144eafabb7518e84d872427dc297e493b4
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa25x_suspend_fixes-r0.patch]
-md5=b74c402b56911c98bb11053119a82754
-sha256=06f17ed978e7cfda0e930a3d5916c6bb06b5587216ef77fb9d4cb5cd416f680d
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa27x_overlay-r2.patch]
-md5=ac55641970f627a1aaf1f1370263cfb5
-sha256=37ece6a9b62a00fab6c55b3f387e7864361f039a7df23286b44c12a6101c881a
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa27x_overlay-r5.patch]
-md5=6aaf8527d5e7af634ec7067f731d4702
-sha256=436422924eede3d68758b84b2cd3b7fc0f204454fa9577b366acbd6c0c4c87e7
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa27x_overlay-r6.patch]
-md5=929218c453c881fe5b3d94c65eb6fe7a
-sha256=f93eddd05d690599c85510372729c28e0d2f25619fb36aef22318bdf863b46a9
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa27x_overlay-r7.patch]
-md5=7be25e4519142e47309753905383ea28
-sha256=ccc9265306f13acec1525fd058dc3bcfb1bef218854b067c2c3b399da210dc12
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa27x_overlay-r8.patch]
-md5=94926c8dbea9035ca9e5b44d9dd68726
-sha256=8848bf269257316e845857d58023fec82e7e2ff5a8092915ec4a8b033429a5cc
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa_cf_initorder_hack-r1.patch]
-md5=b67218e773a236631b41a1718049bbc7
-sha256=f6ddc6636b2a8e4392dab43fdcfd9521e2d7f9022e56c39ecee66d50a94bdc98
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa_keys-r5.patch]
-md5=3bac44af85ad4212c00858f0b5eee2c8
-sha256=6e99a547e2d72d6bd2442f6152bef3bd7a9bb87c8bff137a6a3bf973cbba360c
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa_keys-r7.patch]
-md5=6cb642dc01dc93a99fac3f4894a432c7
-sha256=f6dc5a05456a6d4abb9e8b80df70aefac6f8764d04e079aa4c4c5b45cd0ff9bc
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa_keys-r8.patch]
-md5=4f41fd3a0e031a26d3a2d354f5995ffd
-sha256=3959a45bb65f66a622d7752e41808604032f4ab66f736f96fee83e252d85df5a
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa_keys-r9.patch]
-md5=c1358d4c210d1d701b5b0d96d8e73c12
-sha256=8697e76beb6ea44ce450e8cb9bed764803fe189eaea89e0aa72ebd1974bc52e4
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxa_timerfix-r0.patch]
-md5=69e6907a10d88362d6cf4fd2e806ab42
-sha256=c7d82fbe1d008edfb5ae53879de24bb882b2cdbd9ee9aab67389910da499210e
-
-[http://www.rpsys.net/openzaurus/patches/archive/pxafb_changeres-r0.patch]
-md5=11d4a1ba795b2b72476a3f8edecf23bc
-sha256=d3cce10825519a6e8a98872a90b176c806f6a37cac3cb047c36e0ba159bcf424
-
-[http://www.mn-logistik.de/unsupported/pxa250/pxaregs.c]
-md5=a43baa88842cd5926dbffb6fb87624f6
-sha256=f339b91cd8ab348052c36b36d20033e4bffc3666bc836ff72d5704f025e1c057
-
-[http://mercury.chem.pitt.edu/~shank/py-libmpdclient-0.10.0.tar.gz]
-md5=3a26540b7e057f23187b56e85dc82f95
-sha256=fad4e6ca8e9e2a9e4bcddc96194db69827164f65b8a35cb326d0c8cd3a870238
-
-[http://downloads.sourceforge.net/py-xmlrpc/py-xmlrpc-0.8.8.3.tar.gz]
-md5=d2aa74615aa9cf23413975a68613ffc1
-sha256=12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1
-
-[http://heanet.dl.sourceforge.net/py-xmlrpc/py-xmlrpc-0.8.8.3.tar.gz]
-md5=d2aa74615aa9cf23413975a68613ffc1
-sha256=12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1
-
-[http://twhiteman.netfirms.com/pyDES/pyDes-1.3.1.tar.gz]
-md5=e499fdde54e98be87324c0322311e034
-sha256=4f1aae18f2aabb3559b8878d95a7228ebe6633fc4a88905935354ccdf2accc32
-
-[http://downloads.sourceforge.net/pyopenssl/pyOpenSSL-0.6.tar.gz]
-md5=af67fda6d2125cae9c56ee50430a40c7
-sha256=58ee9dd10fbd97d65347626f60a38aafdcb05d19ad90c883c4284266ba7ec959
-
-[http://heanet.dl.sourceforge.net/pyopenssl/pyOpenSSL-0.6.tar.gz]
-md5=af67fda6d2125cae9c56ee50430a40c7
-sha256=58ee9dd10fbd97d65347626f60a38aafdcb05d19ad90c883c4284266ba7ec959
-
-[http://downloads.sourceforge.net/pyopenssl/pyOpenSSL-0.8.tar.gz]
-md5=00377690f224d9e59c833fb0459603f4
-sha256=2284411d21f1031f08f23c4f49dc0a341e38b07833495d0fe21a87eb25f3ffe3
-
-[ftp://ftp.alsa-project.org/pub/pyalsa/pyalsa-1.0.16.tar.bz2]
-md5=a1f4d561fa5c41a570480f3f328559a2
-sha256=f2c9195284d3c3925d83424a9e24ac8ce96e706abced5d3007df57f9fe51518f
-
-[http://heanet.dl.sourceforge.net/pyalsaaudio/pyalsaaudio-0.3.tar.gz]
-md5=1e061d726df57995e9b09594b304054b
-sha256=04cda928ef4ebc4b340668fe49626fc50619e644cd3825a93344cd0a066a4a61
-
-[http://downloads.sourceforge.net/pyalsaaudio/pyalsaaudio-0.4.tar.gz]
-md5=b312c28efba7db0494836a79f0a49898
-sha256=07148ce16024724b17cc24c51d0f4fb78af214b09b7dc8dcb7b06e5647f4c582
-
-[http://www.andrewchatham.com/pyogg/download/pyao-0.82.tar.gz]
-md5=8e00f5154401a6f6d99efd20606e2819
-sha256=9a444518252f6d747e76a219e5efbc05b4e1742260a7419da9ddf93a519b30c5
-
-[http://org.csail.mit.edu/pybluez/release/pybluez-src-0.10.tar.gz]
-md5=4c28dc47783ad232bf872ae7baad6033
-sha256=9877655ae7e4465d6c237f0896d359bd77021436abc7ed7c89ba76afe6ebe774
-
-[http://org.csail.mit.edu/pybluez/release/pybluez-src-0.13.tar.gz]
-md5=eb38d423b49255a7b9f5ba1f50844b53
-sha256=d8e41f48c86403cb7fc8d0880a207c53a9e4ba6b6eab2fe8870c346567fa3a03
-
-[http://org.csail.mit.edu/pybluez/release/pybluez-src-0.14.tar.gz]
-md5=3d8de7b5a4a100bd7d17278ea5e1c51b
-sha256=8975ba1e6575c3e6ed069bc1ac68457b020a48ce34df7da66aa9cf7a64f31e87
-
-[http://org.csail.mit.edu/pybluez/release/pybluez-src-0.2.tar.gz]
-md5=f51efe7a299ce1ecbf1a017a4dda11c8
-sha256=c16ac8a27af4fae6ef3f07cbd4da70bcf5b1be11dc664312f5c1e4d69c587d0a
-
-[http://cairographics.org/releases/pycairo-1.2.2.tar.gz]
-md5=83a2e06d9fc3530753701d580a18087e
-sha256=ab10b00c209e9feaebfff944d411f300ca032d09d3ebb64e3498acf9fea09c6d
-
-[http://cairographics.org/releases/pycairo-1.4.0.tar.gz]
-md5=e26e77919b606113f565d70036c1f504
-sha256=9212afffee727e39ae99406b5a59ab3248556bcfebfae24d8278313678147e32
-
-[http://cairographics.org/releases/pycairo-1.8.0.tar.gz]
-md5=847f5377c32228a656819f5bd18eb6b4
-sha256=a2272dafceb25ed9fedd0b10429dfec9c412b3b36eb6137f79c87e7d004036d4
-
-[http://downloads.sourceforge.net/pycap/pycap-0.1.6.tar.gz]
-md5=c90bc5382dede1a941e023e7bc27c473
-sha256=961e37f49afeda70d89c21830751548a2ac4912a35122bf70bf29091eef5c4a0
-
-[http://heanet.dl.sourceforge.net/pycap/pycap-0.1.6.tar.gz]
-md5=c90bc5382dede1a941e023e7bc27c473
-sha256=961e37f49afeda70d89c21830751548a2ac4912a35122bf70bf29091eef5c4a0
-
-[http://downloads.sourceforge.net/pychecker/pychecker-0.8.14.tar.gz]
-md5=531214b2c922462eb57dde5d37f004ac
-sha256=4c8601f11112b7fce53634f65140da171d85fc1e1004d0be6d5120848eedcf77
-
-[http://heanet.dl.sourceforge.net/pychecker/pychecker-0.8.17.tar.gz]
-md5=9d2a2d62b368ce503830f830a89bd230
-sha256=7ee4ea2fc02151196590cdef6073302dd61156503ee242a68a3c8aff50e86e52
-
-[http://downloads.sourceforge.net/pychecker/pychecker-0.8.18.tar.gz]
-md5=ef156a631df46de150a364912f2e36c8
-sha256=6495fe464659b175cefce20b187de6904b97b065fd609445b932d9c49a75a024
-
-[http://web.mit.edu/~emin/www/source_code/pycodes/pycodes-1-1.tar.gz]
-md5=26c99a8b10ccb2a21ca4891b85a07978
-sha256=2a9fbef7d953e1fc1eec837a4087cd518e465226b060b5cb3ea67bcef1760269
-
-[http://web.mit.edu/~emin/www/source_code/pycodes/pycodes-1-2.tar.gz]
-md5=c39e0ffea530cbf0b4f2aa6af6e81b66
-sha256=d203b4be819e20314576d5c26329862e7d371c84e8f192e31402a0b6d9e055aa
-
-[http://www.amk.ca/files/python/crypto/pycrypto-1.9a6.tar.gz]
-md5=cdcebdfd63e74754f57b9e9b0db4ea20
-sha256=a6d7db68c87699e283a1f58b637a7e730c350899fd7b35b88e63caa0e85a9ab9
-
-[http://www.amk.ca/files/python/crypto/pycrypto-2.0.1.tar.gz]
-md5=4d5674f3898a573691ffb335e8d749cd
-sha256=b08d4ed54c9403c77778a3803e53a4f33f359b42d94f6f3e14abb1bf4941e6ea
-
-[http://cyberelk.net/tim/data/pycups/pycups-1.9.45.tar.bz2]
-md5=ff634a6751f8a859ed26751bf03abef0
-sha256=ef6e576e5465da9c338ac8ff9f162825cfb7997359efc52e6a110c295a9f363b
-
-[http://pycurl.sourceforge.net/download/pycurl-7.14.0.tar.gz]
-md5=6f73d518fb520af14634a06ee1b7ddce
-sha256=a60e08b01fc3355ec18ec0e447349b6f8bff3f9628eb42891cff1eb51b9618b1
-
-[http://pycurl.sourceforge.net/download/pycurl-7.18.2.tar.gz]
-md5=39210d56f1d5a75ac8dd6a2866a93dd5
-sha256=95d21bd61e03d22ee4ac18fc0b9040c163cb504c4b2cf1dc43c18f32508f6736
-
-[http://www.rhodesmill.org/brandon/projects/pyephem-3.7.2a.tar.gz]
-md5=92d035abe09b9dba39780bc66738ce23
-sha256=5e7e4a23544d9ef232913d3dc9fac3a9a6a2ced4892ce6c4d197ecbb23f89dcd
-
-[http://pypi.python.org/packages/source/p/pyephem/pyephem-3.7.3.3.tar.gz]
-md5=1e13d951bd46b98476d888bf6e1a06fa
-sha256=dd7aedbc9dade0ce25a2a5e2443790fb9d9a607446fb84932e653287b4f160b4
-
-[http://www.rhodesmill.org/brandon/projects/pyephem-3.7b.tar.gz]
-md5=08ddcadfef79b6020d593b7665b4c3fa
-sha256=f310597a3da24cf6799f233cf88914ae5d4ddb2dc8ed6e47cbf95a39fa0e9634
-
-[ftp://ra.stsci.edu/pub/pyfits/pyfits-1.0.1.tar.gz]
-md5=7cab1ef229b47760f91437b427e43819
-sha256=cbd1ee276a6e1bbd525b4c88ec13df9be5c40833d6ffc78b3cd76420c25e9938
-
-[http://www.stsci.edu/resources/software_hardware/pyfits/pyfits-1.1.tar.gz]
-md5=c609558432e2b61bc91cf511e8b62fd9
-sha256=163dc19bf85754c013cd42102e5afc96f40d0264664acaa69d34404524c1928d
-
-[http://www.stsci.edu/resources/software_hardware/pyfits/pyfits-1.3.tar.gz]
-md5=59c3c8c714336eab7760b7d320e124c3
-sha256=a6b01c9d75e7955765019581700bd6ac344457b327522facedaf4cff9e86093c
-
-[http://www.divmod.org/static/projects/pyflakes/pyflakes-0.2.0.tar.gz]
-md5=da243a4425bda4a714b1338fe73663fa
-sha256=1fe008b728923f25d3c8ebd7f28cc538aa0814f3b090df817e25c266fcaecf6a
-
-[http://www.divmod.org/static/projects/pyflakes/pyflakes-0.2.1.tar.gz]
-md5=e65d9245d706350b3db811280d897f30
-sha256=3eecd66deecc2de5c31bb91a4b4479232087e80da94e3086e2a686879374cde9
-
-[http://pypi.python.org/packages/source/p/pyflakes/pyflakes-0.3.0.tar.gz]
-md5=ec7eee3444214bda18e57b82175e1da7
-sha256=019b6d4b549306d013974678872aaf2453af3f02760175504dbe8a9f89db0a2c
-
-[http://pyftpdlib.googlecode.com/files/pyftpdlib-0.5.1.tar.gz]
-md5=f64ac67ebec1d8ab47c0766082617384
-sha256=6daed9475412eaab232e021ed76568c6520dacd75c58da406454139bef95c393
-
-[http://www.pygame.org/ftp/pygame-1.6.tar.gz]
-md5=ea5db930c0031873a7f5ad1f2f7926db
-sha256=dff059338cc1b3409567a5b7f12bd23facc21b2c4ad356257fe50e5e85d2ae02
-
-[http://www.pygame.org/ftp/pygame-1.7.1release.tar.gz]
-md5=05d86d1af446f79411359400951053b7
-sha256=11dfa923f5f831d2bedf476978e004efcac4cfa7d1f315dd094262265fcd8042
-
-[ftp://ftp.pygame.org/pub/pygame/pygame-1.8.1release.tar.gz]
-md5=3e72f11d99c1a46ed69eb943c9de20a5
-sha256=7e1841d812b9eb39fd49c297ce6c3ad83bda56bf78a666e9426d3f6ecce92a75
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-2.12.2.tar.bz2]
-md5=394999abd1921ceff653c98165c713a0
-sha256=83787be6e11f6c7a45c111fa37f674a153274c45c2ab3f4b38b3b6dad933fcda
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-2.12.3.tar.bz2]
-md5=009986021225b7ea6e0ba848707785af
-sha256=efa81e0281668988b8cc2af9d0546befa4365662f1ebec37e0c7c863e969da41
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.14/pygobject-2.14.2.tar.bz2]
-md5=0e9e9300e81847f4f7266f49d3bebbaf
-sha256=79c5d3ab8f072f1d0b102b2bd6410b0dc383a008b5efad1750d8b6dadfde8c6e
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.15/pygobject-2.15.4.tar.bz2]
-md5=df59affe5b8fd7148506c3473d479868
-sha256=c746693328bfed7838a1f3bfac41b13d7f39a81ac961559cd0daf700fc677da7
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.16/pygobject-2.16.0.tar.bz2]
-md5=431e7d4632163b93d1ee43cd071a389c
-sha256=db0ab6f998bc5750aba2dfa96c8932f673914d8bf804a2c1c769b4a6e3f192d2
-
-[ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.20/pygobject-2.20.0.tar.bz2]
-md5=10e1fb79be3d698476a28b1e1b0c5640
-sha256=41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81
-
-[http://downloads.sourceforge.net/pygoogle/pygoogle-0.6.tar.gz]
-md5=334e2d9e5a765ffa9769e2c4cdfcd110
-sha256=ad3f4530977a15e52b379ef301a4a80cf69a883f24dd6cebc5b47b3009c092a4
-
-[http://heanet.dl.sourceforge.net/pygoogle/pygoogle-0.6.tar.gz]
-md5=334e2d9e5a765ffa9769e2c4cdfcd110
-sha256=ad3f4530977a15e52b379ef301a4a80cf69a883f24dd6cebc5b47b3009c092a4
-
-[ftp://ftp.gtk.org/pub/gtk/python/v1.2/pygtk-0.6.12.tar.gz]
-md5=31f0991a18708d47fa29583c0ad956f6
-sha256=7c95e6ae35d282fb333dc7b29bd91e543518ea7f3dfa11f21d52be0654234010
-
-[ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/pygtk-2.10.3.tar.bz2]
-md5=57cd2b7e6e383b58ce145199d03e40b7
-sha256=03a605f106e30bea448b04007635a21140eeaba4c8844188d661c3b133cbee89
-
-[ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/pygtk-2.10.4.tar.bz2]
-md5=89afe242275a3fce57b4ffb5fadc5888
-sha256=ab9ad4481af435894db27e78010f6bbc21c62252dbe7a254121453419edde8f5
-
-[ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.16/pygtk-2.16.0.tar.bz2]
-md5=bd0d437fefd6d5390f5d770a495cd50c
-sha256=7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7444a8
-
-[ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.6/pygtk-2.6.3.tar.bz2]
-md5=5acd4a4f5807f93a80389c1e9af48808
-sha256=1cd8e9bb0a011317862aec90a03e562bebbbf7fcf865a8ff12992548cdda746d
-
-[ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.8/pygtk-2.8.6.tar.bz2]
-md5=c69c2e5e86a8f21a5773df20e265fc3a
-sha256=dee1ec46a43bf624f1ff796903bd2d49e65c1cc8396385f46bf1489817bd6e60
-
-[ftp://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.6/pygtksourceview-2.6.0.tar.bz2]
-md5=5587a1865bd5c785c6f34095c57cc96b
-sha256=77acb735fee997a1638c79256b9dcf592566d066b54a72eb4321909f98f66178
-
-[http://downloads.sourceforge.net/pyid3lib/pyid3lib-0.5.1.tar.bz2]
-md5=49818a591430e08057c27a11e4c40aef
-sha256=2a7bdd52c24ed0e70e4a2d82c697214c4ab5a70f94ea9e7934df15ca202d1169
-
-[http://heanet.dl.sourceforge.net/pyid3lib/pyid3lib-0.5.1.tar.bz2]
-md5=49818a591430e08057c27a11e4c40aef
-sha256=2a7bdd52c24ed0e70e4a2d82c697214c4ab5a70f94ea9e7934df15ca202d1169
-
-[http://downloads.sourceforge.net/pyirclib/pyirclib-0.4.3.tar.gz]
-md5=b9d60e69314a548dfd7d48da3d540d62
-sha256=1615a543e645dd2199f6315d606dcc561373d64d1d7dfc74aba2246a67632808
-
-[http://downloads.emperorlinux.com/contrib/pyiw/pyiw-0.3.2.tbz2]
-md5=24e7d7c4ffe9ec96412786fe58d23073
-sha256=cbc3fc0b95250078826b8bfdf98e982c6c3f28919b23a2bb0d2c1d204b13aada
-
-[http://downloads.emperorlinux.com/contrib/pyiw/pyiw-0.3.3.tbz2]
-md5=152e59edffd60464b737dfe26f9fedce
-sha256=935a3b750ba4034deb41511a7d75393f93566a8a044227bfa19be6b04288dc91
-
-[ftp://ftp.logilab.org/pub/pylint/pylint-0.13.2.tar.gz]
-md5=79596b1bf05f0e5da7621a0bef798a3c
-sha256=749e0b693c9e2a30ef8fe04b0ffaabe05e392e4837b2bf353715fc8a852c5a6e
-
-[ftp://ftp.logilab.org/pub/pylint/pylint-0.15.2.tar.gz]
-md5=98f3917fc4d0855c8f0eab9761533835
-sha256=868c8c105427047842883efc2b1693137fae52e78017a7ae98c2e37b7c1e3f80
-
-[ftp://ftp.logilab.org/pub/pylint/pylint-0.3.3.tar.gz]
-md5=4ed7fb4b8bc126ca2412d9cf074f49c8
-sha256=56399d61e1ab5662189bced26f6450684adf179f5dd308bab7602e7aee1334af
-
-[http://downloads.sourceforge.net/pylirc/pylirc-0.0.5.tar.gz]
-md5=4e3b6b50485610e273fededdb25b47ad
-sha256=a78315e1ddf5af61cf91000a4b2f8e2df0841edd97b2596b2e0c5505bf8330a2
-
-[http://heanet.dl.sourceforge.net/pylirc/pylirc-0.0.5.tar.gz]
-md5=4e3b6b50485610e273fededdb25b47ad
-sha256=a78315e1ddf5af61cf91000a4b2f8e2df0841edd97b2596b2e0c5505bf8330a2
-
-[http://spacepants.org/src/pymad/download/pymad-0.5.1.tar.gz]
-md5=9b9a6c77d1b7a7706e77fd2e7e964c01
-sha256=4a854db3eefd5afcf5c5434f279a6c304129cce41d9046ba044db73686038412
-
-[http://spacepants.org/src/pymad/download/pymad-0.6.tar.gz]
-md5=a1405fb4b610348565c8d0e400c5ff18
-sha256=1c9fc529b78de7d26e9e47cf182c9f8bf43838d8f62a9c1773540d57f5ebc522
-
-[http://www.schwarzvogel.de/pkgs/pymetar-0.11.tar.gz]
-md5=7953d8ac04b889e0968620193c66473a
-sha256=f3237fe997390469af50f79ed5981f6c8cf051300f23c464aea332c900194a8c
-
-[http://www.schwarzvogel.de/pkgs/pymetar-0.14.tar.gz]
-md5=024fb0b46c0cb8cf21d63c68d2014796
-sha256=46d21122cd200099271e8377cf40c7a4dd005b0a3867a792632715de812c47fe
-
-[http://www.andrewchatham.com/pyogg/download/pyogg-1.3.tar.gz]
-md5=45a4ecc4d0600661199e4040a81ea3fe
-sha256=10051f2894e901037dfa05b3c604fbdd76d891b9db2213a3c4f24ae79fbcc2a4
-
-[http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.14/pyorbit-2.14.3.tar.bz2]
-md5=3c4d42ae1a7303fd85071a842617043f
-sha256=a3517e0ddaf23508f99e7489a23e3462f86c528ea24bce432e832a78ee4149db
-
-[http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.24/pyorbit-2.24.0.tar.bz2]
-md5=574593815e75ee6e98062c75d6d1581f
-sha256=8754669b8220aa1f151b920360029d5ea28c42bec55769059676725fe28397b8
-
-[http://www.wiggy.net/files/pyrad-0.8.tar.gz]
-md5=562ddc819d5f6b9d6e1458483e8bbd26
-sha256=0ba5090c66aa76a78dac74f92162f3220ac244ad79ce3ee749ff59022c6ca9fd
-
-[http://pypi.python.org/packages/source/p/pyrad/pyrad-1.1.tar.gz]
-md5=ab1502f8ccd7409ced757d78b0dee7df
-sha256=6a28096ae45261479048a0418b76ad5b6e370031ba8c773f495d8a2b018fc474
-
-[ftp://ra.stsci.edu/pub/pyraf/v2.3/pyraf-1.2.1.tar.gz]
-md5=cfa04c40cf969c81e882ad2820aa2914
-sha256=9fb0f6ce1b8234af3a18c589212fe418efca36cd5977a23ab8ee5887315358e8
-
-[ftp://ra.stsci.edu/pub/pyraf/v2.5/pyraf-1.4.tar.gz]
-md5=ec97161924bb644263eac9b010e705a5
-sha256=3fe6c1b65c44c105d72635b9fdf08560ec5e155e464a59cfe824a332d770fc0a
-
-[ftp://ra.stsci.edu/pub/pyraf/release/pyraf-1.7.tar.gz]
-md5=9a728aef7bebcd54abc103b00e2e1de6
-sha256=dc0f68f2d22cad2166ae3912e20713bb29df1e1450dff18eb426a74ef4087d2a
-
-[ftp://ftp.logilab.org/pub/pyreverse/pyreverse-0.5.0.tar.gz]
-md5=a35281f7b3fea3cceff54378ebac09a4
-sha256=703b204bd1d57b1bfc0ba95246d229a599259b782ee18072d6041656d412073b
-
-[ftp://ftp.logilab.org/pub/pyreverse/pyreverse-0.5.2.tar.gz]
-md5=499cfc69b3cacbdf70a32f253b4a0eb1
-sha256=cb5a5855c68743622b1902c7c106b30316c623c265906f2acb2fa2c9d97b3f37
-
-[http://handheldshell.com/software/pyring_1.1.10.tgz]
-md5=d6d2a16ccd1562b2ae63314f30a4ebf9
-sha256=45b73399b8affd1a81ecd370d37e066c046c49e1777b43d0affe6b520082a604
-
-[http://pypi.python.org/packages/source/p/pyrtm/pyrtm-0.2.tar.gz]
-md5=34423f39caf7df8a9db8e243be9cf1a0
-sha256=d9d46d096a38cb692b55f4ee9f364d54348298e9497b11c1ef057539b5de1567
-
-[http://www.vanille.de/mirror/pyserial-2.0.tar.bz2]
-md5=a8db6163466c21845faa6ef57af992da
-sha256=df76084516b34b5e04dd84e54ef38613d87c56bc04de3d0a711f72fb6707ab0b
-
-[http://downloads.sourceforge.net/pyserial/pyserial-2.2.zip]
-md5=14e774b7b6e5aa52820f0590d3b8c4d9
-sha256=f37c49e29ab9efae5f0ee5004ed34da00436cc0a99810ac4aae53bacec12ab12
-
-[http://heanet.dl.sourceforge.net/pyserial/pyserial-2.2.zip]
-md5=14e774b7b6e5aa52820f0590d3b8c4d9
-sha256=f37c49e29ab9efae5f0ee5004ed34da00436cc0a99810ac4aae53bacec12ab12
-
-[http://downloads.sourceforge.net/pyserial/pyserial-2.4.tar.gz]
-md5=eec19df59fd75ba5a136992897f8e468
-sha256=6b6a9e3d2fd5978c92c843e0109918a4bcac481eecae316254481c0e0f7e73c8
-
-[http://downloads.sourceforge.net/pysqlite/pysqlite-1.0.tar.gz]
-md5=f21b19ff048f6bafbbfc3edb86b4c4e4
-sha256=ca921f56f8e5aa4032abc25b13cf4c86bf5ba24f631c13dc4f511c45d3781dad
-
-[http://initd.org/pub/software/pysqlite/releases/2.2/2.2.2/pysqlite-2.2.2.tar.gz]
-md5=3260547d3f11c85613b2de8ed529a4fc
-sha256=76a82a6a45ae9c12c0409427765ae56c06d8dbb03321f21b8c4d7da48c7cd2b3
-
-[http://initd.org/pub/software/pysqlite/releases/2.4/2.4.0/pysqlite-2.4.0.tar.gz]
-md5=46b4590c51b9fb62cd0be1439646549e
-sha256=7e66c07d3eb93035f9272d01470e531a7c9f9d9751ad06f3a9c13b4f67c0a06a
-
-[http://downloads.sourceforge.net/meta-tools/pytest-0.5.0.tar.gz]
-md5=984074d5d2ca0d6aafd770976e60b8d2
-sha256=b957b471779237e1f0adb578a59a7a3c07217d01e9525314c5e6c28c348533ef
-
-[http://downloads.sourceforge.net/meta-tools/pytester-0.6.0.tar.gz]
-md5=8a7763e31e4cc3fdf9154c793dda3bc0
-sha256=7d17f07aa470cac6afc1b7e68745c1bf1767913ce52b401296e21cab245fe26b
-
-[http://heanet.dl.sourceforge.net/meta-tools/pytester-0.6.0.tar.gz]
-md5=8a7763e31e4cc3fdf9154c793dda3bc0
-sha256=7d17f07aa470cac6afc1b7e68745c1bf1767913ce52b401296e21cab245fe26b
-
-[http://pypi.python.org/packages/source/p/python-cjson/python-cjson-1.0.5.tar.gz]
-md5=4d55b66ecdf0300313af9d030d9644a3
-sha256=85bbe7a9fb6617e24bb4dbef528af8ef6eae07f8809dcd05ec926142feca7714
-
-[http://labix.org/download/python-constraint/python-constraint-1.1.tar.bz2]
-md5=975e5449d6670dd19498bb9ec4856d39
-sha256=0d904161351a8e55b272ed9691b12dca4278bed62fde53ba2a36f479996db910
-
-[http://labix.org/download/python-dateutil/python-dateutil-1.4.1.tar.gz]
-md5=2a5f25ab12fcefcf0b21348f2d47595a
-sha256=74b615c6a55b4421187feba1633fc233e7c5ebdd7abe9b092447a32946823357
-
-[http://downloads.sourceforge.net/python-fam/python-fam-1.1.1.tar.gz]
-md5=f6c760c6d8e5ea69a3fce029f7973558
-sha256=139f069a4455560a8c68c4c18569f2cb453eeda33d522862f7a4af13932d9cdc
-
-[http://heanet.dl.sourceforge.net/python-fam/python-fam-1.1.1.tar.gz]
-md5=f6c760c6d8e5ea69a3fce029f7973558
-sha256=139f069a4455560a8c68c4c18569f2cb453eeda33d522862f7a4af13932d9cdc
-
-[http://dl.cihar.com/python-gammu/latest/python-gammu-0.13.tar.bz2]
-md5=e92083c150264a2851fa5a7a1ef7bb9f
-sha256=1f43959d29b12397082a621f9ff436a76ec4b89cd44442ebce2e127e524f9b06
-
-[http://dl.cihar.com/python-gammu/latest/python-gammu-0.24.tar.bz2]
-md5=498e692243ac8888c267c1bd8c5438dd
-sha256=e8154db193951a7a3e1e6f4ba9daa3ed8e4ae409ef146f25606c8781de7bd934
-
-[http://dl.cihar.com/python-gammu/latest/python-gammu-0.26.tar.bz2]
-md5=886d0484b3eeaa306e61733d85407277
-sha256=954134b57e91339fcc5f3413629d9dfae517b42e202588b53e343927fd3fef88
-
-[http://pypi.python.org/packages/source/p/python-gettext/python-gettext-0.6.tar.gz]
-md5=747b1ab3a6fc00c93b5e269e220fcb38
-sha256=5a75dde767464626c4fe98f8e47ea2ed874217fd5f6093178de0154bf6090381
-
-[http://www.vanille.de/mirror/python-inotify-0.0.6.tar.gz]
-md5=f6bbd996e7dde9eef849468f3123a8f0
-sha256=f88bfa19a707f83fe74613da74ac801b5e0cfb98628655ecc4cfac481c05ec38
-
-[http://rudd-o.com/wp-content/uploads/projects/files/python-inotify/python-inotify-0.1.0.tar.gz]
-md5=361bcab2f0cd57cdaf6fe6fe433778b0
-sha256=22557b44a693918d2a4a4b267b22dd2baa542539e225e3999e1a2b1bf91b954a
-
-[http://downloads.sourceforge.net/python-irclib/python-irclib-0.4.6.tar.gz]
-md5=7e4fc4b5382c6b54ede8b6e29270cba8
-sha256=f1f472a698966b0350857b20fc7f6dd86e4a1f83870edfbe30eb36552b449680
-
-[http://heanet.dl.sourceforge.net/python-irclib/python-irclib-0.4.6.tar.gz]
-md5=7e4fc4b5382c6b54ede8b6e29270cba8
-sha256=f1f472a698966b0350857b20fc7f6dd86e4a1f83870edfbe30eb36552b449680
-
-[http://pypi.python.org/packages/source/p/python-ldap/python-ldap-2.3.9.tar.gz]
-md5=a9f9f16338288d118a1ae6266c993247
-sha256=62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4
-
-[http://opensource.bolloretelecom.eu/files/python-netfilter-0.5.4.tar.gz]
-md5=2029edea09db0829f16b06042c0004ed
-sha256=1ef9ca0508159cc63e1cd097a204664b99eedfa596d326866c8fce9b30715379
-
-[http://opensource.bolloretelecom.eu/files/python-netfilter-0.5.5.tar.gz]
-md5=058983355c399407be999d4e8c16cbe6
-sha256=bce93266c593d79d7083052a6cae516de3d6c3e5bda277f664785d30157b8ac7
-
-[http://pypi.python.org/packages/source/p/python-ptrace/python-ptrace-0.5.tar.gz]
-md5=0df3d1c5109bb88d06575d70513a190c
-sha256=8ff2ec30050803e8b60cfb05d24fa32b3d175bffb81ef5919c3db4ac0f263df8
-
-[http://pypi.python.org/packages/source/p/python-wifi/python-wifi-0.3.1.tar.gz]
-md5=0458e32f82900e03c9fd155442242638
-sha256=a7087ac16ce2d1f146dd76cbfc442ae5b91774f4b8c8eba913c09d0c325eb12f
-
-[http://download.sugarlabs.org/sources/external/python-xklavier/python-xklavier-0.2.tar.gz]
-md5=5b3cd1832f4d37dfa48490759f3bd3be
-sha256=b71096448ca9d7933fbc4aff13cef95a5878f49e4c25f20f815dd1f8f635b6d6
-
-[http://downloads.sourceforge.net/python-xlib/python-xlib-0.14.tar.gz]
-md5=a038c2f410d8445f3fa8f6dcd45659c5
-sha256=4771b0b6a605e0197ece5432fa601c61df724b32544239f463a867200f2160eb
-
-[http://downloads.sourceforge.net/pythondialog/pythondialog-2.7.tar.bz2]
-md5=19e68b362fe61ef84b981d53d96f0735
-sha256=5f7dbcbd28eebadc736d957b9511a87ad5570c8fc822c8123a42e7259773cb7f
-
-[http://heanet.dl.sourceforge.net/pythondialog/pythondialog-2.7.tar.bz2]
-md5=19e68b362fe61ef84b981d53d96f0735
-sha256=5f7dbcbd28eebadc736d957b9511a87ad5570c8fc822c8123a42e7259773cb7f
-
-[http://downloads.sourceforge.net/pyusb/pyusb-0.4.1.tar.gz]
-md5=9576c3e471e40e021fa44f36712bbd04
-sha256=9991a999170c533c10dbff227a9d617ef592fd579edfc21a55f0b715a7d329db
-
-[http://heanet.dl.sourceforge.net/pyusb/pyusb-0.4.1.tar.gz]
-md5=9576c3e471e40e021fa44f36712bbd04
-sha256=9991a999170c533c10dbff227a9d617ef592fd579edfc21a55f0b715a7d329db
-
-[http://www.andrewchatham.com/pyogg/download/pyvorbis-1.3.tar.gz]
-md5=3ddd0dc996b57827c324910cc899d40b
-sha256=c7816f5ad6e45634d88de80cff288b1e1a30bf0afb80f7ca3773e634779d64c0
-
-[http://www.andrewchatham.com/pyogg/download/pyvorbis-1.4.tar.gz]
-md5=b4921e792c0a74f75b9d3057df10ee7c
-sha256=a7154541cea58304feff30752243eab862131c7589d72c200c8ad722d3bf1647
-
-[http://downloads.sourceforge.net/meta-tools/pyweather-0.5.0.tar.gz]
-md5=b1539752674c3f955441339e340ea699
-sha256=a4fa2444a870ac70dfaddbb244aff0a4973c75c79b2eafe1a183567820eb4b79
-
-[http://downloads.emperorlinux.com/contrib/pywpa/pywpa-0.3.4.tbz2]
-md5=f118f45e5118517c6a099a68e8444d54
-sha256=1481afca7dfed9bcecfa6f4c8909a70bb0b90428e9b535b0bb40bc337bc62578
-
-[http://www.freedesktop.org/~lanius/pyxdg-0.15.tar.gz]
-md5=86a5441285fc908145414b63348d11a3
-sha256=c2adf20955cb62af5c94622d0dd47fb82ee63da33c03d5a1f82337ba83044bb7
-
-[http://www.freedesktop.org/~lanius/pyxdg-0.16.tar.gz]
-md5=55b71ec0df9509e05e562ac402b119f7
-sha256=b7f91cec9b42404a680c780c40d37c825701d7e533c1043bbabf6a0551e86635
-
-[http://downloads.sourceforge.net/pyzeroconf/pyzeroconf-0.12.tgz]
-md5=e7180e9440d961c6aba5056fdd7997f0
-sha256=00689fa56dd87eb47b30565ab7561c94d2cde58372e267116889d2531d880b98
-
-[http://heanet.dl.sourceforge.net/pyzeroconf/pyzeroconf-0.12.tgz]
-md5=e7180e9440d961c6aba5056fdd7997f0
-sha256=00689fa56dd87eb47b30565ab7561c94d2cde58372e267116889d2531d880b98
-
-[http://www.libqanava.org/dl/qanava-0.0.7.tar.gz]
-md5=ff9b1bef0be97e81691697fa670461fc
-sha256=a779934f67b8de54ab075834b7b1024b13f832a4299699a6fcf7c5d5cfc74972
-
-[http://www.piro.hopto.org/~piro/zaurus/qclockchange-0.1a.tar.gz]
-md5=05bb0611a9523ef8c095e768b357ba0d
-sha256=eba68cb125b017743a768bdc3c8788e97674ea499a40a03edee7976bf7b89063
-
-[http://piro.sytes.net/~piro/zaurus/etc/qclockchange-0.1b.tar.gz]
-md5=4131497c414c7fedae1df58cab2ddfa3
-sha256=8cb7000f55ab124d5fe928960c3c9a059faf4f374981b88e74ac0cdb7904c98a
-
-[http://byronbradley.co.uk/piccontrol/qcontrol-0.4.tar.gz]
-md5=8c073a5df813b437277a3de39636f61f
-sha256=c85ba04c9459cbc283a6f04ced730b49dc9966cf749808e8f960305116d525e6
-
-[http://www2.gol.com/users/ikezawa/zaurus/qcoptest_0.1.1.tar.gz]
-md5=a31f12647c5bb5f93c81465b4e5ff25a
-sha256=5795b9d619142e2d01016130c7ac71298aa1cabda4806f11762bb8fd489293af
-
-[http://download.savannah.gnu.org/releases/qemu/qemu-0.10.3.tar.gz]
-md5=320d6c536c8a1288cdc6c809f487e6d7
-sha256=89540d7a8c880a6ae33f8a55d55d580f3f03c10b02e32b7323719b3354f7b077
-
-[http://fabrice.bellard.free.fr/qemu/qemu-0.9.1.tar.gz]
-md5=6591df8e9270eb358c881de4ebea1262
-sha256=4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5
-
-[http://www.bellard.org/qemu/qemu-0.9.1.tar.gz]
-md5=6591df8e9270eb358c881de4ebea1262
-sha256=4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5
-
-[http://taiga0818.hp.infoseek.co.jp/rpms/qfish2-1.1.0.tar.gz]
-md5=2a8219bcb375fac66cea66394c3c36fa
-sha256=1e097fdccda0fc914c8229aab7d83964c5944cc95eb053fd69e357dca69461b9
-
-[http://www.qhull.org/download/qhull-2003.1.tar.gz]
-md5=48228e26422bff85ef1f45df5b6e3314
-sha256=68725c96603a426da748d38d0f83e7a9dd6a0bfc483525debe04001846475b0b
-
-[http://www.klografx.net/qiv/download/qiv-1.9-src.tgz]
-md5=b368e00543b2b1d9a87b37fd5ba60c57
-sha256=7ffeb0b90892d71eff4f26227962f5b306d52a55539f1cb2a72993c8252ca518
-
-[http://www.geocities.co.jp/SiliconValley-Oakland/8074/src/qmatrix-1.1.0.tar.gz]
-md5=03c874e403fcf1566d96a9a064cf73c9
-sha256=57d9c0be4714f9973ce50f70d77c68b874cc5456cab2d210861a4b1ee32cb67f
-
-[http://downloads.sourceforge.net/qof/qof-0.6.0.tar.gz]
-md5=4a81867ea4212cb5ebd2a6bde91502c0
-sha256=5782703fe0cbed713dc17ed10560f55408350310461483715b2c0a58bcd83c49
-
-[http://heanet.dl.sourceforge.net/qof/qof-0.6.0.tar.gz]
-md5=4a81867ea4212cb5ebd2a6bde91502c0
-sha256=5782703fe0cbed713dc17ed10560f55408350310461483715b2c0a58bcd83c49
-
-[http://downloads.sourceforge.net/qof/qof-0.7.2.tar.gz]
-md5=dff6bfda556544a240e833d22e509b50
-sha256=643359de7833c9fe661fcfc6fc0dc6e3f390bce55041eba123a495e661366990
-
-[http://heanet.dl.sourceforge.net/qof/qof-0.7.2.tar.gz]
-md5=dff6bfda556544a240e833d22e509b50
-sha256=643359de7833c9fe661fcfc6fc0dc6e3f390bce55041eba123a495e661366990
-
-[http://qolsr.lri.fr/code/qolyester-20050728.tar.bz2]
-md5=922ac0c5a70d8bcba50b23009b3c4878
-sha256=81ce65c833ecd7c98d0af1d19419a3d93af811d99865ed2c8b377a7e507af4a7
-
-[http://zaurus.colognearts.de/qpphoto/qpPhoto_1.0.2_src.tar.gz]
-md5=c3c806bd2910e6c49617acb230eee306
-sha256=ba2d98c4fabb31a66a66a235a5bbc9cb9e8a2c6f3939e71826d8763a8e7e3c0d
-
-[http://downloads.sourceforge.net/qpdf2/qpdf2_2.2.1_20040217b.tgz]
-md5=6b94eda9bd8e2b884c753d70fee04b3f
-sha256=3378f7a92f3afbc3663cce8c99790092282eb01101ba21aed4709736cf875ad5
-
-[http://heanet.dl.sourceforge.net/qpdf2/qpdf2_2.2.1_20040217b.tgz]
-md5=6b94eda9bd8e2b884c753d70fee04b3f
-sha256=3378f7a92f3afbc3663cce8c99790092282eb01101ba21aed4709736cf875ad5
-
-[http://www.vanille.de/mirror/qpe-gaim_20041030.tar.bz2]
-md5=b61c7005301956e231feacff707c7b19
-sha256=0b55004666e3353feef384c5795a05b5bf1a3b69a487aee5b8f8e9d66c133b86
-
-[http://www.bluelightning.org/qpe-nmap/files/qpe-nmap-0.02.tar.bz2]
-md5=82d20f06942324af7fc4ce302efb1028
-sha256=5ea7f9188aa221f004db1688713f35199adf3075d0b54f2bffa2461e9f11ee05
-
-[http://my-zaurus.narod.ru/downloads/qpealarmclock-1.0.9.tar.gz]
-md5=1d338397e60b8031458019bf4b322597
-sha256=5925931a046074598009ddee5c2989330f2fce570f6590c08a55ac955d1e64a6
-
-[http://downloads.sourceforge.net/qpegps/qpegps_0.9.2.3.3_src.zip]
-md5=974ff064b13640329da21f565ac351e6
-sha256=5b070799c3eebf1dd94b1d800da0d532d2e9c353e061d4addc3466232e4a3072
-
-[http://heanet.dl.sourceforge.net/qpegps/qpegps_0.9.2.3.3_src.zip]
-md5=974ff064b13640329da21f565ac351e6
-sha256=5b070799c3eebf1dd94b1d800da0d532d2e9c353e061d4addc3466232e4a3072
-
-[http://downloads.sourceforge.net/qpegps/qpegps_0.9.3.1_src.zip]
-md5=71b270b75bd773b81be3aaa0e4fc88cd
-sha256=f186ef1f117d3a9a9374ac19cfc8daad40a522638e5a758ec79fdd79fac351f4
-
-[http://heanet.dl.sourceforge.net/qpegps/qpegps_0.9.3.1_src.zip]
-md5=71b270b75bd773b81be3aaa0e4fc88cd
-sha256=f186ef1f117d3a9a9374ac19cfc8daad40a522638e5a758ec79fdd79fac351f4
-
-[http://downloads.sourceforge.net/qpegps/qpegps_0.9.3_src.zip]
-md5=2e477f949ee47f446c05e718fae4ec3b
-sha256=12b7f014e9ac0b650836ee9e54f58bd728c66591b7de94a9a8bd600bfb217622
-
-[http://home.midsouth.rr.com/zaurus/qpenmapfe_1.0.0_src.tar.gz]
-md5=6e913e436a7b0f7572ec1ac77db41fde
-sha256=ded3abdab8333aaf7f451963f32465ca1451a38afb173ef64e0f898d907a6e02
-
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-freemono-1.0.tar.bz2]
-md5=28688d47cd80d3a6bb833adb22292e15
-sha256=5ac0513efe6270d45a2ada5dc653c434677da4282e026d8c1a9c156cd99e11c8
-
-[http://www.openzaurus.org/download/3.5.4/sources/qpf-freemono-1.0.tar.bz2]
-md5=28688d47cd80d3a6bb833adb22292e15
-sha256=5ac0513efe6270d45a2ada5dc653c434677da4282e026d8c1a9c156cd99e11c8
-
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-freeserif-1.0.tar.bz2]
-md5=a7fa0210e02f42d5b14245e260bc72c3
-sha256=c8ee6e5e62b0a182dbee85865e56b1572e6875769b8256b39c75b2334a283e45
-
-[http://www.openzaurus.org/download/3.5.4/sources/qpf-freeserif-1.0.tar.bz2]
-md5=a7fa0210e02f42d5b14245e260bc72c3
-sha256=c8ee6e5e62b0a182dbee85865e56b1572e6875769b8256b39c75b2334a283e45
-
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-helvetica.tar.bz2]
-md5=20c040a004f4949b6849658148a78388
-sha256=4b6a122b4f95cf90f9639ca423947e70bba4e567099f9baeada419a51b11924b
-
-[http://www.openzaurus.org/download/3.5.4/sources/qpf-helvetica.tar.bz2]
-md5=20c040a004f4949b6849658148a78388
-sha256=4b6a122b4f95cf90f9639ca423947e70bba4e567099f9baeada419a51b11924b
-
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-hunkysans-0.3.0-r4.tar.bz2]
-md5=917d7f8f3ad3c5b94c747b37d0a5e74a
-sha256=c3cdd8f234cbc1694af777dc1739ca4439cd472567d85f333dc11264d6bda7c8
-
-[http://www.openzaurus.org/download/3.5.4/sources/qpf-hunkysans-0.3.0-r4.tar.bz2]
-md5=917d7f8f3ad3c5b94c747b37d0a5e74a
-sha256=c3cdd8f234cbc1694af777dc1739ca4439cd472567d85f333dc11264d6bda7c8
-
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-hunkyserif-0.3.0-r4.tar.bz2]
-md5=02b38aeaf30c17e15b714b9594ca504d
-sha256=3c5890d6b0aee2d4c1e0c6b8101b6b5381985e86bc50dffc338b8601f4aa7ae8
-
-[http://www.openzaurus.org/download/3.5.4/sources/qpf-hunkyserif-0.3.0-r4.tar.bz2]
-md5=02b38aeaf30c17e15b714b9594ca504d
-sha256=3c5890d6b0aee2d4c1e0c6b8101b6b5381985e86bc50dffc338b8601f4aa7ae8
-
-[http://www.openzaurus.org/mirror/qpf-unifont.tar.bz2]
-md5=92f6df1c5edb26351332df4f576dbb10
-sha256=c1c5b5ab3431896502c9275daeb47610fb2a840faa6d580e140909a3f4ef7391
-
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-utopia.tar.bz2]
-md5=fa2563f3c2332c5bcb05add075908f1e
-sha256=599eed45edc9942f4b37858507c2223cb8decb13fea180cf33c6961ad48a33d1
-
-[http://www.openzaurus.org/download/3.5.4/sources/qpf-utopia.tar.bz2]
-md5=fa2563f3c2332c5bcb05add075908f1e
-sha256=599eed45edc9942f4b37858507c2223cb8decb13fea180cf33c6961ad48a33d1
-
-[http://www.vanille.de/mirror/qpobox-0.5.4.tar.gz]
-md5=45a7f9baeaaf638c6fcd0aa6f1f78080
-sha256=405538793e33bf959cfc53955544615e691da8e37538e79855532d64dad5a95b
-
-[http://www.mneuroth.de/privat/zaurus/qscintilla-1.60-gpl-1.3_zaurus.tar.gz]
-md5=3823bdfc40af13adcfd5f44e6dae5cf0
-sha256=5df3def9192f704c52ee3ddcf4388a2977f237be1663353a97d836b69cc4f811
-
-[http://www.mneuroth.de/privat/zaurus/qscintilla-1.60-gpl-1.3b_zaurus.tar.gz]
-md5=44939519d6623596d874b73695176fef
-sha256=605ce768faedaebcfcff86c3e720c23a114f63850c4f4e975f83de01171a89e0
-
-[http://www.mneuroth.de/privat/zaurus/qscintilla-1.65-gpl-1.6_zaurus.tar.gz]
-md5=999d3a8b916cd1ef13a66843f6f26db7
-sha256=e828dc4aaa7948eafee343e70190dd8003498d50d9258d75d47f05f9970683db
-
-[http://download2.berlios.de/qsvn/qsvn-0.3.0-src.tar.gz]
-md5=66cfcc9cb5f4e32ef30b2c13de51499b
-sha256=99e73cec97c62fecaccc4a7f354392ea9964d8c20b0a4a330890c32dbac87732
-
-[ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-2.3.10-free.tar.gz]
-md5=1f7ad30113afc500cab7f5b2f4dec0d7
-sha256=883363eb0c94de3d1e36f3ab9e09a8f127418d497213cc1a0ed1a1588ecd66b8
-
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qt-embedded-2.3.10-snapshot-20060120.tar.gz]
-md5=fec42313fd5508d840240b5dd2fe27eb
-sha256=0a706cf4c2a70dfeff2e886f225007844a4675f5c6387fb46c4b7f7ef327b68e
-
-[http://www.openzaurus.org/download/3.5.4/sources/qt-embedded-2.3.10-snapshot-20060120.tar.gz]
-md5=fec42313fd5508d840240b5dd2fe27eb
-sha256=0a706cf4c2a70dfeff2e886f225007844a4675f5c6387fb46c4b7f7ef327b68e
-
-[ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-3.3.5.tar.bz2]
-md5=022d7a3c572b554f3c47b12cae71a8a4
-sha256=a97656796c0ef8e87dd83e6138bc406e31830d08f9b213e039d8be39ea65c8e4
-
-[ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.5.tar.bz2]
-md5=022d7a3c572b554f3c47b12cae71a8a4
-sha256=a97656796c0ef8e87dd83e6138bc406e31830d08f9b213e039d8be39ea65c8e4
-
-[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.4.0.tar.bz2]
-md5=e17ad8c9dfecc95a3fd2bd5ed1d7bd3a
-sha256=79945d06de16736d14210139e8e68cf29f8ea312190d2375507511f367a2f872
-
-[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.4.1.tar.bz2]
-md5=491d41cae681a2bab2656f8adc3ba503
-sha256=37274eff0b7cfb6f5a01e2535639ccd3eb4e9c6b27902d1f3bdf68a705c438d0
-
-[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.4.3.tar.bz2]
-md5=9a639aec44a1e4c70040117183d247a3
-sha256=05d06b93f95092f1318634fca24f0c2d0a1252c9f1dc2fbb427b07e8ecbb4f39
-
-[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.5.0.tar.bz2]
-md5=3bd081c940c8580ecaabc1bd898e48f0
-sha256=4f6319c6031af47ef81fef08f465e4db61c0f169f5eb9bbc8f060cc3db3ffafa
-
-[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.5.1.tar.bz2]
-md5=43e7384c59625af0830032348f672a1d
-sha256=f525ad885675f4c2413d67d9a5efaf7c34862d88c796fe7e7e2d05a42a1a66c8
-
-[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.5.2.tar.bz2]
-md5=62186345c609a72b89f16d83bc7a130f
-sha256=272301a27e2f7bcd44c8d09f496e1c749c80b86d9489ea9c30bb265bf2dd02fc
-
-[http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.0-tp1.tar.gz]
-md5=61784f1bcac80f18f468b8dd013eab4f
-sha256=9cfe0418699e231587182b441c8f6ca68f109059c62bfc8dd9daeafb8277d211
-
-[ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.6.0.tar.gz]
-md5=2a7b5126f2450d8525af355fc4c12ad6
-sha256=55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589
-
-[ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.6.1.tar.gz]
-md5=0542a4be6425451ab5f668c6899cac36
-sha256=4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5
-
-[ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.6.2.tar.gz]
-md5=eb651ee4b157c01696aa56777fc6e0e5
-sha256=176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2]
-md5=05d04688c0c0230ed54e89102d689ca4
-sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.6.tar.bz2]
-md5=dc1384c03ac08af21f6fefab32d982cf
-sha256=04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.7.tar.bz2]
-md5=655e21cf6a7e66daf8ec6ceda81aae1e
-sha256=48c05b501029f0640db665fbc7f981a0efbf69ad3cf87a43c5eea4872f4f7ba1
-
-[ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-4.1.1.tar.gz]
-md5=d82b0374d481f93e481aad4e3f26893a
-sha256=a23860a7390bbbc87cf98833f8716cd03b88b1d6fce77e0624daba3150a177e9
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.1.1.tar.gz]
-md5=d82b0374d481f93e481aad4e3f26893a
-sha256=a23860a7390bbbc87cf98833f8716cd03b88b1d6fce77e0624daba3150a177e9
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.1.2.tar.gz]
-md5=18bca010d09b98e94210710047baca0a
-sha256=025655971eef7f76ece9754346d6eb4e2dd44ddf569c4c84de27836aa24b04a3
-
-[ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-4.2.3.tar.gz]
-md5=13f12bf58a32ebf15837fcd605cb3c99
-sha256=c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-
-[ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-4.3.0.tar.gz]
-md5=8012acea71b35c18247bd92c4721589d
-sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.3.tar.gz]
-md5=19678fe35170559cd6a6fa531c57799c
-sha256=89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.0.tar.gz]
-md5=f13ad0aa75efad314715930e663bad55
-sha256=4d1a5bf6a4e85eea83ef3e73d994f74cc4dd979e1023eaedef8da931ea37833a
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.1.tar.gz]
-md5=b09decad252b5181f300135e3122481d
-sha256=5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.3.tar.gz]
-md5=376c003317c4417326ba2116370227d0
-sha256=79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.0.tar.gz]
-md5=d6d1555b7a074e0a746f6247af402e11
-sha256=61831af6b71c7bd4e1ef542071225835d8c741fa8e079bceab8c83f712e396a1
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.1.tar.gz]
-md5=f81a94e2ab7713b2d375d4e5cfc8e051
-sha256=aa3f5a459d042681a321f33e8d99468337a00674d68b8a512e0078625c1f51da
-
-[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.2.tar.gz]
-md5=d8bcc070a58db25c228b7729ffad4550
-sha256=4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
-
-[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz]
-md5=9519eccf0638c9962f73a7b20da77e0e
-sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
-
-[ftp://ftp.trolltech.com/pub/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz]
-md5=70b729dd5dd8b2b432d685918e1971f1
-sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963
-
-[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz]
-md5=70b729dd5dd8b2b432d685918e1971f1
-sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963
-
-[ftp://ftp.trolltech.com/pub/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz]
-md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f
-sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d
-
-[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz]
-md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f
-sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d
-
-[http://keepcool.kf.tu-berlin.de/public/mitarbeiter/sadowski/qtopia-squeak-3.4-2_patched.tar.gz]
-md5=0e2bab65b62784d8714057624373f70d
-sha256=f364de206e1e0f9b1fe84c22a41ff56ebe80d01f0779da2470bbd3efddb3feec
-
-[http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz]
-md5=0a481885a496092c77eb4017540b5cf6
-sha256=6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132
-
-[http://www.quagga.net/download/quagga-0.99.14.tar.gz]
-md5=3a075fd5e26ec6d52f4a51b14a2d3c2c
-sha256=3f637fa1b49d335c00e78602754977d22455ba6e4a82ce4183c4da50667067e5
-
-[http://www.quagga.net/download${QUAGGASUBDIR}/quagga-0.99.4.tar.gz]
-md5=a75d3f5ed0b3354274c28d195e3f6479
-sha256=4044bfacb44ec9fa9160b56aeb1e76e1ca62b17115ae38298065cbaad16491a7
-
-[http://www.quagga.net/download${QUAGGASUBDIR}/quagga-0.99.6.tar.gz]
-md5=78137ecaa66ff4c3780bd05f60e51cf5
-sha256=a22c927f9ceb7152b0c45c939ccb81217c8d614f3c411c86781b24520f2ec15a
-
-[http://www.quagga.net/download/attic/quagga-0.99.6.tar.gz]
-md5=78137ecaa66ff4c3780bd05f60e51cf5
-sha256=a22c927f9ceb7152b0c45c939ccb81217c8d614f3c411c86781b24520f2ec15a
-
-[http://www.quagga.net/download/attic/quagga-0.99.7.tar.gz]
-md5=f448281c50007408ce92c5d8e2107abc
-sha256=fd258e4503646129ca77f6fe9c16b69f36f320256768b84dbabd2e4915ab8eb4
-
-[http://www.quagga.net/download/attic/quagga-0.99.8.tar.gz]
-md5=0a53fb579033fa57ca0e5c3ff0b52105
-sha256=7e745118921982ad7f67a6733161f74c88ba71c587158ab335f0581124be551d
-
-[http://mirror1.pdaXrom.org/rc9/src/quake1src.tar.bz2]
-md5=28405a79f488570bf4e2e8d453f856a0
-sha256=5cd896faae49268327231f299a1187a974cb85acb509fffe8a60b84693a7e3e8
-
-[http://katastrophos.net/zaurus/sources/quasar/quasar_0.9_beta3_sources.tar.bz2]
-md5=97814471766f333e8642d338406ac9c5
-sha256=8a1a1e67980fb664f12dd99851cb600b970371bf35bb5e3242ef4d341877e80f
-
-[http://tastyspleen.net/~jdolan/quetoo-0.6.1.tar.bz2]
-md5=2255c1d9857c725f6e82662593fcb51e
-sha256=f39180bbf8ca641a4a4b9a2d19fb5ef61f2e368b53729944588549b8cb9ac3c0
-
-[http://users.softlab.ece.ntua.gr/~ttsiod/quickstartindex.cc]
-md5=841603b0b16162b3b47f9f85cb2e1dfd
-sha256=8ed21bd84253d3d09a67481d3b441b6410a173b65c952c3e9e2e1c7b67aea6c8
-
-[http://users.softlab.ece.ntua.gr/~ttsiod/quickstartsearch.cc]
-md5=9874bb8924b9ffcfb82ffdfb9bac94d1
-sha256=643bcc948b53b2f2a72fc1698574e1004831784467f660b0da9955db0b392f1d
-
-[http://download.savannah.gnu.org/releases/quilt/quilt-0.39.tar.gz]
-md5=34f0c654aefba0342db6c676988634b5
-sha256=06b32d6f8fe7065b4c2c8142a244374e1be963757125bac20ba016b92231b5bf
-
-[http://download.savannah.gnu.org/releases/quilt/quilt-0.45.tar.gz]
-md5=5f8dd5a041ca7c700b16620228f922aa
-sha256=de7290f334baf631a14d031df304ee94cfb550aa69e7512aa589d21c2381c7d8
-
-[http://download.savannah.gnu.org/releases/quilt/quilt-0.46.tar.gz]
-md5=4508546d1ed0257ef7c128b6121b7208
-sha256=47bf030565bb462840db694acc183273455714028c74974c5b3a3bd4ad29ad89
-
-[http://download.savannah.gnu.org/releases/quilt/quilt-0.48.tar.gz]
-md5=f77adda60039ffa753f3c584a286f12b
-sha256=73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc
-
-[http://download.savannah.nongnu.org/releases/qwo/qwo-0.4.tar.gz]
-md5=72811b7d7fecfbdca45d5a74394daa4f
-sha256=c3b9bffd3e27090d4c0623ef61f48257343d0f6ea1cf573f5296250ab7551e5d
-
-[http://download.savannah.nongnu.org/releases/qwo/qwo-0.5.tar.gz]
-md5=9e1f7394be0a2eb2891e915f594d5f95
-sha256=fbb416acee1f8fe56394f37074154138f3cf324f48ce611cc2df40eb73b5c9ff
-
-[http://downloads.sourceforge.net/qwt/qwt-4.2.0rc1.tgz]
-md5=142b10ab27e837c3c4603cf9a7e9343b
-sha256=3b6db68d53441119dced27e5bad26ec087294cb9d878d37bcea61e1f1e4849a1
-
-[http://heanet.dl.sourceforge.net/qwt/qwt-4.2.0rc1.tgz]
-md5=142b10ab27e837c3c4603cf9a7e9343b
-sha256=3b6db68d53441119dced27e5bad26ec087294cb9d878d37bcea61e1f1e4849a1
-
-[http://www.xm1math.net/qxmp/qxmp-1.0.tar.bz2]
-md5=9eb52b5b6c1dda6ff96790acb9915da8
-sha256=285be4b83819c4bf24b2db1e120a9c8e1756863f49aa631acf09bbbae1e04709
-
-[ftp://ftp.westwood.com/pub/redalert/previews/demo/ra95demo.zip]
-md5=b44ab9ec1bc634ea755587d1988e3722
-sha256=8c48bdb53523ea4d353a7914d9234ce4e3e6f5832eeb47b3b6b005853e8748d2
-
-[http://downloads.sourceforge.net/radlib/radlib-2.6.2.tar.gz]
-md5=e3a4b94c4c70b66accb018fdd0e93209
-sha256=fff54e79937babd9e519f2f56c60e15eee6c453cba9ad2d238154d6fc96450bf
-
-[http://heanet.dl.sourceforge.net/radlib/radlib-2.6.2.tar.gz]
-md5=e3a4b94c4c70b66accb018fdd0e93209
-sha256=fff54e79937babd9e519f2f56c60e15eee6c453cba9ad2d238154d6fc96450bf
-
-[http://v6web.litech.org/radvd/dist/radvd-0.7.2.tar.gz]
-md5=26ea468b2323e44cf827ae5f84d18dc8
-sha256=66ed3cbb85c77aaf8293e3e5df678dc9ade82253628d2ce8cec570655cf157e9
-
-[http://v6web.litech.org/radvd/dist/radvd-1.0.tar.gz]
-md5=8bce4a21757cf069f5a69e2f9bee9e5b
-sha256=fbc44fac8356426c115914eb5dce6fc84afea923ad6aba1670a3402c06bda7ab
-
-[http://xlibs.freedesktop.org/release/randrext-1.0.tar.bz2]
-md5=19cb88ab378efcdebc15974fb9ba4a00
-sha256=9e1db25eec33ba1dff95010d6b8f1150ea40e7f953f1b6b7668a69a1171d23df
-
-[http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.2.1.tar.bz2]
-md5=e2e45564f8ce22e00e1360e79c8ccdeb
-sha256=102fd42f8f2562450f4e45c28bfb0390c2d30ffa6a805eead15d67018930f654
-
-[http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.3.0.tar.bz2]
-md5=a49416013fff33c853efb32f1926551e
-sha256=cfeb1429465e3c24debde1bf53ec35ef738fde5e80d2eed14f33e315e747bb8d
-
-[http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.3.1.tar.bz2]
-md5=a5c244c36382b0de39b2828cea4b651d
-sha256=d93ca3c0ae710a45da6a27e1eeadfb3c9d4aee47f23657c996e1124c0d9985ca
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/randrproto-X11R7.0-1.1.2.tar.bz2]
-md5=bcf36d524f6f50aa16ee8e183350f7b8
-sha256=7a5eb58f10d02f58c2f7fb153bb5dc6d72173d5fa3d317bdbd9674f4577e0ad0
-
-[http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-5.7.tar.Z]
-md5=423282f0edb353296d9f3498ab683abf
-sha256=7b7d2f7f5c2bbb096d23ee6dc5590b7d0b84e16ed54694d5794b7a4a989a63ad
-
-[http://downloads.sourceforge.net/rdesktop/rdesktop-1.3.1.tar.gz]
-md5=968a1e3f5161bab80c306df31c54cfb1
-sha256=67332a0a16471c1c3592d3e51ae5cc0562f9a2f1b1ab942b493f7d5080bd2c33
-
-[http://heanet.dl.sourceforge.net/rdesktop/rdesktop-1.3.1.tar.gz]
-md5=968a1e3f5161bab80c306df31c54cfb1
-sha256=67332a0a16471c1c3592d3e51ae5cc0562f9a2f1b1ab942b493f7d5080bd2c33
-
-[http://downloads.sourceforge.net/rdesktop/rdesktop-1.4.1.tar.gz]
-md5=78dd2bae04edf1cb9f65c29930dcc993
-sha256=db3da6016ceec07efda277adcb175b14c4e5255b0f85137f4a1dce79b0ee5144
-
-[http://heanet.dl.sourceforge.net/rdesktop/rdesktop-1.4.1.tar.gz]
-md5=78dd2bae04edf1cb9f65c29930dcc993
-sha256=db3da6016ceec07efda277adcb175b14c4e5255b0f85137f4a1dce79b0ee5144
-
-[http://downloads.sourceforge.net/rdesktop/rdesktop-1.5.0.tar.gz]
-md5=433546f60fc0f201e99307ba188369ed
-sha256=5ead17c3d29cb1028aeca485ee7a8c65694c1b02a1b7014c3da920b265a438aa
-
-[http://heanet.dl.sourceforge.net/rdesktop/rdesktop-1.5.0.tar.gz]
-md5=433546f60fc0f201e99307ba188369ed
-sha256=5ead17c3d29cb1028aeca485ee7a8c65694c1b02a1b7014c3da920b265a438aa
-
-[http://downloads.sourceforge.net/rdesktop/rdesktop-1.6.0.tar.gz]
-md5=c6fcbed7f0ad7e60ac5fcb2d324d8b16
-sha256=35026eaa8e14ca8bd0ba3730926f14222f8452f2ac662623bbf1909d8b060979
-
-[http://heanet.dl.sourceforge.net/rdesktop/rdesktop-1.6.0.tar.gz]
-md5=c6fcbed7f0ad7e60ac5fcb2d324d8b16
-sha256=35026eaa8e14ca8bd0ba3730926f14222f8452f2ac662623bbf1909d8b060979
-
-[http://qa.debian.org/watch/sf.php/rdesktop/rdesktop-1.6.0.tar.gz]
-md5=c6fcbed7f0ad7e60ac5fcb2d324d8b16
-sha256=35026eaa8e14ca8bd0ba3730926f14222f8452f2ac662623bbf1909d8b060979
-
-[http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.0.4.tar.gz]
-md5=756b38aaf2602d097cafd08996fb7887
-sha256=e754605b72b5498d11207920291d0eed6fa78ad46d3b9ad018cff9bb480224ea
-
-[http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.1.5.tar.gz]
-md5=37478b1d3e76ea521aac22216582ec58
-sha256=0cbfb4b3940ecc9e351bbd72b5a9c53af050f2f5f63d500e8ff714ab6c91e447
-
-[http://downloads.sourceforge.net/re2c/re2c-0.13.1.tar.gz]
-md5=d6168a6c18d5912e98d9343b33fdad97
-sha256=1a47035dd0f283dbc6c0964679afdf6f2c975b462419d1880ac379dc880ba74a
-
-[http://heanet.dl.sourceforge.net/re2c/re2c-0.13.1.tar.gz]
-md5=d6168a6c18d5912e98d9343b33fdad97
-sha256=1a47035dd0f283dbc6c0964679afdf6f2c975b462419d1880ac379dc880ba74a
-
-[http://john.fremlin.de/programs/linux/read-edid/read-edid-1.4.1.tar.gz]
-md5=aadc9a21ea4a1c9819757cda973372f4
-sha256=bffac0107bf6a64a35291e4ca1afc8823996ca6b334f05e6debe9fa558934947
-
-[http://ftp.de.debian.org/debian/pool/main/r/read-edid/read-edid_1.4.1-2.1.diff.gz]
-md5=77a18acd52ece9540d62859e964943bf
-sha256=4d129037dd239adf58280cd7f1110622995d5c1ce428d53b17cbdf32cfbadb96
-
-[ftp://ftp.cwru.edu/pub/bash/readline-4.3.tar.gz]
-md5=f86f7cb717ab321fe15f1bbcb058c11e
-sha256=eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
-
-[ftp://ftp.gnu.org/gnu/readline/readline-4.3.tar.gz]
-md5=f86f7cb717ab321fe15f1bbcb058c11e
-sha256=eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
-
-[ftp://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz]
-md5=e39331f32ad14009b9ff49cc10c5e751
-sha256=12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45
-
-[ftp://ftp.gnu.org/gnu/recode/recode-3.6.tar.gz]
-md5=be3f40ad2e93dae5cd5f628264bf1877
-sha256=e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf
-
-[http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.13.2.tar.bz2]
-md5=0ed4706564a34fc2aff724aa16d3ff00
-sha256=04e77a8b14f373a1825bbe0116cd0db8b2c5dee17b34ba9bddd27e576609cff9
-
-[http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.14.tar.bz2]
-md5=70f5998c673aa510e2acd6d8fb3799de
-sha256=1bd2375bd2bdaa3ea90aa0a70cf1657a2d61877b6eb7e3fe3e6f1d289e69d067
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/recordproto-X11R7.0-1.13.2.tar.bz2]
-md5=6f41a40e8cf4452f1c1725d46b08eb2e
-sha256=080aecbaaa5ad81750541ed19fb5ea6ccb45e1c2a5a93e9a2878a42532e40ba5
-
-[http://packetstormsecurity.org/wireless/redfang.2.5.tar.gz]
-md5=84c0a051ba5358546a9c0e393095ab91
-sha256=7cf45008810ca894b085ae0eb1a0071f0cb6989dd9ce35cfcd617fedf7018c7f
-
-[http://download.librdf.org/source/redland-1.0.8.tar.gz]
-md5=ca66e26082cab8bb817185a116db809b
-sha256=8a77fcfd20fea2c6e53761d6dcbbee3fdb35e5308de36c1daa0d2014e5a96afe
-
-[http://downloads.sourceforge.net/refdbg/refdbg-1.2.tar.gz]
-md5=ed807a83455b8aaff5e894e94161a352
-sha256=0b8591a646d214f0f959483dfcd9b9624996790d546982d814b47ca8fe4c5725
-
-[http://heanet.dl.sourceforge.net/refdbg/refdbg-1.2.tar.gz]
-md5=ed807a83455b8aaff5e894e94161a352
-sha256=0b8591a646d214f0f959483dfcd9b9624996790d546982d814b47ca8fe4c5725
-
-[http://savannah.nongnu.org/download/regex-markup/regex-markup-0.10.0.tar.gz]
-md5=47f9df1cd3865d20aecd6d73e7a7518d
-sha256=879f0af7622c1eb2d1b7c5f7d0ec53ea96fd48b05bc4f4c17542a2ea17fafba5
-
-[http://downloads.sourceforge.net/regina-rexx/regina33.zip]
-md5=600da451b706c4f24451299e348da555
-sha256=74f1521cc613855d26881c7b46fe72b59dafdf377cf26ec9d4f064979039a27f
-
-[http://heanet.dl.sourceforge.net/regina-rexx/regina33.zip]
-md5=600da451b706c4f24451299e348da555
-sha256=74f1521cc613855d26881c7b46fe72b59dafdf377cf26ec9d4f064979039a27f
-
-[ftp://ftp.namesys.com/pub/reiser4progs/old-versions/reiser4progs-1.0.4.tar.gz]
-md5=b2cbc8eb9429b50e0e99ba4eeda4801e
-sha256=4990e24f9a49588cc2d7c3646fb9b5c3946213db26e1df129d218265a88ada2e
-
-[ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-3.6.19.tar.gz]
-md5=b42cf15f6651c3ceff5cb84996c0d539
-sha256=c0862c53aecd23724a72d32fb54706d61d9858925c78408a2852d042417e68bf
-
-[ftp://ftp.debian.org/debian/pool/main/r/reiserfsprogs/reiserfsprogs_3.6.19.orig.tar.gz]
-md5=b42cf15f6651c3ceff5cb84996c0d539
-sha256=c0862c53aecd23724a72d32fb54706d61d9858925c78408a2852d042417e68bf
-
-[ftp://ftp.nl.debian.org/debian/pool/main/r/reiserfsprogs/reiserfsprogs_3.6.19.orig.tar.gz]
-md5=b42cf15f6651c3ceff5cb84996c0d539
-sha256=c0862c53aecd23724a72d32fb54706d61d9858925c78408a2852d042417e68bf
-
-[ftp://ftp.us.debian.org/debian/pool/main/r/reiserfsprogs/reiserfsprogs_3.6.19.orig.tar.gz]
-md5=b42cf15f6651c3ceff5cb84996c0d539
-sha256=c0862c53aecd23724a72d32fb54706d61d9858925c78408a2852d042417e68bf
-
-[http://xorg.freedesktop.org/releases/individual/app/rendercheck-1.3.tar.bz2]
-md5=eb6a358b79b0aeaf03d56c5e1f394365
-sha256=60e83bebab37c2754ae77cc359c0b67e8bc72b46821c7fa260ccc5c811bd741f
-
-[http://xlibs.freedesktop.org/release/renderext-0.8.tar.bz2]
-md5=b00a97b00bf93ab2ac6442ea13ea9c0b
-sha256=779317ca2e99f02b394af0c6f77f16def56de3b71a5d9f9ac6e5e9cfb65192e1
-
-[http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.11.tar.bz2]
-md5=b160a9733fe91b666e74fca284333148
-sha256=c4d1d6d9b0b6ed9a328a94890c171d534f62708f0982d071ccd443322bedffc2
-
-[http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.9.2.tar.bz2]
-md5=28fbe8a59ebd31f098b90ec64f3d133a
-sha256=7754dfbbb1e3818f28720fa9647b8a593e9d54626a7896771c2bfac7f75e2726
-
-[http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.9.3.tar.bz2]
-md5=598bc9a493deee2e48e4434e94467189
-sha256=c98a08b877e98a8fa7daa04be472de7e0cb38a99593faca8b987effcea2dd45b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/renderproto-X11R7.0-0.9.2.tar.bz2]
-md5=a7f3be0960c92ecb6a06a1022fe957df
-sha256=a875741d110a73952119460fac31e1bb7d0b0aff16f59c2a0a04bcd434c74f41
-
-[http://www.pellicosystems.com/zaurus/applications/resistorUI_1.5.0-0.9_armSRC.zip]
-md5=3ef812023466905883a19a22ead8615c
-sha256=467910e5f6b6e137db93a1ccaf668d4146c3dd27dfa0f368b2a20a0a14a23592
-
-[ftp://ftp.debian.org/debian/pool/main/r/resolvconf/resolvconf_1.28.tar.gz]
-md5=fa360e7dcdb195fa5738216facc881c6
-sha256=6c2bd1aa8894a7eb180945a39780e00f4b3949aa487fe278fcace5310d4a2da5
-
-[ftp://ftp.nl.debian.org/debian/pool/main/r/resolvconf/resolvconf_1.28.tar.gz]
-md5=fa360e7dcdb195fa5738216facc881c6
-sha256=6c2bd1aa8894a7eb180945a39780e00f4b3949aa487fe278fcace5310d4a2da5
-
-[ftp://ftp.debian.org/debian/pool/main/r/resolvconf/resolvconf_1.41.tar.gz]
-md5=f7cc9a2a30f480be3ecefedea363575c
-sha256=357ae73b048a2a6db46c8b28e0b79bc9448dbae96f52e44b07db7e40895ef2cf
-
-[ftp://ftp.nl.debian.org/debian/pool/main/r/resolvconf/resolvconf_1.41.tar.gz]
-md5=f7cc9a2a30f480be3ecefedea363575c
-sha256=357ae73b048a2a6db46c8b28e0b79bc9448dbae96f52e44b07db7e40895ef2cf
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/r/resolvconf/resolvconf_1.41.tar.gz]
-md5=f7cc9a2a30f480be3ecefedea363575c
-sha256=357ae73b048a2a6db46c8b28e0b79bc9448dbae96f52e44b07db7e40895ef2cf
-
-[ftp://ftp.debian.org/debian/pool/main/r/resolvconf/resolvconf_1.43.tar.gz]
-md5=15faef2aba7b99782f3b0b8b5d30f80a
-sha256=17e1105cddd928adf7d47e050f9bb49557850687f800b3e24cbbf22933ff31ae
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/r/resolvconf/resolvconf_1.43.tar.gz]
-md5=15faef2aba7b99782f3b0b8b5d30f80a
-sha256=17e1105cddd928adf7d47e050f9bb49557850687f800b3e24cbbf22933ff31ae
-
-[ftp://ftp.us.debian.org/debian/pool/main/r/resolvconf/resolvconf_1.43.tar.gz]
-md5=15faef2aba7b99782f3b0b8b5d30f80a
-sha256=17e1105cddd928adf7d47e050f9bb49557850687f800b3e24cbbf22933ff31ae
-
-[ftp://ftp.debian.org/debian/pool/main/r/resolvconf/resolvconf_1.45.tar.gz]
-md5=1f0b0bccb4dc0a762dacf6aca716e71d
-sha256=096a0696f925334f4f9fcc87df3305999f4b9f9d630fe6f2fa0179f3d56467f3
-
-[http://xlibs.freedesktop.org/release/resourceext-1.0.tar.bz2]
-md5=007713326ca5f1adfd39f3cb587c3b9b
-sha256=78e0a532bb84d6d85e90244bf3bb0ee9a5246545ebc9b677173e37e231d30cdc
-
-[http://xorg.freedesktop.org/releases/individual/proto/resourceproto-1.0.2.tar.bz2]
-md5=b823b314e37eb19dae1f297951d2e933
-sha256=0c33d6fceef5483001459bdc934b5831502250b27f1f4ad370ab044f8ab53487
-
-[http://xorg.freedesktop.org/releases/individual/proto/resourceproto-1.1.0.tar.bz2]
-md5=84795594b3ebd2ee2570cf93340d152c
-sha256=408d9ab067e4141d1bb844d2d0d7d26ad177567384190c32a913131cf549b36b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/resourceproto-X11R7.0-1.0.2.tar.bz2]
-md5=e13d7b0aa5c591224f073bbbd9d1b038
-sha256=72df7c8fe3ea2177adcb9442fcc49dfde75231abf0300844bf4551393cdd42b4
-
-[http://rfakeap.tuxfamily.org/rfakeap-0.2.tar.gz]
-md5=38f159681196b566f20bf837aff1e8f8
-sha256=4e5f63d8488b0fbd1a709429feb797c8c679de48f47ef93ab4741f8506830667
-
-[http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.1.tar.bz2]
-md5=255222b3ab3af671289a6b4844e9f393
-sha256=f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad
-
-[http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.3.tar.bz2]
-md5=44ea16cc3104de6401bc74035f642357
-sha256=162111c0192c8f78e99a6ee9a3df5eb149251c5800896c993399da005ec7fe95
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/rgb-X11R7.0-1.0.0.tar.bz2]
-md5=675e72f221714c3db8730daf0b50f69f
-sha256=97aa9c7c1f7f0ef29d6be741a421f92ca27662775c7a5dd7734c38137ff0f82a
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/rgb-X11R7.1-1.0.1.tar.bz2]
-md5=5b37afc6009cb754afb79847555d1aee
-sha256=24ee0f94226879038fe1d117c251900400376e942b4c82368d46f9466bb57243
-
-[http://rfakeap.tuxfamily.org/rglueap-0.1.tar.gz]
-md5=61b724a4e1a48d0735fb18d4f68c0506
-sha256=13cce714959056d41627ec9442342d46072f9d72ef57554b9d03ebfb353ed2d1
-
-[ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R1.zip]
-md5=613eed8201d37be201805e5048ebb0c3
-sha256=084e250d2392369b2548b663e61bcf128baecb2f527e381e9ba89f0148db2c0d
-
-[http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.12/rhythmbox-0.12.1.tar.bz2]
-md5=f17a72465dc43d554b11cf7b18776bff
-sha256=1f444b9cd74615831dab7ec8cd3c58c95d7436372df9a768bd701ab4321a8721
-
-[http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-0.8.5.tar.gz]
-md5=5ac4e1b5ff4f2fdada81c007ac599cb9
-sha256=654d6b190f4644d82c10b4ce5645b72405c2e78ea346ce3d8eb385fc3f3732de
-
-[http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-0.8.7.tar.bz2]
-md5=2ea5f7cd44f79b64721ce60f1fc1c2b7
-sha256=c3ab591b02afbb5b3f76a0c1406c607b9561138bdb0a62105981de559d2920dc
-
-[http://goodies.xfce.org/releases/ristretto/ristretto-0.0.21.tar.gz]
-md5=7774dcafdc365e70b8d981c0a52d6250
-sha256=b3e63ef1d4a582c2a3f4e99f097ec28273edf9feb51162b470d4c12c61a51378
-
-[http://heanet.dl.sourceforge.net/sourceforge/gkernel/rng-tools-2.tar.gz]
-md5=63d503191eabed630324c104cc024475
-sha256=1126f0ecc8cab3af14a562cddc5d8ffeef47df7eba34a7aadcdee35a25ec2b1e
-
-[http://downloads.sourceforge.net/roadmap/roadmap-1.1.0-src.tar.gz]
-md5=773c1e4291177c5b7a887763f6cb83a6
-sha256=bfaa36f246dc01775268644c153a2c65f5e2009b45d19f72e3d06c83c59d3aed
-
-[http://heanet.dl.sourceforge.net/roadmap/roadmap-1.1.0-src.tar.gz]
-md5=773c1e4291177c5b7a887763f6cb83a6
-sha256=bfaa36f246dc01775268644c153a2c65f5e2009b45d19f72e3d06c83c59d3aed
-
-[http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz]
-md5=749f5923a146f0e29f2bce127f09c2af
-sha256=2d544f4205cc42b4da2cd39ca589f2c826f56ad106e571450fc2694666440a92
-
-[http://artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-3.2.0.tar.gz]
-md5=0403e252fd978095e9546c0f10fa55ac
-sha256=e85175ecbfc91623ec1f6b62fe2b23d69b00cc57482c9c4ddab275de6af60f99
-
-[http://icculus.org/rott/releases/rott-1.0.tar.gz]
-md5=c1c6cbecf00f2229cf2e0053334dcfc1
-sha256=11f9cc331d0be87f0f172840e2bb6e03e27c3b8e9ecbb3eb8cffdc5b73afbd95
-
-[http://downloads.sourceforge.net/rox/rox-filer-2.5.tar.bz2]
-md5=56e6a29f2dbdf11d6f4b74a3f03ff959
-sha256=d91120d78e770c9c09822560dacb42fca641d092cbe52064ca7232f089062921
-
-[http://heanet.dl.sourceforge.net/rox/rox-filer-2.5.tar.bz2]
-md5=56e6a29f2dbdf11d6f4b74a3f03ff959
-sha256=d91120d78e770c9c09822560dacb42fca641d092cbe52064ca7232f089062921
-
-[http://www.roaringpenguin.com/files/download/rp-pppoe-3.8.tar.gz]
-md5=0e32760f498f9cde44081ee6aafc823b
-sha256=d916e9cfe1e62395f63a5361936fa855f6d0f0a37dc7227b394cdb725f553479
-
-[ftp://ftp.jbj.org/pub/rpm-4.4.x/rpm-4.4-1.src.rpm]
-md5=07f932a5f2c06bc14278f91782613c12
-sha256=a515675401cc9aff33cf8fd48d23a177cb9385907758c0e29a1dab693f55efe2
-
-[http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz]
-md5=b8f0661ac765ce1a2de66ca53e37af83
-sha256=a8168b8884ab40aadebba0ba696b889e25020d32a88e646d4f4bc56f2236b184
-
-[ftp://ftp.freebsd.org/pub/FreeBSD//ports/packages/archivers/rpm2cpio-1.2_2.tbz]
-md5=d4950dc6918ca79a4abab306b6188512
-sha256=5ec970d34b4e22feea0333dae3b5f5ee0e38295d89e306b4929b910f4a2aae25
-
-[http://www.freebsd.org/cgi/cvsweb.cgi/%7Echeckout%7E/ports/archivers/rpm2cpio/files/rpm2cpio?rev=1.2]
-md5=07f64fa3dae6eb8b1b578d01473a5c07
-sha256=a98cb1d9903192c4fcf40d82c705e091a5c193f87327703217749a5f4cc6197d
-
-[http://downloads.sourceforge.net/rpyc/rpyc-3.02.tar.gz]
-md5=4e855372c4a533b9ed605503156e6e04
-sha256=3dbd653b27fc855bf86dfe0ac06ed9bf59c8b85c9bcb4b5488528b30c59970f4
-
-[http://www.vanheusden.com/rsstail/rsstail-1.5.tgz]
-md5=1558fc8b0c9a8cb79e421f783f1ffc40
-sha256=242b3d5807e7bd753531fb836395afe18efe948174ea1ae54a4b7baba7a058fe
-
-[http://www.claws-mail.org/downloads/plugins/rssyl-0.10.tar.gz]
-md5=01a123319f2a32ecff7e560b95c2e4df
-sha256=d6bfdee4fd31c0e0089c6edab594eefaa5b7b95f0b783f1156dffadf1a90d820
-
-[http://www.claws-mail.org/downloads/plugins/rssyl-0.13.tar.gz]
-md5=f25df2d1bc2d99536eba334778804632
-sha256=413523cd8ebd4429c192c5cab7a85d017655b32f21a9c261169597180889b370
-
-[http://www.claws-mail.org/downloads/plugins/rssyl-0.15.tar.gz]
-md5=1fa701df95bb538fd0f0bf18d51534c7
-sha256=ed783c3141176ae84b7caec3f76cb483b09cf5c6fbc675abcdaaf5970ff0a4f1
-
-[http://www.claws-mail.org/downloads/plugins/rssyl-0.18.tar.gz]
-md5=7dfd8ae53cf1ed88d5e4150f77b9df63
-sha256=b02eff373fd66daec2ffd75afd3ad97c32c45679883ee65b21aa50fec92fc752
-
-[http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.2.tar.bz2]
-md5=99aea04a27197056368a4431f30f9cdb
-sha256=02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596
-
-[http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.3.tar.bz2]
-md5=e09c14cf1ac78260f95a9aa45bccab4c
-sha256=d6ee7becf9ece2fcc30ce50f7e9be31f231cce0cb3a8ba09d1697ac2822c3fcc
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/rstart-X11R7.0-1.0.1.tar.bz2]
-md5=6f33a1bd8e99372b7544ddfcad456369
-sha256=d662e932154df4d99ffcf29cd1efe5adb7b0eb1841ccffe9155b9c5d8055434c
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/rstart-X11R7.1-1.0.2.tar.bz2]
-md5=5efe197e5ffc2ffb576714a8d6054f53
-sha256=9aaff97266bb7725c967abba81506644edee96748f5823bb1864ce8059874e97
-
-[http://rsync.samba.org/ftp/rsync/old-versions/rsync-2.6.9.tar.gz]
-md5=996d8d8831dbca17910094e56dcb5942
-sha256=ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9
-
-[http://rsync.samba.org/ftp/rsync/rsync-2.6.9.tar.gz]
-md5=996d8d8831dbca17910094e56dcb5942
-sha256=ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9
-
-[http://rsync.samba.org/ftp/rsync/src/rsync-2.6.9.tar.gz]
-md5=996d8d8831dbca17910094e56dcb5942
-sha256=ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9
-
-[http://rsync.samba.org/ftp/rsync/old-versions/rsync-3.0.0.tar.gz]
-md5=2122d460b4119749c6e5993938a9b501
-sha256=17697db5bb9de399b71f7927070f60b3554b70b0ecc0419b50455d56560ea169
-
-[http://rsync.samba.org/ftp/rsync/src/rsync-3.0.0.tar.gz]
-md5=2122d460b4119749c6e5993938a9b501
-sha256=17697db5bb9de399b71f7927070f60b3554b70b0ecc0419b50455d56560ea169
-
-[http://rsync.samba.org/ftp/rsync/src/rsync-3.0.6.tar.gz]
-md5=e9865d093a18e4668b9d31b635dc8e99
-sha256=33cc969364cb66b3e345fa7db2c651a8e07de0e58743ec03899c4ba86953e1b3
-
-[http://downloads.sourceforge.net/nogravity/rt-nogravity-data.zip]
-md5=c7536e907363ea1da63430b49e42931d
-sha256=d7d5a3d17f492049fceb2b9ea22c4c2af7243506219d83f7005b77ae410add29
-
-[http://heanet.dl.sourceforge.net/nogravity/rt-nogravity-data.zip]
-md5=c7536e907363ea1da63430b49e42931d
-sha256=d7d5a3d17f492049fceb2b9ea22c4c2af7243506219d83f7005b77ae410add29
-
-[http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-0.21.tar.bz2]
-md5=f8ed2d3f781e08dcabffc3f8099620ca
-sha256=1215fd1b84944c8f945eb96ebd09e82ac756213123f5e00c4569f2d730412b00
-
-[http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-0.28.tar.bz2]
-md5=761c3e9fab16290c10ab9421182d16e7
-sha256=48e5a43c03f42524dd91873d649a0b8a287debd727da993ab256dc4e839b0cee
-
-[http://downloads.sourceforge.net/rt2400/rt2570-1.1.0-b2.tar.gz]
-md5=f4131d670920a878b4d4a0f5d4d8b93a
-sha256=a677291149687339396fed06c46cc08fd76fcb62d0f4459cae02c6cf54b4eb39
-
-[http://heanet.dl.sourceforge.net/rt2400/rt2570-1.1.0-b2.tar.gz]
-md5=f4131d670920a878b4d4a0f5d4d8b93a
-sha256=a677291149687339396fed06c46cc08fd76fcb62d0f4459cae02c6cf54b4eb39
-
-[http://homepages.tu-darmstadt.de/~p_larbig/wlan/rt2570-k2wrlz-1.6.0.tar.bz2]
-md5=9b96ffc8ceece0522daac443bc41c4af
-sha256=31248ac19b7935638c373aeced6187262a440d195dabfef6128845b4b16bee6c
-
-[http://homepages.tu-darmstadt.de/~p_larbig/wlan/rt2570-k2wrlz-1.6.1.tar.bz2]
-md5=87947cf1868ac37d4d756f3585dbf1e6
-sha256=11d2c4a1b69a4b2b49811128a41c33f25c71e590b019ace392761598ca3d419f
-
-[http://folks.o-hand.com/sameo/rt2860/rt2860-1.7.0.0.tar.bz2]
-md5=9ba1b8fdc9726931d5820226d48b9a33
-sha256=1d8fb8980025a0126520bb8f92dd0a5ce59c72e10889323212d3b4fd5496390a
-
-[http://files.chumby.com/source/ironforge/build396/rt73-chumby-1.2.tar.gz]
-md5=0340e1ceba72330111e6fc85679c75bf
-sha256=94beb93da6dabd16892c899f496eeec745fc69b856abd0d19896b2a4b0fb7c72
-
-[http://homepages.tu-darmstadt.de/~p_larbig/wlan/rt73-k2wrlz-1.0.0.tar.bz2]
-md5=be1820ec548283ccaf5eea7094193351
-sha256=6b9dfcfe509f3c659e2450610ad3bf0a9eef613481085b1b1bfed6647f21782d
-
-[http://homepages.tu-darmstadt.de/~p_larbig/wlan/rt73-k2wrlz-2.0.1.tar.bz2]
-md5=121e2ed57d01e04f82e942c502b1ca75
-sha256=e04718f3989bc567bf185cacfb27e324218cce5f5c87fca65328e49a3b56e603
-
-[http://homepages.tu-darmstadt.de/~p_larbig/wlan/rt73-k2wrlz-3.0.0.tar.bz2]
-md5=952af13db40a8aa723c859256c697a9c
-sha256=91619748c4dba733c60eb8a40805c972f407b2463dc6de856ac40336d66bc16c
-
-[http://music.mcgill.ca/~gary/rtaudio/release/rtaudio-3.0.1.tar.gz]
-md5=5b60500bc9605d2409b71124e48aa929
-sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c
-
-[http://cloud.github.com/downloads/kichkasch/rtmom/rtmom-src-0.1.3.tar.gz]
-md5=c4a1012fc0e00d2b64d8d794166bf893
-sha256=9227e503a90054dd643364272d48b3eae8dae3a9c6c4a42a2859395a8786398f
-
-[http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.0.tar.gz]
-md5=6216be7ce5e3ead9dc115eaeea863694
-sha256=597cefac4535d7f3b752253e5997b3c851c261b26b966a39beb032dcf1d5baa7
-
-[http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.3.tar.gz]
-md5=d1b43acf08e371a56915293bbcf584c6
-sha256=554456550ca6e792297d6d39367120af5b2bd6181d514a43faf4e2f565721908
-
-[http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.4.tar.gz]
-md5=dc0f37d933b0b6c713ad617e09441f3b
-sha256=257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee
-
-[ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.5.tar.gz]
-md5=3fbb02294a8ca33d4684055adba5ed6f
-sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
-
-[ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.5.tar.gz]
-md5=3fbb02294a8ca33d4684055adba5ed6f
-sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
-
-[ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p286.tar.gz]
-md5=797ea136fe43e4286c9362ee4516674e
-sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed
-
-[ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.6-p286.tar.gz]
-md5=797ea136fe43e4286c9362ee4516674e
-sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed
-
-[ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p248.tar.bz2]
-md5=37e19d46b7d4b845f57d3389084b94a6
-sha256=3d238c4cf0988797d33169ab05829f1a483194e7cacae4232f3a0e2cc01b6bfc
-
-[ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p248.tar.gz]
-md5=60a65374689ac8b90be54ca9c61c48e3
-sha256=5c9cd617a2ec6b40abd7c7bdfce3256888134482b22f933a061ae18fb4b48755
-
-[http://trac.luon.net/data/ruby-dbus/releases/ruby-dbus-0.2.1.tar.gz]
-md5=1f6398d8bbafa272c0b43878fec43276
-sha256=cfcadc4ae860f2de3d6aa1a1230a410b1dedf783148a27a20205bb3b54e3c3ac
-
-[http://rxtx.qbang.org/pub/rxtx/rxtx-2.1-7r2.zip]
-md5=9290b4832d46199f8d798a531209640b
-sha256=31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9
-
-[http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-4.8.tar.bz2]
-md5=b8f69ee5a4a2cd195892107be3a3cb29
-sha256=de644640cf71a6ce72f27ac6489b65434105fc6c94538c471925a15e2259b796
-
-[http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-4.9.tar.bz2]
-md5=cdd9e3bde4beec3242f2942911170164
-sha256=26c2a821795b92b5dc3ea35ce2b842ad4d6813b035631f8f9ddf070bd7805936
-
-[http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-5.3.tar.bz2]
-md5=1a5372a40d728c8a50e059b5d826490e
-sha256=1906326e75c27e2e7ad9a530e92d104359488c7b1bb7b1d113dd6a2efa8a60ca
-
-[http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-5.4.tar.bz2]
-md5=7efde6ec77c0ee47a32bd2f447d2937a
-sha256=0b9018e30281290cfdacf89f1680b6b0e961e47aab66fbb65c15a31d85ca473a
-
-[http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-5.6.tar.bz2]
-md5=d194dc03511b64544d2912b88fadd2b5
-sha256=2b8cb122f4d88c1a61b9a90c562f4829d4dd44bc64f66055c9a9b45ebeab7713
-
-[http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-7.7.tar.bz2]
-md5=68298390375da1b34f89a0aa634c9b20
-sha256=04ecd2577ee0c210df610b4a5d870f2bda57c80962fb5b51ae9c4a94098c726c
-
-[http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-7.9.tar.bz2]
-md5=7a0c73ccf0e31808ad37b61e730cd10e
-sha256=33d2363d40b1db7568864dc063ce4af70e50a9f9292a16445f0b167618d8fbba
-
-[http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-0.4.6.tar.bz2]
-md5=f28c48e2caf79b8e9056636259056de7
-sha256=67c58590430d04799644d164e4a5977356d95528864ea787356e35dd314e660f
-
-[http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-0.4.8.tar.bz2]
-md5=c3cbeb30141d9bcd13460ba5cc8acddc
-sha256=053c91b3e3f344c0eec614d38812bfdf3310b8bedaf614399322f614f71aca57
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100-dma.patch]
-md5=4336cca098b577608813a7c1454f2edd
-sha256=c532c14ffb9358d1e0dbb67fce113c6aec0dd9c77ad41875222d69979baac9e7
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100-udc-r2.patch]
-md5=1b8cfd298b9fa10c4779c98fbe8e0bd3
-sha256=564d375388284d7f13003202cba9fc1976b045bd14b3f12adec1449cded33f26
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100_spinlock.patch]
-md5=946368c1a4961ac0362436e967055f76
-sha256=16554de4368956c1d3e1be4245d388bff4767390f2183bfe35b04327def508a5
-
-[http://downloads.sourceforge.net/sablevm/sablevm-1.12.tar.gz]
-md5=6648af9bb5dd3dbbc8cb6835371f5ecd
-sha256=576c1af8affdebb0d5e10f8a8edad10e994965cef6db7980a3c52e25e15d6b94
-
-[http://heanet.dl.sourceforge.net/sablevm/sablevm-1.12.tar.gz]
-md5=6648af9bb5dd3dbbc8cb6835371f5ecd
-sha256=576c1af8affdebb0d5e10f8a8edad10e994965cef6db7980a3c52e25e15d6b94
-
-[http://downloads.sourceforge.net/sablevm/sablevm-classpath-1.12.tar.gz]
-md5=938602a0648660f13357115b6f1fbd60
-sha256=3e7b039a188ce5b2f74c86309936e193ea5d5eefcbdcaa92b38bc3f7e1e9fec4
-
-[http://heanet.dl.sourceforge.net/sablevm/sablevm-classpath-1.12.tar.gz]
-md5=938602a0648660f13357115b6f1fbd60
-sha256=3e7b039a188ce5b2f74c86309936e193ea5d5eefcbdcaa92b38bc3f7e1e9fec4
-
-[http://sablevm.org/download/release/1.12/sablevm-classpath-1.12.tar.gz]
-md5=ae8788df73ee0c2dd1ba8ed0f6d9b817
-sha256=1e50e20b9f597235709eadda23e6d15d3cdd5e63dbfeed6f50aeb5a85b31c405
-
-[http://downloads.sourceforge.net/sailcut/sailcut-1.3.2.tar.gz]
-md5=4bd5142c1741bb302dcd8e3b2e22dcd5
-sha256=c93f35baa7100fa04033b646b273ebf1da01954ea1d1dd33ab599b92ed916fa1
-
-[http://heanet.dl.sourceforge.net/sailcut/sailcut-1.3.2.tar.gz]
-md5=4bd5142c1741bb302dcd8e3b2e22dcd5
-sha256=c93f35baa7100fa04033b646b273ebf1da01954ea1d1dd33ab599b92ed916fa1
-
-[http://www.pleyades.net/david/projects/sakura/sakura-2.1.0.tar.bz2]
-md5=37ef8dee0b01107fc31ad3683af5572d
-sha256=aa053f8b561a1ce50955d72a7b0e2145178edca9cff40ab2e6e8f1d71cac9d6b
-
-[ftp://ftp.suse.com/pub/people/tiwai/salsa-lib/salsa-lib-0.0.1.tar.bz2]
-md5=abfe905d58fbc0910434d08539e36ff6
-sha256=8088a18b109f2c47eedd899f731b6f3fa9b92fa8b91335db0348802d28f8519e
-
-[http://samba.org/samba/ftp/stable/samba-3.0.10.tar.gz]
-md5=b19fd86d3c11a1b43f75a5988cd9ceeb
-sha256=d13a8e562caaa21afe45027630baa33f0fab0bd25a7cfa2218307545dfbac73e
-
-[http://samba.org/samba/ftp/stable/samba-3.0.14a.tar.gz]
-md5=ebee37e66a8b5f6fd328967dc09088e8
-sha256=d8721cc71b9c4ac878d3eef02f01bde7aee18bddd4e40bf213fca577edf3fd18
-
-[http://samba.org/samba/ftp/stable/samba-3.0.20.tar.gz]
-md5=68e72ab16334c329901816febc43217a
-sha256=e5ecf89ed1be4c2a2f198e9c8b3d60223f2f1172b9d53d5388c08b5377e18e3a
-
-[http://samba.org/samba/ftp/stable/samba-3.0.23c.tar.gz]
-md5=9e06d5e10f4ae84f7fafad75d1b4184c
-sha256=f333051eadf6ae88c30bd3d62eb94e9d6cf4a21912c4923d6ffddb029a42631c
-
-[http://samba.org/samba/ftp/stable/samba-3.0.34.tar.gz]
-md5=62404f39bb3dd0a37d6396c57e04c907
-sha256=530793de9f4114f4b391d932e2833baf25a00498317471cd75a068f3378c299e
-
-[http://samba.org/samba/ftp/stable/samba-3.0.5.tar.gz]
-md5=5896ad33676e3c26efaab5dcd897c466
-sha256=88049771c0d48e69b24f7234b2e4400bad53e6d9948d834aff9d563aac3ea8ca
-
-[http://samba.org/samba/ftp/stable/samba-3.0.9.tar.gz]
-md5=9cf2bcef71509a81687dec8732545400
-sha256=550429c7b22e58f4874dece816003ee0b769edbf2030d95aaee8c58588fbd60f
-
-[http://samba.org/samba/ftp/stable/samba-3.2.0.tar.gz]
-md5=318d5b1ec0507f0f6077b1470f9fc028
-sha256=63b744141982d15691b23e3bbe2114d3724fe9bc96c4605d97720bbfa560794d
-
-[http://samba.org/samba/ftp/stable/samba-3.2.5.tar.gz]
-md5=0f7539e09803ae60a2912e70adf1c747
-sha256=22647c6bdd0f1b311bd0e3a893fb184f07d0f5e1c4b3bccd20a024fe18fd7567
-
-[http://samba.org/samba/ftp/stable/samba-3.2.7.tar.gz]
-md5=528677f261f3ed4a58f9483ca25ba6b2
-sha256=4f2bb8c5785c50ad05d3adc0027c0881211b8a5c51e840651b53b7e455c004a3
-
-[http://samba.org/samba/ftp/stable/samba-3.3.0.tar.gz]
-md5=adb048dc3988055533e1ea5d91d81f99
-sha256=b00ca360e9b414744eff33ca4567f3eb1a28d32914e20f00b6672fbc141c9beb
-
-[http://samba.org/samba/ftp/stable/samba-3.3.9.tar.gz]
-md5=d99c3ccc3066d1c6a0dba4de02aad24b
-sha256=41a8919e3a32cf7523c49473edb478f3a7ec7d4ae4d125297a18d48f79e17f91
-
-[ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-1.0.15/sane-backends-1.0.15.tar.gz]
-md5=3b804f35cdfbc5ad2d201ffe078bbac9
-sha256=89106b5bc5a66ca0eaf4553371c89ac8542a757964d7a91c07b8fb77e040eebe
-
-[http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz]
-md5=8c0936272dcfd4e98c51512699f1c06f
-sha256=13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e
-
-[http://alioth.debian.org/frs/download.php/3026/sane-backends-1.0.20.tar.gz]
-md5=a0cfdfdebca2feb4f2ba5d3418b15a42
-sha256=8fb1531e6192b9cfe2f44a020b881d78a13f05426b46263cfbe7fc2507ae3d3a
-
-[ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-1.0.13/sane-frontends-1.0.13.tar.gz]
-md5=2930626e627df49b45192a722cedc8a6
-sha256=94cd595fe1ae130b8490d5690c7665d15536554473ad648ed46fc0ac3f383a80
-
-[http://stage.maemo.org/pool/maemo/ossw/source/s/sapwood/sapwood_1.20-1.tar.gz]
-md5=92dbb7fbcf468030662d4a103ecaca58
-sha256=d0baabff2a5dba4ad8dfc79f15f0d3110ab88564a451c835b56618cf808ba870
-
-[http://pokylinux.org/releases/sato/sato-engine-0.1.tar.gz]
-md5=d1b84ec5c510195d653dca518180d9bb
-sha256=0d16625a56ff1fa5c17dda5ce51bcfa82d349848b5a1df8f845d819f51260e23
-
-[http://pokylinux.org/releases/sato/sato-engine-0.3.1.tar.gz]
-md5=4f889f5bd5976f808c77c497b069c8f1
-sha256=a6f9081b7637bfca057f9759b51822440564ba8f7b809d917baee985d45a193a
-
-[http://pokylinux.org/releases/sato/sato-icon-theme-0.1.tar.gz]
-md5=c9a9117454dafa41fe28cc3f829a87e7
-sha256=23b753434625e2b2206bf77045cf16f72086bb84a2339b5058481270643200fe
-
-[http://pokylinux.org/releases/sato/sato-icon-theme-0.2.1.tar.gz]
-md5=3959b1304ea5a0f9464c588479147ef3
-sha256=07ba4643471bc865b1ddca078bf227b51d7feef06c313685970206a93a71db91
-
-[http://pokylinux.org/releases/sato/sato-icon-theme-0.3.1.tar.gz]
-md5=9540b7e812ec8b89cb77c325a9004a16
-sha256=e8890518a8818e72d44daa1448246df8a6b5958215835f4c72abc833077d1f68
-
-[http://pokylinux.org/releases/sato/sato-icon-theme-0.4.1.tar.gz]
-md5=86a847f3128a43a9cf23b7029a656f50
-sha256=0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732
-
-[http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2]
-md5=ceef10579a75c92483171f3bd7f77df2
-sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7
-
-[http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2]
-md5=ceef10579a75c92483171f3bd7f77df2
-sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7
-
-[http://uazu.net/sbagen/sbagen-1.4.1.tgz]
-md5=7d672f2f2a8e33e664b06777459471fe
-sha256=3190534f4449f810d633b0a9848c7db1458b4c57249432a3932a468ecb06daea
-
-[http://scratchbox.org/download/files/sbox-releases/1.0/src/sbrsh-7.1.tar.gz]
-md5=2ca6d18cf54af3d62bfcc01d884bd493
-sha256=0e2e0524f0559daa6816e4f7ad83b29891455c35c61694bcc5869e2011e3c808
-
-[http://www.secdev.org/projects/scapy/files/scapy-0.9.17.tar.gz]
-md5=c7b0363d646fbdee7fd09042de6fb0a7
-sha256=2068e0dc61189a37487dcf432909540e30579e452907ccbbd97d914fd0e06911
-
-[http://www.secdev.org/projects/scapy/files/scapy-1.1.1.tar.gz]
-md5=8ac720a1bea4304797c713ef1ed063f1
-sha256=2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956
-
-[http://www.secdev.org/projects/scapy/files/scapy-2.0.0.9.tar.gz]
-md5=953dc98dbd78fba3a80d554514581d26
-sha256=0431955a17cd687a28c9b005a6afbc11d8db9348cd4ec91c5600f4f662819e07
-
-[http://sources.slimlogic.co.uk/libscenario/scenario-lib-0.2.0.tar.bz2]
-md5=18b370f6ff89546df66fe64a2efd676a
-sha256=d76d0e8267e781e4ed4a93c9f51b7ae1257bfb2fadb8d8f5b64414b5340b1239
-
-[http://savannah.nongnu.org/download/scew/scew-0.3.1.tar.gz]
-md5=e9a69f7014cad332cc78667b07eebbce
-sha256=0e966359b9e1de31bf375b2a982b7f63cc6dd0c253bda480d1913c668791972a
-
-[http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.20.20-v22.patch]
-md5=0fd84a82c51f67d2d0531aab78f66d2a
-sha256=fc5cd165ecc07d2e254412f39a17a26a753bf081a0e02ed5db0b02d2f6bacc6f
-
-[http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.23.12-v24.1.patch]
-md5=a4a3cfd0abdb876cd6a353b882791ba2
-sha256=51703277e08c47f8c07585ae2319543ff89013465da67828b556b7e7df9313f8
-
-[http://downloads.sourceforge.net/schrodinger/schroedinger-0.2.0.0.tar.gz]
-md5=45f8d0efd9b76579a005e4ffe7f96ac3
-sha256=0b01f9fb9c869ecb6e066993d59e34789f82d445438480ac0e2dc30f29d047a0
-
-[http://heanet.dl.sourceforge.net/schrodinger/schroedinger-0.2.0.0.tar.gz]
-md5=45f8d0efd9b76579a005e4ffe7f96ac3
-sha256=0b01f9fb9c869ecb6e066993d59e34789f82d445438480ac0e2dc30f29d047a0
-
-[http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.5.tar.gz]
-md5=55596c41572c5efcf4b2cae9c68c2152
-sha256=bbb73ebc3a22f53e75dfbaa1718eebcc5a3619bb200b50df42d5377b99ebf4d4
-
-[http://downloads.sourceforge.net/scim/scim-1.4.9.tar.gz]
-md5=975ba34b01304ea8166ac8ea27aa9e88
-sha256=f72e9779e220565f6002923bf7d6aa9891be2bbddcd91a4e2a2d5e20aefba8d0
-
-[http://downloads.sourceforge.net/scons/scons-0.96.1.tar.gz]
-md5=45b1c346edd8a0970210aeb1e82557c9
-sha256=67ea186c1c6270178da0c3411f8c94fcb6a070eb68c3d43f08f282b0728d0c7d
-
-[http://downloads.sourceforge.net/scons/scons-0.96.90.tar.gz]
-md5=2dba56d8b7c3ecc6a36a26abb457d1b9
-sha256=2632398044dc6cb3d49b8760bfb0b878445daaa415af419d6d6a09eb7e423c31
-
-[http://downloads.sourceforge.net/scons/scons-0.97.tar.gz]
-md5=de530fa29e83f3b6efb618873398fa31
-sha256=195df54afedd60767e55393187df0f1e7e0ddb3a46347a5ee82d5050f964c3ba
-
-[http://heanet.dl.sourceforge.net/scons/scons-0.97.tar.gz]
-md5=de530fa29e83f3b6efb618873398fa31
-sha256=195df54afedd60767e55393187df0f1e7e0ddb3a46347a5ee82d5050f964c3ba
-
-[http://downloads.sourceforge.net/scons/scons-1.2.0.tar.gz]
-md5=53b6aa7281811717a57598e319441cf7
-sha256=2806451e02a42789decb6d08098b798b6b81a0a39d8d3b2fbdd3fe84ebd8a246
-
-[http://downloads.sourceforge.net/wordlist/scowl-6.tar.gz]
-md5=69d9b4b34dc85011d89115fa3cd2e011
-sha256=2468f134a2a384eec8d154c7f8bdb9212c2601036aeec29bb38fdeaad3b14912
-
-[http://heanet.dl.sourceforge.net/wordlist/scowl-6.tar.gz]
-md5=69d9b4b34dc85011d89115fa3cd2e011
-sha256=2468f134a2a384eec8d154c7f8bdb9212c2601036aeec29bb38fdeaad3b14912
-
-[ftp://ftp.gnu.org/gnu/screen/screen-4.0.2.tar.gz]
-md5=ed68ea9b43d9fba0972cb017a24940a1
-sha256=05d087656d232b38c82379dfc66bf526d08e75e1f4c626acea4a2dda1ebcc845
-
-[ftp://ftp.gnu.org/gnu/screen/screen-4.0.3.tar.gz]
-md5=8506fd205028a96c741e4037de6e3c42
-sha256=78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77
-
-[ftp://ftp.debian.org/debian/pool/main/s/screen/screen_4.0.2-4.1.diff.gz]
-md5=8f8725fa9b3385042115e84a06866ce6
-sha256=c426660739a93f94364de29cde222f7c3621364d9843b52c91735ba8b6a81c62
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/s/screen/screen_4.0.2-4.1.diff.gz]
-md5=8f8725fa9b3385042115e84a06866ce6
-sha256=c426660739a93f94364de29cde222f7c3621364d9843b52c91735ba8b6a81c62
-
-[ftp://ftp.debian.org/debian/pool/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz]
-md5=659bf15bbbb31817ebad9372c8827618
-sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a
-
-[ftp://ftp.nl.debian.org/debian/pool/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz]
-md5=659bf15bbbb31817ebad9372c8827618
-sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz]
-md5=659bf15bbbb31817ebad9372c8827618
-sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a
-
-[http://xorg.freedesktop.org/releases/individual/app/scripts-1.0.1.tar.bz2]
-md5=08c7f078fc351196c21db3a8206d482d
-sha256=1b154b4359302ca499818c45396325aef9ff364d6ff4ce5c3769e4803994a136
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/scripts-X11R7.0-1.0.1.tar.bz2]
-md5=b5b43aa53372b78f1d67c86301e3dc02
-sha256=b502bc765cffc23189b77ba4d22e843fe03404bfab4e24b97ff4daee58176b33
-
-[http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.1.0.tar.bz2]
-md5=5d551850e6f4acdf49a13f4eb3a5bbfa
-sha256=db09abf73cc339c05c0488639731794372a4770cfca76c2645f503f9fccd478f
-
-[http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.2.0.tar.bz2]
-md5=9040c991a56ee9b5976936f8c65d5c8a
-sha256=deaf0a3212617e0dab353a3c3a66e0a1f2398306eca0fd882ac15996b0e44d99
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/scrnsaverproto-X11R7.0-1.0.2.tar.bz2]
-md5=3185971597710d8843d986da3271b83f
-sha256=b709305970c99107d5121717711b244a7cd7a25e65d08f2e97dea8109f17b3cd
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/proto/scrnsaverproto-X11R7.1-1.1.0.tar.bz2]
-md5=567152e8b564c220f5eefa2e8464e550
-sha256=24ec219323a3d1e20a9d080b2352411f37d171a4a02e12a2930e6ea199ee4341
-
-[ftp://ftp.debian.org/debian/pool/main/s/scsi-idle/scsi-idle_2.4.23-5.tar.gz]
-md5=86b310223642b6841c9e04ecd4d7fed8
-sha256=6b53eb1645ac64667f0ee109b3456ba909b1c8bec432330a9d90e9a20980823b
-
-[ftp://ftp.nl.debian.org/debian/pool/main/s/scsi-idle/scsi-idle_2.4.23-5.tar.gz]
-md5=86b310223642b6841c9e04ecd4d7fed8
-sha256=6b53eb1645ac64667f0ee109b3456ba909b1c8bec432330a9d90e9a20980823b
-
-[http://downloads.sourceforge.net/scummvm/scummvm-0.12.0.tar.bz2]
-md5=cd5620c57645948c8da0d4d9c9fcffb3
-sha256=db9aa3bbb648d09639d9e16f1872558a105f222dac5e3d0a16370b4cf7c3e699
-
-[http://downloads.sourceforge.net/scummvm/scummvm-0.6.0.tar.bz2]
-md5=efc4207a7f10b24e9fc5afa10ed9c455
-sha256=ac22ad70ad6f88c7c8450bc06ba38602331c7470abcafb9e7fe62bfb505b1a3b
-
-[http://heanet.dl.sourceforge.net/scummvm/scummvm-0.6.0.tar.bz2]
-md5=efc4207a7f10b24e9fc5afa10ed9c455
-sha256=ac22ad70ad6f88c7c8450bc06ba38602331c7470abcafb9e7fe62bfb505b1a3b
-
-[http://downloads.sourceforge.net/scummvm/scummvm-0.6.1b.tar.bz2]
-md5=143dd7cfe0995922c49e1f8a6cdf2055
-sha256=29007f54d9e5a37a3da9f51670de7828dde9a3559beddbdd5c2f59796fb220f6
-
-[http://heanet.dl.sourceforge.net/scummvm/scummvm-0.6.1b.tar.bz2]
-md5=143dd7cfe0995922c49e1f8a6cdf2055
-sha256=29007f54d9e5a37a3da9f51670de7828dde9a3559beddbdd5c2f59796fb220f6
-
-[http://puzzle.dl.sourceforge.net/scummvm/scummvm-0.6.1b.tar.bz2]
-md5=143dd7cfe0995922c49e1f8a6cdf2055
-sha256=29007f54d9e5a37a3da9f51670de7828dde9a3559beddbdd5c2f59796fb220f6
-
-[http://downloads.sourceforge.net/scummvm/scummvm-0.9.0.tar.bz2]
-md5=5eede9c97d1883f80770a3e211419783
-sha256=5824f67aa37b00fc8b92ac4fcc413a9a7d868174dcd6df580c4d706807e4545e
-
-[http://heanet.dl.sourceforge.net/scummvm/scummvm-0.9.0.tar.bz2]
-md5=5eede9c97d1883f80770a3e211419783
-sha256=5824f67aa37b00fc8b92ac4fcc413a9a7d868174dcd6df580c4d706807e4545e
-
-[http://puzzle.dl.sourceforge.net/scummvm/scummvm-0.9.0.tar.bz2]
-md5=5eede9c97d1883f80770a3e211419783
-sha256=5824f67aa37b00fc8b92ac4fcc413a9a7d868174dcd6df580c4d706807e4545e
-
-[http://downloads.sourceforge.net/scummvm/scummvm-0.9.1.tar.bz2]
-md5=30a82ad466bae223875e66ee14b94904
-sha256=5cd5d9c06281a4f81d85d9a9f9b0410045d4a764a855f06f574183b528c15d1a
-
-[http://heanet.dl.sourceforge.net/scummvm/scummvm-0.9.1.tar.bz2]
-md5=30a82ad466bae223875e66ee14b94904
-sha256=5cd5d9c06281a4f81d85d9a9f9b0410045d4a764a855f06f574183b528c15d1a
-
-[http://downloads.sourceforge.net/scummvm/scummvm-1.0.0.tar.bz2]
-md5=11b911937e0fc73c94a7bdc374ab617c
-sha256=920932b9d0cfca019f35c2451d93d94ca3b9f981f0b82c418bfbc864fb8c00ec
-
-[ftp://ftp.debian.org/debian/pool/main/s/scw/scw_0.4.3.orig.tar.gz]
-md5=4c9fb66fa496cf32542e92f32f821818
-sha256=fca3763b05f064728c9ff248fa0766808d1ceae561b88ad202811924e4ccdb45
-
-[ftp://ftp.nl.debian.org/debian/pool/main/s/scw/scw_0.4.3.orig.tar.gz]
-md5=4c9fb66fa496cf32542e92f32f821818
-sha256=fca3763b05f064728c9ff248fa0766808d1ceae561b88ad202811924e4ccdb45
-
-[ftp://ftp.us.debian.org/debian/pool/main/s/scw/scw_0.4.3.orig.tar.gz]
-md5=4c9fb66fa496cf32542e92f32f821818
-sha256=fca3763b05f064728c9ff248fa0766808d1ceae561b88ad202811924e4ccdb45
-
-[http://downloads.sourceforge.net/sdcc/sdcc-2.5.0.tar.gz]
-md5=c572e7842fe36348f5b2972c1025a75a
-sha256=138d2e59569f76f1a5d35bd5d85e7006eeebc4f48cd3dac902e2824ed50c3d80
-
-[http://heanet.dl.sourceforge.net/sdcc/sdcc-2.5.0.tar.gz]
-md5=c572e7842fe36348f5b2972c1025a75a
-sha256=138d2e59569f76f1a5d35bd5d85e7006eeebc4f48cd3dac902e2824ed50c3d80
-
-[http://downloads.sourceforge.net/sdcc/sdcc-src-2.8.0.tar.bz2]
-md5=1b9c2e581b92d5e3f13bca37c5784080
-sha256=cbb035699d8910c7ca2fa360a773504b44165e98042ed8c208fea2fe47a96557
-
-[http://heanet.dl.sourceforge.net/sdcc/sdcc-src-2.8.0.tar.bz2]
-md5=1b9c2e581b92d5e3f13bca37c5784080
-sha256=cbb035699d8910c7ca2fa360a773504b44165e98042ed8c208fea2fe47a96557
-
-[http://repository.maemo.org/pool/maemo/ossw/source/s/sdk-default-icons/sdk-default-icons_0.2-1.tar.gz]
-md5=85ccc685b72f6f77da8a4b0ef7c5281b
-sha256=8dcd3aac06f24111461433353015cd36bfaaf45b74ff9aa336713759b6759b0c
-
-[http://repository.maemo.org/pool/diablo/free/s/sdk-default-icons/sdk-default-icons_2.1-2.tar.gz]
-md5=4c792ca02cb3cc971879ea0dcfd304f9
-sha256=96366d20b0fcc7b7be638b666635bc77666ff7f2acef33802d3a396806b87441
-
-[http://repository.maemo.org/pool/maemo/ossw/source/s/sdk-default-theme-config/sdk-default-theme-config_1.0-1.tar.gz]
-md5=ed7202fcabcce02a41225906deb0c682
-sha256=1bc620973aa9448c7374e5c673f21b11f60abbc1d887b9719dd4a90cb99bea64
-
-[http://repository.maemo.org/pool/maemo/ossw/source/s/sdk-default-theme/sdk-default-theme_0.1-1.tar.gz]
-md5=39df0bf8ad0a7370a63c283bdcf67219
-sha256=114f8be9b73d75811cac866650a64cdbc88348353d281dda3b6aff4c1e109337
-
-[http://www.libsdl.org/projects/quake/src/sdlquake-1.0.9.tar.gz]
-md5=6465dc6545970352dfa6305c36c2403d
-sha256=097882b4613c87303dd068c41c95e77675da790cab63c7b440e70643d1741035
-
-[ftp://ftp.gnu.org/gnu/sed/sed-4.0.8.tar.gz]
-md5=fb7fa2a7336afc358012763b292e2124
-sha256=a02d8c006bc0531bd646cae3082b7db8c7a1969084411cb129ec105fd12c0a13
-
-[ftp://ftp.gnu.org/gnu/sed/sed-4.0.9.tar.gz]
-md5=d8fb554bc6577aaedd39b94b3cb3df70
-sha256=c365874794187f8444e5d22998cd5888ffa47f36def4b77517a808dec27c0600
-
-[ftp://ftp.gnu.org/gnu/sed/sed-4.1.1.tar.gz]
-md5=570c0a53a64ec020d8fcbce51fb6d71a
-sha256=5e0bec79ff46ad189370e9defc95f72bd255990bfc3ad546e64f41eb08533fd9
-
-[ftp://ftp.gnu.org/gnu/sed/sed-4.1.2.tar.gz]
-md5=928f0e06422f414091917401f1a834d0
-sha256=638e837ba765d5da0a30c98b57c2953cecea96827882f594612acace93ceeeab
-
-[ftp://ftp.gnu.org/gnu/sed/sed-4.1.tar.gz]
-md5=d8a08cc12fda1826deb2028dd729e189
-sha256=57c86e7c17b8af6d6ecbdc17086ad22ec72d815f0db8a475a1d9adef2879f922
-
-[http://downloads.sourceforge.net/sensors-applet/sensors-applet-2.2.1.tar.gz]
-md5=4ba94415125db147efcc1ae76f9703ee
-sha256=6be95f70458d299f28bfc81dee201b3e1c328bc55df00fc7f2c30d7f8f6faba0
-
-[http://downloads.sourceforge.net/sensors-applet/sensors-applet-2.2.4.tar.gz]
-md5=778f637524a90a9b6475ab77b0e90dd9
-sha256=a52214f2cf2b23a49394804dc589be51eecd4b8674f141047a46a550882f28f6
-
-[ftp://ftp.berlios.de/pub/ser/0.9.0/src/ser-0.9.0_src.tar.gz]
-md5=ae1f9b237f0006785ff22eafa1470ac4
-sha256=65eb4c5735859f3ed191437749a85e9fd24a66a6567025f36a0739f9c34c444e
-
-[http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/serial_sparse.patch]
-md5=2734448ca22fc44c2d999a5e47c70d5d
-sha256=3a8b96d7955a022045c781c1b8ac266fa8cdd47295744d60e7c00a6e88abbb3d
-
-[http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.2.tar.bz2]
-md5=bee5d87d40615e67c84ab0b0c65049ba
-sha256=c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86
-
-[http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.3.tar.bz2]
-md5=07665816f2623ec82e665fb7d31c6cef
-sha256=7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc
-
-[http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.4.tar.bz2]
-md5=839e968d7197b9563f0fd8a5a3aac2e3
-sha256=23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802
-
-[http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.5.tar.bz2]
-md5=00e834c3cbfd990e9d7d5ddc834242df
-sha256=3308fbd0018d53bb818fee9de1cde484965b740073d5d240efa4cfc881c9d1a9
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/sessreg-X11R7.0-1.0.0.tar.bz2]
-md5=8289a5b947165449c23bdfad9af02b4c
-sha256=3769ad5059a2841a8ee28fc8a7d3a3ca8eb59f4fd46d0bd629829f3841202734
-
-[ftp://ftp.debian.org/debian/pool/main/s/setmixer/setmixer_27DEC94.orig.tar.gz]
-md5=b30985591b239d2913382b97817ba790
-sha256=4639247cb15c306f2182eea53982fe8007a8b9080cb9c1a8a38d5d2a45e4c20f
-
-[ftp://ftp.nl.debian.org/debian/pool/main/s/setmixer/setmixer_27DEC94.orig.tar.gz]
-md5=b30985591b239d2913382b97817ba790
-sha256=4639247cb15c306f2182eea53982fe8007a8b9080cb9c1a8a38d5d2a45e4c20f
-
-[http://www.vanheusden.com/setpwc/setpwc-0.9.tgz]
-md5=0ec56a142d79bc2dd346fc6f12f9aa5e
-sha256=827940306b30e3d92805052b31e8bff2f326fca7574b162260ca5386027091c1
-
-[http://www.vanheusden.com/setpwc/setpwc-1.1.tgz]
-md5=acc0266534c5dc13ad1153ec890c1b8d
-sha256=ee8b74fc74229b76c95d1d3360a5540239e77f32d100f8c3ed318e76fd19e09b
-
-[http://www.vanheusden.com/setpwc/setpwc-1.2.tgz]
-md5=1bc721cdfcbac24027e2afc93685d29f
-sha256=855dcf73bda36e6445119f0b1b0a63464ba237d82794f115912464f8aebc5ed1
-
-[http://downloads.sourceforge.net/setserial/setserial-2.17.tar.gz]
-md5=c4867d72c41564318e0107745eb7a0f2
-sha256=7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a
-
-[http://fresh.t-systems-sfr.com/linux/src/setserial-2.17.tar.gz]
-md5=c4867d72c41564318e0107745eb7a0f2
-sha256=7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a
-
-[http://heanet.dl.sourceforge.net/setserial/setserial-2.17.tar.gz]
-md5=c4867d72c41564318e0107745eb7a0f2
-sha256=7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a
-
-[http://mput.de/~kristian/.openmoko/settingsgui-0.8-beta.tar.bz2]
-md5=4a4c4855447f506078dfb762ba72e35d
-sha256=5f4f727cbe982db701dcc4a70cd2c19a4c153a4b0b35a6b5b561b48d53649855
-
-[http://mput.de/~kristian/.openmoko/settingsgui-0.8.tar.bz2]
-md5=8b6f19636983fe22bad5ee1e0906c837
-sha256=e839e55b2d7babbbf0302429e9c58ff6e62a064c9ae4cb2d6f957a89b81e0022
-
-[http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-0.6c6.tar.gz]
-md5=e3d56d4d19776042607cbbecae823c8b
-sha256=075172b39f0933d3fbd1d4e90f29742c1402a29da26db04357eb18fd46ffd6b1
-
-[http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-0.6c8.tar.gz]
-md5=0e9bbe1466f3ee29588cc09d3211a010
-sha256=96667a84cd8c7af103ca07fe6b41f7c1494a0ab7300335f7ab18ab49c3203e37
-
-[http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-0.6c9.tar.gz]
-md5=3864c01d9c719c8924c455714492295e
-sha256=e6190497301b6cb1484b9e6173723452c8df1b4cd9ea97af75c9589b1c34b3d8
-
-[http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.0.3.tar.bz2]
-md5=2b53542095a35a8a5731164118643883
-sha256=086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508
-
-[http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.0.4.tar.bz2]
-md5=6fab3bb176be9e510c5613d054ef1ca4
-sha256=9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac
-
-[http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.1.0.tar.bz2]
-md5=2f902e0a89aaf2b19e06e7f26c6efb3a
-sha256=932f2b314a4bf6dfccd16d63c633073abf650d8e136f481904e972ef3d4faf64
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/setxkbmap-X11R7.0-1.0.1.tar.bz2]
-md5=28b141ab0b1c44a5e90d31ad73bd1078
-sha256=4d710b17c5440518b43d3d1f7cbcb78a62c72f25e48a1b385a0ae3872ec8b40b
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/setxkbmap-X11R7.1-1.0.2.tar.bz2]
-md5=350180a6e4132a2b1262c7a15162c007
-sha256=4323581ddb6150677a36bcb87e3960100a7ea7c80906f0c7b7a27d1e43b055d9
-
-[ftp://ftp.debian.org/debian/pool/main/s/sg3-utils/sg3-utils_1.24.orig.tar.gz]
-md5=9e1b8811b013d8f97d8ea2e0942cebad
-sha256=0a06dae84a8f7f464c0c29c78a8f73f24a62894a2d3fc10b5f74a993f7b5abfe
-
-[ftp://ftp.us.debian.org/debian/pool/main/s/sg3-utils/sg3-utils_1.24.orig.tar.gz]
-md5=9e1b8811b013d8f97d8ea2e0942cebad
-sha256=0a06dae84a8f7f464c0c29c78a8f73f24a62894a2d3fc10b5f74a993f7b5abfe
-
-[ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz]
-md5=103c9828f24820df86e55e7862e28974
-sha256=7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959
-
-[http://www.vanille.de/mirror/sgmlop-1.1.tar.bz2]
-md5=45f77f33a6b2a5c09c28511ebb733b87
-sha256=7fd6495d6c3e8dac7ba086c68abed4930c958a94afc15359223074614559e462
-
-[ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-4.1.4.2.tar.bz2]
-md5=d593a9cab93c48ee0a6ba056db8c1997
-sha256=97987f6a7967a85e6aa0dba2a1d52db8bd69af5a717391de5693db768fb78990
-
-[ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-4.1.4.tar.gz]
-md5=e1072df927bfb4410ee4dfe26dd81a17
-sha256=7e38a7826f6e71e89b55669e8343af05ae33ecfba99aad178cad45845d950a93
-
-[http://freedesktop.org/~hadess/shared-mime-info-0.20.tar.bz2]
-md5=62184241d497d34138285bc248b3fabc
-sha256=6febe616fb850f4319efa7017312abb796024e7ac20da37c4d2ce34afa41776c
-
-[http://freedesktop.org/~hadess/shared-mime-info-0.22.tar.bz2]
-md5=b3b4b45ef3f76f720fd0c389f131dd4c
-sha256=d933caa25caacd57dc8b37f68d222acec3ba3c9d076828d34f006499f6301fb2
-
-[http://freedesktop.org/~hadess/shared-mime-info-0.51.tar.bz2]
-md5=01d72161f7d88123fbccd378871f02f0
-sha256=1c247e03418d6b90bcbc0da6c1abe6ac9cd5bacf9c3a2f3b6105376cf7b0eed8
-
-[http://www.do13.de/openzaurus/patches/sharpsl-pm-postresume-r0.patch]
-md5=bbca81d1c527d833b8e11a0d28275ab2
-sha256=947e7bfe44dad0caf8dc857b40fa840a316cc0d9b97aafefd134ef1fdb87753b
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sharpsl_pm-3.patch]
-md5=143bf72b794dbc24d36600f8e8aedbb7
-sha256=0e87278dcee1d69d3bc44a3f028b4a73b78ceed3c0ba5ab174e6d2f4066bc4db
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sharpsl_pm-4.patch]
-md5=39b7dd5a77cf267d104e57dbfbfb1789
-sha256=a9880d7408e73c6c74ae975ed7fd20b2563459b68d6c4afdfc20f033c95b4d8b
-
-[http://www.rpsys.net/openzaurus/patches/archive/sharpsl_pm-do-r2.patch]
-md5=416c6db0f2358ff9b88853dde2d6823f
-sha256=6c862826f6e0f72bb96ac7fca76c8118af65e65702dd55060d1ec06765f5add8
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sharpsl_pm.patch]
-md5=3cccf791dd1bc42fdb5a7a0e06086c09
-sha256=63028be5190d144538ab5fa8c1d74035424e5ae793d3abb4c5649665e31fd67b
-
-[http://www.rpsys.net/openzaurus/patches/archive/sharpsl_pm_fixes1-r0.patch]
-md5=aeea5a2614fd8f9ae7d729d1ea1dddba
-sha256=1bd129c7a68537533c77267992eaf490ff64bcc3d01c6f4b51343b8f266ae99e
-
-[http://downloads.sourceforge.net/shfs/shfs-0.35.tar.gz]
-md5=016f49d71bc32eee2b5d11fc1600cfbe
-sha256=0d48ffe4d801180c15466f20aaa5802adb9d22067e8941e051dc3c64717ec3c2
-
-[http://heanet.dl.sourceforge.net/shfs/shfs-0.35.tar.gz]
-md5=016f49d71bc32eee2b5d11fc1600cfbe
-sha256=0d48ffe4d801180c15466f20aaa5802adb9d22067e8941e051dc3c64717ec3c2
-
-[http://handhelds.org/~zecke/oe_packages/shisensho_V1.0.0.tar.gz]
-md5=001103f5847e71b0198c3a11df7d62d0
-sha256=17cebdc8ae4374c3944a3233d86278f4d09aaf90279b48e98367e9387f7e6acc
-
-[http://repository.maemo.org/extras/pool/chinook/free/source/s/shishensho/shishensho_0.3.0-1.tar.gz]
-md5=5a1b79ca2441a6f4b32d294855f05c47
-sha256=feec48d2d79aad6d5c7daa911702fccb3dce18ac2e1ee23341d135275ce2a719
-
-[http://www.shorewall.net/pub/shorewall/2.0/shorewall-2.0.9/shorewall-2.0.9.tgz]
-md5=4d0f756b5b63a68593b2de560c1a5b35
-sha256=06064e929423b1bd60a31652d2a31763dccc48e86ea9cdefbcadf524df2bd3f2
-
-[http://xorg.freedesktop.org/releases/individual/app/showfont-1.0.1.tar.bz2]
-md5=339b2faf1ca5114fda414338e15b6e21
-sha256=87db3cf12914abc6b074d12b35c7f39c8fd7b5d3933b339e2c1260a51061760c
-
-[http://xorg.freedesktop.org/releases/individual/app/showfont-1.0.2.tar.bz2]
-md5=8f83d774ed4cc2a6dca86edd856d820a
-sha256=9bd0373659b2f24120dba887fd155f99aed02e4a7c2afae69e7db1c1fa05e88c
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/showfont-X11R7.0-1.0.1.tar.bz2]
-md5=334cb5133960108ac2c24ee27e16bb8e
-sha256=58716b9fb29b8b9397577ebddfe01202f7dcd4be90c1f73fab2fb8794b83b390
-
-[http://sidplayer.sourceforge.net/sidplayer.tar.gz]
-md5=bba4a99e59581066e905c9326a724ba5
-sha256=bc6bfd100c495e74baa651c470252484b19bfc2e6fa8520f591b0c01b9fcfb5d
-
-[http://www.sparc-boot.org/pub/silo/silo-1.4.8.tar.bz2]
-md5=badc27616dc92ad42f5e30751a6b322c
-sha256=2c5e3a832662aa962f700e64ce3c1fc8c77e801000c47b8d66feeb03e66d95de
-
-[http://simh.trailing-edge.com/sources/simhv37-1.zip]
-md5=c8c57379e2e9afbf9817fbbe99ee1106
-sha256=4c3f7374e1faa54c705f7c139e992bb7d3492e9dc62aca5b1e24e5a43bb0f132
-
-[http://meshcube.org/nylon/unstable/sources/simple-firewall_gruen.4g__20060810.tar.gz]
-md5=0ba39ad6dbc20361e6ed20fb41e924a7
-sha256=ba9c828fb982a2edc6228b3034d5369597603ad2b0df66a93edce7334014a17a
-
-[http://cheeseshop.python.org/packages/source/s/simplejson/simplejson-1.7.1.tar.gz]
-md5=b723d488ea43583122511263e9c2c93a
-sha256=c28aa94f8fdeb8af95069640bc41bb615473944c78af9ef0eda318172dd643cd
-
-[http://cheeseshop.python.org/packages/source/s/simplejson/simplejson-2.0.7.tar.gz]
-md5=9d02273f8615b8e3fceda891ffff10d1
-sha256=2b349ed73540f8ce68bdfa29e08e3dff9d885027bfa06d6a871a09fe381ddbbe
-
-[http://www.vanille.de/mirror/sip-3.10.1.tar.gz]
-md5=7d7faa17422cd3e7b27d449ffbc9cd0f
-sha256=b0f36999b31c7e20927befc3df6112955376bff6a0c76ba4a4be4a357fc014be
-
-[http://www.vanille.de/mirror/sip-4.0.1.tar.gz]
-md5=a2aa4ef53cb4f18e7ce25bc2e123548e
-sha256=98d9f4937924d99db716ef8d80ff25a83fdef294981a43c089e97c9394ed08a7
-
-[http://www.vanille.de/mirror/sip-4.1.1.tar.gz]
-md5=f9dc81a7726305af114fede6c4107ce6
-sha256=0408ff3be6460686d53e9675510c8b2bac2fa91f1a7489f54e5ac0d1722cfb6d
-
-[http://www.riverbankcomputing.com/Downloads/sip4/sip-4.4.5.tar.gz]
-md5=ba334c4412cee1dbc6c56ff9a58e7bb0
-sha256=a1f0467ac5c1355d2ddb4a51b198afe43082cce6446e8950020e6f42cb7c71b8
-
-[http://www.vanille.de/mirror/sip-4.4.5.tar.gz]
-md5=ba334c4412cee1dbc6c56ff9a58e7bb0
-sha256=a1f0467ac5c1355d2ddb4a51b198afe43082cce6446e8950020e6f42cb7c71b8
-
-[http://cvs.fedora.redhat.com/repo/pkgs/sip/sip-4.7.7.tar.gz/9cabe6a0f61b73582cfc38b903576211/sip-4.7.7.tar.gz]
-md5=9cabe6a0f61b73582cfc38b903576211
-sha256=928fa03d1b8a2329f5e71dd9190080146b5275119e28c19c36fdd57e788d84ba
-
-[http://www.riverbankcomputing.com/static/Downloads/sip4/sip-4.7.7.tar.gz]
-md5=9cabe6a0f61b73582cfc38b903576211
-sha256=928fa03d1b8a2329f5e71dd9190080146b5275119e28c19c36fdd57e788d84ba
-
-[http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-4.7.9.tar.gz]
-md5=597d7ff7edb42a18421c806ffd18a136
-sha256=7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
-
-[http://www.riverbankcomputing.com/static/Downloads/sip4/sip-4.7.9.tar.gz]
-md5=597d7ff7edb42a18421c806ffd18a136
-sha256=7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
-
-[http://www.riverbankcomputing.com/static/Downloads/sip4/sip-4.8.2.tar.gz]
-md5=7ae60712aa6b4095a8cdab11b437f8f0
-sha256=2ebb29deb2bbcdb99f47866e59deea7c6d98be0c835547b043eefd151516d9a9
-
-[http://downloads.sourceforge.net/siproxd/siproxd-0.7.1.tar.gz]
-md5=45e5a44803181e2bf3361d562060c904
-sha256=5eef70f4e0a8f0f4628550807da3036f8b3086864bf4bcf5ab6d22ac3a6efd81
-
-[http://download.berlios.de/sipsak/sipsak-0.9.6-1.tar.gz]
-md5=c4eb8e282902e75f4f040f09ea9d99d5
-sha256=5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9
-
-[http://thegraveyard.org/files/skippy-xd-0.5.0.tar.bz2]
-md5=0e847845c4cb8c16f79bc4538ae288ad
-sha256=52ff7476b3580a92c385167f1855583c2cf74ae1898a6a5e8446ce67c80bc139
-
-[http://download.skype.com/linux/skype-2.0.0.72.tar.bz2]
-md5=71fa47d788e73bcaf5b788be9236e97d
-sha256=d3087571ab206729e6628986eb485e48204f5f1f0ed3f28326c376d86d583fe8
-
-[http://download.skype.com/linux/skype_static-2.0.0.72.tar.bz2]
-md5=cfaa796ef55e3f858a09bbe096eded5a
-sha256=2f37963e8f19c0ec5efd8631abe9633b6551f09dee024460c40fad10728bc580
-
-[http://archive.ubuntu.com/ubuntu/pool/universe/s/sl/sl_3.03-14.diff.gz]
-md5=bbc8f69a7add52ed30dbac276d43ef92
-sha256=948499164f7be0c0b12e545bf49f1ab81e4546704cb3bedc1141d31a2d6dcbe6
-
-[http://archive.ubuntu.com/ubuntu/pool/universe/s/sl/sl_3.03.orig.tar.gz]
-md5=d0d997b964bb3478f7f4968eee13c698
-sha256=5986d9d47ea5e812d0cbd54a0fc20f127a02d13b45469bb51ec63856a5a6d3aa
-
-[ftp://space.mit.edu/pub/davis/slang/v1.4/slang-1.4.9.tar.bz2]
-md5=4fbb1a7f1257e065ca830deefe13d350
-sha256=fa42e57e902f2161dc2b297e0dcb24ca180024770afa379027db582803ffa2fa
-
-[http://homepage3.nifty.com/cam/slcalc_1.2.1_arm.tar.gz]
-md5=3052050235b4bc8fc14d28b8b5e13e49
-sha256=c7d7f2fb4a3903dd26a90df358f5757f2637c333cd6f6bf511f506a958349fa1
-
-[http://www.gelhaus.net/zaurus/sliderulez-0.92.tar.gz]
-md5=9b48fc595d7291fa8edddfafba2cb7a9
-sha256=28a6af2d1490374de26084e346bbd227586c0f6232dcf4cfebf80413adc7d932
-
-[http://download.berlios.de/slim/slim-1.3.1.tar.gz]
-md5=727d0acb24c0fbf0751134c37a9c895f
-sha256=acd7a4024bfd7c2a4f3cd5d77ffed4956d13727a8f554042126d0568defe0f77
-
-[http://downloads.sourceforge.net/slotsig/slotsig-0.6.tar.bz2]
-md5=dfe9f5d3f17075ec23eb923899ac5f24
-sha256=124499d3c5d2d44ab07b60c235547079044f3728fd3c907987900e270bd947f8
-
-[http://heanet.dl.sourceforge.net/slotsig/slotsig-0.6.tar.bz2]
-md5=dfe9f5d3f17075ec23eb923899ac5f24
-sha256=124499d3c5d2d44ab07b60c235547079044f3728fd3c907987900e270bd947f8
-
-[http://downloads.sourceforge.net/slrn/slrn-0.9.8.0.tar.bz2]
-md5=47e9931771114ba192356a0473e9649e
-sha256=b97ea8385c4c9db64d69a84fcf87e5ffd98239932c88ff19f2e4c107ae24cdb2
-
-[http://heanet.dl.sourceforge.net/slrn/slrn-0.9.8.0.tar.bz2]
-md5=47e9931771114ba192356a0473e9649e
-sha256=b97ea8385c4c9db64d69a84fcf87e5ffd98239932c88ff19f2e4c107ae24cdb2
-
-[http://www.dakotacom.net/~ymg/files/slsnif-0.4.4.tar.gz]
-md5=78eeff8ba36ee0c3a954ec0878d2a997
-sha256=315eb08a14255c137b435cb4f3c1dbfa67427be1c6bec62ff77a54246161c83e
-
-[http://www.lantz.com/filemgmt_data/files/slugtool.tar.gz]
-md5=d83e00e9c691984f36cb421d84873bc7
-sha256=0a2080a48f8a52d10d49aa78a66027205920b76c8e901d07fb040759191aad9e
-
-[http://downloads.sourceforge.net/smartmontools/smartmontools-5.33.tar.gz]
-md5=53f6861a916169a88a9edb1848e27dd0
-sha256=2fdde1b4e610cd6e004db8f98ac1100fcbea03b8f11e236de536ce22bc6c620d
-
-[http://heanet.dl.sourceforge.net/smartmontools/smartmontools-5.33.tar.gz]
-md5=53f6861a916169a88a9edb1848e27dd0
-sha256=2fdde1b4e610cd6e004db8f98ac1100fcbea03b8f11e236de536ce22bc6c620d
-
-[http://downloads.sourceforge.net/smartmontools/smartmontools-5.37.tar.gz]
-md5=4ab3668b7d1362ce923f64a211e0e568
-sha256=2984645b207c52ea9b8ef3951af8bd0c5aab469607fabf63ade05f8fe87309c1
-
-[http://heanet.dl.sourceforge.net/smartmontools/smartmontools-5.37.tar.gz]
-md5=4ab3668b7d1362ce923f64a211e0e568
-sha256=2984645b207c52ea9b8ef3951af8bd0c5aab469607fabf63ade05f8fe87309c1
-
-[http://downloads.sourceforge.net/smartmontools/smartmontools-5.38.tar.gz]
-md5=a282846532ecbd6b4a28072373b3a70b
-sha256=b2097320a1fca4851f1377a14f4cc14a46e27d2a44ca017c40a6cb618b2f31e8
-
-[http://heanet.dl.sourceforge.net/smartmontools/smartmontools-5.38.tar.gz]
-md5=a282846532ecbd6b4a28072373b3a70b
-sha256=b2097320a1fca4851f1377a14f4cc14a46e27d2a44ca017c40a6cb618b2f31e8
-
-[http://downloads.sourceforge.net/smartmontools/smartmontools-5.39.1.tar.gz]
-md5=f6f7380ae45587161c0adae8862110e9
-sha256=725cfd59b33a97561346a990e1ec50b150dbac01f2b90cd9cf3fd74ff1e77720
-
-[http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.2.tar.bz2]
-md5=31da204a0255ba8c6a65386e65dc1c90
-sha256=76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2
-
-[http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.3.tar.bz2]
-md5=ba7dbde81be24fc1bd4156b360e5f8cf
-sha256=1b8dd25483280fc2a4a7d977b4a43dc4228b9c65e904c3d4ee68245705d4ae35
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/smproxy-X11R7.0-1.0.1.tar.bz2]
-md5=60f54881b6fb27a8ba238629e4097c4d
-sha256=c56617fd511eac4bdcff5b9b171be0aeacb7d8ddfe48615aa61295cf90b62888
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/smproxy-X11R7.1-1.0.2.tar.bz2]
-md5=668d00f87fe1123bb5bf0b22dec3e32e
-sha256=56f13e337de528530e35b192d84b869bd3d40cbd0320f3d108f7d741503b995b
-
-[http://gpephone.linuxtogo.org/download/gpephone/sms-1.0/sms-1.0.tar.bz2]
-md5=7c11b59753ae8fea2c1f1030c34bff42
-sha256=7b408a4e7eb5c4fa6861e3d5f0b49f5ce872c87775fb302a7d36956b77f1e2b9
-
-[http://gpephone.linuxtogo.org/download/gpephone/sms-1.1/sms-1.1.tar.bz2]
-md5=baa60d94d99c943b136347a5438ad708
-sha256=b1118e32a03c245fe1140f968fc6d045dae66a7c092f2e42274e9bae3b7b96b8
-
-[http://www.handheldshell.com/software/fso/sms-sentry_1.01.tgz]
-md5=4c21f533aebbe17105374ab0fbcfede3
-sha256=e6ea066943305025dd67e200b272f278911f474c30a4d54bb74268ea930f5130
-
-[http://www.linux-projects.org/downloads/sn9c102-1.32.tar.gz]
-md5=4d5b5bb9c70e69435a608c73da73b632
-sha256=780edfac5a67172a49bc4e8b1bd384fa9184ceaf55bf5ab002fd7b8415db7e3b
-
-[http://www.lysator.liu.se/snes9x/1.43-WIP1/snes9x-1.43-WIP1-src.tar.gz]
-md5=caa2ed89fdc643a18310d2a50db1e02c
-sha256=bc14905c7a7967de59b70909c021d2439d9ec1c9bae835b70cdb786e59caa81c
-
-[http://www.vanille.de/mirror/snes9x-sdl-1.39.tar.bz2]
-md5=a7836a9b6eaae433079c1c9d19f2635a
-sha256=489bb2f9fb69922e9befc27ae1b8d19d31c83c586f55b7ecc503cb4f5e767da4
-
-[http://www.agentpp.com/snmp++v3.2.10.tar.gz]
-md5=6df271fd6a92d7641d7b060dedf7fec6
-sha256=7eedc4ece1c82668c06222ef85457206139253e24a50e5b5d2401a41baee28c1
-
-[http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch]
-md5=fe6945121eaea5e9c570e3dad54d7569
-sha256=578db455270592833156358f79205b21701aa12b64142da16df08fb36fca3322
-
-[http://downloads.sourceforge.net/sofia-sip/sofia-sip-1.11.7.tar.gz]
-md5=09d027ee9817cc1a1b8c0e96271bade4
-sha256=328531d0f522a207a9721223c92b823643af5c82e5958fc5e9c945ea36ddafd6
-
-[http://heanet.dl.sourceforge.net/sofia-sip/sofia-sip-1.11.7.tar.gz]
-md5=09d027ee9817cc1a1b8c0e96271bade4
-sha256=328531d0f522a207a9721223c92b823643af5c82e5958fc5e9c945ea36ddafd6
-
-[http://downloads.sourceforge.net/sofia-sip/sofia-sip-1.12.7.tar.gz]
-md5=c6d7c4c6318fe1ac661862062aad241a
-sha256=86a9522f4ccb17c3b86916784e1de1dce5fe72df6dab06db91f73c2cd3ab96f4
-
-[http://heanet.dl.sourceforge.net/sofia-sip/sofia-sip-1.12.7.tar.gz]
-md5=c6d7c4c6318fe1ac661862062aad241a
-sha256=86a9522f4ccb17c3b86916784e1de1dce5fe72df6dab06db91f73c2cd3ab96f4
-
-[http://joshuawise.com/code/softfan/softfan-0.10.tar.gz]
-md5=e19e8a55c70d9b78f3c5abfa456ebf0c
-sha256=d1cf80381378041049c2b5ec25afca56939cce1d7dd8a8d8ab2ac46e210e354d
-
-[http://handhelds.org/~zecke/oe_packages/sokoban_V1.3.8ern.tar.gz]
-md5=a362dc3f5f23d785990917103c76a43d
-sha256=084f8286eb945455f3f1567c0a7e7df3a759f2a4e1aab3b881b8ef1bda5bdb21
-
-[http://cgit.freedesktop.org/sound-theme-freedesktop/snapshot/sound-theme-freedesktop-0.7.tar.bz2]
-md5=b56ccb5b7afbd29434289c29423ee577
-sha256=14f56bd90c66cdf651637618a298cf2b8ded72ea0135236ed76d5678ddc65d55
-
-[http://gpephone.linuxtogo.org/download/gpephone/soundserver-1.0/soundserver-1.0.tar.bz2]
-md5=14cbf40e5c6ba1ac05a9309d392326fc
-sha256=2cd45d30fcf862f65d3d9a096e69df1e6520920b01cc35fe66e1f21799645614
-
-[http://mutab0r.chat.ru/soundtracker-0.6.7.gtk2.tar.bz2]
-md5=e10563187f49d9f39d360d4c59de6c6c
-sha256=6790d35f1d04ab74b1e48d3a65754fcc01c03f08cc2b5b3a458c5e5c11969695
-
-[http://www.soundtracker.org/dl/v0.6/soundtracker-0.6.8.tar.gz]
-md5=1e5a2ef689e214933e53f687b3a199bb
-sha256=03b2f2c0edba48457ec6178b0a10edfe3481254112936715603a21f638822f50
-
-[http://downloads.sourceforge.net/sox/sox-12.17.5.tar.gz]
-md5=53a3ebe3da0f5845770fd99e2ff0a965
-sha256=9efdc359ccc15af51edc33ead837f0820d353165c633cbe8c86f65ff0d3be30c
-
-[http://heanet.dl.sourceforge.net/sox/sox-12.17.5.tar.gz]
-md5=53a3ebe3da0f5845770fd99e2ff0a965
-sha256=9efdc359ccc15af51edc33ead837f0820d353165c633cbe8c86f65ff0d3be30c
-
-[http://downloads.sourceforge.net/sox/sox-13.0.0.tar.gz]
-md5=0243d62895caee558b5294d5b78cfbcb
-sha256=c66c52cfa42fe126592563c3d8974007a9858bd35d2c1136389a721eeebb9f8e
-
-[http://heanet.dl.sourceforge.net/sox/sox-13.0.0.tar.gz]
-md5=0243d62895caee558b5294d5b78cfbcb
-sha256=c66c52cfa42fe126592563c3d8974007a9858bd35d2c1136389a721eeebb9f8e
-
-[http://www.soft-switch.org/downloads/spandsp/spandsp-0.0.3.tgz]
-md5=6ea33941985fbf94b5f79dc3255ad925
-sha256=368467b757736aef99e19f68e4ed50012b555ef18445b4ad7e47da8c1c353118
-
-[http://www.soft-switch.org/downloads/spandsp/spandsp-0.0.4pre16.tgz]
-md5=9e4de1934d4d49bfee9640e39d19894e
-sha256=3ab8a8ccaa5c9f3ca918209240d38f30e6d43fc9592ae0a791d0e235b15e28aa
-
-[http://www.soft-switch.org/downloads/snapshots/spandsp/spandsp-20070123.tar.gz]
-md5=28b67b6f56d97051c48f251116e0519f
-sha256=18b335e1804cc24505ca683343d62cb98e845ff1e2e3c966502e67f1b61f2546
-
-[http://www.uk.debian.org/debian/pool/main/s/sparc-utils/sparc-utils_1.9.orig.tar.gz]
-md5=08bf3f6d8433a1f4981a2afaa6b49a6c
-sha256=b652bc27f95dcf10a7626b1d2943a1084e1e0b7f9bd3a97f9a46b6688370fe4b
-
-[http://www.codemonkey.org.uk/projects/git-snapshots/sparse/sparse-2008-11-13.tar.gz]
-md5=3f2c1e3c1b09e09cff1b94e334247221
-sha256=ddad6c18d9fbcbcd50452b3d432e6028e7703fb68c68612b28bf879a7c3fdb4c
-
-[http://www.codemonkey.org.uk/projects/git-snapshots/sparse/sparse-2009-03-02.tar.gz]
-md5=14bf874b362799222c3250ca87b1ce55
-sha256=9b49c0a659d1fc8eec85c04eb1c6a0da90f2cbaa241c43817ff9e85213782123
-
-[http://mxhaard.free.fr/spca50x/Download/spca5xx-20060501.tar.gz]
-md5=8fcec25715aea10f9ebec5728c37e752
-sha256=b8049142742cc81bc945aadefb40d173aeb447e428ec62a93e781032ea9b40c2
-
-[http://www.rpsys.net/openzaurus/patches/archive/spectrumcs_fix-r0.patch]
-md5=c6f272e1f03e79add70f75fa52916005
-sha256=f7066bd1ed417200f975679fa8eb652a86381ae533a394d68fd73b911ed89a43
-
-[http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.6.6.tar.gz]
-md5=bbd7ebc5b0f1b3ec4d89ad66b20d5cea
-sha256=c664ee801d1bc0500ae75739fa98bcc8ad410474c98a6757d3d1ee24a8241462
-
-[http://downloads.us.xiph.org/releases/speex/speex-1.1.12.tar.gz]
-md5=1bd6cdf3a0ebabf818cd72a3401e2610
-sha256=77c8505bd9b73192789770299e0a727fba9c1d556d853b8cc473bfee393709f8
-
-[http://downloads.us.xiph.org/releases/speex/speex-1.2beta1.tar.gz]
-md5=aac2e4ba42122b885c787ea280acb3d9
-sha256=d8bef008b3be87b3b155128c091286b269fee32a38b0849bc8cacb3cd5f7f6a0
-
-[http://downloads.us.xiph.org/releases/speex/speex-1.2beta2.tar.gz]
-md5=5480fa53a7451603ecb57ff815c87ac0
-sha256=e57573e86276972080b5d82746d0968492859f35eaa265e79b5cfb130b26e3da
-
-[http://downloads.us.xiph.org/releases/speex/speex-1.2beta3.tar.gz]
-md5=bcada04dc663a725ee7fcfa6301520a3
-sha256=77a3609bf1762f533461c01ef3485d0c9382fa54ec05204f0ff157a4789ce7ab
-
-[http://downloads.us.xiph.org/releases/speex/speex-1.2rc1.tar.gz]
-md5=c4438b22c08e5811ff10e2b06ee9b9ae
-sha256=342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6
-
-[http://www.sphinxsearch.com/downloads/sphinx-0.9.8.tar.gz]
-md5=347e547b79b733778d7553ede34e0aac
-sha256=86de861550fc7b119b3cbe63a34bad32ac771f44c930d229775ac124c83571d9
-
-[http://downloads.sourceforge.net/cmusphinx/sphinxbase-0.1.tar.bz2]
-md5=5ff76b3a4799405ad91e88331eb938bb
-sha256=ffb5e646d98c058ad2f1f0d7738b39e29fbe432981b1b5d9c8a79cdcb168c3c6
-
-[http://heanet.dl.sourceforge.net/cmusphinx/sphinxbase-0.1.tar.bz2]
-md5=5ff76b3a4799405ad91e88331eb938bb
-sha256=ffb5e646d98c058ad2f1f0d7738b39e29fbe432981b1b5d9c8a79cdcb168c3c6
-
-[http://downloads.sourceforge.net/cmusphinx/sphinxbase-0.3.tar.bz2]
-md5=17610af80be230e5760dbb25690a45f0
-sha256=b5817b8629f89e16ba88e1c62dce0321978f3aea038aa77cb61a1ff7fa3e0dbb
-
-[http://heanet.dl.sourceforge.net/cmusphinx/sphinxbase-0.3.tar.bz2]
-md5=17610af80be230e5760dbb25690a45f0
-sha256=b5817b8629f89e16ba88e1c62dce0321978f3aea038aa77cb61a1ff7fa3e0dbb
-
-[http://pypi.python.org/packages/source/s/sphinxsearch/sphinxsearch-0.1.tar.gz]
-md5=920deac1bd4d16fe1c5b51fe839140ab
-sha256=7fcf0aa2e5e08719b39aeb145d3b6e953a8643bb6fd5e8359303399493ee6c39
-
-[http://www.rpsys.net/openzaurus/patches/archive/spitzkbd_fix-r0.patch]
-md5=d69c74ab8e2d7664a48a09773450dd27
-sha256=59e2b9b2244c169c6580cbfffaf5e2bd2f453753f879036487ec6ed116cf851b
-
-[http://dev.gentoo.org/~spock/projects/gensplash/archive/splashutils-1.5.4.2.tar.bz2]
-md5=00dce0efb5e6389cacbf15c62d18e413
-sha256=05265dbc948a690dc5b5710da23eb7093fa4eaabbfebd58463a2be4ab9b848b4
-
-[http://www.hwaci.com/sw/sqlite/sqlite-2.8.15.tar.gz]
-md5=0afa73e107bd106031d046c8ca6a94ab
-sha256=8ba158121f3b20b852bd4dae9c32b5b86a6807a5deebb57f07f667a09672ea4c
-
-[http://www.hwaci.com/sw/sqlite/sqlite-2.8.16.tar.gz]
-md5=9c79b461ff30240a6f9d70dd67f8faea
-sha256=d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
-
-[http://www.hwaci.com/sw/sqlite/sqlite-2.8.17.tar.gz]
-md5=838dbac20b56d2c4292e98848505a05b
-sha256=3f35ebfb67867fb5b583a03e480f900206af637efe7179b32294a6a0cf806f37
-
-[http://www.hwaci.com/sw/sqlite/sqlite-2.8.9.tar.gz]
-md5=0b19989fe083fd547d3baff619d62cda
-sha256=bec2e60f5ed26d4756654892ae62ff00e76a2666c81428622b4f813689b797de
-
-[http://www.sqlite.org/sqlite-3.2.2.tar.gz]
-md5=802f19e1f0eba56f3f1be8c6491c8a55
-sha256=e2f4731017f341160dcba64b00ff5dff16974040f6a8c2dea1449383ac85f611
-
-[http://www.sqlite.org/sqlite-3.2.5.tar.gz]
-md5=0f07cfd8591c3fcae159f0c69bf2436f
-sha256=e5894889e0d88373efeb47bc139061e0b1156fdb209cf252ace23866796c7b53
-
-[http://www.sqlite.org/sqlite-3.2.7.tar.gz]
-md5=34c92821b3b46380f192c0aaf2b2b217
-sha256=c6576eab65d34300116ceb1c82e393c685fd0ffa7baa1ea6b1fa30ea031910df
-
-[http://www.sqlite.org/sqlite-3.3.12.tar.gz]
-md5=ae251cc7a4b54b80941d400ed5af01b7
-sha256=e005781cb0356f65200c05979c04fea533b9a7d873e0060672a4d384468b7186
-
-[http://www.sqlite.org/sqlite-3.3.13.tar.gz]
-md5=6b24d9c364215fba82242a86f54e0ad1
-sha256=930144d92e91ef7b3a7edbbe768cc539db95c06cf05cb156350f8d35bb56625c
-
-[http://www.sqlite.org/sqlite-3.3.5.tar.gz]
-md5=dd2a7b6f2a07a4403a0b5e17e8ed5b88
-sha256=e81d1176960a14459f9ff492b2c4fb1e2b55d0b2c82fd225dbc37afd02334256
-
-[http://www.sqlite.org/sqlite-3.4.2.tar.gz]
-md5=2feec9b429f9298c9f288420c8b449f8
-sha256=0ad86c4b26cd687122b158bf848f0a07d7cd644033d15c4f43b6d643bd74cd81
-
-[http://www.sqlite.org/sqlite-3.5.2.tar.gz]
-md5=b4f631268d811189cfca1d5259cb5dd8
-sha256=af0b4ca361435e54316ddf715737b5b94c737c41e3c0b0e6d66ee8a8938f4500
-
-[http://www.sqlite.org/sqlite-3.5.4.tar.gz]
-md5=f17da840eed792e896c3408d0ce97718
-sha256=47daba209bd3bcffa1c5fcd5fdfc4f524eae619b4fa855aeeb1bbbc8bd2bb04f
-
-[http://www.sqlite.org/sqlite-3.5.6.tar.gz]
-md5=903c9e935c538af392364a9172a3d98d
-sha256=1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb
-
-[http://www.sqlite.org/sqlite-3.6.13.tar.gz]
-md5=652a01797e7538811e4997a5847bc026
-sha256=2ca2591847df72224dd6f99c8fffe35bb63bf41a8519d8e15ad48141aa841bfa
-
-[http://www.sqlite.org/sqlite-3.6.2.tar.gz]
-md5=46f92e42243bc51aaa3871645ce78bd5
-sha256=cb07a9801a128e2f42cf49b7e9d577b092ab54aa05242655af93491a73a91a1f
-
-[http://www.sqlite.org/sqlite-3.6.20.tar.gz]
-md5=0faf8fc8ccff5297513c6532b2b4ce23
-sha256=c172ce97dc7201f38acdff22df467e1514e7225b88c636145e72a66a4ca6d07d
-
-[http://www.sqlite.org/sqlite-3.6.5.tar.gz]
-md5=ed3151ecaeb3f0a484195da5f694c773
-sha256=99bcda2aaf7109a2859ee88aec1f370f61e461343c9bce6cc37f1bed5d933f67
-
-[http://www.zentus.com/sqlitejdbc/dist/sqlitejdbc-v041-src.tgz]
-md5=11aad2f368734e1ff8e0ecc37710d4a9
-sha256=c04bb15b650ffcda80ccd3526b325b49a1173b3421da22b16845aad4a8945c10
-
-[http://kamikaze.waninkoko.info/patches/2.6.23/klight1/broken-out/squashfs-lzma-2.6.23.patch]
-md5=4f9b572c2381c457d866cda9300208de
-sha256=e0f476d04af5921d4a44ab312a03fc6c7122b71adff6e38add8aa188d9969784
-
-[http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch]
-md5=cfdb5caec0326a3ced8b4159f602c94f
-sha256=a7e784b151b25ca724bb7c9611b07cd9a9f3de12014ee80fcada7dd9a8248f53
-
-[http://downloads.sourceforge.net/squashfs/squashfs2.0-r2.tar.gz]
-md5=0b7fcaab8e634ae2385984885c731082
-sha256=353b768294783959219f1203e76c128fb4c75fa37f3a3bb139603c5db55c6974
-
-[http://heanet.dl.sourceforge.net/squashfs/squashfs2.0-r2.tar.gz]
-md5=0b7fcaab8e634ae2385984885c731082
-sha256=353b768294783959219f1203e76c128fb4c75fa37f3a3bb139603c5db55c6974
-
-[http://downloads.sourceforge.net/squashfs/squashfs2.2-r2.tar.gz]
-md5=a8d09a217240127ae4d339e8368d2de1
-sha256=750a7a4896d782698a0f531ca30582f0ddd365fe317a04c4dd4fa1ce2eb053eb
-
-[http://heanet.dl.sourceforge.net/squashfs/squashfs2.2-r2.tar.gz]
-md5=a8d09a217240127ae4d339e8368d2de1
-sha256=750a7a4896d782698a0f531ca30582f0ddd365fe317a04c4dd4fa1ce2eb053eb
-
-[http://downloads.sourceforge.net/squashfs/squashfs3.1-r2.tar.gz]
-md5=c252e5286b142afa54ca49829c51a33f
-sha256=ec3159feae5324e78f7fc09f8f534bd6a3e7ed735144ee8a8e9e7871e77115e0
-
-[http://heanet.dl.sourceforge.net/squashfs/squashfs3.1-r2.tar.gz]
-md5=c252e5286b142afa54ca49829c51a33f
-sha256=ec3159feae5324e78f7fc09f8f534bd6a3e7ed735144ee8a8e9e7871e77115e0
-
-[http://downloads.sourceforge.net/squashfs/squashfs3.3.tar.gz]
-md5=62d3ff7c067a5aa82f57711b3a4ab86a
-sha256=496049c7e5fd361d8fec814ee05005591380bbcb03a565957b78161cdefe84e5
-
-[http://downloads.sourceforge.net/squashfs/squashfs3.3.tgz]
-md5=95c40fca0d886893631b5de14a0af25b
-sha256=8423027a1e7dc238d27ec227f47ce22d1317b4c9a0a9ee49a38b6e6f8da8a5c8
-
-[http://heanet.dl.sourceforge.net/squashfs/squashfs3.3.tgz]
-md5=95c40fca0d886893631b5de14a0af25b
-sha256=8423027a1e7dc238d27ec227f47ce22d1317b4c9a0a9ee49a38b6e6f8da8a5c8
-
-[http://downloads.sourceforge.net/squashfs/squashfs4.0.tar.gz]
-md5=a3c23391da4ebab0ac4a75021ddabf96
-sha256=18948edbe06bac2c4307eea99bfb962643e4b82e5b7edd541b4d743748e12e21
-
-[http://squeeze.xfce.org/downloads/squeeze-0.2.3.tar.bz2]
-md5=bd3cb0648b49be1f146fc4f675606176
-sha256=7b8dc13e0adf72c67bba12e1ed1285ec820946e65d0eec247f7bd159a2cfac2d
-
-[http://www.squid-cache.org/Versions/v2/2.6/squid-2.6.STABLE14.tar.bz2]
-md5=eadb138d48320df8b99349121159c6bf
-sha256=dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a
-
-[http://www.rillion.net/squidview/squidview-0.72.tar.gz]
-md5=4809dcf89e504d4039ed01c9f61c68d5
-sha256=3da4fccc40c7c8ad51dba5bc7ac29a3a53905d5f2de0761353214d7e359d4bfd
-
-[http://www.klake.org/~jt/sscep/sscep.tgz]
-md5=89ba368c8455c324d208e5f5965f8f8f
-sha256=e622c344f72c6d95e15db834efbf777392778b2854e58a5d8f5d20b668cf2a9b
-
-[http://downloads.sourceforge.net/fuse/sshfs-fuse-1.3.tar.gz]
-md5=40fe4a353d03b80f8b37e4b0cc6159d3
-sha256=f80f713105fc0747197b6e5d2440cd77205cb1febe25b7b4fe08809ab67ace26
-
-[http://downloads.sourceforge.net/fuse/sshfs-fuse-1.8.tar.gz]
-md5=3c575cf89a6d3d8ab6063c2f60bd5b25
-sha256=057626d78e5ade840568ab0e171a1d1ae87348ab51bf9e35d1cdc074fc4e2edb
-
-[http://heanet.dl.sourceforge.net/fuse/sshfs-fuse-1.8.tar.gz]
-md5=3c575cf89a6d3d8ab6063c2f60bd5b25
-sha256=057626d78e5ade840568ab0e171a1d1ae87348ab51bf9e35d1cdc074fc4e2edb
-
-[http://downloads.sourceforge.net/fuse/sshfs-fuse-2.2.tar.gz]
-md5=26e9206eb5169e87e6f95f54bc005a4f
-sha256=206ebcbc4cb9f5039bfcc7059678a0f61120605a5cdcbffa3ae5716c113e5423
-
-[ftp://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61.orig.tar.gz]
-md5=957e6fff08625fe34f4fc33d0925bbc9
-sha256=2151ad18cb73f9a254f796dde2b48be7318b45410b59fedbb258db5a41044fb5
-
-[ftp://ftp.nl.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61.orig.tar.gz]
-md5=957e6fff08625fe34f4fc33d0925bbc9
-sha256=2151ad18cb73f9a254f796dde2b48be7318b45410b59fedbb258db5a41044fb5
-
-[ftp://ftp.us.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61.orig.tar.gz]
-md5=957e6fff08625fe34f4fc33d0925bbc9
-sha256=2151ad18cb73f9a254f796dde2b48be7318b45410b59fedbb258db5a41044fb5
-
-[http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/stabs-tweak.patch]
-md5=404d3f5e5adfd757dd91e58bd66ed10e
-sha256=393d1f60ee4e3b4ce8138481e17da02ca2f23e06887a0650be2f5ecf85628844
-
-[http://downloads.sourceforge.net/stalonetray/stalonetray-0.7.6.tar.bz2]
-md5=eebb46182b64d75b89776bbfc867f470
-sha256=35043df77437b66ade4a07b69f31aaa8c157ddc2833899eeb8a4794399a9e061
-
-[http://heanet.dl.sourceforge.net/stalonetray/stalonetray-0.7.6.tar.bz2]
-md5=eebb46182b64d75b89776bbfc867f470
-sha256=35043df77437b66ade4a07b69f31aaa8c157ddc2833899eeb8a4794399a9e061
-
-[http://www.phidgets.com/downloads/examples/standardC_2.1.4.20080821.tar.gz]
-md5=02c328db22a95dc0fa52e12fde9f40da
-sha256=997c4ca8438f09188e6417e2009697fef1fdba54b8a33f482d1dee9d0d8438a4
-
-[http://handhelds.org/~skyhusker/starling-0.1.tar.bz2]
-md5=4762b45291ff5f71691f187ee87a449e
-sha256=7a0002c9247b46ff61b44ecc800bec8b6239279475f9a359b35daf11e58c1406
-
-[http://gpe.linuxtogo.org/download/source/starling-0.9.tar.bz2]
-md5=1c9cab1e49819dbe4e876c3be26cca6b
-sha256=63ed3e239c79a5913e9542b7023586c51a592e33d2ec0256dafa34cbae20c497
-
-[http://gpe.linuxtogo.org/download/source/startup-monitor-0.18-2.tar.gz]
-md5=2ac92d4deda518558036a5685fc28814
-sha256=0d1570843bd479ad6183f5014c3da3f68915f9c2626f11d96b422852a9991d86
-
-[http://freedesktop.org/Software/startup-notification/releases/startup-notification-0.5.tar.gz]
-md5=c7a96f4615b07ed847061b0a9a0be989
-sha256=7d2f388f7b50fc5c929ef173c2df900c588329ab07c16184dee3745a26ac54ae
-
-[http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.8.tar.gz]
-md5=9bba52ffe8c096cfeeaf7a1dcd9b943d
-sha256=7b5d0458b7831ed96633fca771e5707bfd2d3c1c91a8442c6f412e6fa98025bf
-
-[http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.9.tar.gz]
-md5=5480d3af709523ec70e0e04692744f2d
-sha256=c2fa09f9a49d8b319e79638e49e967c682df8726006e03059b1ffca5ab82099c
-
-[http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat.com__20050627.tar.gz]
-md5=ecbdba24ac6274076d4a073bf1ee8ef0
-sha256=b7bed167db8eb005b55392130a8b3f4d5567bcf62fb5f003a91f6c0bfffa5773
-
-[http://familiar.handhelds.org/source/v0.8.3/stash_ports_sources.redhat.com__20050627.tar.gz]
-md5=a457ecf845ef148b3879bd16ce7b89ea
-sha256=1e5d4c2277997dcf2f6eec77b10ed0a84865fb18b0d04da9b99f266e796ba820
-
-[ftp://metalab.unc.edu/pub/Linux/utils/file/stat-3.3.tar.gz]
-md5=37e247e8e400ad9205f1b0500b728fd3
-sha256=7071f0384a423a938dd542c1f08547a02824f6359acd3ef3f944b2c4c2d1ee09
-
-[http://eaglet.rain.com/rick/linux/schedstat/v10/stats-10.pl]
-md5=9c05c1831449219d063e803e3cf1dd88
-sha256=06e1f846b47c3b3b702b65489bc7d4d4c6b9f499609f4aec4556cb5046729202
-
-[http://repository.maemo.org/extras/pool/chinook/free/source/s/statusbarclock/statusbarclock_0.8.tar.gz]
-md5=1d1a700b695798f2e88b63eb8e811e99
-sha256=262e2cb0e3f98891b3216df838a0257fb6675b0b98be8084bfd43843cfc234b4
-
-[http://downloads.sourceforge.net/strace/strace-4.5.11.tar.bz2]
-md5=28335e15c83456a3db055a0a0efcb4fe
-sha256=9de428477d4d3f383d58c2f16b2544da2a5ec0acc50ee90ecb81dfe38f56edb8
-
-[http://heanet.dl.sourceforge.net/strace/strace-4.5.11.tar.bz2]
-md5=28335e15c83456a3db055a0a0efcb4fe
-sha256=9de428477d4d3f383d58c2f16b2544da2a5ec0acc50ee90ecb81dfe38f56edb8
-
-[http://downloads.sourceforge.net/strace/strace-4.5.12.tar.bz2]
-md5=c9dc77b9bd7f144f317e8289e0f6d40b
-sha256=d8d9d62f0ebab71fab62b5ba7eaddd8bb8df9b7f4988b4a8e0d0724662702acf
-
-[http://heanet.dl.sourceforge.net/strace/strace-4.5.12.tar.bz2]
-md5=c9dc77b9bd7f144f317e8289e0f6d40b
-sha256=d8d9d62f0ebab71fab62b5ba7eaddd8bb8df9b7f4988b4a8e0d0724662702acf
-
-[http://downloads.sourceforge.net/strace/strace-4.5.14.tar.bz2]
-md5=09bcd5d00ece28f8154dec11cadfce3c
-sha256=a6808914cbfead2595dfd061a0f14dcbb0a8bb645e3cfdfa5c247d7ded9e0e7d
-
-[http://heanet.dl.sourceforge.net/strace/strace-4.5.14.tar.bz2]
-md5=09bcd5d00ece28f8154dec11cadfce3c
-sha256=a6808914cbfead2595dfd061a0f14dcbb0a8bb645e3cfdfa5c247d7ded9e0e7d
-
-[http://qa.debian.org/watch/sf.php/strace/strace-4.5.14.tar.bz2]
-md5=09bcd5d00ece28f8154dec11cadfce3c
-sha256=a6808914cbfead2595dfd061a0f14dcbb0a8bb645e3cfdfa5c247d7ded9e0e7d
-
-[http://downloads.sourceforge.net/strace/strace-4.5.15.tar.bz2]
-md5=ef40944118841803391d212cb64d3c5b
-sha256=ba8c492c1b2033d4e2131f05df9e3780d4bc35bea87aa32a6052dd53a814e288
-
-[http://heanet.dl.sourceforge.net/strace/strace-4.5.15.tar.bz2]
-md5=ef40944118841803391d212cb64d3c5b
-sha256=ba8c492c1b2033d4e2131f05df9e3780d4bc35bea87aa32a6052dd53a814e288
-
-[http://downloads.sourceforge.net/strace/strace-4.5.18.tar.bz2]
-md5=e9449fcee97e6a8ed73934c883c870e0
-sha256=95e7b7470e04f22c3ec8dc6d0b1fdd8944306cb5313c84c4545cd83abada26d0
-
-[http://downloads.sourceforge.net/streamripper/streamripper-1.61.3.tar.gz]
-md5=57cd09098917bda29f841d366649681c
-sha256=1747aee9fa4cc09b49e0fb14baace3293f8f870c0de27fd3550cde21d99e9cd7
-
-[http://heanet.dl.sourceforge.net/streamripper/streamripper-1.61.3.tar.gz]
-md5=57cd09098917bda29f841d366649681c
-sha256=1747aee9fa4cc09b49e0fb14baace3293f8f870c0de27fd3550cde21d99e9cd7
-
-[http://weather.ou.edu/~apw/projects/stress/stress-0.18.8.tar.gz]
-md5=160d41166d98a1e88c3f95f556633b71
-sha256=3f753cd91828808ecbdeffd1fe3125eccc6f71ecad7756115acc08b3e2c764dc
-
-[http://weather.ou.edu/~apw/projects/stress/stress-1.0.0.tar.gz]
-md5=d693ff044ac7d34f8aaea202cd96f679
-sha256=778126fdcc3ecb54d4a8dad6164001603bcc3b79ba64b3c2c5285275bc0cbedf
-
-[http://downloads.sourceforge.net/strigi/strigi-0.5.10.tar.bz2]
-md5=cfaa2114ea27f2a00e6773c374e98ec4
-sha256=3851f803de3759490073c1d682d018592b010437b9ac2b85394eaddc63621faf
-
-[http://heanet.dl.sourceforge.net/strigi/strigi-0.5.10.tar.bz2]
-md5=cfaa2114ea27f2a00e6773c374e98ec4
-sha256=3851f803de3759490073c1d682d018592b010437b9ac2b85394eaddc63621faf
-
-[http://www.stunnel.org/download/stunnel/src/stunnel-4.09.tar.gz]
-md5=2077669b04c36e4c0baa68348e8860a7
-sha256=56004db651fe180ed23882c555607c8f2723a3e99734d462fe644e531a574271
-
-[http://downloads.sourceforge.net/subapplet/subapplet-1.0.8.tar.gz]
-md5=6042daa703d8bd34174b195843e7ffaa
-sha256=4cc4cc703bcd4da0df25e7b87b082bd9d1c836868bc4641b3c960931582dc3d2
-
-[http://heanet.dl.sourceforge.net/subapplet/subapplet-1.0.8.tar.gz]
-md5=6042daa703d8bd34174b195843e7ffaa
-sha256=4cc4cc703bcd4da0df25e7b87b082bd9d1c836868bc4641b3c960931582dc3d2
-
-[http://subversion.tigris.org/downloads/subversion-1.3.1.tar.bz2]
-md5=07b95963968ae345541ca99d0e7bf082
-sha256=4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d
-
-[http://subversion.tigris.org/downloads/subversion-1.4.0.tar.bz2]
-md5=f0c5fef69fccfb12ef6c8598f484ed0e
-sha256=6960ed42174be9c54853e8708cc91a7c8355b23c4c3921a6d7fe7947d50843e4
-
-[http://subversion.tigris.org/downloads/subversion-1.4.3.tar.bz2]
-md5=de0e792c9804c7bce397d267af5eb30d
-sha256=8260a2d3a67c5cebc100e7662f81679582c0f05a2a28260e235bdf051e72aee3
-
-[http://subversion.tigris.org/downloads/subversion-1.4.5.tar.bz2]
-md5=4c333a5fe827568c67d195cda7a5e154
-sha256=763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53
-
-[http://subversion.tigris.org/downloads/subversion-1.5.5.tar.bz2]
-md5=6f3701a0f2acf3fe53093491ba3d77ee
-sha256=88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be
-
-[http://subversion.tigris.org/downloads/subversion-1.6.5.tar.bz2]
-md5=1a53a0e72bee0bf814f4da83a9b6a636
-sha256=64331bda459e984b8d369b449eec89daa2f3cd288186f1d2a9ad8011badd4dad
-
-[http://ftp.sudo.ws/sudo/dist/sudo-1.6.8p12.tar.gz]
-md5=b29893c06192df6230dd5f340f3badf5
-sha256=56f7d86032538a4a98d90af3742903a09ba16d6db82b593e4a47605f87fa581a
-
-[http://dev.laptop.org/pub/sugar/sources/sugar/sugar-0.82.0.tar.bz2]
-md5=1f26fa4aee57469a0636a70649343fb3
-sha256=ca4c614e09371a986ca5d86065fc697f7eb07b2064a6a2cad541755df0135883
-
-[http://dev.laptop.org/pub/sugar/sources/sugar/sugar-0.82.9.tar.bz2]
-md5=71af6b9632f441259e7ea5608db2ae5f
-sha256=2172bfed8fdeab4279dad7712390fd98ae0a993c42c2c4eec98cf3d30d1a11aa
-
-[http://download.sugarlabs.org/sources/sucrose/glucose/sugar/sugar-0.83.4.tar.bz2]
-md5=6b981c63bb5d8b23b43831ece79884e6
-sha256=254ac13ceeba17749ff6416b33fd038f8db7aaf6fab2e0a9d2303dd07314b186
-
-[http://download.sugarlabs.org/sources/sucrose/glucose/sugar/sugar-0.84.6.tar.bz2]
-md5=1747f7f35519b273e6c27bbcd8513d4b
-sha256=f5db9c1caf5cd57abfccb12ab1f5ba508cbf0f90ec9bad03de3fb38063775b83
-
-[http://dev.laptop.org/pub/sugar/sources/sugar-artwork/sugar-artwork-0.82.0.tar.bz2]
-md5=3d271bf9f0d412afb9a5618ba5496fb8
-sha256=dbe36fa758a49dd8526885e2025b51d6e1e6e32458168e420c955b633ee3b100
-
-[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-artwork/sugar-artwork-0.84.1.tar.bz2]
-md5=d28b847a24aa23a1b6949aa6a7873560
-sha256=2dc71acc88da545e6a217fd4749dc39a9d59e9f2f768bd67ea201999e55f302a
-
-[http://dev.laptop.org/pub/sugar/sources/sugar-base/sugar-base-0.82.0.tar.bz2]
-md5=5c568166761af4839cbc78db5dcd0061
-sha256=124db55b59cdf5731096276e30d07b3537bc217ae63607f1394c2bb118cfe694
-
-[http://dev.laptop.org/pub/sugar/sources/sugar-base/sugar-base-0.82.2.tar.bz2]
-md5=c5790a18fd9ee86a49ffa727505294f5
-sha256=430b27a0510a50fb66ee211e35565be7e1e522bcde7d1adde5c63a1d18ad7f1d
-
-[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/sugar-base-0.83.2.tar.bz2]
-md5=0f05d95eaf0f8e3174a3b3e3b0afe995
-sha256=64ece8bb8e6eddb4c7b8b4ce0aa30f07f00a86ed7b113a7957661e73616a8dc3
-
-[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/sugar-base-0.84.1.tar.bz2]
-md5=0ef47ff5a8931e0e7c732d22a514d297
-sha256=e67eab2d058a3410d8fe82a2161d0c268b6445648c5901a8bd2c26690c45addd
-
-[http://dev.laptop.org/pub/sugar/sources/sugar-datastore/sugar-datastore-0.82.0.tar.bz2]
-md5=7a6bbb387c1f7cd3ddd6663869df3b88
-sha256=3fc7ed937865773089d146f0fce72ee556f0655c612ae840a08dbd1a13d92d39
-
-[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-datastore/sugar-datastore-0.84.0.tar.bz2]
-md5=e57580e9fd44ecc2cb7a947dd8854817
-sha256=6049dddd3863110b95ec7c7b53c15f6ef8c7b627e3a04f0e9053978685a699db
-
-[http://dev.laptop.org/pub/sugar/sources/sugar-presence-service/sugar-presence-service-0.82.1.tar.bz2]
-md5=361bf10937908a638442b562ebb26d0b
-sha256=6aceb2140c44ada61c9deba9215a12b9a1025fabecc07907edfdcf0ba8ca341b
-
-[http://dev.laptop.org/pub/sugar/sources/sugar-presence-service/sugar-presence-service-0.82.2.tar.bz2]
-md5=0b50a2467e4e9eedd22f51bf2fe6e6f3
-sha256=3b33c9689fb9faaeaf4308cd66794b02951249253ac96df99bd308c4b6d38850
-
-[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-presence-service/sugar-presence-service-0.84.0.tar.bz2]
-md5=bf292605b6c2d0ef3761a957acc8a95e
-sha256=15afba51ef2c34b86ae2c4b8ecfe612e37a7024ae9ccf42a3b612d70e3034d48
-
-[http://dev.laptop.org/pub/sugar/sources/sugar-toolkit/sugar-toolkit-0.82.1.tar.bz2]
-md5=885bd339331209d2771ca614723518a3
-sha256=68f1a10298f34ea133a679085b3b54bdb990c49324779f79e40aff0f274b6a9a
-
-[http://dev.laptop.org/pub/sugar/sources/sugar-toolkit/sugar-toolkit-0.82.11.tar.bz2]
-md5=c3a2c45d6444efcd3fa59c50198f9483
-sha256=a0fae53f396c6223365c28c8cda0538f2cb20c660bffd9cfcc37ee00b57c2a7b
-
-[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/sugar-toolkit-0.83.3.tar.bz2]
-md5=f6882ee56ed327c6680738133e911bf3
-sha256=243a9d699af072b4cb79334b62638463d9f39437e7a886a14a95b7a8250983bd
-
-[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/sugar-toolkit-0.84.4.tar.bz2]
-md5=5ad76015d382ec4125c2ef01022dc898
-sha256=bc489eb0feacfd68cd29f1556e2d1c4b4eb8f01c9add7ceb878b605521eb9f92
-
-[http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz]
-md5=05787c6553316940873e8bce192a4fe0
-sha256=ab958a3cc04858ab72f3fe2844362f249897c3bb2149208be22da2ce5d46c9c0
-
-[http://downloads.sourceforge.net/super-tux/supertux-0.1.2.tar.bz2]
-md5=7c10acf574f09ae5cb9eb2a4b9bf93ff
-sha256=8f2275d9667909d3418213522d5d4ef3312c158190429062f79da6b982b9ce6b
-
-[http://heanet.dl.sourceforge.net/super-tux/supertux-0.1.2.tar.bz2]
-md5=7c10acf574f09ae5cb9eb2a4b9bf93ff
-sha256=8f2275d9667909d3418213522d5d4ef3312c158190429062f79da6b982b9ce6b
-
-[http://downloads.sourceforge.net/super-tux/supertux-0.1.3.tar.bz2]
-md5=f2fc288459f33d5cd8f645fbca737a63
-sha256=0092588351776626955339caaa62d12ce5954bb80c5f6952f60a122f53c2ad97
-
-[http://heanet.dl.sourceforge.net/super-tux/supertux-0.1.3.tar.bz2]
-md5=f2fc288459f33d5cd8f645fbca737a63
-sha256=0092588351776626955339caaa62d12ce5954bb80c5f6952f60a122f53c2ad97
-
-[http://swfdec.freedesktop.org/download/swfdec/0.4/swfdec-0.4.0.tar.gz]
-md5=157d31c9dc02aa22b5f27323e5a203fc
-sha256=c31d3bbee984c7971d2b24cddc279d8ad65edff8216778d617484c147ba3ae3d
-
-[http://swfdec.freedesktop.org/download/swfdec/0.7/swfdec-0.7.2.tar.gz]
-md5=7624b5642c947fb054273f091a1d970c
-sha256=c6b2ee967ae04776fd60a47dc283570917e387dbcffc907a0dfc91f567c139f7
-
-[http://swfdec.freedesktop.org/download/swfdec/0.7/swfdec-0.7.4.tar.gz]
-md5=08fcda4a46454bfc66b97fba2d385f8c
-sha256=4345da2a4790125bd7205bd10a3326bf94e36f97229850b99ec9e8f050a9ab4a
-
-[http://swfdec.freedesktop.org/download/swfdec/0.8/swfdec-0.8.2.tar.gz]
-md5=2fb20b04c0e426a1e894a4c4bf22cf87
-sha256=10fd6f07264d3fbd92c03858a99637cd4b9d98ab00fb4d31720adce0c1ed7af4
-
-[http://swfdec.freedesktop.org/download/swfdec/0.9/swfdec-0.9.2.tar.gz]
-md5=7be5e39236e2d6efa61a18e83e5ab73d
-sha256=7d56a3044c19e7ca4b492f3739d9aa6f6bdb6e51ecf4daa5d29c035ae430f1ef
-
-[http://ftp.gnome.org/pub/GNOME/sources/swfdec-gnome/2.26/swfdec-gnome-2.26.0.tar.bz2]
-md5=53d611d9a76a06a703650c4b73fd44cc
-sha256=bf48dcadd9ca015f40a9aaa9cc94d402e9daf7c88b747789c79fcc921e9e1626
-
-[http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/swfdec-mozilla-0.7.2.tar.gz]
-md5=3bc6a49357b4b8b478ce3dfb4f007f18
-sha256=84962251e647fdcdcf111bef0c478f7d3679ae104267ba72e59ad749c6955cc2
-
-[http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/swfdec-mozilla-0.7.4.tar.gz]
-md5=c5958f3b003190b21977495021ac2b28
-sha256=0d7927f2e791321b2867c120eb4140d9017c59b77925eb909b2a03f3ef2a8fe4
-
-[http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/swfdec-mozilla-0.8.2.tar.gz]
-md5=716632e0d35b3c1582c180569ba30346
-sha256=49fd905f41b67832e7b2cfa2cf664657ab08f8fef4a2324e74202fc951396cd5
-
-[http://swfdec.freedesktop.org/download/swfdec-mozilla/0.9/swfdec-mozilla-0.9.2.tar.gz]
-md5=5e19c365d02f1ece2e7caec13c2b23d4
-sha256=8c8cfb52b47efabefab90577fb118ab2699c803cebbc82891700f8e2d712343b
-
-[http://downloads.sourceforge.net/swig/swig-1.3.29.tar.gz]
-md5=44c6f6d8d724cf7fa4a5109e6f63c9b1
-sha256=68b1b032cdc6297f068ef8c3c09abdd46a08512e17705d477cc0bf7b80a550e8
-
-[http://downloads.sourceforge.net/swig/swig-1.3.31.tar.gz]
-md5=4a0bae63e3713e89b26db7209b6a7e05
-sha256=c2ad63095e34b4a474e7ff4adb6ea8b7ab238bb5738d00a739102bb8bb71d805
-
-[http://heanet.dl.sourceforge.net/swig/swig-1.3.31.tar.gz]
-md5=4a0bae63e3713e89b26db7209b6a7e05
-sha256=c2ad63095e34b4a474e7ff4adb6ea8b7ab238bb5738d00a739102bb8bb71d805
-
-[http://downloads.sourceforge.net/swig/swig-1.3.38.tar.gz]
-md5=650c774917be49c526a4f8a3e733c898
-sha256=e7cbddc8c68b1eccba1c82edd5427595397d9a483c8fb1184abc9303afe08045
-
-[http://downloads.sourceforge.net/swig/swig-1.3.39.tar.gz]
-md5=ac201d1b87f8659584534f9540d7ad24
-sha256=bb2d5d9373cf1fe03faaadb02de47af3b058b0300e0f58ece6a7212f0a2b11dc
-
-[http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-1.5.10.tar.gz]
-md5=4c920f2a3ee72040df8a8e105ad840df
-sha256=5fb3f030e9395e23a48c02bde6bc81ad42b1c4056a011d9ee15c4c85110eb847
-
-[http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-1.5.10.tar.gz]
-md5=4c920f2a3ee72040df8a8e105ad840df
-sha256=5fb3f030e9395e23a48c02bde6bc81ad42b1c4056a011d9ee15c4c85110eb847
-
-[http://www.crosswire.org/~dglassey/sword-1.5.7a.tar.gz]
-md5=617f87bc1f61fbbaf5f5306e9c7798a3
-sha256=c4db934c775024f5c931b57a2a6bee08e55ee1f1cd2a7e6ee4876729c4faa827
-
-[http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-1.5.8.tar.gz]
-md5=c36398c84bfb044c0c66ef3ffcf29400
-sha256=aeb57fe89716807f331eb17fcf23ef1ba3ad3e7018cd2d32560677ffe6937ce9
-
-[http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-1.5.8.tar.gz]
-md5=c36398c84bfb044c0c66ef3ffcf29400
-sha256=aeb57fe89716807f331eb17fcf23ef1ba3ad3e7018cd2d32560677ffe6937ce9
-
-[http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-1.5.9.tar.gz]
-md5=e1f1af8c2add8310d0bbcddc9af523b8
-sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
-
-[http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-1.5.9.tar.gz]
-md5=e1f1af8c2add8310d0bbcddc9af523b8
-sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
-
-[http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip]
-md5=b6bf01aa408377f2fe5f617a4dea1876
-sha256=c913105c740fe9cbbf7ab49f663acf5640b812995c2f9c716294f6b44a3185c4
-
-[http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4.2-200902111700/swt-3.4.2-gtk-linux-x86.zip]
-md5=2b97f05f86bd7138491d9a8c5934e840
-sha256=30c8c545faabae331420a6c37194470a4f74f508eab4e0463c65953d09cde6eb
-
-[http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-2.2.9.tar.bz2]
-md5=45e9e89775613b0afb732fbc11c73d26
-sha256=72a6ab7c8a0baf0d1d432929c19a7d096335ba4adc43e40488b6a77e5995a0f5
-
-[http://sylpheed.good-day.net/sylpheed/v2.5/sylpheed-2.5.0.tar.bz2]
-md5=a6fc9e9c2a33876fddb33f25f40b820f
-sha256=d18a8dc51126e25c7677dd649b7499756278e1d82b7b888d37a10fb1d8d38761
-
-[http://www.logarithmic.net/pfh-files/synaesthesia/synaesthesia-2.4.tar.gz]
-md5=784105cbeed3ab209231675f0e029497
-sha256=48505975e809ebadf416dc3e35a528ef87f01b117f2f1c5498d728ead8786493
-
-[http://hem.bredband.net/miko22/syncml-client-0.1.tar.gz]
-md5=a3a6ebd4d64a4de4234f6d8a7f7f61d5
-sha256=d5b4d8a69bf72abcea74a3d02d9bed470abff0d5252c601b73ce8fe933822aea
-
-[http://downloads.sourceforge.net/synergy2/synergy-1.2.7.tar.gz]
-md5=da9effc847d13f9725b6db043d8283a5
-sha256=567a50863c04dc9ccf5def3c62bb9f0494e995357620603dd00bbe035ca7500e
-
-[http://heanet.dl.sourceforge.net/synergy2/synergy-1.2.7.tar.gz]
-md5=da9effc847d13f9725b6db043d8283a5
-sha256=567a50863c04dc9ccf5def3c62bb9f0494e995357620603dd00bbe035ca7500e
-
-[http://downloads.sourceforge.net/synergy2/synergy-1.3.1.tar.gz]
-md5=a6e09d6b71cb217f23069980060abf27
-sha256=4a15e26456498dda5f3aa7d688a4892e0c50394a2f01685136fbc954bacc9691
-
-[http://heanet.dl.sourceforge.net/synergy2/synergy-1.3.1.tar.gz]
-md5=a6e09d6b71cb217f23069980060abf27
-sha256=4a15e26456498dda5f3aa7d688a4892e0c50394a2f01685136fbc954bacc9691
-
-[http://downloads.sourceforge.net/linux-diag/sysfsutils-1.3.0.tar.gz]
-md5=d11c99271531be3c1e6d36b53968cd2b
-sha256=03e3dc79fd7b36266372de0d331d792c04d185e57495c6fb1d46a0ea0ed0b04d
-
-[http://heanet.dl.sourceforge.net/linux-diag/sysfsutils-1.3.0.tar.gz]
-md5=d11c99271531be3c1e6d36b53968cd2b
-sha256=03e3dc79fd7b36266372de0d331d792c04d185e57495c6fb1d46a0ea0ed0b04d
-
-[http://downloads.sourceforge.net/linux-diag/sysfsutils-2.0.0.tar.gz]
-md5=b7857c045ef3b4810c9b8be965c05fb9
-sha256=d162ddc4f4a29c770549cb135da179e205480c065739dbe6c3c1bed6d84a3060
-
-[http://heanet.dl.sourceforge.net/linux-diag/sysfsutils-2.0.0.tar.gz]
-md5=b7857c045ef3b4810c9b8be965c05fb9
-sha256=d162ddc4f4a29c770549cb135da179e205480c065739dbe6c3c1bed6d84a3060
-
-[http://downloads.sourceforge.net/linux-diag/sysfsutils-2.1.0.tar.gz]
-md5=14e7dcd0436d2f49aa403f67e1ef7ddc
-sha256=e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a
-
-[http://heanet.dl.sourceforge.net/linux-diag/sysfsutils-2.1.0.tar.gz]
-md5=14e7dcd0436d2f49aa403f67e1ef7ddc
-sha256=e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a
-
-[http://qa.debian.org/watch/sf.php/linux-diag/sysfsutils-2.1.0.tar.gz]
-md5=14e7dcd0436d2f49aa403f67e1ef7ddc
-sha256=e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a
-
-[http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-1.4.1.tar.gz]
-md5=d214aa40beabf7bdb0c9b3c64432c774
-sha256=44357e0fae8c8f0e315bf130b4e86a4f96b91d66eeb4e473def4ce8336fff102
-
-[http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-1.5.tar.gz]
-md5=e053094e8103165f98ddafe828f6ae4b
-sha256=6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773
-
-[http://kernel.org//pub/linux/utils/boot/syslinux/Old/syslinux-2.11.tar.bz2]
-md5=38a30cc790265f19f80330330ffaa527
-sha256=cdc785cb2356a7147e988e6b572d378c3762cf701c85e4c91a634545e6b9aff4
-
-[http://kernel.org/pub/linux/utils/boot/syslinux/Old/syslinux-2.11.tar.bz2]
-md5=38a30cc790265f19f80330330ffaa527
-sha256=cdc785cb2356a7147e988e6b572d378c3762cf701c85e4c91a634545e6b9aff4
-
-[http://kernel.org//pub/linux/utils/boot/syslinux/Old/syslinux-3.11.tar.bz2]
-md5=513ff71287a4397d507879a1a836c2e8
-sha256=3baef57243c2475b46a913afe38bc7228ddc0297dfaa33e2213903eb9f130bd0
-
-[http://kernel.org/pub/linux/utils/boot/syslinux/Old/syslinux-3.11.tar.bz2]
-md5=513ff71287a4397d507879a1a836c2e8
-sha256=3baef57243c2475b46a913afe38bc7228ddc0297dfaa33e2213903eb9f130bd0
-
-[http://kernel.org//pub/linux/utils/boot/syslinux/syslinux-3.31.tar.bz2]
-md5=5faae89d18baf92e28bc820c62270db9
-sha256=57c4ca6e7836460297edcc45148373ec131157b29c184ee011b29ec491e010f0
-
-[http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.31.tar.bz2]
-md5=5faae89d18baf92e28bc820c62270db9
-sha256=57c4ca6e7836460297edcc45148373ec131157b29c184ee011b29ec491e010f0
-
-[http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.36.tar.bz2]
-md5=d1bfdaa53d31f572f540be55d1480027
-sha256=c087b112da0afd1c50ba8a8a2727c4cabfb1e5a57f43701c5abdc05865072649
-
-[http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.63.tar.bz2]
-md5=ee6b84cc7b598b4e1a00a4a8c6676d4e
-sha256=d4d17102e014d3183a11719896061dc464c3d9a836caaf47b3b57da4ac23b52d
-
-[http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.82.tar.bz2]
-md5=c9f4e73e385c86b3a8faf9b615a04836
-sha256=1dbbf8cfd10fc07187fa8bfede23639fc95314976730f3474cb349e8bf6c6f61
-
-[http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/syslog-ng-1.6.11.tar.gz]
-md5=8f9ca6140f428dc9adec9fa1c270a2dd
-sha256=dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093
-
-[http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.11.tar.gz]
-md5=8f9ca6140f428dc9adec9fa1c270a2dd
-sha256=dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093
-
-[http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/syslog-ng-1.6.8.tar.gz]
-md5=ffbad7e8e6dcbe385820b8ffba23b622
-sha256=3c841fd89599ffb770cdf2844426980d75dc3dab12e0f707e4cbb51937f6125e
-
-[http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.8.tar.gz]
-md5=ffbad7e8e6dcbe385820b8ffba23b622
-sha256=3c841fd89599ffb770cdf2844426980d75dc3dab12e0f707e4cbb51937f6125e
-
-[http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/syslog-ng-2.0.5.tar.gz]
-md5=c161eefc450fabc246c1a10997c6c6a5
-sha256=34862f87d9d404ad4874d95ee871334f5bc2acad65420f672ad2ee286ab660a1
-
-[http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/syslog-ng-2.0.5.tar.gz]
-md5=c161eefc450fabc246c1a10997c6c6a5
-sha256=34862f87d9d404ad4874d95ee871334f5bc2acad65420f672ad2ee286ab660a1
-
-[http://pagesperso-orange.fr/sebastien.godard/sysstat-8.1.5.tar.gz]
-md5=84eb313f4bac5b3fe1ed37f1eaf79d04
-sha256=26c05ef7666881eb1d60291a4293e67d75dbf048ca8a30f6b9eb3dc86ad1b6b0
-
-[http://pagesperso-orange.fr/sebastien.godard/sysstat-8.1.6.tar.gz]
-md5=d7b8f27b83ff080ff824177d65a7dae0
-sha256=0a63da1c99b6a9b6a93b6fd0a9391c7d8216f658d2bea0ba81999e261c6b6649
-
-[http://pagesperso-orange.fr/sebastien.godard/sysstat-9.0.6.tar.gz]
-md5=c05ca01878a4069199d9af93cbe39c8e
-sha256=464a4e23ab3b7d6886a5b8aa108e05b1a7f42654e1c398a040c88c81f30168c9
-
-[http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-1.1.7.tar.bz2]
-md5=a77bde5adc5ee8822b0764ff786ccc09
-sha256=fdd50cb114151c66b8180c0ce90ba0e99f77a69770ac21598a87be935eec2224
-
-[http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/2.6/system-tools-backends-2.6.1.tar.bz2]
-md5=c82a9d305c3a1bf924bba6b1bced3e86
-sha256=7f56dd08cf5425218b697d5db82e6ce03aff4f7b57f58d3053f0a7af632b3747
-
-[http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/2.8/system-tools-backends-2.8.1.tar.bz2]
-md5=2aecff382af4d8ba7fcd69298cc79413
-sha256=c1f5746d22ef439ee47c9b012273ccbefbb2621075f05876bdb6ad5cfe4e1bbe
-
-[http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/2.8/system-tools-backends-2.8.3.tar.bz2]
-md5=403bf4b7c82455d995d6aa54613246c2
-sha256=67629bb6502a4c5b8b639867deb40ecabd5676a4655c264c1f0dbeb97de5c98c
-
-[ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.86.tar.gz]
-md5=7d5d61c026122ab791ac04c8a84db967
-sha256=035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8
-
-[ftp://ftp.debian.org/debian/pool/main/t/t1lib/t1lib_5.0.2.orig.tar.gz]
-md5=cc5d4130b25bb8a1c930488b78930e9b
-sha256=34ff6a85d1dae64d06b5aca04fb17822dd26a734f40cd966e3dd980afa4a037a
-
-[ftp://ftp.nl.debian.org/debian/pool/main/t/t1lib/t1lib_5.0.2.orig.tar.gz]
-md5=cc5d4130b25bb8a1c930488b78930e9b
-sha256=34ff6a85d1dae64d06b5aca04fb17822dd26a734f40cd966e3dd980afa4a037a
-
-[ftp://ftp.us.debian.org/debian/pool/main/t/t1lib/t1lib_5.0.2.orig.tar.gz]
-md5=cc5d4130b25bb8a1c930488b78930e9b
-sha256=34ff6a85d1dae64d06b5aca04fb17822dd26a734f40cd966e3dd980afa4a037a
-
-[http://repository.maemo.org/pool/maemo4.1/free/t/tablet-browser-interface/tablet-browser-interface_0.0.5-1.tar.gz]
-md5=930b83fa92154a2abb3d711b9e3af87a
-sha256=199fcaa5bc5b0b56537d43c522a9f0d839e61d7ffc58438da56574f642159519
-
-[http://repository.maemo.org/pool/maemo5.0beta/free/t/tablet-browser-interface/tablet-browser-interface_0.0.5-4.tar.gz]
-md5=cda500e9983e2d9c68b2688ac85ee7a6
-sha256=b3b8c5fa85b8bdaf26048ead785a4ed6bd3c47e54cc660506982dca601ccb065
-
-[http://developer.kde.org/~wheeler/files/src/taglib-1.4.tar.gz]
-md5=dcd50ddb2544faeae77f194804559404
-sha256=0ff805bb8dbf72a45d347f2310f7e5c86e2e7419a069d546e53cf5f221c196ab
-
-[http://developer.kde.org/~wheeler/files/src/taglib-1.5.tar.gz]
-md5=7b557dde7425c6deb7bbedd65b4f2717
-sha256=ba610716ec539d4858133e008d079728953820c583b200ff0936e36fc0550ec2
-
-[http://tango-project.org/releases/tango-icon-theme-0.7.2.tar.gz]
-md5=eace48f8340a95d7134632bad6287100
-sha256=6b368373f9a01f3f33f77ac25c170cbd052b29d6910f72308e55dc0a39af7722
-
-[http://tango.freedesktop.org/releases/tango-icon-theme-0.7.2.tar.gz]
-md5=eace48f8340a95d7134632bad6287100
-sha256=6b368373f9a01f3f33f77ac25c170cbd052b29d6910f72308e55dc0a39af7722
-
-[http://tango.freedesktop.org/releases/tango-icon-theme-0.8.1.tar.gz]
-md5=32d5258f448b5982af9cfa4364f31d41
-sha256=17e64f2f5d7d8a358136a7003604cb60acaef47b083123956b12eb0ed9293055
-
-[http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz]
-md5=0795895d2f20eddcbd2bffe94ed431a6
-sha256=6e98d8032d57d818acc907ec47e6a718851ff251ae7c29aafb868743eb65c88e
-
-[http://tango-project.org/releases/tango-icon-theme-extras-0.1.0.tar.gz]
-md5=caaceaec7b61f1cbda0db9842f9db281
-sha256=b9252179ea2c546e6bb065281d51373f0ae06081e5a98d4255249af4fa8b33db
-
-[http://www.tangogps.org/downloads/tangogps-0.9.3.tar.gz]
-md5=4e6e4c1a5c1ee2e6026454083de3d5d5
-sha256=d2a107e3a5ceaeeb15ab2e3d7cd308653b4ded8aaf8d3c0e0be3b64ba4e17cfc
-
-[http://www.tangogps.org/downloads/tangogps-0.9.6.tar.gz]
-md5=85755b15099f6071776d6feb67bdbca8
-sha256=e56a77325cdea8c274a39fcb79bd47919cbafa15d8009176538ec9a94f5e6e13
-
-[http://www.tangogps.org/downloads/tangogps-0.9.9.tar.gz]
-md5=0ff6bde0f33b712d066cea08934d4808
-sha256=e4f203a3370ef02684a320431cb71c28af3bc9084bd0af2d72889eb36a62da0d
-
-[http://www.tangogps.org/downloads/tangogps-0.99.1.tar.gz]
-md5=bf99c9510481681651434eb943fe3294
-sha256=9f1e85c4f90a13ceb66dc8c0e6a92561fb00a8b01f63558b01ae9efdff984a59
-
-[http://www.tangogps.org/downloads/tangogps-0.99.2.tar.gz]
-md5=ba0b28f9f87f6b47cf32a4f2c935cc28
-sha256=269462ddae9b3837a8f44ae0004a3bbc2aa14feef7c9dfdc8eda55b2f39c0297
-
-[http://downloads.sourceforge.net/tapioca-voip/tapioca-0.3.9.tar.gz]
-md5=e88c400394c092c2688bb2d490c80ccb
-sha256=fb89ac4e8578adc140e19cb4929b200d2898e5a8373230f500c16e59c803cba1
-
-[http://heanet.dl.sourceforge.net/tapioca-voip/tapioca-0.3.9.tar.gz]
-md5=e88c400394c092c2688bb2d490c80ccb
-sha256=fb89ac4e8578adc140e19cb4929b200d2898e5a8373230f500c16e59c803cba1
-
-[http://downloads.sourceforge.net/tapioca-voip/tapioca-xmpp-0.3.9.tar.gz]
-md5=8d810351eb5b30e70b202e067da450c1
-sha256=51dd2ecda515e5872971cf80216915492686f5a5c9745e12ba1b3c5aec826fce
-
-[http://heanet.dl.sourceforge.net/tapioca-voip/tapioca-xmpp-0.3.9.tar.gz]
-md5=8d810351eb5b30e70b202e067da450c1
-sha256=51dd2ecda515e5872971cf80216915492686f5a5c9745e12ba1b3c5aec826fce
-
-[http://downloads.sourceforge.net/tapioca-voip/tapiocaui-0.3.9.1.tar.gz]
-md5=2b0fc6997e793784763fe23c81a4986f
-sha256=d83dca75ba6088c90b993de9d30b4b0d3189e5efa84151c16d55ef0ec072c38a
-
-[http://heanet.dl.sourceforge.net/tapioca-voip/tapiocaui-0.3.9.1.tar.gz]
-md5=2b0fc6997e793784763fe23c81a4986f
-sha256=d83dca75ba6088c90b993de9d30b4b0d3189e5efa84151c16d55ef0ec072c38a
-
-[ftp://alpha.gnu.org/gnu/tar/tar-1.13.93.tar.gz]
-md5=71bfeab35c9935631fc133f9d272b041
-sha256=0ef70273b6a54357c7823ed1f11015523f5cc5fe16df097e0b5300ae725c44e1
-
-[ftp://ftp.gnu.org/gnu/tar/tar-1.18.tar.bz2]
-md5=70170208d7c1bb9ab40120579434b6a3
-sha256=44944ee0427c8e0d8dbaa0b8f900073a7456819610cc521c53630c3eb117cf5e
-
-[ftp://ftp.gnu.org/gnu/tar/tar-1.20.tar.bz2]
-md5=1a7e17f27abf583b3b0bc059a827e68b
-sha256=be8bf33afb5adc2377e45d94693ffd46b75f267f9b808df0c7006e51211f9deb
-
-[ftp://ftp.gnu.org/gnu/tar/tar-1.22.tar.bz2]
-md5=07fa517027f426bb80f5f5ff91b63585
-sha256=3cefb67f197a3f8f5235999fe749ced0889466a71ddcbc96fddca84e5d53aa4d
-
-[http://downloads.sourceforge.net/subapplet/tasklist-105.tar.gz]
-md5=dc62a061d83cf72d1eca7e8ae2c8e1a6
-sha256=4078c44beebfd298995983b9e2ea189167a1ab081d96a7c485a67b65a974e878
-
-[http://heanet.dl.sourceforge.net/subapplet/tasklist-105.tar.gz]
-md5=dc62a061d83cf72d1eca7e8ae2c8e1a6
-sha256=4078c44beebfd298995983b9e2ea189167a1ab081d96a7c485a67b65a974e878
-
-[http://pimlico-project.org/sources/tasks/tasks-0.12.tar.gz]
-md5=a2926370099899e578082702328e55ee
-sha256=f9b99636f86c2747f84fa918b949152491ee92594a7f1e83418589e83f8d1e4a
-
-[http://pimlico-project.org/sources/tasks/tasks-0.13.tar.gz]
-md5=536ffbbd0f38489c8e3ea9eaf0f67d59
-sha256=3a1029eb587a0587cf3ebcb8c256062ca595b4f5d0a30188fa4aae3adb49ca5a
-
-[http://projects.o-hand.com/sources/tasks/tasks-0.4.tar.gz]
-md5=c68ad2a0fa21c379195b7e93467d73b5
-sha256=65083a94bce9e539c4d9141b4e765415872e01bf17ec4be906d2e304aa8c3e7f
-
-[http://downloads.sourceforge.net/tcl/tcl8.4.11-src.tar.gz]
-md5=629dfea34e4087eb4683f834060abb63
-sha256=8dcfa54b58a6aaf4853fc27752c25d6c2592c485952b2fad25a9bea4b52bed33
-
-[http://heanet.dl.sourceforge.net/tcl/tcl8.4.11-src.tar.gz]
-md5=629dfea34e4087eb4683f834060abb63
-sha256=8dcfa54b58a6aaf4853fc27752c25d6c2592c485952b2fad25a9bea4b52bed33
-
-[http://downloads.sourceforge.net/tcl/tcl8.4.19-src.tar.gz]
-md5=ade2c033a7b545ee108f3fdfeb629fcf
-sha256=1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9
-
-[ftp://ftp.porcupine.org/pub/security/tcp_wrappers_7.6.tar.gz]
-md5=e6fa25f71226d090f34de3f6b122fb5a
-sha256=9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d
-
-[http://www.tcpdump.org/release/tcpdump-3.9.3.tar.gz]
-md5=26c2f6405d6a94f1160a83109b2f71dd
-sha256=d701a3e4d7ab296fecdd6f8f84610a3c6d275839f9db4269b1ff7db3e0a9c0e5
-
-[http://www.tcpdump.org/release/tcpdump-3.9.7.tar.gz]
-md5=2aacf4dc9a3bc500a8b4f3887a32cdd5
-sha256=09f1daece22a3555f1ca1f9779caf36357cc8d5b9ad1964606093c7e884e0da4
-
-[http://www.tcpdump.org/release/tcpdump-4.0.0.tar.gz]
-md5=b22ca72890df2301d922c9f2d17867f9
-sha256=5fe99efe0274b5764c9974417c96a38b5f94e21096d8a94cc1fa172a42035284
-
-[http://downloads.sourceforge.net/tcpick/tcpick-0.1.22.tar.gz]
-md5=77b991a686e83cb716fd241aaa6ea432
-sha256=db19142fd2ca6218ead04fb3144b1640e2ad5a1c784a4e790c8816a37a79ac2e
-
-[http://heanet.dl.sourceforge.net/tcpick/tcpick-0.1.22.tar.gz]
-md5=77b991a686e83cb716fd241aaa6ea432
-sha256=db19142fd2ca6218ead04fb3144b1640e2ad5a1c784a4e790c8816a37a79ac2e
-
-[http://michael.toren.net/code/tcptraceroute/tcptraceroute-1.5beta6.tar.gz]
-md5=0200707ad81b88c31439820ae9bc5102
-sha256=08ce9b24ab7b6ad45ac7f668eccfb7007ef182406f7db0b7e455decfb0b49bec
-
-[http://www.rhythm.cx/~steve/devel/tcptrack/release/1.1.2/source/tcptrack-1.1.2.tar.gz]
-md5=f27e025d9e69f36a7d8b679c047daba1
-sha256=2bfbdd6df159c815b392cd99146df5a450c1a8ffab30a13fd34bced8ee33cda0
-
-[http://downloads.sourceforge.net/tea-editor/tea-17.3.5.tar.bz2]
-md5=c28db354576aaec2152970b06d534640
-sha256=a7147079740acef2df0d2caab164062b12806d988216aa03667198d1100f5eb2
-
-[http://heanet.dl.sourceforge.net/tea-editor/tea-17.3.5.tar.bz2]
-md5=c28db354576aaec2152970b06d534640
-sha256=a7147079740acef2df0d2caab164062b12806d988216aa03667198d1100f5eb2
-
-[http://telepathy.freedesktop.org/releases/telepathy-farsight/telepathy-farsight-0.0.7.tar.gz]
-md5=882c9630ab28706d34d7d6d1060d43f0
-sha256=877760e794fb050448b6e591616afaba061d40c319e86b145053edf22df5570d
-
-[http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.3.0.tar.gz]
-md5=12a4508e338a39c63c24c41261eba3dd
-sha256=b4fcd32237271e400b00e779116e8203eac5efdaf53c78b9909b85a158fd81d8
-
-[http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.5.10.tar.gz]
-md5=f3ad7ac1240593033299ccbf86fbc475
-sha256=3c4eb81c9d516937565a295beb0e98ab5c2a04864a0a5c8cef32916c63056b05
-
-[http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.7.1.tar.gz]
-md5=94bbf929aceac7601421e60ba35683a5
-sha256=63cd37752d153d222fa4a1fe08f6188832341f41652482bd7891e3fbe0ff8dd7
-
-[http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.7.27.tar.gz]
-md5=0bd4fdfb63d86d5e297ae069ad489704
-sha256=9a4ce52bd7eb9b8010a481be71117d814eb15fe9c8579817c7b486199a3801ac
-
-[http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.7.6.tar.gz]
-md5=17564dcb79d886d527609c154834c1c7
-sha256=9ce73e484b2f2858d46ffea9893f9823b5de9c7310f7c26b027f73a1c8fde857
-
-[http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.7.8.tar.gz]
-md5=c6fbf9e97f327de6e8737c619bbad738
-sha256=820af6a106ee3c2ee019ed5a1d9c6a751020a3d1fdeee84316faf8eff467a721
-
-[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.5.10.tar.gz]
-md5=18b6cae979e438628a1032ff1f12b38e
-sha256=f779fbfd30ddc80e15c39f42fc9877725e829dfa19101c3762d6ae809760a3a9
-
-[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.6.0.tar.gz]
-md5=dd32a28c5ca484f950302a04e04d43a7
-sha256=51a82f05d0a323b294b7525aefb68d0611d5bd87739e206340f092d76ceed9fe
-
-[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.0.tar.gz]
-md5=b4cb035a6e235be3179364341843e929
-sha256=e5cffebb02ad5c8192c7bd98aae90e65b008b03150b613659efa641d5f96c141
-
-[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.11.tar.gz]
-md5=8da7a9c43f3721aed982412854c4783e
-sha256=c587eeab36208da798203cd5997fb82c891136dcd18780cd06e3d27a1d6d4a58
-
-[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.14.tar.gz]
-md5=33e68c9876de84a252a84bf5f828aab6
-sha256=49dca0428d69f43c856800967b2def8c890cd322fbdd0aa47c227aec5820a690
-
-[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.29.tar.gz]
-md5=ae67d4fe42c7e337813754cb5927b6cc
-sha256=7bf25e050e8b8ceb983c1cad6b4e38892b052f6da82df3b7aec7b2ea50a8702e
-
-[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.37.tar.gz]
-md5=681b5b82fc3ec65d86a6cb409ec38e5d
-sha256=7ae86c8f17cb00e827a0bb60b03345984b3065a33db3d119527d41993a09443d
-
-[http://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.1.2.tar.gz]
-md5=21bfda9e1fa12e25b4173deb9ffd0b5d
-sha256=3ed0cb5dd687e4d9fa838a318f9ef12a8c221894ff188687c27625f0ac3bce82
-
-[http://downloads.sourceforge.net/tapioca-voip/telepathy-inspector-0.5.0.tar.gz]
-md5=7fe5810c15edacb0d9c5590d3767f8f0
-sha256=16ff39f1d80e6898d0c58e634211254833e6067bd55bc3b4eefabf53cbe6844d
-
-[http://heanet.dl.sourceforge.net/tapioca-voip/telepathy-inspector-0.5.0.tar.gz]
-md5=7fe5810c15edacb0d9c5590d3767f8f0
-sha256=16ff39f1d80e6898d0c58e634211254833e6067bd55bc3b4eefabf53cbe6844d
-
-[http://downloads.sourceforge.net/mission-control/telepathy-mission-control-4.21.tar.gz]
-md5=2ad61079a79b0426c81593ad69f56ada
-sha256=0b98c93fc64409aae43d8f2941784f8f11639ad68b67320417554fa471a86508
-
-[http://heanet.dl.sourceforge.net/mission-control/telepathy-mission-control-4.21.tar.gz]
-md5=2ad61079a79b0426c81593ad69f56ada
-sha256=0b98c93fc64409aae43d8f2941784f8f11639ad68b67320417554fa471a86508
-
-[http://downloads.sourceforge.net/mission-control/telepathy-mission-control-4.22.tar.gz]
-md5=aa8a8264c596c666f886f85356b56e09
-sha256=a36371f8f9d86cb767e4ea84ed378d6546750843d4b1c0d57f7e53153e8da51b
-
-[http://heanet.dl.sourceforge.net/mission-control/telepathy-mission-control-4.22.tar.gz]
-md5=aa8a8264c596c666f886f85356b56e09
-sha256=a36371f8f9d86cb767e4ea84ed378d6546750843d4b1c0d57f7e53153e8da51b
-
-[http://downloads.sourceforge.net/mission-control/telepathy-mission-control-4.31.tar.gz]
-md5=75c59f2c0f990326fc1b66c0bc762c43
-sha256=926a8c047bd43a1fc21539c2ec5b9bf00426083ffe18c2db8c44964b80286b6a
-
-[http://downloads.sourceforge.net/mission-control/telepathy-mission-control-4.45.tar.gz]
-md5=b7810e1a53579bc496796538aefcc014
-sha256=cb5565a66fb233d7c0b9418bcef53fe330c8a5a0f904a9a04de087ad0b4d0be9
-
-[http://heanet.dl.sourceforge.net/mission-control/telepathy-mission-control-4.45.tar.gz]
-md5=b7810e1a53579bc496796538aefcc014
-sha256=cb5565a66fb233d7c0b9418bcef53fe330c8a5a0f904a9a04de087ad0b4d0be9
-
-[http://downloads.sourceforge.net/mission-control/telepathy-mission-control-4.49.tar.gz]
-md5=463234dcf1182ba71a0d39f594922488
-sha256=c7cbaa8edec5c9be78aa954938c64b57e6c2c0f13de260c88fefdbf849e94d4d
-
-[http://downloads.sourceforge.net/mission-control/telepathy-mission-control-4.61.tar.gz]
-md5=8b9de30643f759bf2e40ccc833dd2633
-sha256=76009d233a69b2d12c2aff94770dfe9fc0558e07071f941b738bab357f8fb7b9
-
-[http://downloads.sourceforge.net/mission-control/telepathy-mission-control-4.67.tar.gz]
-md5=0a547e7af4a33355bac3638dd2e40859
-sha256=326b82519a49a238a476c028097bde5820c4b58af500dbb5b715cdfd6fe0bfcd
-
-[http://heanet.dl.sourceforge.net/mission-control/telepathy-mission-control-4.67.tar.gz]
-md5=0a547e7af4a33355bac3638dd2e40859
-sha256=326b82519a49a238a476c028097bde5820c4b58af500dbb5b715cdfd6fe0bfcd
-
-[http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-0.14.0.tar.gz]
-md5=a42cc4defcaf46099e07972ece791c2d
-sha256=3065fae35064c22380963a0d29a04bedb86c05e51d3af84c73f3da8f2107cb2d
-
-[http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-0.15.1.tar.gz]
-md5=b3e9bd31393c4cebbd8077b62b2bcd8c
-sha256=02a5c752201e016905c75503217af5a25eebe3f6a4e02a75173ed34021401296
-
-[http://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-0.3.4.tar.gz]
-md5=1cf9e0a1c6becbbeb5872e7a77e9fc77
-sha256=0eb6e2cccd3e4fa61264507fe984d10cd47ebb125a6f9d5f31cbb3040f57b36c
-
-[http://gpe.linuxtogo.org/download/source/teleport-0.33.tar.gz]
-md5=f406e66bf6a1effc31abf150ea7b5da1
-sha256=f5e73b32337c2616114e0e45cdbd053975ffd38ec3fb28a411e165dbf27a583a
-
-[http://gpe.linuxtogo.org/download/source/teleport-0.34.tar.gz]
-md5=ae571a20333f90d4b79b68c446387925
-sha256=266d6ec9795c2b480101c8754988df68da2c5b3579687bf51ae31000b08ba8bd
-
-[http://leapingcat.org/martinhenne.de/temtor/files/temtor-0.0.1.tar.gz]
-md5=340bc7fa4a9cad1fe9ecc9b1df49d164
-sha256=1c76d6ac7e80de0ae88cc5cbdad7a2a564eac96788549359b001366dc52fe817
-
-[ftp://ftp.gnu.org/gnu/termcap/termcap-1.3.1.tar.gz]
-md5=ffe6f86e63a3a29fa53ac645faaabdfa
-sha256=91a0e22e5387ca4467b5bcb18edf1c51b930262fd466d5fda396dd9d26719100
-
-[http://openzaurus.linuxtogo.org/download/3.5.4/sources/terminus-fonts.tar.bz2]
-md5=e7b056a7619cdd460b5db5a7e263cafc
-sha256=cf7becd610e298d23780216f474907745bd29484f7f81308a9d13cf07f2a4e2d
-
-[http://www.catb.org/~esr/terminfo/termtypes.tc.gz]
-md5=37318885db65314f1bcc2b22751123d3
-sha256=c4fa04257fea6e968d4caa28cc18dbbf9eea4769a463296eaca21ceea757a728
-
-[http://downloads.sourceforge.net/tesseract-ocr/tesseract-1.0.tar.gz]
-md5=e3bc57773a60134ef37e9f06fe541108
-sha256=6fc9e28a574bf22028249e9a12e033c8bee0aeccbf90621238a6f538e60e7d60
-
-[http://heanet.dl.sourceforge.net/tesseract-ocr/tesseract-1.0.tar.gz]
-md5=e3bc57773a60134ef37e9f06fe541108
-sha256=6fc9e28a574bf22028249e9a12e033c8bee0aeccbf90621238a6f538e60e7d60
-
-[http://www.cgsecurity.org/testdisk-6.6-WIP.tar.bz2]
-md5=3cc59a7e425c49dbdf76b54d85b55619
-sha256=2b472be7105eaa88e0c9cca241225c56fdcb80d34dec60ef1d865b0877be771c
-
-[ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-3.0.tar.gz]
-md5=944a4641e79e61043fdaf8f38ecbb4b3
-sha256=9c0f7eaeb5ba6dc6f66433404d264941bf95cded2fa798b1f7a9dd580c21649b
-
-[ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-3.0.tar.gz]
-md5=ed9d30d9162d16ac8d5065cde6e0f6fa
-sha256=6c3b8fa619749cbb28ca0f8847e56773d13e0bb92f1ea34287420950373640c2
-
-[http://www.wias-berlin.de/people/si/tetgen1.4.2.tar.gz]
-md5=59c92b223f69cc7e50ae6cd9d1539db1
-sha256=38f24694983f20e5bffa2ebc1d35a7c3abea50479a6df6449cc900bf2732891d
-
-[http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2]
-md5=a8a9193c0ac1bec2f3ca7be40a5a82eb
-sha256=d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1
-
-[ftp://ftp.gnu.org/gnu/texinfo/texinfo-4.8a.tar.bz2]
-md5=0f429f87de9f20d6c0d952e63bf8e3fa
-sha256=efcda677be7ef093757d965736dff3b5af8c9fd36b3e7d3db09289a4a1d5d013
-
-[http://www.xm1math.net/texmaker/texmaker-1.3.tar.bz2]
-md5=17f91175a32827e9c9f45dc7a20a0c2b
-sha256=6ae8157bbec2b36957bbee6895b4cd3f82406fa90fa7d597235c58ea19307be7
-
-[http://kernel.org/pub/software/network/tftp/tftp-hpa-5.0.tar.bz2]
-md5=28beef704a4ef62bc2dead005198ef4c
-sha256=96309871519efcab829fdfcc1cca546d772ed6a0e214c9e99e77ca7aea29f734
-
-[http://stgt.berlios.de/releases/tgt-0.9.10.tar.bz2]
-md5=d06e2dcef6ac6c975311e88083d8ef26
-sha256=f30ffe64bcf4fc8a82a76594c254ce54c82a33d797cdc0f35f19519572f94c4a
-
-[http://packetstorm.linuxsecurity.com/groups/thc/thcrut-1.2.5.tar.gz]
-md5=190f08ce6839aecb0fa0ce8d5ddd09ee
-sha256=b32f3d71ac540248b7643baa39d8ecfb75af493228caaeb64608e49f2f092473
-
-[http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz]
-md5=156b249b3b0bcd48b06badd2db0d56c5
-sha256=07719b08b1cff6a21c08697a7bcb4395425b07ee753106262fb62a03a7d32360
-
-[http://projects.linuxtogo.org/frs/download.php/13/thumbpad-0.8.tar.gz]
-md5=384af26008a38cb64e50b87e3186d3ac
-sha256=11b067df2ce38baa36566bd29ab14bbf2f7c0fcc15e01a5be2a6a85000c39104
-
-[http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.0.7/source/thunderbird-1.0.7-source.tar.bz2]
-md5=e6388feb0ffcd189af779f165c124b4d
-sha256=6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f
-
-[http://install.source.dir.com/ti_cgt_c6000_6.0.21_setup_linux_x86.bin]
-md5=5bfeaacb628b56005a8865a177af01e4
-sha256=fcfa98e2c8ff18e8e6d5b2ff5e94f20b719150fe7bb4a130cfa360e02df2156a
-
-[http://install.source.dir.local/ti_cgt_c6000_6.0.21_setup_linux_x86.bin]
-md5=5bfeaacb628b56005a8865a177af01e4
-sha256=fcfa98e2c8ff18e8e6d5b2ff5e94f20b719150fe7bb4a130cfa360e02df2156a
-
-[http://install.source.dir.com/ti_cgt_c6000_6.1.9_setup_linux_x86.bin]
-md5=8354845032c0ce8e3da3f250505d0e21
-sha256=da26d02c1b98b95343f19ea273b3536beddd94feb2a773a6cb66efebfdff35c0
-
-[http://install.source.dir.local/ti_cgt_c6000_6.1.9_setup_linux_x86.bin]
-md5=8354845032c0ce8e3da3f250505d0e21
-sha256=da26d02c1b98b95343f19ea273b3536beddd94feb2a773a6cb66efebfdff35c0
-
-[http://www.openzaurus.org/download/3.5.4/sources/tickypip-0.1.2.tar.gz]
-md5=5a085296b1147fe970a256a9b2d0f91f
-sha256=f3b5722c145ebeee3523b4941afdaf75d03a56f1922a9d3662dc1715aa24ca34
-
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/tickypip-levels_1.1.tar.bz2]
-md5=cfdaae67b3d33351e37021cb0394153c
-sha256=881109774a77e34c61fbf41a839fe02a95cb3e67a0218fe4aebc5e6999cbaa57
-
-[http://dl.maptools.org/dl/libtiff/old/tiff-3.7.2.tar.gz]
-md5=9d7123bd0dbde2a3853fb758346adb78
-sha256=802e13e13cb0051e0b06e5f1e24e0cc613aa0f7c0ef742e5b90a667b40978c46
-
-[ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.8.2.tar.gz]
-md5=fbb6f446ea4ed18955e2714934e5b698
-sha256=be88f037080b93ce0a337b2b3ca5e8195f76885deb6c558cc3aa872ee848fc76
-
-[ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta2.tar.gz]
-md5=bf5f4a6892cc7015a9ae8b81eb0b63f7
-sha256=16d746a7bf057a9147756e15fdd7ce76a63ddde122294ce188dc8332da5118ba
-
-[http://downloads.sourceforge.net/vnc-tight/tightvnc-1.3.9_unixsrc.tar.gz]
-md5=80b904d4a10fccee9045d0feeaa65df8
-sha256=56062708bb547425f8e8f0f9c571d4fa06fcc89a11146a5b15c608fd8debdb80
-
-[http://heanet.dl.sourceforge.net/vnc-tight/tightvnc-1.3.9_unixsrc.tar.gz]
-md5=80b904d4a10fccee9045d0feeaa65df8
-sha256=56062708bb547425f8e8f0f9c571d4fa06fcc89a11146a5b15c608fd8debdb80
-
-[http://qa.debian.org/watch/sf.php/vnc-tight/tightvnc-1.3.9_unixsrc.tar.gz]
-md5=80b904d4a10fccee9045d0feeaa65df8
-sha256=56062708bb547425f8e8f0f9c571d4fa06fcc89a11146a5b15c608fd8debdb80
-
-[http://downloads.sourceforge.net/vnc-tight/tightvnc-1.3dev7_unixsrc.tar.gz]
-md5=030903eeafc3c20ef1fb1610bfe6311d
-sha256=390fdd05d86e091300248a4f74a0ffe7b4169f75aa2c1a5461c997a4c2ed2c10
-
-[ftp://ftp.gnu.org/gnu/time/time-1.7.tar.gz]
-md5=e38d2b8b34b1ca259cf7b053caac32b3
-sha256=e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d
-
-[http://handhelds.org/~zecke/oe_packages/timesleuth_V1.05ern.tar.gz]
-md5=671e48a9ff01de9cd2853a353b8179cb
-sha256=f353a33e59a35f2667a00ce60998a06fa25948676dcb4a59599cf6518bd02ca6
-
-[ftp://ftp.tin.org/pub/news/clients/tin/v1.9/tin-1.9.1.tar.gz]
-md5=50ecd901467622fbc47bc935aca222b3
-sha256=0da9424503faad972860682107157d7348872f00f932ec270c78f17ee495dc97
-
-[http://www.tinc-vpn.org/packages/tinc-1.0.2.tar.gz]
-md5=5396e8d279b5140e86113c80abc041ad
-sha256=2e6a535ba29d06337daf22ae12e17cbe10e70de95134ebd7b6e8a6838e3ca5a0
-
-[http://limpens.net/trac/at91-kit-trac/export/4/trunk/sources/tinylogin-1.4.tar.bz2]
-md5=44da0ff2b727455669890b24305e351d
-sha256=5e542e4b7825305a3678bf73136c392feb0d44b8bbf926e8eda5453eea7ddd6b
-
-[http://tinylogin.busybox.net/downloads/tinylogin-1.4.tar.bz2]
-md5=44da0ff2b727455669890b24305e351d
-sha256=5e542e4b7825305a3678bf73136c392feb0d44b8bbf926e8eda5453eea7ddd6b
-
-[http://tinylogin.tinylogin.net/downloads/tinylogin-1.4.tar.bz2]
-md5=44da0ff2b727455669890b24305e351d
-sha256=5e542e4b7825305a3678bf73136c392feb0d44b8bbf926e8eda5453eea7ddd6b
-
-[http://tinyscheme.sourceforge.net/tinyscheme-1.35.tar.gz]
-md5=2dcdbfdca5aa4b28a637429900dcf36c
-sha256=7e45b6f6824b1342e598dee162368ed8d1c9c1bcee96d8e1eda9a4c63c599f08
-
-[http://downloads.sourceforge.net/tcl/tk8.4.11-src.tar.gz]
-md5=408e34fe8a1cec497f98f05bbe89b348
-sha256=8475bb2ff42f5f162de6825c8c700fd61bae7b629de3e0aaf95cb54a224220ba
-
-[http://heanet.dl.sourceforge.net/tcl/tk8.4.11-src.tar.gz]
-md5=408e34fe8a1cec497f98f05bbe89b348
-sha256=8475bb2ff42f5f162de6825c8c700fd61bae7b629de3e0aaf95cb54a224220ba
-
-[http://downloads.sourceforge.net/tcl/tk8.4.19-src.tar.gz]
-md5=9b998d0456d1b956eb9da610837a9c47
-sha256=d056fe6c204ac31539616e1069522dd5864a580b64e521fe1a49bc895ca8699f
-
-[http://trevp.net/tlslite/tlslite-0.3.0.tar.gz]
-md5=2d5f7efafa5d04598b21f1889e981207
-sha256=bbc3bdbdefc81f7b186f1c5697f6939b5fc77d4569112edd1a6b3aceae177228
-
-[http://trevp.net/tlslite/tlslite-0.3.8.tar.gz]
-md5=5e1c19500e30fc7580939c18b435f937
-sha256=3d79170d8c3a662fa717b6401e8004208df113aaf3b18689bbeb704a23bf5b9f
-
-[ftp://ftp.trolltech.com/pub/freebies/tmake/tmake-1.11.tar.gz]
-md5=b007a86a83483ff9bd6795f45780ddce
-sha256=6d828029e276f42fee507f58ed0bd6890ef75f0e54f45f2b1129a2426c817c61
-
-[http://oz.drigon.com/patches/tmio-core-r4.patch]
-md5=2e7f84f2620d9de8a2a924224f20ba99
-sha256=b9505729d2282ba5db99f60b211a12233b6f1cc0b6340681b1722002c97c86e6
-
-[http://oz.drigon.com/patches/tmio-fb-r6.patch]
-md5=7e1df4684cccc0720daaeba1c741c5ee
-sha256=30d71710b35c091014f6f5d3bbb600783db852af98b12e8a0bbaced505a6ffa4
-
-[http://oz.drigon.com/patches/tmio-nand-r5.patch]
-md5=39699fea9bb43a13579f57e373a019d9
-sha256=7c268bafc7adffb57616024a30052c6429ccb2c96f0f70249b6a3e694a6c4ae4
-
-[http://www.do13.de/openzaurus/patches/temp/tmio-ohci-r4.patch]
-md5=213e14dd471eed5c6558e73ca4c2472b
-sha256=d158e56c43c978b6b2e5d3eed176357c6252ec5ec2ecd26c457fa9ae55fefc55
-
-[http://www.do13.de/openzaurus/patches/temp/tmio-tc6393-r6.patch]
-md5=9769f74c54b97b6fe53872e64137144f
-sha256=66adcad8c8ce58c8fb01dbe8cff9ad39855a4d548ddc9405e70198671dae813e
-
-[http://downloads.sourceforge.net/tmsnc/tmsnc-0.3.2.tar.gz]
-md5=337dae91d4775e03b6681f61db56d2a7
-sha256=7f54ba3974f45c0787b6d62d0d62ce352ddbf95419123b98b4969b97d3dfed23
-
-[http://tinymail.org/files/tmut/releases/v1.1/v1.1.0/tmut-1.1.0.tar.bz2]
-md5=6178256c82efcd02b5d50f2289c13d9b
-sha256=ac5dcd76faf25e0c40e91a4bcfea7f6f1bec33d361ad89a6e2f6fc63fa26590e
-
-[http://downloads.sourceforge.net/tn5250/tn5250-0.16.5.tar.gz]
-md5=2f9ef4509198e96bb184577fdddfce6d
-sha256=794687ae1b34aba9a3cf6f9b118d0ba91b8f83858fe92a9ded0611225db3ca0e
-
-[http://heanet.dl.sourceforge.net/tn5250/tn5250-0.16.5.tar.gz]
-md5=2f9ef4509198e96bb184577fdddfce6d
-sha256=794687ae1b34aba9a3cf6f9b118d0ba91b8f83858fe92a9ded0611225db3ca0e
-
-[http://downloads.sourceforge.net/tnef/tnef-1.4.5.tar.gz]
-md5=ec46d47525c6afb928642e3edec21058
-sha256=42067fbc00d1ad4bcbb67440d61869aa43ed2d3d099fc691d3da8ad4296fa6b1
-
-[http://tofrodos.sourceforge.net/download/tofrodos-1.7.8.tar.gz]
-md5=aaa044f9817a048e126d9eb7a7535e96
-sha256=e1d78226c5b54c0ce8e1c7de8bdd025aec6bf684960d5cee28310cf8dce48bb9
-
-[http://keihanna.dl.sourceforge.jp/tomoe/16048/tomoe-0.2.1.tar.gz]
-md5=95eca127a1d519ff4e836b3d00d7fa84
-sha256=3942e0ff0a3b945d0464b69fcc01092a582f2c4e173bd8877572706e584e0e9e
-
-[http://downloads.sourceforge.net/toppler/toppler-1.1.3.tar.gz]
-md5=15ee44094e6a4e2a4f5f9b661f3fb617
-sha256=5db9cff3fe39007e9a80c3b27acfb86692641f2b0de118ef1d5e24ebd35d438b
-
-[http://surfnet.dl.sourceforge.net/sourceforge/toppler/toppler-1.1.3.tar.gz ]
-md5=15ee44094e6a4e2a4f5f9b661f3fb617
-sha256=5db9cff3fe39007e9a80c3b27acfb86692641f2b0de118ef1d5e24ebd35d438b
-
-[http://tor.eff.org/dist/tor-0.1.1.26.tar.gz]
-md5=0667df7a1f670bee5163b607aea172ba
-sha256=3be8c89be5b927e73b77a82ca3d83f0f162fceea2d6a14ce1c0cf5333b36cd1c
-
-[http://www.do13.de/openzaurus/patches/tosa-bluetooth-r8.patch]
-md5=729ac2d8f04a2504828438204871b4c6
-sha256=af0842389181c477b5b2efa7599687682715be6528c03158a9cf0d305be0bff8
-
-[http://www.do13.de/openzaurus/patches/tosa-keyboard-r17.patch]
-md5=9c87d88deed0654378c2a38fe6d77b3e
-sha256=d50cdc7ced20fe3314d2c474efd0edf03a1a0ffef8b5f8dba27a30ad149d1dea
-
-[http://www.do13.de/openzaurus/patches/tosa-power-r17.patch]
-md5=954042ddf8d49c058cf0d6018ff70952
-sha256=f5fa3d9ec3aba5819874cbd8a4c99c27d05a0f8e63306e1a74e0c8b4b1b34c3d
-
-[http://www.do13.de/openzaurus/patches/tosa-power-r18.patch]
-md5=96169aa4468dc459385f79ac9115ca72
-sha256=c8ca2242cc3f3c2329dfff6770f3a0b990d8b8945bbcb2d9988af1bb3ea7db62
-
-[http://www.do13.de/openzaurus/patches/tosa-pxaac97-r6.patch]
-md5=17dce7cf6276af37ae9b26d0bb381dc2
-sha256=7ebee992bbcb4c6c745f70bd59cf9fe58fb6e36ef183b05c64ef3bcf802f8208
-
-[http://www.do13.de/openzaurus/patches/tosa-tmio-lcd-r8.patch]
-md5=d6211f57b3ce124167d8e1b5277d45ea
-sha256=0b24e28104851b5e29197fba6729370e7fa625cc1775ee40a80f14f340dbdb25
-
-[http://www.do13.de/openzaurus/patches/tosa-tmio-r6.patch]
-md5=d4088e44285ce609d41455cf3b31772a
-sha256=ec732cb9ec9522c04769f9e41fab7288e7cdff6566eee18b5ab74542b5d9575a
-
-[http://ftp.acc.umu.se/pub/GNOME/sources/totem/0.99/totem-0.99.15.tar.gz]
-md5=08aeed6d3c70347e788f70e14976463f
-sha256=12535d584e611ce21921e5bb063b21a8c47d7117570f9f1b5fd91fa42439ed69
-
-[http://ftp.gnome.org/pub/GNOME/sources/totem/1.0/totem-1.0.4.tar.gz]
-md5=e005e843829657fad1a80dda76f6fa25
-sha256=b7a2c39bcf8d0024519c3297c4b7dadf334bcac2c62198a2de330ff0d1ab0a7b
-
-[http://ftp.gnome.org/pub/GNOME/sources/totem/2.23/totem-2.23.4.tar.bz2]
-md5=e90839bbac5b7b663a1ddc74646ded99
-sha256=b0bc44f22ac05d490d607282f40986027a1cda2996adad56203dfed8faa815d9
-
-[http://ftp.gnome.org/pub/GNOME/sources/totem/2.24/totem-2.24.2.tar.bz2]
-md5=e85064c48fe28e8e87c1da04a06173df
-sha256=776ddf74b657da5709d8f3d1c800b8203aa82a5f06f1c6d2d0f23a0a5f6685f7
-
-[http://ftp.gnome.org/pub/GNOME/sources/totem/2.28/totem-2.28.1.tar.bz2]
-md5=42f071fcf8ffc471beb3e1689297d647
-sha256=18121f17c37faaa9cc245d46293a24f58f2bba9dc9b84af5e1ffe0ac6e697b04
-
-[http://ftp.gnome.org/pub/GNOME/sources/totem/2.28/totem-2.28.5.tar.bz2]
-md5=03b43f3c3a93b6dbcf1d1b370cc9297f
-sha256=c788bb314addbeeb2b27a2af0f7448752db22dcfaf8b0a4e704463ba9a9dc063
-
-[http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.23/totem-pl-parser-2.23.3.tar.bz2]
-md5=c163dfd840c6a522e6cd852b379e89cd
-sha256=5730611c42f8a8540343faa9512d9161073d2f882668c80dd0cf6a34c72daa75
-
-[http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.24/totem-pl-parser-2.24.1.tar.bz2]
-md5=fa658ae2f20458d3c5d3effba3b2dd7e
-sha256=3193c3446d211db2bd3c169c86f6d433666669336bd589a20c87f1483295cf2a
-
-[http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.26/totem-pl-parser-2.26.2.tar.bz2]
-md5=daffda80cfead2a1473ca3ff71e1057b
-sha256=3a6dd0382fe074f23a747b08423fccb23fb38c25b1feddacbd4875d8b8c83743
-
-[http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.28/totem-pl-parser-2.28.1.tar.bz2]
-md5=bd4ef8ce1cd3c467cd6adc2835f027bc
-sha256=5f71c946cce245d53e8a13281c8dc1884fb6928f0a65d47a6aba7fb18a39acc2
-
-[http://www.gnome.org/~jamiemcc/tracker/tracker-0.5.4.tar.gz]
-md5=724208e1b2d235148499672b44181298
-sha256=ad214a2692041f423d2150777c233b21cab2d108f849edc513192587ac63c9c2
-
-[http://ftp.gnome.org/pub/GNOME/sources/tracker/0.6/tracker-0.6.93.tar.bz2]
-md5=768059a486ff73ae18595afab3b78a70
-sha256=f4d3b413a61bfe6895f7f87bbfbcc7159f66b1d73fc29a7380839802fbb01198
-
-[http://ftp.gnome.org/pub/GNOME/sources/tracker/0.6/tracker-0.6.95.tar.bz2]
-md5=a4edc8aa830070bd3f1d80a7df07c80c
-sha256=0fe42353117c62ccc9de3b3c9c11acf707a0702d30cd24b8d1cd1e2581dec339
-
-[http://downloads.sourceforge.net/transconnect/transconnect-1.2.tar.gz]
-md5=c255ff48387ea6a7092707ba992237e7
-sha256=47d6cc44f78fc6d4cdb1dfee02fe6e0f4d8aae0ce2e3e92567667f0475736617
-
-[http://heanet.dl.sourceforge.net/transconnect/transconnect-1.2.tar.gz]
-md5=c255ff48387ea6a7092707ba992237e7
-sha256=47d6cc44f78fc6d4cdb1dfee02fe6e0f4d8aae0ce2e3e92567667f0475736617
-
-[http://downloads.sourceforge.net/transconnect/transconnect-1.3-Beta.tar.gz]
-md5=50f75731e610fce00803cc7d98b301fd
-sha256=404df2c479517020290be9847191523c1fcbd3e929e8bb1191a7832209d04af8
-
-[http://heanet.dl.sourceforge.net/transconnect/transconnect-1.3-Beta.tar.gz]
-md5=50f75731e610fce00803cc7d98b301fd
-sha256=404df2c479517020290be9847191523c1fcbd3e929e8bb1191a7832209d04af8
-
-[http://mirrors.m0k.org/transmission/files/transmission-1.40.tar.bz2]
-md5=490d13c141ba7b4a96582541ea83a461
-sha256=944ab9cfcfc9a4bd7efeecf32ea609fa6517970a9708c44eee6d5750c4ff8e0c
-
-[http://mirrors.m0k.org/transmission/files/transmission-1.61.tar.bz2]
-md5=0b0428f4a6237a64dc8b7d378ace3f06
-sha256=3bc5bf49ed02a3d93b4b9b71c7814960e972c1bde4e9fb83b2cd500c83ae4a9a
-
-[http://mirrors.m0k.org/transmission/files/transmission-1.73.tar.bz2]
-md5=9c1b5d84fb9ddbbd50b5776c1cd6daa4
-sha256=edd775e06e66dc775ca8272bbd2e47ac4fef6fcb884ccc1001589343fd9d0866
-
-[http://mirrors.m0k.org/transmission/files/transmission-1.75.tar.bz2]
-md5=ec09b76ca941f5c389d8dd4f469f1fa6
-sha256=a01bcf7718876d96eeb423a58247b89158bf0bc5d2bed414009e5fb83ff76c9e
-
-[http://mirrors.m0k.org/transmission/files/transmission-1.76.tar.bz2]
-md5=ac44511ba4c203998be3079626126ede
-sha256=b221d6ecec0c5ca9908f17ae7d56ce139d317faaa0c106e99fb321130280f151
-
-[http://mirrors.m0k.org/transmission/files/transmission-1.80b3.tar.bz2]
-md5=0b9cf68b68ce04d2e91723e3190c0568
-sha256=6ffff2365e0508fd0e190054f2d57893b8755be8ce4a34e7ef89861c06033eb9
-
-[http://mirrors.m0k.org/transmission/files/transmission-1.80b4.tar.bz2]
-md5=8a257189b51bd3608a8478680230e716
-sha256=c7dc1627e21a5f1625ce4958e247a44fb8b13ce8733085c1d64707bd93ed9178
-
-[http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2]
-md5=3b713239e5e6b269b31cb665563358df
-sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/trapproto-X11R7.0-3.4.3.tar.bz2]
-md5=84ab290758d2c177df5924e10bff4835
-sha256=522ded5292b80289e13dc8af9a0c11d35417f7079779969835cc8af55a38d006
-
-[http://laurikari.net/tre/tre-0.7.5.tar.bz2]
-md5=e72e5c94008865cf720992a0b25d6e89
-sha256=030f25e6e4c1714df013105494bc5e24b3e0acc65887158a52a03efd8e0759aa
-
-[ftp://mama.indstate.edu/linux/tree/tree-1.5.1.tgz]
-md5=274ca4d36ee6fb216fa6cf01ad5eaa84
-sha256=1cda1c4d43c6e11ac2214e0a886f1d184bf59d49252cb489b110697f686f809c
-
-[ftp://mama.indstate.edu/linux/tree/tree-1.5.2.tgz]
-md5=b86a3091ec93e1e13e81020fa33b6270
-sha256=d830f5c79fa86bd5b40ce99e70408e7e734361a14dc0bea5bffa0586cfde9715
-
-[http://www.southern-storm.com.au/download/treecc-0.3.6.tar.gz]
-md5=56426279e6017af909353176e582fb28
-sha256=c9b97a2c4a27a3d59caea3430485837f286ca8883504a8eb6bd86702275ba5fe
-
-[http://handhelds.org/~zecke/oe_packages/tron_V1.0.0.tar.gz]
-md5=65e8a11836493aacae7b6d3895807efb
-sha256=226cd1c59495349686d82250ff59f40319f3f7f469a3320b837ed3c344bec037
-
-[http://www.rpsys.net/openzaurus/patches/archive/tsc2101-r12.patch]
-md5=3d98b0d388f9eeceacace7c5ab0e3a90
-sha256=51ad0df8dfef36f6978e291b6558028d364e973b2263595d7eecec2ded0a5cd7
-
-[http://www.rpsys.net/openzaurus/patches/archive/tsc2101-r16.patch]
-md5=28d2b552a3d416c35119bc3f459c0c1a
-sha256=c2bed5d4ec064e0ac9c73c046e545dfad5ebfce3c84bdade1323a9f7a5265056
-
-[http://www.rpsys.net/openzaurus/patches/archive/tsc2101-r18.patch]
-md5=95e9a5dfc1852e2db3d1d9da6df439df
-sha256=83097559d413b57aa67da1de975e8fbb99d02a2b2166aad57d7b30881208ff1e
-
-[http://www.rpsys.net/openzaurus/patches/archive/tsc2101-r19.patch]
-md5=c70fa3e0184842e4f6822b7002eac33e
-sha256=7ca39d0df0a102114eabcd39df94ff271d81a71d9ef9f61915ac0a04031b68d1
-
-[http://repository.maemo.org/pool/maemo/ossw/source/t/tscalib/tscalib_0.0.1-3.tar.gz]
-md5=a06f80dfda9688e033561f959aae2d5e
-sha256=b27add2e28f38feea0c554633f220cd7542a8bb768ba290636a317852774ecbb
-
-[http://www.gnomepro.com/tsclient/tsclient-0.132.tar.gz]
-md5=748aada74e9e096467a9d553538df885
-sha256=da12dc1257ffb9dd3f9acfc53c7f420b234738a67ffbbe0e9dd96e18d04ebad0
-
-[http://www.gnomepro.com/tsclient/tsclient-0.140.tar.gz]
-md5=c10a5a151a1ece653f62e07b11228534
-sha256=4a94b68885e101dda429493caff18b5254c1240aafdb98a74ea0d775dd83b713
-
-[http://download.berlios.de/tslib/tslib-1.0.tar.bz2]
-md5=92b2eb55b1e4ef7e2c0347069389390e
-sha256=9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8
-
-[http://archive.ubuntu.com/ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_0.2.20080216.1.orig.tar.gz]
-md5=d219fcaf953f3eb1889399955a00379f
-sha256=8038a6db9e832456d5da5559aff8d15130243be1091bf24f3243503a6f1bda98
-
-[http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2]
-md5=bb22bd5b4675f5dbe17c6963d8c00ed6
-sha256=db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc
-
-[ftp://ftp.debian.org/debian/pool/main/t/ttf-gentium/ttf-gentium_1.02.orig.tar.gz]
-md5=4c3e6ae586be277537ebb68f2a45b883
-sha256=4746c04c9a4ad9e0788a38e0a2f81919a630d8070ceabc89f156b6d41d8ceb37
-
-[ftp://ftp.nl.debian.org/debian/pool/main/t/ttf-gentium/ttf-gentium_1.02.orig.tar.gz]
-md5=4c3e6ae586be277537ebb68f2a45b883
-sha256=4746c04c9a4ad9e0788a38e0a2f81919a630d8070ceabc89f156b6d41d8ceb37
-
-[ftp://ftp.us.debian.org/debian/pool/main/t/ttf-gentium/ttf-gentium_1.02.orig.tar.gz]
-md5=4c3e6ae586be277537ebb68f2a45b883
-sha256=4746c04c9a4ad9e0788a38e0a2f81919a630d8070ceabc89f156b6d41d8ceb37
-
-[http://www.bedroomlan.org/~alexios/files/SOFTWARE/ttyconv/ttyconv_0.2.3.tar.gz]
-md5=7997ba54401a7685290a6666b9d28585
-sha256=d91b4addcbb241b04b6cf795447163ed890a436b10205d2cd9cc1885ea3d9433
-
-[http://0xcc.net/ttyrec/ttyrec-1.0.8.tar.gz]
-md5=ee74158c6c55ae16327595c70369ef83
-sha256=ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec
-
-[http://downloads.sourceforge.net/tunctl/tunctl-1.5.tar.gz]
-md5=fdbedc263b3e85bb0e087cd567414607
-sha256=aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff
-
-[http://alioth.debian.org/frs/download.php/2241/tuxmath_w_fonts-1.6.0.tar.gz]
-md5=3aa0e0e488719611f0bc4441b63a6f56
-sha256=f3aae7e2f67cf12f3da98325388c7b2f6718729aa69c5c804d1866d6a49f8592
-
-[http://alioth.debian.org/frs/download.php/2733/tuxmath_w_fonts-1.7.1.tar.gz]
-md5=4ab3d5bd74adb0d0aeacb721b8cac395
-sha256=d0aebfb352add3ada95537aeef163019f93d5a0f9385a2fcae678125b77d5035
-
-[http://heanet.dl.sourceforge.net/sourceforge/tuxnes/tuxnes-0.75.tar.gz]
-md5=5db0cd42dfdff3e681805e93b4867c43
-sha256=217fc57fdd2a5ec360c197ea36110ec929d3f27c88cf875f0f4723b3496ed7c2
-
-[http://alioth.debian.org/frs/download.php/2767/tuxtype_w_fonts-1.7.3.tar.gz]
-md5=9b76e5ebb3daf3d93545dc561229e2a5
-sha256=1834524115d9b4ab49552dd078f56febd618deae88e064260744721e35fe60f6
-
-[http://linuz.sns.it/~max/twin/twin-0.4.6.tar.gz]
-md5=92429bb5550a4c231085585a3473bf4d
-sha256=67c4b7677469040b4fc37c084bc4f1ef4c365477e79862c3dc7c256c9f9257c2
-
-[http://xorg.freedesktop.org/releases/individual/app/twm-1.0.3.tar.bz2]
-md5=a56b71dc40249195b32b304633c28a3e
-sha256=5b41550477a893bf2b82ab73fc7fb6c839ba52d0deac059be1a473dd7bb92a4e
-
-[http://xorg.freedesktop.org/releases/individual/app/twm-1.0.4.tar.bz2]
-md5=0865e14c73c08fa8c501ae877298ee9f
-sha256=daa088f9ae231508929b7bd4746e942212b53f2802ca4cee450139fabc8de1fa
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/twm-X11R7.0-1.0.1.tar.bz2]
-md5=cd525ca3ac5e29d21a61deebc1e0c376
-sha256=2ce51682b63d1f3f3c566bddf84f74105634247d7b4ef559dd3f0199c9e6d41e
-
-[http://linuz.sns.it/~max/twin/twutils-0.2.tar.gz]
-md5=313d47ae27c3c4d51317626421c78284
-sha256=e4ac5c2a59e1c9f80b19c5703240e125592018f40972c2628171d0eeddd15e7b
-
-[http://teax.sourceforge.net/txdrug-0.1.tar.gz]
-md5=c867374392559d6e475eeb03f6a81169
-sha256=ee1044b61fc457ecc6025d06c5b9241994bd19e3d6ce98ae0827842caab00f0f
-
-[http://www.openzaurus.org/mirror/tximage-0.2.tar.gz]
-md5=eca63798136caeeaf7fd4b24c3e10783
-sha256=88b11a3e89db847e1db51e6f2b0c69e2afa0035fb4a47f523d264765eedb2958
-
-[ftp://elsie.nci.nih.gov/pub/tzcode2007e.tar.gz]
-md5=4ac16fb9de55c6e8e4c86b4e3613fbcf
-sha256=86d0db25f691ba5b86939e8a5911939b9b306d1deb13fccc5d7f899a9fdabac3
-
-[ftp://elsie.nci.nih.gov/pub/tzcode2007h.tar.gz]
-md5=e3d9b770e2a74bcddb6aac57f699c961
-sha256=d9be06167a3a882e39abed547037f1404935fa80410022af455060a1ba9c8bbb
-
-[ftp://elsie.nci.nih.gov/pub/tzcode2007k.tar.gz]
-md5=1f1de10e168b78681756cc6411ea8145
-sha256=1e5630747b12d82e106ff52173f890fe1975e2e72768872db8c64de9eace33d4
-
-[http://bent.latency.net/bent/darcs/zoneinfo-2007k/src/tzcode2007k.tar.gz]
-md5=1f1de10e168b78681756cc6411ea8145
-sha256=1e5630747b12d82e106ff52173f890fe1975e2e72768872db8c64de9eace33d4
-
-[ftp://elsie.nci.nih.gov/pub/tzcode2009k.tar.gz]
-md5=d181116286661375966a350e3e358cfa
-sha256=2581f4ce19b11e4218ad0b2859679485af1cefe036f52643c8fb20024c8f5d45
-
-[ftp://elsie.nci.nih.gov/pub/tzdata2007e.tar.gz]
-md5=b74e5f71714e5222340f1fb30da30a76
-sha256=51d14a60ea12aa901bf91e5d39ea30c13ffdc299640e8ec9cb0d35a128874767
-
-[ftp://elsie.nci.nih.gov/pub/tzdata2007h.tar.gz]
-md5=da8b4fb3abd4f1403b0bd2a4675a91ab
-sha256=8f16f0db83073c8ccb3702f9173c4991200c78e64ebd358fce9cbbf4371a2148
-
-[ftp://elsie.nci.nih.gov/pub/tzdata2007i.tar.gz]
-md5=bfe68c92dbe3726676063bdb14931b8b
-sha256=70bb254ae0da44d71f6d0932ffe34f61457bf41c38dfd389a7bf5bfb544a362b
-
-[ftp://elsie.nci.nih.gov/pub/tzdata2007k.tar.gz]
-md5=595b3b197174fa0c2dd654c52969fb2a
-sha256=37e986086ce1a1ccb9a4f24c2b77ede54f0eae2ee9959e7a191a49cedb405783
-
-[http://bent.latency.net/bent/darcs/zoneinfo-2007k/src/tzdata2007k.tar.gz]
-md5=595b3b197174fa0c2dd654c52969fb2a
-sha256=37e986086ce1a1ccb9a4f24c2b77ede54f0eae2ee9959e7a191a49cedb405783
-
-[ftp://elsie.nci.nih.gov/pub/tzdata2008b.tar.gz]
-md5=dbeb9a327bbff77ab4078488b8c5323a
-sha256=633d76612d73a7add41a3b90fe5721ea5f4282d52bd8408b9d4fab261443aa6c
-
-[ftp://elsie.nci.nih.gov/pub/tzdata2009m.tar.gz]
-md5=5314fe1483c7c1be17c50f2c2171e06b
-sha256=7609980204940ceaf74b5a48d15ea0c079eaec627e149cf3d986cfed268881fe
-
-[ftp://elsie.nci.nih.gov/pub/tzdata2009n.tar.gz]
-md5=c572bfb704e2da88b9e48517cfa3578f
-sha256=7b08bb8a98ad8a06e2cafda05ab21f2a69b2d64252dfc9435c93094d979e7c5a
-
-[ftp://elsie.nci.nih.gov/pub/tzdata2009o.tar.gz]
-md5=75c74b9c8df7c83c8e3c3068fff08a82
-sha256=5fbd4053a4eb01b814799855e35a3c01743f98acf9fcd167522e6484a2edd7b7
-
-[ftp://elsie.nci.nih.gov/pub/tzdata2009p.tar.gz]
-md5=e401e284512be17f5cf63ee52e4f3284
-sha256=7182ad6f03bfe16ccdbac4a3efb9e765ea7c51afc33c3a7fefb053122aa6da2c
-
-[ftp://elsie.nci.nih.gov/pub/tzdata2009r.tar.gz]
-md5=c38d977a3f9f4d4646cab902554c519e
-sha256=684d23e3ebe825c9db90732534446f4e33f5ad4455980b15fd9eb2e4ba5a6731
-
-[ftp://elsie.nci.nih.gov/pub/tzdata2009s.tar.gz]
-md5=3cd8038d7bbfb3a4ac544aceef724853
-sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
-
-[http://ftp.uni-erlangen.de/pub/Linux/MIRROR.gentoo/distfiles/tzdata2009s.tar.gz]
-md5=3cd8038d7bbfb3a4ac544aceef724853
-sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
-
-[http://gentoo.prz.rzeszow.pl/distfiles/tzdata2009s.tar.gz]
-md5=3cd8038d7bbfb3a4ac544aceef724853
-sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
-
-[http://ftp.uni-erlangen.de/pub/Linux/MIRROR.gentoo/distfiles/tzdata2010b.tar.gz]
-md5=dfd29a56cb39cc8c57b0939608a054f6
-sha256=a93208ae389cc0d3618731cc9f406ba2cfc6aac39668a06c687d3fae2a7e8210
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/t/tzdata/tzdata_2007h.orig.tar.gz]
-md5=8b766bb807c1f7c0c02ff798ea5db80e
-sha256=b4c6367ab85de8f148c903bb25dc69de7a7d7d05f204f58880a16a8b81bf93de
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.2.tar.bz2]
-md5=f10b6954498bab5d08d0f50de381af50
-sha256=4f32cfd01f0678080f8e98009ba99ce37f1261d842e3af9a6b3add22005a80ca
-
-[http://downloads.sourceforge.net/u-boot/u-boot-1.1.2.tar.bz2]
-md5=f10b6954498bab5d08d0f50de381af50
-sha256=4f32cfd01f0678080f8e98009ba99ce37f1261d842e3af9a6b3add22005a80ca
-
-[http://avr32linux.org/twiki/pub/Main/UbootPatches/u-boot-1.1.4-avr1.patch.bz2]
-md5=4508e9abd423a672763441d8535331c4
-sha256=b18d9f4e1fa5cf1f3d89640d6aa5067da150cebb822fdeb07222991f71684590
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2]
-md5=096cac66046326659b97eeded007ec73
-sha256=1af9d68adfe044cb8fe1b3efa5b661c4cb57edf90f4a8daf38f0fc19692677a7
-
-[http://downloads.sourceforge.net/u-boot/u-boot-1.1.4.tar.bz2]
-md5=096cac66046326659b97eeded007ec73
-sha256=1af9d68adfe044cb8fe1b3efa5b661c4cb57edf90f4a8daf38f0fc19692677a7
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2]
-md5=5b1b1f7b3b1e06f75f5bfbd79891067b
-sha256=778acb0eafe1d9b94c6f5ec5f333126c40d73704920ff8b23085c6dedecfd6e8
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-1.2.0.tar.bz2]
-md5=17aeee76ca4c07887bbfea8a52d40884
-sha256=62192ddf019c5d24f6538b33c9e69b6e5792bf5b0f464c0149061e2f0871108b
-
-[http://downloads.sourceforge.net/u-boot/u-boot-1.2.0.tar.bz2]
-md5=17aeee76ca4c07887bbfea8a52d40884
-sha256=62192ddf019c5d24f6538b33c9e69b6e5792bf5b0f464c0149061e2f0871108b
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-1.3.0.tar.bz2]
-md5=2298f6d6d5c52d42a90c44774ed07751
-sha256=a55d6d46120ea7625a9d2fe594f677690e7dc9e9b3151a6af0ebe25978458608
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-1.3.1.tar.bz2]
-md5=8fbd29c7e70c524a42d18b9c3f3a4aa1
-sha256=64811b4ab4ca362b01a3d08f53a2dbbf059e18484b90cb5e21c0365d53b87f77
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-1.3.2.tar.bz2]
-md5=78b1c2722d3907b5fae2cd219dbaf927
-sha256=8ab07cd758a1775642629e624f70e376fa8e84a2f879dee4544158d9c90cde2a
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-1.3.4.tar.bz2]
-md5=ca12b805b4f2bdcf15733be3fe22e896
-sha256=096aa286d923b7cc356bbe0dda0a29a701369deeb27ada1a2f053155aa403c31
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-2008.10.tar.bz2]
-md5=9d7758c475068a8452430f18d1751566
-sha256=5cd64b5ac52720a7f60015e01696422277ecc459e89dce8b16d457f30a9409ab
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-2009.01.tar.bz2]
-md5=cb11d3d74eee4d31124523d90d8c31fa
-sha256=0c0afa2816482e087987f71958b656ff0c122032f5e3897a8d17daca5bc14115
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-2009.03.tar.bz2]
-md5=285e2184d2efef50e0fe43b71d2a7b11
-sha256=a2889bee9c45575b284564dbc27cf3dc6cb9833d4ff643976a1b3dba2d763f86
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-2009.06.tar.bz2]
-md5=dfbe65c1e31bb7de5f5b03d50de192b5
-sha256=b0037cf21b67779ef5a0c585b32e46bde3b78df889484c78bb4318c9b448f560
-
-[ftp://ftp.denx.de/pub/u-boot/u-boot-2009.08.tar.bz2]
-md5=cd4788ea1c6ac4f9b100b888a1063a6b
-sha256=858fd04efd5b98e99fd1a074998b1a8ac5fbd07b176de1d20d8eb148492d949d
-
-[http://linux.omap.com/pub/bootloader/2430sdp/source/u-boot-SEP1106.tar.gz]
-md5=49c07dec9e1be69fd01d46f47ec03731
-sha256=a090786113b02647413ebc15888af269f2e6d50f73cbb94b0619cc1702911dae
-
-[http://www.reitwiessner.de/programs/u2nl-1.3.tar.gz]
-md5=d97a16d8b2231501ba418b5f1ffe018a
-sha256=7e1d8239a5bd43c50f6091b484acbc8a7c5886cd4523f1e369504266cbaca50d
-
-[http://cxx.uclibc.org/src/uClibc++-0.1.9.tbz2]
-md5=ebf58e04d72eab5c131c2c9118737024
-sha256=82342a5d6088421e79699dd7af614ebecf6dd335eabce07690902a379f5ea8de
-
-[http://www.uclibc.org/downloads/uClibc-0.9.28.tar.bz2]
-md5=1ada58d919a82561061e4741fb6abd29
-sha256=c8bc5383eafaa299e9874ae50acc6549f8b54bc29ed64a9a3387b3e4cd7f4bcb
-
-[http://www.uclibc.org/downloads/uClibc-0.9.29.tar.bz2]
-md5=61dc55f43b17a38a074f347e74095b20
-sha256=ca70501ae859cd86b387bb196908838275b4b06e6f4d692f9aa51b8a633334a7
-
-[http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2]
-md5=1a4b84e5536ad8170563ffa88c34679c
-sha256=2d9769a02c46cff73f56a076268192da1ce91c913e2e4e31c120be098f704c8c
-
-[http://www.uclibc.org/downloads/uClibc-0.9.30.tar.bz2]
-md5=e5766e2566e0297adebebbcc0aba1f2d
-sha256=67e7e6b983cd2caa163f177d5196282434ae1e18b7270495cd6c65f5c1549555
-
-[http://wiki.openembedded.net/dl/uclibc-locale/uClibc-locale-030818.arm.tgz]
-md5=fc0b6113f2b333564d3558e241059db8
-sha256=6765f08499079207ba8c4da999d602ca75c384ff5812aa973f27b6a501b3438e
-
-[http://www.uclinux.org/pub/uClinux/uClinux-2.4.x/uClinux-2.4.24-uc0.diff.gz]
-md5=cd8a3b23299305761c5b3b3f81dd017a
-sha256=c409609ce3bdf5bc4c040aa17ec28c6c214695a6aaaa408643edbda704142fcf
-
-[http://ubahnstation.net/source/ubahnnav-0.4.1.tar.gz]
-md5=039d1215960b879d5b292e5b713ced8b
-sha256=7007261ad816938ee4824720eb08e9bff4ad6f796965ec928f56acfa3c24a1b9
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/ucb1x00-touch-audio-r1.patch]
-md5=958229e8a1cb706499eb75e5c8be804f
-sha256=2a45b4e4e667b99ad32f5b9b12671f77646cc04d5798b9b8af5f30806149f8bd
-
-[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/ucb1x00_suspend.patch]
-md5=8cf0f9e1158bf04cccb65a0926221888
-sha256=502e6c62fd930639987e34fbb1aaeb7b1456e2743e0d6986faf0990257921435
-
-[http://downloads.sourceforge.net/ipodlinux/uclinux-2.4.24-ipod0.patch.gz]
-md5=5d16f569d2a18b6536749cc2b229649d
-sha256=43604951abb43246ccd6b6e7b6935f92322f9313ded99044057b241a2a20b07b
-
-[http://www.unicap-imaging.org/downloads/ucview-0.22.tar.gz]
-md5=1b43c823624962bde3248ae493995750
-sha256=aabf82869707be33ac57cce1db798922b8a9329cfcba876643d49f9807fb32af
-
-[http://www.unicap-imaging.org/downloads/ucview-0.30.tar.gz]
-md5=509077240e1f8a3d865953c4224182b9
-sha256=b3e501f327ca7c762bef56ea786e1d1fcc27b2354e1b98fc4e5c9a078b870873
-
-[http://anymore.nl/ipaq/udc_unbind.patch]
-md5=07da0085296fef529ca869a108e07edc
-sha256=3ffcdc0e4597046f476ae5d4250783eb563723614bad9f1f58cc0cd9932d0b1d
-
-[http://anymore.nl/ipaq/udc_usb_gadget_register_driver_fix.patch]
-md5=ee48a4ec191cb6ae61dad1bf6378cc85
-sha256=31cfb81c4a4b16a6a0fe8fec04241d37c9ca98fe3bb0a434141c287fcb98e2bb
-
-[http://kernel.org//pub/linux/utils/kernel/hotplug/udev-092.tar.gz]
-md5=a3954a4fc25cee4e1f6df498de8f72c7
-sha256=e402e316ffddbdd5312d3a5957fccf47de7a8b62c7bb3710829a2e696e3818d1
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-092.tar.gz]
-md5=a3954a4fc25cee4e1f6df498de8f72c7
-sha256=e402e316ffddbdd5312d3a5957fccf47de7a8b62c7bb3710829a2e696e3818d1
-
-[http://kernel.org//pub/linux/utils/kernel/hotplug/udev-097.tar.gz]
-md5=dfee443eed87892cc7eb50969191ff17
-sha256=1af8fedef2e76c99ab4dbf75e5ff573739dd952adc7856c5dbcebf0512e4adbe
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-097.tar.gz]
-md5=dfee443eed87892cc7eb50969191ff17
-sha256=1af8fedef2e76c99ab4dbf75e5ff573739dd952adc7856c5dbcebf0512e4adbe
-
-[http://kernel.org//pub/linux/utils/kernel/hotplug/udev-100.tar.gz]
-md5=1ceb626a86630287cc28585eb16d7131
-sha256=faa9b6e000509039bbd4e1f24694adacf2cd86228d22240ec1a13acc13517aa6
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-100.tar.gz]
-md5=1ceb626a86630287cc28585eb16d7131
-sha256=faa9b6e000509039bbd4e1f24694adacf2cd86228d22240ec1a13acc13517aa6
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-115.tar.gz]
-md5=3ee465beef2d19c212fdb52d9a89d62e
-sha256=07b29dfdd2d63090c76df04c2dcde323640708c5a06b346cb299c0aba4351a3e
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-118.tar.gz]
-md5=a8233f2afc62a8a8971f79df8878d57e
-sha256=4467f57484124b735450e05617c2aa0f75e0e56306e92c74f9dfe59bd028fcd9
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-124.tar.gz]
-md5=2ea9229208154229c5d6df6222f74ad7
-sha256=cc9f58ff58fbd3f5868e1f1e368e3c93e1f441afd0ac1dcbd5d01a9ce5b5b0d7
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-137.tar.gz]
-md5=a3fcdcd21b2f33d598f45a68fff892bd
-sha256=ee3922bd46dbdc406be5d498be5bc062a0b39f05f1c0a1b22c3657eb0e805975
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-141.tar.gz]
-md5=86382b7bbc64459e714c65a2a4e10916
-sha256=001be4a8963c48e7debc82c6078562d087a2979da63e558a5e3613c03725c377
-
-[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-151.tar.gz]
-md5=5e66b90bfa91e9ed101fdb66735af658
-sha256=a1fbc567ab6c2062ce32cebe6c96664282a979e0b7bf402b16fb3795c9ac0ae8
-
-[http://udhcp.busybox.net/source/udhcp-0.9.8.tar.gz]
-md5=2d7e548820d2ded5e183933cb701defb
-sha256=da0ca1e821e3fa7cfbe73ddb1480b921002ee992f5e5fbc611422c103b907443
-
-[http://projects.unbit.it/downloads/udlfb-0.2.3_and_xf86-video-displaylink-0.3.tar.gz]
-md5=c2aedc8130c2e4d52e334b6804ab70da
-sha256=487a1d7bf4b896d9a4b9e7dd1bd293adcadde5684fe9fe32aa209761c3191b3e
-
-[http://downloads.sourceforge.net/ufraw/ufraw-0.12.tar.gz]
-md5=b2c104938c1c3eb47e7605432bbd3157
-sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f
-
-[http://heanet.dl.sourceforge.net/ufraw/ufraw-0.12.tar.gz]
-md5=b2c104938c1c3eb47e7605432bbd3157
-sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f
-
-[http://uim.freedesktop.org/releases/uim/stable/uim-1.3.1.tar.bz2]
-md5=2832e23d4778bbacbfa4b49bf642d667
-sha256=ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256
-
-[http://uim.googlecode.com/files/uim-1.3.1.tar.bz2]
-md5=2832e23d4778bbacbfa4b49bf642d667
-sha256=ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256
-
-[http://keihanna.dl.sourceforge.jp/tomoe/17172/uim-tomoe-gtk-0.2.0.tar.gz]
-md5=e52817378766286d69b78fe58b37e45e
-sha256=e35fcb9b14e7621dc32975872a5147137ff12cc71e16993702a49268d59c079c
-
-[http://upir.cz/maemo/dists/chinook/main/source/ukeyboard_1.1.tar.gz]
-md5=4ba5657f3f7d71a818f3e6259b5d4fde
-sha256=e5b7b7c4b61f7b0affa5e3987e0127c695d2e512f39df68b97479b50cc39ed78
-
-[http://upir.cz/maemo/dists/chinook/main/source/ukeyboard_1.2.tar.gz]
-md5=cf291d487250e3e9c1cc34389ce49297
-sha256=1f54d52abc5a53db45bc063948375b947af2c031ee1b810686027f7694deb474
-
-[http://upir.cz/maemo/dists/chinook/main/source/ukeyboard_1.6.tar.gz]
-md5=78b8ab318d725b07c3c08c390290a556
-sha256=0ecaf4e174c5b8eb3c1225cc60917404e14ad613f57fd2ca290d31548f089bcf
-
-[http://downloads.sourceforge.net/ulxmlrpcpp/ulxmlrpcpp-1.5.2-src.tar.bz2]
-md5=cea56d3a1a7e4f1a4d12697330c4526b
-sha256=00f40bf3c8e4ed3ca169ec54352fc7499d443e443d91b7460997ddca5448905e
-
-[http://downloads.sourceforge.net/ulxmlrpcpp/ulxmlrpcpp-1.7.3-src.tar.bz2]
-md5=7c5d849d8d1cd9ccfb4b90350145d503
-sha256=0d568ff00cd45f73f3634723f8cb453f8bc952760cad3829bcbca88378a2ed83
-
-[http://heanet.dl.sourceforge.net/ulxmlrpcpp/ulxmlrpcpp-1.7.3-src.tar.bz2]
-md5=7c5d849d8d1cd9ccfb4b90350145d503
-sha256=0d568ff00cd45f73f3634723f8cb453f8bc952760cad3829bcbca88378a2ed83
-
-[http://www.unicap-imaging.org/downloads/unicap-0.9.3.tar.gz]
-md5=69db7c7dacb58c303d44f3b6598653ee
-sha256=bf619a4675aa4b7cec9c3a664e1fcd9d869facf393e4e9e51e52490db98d6585
-
-[http://www.unicap-imaging.org/downloads/tisCMOS/unicap-0.9.4.tar.gz]
-md5=f562b36a854c634d728a638db4201f3d
-sha256=2ee51c061aaabf3490f4814e739f346bfe2565113d4309161f472e94db668565
-
-[http://www.unicap-imaging.org/downloads/unicap-0.9.4.tar.gz]
-md5=f4ef95b9338cc16754ab092a581d123c
-sha256=63ba54255f6700777fa275a67585ec164952ecaa7f8de0c046b7ebc009363c7a
-
-[http://www.unicap-imaging.org/downloads/unicap-0.9.7.tar.gz]
-md5=2436d1cd2c6b321529e9e1d67ff7095c
-sha256=b3b7682718e64761d807a96236720cb2952219c139a21d343325fb25fe30cde2
-
-[ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/OLD/unionfs-1.x/unionfs-1.0.11.tar.gz]
-md5=494651fe0cf724c093b4be80e35e857f
-sha256=f1df81423a65590ffd20df43f5cd0be14cf6746437eb40c2c924f5f58a6e18a7
-
-[ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.0.11.tar.gz]
-md5=494651fe0cf724c093b4be80e35e857f
-sha256=f1df81423a65590ffd20df43f5cd0be14cf6746437eb40c2c924f5f58a6e18a7
-
-[ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/OLD/unionfs-1.x/unionfs-1.0.13.tar.gz]
-md5=1dca48ff260dacf890b8040a3cea55b3
-sha256=61b03ce855734b1a1b4b180856095876d562c22e359ba847a2544c488c7254b4
-
-[ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.0.13.tar.gz]
-md5=1dca48ff260dacf890b8040a3cea55b3
-sha256=61b03ce855734b1a1b4b180856095876d562c22e359ba847a2544c488c7254b4
-
-[http://osdn.dl.sourceforge.jp/zaurus-ja/773/unismall-1.0.0.tar.gz]
-md5=fb608934ab87ad5203aebb85c2d130c7
-sha256=9f60583875713e7d45797f25c321c1bb36f43afbbe3c4ab4fd1f58c157022eb6
-
-[ftp://ftp.gnu.org/gnu/units/units-1.80.tar.gz]
-md5=537f0e1fadc7715e1eb15c9aa33c8c64
-sha256=f1dc3a6e929618a1799d95e014dcb072963d13128aa8108772538b8c3e1535f8
-
-[http://www.tux.org/pub/tux/benchmarks/System/unixbench/unixbench-4.1.0.tgz]
-md5=3561ae1f067f9dfb9707c062f536acac
-sha256=4605f3f0001afd3af91ffb554dfd65c5cd313b6b9ada52ae8b2efdccf894cfa2
-
-[http://www.rarlab.com/rar/unrarsrc-3.4.3.tar.gz]
-md5=06966791546a7b40a2b0139fba552cb0
-sha256=f53533b44a9c17972aff6ac7047c6ac1e2e5e2930254eccdb1239678a6dd1793
-
-[http://downloads.sourceforge.net/project/infozip/UnZip%205.x%20and%20earlier/5.52/unzip552.tar.gz]
-md5=9d23919999d6eac9217d1f41472034a9
-sha256=145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
-
-[http://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz]
-md5=9d23919999d6eac9217d1f41472034a9
-sha256=145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
-
-[http://downloads.sourceforge.net/nslu/upslug2-11.tar.gz]
-md5=e135bc8a390b65573bbc8ff4628e490c
-sha256=24859c992fb58f0bf4840e1378da91b942c73263b0213096e6755436af8d16bc
-
-[http://upstart.ubuntu.com/download/0.3/upstart-0.3.8.tar.bz2]
-md5=5cdd2dc3a3f02089c9450edf4e8f4941
-sha256=9a2a37455ad4e9dd2856b5a0f15adb1a3f84439f60d0f63b041584a2666e9835
-
-[http://downloads.sourceforge.net/sc2/uqm-0.3-source.tgz]
-md5=6abcdc3caf7efd3bd978332743ee7568
-sha256=e42ac3b45c1c8a3199bbd9b666e9225d76bc18d902339c54cbb4df3a75909e53
-
-[http://heanet.dl.sourceforge.net/sc2/uqm-0.3-source.tgz]
-md5=6abcdc3caf7efd3bd978332743ee7568
-sha256=e42ac3b45c1c8a3199bbd9b666e9225d76bc18d902339c54cbb4df3a75909e53
-
-[http://downloads.sourceforge.net/sc2/uqm-0.5.0-source.tar.gz]
-md5=9002b1bc2de9285588dd97b618a867a7
-sha256=bdb715784bf0c94825cf40f97c60a5ec83fd3e17e9e186a78cd145781c4d9804
-
-[http://heanet.dl.sourceforge.net/sc2/uqm-0.5.0-source.tar.gz]
-md5=9002b1bc2de9285588dd97b618a867a7
-sha256=bdb715784bf0c94825cf40f97c60a5ec83fd3e17e9e186a78cd145781c4d9804
-
-[http://downloads.sourceforge.net/uriparser/uriparser-0.5.1.tar.bz2]
-md5=faf561c6260e1b580cba2509f410a29f
-sha256=5a664f5c8f404c1148f661499866f1fe8df8debef2adc55c630ac83e6d57a98c
-
-[http://heanet.dl.sourceforge.net/uriparser/uriparser-0.5.1.tar.bz2]
-md5=faf561c6260e1b580cba2509f410a29f
-sha256=5a664f5c8f404c1148f661499866f1fe8df8debef2adc55c630ac83e6d57a98c
-
-[http://linux.duke.edu/projects/urlgrabber/download/urlgrabber-3.1.0.tar.gz]
-md5=2a92d8ce0d89c5e772a98e9b8dcd5b73
-sha256=34d48f4f4390ed06c0fc8fac580f6fe4cd2bfb3557ff0f11254a7bea25d353ca
-
-[http://excess.org/urwid/urwid-0.8.4.tar.gz]
-md5=4bf9e297f1db0502ec2753f3e084f4cd
-sha256=03c1970273b211be8a6a8d23e44522b5d20a774781d31b51c26109985ac28cdd
-
-[http://excess.org/urwid/urwid-0.9.8.1.tar.gz]
-md5=5a033bcafa4eb8c6e76636112bc3de98
-sha256=d0fb637d27f2aacdb116683970d915656bdfb68fa20affe68fffc52d5ab379a3
-
-[http://oz.drigon.com/patches/usb-ohci-hooks-r1.patch]
-md5=5fa0f5c96b0ac775457db1c34e2a2050
-sha256=095745353b285a3675ab9778f13510171a49cb530dd6702fe5f2a137eaeeaa5e
-
-[http://www.rpsys.net/openzaurus/patches/archive/usb_add_epalloc-r1.patch]
-md5=cbed67d90ab43de50e398680b04ec902
-sha256=5b8bb4f95c53367b1e1aaf821722c44f96a711d1a8b43476641f7074deffe5d7
-
-[http://www.rpsys.net/openzaurus/patches/archive/usb_add_epalloc-r3.patch]
-md5=7a9ff02fa652daa8fd518c1a6f95162c
-sha256=dbc5d6921136711f08c197284ec67dc77232559e2e31429f8a30a1a102bd07f7
-
-[http://www.rpsys.net/openzaurus/patches/archive/usb_add_epalloc-r4.patch]
-md5=042c5243ce0253341fe920a8a863e37b
-sha256=6d2ae5d70609df7d2c2b518eca0624c4a59328b277ed114b9e5b57dd030e6e94
-
-[http://www.draisberghof.de/usb_modeswitch/usb_modeswitch-1.0.2.tar.bz2]
-md5=4f896ed631f9be0338df9c5a2145ef82
-sha256=f1b9388f4507185a4ac30bae3383d9e9bbb95075a14dd188c904cacdd8cf4e66
-
-[http://www.draisberghof.de/usb_modeswitch/usb_modeswitch-1.0.7.tar.bz2]
-md5=a9d05c785ade1b06097d53f4423bd5c6
-sha256=ce4985544ea9a252d43cd031823938d51a28e7a9f449ff4403295d1654a3b9d9
-
-[http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r0.patch]
-md5=c8193bc27642fa446d702cfdb9464c2a
-sha256=2101f292449cbacc277aecc5c649de895d501057f299e8e48a7ec50cfb0a200d
-
-[http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r3.patch]
-md5=59ce16ffe6362514e26540e1a08856b7
-sha256=eb8d02a6355a62790f511269d046269840f40f962b5f910a3a3f3047f5364b9c
-
-[http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r5.patch]
-md5=e312729c632e820bd9d651476ccec9bc
-sha256=94b8926463a996056b4cdff85f940f2f647be30c55fe998943de7e92bd0fee64
-
-[http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r6.patch]
-md5=b70762567efcf7c2645268cce520497c
-sha256=7bd4d2230fa1ed83021382697335bb81410b0611937f5225aad6594f04a356ba
-
-[http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r7.patch]
-md5=1ec80e91dd5d23845f5eb06a4a8b8837
-sha256=0d68c607a276cc4389ab1759fcac4b165d26d4da3fc694ea85e5ec7254f30ebe
-
-[http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r8.patch]
-md5=d4bbe2b9ef6b5879d72875896632d8b3
-sha256=c4bf829816c3e53b0807bb12cfdc8b1f0e0c1eae14a5be2ffb1a59ad71bbb188
-
-[http://anymore.nl/ipaq/usbgadget_fixups.patch]
-md5=261038b0a6890207b68a26be10a37822
-sha256=1d645fa76a9482a6630b9a7257d11eabfa94ef4337493ef7075e25cbb8820491
-
-[http://www.techiem2.net/files/usbmode.tar.gz]
-md5=1af56936129a4cf59487f8825cce44b6
-sha256=368b06259170e7e960c8ba4e344e6df45c85ac23476554e84fe9e53667dcfc0e
-
-[http://downloads.sourceforge.net/linux-usb/usbutils-0.70.tar.gz]
-md5=05276dc307a0297904bc892e9998bf59
-sha256=98d29c0c013debc32f1a17fd66f5e9248025959b07d13f1faba91aa5a1a9ba6b
-
-[http://heanet.dl.sourceforge.net/linux-usb/usbutils-0.70.tar.gz]
-md5=05276dc307a0297904bc892e9998bf59
-sha256=98d29c0c013debc32f1a17fd66f5e9248025959b07d13f1faba91aa5a1a9ba6b
-
-[http://downloads.sourceforge.net/linux-usb/usbutils-0.72.tar.gz]
-md5=ee345fe605ffcfce843dae4aed81122b
-sha256=00385353242173b878413e0423c1dddcbbb50a3cadc3bb9d0a6adcf335794423
-
-[http://downloads.sourceforge.net/linux-usb/usbutils-0.73.tar.gz]
-md5=88978b4ad891f610620b1b8e5e0f43eb
-sha256=2edc7cc98fd217f6980d8ba0b3792beed4695d4e8429a11c7237faab04ab47f4
-
-[http://downloads.sourceforge.net/linux-usb/usbutils-0.82.tar.gz]
-md5=6e393cc7423b5d228fa3d34c21481ae4
-sha256=9876b0e45a1bd3899222b916ab1d423e9efa3ad9374d55a6a301d5716f2d8a2f
-
-[http://downloads.sourceforge.net/linux-usb/usbutils-0.86.tar.gz]
-md5=34979f675d2bcb3e1b45012fa830a53f
-sha256=b3b2bea6d2cd87660c8201a47071bf2a9889d8ed90c7203cc768b597799c12f4
-
-[http://www.kroah.com/linux-usb/usbview-1.0.tar.gz]
-md5=2ac1bdae03a858b965e895b211a75ad7
-sha256=7a7add52242142f37a7d220c76dfe77090f6592eacdf796e3d07fa61415340fd
-
-[http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz]
-md5=d669ae4a3567b0d5d3ff5db6351b4053
-sha256=651f040408a9dfe3ece1d490cd808fc80e878fd39876f50f6772f9e5f9ee3674
-
-[http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz]
-md5=7b407c7ff5a38216f85d648365d81894
-sha256=bfa16a53bf481178f0b1bb51fadf539e96312fc3b84f1e54c650d2bae6f1eccb
-
-[http://ushare.geexbox.org/releases/ushare-0.9.7.tar.bz2]
-md5=e978c648f808cf1740b1583a78b922ff
-sha256=b09616934c21e10a9bac2d3941bd8585b075ccc10c2f5218a0f652b0e9386a4c
-
-[http://ushare.geexbox.org/releases/ushare-1.1a.tar.bz2]
-md5=5bbcdbf1ff85a9710fa3d4e82ccaa251
-sha256=7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665
-
-[http://mattcamp.paunix.org/usound/usound-0.2.0.tar.gz]
-md5=f863e1c02a8f7b634fd3102274163f8e
-sha256=31299e0308d7e1879cba6c54e3c06b1ba8de028d6cf8dc6ff99c0fe9974cefe2
-
-[ftp://ftp.gnu.org/gnu/gnuradio/usrp-0.12.tar.gz]
-md5=41ee5d5f1ef440fdd880f99c53fccf69
-sha256=c9be448984840ae960874c3c536942ba63c79a7f6a0dff3970540190b1500804
-
-[http://ftp.cwi.nl/aeb/util-linux/util-linux-2.12.tar.gz]
-md5=997adf78b98d9d1c5db4f37ea982acff
-sha256=9c239b947b9a7352d88625073ab512d601da92a00703f73dc1e1b83b78b4ca1d
-
-[http://kernel.org//pub/linux/utils/util-linux/util-linux-2.12o.tar.bz2]
-md5=a7c0c2729ed27beac39cf656d2097dd3
-sha256=913a83f69a370b6ee858577f8f1d218cfe899fd39d7b8a380df4971b6059e8e0
-
-[http://kernel.org/pub/linux/utils/util-linux/util-linux-2.12o.tar.bz2]
-md5=a7c0c2729ed27beac39cf656d2097dd3
-sha256=913a83f69a370b6ee858577f8f1d218cfe899fd39d7b8a380df4971b6059e8e0
-
-[http://kernel.org//pub/linux/utils/util-linux/util-linux-2.12q.tar.bz2]
-md5=54320aa1abbce00c0dc030e2c3afe5d7
-sha256=2e68a53d1393e97926340d9b21e1bde488aaef05ab3e8bcab4849d1859115c6d
-
-[http://kernel.org/pub/linux/utils/util-linux/util-linux-2.12q.tar.bz2]
-md5=54320aa1abbce00c0dc030e2c3afe5d7
-sha256=2e68a53d1393e97926340d9b21e1bde488aaef05ab3e8bcab4849d1859115c6d
-
-[http://kernel.org//pub/linux/utils/util-linux/util-linux-2.12r.tar.bz2]
-md5=af9d9e03038481fbf79ea3ac33f116f9
-sha256=b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
-
-[http://kernel.org/pub/linux/utils/util-linux/util-linux-2.12r.tar.bz2]
-md5=af9d9e03038481fbf79ea3ac33f116f9
-sha256=b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
-
-[http://kernel.org/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-2.13.1.tar.bz2]
-md5=424badc1832e4b5291a2ec04e9e244f4
-sha256=e67d86683adef0855220b6f5a4b7ca2c51a15faa142e2ecd69925ede76854a4d
-
-[http://kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.tar.bz2]
-md5=23f227da49df36f33fe47e917e332cd8
-sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c
-
-[http://kernel.org/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-2.15.tar.bz2]
-md5=71919b69eeecbba05612224d8f2c450f
-sha256=db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd
-
-[http://kernel.org/pub/linux/utils/util-linux-ng/v2.16/util-linux-ng-2.16.tar.bz2]
-md5=9623380641b0c2e0449f5b1ecc567663
-sha256=a6365fcb2b34439faa52164e1a018086c2b6818f8a189c487c79e09dc3c62722
-
-[http://ftp.linux-vserver.org/pub/utils/util-vserver/util-vserver-0.30.214.tar.bz2]
-md5=8bad879e36a6a1b9b4858d0d6d3c8c76
-sha256=c88a27ccd1593f4396e1cf4aca37c715c7618a77d709ad63c7cc744ca1557c45
-
-[http://ftp.linux-vserver.org/pub/utils/util-vserver/util-vserver-0.30.215.tar.bz2]
-md5=befd9b8e5311e87395b67ee381d83649
-sha256=40686ac0652b245fcbb34e52ac8d80ae6b4ea3f73150ebc1ce7c69660ccaa35e
-
-[ftp://ftp.gnu.org/pub/gnu/uucp/uucp-1.07.tar.gz]
-md5=64c54d43787339a7cced48390eb3e1d0
-sha256=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c
-
-[http://ftp.debian.org/debian/pool/main/u/uucp/uucp_1.07.orig.tar.gz]
-md5=64c54d43787339a7cced48390eb3e1d0
-sha256=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c
-
-[http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch]
-md5=e0b42e51630e9cd7e3b0adf1be42f4a1
-sha256=0c625e90d13f91269d3a02ebdfba97226651a849ad8d69a0734bb5df7964c571
-
-[http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch]
-md5=e0b42e51630e9cd7e3b0adf1be42f4a1
-sha256=0c625e90d13f91269d3a02ebdfba97226651a849ad8d69a0734bb5df7964c571
-
-[http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/v2.6.17-gitcurrent.patch]
-md5=d41d8cd98f00b204e9800998ecf8427e
-sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-
-[http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-0.1.3.tar.bz2]
-md5=1c26f40af343bcc465f5832e2c9548d6
-sha256=bf0ca221bc5e8a6b06f73a1eb6ae1470ec5b34b987669f7abeb499e6402af3b0
-
-[http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-0.1.5.tar.bz2]
-md5=81ae073aa38317acdd4c5ecdc15da386
-sha256=8c8db0b6de0bae2c065a68d31369e750dc03bd875bac78e87763e263f3bc2588
-
-[http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-0.1.8.tar.bz2]
-md5=613c601d6a8a85289327ef6392e16c57
-sha256=4154c5a3830bba25bd63b175f4fba07867ef029124d8c9470fac45235569dde5
-
-[http://people.igalia.com/berto/files/vagalume/source/vagalume_0.5.1-1.tar.gz]
-md5=5ec548c343de435b94a7b39f5c853292
-sha256=10263676cb872ca48d8d605be44eb1e6260419675409732e7e5a76eb41843cee
-
-[http://vagalume.igalia.com/files/source/vagalume_0.7.1.orig.tar.gz]
-md5=c7929eefe38cab5985834d5163292121
-sha256=6f37a0a9a5deb501176bc119b2df61746ccdd6ba95c80f179d8fff1ed323371e
-
-[http://garage.maemo.org/frs/download.php/4505/vagalume_0.7.orig.tar.gz]
-md5=97e1497eed21ef0ac82514ead94c5ee4
-sha256=82b42534276018809aec934b572845e495ea19fc0c6abf6b6ef1e8571b91ccee
-
-[http://people.igalia.com/berto/files/vagalume/source/vagalume_0.7.orig.tar.gz]
-md5=97e1497eed21ef0ac82514ead94c5ee4
-sha256=82b42534276018809aec934b572845e495ea19fc0c6abf6b6ef1e8571b91ccee
-
-[http://vagalume.igalia.com/files/source/vagalume_0.8.2.orig.tar.gz]
-md5=e25d41ea12eac9891663b2c32cb91851
-sha256=9d046572b1c8e2917f69df2abddf7199f643da1d0eee25aae828ad8891f67103
-
-[http://vagalume.igalia.com/files/source/vagalume_0.8.3.orig.tar.gz]
-md5=f6cb301fe4eec68877484b258045d0df
-sha256=aedf9efef06cd542168c0316d7696d6ba64e78d689212693264f4c5d17663f4d
-
-[http://download.gnome.org/sources/vala/0.1/vala-0.1.5.tar.bz2]
-md5=4e082ecb7f60ebdc49f3bd19ae7ebca2
-sha256=20c577c9130f114dda24fd5a1c19cd477679553c4e2e7c8362471ae1f21b6836
-
-[http://download.gnome.org/sources/vala/0.3/vala-0.3.4.tar.bz2]
-md5=8b44e6bd6064e0858dc399d61200691c
-sha256=24a25b77f1c8976de44de73b571f5da4c450a995f8fc71d935da0212af775e30
-
-[http://download.gnome.org/sources/vala/0.3/vala-0.3.5.tar.bz2]
-md5=ac2b5ab509dfabd923d0ed89df2c7c47
-sha256=c03e8e2a63fad2049406aa6722683568700901f782ff4ba562905c11b42c3647
-
-[http://download.gnome.org/sources/vala/0.4/vala-0.4.0.tar.bz2]
-md5=9aea32dc66e42895d7cbebe79b6dc6d5
-sha256=0a08ba289566e4d69b937c6bc29e43ba99b445811583b08bdef8d4b52e8a7d0c
-
-[http://download.gnome.org/sources/vala/0.5/vala-0.5.1.tar.bz2]
-md5=0051ae1f2ef967ce21e77889719daad1
-sha256=b24593c78fa322349ae9967a454464e37a25ab58f44481334589a609e9bcca7b
-
-[http://download.gnome.org/sources/vala/0.5/vala-0.5.2.tar.bz2]
-md5=e5b2ee7a4ff5f551a278e64a3e502f50
-sha256=dbd7c9200d45e9278498817490092c468aa31ec9815f30d71deb5b5009401b64
-
-[http://download.gnome.org/sources/vala/0.5/vala-0.5.3.tar.bz2]
-md5=92216c6ffb9fe0dee80c22603ee0bbb0
-sha256=564463e9e4a2603a33bb29abb9011c9fcd7108d86054b19bd163b295c0511567
-
-[http://download.gnome.org/sources/vala/0.5/vala-0.5.4.tar.bz2]
-md5=9aa42745fd87e55655adde0dc14f928c
-sha256=faf0b7863161927e1502c8829f24e23aad404d305305728a4f37a4824d73fdab
-
-[http://download.gnome.org/sources/vala/0.5/vala-0.5.5.tar.bz2]
-md5=ae4a9b6b67262c357aa6af012f976c65
-sha256=a1cef2b1f56c46cf787af855c43468ff7dcb4acd4e253c85e302cd8bd37dbbac
-
-[http://download.gnome.org/sources/vala/0.5/vala-0.5.6.tar.bz2]
-md5=c4e3d285ffacd6c5971788215588420b
-sha256=7f2f0492b0e1f9f96bd416e6c7a34e77c46faa20eeaff28c81c5932c91534ffc
-
-[http://download.gnome.org/sources/vala/0.5/vala-0.5.7.tar.bz2]
-md5=5e6c4ce07091725d9afdac7cf00e553c
-sha256=d0425be8572be85b8a7ae802a19bcb73fdeac74906f7bcbbc129697ea6a86f3a
-
-[http://download.gnome.org/sources/vala/0.6/vala-0.6.0.tar.bz2]
-md5=9e5888a79757eb0f47df118b39762ed6
-sha256=9d1cb3661e6c15059e4eecce323b3f118c243d1f17a1883e2b2d7ca0a16987e5
-
-[http://www.freesmartphone.org/sources/vala-0.7.10.1.tar.bz2]
-md5=f34e85c15a7ecec880c03d70e6e3ad20
-sha256=d4a055b0eb714d5335e21db8d685f27a59f2f7b639bf8229429e6e9325928674
-
-[http://www.freesmartphone.org/sources/vala-0.7.10.2.tar.bz2]
-md5=f1d2d0c254b97ac298283d795dc88625
-sha256=2bd7bfc71e56f2d29a0c971a81e7ff098a96d0e79d68eed0d604f3882ccd6fe6
-
-[http://www.freesmartphone.org/sources/vala-0.7.10.3.tar.bz2]
-md5=b3b2b025c46f66a887bca195f44ea46a
-sha256=de4fe0a55fd6dcff31205fbf81766593bb9e576939ebe3dd418967cde15b70c4
-
-[http://downloads.freesmartphone.org/sources/vala-0.7.10.4.tar.bz2]
-md5=595a211e2a305ccbb9478f513a341e42
-sha256=2ba6dde7ba9829253147ef2eadbb9f69f8dddc4098006740e9b206bcb903c0c6
-
-[http://www.freesmartphone.org/sources/vala-0.7.10.tar.bz2]
-md5=6e807644f500d6605a5ee4e1612dd187
-sha256=902392d95e20e8c3e18ad739e24c6727dd90fe281b1ffdbbf509a8d7c50aa8c5
-
-[http://www.freesmartphone.org/sources/vala-0.7.5-fso2.tar.gz]
-md5=1a10e3c3d7c8eab324ecb0d8b81732bd
-sha256=4dfd1ff2793f71ab11d842ff4379a676a30af4287b7b6892ba9733bf7b691c10
-
-[http://www.freesmartphone.org/sources/vala-0.7.6-fso2.tar.gz]
-md5=ca44d7e733e4f2058a1e5e8a0aa5d2e0
-sha256=59295d46010c19f7b23f46e60522e6161ffc44685ef20fc04aca8b54d3fd7ef0
-
-[http://www.freesmartphone.org/sources/vala-0.7.7+fso1.tar.bz2]
-md5=870e79fceb3d8c2d9fa139df097ec66d
-sha256=147613e4c794b45d4c75d78d7aba7b688ad6c90ff6778475c836412ee7f4cbed
-
-[http://www.freesmartphone.org/sources/vala-0.7.7+fso5.tar.bz2]
-md5=e4c09df42b2c475dae15a791d867e26e
-sha256=16971189b3cb95648b9574eb7c4c7cc0dff9978458aff7f3f7c54ab823ada721
-
-[http://ftp.gnome.org/pub/GNOME/sources/vala/0.7/vala-0.7.7.tar.bz2]
-md5=7d11fcddb2bd30b9ecbdacfaa20f2769
-sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f
-
-[http://www.freesmartphone.org/sources/vala-0.7.8.1.tar.gz]
-md5=8c70abb3ef35523a0b8cf8685b327e11
-sha256=5c59e1fa363e876b5df7d9f5fccbac776c42bcd31bb04c4fde1d41d083538888
-
-[http://www.freesmartphone.org/sources/vala-0.7.8.2.tar.gz]
-md5=f920b9ef0e9ea52a93351d58e23e4835
-sha256=0c71ded5f709709a4309ba073908ff237966d1bae1630c593a664d70613c6218
-
-[http://download.gnome.org/sources/vala/0.7/vala-0.7.8.tar.bz2]
-md5=accd0d350c6d6de7527a0a65c40f8be2
-sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747
-
-[http://ftp.acc.umu.se/pub/GNOME/sources/vala/0.7/vala-0.7.8.tar.bz2]
-md5=accd0d350c6d6de7527a0a65c40f8be2
-sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747
-
-[http://www.freesmartphone.org/sources/vala-0.7.9.1.tar.bz2]
-md5=2063d946d99fccf9822289e8309db498
-sha256=730d369e4ac17abf9f4073cd85873372ac6d98ad86fa2e91ea9f0b414c0479c1
-
-[http://www.freesmartphone.org/sources/vala-0.7.9.2.tar.bz2]
-md5=06336c53d12a864a5092e215ec5648f3
-sha256=5f810c66d35ecea5f77ca6ed87fb3ba394c700dcbcaec5f04872a4c5340a5622
-
-[http://www.freesmartphone.org/sources/vala-0.7.9.3.tar.bz2]
-md5=22eb478f18a623a2983bd401a3de0683
-sha256=a074f50cf1ee3bb4118c2639ad600baa789f5bfe35d1e6f3377179ab02b52af8
-
-[http://www.freesmartphone.org/sources/vala-0.7.9.4.tar.bz2]
-md5=036faac08ab0898811e6bb92b5fba8de
-sha256=debefbb3ea7ae8318f6f5a064e593ecd1d93ba6c5c86c14019800f724c46690e
-
-[http://www.freesmartphone.org/sources/vala-0.7.9.5.tar.bz2]
-md5=147b5b9c37d4e2d814f582d6cf78c96a
-sha256=e1d6e89eb8689fb3422502a9020a39fff0a5e6ddb3eb47eed9ac9a00636e06b0
-
-[http://www.freesmartphone.org/sources/vala-0.7.9.6.tar.bz2]
-md5=d13ead3d2926b9e7abd7fe61c3a48181
-sha256=48332dd1a31ac8cf29536111730d6710f79c5e825ca3acd8927e662fb0f25f48
-
-[http://www.freesmartphone.org/sources/vala-0.7.9.7.tar.bz2]
-md5=b05fd8f4420152ca0080a99750863f3f
-sha256=46805e1c19707de043820a1474a8b3775ea3b698a0b539eabd7b86f0f3ad888a
-
-[http://www.freesmartphone.org/sources/vala-0.7.9.tar.bz2]
-md5=f2f8b2914361db599fd6392ec27f7042
-sha256=a71d59cfed750ff402fece5e7d4b656caf3377d5a6bfe5339894f1b13769d58d
-
-[http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2]
-md5=9407d33961186814cef0e6ecedfd6318
-sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33
-
-[http://www.valgrind.org/downloads/valgrind-3.3.0.tar.bz2]
-md5=e5fc39755a714f36b7e5014c1c6d4748
-sha256=5af08229d77fe55437a6c558aee9babcff23f28c8a9c8f1f0a7d152754e9947a
-
-[http://www.valgrind.org/downloads/valgrind-3.3.1.tar.bz2]
-md5=0539e2fa4aadb2cd4ca4bba65b1fe8b5
-sha256=95b7b4d815bd479332637c93e69ec24167cd28d4f9d9f9b718e1b091bb88aafa
-
-[http://downloads.sourceforge.net/aoetools/vblade-19.tgz]
-md5=59d45caa6454388eea60441dcf6631db
-sha256=779c8c9e80ce09e8ef1737216c8438c6e614d7001e1a6f312e4a82191e34870e
-
-[http://downloads.sourceforge.net/vde/vde-2.0.2.tar.bz2]
-md5=d97a8dbc72942c57542f50322b538a48
-sha256=05b473815f9706387a3c5eaeb4da2e492f624e0b7783432179454f9d69bb973c
-
-[http://heanet.dl.sourceforge.net/vde/vde-2.0.2.tar.bz2]
-md5=d97a8dbc72942c57542f50322b538a48
-sha256=05b473815f9706387a3c5eaeb4da2e492f624e0b7783432179454f9d69bb973c
-
-[ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.10.tar.bz2]
-md5=c74ee966baca1c47ed6b9e2be3d1639b
-sha256=165bfcd811ef92cab50d11a88a76c481e105689438929414d27edfacfb312f52
-
-[ftp://ftp.billsgames.com/unix/x/vectoroids/src/vectoroids-1.1.0.tar.gz]
-md5=c63ce56b09aa7da9a6e95d804e9ee314
-sha256=8d14dd281767e994108abd77c8e67d5a17718d0ad1e34d37e026911d14697b2e
-
-[http://openzaurus.org/mirror/vera-qpf_1.10-3.tar.gz]
-md5=13327e7086fa5ceec44550745a914f42
-sha256=1ca61d438f3e5f4b7af853b48e16d68b226d568cd12eda36b94ffbf3cb9458c1
-
-[http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-0.6701.tar.gz]
-md5=eb5464a77d342ab5eb21f2fb82670d1c
-sha256=7fb38ae6ce9ff7b4f9f46838bbb4d1fce577afddfbb3cc89e37cd8cbc81d795c
-
-[http://gpephone.linuxtogo.org/download/gpephone/videoplayer-0.1/videoplayer-0.1.tar.gz]
-md5=405c8780f80f8f117622fa45698328c7
-sha256=3cf9b04025015ad06ab3449f20778e34887f5aecdfe367a983ae8e52e394b0df
-
-[http://xorg.freedesktop.org/releases/individual/proto/videoproto-2.2.2.tar.bz2]
-md5=44292d74a9a3c94b1ecb9d77a0da83e8
-sha256=ab088478830cd30c2fe34fb7f44ffd4d177af7711c225c24676d3e9e9f24780c
-
-[http://xorg.freedesktop.org/releases/individual/proto/videoproto-2.3.0.tar.bz2]
-md5=fb762146a18207a1e8bc9f299dfc7ac0
-sha256=4f2bc94e5a1b60d6f35a9a2589ca98949e8841997f6a9acf4e85f46c1f34045f
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/videoproto-X11R7.0-2.2.2.tar.bz2]
-md5=de9e16a8a464531a54a36211d2f983bd
-sha256=074b4576113e89213940e3ea3901dd035ab317255cd78c929aa52d89227f1f37
-
-[http://xorg.freedesktop.org/releases/individual/app/viewres-1.0.1.tar.bz2]
-md5=cdbed540daf7975b56000420c9aa5bf9
-sha256=bf49cd45ffb197a6992b3b7c99c94161eaf7cf6a2b661d3905ac382bedce34b8
-
-[http://xorg.freedesktop.org/releases/individual/app/viewres-1.0.2.tar.bz2]
-md5=f35c4ad7e1aa1ee2b25373dcdc34345b
-sha256=85c7207f89bfb13cc9f3c3c9d9a785094e7576e5e3e7ef0450544c4cd6bbbf3b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/viewres-X11R7.0-1.0.1.tar.bz2]
-md5=004bf8dd4646aca86faf5aa22b0c3f2f
-sha256=0ee43fd2dd9c8b60fad0e3d89bb04dcb8d7e398b33bbcc603a8e0900c3144a28
-
-[http://downloads.sourceforge.net/viking/viking-0.9.6.tar.gz]
-md5=14c7de0702a5bd5e45924bd166ae5ee2
-sha256=9370d4e6a7166c03c8838edc9defd5c9c637b0a2a2f765e2a0d7ec4ed9079fb8
-
-[http://heanet.dl.sourceforge.net/viking/viking-0.9.6.tar.gz]
-md5=14c7de0702a5bd5e45924bd166ae5ee2
-sha256=9370d4e6a7166c03c8838edc9defd5c9c637b0a2a2f765e2a0d7ec4ed9079fb8
-
-[ftp://ftp.vim.org/pub/vim/unix/vim-6.2.tar.bz2]
-md5=c49d360bbd069d00e2a57804f2a123d9
-sha256=0619ddfa76f3856461f8d61b070a9da792ed587629f2b5718212ddb0c184fa70
-
-[ftp://ftp.vim.org/pub/vim/unix/vim-6.4.tar.bz2]
-md5=774c14d93ce58674b3b2c880edd12d77
-sha256=5141ff8c7ed8ddc769fcf3b2bda386c6255d72163ae6727d8a6031d749be9f95
-
-[ftp://ftp.vim.org/pub/vim/unix/vim-7.0.tar.bz2]
-md5=4ca69757678272f718b1041c810d82d8
-sha256=494e27bd169d333917c0febcace466f89d119f71961e8959022fc6eab89764fc
-
-[http://ftp.gnome.org/pub/GNOME/sources/vino/2.16/vino-2.16.0.tar.bz2]
-md5=89937e6d6cd8f658d037da0a7cfd3f4e
-sha256=bcf62f1121fe704a019363467f9182e29931ee6779f3b65e996171f4caa11369
-
-[http://ftp.gnome.org/pub/GNOME/sources/vino/2.22/vino-2.22.2.tar.bz2]
-md5=be507a80ec2c3cd5888060b81ff74f4e
-sha256=f01b24635120e9f5fc5332cbdff49e26603d1c7089d70057209f41cd634751e7
-
-[http://www.mneuroth.de/privat/zaurus/visiscript_src_0.3.2.tar.gz]
-md5=c43beaef5817fe525099341620e3584b
-sha256=3ec61d179aa29811f1383bd99c529342aecea1b3b4cffaa8670aecd7486d0c94
-
-[http://www.mneuroth.de/privat/zaurus/visiscript_src_0.4.3.tar.gz]
-md5=f625eb9cffa82e35c3c477c58aa98795
-sha256=39f2dfd8aaf41b51aadaa06c862b75d82c8f0ffd268d03d37e5895c038366271
-
-[http://scry.wanfear.com/~greear/vlan/vlan.1.8.tar.gz]
-md5=1edd81324b4ffc0702c9ff289a342d91
-sha256=5a254457f718df733a03e9e5c39caaba9c0aac864ea69cb5d8907ec6df28e57f
-
-[http://www.candelatech.com/~greear/vlan/vlan.1.9.tar.gz]
-md5=5f0c6060b33956fb16e11a15467dd394
-sha256=3b8f0a1bf0d3642764e5f646e1f3bbc8b1eeec474a77392d9aeb4868842b4cca
-
-[http://download.videolan.org/pub/videolan/vlc/0.7.2/vlc-0.7.2.tar.gz]
-md5=25dfcc804cb92f46c0b64ce1466515cc
-sha256=1551c792384ae027995f498546d26c1fdd42a896a9cc2d94a8209d06af4b5874
-
-[http://download.videolan.org/pub/videolan/vlc/0.8.1/vlc-0.8.1.tar.gz]
-md5=3fb3ac4ed456f092d51a00d50159790f
-sha256=9f84c8e8a2f7f5969bc771741b1db64aa44c1b919e8ddbeba37875ca089b66d9
-
-[http://download.videolan.org/pub/videolan/vlc/0.8.4/vlc-0.8.4.tar.gz]
-md5=9cd5ca752f7236167715ca1916da92ad
-sha256=d4e586a7475a0a2390ef9a7225e5146aa65ab70ec408cf9568c79c5aee0ca647
-
-[http://download.videolan.org/pub/videolan/vlc/0.8.6h/vlc-0.8.6h.tar.bz2]
-md5=4a6eece2f56d4ad5dfa786e934d2b4a8
-sha256=50ed87c869228274043b7fa468f908fe6ee571196510177593c701d99b357221
-
-[http://videolan.mirror.technotop.nl/vlc/0.9.2/vlc-0.9.2.tar.bz2]
-md5=f7d843d0725abb57196c4012eeb0e636
-sha256=b839353694fa5d47b8874573525a6612ce22654774c7cd2d9d4a16f7044b7854
-
-[http://videolan.mirror.technotop.nl/vlc/0.9.4/vlc-0.9.4.tar.bz2]
-md5=786628aaf8f30a9b812975b67c88b971
-sha256=6e6ce0fc497d380b3ed1b8c77c4ce5d089a90070ef38626b9af71a13e52b4faf
-
-[http://download.videolan.org/pub/videolan/vlc/0.9.6/vlc-0.9.6.tar.bz2]
-md5=cd71276ed867029a6d077a40bccd4d05
-sha256=ac091ba9b2e2e9aff293969b3405b145c09789e59ac0caab2247211a19e09a8a
-
-[http://download.videolan.org/pub/videolan/vlc/0.9.8a/vlc-0.9.8a.tar.bz2]
-md5=8ffa2ff763badd5de7592004d8d69a63
-sha256=197c29803790efc0273bb4577d54629d0769a3b49b091c6430eb6704fd69824f
-
-[http://download.videolan.org/pub/videolan/vlc/1.0.2/vlc-1.0.2.tar.bz2]
-md5=69d4e30fe4fc2691780fbeacd40359d2
-sha256=38b176fd495f3254db74e03977235a0a2212fc6533d7cd1a4c3dddc495b074f0
-
-[http://www.lavrsen.dk/foswiki/pub/Motion/VideoFourLinuxLoopbackDevice/vloopback-1.2.tar.gz]
-md5=1b63bf5b3d2b7fae63497d285789aec5
-sha256=d5af0c07aa53a6c93e92a6dd83f34dd9a08a05a0c0169c8ca8b15b023fdadf80
-
-[http://194.213.43.198/vmedit/vmedit-0.02.tar.gz]
-md5=7550ea1dd951d2f7fb1a54caa88860b2
-sha256=bca8b0073d9527c0293b831c9b8d8f89fc3dc7b5ab30898e7b748843af07a978
-
-[http://www.realvnc.com/dist/vnc-3.3.7-unixsrc.tar.gz]
-md5=511ffbc8ed8d9df82e7c67852164728c
-sha256=ee1faf72ef745a7d96e44cb4797d92a8cd2c9e290dfe602fae0fd955a11d4f3a
-
-[http://vobject.skyhouseconsulting.com/vobject-0.8.1c.tar.gz]
-md5=c9686dd74d39fdae140890d9c694c076
-sha256=594113117f2017ed837c8f3ce727616f9053baa5a5463a7420c8249b8fc556f5
-
-[http://gpephone.linuxtogo.org/download/gpephone/voicecall-0.1/voicecall-0.1.tar.gz]
-md5=7fa731310c2f5e334ca4eba9c5482965
-sha256=f6ddc993d4890b9500a63345f76acd3eb4a04a9190fcd055f323319627bf104e
-
-[http://www.wirelessdefence.org/Contents/Files/void11-0.2.0.tar.bz2]
-md5=1c5b3e3e70916de74c2932c7f3e46d9e
-sha256=08d588ce0731d0c0e55a1cac35acf019e1b735d0f75f16962adfeb4fefd69441
-
-[http://www.vorbis.com/files/1.0.1/unix/vorbis-tools-1.0.1.tar.gz]
-md5=80d3ae3bbae2a488d433d86b8fd64777
-sha256=4f1f6ba6410e5f2aeb473d0a09caaa528cc926866735ab66e05cdff9c5093a37
-
-[http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.3.2.tar.gz]
-md5=aaccdffc5656095a45dfe87c5bf612cb
-sha256=55702637d377d73e6f323462779aeb02f5049d71c7ea4e3bbe564566d9a8d488
-
-[http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.3.3.tar.gz]
-md5=e7518cff21326fe7eb9795b60c25ae6a
-sha256=be4a8e87b044cb99349e71e6879446739dd537dbde13e99ec61817ed67605bd7
-
-[http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.5.1.tar.gz]
-md5=7a8e94dbe94f39a4fd89b72e0125f66f
-sha256=f63660bd020bbe6a39e8eb67ad60c54d719046c6198a6834371d098947f9a2ed
-
-[http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.5.3.tar.gz]
-md5=4378f9551d5b077e1770bbe09995afb3
-sha256=46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884
-
-[ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.5.tar.gz]
-md5=146062e8b2f93af43ff6c2c770feea94
-sha256=5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b
-
-[http://ftp.gnome.org/pub/GNOME/sources/vte/0.11/vte-0.11.15.tar.bz2]
-md5=a9dc7b330d52ce384e3e5715d396c72f
-sha256=c31e1e930bce109cccd40dc0378b7ee28933482855918f46573e79d9db818be7
-
-[http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.13.tar.bz2]
-md5=40480f20f6b7664f3d364e4f2ed27889
-sha256=edfb74b0bef469ee122ab67c3e4562043e97803c8a32899caf5bd3a71c464a6d
-
-[http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.14.tar.bz2]
-md5=9df3e35b81b209952ac1cf7904f7b620
-sha256=40cf321980d3139c8f084e818504e1366be81bed817eeeec9021257e04c1c0db
-
-[http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.8.tar.bz2]
-md5=65344de3023c41c8dda2b35a415bf969
-sha256=1dc06ad4224c18061b000de0435b81b7c249215da4163edecb62a8d46090098f
-
-[http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.9.tar.bz2]
-md5=a42c893a01e3d9818789be373e529422
-sha256=0e61bbccbc6689d8d9ea4842795498d3ff85079b870eda899cbbd7beb80866ec
-
-[http://ftp.gnome.org/pub/GNOME/sources/vte/0.20/vte-0.20.0.tar.bz2]
-md5=12dde859bc98e039336baff6e9e6b15b
-sha256=6612c72fe73279a23e296a70e19b3f5dd270c6d16cf0cc6a191475c1a16846f7
-
-[http://ftp.gnome.org/pub/GNOME/sources/vte/0.21/vte-0.21.5.tar.bz2]
-md5=9b4d97dfc40e4f77b7ecf2e9e89da368
-sha256=0044b7226e06752f8eefe61dce5cd84e7915bf1756b200c198eff8b7c379e2f6
-
-[http://downloads.sourceforge.net/vtun/vtun-2.6.tar.gz]
-md5=309534fd03c5d13a19c43916f61f4bbf
-sha256=fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
-
-[http://heanet.dl.sourceforge.net/vtun/vtun-2.6.tar.gz]
-md5=309534fd03c5d13a19c43916f61f4bbf
-sha256=fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
-
-[http://gpe.linuxtogo.org/download/source/vtype-utils-0.6.tar.gz]
-md5=1bcb6f204f491d3813861dd8760cec61
-sha256=51fa4fa2e2a8ecdce773d42d7ecb4bdf33b89a332418059c275b8a9d3fd3e8f9
-
-[http://download.openvz.org/utils/vzctl/3.0.23/src/vzctl-3.0.23.tar.bz2]
-md5=f44c5721c862546903d6884d79959b70
-sha256=3ca7da609ee07b0a8d6b21f05c76b35ba8febc6b5c251b67c759bcbb3bf76eea
-
-[http://www.rpsys.net/openzaurus/patches/archive/w100_extaccel-r0.patch]
-md5=ccfb6eff7d9fea9bf7aa4a60e93fe818
-sha256=19852444040a1be4474c3c9378ac40ef50d66ef1d3b8059d3a0db89c0235b843
-
-[http://www.rpsys.net/openzaurus/patches/archive/w100_extaccel-r1.patch]
-md5=1f046a5bfb11b320a84da6af9df976d0
-sha256=1be8f5179f37a56094ae712f9561b86bb4cd40cb5c55d7dbc680f34b77d0b1cf
-
-[http://www.rpsys.net/openzaurus/patches/archive/w100_extaccel-r2.patch]
-md5=2c958056e0a82da4d85810ea51b9e07b
-sha256=c8e0cf191fb60b26eb5481c24d162c3675c72bc940c42393af2f0b62897de90f
-
-[http://www.rpsys.net/openzaurus/patches/archive/w100_extmem-r0.patch]
-md5=a32cf8e91474d9ccfecb2a225ed326f7
-sha256=d6863b3ad5ecb465d217714ad474f2a9fb6e7890b4565184e8d5962d46850a31
-
-[http://www.rpsys.net/openzaurus/patches/archive/w100_extmem-r1.patch]
-md5=a17be90788c4ccd6ee8253659b9321f8
-sha256=56dfd5365848095793faa31ee1cf753c10891dd076944d3533b05c6547965134
-
-[http://downloads.sourceforge.net/mingw/w32api-3.11-src.tar.gz]
-md5=bc37e4e6973f603c317a40602f7f35d9
-sha256=852fee2c0aa5cd9ff529c1ba1d28668796c7c3dc959376f6a207a0b178ac5225
-
-[http://downloads.sourceforge.net/mingw/w32api-3.13-mingw32-src.tar.gz]
-md5=8eae788a09a589414b83adc91bb0c069
-sha256=02cec615f8cfc94786ea9c1f41645cf43cc2414ca36b92fdd041304723bf2fc4
-
-[http://mpx.freeshell.net/w3cam-0.7.2.tar.gz]
-md5=eec0b301b32bc8e9f65a4e54248c9868
-sha256=96d659d916fafe555311068c9bf8662b93f10d099b12b17ed04d8a8fffbc72e0
-
-[http://wirbel.htpc-forum.de/w_scan/w_scan-20080720.tar.bz2]
-md5=29d20fec3febf96de43bc27db4b47cfd
-sha256=7107d31e05168febe4cd11bc7fb91ea8f6283b225c7c48a0e9579458d3b5de33
-
-[http://wirbel.htpc-forum.de/w_scan/w_scan-20091230.tar.bz2]
-md5=97cd83d5c174e386d01a364b2d280f2a
-sha256=1a5864559b6a0acb76b9fa66b4e1351acd7d06c4e4a9a2ba323e7eafa4d4788b
-
-[http://www.ibiblio.org/pub/Linux/system/network/misc/wakelan-1.1.tar.gz]
-md5=4a3a31d874967cd6ac761b7d4323e0d5
-sha256=3df5eb8f877648799ab623cf1718ecc6f86eb0c2f51d344d8e860442dcc5cd6f
-
-[http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/watchdog-5.2.6.tar.gz]
-md5=5a1a4476087973852e30f8cdb5b0ff92
-sha256=c762525fdbf5f5dd32c6c950f2a63d8c1b15ec3dc7afca5d2dc3dbd1b129a00d
-
-[http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/watchdog-5.4.tar.gz]
-md5=66480128b9dabcced2e4c8db3e60fa50
-sha256=6c5bfb2edae5c289233b6cd65393bb7414a2d30ad4d1239c207a659a4232d91a
-
-[http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/watchdog-5.6.tar.gz]
-md5=6df285569dd1d85528b983c98c9b2b7c
-sha256=a2c7d6726e092315dbb047211b754528e4532521678a30e16f60a31bb86a7f74
-
-[http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/watchdog_5.3.1.tar.gz]
-md5=ba97ddce396bfccd8d409bc3141d7ef4
-sha256=b7bf9feeedea26d7e06935369a1a556089426e94f9ead946018526c96cd9b12e
-
-[http://downloads.sourceforge.net/wbxmllib/wbxml2-0.9.0-src.tar.gz]
-md5=3f9b5bf104ec523b8eebe69f93919ded
-sha256=acd218148d7f92ee7bd0539d6aabd0b42cca8ae4ffe241bfa8760d30605b28c9
-
-[http://heanet.dl.sourceforge.net/wbxmllib/wbxml2-0.9.0-src.tar.gz]
-md5=3f9b5bf104ec523b8eebe69f93919ded
-sha256=acd218148d7f92ee7bd0539d6aabd0b42cca8ae4ffe241bfa8760d30605b28c9
-
-[http://downloads.sourceforge.net/wbxmllib/wbxml2-0.9.2.tar.gz]
-md5=67a48fd9b69db8818a4dca5375c7993a
-sha256=cb4909d8753dff7f6ac90a62a61ed1ae68e49ead2dbc60c22673c55bb0e14a36
-
-[http://downloads.sourceforge.net/meta-tools/weather-0.7.0.tar.gz]
-md5=ce547183f7b455d837d654a484b29a83
-sha256=fabdec4b04d50b50558b6062d35884c60b419e65b3738b08be07d729b6f3d46a
-
-[http://heanet.dl.sourceforge.net/meta-tools/weather-0.7.0.tar.gz]
-md5=ce547183f7b455d837d654a484b29a83
-sha256=fabdec4b04d50b50558b6062d35884c60b419e65b3738b08be07d729b6f3d46a
-
-[http://webpy.org/static/web.py-0.21.tar.gz]
-md5=9877a65a31bd97f649562ceab123995d
-sha256=1900e88c268fe48b8f79589683068e1160792bcac2bd3867a262a02081755ccb
-
-[http://webpy.org/static/web.py-0.31.tar.gz]
-md5=439b0700f9f5d422e5db6f28c0f86b11
-sha256=01f30f86c9ea41e7fcc9bc4cabb17283de7dbf19c301254161a89dd0a73cb9f3
-
-[http://downloads.sourceforge.net/webcamserver/webcam_server-0.50.tar.gz]
-md5=96830836f64edbb12c248eb84e6b0d18
-sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305
-
-[http://heanet.dl.sourceforge.net/webcamserver/webcam_server-0.50.tar.gz]
-md5=96830836f64edbb12c248eb84e6b0d18
-sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305
-
-[http://downloads.sourceforge.net/wesnoth/wesnoth-1.4.6.tar.bz2]
-md5=9e92234b29f062b3779750ba3cd0a71b
-sha256=87caf592bd81922908e7ee6ff356c7d46cf5a2cbe46847df7d64aff537ca16b6
-
-[ftp://ftp.gnu.org/gnu/wget/wget-1.11.4.tar.gz]
-md5=69e8a7296c0e12c53bd9ffd786462e87
-sha256=7315963b6eefb7530b4a4f63a5d5ccdab30078784cf41ccb5297873f9adea2f3
-
-[ftp://ftp.gnu.org/gnu/wget/wget-1.9.1.tar.gz]
-md5=e6051f1e1487ec0ebfdbda72bedc70ad
-sha256=69044b87c517b986dbc17a5f7e4de430cb56e605330c19c6bb0d384d5c37e638
-
-[ftp://ftp.debian.org/debian/pool/main/w/whois/whois_4.5.25.tar.gz]
-md5=516fc54ce709e874133fc3b3c7c05447
-sha256=99979ff161ee209da21ae118eff9ca6de7c5cb1b0dc3397de18df534e0afaf76
-
-[http://wifi-radar.systemimager.org/pub/wifi-radar-1.9.6.tar.bz2]
-md5=4ab4cc22d68dd0655ab28b75c7aa6248
-sha256=bb94acb9da36e7148dc5090f07f43c816569b0b5d671135fd661b2376f19d719
-
-[http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/wiggle-0.6.tar.gz]
-md5=1884607cdebaf730737cb99b2909219b
-sha256=639f8bd48c58b1fa4f24a65bc8aa3e53219e7d48726e63e7c40f0701d1d89b9c
-
-[http://handhelds.org/~zecke/oe_packages/win4_V1.0.1.tar.gz]
-md5=0817e2606cd87fe2cbead6b7104f7425
-sha256=00b2384e225d6a1cbda4994c63103ac229269bb2946537e9357655e5c5b84333
-
-[http://xorg.freedesktop.org/releases/individual/proto/windowswmproto-1.0.3.tar.bz2]
-md5=ed5416cf7e2ba6e66641c88f12768c0c
-sha256=780d249696bb2de7acabded90a465a62cd6cbda3b7f0ccff6ebfdf0d8180f151
-
-[http://xorg.freedesktop.org/releases/individual/proto/windowswmproto-1.0.4.tar.bz2]
-md5=e74b2ff3172a6117f2a62b655ef99064
-sha256=c05bb0edb627554fe97aa1516aed44accf6566b1db0e50332689a24afcebd26b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/windowswmproto-X11R7.0-1.0.3.tar.bz2]
-md5=ea2f71075f68371fec22eb98a6af8074
-sha256=e575dc15f7ac3bd4dd4241be617bd88806506cf6ff1fc9332a42ae2275a5118c
-
-[http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.26.tar.gz]
-md5=a037f5c19ab8f3a89acb09e8cfd22d5b
-sha256=8942ca7cb87c2771b1e2d3cc91f895ed5e5f95dedf40762c6f5e9d6395382f6d
-
-[http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.27.tar.gz]
-md5=29891b66f23565e7e381d28404abb29a
-sha256=f3d6639079d4662458cd60d691644abbacb0ede7ec401fa861a10995c1db6ba5
-
-[http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.pre13.tar.gz]
-md5=eb2c01c2945df2682a9b3c75515fd389
-sha256=b993c360748161d03b9e5fddb9ac21f7a6727f11a792ede5595b4051579be6a6
-
-[http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre10.tar.gz]
-md5=d04cddba74f3d93a13a298dc1b905cc4
-sha256=1f767da365a8cdc62569b366ded609873f56ed033b0b9e66c18f63ccb604f11b
-
-[http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre21.tar.gz]
-md5=953774d6a34050bae4ef3bfa731f6653
-sha256=90714813bcf0552cd9afe3d270de168ec41b91ed3105766c8cedf32d4724f3a9
-
-[http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz]
-md5=e06c222e186f7cc013fd272d023710cb
-sha256=6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1
-
-[http://downloads.sourceforge.net/wireshark/wireshark-0.99.4.tar.bz2]
-md5=05fada181e12bfa94b52f0b10395b28c
-sha256=a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e
-
-[http://heanet.dl.sourceforge.net/wireshark/wireshark-0.99.4.tar.bz2]
-md5=05fada181e12bfa94b52f0b10395b28c
-sha256=a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e
-
-[http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-08-30-2158.zip]
-md5=b69ee5a5ffc825ff6d7970a62dcae46a
-sha256=6641a438972acdc8113957c25a17db55d6d9c3ce037ed3ac5337ac6ee153d73f
-
-[http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-08-rev2.zip]
-md5=2283368c079076b3e2d53cff854ca047
-sha256=505a77bda0011a1968a5a5c764cdbe81c536b1c8863f4dd31545735f5056497e
-
-[http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-08.zip]
-md5=850aabefe44682167cad5e57b6145ac3
-sha256=0e8cb79d14e2e3c82f311c052ea2e22cc380f9a97af1d259d25e2605e3237885
-
-[ftp://ftp.elmeg.de/artem/ClientCards/11b/linux/wl_lkm_718_release.tar.gz]
-md5=049c6c3d410e9f46884627b57485d3e7
-sha256=a28c7ea94d57a5354b7de06cf5f6416d80a40596911c129d4b6a4087dc916831
-
-[http://www.agere.com/mobility/docs/wl_lkm_718_release.tar.gz]
-md5=049c6c3d410e9f46884627b57485d3e7
-sha256=a28c7ea94d57a5354b7de06cf5f6416d80a40596911c129d4b6a4087dc916831
-
-[http://www.do13.de/openzaurus/patches/wm97xx-dig-restore-r0.patch]
-md5=005d3b485d4025a8c5d64a8a2b441851
-sha256=5eac44e4ab19eff4c4f51235b50c34234f4f7f9bcc1dba2ec91732a0402fb106
-
-[http://www.do13.de/openzaurus/patches/wm97xx-lg7-r0.patch]
-md5=dd29aa3743b57630396c20b8c15cfabb
-sha256=c9f3d07eb6ff0f84b4ce38aa6ab418caf33713b1a08e4456e4fc469ccc7f0bba
-
-[http://www.do13.de/openzaurus/patches/wm97xx-miscdevs-resume-r0.patch]
-md5=0d001626b57e1bd1fcff4757423e283c
-sha256=e9152e09ff174fc4c4cd5ce00e52a15005c738c2a4c0de87f5ff24ca325f9b85
-
-[http://sweb.cz/tripie/utils/wmctrl/dist/wmctrl-1.07.tar.gz]
-md5=1fe3c7a2caa6071e071ba34f587e1555
-sha256=d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9
-
-[http://trac.hackable1.org/trac/raw-attachment/wiki/WooshBrowser/woosh-0.1.tar.gz]
-md5=3a9639e077c3d8f85bb59333ef14015b
-sha256=1e8d7eb70f349bfee9eb3f3cb2464c19a4229d0f7faa0a6962a3cd15a460b99f
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.2.6.tar.gz]
-md5=7f83c74bf5e6db7dc564c391a44a9fe7
-sha256=f32c5e7607312d3650684977e6d1888a4a53cdb4ba16746225fab66cf345d55a
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.3.6.tar.gz]
-md5=e7691bc302beebe9ab3b290d0349925c
-sha256=ecc820bfa5f9495fed342e95a806ad723cdeae7175460b20b4227390f931334b
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.3.8.tar.gz]
-md5=c9ced104f0322f834a84336c293b4b57
-sha256=f24a344e19a513d5725b1cdce9b0393676a80a7dc083e053a04fb3b703cf7115
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.4.7.tar.gz]
-md5=1345730f15d5f93f2f083096ddc903eb
-sha256=002a5d52c1c8f516efe6a834227d3fe63ecf2588966e44fbde1e72a5844c334f
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.4.8.tar.gz]
-md5=765d6c70d75e88cd4dc010fa6b52c45f
-sha256=6d03f514211c9b806fb649e8dc5d0b047aa55b4762ddc7b675cf0bd7de230cf8
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.4.9.tar.gz]
-md5=98498c152cbfc388c306fd9bbf7d57d4
-sha256=bc7b0dc81248394d2456ea25059bdf1df2173fa8d178cda7d4570671ab916857
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.5.10.tar.gz]
-md5=9e7b99da67c47d81121368c6d580d069
-sha256=c5c5ae89b4d3a247d4f5dcfa37e86df248d7e483d42636ef1f82c0bc48597dde
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.5.5.tar.gz]
-md5=482dd85949c82aa15309e5ab3d2cf5c3
-sha256=d571021d74fe7433716fc968b568e458451f40cfb333b5a682cd4d8ee2373543
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.5.7.tar.gz]
-md5=bd2436392ad3c6d2513da701a12f2d27
-sha256=cf688be96ba5f3227876b3412150e84a3cee60ddd0207b6d940d1fbbaf136b57
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.5.8.tar.gz]
-md5=7bb22f2bcdeed54b3fb5407d6d8bc9bb
-sha256=2f9755e2e3f96d26380857ef95be7765e6e276f6b53194c70633c027485d67f0
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.6.0.tar.gz]
-md5=635c7af7cecb39954997146b5c734b1c
-sha256=24ce7873cbf2b23c00f931dd7f20326bea5463dd2a50a865b3d9bffd3f5780b7
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.6.3.tar.gz]
-md5=b51b2975f21006f85f7297f3fb1acde1
-sha256=f70b18243e049bbda66254388b6e94d404e747d913b8496d6e93a9c56bbf4af2
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.6.4.tar.gz]
-md5=eb06a9a05d3916addf9451297a558aa2
-sha256=0c10e59dd079c4e5d9ec6eebe9a8ac0e1b9e472cccef49c705f87a78391e79fa
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.6.7.tar.gz]
-md5=b61f6e94b63f92173f4286b5e6a84140
-sha256=7c698fe145785b63e584da02b21a7e9a32b0929e35fc0bc67ad99af6d5217f64
-
-[http://hostap.epitest.fi/releases/wpa_supplicant-0.6.9.tar.gz]
-md5=0efb8fcedf0a8acf6f423dfdb0658fdd
-sha256=6e5284fa3f7c56e001fae92486eaa31340db5dd925dcb38bd572d2e8ed70f570
-
-[http://downloads.sourceforge.net/wqy/wqy-zenhei-0.6.26-0.tar.gz]
-md5=bf2c1cb512606d995873bada27c777da
-sha256=47355b6ec84bb309614b6d657ddfda993b96ed0be569264f82e523b254f945b2
-
-[http://heanet.dl.sourceforge.net/wqy/wqy-zenhei-0.6.26-0.tar.gz]
-md5=bf2c1cb512606d995873bada27c777da
-sha256=47355b6ec84bb309614b6d657ddfda993b96ed0be569264f82e523b254f945b2
-
-[http://apache.org/dist/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz]
-md5=084ebfe4a816058f8ff6bd731fa70df4
-sha256=0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc
-
-[http://woodstox.codehaus.org/2.0.6/wstx-src.tar.gz]
-md5=3fc8e914d13316aa254b883a99fd2b85
-sha256=e7ab2018865334a1b9b04161235192c2fdc7387baa422b576722db2011f75157
-
-[http://downloads.sourceforge.net/witty/wt-2.2.0.tar.gz]
-md5=c990186db06cf188cb267d12bc21e2da
-sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345
-
-[http://heanet.dl.sourceforge.net/witty/wt-2.2.0.tar.gz]
-md5=c990186db06cf188cb267d12bc21e2da
-sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345
-
-[http://downloads.sourceforge.net/witty/wt-2.2.3.tar.gz]
-md5=2f4c34f1e092451d3c4d2e7f8c250015
-sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3
-
-[http://downloads.sourceforge.net/witty/wt-2.99.0.tar.gz]
-md5=3d35c181dfab7dfd3fe898738dffb421
-sha256=64e6bd25d18e838e1c60693eccbd11926c65b228d6ac69c4dafc7ebe7341dbbf
-
-[http://www.alumnit.ca/download/wvdial-1.56.tar.gz]
-md5=45097f269c7847266e121e4a0f362be9
-sha256=e4d35719c10c372bfca8247d127c941958557aabca61c25a04f213e22cc40728
-
-[http://www.alumnit.ca/download/wvdial-1.60.tar.gz]
-md5=27fbbde89f8fd9f6e735a8efa5217fc9
-sha256=0c65ea807950fab32e659d1869a7167ff978502bd5d0159dbe9de90eb6c2e16b
-
-[http://downloads.sourceforge.net/wview/wview-3.1.3.tar.gz]
-md5=07f76102b9798f7a01cb35663589896f
-sha256=9dcbe3c0006ea63012c5a57720128170bef39b72d8e98e79ccbee202a3e7323f
-
-[http://heanet.dl.sourceforge.net/wview/wview-3.1.3.tar.gz]
-md5=07f76102b9798f7a01cb35663589896f
-sha256=9dcbe3c0006ea63012c5a57720128170bef39b72d8e98e79ccbee202a3e7323f
-
-[http://wvstreams.googlecode.com/files/wvstreams-4.4.1.tar.gz]
-md5=907b0cba8931553d848620ea16f006b9
-sha256=cff48f9a87e94672c7a819661a3a5c893ee44e763c6e5775d00aff3de43619b1
-
-[http://wvstreams.googlecode.com/files/wvstreams-4.5.1.tar.gz]
-md5=d092f6a80d38d361cb7a6d54d7699678
-sha256=465e5d5a9dee6284574fa065dcde5cc17a2907f153239ad4a4917e82abb8de6b
-
-[http://wvstreams.googlecode.com/files/wvstreams-4.6.tar.gz]
-md5=4ee8ccfe6dfc29bf952d58fa23626c97
-sha256=171df8e545b53edb3efbd65b9bc2b35549d05249bd0c92776701f9d8da77ed6f
-
-[http://ftp.de.debian.org/debian/pool/main/w/wvstreams/wvstreams_4.2.2-2.2.diff.gz]
-md5=58e1df79ce031b256417ba5992cce833
-sha256=f203a843f11d53ed075a03c07a85e2b5d43dec4cff4da791a96265dfdbee1030
-
-[http://ftp.de.debian.org/debian/pool/main/w/wvstreams/wvstreams_4.2.2.orig.tar.gz]
-md5=103230cb9926cb8f3f4d8dc8584f3b9c
-sha256=8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14
-
-[http://www.gedanken.demon.co.uk/download-wwwoffle/wwwoffle-2.9c.tgz]
-md5=50208b5c8d5c125accd18f9760225f9e
-sha256=6b134ac08daf1186c1cdd34fea4ad8c4f1ad2f52307db98786e262dc4243256c
-
-[http://www.gedanken.demon.co.uk/download-wwwoffle/wwwoffle-2.9f.tgz]
-md5=a5f04c190a2f27f28cfc744c478e6aaa
-sha256=14728356373c57dbafeaa8458455f1a299aee7ab395cb0de0312be5d693f7b5a
-
-[http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2]
-md5=cac58d215b73189e8574d1c361e771a6
-sha256=1e09f6ad9dd987403f9549c2640680cf932ba00df5afa20a4531e98544b413a5
-
-[http://downloads.sourceforge.net/wxwindows/wxBase-2.6.2.tar.bz2]
-md5=029ff5aac16ff5c42c89b9a7c7ac4029
-sha256=7c03f8e02b023c8843bc959bf32d972cdca27d5f6601c6c2ce1c1174208966d4
-
-[http://downloads.sourceforge.net/wxwindows/wxBase-2.6.4.tar.bz2]
-md5=6e55324d2a522d23fd8834ad8656e0b6
-sha256=1679c29f94983f3fb855f79dcffa2335eb638c6e159444185506e0ff50e6672a
-
-[http://heanet.dl.sourceforge.net/wxwindows/wxBase-2.6.4.tar.bz2]
-md5=6e55324d2a522d23fd8834ad8656e0b6
-sha256=1679c29f94983f3fb855f79dcffa2335eb638c6e159444185506e0ff50e6672a
-
-[http://downloads.sourceforge.net/wxwindows/wxBase-2.8.9.tar.bz2]
-md5=2f78233829bb8979ca31f86b6de87ee9
-sha256=5bad521a93021ee7af10127b8c9b4235c16274ad06943585022bfc23a6f4b005
-
-[http://heanet.dl.sourceforge.net/wxwindows/wxBase-2.8.9.tar.bz2]
-md5=2f78233829bb8979ca31f86b6de87ee9
-sha256=5bad521a93021ee7af10127b8c9b4235c16274ad06943585022bfc23a6f4b005
-
-[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.6.3.tar.gz]
-md5=7af577ac8a6d78d6a0fef1b09cf1093e
-sha256=f4f42e8b649285fb0d8cf8109e420f6a0d16b2315985d017935279ceb26eb035
-
-[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.6.4.tar.gz]
-md5=43cbe5c7508f7dc3e141c346a897fbe7
-sha256=b31c3bc4e85e7f972db1dfb7b447d213694569e2a5794a84116295c334a11f43
-
-[http://heanet.dl.sourceforge.net/wxwindows/wxWidgets-2.6.4.tar.gz]
-md5=43cbe5c7508f7dc3e141c346a897fbe7
-sha256=b31c3bc4e85e7f972db1dfb7b447d213694569e2a5794a84116295c334a11f43
-
-[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.10.tar.bz2]
-md5=0461c2085ac1ad7e648aa84c4ba51dd1
-sha256=b84617a2fd219153a6df95dc7f4aa1ba9c07af5859a3d00fc23f9aaed2a1e3d5
-
-[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.10.tar.gz]
-md5=05b32ca051651f4b1885a90f62969faf
-sha256=4a65573bc12e15b21a4acdce89e7e6b71edbe214817457f90fcf855220bafe66
-
-[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.9.tar.gz]
-md5=3ad40ea2b1728eefa94f60beb9951ff7
-sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7
-
-[http://heanet.dl.sourceforge.net/wxwindows/wxWidgets-2.8.9.tar.gz]
-md5=3ad40ea2b1728eefa94f60beb9951ff7
-sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7
-
-[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.9.0.tar.bz2]
-md5=09058928eeb72853142c062bdec056ce
-sha256=8cf5c1dcf6357b2d27efd0c737b95baf1d2d1e88b5bf24560824b5eb6f2dc782
-
-[http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2]
-md5=fd06c8b8e3572a0e14af65a49e0dd7d1
-sha256=c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064
-
-[http://xorg.freedesktop.org/releases/individual/app/x11perf-1.5.1.tar.bz2]
-md5=66e4aa4645f83809071eb69553ed0222
-sha256=ab4c6a579f93fa9485ef5be8760a3da0d22acfa743f2114057c5262b77ff7056
-
-[http://xorg.freedesktop.org/releases/individual/app/x11perf-1.5.tar.bz2]
-md5=31283bfc3c78718ac1bd71e510d4e774
-sha256=4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/x11perf-X11R7.0-1.0.1.tar.bz2]
-md5=9986b20301c6a37bb144cb9733bf35a0
-sha256=de56a33aaf723aac41575662b88fca9e90aa493905998290718c02658f516d87
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/x11perf-X11R7.1-1.4.1.tar.bz2]
-md5=23e2b7b53125d75820fa66db905a6a74
-sha256=202fb66a6ae84c03f6c1164e0bd4386f94285e9d85f65e32989b10d5b65c5412
-
-[http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz]
-md5=96edffb5a9eb36aad4620f49ca58101b
-sha256=0ab0690814d9b773ba790fde1728abea985f64e129b2cf42e12435d1f09adf69
-
-[http://downloads.sourceforge.net/libvncserver/x11vnc-0.9.4.tar.gz]
-md5=0683a56108ca6d0c4329c7b9a5b7fbde
-sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65
-
-[http://heanet.dl.sourceforge.net/libvncserver/x11vnc-0.9.4.tar.gz]
-md5=0683a56108ca6d0c4329c7b9a5b7fbde
-sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65
-
-[http://downloads.sourceforge.net/libvncserver/x11vnc-0.9.7.tar.gz]
-md5=30a167577f657909b3355421e14e2ddb
-sha256=fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342
-
-[http://downloads.sourceforge.net/libvncserver/x11vnc-0.9.8.tar.gz]
-md5=13e41380fe9ba2581db180061d1cbd22
-sha256=235549a5dad84c20c6d4aba920d95e3b98999b91ca5347bdde22fa0326818342
-
-[http://downloads.sourceforge.net/libvncserver/x11vnc-0.9.9.tar.gz]
-md5=874008821a0588a73ec7fbe09b747bb0
-sha256=6b960267b1f842efe5fb76b5d36fbee79ca8ea31528ee83877623e1cca0fbbe9
-
-[http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090127-2245.tar.bz2]
-md5=25fcaa86a53333d416d5e837fb47ba7d
-sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21
-
-[http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090928-2245.tar.bz2]
-md5=99870531113dafd01026c01a96c5fcbb
-sha256=8b435c02ed0a09d039c0a89c8ddc5470e1885630a5dcedfe3d8bc60a6d63ab69
-
-[http://archive.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz]
-md5=fc805051f0fe505c7a4b1b5c8db9b9e3
-sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043
-
-[http://www.oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz]
-md5=d6f86ccc3d1a534902e1cf8df1cb43f3
-sha256=05072405fd182425d90374d2d5b69c36fe9fd927f44e397c449a9bdd1a971218
-
-[http://www.oligarchy.co.uk/xapian/1.0.13/xapian-core-1.0.13.tar.gz]
-md5=5442e7ffc75abd853d1ab1d12667a3e9
-sha256=a474be06657bd83200231d938d48d4d2a83cff0252c618421f835604c5548dce
-
-[http://www.oligarchy.co.uk/xapian/1.0.14/xapian-core-1.0.14.tar.gz]
-md5=f318fe11143af82aa6679acc51723a1a
-sha256=9db5a04e184bc06be17d007a58adbf2592e7a380dfd80ddc6aa9001084b9a134
-
-[http://www.oligarchy.co.uk/xapian/1.0.5/xapian-core-1.0.5.tar.gz]
-md5=5fbfec7f23b0f539d32b50de4a278b95
-sha256=277e30cbd4a4d9355e9b2c02489d34cbaed87754bbdeb8956e5463e9fb592658
-
-[http://www.oligarchy.co.uk/xapian/1.0.7/xapian-core-1.0.7.tar.gz]
-md5=b4acff50028120852d4a8d943065f6d2
-sha256=75f2e805399ce61c423d7945f7f0d14aac53943538345425f6a1033b9fe59631
-
-[http://xappy.googlecode.com/files/xappy-0.5.tar.gz]
-md5=cc0c6d5a8f9346ad90bd5f8183789c96
-sha256=998d148114abb4ae68ef2c340d971dfe09ec581850a1f0fd7c856f3c9b397b3e
-
-[http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.2.tar.bz2]
-md5=31b956edaeb453ddaa640420e97b25b2
-sha256=569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17
-
-[http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.3.tar.bz2]
-md5=e91e10ace1df0d5f2cbc74ead256407a
-sha256=1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c
-
-[http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.4.tar.bz2]
-md5=fa00078c414c4a57cab7a6d89a0c8734
-sha256=f91190c8b8bb18270b86b00f30da5684bb5e5bd1ed0ccf352322f8145e076a59
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xauth-X11R7.0-1.0.1.tar.bz2]
-md5=ef2359ddaaea6ffaf9072fa342d6eb09
-sha256=cbb271f6c3586210f31953933c4d06bd34272df9c596f5e26124ca3caf8529be
-
-[http://www.hoopajoo.net/static/projects/xautomation-1.00.tar.gz]
-md5=5051d633c15a0aac8c6eada281584d1d
-sha256=019578691e8ab02532e35033331e275b658b360033e9e34dfdecf4774d161e3c
-
-[http://dl.bytesex.org/releases/xawtv/xawtv-3.93.tar.gz]
-md5=8d2731e6e95f173f41a0ddc875d55804
-sha256=d5e333bc74c0a534bf96f40ea89b7e700f137d46f1fdbaea13fa552ad6227af8
-
-[http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.1.tar.bz2]
-md5=3e39eec6d0fd5c587ca6d55aa7bb8fe1
-sha256=5d32d891c83b9c0089231f4f1c424ab02301b627ce26e5c2e6e397b8ea606fb2
-
-[http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.tar.bz2]
-md5=51b4a1c0ae2b3bd77417306fd78a3e94
-sha256=c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4
-
-[http://xorg.freedesktop.org/releases/individual/app/xbiff-1.0.1.tar.bz2]
-md5=404f5add4537d22dd109c33e518a5190
-sha256=9845b1fa8a1cfd408f01fd69b66808068e847cdc925d114c7723c17934a96503
-
-[http://xorg.freedesktop.org/releases/individual/app/xbiff-1.0.2.tar.bz2]
-md5=1d4ad06725f9dc4b877ecd210b7b1607
-sha256=7c21763a90599ad627739804ba76dd33516b76cce440294e1154bf680eca60f7
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xbiff-X11R7.0-1.0.1.tar.bz2]
-md5=c4eb71a3187586d02365a67fc1445e54
-sha256=c9c899fddcb5053d6cf2a00a933b6e6b0429af547efbe85f89ad3bb35176bbec
-
-[http://xorg.freedesktop.org/releases/individual/data/xbitmaps-1.0.1.tar.bz2]
-md5=b28a9840cde3c38d7c09716372fea257
-sha256=5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867
-
-[http://xorg.freedesktop.org/releases/individual/data/xbitmaps-1.1.0.tar.bz2]
-md5=f9ddd4e70a5375508b3acaf17be0d0ab
-sha256=c9a2059c8b0636b7ee1169647bb22f6eb4a0589e36fdb98936002e2569ad8761
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/data/xbitmaps-X11R7.0-1.0.1.tar.bz2]
-md5=22c6f4a17220cd6b41d9799905f8e357
-sha256=3d7b78cf588871caa00ef79f5f66657803cf9a07350ac5dcf56fbe5ca2a794a8
-
-[http://ftp.gnu.org/gnu/xboard/xboard-4.2.7.tar.gz]
-md5=b70ad8ff7569975302c5fb402d5eea32
-sha256=5b21f12e3e99be0c69a3fa5f3d4cb79def24b6a2195ed94efc1b6ab415fb8d3b
-
-[http://xorg.freedesktop.org/releases/individual/app/xcalc-1.0.1.tar.bz2]
-md5=07b948cf671fde88df1a59bfb0cab3b8
-sha256=17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248
-
-[http://xorg.freedesktop.org/releases/individual/app/xcalc-1.0.2.tar.bz2]
-md5=d31a99795b9668f047aa11bf36df6df0
-sha256=96375e2d212e7249d14d0beac73c1a6d89252b5fcf571bd9f5c7303a14bb4a32
-
-[http://xorg.freedesktop.org/releases/individual/app/xcalc-1.0.3.tar.bz2]
-md5=0b981e360b54584fcb6dc2ec4658c406
-sha256=96c413998c664a8397313d749b20e18308bcd82187a89446a64b3557b089b42f
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xcalc-X11R7.0-1.0.1.tar.bz2]
-md5=c1ecea85be15f746a59931e288768bdb
-sha256=a1af9c7474307077e69cf86c185c77a3a1454ada64e3abf766fcdee6e92b4fd6
-
-[http://xcb.freedesktop.org/dist/xcb-demo-0.1.tar.bz2]
-md5=872ceecda2cfe3c4056716e414b6802d
-sha256=20753bb59558dc00311a5a296fc6c4b3fcff04b86b2579fcb459c89b17d733a4
-
-[http://xcb.freedesktop.org/dist/xcb-proto-0.9.91.tar.bz2]
-md5=830cac0c81e43807849dd172bf7e65e2
-sha256=cefb1a052f8366d1ddfaabc9dc4207307855ab2b12862989fa3cbec02a48f1fa
-
-[http://xcb.freedesktop.org/dist/xcb-proto-0.9.92.tar.bz2]
-md5=dc05c33ae1efc3e59d725887de9fc1a6
-sha256=4590e383f9bb6cc724e2033911a96d36f5966a5f82771bd3f06a63add2aa3e10
-
-[http://xcb.freedesktop.org/dist/xcb-proto-0.9.93.tar.bz2]
-md5=43298a907d6d242132c20e4338c2f33f
-sha256=3f28eb14edd588878d39a33803adc0d3cc49e9dfaef77d9db0490125b3da786e
-
-[http://xcb.freedesktop.org/dist/xcb-proto-0.9.tar.bz2]
-md5=b1f8eec1a25d2c8a831dd9a1b19fbc38
-sha256=982023711ca2a561a2e01e37fd6e7c64ca62efd4846da2e48826754d69204344
-
-[http://xcb.freedesktop.org/dist/xcb-proto-1.0.tar.bz2]
-md5=d31407eaae7e52d100645217767a41aa
-sha256=df3ce807139957a9d3bd196a6eb5fad1d04af079d47b0ec36502911520b84e08
-
-[http://xcb.freedesktop.org/dist/xcb-util-0.1.tar.bz2]
-md5=c3852c5f0569e2577a6a2b06276948d1
-sha256=9086821a37d29ec4158f841c948b26637f4e262f22344d834eefafb7a313d266
-
-[http://xcb.freedesktop.org/dist/xcb-util-0.2.tar.bz2]
-md5=b09bdebad50638709de22d8eb2dc3bf5
-sha256=a0d6a15ac4dcbcea832f2f9b2dbcf575b02cf69aa92f0ba90bd35b61cd75b01a
-
-[http://www.xchat.org/files/source/2.6/xchat-2.6.0.tar.bz2]
-md5=0c827bf6df0572231cbbb1e25965fb61
-sha256=abdc3055a9c85996c84adc858b2c8f02116f330bdbaeff9e7b38a99da4b852a4
-
-[http://www.xchat.org/files/source/2.6/xchat-2.6.1.tar.bz2]
-md5=50fbc65bf9c051029ea081cf497493f3
-sha256=4827a11db099d4968183d322e326ea5657ddec560c3f2ceef8d210d0a3b83584
-
-[http://www.xchat.org/files/source/2.6/xchat-2.6.8.tar.bz2]
-md5=940fd8560a4e4e5d905e53207c6cbb87
-sha256=7e239a43c5e293da57a0ee8dc1e383d243ec44b00e682558db93be3d2752611f
-
-[http://www.xchat.org/files/source/2.8/xchat-2.8.4.tar.bz2]
-md5=66d60febc62a01bafac9bb3a35fb37ae
-sha256=f95a9a9e477128aae536669dedd79f4e7b4d469072565695289e4bbb5b36dd63
-
-[http://www.xchat.org/files/source/2.8/xchat-2.8.6.tar.bz2]
-md5=1f2670865d43a23a9abc596dde999aca
-sha256=8c89dbf36304b99363a7f090d695447653102b4528ca2aa367a2abe5cff1746d
-
-[http://downloads.sourceforge.net/xclip/xclip-0.12.tar.gz]
-md5=f7e19d3e976fecdc1ea36cd39e39900d
-sha256=b7c7fad059ba446df5692d175c2a1d3816e542549661224806db369a0d716c45
-
-[http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.0.1.tar.bz2]
-md5=2c6ecedb10dc51adbb64c95f22fd99c2
-sha256=3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc
-
-[http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.1.0.tar.bz2]
-md5=113eccea3ee73a1ef7b43d2291ca1e09
-sha256=de0f37c7bf69c3aac3362bc0cbe470a622c2a85b62c5483c113ea88512232710
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xclipboard-X11R7.0-1.0.1.tar.bz2]
-md5=a661b0f922cbdc62514bfd3e700d00fd
-sha256=74e949dc0fc1d275b60a170975a9bb99a12153687f2a3478b963b1ae4c607d96
-
-[http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.2.tar.bz2]
-md5=6b930326f71993fb54b7203902b387cd
-sha256=ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d
-
-[http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.3.tar.bz2]
-md5=2b1a3d030d87e62a591db8ee4c0072e6
-sha256=10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f
-
-[http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.4.tar.bz2]
-md5=bb9fd5e00d39c348a0078b97fdf8258f
-sha256=69b903b6305211c9fc5db394f3d08c0a696aa51942d73db7f594422e7be6edf0
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xclock-X11R7.0-1.0.1.tar.bz2]
-md5=00444fed4bf5cd51624476ee11dd1fab
-sha256=eb93d5278f5e46f8d7ff5b53a10a03fef09326e72966c3a0b8faa255436ee6b9
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xclock-X11R7.1-1.0.2.tar.bz2]
-md5=349447c4398be41856f5cc8b67d5d6f4
-sha256=1584dcd6d9f5206b1b44eb4645b09b809cb8a6b06eef8b7d6dc9615906692e1b
-
-[http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.1.2.tar.bz2]
-md5=fde0b050901f024b19159cdacdcfbd20
-sha256=b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab
-
-[http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.2.0.tar.bz2]
-md5=7b83e4a7e9f4edc9c6cfb0500f4a7196
-sha256=de17c06b7005c5e9ab469e324e76c5c3b8baa2dfc3c1dc7e93438c197facf68e
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xcmiscproto-X11R7.0-1.1.2.tar.bz2]
-md5=77f3ba0cbef119e0230d235507a1d916
-sha256=f28e8f6baaaa590ed991314c98f16d114e4668b93c5c6e7fb1bf51f3cc7bf6c0
-
-[http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.1.tar.bz2]
-md5=8579d5f50ba7f0c4a5bf16b9670fea01
-sha256=e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e
-
-[http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.2.tar.bz2]
-md5=7f2bed9f4dd3301d18d83eb296c3be0d
-sha256=bfcac66634ea4d4a1607f1c8a4170e6089db13355357fc143281a6fc0216face
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xcmsdb-X11R7.0-1.0.1.tar.bz2]
-md5=1c8396ed5c416e3a6658394ff6c415ad
-sha256=6e1cdf207ca998acd4e1cc991bde47fcf9d01d24ba733f9d3afe3c64843ef838
-
-[http://xorg.freedesktop.org/releases/individual/app/xcompmgr-1.1.4.tar.bz2]
-md5=3eb1c2b7a6ceaec4ee872cb06d202d91
-sha256=4bf647745b4de940ef75796fc8ad4e1f83c276e474f7b6779f317fcd070de884
-
-[http://xorg.freedesktop.org/releases/individual/app/xcompmgr-1.1.5.tar.bz2]
-md5=bf8faa8c540bfdcd0252801d8f16d868
-sha256=bb20737a6f9e0cdf5cfbd5288b6a9a4b16ca18d2be19444549c1d6be2a90b571
-
-[http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.2.tar.bz2]
-md5=8678ddd23573022d68dcd883ae239be8
-sha256=45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377
-
-[http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.3.tar.bz2]
-md5=0e1a3110bebabecc2897d67a973526b0
-sha256=1b1ec25fefad34f5c33c74474358c1f5a8702d8c04defc854826bccb7a46bc45
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xconsole-X11R7.0-1.0.1.tar.bz2]
-md5=f983b589ba9de198d90abee220a80f81
-sha256=f62bd7916589515d338055cf977b544d031883659f0ec97cbbd08441256f1059
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xconsole-X11R7.1-1.0.2.tar.bz2]
-md5=dd817a0fabe11b1b463492b37247b013
-sha256=be246df3bb5b5ed6bcc3d527f7b6015b3c3f2035090f52729ec4c796f5da20e9
-
-[http://www.nickg.me.uk/files/xcowsay-1.1.tar.gz]
-md5=cf08b324b67d5761158344adcea89402
-sha256=e0dd4b753690c650c6bfbb5af9d190fa6bb3d889a491c8553a34ba397ede8bbc
-
-[http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-1.0.1.tar.bz2]
-md5=014bad415e64c49994679cdb71a97e37
-sha256=4e7dcd402cd045ce1bd1a3de496270e78d6ead2478a0bcb3404072b33c5c9ea0
-
-[http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-1.0.2.tar.bz2]
-md5=e8929a1bb4d98d1a3991fd340d0b5f09
-sha256=5f798c2f1d2794c09fa0a40700c40359b725107608012866828015dca47514d6
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/data/xcursor-themes-X11R7.0-1.0.1.tar.bz2]
-md5=c39afeae55a7d330297b2fec3d113634
-sha256=730029a4f23661094f0d246595041e51ec0b55e7405fcd5affee1ec7f9aba813
-
-[http://matchbox-project.org/sources/utils/xcursor-transparent-theme-0.1.1.tar.gz]
-md5=7b0c623049d4aab20600d6473f8aab23
-sha256=b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4
-
-[http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-0.1.1.tar.gz]
-md5=7b0c623049d4aab20600d6473f8aab23
-sha256=b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4
-
-[http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.1.tar.bz2]
-md5=39e1e62f5bd92603b0230b8b948c2fc4
-sha256=18d3e0d64853089c2154f1f867df087fc15f87e03e09fabc98ee5e265d8a53ef
-
-[http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.2.tar.bz2]
-md5=6fc90896b8c786cb1a2100b4167f7874
-sha256=e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e
-
-[http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.3.tar.bz2]
-md5=69df079b3950a0db4e5f4e6f0e00ddee
-sha256=ed5f3ffe881c21ffca85406e5a5f553ed4985cc5e9acdb535f682c33bebac254
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xcursorgen-X11R7.0-1.0.0.tar.bz2]
-md5=4d7b26dbb4442e89ec65c4147b31a5f7
-sha256=8290616302932e72d4224cbe27d872efa5f44b0b8553ded0bbfb3537abe76907
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xcursorgen-X11R7.1-1.0.1.tar.bz2]
-md5=59d8d79fb950a55722c0089496fd18b1
-sha256=ae38043c9dbf99a516f4edc58ef6235ceba975d8b5f374244a2b3e96793d7d5a
-
-[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/6_23/exports/xdais_6_23.tar.gz]
-md5=09b0a14b9f8fb98686a98857eedd10a1
-sha256=12e60870930d9392c37dabdd25988e6dd5fb66ce0fe1e3b0d72250c90c8c26b7
-
-[http://xorg.freedesktop.org/releases/individual/app/xdbedizzy-1.0.2.tar.bz2]
-md5=ecef9cfd197d00980e0d69ee4126d890
-sha256=74e882e9fee7ebeb274caf43071afff92531b8a41f34650376146a131166012d
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xdbedizzy-X11R7.0-1.0.1.tar.bz2]
-md5=ceaccde801650ffbffc1e5b0657960d2
-sha256=4511dc4df6ebb320a4a516b3b712c86f6924e5ee9832618f58ebba06c64712ea
-
-[http://install.source.dir.com/xdctools_setuplinux_3_10_03.bin]
-md5=8f0f8af016b97fb612ec11afaaf5a9e7
-sha256=d398bfb7a5d9657b802db835c28db892ec8fe54cf332420edef0b3ba1c231fcb
-
-[http://install.source.dir.local/xdctools_setuplinux_3_10_03.bin]
-md5=8f0f8af016b97fb612ec11afaaf5a9e7
-sha256=d398bfb7a5d9657b802db835c28db892ec8fe54cf332420edef0b3ba1c231fcb
-
-[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/xdctools_3_15//exports/xdctools_setuplinux_3_15_01_59.bin]
-md5=c7cd094cdc49459018b6f0e1eb95af30
-sha256=0d5fbc8cfdaa968090ad11b0b84cfb122e2a1c54c4d261fd722b27c6d6972c23
-
-[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/xdctools_3_15/exports/xdctools_setuplinux_3_15_01_59.bin]
-md5=c7cd094cdc49459018b6f0e1eb95af30
-sha256=0d5fbc8cfdaa968090ad11b0b84cfb122e2a1c54c4d261fd722b27c6d6972c23
-
-[http://gpe.linuxtogo.org/download/source/xdemineur-2.1.1.tar.bz2]
-md5=b3884eaec59a63691f66bc29ce57a56d
-sha256=75378ad3eacbe32c625de3b4af3e1f6fc9772ab45c1cd1393483d95ac4da3b22
-
-[http://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.10.tar.gz]
-md5=6873f49ea7f568743621ed1e05e52dab
-sha256=169978c677db5c498f485e9896cd0ababae6b3a9d0bf640ffa719d5af2abca46
-
-[http://portland.freedesktop.org/download/xdg-utils-1.0.2.tgz]
-md5=348a5b91dc66426505022c74a64b2940
-sha256=21aeb7d16b2529b8d3975118f59eec09953e09f9a68d718159e98c90474b01ac
-
-[http://xdiskusage.sourceforge.net/xdiskusage-1.48.tgz]
-md5=a902aa9d73761ade98256c3cd5c1f533
-sha256=7842aa42510bf52c367164d44a977915ad9f070864d5175157738f8d6894274b
-
-[http://xorg.freedesktop.org/releases/individual/app/xditview-1.0.1.tar.bz2]
-md5=e9a7192ef29453b8c810ddd556a463c0
-sha256=177194e5f83b31c2f934e3a0b573e8ae359edf2ef1a2403ee8e1dad383558117
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xditview-X11R7.0-1.0.1.tar.bz2]
-md5=21887fe4ec1965d637e82b7840650a6f
-sha256=c3662dc4e97f7eb0bbcd7cf952bd9f67218e8ceb8f5418fb6bf61ee5e8ec0392
-
-[http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.3.tar.bz2]
-md5=619d0549c6c20ca15aa77769f2fbabe2
-sha256=9e640974c132ef1faafedc77e4602d55457b2791006b677cec071ee8afbf9a74
-
-[http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.4.tar.bz2]
-md5=a2b4c280f3e324d081a0d9ed76a8a123
-sha256=928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073
-
-[http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.6.tar.bz2]
-md5=c89f8bc74fda4d19e5f374f59c88810f
-sha256=c41ac89d9da5c3f5424e9c4871d363ff17acf0fd2a46830931c447ba0b5a8bcd
-
-[http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.7.tar.bz2]
-md5=92effdb698d9ecc9113fe4f49294bd90
-sha256=6a7bceccb1eb9ce3d14259be7a6cc8268bc9e1f127298480b9322ceb6f032d6d
-
-[http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.8.tar.bz2]
-md5=cc1816bc62a3722ad509373b0b7f30fe
-sha256=e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9
-
-[http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.9.tar.bz2]
-md5=030ae4bd9b8d428749d68bfdf56ce8a5
-sha256=e7b1db0e1b0d0113a301d94e40b0314e55f7e0006415f50a9cf06f636b11b134
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xdm-X11R7.0-1.0.1.tar.bz2]
-md5=9ac363721dbb8cd39aa1064b260624a6
-sha256=9bf8895b98fb35ee38ac713ce83c80abdd8e33de278e1ddf982a293c31b56b81
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xdm-X11R7.1-1.0.4.tar.bz2]
-md5=03ca4af9bd9c96ce5240c87cad4f7157
-sha256=3c5c42cfd51f9122a3c5761fbf3c5a5fa7c89d101b3b8d19faeefcec53b3fade
-
-[http://xorg.freedesktop.org/releases/individual/app/xdpyinfo-1.0.2.tar.bz2]
-md5=c9ee60ae52c97c51d4ca327e53f0cb61
-sha256=c9927fc33e8a4422d74b1ebee0d19dd5a16d9ebc435e8f47f0aa546501ccfed3
-
-[http://xorg.freedesktop.org/releases/individual/app/xdpyinfo-1.0.3.tar.bz2]
-md5=b7cbab6cbcd12bf7ad65dbc12d86e104
-sha256=4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962
-
-[http://xorg.freedesktop.org/releases/individual/app/xdpyinfo-1.1.0.tar.bz2]
-md5=d1d516610316138105cd07064b257c5c
-sha256=780d8dfe65653f42ee26d35928ab7f72f5f27ab08eda692fe4baad05126a0631
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xdpyinfo-X11R7.0-1.0.1.tar.bz2]
-md5=2b08e9ca783e3aa91d7fb84fdd716e93
-sha256=d97f2872f5400f7fb5c0ad9442eced4bea55ab523de27417bd479db0071e3fed
-
-[http://xorg.freedesktop.org/releases/individual/app/xdriinfo-1.0.1.tar.bz2]
-md5=be3c5a9b242a57226b5bb5f22ec341ca
-sha256=f693977bdaea7eb6b095a6b6bc60b8a62110ecdef4c455211346e592f59c3772
-
-[http://xorg.freedesktop.org/releases/individual/app/xdriinfo-1.0.2.tar.bz2]
-md5=a5ec51ed9f0a55dc3462d90d52ff899c
-sha256=7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265
-
-[http://xorg.freedesktop.org/releases/individual/app/xdriinfo-1.0.3.tar.bz2]
-md5=cb304d1ce562ac48b68eedeba38c662f
-sha256=2b762afd08c798d79fd6dacfd6280da39105927fa2bd91e3b1ba75b8cddc259c
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xdriinfo-X11R7.0-1.0.0.tar.bz2]
-md5=75b8b53e29bb295f7fbae7909e0e9770
-sha256=84753f1c33be507ed9c1cc9d5e78565cc61e60d1403e499d7f25603d9a3b4f6b
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xdriinfo-X11R7.1-1.0.1.tar.bz2]
-md5=36cc576a71bca1177ce793003ed78f32
-sha256=9049146404b9596d70f77a0250d26aff93ba7ba6f42e99f7ee2302a757dfd362
-
-[http://xorg.freedesktop.org/releases/individual/app/xedit-1.0.2.tar.bz2]
-md5=c56160e93c24ddf17e69891ed50deb72
-sha256=2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df
-
-[http://xorg.freedesktop.org/releases/individual/app/xedit-1.1.2.tar.bz2]
-md5=67193be728414d45a1922911e6437991
-sha256=a38823a8b7919e2efa689bc4c279e12314e45b41131c39ce9ca523e54f42fa1f
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xedit-X11R7.0-1.0.1.tar.bz2]
-md5=19f607d033f62fb1ee5965f4236b19d4
-sha256=cfbea0872e9963ae3ff61b07000f92d840b65244eec0e1a9750a58a03d70db93
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xedit-X11R7.1-1.0.2.tar.bz2]
-md5=591f578f37e0654cc7d1bb0923191797
-sha256=fb22559759a92f1a6c10716b743509ba20005f223725ec4b6492462bfe9237d0
-
-[http://www.axint.net/apache/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz]
-md5=04169609449a8846bc1e6891c04cadf4
-sha256=77fae8a1e7aa58007115c939aa68fd5028da79c481fc457dfce546b50c9dfda5
-
-[http://mirror.serversupportforum.de/apache/xerces/c/2/sources/xerces-c-src_2_8_0.tar.gz]
-md5=5daf514b73f3e0de9e3fce704387c0d2
-sha256=416eaf74bbe6ff3b3c64a282e886810cad6cbb48478d3c83344661504c09c8d6
-
-[http://xorg.freedesktop.org/releases/individual/app/xev-1.0.2.tar.bz2]
-md5=e3008eb0655da3026c162a5597d70869
-sha256=cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053
-
-[http://xorg.freedesktop.org/releases/individual/app/xev-1.0.3.tar.bz2]
-md5=a9532c3d1683c99bb5df1895cb3a60b1
-sha256=d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a
-
-[http://xorg.freedesktop.org/releases/individual/app/xev-1.0.4.tar.bz2]
-md5=5f98c0a2725a33d60ef4956befe078fb
-sha256=7fad9c9755a624e677f44633dee218e9c22b4ba9a83e6709a6cbf8c1a501fde8
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xev-X11R7.0-1.0.1.tar.bz2]
-md5=5d0d3c13b03e9516eafe536e6bd756c7
-sha256=eb7ea9a7917fa6d603529e76f793e56baefa87a3034602634c73f9b284adc8b7
-
-[http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.0.2.tar.bz2]
-md5=242388ab65dde3a3dd313eeee265e429
-sha256=53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9
-
-[http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.0.3.tar.bz2]
-md5=3a2e0252e853ab30b3bff05ac92ec61c
-sha256=3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4
-
-[http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.0.5.tar.bz2]
-md5=e6841018a7c64983b0954aa2c564d115
-sha256=d33e1f3c96daad78667b2dfc14a1ce2ee3bdce19409f82cd5ede6c696ca5b042
-
-[http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.1.1.tar.bz2]
-md5=fb6ccaae76db7a35e49b12aea60ca6ff
-sha256=6d0abd31ddd57c2cb24cecf5fd90b4c29a276e20e3e03ca3c2c57d074f964d99
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xextproto-X11R7.0-7.0.2.tar.bz2]
-md5=c0e88fc3483d90a7fea6a399298d90ea
-sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/protto/xextproto-X11R7.0-7.0.2.tar.bz2]
-md5=c0e88fc3483d90a7fea6a399298d90ea
-sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
-
-[http://xorg.freedesktop.org/releases/individual/app/xeyes-1.0.1.tar.bz2]
-md5=033f14f7c4e30d1f4edbb22d5ef86883
-sha256=530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
-
-[http://xorg.freedesktop.org/releases/individual/app/xeyes-1.0.991.tar.bz2]
-md5=ba1b886bd6104018fe78ab431d83ce4d
-sha256=594324114bb20a502102a9a584dfa5c63d85aa60b7975fd7587d82d42c8ef115
-
-[http://xorg.freedesktop.org/releases/individual/app/xeyes-1.1.0.tar.bz2]
-md5=933f6d2b132d14f707f1f3c87b39ebe2
-sha256=996b9641fea06e2f0dde9cbf5fb31b5cd139376198057a88ca59820fdb94d507
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xeyes-X11R7.0-1.0.1.tar.bz2]
-md5=3ffafa7f222ea799bcd9fcd85c60ab98
-sha256=e93bb322fe96ceabd0581bb70101aaa1001b0b8f894b3ae0e1fa2e4b38f41af2
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.1.2.tar.bz2]
-md5=a318c1e86123832d7b0c95fc7d47ef35
-sha256=01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.2.0.tar.bz2]
-md5=120e226ede5a4687b25dd357cc9b8efe
-sha256=ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86bigfontproto-X11R7.0-1.1.2.tar.bz2]
-md5=5509d420a2bc898ca7d817cd8bf1b2a7
-sha256=56498126f54f123e2ffde0a883ccbc914097818e85bfa6b2a4a47df687f50b79
-
-[http://xorg.freedesktop.org/releases/individual/app/xf86dga-1.0.2.tar.bz2]
-md5=66feef21fb4e769cc1e2f193ae461a8c
-sha256=650633b83796e5a24d4c5ec30adfeb3958f75d9d0785060d5c42bab55ccc1857
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xf86dga-X11R7.0-1.0.1.tar.bz2]
-md5=f518fd7ebef3d9e8dbaa57e50a3e2631
-sha256=c8c90650a4f0c7e7684738a5f2fdbb92c8278afb315113ae6129b2d0bdd0a865
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.0.2.tar.bz2]
-md5=461aa291a23e8cf387b70f3efa71b05c
-sha256=3ee1db2481ea222269bd201eef4d0e5d8ca4dbdb5eeb4852cf1efc42d4269b60
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.0.3.tar.bz2]
-md5=42fdcebc66efac02ab4beec2b1b0ad6e
-sha256=5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.1.tar.bz2]
-md5=a036dc2fcbf052ec10621fd48b68dbb1
-sha256=ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86dgaproto-X11R7.0-2.0.2.tar.bz2]
-md5=48ddcc6b764dba7e711f8e25596abdb0
-sha256=c66920f0ad6921a33098008cd01f05eb9a47f550d214065dc6c7072f176c82cf
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.0.3.tar.bz2]
-md5=e4a282cfd708b8892fca4425fee9cd7b
-sha256=111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.0.4.tar.bz2]
-md5=01470d088da3a8a3deefa8e1f45d69cb
-sha256=f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.1.0.tar.bz2]
-md5=309d552732666c3333d7dc63e80d042f
-sha256=d23f12deffd03e582e897ed6a7df3ea7f66ee8577f0f61374dcdf2ebffdce1be
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86driproto-X11R7.0-2.0.3.tar.bz2]
-md5=839a70dfb8d5b02bcfc24996ab99a618
-sha256=256fd04cbd97b2b96e7ef808b6752561da855ded3835a1bb0d7acbe07758e924
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86miscproto-0.9.2.tar.bz2]
-md5=acae8edeb05a406f7f60bcbb218a8f1d
-sha256=aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86miscproto-0.9.3.tar.bz2]
-md5=ca63bbb31cf5b7f37b2237e923ff257a
-sha256=45b8ec6a4a8ca21066dce117e09dcc88539862e616e60fb391de05b36f63b095
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86miscproto-X11R7.0-0.9.2.tar.bz2]
-md5=1cc082d8a6da5177ede354bedbacd4ed
-sha256=ed0190e3db4c07fe042cfc9d726e3806af83a2e6dfdbd832a7f8c225805bde5b
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86rushproto-1.1.2.tar.bz2]
-md5=b6a96ffdae084e27487a58314008b000
-sha256=07d9b237541f2d6313b5b28f5335d987a766b36c87b133f77cc48f31d969a3ae
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86rushproto-X11R7.0-1.1.2.tar.bz2]
-md5=1a6b258d72c3c3baccfd695d278e847c
-sha256=861b881e2ac1e9164048c06217b54dffb5d88feb0bf72abf31984e663843b923
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2]
-md5=f00844a63d6e76b69eb0eb5e41eed843
-sha256=07152f990cc79ec5931989decc4a90b1919147e98ff6fcfe39507a9d3fc4d96e
-
-[http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.3.tar.bz2]
-md5=4434894fc7d4eeb4a22e6b876d56fdaa
-sha256=8f704613a5407b31c594d05cf8e053f2b05777172a44e7cd2abd8090bd2ac247
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86vidmodeproto-X11R7.0-2.2.2.tar.bz2]
-md5=475f19a2ffbfab9a0886791c5f89c978
-sha256=2497487e51cb2e94dfe540b9084f625f8018eb0853a699d724be790b26d9fd15
-
-[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfcalendar-4.2.0.tar.gz]
-md5=519ae7186ed4c083fdbe452cc24f8837
-sha256=36130c0535c34a5d7873a9ccf82aa45cd1aa5d0ad7191e4c7cc71faac9fbd3e7
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfcalendar-4.2.2.tar.gz]
-md5=d964e45cc1d21f482f5e303129491987
-sha256=910a65a81b7efb18e638105a46cb1249df041df6e66fcfcb58ac7e95baaa7976
-
-[http://www.us.xfce.org/archive/xfce/4.2.3/src/xfcalendar-4.2.3.tar.gz]
-md5=d2e2c8e010cca708295aeaf621086205
-sha256=ad8d141d23f48736180d3913a0600d1733d71a341fd1889e69f727a998cfa0a3
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce-mcs-manager-4.2.2.tar.gz]
-md5=9f6cdb3f11fc57a458fe7c91540181c9
-sha256=b075e7503089a1e0b7a156fb05871ba83c4a20d22b822a4599545b6a3e410c40
-
-[http://www.us.xfce.org/archive/xfce/4.2.3/src/xfce-mcs-manager-4.2.3.tar.gz]
-md5=029e7cc2b20a3de5f908483b4253f492
-sha256=9bc1d715ee77a3d910214dd2fe6f537ee39960177f869a781361535a8d9a1828
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2]
-md5=59d6d8f4f931b562b39ea1decdf9e29e
-sha256=951cb843f1c98fb68e0ab71f260dda9bc77ffd7b3aa16883d22e395134125c48
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce-mcs-manager-4.4.2.tar.bz2]
-md5=876a4b5d582de8fdc01457df2e7e1339
-sha256=65531403c4b24f1be031e57a935b9a464661c47764cb913888aa86ed03ecb268
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce-mcs-plugins-4.2.2.tar.gz]
-md5=6e23972a2a0b3b3e7852bfc68dc0eeb8
-sha256=693166e49eac35a85e66a7ad5dee046657f08937dc0a9144ecd26148ab9917a9
-
-[http://www.us.xfce.org/archive/xfce/4.2.3/src/xfce-mcs-plugins-4.2.3.tar.gz]
-md5=cdd1ca3ff7610a45658aa801b91da8dc
-sha256=57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2]
-md5=6234425227e1145319bd75ef52fa97f5
-sha256=f2773a4c007139f0a06c418b3535374ebeed8e10eef41d3ae69f4259f6f632a5
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2]
-md5=77fcc929058de530d4f91eb25de851a1
-sha256=e16610264256248bfd8ca227c7861000abf0c323611ad34913b06c41af0c9be5
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce-utils-4.2.2.tar.gz]
-md5=585e1fd48dee70c50271ac478e8adcd0
-sha256=67091b02a85c9700d574416c4adfca6db042b679ac3234228967f4a6c560ad93
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce-utils-4.3.99.2.tar.bz2]
-md5=de6502dd93176b2a60e2e66bf052024f
-sha256=a40832c874dda5a06c0208cd178a8d02cd61cb2379aa46cdffbe3fb592fd551c
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce-utils-4.4.2.tar.bz2]
-md5=119dd3f1daedfa41e3be89bad8997336
-sha256=eba910fb99598e09fa4c41c4ab405216a2b59a837a3ab058656360ec2324314c
-
-[http://mocha.xfce.org/archive/src/xfce/xfce-utils/4.6/xfce-utils-4.6.1.tar.bz2]
-md5=1aa2362b11e79e56d52ce0d265faf1b6
-sha256=8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce-utils-4.6.1.tar.bz2]
-md5=1aa2362b11e79e56d52ce0d265faf1b6
-sha256=8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce4-appfinder-4.2.2.tar.gz]
-md5=0ef8c944e8aa2db06719e02b2c40d70c
-sha256=4bca692e0af03c0f70c6cf62f2b60274e71899beaa45815c2d0f46f7f19c06d5
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce4-appfinder-4.3.99.2.tar.bz2]
-md5=a4636f51d79eb68ba65098336d120d56
-sha256=1e6c80b800dd02f6b1cbf69df36307cc0b341ab73438c5508ac760fd8be66232
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-appfinder-4.4.2.tar.bz2]
-md5=0bdd0b1e96a1e1cf50ce5d582758b992
-sha256=bdf232505f240d0933ca3cd7d2a5c07c31477a70570d95111f94a1226bf7e59c
-
-[http://mocha.xfce.org/archive/src/xfce/xfce4-appfinder/4.6/xfce4-appfinder-4.6.1.tar.bz2]
-md5=a1bc7d88100cfd92714a300be531589b
-sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-appfinder-4.6.1.tar.bz2]
-md5=a1bc7d88100cfd92714a300be531589b
-sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-dev-tools-4.4.0.1.tar.bz2]
-md5=7d09d161efc7ef86b3b48791d98c8ae8
-sha256=1e7a506f08c8a4f368dd18648006ba3934a94eb96fd4545f5303d46aeae9cc3e
-
-[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2]
-md5=c9587fa78e877eee858a33391d0afd62
-sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
-
-[http://www.us.xfce.org/archive/xfce/4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2]
-md5=c9587fa78e877eee858a33391d0afd62
-sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-dev-tools-4.6.0.tar.bz2]
-md5=c9587fa78e877eee858a33391d0afd62
-sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-icon-theme-4.4.2.tar.bz2]
-md5=d3e3e64596a7efa857d2e6bb0cbd09bb
-sha256=72178637c479ba848747285e0c7dc53a3abfe26b6517df5e75c7449542017350
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce4-mixer-4.2.2.tar.gz]
-md5=fd5eb62c04d10659402a228b304f735b
-sha256=9d145dd0ad09c1bd1efe357bd0413fabc93945d7986d3f4662ac515625da93bc
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce4-mixer-4.3.99.2.tar.bz2]
-md5=9648fc403f9eb4baede230644bf5638d
-sha256=6beda572195d6f7ed108e0659592d1ca6ad5088e769e3d219cc4114533f8b169
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-mixer-4.4.2.tar.bz2]
-md5=c21cb5680f135dc86e5f0a6f9473003a
-sha256=b390241dfddbc10ae1b870d1326a7675b9ac99e13c89326ba2accea3bfecc47a
-
-[http://mocha.xfce.org/archive/src/apps/xfce4-mixer/4.6/xfce4-mixer-4.6.1.tar.bz2]
-md5=a99e2455445480ef5081fe69454a46fc
-sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
-
-[http://mocha.xfce.org/archive/src/xfce/xfce4-mixer/4.6/xfce4-mixer-4.6.1.tar.bz2]
-md5=a99e2455445480ef5081fe69454a46fc
-sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-mixer-4.6.1.tar.bz2]
-md5=a99e2455445480ef5081fe69454a46fc
-sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
-
-[http://spuriousinterrupt.org/files/xfce4-notifyd/xfce4-notifyd-0.1.0.tar.bz2]
-md5=659ecaf37f0f7ee9e31f7b25f9813778
-sha256=989b0e9ae9ff5bdbdbf56368a44eca039236033f84d05001e311c21c988bd0e1
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce4-panel-4.2.2.tar.gz]
-md5=50699e6c8e4a79f0a4f962e12559c9d0
-sha256=b29e8524c448b9712f5eff0d7702706289a4a2967125b82a92a50ca142cc2d66
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce4-panel-4.3.99.2.tar.bz2]
-md5=53f96a9db5628ac1c629c9e5ecd842e4
-sha256=1925b19457594b5e2a57f07f649375be428a038eb821c8b445dc1e7d2fe9c769
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-panel-4.4.2.tar.bz2]
-md5=8f26b32c442bf9926f98f285a3c251dd
-sha256=ddabfb0ccf04366820efdeb7c640ee3a648a55e51b5177c9861a5ab896e96ddd
-
-[http://mocha.xfce.org/archive/src/xfce/xfce4-panel/4.6/xfce4-panel-4.6.1.tar.bz2]
-md5=73a366b9892152266b465d7d9c35bef4
-sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-panel-4.6.1.tar.bz2]
-md5=73a366b9892152266b465d7d9c35bef4
-sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
-
-[http://mocha.xfce.org/archive/src/xfce/xfce4-panel/4.6/xfce4-panel-4.6.2.tar.bz2]
-md5=88352816c84cbea57121b0c478976976
-sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
-
-[http://archive.xfce.org/src/apps/xfce4-power-manager/0.8/xfce4-power-manager-0.8.4.2.tar.bz2]
-md5=3131257750766838a64a9bb7f74eb2a1
-sha256=16cc04bf613ecfbc9ea43514ccb5f7d7923b7fc4ebf8117c0ce32fa1422334e1
-
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2]
-md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7
-sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
-
-[http://mocha.xfce.org/archive/src/xfce/xfce4-session/4.6/xfce4-session-4.6.1.tar.bz2]
-md5=7628be41ed3511a20cff5673d9d39858
-sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-session-4.6.1.tar.bz2]
-md5=7628be41ed3511a20cff5673d9d39858
-sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
-
-[http://mocha.xfce.org/archive/src/xfce/xfce4-settings/4.6/xfce4-settings-4.6.1.tar.bz2]
-md5=dc1c8704471c5b0104fa10c30eb60cb6
-sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-settings-4.6.1.tar.bz2]
-md5=dc1c8704471c5b0104fa10c30eb60cb6
-sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
-
-[http://mocha.xfce.org/archive/src/xfce/xfconf/4.6/xfconf-4.6.1.tar.bz2]
-md5=d4d3018767ea9eb4b57cc57d4038023b
-sha256=22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfconf-4.6.1.tar.bz2]
-md5=d4d3018767ea9eb4b57cc57d4038023b
-sha256=22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e
-
-[http://xorg.freedesktop.org/releases/individual/app/xfd-1.0.1.tar.bz2]
-md5=c72abd90f50ef459bc14b39ec9fcc7f8
-sha256=111baa16780429d6739ab69b7393a18d75a10b7615dcc8cd0b0878ab9a5e2e1e
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfd-X11R7.0-1.0.1.tar.bz2]
-md5=26c83a6fe245906cc05055abf877d0f2
-sha256=a3fe35b19aa957e5261a12ef78de2c62b47796aa612b2334088b3d98dcd77e8f
-
-[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfdesktop-4.2.0.tar.gz]
-md5=1cacd48e0ab475f4fd55d79020d60c55
-sha256=45a6c30d33f9b887d13f0dd6458e9055dae6664c307b24a68594fcff73d22127
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfdesktop-4.2.2.tar.gz]
-md5=746641ae286994c0f42d7c4f58a90716
-sha256=abba9b334012c8d3771939d8644e25d1560f18174e94eda155c65c87924f08d1
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfdesktop-4.3.99.2.tar.bz2]
-md5=d44a81b9da9598425d9dd8dcd1cd5485
-sha256=427df09a88f9b4a38fbed68d8154090bf0c11fbdc132c26247dc5568ee5ae910
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfdesktop-4.4.2.tar.bz2]
-md5=694601234e74903d0fccba064f411e0c
-sha256=7e50c13e45b1424924c49dd1e9daa6c16881ee57ac21e4e2c6f20c0eec227cdb
-
-[http://mocha.xfce.org/archive/src/xfce/xfdesktop/4.6/xfdesktop-4.6.1.tar.bz2]
-md5=ae15cacc3e3834cca7238a8e1035c50d
-sha256=22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfdesktop-4.6.1.tar.bz2]
-md5=ae15cacc3e3834cca7238a8e1035c50d
-sha256=22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
-
-[http://www.us.xfce.org/archive/xfce/4.2.0/src/xffm-4.2.0.tar.gz]
-md5=476b50335da473d46b12f43a07a28e83
-sha256=dcd12681eaaf2b88dd512023949080b6d47426ff855efc03329790ab479280c9
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/xffm-4.2.2.tar.gz]
-md5=5eb5ede5b2bfac564c26d96ee06a3241
-sha256=0cde8831dc56669a046f6284b0a8dabd583942837e41832e7ed57e57020c4446
-
-[http://www.us.xfce.org/archive/xfce/4.2.3/src/xffm-4.2.3.tar.gz]
-md5=5d2a990bb725b6720db93f34dd91a731
-sha256=791a05a2fd695508ff6b3fd3e0e2be66de28a3d0bf86ee22e14126992d7aef21
-
-[http://xorg.freedesktop.org/releases/individual/app/xfindproxy-1.0.1.tar.bz2]
-md5=5df3a162429bdd6ce5aea3ca5f6365b8
-sha256=6b585ceadd3e17b433e177d80837e485869d6704f1181b6f3457ae56ba1988ea
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfindproxy-X11R7.0-1.0.1.tar.bz2]
-md5=5ef22b8876bb452f670e0fc425a12504
-sha256=33e4334126ee11aa6b68e0dc2c1aea0f0d37144240f650f21e10a90db9b05b6c
-
-[http://xorg.freedesktop.org/releases/individual/app/xfontsel-1.0.2.tar.bz2]
-md5=288fe4cf8a990e4e602aac16dd9109fb
-sha256=7a66ba3910bd7e39d58f9d4a4a588f191a874b8607369fe2cc9203a7115006a9
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfontsel-X11R7.0-1.0.1.tar.bz2]
-md5=d1df7b8622b7f8ebca4b2463118d7073
-sha256=b87b5f171cb4d61e35ff0fda9231166c4b6132fe512b05e8ff63a91be47eab43
-
-[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfprint-4.2.0.tar.gz]
-md5=dce7378c3961122ca20b2518e939e57c
-sha256=6d643173a9ae18e1daa3566503bc461e9a056470595ec059b2eea70e4113b77b
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfprint-4.3.99.2.tar.bz2]
-md5=c2eb9dee0002e875b91e73557f7354a1
-sha256=4eee12555dbc296fa26afbfdbfabad3586000239d5666e54b6bfae7f8cd03e89
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfprint-4.4.2.tar.bz2]
-md5=be4802807e74dea30f4825102ceff5c5
-sha256=b9bb03820a8ba1995ffe3e5b96b6d5ebbbc0347ad1202172f13bba63b2984d54
-
-[http://mocha.xfce.org/archive/src/archive/xfprint/4.6/xfprint-4.6.1.tar.bz2]
-md5=d92fca97a42816085080baf07a99a62e
-sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
-
-[http://mocha.xfce.org/archive/src/xfce/xfprint/4.6/xfprint-4.6.1.tar.bz2]
-md5=d92fca97a42816085080baf07a99a62e
-sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfprint-4.6.1.tar.bz2]
-md5=d92fca97a42816085080baf07a99a62e
-sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
-
-[http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.4.tar.bz2]
-md5=f43cb64d623b748208dfd9012d17b654
-sha256=452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b
-
-[http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.5.tar.bz2]
-md5=3fc73b5e39a1fe8b8d96563c8144cffe
-sha256=f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9
-
-[http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.6.tar.bz2]
-md5=a62ea490a8b97f74b53732df8fc309d8
-sha256=5a3ad18fdc67e261454740217f7c02d1b6825013abcebdcd778a4865fd823353
-
-[http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.8.tar.bz2]
-md5=f10717e45535b64eb45226aac571dac2
-sha256=34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482
-
-[http://xorg.freedesktop.org/releases/individual/app/xfs-1.1.0.tar.bz2]
-md5=5cfc06a320f74f07a0aa73da62307e9a
-sha256=47bad4bbcd0488a8e573aa6efe3438076c4d27c498d6f642f3aa27262eb95f6d
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfs-X11R7.0-1.0.1.tar.bz2]
-md5=a297da3d906110e9c29ec56c5ea578a8
-sha256=5d9df9048863f6d281fc1b71601ff7d31d5075eceeba462b3a32dd4734440c6a
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xfs-X11R7.1-1.0.2.tar.bz2]
-md5=b1650e876b19741762b654dcdb98be47
-sha256=15094fbb2ebbe067c88ed32a62724b71019ee577c849b25aa6ebf0115efc63c6
-
-[http://xorg.freedesktop.org/releases/individual/app/xfsinfo-1.0.1.tar.bz2]
-md5=e98b18fbce1261de30b1de819d86f48a
-sha256=adc33443b3a7f334d2407de702004a0491f24708e0e1abe74cd8ae114cd60cd9
-
-[http://xorg.freedesktop.org/releases/individual/app/xfsinfo-1.0.2.tar.bz2]
-md5=e6c0071f6d5436113982f4a575d3f94b
-sha256=95aaca84f948fc7e25d82c58d3fdbba44911b99f3e205378ce82a786c11bb96f
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfsinfo-X11R7.0-1.0.1.tar.bz2]
-md5=55ca0cfd09b1c1555d492d6961d9af46
-sha256=8d5f6ad0318a8958eaf5772657007ffb545a36c9cd8190f2511cfa03c0069d63
-
-[ftp://oss.sgi.com/projects/xfs/download/download/cmd_tars/xfsprogs_2.8.16-1.tar.gz]
-md5=632c7745f884dc5e6fd707a18971aca3
-sha256=b3195456c99ab66103fd235ab410d6f3e6a56f2bdb7fb31d9d3789f2d453ec3f
-
-[http://slackware.osuosl.org/slackware-12.0/source/a/xfsprogs/xfsprogs_2.8.16-1.tar.gz]
-md5=632c7745f884dc5e6fd707a18971aca3
-sha256=b3195456c99ab66103fd235ab410d6f3e6a56f2bdb7fb31d9d3789f2d453ec3f
-
-[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfwm4-4.2.0.tar.gz]
-md5=da6d773f31ef91400174c2045f0f1a80
-sha256=4ba4bad5bf750045175dc6af58ec29d046c91fa30c3b769213ce69fc739c8046
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfwm4-4.2.2.tar.gz]
-md5=e4c91c59da7d1bdc6141cde3263ea6f9
-sha256=02ab845725c59d4a2b6299e8d576df542011d7775637676080e9d76f02aa63da
-
-[http://www.us.xfce.org/archive/xfce/4.2.3.2/src/xfwm4-4.2.3.2.tar.gz]
-md5=d73e89c50179ccb438c076b3b71d59a4
-sha256=018628d7c5ef10d947cb0228ca4ed7527aebf9ea54eb6db49091a7b8f61c2b86
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfwm4-4.3.99.2.tar.bz2]
-md5=3186d90ae752cce9687698c8bd6b26c3
-sha256=3600267ba477217f065628454bffb30d8819731940c7fdbfd197c731bca9125f
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfwm4-4.4.2.tar.bz2]
-md5=21da77e50b07e72bba784bf3418ca067
-sha256=710120122bc4acaaecdb0646656c5aa92f1d44c4c81d1a6775688abab04cca0a
-
-[http://mocha.xfce.org/archive/src/xfce/xfwm4/4.6/xfwm4-4.6.1.tar.bz2]
-md5=538ff2554a23bf877d336e573884da9a
-sha256=0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed
-
-[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfwm4-4.6.1.tar.bz2]
-md5=538ff2554a23bf877d336e573884da9a
-sha256=0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed
-
-[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfwm4-themes-4.2.0.tar.gz]
-md5=a8d0676fbf9cd3b3514d76a39d4ecbe1
-sha256=9aebac55dfc92a3533678a873d0f3babee285061b0ad5b26a56b6e72fb306ed4
-
-[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfwm4-themes-4.2.2.tar.gz]
-md5=440977408bd1395f4464f18f01faf644
-sha256=b458f3d9dc1f6370ac596862e1ebcbc3e5227e58450ea9c1172d7de6534e34a1
-
-[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfwm4-themes-4.3.99.2.tar.bz2]
-md5=a77e9e700de66d38b6c4850a18283fb1
-sha256=10b2f7ffbf309c12ec82b4bc28b35014cb223208d3003bab3765b70dea9d96bd
-
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfwm4-themes-4.4.2.tar.bz2]
-md5=fbea3ef7eec87fd669958f9cf597bfb8
-sha256=d6f6052ec9bdc2a048dd34a79248ee56abd903055adc0d89d04715eb17ac1dc0
-
-[http://mocha.xfce.org/archive/src/art/xfwm4-themes/4.6/xfwm4-themes-4.6.0.tar.bz2]
-md5=4dc5cb29cbd40e3b9dece12a85e20854
-sha256=9964ce221c1715a892c3ecb802739c0f5eae2b64912093d13fe7631710254c8c
-
-[http://www.us.xfce.org/archive/xfce/4.6.0/src/xfwm4-themes-4.6.0.tar.bz2]
-md5=4dc5cb29cbd40e3b9dece12a85e20854
-sha256=9964ce221c1715a892c3ecb802739c0f5eae2b64912093d13fe7631710254c8c
-
-[http://xorg.freedesktop.org/releases/individual/app/xfwp-1.0.1.tar.bz2]
-md5=0dbde8b3867032b9e4a383d46dfd7e48
-sha256=cdd6ecb453c62086dd01808a26787641add419dd42469349f79d0adeb89a6d93
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfwp-X11R7.0-1.0.1.tar.bz2]
-md5=e1ef3fef10d1f7fbd936794982a8f0be
-sha256=d333ce08122e6cde1a9d4fc7cb8e58b13e9335b52fd249046e8380f23d9bf429
-
-[http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.1.tar.bz2]
-md5=45d8fa3c85d4bfda87251798fd605a45
-sha256=085330064fdb90a152d2d44474fa20bb81ccb6c587c144f5f9c323cb9cc31eee
-
-[http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.2.tar.bz2]
-md5=f13ddedaa63a608d3b025d326f4f5b5d
-sha256=5d3d5b230fc60aefae8f4865c17add133b5fb11377fd61c80897ef94fcccf41e
-
-[http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.3.tar.bz2]
-md5=e8a88bf1a18f35b724619849dca97f4f
-sha256=e5eb2588fbbdc5c2db5571b304204487a9c22eed15ac6cb816f605ec403e6e1a
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xgamma-X11R7.0-1.0.1.tar.bz2]
-md5=07167da3f6b21985e27174ec70f213c0
-sha256=ec744335f06c070d30f7f256262f6326c2cfff35a0ed6178e7be18ad44ad8a86
-
-[http://xorg.freedesktop.org/releases/individual/app/xgc-1.0.1.tar.bz2]
-md5=72fc8dd68f585000c0a542eba0264571
-sha256=7caddfc6c34f62a4ab2dba2ba34085f6b2343b36ec1bec3b522a2188170e1093
-
-[http://xorg.freedesktop.org/releases/individual/app/xgc-1.0.2.tar.bz2]
-md5=fec79887ca14575bef4c757b4e95a693
-sha256=fed1be13409b6963d88ee668da4670cd6da5bd9aff95576234df8849e2084002
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xgc-X11R7.0-1.0.1.tar.bz2]
-md5=8cd01cf558c3eed738115abcf720277d
-sha256=6151d08a12e7a9874738c46119c6ffe8383d1fe6c5d10ffc9d88e2adc8e454e8
-
-[http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.2.tar.bz2]
-md5=f746aba36f075ae4cae313d849a94f4e
-sha256=edab2cc49d230f58e54c0f7b83fd726fec5fc31356668a11589649f19ba90db6
-
-[http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.3.tar.bz2]
-md5=c7f91b4a750d297f269c2a0a3206a1b2
-sha256=2d63007c65e89fe273a43f3e45b3c0133acbc3ceeda6bfc9671388409134ad17
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xhost-X11R7.0-1.0.0.tar.bz2]
-md5=76c44e84aaf4ad8e97cf15f4dbe4a24a
-sha256=5e3db5f2387457f67798d664ed67c67337d2f84c45f15d986ee2f46f9b45d0d1
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xhost-X11R7.1-1.0.1.tar.bz2]
-md5=d12efb18c7e3025c5e6a6f63144c2145
-sha256=b968a10f52b0c5e807ec4c2c106f3aea301cf0ac00d04299b6961370c82c66d8
-
-[http://downloads.sourceforge.net/xine/xine-lib-1.1.0.tar.gz]
-md5=3537cfd58d253b4be20a4975e7086e38
-sha256=795085a067b3a11c1b3de48b4d07b01d8ffb6123bd188a73cb53b0605f875c64
-
-[http://downloads.sourceforge.net/xine/xine-lib-1.1.16.3.tar.bz2]
-md5=4f508abf088cf427a731f85634c8260d
-sha256=d25a241efa55dc7d8f482336efa8bb7b9bb9d69b6df8a8a37f2660948fd67b52
-
-[http://downloads.sourceforge.net/xine/xine-lib-1.1.16.tar.bz2]
-md5=acd1a210c5a6444e8fd44696469352bb
-sha256=27df9c8f962797b235d69154705cfdf18d3e325f028f54e3e804f6dadb8237be
-
-[http://folks.o-hand.com/dodji/0xdeadbabe/xine.tgz]
-md5=8b78ce490cde6eb3c586656e9bc5ead8
-sha256=86402c93b332c44b4e79c568137257d567de1f95cd5f6f6e5433b7e67b40050a
-
-[http://xorg.freedesktop.org/releases/individual/proto/xineramaproto-1.1.2.tar.bz2]
-md5=1cc292c562962ad0ad3a253cae68c632
-sha256=e8a62b1cafbcfc3b9fed147612ed4320233d0c9d6de30c991c2cd0c691c40910
-
-[http://xorg.freedesktop.org/releases/individual/proto/xineramaproto-1.2.tar.bz2]
-md5=a8aadcb281b9c11a91303e24cdea45f5
-sha256=58e88087ceec7201d918f94d6b1247325adca2a9903fed11291b412427a7ba64
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xineramaproto-X11R7.0-1.1.2.tar.bz2]
-md5=80516ad305063f4e6c6c3ccf42ea2142
-sha256=f74d0dfb47d23f544a67464427754adf3fbc52b76b4a68834ab1caf8dc5406df
-
-[http://www.xinetd.org/xinetd-2.3.13.tar.gz]
-md5=4295b5fe12350f09b5892b363348ac8b
-sha256=eddfd1bf3684eaff3a7ba424421d3126878a7469ced0f3d370c7cf66bde64522
-
-[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.3.tar.bz2]
-md5=f04a903cc0e18b3c338f58eb90f6caf8
-sha256=c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186
-
-[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.4.tar.bz2]
-md5=9df52a504dc04313a6650fae364ae04a
-sha256=1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52
-
-[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.5.tar.bz2]
-md5=9a2aad51042141a0e6ad066015397595
-sha256=95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d
-
-[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.7.tar.bz2]
-md5=8b882d9e2deed9d85469a3beaec566a3
-sha256=15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774
-
-[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.8.tar.bz2]
-md5=521574088fbd688edbf91e6bae674265
-sha256=06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524
-
-[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.9.tar.bz2]
-md5=224c36057e4416205d4e421af01a2f15
-sha256=b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999
-
-[http://xorg.freedesktop.org/releases/individual/app/xinit-1.1.0.tar.bz2]
-md5=9144097186c3d2454beffe8ac3b53c6e
-sha256=c79ec1a4d60404715a626f2832f1b62f43b9d52a1e4642b40af743ee41362590
-
-[http://xorg.freedesktop.org/releases/individual/app/xinit-1.1.1.tar.bz2]
-md5=93c73705ed9eb1e1a6b6938405672f2b
-sha256=b103d2cf9e1cd8b049e28bb1109f3da3a14287bbce3ab8b2f427d55a6e5f4785
-
-[http://xorg.freedesktop.org/releases/individual/app/xinit-1.2.0.tar.bz2]
-md5=fe1696cab2fbed6fa059d0cd1c53ac13
-sha256=ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xinit-X11R7.0-1.0.1.tar.bz2]
-md5=6d2df59fa328cbc99c0de98bc2e14597
-sha256=e55c61ede6760ce0d8eaac6dc386850c7873311ab038c69338e35559ec0bbd02
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xinit-X11R7.1-1.0.2.tar.bz2]
-md5=05ae7771d2245bf325ff30b13da92666
-sha256=c15dd54ad64e660d5a3e8c1ea0d14e50ba1127aab2e3211b82e3ee1e6c7045a4
-
-[http://xorg.freedesktop.org/releases/individual/app/xinput-1.3.0.tar.bz2]
-md5=977d657e8d7b59f7d82c98ebef444b28
-sha256=330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45
-
-[http://xorg.freedesktop.org/releases/individual/app/xinput-1.4.2.tar.bz2]
-md5=58e619576cbf4b6057eebb7a97fe2ddf
-sha256=3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b
-
-[http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.0.tar.bz2]
-md5=3e8a5f1faccc8ab00c6190e5a34e0a45
-sha256=a84728e34bb5edd36ecc1b5489f48ad1467ad5aab1f74f1b7789f826a1ffcaf9
-
-[http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.3.tar.bz2]
-md5=2fbcae1323c266edf5b6c61751f2e343
-sha256=0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716
-
-[http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.4.tar.bz2]
-md5=d5122f1d5a91725a81c843f3bd388244
-sha256=fefc574bf639d64348939edf9654306af2bb3c20447be9cff493cb06d87cb672
-
-[http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.5.tar.bz2]
-md5=6cc96c3e4ed5d9802fe717beac008f19
-sha256=204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1
-
-[http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.1.1.tar.bz2]
-md5=38c387bacdc01038c8ac280588792bcf
-sha256=9775bcfd43d9ffa41e2865e5b2c933f419bf983d7a529b3103656c76fd82e663
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkbcomp-X11R7.0-1.0.1.tar.bz2]
-md5=46d1e015897200d4dfed64990abaa8b9
-sha256=35825e80fa1905111302b5c069f5419f5fe63b370f9c437adb8c901fc10cfd16
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xkbcomp-X11R7.1-1.0.2.tar.bz2]
-md5=ed19a000dc13dae9ee45df8f26cebfc5
-sha256=d6ac3fdf1ad297b8d3a2cff3089feaa53e3ad34bb2c1a977873f9bcd01006d7a
-
-[http://handhelds.org/~mallum/xkbd/xkbd-0.8.15-CVS.tar.gz]
-md5=56271e79da101bbc31e5384a9499853d
-sha256=04bc9f6ea423f7fbd9150767cef6a1bc5c70c545eeb923539a93a549905457de
-
-[http://www.angstrom-distribution.org/unstable/sources/xkbd-0.8.15-CVS.tar.gz]
-md5=56271e79da101bbc31e5384a9499853d
-sha256=04bc9f6ea423f7fbd9150767cef6a1bc5c70c545eeb923539a93a549905457de
-
-[http://xorg.freedesktop.org/releases/individual/data/xkbdata-1.0.1.tar.bz2]
-md5=9bf179be9a195953dc5f4c15e23ab7f0
-sha256=94e1909faa9bf754c0e78a6bea8fa6e16c0931c4a2eb1f2252b7f0fa480cb4df
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/data/xkbdata-X11R7.0-1.0.1.tar.bz2]
-md5=1f706f92334ee65818512b3b45d7be65
-sha256=37af4603fa399760a055cc994c61b25778febf676af3fcfad84577f484a174e6
-
-[http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.0.2.tar.bz2]
-md5=68f2a143716c23b566f8509d9498f516
-sha256=4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b
-
-[http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.1.0.tar.bz2]
-md5=8d3c1485c2dd62ea7395a37377958a39
-sha256=46037add20321ff13954ad91aa5f5f5ec52d78006f9d7c52aa6167622b34a2df
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkbevd-X11R7.0-1.0.1.tar.bz2]
-md5=7ba0496f079552d1918d73bd09bde9b2
-sha256=9b358d085bb4fcbfcb0a928cacd4825ba918ef21a2a5e4a3ee401f09abc97f90
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xkbevd-X11R7.1-1.0.2.tar.bz2]
-md5=af4fb106610b4ee3e36ddfdfe213f40f
-sha256=86ab048045dcd1de690de0b040235040f496c686730ad557c912e0f40edf5c4a
-
-[http://xorg.freedesktop.org/releases/individual/app/xkbprint-1.0.1.tar.bz2]
-md5=b98ae2d8b21c545b7b322d0b302efefa
-sha256=008dffea5b213880cb3ebd40d0b9bf0cc10392fb0349831efdebf2a428dd2e17
-
-[http://xorg.freedesktop.org/releases/individual/app/xkbprint-1.0.2.tar.bz2]
-md5=3d3eb10466442354d6b73b503b9829db
-sha256=2e51b3c2d33da885be6d955007ae7e025b8f8b21f7fe6d21387690d9f5cadb92
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkbprint-X11R7.0-1.0.1.tar.bz2]
-md5=6235c39690968d0a9a4c1b1c16c8905a
-sha256=d2e9c3c28e23010441ce40c48bda7adabd338a256cb9b99848be6ed937fc10e7
-
-[http://xorg.freedesktop.org/releases/individual/app/xkbutils-1.0.1.tar.bz2]
-md5=84396a3dd75337caaae29d8fa5616fb1
-sha256=aaad73ed8db764978a18bc6ba774d38a4c1330c86622c0b47ae3ced09c175856
-
-[http://xorg.freedesktop.org/releases/individual/app/xkbutils-1.0.2.tar.bz2]
-md5=369a21641b7ca983d6641298e51d97f8
-sha256=12a37d4594a4deb2642b1659f3827068c24bb8791a20b927c5f3b7fdb0c70bee
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkbutils-X11R7.0-1.0.1.tar.bz2]
-md5=798502eca0c6c3e8c02d76fabb910532
-sha256=8178a1c45af6e844ca0adcfe72fbddcbaebf3f305452a83e39768373981be92f
-
-[http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.3.tar.bz2]
-md5=d9e9f69f9c6ef5c5a8255cfbe6a57d51
-sha256=49f02ed7b0b246a640fb129fcb3d24d7560305bb6f04e69b09739554857f79f5
-
-[http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.4.tar.bz2]
-md5=a9fe7efbc67a6966c4d4501f0cf88073
-sha256=921a857dcf90a59df7feb26da5aabcf0bbfb749c46e2a46c3bc7a0280b83b0e1
-
-[http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.1.tar.bz2]
-md5=f66d76abb0f75514ca32272e23cca757
-sha256=77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de
-
-[http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.2.tar.bz2]
-md5=dca031355b4afcf8517a8258eeb730c3
-sha256=532df0398d3f4eab1cba8d0367c02a293ca74f2d89a27ef014854a2bde9a5a27
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkill-X11R7.0-1.0.1.tar.bz2]
-md5=35f47fd58d75c1ea5f414b21a10bdbf3
-sha256=fe59dfdcd43faf8efa778f9b2390525a606a62dcd7a70774982bc19301f6a3ce
-
-[http://xorg.freedesktop.org/releases/individual/app/xload-1.0.1.tar.bz2]
-md5=ba013813f9c21eb015559466f8d02a44
-sha256=8d51184d6b18eea2f64e0c5b88cd95edff8353ce6529e780f95b1f2347babbf2
-
-[http://xorg.freedesktop.org/releases/individual/app/xload-1.0.2.tar.bz2]
-md5=b41ed6b4bcfc9897366c27a94d2bf150
-sha256=86b176b6efc52557b1c7631bfdd5c17e7060a438e1e85ce15ec9657be356c50b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xload-X11R7.0-1.0.1.tar.bz2]
-md5=11080456822146ebc0118b15f4b911d9
-sha256=6b5b3ef58e6646f004a5f1cbc6be8f32b824cfbf78a30bf242e4f07083668770
-
-[ftp://ftp.x.org/R5contrib/xloadimage.4.1.tar.gz]
-md5=7331850fc04056ab8ae6b5725d1fb3d2
-sha256=400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4
-
-[http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.1.tar.bz2]
-md5=4c5482552f38a7d42398a694cc9b2ee6
-sha256=de59f9be3d45fe93f445f39bec3cea09753a671e56863ce77e3a797d2df526b2
-
-[http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.2.tar.bz2]
-md5=7365c0852750134119734bc1879f60ca
-sha256=47a8aa4e8190772e24dd58266fdd4ba2723b5d7a23365a3e4c07c1263ffb3130
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlogo-X11R7.0-1.0.1.tar.bz2]
-md5=0314b2f5173da64957031400638fa5f8
-sha256=1397377bae07e8907f73bc445e967d4d4400769e683c2119598d952c8ad28131
-
-[http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.0.1.tar.bz2]
-md5=69adcda848479acc3b82b3928812d191
-sha256=456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a
-
-[http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.0.2.tar.bz2]
-md5=dc8b420bbfa35091ea30edf57c952ec2
-sha256=d66cd7682e5ea2a52e8da8a75ea6154f40a3a69938c6c2cf5d5c1e012f5c121b
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlsatoms-X11R7.0-1.0.1.tar.bz2]
-md5=737b4d7893aa886e8e4181c94380a421
-sha256=6a079872319ac7934578cace787f4f89ea87258f6dd8b33e5b4359be1256e9a3
-
-[http://xorg.freedesktop.org/releases/individual/app/xlsclients-1.0.1.tar.bz2]
-md5=44473b880d26bfbe8b3d4d72b183cba7
-sha256=988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698
-
-[http://xorg.freedesktop.org/releases/individual/app/xlsclients-1.0.2.tar.bz2]
-md5=df270f7dd5528ae1b7d80c47585d8278
-sha256=8527cdd29d4fcc67df014bc8b371be98901c9082b8de81ea2302bf705c887698
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlsclients-X11R7.0-1.0.1.tar.bz2]
-md5=cc0d64e90eab0b90b38355e841824588
-sha256=05c269e322ed1ef54b8a32883c8676f46330ec70d85b0a158dbefc2b0e91ceb8
-
-[http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.1.tar.bz2]
-md5=ca9c6c88d0b83360b7b5092615fbf591
-sha256=c8d826194299b2b8e3c6edce7070f05421465b0118ed47135a0195d12fe8a720
-
-[http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.2.tar.bz2]
-md5=28958248590ff60ecd70e8f590d977b7
-sha256=cc6e519b783b082a2fe4cd06ea5b3693ee6bdb23f4b36e7a72753c524ef5111c
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlsfonts-X11R7.0-1.0.1.tar.bz2]
-md5=e8681e5671e7f01922ce6c8f2327e602
-sha256=1f8d23d5f7dac0f06bc6c6fe6ed7d8e620fe1b0057654da314e24f7c6faefc6f
-
-[http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.1.tar.bz2]
-md5=058d168d1c7c991b8d12158433ea5f63
-sha256=1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02
-
-[http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.2.tar.bz2]
-md5=7c6a783e42c88360ac31d259a864a19d
-sha256=51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43
-
-[http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.3.tar.bz2]
-md5=32f7ed4c089365cadb9382f6fbd750a9
-sha256=0368268a352d302d0b84229a71e3ea0e8d1c44019b1f06b6301ad7a106418553
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmag-X11R7.0-1.0.1.tar.bz2]
-md5=38ac487ac1b75be0253fe7f973947386
-sha256=d039d857c6d334d481452c20f5e419b1e120e03e6c9af709f071d9c00ffd9cd1
-
-[http://x.mame.net/download/historic/xmame-0.100.tar.bz2]
-md5=c289797531d540853c835a2bb9fad8bc
-sha256=7cceeadeab80f605ed1fba47feb9fd1736d08626ba3f5374dfbe55659232cdd3
-
-[http://x.mame.net/download/xmame-0.106.tar.bz2]
-md5=b2b18d32a03ebd4d9c9476fbb93695ca
-sha256=a385d86adebc2eb53b560bb522cf569569a74c4104605a8e7d61f1caa0f5e4df
-
-[http://x.mame.net/download/historic/xmame-0.86.tar.bz2]
-md5=b16782cd620ef970233eacd65462ad74
-sha256=bcb35dd4cb138e06bb016a42316dfcc59f82eeed6357902e1f230b4815e9ad93
-
-[http://x.mame.net/download/historic/xmame-0.87.tar.bz2]
-md5=817f825ea92baf5f5e98ecb13193b844
-sha256=5bd358381d75f17802a0c8dfc62dcdaf9e782ecad23c0fca3e5c5b6445ff7ba1
-
-[http://x.mame.net/download/historic/xmame-0.95.tar.bz2]
-md5=e2571ce90bdf1517eea4d8085170fe6c
-sha256=c3044870d1778b4f6d64463f0aeda2995aade1e0bea0feb6935d18bf44fcf6cb
-
-[http://xorg.freedesktop.org/releases/individual/app/xman-1.0.2.tar.bz2]
-md5=855f2dbfa2aff58b8b9cd6a1c1120fad
-sha256=00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2
-
-[http://xorg.freedesktop.org/releases/individual/app/xman-1.0.3.tar.bz2]
-md5=3d3a4b310a65ccce82472ef83acbbf97
-sha256=38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a
-
-[http://xorg.freedesktop.org/releases/individual/app/xman-1.1.0.tar.bz2]
-md5=5e5b3351bac26cc1f8490faf1c1402bb
-sha256=9d617ed760fe2147baae5ad9cbbdd85f1bb7534acfc3327bb51dad42e8bcc8b0
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xman-X11R7.0-1.0.1.tar.bz2]
-md5=a4f21547120952aeb8e5663ebd72e843
-sha256=3d159c703ba901657d9633b239d39b21c8de68a2c3358fd1aa4175d20359ef87
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xman-X11R7.1-1.0.2.tar.bz2]
-md5=89761d6047acca5fb6fb69eb2633afe9
-sha256=a7f195777e6520a912a231c3c97a5fba82d361bfeee8948a18c026da7b04654e
-
-[http://xorg.freedesktop.org/releases/individual/app/xmessage-1.0.1.tar.bz2]
-md5=b3674c3a00a089764d86aa94e257ccec
-sha256=b921aef62c2a2f5c32048502cd96630e9d42493cd39d1841fde247274f24bbda
-
-[http://xorg.freedesktop.org/releases/individual/app/xmessage-1.0.2.tar.bz2]
-md5=b4b561ef11fd184989a6062962e86748
-sha256=02b4016e93acab94105fa61f6dbe13082669276ab4650b871835fb7884b0c3c3
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmessage-X11R7.0-1.0.1.tar.bz2]
-md5=5a17607184fd348c2b36b5499ae9d2e6
-sha256=e9cb13ed6ae88cdeffe200ea1ec008b2413f182171c9d1ee7dede049f61df473
-
-[http://xorg.freedesktop.org/releases/individual/app/xmh-1.0.1.tar.bz2]
-md5=656bcbdd41818a8b5a9f7dba77a3eeba
-sha256=9471fb455ce0bfc582b865722ab7417c587c9fea82342181e9cd0a9629c2c6fa
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmh-X11R7.0-1.0.1.tar.bz2]
-md5=53af2f87dc096d84f11ca6fbd6748b34
-sha256=e86cbfb7d4fcad741751afd2e1304c41af42af3d95d09745cc27fb34200d5b8b
-
-[http://archive.apache.org/dist/xml/commons/source/xml-commons-external-1.3.04-src.tar.gz]
-md5=5536f87a816c766f4999ed60593a8701
-sha256=8e8a412aeb95644eaf14ec1a5cfd04833e38cac4a01b83d73d7de2368a35a597
-
-[http://archive.apache.org/dist/xml/commons/xml-commons-resolver-1.2.tar.gz]
-md5=46d52acdb67ba60f0156043f30108766
-sha256=55dbe7bd56452c175320ce9a97b752252c5537427221323c72e9b9c1ac221efe
-
-[http://xmlpull.org/v1/download/xmlpull_1_1_3_4c_src.tgz]
-md5=34c8a093e5678dd633411dfea88f8558
-sha256=e17aa1a26119966258a3656a262bbba0f0b036eecb6d9bf192cf4b497686f4c3
-
-[http://downloads.sourceforge.net/xmltv/xmltv-0.5.54.tar.bz2]
-md5=b006f72f45a3e7be3e64f88813275403
-sha256=aa9acb0c56f0e40f574e16b762fb590fbd0004bccac9847e2e710c041b90d412
-
-[http://downloads.sourceforge.net/xmltv/xmltv-0.5.56.tar.bz2]
-md5=308c01dc50f9f138bd9ada7483e2877b
-sha256=9159dc21418f611b37520bf71f32a0ca3b44cc490bb9620e9a1a812315685d1c
-
-[http://www.xmms.org/files/1.2.x/xmms-1.2.10.tar.bz2]
-md5=03a85cfc5e1877a2e1f7be4fa1d3f63c
-sha256=ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a
-
-[http://downloads.sourceforge.net/xmms-mad/xmms-mad-0.10.tar.bz2]
-md5=410b30968bdb4adce0baec8acc7f2ed4
-sha256=c0c89d93442c85296386199dc08a8ad9b480a29deea31936e5688c2bcc9a5265
-
-[http://heanet.dl.sourceforge.net/xmms-mad/xmms-mad-0.10.tar.bz2]
-md5=410b30968bdb4adce0baec8acc7f2ed4
-sha256=c0c89d93442c85296386199dc08a8ad9b480a29deea31936e5688c2bcc9a5265
-
-[http://mirror1.pdaxrom.org/source/src/xmms-tremor-1.0.tar.bz2]
-md5=998d2a399bd0fb9a2bcde6d5bd2443d4
-sha256=66514764e9aa0168af22a5b4334e9882fbb0b87285ee2055c1daceb3a2214315
-
-[http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.2.tar.bz2]
-md5=ea78b3e32e27c3662f86ea68b3aec22f
-sha256=4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44
-
-[http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.3.tar.bz2]
-md5=626731003ec22a74ecf9e44ed098bbdf
-sha256=c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f
-
-[http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.4.tar.bz2]
-md5=bbe021f812e0014a8ee3692317788119
-sha256=805a63525d99f59d60a11aa89121fb9cdb001c8d542237ac4deafbadc7bd0bed
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmodmap-X11R7.0-1.0.0.tar.bz2]
-md5=240ed53111925e005d2f138ea98ef5e1
-sha256=017530da4262a6e52c87cb8ea47aebc83fcd82346cc8072f02ba9de060407be3
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xmodmap-X11R7.1-1.0.1.tar.bz2]
-md5=0e11f78c00e27e775c4606c7e021cbf4
-sha256=ba875a916f4f9db29c87a48494fec65121ade424a7d98538920d326d8724bed1
-
-[http://familiar.handhelds.org/source/v0.8.4-rc2/sources/xmonobut-0.4.1.tar.gz]
-md5=41d9da556205c7cfcb86362387fa6493
-sha256=5002223fd102fc5bd454a8b62feb9d281f454769624a071804d6bfc82416a0b4
-
-[http://www.handhelds.org/~philippe/sources/xmonobut-0.4.1.tar.gz]
-md5=41d9da556205c7cfcb86362387fa6493
-sha256=5002223fd102fc5bd454a8b62feb9d281f454769624a071804d6bfc82416a0b4
-
-[http://www.handhelds.org/~mallum/downloadables/xmonobut/xmonobut-0.4.tar.gz]
-md5=2d9472aa72a7d530509aa12df58efdf1
-sha256=c26fd58cd16b13fe305b7dadcabc1764552cdd30b55e798cb218df3cb0c88f03
-
-[http://xorg.freedesktop.org/releases/individual/app/xmore-1.0.1.tar.bz2]
-md5=d36e918dce779a9d207b7a266f4e87c8
-sha256=653566be73c474bc45f1a6631e14b008445c74557a8f6f46effee1ac3e8f2527
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmore-X11R7.0-1.0.1.tar.bz2]
-md5=99a48c50d486b7c9098b4f5598782cac
-sha256=0616d2c8d7aa990787f6c27e412c65b3f5e1b9a42b12562700bc2da953def4c1
-
-[http://www.cafeconleche.org/XOM/xom-1.1-src.tar.gz]
-md5=e5ae82568d7b1faeb950140c34fbbcb1
-sha256=d648fd1f7b7437123afa63df06f6a6409a0487c99ca8f8beba75aaa474d65818
-
-[http://xorg.freedesktop.org/releases/individual/doc/xorg-docs-1.0.1.tar.bz2]
-md5=78fd95f6d5ea69d91723dcc16280c664
-sha256=b7b8593b055e29dedc0631e1db9781583038afc67bce0f715fdf3201570d1e4e
-
-[http://xorg.freedesktop.org/releases/individual/doc/xorg-docs-1.2.tar.bz2]
-md5=f817c5df43817846c1b27bac83da74d7
-sha256=23648ac11d5cc57f3e1e747a73bd1c4f83c42a657969814af0d399fdd3d7beec
-
-[http://xorg.freedesktop.org/releases/individual/doc/xorg-docs-1.4.tar.bz2]
-md5=4f2005bdd430a98c262901383459009e
-sha256=fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925
-
-[http://xorg.freedesktop.org/releases/individual/doc/xorg-docs-1.5.tar.bz2]
-md5=359ac83ad27eecd5588914ba8715301d
-sha256=62cc63582e97ad76a02acdb409123ff0e2cf33df25c9977e3b8a7606be75eafc
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/doc/xorg-docs-X11R7.0-1.0.1.tar.bz2]
-md5=ac0d76afa46ef5da9e1cf33558f4b303
-sha256=a3adf1c61247254cc81c80a6c020fe6a9fe0abbdc5f66f8631ec87a1a356c4ae
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/doc/xorg-docs-X11R7.1-1.2.tar.bz2]
-md5=a7c05bf0897ba99fe01af528c0831183
-sha256=5118569d9214c308b532cfb04df9cc14288f29b307adb00e3eed7f2ab5744efb
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.1.0.tar.bz2]
-md5=d070c58a598fb52c5cb86344725c4ad6
-sha256=da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.2.0.tar.bz2]
-md5=ea291c89e68832d570d9d5e007218bd6
-sha256=e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.3.0.0.tar.bz2]
-md5=a51a7d482e3c689394755bb17bda8526
-sha256=93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.4.0.90.tar.bz2]
-md5=bb16e969850dbb5d3805cb88d35656d0
-sha256=b89f2d17be5ba71e3cc25379e18155c55ea36ba94ac1abae953214f13c020ffe
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.4.2.tar.bz2]
-md5=fa2915ae377f61c340a18ebef484b64b
-sha256=829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.4.99.901.tar.bz2]
-md5=e548512ece2f2fd32e438fbbd8f5b857
-sha256=8c5b0f58a7f4382f052df0f4fb352c26953402d3298ee69d2d7077b510e09099
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.4.tar.bz2]
-md5=a06d9fe4f9f1d459ae02657f9ce64220
-sha256=51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.5.0.tar.bz2]
-md5=9a817e5f7374d45b4dbe64b21bc0fb61
-sha256=9a0687812eaceaccc21d55dead47f1fbecf8300a28604bd2c08aae6ff7874cd0
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.5.1.tar.bz2]
-md5=d16f5a033f001c9069b4141194614da2
-sha256=2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.5.3.tar.bz2]
-md5=308971036e25250e7fe3cccfd5a120f8
-sha256=a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.6.1.tar.bz2]
-md5=ed0878bf32a24d4948c3b8a122a39eff
-sha256=0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.1.tar.bz2]
-md5=dda7842467cda6018fdc87e6002e4db1
-sha256=a58c0de29cbd2b7d1a1ac5ee70a94ad1ed2a085132803c0ca83f2dd8513b4c20
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.2.tar.bz2]
-md5=5c087e0f555203065fd90d02ef5f736e
-sha256=f4fb49209a6f3cb1c5b039b1f43870774e2eac1540b4d3235a2f13bc441da159
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.3.tar.bz2]
-md5=4c63b22cad9ed8ae8b86561f0f92c327
-sha256=4b644113cd030fc77615c03c7b6529e063dc1d471ec6a990e6f62eb45a9c2db4
-
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.4.tar.bz2]
-md5=75d27c3a1c12293f620a2d6518fcbdfa
-sha256=b8ec11b3f2c6f84c21e8cd9804672ba6e27fda3e913d58dd947205ea253e33f8
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
-md5=0e7527480fb845a3c2e333bd0f47ff50
-sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2]
-md5=59bc20bcade0293042edc8a99aa2c832
-sha256=373e48b86e2b569d1c69274762ee50f30c49b1000d3524cbd05b3fc3ce60ccc2
-
-[http://repository.maemo.org/pool/maemo3.1/free/source/xorg-server_1.1.99.3-0osso31.tar.gz]
-md5=19a246ea30233ef3c5fe16248b771862
-sha256=211f4d13d8cd726b10553534a4d0f0267b18d39dd30b2f5bc6dfcde9f6d6b8c9
-
-[http://xorg.freedesktop.org/releases/individual/doc/xorg-sgml-doctools-1.1.1.tar.bz2]
-md5=ae3d4f73c42953b0a5513bb2967ab913
-sha256=be1fbd7646a55eb9a9ad161f9b83034ba88a82c780e29d4a7888db2495947f25
-
-[http://xorg.freedesktop.org/releases/individual/doc/xorg-sgml-doctools-1.2.tar.bz2]
-md5=f930e5be117922f0841614c8d43f1ae8
-sha256=4def78f2e0e002f5693b61b53ab4325fbc150d3614fe53818e8df9b365a4dbea
-
-[http://xorg.freedesktop.org/releases/individual/doc/xorg-sgml-doctools-1.3.tar.bz2]
-md5=1e3ee108688d1df91049a565813c973d
-sha256=d5c0279fa84dc4a61ba2a6a9a892b34b7e9266f9562721b529b0296f5b75dbb2
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/doc/xorg-sgml-doctools-X11R7.0-1.0.1.tar.bz2]
-md5=d08d4fd10ac46d8b4636efe4d8c0de74
-sha256=2a676fdaf45a7a1e40f4df2cbd09d542672c2d0fe1f890a874b8719e0a448ad7
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/doc/xorg-sgml-doctools-X11R7.1-1.1.tar.bz2]
-md5=2b820facb5658160a08ff4d9ca906ad5
-sha256=594d9b543d3e183d5f0a3669a2a1e3c8e18b1f10bf6952dc6c614aabe1a288b5
-
-[http://prdownloads.sourceforge.net/xoscope/xoscope-1.12.tgz]
-md5=89f8019a772713a976b634305d29cfe5
-sha256=d7dec98f0d85f7ce889d0b2fcb4ed683a6384057ccea2ab531a0710969ff7ca2
-
-[http://math.mit.edu/~auroux/software/xournal/xournal-0.2.tar.gz]
-md5=db62deddcbf4dc7d52b7da405e61ed0d
-sha256=be1c24d49086a2b45462fb17deb8142533616182d728fd826a30bc32a87ed087
-
-[http://xournal.sourceforge.net/xournal-0.3.3.tar.gz]
-md5=c617d08d2c565eef0d8defb304925ade
-sha256=77f3bf12ce006eb06fc79d9c60a13ff69403ca6c28cc2babafb0ae35a2240ead
-
-[http://xournal.sourceforge.net/xournal-0.4.0.1.tar.gz]
-md5=e0f356e0a7b310b0d4b2976e6b7b74fd
-sha256=bb797a384b9acb8209fea572934d1b1484c5de41f062fe152ae99962f52f98ea
-
-[http://xournal.sourceforge.net/xournal-0.4.1.tar.gz]
-md5=b3d352d08e71606383c31da5790b8d60
-sha256=dff617ca33dc263caecb6afc5d42c109166ef2a1c0fe0afa070ff6691ea0e8d7
-
-[http://xournal.sourceforge.net/xournal-0.4.5.tar.gz]
-md5=795e4396ded2b67766eb2926be1fb4a9
-sha256=a7d7c2cb544451939779276e6e5ee5acc756bd0efb5253de15dc00bfe07755d1
-
-[http://xournal.sourceforge.net/xournal-0.4.tar.gz]
-md5=139ef3045c99dc5c07118b47ff9257e1
-sha256=4de076c38b4b64188d23821e7d7a0f6a26b1d6707e768dadda14eb69dcc84598
-
-[http://repository.maemo.org/pool/maemo/ossw/source/x/xpext/xpext_1.0-5.tar.gz]
-md5=1b0cb67b6f2bd7c4abef17648b062896
-sha256=a3b06f5188fd9effd0799ae31352b3cd65cb913b964e2c1a923ffa9d3c08abbe
-
-[http://xorg.freedesktop.org/releases/individual/app/xphelloworld-1.0.1.tar.bz2]
-md5=5c7fd1e35dd63089229e357c46e4f407
-sha256=b1ca08e3ba4e5b135ee9d8675e717a6f88eafa53b031b2b821d2760897e35426
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xphelloworld-X11R7.0-1.0.1.tar.bz2]
-md5=80c9a23c7efb72b9674d7af6b7346992
-sha256=4fbc61ec9405b0797318dcf54f5c3a3cc83221f27014563113d2f3f78b3982bf
-
-[http://xorg.freedesktop.org/releases/individual/app/xplsprinters-1.0.1.tar.bz2]
-md5=c1558277f4a010473ff0744845c49537
-sha256=adc60a1808e0974b75a0e7f95022f23411a0e2e9f83e84c441cba5f28f8db072
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xplsprinters-X11R7.0-1.0.1.tar.bz2]
-md5=1d0a68dada5e14ab07d7660abd4d03e3
-sha256=4f54239ec09f4555d15969d44ac84719e739f78071b0f7855ec620a1f0257a3b
-
-[http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-1.1.3.4.O_src.tgz]
-md5=e1b6aeaad1cd06e64568aae1a507d5c6
-sha256=404c0cd332f54ecf9807dc86d365c17dcffab669994c9dcbbad31fbc4b59f811
-
-[http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.1.tar.bz2]
-md5=01c0a14755fc91369e8c011c9f881d5d
-sha256=b871221d23dc4fc50398e9fe0e2a6a4e951aa6c9df2c5671d069ad88f0fd6249
-
-[http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.2.tar.bz2]
-md5=6b3a6896081f628bf5a2c9129417c86f
-sha256=c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf
-
-[http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.3.tar.bz2]
-md5=1c2c540d240def3ea65ff2030f059f8a
-sha256=2878d6b04ef81ec415fa81313565bee521bf94132127615b9d717d5a489b937d
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xpr-X11R7.0-1.0.1.tar.bz2]
-md5=487b5ab96b373acb80808758ce23eb49
-sha256=8c77256313114c80d49ac5db0013c439ddf9888f2d265f66c9ee3da2de46cdf4
-
-[http://xorg.freedesktop.org/releases/individual/app/xprehashprinterlist-1.0.1.tar.bz2]
-md5=99ee20a9af25375895f5d7ebc1004163
-sha256=ba67e9256f703d614ab891b1d676fc26e7479094b957370cbb363c78b2f20259
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xprehashprinterlist-X11R7.0-1.0.1.tar.bz2]
-md5=3907bce78d304dedb2a5dd6944bd2ed5
-sha256=cc28f5d046d60c12e71b88863c502cca3c6457a07996bd54974debe115f11d73
-
-[http://downloads.sourceforge.net/xprint/xprint_mozdev_org_source-2004-07-07-release_009_001.tar.gz]
-md5=83a43006896fc270515a86f9ccec2c35
-sha256=03d2b69abb17382ead3bc796d451a61d576ff9ac2af34dcd6aba39f77e03df59
-
-[http://heanet.dl.sourceforge.net/xprint/xprint_mozdev_org_source-2004-07-07-release_009_001.tar.gz]
-md5=83a43006896fc270515a86f9ccec2c35
-sha256=03d2b69abb17382ead3bc796d451a61d576ff9ac2af34dcd6aba39f77e03df59
-
-[http://xorg.freedesktop.org/releases/individual/app/xprop-1.0.2.tar.bz2]
-md5=5b6f02a3b1cda0cadc35f84814fe53d4
-sha256=88b1e65703c68f14ac6cb735737d1a0e52751a18fdc8a39d2d1e5eaa07875ca0
-
-[http://xorg.freedesktop.org/releases/individual/app/xprop-1.0.3.tar.bz2]
-md5=e7b16eeb4bab974e3592d62f415aa6a5
-sha256=ddda23b888a3b4cf96a508af7ae07e3b2f1e9f2f2f0d5f6b2684cfa162337fa6
-
-[http://xorg.freedesktop.org/releases/individual/app/xprop-1.0.4.tar.bz2]
-md5=48aa8fd78802f477dcbf9ef0dfd9f783
-sha256=daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772
-
-[http://xorg.freedesktop.org/releases/individual/app/xprop-1.1.0.tar.bz2]
-md5=f0bacbd30f0dd1c1e9ccafe97687b7a4
-sha256=cc8e07901574895f113baffda19272c54545879e02012314527ebbf2dcc66226
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xprop-X11R7.0-1.0.1.tar.bz2]
-md5=6730f0fbad6969825580de46e66b44dd
-sha256=295a7f8bf08ca36c2db0defc1e5d38e498e7a7b6d7a0a78853e87ef71645388d
-
-[http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.10.tar.bz2]
-md5=2ed80e90992e7455eaac4c3e977ebd01
-sha256=6d659920262d41e48714184f94ff9cd2608515e0f3d2f074892fe0c048784df4
-
-[http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.11.tar.bz2]
-md5=6b6c266576d81c505aa4a1828151f7f8
-sha256=4ba69b7ef195c1a4e2e8ea9a1101f5079ada1f060c66968226754687685e9e53
-
-[http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.12.tar.bz2]
-md5=388234421add6c1760b4fc99fcdc76b0
-sha256=bec5a98bbea56da069785784116261ec956df039fb07d0cdca53ae1ed03ebc0f
-
-[http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.13.tar.bz2]
-md5=7d26f45dca52632712a696e0631dc17b
-sha256=6f6328922d69f5de29513a5baf1d010db2a7a54cb58a7a6cbbb1b25097ecd592
-
-[http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.15.tar.bz2]
-md5=1a2b31430d04340be2e49e8b6445e076
-sha256=fd8cd0bc3e94d7416e6af9eddfa909b0e64246e0d2bb41c00f4e02bd85c76bee
-
-[http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.16.tar.bz2]
-md5=75c9edff1f3823e5ab6bb9e66821a901
-sha256=8224da1ce19c0ded4e07a325f3ed62bb4453782db97fd175cb3ffd1acaeb9672
-
-[http://xorg.freedesktop.org/releases/development/X11R7.2-RC3/proto/xproto-7.0.9.tar.gz]
-md5=937c572775ff4a2edfbbf5568dc0e959
-sha256=e68db1c55c1c6d398098d69096b3c3b35863b5d25ef216cb2d1d4364ab0000af
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xproto-X11R7.0-7.0.4.tar.bz2]
-md5=643259d00e02db8e9a6f4c047281b5d9
-sha256=78dec6988b9eec524ede61e04a379ff52fac23816c2824d7782a6e618997c31c
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/proto/xproto-X11R7.1-7.0.5.tar.bz2]
-md5=930c4c618a6523fec1095827d8117fed
-sha256=0a9930e2ed7501d638cd90c948278b4f20e225c78c92cf2619e2b55a024e890e
-
-[http://xorg.freedesktop.org/releases/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2]
-md5=d28007a50976204960fc1fc07b4ca093
-sha256=c45176d002c85c142ac52774680f5325d330c5ecc32d4d6a056d85ee039a0cbc
-
-[http://xorg.freedesktop.org/releases/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2]
-md5=9de22ca1522008c28fb03dfc41ba2d30
-sha256=7382acd8c76fa577beb622cab86cc07fafdcecbbd9b4f209bfa72976c4fd26c2
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2]
-md5=977ee3fd1525418aaa8bfc55ffbf6fc9
-sha256=f3c25042dfd332c3aee22176b3bcd244a99bc475112a97d9d4cc03505fe7b48f
-
-[http://xorg.freedesktop.org/releases/individual/app/xrandr-1.2.0.tar.bz2]
-md5=9e74e6919cf731ec10ce26fd6a4483fa
-sha256=7bf3bd3cf46a6a29e35b9dd1c8d3d14494be76da0d24c6ef5dab36974445004d
-
-[http://xorg.freedesktop.org/releases/individual/app/xrandr-1.2.2.tar.bz2]
-md5=c6ec9dc42396e3b3a2da932f3feca6ec
-sha256=632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303
-
-[http://xorg.freedesktop.org/releases/individual/app/xrandr-1.2.3.tar.bz2]
-md5=41a9d0cc073fa6165a31fbf9e85f68a6
-sha256=ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207
-
-[http://xorg.freedesktop.org/releases/individual/app/xrandr-1.3.2.tar.bz2]
-md5=2cb19bb1c19ccf77c40032b03dbe06f0
-sha256=34d4334644a6494573141bb8647feb8f91c0ce8c8d3b6883b4861e038e912249
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrandr-X11R7.0-1.0.1.tar.bz2]
-md5=e433ccca3c4f9ab8609dfd1c9c8e36ea
-sha256=40ccd95d26c43d326fb8396ca758334bf34854336007b46285d3e881cb66e73a
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xrandr-X11R7.1-1.0.2.tar.bz2]
-md5=e148e9ba69092127598c8d72debeae90
-sha256=f332a1826674b93c23d53a958c1ad9b144aead34e0222f3a94579f8721987793
-
-[http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.3.tar.bz2]
-md5=380b2ef545306354cc150834de567be7
-sha256=a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c
-
-[http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.4.tar.bz2]
-md5=34eb2311a0c5279e7b4f492e826f63d1
-sha256=3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000
-
-[http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.5.tar.bz2]
-md5=9c30b8e1709d5367beb7706146640c07
-sha256=c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa
-
-[http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.6.tar.bz2]
-md5=8dd881cd5a7dcb6e456549817f0fb475
-sha256=8d062a3764665fcf22b14df4a5aca6af1e6d7d613296875b31b68e74ef66fc99
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrdb-X11R7.0-1.0.1.tar.bz2]
-md5=a3c1fd6f5391de7f810239a912d39fa5
-sha256=adf3f97fcb0d768e19058e94dd4aaec70ea61afa8077f6c6e99aa70bc8564e14
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xrdb-X11R7.1-1.0.2.tar.bz2]
-md5=2187897f97f0c818b27f8b8d33f31fa8
-sha256=8be898b0514248d430a4c71be3ffdf6da8e296dabae27a186ed662f38c386397
-
-[http://xorg.freedesktop.org/releases/individual/app/xrefresh-1.0.2.tar.bz2]
-md5=1228f890f86148e4e6ae22aa73118cbb
-sha256=522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5
-
-[http://xorg.freedesktop.org/releases/individual/app/xrefresh-1.0.3.tar.bz2]
-md5=8f4fafcfb77b3c6972cc44bb3f1c899c
-sha256=3ee0a5f7aeb14bbffbcafcff8e7806c9a59f08e1a58322a50f5fca023a7d7ed9
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrefresh-X11R7.0-1.0.1.tar.bz2]
-md5=5a46d5fb82aeeb4d6aac58c9cc367439
-sha256=9915ee47ff85d83eee825b1a44857b92b4b16558e4bf436671ae7a37f4ab65ad
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xrefresh-X11R7.1-1.0.2.tar.bz2]
-md5=16df4b8f3d844236dfd24efd88e8ea99
-sha256=964f96d9d86140564fa42de6f803bf3065ef287620cec4462d2fae8ca396034b
-
-[http://projects.o-hand.com/sources/xrestop/xrestop-0.4.tar.gz]
-md5=d8a54596cbaf037e62b80c4585a3ca9b
-sha256=67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257
-
-[http://xorg.freedesktop.org/releases/individual/app/xrx-1.0.1.tar.bz2]
-md5=5f65e24f8a225e255beb2059e33d6b37
-sha256=a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4
-
-[http://xorg.freedesktop.org/releases/individual/app/xrx-1.0.3.tar.bz2]
-md5=c121945afcfc84e99af17158fda68be9
-sha256=9cb0fc67153ce935550d61dfd3d021cb3e6833274453538885b7cddff9fe8abe
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrx-X11R7.0-1.0.1.tar.bz2]
-md5=9de3b04392c98df59c79a34fd51c385f
-sha256=2a177a9f36c92fdc109260a7c04980db6920fb9d3529d79e9bc019ae7f5a310e
-
-[http://www.rpsys.net/openzaurus/patches/archive/xscale_cache_workaround-r1.patch]
-md5=aeff1063bec0e906a20b9a6bbc8a83e3
-sha256=fbf0ee62f55c432cd930df45ae31b39b9db3a44a80ebb472b06e59bf8ff78d75
-
-[http://www.jwz.org/xscreensaver/xscreensaver-4.22.tar.gz]
-md5=9f37c428f034e581026e243445378195
-sha256=d0a4a6a60a1cad27aebc23580acdce442d3c6d8eae782883c7df08b3fc3184a1
-
-[http://www.jwz.org/xscreensaver/xscreensaver-5.07.tar.gz]
-md5=55a12fcb5d3a7231c9850ef9d9f82918
-sha256=8c50a74c07b1fffcbb20bd79e3ee92f1f52191e5a187433bb49964ccf94badb6
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.10.tar.gz]
-md5=b73f38a79582e0d026a52bb5ee3ea0e3
-sha256=7ada44f9b7bd1071d846e7c0dea6399ebcfd45d37b9583a4e44d18cf5c5fca29
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.11.tar.gz]
-md5=6a5f7bd7d20c6bbcb5ab3db4f425afac
-sha256=3494a5fb80514cd1f1be784f08bd9fce12b080dbdfeb9b7ad50961094e901d50
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.12.tar.gz]
-md5=9e66d7699ca6bad1c3a5914ac8bfcb91
-sha256=e82ec094d193cdd91aba699eff95fa6adaa01235f9ec4a68b1dd022c1b4496ef
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.13.tar.gz]
-md5=bd12dffbef3b5a87bf96fa3d8978127b
-sha256=fdfa2591756c5709d0531cc73fed07fb4bd50509c706c31ebd5c7301930be806
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.14.tar.gz]
-md5=4cdc10f4c429cfcf5bc6e28fe028cf0f
-sha256=260faa13632aee22573f766c0dabed6573e959d1f686c5880b151f393df6d350
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.15.tar.gz]
-md5=380e75e6ec4b19b90372cc90e249f859
-sha256=793e282c30c301ac5f2fd58f43dd59a691da1c18c7fbcbcbd9a08602f3ae8799
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.16.tar.gz]
-md5=237d27a5b46d1fa88fb43fb1a40cf209
-sha256=c93e01cd754e8cafc6e02d32a7304d4b152e6aba9e6b0bcaea9ded12263f24b4
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.18.tar.gz]
-md5=72c8b5c4c4aa18abe4f29308d2726e1e
-sha256=3e198bf84fac63cd5d93521c1646cf6dc2d959b4c84a16aa9cd1d9ca94ddd212
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.21.tar.gz]
-md5=7810436d0085f8808a09ea6377526c71
-sha256=723dbbdfac6e421aa3343a2f1cef7cfb998bb5c045dcf0df870aeba6dd78b79d
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.22.tar.gz]
-md5=658badd22689cdde536050f740ec8319
-sha256=70a767f1109bf70353c58b0fb54626a1300fd0724017196bfd17d13a582ddd62
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.24.tar.gz]
-md5=6d7aaa9c267427ddb78faf008cf78187
-sha256=8109646b77c08a0f269531ad42475782101a88681c2590453f4a5c9fe4681932
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.25.tar.gz]
-md5=95faf3cc8c0a70352e9580fc873ca693
-sha256=f0391d08a6763598066e21d83460493973fe24fc65e3f0d2b534ef2497946a34
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.3.tar.gz]
-md5=b55e9347b9aed725cc7baf91701cdd83
-sha256=177b5a3e65d7a64b5a0fbbf1b10f8e3d020a20c823b1bb9f3269dc835df213e1
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.30.tar.gz]
-md5=67320288d285a627391f54ed739fb12d
-sha256=5de3bc0c021647606fd23863f44508f851252bebce579f920e020caed74b63f0
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.31.tar.gz]
-md5=ac2515a68bc3c5cf3729aa2ff4edebdf
-sha256=d9991f22b5f52bc4cfe579f4e3fbb6d04f8d7ce575bd04a94372c14584ddfd34
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.32.tar.gz]
-md5=cdb63bb95074cfb778250defc3ca585e
-sha256=a10641a046f39d6044882ec8bf44d28020291b75006374245daab1b73c0dab15
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.8.tar.gz]
-md5=1e2b9633a0cef8c525d66026a9f22c87
-sha256=cfbe37b066beee3c3a6e85806fc1588aa737b7bd7b3647e9eb91e03f21571527
-
-[http://gpe.linuxtogo.org/download/source/xserver-common-1.9.tar.gz]
-md5=6abed999858aff0fff9cf39f65ac5c3d
-sha256=7739ba3ab0203f98302338afdb6f6af1b4620454e9115f56fe88d177b50f8be8
-
-[http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserver-kdrive_6.6.3-5.tar.gz]
-md5=a332bc9fd05b6d1203a73dba94985e53
-sha256=16f6f6ccb3eb29042ac53aac0c7d5f467f59bb0ce70224dc311eeff509a6a39b
-
-[http://xorg.freedesktop.org/releases/individual/app/xset-1.0.2.tar.bz2]
-md5=1b781a0802c7b8fb9619a6665607b3f0
-sha256=ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9
-
-[http://xorg.freedesktop.org/releases/individual/app/xset-1.0.3.tar.bz2]
-md5=657bbb43ce5470c33665d187c1740566
-sha256=0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11
-
-[http://xorg.freedesktop.org/releases/individual/app/xset-1.0.4.tar.bz2]
-md5=2f41fd983ba4d89419204854936025e2
-sha256=6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad
-
-[http://xorg.freedesktop.org/releases/individual/app/xset-1.1.0.tar.bz2]
-md5=eeb0d02f69c76bd40470dede99b4bd49
-sha256=72c859c6030890a25cf828d0b2743454e50eadab30f6be8c17172fe97a554643
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xset-X11R7.0-1.0.1.tar.bz2]
-md5=a0350e334a215829166266e2ce504b1c
-sha256=db17d017fff06df2e47f9d123bfb4f1d63a063eb3c08ec017292cc206bb293d1
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xset-X11R7.1-1.0.2.tar.bz2]
-md5=ba1e928daa7146e44e3c55db323884f4
-sha256=f27e8dc088d9ca3aa9493ae13422a8c02ce07543780f1fe09985a0d8f41136d4
-
-[http://xorg.freedesktop.org/releases/individual/app/xsetmode-1.0.0.tar.bz2]
-md5=d074e79d380b031d2f60e4cd56538c93
-sha256=988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xsetmode-X11R7.0-1.0.0.tar.bz2]
-md5=d83d6ef0b73762feab724aab95d9a4a2
-sha256=ff7e076c77c35f746bc01d15d3ff9e203a45a850ef7e26ef11726b0b9f709e4a
-
-[http://xorg.freedesktop.org/releases/individual/app/xsetpointer-1.0.0.tar.bz2]
-md5=c94ea103e27e370e4e5030e50c5d5d69
-sha256=7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a
-
-[http://xorg.freedesktop.org/releases/individual/app/xsetpointer-1.0.1.tar.bz2]
-md5=9e5bcbeda4aaf02bfa095e41d30baee4
-sha256=495d88871eb5081e98bbae55f813f73cb3ce4145d6ca3e8f2826800166c04571
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xsetpointer-X11R7.0-1.0.0.tar.bz2]
-md5=195614431e2431508e07a42a3b6d4568
-sha256=103e35a5523e9237ef3a27bb8e08ab4443de5ceedfe5784be48afde6fba6cd06
-
-[http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.0.1.tar.bz2]
-md5=fc7eeb7130bb54345671a9dbaab567ac
-sha256=897d77acd3f4a366472386139827eaac24cc423c811ef0e65e0d5eca099a3155
-
-[http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.0.2.tar.bz2]
-md5=9af7db9f3052aef0b11636720b3101dd
-sha256=4f9a751f4830d479fae8ccb68ed04896dc99612789310b7917bd15c04aa3351d
-
-[http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.0.3.tar.bz2]
-md5=cbda9b9b8da5af4614110883d5a276b8
-sha256=d7e512cc686de3ab5fcd3c9f9e605d7cae68a4b50f2c0786f0f09ce08c728f48
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xsetroot-X11R7.0-1.0.1.tar.bz2]
-md5=e2831b39cd395d6f6f4824b0e25f55ed
-sha256=8327c294491dbd13c06c8d5d6bf971dca215f59facce99d3e4d0c170d7f0fe44
-
-[http://gpe.linuxtogo.org/download/source/xsettings-client-0.14.tar.bz2]
-md5=63e6c23e5a2036cfba77bd22c9a7bff2
-sha256=33237bb8fdad27e7f9fef9122198654e4e39081582baeb60ca4246308ffa4eb2
-
-[http://xorg.freedesktop.org/releases/individual/app/xsm-1.0.1.tar.bz2]
-md5=cce867ff7d0df9c0b9e682591779952c
-sha256=2f2535b5394d59be0a4bb15c12ea1b19b873a0096446ecc4c71aa81f0d99b29a
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xsm-X11R7.0-1.0.1.tar.bz2]
-md5=e3588272ce3b7dc21d42ead683135a8a
-sha256=c66e75117b4aa9dc3272f1568f83321a1273ab50309fcb4bc64e62d124596a49
-
-[http://go-mono.com/sources/xsp/xsp-1.2.5.tar.bz2]
-md5=adb7871e5ebeefcf8ed959523442c0fb
-sha256=25c246b7ed3e82a5f3562c2c15db551332830de4c238a53e3260ab7d40cd015a
-
-[http://go-mono.com/sources/xsp/xsp-2.4.2.tar.bz2]
-md5=53f544584224dd6470cf1d4913ac077e
-sha256=5535162fcbe4b2bec7df15127ad48d747212723413e021b2e90a931e75b80063
-
-[http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/xsp_1.0.0-8.tar.gz]
-md5=2a0d8d02228d4cbd28b6e07bb7c17cf5
-sha256=8b722b952b64841d996c70c3278499886c81bb5012991beed5f66f4158418f59
-
-[http://gpe.linuxtogo.org/download/source/xst-0.15.tar.gz]
-md5=cbe38d183fa6cf0d7c29b4befd0d71d6
-sha256=f5d79766715012ea7bb7ef164994963950c3343ef025ee71d1540aa26ab48c8c
-
-[http://xorg.freedesktop.org/releases/individual/app/xstdcmap-1.0.1.tar.bz2]
-md5=86ab558441edfb86f853639e4290a754
-sha256=0d920660137dee514599f63b5a8c8ce14d2474607e28e32c973cafb360f7e738
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xstdcmap-X11R7.0-1.0.1.tar.bz2]
-md5=e276aa02d44dcacf5ac13aa0cabd404d
-sha256=3af07e423eddf28593a424f6cd53291d1413b905ddd6915aaa3f44007b238a8c
-
-[http://www.oesources.org/source/current/xstroke-0.6.tar.gz]
-md5=bdfa8834bc2e78c4874d558025d944e2
-sha256=a3a947e9982fe1feef235fcbcf41b01b5f86ebf46d106fa719801cf061f6bb00
-
-[http://xorg.freedesktop.org/releases/development/X11R7.0-RC4/extras/xterm-207.tar.gz]
-md5=3de8a3756c284a46a08c6d0308909486
-sha256=652f579171e6e8f73c13ab6b060d2447ae35ebfbd39a6002b7c05a1dfc0f7eb8
-
-[ftp://invisible-island.net/xterm/xterm-243.tgz]
-md5=be25d2d3661d0bb77fc66e1bcbb3caba
-sha256=2621e7362713b588d1ec035f969194f160896b77f6455a26fd81dcc6e29b9877
-
-[ftp://invisible-island.net/xterm/xterm-251.tgz]
-md5=343a4ce213f70c53cf65979f163bebc3
-sha256=2ff9a4ae66cf9a48829023d1d007b0e84ee9cc60feb48107f9c1ea9dd7570ce7
-
-[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.0.3.tar.bz2]
-md5=bb196907ea1e182dcb396eb22f7d2c1a
-sha256=e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085
-
-[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.0.4.tar.bz2]
-md5=8b36cdf08df12be96615e3d550236626
-sha256=765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c
-
-[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.1.tar.bz2]
-md5=8546e3a060aefb42c889eaa4b5db33af
-sha256=16bc4646f105efd3d0dd105899ac19035d67acf50950ca8c70cf68772508272d
-
-[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.1.tar.bz2]
-md5=96e142331edd498a9364887b2548f1bb
-sha256=9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd
-
-[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.3.tar.bz2]
-md5=f9cf791dfad59cf044e276aab3a71e1d
-sha256=a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0
-
-[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.4.tar.bz2]
-md5=b3b57e78dc06885e79f8393a83619715
-sha256=a26adb573ec47a21a8772d8ad89690c629c9128f8d3037d9037b032ae24cc76e
-
-[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.5.tar.bz2]
-md5=2d1e57e82acc5f21797e92341415af2f
-sha256=cc71a391f4da8176e5daeeac1ddf5137ba5e8d2263cb93a49f9e2a9976b90899
-
-[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.tar.bz2]
-md5=a91fef8b932b21992af7dfff7b2643f3
-sha256=d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/xtrans-X11R7.0-1.0.0.tar.bz2]
-md5=153642136a003871a9093c8103d6ac5a
-sha256=c9a049b4367318b53cbad02bc7e3c4450778e3237400a515b2a6272405b8b912
-
-[http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.2.tar.bz2]
-md5=97a62a011a11f03b46d72851aa298fa8
-sha256=8f513da45b0c65dff4a3d477e5600a98d677571d7ed283f52c905987dcae0fbc
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xtrap-X11R7.0-1.0.1.tar.bz2]
-md5=6d56946322d2875eb33f25f5e5f621a3
-sha256=be25959a38d1e2d3b54e5620863a95c2eb712c6b4bce698b88ccff66d2964559
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xtrap-X11R7.1-1.0.2.tar.bz2]
-md5=435778018128f2b9402252c9022b44fa
-sha256=291ee660e3737f4bf95ea1499d218df108ed4eecdc3642f597f925f05d422fc7
-
-[http://gpe.linuxtogo.org/download/source/xtscal-0.4.tar.bz2]
-md5=a5bb88b23d1b49d001010b6ab5efd1be
-sha256=c3eaee0abc49e401ef9d91d1e44d65441ec76db367e4d3ebf24a15aeab62a016
-
-[http://gpe.linuxtogo.org/download/source/xtscal-0.5.1.tar.bz2]
-md5=9ae79f1c64551a1cacf506fde6d83ef6
-sha256=39c354adb9783fc30d4df6edbe04f68b69d5005b1bd7353dca506ced3b8b594e
-
-[http://gpe.linuxtogo.org/download/source/xtscal-0.5.tar.bz2]
-md5=960acbb885e4de593210c680360dc234
-sha256=a3cfc867672924f27d5ed39a99bc089cc9417d193513984f0a081a92230e947b
-
-[http://gpe.linuxtogo.org/download/source/xtscal-0.6.3.tar.bz2]
-md5=9bcab80b474d5454477d1ca166a68c34
-sha256=27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1
-
-[https://launchpad.net/ubuntu/karmic/+source/xubuntu-artwork/0.38/+files/xubuntu-artwork_0.38.tar.gz]
-md5=38626b5ae9abfe00428a5f0a265d5177
-sha256=8a73aea3fcb2b33968bc12f28befbf7a83c5d45fe1898e54855f095538238b8d
-
-[http://downloads.sourceforge.net/xvidcap/xvidcap-1.1.6.tar.gz]
-md5=c6add7ae452e5cecbdda6e55e7c67cdb
-sha256=17ca7b7f8ce12f7e312b2abc2da7f381dc0e964cdac6312631cd7987f02b9fba
-
-[http://heanet.dl.sourceforge.net/xvidcap/xvidcap-1.1.6.tar.gz]
-md5=c6add7ae452e5cecbdda6e55e7c67cdb
-sha256=17ca7b7f8ce12f7e312b2abc2da7f381dc0e964cdac6312631cd7987f02b9fba
-
-[http://downloads.sourceforge.net/xvidcap/xvidcap-1.1.7rc1.tar.gz]
-md5=449ee23b6ea171f090b9de48ffefb364
-sha256=487bf07b2f9ead6a59682d091081e47cfe4ca5777de32e6cec5bef55fa51c82f
-
-[http://heanet.dl.sourceforge.net/xvidcap/xvidcap-1.1.7rc1.tar.gz]
-md5=449ee23b6ea171f090b9de48ffefb364
-sha256=487bf07b2f9ead6a59682d091081e47cfe4ca5777de32e6cec5bef55fa51c82f
-
-[http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.1.tar.bz2]
-md5=e0744594f4e5969b20df28d897781318
-sha256=6d0feb42c2f1d6011d97c776b9d580fd589cdf3cfe246cd99437c406a2740d36
-
-[http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.2.tar.bz2]
-md5=e40eeb4454f2a7cdde3a14f5dfd3aadd
-sha256=73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xvidtune-X11R7.0-1.0.1.tar.bz2]
-md5=a12e27fb732cb115b6adc4c724c44c5d
-sha256=f7b3925d7e9981d146d3e5774de0521e6d48e2ed99841f538f267e8bc58bf5cd
-
-[http://xorg.freedesktop.org/releases/individual/app/xvinfo-1.0.1.tar.bz2]
-md5=0a5bd8e43de6eb8ff5b5bc673204401d
-sha256=439b3c7ad96fc7b1ef9156c716e10b607883a9a58b777f8dc02f03284eb33fb3
-
-[http://xorg.freedesktop.org/releases/individual/app/xvinfo-1.0.2.tar.bz2]
-md5=e1e318436f49e2f0f3764593dadd9ad2
-sha256=126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150
-
-[http://xorg.freedesktop.org/releases/individual/app/xvinfo-1.1.0.tar.bz2]
-md5=8cc299b2cb636b5f7fe672610789d3d4
-sha256=0a318f6ca0d92bd5cc2ab9d2690f6120b3e1537b7902ce110469864869e86efb
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xvinfo-X11R7.0-1.0.1.tar.bz2]
-md5=39d79590345bed51da6df838f6490cbf
-sha256=5b52a7241aef8e3372fb15f58f2276e043e19a87269aa6a0330b5823bc3697f6
-
-[http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.1.tar.bz2]
-md5=911addfb7fa402217ddac63e5c1d97c7
-sha256=c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131
-
-[http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.2.tar.bz2]
-md5=0a6ef08a2ac08ad5c4dd1522eb3788a3
-sha256=ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61
-
-[http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.3.tar.bz2]
-md5=007cea1f389abde5c93162dcd5541351
-sha256=fff2dbea086c554463d4309209ee05e026b7f19900598f55e0a24a6d7a7ee3fd
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xwd-X11R7.0-1.0.1.tar.bz2]
-md5=596c443465ab9ab67c59c794261d4571
-sha256=8ec0abf34ec88f3681666c7727749bac1ccf3f935c1c7f78c009a764f7f0fb11
-
-[http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.0.2.tar.bz2]
-md5=e5dbc8866a55958297f5f38205b6be1e
-sha256=9fdfd3259b335531cdba831872ec0e32c5f6df01e14b87c3187b494be75b7b66
-
-[http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.0.3.tar.bz2]
-md5=721f84332c98c33152460bb22ba9ded6
-sha256=fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a
-
-[http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.0.4.tar.bz2]
-md5=e2a9bf5ab7f2a0866700a3b49dd8c6bf
-sha256=df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4
-
-[http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.0.5.tar.bz2]
-md5=908f8bc3255f639effa9780fb1c19ea4
-sha256=8db6b81a7b0bc4e7acce6c6d41df9747b0b19e12c21c5a70b51bbc63a42cdcd9
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xwininfo-X11R7.0-1.0.1.tar.bz2]
-md5=3ec67e4e1b9f5a1fe7e56b56ab931893
-sha256=75bc03d2eafd4c7139d707fb86b023376d5a5ad2e9315dad53b250cb19e8bce1
-
-[http://xorg.freedesktop.org/releases/X11R7.1/src/app/xwininfo-X11R7.1-1.0.2.tar.bz2]
-md5=6a80a6512b9286f15a5bc47d3a019bc9
-sha256=55fc617d536e58f088c694e71e1a02d3019c887c9abd2222574f84866b145d5e
-
-[http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.1.tar.bz2]
-md5=6e3c5d0297d88e890b6f5df31f73dd60
-sha256=d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c
-
-[http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.2.tar.bz2]
-md5=20bc5d85634964d4ceee77cdfcd131ed
-sha256=84345dfbff0dc411689639aada2407758640af71eb61a1be332bfa24d8b90ac1
-
-[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xwud-X11R7.0-1.0.1.tar.bz2]
-md5=e08d2ee04abb89a6348f47c84a1ff3ed
-sha256=a10c7950ad632f07426ea9516b3743c562da8403f0da0cc678277031020f1586
-
-[http://pyyaml.org/download/libyaml/yaml-0.1.1.tar.gz]
-md5=a4768462c6ef53a7e0f68248aa3bda15
-sha256=76444692a94de4e6776a1bdf3b735e8f016bb374ae7c60496f8032fdc6085889
-
-[http://pyyaml.org/download/libyaml/yaml-0.1.2.tar.gz]
-md5=f6c9b5c2b0f6919abd79f5fd059b01dc
-sha256=5beb94529cc7ac79b17e354f9b03aea311f5af17be5d48bc39e6f1db5059f70f
-
-[http://meshcube.org/download/yamonenv_20060814.tgz]
-md5=43c606bbd27c500b0022471ed704ab78
-sha256=014e744f40c773bf225328bce1ca80f5dde4835c1f6671e989a4f8c4ed24555f
-
-[http://www.tortall.net/projects/yasm/releases/yasm-0.7.2.tar.gz]
-md5=cc9360593de5625dca286f0bfcb27dd5
-sha256=2c4f916883cbaf5c177a3fd105c3180bd0f574c87d7215ecfbe5b087efcc0dd6
-
-[http://downloads.sourceforge.net/yasr/yasr-0.6.9.tar.gz]
-md5=daec224676fb2db5a1936b399f559473
-sha256=41f17cfab8e88824a8dc1476602a0944b9030a8f8da2538a7a6549e3534e3bdf
-
-[http://download.devbase.at/voip/yeaphone-0.1.tar.gz]
-md5=476552b3b88b651ba161d22c1db5314d
-sha256=2f596ef4c57e29708d6246949289341d9f9756d162bf49e89f0828180329aa51
-
-[http://kernel.org//pub/linux/utils/net/NIS/yp-tools-2.9.tar.bz2]
-md5=19de06a04129ec26773f9198e086fcd4
-sha256=65c27f5c9ef3af56b17108ecb2e89276e0fe8722152d4353bb86672c1060a718
-
-[http://kernel.org/pub/linux/utils/net/NIS/yp-tools-2.9.tar.bz2]
-md5=19de06a04129ec26773f9198e086fcd4
-sha256=65c27f5c9ef3af56b17108ecb2e89276e0fe8722152d4353bb86672c1060a718
-
-[http://kernel.org//pub/linux/utils/net/NIS/ypbind-mt-1.19.tar.bz2]
-md5=4878b742d61590501230aa8baa6a4f53
-sha256=a39753a22b1f77b1fdb8163e800ee2d4f98a9e3018693d127459b509069a23f3
-
-[http://kernel.org/pub/linux/utils/net/NIS/ypbind-mt-1.19.tar.bz2]
-md5=4878b742d61590501230aa8baa6a4f53
-sha256=a39753a22b1f77b1fdb8163e800ee2d4f98a9e3018693d127459b509069a23f3
-
-[http://kernel.org//pub/linux/utils/net/NIS/OLD/ypserv/ypserv-2.17.tar.bz2]
-md5=d0366ade2f46a2292de47bc1fe60e8fd
-sha256=afed29dd6f0401be0fa2a8761993dd6dd93d1ad93aa1812a87ce8aa00736e89b
-
-[http://kernel.org/pub/linux/utils/net/NIS/OLD/ypserv/ypserv-2.17.tar.bz2]
-md5=d0366ade2f46a2292de47bc1fe60e8fd
-sha256=afed29dd6f0401be0fa2a8761993dd6dd93d1ad93aa1812a87ce8aa00736e89b
-
-[http://linux.duke.edu/projects/yum/download/3.2/yum-3.2.18.tar.gz]
-md5=711f518cb72a698ed98a21a374a4585e
-sha256=8b3f300602ce021bf5202496b98271814935f45f3bf3c6730ba4e789b2f323c8
-
-[http://linux.duke.edu/projects/yum/download/yum-metadata-parser/yum-metadata-parser-1.1.2.tar.gz]
-md5=13df226ef004ea78eebc59022720b536
-sha256=48b87110c3c46ad04209b358fded534eca3bfdc91b396d2549390dd51048be9f
-
-[http://www.Vanille.de/mirror/zauralign-1.0.2.tar.gz]
-md5=c159a55ecc3ba800445d4bb73d0925e6
-sha256=f849da3eec59b22599a806d59e81729ba9234fc2318335804d45d9dce23fb532
-
-[http://www.rpsys.net/openzaurus/patches/archive/zaurus_reboot-r3.patch]
-md5=2caa84539d463743bbcbfb41b9ac6861
-sha256=e145638ab4b0f267075b82db5ab9f7170ae2abf1fa1212d5175c31fe4bd28477
-
-[http://downloads.sourceforge.net/zbar/zbar-0.8.tar.bz2]
-md5=b5b0efd92af16230ce9952e7a9a671fd
-sha256=5415ffde882c7f7acee58e8a36aa65e732cfcfbbb582669480d6cf9549edfbbc
-
-[http://downloads.sourceforge.net/bedic/zbedic_1.0-0.tgz]
-md5=96eb282a1a3e4fea69b94f1db069f4e9
-sha256=f218b25c4be2261c49b9c9e1f10c93b64eaf6132ace6bc4052cf0489e3ac56e8
-
-[http://downloads.sourceforge.net/bedic/zbedic_1.2-2.tgz]
-md5=c7e8e267567a96cff7920a0365978c4d
-sha256=b991cc5635849353081c2a3350142484763323bc58bfa49b62285645aac129b9
-
-[http://heanet.dl.sourceforge.net/bedic/zbedic_1.2-2.tgz]
-md5=c7e8e267567a96cff7920a0365978c4d
-sha256=b991cc5635849353081c2a3350142484763323bc58bfa49b62285645aac129b9
-
-[http://www.vanille.de/mirror/zbench-2.0.tar.bz2]
-md5=75beb13ea40ce93b7a141b82fbf4437a
-sha256=b1a1a5d98596fc24225968a480617feb5723390db9175cd6e01828b7fda3a921
-
-[http://downloads.sourceforge.net/zeroconf/zcip-4.tar.gz]
-md5=ce40fdcd923110ee75717295a5fd4100
-sha256=09bff63fdf2ae0704423ad232d31e792b342433e12306e107c14dc02f06ed507
-
-[http://heanet.dl.sourceforge.net/zeroconf/zcip-4.tar.gz]
-md5=ce40fdcd923110ee75717295a5fd4100
-sha256=09bff63fdf2ae0704423ad232d31e792b342433e12306e107c14dc02f06ed507
-
-[http://zd1211.ath.cx/download/zd1211-driver-r77.tgz]
-md5=ab79187f18b102df2fb576bd4cf733fd
-sha256=8e5715e9d2bd2cb489c601ff91305f81fd662b27cb2da5486071fbab5bd8b634
-
-[http://zd1211.ath.cx/download/zd1211-driver-r83.tgz]
-md5=a5751f0e6f1f368689077fa7758a4932
-sha256=8288a1299f8c6f0176f2cd1b51f83b2c4b919460a2aa4fe98699b019e583bfc1
-
-[http://zd1211.ath.cx/download/zd1211-driver-r85.tgz]
-md5=51691a15137fbc35515a630d45d03352
-sha256=dd71e82cd3df6ca60e629cc5655e7a380586b363a3d963482e9f151eb186dbad
-
-[http://downloads.sourceforge.net/zd1211/zd1211-firmware-1.4.tar.bz2]
-md5=19f28781d76569af8551c9d11294c870
-sha256=866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1
-
-[http://heanet.dl.sourceforge.net/zd1211/zd1211-firmware-1.4.tar.bz2]
-md5=19f28781d76569af8551c9d11294c870
-sha256=866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1
-
-[http://downloads.sourceforge.net/zd1211/zd1211-firmware1.3.tar.bz2]
-md5=cfff76ea35f4f93c37f6c99aa2058140
-sha256=78b013e2e0bb4c1af1adbd7acca4299cd3d83e96d8da2731f629f562b5f153a6
-
-[http://heanet.dl.sourceforge.net/zd1211/zd1211-firmware1.3.tar.bz2]
-md5=cfff76ea35f4f93c37f6c99aa2058140
-sha256=78b013e2e0bb4c1af1adbd7acca4299cd3d83e96d8da2731f629f562b5f153a6
-
-[http://www.cinlug.org/modules/Static_Docs/data/db/zddice/zddice_1.0.0_arm.src.tar.gz]
-md5=791e8986c6e16dcd1c9878126725e06b
-sha256=eba57692dadd21df8d4afaea4daf8db5179c7398e11cd019fd462aa6947f4119
-
-[ftp://ftp.gnome.org/pub/gnome/sources/zenity/2.20/zenity-2.20.1.tar.bz2]
-md5=b9989582ea43f8fd58819d85ef9c9bc5
-sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36
-
-[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.20/zenity-2.20.1.tar.bz2]
-md5=b9989582ea43f8fd58819d85ef9c9bc5
-sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36
-
-[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.26/zenity-2.26.0.tar.bz2]
-md5=6660ce6dac0a6ca495a0e954cb6b40a2
-sha256=fc619215ca90cab48efae7bdf524d1de690b75832f07f3cbcb6d5c3910d402a1
-
-[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.28/zenity-2.28.0.tar.bz2]
-md5=262c476aebbf67a7043cd80c6a03add3
-sha256=3747a23ce46b0ee68e6261d669ae461f0f460d9c6ad19e04acbd518ddfcc8c63
-
-[http://www.progsoc.org/~wildfire/zeroconf/download/zeroconf-0.6.1.tar.gz]
-md5=31ac40fdaf24b3e666ed83c1320dd7a5
-sha256=3e93416ad44202c2952a1342dad12f2ad0e61dd3f1c59110d9ad8cb1d4c639e5
-
-[http://www.progsoc.org/~wildfire/zeroconf/download/zeroconf-0.9.tar.gz]
-md5=bdafb16b008ebb5633e4e581f77821d2
-sha256=a8c74df127753e2310fa1e072f3c9ca44a404bb0bbce9cfec7a84c6dff8bec7b
-
-[http://www.cinlug.org/modules/Static_Docs/data/db/zgs/zgscore_1.0.2_arm.src.tar.gz]
-md5=98e9dd2db54015c0f5193c5427f02d50
-sha256=a2683b8a6a172017f0fe6392fb07d87a5c02fc2714fbff4c98dcae67db588636
-
-[http://downloads.sourceforge.net/zile/zile-2.0beta6.tar.gz]
-md5=538e86a10a0c373f98a4c2dff29b39dd
-sha256=84568814469d4d7c44a324badb8023b049aae5d5f17e4b788a955f8d5137b3c4
-
-[http://heanet.dl.sourceforge.net/zile/zile-2.0beta6.tar.gz]
-md5=538e86a10a0c373f98a4c2dff29b39dd
-sha256=84568814469d4d7c44a324badb8023b049aae5d5f17e4b788a955f8d5137b3c4
-
-[http://downloads.sourceforge.net/zile/zile-2.2.15.tar.gz]
-md5=1fa62e2309fa52e26a5594cc38911aee
-sha256=2822148fdf6f2054b51c776db21f71e817761c225b370ab3f3ce7efe3711368f
-
-[http://heanet.dl.sourceforge.net/zile/zile-2.2.15.tar.gz]
-md5=1fa62e2309fa52e26a5594cc38911aee
-sha256=2822148fdf6f2054b51c776db21f71e817761c225b370ab3f3ce7efe3711368f
-
-[ftp://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz]
-md5=8a4da4460386e324debe97f3b7fe4d96
-sha256=d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f
-
-[http://www.warmi.net/zaurus/files/zipsc_0.4.3.tar.gz]
-md5=84c9037c144cb9a56137e2c218532ee1
-sha256=a5e989f87fd85b66b2cea1246f14577cbef9a618abde2df2c17a04030fb6cda6
-
-[http://handhelds.org/~zecke/oe_packages/ziq_V1.1ern.tar.gz]
-md5=f8c6b4b8b5b6f62ec9fc117e4b35fd53
-sha256=995a52223365ec41ae72ef781bde2c8f2f34e0e5dd19e17245f5f354ac52fb8b
-
-[http://www.cinlug.org/modules/Static_Docs/data/db/zlaps/zlaps_1.0.0_arm.src.tar.gz]
-md5=6c3d5a05da141c7d3ceac0db3d587441
-sha256=23252f3d76c863f88daae8384c0c02a93638a883048a084a0f2fcfbd804eb5ae
-
-[http://www.zlib.net/zlib-1.2.3.tar.bz2]
-md5=dee233bf288ee795ac96a98cc2e369b6
-sha256=e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
-
-[http://www.rpsys.net/openzaurus/patches/archive/zlib_inflate-r3.patch]
-md5=c5ef63b62e65900a2c092bc7349c089a
-sha256=81a5c8b74f100d7444356895f745321de53398f70e83b69f8284b0bf63c99ad0
-
-[http://user.cs.tu-berlin.de/~karlb/zmerlin/zmerlin.tar.gz]
-md5=ae1f9198544d1585f44dab7bab110ae3
-sha256=28e73da5403faad322022e8fb327f99677841d26396a1a1f1e854c768b47cf7c
-
-[http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.3.0.tar.gz]
-md5=93668855e37b4691c5c956665c33392c
-sha256=c049ef6f0748a2db26c7d01de1566e52f048e5fa6fbbb8da90c43e55597a5075
-
-[http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.5.1.tar.gz]
-md5=685fc532550abb07cca6190c9cd2b901
-sha256=b81d898532c47f73475c2d0c23580e289eed25923d007eca8e62750c0998bba0
-
-[http://downloads.sourceforge.net/zrally/zrally_0.90_src.tar.gz]
-md5=7084c0d2b28108563ca45e5ec1533ba1
-sha256=c4fb0477fdc110b63d867ae2a46cca7913fa6a0ca8bf574c7189329bea91dcdf
-
-[http://heanet.dl.sourceforge.net/zrally/zrally_0.90_src.tar.gz]
-md5=7084c0d2b28108563ca45e5ec1533ba1
-sha256=c4fb0477fdc110b63d867ae2a46cca7913fa6a0ca8bf574c7189329bea91dcdf
-
-[http://handhelds.org/~zecke/oe_packages/zrev7_V1.0.1.tar.gz]
-md5=fa339990ee78b0fd1bad994f0b35764c
-sha256=bc3487bf3927f7e3ea46cef770724d20e820883f4173eb7f8a1332c51d9b6431
-
-[http://z-soft.z-portal.info/zsafe/zsafe_2.1.3.tgz]
-md5=5e4e10a67de603b04b752ed00311455d
-sha256=0937b15ca5dcd6f49adff04096610cee1f70197e17d461aefa98ed52e5ea0b72
-
-[http://www.zsh.org/pub/old/zsh-4.1.1.tar.bz2]
-md5=48958b1a3fc86261a26eea40a4f7d4af
-sha256=f539e6db53233fa75d5fa389b4807d54add312fc96de71b5eb7cf4f071719027
-
-[http://www.zsh.org/pub/zsh-4.3.10.tar.bz2]
-md5=74c5b275544400082a1cde806c98682a
-sha256=63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c
-
-[http://www.lachner-net.de/Frames/Software/zshopi_0.2.tar.bz2]
-md5=1343c4de6d586a1b4ed2b5c97d53e717
-sha256=6a136cbc7fdb38c73fe5862f21913e8fe63864063bba833c149c1098d758a12f
-
-[http://www.lachner-net.de/old/Frames/Software/zshopi_0.2.tar.bz2]
-md5=1343c4de6d586a1b4ed2b5c97d53e717
-sha256=6a136cbc7fdb38c73fe5862f21913e8fe63864063bba833c149c1098d758a12f
-
-[http://handhelds.org/~zecke/oe_packages/zsubhunt_V1.0.0ern.tar.gz]
-md5=7f1fee1e58d92fbe72ffee34078c6fa2
-sha256=d31c51a3db059c564e77ee8776f441b3ea530089a7b48aa31a49d2ebf7bf9dc9
-
-[http://user.cs.tu-berlin.de/~karlb/ztappy/ztappy.tar.gz]
-md5=9bc4d68ba2e17ff91df89452debe2188
-sha256=b23ec333618729edeafbae77b5a73183e6e168c671452b98fac2bf3f13660207
-
-[http://handhelds.org/~zecke/oe_packages/ztappy_V0.9.3ern.tar.gz]
-md5=2c3881503615d86b78b89ad5f4ec675c
-sha256=006c061dc031e711cc3ccccbb659ffb9b09b74ff3be6c5768aecd7297738b1c0
-
-[http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz]
-md5=d24f03c8df5c98d510590bd9a63dc932
-sha256=7fa88dcb6da482bc20fc4916f191e9c35d01b3c0f45c9bcd66067029c49cc0b4
-
-[http://www.linux-solutions.at/projects/zaurus/source/zuc_V1.1.2ern.tar.gz]
-md5=c4ed24fa825940f4803bd494fd9c12a6
-sha256=8e7d8d05bcc99203f4ca8231647b2a24d51b10abffeb00910cb6eeee85427f86
-
-[http://nick.kreucher.net/zuc/zuc_units]
-md5=0d4a28c847829208b0177483e174b3f5
-sha256=3bc5735516b47874208b0efe23d498b8d43e51a140b3ff60683d5f1a951f50ac
-
-[http://www.vanille.de/mirror/zudoku-1.1.tar.gz]
-md5=8f8fd0e106c81897f0c8c3049dbf57de
-sha256=42494c9c712caaf3ca96f8abf59aaeb0fb3dbd2076c21d8642ea4c6cd9a04900
-
-[http://downloads.sourceforge.net/zapping/zvbi-0.2.22.tar.bz2]
-md5=a01cbe39a48579ba92582ff75a5e37c2
-sha256=a832819915838b364dd19f7f5d8d632b7d0493d8a19e2d011f9b5a3f2e8cf266
-
-[http://heanet.dl.sourceforge.net/zapping/zvbi-0.2.22.tar.bz2]
-md5=a01cbe39a48579ba92582ff75a5e37c2
-sha256=a832819915838b364dd19f7f5d8d632b7d0493d8a19e2d011f9b5a3f2e8cf266
-
-[http://downloads.sourceforge.net/zapping/zvbi-0.2.24.tar.bz2]
-md5=918c8ebb03c0e2f3272e0d90a92f2289
-sha256=12f5b654f6b91953391d2492a09d2c9586d5b7af419f0eeb306e1d30245659d3
-
-[http://downloads.sourceforge.net/zapping/zvbi-0.2.25.tar.bz2]
-md5=b63c626baf1fc385df04d88bc9628a4a
-sha256=fa85c35ae5694e6b1ce0dee920c1ecb93698b66c35717368143560930aedbc13
-
-[http://heanet.dl.sourceforge.net/zapping/zvbi-0.2.25.tar.bz2]
-md5=b63c626baf1fc385df04d88bc9628a4a
-sha256=fa85c35ae5694e6b1ce0dee920c1ecb93698b66c35717368143560930aedbc13
-
-[http://downloads.sourceforge.net/zziplib/zziplib-0.10.82.tar.bz2]
-md5=a6538f6c44ceeed0ed7e8e356f444168
-sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8
-
-[http://heanet.dl.sourceforge.net/zziplib/zziplib-0.10.82.tar.bz2]
-md5=a6538f6c44ceeed0ed7e8e356f444168
-sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8
-
-[http://downloads.sourceforge.net/zziplib/zziplib-0.12.83.tar.bz2]
-md5=4943ab7aa141af2c339266cd66b05c74
-sha256=5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867
-
-[http://heanet.dl.sourceforge.net/zziplib/zziplib-0.12.83.tar.bz2]
-md5=4943ab7aa141af2c339266cd66b05c74
-sha256=5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867
-
-[http://downloads.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2]
-md5=5f7b88ebb2bcd7e8044328482d079661
-sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
-
-[http://heanet.dl.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2]
-md5=5f7b88ebb2bcd7e8044328482d079661
-sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
-
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 2b03e718a3..1df0c0bf52 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -144,6 +144,9 @@ ANGSTROM_BLACKLIST_pn-fso-apm       = "regular apmd is good enough"
 
 require conf/distro/include/angstrom.inc
 
+# Set DISTRO_FEED_CONFIGS to our config var, assigned in the above .inc
+DISTRO_FEED_CONFIGS = "${ANGSTROM_FEED_CONFIGS}"
+
 # If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
 # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
 IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 22a94bcded..94beffb94f 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -57,7 +57,7 @@ UDEV_GE_141 = "1"
 PREFERRED_VERSION_usbutils = "0.86"
 PREFERRED_VERSION_wpa-supplicant = "0.6.9"
 PREFERRED_VERSION_wget = "1.11.4"
-PREFERRED_VERSION_xserver-common = "1.32"
+PREFERRED_VERSION_xserver-common = "1.33"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
 
 #
diff --git a/conf/distro/include/angstrom-codec-engine-2.25.01-preferred-versions.inc b/conf/distro/include/angstrom-codec-engine-2.25.01-preferred-versions.inc
index cab6e9d27e..5a16f2c8b3 100644
--- a/conf/distro/include/angstrom-codec-engine-2.25.01-preferred-versions.inc
+++ b/conf/distro/include/angstrom-codec-engine-2.25.01-preferred-versions.inc
@@ -2,14 +2,49 @@
 # - using edma-lld 01.11.00.03 (instead of 01.11.00.02) to fix installer issue.
 
 PREFERRED_VERSION_ti-codec-engine = "2_25_01_06"
- 
+PREFERRED_VERSION_ti-codec-engine-examples = "2_25_01_06" 
+
 PREFERRED_VERSION_ti-biosutils = "1_02_02"
 PREFERRED_VERSION_ti-cgt6x = "6_1_9"
 PREFERRED_VERSION_ti-dspbios = "5_41_02_14"
+PREFERRED_VERSION_ti-dsplink = "1_64"
+PREFERRED_VERSION_ti-dsplink-examples = "1_64"
 PREFERRED_VERSION_ti-dsplink-module = "1_64"
 PREFERRED_VERSION_ti-edma3lld = "01_11_00_03"
 PREFERRED_VERSION_ti-framework-components = "2_25_01_05"
 PREFERRED_VERSION_ti-linuxutils = "2_25_01_06"
+PREFERRED_VERSION_ti-local-power-manager = "1_24_01"
 PREFERRED_VERSION_ti-lpm-module = "1_24_01"
+PREFERRED_VERSION_ti-lpm-utils = "1_24_01"
 PREFERRED_VERSION_ti-xdais = "6_25_01_08"
 PREFERRED_VERSION_ti-xdctools = "3_16_01_27"
+
+PREFERRED_VERSION_ti-codecs-dm355 = "1_13_000"
+PREFERRED_VERSION_ti-codecs-dm355-server = "1_13_000"
+PREFERRED_VERSION_ti-codecs-dm365 = "3_10_00_02"
+PREFERRED_VERSION_ti-codecs-dm365-server = "3_10_00_02"
+PREFERRED_VERSION_ti-codecs-dm6446 = "2_05_00_00"
+PREFERRED_VERSION_ti-codecs-dm6446-server = "2_05_00_00"
+PREFERRED_VERSION_ti-codecs-dm6467 = "1_00_00_03"
+PREFERRED_VERSION_ti-codecs-dm6467-server = "1_00_00_03"
+PREFERRED_VERSION_ti-codecs-omap3530 = "1_00_01"
+PREFERRED_VERSION_ti-codecs-omap3530-server = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl137 = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl137-server = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl138 = "1_00_00"
+PREFERRED_VERSION_ti-codecs-omapl138-server = "1_00_00"
+PREFERRED_VERSION_ti-dm355mm-module = "1_13"
+PREFERRED_VERSION_ti-dm365mm-module = "1_0_3"
+PREFERRED_VERSION_ti-dvsdk-demos = "3_10_00_11"
+
+# PREFERRED_VERSION_ti-dmai = ""
+# PREFERRED_VERSION_ti-dmai-apps = ""
+# PREFERRED_VERSION_ti-dmai-tests = ""
+# PREFERRED_VERSION_gstreamer-ti = ""
+# PREFERRED_VERSION_gstreamer-ti-demo-script = ""
+
+# PREFERRED_VERSION_matrix-gui = ""
+# PREFERRED_VERSION_bitblit = ""
+# PREFERRED_VERSION_ti-dsplib = ""
+# PREFERRED_VERSION_ti-sysbios = ""
+
diff --git a/conf/distro/include/angstrom-codec-engine-2.25.02-preferred-versions.inc b/conf/distro/include/angstrom-codec-engine-2.25.02-preferred-versions.inc
new file mode 100644
index 0000000000..920263a3ef
--- /dev/null
+++ b/conf/distro/include/angstrom-codec-engine-2.25.02-preferred-versions.inc
@@ -0,0 +1,50 @@
+# Codec engine needs a specific set of version of its dependencies, so we specify them here:
+# - using edma-lld 01.11.00.03 (instead of 01.11.00.02) to fix installer issue.
+
+PREFERRED_VERSION_ti-codec-engine = "2_25_02_11"
+PREFERRED_VERSION_ti-codec-engine-examples = "2_25_02_11"
+
+PREFERRED_VERSION_ti-biosutils = "1_02_02"
+PREFERRED_VERSION_ti-cgt6x = "6_1_5"
+PREFERRED_VERSION_ti-dspbios = "5_41_00_06"
+PREFERRED_VERSION_ti-dsplink = "1_64"
+PREFERRED_VERSION_ti-dsplink-examples = "1_64"
+PREFERRED_VERSION_ti-dsplink-module = "1_64"
+PREFERRED_VERSION_ti-edma3lld = "01_11_00_03"
+PREFERRED_VERSION_ti-framework-components = "2_25_01_05"
+PREFERRED_VERSION_ti-linuxutils = "2_25_02_08"
+PREFERRED_VERSION_ti-local-power-manager = "1_24_02_09"
+PREFERRED_VERSION_ti-lpm-module = "1_24_02_09"
+PREFERRED_VERSION_ti-lpm-utils = "1_24_02_09"
+PREFERRED_VERSION_ti-xdais = "6_25_02_11"
+PREFERRED_VERSION_ti-xdctools = "3_16_00_18"
+
+PREFERRED_VERSION_ti-codecs-dm355 = "1_13_000"
+PREFERRED_VERSION_ti-codecs-dm355-server = "1_13_000"
+PREFERRED_VERSION_ti-codecs-dm365 = "3_10_00_02"
+PREFERRED_VERSION_ti-codecs-dm365-server = "3_10_00_02"
+PREFERRED_VERSION_ti-codecs-dm6446 = "2_05_00_00"
+PREFERRED_VERSION_ti-codecs-dm6446-server = "2_05_00_00"
+PREFERRED_VERSION_ti-codecs-dm6467 = "1_00_00_03"
+PREFERRED_VERSION_ti-codecs-dm6467-server = "1_00_00_03"
+PREFERRED_VERSION_ti-codecs-omap3530 = "1_00_01"
+PREFERRED_VERSION_ti-codecs-omap3530-server = "1_00_01"
+PREFERRED_VERSION_ti-codecs_omapl137 = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl137-server = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl138 = "1_00_00"
+PREFERRED_VERSION_ti-codecs-omapl138-server = "1_00_00"
+PREFERRED_VERSION_ti-dm355mm-module = "1_13"
+PREFERRED_VERSION_ti-dm365mm-module = "1_0_3"
+PREFERRED_VERSION_ti-dvsdk-demos = "3_10_00_11"
+
+# PREFERRED_VERSION_ti-dmai = ""
+# PREFERRED_VERSION_ti-dmai-apps = ""
+# PREFERRED_VERSION_ti-dmai-tests = ""
+# PREFERRED_VERSION_gstreamer-ti = ""
+# PREFERRED_VERSION_gstreamer-ti-demo-script = ""
+
+# PREFERRED_VERSION_matrix-gui = ""
+# PREFERRED_VERSION_bitblit = ""
+# PREFERRED_VERSION_ti-dsplib = ""
+# PREFERRED_VERSION_ti-sysbios = ""
+
diff --git a/conf/distro/include/angstrom-codec-engine-latest-preferred-versions.inc b/conf/distro/include/angstrom-codec-engine-latest-preferred-versions.inc
new file mode 100644
index 0000000000..3de327b5d3
--- /dev/null
+++ b/conf/distro/include/angstrom-codec-engine-latest-preferred-versions.inc
@@ -0,0 +1,50 @@
+# This is the latest set of TI components
+#
+
+PREFERRED_VERSION_ti-codec-engine = "2_25_02_11"
+PREFERRED_VERSION_ti-codec-engine-examples = "2_25_02_11"
+
+PREFERRED_VERSION_ti-biosutils = "1_02_02"
+PREFERRED_VERSION_ti-cgt6x = "6_1_14"
+PREFERRED_VERSION_ti-dspbios = "5_41_03_17"
+PREFERRED_VERSION_ti-dsplink = "1_65_00_02"
+PREFERRED_VERSION_ti-dsplink-examples = "1_65_00_02"
+PREFERRED_VERSION_ti-dsplink-module = "1_65_00_02"
+PREFERRED_VERSION_ti-edma3lld = "01_11_00_03"
+PREFERRED_VERSION_ti-framework-components = "2_25_01_05"
+PREFERRED_VERSION_ti-linuxutils = "2_25_02_08"
+PREFERRED_VERSION_ti-local-power-manager = "1_24_02_09"
+PREFERRED_VERSION_ti-lpm-module = "1_24_02_09"
+PREFERRED_VERSION_ti-lpm-utils = "1_24_02_09"
+PREFERRED_VERSION_ti-xdais = "6_25_02_11"
+PREFERRED_VERSION_ti-xdctools = "3_16_03_36"
+
+PREFERRED_VERSION_ti-codecs-dm355 = "1_13_000"
+PREFERRED_VERSION_ti-codecs-dm355-server = "1_13_000"
+PREFERRED_VERSION_ti-codecs-dm365 = "3_10_00_02"
+PREFERRED_VERSION_ti-codecs-dm365-server = "3_10_00_02"
+PREFERRED_VERSION_ti-codecs-dm6446 = "2_05_00_00"
+PREFERRED_VERSION_ti-codecs-dm6446-server = "2_05_00_00"
+PREFERRED_VERSION_ti-codecs-dm6467 = "1_00_00_03"
+PREFERRED_VERSION_ti-codecs-dm6467-server = "1_00_00_03"
+PREFERRED_VERSION_ti-codecs-omap3530 = "1_00_01"
+PREFERRED_VERSION_ti-codecs-omap3530-server = "1_00_01"
+PREFERRED_VERSION_ti-codecs_omapl137 = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl137-server = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl138 = "1_00_00"
+PREFERRED_VERSION_ti-codecs-omapl138-server = "1_00_00"
+PREFERRED_VERSION_ti-dm355mm-module = "1_13"
+PREFERRED_VERSION_ti-dm365mm-module = "1_0_3"
+PREFERRED_VERSION_ti-dvsdk-demos = "3_10_00_11"
+
+# PREFERRED_VERSION_ti-dmai = ""
+# PREFERRED_VERSION_ti-dmai-apps = ""
+# PREFERRED_VERSION_ti-dmai-tests = ""
+# PREFERRED_VERSION_gstreamer-ti = ""
+# PREFERRED_VERSION_gstreamer-ti-demo-script = ""
+
+# PREFERRED_VERSION_matrix-gui = ""
+# PREFERRED_VERSION_bitblit = ""
+# PREFERRED_VERSION_ti-dsplib = ""
+# PREFERRED_VERSION_ti-sysbios = ""
+
diff --git a/conf/distro/include/angstrom-codec-engine-latestproduction-preferred-versions.inc b/conf/distro/include/angstrom-codec-engine-latestproduction-preferred-versions.inc
new file mode 100644
index 0000000000..c736208018
--- /dev/null
+++ b/conf/distro/include/angstrom-codec-engine-latestproduction-preferred-versions.inc
@@ -0,0 +1,50 @@
+# This is the latest set of 'GA'd (Production Release) TI components
+#
+
+PREFERRED_VERSION_ti-codec-engine = "2_25_02_11"
+PREFERRED_VERSION_ti-codec-engine-examples = "2_25_02_11"
+
+PREFERRED_VERSION_ti-biosutils = "1_02_02"
+PREFERRED_VERSION_ti-cgt6x = "6_1_14"
+PREFERRED_VERSION_ti-dspbios = "5_41_03_17"
+PREFERRED_VERSION_ti-dsplink = "1_64"
+PREFERRED_VERSION_ti-dsplink-examples = "1_64"
+PREFERRED_VERSION_ti-dsplink-module = "1_64"
+PREFERRED_VERSION_ti-edma3lld = "01_11_00_03"
+PREFERRED_VERSION_ti-framework-components = "2_25_01_05"
+PREFERRED_VERSION_ti-linuxutils = "2_25_02_08"
+PREFERRED_VERSION_ti-local-power-manager = "1_24_02_09"
+PREFERRED_VERSION_ti-lpm-module = "1_24_02_09"
+PREFERRED_VERSION_ti-lpm-utils = "1_24_02_09"
+PREFERRED_VERSION_ti-xdais = "6_25_02_11"
+PREFERRED_VERSION_ti-xdctools = "3_16_03_36"
+
+PREFERRED_VERSION_ti-codecs-dm355 = "1_13_000"
+PREFERRED_VERSION_ti-codecs-dm355-server = "1_13_000"
+PREFERRED_VERSION_ti-codecs-dm365 = "3_10_00_02"
+PREFERRED_VERSION_ti-codecs-dm365-server = "3_10_00_02"
+PREFERRED_VERSION_ti-codecs-dm6446 = "2_05_00_00"
+PREFERRED_VERSION_ti-codecs-dm6446-server = "2_05_00_00"
+PREFERRED_VERSION_ti-codecs-dm6467 = "1_00_00_03"
+PREFERRED_VERSION_ti-codecs-dm6467-server = "1_00_00_03"
+PREFERRED_VERSION_ti-codecs-omap3530 = "1_00_01"
+PREFERRED_VERSION_ti-codecs-omap3530-server = "1_00_01"
+PREFERRED_VERSION_ti-codecs_omapl137 = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl137-server = "1_00_00"
+PREFERRED_VERSION_ti-codecs_omapl138 = "1_00_00"
+PREFERRED_VERSION_ti-codecs-omapl138-server = "1_00_00"
+PREFERRED_VERSION_ti-dm355mm-module = "1_13"
+PREFERRED_VERSION_ti-dm365mm-module = "1_0_3"
+PREFERRED_VERSION_ti-dvsdk-demos = "3_10_00_11"
+
+# PREFERRED_VERSION_ti-dmai = ""
+# PREFERRED_VERSION_ti-dmai-apps = ""
+# PREFERRED_VERSION_ti-dmai-tests = ""
+# PREFERRED_VERSION_gstreamer-ti = ""
+# PREFERRED_VERSION_gstreamer-ti-demo-script = ""
+
+# PREFERRED_VERSION_matrix-gui = ""
+# PREFERRED_VERSION_bitblit = ""
+# PREFERRED_VERSION_ti-dsplib = ""
+# PREFERRED_VERSION_ti-sysbios = ""
+
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 8bbd28ee93..c34a0a1875 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -29,6 +29,9 @@ CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}"
 DEPLOY_DIR = "${TMPDIR}/deploy/${LIBC}"
 require conf/distro/include/angstrom-${LIBC}.inc
 
+# Set some java bits
+require conf/distro//include/sane-toolchain-java.inc
+
 # ARM920T and up can use thumb mode to decrease binary size at the expense of speed
 # (the complete story is a bit more nuanced due to cache starvation)
 # Angstrom turns on thumb for armv4t machine according to this RFC:
diff --git a/conf/distro/include/kaeilos-2010.inc b/conf/distro/include/kaeilos-2010.inc
new file mode 100644
index 0000000000..2fb30ce0f6
--- /dev/null
+++ b/conf/distro/include/kaeilos-2010.inc
@@ -0,0 +1,155 @@
+#@TYPE: Distribution
+#@NAME: kaeilos-2010
+#@DESCRIPTION: Release independent distribution configuration for KaeilOS 
+#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+#@VERSION: 21-04-2010
+#
+# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
+# Product website : http://www.KaeilOS.com 
+
+# Preserve original DISTRO value
+USERDISTRO := "${DISTRO}"
+DISTRO = "kaeilos"
+DISTRO_NAME = "KaeilOS"
+BUILDNAME = "KaeilOS ${DISTRO_VERSION}"
+TARGET_VENDOR = "-kaeilos"
+
+# Add FEED_ARCH to overrides
+OVERRIDES .= ":${FEED_ARCH}"
+
+# Put links to sources in deploy/sources to make it easier for people to be GPL compliant
+INHERIT += "src_distribute_local"
+SRC_DIST_LOCAL ?= "symlink"
+
+# Can be "glibc", "eglibc" or "uclibc"
+KAEILOSLIBC ?= "eglibc"
+LIBC ?= "${KAEILOSLIBC}"
+PSTAGE_EXTRAPATH = "${LIBC}"
+
+CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}"
+DEPLOY_DIR = "${TMPDIR}/deploy/${LIBC}"
+require conf/distro/include/angstrom-${LIBC}.inc
+
+ARM_INSTRUCTION_SET = "arm"
+THUMB_INTERWORK = "yes"
+
+#Use this variable in feeds and other parts that need a URI
+KAEILOS_URI ?= "http://www.kaeilos.com"
+
+#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/, /etc/apt/sources.list)
+# usefull for derivative distros and local testing
+# As this is runtime we can't and won't use virtual/feed-configs
+DISTRO_FEED_CONFIGS = "kaeilos-feed-configs"
+
+#Set the default maintainer of kaeilos
+MAINTAINER = "KaeilOS Mantainer <m.cavallini@koansoftware.com>"
+
+#use debian style naming
+INHERIT += "debian"
+
+#activate config checker
+INHERIT += "sanity" 
+
+#make devshell available as task
+INHERIT += "devshell" 
+
+#run QA tests on builds and packages and log them  
+INHERIT += "insane"
+QA_LOG = "1"
+
+#run QA tests on recipes
+INHERIT += "recipe_sanity"
+
+#save statistical info on images
+INHERIT += "testlab"
+
+INHERIT += "package_ipk"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
+
+# We don't want to keep OABI compat
+ARM_KEEP_OABI = "0"
+# Do keep OABI compat for om-gta01 to keep the gllin binary working
+ARM_KEEP_OABI_pn-linux-openmoko-2.6.24_om-gta01 = "1"
+ARM_KEEP_OABI_pn-linux-openmoko-2.6.28_om-gta01 = "1"
+
+
+#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
+PREFERRED_PROVIDER_qemu-native = "qemu-native"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+
+# We only want to build UTF8 locales
+LOCALE_UTF8_ONLY = "1"
+
+#qemu doesn't like this fp
+ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
+
+#qemu has taken a dislike to armeb as well
+ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
+
+#ARM EABI is softfloat by default, but let's make sure :)
+#make it overridable for platforms with FPU, like ep93xx or i.mx31
+TARGET_FPU_arm ?= "soft"
+TARGET_FPU_armeb ?= "soft"
+TARGET_FPU_ixp4xx ?= "soft"
+
+TARGET_FPU_armv6 ?= "hard"
+TARGET_FPU_armv6-novfp ?= "soft"
+TARGET_FPU_armv7a ?= "hard"
+
+# webkit-gtk and cairo have alignment issues with double instructions on armv5 so
+# disable them here
+TARGET_CC_ARCH_pn-webkit-gtk_armv5te = "-march=armv4t"
+TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t"
+
+#Set the right arch for the feeds
+#Alphabetically sorted
+FEED_ARCH ?= "${BASE_PACKAGE_ARCH}"
+
+#Tweak packaging for strongarm machines since they can't use EABI
+PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3600  = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3800  = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi"
+
+#Name the generated images in a sane way
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+
+# KaeilOS *always* has some form of release config, so error out if someone thinks he knows better 
+DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+# Configuration for tinderbox, so people only need:
+# INHERIT          += "tinderclient"
+# in their local.conf 
+
+#Name of the client
+TINDER_MACHINE  = "${MACHINE}-${LIBC}-build-image"
+
+# Which lof file to write to, which tree to report to
+TINDER_LOG        = "${TMPDIR}/tinder.log"
+TINDER_TREE       = "KaeilOS"
+
+# Which branch do we build
+TINDER_BRANCH     = "org.openembedded.dev"
+   
+## Clobbing
+## 0 for rebuilding everything from scratch
+## 1 for incremental builds
+TINDER_CLOBBER    = "1"
+
+## Do a report at all
+TINDER_REPORT     = "1"
+
+OESTATS_SERVER      ?= "tinderbox.openembedded.org"
+
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs wifi alsa bluetooth ext2 vfat pcmcia usbgadget usbhost pci pam"
+
+# Following features are for ARM and E500 based machines
+DISTRO_FEATURES += "eabi"
+
+# Use-like features
+DISTRO_FEATURES += "tk"
+
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 7a795f38c1..6b6caee73d 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -9,7 +9,8 @@ PREFERRED_VERSION_automake-native = "1.11.1"
 PREFERRED_VERSION_libmikmod = "3.2.0-beta2"
 PREFERRED_VERSION_mtd-utils-native = "1.2.0+git"
 PREFERRED_VERSION_strace = "4.5.15"
-PREFERRED_VERSION_mesa-dri     = "7.8"
+PREFERRED_VERSION_mesa-dri     = "7.8.1"
+PREFERRED_VERSION_emacs-x11 = "23.1"
 
 # We need this for jamvm
 PREFERRED_VERSION_classpath = "0.98"
@@ -28,6 +29,8 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.32"
 PREFERRED_VERSION_openssh = "5.2p1"
 
 # upgrades used in Angstrom
+PREFERRED_VERSION_xserver-common = "1.33"
+PREFERRED_VERSION_xserver-nodm-init = "2.0"
 PREFERRED_VERSION_gtk+          = "2.20.0"
 PREFERRED_VERSION_gtk+-native   = "2.20.0"
 PREFERRED_VERSION_hal           = "0.5.13"
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 5b39d40a56..fc5891c081 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -10,7 +10,7 @@
 #
 # This *must* be removed after initial testing is completed.  MJW 08-Dec-2008
 #
-SRCREV_pn-linux-ixp4xx ?= "1089"
+SRCREV_pn-linux-ixp4xx ?= "1090"
 PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV_pn-linux-ixp4xx}"
 #
 #===============================================================================#
@@ -73,3 +73,6 @@ PREFERRED_VERSION_boost				?= "1.33.1"
 
 # pulseaudio 0.9.19 is broken (ASM errors during do_compile):
 PREFERRED_VERSION_pulseaudio                    ?= "0.9.15"
+
+# latest tcl recipe has a bug that overwites regex.h; use the old tcl
+PREFERRED_VERSION_tcl				?= "8.4.19"
\ No newline at end of file
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index 62046f8eca..5746254e0d 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Wed Apr  7 09:27:09 CEST 2010
+#Tue May 11 11:49:22 CEST 2010
 #app
 PREFERRED_VERSION_appres ?= "1.0.2"
 PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -47,7 +47,7 @@ PREFERRED_VERSION_xcursorgen ?= "1.0.3"
 PREFERRED_VERSION_xcursorgen-native ?= "1.0.3"
 PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
 PREFERRED_VERSION_xditview ?= "1.0.1"
-PREFERRED_VERSION_xdm ?= "1.1.9"
+PREFERRED_VERSION_xdm ?= "1.1.10"
 PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
 PREFERRED_VERSION_xdriinfo ?= "1.0.3"
 PREFERRED_VERSION_xedit ?= "1.1.2"
@@ -343,7 +343,7 @@ PREFERRED_VERSION_xproto-native ?= "7.0.16"
 PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
 #util
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.3"
 PREFERRED_VERSION_lndir ?= "1.0.1"
 PREFERRED_VERSION_makedepend ?= "1.0.2"
 PREFERRED_VERSION_makedepend-native ?= "1.0.2"
@@ -351,4 +351,4 @@ PREFERRED_VERSION_util-macros ?= "1.7.0"
 PREFERRED_VERSION_util-macros-native ?= "1.7.0"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
 #xserver
-PREFERRED_VERSION_xserver-xorg ?= "1.8.0"
+PREFERRED_VERSION_xserver-xorg ?= "1.8.1"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a2006783be..2183d40aaa 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -2,6 +2,4 @@
 # only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly
 
 OPKG_SRCREV ?= "527"
-EFL_SRCREV ?= "47939"
-FSO_CORNUCOPIA_SRCREV ?= "a2698e95446861f3ae6d89bc64019b29964a8108"
-FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
+EFL_SRCREV ?= "48935"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index daa2deff29..1b77f7573b 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -5,14 +5,14 @@
 #############################################################################
 
 # Base line versions, good for most things
-PREFERRED_GCC_VERSION                ?= "4.4.2"
-PREFERRED_BINUTILS                   ?= "2.20"
+PREFERRED_GCC_VERSION                ?= "4.4.4"
+PREFERRED_BINUTILS                   ?= "2.20.1"
 
 # Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc             ?= "2.10.1"
 PREFERRED_VERSION_glibc-initial     ?= "2.10.1"
-PREFERRED_VERSION_eglibc             ?= "2.10"
-PREFERRED_VERSION_eglibc-initial     ?= "2.10"
+PREFERRED_VERSION_eglibc             ?= "2.11"
+PREFERRED_VERSION_eglibc-initial     ?= "2.11"
 PREFERRED_VERSION_uclibc            ?= "0.9.30.1"
 PREFERRED_VERSION_uclibc-initial    ?= "0.9.30.1"
 
@@ -21,7 +21,6 @@ PREFERRED_GCC_VERSION_486sx          ?= "4.3.2"
 PREFERRED_GCC_VERSION_avr32          ?= "4.2.2"
 PREFERRED_GCC_VERSION_armv7a         ?= "4.4.1" 
 PREFERRED_GCC_VERSION_bfin           ?= "4.1.2"
-PREFERRED_GCC_VERSION_ppc405         ?= "4.4.1"
 PREFERRED_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
 PREFERRED_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
 
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index a73e213a78..25dac9ba32 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -15,4 +15,3 @@ SRCREV_pn-shr-wizard = "${AUTOREV}"
 # additional package (built only with task-shr-feed) with live development
 SRCREV_pn-ventura = "${AUTOREV}"
 SRCREV_pn-emtooth = "${AUTOREV}"
-SRCREV_pn-fltkspacetrader = "${AUTOREV}"
diff --git a/conf/distro/kaeilos-2010.conf b/conf/distro/kaeilos-2010.conf
new file mode 100644
index 0000000000..4bb637cfa6
--- /dev/null
+++ b/conf/distro/kaeilos-2010.conf
@@ -0,0 +1,159 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: KaeilOS(R) - http://www.kaeilos.com
+#@DESCRIPTION: KaeilOS Linux Distribution ver.2010
+#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+#@VERSION: 21-04-2010
+#
+# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
+# Product website : http://www.KaeilOS.com
+#
+# Use this at your own risk, we welcome bugreports filed at 
+#    http://bugs.openembedded.net
+#@--------------------------------------------------------------------
+
+DISTRO_VERSION = "2010.1-${DATE}"
+DISTRO_REVISION = "1"
+DISTRO_PR = ".1"
+
+OLDEST_KERNEL ?= "2.6.28"
+
+#build staging from packages
+INHERIT += "packaged-staging"
+
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/kaeilos-2009-preferred-versions.inc
+require conf/distro/include/preferred-e-versions.inc
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
+
+#Images built can have to modes:
+# 'debug': empty rootpassword, strace included
+# 'release' no root password, no strace and gdb by default
+DISTRO_TYPE ?= "debug"
+#DISTRO_TYPE = "release"
+
+# Set the toolchain type (internal, external) and brand (generic, csl etc.)
+TOOLCHAIN_TYPE ?= "internal"
+TOOLCHAIN_BRAND ?= ""
+
+# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so
+# shipping some adhoc subset will be still useless and size burden for
+# users of all other languages/countries. Instead, worth to make it easy
+# to install additional languages: installer/wizard + metapackages which
+# will RRECOMMEND as much as possible content for a given language
+# (locales, UI transalations, help, etc. - useless for pros, but really 
+# helpful for common users).
+# Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
+IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}'
+
+# increase inode/block ratio for ext2 filesystem 
+EXTRA_IMAGECMD_ext2 = "-i 4096"
+
+# set feed path variables
+FEED_BASEPATH = "feeds/unstable/ipk/${LIBC}/"
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+PCMCIA_MANAGER = "pcmciautils"
+
+
+require conf/distro/include/kaeilos-2010.inc
+
+# Select packaging system
+IMAGE_FSTYPES ?= "tar.gz jffs2"
+PREFERRED_PKG_FORMAT = "ipk"
+IPKG_VARIANT = "opkg-nogpg"
+
+
+
+#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
+PREFERRED_VERSION_linux-libc-headers 	= "2.6.31"
+
+# see into glibc-package.bbclass : added KaeilOS hack supporting glibc 2.9
+LIBC ?= "eglibc"
+PREFERRED_VERSION_glibc 		?= "2.10.1"
+PREFERRED_VERSION_glibc-initial 	?= "2.10.1"
+PREFERRED_VERSION_uclibc        	?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial	?= "0.9.30.1"
+
+#armv4 needs at least gcc 4.4.2 for eabi
+KAEILOS_GCC_VERSION_armv4              ?= "4.4.2"
+
+#Everybody else can just use this: 
+KAEILOS_BINUTILS_VERSION                ?= "2.19.51"
+PREFERRED_VERSION_binutils               ?= "${KAEILOS_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross         ?= "${KAEILOS_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross-sdk     ?= "${KAEILOS_BINUTILS_VERSION}"
+
+KAEILOS_GCC_VERSION                     ?= "4.3.3"
+PREFERRED_VERSION_gcc                    ?= "${KAEILOS_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross              ?= "${KAEILOS_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-sdk          ?= "${KAEILOS_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-initial      ?= "${KAEILOS_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-intermediate ?= "${KAEILOS_GCC_VERSION}"
+
+PREFERRED_ARM_INSTRUCTION_SET ?= "thumb"
+require conf/distro/include/sane-toolchain.inc
+
+PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
+PREFERRED_PROVIDER_hotplug               = "udev"
+PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg-nocurl"
+
+# PREFERRED VERSIONS
+PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-nogpg"
+
+
+# Select xserver-xorg as default, since kdrive has been EOL'ed
+XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" 
+
+
+# do some task-base stuff here
+
+# Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with
+# bluez 3.x
+DISTRO_BLUETOOTH_MANAGER = "\
+	blueprobe \
+	bluez4 \
+   "
+
+# We want to ship extra debug utils in the rootfs when doing a debug build 
+DEBUG_APPS ?= ""
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
+
+# KaeilOS want to ship some extra stuff. This should be moved into task-base eventually
+# contains ipkg specific stuff as well :(
+DISTRO_EXTRA_RDEPENDS += "\
+    update-modules \
+    kaeilos-version \
+    opkg-nogpg opkg-collateral \
+    util-linux-ng-mount util-linux-ng-umount \
+    ${DEBUG_APPS} \
+    "
+
+# This also hooks into task-base, but isn't mandatory.
+# If you don't want parts of this in your task-base using images you can put this in the image recipe:
+# BAD_RECOMMENDATIONS = "avahi-daemon avahi-autoipd"
+# Note that BAD_RECOMMENDATIONS is a feature of rootfs_ipk.bbclass
+# kernel modules: ship fs modules so you can mount stuff and af-packet so networking works
+# avahi: makes finding your device on the network a lot easier
+# openssh-sftp-server: provides sftp which combined with avahi makes it real easy to use things like sshfs
+# DEBUG_APPS: ship strace and procpc to make simple debugging a lot easier
+DISTRO_EXTRA_RRECOMMENDS += " \
+    kernel-module-vfat \
+    kernel-module-ext2 \
+    kernel-module-ext3 \
+    kernel-module-af-packet \
+    avahi-daemon \
+    avahi-autoipd \
+    openssh-sftp-server \
+    ${DEBUG_APPS} \
+    "
+
+SPLASH ?= "psplash"
+
+ARM_INSTRUCTION_SET_pn-uclibc = "arm"
+ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm"
+
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 7aa6c587ce..1e72efd660 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -16,7 +16,7 @@ DISTRO_VERSION = "dev-snapshot-${SRCDATE}"
 DISTRO_TYPE ?= "debug"
 
 # Ensure some form of release config, so error out if someone thinks he knows better
-DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION")
+DISTRO_CHECK := "${@bb.data.getVar('DISTRO_VERSION',d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION")
 
 #############################################################################
 # FEATURE SELECTION
@@ -66,10 +66,11 @@ IPKG_VARIANT = "opkg-nogpg"
 #############################################################################
 # Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
-CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}"
+CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}"
 DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
-SPLASH ?= "${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)}"
+SPLASH ?= '${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)}'
+PREFERRED_PROVIDER_virtual/psplash = "psplash"
 
 # increase inode/block ratio for ext2 filesystem 
 EXTRA_IMAGECMD_ext2 = "-i 8192"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 81d7075fc1..2b34c40bc3 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -53,14 +53,6 @@ PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
 # require conf/distro/include/fso-autorev.inc
 
 # override the PACKAGE_ARCH of certain packages for openmoko distro
-#
-# Same kernel used to run on both these machines...
-# Currently not used but left here in case someone wants to switch on
-# quickly
-#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "armv4t"
-#PACKAGE_ARCH_pn-linux-openmoko_om-gta02 = "armv4t"
-#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta01 = "armv4t"
-#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta02 = "armv4t"
 
 # Same kernel so same usb
 PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 0e8e272b11..caee288305 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -57,7 +57,7 @@ PREFERRED_VERSION_glibc = "2.2.5"
 PREFERRED_VERSION_linux-libc-headers = "2.4.18"
 
 IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
-#INHIBIT_PACKAGE_STRIP = "1"
+#PACKAGE_STRIP = "no"
 
 #
 # Opie
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index b96c4eed8b..5b90696dd1 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -77,17 +77,6 @@ PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
 PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
 PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
 
-# Helper to say what image we built
-SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"
-ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;"
-ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
-ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
-ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${SHR_VERSION_FILE};"
-ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${SHR_VERSION_FILE};"
-
-#Package customization
-EXTRA_OECONF-pn_qemu += " --target-list=arm-linux-user,arm-softmmu"
-
 #Illume settings
 ILLUME_CONFIG = "e-wm-config-illume-shr"
 ILLUME_THEME = "e-wm-theme-illume-gry"
@@ -102,7 +91,9 @@ DISTRO_BLUETOOTH_MANAGER = "bluez4"
 # We want images supporting the following features (for task-base)
 DISTRO_FEATURES = "wifi ppp ext2 vfat bluetooth usbgadget usbhost"
 # Following features are for ARM and E500 based machines
-DISTRO_FEATURES += "eabi"
+DISTRO_FEATURES += " eabi "
+# Use-like features
+DISTRO_FEATURES += " tk "
 
 #############################################################################
 # LIBRARY NAMES
@@ -154,10 +145,8 @@ OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_A
 # TOOLCHAIN
 #############################################################################
 LIBC ?= "eglibc"
-PREFERRED_BINUTILS                   ?= "2.20.1"
-PREFERRED_GCC_VERSION                ?= "4.4.3"
-PREFERRED_VERSION_eglibc             ?= "2.11"
-PREFERRED_VERSION_eglibc-initial     ?= "2.11"
+PREFERRED_VERSION_eglibc             ?= "2.12"
+PREFERRED_VERSION_eglibc-initial     ?= "2.12"
 require conf/distro/include/sane-toolchain.inc
 
 #############################################################################
@@ -193,6 +182,7 @@ DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cl
 # util-linux-ng-mount util-linux-ng-umount: busybox mount is broken
 # angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink
 DISTRO_EXTRA_RDEPENDS += "\
+  shr-version \
   distro-feed-configs \
   util-linux-ng-mount util-linux-ng-umount \
   angstrom-libc-fixup-hack \
diff --git a/conf/layer.conf b/conf/layer.conf
new file mode 100644
index 0000000000..c95f9c09dd
--- /dev/null
+++ b/conf/layer.conf
@@ -0,0 +1,5 @@
+BBFILES += "${LAYERDIR}/recipes/*/*.bb"
+BBPATH .= ":${LAYERDIR}"
+BBFILE_COLLECTIONS += "oe"
+BBFILE_PRIORITY_oe = "0"
+BBFILE_PATTERN_oe = "^${LAYERDIR}/"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 2cff53bc1b..af20c93254 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -124,11 +124,18 @@ IMAGE_FSTYPES = "jffs2 tar"
 # Uncomment this if you want BitBake to emit debugging output
 # BBDEBUG = "yes"
 
-# Uncomment these two if you want BitBake to build images useful for debugging. 
-# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined.
-# Also note that OE now produces -dbg packages which contain debugging symbols.
+# Use DEBUG_BUILD to build packages with DEBUG_OPTIMIZATION instead of
+# FULL_OPTIMIZATION.
+#
 # DEBUG_BUILD = "1"
-# INHIBIT_PACKAGE_STRIP = "1"
+
+# If you want to have unstripped ready-to-debug binaries, set this to "no",
+# although for debugging you can use automatically produced -dbg packages.
+# If you need to have completely undebuggable builds, set this to "full",
+# by default gnu.debuglink section is left in the binaries after stripping, so
+# this might be useful if you want to have checksum-level binary consistency
+# across successive builds.
+# PACKAGE_STRIP = "no"
 
 # Uncomment these to build a package such that you can use gprof to profile it.
 # NOTE: This will only work with 'linux' targets, not
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 9930c89c6a..4afa515c32 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
 require conf/machine/include/zaurus-2.6.inc
-require conf/machine/include/zaurus-clamshell.inc
+require conf/machine/include/tune-xscale.inc
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 MACHINE_FEATURES += "iwmmxt"
diff --git a/conf/machine/bug20.conf b/conf/machine/bug20.conf
index dbc1faf6ea..42c2c1239f 100644
--- a/conf/machine/bug20.conf
+++ b/conf/machine/bug20.conf
@@ -9,6 +9,7 @@ XSERVER = "xserver-xorg \
            xserver-xorg-extension-glx \
            xf86-input-evdev \
            xf86-input-mouse \
+           xf86-input-tslib \
            xf86-video-omapfb \
            xf86-input-keyboard"
 
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 4daedde482..68c9ba4263 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
 
 require conf/machine/include/zaurus-2.6.inc
-require conf/machine/include/zaurus-clamshell.inc
+require conf/machine/include/tune-xscale.inc
 
 # NAND factory-default
 # SL-C700 (corgi) mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)
diff --git a/conf/machine/dm3730-am3715-evm.conf b/conf/machine/dm3730-am3715-evm.conf
index b91acd5fc7..a13b95a324 100644
--- a/conf/machine/dm3730-am3715-evm.conf
+++ b/conf/machine/dm3730-am3715-evm.conf
@@ -18,9 +18,10 @@ require conf/machine/include/omap3.inc
 # Ship all kernel modules
 
 IMAGE_FSTYPES ?= "jffs2 tar.bz2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
+EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
 SERIAL_CONSOLE = "115200 ttyS0"
+USE_VT = "0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
 
diff --git a/conf/machine/imote2.conf b/conf/machine/imote2.conf
index 24da0d0678..72830e1a57 100644
--- a/conf/machine/imote2.conf
+++ b/conf/machine/imote2.conf
@@ -3,13 +3,13 @@
 #@DESCRIPTION: Machine configuration for Crossbow iMote 2
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/kernel = "linux-zigbee"
 
 PACKAGE_EXTRA_ARCHS = " iwmmxt"
 
 KERNEL_IMAGETYPE = "zImage"
 IMAGE_FSTYPE += "jffs2"
-EXTRA_IMAGECMD_jffs2 = "--little-endian -e 0x40000 --pad=0x01DC0000 --eraseblock=0x20000"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --pad=0x01DC0000 --eraseblock=0x20000"
 
 CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS2,115200 mem=32M"
 
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 59d763df69..6e959675f7 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r44"
+MACHINE_KERNEL_PR = "r45"
 
 TARGET_ARCH = "arm"
 
diff --git a/conf/machine/include/htc-qsd8.inc b/conf/machine/include/htc-qsd8.inc
index ac3e7d22ee..440894b063 100644
--- a/conf/machine/include/htc-qsd8.inc
+++ b/conf/machine/include/htc-qsd8.inc
@@ -22,6 +22,9 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 # use this for overrides
 MACHINE_CLASS = "htc-qsd8"
 
+# use uncompressed kernel image
+KERNEL_IMAGETYPE = Image
+
 # features
 MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb keyboard"
 
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index de82901b51..bb7f0de7b5 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = "omap3"
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r70"
+MACHINE_KERNEL_PR = "r76"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc
index 190066bca0..852c12a0fd 100644
--- a/conf/machine/include/qemu.inc
+++ b/conf/machine/include/qemu.inc
@@ -1,5 +1,5 @@
 PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 GUI_MACHINE_CLASS = "bigscreen"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen keyboard touchscreen"
@@ -11,3 +11,5 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "230000"
 
 # Don't include kernels in standard images
 RDEPENDS_kernel-base = ""
+
+EXTRA_IMAGEDEPENDS += "qemu-native"
diff --git a/conf/machine/include/tune-ppc603e.inc b/conf/machine/include/tune-ppc603e.inc
index 2f627a725d..a1c62ad74c 100644
--- a/conf/machine/include/tune-ppc603e.inc
+++ b/conf/machine/include/tune-ppc603e.inc
@@ -1,4 +1,4 @@
-TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
+TARGET_CC_ARCH = "-mcpu=603e"
 BASE_PACKAGE_ARCH = "ppc603e"
 FEED_ARCH = "ppc603e"
 PACKAGE_EXTRA_ARCHS += "ppc603e"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index d8bd5b00dc..8147c77bc9 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -1,25 +1,35 @@
+########################
 # Zaurus common settings
-# Additionally, clamshell specific stuff in zaurus-clamshell.inc
-
-TARGET_ARCH = "arm"
+########################
 
 ERASEBLOCKSIZE = "0x4000"
 ERASEBLOCKSIZE_akita = "0x20000"
 
-# Warning! SL-C3000 seems to be "0x4000" (16m NAND) 
-# C3100 and C3200 have same 128MB NAND device as akita
+# Warning! SL-C3000 has "0x4000" (16MiB NAND) 
+# C3100 and C3200 have same 128MiB NAND device as akita
 ERASEBLOCKSIZE_spitz = "0x20000"
 
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
+IMAGE_FSTYPES += "jffs2 tar.gz"
+
+# kernel now supports favourlzo
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
+                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
+                   && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                   -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
+                   --eraseblock=${ERASEBLOCKSIZE} -l -p; \
+                   cat ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
+                   cat ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
+
 
 EXTRA_IMAGEDEPENDS += "zaurus-installer"
 
-SERIAL_CONSOLE = "115200 ttyS0"
-SERIAL_CONSOLE_collie = "115200 ttySA0"
 
-# FIXME: xserver-xorg is in testing on spitz
+#########
+# xserver (FIXME: xserver-xorg is in testing on spitz)
+#########
 
-# deprecated defaults
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"
 
@@ -40,9 +50,36 @@ PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg"
 XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
 PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri"
 
-PCMCIA_MANAGER ?= "pcmciautils"
 
-IMAGE_FSTYPES += "jffs2 tar.gz"
+########
+# kernel
+########
+
+MACHINE_KERNEL_VERSION = "2.6"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+
+# Starting with 2.6.32 linux-rp is deprecated for some models
+#PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/kernel_collie = "linux"
+PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
+
+# Default bootloader expects "zImage", use "uImage" for u-boot
+# Note: kexecboot can boot both kind of images
+ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
+KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"
+
+
+################
+# machine tuning
+################
+
+TARGET_ARCH = "arm"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE_collie = "115200 ttySA0"
+
+PCMCIA_MANAGER ?= "pcmciautils"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2"
 MACHINE_FEATURES_append_akita = " usbhost "
@@ -52,7 +89,6 @@ MACHINE_FEATURES_append_tosa  = " usbhost wifi "
 MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical"
 MACHINE_EXTRA_RDEPENDS_collie = "zaurusd"
 
-# Here we just need snd modules
 # Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel
 # Fixme ? module-snd for collie
 MACHINE_EXTRA_RRECOMMENDS_collie = ""
@@ -65,5 +101,10 @@ MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-p
 # Fixme ? module-snd for tosa
 MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix"
 
-require conf/machine/include/zaurus-kernel.inc
+
+##################################
+# build kexecboot kernel while
+# making sure rootfs is compatible
+##################################
+
 require conf/machine/include/initramfs-kexecboot.inc
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
deleted file mode 100644
index 4fa9f75eb3..0000000000
--- a/conf/machine/include/zaurus-clamshell.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-include conf/machine/include/tune-xscale.inc
-
-EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
-                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
-                   && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
-                   -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
-                   --eraseblock=${ERASEBLOCKSIZE} -l -p; \
-                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-                   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
-                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
-                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-                   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
-                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
deleted file mode 100644
index bbbb38315c..0000000000
--- a/conf/machine/include/zaurus-kernel.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-# Zaurus common kernel settings
-
-MACHINE_KERNEL_VERSION = "2.6"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-
-# Starting with 2.6.32 linux-rp is deprecated for some models
-#PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_PROVIDER_virtual/kernel_collie = "linux"
-PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
-
-# Default bootloader expects "zImage", use "uImage" for u-boot
-# Note: kexecboot can boot both kind of images
-ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
-KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"
diff --git a/conf/machine/om-3d7k.conf b/conf/machine/om-3d7k.conf
index 95bfd40b23..0ebd2a0d6d 100644
--- a/conf/machine/om-3d7k.conf
+++ b/conf/machine/om-3d7k.conf
@@ -6,7 +6,7 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-devel"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone vfat ext2"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index ede2a2009e..0890d7184b 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -6,16 +6,9 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel
-PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
-#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel"
-#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
-#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.32"
-
-PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
 
 UBOOT_ENTRYPOINT = "30008000"
 
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 9733269d4f..47f4ae16e5 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -6,15 +6,9 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel
-PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
-#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel"
-#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
-
-PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
 # Override only for shr as it needs mesa-dri_git and ie angstrom has preferred_version set to 7.6
 MACHINE_DRI_MODULES_shr = "glamo"
 
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index de76527167..606925cdc9 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -11,4 +11,4 @@ KERNEL_IMAGETYPE = "zImage"
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
diff --git a/conf/machine/qemuppc.conf b/conf/machine/qemuppc.conf
new file mode 100644
index 0000000000..c2256782c0
--- /dev/null
+++ b/conf/machine/qemuppc.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: QEMU PowerPC Emulator setup
+#@DESCRIPTION: Machine configuration for running a PowerPC system under qemu emulation
+
+TARGET_ARCH = "powerpc"
+
+require conf/machine/include/qemu.inc
+require conf/machine/include/tune-ppc603e.inc
+
+KERNEL_IMAGETYPE = "vmlinux"
+KERNEL_OUTPUT = "vmlinux"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+
diff --git a/conf/machine/qemush4.conf b/conf/machine/qemush4.conf
new file mode 100644
index 0000000000..8ee723b140
--- /dev/null
+++ b/conf/machine/qemush4.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: QEMU SH4 Emulator setup
+#@DESCRIPTION: Machine configuration for running a SH4(rts7751r2dplus) system under qemu emulation
+
+TARGET_ARCH = "sh4"
+
+require conf/machine/include/qemu.inc
+require conf/machine/include/tune-sh4.inc
+
+KERNEL_IMAGETYPE = "zImage"
+
+SERIAL_CONSOLE = "115200 ttySC1"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 4fe62b5f43..0b5331eb44 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
 require conf/machine/include/zaurus-2.6.inc
-require conf/machine/include/zaurus-clamshell.inc
+require conf/machine/include/tune-xscale.inc
 
 MACHINE_FEATURES += "iwmmxt"
 PACKAGE_EXTRA_ARCHS += "iwmmxt"
diff --git a/conf/machine/xilinx-ml507.conf b/conf/machine/xilinx-ml507.conf
index 693f904012..8c888b2ae7 100644
--- a/conf/machine/xilinx-ml507.conf
+++ b/conf/machine/xilinx-ml507.conf
@@ -15,7 +15,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-ml507"
 
 KERNEL_IMAGETYPE = "uImage"
 
-MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet"
+MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet screen"
 MACHINE_EXTRA_RECOMMENDS = "kernel-modules"
 
 UBOOT_ARCH = "ppc"
@@ -30,7 +30,7 @@ PREFERRED_VERSION_u-boot_xilinx-ml507 = "git"
 # XILINX_BOARD = "ml507"
 
 # Don't use tty1
-USE_VT = "0"
+# USE_VT = "0"
 SERIAL_CONSOLE = "9600 ttyS0"
 
 # Device nodes add xsa for (system ace)
diff --git a/contrib/angstrom/extract-feedarch.sh b/contrib/angstrom/extract-feedarch.sh
new file mode 100644
index 0000000000..644be25386
--- /dev/null
+++ b/contrib/angstrom/extract-feedarch.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+if [ ! -d archs ] ; then
+	mkdir archs
+fi
+
+for feedconfig in $(find . -name "angstrom-feed-configs_*") ; do
+	rm -rf feedtemp ; mkdir feedtemp
+	dpkg-deb -X $feedconfig feedtemp >& /dev/null
+	echo $(tail -n1 feedtemp/etc/opkg/arch.conf | awk '{print $2}') >> archs/$(tail -n2 feedtemp/etc/opkg/arch.conf | head -n1 | awk '{print $2}')
+	rm -rf feedtemp
+done
+
+# Fixups
+cat archs/iwmmxt >> archs/armv5te || true
+cat archs/omap3517-evm >> archs/armv7a || true
+rm -f archs/arm archs/iwmmxt archs/omap3517-evm
+touch archs/iwmmxt archs/sparc
+touch archs/sparc
+
+#    "mipsel")
+#            machines="";;
+
+cat /tmp/sort-head.sh
+for arch in archs/* ; do
+	echo -e "\t\"$(basename $arch)\")"
+	cat $arch | sort | awk '{print $1}' | uniq | xargs echo -ne '\t\t\tmachines="' | sed -e 's:machines=" :machines=":g'
+	echo '" ;;'
+	cat $arch | sort | awk '{print $1}' | uniq > /tmp/feedsort && mv /tmp/feedsort $arch
+done
+cat /tmp/sort-footer.sh
+
diff --git a/contrib/angstrom/personal-feed.sh b/contrib/angstrom/personal-feed.sh
index 948769e5d7..1951c27ab4 100644
--- a/contrib/angstrom/personal-feed.sh
+++ b/contrib/angstrom/personal-feed.sh
@@ -45,7 +45,7 @@ echo "Starting rsync..."
 rsync -vz --partial --copy-links --progress --files-from=files-trans upload-queue/ personal-feed/
 
 echo "Generating index for your personal feed..."
-( cd personal-feed ; PATH=$PATH:$(find ../../../staging/$(uname -m)* -name "ipkg-make-index" | sed s:/ipkg-make-index::g) ipkg-make-index -p Packages -m . >& /dev/null )
+( cd personal-feed ; PATH=$PATH:$(find ../../../sysroots/$(uname -m)* -name "ipkg-make-index" | sed s:/ipkg-make-index::g) ipkg-make-index -p Packages -m . >& /dev/null )
 
 
 # Clean up temporary files
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index 0f1d220cf0..a865d454e1 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -43,47 +43,67 @@ do_sort() {
 archdir=$arch
 
 case "$arch" in
+	"486sx")
+			machines="vortex86sx" ;;
 	"armv4")
-			machines="h3600 h3800 collie simpad htcwallaby" ;;
+			machines="collie h3600 h3800 htcwallaby jornada56x jornada7xx shark simpad" ;;
 	"armv4t")
-			machines="micro2440 mini2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;;
+			machines="acern30 amsdelta at2440evb cs-e9302 ep93xx eteng500 eten-m800 fic-gta01 fic-gta02 gesbc-9302 h1940 h6300 kb9202 ks8695 m8050 micro2440 mini2440 om-gta01 om-gta02 rx1950 rx3000 sarge-at91 simone smdk2440 smdk2443 topas910 ts72xx" ;;
 	"armv5te")
-			machines="hawkboard da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm6467t-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client openrd-base dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone hipox" ;;
+			machines="a1200 a780 a910 afeb9260 afeb9260-180 akita asus620 asus730 at91cap9adk at91-l9260 at91sam9260ek at91sam9261ek at91sam9263ek at91sam9g10ek at91sam9g20ek at91sam9g45ek at91sam9g45ekes at91sam9rlek aximx50 aximx50v bd-neon c7x0 chumby cm-x270 cm-x300 da830-omapl137-evm da850-omapl138-evm davinci-dvevm davinci-sffsdr devkitidp-pxa255 dm355-evm dm355-leopard dm357-evm dm365-evm dm6446-evm dm6467-evm dm6467t-evm dns323 e680 ea3250 em-x270 er0100 eseries ghi270 gumstix gumstix-connex gumstix-custom-connex gumstix-custom-verdex gumstix-verdex h1910 h2200 h3900 h4000 h5000 hawkboard hipox htcalpine htcapache htcblueangel htchimalaya htcsable htctornado htcuniversal hx2000 hx4700 imote2 ixp4xxle kixrp435 kuropro logicpd-pxa270 looxc550 lspro magician mainstone mh355 mp900c mtx-3 mtx-3a mv2120 mx21ads mx27ads n2100 navman-icn330 netbook-pro neuros-osd neuros-osd2 nhk15 nokia770 nslu2le omap1510inn omap1610h2 omap1710h3 omap5912osk openrd-base openrd-client palmld palmt650 palmt680 palmtc palmtt palmtt3 palmtt5 palmtx palmz31 palmz71 palmz72 poodle qemuarm rokre2 rokr-e2 rokre6 ronetix-pm9261 ronetix-pm9263 sgh-i900 sheevaplug spitz stamp9g20evb topas910 tosa triton ts409 tsx09 tx25 tx27" ;;
 	"armv5teb")
-			machines="ixp4xxbe nslu2be" ;;
+			machines="fsg3be ixp4xxbe nslu2be" ;;
+	"armv6")
+			machines="bug mx31ads mx31moboard nokia800 om-3d7k omap2420h4 omap2430sdp smartq5 smdk6410" ;;
 	"armv6-novfp")
-			machines="htcdiamond htckaiser htcpolaris htcraphael htcvogue" ;;	
-	"armv6")	
-			machines="smdk6410 smartq5 bug mx31ads nokia800 " ;;
-	"armv7")
-			machines="" ;;
+			machines="htcblackstone htcdiamond htcdream htckaiser htcnike htcpolaris htcraphael htctitan htcvogue" ;;
 	"armv7a")
-			machines="archos5 archos5it palmpre cm-t35 igep0020 omap3-touchbook beagleboard omap3evm am3517-evm omap3517-evm dm3730-am3715-evm omap3-pandora omapzoom omapzoom2 omapzoom36x overo" ;;
+			machines="am3517-evm archos5 archos5it beagleboard bug20 cm-t35 dm3730-am3715-evm htcleo igep0020 nokia900 omap3517-evm omap3evm omap3-pandora omap3-touchbook omap4430-sdp omapzoom omapzoom2 omapzoom36x overo palmpre" ;;
 	"avr32")
-			machines="atngw100 at32stk1000" ;;
+			machines="at32stk1000 atngw100" ;;
 	"bfin")
 			archdir="blackfin"
 			machines="adsp-bf537-stamp" ;;
 	"geode")
-			machines="alix" ;;
+			machines="alix geodegx geodelx iei-nanogx-466 xo" ;;
 	"i486")
-			machines="x86" ;;
+			machines="wrap" ;;
 	"i586")
-			machines="epia" ;;
+			machines="d201gly2 epia i586-generic netvisa progear x86 x86-uml" ;;
 	"i686")
-			machines="eee701 qemux86 guinness progear" ;;
+			machines="eee701 i686-generic qemux86 guinness progear ion qemux86 vmware x86-32-nocona x86-prescott" ;;
 	"iwmmxt")
 			machines="" ;;
-	"ppc405")	
-			machines="dht-walnut" ;;
+	"mips")
+			machines="qemumips" ;;
+	"mipsel")
+			machines="ben-nanonote db1200 lsmipsel mtx-1 mtx-2 rb500 stb225 wgt634u wl500g wrt54 xxs1500" ;;
+	"powerpc")
+			machines="gamecube p2020ds" ;;
+	"ppc405")
+			machines="dht-walnut kilauea magicbox xilinx-ml403 xilinx-ml410" ;;
+	"ppc440e")
+			machines="canyonlands sequoia xilinx-ml507" ;;
+	"ppc500")
+			machines="tqm8540" ;;
 	"ppc603e")
-			machines="lsppchd lsppchg efika n1200" ;;
+			machines="efika lite5200 lsppchd lsppchg n1200 qemuppc storcenter" ;;
+	"ppce300c2")
+			machines="mpc8323e-rdb" ;;
 	"ppce300c3")
-			machines="mpc8313e-rdb mpc8315e-rdb" ;;
+			machines="boc01 mpc8313e-rdb mpc8315e-rdb" ;;
 	"ppce500")
 			machines="tqm8540" ;;
+	"ppce500v2")
+			machines="calamari" ;;
+	"ppce600")
+			machines="mpc8641-hpcn" ;;
+	"sh4")
+			machines="qemush4 titan" ;;
 	"sparc")
-			machines="" ;;
+			machines="sun4cdm" ;;
+	"x86")
+			machines="colinux" ;;
 esac
 
 if [ $(find . -name  "*.ipk"| grep $arch | wc -l) -gt 0 ] ; then
@@ -165,13 +185,16 @@ for i in `find . -name  "*.ipk"| grep _all` ; do mkdir -p ../all/ || true ;mv $i
 mkdir -p ../sdk ; mv *sdk.ipk ../sdk/ || true
  (mkdir -p ../sdk ; cd ../sdk && ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig )
 
-for arch in armv4t armv4 armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e ppce300c3 ppce500 sparc x86_64 ; do
+for arch in armv4t armv4 armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt mips mipsel powerpc ppc405 ppc440e ppc500 ppce300c2 ppce300c3 ppce500v2 ppce500 ppce600 sh4 sparc x86_64 x86; do
 	do_sort
 done
 
 if [ "$1" != "--skip-sorted-list" ]; then
     echo "Updating list of sorted packages (takes long)"
-    for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted
+    for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted-new
+	cat files-sorted files-sorted-new | sort | uniq > files-sorted-tmp
+	mv files-sorted-tmp files-sorted
+	rm files-sorted-*
 fi
 
 ( cd ~/website/repo-updater ; rm -f feed.db* ; php update.php ; rm ../repo/feeds.db* ; cp feeds.db* ../repo )
diff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.py
index fe0e38596b..1d1085d6e6 100755
--- a/contrib/python/generate-manifest-2.6.py
+++ b/contrib/python/generate-manifest-2.6.py
@@ -9,10 +9,10 @@ import os
 import sys
 import time
 
-VERSION = "2.6.2"
+VERSION = "2.6.4"
 
 __author__ = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-__version__ = "20091004"
+__version__ = "20100505"
 
 class MakefileMaker:
 
@@ -23,7 +23,7 @@ class MakefileMaker:
         self.output = outfile
         self.out( """
 # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
-# Generator: '%s' Version %s (C) 2002-2009 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# Generator: '%s' Version %s (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
 # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 """ % ( sys.argv[0], __version__ ) )
 
@@ -248,7 +248,7 @@ if __name__ == "__main__":
 
     m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math",
     "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
-    "pipes.* socket.* tempfile.* StringIO.* " )
+    "pipes.* socket.* ssl.* tempfile.* StringIO.* " )
 
     m.addPackage( "python-json", "Python JSON Support", "python-core python-math python-re",
     "json" ) # package
diff --git a/contrib/qa/bugzilla.py b/contrib/qa/bugzilla.py
index d1fd0d84c0..569f140d78 100644
--- a/contrib/qa/bugzilla.py
+++ b/contrib/qa/bugzilla.py
@@ -7682,7 +7682,7 @@ bugs_openmoko = """<!-- 1.0@bugzilla.org -->
     </td>
     <td><nobr></nobr>
     </td>
-    <td>package libelf-0.8.6-r0: task do_populate_staging: failed
+    <td>package libelf-0.8.6-r0: task do_populate_sysroot: failed
     </td>
 
   </tr>
diff --git a/contrib/qemu/run-qemu.sh b/contrib/qemu/run-qemu.sh
index 922d28238c..ec863c2a12 100755
--- a/contrib/qemu/run-qemu.sh
+++ b/contrib/qemu/run-qemu.sh
@@ -1,5 +1,12 @@
 #!/bin/sh
 # set -x
+# This script helps in launching QEMU to emulate OE based target systems
+# It accepts 2 arguments
+# First argument is the target architectures
+# second argument is empty if you want to do a complete init or
+# 'single' if booting into /bin/sh
+# It assumes that bridge is setup on the eth0 device on the host systems
+
 # on debian-like systems
 # set up bridge aptitude install bridge-utils
 # 
@@ -23,17 +30,49 @@
 #
 #auto eth0
 
-supported_archs="{arm mips x86}"
-if [ $# -ne 1 ]; then
+# before using this script make sure that the following variables are set
+# as per your build system environment
+
+# oetmpdir -	Same as $TMPDIR set in OE local.conf
+# oesrcdir -	Absolute path to OE metadata
+# kernel -	Kernel image e.g. uImage, zImage, vmlinux etc.
+# image -	The root file system created by OE console-image, x11-image etc.
+# imagetype -	Image file system type e.g. ext2, ext3 etc.
+# libc -	uclibc/glibc/eglibc
+# server -	NFS server hosting the root file system.
+# gateway
+# netmask
+# address -	IP Address of the target. You may have diffrent LAN setup
+# hostname -	Name of the target
+# nfsdir -	Absolute path to directory having the root file system on NFS
+# device
+# nfsboot -	'yes' if root file system is to be mounted over NFS, if booting from
+#		disk image then set it to 'no'
+# networking -	If target should enable networking over bridge set to 'yes' else 'no'
+#		This will be set to 'yes' automatically if nfsboot is enabled
+# staticip -	Set to 'yes' if IP address is assigned statically or 'no' if getting
+#		from dhcp server. Note that this option is not entertained if networking
+#		is disabled
+
+supported_archs="{arm mips ppc sh4 x86}"
+if [ $# -ne 2 ]; then
     echo -en "
-    Usage: `basename $0` <arch>
+    Usage: `basename $0` <arch> <libc>
     where <arch> is one $supported_archs
-    Example: `basename $0` arm
+    libc is uclibc glibc or eglibc
+    Example: `basename $0` arm eglibc
 "
-    exit 1
+    exit 0
 fi
 
 arch=$1
+libc=$2
+mem=256				# memory for guest server in Mb
+imagetype="ext2"
+networking="no"
+nfsboot="no"
+staticip="yes"
+
 case $arch in
     arm)
 	address="10.0.1.101"
@@ -42,11 +81,9 @@ case $arch in
 	gdbport="1234"
 	consoleopt="console=ttyAMA0 console=ttyS0"
 	rootdisk="sda"
-	qemu="qemu-system-arm"
-	libc="uclibc"
-        kernel="/scratch/oe/deploy/$libc/images/qemu$arch/zImage-qemuarm.bin"
-        hdimage="/scratch/oe/deploy/$libc/images/qemu$arch/native-sdk-image-qemuarm.ext2"
-        #hdimage="/scratch/oe/deploy/$libc/images/qemu$arch/console-image-qemuarm.ext2"
+	qemuopts="-nographic"
+        kernel="zImage"
+        image="minimalist-image"
         ;;
     mips)
 	address="10.0.1.102"
@@ -55,24 +92,21 @@ case $arch in
 	gdbport="1235"
         consoleopt="console=ttyS0"
 	rootdisk="hda"
-	qemu="qemu-system-mips"
-	libc="uclibc"
-        kernel="/scratch/oe/deploy/$libc/images/qemu$arch/vmlinux-qemumips.bin"
-        hdimage="/scratch/oe/deploy/$libc/images/qemu$arch/native-sdk-image-qemumips.ext2"
-        hdimage="/scratch/oe/deploy/$libc/images/qemu$arch/console-image-qemumips.ext2"
+	qemuopts="-nographic"
+        kernel="vmlinux"
+        image="minimalist-image"
         ;;
     ppc|powerpc)
     	arch=ppc
 	address="10.0.1.103"
         macaddr="00:16:3e:00:00:03"
-	machine="bamboo"
+	machine="g3beige"
 	gdbport="1236"
         consoleopt="console=ttyS0"
-	rootdisk="hdc" #hdc4
-	qemu="qemu-system-ppcemb"
-	libc="eglibc"
-        kernel="/scratch/oe/deploy/$libc/images/qemu$arch/uImage-qemuppc.bin"
-        hdimage="/scratch/oe/deploy/$libc/images/qemu$arch/helloworld-image-qemuppc.ext2"
+	rootdisk="hdc"
+	qemuopts="-nographic"
+        kernel="vmlinux"
+        image="minimalist-image"
         ;;
     sh|sh4)
     	arch=sh4
@@ -80,15 +114,12 @@ case $arch in
         macaddr="00:16:3e:00:00:04"
 	machine="r2d"
 	gdbport="1237"
-        #consoleopt="console=tty0 console=ttySC1"
-	rootdisk="sdc2" #hdc4
-	qemu="qemu-system-sh4 -serial vc -serial stdio"
-	#qemu="qemu-system-sh4"
-	libc="uclibc"
-        kernel="/scratch/oe/deploy/$libc/images/qemu$arch/zImage-qemush4.bin"
-        #kernel="/home/kraj/qemu/sh/sh-test-0.2/zImage"
-        hdimage="/scratch/oe/deploy/$libc/images/qemu$arch/console-image-qemush4.ext2"
-        #hdimage="/home/kraj/qemu/sh/sh-test-0.2/sh-linux-mini.img"
+	mem="512"
+        consoleopt="console=ttySC1 noiotrap earlyprintk=sh-sci.1"
+	rootdisk="sda"
+	qemuopts="-monitor null -serial vc -serial stdio"
+        kernel="zImage"
+        image="minimalist-image"
         ;;
     x86)
 	address="10.0.1.105"
@@ -97,12 +128,9 @@ case $arch in
 	machine="pc"
         consoleopt="console=ttyS0"
 	rootdisk="hda"
-	qemu="qemu"
-	libc="uclibc"
-        kernel="/scratch/oe/deploy/$libc/images/qemu$arch/bzImage-qemux86.bin"
-        hdimage="/scratch/oe/deploy/$libc/images/qemu$arch/native-sdk-image-qemux86.ext2"
-        hdimage="/scratch/oe/deploy/$libc/images/qemu$arch/minimalist-image-qemux86.ext2"
-        hdimage="/scratch/oe/deploy/$libc/images/qemu$arch/console-image-qemux86.ext2"
+	qemuopts="-nographic"
+        kernel="bzImage"
+        image="minimalist-image"
         ;;
     *)
         echo "Specify one architectures out of $supported_archs to emulate."
@@ -116,49 +144,75 @@ netmask="255.255.0.0"		# subnet mask
 hostname="qemu$arch"		# hostname for guest server
 nfsdir="/opt/oe/$hostname"	# nfs directory where root file system is
 device="eth0"			# interface that guest server will use
-mem=256				# memory for guest server in Mb
-gdbit="-gdb tcp::$gdbport"	# debug the kernel using gdb set it to -s
+gdbit="-redir tcp:2222::22 -gdb tcp::$gdbport"   # debug the kernel using gdb set it to -s
 				# add -S to stop after launch and wait for
 				# gdb to connect
 
-nfsopts="rsize=8192,wsize=8192,hard,intr,tcp,nolock"	# nfs options
-
-# for NFS root 
-rootfs="root=/dev/nfs rw nfsroot=$nfsserver:$nfsdir,$nfsopts"
+oetmpdir=/scratch/oe
+oesrcdir=$HOME/work/oe/openembedded
 
-# Boot from a Disk Image
+nfsopts="rsize=8192,wsize=8192,hard,intr,tcp,nolock"	# nfs options
 
-rootfs="root=/dev/$rootdisk rw"
+if [ $nfsboot = "yes" ]; then
+	# for NFS root 
+	rootfs="root=/dev/nfs rw nfsroot=$nfsserver:$nfsdir,$nfsopts"
+	# without networking nfsroot wouldnt be possible so enable it explicitly.
+	networking="yes"
+else
+	# Boot from a Disk Image
+	rootfs="root=/dev/$rootdisk rw"
+fi
 
-# ip format
-#ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
-ipopt="ip=$address::$gateway:$netmask:$hostname:$device:off"
+if [ $networking != "yes" ]; then
+	ipopt=""
+else
+if [ $staticip = "yes" ]; then
+	# ip format
+	#ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
+	ipopt="ip=$address::$gateway:$netmask:$hostname:$device:off"
+else
+	# get IP from DHCP server on network
+	ipopt="ip=dhcp"
+fi
+fi
+qemuifup="$oesrcdir/contrib/qemu/qemu-ifup"
+qemuifdown="$oesrcdir/contrib/qemu/qemu-ifdown"
 
-# get IP from DHCP server on network
-#ipopt="ip=dhcp"
 
-init=""
-qemuifup="/home/kraj/work/oe/openembedded/contrib/qemu/qemu-ifup"
-qemuifdown="/home/kraj/work/oe/openembedded/contrib/qemu/qemu-ifdown"
+if [ $networking = "yes" ]; then
+	uid=`whoami`
+	iface=`sudo tunctl -b -u $uid`
+	netopt="-net nic,vlan=0,macaddr=$macaddr -net tap,vlan=0,ifname=$iface,script=$qemuifup,downscript=$qemuifdown"
+else
+	netopt="-net none"
+fi
 
-uid=`whoami`
-iface=`sudo tunctl -b -u $uid`
+if [ "x$2" == "xsingle" ]; then
+    init="init=/bin/sh"
+else
+    init=""
+fi
 
-netopt="-net nic,vlan=0,macaddr=$macaddr -net tap,vlan=0,ifname=$iface,script=$qemuifup,downscript=$qemuifdown"
+qemupath="$oetmpdir/sysroots/`uname -m`-linux/usr/bin"
 
-if [ "x$1" == "xsingle" ]
-then
-    init="init=/bin/sh"
+if [ $arch = "x86" ]; then
+    qemu=$qemupath/qemu
+else
+    qemu=$qemupath/qemu-system-$arch
 fi
+kernelimage=$oetmpdir/deploy/$libc/images/qemu$arch/$kernel-qemu$arch.bin
+hdimage=$oetmpdir/deploy/$libc/images/qemu$arch/$image-qemu$arch.$imagetype
 echo "Starting QEMU ..."
 set -x
-	#-L /scratch/oe/deploy/$libc/images/qemu$arch \
-$qemu -M $machine --snapshot $gdbit -m $mem -kernel $kernel -hda $hdimage \
-	-usb -usbdevice wacom-tablet -nographic --no-reboot -localtime \
+$qemu -M $machine --snapshot $gdbit -m $mem \
+	-kernel $kernelimage -drive file=$hdimage \
+	-usb -usbdevice wacom-tablet --no-reboot -localtime \
+	$qemuopts \
 	-append "$consoleopt $rootfs $ipopt $init debug user_debug=-1" \
 	$netopt
 set +x
-#destroy the tap interface
-sudo tunctl -b -d $iface
+if [ $networking = "yes" ]; then
+	#destroy the tap interface
+	sudo tunctl -b -d $iface
+fi
 stty sane
-# qemu-system-sh4 -M r2d -kernel ~/zImage -nographic -monitor null -serial null -serial stdio  
diff --git a/docs/usermanual/chapters/metadata.xml b/docs/usermanual/chapters/metadata.xml
index c698be961a..bbf6f733bb 100644
--- a/docs/usermanual/chapters/metadata.xml
+++ b/docs/usermanual/chapters/metadata.xml
@@ -95,7 +95,7 @@
 
     <para>OpenEmbedded has files ending with <emphasis>.conf</emphasis>,
     <emphasis>.inc</emphasis>, <emphasis>.bb</emphasis>
-    and<emphasis>.bbclass</emphasis>. The syntax and semantic of these files
+    and<emphasis>.bbclass</emphasis>. The syntax and semantics of these files
     are best described in the <ulink
     url="http://bitbake.berlios.de/manual"><application>BitBake</application>
     manual</ulink>.</para>
diff --git a/docs/usermanual/chapters/recipes.xml b/docs/usermanual/chapters/recipes.xml
index 90a181060b..6a574d87b7 100644
--- a/docs/usermanual/chapters/recipes.xml
+++ b/docs/usermanual/chapters/recipes.xml
@@ -451,7 +451,7 @@ mv fixed.recipe.bb myrecipe.bb</screen></para>
       </listitem>
 
       <listitem>
-        <para>The classes, that are used via the inherit keyword, define
+        <para>The classes that are used via the inherit keyword define
         and/or use the majority of the remaining variables. A class is like
         a library that contains parts of a bitbake recipe that is used by
         multiple recipes. To make them usable in more situations they often
@@ -503,7 +503,7 @@ mv fixed.recipe.bb myrecipe.bb</screen></para>
     <para>Practically all recipes start with a header section which describes
     various aspects of the package that is being built. This information is
     typically used directly by the package format (such as ipkg or deb) as
-    it's meta data used to describe the package.</para>
+    its meta data used to describe the package.</para>
 
     <para>Variables used in the header include:</para>
 
@@ -835,7 +835,7 @@ S = "${WORKDIR}/widgets"</screen></para>
       <title>D: The destination directory</title>
 
       <para>The destination directory is where the completed application and
-      all of it's files are installed into in preparation for packaging.
+      all of its files are installed into in preparation for packaging.
       Typically an installation would place files in directories such as
       <emphasis role="bold">/etc</emphasis> and <emphasis
       role="bold">/usr/bin</emphasis> by default. Since those directories are
@@ -1037,7 +1037,7 @@ ${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"</screen></para>
       done is when one recipe includes another one in which the default values
       will be based on the name of the package doing the including, not the
       included package. Typically the included package will expect the files
-      to be located in a directory based on it's own name.</para>
+      to be located in a directory based on its own name.</para>
 
       <para>As an example the m4-native recipe includes the m4 recipe. This is
       fine, except that the m4 recipe expects its files and patches to be
@@ -1218,8 +1218,8 @@ Packaged contents of myhelloworld-doc into /home/lenehan/devel/oe/build/titan-gl
 NOTE: Not creating empty archive for myhelloworld-dev-0.1-r0
 NOTE: Not creating empty archive for myhelloworld-locale-0.1-r0
 NOTE: package myhelloworld-0.1-r0: task do_package_write: completed
-NOTE: package myhelloworld-0.1-r0: task do_populate_staging: started
-NOTE: package myhelloworld-0.1-r0: task do_populate_staging: completed
+NOTE: package myhelloworld-0.1-r0: task do_populate_sysroot: started
+NOTE: package myhelloworld-0.1-r0: task do_populate_sysroot: completed
 NOTE: package myhelloworld-0.1-r0: task do_build: started
 NOTE: package myhelloworld-0.1-r0: task do_build: completed
 NOTE: package myhelloworld-0.1: completed
@@ -1458,7 +1458,7 @@ inherit autotools</screen></para>
   </section>
 
   <section id="recipes_methods" xreflabel="methods">
-    <title>Methods: Inbuilt methods to make your life easier</title>
+    <title>Methods: Built-in methods to make your life easier</title>
 
     <para>There are several helper functions defined by the base class, which
     is included by default for all recipes. Many of these are used a lot in
@@ -1931,7 +1931,7 @@ NOTE: package helloworld-0.1-r0: task do_package_write: completed</screen>We
 
             <listitem>
               <para>Documentation related files. All documentation is
-              separated into it's own package so that it does not need to be
+              separated into its own package so that it does not need to be
               installed unless explicitly required.<screen>FILES_${PN}-doc = "\
     ${docdir} \
     ${mandir} \
@@ -2447,7 +2447,7 @@ addtask unpack_extra after do_unpack before do_patch</screen></para>
     building later applications.</para>
 
     <para>Taking bzip2 as an example you can see that it stages a header file
-    and it's library files:<screen>do_stage () {
+    and its library files:<screen>do_stage () {
     install -m 0644 bzlib.h ${STAGING_INCDIR}/
     oe_libinstall -a -so libbz2 ${STAGING_LIBDIR}
 }</screen></para>
@@ -2929,7 +2929,7 @@ fi</screen></para>
     some action, such as changing user or group owners or creating device
     nodes. Since OpenEmbedded will not keep the user and group information
     it's usually preferable to remove that from the makefiles. For device
-    nodes it's usually preferably to create them from the initial device node
+    nodes it's usually preferable to create them from the initial device node
     lists or via udev configuration.</para>
 
     <para>However if you can't get by without root permissions then you can
@@ -3135,7 +3135,7 @@ do_configure() {
     object, then replaces any dots with underscores. Therefore if the <emphasis
     role="bold">PV</emphasis> was <emphasis role="bold">0.9.0</emphasis> then
     <emphasis role="bold">TAG</emphasis> will be set to <emphasis
-    role="bold">0-9-0</emphasis>.</para>
+    role="bold">0_9_0</emphasis>.</para>
 
     <para>Some of the more common python code in use in existing recipes is
     shown in the following table:</para>
diff --git a/docs/usermanual/chapters/usage.xml b/docs/usermanual/chapters/usage.xml
index 058fa5d869..1563dc3eac 100644
--- a/docs/usermanual/chapters/usage.xml
+++ b/docs/usermanual/chapters/usage.xml
@@ -5,7 +5,7 @@
   <section id="usage_introduction" xreflabel="introduction">
     <title>Introduction</title>
 
-    <para>If your reading this manual you probably already have some idea of
+    <para>If you're reading this manual you probably already have some idea of
     what OpenEmbedded is all about, which is taking a lot of software and
     creating something that you can run on another device. This involves
     downloading some source code, compiling it, creating packages (like .deb
@@ -13,7 +13,7 @@
     device. The difficulties of cross-compiling and the variety of devices
     which can be supported lead to a lot more complexity in an OpenEmbedded
     based distribution than you'd find in a typical desktop distribution
-    (which cross-compiling isn't needed).</para>
+    (for which cross-compiling isn't needed).</para>
 
     <para>A major part of OpenEmbedded deals with compiling source code for
     various projects. For each project this generally requires the same basic
@@ -642,10 +642,10 @@ Packaged contents of lzo-dev into /home/lenehan/devel/oe/build/titan-glibc-25/tm
 NOTE: Not creating empty archive for lzo-locale-1.08-r14
 NOTE: package lzo-1.08-r14: task <emphasis role="bold">do_package_write</emphasis>: completed
 NOTE: package lzo-1.08: completed
-NOTE: Running task 223 of 226 (ID: 6, /home/lenehan/devel/oe/build/titan-glibc-25/recipes/lzo/lzo_1.08.bb, do_populate_staging)
+NOTE: Running task 223 of 226 (ID: 6, /home/lenehan/devel/oe/build/titan-glibc-25/recipes/lzo/lzo_1.08.bb, do_populate_sysroot)
 NOTE: package lzo-1.08: started
-NOTE: package lzo-1.08-r14: task <emphasis role="bold">do_populate_staging</emphasis>: started
-NOTE: package lzo-1.08-r14: task <emphasis role="bold">do_populate_staging</emphasis>: completed
+NOTE: package lzo-1.08-r14: task <emphasis role="bold">do_populate_sysroot</emphasis>: started
+NOTE: package lzo-1.08-r14: task <emphasis role="bold">do_populate_sysroot</emphasis>: completed
 NOTE: package lzo-1.08: completed
 NOTE: Running task 224 of 226 (ID: 9, /home/lenehan/devel/oe/build/titan-glibc-25/recipes/lzo/lzo_1.08.bb, do_qa_staging)
 NOTE: package lzo-1.08: started
@@ -734,10 +734,10 @@ NOTE: build 200705041709: completed</screen><note>
       </varlistentry>
 
       <varlistentry>
-        <term>populate_staging (stage)</term>
+        <term>populate_sysroot (stage)</term>
 
         <listitem>
-          <para>The <emphasis>populate_staging</emphasis> task (stage is an
+          <para>The <emphasis>populate_sysroot</emphasis> task (stage is an
           alternate, easier to type name, that can be used to refer to this
           task) is responsible for making available libraries and headers (if
           any) that may be required by other packages to build. For example if
@@ -745,7 +745,7 @@ NOTE: build 200705041709: completed</screen><note>
           available for other applications to include and link against.</para>
 
           <note>
-            <para>This is different to the <emphasis>install</emphasis> task
+            <para>This is different from the <emphasis>install</emphasis> task
             in that this is responsible for making available libraries and
             headers for use during build on the development host. Therefore
             it's libraries which normal have to stage things while
@@ -820,10 +820,10 @@ NOTE: build 200705041709: completed</screen><note>
     <emphasis>qa_configure</emphasis> between the
     <emphasis>configure</emphasis> and <emphasis>compile</emphasis> tasks and
     another new task called <emphasis>qa_staging</emphasis> between
-    <emphasis>populate_staging</emphasis> and <emphasis>build</emphasis>
+    <emphasis>populate_sysroot</emphasis> and <emphasis>build</emphasis>
     tasks. The former validates the result of the
     <emphasis>configure</emphasis> task and the late the results of the
-    <emphasis>populate_staging</emphasis> task.</para>
+    <emphasis>populate_sysroot</emphasis> task.</para>
 
     <para>To determine the full list of tasks available for a specific recipe
     you can run bitbake on the recipe and asking it for the full list of
@@ -835,7 +835,7 @@ do_listtasks
 do_rebuild
 do_compile
 do_build
-do_populate_staging
+do_populate_sysroot
 do_mrproper
 do_fetch
 do_configure
@@ -853,7 +853,7 @@ NOTE: package perl-5.8.8-r11: task do_listtasks: completed
 NOTE: package perl-5.8.8: completed
 $ </screen></para>
 
-    <para>If your being observant you'll note that
+    <para>If you're being observant you'll note that
     <emphasis>listtasks</emphasis> is in fact a task itself, and that the
     <emphasis role="bold">-c</emphasis> option to bitbake allows you to
     explicitly run specific tasks. We'll make use of this in the next section
@@ -876,7 +876,7 @@ $ </screen></para>
     the named recipe only. Note that this ignores any dependencies that are in
     the recipe, so these must have already been built previously.</para>
 
-    <para>Here's a typically example that cleans up the package (using the
+    <para>Here's a typical example that cleans up the package (using the
     <emphasis>clean</emphasis> task) and the rebuilds it with debugging output
     from bitbake enabled:<screen>$ <command>bitbake</command> -b &lt;bb-file&gt; -c clean
 $ <command>bitbake</command> -b &lt;bb-file&gt; -D</screen></para>
@@ -1116,7 +1116,7 @@ do_mrproper
 do_fetch
 do_configure
 do_clean
-do_populate_staging
+do_populate_sysroot
 do_package
 do_unpack
 do_install
diff --git a/docs/usermanual/reference/class_autotools.xml b/docs/usermanual/reference/class_autotools.xml
index a9e1a5721a..248b66a116 100644
--- a/docs/usermanual/reference/class_autotools.xml
+++ b/docs/usermanual/reference/class_autotools.xml
@@ -12,7 +12,7 @@
   <para>The autotools class takes care of all of the details for you. It
   defines appropriate tasks for <emphasis>configure</emphasis>,
   <emphasis>compile</emphasis>, <emphasis>stage</emphasis> and
-  <emphasis>install</emphasis>. At it's simplest adding an inherit for the
+  <emphasis>install</emphasis>. At its simplest adding an inherit for the
   autotools class is all that is required. The netcat recipe for example
   is:<screen>DESCRIPTION = "GNU Netcat"
 HOMEPAGE = "http://netcat.sourceforge.net"
@@ -150,4 +150,4 @@ do_configure() {
     oe_runconf
 }</screen></para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/usermanual/reference/class_binconfig.xml b/docs/usermanual/reference/class_binconfig.xml
index 049f85e1f0..4c60e671f0 100644
--- a/docs/usermanual/reference/class_binconfig.xml
+++ b/docs/usermanual/reference/class_binconfig.xml
@@ -37,10 +37,10 @@
   class.</para>
 
   <para>The class will search in source directory, <command>${S}</command>,
-  and all it's subdirectories, for files that end in
+  and all its subdirectories, for files that end in
   <command>-config</command> and process them as described above. All that is
   required to use the class is the addition of binconfig in an inherit
   statement:</para>
 
   <para><screen>inherit autotools binconfig</screen></para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/usermanual/reference/class_image.xml b/docs/usermanual/reference/class_image.xml
index b591e9aae2..227f7e1cd0 100644
--- a/docs/usermanual/reference/class_image.xml
+++ b/docs/usermanual/reference/class_image.xml
@@ -349,10 +349,10 @@ Alias /bogofeed ${DEPLOY_DIR}
 	<command>deploy/ipk</command>).</para>
         <para>Now, every image built will automatically contain feed configs
 	for the deploy directory (as of time of writing, deploy directory is internally structured with
-	per-arch subdirectories; so, there several feed configs are being generated, one for each subdirectory).
+	per-arch subdirectories; so, there are several feed configs being generated, one for each subdirectory).
         </para>
 
     </section>
 
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/usermanual/reference/dirs_install.xml b/docs/usermanual/reference/dirs_install.xml
index 75f85ac930..14f3fc645e 100644
--- a/docs/usermanual/reference/dirs_install.xml
+++ b/docs/usermanual/reference/dirs_install.xml
@@ -6,7 +6,7 @@
   control the directories into which files are installed.</para>
 
   <para>These variables can be used directly by the recipe to refer to paths
-  that will be used after the package is installed. For example, when specify
+  that will be used after the package is installed. For example, when specifying
   the location of configuration files you need to specify the location on the
   target as show in the following example from quagga:<screen># Indicate that the default files are configuration files
 CONFFILES_${PN} = "${sysconfdir}/default/quagga"
diff --git a/docs/usermanual/reference/fakeroot.xml b/docs/usermanual/reference/fakeroot.xml
index 5eb6a48eb0..845756551b 100644
--- a/docs/usermanual/reference/fakeroot.xml
+++ b/docs/usermanual/reference/fakeroot.xml
@@ -45,7 +45,7 @@ brw-------  1 root root 22, 0 Aug 18 13:20 hdc
     device node, even though we did not have to give a password for the root
     user. In reality this device node still doesn't exist, it just looks like
     it exits. Fakeroot is lying to the shell process and telling it that
-    <emphasis>"yes, this file exists and these are it's
+    <emphasis>"yes, this file exists and these are its
     properties"</emphasis>. We'll talk more about how fakeroot actually works
     in a minute.</para>
 
@@ -183,4 +183,4 @@ crw-r----- root/root    204,10 2006-08-16 13:07:12 ./dev/ttySC2
     oe_runmake install-man DESTDIR=${D}
     ...</screen></para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/usermanual/reference/var_src_uri.xml b/docs/usermanual/reference/var_src_uri.xml
index bc495719f8..b858e8abb0 100644
--- a/docs/usermanual/reference/var_src_uri.xml
+++ b/docs/usermanual/reference/var_src_uri.xml
@@ -455,11 +455,12 @@ SRC_URI[sha256sum] = &quot;36bdb85c97b39ac604bc58cb7857ee08295242c78a12848ef8a31
         </listitem>
       </varlistentry>
 
+      <varlistentry>
         <term>tag</term>
 
         <listitem>
           <para>The git tag to retrieve. The default is
-	  <command>"master"</command>.  This may be placed into
+          <command>"master"</command>.  This may be placed into
           <command>SRCREV</command> instead.</para>
         </listitem>
       </varlistentry>
@@ -470,7 +471,7 @@ SRC_URI[sha256sum] = &quot;36bdb85c97b39ac604bc58cb7857ee08295242c78a12848ef8a31
         <listitem>
           <para>The method to use to access the repository. Common options are
           <command>"git"</command>, <command>"http"</command> and
-	  <command>"rsync"</command>. The default is
+          <command>"rsync"</command>. The default is
           <command>"rsync"</command>.</para>
         </listitem>
       </varlistentry>
@@ -484,7 +485,7 @@ SRC_URI[sha256sum] = &quot;36bdb85c97b39ac604bc58cb7857ee08295242c78a12848ef8a31
 
           <listitem>
             <para>The revision of the git source to be checked out.
-	    The default is <command>1</command> which is invalid and leads to
+            The default is <command>1</command> which is invalid and leads to
             an error.</para>
           </listitem>
         </varlistentry>
diff --git a/recipes/mono/mono-1.9.1/.mtn2git_empty b/lib/oe/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/recipes/mono/mono-1.9.1/.mtn2git_empty
+++ b/lib/oe/__init__.py
diff --git a/lib/oe/patch.py b/lib/oe/patch.py
new file mode 100644
index 0000000000..7f6b0fe8de
--- /dev/null
+++ b/lib/oe/patch.py
@@ -0,0 +1,403 @@
+class NotFoundError(Exception):
+    def __init__(self, path):
+        self.path = path
+
+    def __str__(self):
+        return "Error: %s not found." % self.path
+
+class CmdError(Exception):
+    def __init__(self, exitstatus, output):
+        self.status = exitstatus
+        self.output = output
+
+    def __str__(self):
+        return "Command Error: exit status: %d  Output:\n%s" % (self.status, self.output)
+
+
+def runcmd(args, dir = None):
+    import commands
+
+    if dir:
+        olddir = os.path.abspath(os.curdir)
+        if not os.path.exists(dir):
+            raise NotFoundError(dir)
+        os.chdir(dir)
+        # print("cwd: %s -> %s" % (olddir, dir))
+
+    try:
+        args = [ commands.mkarg(str(arg)) for arg in args ]
+        cmd = " ".join(args)
+        # print("cmd: %s" % cmd)
+        (exitstatus, output) = commands.getstatusoutput(cmd)
+        if exitstatus != 0:
+            raise CmdError(exitstatus >> 8, output)
+        return output
+
+    finally:
+        if dir:
+            os.chdir(olddir)
+
+class PatchError(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
+    def __str__(self):
+        return "Patch Error: %s" % self.msg
+
+class PatchSet(object):
+    defaults = {
+        "strippath": 1
+    }
+
+    def __init__(self, dir, d):
+        self.dir = dir
+        self.d = d
+        self.patches = []
+        self._current = None
+
+    def current(self):
+        return self._current
+
+    def Clean(self):
+        """
+        Clean out the patch set.  Generally includes unapplying all
+        patches and wiping out all associated metadata.
+        """
+        raise NotImplementedError()
+
+    def Import(self, patch, force):
+        if not patch.get("file"):
+            if not patch.get("remote"):
+                raise PatchError("Patch file must be specified in patch import.")
+            else:
+                patch["file"] = bb.fetch.localpath(patch["remote"], self.d)
+
+        for param in PatchSet.defaults:
+            if not patch.get(param):
+                patch[param] = PatchSet.defaults[param]
+
+        if patch.get("remote"):
+            patch["file"] = bb.data.expand(bb.fetch.localpath(patch["remote"], self.d), self.d)
+
+        patch["filemd5"] = bb.utils.md5_file(patch["file"])
+
+    def Push(self, force):
+        raise NotImplementedError()
+
+    def Pop(self, force):
+        raise NotImplementedError()
+
+    def Refresh(self, remote = None, all = None):
+        raise NotImplementedError()
+
+
+class PatchTree(PatchSet):
+    def __init__(self, dir, d):
+        PatchSet.__init__(self, dir, d)
+
+    def Import(self, patch, force = None):
+        """"""
+        PatchSet.Import(self, patch, force)
+
+        if self._current is not None:
+            i = self._current + 1
+        else:
+            i = 0
+        self.patches.insert(i, patch)
+
+    def _applypatch(self, patch, force = False, reverse = False, run = True):
+        shellcmd = ["cat", patch['file'], "|", "patch", "-p", patch['strippath']]
+        if reverse:
+            shellcmd.append('-R')
+
+        if not run:
+            return "sh" + "-c" + " ".join(shellcmd)
+
+        if not force:
+            shellcmd.append('--dry-run')
+
+        output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
+
+        if force:
+            return
+
+        shellcmd.pop(len(shellcmd) - 1)
+        output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
+        return output
+
+    def Push(self, force = False, all = False, run = True):
+        if all:
+            for i in self.patches:
+                if self._current is not None:
+                    self._current = self._current + 1
+                else:
+                    self._current = 0
+                self._applypatch(i, force)
+        else:
+            if self._current is not None:
+                self._current = self._current + 1
+            else:
+                self._current = 0
+            return self._applypatch(self.patches[self._current], force)
+
+
+    def Pop(self, force = None, all = None):
+        if all:
+            for i in self.patches:
+                self._applypatch(i, force, True)
+        else:
+            self._applypatch(self.patches[self._current], force, True)
+
+    def Clean(self):
+        """"""
+
+class GitApplyTree(PatchTree):
+    def __init__(self, dir, d):
+        PatchTree.__init__(self, dir, d)
+
+    def _applypatch(self, patch, force = False, reverse = False, run = True):
+        shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']]
+
+        if reverse:
+            shellcmd.append('-R')
+
+        shellcmd.append(patch['file'])
+
+        if not run:
+            return "sh" + "-c" + " ".join(shellcmd)
+
+        return runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
+
+
+class QuiltTree(PatchSet):
+    def _runcmd(self, args, run = True):
+        quiltrc = bb.data.getVar('QUILTRCFILE', self.d, 1)
+        if not run:
+            return ["quilt"] + ["--quiltrc"] + [quiltrc] + args
+        runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir)
+
+    def _quiltpatchpath(self, file):
+        return os.path.join(self.dir, "patches", os.path.basename(file))
+
+
+    def __init__(self, dir, d):
+        PatchSet.__init__(self, dir, d)
+        self.initialized = False
+        p = os.path.join(self.dir, 'patches')
+        if not os.path.exists(p):
+            os.makedirs(p)
+
+    def Clean(self):
+        try:
+            self._runcmd(["pop", "-a", "-f"])
+        except Exception:
+            pass
+        self.initialized = True
+
+    def InitFromDir(self):
+        # read series -> self.patches
+        seriespath = os.path.join(self.dir, 'patches', 'series')
+        if not os.path.exists(self.dir):
+            raise Exception("Error: %s does not exist." % self.dir)
+        if os.path.exists(seriespath):
+            series = file(seriespath, 'r')
+            for line in series.readlines():
+                patch = {}
+                parts = line.strip().split()
+                patch["quiltfile"] = self._quiltpatchpath(parts[0])
+                patch["quiltfilemd5"] = bb.utils.md5_file(patch["quiltfile"])
+                if len(parts) > 1:
+                    patch["strippath"] = parts[1][2:]
+                self.patches.append(patch)
+            series.close()
+
+            # determine which patches are applied -> self._current
+            try:
+                output = runcmd(["quilt", "applied"], self.dir)
+            except CmdError:
+                import sys
+                if sys.exc_value.output.strip() == "No patches applied":
+                    return
+                else:
+                    raise sys.exc_value
+            output = [val for val in output.split('\n') if not val.startswith('#')]
+            for patch in self.patches:
+                if os.path.basename(patch["quiltfile"]) == output[-1]:
+                    self._current = self.patches.index(patch)
+        self.initialized = True
+
+    def Import(self, patch, force = None):
+        if not self.initialized:
+            self.InitFromDir()
+        PatchSet.Import(self, patch, force)
+
+        args = ["import", "-p", patch["strippath"]]
+        if force:
+            args.append("-f")
+            args.append("-dn")
+        args.append(patch["file"])
+
+        self._runcmd(args)
+
+        patch["quiltfile"] = self._quiltpatchpath(patch["file"])
+        patch["quiltfilemd5"] = bb.utils.md5_file(patch["quiltfile"])
+
+        # TODO: determine if the file being imported:
+        #      1) is already imported, and is the same
+        #      2) is already imported, but differs
+
+        self.patches.insert(self._current or 0, patch)
+
+
+    def Push(self, force = False, all = False, run = True):
+        # quilt push [-f]
+
+        args = ["push"]
+        if force:
+            args.append("-f")
+        if all:
+            args.append("-a")
+        if not run:
+            return self._runcmd(args, run)
+
+        self._runcmd(args)
+
+        if self._current is not None:
+            self._current = self._current + 1
+        else:
+            self._current = 0
+
+    def Pop(self, force = None, all = None):
+        # quilt pop [-f]
+        args = ["pop"]
+        if force:
+            args.append("-f")
+        if all:
+            args.append("-a")
+
+        self._runcmd(args)
+
+        if self._current == 0:
+            self._current = None
+
+        if self._current is not None:
+            self._current = self._current - 1
+
+    def Refresh(self, **kwargs):
+        if kwargs.get("remote"):
+            patch = self.patches[kwargs["patch"]]
+            if not patch:
+                raise PatchError("No patch found at index %s in patchset." % kwargs["patch"])
+            (type, host, path, user, pswd, parm) = bb.decodeurl(patch["remote"])
+            if type == "file":
+                import shutil
+                if not patch.get("file") and patch.get("remote"):
+                    patch["file"] = bb.fetch.localpath(patch["remote"], self.d)
+
+                shutil.copyfile(patch["quiltfile"], patch["file"])
+            else:
+                raise PatchError("Unable to do a remote refresh of %s, unsupported remote url scheme %s." % (os.path.basename(patch["quiltfile"]), type))
+        else:
+            # quilt refresh
+            args = ["refresh"]
+            if kwargs.get("quiltfile"):
+                args.append(os.path.basename(kwargs["quiltfile"]))
+            elif kwargs.get("patch"):
+                args.append(os.path.basename(self.patches[kwargs["patch"]]["quiltfile"]))
+            self._runcmd(args)
+
+class Resolver(object):
+    def __init__(self, patchset):
+        raise NotImplementedError()
+
+    def Resolve(self):
+        raise NotImplementedError()
+
+    def Revert(self):
+        raise NotImplementedError()
+
+    def Finalize(self):
+        raise NotImplementedError()
+
+class NOOPResolver(Resolver):
+    def __init__(self, patchset):
+        self.patchset = patchset
+
+    def Resolve(self):
+        olddir = os.path.abspath(os.curdir)
+        os.chdir(self.patchset.dir)
+        try:
+            self.patchset.Push()
+        except Exception:
+            import sys
+            os.chdir(olddir)
+            raise sys.exc_value
+
+# Patch resolver which relies on the user doing all the work involved in the
+# resolution, with the exception of refreshing the remote copy of the patch
+# files (the urls).
+class UserResolver(Resolver):
+    def __init__(self, patchset):
+        self.patchset = patchset
+
+    # Force a push in the patchset, then drop to a shell for the user to
+    # resolve any rejected hunks
+    def Resolve(self):
+
+        olddir = os.path.abspath(os.curdir)
+        os.chdir(self.patchset.dir)
+        try:
+            self.patchset.Push(False)
+        except CmdError, v:
+            # Patch application failed
+            patchcmd = self.patchset.Push(True, False, False)
+
+            t = bb.data.getVar('T', d, 1)
+            if not t:
+                bb.msg.fatal(bb.msg.domain.Build, "T not set")
+            bb.mkdirhier(t)
+            import random
+            rcfile = "%s/bashrc.%s.%s" % (t, str(os.getpid()), random.random())
+            f = open(rcfile, "w")
+            f.write("echo '*** Manual patch resolution mode ***'\n")
+            f.write("echo 'Dropping to a shell, so patch rejects can be fixed manually.'\n")
+            f.write("echo 'Run \"quilt refresh\" when patch is corrected, press CTRL+D to exit.'\n")
+            f.write("echo ''\n")
+            f.write(" ".join(patchcmd) + "\n")
+            f.write("#" + bb.data.getVar('TERMCMDRUN', d, 1))
+            f.close()
+            os.chmod(rcfile, 0775)
+
+            os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually"
+            os.environ['TERMRCFILE'] = rcfile
+            rc = os.system(bb.data.getVar('TERMCMDRUN', d, 1))
+            if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0:
+                bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \
+                    + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', d, 1))
+
+            # Construct a new PatchSet after the user's changes, compare the
+            # sets, checking patches for modifications, and doing a remote
+            # refresh on each.
+            oldpatchset = self.patchset
+            self.patchset = oldpatchset.__class__(self.patchset.dir, self.patchset.d)
+
+            for patch in self.patchset.patches:
+                oldpatch = None
+                for opatch in oldpatchset.patches:
+                    if opatch["quiltfile"] == patch["quiltfile"]:
+                        oldpatch = opatch
+
+                if oldpatch:
+                    patch["remote"] = oldpatch["remote"]
+                    if patch["quiltfile"] == oldpatch["quiltfile"]:
+                        if patch["quiltfilemd5"] != oldpatch["quiltfilemd5"]:
+                            bb.note("Patch %s has changed, updating remote url %s" % (os.path.basename(patch["quiltfile"]), patch["remote"]))
+                            # user change?  remote refresh
+                            self.patchset.Refresh(remote=True, patch=self.patchset.patches.index(patch))
+                        else:
+                            # User did not fix the problem.  Abort.
+                            raise PatchError("Patch application failed, and user did not fix and refresh the patch.")
+        except Exception:
+            os.chdir(olddir)
+            raise
+        os.chdir(olddir)
diff --git a/lib/oe/path.py b/lib/oe/path.py
new file mode 100644
index 0000000000..8902951581
--- /dev/null
+++ b/lib/oe/path.py
@@ -0,0 +1,44 @@
+def join(*paths):
+    """Like os.path.join but doesn't treat absolute RHS specially"""
+    import os.path
+    return os.path.normpath("/".join(paths))
+
+def relative(src, dest):
+    """ Return a relative path from src to dest.
+
+    >>> relative("/usr/bin", "/tmp/foo/bar")
+    ../../tmp/foo/bar
+
+    >>> relative("/usr/bin", "/usr/lib")
+    ../lib
+
+    >>> relative("/tmp", "/tmp/foo/bar")
+    foo/bar
+    """
+    import os.path
+
+    if hasattr(os.path, "relpath"):
+        return os.path.relpath(dest, src)
+    else:
+        destlist = os.path.normpath(dest).split(os.path.sep)
+        srclist = os.path.normpath(src).split(os.path.sep)
+
+        # Find common section of the path
+        common = os.path.commonprefix([destlist, srclist])
+        commonlen = len(common)
+
+        # Climb back to the point where they differentiate
+        relpath = [ os.path.pardir ] * (len(srclist) - commonlen)
+        if commonlen < len(destlist):
+            # Add remaining portion
+            relpath += destlist[commonlen:]
+
+        return os.path.sep.join(relpath)
+
+def format_display(path, metadata):
+    """ Prepare a path for display to the user. """
+    rel = relative(metadata.getVar("TOPDIR", 1), path)
+    if len(rel) > len(path):
+        return path
+    else:
+        return rel
diff --git a/lib/oe/qa.py b/lib/oe/qa.py
new file mode 100644
index 0000000000..01813931bb
--- /dev/null
+++ b/lib/oe/qa.py
@@ -0,0 +1,76 @@
+class ELFFile:
+    EI_NIDENT = 16
+
+    EI_CLASS      = 4
+    EI_DATA       = 5
+    EI_VERSION    = 6
+    EI_OSABI      = 7
+    EI_ABIVERSION = 8
+
+    # possible values for EI_CLASS
+    ELFCLASSNONE = 0
+    ELFCLASS32   = 1
+    ELFCLASS64   = 2
+
+    # possible value for EI_VERSION
+    EV_CURRENT   = 1
+
+    # possible values for EI_DATA
+    ELFDATANONE  = 0
+    ELFDATA2LSB  = 1
+    ELFDATA2MSB  = 2
+
+    def my_assert(self, expectation, result):
+        if not expectation == result:
+            #print "'%x','%x' %s" % (ord(expectation), ord(result), self.name)
+            raise Exception("This does not work as expected")
+
+    def __init__(self, name, bits32):
+        self.name = name
+        self.bits32 = bits32
+
+    def open(self):
+        self.file = file(self.name, "r")
+        self.data = self.file.read(ELFFile.EI_NIDENT+4)
+
+        self.my_assert(len(self.data), ELFFile.EI_NIDENT+4)
+        self.my_assert(self.data[0], chr(0x7f) )
+        self.my_assert(self.data[1], 'E')
+        self.my_assert(self.data[2], 'L')
+        self.my_assert(self.data[3], 'F')
+        if self.bits32 :
+            self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32))
+        else:
+            self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64))
+        self.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) )
+
+        self.sex = self.data[ELFFile.EI_DATA]
+        if self.sex == chr(ELFFile.ELFDATANONE):
+            raise Exception("self.sex == ELFDATANONE")
+        elif self.sex == chr(ELFFile.ELFDATA2LSB):
+            self.sex = "<"
+        elif self.sex == chr(ELFFile.ELFDATA2MSB):
+            self.sex = ">"
+        else:
+            raise Exception("Unknown self.sex")
+
+    def osAbi(self):
+        return ord(self.data[ELFFile.EI_OSABI])
+
+    def abiVersion(self):
+        return ord(self.data[ELFFile.EI_ABIVERSION])
+
+    def isLittleEndian(self):
+        return self.sex == "<"
+
+    def isBigEngian(self):
+        return self.sex == ">"
+
+    def machine(self):
+        """
+        We know the sex stored in self.sex and we
+        know the position
+        """
+        import struct
+        (a,) = struct.unpack(self.sex+"H", self.data[18:20])
+        return a
diff --git a/lib/oe/utils.py b/lib/oe/utils.py
new file mode 100644
index 0000000000..e61d663a50
--- /dev/null
+++ b/lib/oe/utils.py
@@ -0,0 +1,69 @@
+def read_file(filename):
+    try:
+        f = file( filename, "r" )
+    except IOError, reason:
+        return "" # WARNING: can't raise an error now because of the new RDEPENDS handling. This is a bit ugly. :M:
+    else:
+        return f.read().strip()
+    return None
+
+def ifelse(condition, iftrue = True, iffalse = False):
+    if condition:
+        return iftrue
+    else:
+        return iffalse
+
+def conditional(variable, checkvalue, truevalue, falsevalue, d):
+    if bb.data.getVar(variable,d,1) == checkvalue:
+        return truevalue
+    else:
+        return falsevalue
+
+def less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
+    if float(bb.data.getVar(variable,d,1)) <= float(checkvalue):
+        return truevalue
+    else:
+        return falsevalue
+
+def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
+    result = bb.vercmp(bb.data.getVar(variable,d,True), checkvalue)
+    if result <= 0:
+        return truevalue
+    else:
+        return falsevalue
+
+def contains(variable, checkvalues, truevalue, falsevalue, d):
+    val = bb.data.getVar(variable,d,1)
+    if not val:
+        return falsevalue
+    matches = 0
+    if type(checkvalues).__name__ == "str":
+        checkvalues = [checkvalues]
+    for value in checkvalues:
+        if val.find(value) != -1:
+            matches = matches + 1
+    if matches == len(checkvalues):
+        return truevalue
+    return falsevalue
+
+def both_contain(variable1, variable2, checkvalue, d):
+    if bb.data.getVar(variable1,d,1).find(checkvalue) != -1 and bb.data.getVar(variable2,d,1).find(checkvalue) != -1:
+        return checkvalue
+    else:
+        return ""
+
+def prune_suffix(var, suffixes, d):
+    # See if var ends with any of the suffixes listed and 
+    # remove it if found
+    for suffix in suffixes:
+        if var.endswith(suffix):
+            return var.replace(suffix, "")
+    return var
+
+def str_filter(f, str, d):
+    from re import match
+    return " ".join(filter(lambda x: match(f, x, 0), str.split()))
+
+def str_filter_out(f, str, d):
+    from re import match
+    return " ".join(filter(lambda x: not match(f, x, 0), str.split()))
diff --git a/recipes/aalib/aalib_1.4rc5.bb b/recipes/aalib/aalib_1.4rc5.bb
index a423dfec6c..a9586083e4 100644
--- a/recipes/aalib/aalib_1.4rc5.bb
+++ b/recipes/aalib/aalib_1.4rc5.bb
@@ -5,7 +5,7 @@ LICENSE="LGPL"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/aa-project/aalib-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 S = "${WORKDIR}/aalib-1.4.0"
 
 inherit autotools
diff --git a/recipes/abiword/abiword-plugins_2.4.6.bb b/recipes/abiword/abiword-plugins_2.4.6.bb
index 7a72ea760b..372eb8f685 100644
--- a/recipes/abiword/abiword-plugins_2.4.6.bb
+++ b/recipes/abiword/abiword-plugins_2.4.6.bb
@@ -8,7 +8,7 @@ RDEPENDS = "abiword"
 PR = "r1"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
-           file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2"
+           file://abiword-plugin-pdf-poppler.patch;striplevel=2"
 S = "${WORKDIR}/abiword-${PV}/abiword-plugins"
 
 inherit autotools
diff --git a/recipes/abiword/abiword-plugins_2.6.0.bb b/recipes/abiword/abiword-plugins_2.6.0.bb
index 0c54b43441..8209b42769 100644
--- a/recipes/abiword/abiword-plugins_2.6.0.bb
+++ b/recipes/abiword/abiword-plugins_2.6.0.bb
@@ -7,7 +7,7 @@ RDEPENDS = "abiword"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \
            http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \
-           file://abiword-cxx-for-ld-fix.patch;patch=1 \
+           file://abiword-cxx-for-ld-fix.patch \
 	   "
 
 DEFAULT_PREFERENCE = "2"
diff --git a/recipes/abiword/abiword-plugins_2.6.4.bb b/recipes/abiword/abiword-plugins_2.6.4.bb
index f3ec196a9f..03df1f7764 100644
--- a/recipes/abiword/abiword-plugins_2.6.4.bb
+++ b/recipes/abiword/abiword-plugins_2.6.4.bb
@@ -9,7 +9,7 @@ PR = "r1"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \
            http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \
-#           file://abiword-cxx-for-ld-fix.patch;patch=1 \
+#           file://abiword-cxx-for-ld-fix.patch \
 	   "
 
 DEFAULT_PREFERENCE = "2"
diff --git a/recipes/abiword/abiword-plugins_2.6.8.bb b/recipes/abiword/abiword-plugins_2.6.8.bb
index ca2146cdaa..af886903ab 100644
--- a/recipes/abiword/abiword-plugins_2.6.8.bb
+++ b/recipes/abiword/abiword-plugins_2.6.8.bb
@@ -8,7 +8,7 @@ RDEPENDS = "abiword"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \
            http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \
-#           file://abiword-cxx-for-ld-fix.patch;patch=1 \
+#           file://abiword-cxx-for-ld-fix.patch \
 	   "
 
 DEFAULT_PREFERENCE = "2"
diff --git a/recipes/abiword/abiword_2.8.1.bb b/recipes/abiword/abiword_2.8.1.bb
index 2337cbf8af..96bc03c17e 100644
--- a/recipes/abiword/abiword_2.8.1.bb
+++ b/recipes/abiword/abiword_2.8.1.bb
@@ -4,7 +4,7 @@ PR = "r5"
 
 SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
            file://autogen-common.sh \
-	   file://nodolt.patch;patch=1"
+	   file://nodolt.patch"
 
 do_configure() {
 	autotools_do_configure
diff --git a/recipes/abiword/abiword_2.8.2.bb b/recipes/abiword/abiword_2.8.2.bb
index d02d687086..7352f18e4a 100644
--- a/recipes/abiword/abiword_2.8.2.bb
+++ b/recipes/abiword/abiword_2.8.2.bb
@@ -4,7 +4,7 @@ RCONFLICTS_${PN} = "abiword-embedded"
 
 SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \
            file://autogen-common.sh \
-	   file://nodolt.patch;patch=1"
+	   file://nodolt.patch"
 
 SRC_URI[abiword.md5sum] = "b44ffbebd5bd0f5f98f34dc8c688b4ed"
 SRC_URI[abiword.sha256sum] = "cb668f47649a8ed40dbaedb22383794d07b8349549a392fed57814120803db9c"
diff --git a/recipes/abiword/abiword_2.8.3.bb b/recipes/abiword/abiword_2.8.3.bb
index a91d6f733f..248fbbf610 100644
--- a/recipes/abiword/abiword_2.8.3.bb
+++ b/recipes/abiword/abiword_2.8.3.bb
@@ -2,11 +2,11 @@ require abiword-2.5.inc
 DEPENDS += " loudmouth libwmf-native gtkmathview "
 RCONFLICTS_${PN} = "abiword-embedded"
 
-PR = "r2.1"
+PR = "r2"
 
 SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \
            file://autogen-common.sh \
-	   file://nodolt.patch;patch=1"
+	   file://nodolt.patch"
 
 SRC_URI[abiword.md5sum] = "8984b09663e1514ca0e361b0627ea285"
 SRC_URI[abiword.sha256sum] = "b74f7ba5852e6225dd1fb52be266eaa33149fb24210b33b5d8d0f37273e0e3cb"
diff --git a/recipes/acct/acct_6.3.99+6.4pre1.bb b/recipes/acct/acct_6.3.99+6.4pre1.bb
index 854bf70961..539eefb62a 100644
--- a/recipes/acct/acct_6.3.99+6.4pre1.bb
+++ b/recipes/acct/acct_6.3.99+6.4pre1.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 DESCRIPTION = "GNU Accounting Utilities - user and process accounting."
 
 SRC_URI = "http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/acct-6.4-pre1.tar.gz \
-	file://cross-compile.patch;patch=1"
+	file://cross-compile.patch"
 
 S = "${WORKDIR}/acct-6.4-pre1"
 
diff --git a/recipes/aceofpenguins/aceofpenguins_1.2.bb b/recipes/aceofpenguins/aceofpenguins_1.2.bb
index 7dc600d9e3..5b4ab3f254 100644
--- a/recipes/aceofpenguins/aceofpenguins_1.2.bb
+++ b/recipes/aceofpenguins/aceofpenguins_1.2.bb
@@ -8,8 +8,8 @@ PR = "r2"
 
 SRC_URI = "\
   http://www.delorie.com/store/ace/ace-${PV}.tar.gz\
-  file://gcc4.patch;patch=1\
-  file://fix-crosscompile.patch;patch=1\
+  file://gcc4.patch\
+  file://fix-crosscompile.patch\
 "
 S = "${WORKDIR}/ace-${PV}"
 
diff --git a/recipes/acpid/acpid_1.0.10.bb b/recipes/acpid/acpid_1.0.10.bb
index 7138b86579..fc2dd8d07b 100644
--- a/recipes/acpid/acpid_1.0.10.bb
+++ b/recipes/acpid/acpid_1.0.10.bb
@@ -1,8 +1,8 @@
 require acpid.inc
 
-SRC_URI_append = " file://event.c.diff;patch=1 \
-                   file://netlink.diff;patch=1 \
-                   file://gcc44.diff;patch=1 \
+SRC_URI_append = " file://event.c.diff \
+                   file://netlink.diff \
+                   file://gcc44.diff \
                  "
 PR = "${INC_PR}.0"
 SRC_URI[md5sum] = "61156ef32015c56dc0f2e3317f4ae09e"
diff --git a/recipes/acpid/acpid_1.0.3.bb b/recipes/acpid/acpid_1.0.3.bb
index 0009c0ec9f..5096371264 100644
--- a/recipes/acpid/acpid_1.0.3.bb
+++ b/recipes/acpid/acpid_1.0.3.bb
@@ -1,5 +1,5 @@
 require acpid.inc
-SRC_URI += "file://gcc40.patch;patch=1"
+SRC_URI += "file://gcc40.patch"
 PR = "${INC_PR}.0"
 SRC_URI[md5sum] = "8513c19d0f14ff396ea73caaea7f2ef8"
 SRC_URI[sha256sum] = "b36d6e83ecee4748cc3b8fa3cdbc8c59e620428ce77e22e241faa19c2e0e7dad"
diff --git a/recipes/acpid/acpid_1.0.4.bb b/recipes/acpid/acpid_1.0.4.bb
index ac9c24a312..a524039eb6 100644
--- a/recipes/acpid/acpid_1.0.4.bb
+++ b/recipes/acpid/acpid_1.0.4.bb
@@ -1,5 +1,5 @@
 require acpid.inc
-SRC_URI += "file://gcc40.patch;patch=1"
+SRC_URI += "file://gcc40.patch"
 PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "3aff94e92186e99ed5fd6dcee2db7c74"
diff --git a/recipes/acpid/acpid_1.0.8.bb b/recipes/acpid/acpid_1.0.8.bb
index faa352f6e0..7e1b96ab2e 100644
--- a/recipes/acpid/acpid_1.0.8.bb
+++ b/recipes/acpid/acpid_1.0.8.bb
@@ -1,8 +1,8 @@
 require acpid.inc
 
-SRC_URI_append = " file://event.c.diff;patch=1 \
-                   file://fixfd.diff;patch=1 \
-                   file://netlink.diff;patch=1"
+SRC_URI_append = " file://event.c.diff \
+                   file://fixfd.diff \
+                   file://netlink.diff"
 PR = "${INC_PR}.0"
 SRC_URI[md5sum] = "1d9c52fe2c0b51f8463f357c2a3d3ddb"
 SRC_URI[sha256sum] = "d57ae5302c38c37d060a097fa51600fe06fbfffd575641d638407944f126b7b1"
diff --git a/recipes/adns/adns_1.0.bb b/recipes/adns/adns_1.0.bb
index 66b35900e2..96e47811e2 100644
--- a/recipes/adns/adns_1.0.bb
+++ b/recipes/adns/adns_1.0.bb
@@ -3,8 +3,8 @@ SECTION = "console/network"
 LICENSE="GPL"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/adns/adns-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://fixparsedomainflags.patch;patch=1"
+	   file://configure.patch \
+	   file://fixparsedomainflags.patch"
 
 inherit autotools
 
diff --git a/recipes/agg/agg-minimal_2.5.bb b/recipes/agg/agg-minimal_2.5.bb
index 0939b23c1f..69fa1c61eb 100644
--- a/recipes/agg/agg-minimal_2.5.bb
+++ b/recipes/agg/agg-minimal_2.5.bb
@@ -8,7 +8,7 @@ DEPENDS = "freetype"
 PR = "r0"
 
 SRC_URI = "http://www.antigrain.com/agg-${PV}.tar.gz;name=archive"
-SRC_URI += "http://www.wxsvg.org/files/agg-2.5_cygming.patch;patch=1;name=patch"
+SRC_URI += "http://www.wxsvg.org/files/agg-2.5_cygming.patch;name=patch"
 S = "${WORKDIR}/agg-${PV}"
 
 inherit autotools pkgconfig
diff --git a/recipes/aircrack/aircrack-ng_0.9.3.bb b/recipes/aircrack/aircrack-ng_0.9.3.bb
index 164e12d25c..0beff677b8 100644
--- a/recipes/aircrack/aircrack-ng_0.9.3.bb
+++ b/recipes/aircrack/aircrack-ng_0.9.3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz \
-           file://makefile-ldflags.patch;patch=1"
+           file://makefile-ldflags.patch"
 
 SBINFILES = "airodump-ng aireplay-ng airmon-ng airtun-ng"
 BINFILES = "aircrack-ng airdecap-ng packetforge-ng ivstools kstats makeivs"
diff --git a/recipes/aircrack/aircrack_2.1.bb b/recipes/aircrack/aircrack_2.1.bb
index 12fc99484d..4aeac96231 100644
--- a/recipes/aircrack/aircrack_2.1.bb
+++ b/recipes/aircrack/aircrack_2.1.bb
@@ -7,7 +7,7 @@ PV="2.1"
 PR ="r0"
 
 SRC_URI = "http://archive.aircrack-ng.org/aircrack-old/${P}.tgz \
-file://silent_patch.diff;patch=1;pnum=0"
+file://silent_patch.diff;striplevel=0"
 
 SRC_URI[md5sum] = "694c6180f620b0534e5925a71b960bd1"
 SRC_URI[sha256sum] = "9b749d98278450b80153c1f82b7e253548a3f03603062dc98cc1320803d791da"
diff --git a/recipes/aircrack/aircrack_2.41.bb b/recipes/aircrack/aircrack_2.41.bb
index c083b5faf2..10731f8a06 100644
--- a/recipes/aircrack/aircrack_2.41.bb
+++ b/recipes/aircrack/aircrack_2.41.bb
@@ -6,7 +6,7 @@ DEPENDS = ""
 PR ="r1"
 
 SRC_URI = "http://www.wirelessdefence.org/Contents/Files/${P}.tgz \
-		file://oe.patch;patch=1;pnum=1"
+		file://oe.patch"
 
 inherit autotools
 
diff --git a/recipes/albumshaper/albumshaper_2.1.bb b/recipes/albumshaper/albumshaper_2.1.bb
index ed75290e64..8edbc551a7 100644
--- a/recipes/albumshaper/albumshaper_2.1.bb
+++ b/recipes/albumshaper/albumshaper_2.1.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 DEPENDS = "libxml2 libxslt jpeg"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/albumshaper/albumshaper_${PV}.tar.bz2 \
-           file://fixpaths.patch;patch=1"
+           file://fixpaths.patch"
 S = "${WORKDIR}/albumshaper_2.1_src"
 
 inherit qmake qt3x11
diff --git a/recipes/alsa/alsa-driver_0.9.6-hh4c.bb b/recipes/alsa/alsa-driver_0.9.6-hh4c.bb
index 0e61e281f8..e5f6729bcd 100644
--- a/recipes/alsa/alsa-driver_0.9.6-hh4c.bb
+++ b/recipes/alsa/alsa-driver_0.9.6-hh4c.bb
@@ -11,10 +11,10 @@ PR = "r6"
 DEPENDS += "fakeroot-native"
 
 SRC_URI = "ftp://ftp.handhelds.org/packages/alsa-driver/alsa-driver-${PV}.tar.gz \
-	file://sound.p.patch;patch=1 \
-	file://h5400.patch;patch=1 \
-	file://sa11xx.patch;patch=1 \
-	file://adriver.h.patch;patch=1"
+	file://sound.p.patch \
+	file://h5400.patch \
+	file://sa11xx.patch \
+	file://adriver.h.patch"
 
 inherit autotools module
 
diff --git a/recipes/alsa/alsa-lib_1.0.13.bb b/recipes/alsa/alsa-lib_1.0.13.bb
index c6868f6daf..b0ec97d08b 100644
--- a/recipes/alsa/alsa-lib_1.0.13.bb
+++ b/recipes/alsa/alsa-lib_1.0.13.bb
@@ -11,7 +11,7 @@ PR = "r4"
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1"
+           file://fix-tstamp-declaration.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/alsa/alsa-lib_1.0.14.bb b/recipes/alsa/alsa-lib_1.0.14.bb
index 41a5596ba3..6ad5f31e6c 100644
--- a/recipes/alsa/alsa-lib_1.0.14.bb
+++ b/recipes/alsa/alsa-lib_1.0.14.bb
@@ -12,8 +12,8 @@ PR = "r2"
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1 \
-           file://unbreak_plugindir.patch;patch=1"
+           file://fix-tstamp-declaration.patch \
+           file://unbreak_plugindir.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/alsa/alsa-lib_1.0.15.bb b/recipes/alsa/alsa-lib_1.0.15.bb
index 2613eb256e..4dcdda45cf 100644
--- a/recipes/alsa/alsa-lib_1.0.15.bb
+++ b/recipes/alsa/alsa-lib_1.0.15.bb
@@ -11,8 +11,8 @@ PR = "r1"
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1 \
-	   file://fix_libmath.patch;patch=1 \
+           file://fix-tstamp-declaration.patch \
+	   file://fix_libmath.patch \
 	  "
 
 inherit autotools pkgconfig
diff --git a/recipes/alsa/alsa-lib_1.0.17.bb b/recipes/alsa/alsa-lib_1.0.17.bb
index 3615598d00..af61ee1567 100644
--- a/recipes/alsa/alsa-lib_1.0.17.bb
+++ b/recipes/alsa/alsa-lib_1.0.17.bb
@@ -10,8 +10,8 @@ LICENSE = "LGPLv2.1"
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1 \
-	   file://fix_libmath.patch;patch=1 \
+           file://fix-tstamp-declaration.patch \
+	   file://fix_libmath.patch \
 	  "
 
 inherit autotools pkgconfig
diff --git a/recipes/alsa/alsa-lib_1.0.18.bb b/recipes/alsa/alsa-lib_1.0.18.bb
index 691702fe4a..d815be4ff5 100644
--- a/recipes/alsa/alsa-lib_1.0.18.bb
+++ b/recipes/alsa/alsa-lib_1.0.18.bb
@@ -10,8 +10,8 @@ LICENSE = "LGPLv2.1"
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1 \
-	   file://fix_libmath.patch;patch=1 \
+           file://fix-tstamp-declaration.patch \
+	   file://fix_libmath.patch \
 	  "
 
 inherit autotools pkgconfig
diff --git a/recipes/alsa/alsa-lib_1.0.19.bb b/recipes/alsa/alsa-lib_1.0.19.bb
index 9f0bc89781..57f3cdc033 100644
--- a/recipes/alsa/alsa-lib_1.0.19.bb
+++ b/recipes/alsa/alsa-lib_1.0.19.bb
@@ -10,8 +10,8 @@ LICENSE = "LGPLv2.1"
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1 \
-	   file://fix_libmath.patch;patch=1 \
+           file://fix-tstamp-declaration.patch \
+	   file://fix_libmath.patch \
 	  "
 
 inherit autotools pkgconfig
diff --git a/recipes/alsa/alsa-lib_1.0.20.bb b/recipes/alsa/alsa-lib_1.0.20.bb
index c0a6769971..de522c7606 100644
--- a/recipes/alsa/alsa-lib_1.0.20.bb
+++ b/recipes/alsa/alsa-lib_1.0.20.bb
@@ -11,8 +11,8 @@ PR = "r3"
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1 \
-	   file://fix_libmath.patch;patch=1 \
+           file://fix-tstamp-declaration.patch \
+	   file://fix_libmath.patch \
 	  "
 
 inherit autotools pkgconfig
diff --git a/recipes/alsa/alsa-lib_1.0.23.bb b/recipes/alsa/alsa-lib_1.0.23.bb
new file mode 100644
index 0000000000..0f9b14c16d
--- /dev/null
+++ b/recipes/alsa/alsa-lib_1.0.23.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "Alsa sound library"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "libs/multimedia"
+LICENSE = "LGPLv2.1"
+
+# configure.in sets -D__arm__ on the command line for any arm system
+# (not just those with the ARM instruction set), this should be removed,
+# (or replaced by a permitted #define).
+#FIXME: remove the following
+ARM_INSTRUCTION_SET = "arm"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
+           file://fix-tstamp-declaration.patch \
+           file://fix_libmath.patch \
+	  "
+
+SRC_URI[md5sum] = "f48b50421d8a69d2d806d9c47e534f0d"
+SRC_URI[sha256sum] = "b4238ecaba5e4a1383af06180611a57ef29f9bf47bc177136dba1bb5b70ff423"
+
+inherit autotools pkgconfig
+
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python --enable-shared --enable-static"
+
+
+require alsa-fpu.inc
+EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
+
+
+require alsa-versym.inc
+EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} "
+
+
+PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
+FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
+FILES_libasound = "${libdir}/libasound.so.*"
+FILES_alsa-server = "${bindir}/*"
+FILES_alsa-conf = "${datadir}/alsa/"
+FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
+FILES_alsa-conf-base = "\
+${datadir}/alsa/alsa.conf \
+${datadir}/alsa/cards/aliases.conf \
+${datadir}/alsa/pcm/default.conf \
+${datadir}/alsa/pcm/dmix.conf \
+${datadir}/alsa/pcm/dsnoop.conf"
+
+RDEPENDS_libasound = "alsa-conf-base"
+
diff --git a/recipes/alsa/alsa-oss_1.0.15.bb b/recipes/alsa/alsa-oss_1.0.15.bb
index 4caf16c801..d6b09c58f7 100644
--- a/recipes/alsa/alsa-oss_1.0.15.bb
+++ b/recipes/alsa/alsa-oss_1.0.15.bb
@@ -5,7 +5,7 @@ DEPENDS = "alsa-lib"
 PR = "r2"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
-	   file://libio.patch;patch=1 \
+	   file://libio.patch \
 	  "
 
 inherit autotools 
diff --git a/recipes/alsa/alsa-oss_1.0.17.bb b/recipes/alsa/alsa-oss_1.0.17.bb
index 737c9296e9..c5dd9343e1 100644
--- a/recipes/alsa/alsa-oss_1.0.17.bb
+++ b/recipes/alsa/alsa-oss_1.0.17.bb
@@ -5,7 +5,7 @@ DEPENDS = "alsa-lib"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
-	   file://libio.patch;patch=1 \
+	   file://libio.patch \
 	  "
 
 inherit autotools_stage
diff --git a/recipes/alsa/alsa-scenario_0.2.bb b/recipes/alsa/alsa-scenario_0.2.bb
index 71d098ef03..72afc8db7a 100644
--- a/recipes/alsa/alsa-scenario_0.2.bb
+++ b/recipes/alsa/alsa-scenario_0.2.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
 
 PR = "r0"
-PE = "2"
+PE = "1"
 
 SRC_URI = "http://sources.slimlogic.co.uk/libscenario/scenario-lib-0.2.0.tar.bz2"
 
diff --git a/recipes/alsa/alsa-scenario_git.bb b/recipes/alsa/alsa-scenario_git.bb
index 1d249c3897..ffe2d10044 100644
--- a/recipes/alsa/alsa-scenario_git.bb
+++ b/recipes/alsa/alsa-scenario_git.bb
@@ -4,9 +4,9 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
 SRCREV = "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
-PV = "0.2+gitr${SRCPV}"
+PV = "0.2+gitr${SRCREV}"
 PR = "r0"
-PE = "2"
+PE = "1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/alsa/alsa-state.bb b/recipes/alsa/alsa-state.bb
index d1acf81b2c..6c8192ed86 100644
--- a/recipes/alsa/alsa-state.bb
+++ b/recipes/alsa/alsa-state.bb
@@ -7,7 +7,7 @@
 DESCRIPTION = "Alsa Scenario Files"
 LICENSE = "MIT"
 PV = "0.2.0"
-PR = "r16"
+PR = "r17"
 
 SRC_URI = "\
   file://asound.conf \
diff --git a/recipes/alsa/alsa-state/beagleboard/asound.state b/recipes/alsa/alsa-state/beagleboard/asound.state
index f4d6f10434..f92449152c 100644
--- a/recipes/alsa/alsa-state/beagleboard/asound.state
+++ b/recipes/alsa/alsa-state/beagleboard/asound.state
@@ -216,6 +216,16 @@ state.omap3beagle {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
+		comment.item.0 'Voice high priority'
+		comment.item.1 'HiFi high priority'
+		iface MIXER
+		name 'AVADC Clock Priority'
+		value 'Voice high priority'
+	}
+	control.21 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
 		comment.item.0 '27/20/14 ms'
 		comment.item.1 '55/40/27 ms'
 		comment.item.2 '109/81/55 ms'
@@ -228,7 +238,7 @@ state.omap3beagle {
 		name 'HS ramp delay'
 		value '27/20/14 ms'
 	}
-	control.21 {
+	control.22 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -238,7 +248,7 @@ state.omap3beagle {
 		name 'Vibra H-bridge mode'
 		value 'Vibra H-bridge direction'
 	}
-	control.22 {
+	control.23 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -248,55 +258,55 @@ state.omap3beagle {
 		name 'Vibra H-bridge direction'
 		value 'Positive polarity'
 	}
-	control.23 {
+	control.24 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'Analog Right Capture Route Sub mic'
+		name 'Analog Right Sub Mic Capture Switch'
 		value false
 	}
-	control.24 {
+	control.25 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'Analog Right Capture Route AUXR'
+		name 'Analog Right AUXR Capture Switch'
 		value true
 	}
-	control.25 {
+	control.26 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'Analog Left Capture Route Main mic'
+		name 'Analog Left Main Mic Capture Switch'
 		value false
 	}
-	control.26 {
+	control.27 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'Analog Left Capture Route Headset mic'
+		name 'Analog Left Headset Mic Capture Switch'
 		value false
 	}
-	control.27 {
+	control.28 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'Analog Left Capture Route AUXL'
+		name 'Analog Left AUXL Capture Switch'
 		value true
 	}
-	control.28 {
+	control.29 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'Analog Left Capture Route Carkit mic'
+		name 'Analog Left Carkit Mic Capture Switch'
 		value false
 	}
-	control.29 {
+	control.30 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -306,7 +316,7 @@ state.omap3beagle {
 		name 'TX2 Capture Route'
 		value Analog
 	}
-	control.30 {
+	control.31 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -316,7 +326,7 @@ state.omap3beagle {
 		name 'TX1 Capture Route'
 		value Analog
 	}
-	control.31 {
+	control.32 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -326,7 +336,7 @@ state.omap3beagle {
 		name 'Vibra Route'
 		value 'Local vibrator'
 	}
-	control.32 {
+	control.33 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -338,15 +348,15 @@ state.omap3beagle {
 		name 'Vibra Mux'
 		value AudioL1
 	}
-	control.33 {
+	control.34 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'HandsfreeR Switch Switch'
+		name 'HandsfreeR Switch'
 		value false
 	}
-	control.34 {
+	control.35 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -358,15 +368,15 @@ state.omap3beagle {
 		name 'HandsfreeR Mux'
 		value Voice
 	}
-	control.35 {
+	control.36 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'HandsfreeL Switch Switch'
+		name 'HandsfreeL Switch'
 		value false
 	}
-	control.36 {
+	control.37 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -378,7 +388,7 @@ state.omap3beagle {
 		name 'HandsfreeL Mux'
 		value Voice
 	}
-	control.37 {
+	control.38 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -386,7 +396,7 @@ state.omap3beagle {
 		name 'CarkitR Mixer Voice'
 		value false
 	}
-	control.38 {
+	control.39 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -394,7 +404,7 @@ state.omap3beagle {
 		name 'CarkitR Mixer AudioR1'
 		value false
 	}
-	control.39 {
+	control.40 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -402,7 +412,7 @@ state.omap3beagle {
 		name 'CarkitR Mixer AudioR2'
 		value false
 	}
-	control.40 {
+	control.41 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -410,7 +420,7 @@ state.omap3beagle {
 		name 'CarkitL Mixer Voice'
 		value false
 	}
-	control.41 {
+	control.42 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -418,7 +428,7 @@ state.omap3beagle {
 		name 'CarkitL Mixer AudioL1'
 		value false
 	}
-	control.42 {
+	control.43 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -426,7 +436,7 @@ state.omap3beagle {
 		name 'CarkitL Mixer AudioL2'
 		value false
 	}
-	control.43 {
+	control.44 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -434,7 +444,7 @@ state.omap3beagle {
 		name 'HeadsetR Mixer Voice'
 		value false
 	}
-	control.44 {
+	control.45 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -442,7 +452,7 @@ state.omap3beagle {
 		name 'HeadsetR Mixer AudioR1'
 		value false
 	}
-	control.45 {
+	control.46 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -450,7 +460,7 @@ state.omap3beagle {
 		name 'HeadsetR Mixer AudioR2'
 		value true
 	}
-	control.46 {
+	control.47 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -458,7 +468,7 @@ state.omap3beagle {
 		name 'HeadsetL Mixer Voice'
 		value false
 	}
-	control.47 {
+	control.48 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -466,7 +476,7 @@ state.omap3beagle {
 		name 'HeadsetL Mixer AudioL1'
 		value false
 	}
-	control.48 {
+	control.49 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -474,7 +484,7 @@ state.omap3beagle {
 		name 'HeadsetL Mixer AudioL2'
 		value true
 	}
-	control.49 {
+	control.50 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -482,7 +492,7 @@ state.omap3beagle {
 		name 'PredriveR Mixer Voice'
 		value false
 	}
-	control.50 {
+	control.51 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -490,7 +500,7 @@ state.omap3beagle {
 		name 'PredriveR Mixer AudioR1'
 		value false
 	}
-	control.51 {
+	control.52 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -498,7 +508,7 @@ state.omap3beagle {
 		name 'PredriveR Mixer AudioR2'
 		value false
 	}
-	control.52 {
+	control.53 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -506,7 +516,7 @@ state.omap3beagle {
 		name 'PredriveR Mixer AudioL2'
 		value false
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -514,7 +524,7 @@ state.omap3beagle {
 		name 'PredriveL Mixer Voice'
 		value false
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -522,7 +532,7 @@ state.omap3beagle {
 		name 'PredriveL Mixer AudioL1'
 		value false
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -530,7 +540,7 @@ state.omap3beagle {
 		name 'PredriveL Mixer AudioL2'
 		value false
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -538,7 +548,7 @@ state.omap3beagle {
 		name 'PredriveL Mixer AudioR2'
 		value false
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -546,7 +556,7 @@ state.omap3beagle {
 		name 'Earpiece Mixer Voice'
 		value false
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -554,7 +564,7 @@ state.omap3beagle {
 		name 'Earpiece Mixer AudioL1'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -562,7 +572,7 @@ state.omap3beagle {
 		name 'Earpiece Mixer AudioL2'
 		value false
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -570,7 +580,7 @@ state.omap3beagle {
 		name 'Earpiece Mixer AudioR1'
 		value false
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -581,7 +591,7 @@ state.omap3beagle {
 		name 'Voice Digital Loopback Volume'
 		value 0
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -592,7 +602,7 @@ state.omap3beagle {
 		name 'Right Digital Loopback Volume'
 		value 0
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -603,7 +613,7 @@ state.omap3beagle {
 		name 'Left Digital Loopback Volume'
 		value 0
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -611,7 +621,7 @@ state.omap3beagle {
 		name 'Voice Analog Loopback Switch'
 		value false
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -619,7 +629,7 @@ state.omap3beagle {
 		name 'Left2 Analog Loopback Switch'
 		value false
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -627,7 +637,7 @@ state.omap3beagle {
 		name 'Right2 Analog Loopback Switch'
 		value false
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -635,7 +645,7 @@ state.omap3beagle {
 		name 'Left1 Analog Loopback Switch'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -644,4 +654,3 @@ state.omap3beagle {
 		value false
 	}
 }
-
diff --git a/recipes/alsa/alsa-utils_1.0.14.bb b/recipes/alsa/alsa-utils_1.0.14.bb
index b8120736f3..9bef67a3f2 100644
--- a/recipes/alsa/alsa-utils_1.0.14.bb
+++ b/recipes/alsa/alsa-utils_1.0.14.bb
@@ -6,7 +6,7 @@ DEPENDS = "alsa-lib ncurses"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
-	   file://alsa-utils-automake.patch;patch=1 \
+	   file://alsa-utils-automake.patch \
 	  "
 inherit autotools
 
diff --git a/recipes/alsa/alsa-utils_1.0.15.bb b/recipes/alsa/alsa-utils_1.0.15.bb
index 470b1d8651..5fc07b16b7 100644
--- a/recipes/alsa/alsa-utils_1.0.15.bb
+++ b/recipes/alsa/alsa-utils_1.0.15.bb
@@ -6,7 +6,7 @@ DEPENDS = "alsa-lib ncurses"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
-           file://alsa-utils-automake.patch;patch=1 \
+           file://alsa-utils-automake.patch \
 	  "
 
 inherit autotools
diff --git a/recipes/alsa/alsa-utils_1.0.17.bb b/recipes/alsa/alsa-utils_1.0.17.bb
index 7c4a9353d1..174dfd4415 100644
--- a/recipes/alsa/alsa-utils_1.0.17.bb
+++ b/recipes/alsa/alsa-utils_1.0.17.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "alsa-lib ncurses"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
-           file://alsa-utils-automake.patch;patch=1 \
+           file://alsa-utils-automake.patch \
 	  "
 
 inherit autotools
diff --git a/recipes/alsa/alsa-utils_1.0.18.bb b/recipes/alsa/alsa-utils_1.0.18.bb
index 4ba4f79e2b..f53de1397e 100644
--- a/recipes/alsa/alsa-utils_1.0.18.bb
+++ b/recipes/alsa/alsa-utils_1.0.18.bb
@@ -6,9 +6,9 @@ DEPENDS = "alsa-lib ncurses"
 PR = "r2"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
-           file://alsa-utils-automake.patch;patch=1 \
-	   file://alsa-utils-remove-xmlto.patch;patch=1 \
-	   file://alsa-utils-autoconf-strl-funcs.patch;patch=1 \
+           file://alsa-utils-automake.patch \
+	   file://alsa-utils-remove-xmlto.patch \
+	   file://alsa-utils-autoconf-strl-funcs.patch \
 	  "
 
 inherit autotools
diff --git a/recipes/alsa/alsa-utils_1.0.19.bb b/recipes/alsa/alsa-utils_1.0.19.bb
index cdb289c7e9..f4b92bbffb 100644
--- a/recipes/alsa/alsa-utils_1.0.19.bb
+++ b/recipes/alsa/alsa-utils_1.0.19.bb
@@ -6,7 +6,7 @@ DEPENDS = "alsa-lib ncurses"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
-	   file://alsa-utils-remove-xmlto-1.0.19plus.patch;patch=1 \
+	   file://alsa-utils-remove-xmlto-1.0.19plus.patch \
 	  "
 	
 
diff --git a/recipes/alsa/alsa-utils_1.0.20.bb b/recipes/alsa/alsa-utils_1.0.20.bb
index c9e9e35c0b..462d919b31 100644
--- a/recipes/alsa/alsa-utils_1.0.20.bb
+++ b/recipes/alsa/alsa-utils_1.0.20.bb
@@ -2,15 +2,15 @@ DESCRIPTION = "ALSA Utilities"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPLv2"
-DEPENDS = "alsa-lib ncurses gettext-native"
-PR = "r1"
+DEPENDS = "alsa-lib ncurses"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
-	   file://alsa-utils-remove-xmlto-1.0.19plus.patch;patch=1 \
+	   file://alsa-utils-remove-xmlto-1.0.19plus.patch \
 	  "
 	
 
-inherit autotools
+inherit gettext autotools
 
 # This are all packages that we need to make. Also, the now empty alsa-utils
 # ipk depend on them.
diff --git a/recipes/amule/amule_2.1.3.bb b/recipes/amule/amule_2.1.3.bb
index d6627171f5..0c1d6dd35d 100644
--- a/recipes/amule/amule_2.1.3.bb
+++ b/recipes/amule/amule_2.1.3.bb
@@ -8,7 +8,7 @@ DEPENDS = "wxbase"
 
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/amule/aMule-${PV}.tar.bz2 \
-           file://parser.patch;patch=1"
+           file://parser.patch"
 
 S = "${WORKDIR}/aMule-${PV}"
 
diff --git a/recipes/angstrom/angstrom-feed-configs.bb b/recipes/angstrom/angstrom-feed-configs.bb
index ea43cd0a0e..d25cba7fb2 100644
--- a/recipes/angstrom/angstrom-feed-configs.bb
+++ b/recipes/angstrom/angstrom-feed-configs.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Configuration files for online package repositories aka feeds"
 RRECOMMENDS_${PN} += "opkg-nogpg-nocurl"
 
 #PV = "${DISTRO_VERSION}"
-PR = "r9"
+PR = "r11"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FEED_BASEPATH ?= "unstable/feed/"
@@ -25,8 +25,9 @@ do_compile() {
 		  echo "src/gz ${feed} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf
 	done
 
-		echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/machine/${MACHINE_ARCH}" >  ${S}/${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf
-	echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}/all" > ${S}/${sysconfdir}/opkg/noarch-feed.conf
+	echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/machine/${MACHINE_ARCH}" >  ${S}/${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf
+	echo "#src/gz sdk ${ANGSTROM_URI}/${FEED_BASEPATH}sdk" > ${S}/${sysconfdir}/opkg/sdk-feed.conf
+	echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}all" > ${S}/${sysconfdir}/opkg/noarch-feed.conf
 		
 	# iwmmxt is a special case, add the iwmmxt feed for machine that have 'iwmmxt' in MACHINE_FEATURES
 		if [ "${IWMMXT_FEED}" = "iwmmxt" ] ; then
@@ -53,6 +54,7 @@ FILES_${PN} = "${sysconfdir}/opkg/base-feed.conf \
 					${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf \
 					${sysconfdir}/opkg/noarch-feed.conf \
 					${sysconfdir}/opkg/iwmmxt-feed.conf \
+					${sysconfdir}/opkg/sdk-feed.conf \
 					${sysconfdir}/opkg/arch.conf \
 					"
 
@@ -63,7 +65,8 @@ CONFFILES_${PN} += "${sysconfdir}/opkg/base-feed.conf \
 					${sysconfdir}/opkg/gstreamer-feed.conf \
 					${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf \
 					${sysconfdir}/opkg/noarch-feed.conf \
-				    ${sysconfdir}/opkg/arch.conf \
+					${sysconfdir}/opkg/sdk-feed.conf \
+					${sysconfdir}/opkg/arch.conf \
 					"
 
 python populate_packages_prepend () {
diff --git a/recipes/angstrom/angstrom-uboot-scripts.bb b/recipes/angstrom/angstrom-uboot-scripts.bb
index d4c6347aeb..67245a0506 100644
--- a/recipes/angstrom/angstrom-uboot-scripts.bb
+++ b/recipes/angstrom/angstrom-uboot-scripts.bb
@@ -8,6 +8,10 @@ SRC_URI = "file://*.cmd"
 
 do_configure() {
 	cp ${WORKDIR}/*.cmd ${S}
+
+	for i in *.cmd ; do
+		mv $i uboot-$i
+	done
 }
 
 do_compile() {
@@ -17,13 +21,13 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}${datadir}/u-boot-scripts
-	for i in *.scr ; do
-		install -m 0644 $i ${D}${datadir}/u-boot-scripts
+	install -d ${D}/boot/u-boot-scripts
+	for i in *.cmd *.scr ; do
+		install -m 0644 $i ${D}/boot/u-boot-scripts
 	done
 }
 
-FILES_${PN} += "${datadir}"
+FILES_${PN} += "/boot"
 
 addtask deploy before do_package after do_install
 
diff --git a/recipes/angstrom/angstrom-uboot-scripts/dsplink-512MB.cmd b/recipes/angstrom/angstrom-uboot-scripts/dsplink-512MB.cmd
new file mode 100644
index 0000000000..aa466bf63b
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/dsplink-512MB.cmd
@@ -0,0 +1,4 @@
+setenv vram '24M'
+setenv dvimode 'hd720 mem=99M@0x80000000 mem=384M@0x88000000 omapfb.vram=0:12M,1:8M,2:4M'
+run loaduimage
+run mmcboot
diff --git a/recipes/angstrom/angstrom-uboot-scripts/dsplink-bootchart.cmd b/recipes/angstrom/angstrom-uboot-scripts/dsplink-bootchart.cmd
new file mode 100644
index 0000000000..0d034f83ca
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/dsplink-bootchart.cmd
@@ -0,0 +1,6 @@
+setenv vram '20M'
+setenv dvimode 'hd720 mem=99M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:12M,1:4M,2:4M'
+run loaduimage
+echo Booting from mmc ...
+setenv bootargs init=/sbin/bootchartd quiet initcall_debug console=${console} mpurate=${mpurate} vram=${vram} omapfb.mode=dvi:${dvimode} omapdss.def_disp=${defaultdisplay} root=${mmcroot} rootfstype=${mmcrootfstype}
+bootm ${loadaddr}
diff --git a/recipes/angstrom/angstrom-uboot-scripts/sh.cmd b/recipes/angstrom/angstrom-uboot-scripts/sh.cmd
new file mode 100644
index 0000000000..1e37e06ebb
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/sh.cmd
@@ -0,0 +1,6 @@
+setenv vram '4M'
+setenv dvimode 'hd720'
+run loaduimage
+echo Booting from mmc ...
+setenv bootargs init=/bin/busybox sh console=${console} mpurate=${mpurate} vram=${vram} omapfb.mode=dvi:${dvimode} omapdss.def_disp=${defaultdisplay} root=${mmcroot} rootfstype=${mmcrootfstype}
+bootm ${loadaddr}
diff --git a/recipes/angstrom/angstrom-version.bb b/recipes/angstrom/angstrom-version.bb
index 6f1043cec0..1728c0dff8 100644
--- a/recipes/angstrom/angstrom-version.bb
+++ b/recipes/angstrom/angstrom-version.bb
@@ -1,7 +1,7 @@
 LICENSE = "MIT"
 
 PV = "${DISTRO_VERSION}"
-PR = "r2"
+PR = "r3"
 PE = "1"
 
 PACKAGES = "${PN}"
@@ -9,10 +9,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 export METADATA_REVISION
 export METADATA_BRANCH
+export TARGET_SYS
 
 do_install() {
 	mkdir -p ${D}${sysconfdir}
 	echo "Angstrom ${DISTRO_VERSION}" > ${D}${sysconfdir}/angstrom-version
 	echo "Built from branch: ${METADATA_BRANCH}" >> ${D}${sysconfdir}/angstrom-version
 	echo "Revision: ${METADATA_REVISION}" >> ${D}${sysconfdir}/angstrom-version
+	echo "Target system: ${TARGET_SYS}" >> ${D}${sysconfdir}/angstrom-version
 }
diff --git a/recipes/angstrom/e-wm-config-angstrom.bb b/recipes/angstrom/e-wm-config-angstrom.bb
index 208ab99c9f..e0d0f8d375 100644
--- a/recipes/angstrom/e-wm-config-angstrom.bb
+++ b/recipes/angstrom/e-wm-config-angstrom.bb
@@ -4,7 +4,7 @@ DEPENDS = "edje-native eet-native e-wm places gnome-icon-theme"
 
 PACKAGES_DYNAMIC = "e-wm-config-angstrom*"
 
-PR = "r13"
+PR = "r14"
 
 SRC_URI = " \
           file://configs \
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/e.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/e.src
deleted file mode 100644
index e4b6e130e2..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/e.src
+++ /dev/null
@@ -1,903 +0,0 @@
-group "E_Config" struct {
-  value "config_version" int: 65843;
-  value "show_splash" int: 1;
-  value "init_default_theme" string: "default.edj";
-  value "desktop_default_name" string: "Desktop %i, %i";
-  value "menus_scroll_speed" double: 1000.0000000000000000000000000;
-  value "menus_fast_mouse_move_threshhold" double: 300.0000000000000000000000000;
-  value "menus_click_drag_timeout" double: 0.2500000000000000000000000;
-  value "border_shade_animate" int: 1;
-  value "border_shade_transition" int: 3;
-  value "border_shade_speed" double: 3000.0000000000000000000000000;
-  value "framerate" double: 25.0000000000000000000000000;
-  value "priority" int: 1;
-  value "image_cache" int: 2048;
-  value "font_cache" int: 512;
-  value "edje_cache" int: 8;
-  value "edje_collection_cache" int: 24;
-  value "zone_desks_x_count" int: 4;
-  value "zone_desks_y_count" int: 1;
-  value "use_virtual_roots" int: 0;
-  value "show_desktop_icons" int: 0;
-  value "edge_flip_dragging" int: 0;
-  value "evas_engine_default" int: 1;
-  value "evas_engine_container" int: 0;
-  value "evas_engine_init" int: 0;
-  value "evas_engine_menus" int: 0;
-  value "evas_engine_borders" int: 0;
-  value "evas_engine_errors" int: 0;
-  value "evas_engine_popups" int: 0;
-  value "evas_engine_drag" int: 0;
-  value "evas_engine_win" int: 0;
-  value "evas_engine_zone" int: 0;
-  value "use_composite" int: 0;
-  value "language" string: "en_US.UTF-8";
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "gadman";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 100;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "illume";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 1;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "start";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desk";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_dialogs";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_imc";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_keybindings";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_intl";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mouse_cursor";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_transitions";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_display";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_profiles";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_performance";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_fonts";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_engine";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_startup";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_theme";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_wallpaper";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "dropshadow";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desks";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_scale";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "battery";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "mixer";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "clock";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "pager";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "syscon";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "cpufreq";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "systray";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "msgbus_lang";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "fileman";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "places";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "temperature";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_icon_theme";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_applications";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "themes" list {
-    group "E_Config_Theme" struct {
-      value "category" string: "theme";
-      value "file" string: "illume.edj";
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
-      value "modifiers" int: 0;
-      value "key" string: "Execute";
-      value "action" string: "delayed_action";
-      value "params" string: "[0.0 syscon] [2.0 halt_now]";
-      value "any_mod" uchar: 1;
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,clicked,[12]";
-      value "source" string: "e.event.close";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_close";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.titlebar";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_move";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,up,1";
-      value "source" string: "e.event.titlebar";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_move";
-      value "params" string: "end";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.tl";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "tl";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.t";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "t";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.tr";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "tr";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.r";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "r";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.br";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "br";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.b";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "b";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.bl";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "bl";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,1";
-      value "source" string: "e.event.resize.l";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "l";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,up,1";
-      value "source" string: "e.event.resize.*";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_resize";
-      value "params" string: "end";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,down,3";
-      value "source" string: "e.event.resize.*";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_move";
-    }
-  }
-  group "signal_bindings" list {
-    group "E_Config_Binding_Signal" struct {
-      value "context" int: 2;
-      value "signal" string: "mouse,up,3";
-      value "source" string: "e.event.resize.*";
-      value "modifiers" int: 0;
-      value "any_mod" uchar: 1;
-      value "action" string: "window_move";
-      value "params" string: "end";
-    }
-  }
-  value "window_placement_policy" int: 0;
-  value "focus_policy" int: 0;
-  value "focus_setting" int: 1;
-  value "pass_click_on" int: 1;
-  value "always_click_to_raise" int: 0;
-  value "always_click_to_focus" int: 0;
-  value "use_auto_raise" int: 0;
-  value "auto_raise_delay" double: 0.5000000000000000000000000;
-  value "use_resist" int: 1;
-  value "drag_resist" int: 16;
-  value "desk_resist" int: 32;
-  value "window_resist" int: 12;
-  value "gadget_resist" int: 32;
-  value "winlist_warp_while_selecting" int: 1;
-  value "winlist_warp_at_end" int: 1;
-  value "winlist_warp_speed" double: 0.1000000000000000055511151;
-  value "winlist_scroll_animate" int: 1;
-  value "winlist_scroll_speed" double: 0.1000000000000000055511151;
-  value "winlist_list_show_iconified" int: 1;
-  value "winlist_list_show_other_desk_iconified" int: 1;
-  value "winlist_list_show_other_screen_iconified" int: 0;
-  value "winlist_list_show_other_desk_windows" int: 0;
-  value "winlist_list_show_other_screen_windows" int: 0;
-  value "winlist_list_uncover_while_selecting" int: 0;
-  value "winlist_list_jump_desk_while_selecting" int: 0;
-  value "winlist_list_focus_while_selecting" int: 1;
-  value "winlist_list_raise_while_selecting" int: 1;
-  value "winlist_pos_align_x" double: 0.5000000000000000000000000;
-  value "winlist_pos_align_y" double: 0.5000000000000000000000000;
-  value "winlist_pos_size_w" double: 0.5000000000000000000000000;
-  value "winlist_pos_size_h" double: 0.5000000000000000000000000;
-  value "winlist_pos_min_w" int: 0;
-  value "winlist_pos_min_h" int: 0;
-  value "winlist_pos_max_w" int: 320;
-  value "winlist_pos_max_h" int: 320;
-  value "maximize_policy" int: 50;
-  value "allow_manip" int: 0;
-  value "border_fix_on_shelf_toggle" int: 0;
-  value "allow_above_fullscreen" int: 0;
-  value "kill_if_close_not_possible" int: 1;
-  value "kill_process" int: 1;
-  value "kill_timer_wait" double: 10.0000000000000000000000000;
-  value "ping_clients" int: 1;
-  value "transition_desk" string: "vswipe";
-  value "transition_change" string: "crossfade";
-  value "remember_internal_windows" int: 0;
-  value "move_info_follows" int: 1;
-  value "resize_info_follows" int: 1;
-  value "move_info_visible" int: 1;
-  value "resize_info_visible" int: 1;
-  value "focus_last_focused_per_desktop" int: 1;
-  value "focus_revert_on_hide_or_close" int: 1;
-  value "pointer_slide" int: 0;
-  value "use_e_cursor" int: 1;
-  value "cursor_size" int: 32;
-  value "menu_autoscroll_margin" int: 0;
-  value "menu_autoscroll_cursor_margin" int: 1;
-  value "transient.move" int: 1;
-  value "transient.resize" int: 0;
-  value "transient.raise" int: 1;
-  value "transient.lower" int: 1;
-  value "transient.layer" int: 1;
-  value "transient.desktop" int: 1;
-  value "transient.iconify" int: 1;
-  value "modal_windows" int: 1;
-  value "menu_eap_name_show" int: 1;
-  value "menu_eap_generic_show" int: 1;
-  value "menu_eap_comment_show" int: 0;
-  value "fullscreen_policy" int: 0;
-  value "exebuf_max_exe_list" int: 20;
-  value "exebuf_max_eap_list" int: 20;
-  value "exebuf_max_hist_list" int: 20;
-  value "exebuf_scroll_animate" int: 1;
-  value "exebuf_scroll_speed" double: 0.1000000000000000055511151;
-  value "exebuf_pos_align_x" double: 0.5000000000000000000000000;
-  value "exebuf_pos_align_y" double: 0.5000000000000000000000000;
-  value "exebuf_pos_size_w" double: 0.7500000000000000000000000;
-  value "exebuf_pos_size_h" double: 0.2500000000000000000000000;
-  value "exebuf_pos_min_w" int: 200;
-  value "exebuf_pos_min_h" int: 160;
-  value "exebuf_pos_max_w" int: 400;
-  value "exebuf_pos_max_h" int: 320;
-  value "exebuf_term_cmd" string: "xterm -hold -e";
-  value "use_app_icon" int: 0;
-  value "cnfmdlg_disabled" int: 0;
-  value "cfgdlg_auto_apply" int: 0;
-  value "cfgdlg_default_mode" int: 0;
-  group "gadcons" list {
-    group "E_Config_Gadcon" struct {
-      value "name" string: "slipshelf";
-      value "id" int: 0;
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "clock";
-          value "id" string: "clock";
-          value "geom.pos" int: 720;
-          value "geom.size" int: 42;
-          value "geom.res" int: 138;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 1;
-          value "state_info.flags" int: 1;
-          value "style" string: "plain";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "battery";
-          value "id" string: "battery";
-          value "geom.pos" int: 720;
-          value "geom.size" int: 52;
-          value "geom.res" int: 142;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 4;
-          value "state_info.flags" int: 1;
-          value "style" string: "plain";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "mixer";
-          value "id" string: "mixer.0";
-          value "geom.pos" int: 720;
-          value "geom.size" int: 80;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 5;
-          value "state_info.flags" int: 0;
-          value "style" string: "plain";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "start";
-          value "id" string: "start";
-          value "geom.pos" int: 720;
-          value "geom.size" int: 80;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 6;
-          value "state_info.flags" int: 0;
-          value "style" string: "plain";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-    }
-  }
-  group "gadcons" list {
-    group "E_Config_Gadcon" struct {
-      value "name" string: "slipshelf_extra";
-      value "id" int: 0;
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "configuration";
-          value "id" string: "configuration";
-          value "geom.pos" int: 0;
-          value "geom.size" int: 32;
-          value "geom.res" int: 472;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 1;
-          value "state_info.flags" int: 1;
-          value "style" string: "plain";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "pager";
-          value "id" string: "pager";
-          value "geom.pos" int: 376;
-          value "geom.size" int: 96;
-          value "geom.res" int: 472;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 4;
-          value "state_info.flags" int: 0;
-          value "style" string: "inset";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "systray";
-          value "id" string: "systray";
-          value "geom.pos" int: 720;
-          value "geom.size" int: 80;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 5;
-          value "state_info.flags" int: 0;
-          value "style" string: "inset";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-    }
-  }
-  group "gadcons" list {
-    group "E_Config_Gadcon" struct {
-      value "name" string: "gadman";
-      value "id" int: 114;
-    }
-  }
-  group "gadcons" list {
-    group "E_Config_Gadcon" struct {
-      value "name" string: "gadman_top";
-      value "id" int: 115;
-    }
-  }
-  value "font_hinting" int: 0;
-  value "desklock_auth_method" int: 0;
-  value "desklock_login_box_zone" int: -1;
-  value "desklock_start_locked" int: 0;
-  value "desklock_autolock_screensaver" int: 0;
-  value "desklock_post_screensaver_time" double: 0.0000000000000000000000000;
-  value "desklock_autolock_idle" int: 0;
-  value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
-  value "desklock_use_custom_desklock" int: 0;
-  value "desklock_ask_presentation" uchar: 1;
-  value "desklock_ask_presentation_timeout" double: 30.0000000000000000000000000;
-  value "display_res_restore" int: 0;
-  value "display_res_width" int: 1;
-  value "display_res_height" int: 1;
-  value "display_res_hz" int: 0;
-  value "display_res_rotation" int: 0;
-  value "screensaver_enable" int: 1;
-  value "screensaver_timeout" int: 30;
-  value "screensaver_interval" int: 5;
-  value "screensaver_blanking" int: 2;
-  value "screensaver_expose" int: 2;
-  value "screensaver_ask_presentation" uchar: 1;
-  value "screensaver_ask_presentation_timeout" double: 30.0000000000000000000000000;
-  value "dpms_enable" int: 0;
-  value "dpms_standby_enable" int: 0;
-  value "dpms_suspend_enable" int: 0;
-  value "dpms_off_enable" int: 0;
-  value "dpms_standby_timeout" int: 0;
-  value "dpms_suspend_timeout" int: 0;
-  value "dpms_off_timeout" int: 0;
-  value "clientlist_group_by" int: 0;
-  value "clientlist_include_all_zones" int: 0;
-  value "clientlist_separate_with" int: 0;
-  value "clientlist_sort_by" int: 0;
-  value "clientlist_separate_iconified_apps" int: 0;
-  value "clientlist_warp_to_iconified_desktop" int: 0;
-  value "clientlist_limit_caption_len" int: 0;
-  value "clientlist_max_caption_len" int: 2;
-  value "mouse_hand" int: 1;
-  value "mouse_accel_numerator" int: 2;
-  value "mouse_accel_denominator" int: 1;
-  value "mouse_accel_threshold" int: 4;
-  value "border_raise_on_mouse_action" int: 1;
-  value "border_raise_on_focus" int: 1;
-  value "desk_flip_wrap" int: 0;
-  value "fullscreen_flip" int: 1;
-  value "icon_theme" string: "gnome";
-  value "icon_theme_overrides" uchar: 1;
-  value "desk_flip_animate_mode" int: 0;
-  value "desk_flip_animate_interpolation" int: 0;
-  value "desk_flip_animate_time" double: 0.2000000000000000111022302;
-  value "desk_flip_pan_bg" uchar: 0;
-  value "desk_flip_pan_x_axis_factor" double: 0.0000000000000000000000000;
-  value "desk_flip_pan_y_axis_factor" double: 0.0000000000000000000000000;
-  value "wallpaper_import_last_dev" string: "~/";
-  value "wallpaper_import_last_path" string: "/";
-  value "wallpaper_grad_c1_r" int: 0;
-  value "wallpaper_grad_c1_g" int: 0;
-  value "wallpaper_grad_c1_b" int: 0;
-  value "wallpaper_grad_c2_r" int: 255;
-  value "wallpaper_grad_c2_g" int: 255;
-  value "wallpaper_grad_c2_b" int: 255;
-  value "theme_default_border_style" string: "default";
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/jpeg";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/png";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-pixmap";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/x-xpixmap";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/svg+xml";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/gif";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "image/tiff";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "application/x-edje";
-      value "icon" string: "THUMB";
-    }
-  }
-  group "mime_icons" list {
-    group "E_Config_Mime_Icon" struct {
-      value "mime" string: "application/x-desktop";
-      value "icon" string: "DESKTOP";
-    }
-  }
-  value "desk_auto_switch" int: 0;
-  value "thumb_nice" int: 0;
-  value "menu_favorites_show" int: 1;
-  value "menu_apps_show" int: 1;
-  value "ping_clients_interval" int: 128;
-  value "cache_flush_poll_interval" int: 512;
-  value "thumbscroll_enable" int: 1;
-  value "thumbscroll_threshhold" int: 36;
-  value "thumbscroll_momentum_threshhold" double: 100.0000000000000000000000000;
-  value "thumbscroll_friction" double: 1.0000000000000000000000000;
-  value "hal_desktop" int: 0;
-  value "hal_auto_mount" int: 1;
-  value "hal_auto_open" int: 1;
-  value "border_keyboard.timeout" double: 5.0000000000000000000000000;
-  value "border_keyboard.move.dx" uchar: 5;
-  value "border_keyboard.move.dy" uchar: 5;
-  value "border_keyboard.resize.dx" uchar: 5;
-  value "border_keyboard.resize.dy" uchar: 5;
-  value "scale.min" double: 0.9000000000000000222044605;
-  value "scale.max" double: 4.0000000000000000000000000;
-  value "scale.factor" double: 1.0000000000000000000000000;
-  value "scale.base_dpi" int: 142;
-  value "scale.use_dpi" uchar: 1;
-  value "scale.use_custom" uchar: 0;
-  value "show_cursor" uchar: 0;
-  value "idle_cursor" uchar: 0;
-  value "cfgdlg_normal_wins" uchar: 1;
-  value "syscon.main.icon_size" int: 64;
-  value "syscon.secondary.icon_size" int: 48;
-  value "syscon.extra.icon_size" int: 48;
-  value "syscon.timeout" double: 5.0000000000000000000000000;
-  value "syscon.do_input" uchar: 0;
-  group "syscon.actions" list {
-    group "E_Config_Syscon_Action" struct {
-      value "action" string: "suspend";
-      value "params" string: "now";
-      value "button" string: "button";
-      value "icon" string: "system-suspend";
-      value "is_main" int: 1;
-    }
-  }
-  group "syscon.actions" list {
-    group "E_Config_Syscon_Action" struct {
-      value "action" string: "desk_lock";
-      value "button" string: "button";
-      value "icon" string: "system-lock-screen";
-      value "is_main" int: 1;
-    }
-  }
-  group "syscon.actions" list {
-    group "E_Config_Syscon_Action" struct {
-      value "action" string: "halt";
-      value "params" string: "now";
-      value "button" string: "button";
-      value "icon" string: "system-shutdown";
-      value "is_main" int: 0;
-    }
-  }
-  value "mode.presentation" uchar: 0;
-  value "mode.offline" uchar: 0;
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/icon.png b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/icon.png
deleted file mode 100644
index f6fa12f4ff..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/icon.png
+++ /dev/null
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.battery.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.battery.src
deleted file mode 100644
index 854be11b99..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.battery.src
+++ /dev/null
@@ -1,7 +0,0 @@
-group "Battery_Config" struct {
-  value "poll_interval" int: 32;
-  value "alert" int: 10;
-  value "alert_p" int: 10;
-  value "alert_timeout" int: 0;
-  value "force_mode" int: 0;
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.cpufreq.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.cpufreq.src
deleted file mode 100644
index c782ac20b5..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.cpufreq.src
+++ /dev/null
@@ -1,6 +0,0 @@
-group "Cpufreq_Config" struct {
-  value "config_version" int: 1;
-  value "poll_interval" int: 32;
-  value "restore_governor" int: 0;
-  value "auto_powersave" int: 1;
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.dropshadow.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.dropshadow.src
deleted file mode 100644
index 4c2af60659..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.dropshadow.src
+++ /dev/null
@@ -1,7 +0,0 @@
-group "Dropshadow_Config" struct {
-  value "shadow_x" int: 0;
-  value "shadow_y" int: 0;
-  value "blur_size" int: 10;
-  value "quality" int: 4;
-  value "shadow_darkness" double: 0.5000000000000000000000000;
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.fileman.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.fileman.src
deleted file mode 100644
index b40eec6129..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.fileman.src
+++ /dev/null
@@ -1,28 +0,0 @@
-group "Fileman_Config" struct {
-  value "config_version" int: 65793;
-  value "view.mode" int: 1;
-  value "view.open_dirs_in_place" uchar: 0;
-  value "view.selector" uchar: 0;
-  value "view.single_click" uchar: 0;
-  value "view.no_subdir_jump" uchar: 0;
-  value "view.no_subdir_drop" uchar: 0;
-  value "view.always_order" uchar: 0;
-  value "view.link_drop" uchar: 0;
-  value "view.fit_custom_pos" uchar: 0;
-  value "view.show_full_path" uchar: 0;
-  value "view.show_desktop_icons" uchar: 0;
-  value "view.show_toolbar" uchar: 1;
-  value "icon.icon.w" int: 48;
-  value "icon.icon.h" int: 48;
-  value "icon.list.w" int: 16;
-  value "icon.list.h" int: 16;
-  value "icon.fixed.w" uchar: 0;
-  value "icon.fixed.h" uchar: 0;
-  value "icon.extension.show" uchar: 1;
-  value "list.sort.no_case" uchar: 1;
-  value "list.sort.dirs.first" uchar: 1;
-  value "list.sort.dirs.last" uchar: 0;
-  value "selection.single" uchar: 0;
-  value "selection.windows_modifiers" uchar: 0;
-  value "theme.fixed" uchar: 0;
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.gadman.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.gadman.src
deleted file mode 100644
index a0da14be8b..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.gadman.src
+++ /dev/null
@@ -1,9 +0,0 @@
-group "Gadman_Config" struct {
-  value "bg_type" int: 0;
-  value "color_r" int: 255;
-  value "color_g" int: 255;
-  value "color_b" int: 255;
-  value "color_a" int: 255;
-  value "anim_bg" int: 1;
-  value "anim_gad" int: 1;
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.ibar.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.ibar.src
deleted file mode 100644
index 55757663d2..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.ibar.src
+++ /dev/null
@@ -1,18 +0,0 @@
-group "IBar_Config" struct {
-  group "items" list {
-    group "IBar_Config_Item" struct {
-      value "id" string: "0";
-      value "dir" string: "default";
-      value "show_label" int: 1;
-      value "eap_label" int: 0;
-    }
-  }
-  group "items" list {
-    group "IBar_Config_Item" struct {
-      value "id" string: "ibar.1";
-      value "dir" string: "default";
-      value "show_label" int: 1;
-      value "eap_label" int: 0;
-    }
-  }
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.ibox.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.ibox.src
deleted file mode 100644
index 1126554a1b..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.ibox.src
+++ /dev/null
@@ -1,20 +0,0 @@
-group "IBox_Config" struct {
-  group "items" list {
-    group "IBox_Config_Item" struct {
-      value "id" string: "0";
-      value "show_label" int: 0;
-      value "show_zone" int: 1;
-      value "show_desk" int: 0;
-      value "icon_label" int: 0;
-    }
-  }
-  group "items" list {
-    group "IBox_Config_Item" struct {
-      value "id" string: "ibox.1";
-      value "show_label" int: 0;
-      value "show_zone" int: 1;
-      value "show_desk" int: 0;
-      value "icon_label" int: 0;
-    }
-  }
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.illume.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.illume.src
deleted file mode 100644
index 0adf45b763..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.illume.src
+++ /dev/null
@@ -1,18 +0,0 @@
-group "Illume_Cfg" struct {
-  value "config_version" int: 3;
-  value "launcher.mode" int: 1;
-  value "launcher.icon_size" int: 120;
-  value "launcher.single_click" int: 1;
-  value "power.auto_suspend" int: 1;
-  value "power.auto_suspend_delay" int: 1;
-  value "performance.cache_level" int: 3;
-  value "performance.fps" int: 25;
-  value "slipshelf.main_gadget_size" int: 56;
-  value "slipshelf.extra_gagdet_size" int: 48;
-  value "slipshelf.style" int: 1;
-  value "sliding.slipshelf.duration" int: 1000;
-  value "sliding.kbd.duration" int: 1000;
-  value "sliding.busywin.duration" int: 1000;
-  value "sliding.layout.duration" int: 1000;
-  value "kbd.use_internal" int: 1;
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.mixer.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.mixer.src
deleted file mode 100644
index 2647520e57..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.mixer.src
+++ /dev/null
@@ -1,13 +0,0 @@
-group "Mixer_Module_Config" struct {
-  value "version" int: 3;
-  value "default_gc_id" string: "mixer.0";
-  group "gadgets" hash {
-    key "mixer.0";
-    group "Mixer_Gadget_Config" struct {
-      value "lock_sliders" int: 1;
-      value "show_locked" int: 0;
-      value "card" string: "hw:0";
-      value "channel_name" string: "Carkit";
-    }
-  }
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.pager.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.pager.src
deleted file mode 100644
index 320830c222..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.pager.src
+++ /dev/null
@@ -1,15 +0,0 @@
-group "Pager_Config" struct {
-  value "popup" uint: 1;
-  value "popup_speed" double: 1.0000000000000000000000000;
-  value "popup_urgent" uint: 0;
-  value "popup_urgent_stick" uint: 0;
-  value "popup_urgent_speed" double: 1.5000000000000000000000000;
-  value "show_desk_names" uint: 0;
-  value "popup_height" int: 60;
-  value "popup_act_height" int: 60;
-  value "drag_resist" uint: 3;
-  value "btn_drag" uchar: 1;
-  value "btn_noplace" uchar: 2;
-  value "btn_desk" uchar: 0;
-  value "flip_desk" uchar: 0;
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.places.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.places.src
deleted file mode 100644
index 5ec10776e7..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.places.src
+++ /dev/null
@@ -1,25 +0,0 @@
-group "Config" struct {
-  value "version" int: 65679;
-  value "fm" string: "";
-  value "auto_mount" uchar: 1;
-  value "auto_open" uchar: 0;
-  group "conf_items" list {
-    group "Config_Item" struct {
-      value "id" string: "Places.1";
-      value "switch2" int: 0;
-    }
-  }
-  group "conf_items" list {
-    group "Config_Item" struct {
-      value "id" string: "Places.2";
-      value "switch2" int: 0;
-    }
-  }
-  value "show_menu" uchar: 1;
-  value "show_home" uchar: 1;
-  value "show_desk" uchar: 0;
-  value "show_trash" uchar: 0;
-  value "show_root" uchar: 1;
-  value "show_temp" uchar: 0;
-  value "show_bookm" uchar: 1;
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.temperature.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.temperature.src
deleted file mode 100644
index dcad5332e1..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/module.temperature.src
+++ /dev/null
@@ -1,13 +0,0 @@
-group "Temperature_Config" struct {
-  group "faces" hash {
-    key "temperature.1";
-    group "Temperature_Config_Face" struct {
-      value "id" string: "temperature.1";
-      value "poll_interval" int: 128;
-      value "low" int: 30;
-      value "high" int: 80;
-      value "sensor_type" int: 0;
-      value "units" int: 0;
-    }
-  }
-}
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/profile.desktop b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/profile.desktop
deleted file mode 100644
index 492f141057..0000000000
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-touchscreen/profile.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Angstrom Touchscreen
-Icon=icon.png
-Comment=This is the Angstrom profile that is tweaked for touchscreen devices.
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/e.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/e.src
index 704e00e0b1..edf9777a8a 100644
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/e.src
+++ b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/e.src
@@ -98,14 +98,6 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "exebuf";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
       value "name" string: "winlist";
       value "enabled" uchar: 1;
       value "delayed" uchar: 1;
@@ -202,14 +194,6 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "conf_exebuf";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
       value "name" string: "conf_fonts";
       value "enabled" uchar: 1;
       value "delayed" uchar: 1;
@@ -450,14 +434,6 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "msgbus_lang";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
       value "name" string: "syscon";
       value "enabled" uchar: 1;
       value "delayed" uchar: 1;
@@ -916,15 +892,6 @@ group "E_Config" struct {
   group "key_bindings" list {
     group "E_Config_Binding_Key" struct {
       value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "Escape";
-      value "action" string: "exebuf";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
       value "modifiers" int: 6;
       value "key" string: "l";
       value "action" string: "desk_lock";
@@ -1499,20 +1466,6 @@ group "E_Config" struct {
   value "menu_eap_generic_show" int: 1;
   value "menu_eap_comment_show" int: 0;
   value "fullscreen_policy" int: 0;
-  value "exebuf_max_exe_list" int: 20;
-  value "exebuf_max_eap_list" int: 20;
-  value "exebuf_max_hist_list" int: 20;
-  value "exebuf_scroll_animate" int: 1;
-  value "exebuf_scroll_speed" double: 0.1000000000000000055511151;
-  value "exebuf_pos_align_x" double: 0.5000000000000000000000000;
-  value "exebuf_pos_align_y" double: 0.5000000000000000000000000;
-  value "exebuf_pos_size_w" double: 0.7500000000000000000000000;
-  value "exebuf_pos_size_h" double: 0.2500000000000000000000000;
-  value "exebuf_pos_min_w" int: 200;
-  value "exebuf_pos_min_h" int: 160;
-  value "exebuf_pos_max_w" int: 400;
-  value "exebuf_pos_max_h" int: 320;
-  value "exebuf_term_cmd" string: "xterm -hold -e";
   value "use_app_icon" int: 1;
   value "cnfmdlg_disabled" int: 0;
   value "cfgdlg_auto_apply" int: 0;
diff --git a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/e.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/e.src
index 67ba752c9c..bf0c11e412 100644
--- a/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/e.src
+++ b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/e.src
@@ -50,14 +50,6 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "msgbus_lang";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 0;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
       value "name" string: "places";
       value "enabled" uchar: 1;
       value "delayed" uchar: 0;
@@ -298,14 +290,6 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "conf_exebuf";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
       value "name" string: "conf_dpms";
       value "enabled" uchar: 1;
       value "delayed" uchar: 1;
@@ -402,14 +386,6 @@ group "E_Config" struct {
   }
   group "modules" list {
     group "E_Config_Module" struct {
-      value "name" string: "exebuf";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
       value "name" string: "pager";
       value "enabled" uchar: 1;
       value "delayed" uchar: 0;
@@ -916,15 +892,6 @@ group "E_Config" struct {
   group "key_bindings" list {
     group "E_Config_Binding_Key" struct {
       value "context" int: 9;
-      value "modifiers" int: 4;
-      value "key" string: "Escape";
-      value "action" string: "exebuf";
-      value "any_mod" uchar: 0;
-    }
-  }
-  group "key_bindings" list {
-    group "E_Config_Binding_Key" struct {
-      value "context" int: 9;
       value "modifiers" int: 6;
       value "key" string: "l";
       value "action" string: "desk_lock";
@@ -1499,20 +1466,6 @@ group "E_Config" struct {
   value "menu_eap_generic_show" int: 1;
   value "menu_eap_comment_show" int: 0;
   value "fullscreen_policy" int: 0;
-  value "exebuf_max_exe_list" int: 20;
-  value "exebuf_max_eap_list" int: 20;
-  value "exebuf_max_hist_list" int: 20;
-  value "exebuf_scroll_animate" int: 1;
-  value "exebuf_scroll_speed" double: 0.1000000000000000055511151;
-  value "exebuf_pos_align_x" double: 0.5000000000000000000000000;
-  value "exebuf_pos_align_y" double: 0.5000000000000000000000000;
-  value "exebuf_pos_size_w" double: 0.7500000000000000000000000;
-  value "exebuf_pos_size_h" double: 0.2500000000000000000000000;
-  value "exebuf_pos_min_w" int: 200;
-  value "exebuf_pos_min_h" int: 160;
-  value "exebuf_pos_max_w" int: 400;
-  value "exebuf_pos_max_h" int: 320;
-  value "exebuf_term_cmd" string: "xterm -hold -e";
   value "use_app_icon" int: 0;
   value "cnfmdlg_disabled" int: 0;
   value "cfgdlg_auto_apply" int: 0;
diff --git a/recipes/anki/anki_0.4.3.bb b/recipes/anki/anki_0.4.3.bb
index b52c0323b0..97cc3ee1a5 100644
--- a/recipes/anki/anki_0.4.3.bb
+++ b/recipes/anki/anki_0.4.3.bb
@@ -5,7 +5,7 @@ PR = "r2"
 
 export PV := "${PV}"
 
-SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch;patch=1"
+SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch"
 S = "${WORKDIR}/anki-${PV}"
 
 SRC_URI[md5sum] = "90434860945de4c09d55cdb5dbe984fc"
diff --git a/recipes/ant/ant-native_1.7.1.bb b/recipes/ant/ant-native_1.7.1.bb
index 405026bbd4..b4fdb054f9 100644
--- a/recipes/ant/ant-native_1.7.1.bb
+++ b/recipes/ant/ant-native_1.7.1.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Another Neat Tool - build system for Java"
 LICENSE = "AL2.0"
-
 AUTHOR = "Apache Software Foundation"
 HOMEPAGE = "http://ant.apache.org"
+PR = "r1"
+
 
 SRC_URI = "\
     http://ftp.riken.jp/net/apache/ant/source/apache-ant-${PV}-src.tar.gz \
@@ -58,9 +59,9 @@ do_compile() {
   sed -i -e"s|@JAR_FILE@|$cp|" ${WORKDIR}/ant
 }
 
-do_stage_append() {
-	install -d ${bindir}
-	install -m 0755 ${WORKDIR}/ant ${bindir}
+do_install_append() {
+	install -d ${D}${bindir}
+	install -m 0755 ${WORKDIR}/ant ${D}${bindir}
 }
 
 SRC_URI[md5sum] = "2a44ff60456cf67bb83771cfcedb8e33"
diff --git a/recipes/anthy/anthy_9100e.bb b/recipes/anthy/anthy_9100e.bb
index e87f19b602..83e61b774d 100644
--- a/recipes/anthy/anthy_9100e.bb
+++ b/recipes/anthy/anthy_9100e.bb
@@ -12,9 +12,9 @@ DEPENDS = "anthy-native"
 PR = "r3"
 
 SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/29142/anthy-9100e.tar.gz \
-           file://not_build_elc.patch;patch=1 \
-           file://2ch_t.patch;patch=1 \
-           file://native-helpers.patch;patch=1"
+           file://not_build_elc.patch \
+           file://2ch_t.patch \
+           file://native-helpers.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/apache2/apache2_2.2.14.bb b/recipes/apache2/apache2_2.2.14.bb
index 72dbfc9759..7361167d5e 100644
--- a/recipes/apache2/apache2_2.2.14.bb
+++ b/recipes/apache2/apache2_2.2.14.bb
@@ -6,11 +6,11 @@ RDEPENDS += "openssl"
 PR = "r1"
 
 SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-${PV}.tar.bz2 \
-	   file://apr-sockets-patch;patch=1 \
-	   file://configure-patch;patch=1 \
-	   file://server-makefile-patch;patch=1 \
-	   file://configure.in.patch;patch=1 \
-	   file://apr.h.in.patch;patch=1 \
+	   file://apr-sockets-patch;apply=yes \
+	   file://configure-patch;apply=yes \
+	   file://server-makefile-patch;apply=yes \
+	   file://configure.in.patch \
+	   file://apr.h.in.patch \
            file://init"
 
 #
diff --git a/recipes/apache2/apache2_2.2.3.bb b/recipes/apache2/apache2_2.2.3.bb
index 1146d933b9..91a341e496 100644
--- a/recipes/apache2/apache2_2.2.3.bb
+++ b/recipes/apache2/apache2_2.2.3.bb
@@ -6,11 +6,11 @@ RDEPENDS += "openssl"
 PR = "r6"
 
 SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2 \
-	   file://dftables-makefile-patch;patch=1 \
-	   file://apr-sockets-patch;patch=1 \
-	   file://configure-patch;patch=1 \
-	   file://server-makefile-patch;patch=1 \
-           file://configure-fix-cross-compile-ptr-check.patch;patch=1 \
+	   file://dftables-makefile-patch;apply=yes \
+	   file://apr-sockets-patch;apply=yes \
+	   file://configure-patch;apply=yes \
+	   file://server-makefile-patch;apply=yes \
+           file://configure-fix-cross-compile-ptr-check.patch \
            file://init"
 
 #
diff --git a/recipes/apex/apex-env_1.5.14.bb b/recipes/apex/apex-env_1.5.14.bb
index f47ce67bc6..ddd28f3c59 100644
--- a/recipes/apex/apex-env_1.5.14.bb
+++ b/recipes/apex/apex-env_1.5.14.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
-	file://find-apex-partition.patch;patch=1 \
+	file://find-apex-partition.patch \
 	"
 S = ${WORKDIR}/apex-${PV}/usr
 
diff --git a/recipes/apex/apex-env_1.5.8.bb b/recipes/apex/apex-env_1.5.8.bb
index 515a8c5bc1..b61902639c 100644
--- a/recipes/apex/apex-env_1.5.8.bb
+++ b/recipes/apex/apex-env_1.5.8.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
-	file://find-apex-partition.patch;patch=1 \
+	file://find-apex-partition.patch \
 	"
 S = ${WORKDIR}/apex-${PV}/usr
 
diff --git a/recipes/apex/apex-nslu2-16mb_1.5.14.bb b/recipes/apex/apex-nslu2-16mb_1.5.14.bb
index f71eaa5d4b..8e764dd28f 100644
--- a/recipes/apex/apex-nslu2-16mb_1.5.14.bb
+++ b/recipes/apex/apex-nslu2-16mb_1.5.14.bb
@@ -58,7 +58,7 @@ do_stage() {
 	elif [ "x${SITEINFO_ENDIANESS}" = "xle" ]; then
 		devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin 'xp $,4'
 	else
-		oefatal do_populate_staging cannot determine endianess
+		oefatal do_populate_sysroot cannot determine endianess
 	fi
 }
 
diff --git a/recipes/apex/apex-nslu2_1.5.14.bb b/recipes/apex/apex-nslu2_1.5.14.bb
index db78872251..a1d91b7e67 100644
--- a/recipes/apex/apex-nslu2_1.5.14.bb
+++ b/recipes/apex/apex-nslu2_1.5.14.bb
@@ -58,7 +58,7 @@ do_stage() {
 	elif [ "x${SITEINFO_ENDIANESS}" = "xle" ]; then
 		devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2.bin 'xp $,4'
 	else
-		oefatal do_populate_staging cannot determine endianess
+		oefatal do_populate_sysroot cannot determine endianess
 	fi
 }
 
diff --git a/recipes/apmd/apmd_3.2.2.bb b/recipes/apmd/apmd_3.2.2.bb
index 0240f6152a..6b8313281d 100644
--- a/recipes/apmd/apmd_3.2.2.bb
+++ b/recipes/apmd/apmd_3.2.2.bb
@@ -6,11 +6,11 @@ LICENSE = "GPL"
 PR = "r12"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz \
-           file://debian.patch;patch=1 \
-           file://workaround.patch;patch=1 \
-           file://zaurus24.patch;patch=1 \
-           file://unlinux.patch;patch=1 \
-           file://libtool.patch;patch=1 \
+           file://debian.patch \
+           file://workaround.patch \
+           file://zaurus24.patch \
+           file://unlinux.patch \
+           file://libtool.patch \
            file://init \
            file://default \
            file://apmd_proxy \
diff --git a/recipes/appweb/appweb_1.2.0.bb b/recipes/appweb/appweb_1.2.0.bb
index 66891dc78a..d0acb9d83d 100644
--- a/recipes/appweb/appweb_1.2.0.bb
+++ b/recipes/appweb/appweb_1.2.0.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with
 SECTION = "console/network"
 LICENSE = "GPL"
 SRC_URI = "http://www.mbedthis.com/software/appWeb-src-1.2.0-1.tar.gz \
-	   file://makerules.patch;patch=1 \
-	   file://nonrootinstall.patch;patch=1"
+	   file://makerules.patch \
+	   file://nonrootinstall.patch"
 S = "${WORKDIR}/appWeb-1.2.0"
 
 APPWEB_HOST = "${@get_appweb_host(d, bb)}"
diff --git a/recipes/appweb/appweb_2.0.4.bb b/recipes/appweb/appweb_2.0.4.bb
index c590d9f620..a180f2fb9e 100644
--- a/recipes/appweb/appweb_2.0.4.bb
+++ b/recipes/appweb/appweb_2.0.4.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with
 SECTION = "console/network"
 LICENSE = "GPL"
 SRC_URI = "http://www.mbedthis.com/software/appWeb-src-${PV}-1.tar.gz \
-	   file://makerules.patch;patch=1 \
-	   file://init.d.patch;patch=1 \
-           file://libdb.patch;patch=1"
+	   file://makerules.patch \
+	   file://init.d.patch \
+           file://libdb.patch"
 S = "${WORKDIR}/appWeb-${PV}"
 
 APPWEB_HOST = "${@get_appweb_host(d, bb)}"
diff --git a/recipes/apr/apr-util_0.9.12.bb b/recipes/apr/apr-util_0.9.12.bb
index f1f19ed6af..1902c054ef 100644
--- a/recipes/apr/apr-util_0.9.12.bb
+++ b/recipes/apr/apr-util_0.9.12.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://apr.apache.org"
 PR = "r1"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
-           file://gen_uri_delims.patch;patch=1 \
+           file://gen_uri_delims.patch \
            file://uri_delims.h"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
diff --git a/recipes/apr/apr-util_1.2.12.bb b/recipes/apr/apr-util_1.2.12.bb
index fc9fb364e5..b5c1ebb9ef 100644
--- a/recipes/apr/apr-util_1.2.12.bb
+++ b/recipes/apr/apr-util_1.2.12.bb
@@ -9,7 +9,7 @@ inherit autotools lib_package binconfig
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
-           file://configure_fixes.patch;patch=1"
+           file://configure_fixes.patch"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
 		--with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
diff --git a/recipes/apr/apr-util_1.2.7.bb b/recipes/apr/apr-util_1.2.7.bb
index 971221ea80..e26d3000bc 100644
--- a/recipes/apr/apr-util_1.2.7.bb
+++ b/recipes/apr/apr-util_1.2.7.bb
@@ -7,7 +7,7 @@ PR = "r3"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
-           file://configure_fixes.patch;patch=1"
+           file://configure_fixes.patch"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
 		--with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
diff --git a/recipes/apr/apr-util_1.3.4.bb b/recipes/apr/apr-util_1.3.4.bb
index 6b56fe92e3..914f9ce809 100644
--- a/recipes/apr/apr-util_1.3.4.bb
+++ b/recipes/apr/apr-util_1.3.4.bb
@@ -6,8 +6,8 @@ LICENSE = "Apache License, Version 2.0"
 PR = "r5"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
-           file://configfix.patch;patch=1 \
-           file://configure_fixes.patch;patch=1"
+           file://configfix.patch \
+           file://configure_fixes.patch"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ 
 		--with-dbm=gdbm \
diff --git a/recipes/apr/apr_1.2.12.bb b/recipes/apr/apr_1.2.12.bb
index ec0f824896..dd4493f571 100644
--- a/recipes/apr/apr_1.2.12.bb
+++ b/recipes/apr/apr_1.2.12.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
-           file://configure_fixes.patch;patch=1"
+           file://configure_fixes.patch"
 
 inherit autotools lib_package binconfig
 
diff --git a/recipes/apr/apr_1.2.7.bb b/recipes/apr/apr_1.2.7.bb
index fce7e02b46..cfb6e30582 100644
--- a/recipes/apr/apr_1.2.7.bb
+++ b/recipes/apr/apr_1.2.7.bb
@@ -6,7 +6,7 @@ PR = "r2"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
-           file://configure_fixes.patch;patch=1"
+           file://configure_fixes.patch"
 
 inherit autotools lib_package binconfig
 
diff --git a/recipes/apr/apr_1.3.3.bb b/recipes/apr/apr_1.3.3.bb
index 5862e40dc8..3a49235842 100644
--- a/recipes/apr/apr_1.3.3.bb
+++ b/recipes/apr/apr_1.3.3.bb
@@ -5,9 +5,9 @@ LICENSE = "Apache License, Version 2.0"
 PR = "r4"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
-           file://configure_fixes.patch;patch=1 \
-	   file://cleanup.patch;patch=1 \
-           file://configfix.patch;patch=1"
+           file://configure_fixes.patch \
+	   file://cleanup.patch \
+           file://configfix.patch"
 
 inherit autotools lib_package binconfig
 
diff --git a/recipes/apr/apr_1.3.5.bb b/recipes/apr/apr_1.3.5.bb
index 11b9147fe4..a8362e4165 100644
--- a/recipes/apr/apr_1.3.5.bb
+++ b/recipes/apr/apr_1.3.5.bb
@@ -5,9 +5,9 @@ LICENSE = "Apache License, Version 2.0"
 PR = "r4"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2;name=apr135tarbz2 \
-           file://configure_fixes.patch;patch=1 \
-#	   file://cleanup.patch;patch=1 \
-           file://configfix.patch;patch=1"
+           file://configure_fixes.patch \
+#	   file://cleanup.patch \
+           file://configfix.patch"
 
 inherit autotools lib_package binconfig
 
diff --git a/recipes/apt/apt-native.inc b/recipes/apt/apt-native.inc
index 4e4771a9cd..90f3ec5b53 100644
--- a/recipes/apt/apt-native.inc
+++ b/recipes/apt/apt-native.inc
@@ -6,7 +6,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}"
 PACKAGES = ""
 USE_NLS = "yes"
 
-SRC_URI += "file://db_linking_hack.patch;patch=1"
+SRC_URI += "file://db_linking_hack.patch"
 
 python do_stage () {
 	bb.build.exec_func('do_stage_base', d)
diff --git a/recipes/apt/apt-native_0.6.46.2.bb b/recipes/apt/apt-native_0.6.46.2.bb
index a0d4660bda..4d9a8875c7 100644
--- a/recipes/apt/apt-native_0.6.46.2.bb
+++ b/recipes/apt/apt-native_0.6.46.2.bb
@@ -1,8 +1,8 @@
 require apt-native.inc
 PR = "r3"
 
-SRC_URI += "file://nodoc.patch;patch=1 \
-            file://noconfigure.patch;patch=1"
+SRC_URI += "file://nodoc.patch \
+            file://noconfigure.patch"
 
 SRC_URI[md5sum] = "67d439a252996357b0313b3ad999739a"
 SRC_URI[sha256sum] = "6f1a7340d0de2a9a524055d0ed4289aa919dc29e9e1fe60aae598f2019105686"
diff --git a/recipes/apt/apt-native_0.7.14.bb b/recipes/apt/apt-native_0.7.14.bb
index 38a75eb1f7..0482e6616c 100644
--- a/recipes/apt/apt-native_0.7.14.bb
+++ b/recipes/apt/apt-native_0.7.14.bb
@@ -1,9 +1,9 @@
 require apt-native.inc
 PR = "r3"
 
-SRC_URI += "file://nodoc.patch;patch=1 \
-            file://noconfigure.patch;patch=1 \
-	    file://no-curl.patch;patch=1"
+SRC_URI += "file://nodoc.patch \
+            file://noconfigure.patch \
+	    file://no-curl.patch"
 
 SRC_URI[md5sum] = "19efa18fb1ef20c58b9b44e94258b814"
 SRC_URI[sha256sum] = "8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045"
diff --git a/recipes/apt/apt-native_0.7.19.bb b/recipes/apt/apt-native_0.7.19.bb
index 3331c93d15..decec465ad 100644
--- a/recipes/apt/apt-native_0.7.19.bb
+++ b/recipes/apt/apt-native_0.7.19.bb
@@ -1,9 +1,9 @@
 require apt-native.inc
 PR = "r3"
 
-SRC_URI += "file://nodoc.patch;patch=1 \
-            file://noconfigure.patch;patch=1 \
-	    file://no-curl.patch;patch=1"
+SRC_URI += "file://nodoc.patch \
+            file://noconfigure.patch \
+	    file://no-curl.patch"
 
 SRC_URI[md5sum] = "0ef50176aea36cb0cce633a9b62dc7eb"
 SRC_URI[sha256sum] = "c928f5eb2baffb50e7ccf02d07a16daf867945c8aa542d500bbbbaff7bbcef42"
diff --git a/recipes/apt/apt-native_0.7.2.bb b/recipes/apt/apt-native_0.7.2.bb
index 1d85762c22..a7278ff77f 100644
--- a/recipes/apt/apt-native_0.7.2.bb
+++ b/recipes/apt/apt-native_0.7.2.bb
@@ -1,8 +1,8 @@
 require apt-native.inc
 PR = "r4"
 
-SRC_URI += "file://nodoc.patch;patch=1 \
-            file://noconfigure.patch;patch=1"
+SRC_URI += "file://nodoc.patch \
+            file://noconfigure.patch"
 
 SRC_URI[md5sum] = "c66f943203fa24e85ed8c48f6ac5ad1e"
 SRC_URI[sha256sum] = "e7d58e2b202713b4df8cd5fd58bc20ba8d31c0da6e5e3b3c89a138dbf0b24ad9"
diff --git a/recipes/apt/apt-native_0.7.20.2.bb b/recipes/apt/apt-native_0.7.20.2.bb
index 955edc8314..a6d5277c32 100644
--- a/recipes/apt/apt-native_0.7.20.2.bb
+++ b/recipes/apt/apt-native_0.7.20.2.bb
@@ -1,9 +1,9 @@
 require apt-native.inc
 PR = "r1"
 
-SRC_URI += "file://nodoc.patch;patch=1 \
-            file://noconfigure.patch;patch=1 \
-	    file://no-curl.patch;patch=1"
+SRC_URI += "file://nodoc.patch \
+            file://noconfigure.patch \
+	    file://no-curl.patch"
 
 SRC_URI[md5sum] = "e6ee1b594f6ed5fab5cb593ee46cfc21"
 SRC_URI[sha256sum] = "4dc935a520c65705795ada5942b658f6e86b22eefc7032342267272bd6566b05"
diff --git a/recipes/apt/apt-native_0.7.3.bb b/recipes/apt/apt-native_0.7.3.bb
index 0647707ccf..8c3f21d99d 100644
--- a/recipes/apt/apt-native_0.7.3.bb
+++ b/recipes/apt/apt-native_0.7.3.bb
@@ -1,8 +1,8 @@
 require apt-native.inc
 PR = "r5"
 
-SRC_URI += "file://nodoc.patch;patch=1 \
-            file://noconfigure.patch;patch=1"
+SRC_URI += "file://nodoc.patch \
+            file://noconfigure.patch"
 
 SRC_URI[md5sum] = "e2e6e23f43bfdf135b923205659dfaf1"
 SRC_URI[sha256sum] = "d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710"
diff --git a/recipes/apt/apt_0.5.28.6.bb b/recipes/apt/apt_0.5.28.6.bb
index 5e3f7c7c5e..e3157bbc4e 100644
--- a/recipes/apt/apt_0.5.28.6.bb
+++ b/recipes/apt/apt_0.5.28.6.bb
@@ -1,7 +1,7 @@
 require apt.inc
 PR = "r2"
 
-SRC_URI += "file://autofoo.patch;patch=1"
+SRC_URI += "file://autofoo.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/apt/apt_0.6.25.bb b/recipes/apt/apt_0.6.25.bb
index e75f5588ac..dab59a9f08 100644
--- a/recipes/apt/apt_0.6.25.bb
+++ b/recipes/apt/apt_0.6.25.bb
@@ -1,7 +1,7 @@
 require apt.inc
 PR = "r3"
 
-SRC_URI += "file://autofoo.patch;patch=1"
+SRC_URI += "file://autofoo.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/apt/apt_0.6.46.2.bb b/recipes/apt/apt_0.6.46.2.bb
index 8273c160f2..5aeb03716f 100644
--- a/recipes/apt/apt_0.6.46.2.bb
+++ b/recipes/apt/apt_0.6.46.2.bb
@@ -1,7 +1,7 @@
 require apt.inc
 PR = "r2"
 
-SRC_URI += "file://nodoc.patch;patch=1"
+SRC_URI += "file://nodoc.patch"
 
 require apt-package.inc
 
diff --git a/recipes/apt/apt_0.7.14.bb b/recipes/apt/apt_0.7.14.bb
index 5b121b0df6..84a4e12256 100644
--- a/recipes/apt/apt_0.7.14.bb
+++ b/recipes/apt/apt_0.7.14.bb
@@ -3,11 +3,11 @@ RDEPENDS = "dpkg"
 
 require apt.inc
 
-SRC_URI += "file://no-ko-translation.patch;patch=1 \
-            file://use-host.patch;patch=1 "
+SRC_URI += "file://no-ko-translation.patch \
+            file://use-host.patch "
 PR = "r3"
 
-SRC_URI += "file://nodoc.patch;patch=1"
+SRC_URI += "file://nodoc.patch"
 
 require apt-package.inc
 
diff --git a/recipes/apt/apt_0.7.19.bb b/recipes/apt/apt_0.7.19.bb
index 15f127dbbe..ab84f0d279 100644
--- a/recipes/apt/apt_0.7.19.bb
+++ b/recipes/apt/apt_0.7.19.bb
@@ -3,11 +3,11 @@ RDEPENDS = "dpkg"
 
 require apt.inc
 
-SRC_URI += "file://no-ko-translation.patch;patch=1 \
-            file://use-host.patch;patch=1 "
+SRC_URI += "file://no-ko-translation.patch \
+            file://use-host.patch "
 PR = "r3"
 
-SRC_URI += "file://nodoc.patch;patch=1"
+SRC_URI += "file://nodoc.patch"
 
 require apt-package.inc
 
diff --git a/recipes/apt/apt_0.7.2.bb b/recipes/apt/apt_0.7.2.bb
index 5db2cb9b86..c38414948f 100644
--- a/recipes/apt/apt_0.7.2.bb
+++ b/recipes/apt/apt_0.7.2.bb
@@ -1,7 +1,7 @@
 require apt.inc
 PR = "r3"
 
-SRC_URI += "file://nodoc.patch;patch=1"
+SRC_URI += "file://nodoc.patch"
 
 require apt-package.inc
 
diff --git a/recipes/apt/apt_0.7.20.2.bb b/recipes/apt/apt_0.7.20.2.bb
index ee247fabeb..09dbbc44a9 100644
--- a/recipes/apt/apt_0.7.20.2.bb
+++ b/recipes/apt/apt_0.7.20.2.bb
@@ -3,9 +3,9 @@ RDEPENDS = "dpkg"
 
 require apt.inc
 
-SRC_URI += "file://no-doxygen.patch;patch=1 \
-            file://no-ko-translation.patch;patch=1 \
-            file://use-host.patch;patch=1 "
+SRC_URI += "file://no-doxygen.patch \
+            file://no-ko-translation.patch \
+            file://use-host.patch "
 PR = "r1"
 
 require apt-package.inc
diff --git a/recipes/apt/apt_0.7.3.bb b/recipes/apt/apt_0.7.3.bb
index 4e8bbe765b..0752d4a15f 100644
--- a/recipes/apt/apt_0.7.3.bb
+++ b/recipes/apt/apt_0.7.3.bb
@@ -1,7 +1,7 @@
 require apt.inc
 PR = "r3"
 
-SRC_URI += "file://nodoc.patch;patch=1"
+SRC_URI += "file://nodoc.patch"
 
 require apt-package.inc
 
diff --git a/recipes/ark3116/ark3116_0.4.1.bb b/recipes/ark3116/ark3116_0.4.1.bb
index 11f6335f00..8c110d7fbb 100644
--- a/recipes/ark3116/ark3116_0.4.1.bb
+++ b/recipes/ark3116/ark3116_0.4.1.bb
@@ -10,8 +10,8 @@ PR = "r2"
 RRECOMMENDS = "kernel-module-usbserial"
 
 SRC_URI = "http://avr.auctionant.de/ark3116_linux_driver/releases/ark3116-0.4.1.tgz \
-           file://ark3116.c.patch;patch=1 \
-           file://Makefile.patch;patch=1"
+           file://ark3116.c.patch \
+           file://Makefile.patch"
 
 S = "${WORKDIR}/ark3116"
 
diff --git a/recipes/arptables/arptables_0.0.3-4.bb b/recipes/arptables/arptables_0.0.3-4.bb
index ccf3e6d39d..17012b1b99 100644
--- a/recipes/arptables/arptables_0.0.3-4.bb
+++ b/recipes/arptables/arptables_0.0.3-4.bb
@@ -5,8 +5,8 @@ SECTION = "console/network"
 
 SRC_URI = " \
 	${SOURCEFORGE_MIRROR}/ebtables/arptables-v${PV}.tar.gz;name=arptables \
-	file://arptables-compile-install.patch;patch=1 \
-	file://arptables-init-busybox.patch;patch=1 \
+	file://arptables-compile-install.patch \
+	file://arptables-init-busybox.patch \
 	"
 SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5"
 SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928"
diff --git a/recipes/arpwatch/arpwatch_2.1a15.bb b/recipes/arpwatch/arpwatch_2.1a15.bb
index 9dc104e9aa..34f3ca9f80 100644
--- a/recipes/arpwatch/arpwatch_2.1a15.bb
+++ b/recipes/arpwatch/arpwatch_2.1a15.bb
@@ -6,13 +6,13 @@ RRECOMMENDS = "arpwatch-data"
 PR = "r2"
 
 SRC_URI = "ftp://ftp.ee.lbl.gov/arpwatch-${PV}.tar.gz \
-           file://05debian_fhs.patch;patch=1 \
-           file://06debian_manpages.patch;patch=1 \
+           file://05debian_fhs.patch \
+           file://06debian_manpages.patch \
            file://init.d \
            file://arpwatch.default \
            file://arpwatch.conf \
            file://ethercodes.dat \
-           file://make.patch;patch=1 \
+           file://make.patch \
            file://volatiles.08_arpwatch"
 
 inherit autotools update-rc.d
diff --git a/recipes/asleap/asleap_2.1.bb b/recipes/asleap/asleap_2.1.bb
index 64c778eaf6..a832b02639 100644
--- a/recipes/asleap/asleap_2.1.bb
+++ b/recipes/asleap/asleap_2.1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "libpcap openssl"
 
 SRC_URI = "http://802.11ninja.net/~jwright/code/${PN}-${PV}.tgz \
-           file://if.h.patch;patch=1 \
+           file://if.h.patch \
            "
 
 S = "${WORKDIR}/${PN}-${PV}"
diff --git a/recipes/aspell/aspell_0.60.5.bb b/recipes/aspell/aspell_0.60.5.bb
index 662a06fbd6..bc9c027d9c 100644
--- a/recipes/aspell/aspell_0.60.5.bb
+++ b/recipes/aspell/aspell_0.60.5.bb
@@ -14,9 +14,5 @@ FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir
 
 inherit autotools
 
-do_stage() {
-	autotools_stage_all
-}
-
 SRC_URI[md5sum] = "17fd8acac6293336bcef44391b71e337"
 SRC_URI[sha256sum] = "ee9e81d2e3e66b01ad91da736e48568ed8acd6dfb6b664d904066ecc5ea4e84b"
diff --git a/recipes/aspell/aspell_0.60.6.bb b/recipes/aspell/aspell_0.60.6.bb
index dc9e4f7362..3711846e21 100644
--- a/recipes/aspell/aspell_0.60.6.bb
+++ b/recipes/aspell/aspell_0.60.6.bb
@@ -12,11 +12,7 @@ FILES_${PN} = "${bindir}/aspell"
 FILES_libpspell = "${libdir}/libpspell.so.*"
 FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell"
 
-inherit autotools
-
-do_stage() {
-	autotools_stage_all
-}
+inherit autotools gettext
 
 SRC_URI[md5sum] = "bc80f0198773d5c05086522be67334eb"
 SRC_URI[sha256sum] = "4f5b1520e26cf6bbb1b5ca8a2f9f22948c3ca38ac4c2dd9e02df042fee7c0e36"
diff --git a/recipes/asterisk/asterisk_1.2.24.bb b/recipes/asterisk/asterisk_1.2.24.bb
index ab1a17c16c..891d569a45 100644
--- a/recipes/asterisk/asterisk_1.2.24.bb
+++ b/recipes/asterisk/asterisk_1.2.24.bb
@@ -8,11 +8,11 @@ SECTION = "console/telephony"
 PR = "r1"
 
 SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz \
-	 file://uclibc-compat-getloadavg.patch;patch=1 \
-	 file://uclibc-dns.patch;patch=1 \
-#         file://uclibc-define-glob.patch;patch=1 \
-         file://asterisk.patch;patch=1 \
-         file://enable-speex.patch;patch=1"
+	 file://uclibc-compat-getloadavg.patch \
+	 file://uclibc-dns.patch \
+#         file://uclibc-define-glob.patch \
+         file://asterisk.patch \
+         file://enable-speex.patch"
 
 S = "${WORKDIR}/asterisk-${PV}"
 
diff --git a/recipes/asterisk/asterisk_1.2.28.bb b/recipes/asterisk/asterisk_1.2.28.bb
index a79d81b694..89e6a95acf 100644
--- a/recipes/asterisk/asterisk_1.2.28.bb
+++ b/recipes/asterisk/asterisk_1.2.28.bb
@@ -8,10 +8,10 @@ SECTION = "console/telephony"
 PR = "r1"
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
-	 file://uclibc-compat-getloadavg.patch;patch=1 \
-	 file://uclibc-dns.patch;patch=1 \
-         file://asterisk.patch;patch=1 \
-         file://enable-speex.patch;patch=1"
+	 file://uclibc-compat-getloadavg.patch \
+	 file://uclibc-dns.patch \
+         file://asterisk.patch \
+         file://enable-speex.patch"
 
 S = "${WORKDIR}/asterisk-${PV}"
 
diff --git a/recipes/asterisk/asterisk_1.4.17.bb b/recipes/asterisk/asterisk_1.4.17.bb
index 95a0be6b69..97a111ee5c 100644
--- a/recipes/asterisk/asterisk_1.4.17.bb
+++ b/recipes/asterisk/asterisk_1.4.17.bb
@@ -12,8 +12,8 @@ PR = "r1"
 
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
-	file://sounds.xml.patch;patch=1\
-	file://Makefile.patch;patch=1\
+	file://sounds.xml.patch\
+	file://Makefile.patch\
 	file://logrotate \
 	file://volatiles \
 	file://init"
diff --git a/recipes/asterisk/asterisk_1.4.19.1.bb b/recipes/asterisk/asterisk_1.4.19.1.bb
index 7fe3c99942..481fe84ef6 100644
--- a/recipes/asterisk/asterisk_1.4.19.1.bb
+++ b/recipes/asterisk/asterisk_1.4.19.1.bb
@@ -11,8 +11,8 @@ PR = "r2"
 
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
-	file://sounds.xml.patch;patch=1\
-	file://Makefile.patch;patch=1\
+	file://sounds.xml.patch\
+	file://Makefile.patch\
 	file://logrotate \
 	file://volatiles \
 	file://init"
diff --git a/recipes/asterisk/asterisk_1.4.23.1.bb b/recipes/asterisk/asterisk_1.4.23.1.bb
index 5af2c25e82..0b7ae7949b 100644
--- a/recipes/asterisk/asterisk_1.4.23.1.bb
+++ b/recipes/asterisk/asterisk_1.4.23.1.bb
@@ -9,8 +9,8 @@ DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
 #RRECOMMENDS_${PN} = "logrotate"
 
 SRC_URI="http://downloads.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
-#	file://sounds.xml.patch;patch=1 \
-	file://Makefile.patch;patch=1 \
+#	file://sounds.xml.patch \
+	file://Makefile.patch \
 	file://logrotate \
 	file://volatiles \
 	file://init"
diff --git a/recipes/asterisk/asterisk_1.6.0-beta8.bb b/recipes/asterisk/asterisk_1.6.0-beta8.bb
index fa8d894468..db9e784f09 100644
--- a/recipes/asterisk/asterisk_1.6.0-beta8.bb
+++ b/recipes/asterisk/asterisk_1.6.0-beta8.bb
@@ -15,8 +15,8 @@ DEFAULT_PREFERENCE = "-1"
 
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
-	file://sounds.xml.patch;patch=1\
-	file://Makefile.patch;patch=1\
+	file://sounds.xml.patch\
+	file://Makefile.patch\
 	file://logrotate \
 	file://volatiles \
 	file://init"
diff --git a/recipes/at/at_3.1.8.bb b/recipes/at/at_3.1.8.bb
index d66666f709..e6aaba4522 100644
--- a/recipes/at/at_3.1.8.bb
+++ b/recipes/at/at_3.1.8.bb
@@ -8,8 +8,8 @@ RREPLACES = "atd"
 PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}-11.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://nonrootinstall.patch;patch=1"
+	   file://configure.patch \
+	   file://nonrootinstall.patch"
 
 inherit autotools
 
diff --git a/recipes/at76c503a/at76c503a-modules_0.17.bb b/recipes/at76c503a/at76c503a-modules_0.17.bb
index 570db3a33a..e22204215b 100644
--- a/recipes/at76c503a/at76c503a-modules_0.17.bb
+++ b/recipes/at76c503a/at76c503a-modules_0.17.bb
@@ -8,7 +8,7 @@ RDEPENDS = "at76c503-firmware"
 
 SRC_URI = "http://download.berlios.de/at76c503a/at76_usb-0.17.tar.gz"
 SRC_URI_ixp4xx = "http://download.berlios.de/at76c503a/at76_usb-0.17.tar.gz \
-                  file://at76_usb-0.17-.patch;patch=1"
+                  file://at76_usb-0.17-.patch"
 S = "${WORKDIR}/at76_usb-${PV}/"
 
 inherit module
diff --git a/recipes/at76c503a/at76c503a-modules_cvs.bb b/recipes/at76c503a/at76c503a-modules_cvs.bb
index 870fe0b047..9559a04cf7 100644
--- a/recipes/at76c503a/at76c503a-modules_cvs.bb
+++ b/recipes/at76c503a/at76c503a-modules_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 LICENSE = "GPL"
 SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \
-	   file://makefile.cc.patch;patch=1"
+	   file://makefile.cc.patch"
 S = "${WORKDIR}/at76c503a"
 PR = "r4"
 SRCDATE = "20060814"
diff --git a/recipes/at91bootstrap/at91bootstrap_2.11.bb b/recipes/at91bootstrap/at91bootstrap_2.11.bb
index 3be54d4598..dfe524fe9e 100644
--- a/recipes/at91bootstrap/at91bootstrap_2.11.bb
+++ b/recipes/at91bootstrap/at91bootstrap_2.11.bb
@@ -3,7 +3,7 @@ PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_afeb9260 = "1"
 DEFAULT_PREFERENCE_afeb9260-180 = "1"
-SRC_URI += "file://0001-AFEB9260-support-thumb-support.patch;patch=1"
+SRC_URI += "file://0001-AFEB9260-support-thumb-support.patch"
 
 
 SRC_URI[md5sum] = "8962bd639d189e1d3328b6c056d96099"
diff --git a/recipes/at91bootstrap/at91bootstrap_2.4.bb b/recipes/at91bootstrap/at91bootstrap_2.4.bb
index 3d2831a8b4..d39ebf8dd0 100644
--- a/recipes/at91bootstrap/at91bootstrap_2.4.bb
+++ b/recipes/at91bootstrap/at91bootstrap_2.4.bb
@@ -1,10 +1,10 @@
 require at91bootstrap.inc
 SRC_URI = "ftp://www.at91.com/pub/buildroot/${PN}-${PV}.tar.bz2 \
            "
-SRC_URI_append_afeb9260 = " file://0001-Generic-code-changes.patch;patch=1 \
-           file://0002-Making-image-directly-flashable.patch;patch=1 \
-           file://0003-AFEB9260-board-support.patch;patch=1 \
-           file://0004-AFEB9260-133-board-support.patch;patch=1"
+SRC_URI_append_afeb9260 = " file://0001-Generic-code-changes.patch \
+           file://0002-Making-image-directly-flashable.patch \
+           file://0003-AFEB9260-board-support.patch \
+           file://0004-AFEB9260-133-board-support.patch"
 
 PR = "r5"
 
diff --git a/recipes/atd/atd_0.70.bb b/recipes/atd/atd_0.70.bb
index 7f2193daca..5ffb3869f3 100644
--- a/recipes/atd/atd_0.70.bb
+++ b/recipes/atd/atd_0.70.bb
@@ -7,7 +7,7 @@ RREPLACES = "at"
 PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \
-			file://atd-startup.patch;patch=1;pnum=0"
+			file://atd-startup.patch;striplevel=0"
 S = "${WORKDIR}/atd"
 
 inherit update-rc.d
diff --git a/recipes/atftp/atftp_0.7.bb b/recipes/atftp/atftp_0.7.bb
index 51c645bf30..e62480a5b0 100644
--- a/recipes/atftp/atftp_0.7.bb
+++ b/recipes/atftp/atftp_0.7.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r6"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.orig.tar.gz;name=archive \
-	   ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-6.diff.gz;patch=1;name=patch \
+	   ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-6.diff.gz;name=patch \
 	   file://atftpd.init"
 S = "${WORKDIR}/atftp-${PV}"
 
diff --git a/recipes/audiofile/audiofile_0.2.6.bb b/recipes/audiofile/audiofile_0.2.6.bb
index b290e26ebc..b142aaf728 100644
--- a/recipes/audiofile/audiofile_0.2.6.bb
+++ b/recipes/audiofile/audiofile_0.2.6.bb
@@ -8,10 +8,10 @@ RPROVIDES_${PN} += "audiofile"
 PR = "r8"
 
 SRC_URI = "http://www.68k.org/~michael/audiofile/audiofile-${PV}.tar.gz \
-	   file://audiofile-m4_quote_fix.diff;patch=1;pnum=0 \
-	   file://audiofile-oldstyle.patch;patch=1;pnum=0 \
-	   file://audiofile-0.2.6.patch;patch=1;pnum=0 \
-	   file://CVE-2008-5824.patch;patch=1 \
+	   file://audiofile-m4_quote_fix.diff;striplevel=0 \
+	   file://audiofile-oldstyle.patch;striplevel=0 \
+	   file://audiofile-0.2.6.patch;striplevel=0 \
+	   file://CVE-2008-5824.patch \
 "
 
 inherit autotools_stage lib_package binconfig
diff --git a/recipes/aumix/aumix_2.8.bb b/recipes/aumix/aumix_2.8.bb
index d08532e2fa..3599d0d4d5 100644
--- a/recipes/aumix/aumix_2.8.bb
+++ b/recipes/aumix/aumix_2.8.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLV2"
 DEPENDS = "ncurses"
 
 SRC_URI = "http://jpj.net/~trevor/aumix/aumix-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc
index 17602858cb..35b0289a26 100644
--- a/recipes/autoconf/autoconf.inc
+++ b/recipes/autoconf/autoconf.inc
@@ -11,7 +11,7 @@ RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"
 INC_PR = "r9"
 
 SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2;name=autoconf \
-	   file://program_prefix.patch;patch=1"
+	   file://program_prefix.patch"
 
 inherit autotools
 
diff --git a/recipes/autoconf/autoconf_2.59.bb b/recipes/autoconf/autoconf_2.59.bb
index 8212ff4ace..13a2f1deef 100644
--- a/recipes/autoconf/autoconf_2.59.bb
+++ b/recipes/autoconf/autoconf_2.59.bb
@@ -2,15 +2,15 @@ require autoconf.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://autoreconf-include.patch;patch=1 \
-	   file://autoreconf-exclude.patch;patch=1 \
-	   file://autoreconf-foreign.patch;patch=1 \
-	   file://autoreconf-gnuconfigize.patch;patch=1 \
-	   file://autoconf259-update-configscripts.patch;patch=1 \
-	   file://autoheader-nonfatal-warnings.patch;patch=1 \
-	   file://sizeof_types.patch;patch=1 \
-	   file://autoconf-x.patch;patch=1 \
-	   file://autoconf-sh.patch;patch=1"
+SRC_URI += "file://autoreconf-include.patch \
+	   file://autoreconf-exclude.patch \
+	   file://autoreconf-foreign.patch \
+	   file://autoreconf-gnuconfigize.patch \
+	   file://autoconf259-update-configscripts.patch \
+	   file://autoheader-nonfatal-warnings.patch \
+	   file://sizeof_types.patch \
+	   file://autoconf-x.patch \
+	   file://autoconf-sh.patch"
 
 SRC_URI[autoconf.md5sum] = "1ee40f7a676b3cfdc0e3f7cd81551b5f"
 SRC_URI[autoconf.sha256sum] = "f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7"
diff --git a/recipes/autoconf/autoconf_2.61.bb b/recipes/autoconf/autoconf_2.61.bb
index 423571f72e..9542e21da5 100644
--- a/recipes/autoconf/autoconf_2.61.bb
+++ b/recipes/autoconf/autoconf_2.61.bb
@@ -2,16 +2,16 @@ require autoconf.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://autoreconf-include.patch;patch=1 \
-	   file://autoreconf-exclude.patch;patch=1 \
-	   file://autoreconf-foreign.patch;patch=1 \
-	   file://autoreconf-gnuconfigize.patch;patch=1 \
-	   file://autoheader-nonfatal-warnings.patch;patch=1 \
-	   file://config-site.patch;patch=1 \
-	   file://autoconf-dont-execute-perl.patch;patch=1 \
+SRC_URI += "file://autoreconf-include.patch \
+	   file://autoreconf-exclude.patch \
+	   file://autoreconf-foreign.patch \
+	   file://autoreconf-gnuconfigize.patch \
+	   file://autoheader-nonfatal-warnings.patch \
+	   file://config-site.patch \
+	   file://autoconf-dont-execute-perl.patch \
 	   "
 
-SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1"
+SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch"
 
 SRC_URI[autoconf.md5sum] = "36d3fe706ad0950f1be10c46a429efe0"
 SRC_URI[autoconf.sha256sum] = "93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1"
diff --git a/recipes/autoconf/autoconf_2.63.bb b/recipes/autoconf/autoconf_2.63.bb
index ea0bebd237..41b33766c8 100644
--- a/recipes/autoconf/autoconf_2.63.bb
+++ b/recipes/autoconf/autoconf_2.63.bb
@@ -4,13 +4,13 @@ PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI += "file://autoreconf-exclude.patch;patch=1 \
-	    file://autoreconf-foreign.patch;patch=1 \
-	    file://autoheader-nonfatal-warnings.patch;patch=1 \
-	    file://autoreconf-gnuconfigize.patch;patch=1 \
-	    file://config-site.patch;patch=1"
+SRC_URI += "file://autoreconf-exclude.patch \
+	    file://autoreconf-foreign.patch \
+	    file://autoheader-nonfatal-warnings.patch \
+	    file://autoreconf-gnuconfigize.patch \
+	    file://config-site.patch"
 
-SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1"
+SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch"
 
 SRC_URI[autoconf.md5sum] = "7565809ed801bb5726da0631ceab3699"
 SRC_URI[autoconf.sha256sum] = "264d7c1c0e268bc77fbe0f308e085545535edfe73f33e27c80219cc0c9c71246"
diff --git a/recipes/autoconf/autoconf_2.65.bb b/recipes/autoconf/autoconf_2.65.bb
index c2a9223cba..d0bc9d4375 100644
--- a/recipes/autoconf/autoconf_2.65.bb
+++ b/recipes/autoconf/autoconf_2.65.bb
@@ -2,13 +2,13 @@ require autoconf.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://autoreconf-exclude.patch;patch=1 \
-	    file://autoreconf-foreign.patch;patch=1 \
-	    file://autoheader-nonfatal-warnings.patch;patch=1 \
-	    file://autoreconf-gnuconfigize.patch;patch=1 \
-	    file://config-site.patch;patch=1"
+SRC_URI += "file://autoreconf-exclude.patch \
+	    file://autoreconf-foreign.patch \
+	    file://autoheader-nonfatal-warnings.patch \
+	    file://autoreconf-gnuconfigize.patch \
+	    file://config-site.patch"
 
-SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1"
+SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch"
 
 SRC_URI[autoconf.md5sum] = "a6de1cc6434cd64038b0a0ae4e252b33"
 SRC_URI[autoconf.sha256sum] = "db11944057f3faf229ff5d6ce3fcd819f565455c152b72cec17ebc1cbb80136b"
diff --git a/recipes/autofs/autofs_4.1.4.bb b/recipes/autofs/autofs_4.1.4.bb
index f7a5de6133..1a658b6df5 100644
--- a/recipes/autofs/autofs_4.1.4.bb
+++ b/recipes/autofs/autofs_4.1.4.bb
@@ -1,15 +1,15 @@
 require autofs.inc
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2;name=archive \
-           ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1;name=patch1 \
-           ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch;patch=1;name=patch2 \
-           ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-non-replicated-ping.patch;patch=1;name=patch3 \
-           file://cross.patch;patch=1 \
-           file://Makefile.rules-cross.patch;patch=1 \
-	   file://install.patch;patch=1 \
-	   file://auto.net-sort-option-fix.patch;patch=1 \
-	   file://autofs-additional-distros.patch;patch=1 \
-	   file://no-bash.patch;patch=1"
+           ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;name=patch1 \
+           ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch;name=patch2 \
+           ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-non-replicated-ping.patch;name=patch3 \
+           file://cross.patch \
+           file://Makefile.rules-cross.patch \
+	   file://install.patch \
+	   file://auto.net-sort-option-fix.patch \
+	   file://autofs-additional-distros.patch \
+	   file://no-bash.patch"
 PR = "${INC_PR}"
 
 inherit update-rc.d
diff --git a/recipes/automake/automake_1.11.1.bb b/recipes/automake/automake_1.11.1.bb
index 4b46787368..74477e7b95 100644
--- a/recipes/automake/automake_1.11.1.bb
+++ b/recipes/automake/automake_1.11.1.bb
@@ -1,7 +1,5 @@
 require automake.inc
 PR = "${INC_PR}.0"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI[automake.md5sum] = "c2972c4d9b3e29c03d5f2af86249876f"
 SRC_URI[automake.sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae"
diff --git a/recipes/avahi/avahi-python_0.6.21.bb b/recipes/avahi/avahi-python_0.6.21.bb
index 5a7270ed7d..982f69164c 100644
--- a/recipes/avahi/avahi-python_0.6.21.bb
+++ b/recipes/avahi/avahi-python_0.6.21.bb
@@ -8,8 +8,8 @@ FILES_avahi-discover = ""
 PROVIDES = "avahi"
 DEPENDS += "python-native"
 
-SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1 \
-            file://configure-check-pymod.patch;patch=1"
+SRC_URI += "file://dbus-pre-1.1.1-support.patch \
+            file://configure-check-pymod.patch"
 S = "${WORKDIR}/avahi-${PV}"
 
 RDEPENDS_avahi-discover = "python-avahi python-pygtk"
diff --git a/recipes/avahi/avahi-python_0.6.25.bb b/recipes/avahi/avahi-python_0.6.25.bb
index 8ea46e1dd6..53327a794a 100644
--- a/recipes/avahi/avahi-python_0.6.25.bb
+++ b/recipes/avahi/avahi-python_0.6.25.bb
@@ -8,7 +8,7 @@ FILES_avahi-discover = ""
 PROVIDES = "avahi"
 DEPENDS += "python-native"
 
-SRC_URI += "file://configure-check-pymod.patch;patch=1"
+SRC_URI += "file://configure-check-pymod.patch"
 
 S = "${WORKDIR}/avahi-${PV}"
 
diff --git a/recipes/avahi/avahi-ui_0.6.21.bb b/recipes/avahi/avahi-ui_0.6.21.bb
index 62bcb8111b..3cef5aed0e 100644
--- a/recipes/avahi/avahi-ui_0.6.21.bb
+++ b/recipes/avahi/avahi-ui_0.6.21.bb
@@ -4,7 +4,7 @@ PR = "r8"
 
 DEPENDS += "avahi gtk+"
 
-SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
+SRC_URI += "file://dbus-pre-1.1.1-support.patch"
 AVAHI_GTK = "--enable-gtk"
 
 S = "${WORKDIR}/avahi-${PV}"
diff --git a/recipes/avahi/avahi_0.6.21.bb b/recipes/avahi/avahi_0.6.21.bb
index 20d7802bf5..175d19f011 100644
--- a/recipes/avahi/avahi_0.6.21.bb
+++ b/recipes/avahi/avahi_0.6.21.bb
@@ -2,8 +2,8 @@ require avahi.inc
 
 PR = "r10"
 
-SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
-SRC_URI += "file://avr32-ipv6-fix.patch;patch=1"
+SRC_URI += "file://dbus-pre-1.1.1-support.patch"
+SRC_URI += "file://avr32-ipv6-fix.patch"
 
 SRC_URI[md5sum] = "9cc68f79c50c9dd9e419990c3c9b05b9"
 SRC_URI[sha256sum] = "d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561"
diff --git a/recipes/avahi/mango-lassi_git.bb b/recipes/avahi/mango-lassi_git.bb
index b0131d3136..c2250d8781 100644
--- a/recipes/avahi/mango-lassi_git.bb
+++ b/recipes/avahi/mango-lassi_git.bb
@@ -2,8 +2,7 @@ ESCRIPTION = "Input sharing, the avahi way"
 DEPENDS = "avahi-ui libglade libnotify"
 
 SRCREV = "73638817126a68d62f1233f6e6859ce75a259e93"
-PV = "0.0+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+${PR}+gitr${SRCREV}"
 PR = "r1"
 
 SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http"
diff --git a/recipes/avr-evtd/avr-evtd_1.7.2.bb b/recipes/avr-evtd/avr-evtd_1.7.2.bb
index d52ef5dd7e..abfcac4312 100644
--- a/recipes/avr-evtd/avr-evtd_1.7.2.bb
+++ b/recipes/avr-evtd/avr-evtd_1.7.2.bb
@@ -5,7 +5,7 @@ PR = "r1"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ppc-evtd/avr_evtd_${PV}.release.tar.gz \
-	   file://dont-ignore-config.patch;patch=1 \
+	   file://dont-ignore-config.patch \
 	   file://avr_evtd.conf \
 	   file://EventScript \
 	   file://init"
diff --git a/recipes/avr-libc/avr-libc_1.0.3.bb b/recipes/avr-libc/avr-libc_1.0.3.bb
index 20a2850958..052425b36b 100644
--- a/recipes/avr-libc/avr-libc_1.0.3.bb
+++ b/recipes/avr-libc/avr-libc_1.0.3.bb
@@ -12,7 +12,7 @@ python __anonymous () {
 }
 
 SRC_URI = "http://savannah.nongnu.org/download/avr-libc/avr-libc-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 B = "${WORKDIR}/build.${BUILD_SYS}.${TARGET_SYS}"
 
 inherit autotools
diff --git a/recipes/avrdude/avrdude.inc b/recipes/avrdude/avrdude.inc
new file mode 100644
index 0000000000..679c4ba992
--- /dev/null
+++ b/recipes/avrdude/avrdude.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "AVRDUDE is software for programming Atmel AVR Microcontrollers."
+HOMEPAGE = "http://www.nongnu.org/avrdude/"
+SECTION = "console"
+LICENSE = "GPLv2"
+
+DEPENDS = "virtual/libusb0 ncurses"
+
+SRC_URI = "http://savannah.nongnu.org/download/avrdude/avrdude-${PV}.tar.gz"
+
+inherit autotools
+
diff --git a/recipes/avrdude/avrdude_5.10.bb b/recipes/avrdude/avrdude_5.10.bb
new file mode 100644
index 0000000000..95899d97a0
--- /dev/null
+++ b/recipes/avrdude/avrdude_5.10.bb
@@ -0,0 +1,4 @@
+require avrdude.inc
+
+SRC_URI[md5sum] = "69b082683047e054348088fd63bad2ff"
+SRC_URI[sha256sum] = "81501b63d5b8699874d00c9eca42837b85695bc0820ba9843b17f573ce38be5e"
diff --git a/recipes/bacula/bacula-client_1.38.11.bb b/recipes/bacula/bacula-client_1.38.11.bb
index bf24b9d502..0b663af385 100644
--- a/recipes/bacula/bacula-client_1.38.11.bb
+++ b/recipes/bacula/bacula-client_1.38.11.bb
@@ -7,7 +7,7 @@ PR ="r1"
 DEPENDS = "gmp openssl zlib readline"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/bacula/bacula-1.38.11.tar.gz \
-           file://findlib-attribs.patch;patch=1;pnum=1 \
+           file://findlib-attribs.patch \
            file://bacula-fd.init"
 
 S = "${WORKDIR}/bacula-1.38.11"
diff --git a/recipes/balsa/balsa_2.0.17.bb b/recipes/balsa/balsa_2.0.17.bb
index 6537806903..16b303ac49 100644
--- a/recipes/balsa/balsa_2.0.17.bb
+++ b/recipes/balsa/balsa_2.0.17.bb
@@ -8,8 +8,8 @@ RDEPENDS = "gdk-pixbuf-loader-xpm"
 PR = "r3"
 
 SRC_URI = "http://talinux.fi.tal.org/pub/talinux/sources/balsa-${PV}.tar.bz2 \
-	   file://libmutt-cross.patch;patch=1 \
-	   file://desktop-file-fix.patch;patch=1"
+	   file://libmutt-cross.patch \
+	   file://desktop-file-fix.patch"
 
 inherit autotools
 
diff --git a/recipes/balsa/balsa_2.4.2.bb b/recipes/balsa/balsa_2.4.2.bb
index fb6f71072f..4b4f57cdaf 100644
--- a/recipes/balsa/balsa_2.4.2.bb
+++ b/recipes/balsa/balsa_2.4.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://pawsa.fedorapeople.org/balsa/"
 SECTION = "x11/network"
 LICENSE = "GPL"
 SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2 \
-	   file://libbalsa-gpe-corruption.patch;patch=1"
+	   file://libbalsa-gpe-corruption.patch"
 PR = "r1"
 
 DEPENDS = "glib-2.0 gmime gnome-icon-theme gtk+ intltool-native libesmtp libxml-parser-perl-native"
diff --git a/recipes/base-files/base-files/shr/profile b/recipes/base-files/base-files/shr/profile
index e39a8f1a63..05e8490fd8 100644
--- a/recipes/base-files/base-files/shr/profile
+++ b/recipes/base-files/base-files/shr/profile
@@ -35,15 +35,15 @@ umask 022
 alias pico=nano
 alias fso='cd /local/pkg/fso'
 alias ipkg='opkg'
-export PS1="\[\033[01;32m\]\u@\h\[\033[01;34m\] \w $\[\033[00m\] "
-if [ "$DISPLAY" = "" ]
-then
+export PS1="\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \\$\[\033[00m\] "
+if [ "$DISPLAY" = "" ] ; then
     export DISPLAY=localhost:0
 fi
+if [ "$HOME" = "" -o "$HOME" = "/" ] ; then
+    export HOME=/home/root
+fi
 export HISTFILESIZE=1000
 export HISTSIZE=1000
 alias rm='rm -i'; alias cp='cp -i'; alias mv='mv -i'
 alias la='ls  -ltrA'; alias lh='ls  -ltrh'; alias lr='ls  -ltr';
 alias lR='ls  -ltrR'
-# set your locale here:
-export LANG=en_US.UTF-8
diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb
index 8f1de11c7b..9801f8ae8c 100644
--- a/recipes/base-files/base-files_3.0.14.bb
+++ b/recipes/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r91"
+PR = "r94"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/recipes/base-passwd/base-passwd_3.5.20.bb b/recipes/base-passwd/base-passwd_3.5.20.bb
index e3b08c2752..6e9c51b98f 100644
--- a/recipes/base-passwd/base-passwd_3.5.20.bb
+++ b/recipes/base-passwd/base-passwd_3.5.20.bb
@@ -5,9 +5,9 @@ PR = "r1"
 
 SRC_URI = "\
   ${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
-  file://nobash.patch;patch=1 \
-  file://root-home.patch;patch=1 \
-  file://mysql.patch;patch=1 \
+  file://nobash.patch \
+  file://root-home.patch \
+  file://mysql.patch \
 "
 S = "${WORKDIR}/base-passwd"
 
diff --git a/recipes/bash/bash_3.0.bb b/recipes/bash/bash_3.0.bb
index 2382b11c72..bdbbb83a5d 100644
--- a/recipes/bash/bash_3.0.bb
+++ b/recipes/bash/bash_3.0.bb
@@ -2,9 +2,9 @@ require bash.inc
 PR = "r12"
 
 SRC_URI += "\
-  file://bash-3.0-fixes.patch;patch=1 \
-  file://default_path.patch;patch=1 \
-  file://signames-mipsel.diff;patch=1 \
+  file://bash-3.0-fixes.patch \
+  file://default_path.patch \
+  file://signames-mipsel.diff \
 "
 
 SRC_URI[archive.md5sum] = "26c4d642e29b3533d8d754995bc277b3"
diff --git a/recipes/bash/bash_3.2.bb b/recipes/bash/bash_3.2.bb
index bf8b46294c..178f195d35 100644
--- a/recipes/bash/bash_3.2.bb
+++ b/recipes/bash/bash_3.2.bb
@@ -3,47 +3,47 @@ require bash.inc
 PR = "r8"
 
 SRC_URI += "\
-           file://builtins.patch;patch=1 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001;patch=1;pnum=0;name=bash32-01 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002;patch=1;pnum=0;name=bash32-02 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003;patch=1;pnum=0;name=bash32-03 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-004;patch=1;pnum=0;name=bash32-04 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-005;patch=1;pnum=0;name=bash32-05 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-006;patch=1;pnum=0;name=bash32-06 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-007;patch=1;pnum=0;name=bash32-07 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-008;patch=1;pnum=0;name=bash32-08 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-009;patch=1;pnum=0;name=bash32-09 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-010;patch=1;pnum=0;name=bash32-10 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-011;patch=1;pnum=0;name=bash32-11 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-012;patch=1;pnum=0;name=bash32-12 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-013;patch=1;pnum=0;name=bash32-13 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-014;patch=1;pnum=0;name=bash32-14 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-015;patch=1;pnum=0;name=bash32-15 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-016;patch=1;pnum=0;name=bash32-16 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-017;patch=1;pnum=0;name=bash32-17 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-018;patch=1;pnum=0;name=bash32-18 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-019;patch=1;pnum=0;name=bash32-19 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-020;patch=1;pnum=0;name=bash32-20 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-021;patch=1;pnum=0;name=bash32-21 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-022;patch=1;pnum=0;name=bash32-22 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-023;patch=1;pnum=0;name=bash32-23 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-024;patch=1;pnum=0;name=bash32-24 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-025;patch=1;pnum=0;name=bash32-25 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-026;patch=1;pnum=0;name=bash32-26 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-027;patch=1;pnum=0;name=bash32-27 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-028;patch=1;pnum=0;name=bash32-28 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-029;patch=1;pnum=0;name=bash32-29 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-030;patch=1;pnum=0;name=bash32-30 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-031;patch=1;pnum=0;name=bash32-31 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-032;patch=1;pnum=0;name=bash32-32 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-033;patch=1;pnum=0;name=bash32-33 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-034;patch=1;pnum=0;name=bash32-34 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-035;patch=1;pnum=0;name=bash32-35 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-036;patch=1;pnum=0;name=bash32-36 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-037;patch=1;pnum=0;name=bash32-37 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-038;patch=1;pnum=0;name=bash32-38 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-039;patch=1;pnum=0;name=bash32-39 \
-           file://default_path.patch;patch=1 \
+           file://builtins.patch \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001;apply=yes;striplevel=0;name=bash32-01 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002;apply=yes;striplevel=0;name=bash32-02 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003;apply=yes;striplevel=0;name=bash32-03 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-004;apply=yes;striplevel=0;name=bash32-04 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-005;apply=yes;striplevel=0;name=bash32-05 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-006;apply=yes;striplevel=0;name=bash32-06 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-007;apply=yes;striplevel=0;name=bash32-07 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-008;apply=yes;striplevel=0;name=bash32-08 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-009;apply=yes;striplevel=0;name=bash32-09 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-010;apply=yes;striplevel=0;name=bash32-10 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-011;apply=yes;striplevel=0;name=bash32-11 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-012;apply=yes;striplevel=0;name=bash32-12 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-013;apply=yes;striplevel=0;name=bash32-13 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-014;apply=yes;striplevel=0;name=bash32-14 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-015;apply=yes;striplevel=0;name=bash32-15 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-016;apply=yes;striplevel=0;name=bash32-16 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-017;apply=yes;striplevel=0;name=bash32-17 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-018;apply=yes;striplevel=0;name=bash32-18 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-019;apply=yes;striplevel=0;name=bash32-19 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-020;apply=yes;striplevel=0;name=bash32-20 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-021;apply=yes;striplevel=0;name=bash32-21 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-022;apply=yes;striplevel=0;name=bash32-22 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-023;apply=yes;striplevel=0;name=bash32-23 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-024;apply=yes;striplevel=0;name=bash32-24 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-025;apply=yes;striplevel=0;name=bash32-25 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-026;apply=yes;striplevel=0;name=bash32-26 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-027;apply=yes;striplevel=0;name=bash32-27 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-028;apply=yes;striplevel=0;name=bash32-28 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-029;apply=yes;striplevel=0;name=bash32-29 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-030;apply=yes;striplevel=0;name=bash32-30 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-031;apply=yes;striplevel=0;name=bash32-31 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-032;apply=yes;striplevel=0;name=bash32-32 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-033;apply=yes;striplevel=0;name=bash32-33 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-034;apply=yes;striplevel=0;name=bash32-34 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-035;apply=yes;striplevel=0;name=bash32-35 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-036;apply=yes;striplevel=0;name=bash32-36 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-037;apply=yes;striplevel=0;name=bash32-37 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-038;apply=yes;striplevel=0;name=bash32-38 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-039;apply=yes;striplevel=0;name=bash32-39 \
+           file://default_path.patch \
            "
 
 SRC_URI[archive.md5sum] = "00bfa16d58e034e3c2aa27f390390d30"
diff --git a/recipes/batmand/batmand.inc b/recipes/batmand/batmand.inc
index cb99cf0d74..625241f5d0 100644
--- a/recipes/batmand/batmand.inc
+++ b/recipes/batmand/batmand.inc
@@ -9,7 +9,7 @@ INC_PR = "r1"
 RDEPENDS = "kernel-module-tun"
 
 SRC_URI = "http://downloads.open-mesh.net/batman/stable/sources/batman/batman-${PV}.tar.gz \
-           file://makefile-fix.patch;patch=1 \
+           file://makefile-fix.patch \
           "
 
 S = "${WORKDIR}/batman-${PV}"
diff --git a/recipes/bazaar/bazaar_1.2.bb b/recipes/bazaar/bazaar_1.2.bb
index d07300275a..e7ead5424f 100644
--- a/recipes/bazaar/bazaar_1.2.bb
+++ b/recipes/bazaar/bazaar_1.2.bb
@@ -18,8 +18,8 @@ RDEPENDS_${PN} += "patch"
 RSUGGESTS_${PN} += "gnupg"
 
 SRC_URI = "http://bazaar.canonical.com/releases/src/bazaar_${PV}.tar.gz \
-	   file://no_archive_format_guess_msg.patch;patch=1 \
-	   file://import_dirarg.patch;patch=1"
+	   file://no_archive_format_guess_msg.patch \
+	   file://import_dirarg.patch"
 
 S = "${WORKDIR}/thelove@canonical.com---dists--bazaar--1.2"
 B = "${WORKDIR}/build-${HOST_SYS}"
diff --git a/recipes/bb/bb_1.2.bb b/recipes/bb/bb_1.2.bb
index 23cae91f44..fa94d13a51 100644
--- a/recipes/bb/bb_1.2.bb
+++ b/recipes/bb/bb_1.2.bb
@@ -6,7 +6,7 @@ DEPENDS = "aalib"
 PR = "r1"
 
 SRC_URI = "http://prdownloads.sourceforge.net/aa-project/bb-1.2.tar.gz \
-           file://fix-compile.patch;patch=1"
+           file://fix-compile.patch"
 
 inherit autotools
 
diff --git a/recipes/beecrypt/beecrypt_3.1.0.bb b/recipes/beecrypt/beecrypt_3.1.0.bb
index 8205f7c3b4..c23a999818 100644
--- a/recipes/beecrypt/beecrypt_3.1.0.bb
+++ b/recipes/beecrypt/beecrypt_3.1.0.bb
@@ -5,7 +5,7 @@
 DESCRIPTION="Beecrypt is a general-purpose cryptography library."
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
 SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
-         file://x64fix.patch;patch=1"
+         file://x64fix.patch"
 
 PR = "r4"
 
diff --git a/recipes/beep/beep_1.2.2.bb b/recipes/beep/beep_1.2.2.bb
index e0ddfd972e..79a52c02eb 100644
--- a/recipes/beep/beep_1.2.2.bb
+++ b/recipes/beep/beep_1.2.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r3"
 
 SRC_URI  = "http://johnath.com/beep/beep-${PV}.tar.gz"
-SRC_URI += "file://linux-input.patch;patch=1"
+SRC_URI += "file://linux-input.patch"
 
 S = "${WORKDIR}/beep-${PV}"
 
diff --git a/recipes/beepmp/beepmp_0.9.7.bb b/recipes/beepmp/beepmp_0.9.7.bb
index 4db6072fb9..0c9e471b4d 100644
--- a/recipes/beepmp/beepmp_0.9.7.bb
+++ b/recipes/beepmp/beepmp_0.9.7.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://beepmp.sourceforge.net"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/beepmp/bmp-${PV}.tar.gz \
-	   file://gnusource.patch;patch=1"
+	   file://gnusource.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/billiardz/billiardz_0.1.4.bb b/recipes/billiardz/billiardz_0.1.4.bb
index 2b3c058dad..f8af48789d 100644
--- a/recipes/billiardz/billiardz_0.1.4.bb
+++ b/recipes/billiardz/billiardz_0.1.4.bb
@@ -7,7 +7,7 @@ DEPENDS = "libsdl-qpe libsdl-image"
 PR = "r2"
 
 SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz \
-           file://gcc4.patch;patch=1"
+           file://gcc4.patch"
 
 SRC_URI[md5sum] = "21908ae1ee9e3cb96e9dda6f096ed13f"
 SRC_URI[sha256sum] = "23b70f94a987af6be23108a772b927a2c02060c6137b9589484e28b55c2bdebd"
diff --git a/recipes/bind/bind_9.3.1.bb b/recipes/bind/bind_9.3.1.bb
index 35b5fcd7c5..33b1de28e3 100644
--- a/recipes/bind/bind_9.3.1.bb
+++ b/recipes/bind/bind_9.3.1.bb
@@ -4,9 +4,9 @@ DESCRIPTION = "ISC Internet Domain Name Server"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.1/bind-9.3.1.tar.gz \
-           file://lib_dns_Makefile.in.patch;patch=1 \
-	   file://configure.in.patch;patch=1 \
-	   file://conf.patch;patch=1 \
+           file://lib_dns_Makefile.in.patch \
+	   file://configure.in.patch \
+	   file://conf.patch \
 	   "
 
 EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr"
diff --git a/recipes/bind/bind_9.3.4-P1.bb b/recipes/bind/bind_9.3.4-P1.bb
index 87d660698d..45bf608fb3 100644
--- a/recipes/bind/bind_9.3.4-P1.bb
+++ b/recipes/bind/bind_9.3.4-P1.bb
@@ -7,9 +7,9 @@ PR = "r0"
 DEPENDS = "openssl"
 
 SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.4-P1/bind-9.3.4-P1.tar.gz \
-	   file://conf.patch;patch=1 \
-	   file://configure.in.patch;patch=1 \
-	   file://so_bsdcompat.patch;patch=1 \
+	   file://conf.patch \
+	   file://configure.in.patch \
+	   file://so_bsdcompat.patch \
 	   "
 
 EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr"
diff --git a/recipes/bind/bind_9.3.5-P1.bb b/recipes/bind/bind_9.3.5-P1.bb
index ce53add5ea..d105dfc859 100644
--- a/recipes/bind/bind_9.3.5-P1.bb
+++ b/recipes/bind/bind_9.3.5-P1.bb
@@ -7,9 +7,9 @@ PR = "r0"
 DEPENDS = "openssl"
 
 SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.5-P1/bind-9.3.5-P1.tar.gz \
-	   file://conf.patch;patch=1 \
-	   file://configure.in.patch;patch=1 \
-	   file://so_bsdcompat.patch;patch=1 \
+	   file://conf.patch \
+	   file://configure.in.patch \
+	   file://so_bsdcompat.patch \
 	   "
 
 EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr"
diff --git a/recipes/bind/bind_9.3.6.bb b/recipes/bind/bind_9.3.6.bb
index 5b5d3197c3..0965f72a11 100644
--- a/recipes/bind/bind_9.3.6.bb
+++ b/recipes/bind/bind_9.3.6.bb
@@ -7,8 +7,8 @@ PR = "r0"
 DEPENDS = "openssl"
 
 SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${PN}-${PV}.tar.gz \
-	   file://conf.patch;patch=1 \
-	   file://configure.in.patch;patch=1 \
+	   file://conf.patch \
+	   file://configure.in.patch \
 	   "
 
 EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr --disable-devpoll --disable-epoll"
diff --git a/recipes/binutils/binutils-cross-sdk_cvs.bb b/recipes/binutils/binutils-cross-sdk_cvs.bb
index b01afc4070..ebaa0c9b22 100644
--- a/recipes/binutils/binutils-cross-sdk_cvs.bb
+++ b/recipes/binutils/binutils-cross-sdk_cvs.bb
@@ -1,4 +1,33 @@
 require binutils_cvs.bb
 require binutils-cross-sdk.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 FILESPATHPKG .= ":binutils-cvs"
+
+do_install () {
+        oe_runmake 'DESTDIR=${D}' install-ld install-binutils install-gas
+
+        # We don't really need these, so we'll remove them...
+        rm -rf ${D}${libdir}/ldscripts
+
+        # Fix the /usr/${TARGET_SYS}/bin/* links
+        for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
+                rm -f $l
+                ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+                        | tr -s / \
+                        | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+        done
+
+        # Install the libiberty header
+        install -d ${D}${includedir}
+        install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+        install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+
+        cd ${D}${bindir}
+
+        # Symlinks for ease of running these on the native target
+        for p in ${TARGET_SYS}-* ; do
+                ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+        done
+
+        rm ${D}${bindir}/ar ${D}${bindir}/strings
+}
diff --git a/recipes/binutils/binutils-cross.inc b/recipes/binutils/binutils-cross.inc
index 5808c1fbda..bd22c92e16 100644
--- a/recipes/binutils/binutils-cross.inc
+++ b/recipes/binutils/binutils-cross.inc
@@ -8,22 +8,22 @@ EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
 		--enable-install-libbfd \
                 --disable-werror"
 
-do_stage () {
-	oe_runmake install
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
 
 	# We don't really need these, so we'll remove them...
-	rm -rf ${CROSS_DIR}/lib/ldscripts
-	rm -rf ${CROSS_DIR}/share/info
-	rm -rf ${CROSS_DIR}/share/locale
-	rm -rf ${CROSS_DIR}/share/man
-	rmdir ${CROSS_DIR}/share || :
-	rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
-	rmdir ${CROSS_DIR}/${libdir}64/gcc-lib || :
-	rmdir ${CROSS_DIR}/${libdir} || :
-	rmdir ${CROSS_DIR}/${libdir}64 || :
-	rmdir ${CROSS_DIR}/${prefix} || :
+	rm -rf ${D}${CROSS_DIR}/lib/ldscripts
+	rm -rf ${D}${CROSS_DIR}/share/info
+	rm -rf ${D}${CROSS_DIR}/share/locale
+	rm -rf ${D}${CROSS_DIR}/share/man
+	rmdir ${D}${CROSS_DIR}/share || :
+	rmdir ${D}${CROSS_DIR}/${libdir}/gcc-lib || :
+	rmdir ${D}${CROSS_DIR}/${libdir}64/gcc-lib || :
+	rmdir ${D}${CROSS_DIR}/${libdir} || :
+	rmdir ${D}${CROSS_DIR}/${libdir}64 || :
+	rmdir ${D}${CROSS_DIR}/${prefix} || :
 }
 
-do_install () {
-	:
+do_stage () {
+	use_do_install_for_stage
 }
diff --git a/recipes/binutils/binutils.inc b/recipes/binutils/binutils.inc
index 49d3aeaa3c..ee44a5d7d6 100644
--- a/recipes/binutils/binutils.inc
+++ b/recipes/binutils/binutils.inc
@@ -76,24 +76,12 @@ do_configure () {
 #
 # must prime config.cache to ensure the build of libiberty
 #
-        mkdir -p ${B}/build-${BUILD_SYS}
+	mkdir -p ${B}/build-${BUILD_SYS}
 	for i in ${CONFIG_SITE}; do
-	    cat $i >> ${B}/build-${BUILD_SYS}/config.cache
+		cat $i >> ${B}/build-${BUILD_SYS}/config.cache
 	done
 }
 
-do_stage () {
-	oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
-	oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
-	oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
-	install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
-}
-
 do_install () {
 	autotools_do_install
 
diff --git a/recipes/binutils/binutils_2.14.90.0.6.bb b/recipes/binutils/binutils_2.14.90.0.6.bb
index 34c2c30244..c539a9f9ec 100644
--- a/recipes/binutils/binutils_2.14.90.0.6.bb
+++ b/recipes/binutils/binutils_2.14.90.0.6.bb
@@ -41,15 +41,15 @@ FILES_${PN}-symlinks = " \
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://ld_makefile.patch;patch=1 \
-     file://better_file_error.patch;patch=1 \
-     file://signed_char_fix.patch;patch=1 \
-     file://binutils-uclibc-001-debian.patch;patch=1 \
-     file://binutils-uclibc-100-conf.patch;patch=1 \
-     file://binutils-uclibc-200-build_modules.patch;patch=1 \
-     file://binutils-uclibc-210-cflags.patch;patch=1 \
-     file://binutils-100_cflags_for_build.patch;patch=1 \
-     file://plt32trunc.patch;patch=1"
+     file://ld_makefile.patch \
+     file://better_file_error.patch \
+     file://signed_char_fix.patch \
+     file://binutils-uclibc-001-debian.patch \
+     file://binutils-uclibc-100-conf.patch \
+     file://binutils-uclibc-200-build_modules.patch \
+     file://binutils-uclibc-210-cflags.patch \
+     file://binutils-100_cflags_for_build.patch \
+     file://plt32trunc.patch"
 
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/recipes/binutils/binutils_2.14.90.0.7.bb b/recipes/binutils/binutils_2.14.90.0.7.bb
index 9af6fd43bf..4f5a56080d 100644
--- a/recipes/binutils/binutils_2.14.90.0.7.bb
+++ b/recipes/binutils/binutils_2.14.90.0.7.bb
@@ -40,17 +40,17 @@ FILES_${PN}-symlinks = " \
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://ld_makefile.patch;patch=1 \
-     file://better_file_error.patch;patch=1 \
-     file://signed_char_fix.patch;patch=1 \
-     file://binutils-uclibc-001-debian.patch;patch=1 \
-     file://binutils-uclibc-100-conf.patch;patch=1 \
-     file://binutils-uclibc-200-build_modules.patch;patch=1 \
-     file://binutils-uclibc-210-cflags.patch;patch=1 \
-     file://binutils-100_cflags_for_build.patch;patch=1 \
-     file://plt32trunc.patch;patch=1 \
-     file://600-arm-textrel.patch;patch=1 \
-     file://binutils-2.14.90.0.7-fix-broken-configure.patch;patch=1"
+     file://ld_makefile.patch \
+     file://better_file_error.patch \
+     file://signed_char_fix.patch \
+     file://binutils-uclibc-001-debian.patch \
+     file://binutils-uclibc-100-conf.patch \
+     file://binutils-uclibc-200-build_modules.patch \
+     file://binutils-uclibc-210-cflags.patch \
+     file://binutils-100_cflags_for_build.patch \
+     file://plt32trunc.patch \
+     file://600-arm-textrel.patch \
+     file://binutils-2.14.90.0.7-fix-broken-configure.patch"
 
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/recipes/binutils/binutils_2.15.94.0.1.bb b/recipes/binutils/binutils_2.15.94.0.1.bb
index fc2249b433..91cf368cfb 100644
--- a/recipes/binutils/binutils_2.15.94.0.1.bb
+++ b/recipes/binutils/binutils_2.15.94.0.1.bb
@@ -39,14 +39,14 @@ FILES_${PN}-symlinks = " \
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://ld_makefile.patch;patch=1 \
-     file://better_file_error.patch;patch=1 \
-     file://signed_char_fix.patch;patch=1 \
-     file://objdump_fix.patch;patch=1 \
-     file://binutils-100_cflags_for_build.patch;patch=1 \
-     file://binutils-2.15.91.0.1-uclibc-100-conf.patch;patch=1 \
-     file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1 \
-     file://binutils-2.15-allow-gcc-4.0.patch;patch=1"
+     file://ld_makefile.patch \
+     file://better_file_error.patch \
+     file://signed_char_fix.patch \
+     file://objdump_fix.patch \
+     file://binutils-100_cflags_for_build.patch \
+     file://binutils-2.15.91.0.1-uclibc-100-conf.patch \
+     file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch \
+     file://binutils-2.15-allow-gcc-4.0.patch"
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
diff --git a/recipes/binutils/binutils_2.16.1.bb b/recipes/binutils/binutils_2.16.1.bb
index 861a8350a7..688856c1aa 100644
--- a/recipes/binutils/binutils_2.16.1.bb
+++ b/recipes/binutils/binutils_2.16.1.bb
@@ -3,13 +3,13 @@ PR = "r1"
 CROSSTOOL_PATCH_URL = "http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/"
 SRC_URI = \
     "${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2;name=archive \
-     ${CROSSTOOL_PATCH_URL}bfd-hash-tweak.patch;patch=1;name=patch1 \
-     ${CROSSTOOL_PATCH_URL}binutils-2.15-psignal.patch;patch=1;name=patch2 \
-     ${CROSSTOOL_PATCH_URL}binutils-skip-comments.patch;patch=1;name=patch3 \
-     ${CROSSTOOL_PATCH_URL}callahan.patch;patch=1;name=patch4 \
-     ${CROSSTOOL_PATCH_URL}cross-gprof.patch;patch=1;name=patch5 \
-     ${CROSSTOOL_PATCH_URL}stabs-tweak.patch;patch=1;name=patch6 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1"
+     ${CROSSTOOL_PATCH_URL}bfd-hash-tweak.patch;name=patch1 \
+     ${CROSSTOOL_PATCH_URL}binutils-2.15-psignal.patch;name=patch2 \
+     ${CROSSTOOL_PATCH_URL}binutils-skip-comments.patch;name=patch3 \
+     ${CROSSTOOL_PATCH_URL}callahan.patch;name=patch4 \
+     ${CROSSTOOL_PATCH_URL}cross-gprof.patch;name=patch5 \
+     ${CROSSTOOL_PATCH_URL}stabs-tweak.patch;name=patch6 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch"
 
 
 require binutils.inc
diff --git a/recipes/binutils/binutils_2.16.91.0.6.bb b/recipes/binutils/binutils_2.16.91.0.6.bb
index 28a2c52214..cbaa4a5cd9 100644
--- a/recipes/binutils/binutils_2.16.91.0.6.bb
+++ b/recipes/binutils/binutils_2.16.91.0.6.bb
@@ -44,13 +44,13 @@ FILES_${PN}-symlinks = " \
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \
-     file://binutils-uclibc-702-binutils-skip-comments.patch;patch=1"
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch \
+     file://binutils-uclibc-702-binutils-skip-comments.patch"
 
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/recipes/binutils/binutils_2.16.91.0.7.bb b/recipes/binutils/binutils_2.16.91.0.7.bb
index 662c2f4960..369dd0a943 100644
--- a/recipes/binutils/binutils_2.16.91.0.7.bb
+++ b/recipes/binutils/binutils_2.16.91.0.7.bb
@@ -40,13 +40,13 @@ FILES_${PN}-symlinks = " \
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \
-     file://binutils-uclibc-702-binutils-skip-comments.patch;patch=1"
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch \
+     file://binutils-uclibc-702-binutils-skip-comments.patch"
 
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/recipes/binutils/binutils_2.16.bb b/recipes/binutils/binutils_2.16.bb
index 3f1ad085ff..c8aa2de392 100644
--- a/recipes/binutils/binutils_2.16.bb
+++ b/recipes/binutils/binutils_2.16.bb
@@ -2,21 +2,21 @@ PR = "r10"
 
 SRC_URI = \
     "${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
-     file://ld_makefile.patch;patch=1 \
-     file://better_file_error.patch;patch=1 \
-     file://signed_char_fix.patch;patch=1 \
-     file://binutils-2.16-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-100_cflags_for_build.patch;patch=1"
+     file://ld_makefile.patch \
+     file://better_file_error.patch \
+     file://signed_char_fix.patch \
+     file://binutils-2.16-objcopy-rename-errorcode.patch \
+     file://binutils-100_cflags_for_build.patch"
 
 # uclibc patches
-SRC_URI += "file://binutils-2.16-linux-uclibc.patch;patch=1"
+SRC_URI += "file://binutils-2.16-linux-uclibc.patch"
 
 # arm thumb support patches
-SRC_URI += "file://binutils-2.16-thumb-trampoline.patch;patch=1"
-SRC_URI += "file://binutils-2.16-thumb-glue.patch;patch=1"
+SRC_URI += "file://binutils-2.16-thumb-trampoline.patch"
+SRC_URI += "file://binutils-2.16-thumb-glue.patch"
 
 # powerpc patches
-SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+SRC_URI += "file://binutils-2.16.1-e300c2c3.patch"
 
 require binutils.inc
 
diff --git a/recipes/binutils/binutils_2.17.50.0.1.bb b/recipes/binutils/binutils_2.17.50.0.1.bb
index 4c3a1987c2..d1074311c8 100644
--- a/recipes/binutils/binutils_2.17.50.0.1.bb
+++ b/recipes/binutils/binutils_2.17.50.0.1.bb
@@ -39,13 +39,13 @@ FILES_${PN}-symlinks = " \
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \
-     file://binutils-uclibc-702-binutils-skip-comments.patch;patch=1"
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch \
+     file://binutils-uclibc-702-binutils-skip-comments.patch"
 
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/recipes/binutils/binutils_2.17.50.0.12.bb b/recipes/binutils/binutils_2.17.50.0.12.bb
index f49fa7e4b6..0d2ce9f357 100644
--- a/recipes/binutils/binutils_2.17.50.0.12.bb
+++ b/recipes/binutils/binutils_2.17.50.0.12.bb
@@ -4,12 +4,12 @@ PR = "${INC_PR}.1"
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
      "
 
 SRC_URI[md5sum] = "6f3e83399b965d70008860f697c50ec2"
diff --git a/recipes/binutils/binutils_2.17.50.0.5.bb b/recipes/binutils/binutils_2.17.50.0.5.bb
index 6ca6cbaff5..9a4950d798 100644
--- a/recipes/binutils/binutils_2.17.50.0.5.bb
+++ b/recipes/binutils/binutils_2.17.50.0.5.bb
@@ -4,13 +4,13 @@ PR = "r3"
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://binutils-configure-texinfo-version.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://binutils-configure-texinfo-version.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
      "
 
 SRC_URI[md5sum] = "00eccd47e19a9f24410a137a849aa3fc"
diff --git a/recipes/binutils/binutils_2.17.50.0.8.bb b/recipes/binutils/binutils_2.17.50.0.8.bb
index 4ece61c792..e8a6ebe749 100644
--- a/recipes/binutils/binutils_2.17.50.0.8.bb
+++ b/recipes/binutils/binutils_2.17.50.0.8.bb
@@ -4,13 +4,13 @@ PR = "r2"
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://binutils-configure-texinfo-version.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://binutils-configure-texinfo-version.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
      "
 
 SRC_URI[md5sum] = "1441fe6fa44b344d0575cb66d3f89252"
diff --git a/recipes/binutils/binutils_2.17.bb b/recipes/binutils/binutils_2.17.bb
index bab0f01cc1..1ffa61d121 100644
--- a/recipes/binutils/binutils_2.17.bb
+++ b/recipes/binutils/binutils_2.17.bb
@@ -6,31 +6,31 @@ PR = "${INC_PR}.1"
 
 SRC_URI = \
     "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
-     file://better_file_error.patch;patch=1 \
-     file://signed_char_fix.patch;patch=1 \
+     file://better_file_error.patch \
+     file://signed_char_fix.patch \
 "
 
 #patches from http://svn.uclibc.org/cgi-bin/viewcvs.cgi/trunk/buildroot/toolchain/binutils/2.17/
 
 SRC_URI += "\
-	file://100-uclibc-conf.patch;patch=1 \
-	file://300-006_better_file_error.patch;patch=1 \
-	file://702-binutils-skip-comments.patch;patch=1 \
-	file://110-arm-eabi-conf.patch;patch=1 \
-	file://300-012_check_ldrunpath_length.patch;patch=1 \
-	file://300-001_ld_makefile_patch.patch;patch=1 \
-	file://400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \
+	file://100-uclibc-conf.patch \
+	file://300-006_better_file_error.patch \
+	file://702-binutils-skip-comments.patch \
+	file://110-arm-eabi-conf.patch \
+	file://300-012_check_ldrunpath_length.patch \
+	file://300-001_ld_makefile_patch.patch \
+	file://400-mips-ELF_MAXPAGESIZE-4K.patch \
 "
 # removed in favor of the atmel 1.2.6 patch which is supposedly newer (yes)
-#        file://500-avr32-atmel.1.3.0.patch;patch=1 \
-#        file://501-avr32-fix-pool-alignment.patch;patch=1 \
+#        file://500-avr32-atmel.1.3.0.patch \
+#        file://501-avr32-fix-pool-alignment.patch \
 
 SRC_URI_append_avr32 = "\
-        file://binutils-2.17.atmel.1.2.6.patch.bz2;patch=1 \
+        file://binutils-2.17.atmel.1.2.6.patch.bz2 \
 "
 
 # Zecke's OSX fixes
-SRC_URI += " file://warning-free.patch;patch=1 "
+SRC_URI += " file://warning-free.patch "
 
 SRC_URI[md5sum] = "e26e2e06b6e4bf3acf1dc8688a94c0d1"
 SRC_URI[sha256sum] = "e2c33ce6f23c9a366f109ced295626cb2f8bd6b2f08ff9df6dafb5448505a25e"
diff --git a/recipes/binutils/binutils_2.18.50.0.7.bb b/recipes/binutils/binutils_2.18.50.0.7.bb
index c9b0d6d709..f9bb77acb8 100644
--- a/recipes/binutils/binutils_2.18.50.0.7.bb
+++ b/recipes/binutils/binutils_2.18.50.0.7.bb
@@ -6,19 +6,19 @@ LICENSE = "GPLv3"
 
 SRC_URI = "\
      ${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
-     file://binutils-arm-pr7093.patch;patch=1 \
-     file://binutils-x86_64_i386_biarch.patch;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-gas-needs-libm.patch \
+     file://binutils-arm-pr7093.patch \
+     file://binutils-x86_64_i386_biarch.patch \
      "
 
 # powerpc patches
-SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+SRC_URI += "file://binutils-2.16.1-e300c2c3.patch"
 
 
 SRC_URI[md5sum] = "d5bce238060d631be60a3f1f1009a7ba"
diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb
index c7931ccdb7..aab634bd84 100644
--- a/recipes/binutils/binutils_2.18.bb
+++ b/recipes/binutils/binutils_2.18.bb
@@ -6,27 +6,27 @@ LICENSE = "GPLv3"
 
 SRC_URI = "\
      ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-configure-texinfo-version.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
-     file://binutils-x86_64_i386_biarch.patch;patch=1 \
-     file://binutils-section-in-segment.patch;patch=1;pnum=0 \
-     file://parse-neon-vmov.diff;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-configure-texinfo-version.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-gas-needs-libm.patch \
+     file://binutils-x86_64_i386_biarch.patch \
+     file://binutils-section-in-segment.patch;striplevel=0 \
+     file://parse-neon-vmov.diff \
      "
 
 # powerpc patches
 SRC_URI += "\
-     file://binutils-2.16.1-e300c2c3.patch;patch=1 \
-     file://binutils-powerpc-ld-segfault.patch;patch=1 \
+     file://binutils-2.16.1-e300c2c3.patch \
+     file://binutils-powerpc-ld-segfault.patch \
      "
 
 # ep93xx crunch patches
-SRC_URI_append_ep9312 = " file://binutils-crunch.patch;patch=1"
+SRC_URI_append_ep9312 = " file://binutils-crunch.patch"
 
 SRC_URI[md5sum] = "9d22ee4dafa3a194457caf4706f9cf01"
 SRC_URI[sha256sum] = "487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b"
diff --git a/recipes/binutils/binutils_2.19.1.bb b/recipes/binutils/binutils_2.19.1.bb
index 4a0126eb0e..68ac7c5741 100644
--- a/recipes/binutils/binutils_2.19.1.bb
+++ b/recipes/binutils/binutils_2.19.1.bb
@@ -6,19 +6,19 @@ LICENSE = "GPLv3"
 
 SRC_URI = "\
      ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
-     file://binutils-arm-pr7093.patch;patch=1 \
-     file://binutils-x86_64_i386_biarch.patch;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-gas-needs-libm.patch \
+     file://binutils-arm-pr7093.patch \
+     file://binutils-x86_64_i386_biarch.patch \
      "
 
 # powerpc patches
-SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+SRC_URI += "file://binutils-2.16.1-e300c2c3.patch"
 
 
 SRC_URI[md5sum] = "09a8c5821a2dfdbb20665bc0bd680791"
diff --git a/recipes/binutils/binutils_2.19.51.0.3.bb b/recipes/binutils/binutils_2.19.51.0.3.bb
index f667997ab4..dea4551af7 100644
--- a/recipes/binutils/binutils_2.19.51.0.3.bb
+++ b/recipes/binutils/binutils_2.19.51.0.3.bb
@@ -6,19 +6,19 @@ LICENSE = "GPLv3"
 
 SRC_URI = "\
      ${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
-     file://binutils-arm-pr7093.patch;patch=1 \
-     file://binutils-x86_64_i386_biarch.patch;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-gas-needs-libm.patch \
+     file://binutils-arm-pr7093.patch \
+     file://binutils-x86_64_i386_biarch.patch \
      "
 
 # powerpc patches
-SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+SRC_URI += "file://binutils-2.16.1-e300c2c3.patch"
 
 
 SRC_URI[md5sum] = "c55a2b1eadf818d38e963060412fadca"
diff --git a/recipes/binutils/binutils_2.19.51.bb b/recipes/binutils/binutils_2.19.51.bb
index aa53573743..0ebcb33cb8 100644
--- a/recipes/binutils/binutils_2.19.51.bb
+++ b/recipes/binutils/binutils_2.19.51.bb
@@ -5,19 +5,19 @@ LICENSE = "GPLv3"
 
 SRC_URI = "\
      ftp://sourceware.org/pub/binutils/snapshots/binutils-${PV}.tar.bz2 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
-     file://binutils-arm-pr7093.patch;patch=1 \
-     file://ld-stub-crash.patch;patch=1;pnum=0 \
-     file://thumb-func.patch;patch=1 \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-gas-needs-libm.patch \
+     file://binutils-arm-pr7093.patch \
+     file://ld-stub-crash.patch;striplevel=0 \
+     file://thumb-func.patch \
      "
 
 # powerpc patches
-SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+SRC_URI += "file://binutils-2.16.1-e300c2c3.patch"
 
 
 SRC_URI[md5sum] = "fd59f36022f6ea802d1c844a2576e616"
diff --git a/recipes/binutils/binutils_2.19.bb b/recipes/binutils/binutils_2.19.bb
index 6552b0eb53..2a081dbc29 100644
--- a/recipes/binutils/binutils_2.19.bb
+++ b/recipes/binutils/binutils_2.19.bb
@@ -6,19 +6,19 @@ LICENSE = "GPLv3"
 
 SRC_URI = "\
      ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
-     file://binutils-arm-pr7093.patch;patch=1 \
-     file://binutils-x86_64_i386_biarch.patch;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-gas-needs-libm.patch \
+     file://binutils-arm-pr7093.patch \
+     file://binutils-x86_64_i386_biarch.patch \
      "
 
 # powerpc patches
-SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+SRC_URI += "file://binutils-2.16.1-e300c2c3.patch"
 
 
 SRC_URI[md5sum] = "17a52219dee5a76c1a9d9b0bfd337d66"
diff --git a/recipes/binutils/binutils_2.20.1.bb b/recipes/binutils/binutils_2.20.1.bb
index e5e7f546c0..e573c276b0 100644
--- a/recipes/binutils/binutils_2.20.1.bb
+++ b/recipes/binutils/binutils_2.20.1.bb
@@ -6,13 +6,13 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "\
      ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2;name=tarball \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
-     file://binutils-x86_64_i386_biarch.patch;patch=1 \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-gas-needs-libm.patch \
+     file://binutils-x86_64_i386_biarch.patch \
      "
 
 SRC_URI[tarball.sha256sum] = "228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8"
@@ -20,5 +20,5 @@ SRC_URI[tarball.md5sum] = "9cdfb9d6ec0578c166d3beae5e15c4e5"
 
 # powerpc patches
 SRC_URI += "\
-     file://binutils-2.16.1-e300c2c3.patch;patch=1 \
+     file://binutils-2.16.1-e300c2c3.patch \
      "
diff --git a/recipes/binutils/binutils_2.20.bb b/recipes/binutils/binutils_2.20.bb
index 2ab71095ad..9d0438a73e 100644
--- a/recipes/binutils/binutils_2.20.bb
+++ b/recipes/binutils/binutils_2.20.bb
@@ -6,22 +6,22 @@ PR = "${INC_PR}.4"
 
 SRC_URI = "\
      ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
-     file://ld-stub-crash.patch;patch=1;pnum=0 \
-     file://binutils-arm-non-empty-know.patch;patch=1 \
-     file://binutils_unexport_LD_LIBRARY_PATH_for_CC_FOR_BUILD.patch;patch=1 \
-     file://binutils-x86_64_i386_biarch.patch;patch=1 \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-gas-needs-libm.patch \
+     file://ld-stub-crash.patch;striplevel=0 \
+     file://binutils-arm-non-empty-know.patch \
+     file://binutils_unexport_LD_LIBRARY_PATH_for_CC_FOR_BUILD.patch \
+     file://binutils-x86_64_i386_biarch.patch \
      "
 
 # powerpc patches
 SRC_URI += "\
-     file://binutils-2.16.1-e300c2c3.patch;patch=1 \
-     file://binutils-powerpc-pr11088.patch;patch=1 \
+     file://binutils-2.16.1-e300c2c3.patch \
+     file://binutils-powerpc-pr11088.patch \
      "
 
 SRC_URI[md5sum] = "ee2d3e996e9a2d669808713360fa96f8"
diff --git a/recipes/binutils/binutils_csl-arm-20050416.bb b/recipes/binutils/binutils_csl-arm-20050416.bb
index 2c7c2076c3..38f588f1f4 100644
--- a/recipes/binutils/binutils_csl-arm-20050416.bb
+++ b/recipes/binutils/binutils_csl-arm-20050416.bb
@@ -43,9 +43,9 @@ FILES_${PN}-symlinks = " \
 	${bindir}/strip"
 
 SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;method=pserver;localdir=src;tag=binutils-csl-arm-2005q1-branch;date=20050416 \
-     file://ld_makefile.patch;patch=1 \
-     file://better_file_error.patch;patch=1 \
-     file://signed_char_fix.patch;patch=1"
+     file://ld_makefile.patch \
+     file://better_file_error.patch \
+     file://signed_char_fix.patch"
 
 S = "${WORKDIR}/src"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/recipes/binutils/binutils_csl-arm-20050603.bb b/recipes/binutils/binutils_csl-arm-20050603.bb
index 13759b47ad..a435b56030 100644
--- a/recipes/binutils/binutils_csl-arm-20050603.bb
+++ b/recipes/binutils/binutils_csl-arm-20050603.bb
@@ -43,9 +43,9 @@ FILES_${PN}-symlinks = " \
 	${bindir}/strip"
 
 SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;method=pserver;localdir=src;tag=binutils-csl-arm-2005q1-branch;date=20050603 \
-     file://ld_makefile.patch;patch=1 \
-     file://better_file_error.patch;patch=1 \
-     file://signed_char_fix.patch;patch=1"
+     file://ld_makefile.patch \
+     file://better_file_error.patch \
+     file://signed_char_fix.patch"
 
 S = "${WORKDIR}/src"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/recipes/binutils/binutils_cvs.bb b/recipes/binutils/binutils_cvs.bb
index b335767687..e852afbdde 100644
--- a/recipes/binutils/binutils_cvs.bb
+++ b/recipes/binutils/binutils_cvs.bb
@@ -1,20 +1,20 @@
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
 PV = "2.20+cvs${SRCDATE}"
 INC_PR = "r5"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 require binutils.inc
 
 S = "${WORKDIR}/src"
 EXTRA_OEMAKE = "configure-build-libiberty"
 SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;method=pserver;localdir=src \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1;maxdate=20090801 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;maxdate=20090801 \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
+     file://binutils-uclibc-gas-needs-libm.patch \
      "
 
 do_compile () {
@@ -49,14 +49,3 @@ do_install () {
         rm ${D}${bindir}/ar ${D}${bindir}/strings
 }
 
-do_stage () {
-        oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
-        oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
-        oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
-        install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
-        install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
-        install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
-        install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
-        install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
-        install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
-}
diff --git a/recipes/bison/bison.inc b/recipes/bison/bison.inc
index b770ffd42d..f05874ffe9 100644
--- a/recipes/bison/bison.inc
+++ b/recipes/bison/bison.inc
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "gettext"
 
 SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
+	   file://m4.patch"
 
 INCPR = "r4"
 
diff --git a/recipes/bitchx/bitchx_1.1.bb b/recipes/bitchx/bitchx_1.1.bb
index feb37c56cf..2cebfd54eb 100644
--- a/recipes/bitchx/bitchx_1.1.bb
+++ b/recipes/bitchx/bitchx_1.1.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 #PR = "-r1"
 
 SRC_URI = "http://bitchx.sourceforge.net/ircii-pana-${PV}-final.tar.gz \
-	   file://gcc34.patch;patch=1"
+	   file://gcc34.patch"
 S = "${WORKDIR}/BitchX"
 
 inherit autotools
diff --git a/recipes/bitlbee/bitlbee_1.0.4.bb b/recipes/bitlbee/bitlbee_1.0.4.bb
index b69519b282..f9661dc485 100644
--- a/recipes/bitlbee/bitlbee_1.0.4.bb
+++ b/recipes/bitlbee/bitlbee_1.0.4.bb
@@ -6,7 +6,7 @@ DEPENDS = "glib-2.0 gnutls"
 PR = "r0"
 
 SRC_URI = "http://get.bitlbee.org/src/${P}.tar.gz \
-           file://configure.patch;patch=1 \
+           file://configure.patch \
            file://init-script"
 
 S = "${WORKDIR}/bitlbee-${PV}"
diff --git a/recipes/bl/bl_cvs.bb b/recipes/bl/bl_cvs.bb
index 716393e31d..cdbf2ba58a 100644
--- a/recipes/bl/bl_cvs.bb
+++ b/recipes/bl/bl_cvs.bb
@@ -5,7 +5,7 @@ PV = "0.0+cvs${SRCDATE}"
 DESCRIPTION = "Command line tool for iPaq backlight control"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/h3600_test \
-           file://nokernelheader.patch;patch=1;pnum=0 \
+           file://nokernelheader.patch;striplevel=0 \
 	   file://zaurus-hinge.bl-on \
 	   file://zaurus-hinge.bl-off"
 
diff --git a/recipes/blackbox/blackbox_0.70.1.bb b/recipes/blackbox/blackbox_0.70.1.bb
index 02a5e5b829..8ac16ddee4 100644
--- a/recipes/blackbox/blackbox_0.70.1.bb
+++ b/recipes/blackbox/blackbox_0.70.1.bb
@@ -5,7 +5,7 @@ DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxiner
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/blackboxwm/blackbox-0.70.1.tar.gz \
-  file://remove-host-includes.patch;patch=1"
+  file://remove-host-includes.patch"
 S = "${WORKDIR}/blackbox-${PV}"
 
 inherit autotools pkgconfig
diff --git a/recipes/blueprobe/blueprobe_0.18.bb b/recipes/blueprobe/blueprobe_0.18.bb
index f253e8ee1a..941929742b 100644
--- a/recipes/blueprobe/blueprobe_0.18.bb
+++ b/recipes/blueprobe/blueprobe_0.18.bb
@@ -2,10 +2,10 @@ require blueprobe.inc
 PR = "r6"
 
 SRC_URI += "\
-  file://fix-makefile.patch;patch=1 \
-  file://h4000.patch;patch=1 \
-  file://uclibc-fix.patch;patch=1 \
-  file://rx3000.patch;patch=1 \
+  file://fix-makefile.patch \
+  file://h4000.patch \
+  file://uclibc-fix.patch \
+  file://rx3000.patch \
 "
 
 SRC_URI[md5sum] = "174a1f2c9ffea150c7abe4becd99f2cd"
diff --git a/recipes/blueprobe/blueprobe_svn.bb b/recipes/blueprobe/blueprobe_svn.bb
index 5ef2dfcf8b..d3dd02d186 100644
--- a/recipes/blueprobe/blueprobe_svn.bb
+++ b/recipes/blueprobe/blueprobe_svn.bb
@@ -4,7 +4,7 @@ PR = "r0"
 inherit pkgconfig gpe autotools
 
 SRC_URI = "${GPE_SVN} \
-           file://blueprobe-svn-Makefile.patch;patch=1"
+           file://blueprobe-svn-Makefile.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/bluez/bcm2035-tool_0.0.bb b/recipes/bluez/bcm2035-tool_0.0.bb
index 156c7e1295..51173c5553 100644
--- a/recipes/bluez/bcm2035-tool_0.0.bb
+++ b/recipes/bluez/bcm2035-tool_0.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI = "http://people.openezx.org/wyrm/bcm2035-tool.tgz \
-           file://addr-as-arg.patch;patch=1 \
+           file://addr-as-arg.patch \
 	   "
 
 S = "${WORKDIR}/${PN}"
diff --git a/recipes/bluez/bluez-cups-backend_3.33.bb b/recipes/bluez/bluez-cups-backend_3.33.bb
index 0a0e26c69b..736c03dfa0 100644
--- a/recipes/bluez/bluez-cups-backend_3.33.bb
+++ b/recipes/bluez/bluez-cups-backend_3.33.bb
@@ -6,7 +6,7 @@ DEPENDS += "cups"
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;patch=1"
+SRC_URI += "file://hciattach-ti-bts.patch"
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
diff --git a/recipes/bluez/bluez-gnome_1.8.bb b/recipes/bluez/bluez-gnome_1.8.bb
index 57629b37c9..4d9cbfaf00 100644
--- a/recipes/bluez/bluez-gnome_1.8.bb
+++ b/recipes/bluez/bluez-gnome_1.8.bb
@@ -6,8 +6,8 @@ DEPENDS = "dbus-glib gconf libnotify gtk+"
 RRECOMMENDS = "gnome-icon-theme"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/${P}.tar.gz \
-	   file://add-device-from-rfcomm-crash.patch;patch=1 \
-	   file://cs-typo.patch;patch=1"
+	   file://add-device-from-rfcomm-crash.patch \
+	   file://cs-typo.patch"
 
 inherit autotools pkgconfig gconf mime
 
diff --git a/recipes/bluez/bluez-gnome_git.bb b/recipes/bluez/bluez-gnome_git.bb
index 267f3f9e5d..710987b227 100644
--- a/recipes/bluez/bluez-gnome_git.bb
+++ b/recipes/bluez/bluez-gnome_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "dbus-glib gconf libnotify gtk+"
 
 SRCREV = "c4ccbf7c4d0aa55e234d30e6daee494e496c7c7f"
 SRC_URI = "git://git.kernel.org/pub/scm/bluetooth/bluez-gnome.git;protocol=git;branch=master "
-#           file://pkgconfig-add-gthread.patch;patch=1 "
+#           file://pkgconfig-add-gthread.patch "
 
 PV = "0.10+gitr${SRCREV}"
 S = "${WORKDIR}/git"
diff --git a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
index e1dff24044..1cc93efe78 100644
--- a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
+++ b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
@@ -6,7 +6,7 @@ DEPENDS += "gstreamer gst-plugins-base "
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;patch=1" 
+SRC_URI += "file://hciattach-ti-bts.patch" 
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
diff --git a/recipes/bluez/bluez-hcidump_1.42.bb b/recipes/bluez/bluez-hcidump_1.42.bb
index ef0209c5cd..e83729de05 100644
--- a/recipes/bluez/bluez-hcidump_1.42.bb
+++ b/recipes/bluez/bluez-hcidump_1.42.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
 SECTION = "console"
 PRIORITY = "optional"
 DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-PR = "r0"
+LICENSE = "GPLv2"
+PR = "r1"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
 S = "${WORKDIR}/bluez-hcidump-${PV}"
diff --git a/recipes/bluez/bluez-utils-alsa_3.33.bb b/recipes/bluez/bluez-utils-alsa_3.33.bb
index 407fcd954c..c48ed1bef8 100644
--- a/recipes/bluez/bluez-utils-alsa_3.33.bb
+++ b/recipes/bluez/bluez-utils-alsa_3.33.bb
@@ -6,7 +6,7 @@ DEPENDS += "alsa-lib"
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;patch=1" 
+SRC_URI += "file://hciattach-ti-bts.patch" 
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
diff --git a/recipes/bluez/bluez-utils.inc b/recipes/bluez/bluez-utils.inc
index 7c84f4e1d5..9933748eb6 100644
--- a/recipes/bluez/bluez-utils.inc
+++ b/recipes/bluez/bluez-utils.inc
@@ -10,14 +10,14 @@ LICENSE = "GPL"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
-	file://hciattach-ti-bts.patch;patch=1 \
-        file://handle-eintr.patch;patch=1;status=applied"
+	file://hciattach-ti-bts.patch \
+        file://handle-eintr.patch;status=applied"
 SRC_URI_append_r1000      = " file://hciattach.sh"
 SRC_URI_append_ghi270      = " file://hciattach.sh"
 
 # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
 # Let's default to that instead of 'any' until further notice...
-SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
+SRC_URI += " file://default-manfid-0x0-to-bcps.patch"
 
 S = "${WORKDIR}/bluez-utils-${PV}"
 
diff --git a/recipes/bluez/bluez-utils3.inc b/recipes/bluez/bluez-utils3.inc
index df071b76d9..d75745954d 100644
--- a/recipes/bluez/bluez-utils3.inc
+++ b/recipes/bluez/bluez-utils3.inc
@@ -12,7 +12,7 @@ FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
            file://hcid.conf \
-           file://sbc-thumb.patch;patch=1"
+           file://sbc-thumb.patch"
 
 
 S = "${WORKDIR}/bluez-utils-${PV}"
diff --git a/recipes/bluez/bluez-utils_3.33.bb b/recipes/bluez/bluez-utils_3.33.bb
index d7ae808abc..8d202dad78 100644
--- a/recipes/bluez/bluez-utils_3.33.bb
+++ b/recipes/bluez/bluez-utils_3.33.bb
@@ -4,7 +4,7 @@ PR = "r3"
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;patch=1" 
+SRC_URI += "file://hciattach-ti-bts.patch" 
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
diff --git a/recipes/bluez/bluez4-libs.inc b/recipes/bluez/bluez4-libs.inc
index 4da389cdbb..0083f15440 100644
--- a/recipes/bluez/bluez4-libs.inc
+++ b/recipes/bluez/bluez4-libs.inc
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 INC_PR = "r1"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-        file://avinfo-link.patch;patch=1;pnum=0"
+        file://avinfo-link.patch;striplevel=0"
 
 S = "${WORKDIR}/bluez-${PV}"
 
diff --git a/recipes/bluez/bluez4.inc b/recipes/bluez/bluez4.inc
index 3bbfb9add7..1807c95ea7 100644
--- a/recipes/bluez/bluez4.inc
+++ b/recipes/bluez/bluez4.inc
@@ -2,9 +2,9 @@ DESCRIPTION = "Linux Bluetooth Stack Userland V4"
 HOMEPAGE = "http://www.bluez.org"
 SECTION = "libs"
 PRIORITY = "optional"
-LICENSE = "GPL"
+LICENSE = "GPLv2/LGPLv2.1"
 DEPENDS = "gst-plugins-base alsa-lib virtual/libusb0 dbus-glib"
-INC_PR = "r6"
+INC_PR = "r7"
 
 # temporary solution until bug 5176 is properly fixed
 PROVIDES += "bluez-utils bluez-libs bluez-utils-dbus"
@@ -13,8 +13,8 @@ RPROVIDES_bluez4-dev = "bluez-libs-dev"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
-  file://sbc-thumb.patch;patch=1 \
+  file://fix-dfutool-usb-declaration-mismatch.patch \
+  file://sbc-thumb.patch \
   file://bluetooth.conf \
 "
 S = "${WORKDIR}/bluez-${PV}"
diff --git a/recipes/bluez/bluez4_4.31.bb b/recipes/bluez/bluez4_4.31.bb
index 6f32474166..17fd98f462 100644
--- a/recipes/bluez/bluez4_4.31.bb
+++ b/recipes/bluez/bluez4_4.31.bb
@@ -8,10 +8,10 @@ PR = "r7"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
-  file://sbc-thumb.patch;patch=1 \
+  file://fix-dfutool-usb-declaration-mismatch.patch \
+  file://sbc-thumb.patch \
   file://bluetooth.conf \
-#  file://hid2hci_usb_init.patch;patch=1 \
+#  file://hid2hci_usb_init.patch \
 "
 S = "${WORKDIR}/bluez-${PV}"
 
diff --git a/recipes/bluez/bluez4_4.35.bb b/recipes/bluez/bluez4_4.35.bb
index 5c10cfad1d..1b2260251f 100644
--- a/recipes/bluez/bluez4_4.35.bb
+++ b/recipes/bluez/bluez4_4.35.bb
@@ -15,8 +15,8 @@ PR = "r2"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
-  file://sbc-thumb.patch;patch=1 \
+  file://fix-dfutool-usb-declaration-mismatch.patch \
+  file://sbc-thumb.patch \
   file://bluetooth.conf \
 "
 S = "${WORKDIR}/bluez-${PV}"
diff --git a/recipes/bluez/bluez4_4.37.bb b/recipes/bluez/bluez4_4.37.bb
index 6ec1b1c282..b1dabd1a1a 100644
--- a/recipes/bluez/bluez4_4.37.bb
+++ b/recipes/bluez/bluez4_4.37.bb
@@ -15,8 +15,8 @@ PR = "r1"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
-  file://sbc-thumb.patch;patch=1 \
+  file://fix-dfutool-usb-declaration-mismatch.patch \
+  file://sbc-thumb.patch \
   file://bluetooth.conf \
 "
 S = "${WORKDIR}/bluez-${PV}"
diff --git a/recipes/bluez/obexd_0.22.bb b/recipes/bluez/obexd_0.22.bb
index 1731cd2a94..c305b10a40 100644
--- a/recipes/bluez/obexd_0.22.bb
+++ b/recipes/bluez/obexd_0.22.bb
@@ -5,7 +5,7 @@ DEPENDS_append_shr = " libframeworkd-glib "
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz;name=archive"
-SRC_URI_append_shr = " file://obexd-add-fso-support.patch;patch=1 "
+SRC_URI_append_shr = " file://obexd-add-fso-support.patch "
 SRC_URI[archive.md5sum] = "ed59a0e357b56d2a2ba0d1de6a0cc109"
 SRC_URI[archive.sha256sum] = "b6a0217abafd2fd78c33ef8b9d64bb83da014c67c1ed594c475129a1b326e137"
 
diff --git a/recipes/bluez/ussp-push-0.11/hci_remote_name.patch b/recipes/bluez/ussp-push-0.11/hci_remote_name.patch
new file mode 100644
index 0000000000..c760608be5
--- /dev/null
+++ b/recipes/bluez/ussp-push-0.11/hci_remote_name.patch
@@ -0,0 +1,13 @@
+diff -urN ussp-push-0.11/src/obex_socket.c ussp-push-0.11_Demo/src/obex_socket.c
+--- ussp-push-0.11/src/obex_socket.c	2008-08-25 02:18:53.000000000 +0530
++++ ussp-push-0.11_Demo/src/obex_socket.c	2010-04-16 15:11:27.000000000 +0530
+@@ -197,7 +197,8 @@
+ 	for (i = 0; i < niinf; i++) {
+ 		char devname[128];
+ 
+-		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++		if (hci_read_remote_name(dd, &piinf[i].bdaddr,
++					sizeof(devname) - 1,
+ 				    devname, 100000) >= 0) {
+ 			if (strcasecmp(devname, btname) == 0) {
+ 				*btaddr = piinf[i].bdaddr;
diff --git a/recipes/bluez/ussp-push_0.11.bb b/recipes/bluez/ussp-push_0.11.bb
new file mode 100644
index 0000000000..42b9008805
--- /dev/null
+++ b/recipes/bluez/ussp-push_0.11.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "OBEX object pusher"
+HOMEPAGE = "http://www.xmailserver.org/ussp-push.html"
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs openobex"
+LICENSE = "GPLv2"
+PR = "r1"
+
+SRC_URI = "http://www.xmailserver.org/ussp-push-${PV}.tar.gz \
+	file://hci_remote_name.patch"
+
+S = "${WORKDIR}/ussp-push-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
+
+SRC_URI[md5sum] = "5c44983ee27809867041feff6bb4423a"
+SRC_URI[sha256sum] = "bb2748eaed6164812555b4a1e186c4f2820c5ef9ce30f12d7aac28a452719bbd"
diff --git a/recipes/bmon/bmon_2.1.0.bb b/recipes/bmon/bmon_2.1.0.bb
index 611ceb7ea7..0f263ab043 100644
--- a/recipes/bmon/bmon_2.1.0.bb
+++ b/recipes/bmon/bmon_2.1.0.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 DEPENDS = "libnl"
 
 SRC_URI = "http://people.suug.ch/~tgr/bmon/files/bmon-2.1.0.tar.gz \
-           file://no-strip.patch;patch=1"
+           file://no-strip.patch"
 
 inherit autotools
 
diff --git a/recipes/boa/boa_0.94.13.bb b/recipes/boa/boa_0.94.13.bb
index 33601b7b18..d75a099b83 100644
--- a/recipes/boa/boa_0.94.13.bb
+++ b/recipes/boa/boa_0.94.13.bb
@@ -6,8 +6,8 @@ RPROVIDES = "httpd"
 PR = "r3"
 
 SRC_URI = "http://www.boa.org/boa-${PV}.tar.gz \
-           file://cgi.patch;patch=1;pnum=2 \
-           file://debian-patch.diff;patch=1;pnum=2 \
+           file://cgi.patch;striplevel=2 \
+           file://debian-patch.diff;striplevel=2 \
            file://boa.conf \
            file://boa.init"
 
diff --git a/recipes/bochs/bochs_2.1.bb b/recipes/bochs/bochs_2.1.bb
index 6843981486..3052c1bfcd 100644
--- a/recipes/bochs/bochs_2.1.bb
+++ b/recipes/bochs/bochs_2.1.bb
@@ -9,7 +9,7 @@ BROKEN = "1"
 APPIMAGE = "doc/docbook/images/dlxlinux-in-linux.png"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bochs/bochs-${PV}.tar.gz \
-           file://compile.patch;patch=1"
+           file://compile.patch"
 
 inherit autotools sdl
 
diff --git a/recipes/bogofilter/bogofilter_0.96.6.bb b/recipes/bogofilter/bogofilter_0.96.6.bb
index 35bb1112b5..ab4c86b6b7 100644
--- a/recipes/bogofilter/bogofilter_0.96.6.bb
+++ b/recipes/bogofilter/bogofilter_0.96.6.bb
@@ -9,7 +9,7 @@ PR = "r8"
 PRIORITY = "optional"
 
 SRC_URI = "http://launchpad.net/bogofilter/main/0.96.6/+download/bogofilter-0.96.6.tar.gz;name=src \
-           file://configure.ac.patch;patch=1 \
+           file://configure.ac.patch \
 	   file://volatiles \
 	   file://postfix-filter.sh \
 	   file://bogohelper.sh "
diff --git a/recipes/bonnie/bonnie++.inc b/recipes/bonnie/bonnie++.inc
index 450f6fc43c..67cec90568 100644
--- a/recipes/bonnie/bonnie++.inc
+++ b/recipes/bonnie/bonnie++.inc
@@ -7,7 +7,7 @@ LICENSE="GPL"
 
 
 SRC_URI="http://www.coker.com.au/bonnie++/${PN}-${PV}.tgz \
-	 file://gcc-4.3-fixes.patch;patch=1"
+	 file://gcc-4.3-fixes.patch"
 
 inherit autotools
 
diff --git a/recipes/boost-asio/boost-asio_0.3.7.bb b/recipes/boost-asio/boost-asio_0.3.7.bb
index e54c5cdaf7..7ab5171af1 100644
--- a/recipes/boost-asio/boost-asio_0.3.7.bb
+++ b/recipes/boost-asio/boost-asio_0.3.7.bb
@@ -9,8 +9,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/asio/boost_asio_0_3_7.tar.bz2"
 
 # mtx-[12] use 2.4 kernels but the kernel-libc-headers are from kernel 2.6,
 # thus the automatic epoll detection does not work in epoll_reactor_fwd.hpp.
-SRC_URI_append_mtx-1 = " file://disable-epoll.patch;patch=1"
-SRC_URI_append_mtx-2 = " file://disable-epoll.patch;patch=1"
+SRC_URI_append_mtx-1 = " file://disable-epoll.patch"
+SRC_URI_append_mtx-2 = " file://disable-epoll.patch"
 
 S = "${WORKDIR}/boost_asio_0_3_7"
 
diff --git a/recipes/boost/boost_1.33.1.bb b/recipes/boost/boost_1.33.1.bb
index 9c12b20fa4..d712cf7c2c 100644
--- a/recipes/boost/boost_1.33.1.bb
+++ b/recipes/boost/boost_1.33.1.bb
@@ -3,10 +3,10 @@ PR = "${INC_PR}.1"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
-  file://linux-uclibc.patch;patch=1 \
-  file://atomic_count_gcc_atomicity.patch;patch=1 \
-  file://gcc43.patch;patch=1 \
-  file://gcc41.patch;patch=1 \
+  file://linux-uclibc.patch \
+  file://atomic_count_gcc_atomicity.patch \
+  file://gcc43.patch \
+  file://gcc41.patch \
 "
 
 
diff --git a/recipes/boost/boost_1.34.1.bb b/recipes/boost/boost_1.34.1.bb
index d82c5d9a7e..35089b226e 100644
--- a/recipes/boost/boost_1.34.1.bb
+++ b/recipes/boost/boost_1.34.1.bb
@@ -13,12 +13,10 @@ PR = "6"
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
-	file://linux-uclibc.patch;patch=1 \
-	file://${PV}-gcc43.patch;patch=1 \
+	file://linux-uclibc.patch \
+	file://${PV}-gcc43.patch \
 	"
 
-DEFAULT_PREFERENCE = "-1"
-
 S = "${WORKDIR}/${BOOST_P}"
 
 BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
diff --git a/recipes/boost/boost_1.36.0.bb b/recipes/boost/boost_1.36.0.bb
index 6dedbafc96..d5e7b0ff6e 100644
--- a/recipes/boost/boost_1.36.0.bb
+++ b/recipes/boost/boost_1.36.0.bb
@@ -3,13 +3,13 @@ include boost-36.inc
 PR = "${INC_PR}.1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
-           file://arm-intrinsics.patch;patch=1 \
-           file://01-no-serialization-test.patch;patch=1 \
-           file://02-atomic-count-pthreads-on-arm.patch;patch=1 \
-           file://03-exception-clone-destructor-fix.patch;patch=1 \
-           file://gcc-44.diff;patch=1 \
-           file://uclibc.patch;patch=1 \
-           file://sscanf.patch;patch=1 \
+           file://arm-intrinsics.patch \
+           file://01-no-serialization-test.patch \
+           file://02-atomic-count-pthreads-on-arm.patch \
+           file://03-exception-clone-destructor-fix.patch \
+           file://gcc-44.diff \
+           file://uclibc.patch \
+           file://sscanf.patch \
           "
 
 BJAM_OPTS    = '${BJAM_TOOLS} \
diff --git a/recipes/boost/boost_1.37.0.bb b/recipes/boost/boost_1.37.0.bb
index f21100e62f..6daa475bfb 100644
--- a/recipes/boost/boost_1.37.0.bb
+++ b/recipes/boost/boost_1.37.0.bb
@@ -1,14 +1,12 @@
 include boost-36.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 PR = "${INC_PR}.1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2;name=boost1370tarbz2 \
-           file://arm-intrinsics.patch;patch=1 \
-           file://02-atomic-count-pthreads-on-arm.patch;patch=1 \
-           file://uclibc.patch;patch=1 \
-           file://sscanf.patch;patch=1 \
+           file://arm-intrinsics.patch \
+           file://02-atomic-count-pthreads-on-arm.patch \
+           file://uclibc.patch \
+           file://sscanf.patch \
           "
 
 SRC_URI[boost1370tarbz2.md5sum] = "8d9f990bfb7e83769fa5f1d6f065bc92"
diff --git a/recipes/boost/boost_1.40.0.bb b/recipes/boost/boost_1.40.0.bb
index 28eb7ca2d6..194de8e37d 100644
--- a/recipes/boost/boost_1.40.0.bb
+++ b/recipes/boost/boost_1.40.0.bb
@@ -3,11 +3,9 @@ require boost-14x.inc
 PR = "${INC_PR}.1"
 
 SRC_URI = "http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz \
-           file://uclibc.patch;patch=1 \
+           file://uclibc.patch \
           "
 S = "${WORKDIR}/boost-1.40.0.cmake2"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI[md5sum] = "1a0926fe4c8228f14a2622b4182b801e"
 SRC_URI[sha256sum] = "ce6e6c3a6b9a3e7695cb7a0f83d4dbb58f1fb246eb706e3caf3fce3b77e186c0"
diff --git a/recipes/boost/boost_1.41.0.bb b/recipes/boost/boost_1.41.0.bb
index 1300894eca..7a31629ca3 100644
--- a/recipes/boost/boost_1.41.0.bb
+++ b/recipes/boost/boost_1.41.0.bb
@@ -3,7 +3,7 @@ require boost-14x.inc
 PR = "${INC_PR}.1"
 
 SRC_URI = "http://sodium.resophonic.com/boost-cmake/1.41.0.cmake0/boost-1.41.0.cmake0.tar.gz;name=tarball \
-           file://1.41.0_uclibc.patch;patch=1 \
+           file://1.41.0_uclibc.patch \
           "
 S = "${WORKDIR}/boost-1.41.0.cmake0"
 
@@ -12,5 +12,3 @@ SRC_URI[tarball.sha256sum] = "78b7e72d34b057847ff99b291719d5bf1b76ed080bebfa3122
 
 DEPENDS += " icu "
 
-DEFAULT_PREFERENCE = "-1"
-
diff --git a/recipes/bootchart/bootchart_0.9.bb b/recipes/bootchart/bootchart_0.9.bb
index 4cce4dff74..160cc06c19 100644
--- a/recipes/bootchart/bootchart_0.9.bb
+++ b/recipes/bootchart/bootchart_0.9.bb
@@ -14,7 +14,7 @@ RDEPENDS = "bash coreutils acct"
 PACKAGE_ARCH = "all"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bootchart/bootchart-${PV}.tar.bz2\
-           file://handheld.patch;patch=1"
+           file://handheld.patch"
 
 
 do_install() {
diff --git a/recipes/bootmenu/bootmenu_0.6.bb b/recipes/bootmenu/bootmenu_0.6.bb
index c94efcaf90..e1a7dd0e77 100644
--- a/recipes/bootmenu/bootmenu_0.6.bb
+++ b/recipes/bootmenu/bootmenu_0.6.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.cosmicpenguin.net/pub/bootmenu/bootmenu-${PV}.tar.gz \
-	   file://compile.patch;patch=1"
+	   file://compile.patch"
 
 EXTRA_OEMAKE = ""
 
diff --git a/recipes/bootsplash/bootsplash_3.0.7.bb b/recipes/bootsplash/bootsplash_3.0.7.bb
index 9f531a1c81..0903547469 100644
--- a/recipes/bootsplash/bootsplash_3.0.7.bb
+++ b/recipes/bootsplash/bootsplash_3.0.7.bb
@@ -7,8 +7,8 @@ HOMEPAGE="http://www.bootsplash.org"
 SECTION = "media-gfx"
 LICENSE = "GPL"
 SRC_URI="ftp://ftp.openbios.org/pub/bootsplash/rpm-sources/bootsplash/bootsplash-${PV}.tar.bz2 \
-         file://freetype2.patch;patch=1 \
-	 file://gcc-issues.patch;patch=1"
+         file://freetype2.patch \
+	 file://gcc-issues.patch"
 
 DEPENDS="freetype libmng"
 PR = "r1"
diff --git a/recipes/brickout/brickout_2002.06.09.bb b/recipes/brickout/brickout_2002.06.09.bb
index 01a93bbac5..f0a5377b3e 100644
--- a/recipes/brickout/brickout_2002.06.09.bb
+++ b/recipes/brickout/brickout_2002.06.09.bb
@@ -6,7 +6,7 @@ DEPENDS = "libsdl-qpe libsdl-mixer libsdl-image"
 PR = "r4"
 
 SRC_URI = "ftp://ftp.billsgames.com/unix/agenda/brickout/src/brickout-${PV}.tar.gz \
-           file://directories.patch;patch=1"
+           file://directories.patch"
 
 inherit palmtop
 
diff --git a/recipes/brutefir/brutefir_1.0i.bb b/recipes/brutefir/brutefir_1.0i.bb
index 15411c4ae4..be13826b19 100644
--- a/recipes/brutefir/brutefir_1.0i.bb
+++ b/recipes/brutefir/brutefir_1.0i.bb
@@ -9,7 +9,7 @@ PR = "r1"
 # to add back SSE and MMX after fixing the makefile to not use uname to check for cpu 
 
 SRC_URI = "http://www.ludd.luth.se/~torger/files/brutefir-${PV}.tar.gz \
-           file://unbreak-makefile.patch;patch=1 \
+           file://unbreak-makefile.patch \
 	   "
 
 do_configure() {
diff --git a/recipes/bt950-cs/bt950-cs_0.1.bb b/recipes/bt950-cs/bt950-cs_0.1.bb
index 40ba8ba50f..305bae3bee 100644
--- a/recipes/bt950-cs/bt950-cs_0.1.bb
+++ b/recipes/bt950-cs/bt950-cs_0.1.bb
@@ -7,7 +7,7 @@ RDEPENDS = "pcmcia-cs"
 PR = "r1"
 
 SRC_URI = "http://www.holtmann.org/linux/bluetooth/bt950-${PV}.tar.gz \
-file://makefile.patch;patch=1"
+file://makefile.patch"
 
 S = "${WORKDIR}/bt950-${PV}"
 
diff --git a/recipes/btscanner/btscanner_1.0.bb b/recipes/btscanner/btscanner_1.0.bb
index 1167ba8451..a475b959a5 100644
--- a/recipes/btscanner/btscanner_1.0.bb
+++ b/recipes/btscanner/btscanner_1.0.bb
@@ -7,8 +7,8 @@ PR = "r3"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.gz \
-	   file://0909132213173.patch;patch=1 \
-	   file://configure.patch;patch=1"
+	   file://0909132213173.patch \
+	   file://configure.patch"
 
 #Yes, the packages uses this ugly hardcoded path instead of ${sysconfdir}
 FILES_${PN} += "/usr/etc/oui.txt"
diff --git a/recipes/btscanner/btscanner_2.0.bb b/recipes/btscanner/btscanner_2.0.bb
index b8e02c248f..ce101c9228 100644
--- a/recipes/btscanner/btscanner_2.0.bb
+++ b/recipes/btscanner/btscanner_2.0.bb
@@ -7,8 +7,8 @@ PR = "r2"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.bz2 \
-           file://gcc-4.patch;patch=1 \
-           file://configurable-paths.patch;patch=1 \
+           file://gcc-4.patch \
+           file://configurable-paths.patch \
            "
 
 FILES_${PN} += "${datadir}/oui.txt"
diff --git a/recipes/btsco/btsco-module.inc b/recipes/btsco/btsco-module.inc
index 5c38fb1719..cbc0f7ca75 100644
--- a/recipes/btsco/btsco-module.inc
+++ b/recipes/btsco/btsco-module.inc
@@ -7,7 +7,7 @@ DEPENDS = "alsa-lib bluez-libs"
 inherit module
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-${PV}.tar.gz \
-	   file://makefile.patch;patch=1"
+	   file://makefile.patch"
 
 S = "${WORKDIR}/btsco-${PV}/kernel"
 
diff --git a/recipes/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch b/recipes/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch
new file mode 100644
index 0000000000..6f209ce571
--- /dev/null
+++ b/recipes/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch
@@ -0,0 +1,12 @@
+diff -uNr busybox-1.15.3.orig//include/applets.h busybox-1.15.3/include/applets.h
+--- busybox-1.15.3.orig//include/applets.h	2009-12-12 22:13:28.000000000 +0100
++++ busybox-1.15.3/include/applets.h	2010-04-30 15:35:40.000000000 +0200
+@@ -323,7 +323,7 @@
+ IF_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_DROP))
+ IF_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+ IF_RTCWAKE(APPLET(rtcwake, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+-IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_BIN, _BB_SUID_DROP, run_parts))
++IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_USR_BIN, _BB_SUID_DROP, run_parts))
+ IF_RUNCON(APPLET(runcon, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+ IF_RUNLEVEL(APPLET(runlevel, _BB_DIR_SBIN, _BB_SUID_DROP))
+ IF_RUNSV(APPLET(runsv, _BB_DIR_USR_BIN, _BB_SUID_DROP))
diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index 1ee263ad90..8abda7c964 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -11,24 +11,24 @@ LICENSE = "GPLv2"
 SECTION = "base"
 PRIORITY = "required"
 
-INC_PR = "r26"
+INC_PR = "r29"
 
 SRC_URI = "\
   file://busybox-cron \
   file://busybox-httpd \
   file://busybox-udhcpd \
   file://default.script file://simple.script \
-  file://dhcp-hostname.patch;patch=1 \
+  file://dhcp-hostname.patch \
   file://hwclock.sh \
-  file://ifupdown-spurious-environ.patch;patch=1 \
+  file://ifupdown-spurious-environ.patch \
   file://mount.busybox \
   file://syslog \
   file://syslog.conf \
-  file://udhcpscript.patch;patch=1 \
+  file://udhcpscript.patch \
   file://umount.busybox \
 "
 
-SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
+SRC_URI_append_nylon = " file://xargs-double-size.patch"
 
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
@@ -46,12 +46,14 @@ RDEPENDS_${PN} += "${PN}-mountall"
 RRECOMMENDS_${PN} += "libgcc ${PN}-syslog"
 
 FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
-FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog ${sysconfdir}/syslog.conf"
+FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} ${sysconfdir}/syslog.conf"
 FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
 
 FILES_${PN} += "${datadir}/udhcpc"
 
-INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd"
+# syslog initscript is handled explicitly because order of
+# update-rc.d and update-alternatives is important (see below)
+INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-udhcpd"
 INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
 INITSCRIPT_NAME_${PN}-syslog = "syslog"
 INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
@@ -78,6 +80,9 @@ do_configure () {
 do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS
 	base_do_compile
+	# Busybox will force a strip, we do not want that.  Future-proof
+	# in case later versions do this better.
+	cp busybox_unstripped busybox || true
 }
 
 do_install () {
@@ -104,7 +109,7 @@ do_install () {
 	ln -sf busybox ${D}${base_bindir}/sh
 
 	if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
-		install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
+		install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
 		install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
 	fi
 	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
@@ -142,7 +147,9 @@ pkg_postinst_${PN} () {
 	if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; /*) to="/bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi
 
 	# This adds the links, remember that this has to work when building an image too, hence the $D
+    set +e
 	while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; /*) to="/bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
+    set -e
 }
 
 pkg_postinst_${PN}-mountall () {
@@ -152,6 +159,40 @@ pkg_prerm_${PN}-mountall () {
 	update-alternatives --remove default_mountall mountall.${PN}
 }
 
+pkg_postinst_${PN}-syslog () {
+	update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50
+
+	if test "x$D" != "x"; then
+		OPT="-r $D"
+	else
+		OPT="-s"
+	fi
+	update-rc.d $OPT syslog defaults
+}
+
+pkg_prerm_${PN}-syslog () {
+	if test "x$D" = "x"; then
+		if test "$1" = "upgrade" -o "$1" = "remove"; then
+			/etc/init.d/syslog stop
+		fi
+	fi
+
+	update-alternatives --remove syslog-init syslog.${PN}
+}
+
+pkg_postrm_${PN}-syslog () {
+	if test "x$D" != "x"; then
+		OPT="-r $D"
+	else
+		OPT=""
+	fi
+	if test "$1" = "remove" -o "$1" = "purge"; then
+		if ! test -e "/etc/init.d/syslog"; then
+			update-rc.d $OPT syslog remove
+		fi
+	fi
+}
+
 pkg_prerm_${PN} () {
 	# This is so you can make busybox commit suicide - removing busybox with no other packages
 	# providing its files, this will make update-alternatives work, but the update-rc.d part
diff --git a/recipes/busybox/busybox_1.11.3.bb b/recipes/busybox/busybox_1.11.3.bb
index 838e1bd54f..fa169efd9c 100644
--- a/recipes/busybox/busybox_1.11.3.bb
+++ b/recipes/busybox/busybox_1.11.3.bb
@@ -4,11 +4,11 @@ PR = "${INC_PR}.1"
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
   \
-  file://udhcpscript.patch;patch=1 \
-  file://B921600.patch;patch=1 \
-  file://fdisk_lineedit_segfault.patch;patch=1 \
-  file://iptunnel.patch;patch=1 \
-  file://busybox-appletlib-dependency.patch;patch=1 \
+  file://udhcpscript.patch \
+  file://B921600.patch \
+  file://fdisk_lineedit_segfault.patch \
+  file://iptunnel.patch \
+  file://busybox-appletlib-dependency.patch \
   file://busybox-cron \
   file://busybox-httpd \
   file://busybox-udhcpd \
diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb
index d22819e7d4..57815f68af 100644
--- a/recipes/busybox/busybox_1.13.2.bb
+++ b/recipes/busybox/busybox_1.13.2.bb
@@ -3,24 +3,24 @@ PR = "${INC_PR}.1"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
-  file://busybox-1.13.2-awk.patch;patch=1 \
-  file://busybox-1.13.2-depmod.patch;patch=1 \
-  file://busybox-1.13.2-init.patch;patch=1 \
-  file://busybox-1.13.2-killall.patch;patch=1 \
-  file://busybox-1.13.2-mdev.patch;patch=1 \
-  file://busybox-1.13.2-modprobe.patch;patch=1 \
-  file://busybox-1.13.2-printf.patch;patch=1 \
-  file://busybox-1.13.2-syslogd.patch;patch=1 \
-  file://busybox-1.13.2-tar.patch;patch=1 \
-  file://busybox-1.13.2-top24.patch;patch=1 \
-  file://busybox-1.13.2-unzip.patch;patch=1 \
-  file://busybox-1.13.2-wget.patch;patch=1 \
+  file://busybox-1.13.2-awk.patch \
+  file://busybox-1.13.2-depmod.patch \
+  file://busybox-1.13.2-init.patch \
+  file://busybox-1.13.2-killall.patch \
+  file://busybox-1.13.2-mdev.patch \
+  file://busybox-1.13.2-modprobe.patch \
+  file://busybox-1.13.2-printf.patch \
+  file://busybox-1.13.2-syslogd.patch \
+  file://busybox-1.13.2-tar.patch \
+  file://busybox-1.13.2-top24.patch \
+  file://busybox-1.13.2-unzip.patch \
+  file://busybox-1.13.2-wget.patch \
   \
-  file://udhcpscript.patch;patch=1 \
-  file://udhcpc-fix-nfsroot.patch;patch=1 \
-  file://B921600.patch;patch=1 \
-  file://get_header_tar.patch;patch=1 \
-  file://busybox-appletlib-dependency.patch;patch=1 \
+  file://udhcpscript.patch \
+  file://udhcpc-fix-nfsroot.patch \
+  file://B921600.patch \
+  file://get_header_tar.patch \
+  file://busybox-appletlib-dependency.patch \
   file://find-touchscreen.sh \
   file://busybox-cron \
   file://busybox-httpd \
diff --git a/recipes/busybox/busybox_1.14.3.bb b/recipes/busybox/busybox_1.14.3.bb
index d714310368..ebe018cc78 100644
--- a/recipes/busybox/busybox_1.14.3.bb
+++ b/recipes/busybox/busybox_1.14.3.bb
@@ -6,11 +6,11 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
 \
-  file://udhcpscript.patch;patch=1 \
-  file://udhcpc-fix-nfsroot.patch;patch=1 \
-  file://B921600.patch;patch=1 \
-  file://get_header_tar.patch;patch=1 \
-  file://busybox-appletlib-dependency.patch;patch=1 \
+  file://udhcpscript.patch \
+  file://udhcpc-fix-nfsroot.patch \
+  file://B921600.patch \
+  file://get_header_tar.patch \
+  file://busybox-appletlib-dependency.patch \
   file://find-touchscreen.sh \
   file://busybox-cron \
   file://busybox-httpd \
diff --git a/recipes/busybox/busybox_1.15.3.bb b/recipes/busybox/busybox_1.15.3.bb
index 1e1aa1e32a..07103e855f 100644
--- a/recipes/busybox/busybox_1.15.3.bb
+++ b/recipes/busybox/busybox_1.15.3.bb
@@ -1,15 +1,16 @@
 require busybox.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
   \
-  file://udhcpscript.patch;patch=1 \
-  file://udhcpc-fix-nfsroot.patch;patch=1 \
-  file://B921600.patch;patch=1 \
-  file://get_header_tar.patch;patch=1 \
-  file://busybox-appletlib-dependency.patch;patch=1 \
-  file://0000-wget-no-check-certificate.patch;patch=1 \
+  file://udhcpscript.patch \
+  file://udhcpc-fix-nfsroot.patch \
+  file://B921600.patch \
+  file://get_header_tar.patch \
+  file://busybox-appletlib-dependency.patch \
+  file://0000-wget-no-check-certificate.patch \
+  file://run-parts.in.usr-bin.patch \
   file://find-touchscreen.sh \
   file://busybox-cron \
   file://busybox-httpd \
diff --git a/recipes/busybox/busybox_1.2.1.bb b/recipes/busybox/busybox_1.2.1.bb
index 037584a198..c3ab626f2f 100644
--- a/recipes/busybox/busybox_1.2.1.bb
+++ b/recipes/busybox/busybox_1.2.1.bb
@@ -5,12 +5,12 @@ PR = "${INC_PR}.1"
 SRC_URI += "\
 	   http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
 	   \
-	   file://wget-long-options.patch;patch=1 \
-	   file://df_rootfs.patch;patch=1 \
+	   file://wget-long-options.patch \
+	   file://df_rootfs.patch \
            file://defconfig"
 SRC_URI[tarball.md5sum] = "362b3dc0f2023ddfda901dc1f1a74391"
 SRC_URI[tarball.sha256sum] = "c6f955c7feafdb7c40645b3dc4c4a3c945477a2429633eef7b2a34ef01827410"
-SRC_URI_append_avr32 = " file://install-should-unlink-dest-if-it-exists.patch;patch=1"
+SRC_URI_append_avr32 = " file://install-should-unlink-dest-if-it-exists.patch"
 
 do_configure () {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe
diff --git a/recipes/busybox/busybox_1.2.2.bb b/recipes/busybox/busybox_1.2.2.bb
index c160635998..2a373ae823 100644
--- a/recipes/busybox/busybox_1.2.2.bb
+++ b/recipes/busybox/busybox_1.2.2.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "\
 	   http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
 	   \
-	   file://wget-long-options.patch;patch=1 \
+	   file://wget-long-options.patch \
            file://defconfig"
 SRC_URI[tarball.md5sum] = "ae8a4c65b9464c8ece3483a3d3b9544c"
 SRC_URI[tarball.sha256sum] = "4de9fb2bb018e381e64199b38d90cb25e71366c37a8995e9ab5ed206ebcb972f"
diff --git a/recipes/busybox/busybox_1.7.2.bb b/recipes/busybox/busybox_1.7.2.bb
index cd22797129..5887fbb7fd 100644
--- a/recipes/busybox/busybox_1.7.2.bb
+++ b/recipes/busybox/busybox_1.7.2.bb
@@ -11,17 +11,17 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://mountall \
            file://syslog \
            file://syslog.conf \
-           file://udhcpscript.patch;patch=1 \
-           file://busybox-appletlib-dependency.patch;patch=1 \
+           file://udhcpscript.patch \
+           file://busybox-appletlib-dependency.patch \
            file://umount.busybox \
            file://run_parts.c"
 SRC_URI[tarball.md5sum] = "c91ec9756e2000073a9dd8fa9fc3f89e"
 SRC_URI[tarball.sha256sum] = "83c4cc813124a43f13e2ebb83cea9da9909d63891b824bf4bc7006f0567db7cf"
 
-SRC_URI += "http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch;patch=1;name=patch1 \
-            http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-iptun.patch;patch=1;name=patch2 \
-            http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-logger.patch;patch=1;name=patch3 \
-            http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-tail.patch;patch=1;name=patch4 \
+SRC_URI += "http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch;name=patch1 \
+            http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-iptun.patch;name=patch2 \
+            http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-logger.patch;name=patch3 \
+            http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-tail.patch;name=patch4 \
             file://defconfig"
 
 EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
diff --git a/recipes/busybox/busybox_1.9.2.bb b/recipes/busybox/busybox_1.9.2.bb
index 5e8e65a314..065cabf66b 100644
--- a/recipes/busybox/busybox_1.9.2.bb
+++ b/recipes/busybox/busybox_1.9.2.bb
@@ -2,11 +2,11 @@ require busybox.inc
 PR = "${INC_PR}.1"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
-           file://udhcpscript.patch;patch=1 \
-           file://adduser-longops.patch;patch=1 \
-           file://sort-z-nul.patch;patch=1;status=upstream \
-           file://topmem.patch;patch=1 \
-           file://busybox-appletlib-dependency.patch;patch=1 \
+           file://udhcpscript.patch \
+           file://adduser-longops.patch \
+           file://sort-z-nul.patch;status=upstream \
+           file://topmem.patch \
+           file://busybox-appletlib-dependency.patch \
            file://busybox-cron \
            file://busybox-httpd \
            file://busybox-udhcpd \
diff --git a/recipes/bvi/bvi_1.3.1.bb b/recipes/bvi/bvi_1.3.1.bb
index b1b228bd03..120ef8d392 100644
--- a/recipes/bvi/bvi_1.3.1.bb
+++ b/recipes/bvi/bvi_1.3.1.bb
@@ -6,9 +6,9 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bvi/bvi-${PV}.src.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://compile.patch;patch=1 \
-	   file://no-strip.patch;patch=1"
+	   file://configure.patch \
+	   file://compile.patch \
+	   file://no-strip.patch"
 
 inherit autotools
 
diff --git a/recipes/bwmon/bwmon_1.3.bb b/recipes/bwmon/bwmon_1.3.bb
index 6c06787144..1e509a17fb 100644
--- a/recipes/bwmon/bwmon_1.3.bb
+++ b/recipes/bwmon/bwmon_1.3.bb
@@ -4,7 +4,7 @@ DEPENDS = "ncurses"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bwmon/${P}.tar.gz \
-           file://makefile.patch;patch=1"
+           file://makefile.patch"
 
 inherit autotools
 
diff --git a/recipes/bzip2/bzip2-full-native_1.0.5.bb b/recipes/bzip2/bzip2-full-native_1.0.5.bb
index 2e7077cac9..8ead80a802 100644
--- a/recipes/bzip2/bzip2-full-native_1.0.5.bb
+++ b/recipes/bzip2/bzip2-full-native_1.0.5.bb
@@ -5,7 +5,7 @@ PR = "r1"
 LICENSE = "bzip2"
 FILESPATH =. "${FILE_DIRNAME}/bzip2-${PV}:"
 SRC_URI = "http://www.bzip.org/${PV}/bzip2-${PV}.tar.gz \
-	   file://bzip2-1.0.5-autoconfiscated.patch;patch=1"
+	   file://bzip2-1.0.5-autoconfiscated.patch"
 
 S = "${WORKDIR}/bzip2-${PV}"
 
diff --git a/recipes/bzip2/bzip2_1.0.2.bb b/recipes/bzip2/bzip2_1.0.2.bb
index 1276bc6461..c454ef9728 100644
--- a/recipes/bzip2/bzip2_1.0.2.bb
+++ b/recipes/bzip2/bzip2_1.0.2.bb
@@ -4,8 +4,8 @@ PR = "r2"
 
 LICENSE = "bzip2"
 SRC_URI = "ftp://sources.redhat.com/pub/bzip2/v102/bzip2-${PV}.tar.gz \
-	   file://installpaths.patch;patch=1 \
-	   file://ldflags.patch;patch=1"
+	   file://installpaths.patch \
+	   file://ldflags.patch"
 
 CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64"
 
diff --git a/recipes/bzip2/bzip2_1.0.5.bb b/recipes/bzip2/bzip2_1.0.5.bb
index 6d49b387a4..a088230bbb 100644
--- a/recipes/bzip2/bzip2_1.0.5.bb
+++ b/recipes/bzip2/bzip2_1.0.5.bb
@@ -4,7 +4,7 @@ PR = "r2"
 
 LICENSE = "bzip2"
 SRC_URI = "http://www.bzip.org/${PV}/bzip2-${PV}.tar.gz \
-	   file://bzip2-1.0.5-autoconfiscated.patch;patch=1"
+	   file://bzip2-1.0.5-autoconfiscated.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/c3110x/cx3110x_1.1.bb b/recipes/c3110x/cx3110x_1.1.bb
index 797c7caee6..b3d9ee90cc 100644
--- a/recipes/c3110x/cx3110x_1.1.bb
+++ b/recipes/c3110x/cx3110x_1.1.bb
@@ -9,7 +9,7 @@ export KERNEL_SRC_DIR = ${STAGING_KERNEL_DIR}
 export LDFLAGS = ""
 
 SRC_URI = "https://garage.maemo.org/frs/download.php/939/cx3110x-1.1.tar.gz \
-           file://umac_binary.patch;patch=1 \
+           file://umac_binary.patch \
            http://use.the.umac.ko.from.your.own.nokia800/umac.ko" 
 
 S = "${WORKDIR}/cx3110x-${PV}"
diff --git a/recipes/ca-certificates/ca-certificates_20090814.bb b/recipes/ca-certificates/ca-certificates_20090814.bb
index ae85fea9fc..b8e2f2c0c8 100644
--- a/recipes/ca-certificates/ca-certificates_20090814.bb
+++ b/recipes/ca-certificates/ca-certificates_20090814.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 SRC_URI = "http://ftp.de.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_${PV}.tar.gz;name=archive \
-           file://remove-c-rehash.patch;patch=1"
+           file://remove-c-rehash.patch"
 SRC_URI[archive.md5sum] = "307052c985bec7f9a00eb84293eef779"
 SRC_URI[archive.sha256sum] = "6924fafc35dd020da99bc86842f95f2a97a3a5ff084b0635eea815fe2777fc7c"
 
diff --git a/recipes/cacao/cacao-cldc_0.98.bb b/recipes/cacao/cacao-cldc_0.98.bb
index 8c97409e81..963d684e39 100644
--- a/recipes/cacao/cacao-cldc_0.98.bb
+++ b/recipes/cacao/cacao-cldc_0.98.bb
@@ -6,14 +6,14 @@ PR = "r1"
 
 SRC_URI += "\
   http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=8b8907c8b925761c9410bcadb9705346 \
-	file://midpath.patch;patch=1 \
-	file://offsets_make.patch;patch=1 \
-	file://classpath_var.patch;patch=1 \
-	file://libmath.patch;patch=1 \
-	file://arm_mmap.patch;patch=1 \
+	file://midpath.patch \
+	file://offsets_make.patch \
+	file://classpath_var.patch \
+	file://libmath.patch \
+	file://arm_mmap.patch \
 	"
 
-SRC_URI_append_arm = "file://offset.h_arm.patch;patch=1"
+SRC_URI_append_arm = "file://offset.h_arm.patch"
 
 
 SRC_URI[md5sum] = "8b8907c8b925761c9410bcadb9705346"
diff --git a/recipes/cacao/cacao-initial_0.98.bb b/recipes/cacao/cacao-initial_0.98.bb
index 4b198b2c4e..bf1b993a51 100644
--- a/recipes/cacao/cacao-initial_0.98.bb
+++ b/recipes/cacao/cacao-initial_0.98.bb
@@ -8,7 +8,7 @@ PR = "r0"
 
 SRC_URI = "\
         http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2; \
-        file://cacao-0.98-initial.patch;patch=1;pnum=1 \
+        file://cacao-0.98-initial.patch \
         "
 
 # libjvm disabled - it would conflict with cacao-native installations
diff --git a/recipes/cacao/cacao_0.99.3.bb b/recipes/cacao/cacao_0.99.3.bb
index b704d4b6b5..142a40bdf2 100644
--- a/recipes/cacao/cacao_0.99.3.bb
+++ b/recipes/cacao/cacao_0.99.3.bb
@@ -4,12 +4,12 @@ PR = "r8"
 
 SRC_URI = "\
   http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \
-  file://cacao-codegen-arm1.patch;patch=1 \
-  file://cacao-codegen-arm2.patch;patch=1 \
-  file://cacao-arm-race.patch;patch=1 \
-  file://vfp-compat.patch;patch=1 \
-  file://cacao-disable-stackbase-check.patch;patch=1 \
-  file://cacao_PR99_C_0.99.3.patch;patch=1 \
+  file://cacao-codegen-arm1.patch \
+  file://cacao-codegen-arm2.patch \
+  file://cacao-arm-race.patch \
+  file://vfp-compat.patch \
+  file://cacao-disable-stackbase-check.patch \
+  file://cacao_PR99_C_0.99.3.patch \
   "
 
 SRC_URI[md5sum] = "db93ab31c6d1b7f1e213771bb81bde58"
diff --git a/recipes/cacao/cacao_0.99.4.bb b/recipes/cacao/cacao_0.99.4.bb
index 6c88702ca9..5ae0330a6c 100644
--- a/recipes/cacao/cacao_0.99.4.bb
+++ b/recipes/cacao/cacao_0.99.4.bb
@@ -4,9 +4,9 @@ PR = "r2"
 
 SRC_URI = "\
 	http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \
-	file://vfp-compat.patch;patch=1 \
-	file://cacao-disable-stackbase-check.patch;patch=1 \
-	file://cacao_PR99_C_0.99.3.patch;patch=1 \
+	file://vfp-compat.patch \
+	file://cacao-disable-stackbase-check.patch \
+	file://cacao_PR99_C_0.99.3.patch \
 	"
 
 SRC_URI[md5sum] = "63220327925ace13756ae334c55a3baa"
diff --git a/recipes/cairo/cairo-directfb_1.4.8.bb b/recipes/cairo/cairo-directfb_1.4.8.bb
index 4c7df7a8fd..d9d3715510 100644
--- a/recipes/cairo/cairo-directfb_1.4.8.bb
+++ b/recipes/cairo/cairo-directfb_1.4.8.bb
@@ -3,7 +3,7 @@ RCONFLICTS = "cairo"
 RPROVIDES = "cairo-directfb"
 DEPENDS = "directfb libsm libpng fontconfig"
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-	   file://cairo_directfb_is_similar-typo.patch;patch=1 \
+	   file://cairo_directfb_is_similar-typo.patch \
 	  "
 
 EXTRA_OECONF += " --enable-directfb \
diff --git a/recipes/cairo/cairo-directfb_1.6.4.bb b/recipes/cairo/cairo-directfb_1.6.4.bb
index cdd5ca9042..55064ce8c6 100644
--- a/recipes/cairo/cairo-directfb_1.6.4.bb
+++ b/recipes/cairo/cairo-directfb_1.6.4.bb
@@ -3,7 +3,7 @@ RCONFLICTS = "cairo"
 RPROVIDES = "cairo-directfb"
 DEPENDS = "directfb pixman libsm libpng fontconfig"
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-           file://configure_fix.patch;patch=1 "
+           file://configure_fix.patch "
 
 EXTRA_OECONF += " --enable-directfb \
 		  --disable-xlib \
diff --git a/recipes/cairo/cairo_1.2.4.bb b/recipes/cairo/cairo_1.2.4.bb
index b30041f7d7..f1723a7978 100644
--- a/recipes/cairo/cairo_1.2.4.bb
+++ b/recipes/cairo/cairo_1.2.4.bb
@@ -6,8 +6,8 @@ LICENSE = "MPL LGPL"
 PR = "r2"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-	   file://0001-Add-autoconf-macro-AX_C_FLOAT_WORDS_BIGENDIAN.diff;patch=1 \
-	   file://0002-Change-_cairo_fixed_from_double-to-use-the-magic-number-technique.diff;patch=1 \
+	   file://0001-Add-autoconf-macro-AX_C_FLOAT_WORDS_BIGENDIAN.diff \
+	   file://0002-Change-_cairo_fixed_from_double-to-use-the-magic-number-technique.diff \
   	   "
 
 inherit autotools pkgconfig
diff --git a/recipes/cairo/cairo_1.4.10.bb b/recipes/cairo/cairo_1.4.10.bb
index bf2bab2d77..544479b282 100644
--- a/recipes/cairo/cairo_1.4.10.bb
+++ b/recipes/cairo/cairo_1.4.10.bb
@@ -3,7 +3,7 @@ require cairo.inc
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-file://stats.patch;patch=1;p=1"
+file://stats.patch;p=1"
 
 PR = "r0"
 
diff --git a/recipes/cairo/cairo_1.4.14.bb b/recipes/cairo/cairo_1.4.14.bb
index b9bb399900..583089586d 100644
--- a/recipes/cairo/cairo_1.4.14.bb
+++ b/recipes/cairo/cairo_1.4.14.bb
@@ -3,7 +3,7 @@ require cairo.inc
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-file://0001-Fix-for-a-memory-leak-in-pixman.patch;patch=1;p=1"
+file://0001-Fix-for-a-memory-leak-in-pixman.patch;p=1"
 
 PR = "r0"
 
diff --git a/recipes/cairo/cairo_1.6.4.bb b/recipes/cairo/cairo_1.6.4.bb
index dea30acef8..619469c30b 100644
--- a/recipes/cairo/cairo_1.6.4.bb
+++ b/recipes/cairo/cairo_1.6.4.bb
@@ -3,7 +3,7 @@ require cairo.inc
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-           file://configure_fix.patch;patch=1 "
+           file://configure_fix.patch "
 
 PR = "r4"
 
diff --git a/recipes/cairo/cairo_1.7.6.bb b/recipes/cairo/cairo_1.7.6.bb
index 39ea0941ea..e2fc21215d 100644
--- a/recipes/cairo/cairo_1.7.6.bb
+++ b/recipes/cairo/cairo_1.7.6.bb
@@ -3,7 +3,7 @@ require cairo.inc
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz \
-#           file://configure_fix.patch;patch=1 \
+#           file://configure_fix.patch \
           "
 
 
diff --git a/recipes/cairo/cairo_1.8.10.bb b/recipes/cairo/cairo_1.8.10.bb
index 0c43549121..fff9cac56c 100644
--- a/recipes/cairo/cairo_1.8.10.bb
+++ b/recipes/cairo/cairo_1.8.10.bb
@@ -1,7 +1,7 @@
 require cairo.inc
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz;name=cairo \
-           file://dolt-fix.patch;patch=1 \
+           file://dolt-fix.patch \
           "
 
 SRC_URI[cairo.md5sum] = "b60a82f405f9400bbfdcf850b1728d25"
diff --git a/recipes/cairo/cairo_1.8.8.bb b/recipes/cairo/cairo_1.8.8.bb
index 24bcd67967..de12f1365d 100644
--- a/recipes/cairo/cairo_1.8.8.bb
+++ b/recipes/cairo/cairo_1.8.8.bb
@@ -3,7 +3,7 @@ PR = "r1"
 require cairo.inc
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-           file://dolt-fix.patch;patch=1 \
+           file://dolt-fix.patch \
           "
 
 
diff --git a/recipes/cairo/libsvg-cairo_20050601.bb b/recipes/cairo/libsvg-cairo_20050601.bb
index 9cc7c5b46c..330b92114f 100644
--- a/recipes/cairo/libsvg-cairo_20050601.bb
+++ b/recipes/cairo/libsvg-cairo_20050601.bb
@@ -8,7 +8,7 @@ DEPENDS = "libsvg cairo"
 DESCRIPTION = "SVG rendering library"
 DEFAULT_PREFERENCE = "1"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-cairo;date=${FIXEDSRCDATE} \
-	   file://libsvg-cairo-libtool.diff;patch=1"
+	   file://libsvg-cairo-libtool.diff"
 S = "${WORKDIR}/libsvg-cairo"
 
 inherit autotools pkgconfig
diff --git a/recipes/cairo/libsvg_0.1.4.bb b/recipes/cairo/libsvg_0.1.4.bb
index 3bb562894a..ecc4b4bffe 100644
--- a/recipes/cairo/libsvg_0.1.4.bb
+++ b/recipes/cairo/libsvg_0.1.4.bb
@@ -6,8 +6,8 @@ DESCRIPTION = "SVG parser library"
 PR = "r1"
 
 SRC_URI = "http://cairographics.org/snapshots/libsvg-${PV}.tar.gz \
-           file://configure_fix.patch;patch=1 \
-           file://gcc4_and_expat.patch;patch=1"
+           file://configure_fix.patch \
+           file://gcc4_and_expat.patch"
 
 EXTRA_OECONF = "--with-expat"
 
diff --git a/recipes/callweaver/callweaver_1.2.0-rc5.bb b/recipes/callweaver/callweaver_1.2.0-rc5.bb
index 815c0e9f13..bdd8e0d0a5 100644
--- a/recipes/callweaver/callweaver_1.2.0-rc5.bb
+++ b/recipes/callweaver/callweaver_1.2.0-rc5.bb
@@ -18,7 +18,7 @@ CWRCV = "rc5"
 
 SRC_URI = "http://devs.callweaver.org/release/callweaver-1.2.0-${CWRCV}.tar.bz2 \
            svn://svn.callweaver.org/callweaver-sounds/trunk/sounds/en_US;module=MelanieTaylor;proto=https;rev=4466 \
-           file://bootstrap.patch;patch=1 \
+           file://bootstrap.patch \
            file://logrotate \
            file://volatiles \
            file://init"
diff --git a/recipes/came/came_1.7.bb b/recipes/came/came_1.7.bb
index 53600bdb83..e485e9c89e 100644
--- a/recipes/came/came_1.7.bb
+++ b/recipes/came/came_1.7.bb
@@ -5,8 +5,8 @@ SECTION = "x11/utils"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://linuxbrit.co.uk/downloads/camE-${PV}.tar.gz \
-           file://make.patch;patch=1 \
-           file://compile.patch;patch=1"
+           file://make.patch \
+           file://compile.patch"
 S = "${WORKDIR}/camE-${PV}"
 
 do_install () {
diff --git a/recipes/camera-assistant/camera-assistant_0.2.0.bb b/recipes/camera-assistant/camera-assistant_0.2.0.bb
index 4e09d27769..bb4995a9cc 100644
--- a/recipes/camera-assistant/camera-assistant_0.2.0.bb
+++ b/recipes/camera-assistant/camera-assistant_0.2.0.bb
@@ -16,7 +16,7 @@ HOMEPAGE = "http://cameraassistant.sourceforge.net/"
 
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cameraassistant/camera-assistant_0.2.0.tar.gz \
-	  file://g++-3.4-compile-fixes.patch;patch=1 \
+	  file://g++-3.4-compile-fixes.patch \
 	  file://ca.desktop \
 	  file://ca.png "
 
diff --git a/recipes/camsource/camsource_0.7.0.bb b/recipes/camsource/camsource_0.7.0.bb
index 059afee23d..1f12bdb2c9 100644
--- a/recipes/camsource/camsource_0.7.0.bb
+++ b/recipes/camsource/camsource_0.7.0.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "jpeg libxml2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/camsource/camsource-${PV}.tar.bz2 \
-	   file://gcc34.patch;patch=1"
+	   file://gcc34.patch"
 S = "${WORKDIR}/camsource-${PV}"
 
 inherit autotools
diff --git a/recipes/ccache/ccache_2.4.bb b/recipes/ccache/ccache_2.4.bb
index 54d7a775af..1f00408c92 100644
--- a/recipes/ccache/ccache_2.4.bb
+++ b/recipes/ccache/ccache_2.4.bb
@@ -2,13 +2,15 @@ DESCRIPTION = "compiler cache"
 HOMEPAGE = "http:/ccache.samba.org"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://samba.org/ftp/ccache/ccache-${PV}.tar.gz \
-	file://ccache-gcov.patch;patch=1 \
+	file://ccache-gcov.patch \
 	"
 
 inherit autotools
 
+TARGET_CC_ARCH += "${LDFLAGS}"
+
 SRC_URI[md5sum] = "73c1ed1e767c1752dd0f548ec1e66ce7"
 SRC_URI[sha256sum] = "435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0"
diff --git a/recipes/ccrtp/ccrtp_1.7.0.bb b/recipes/ccrtp/ccrtp_1.7.0.bb
index 1ebfddb7c2..c61dd7357e 100644
--- a/recipes/ccrtp/ccrtp_1.7.0.bb
+++ b/recipes/ccrtp/ccrtp_1.7.0.bb
@@ -1,12 +1,16 @@
 DESCRIPTION = "GNU Common C++"
 HOMEPAGE = "http://freshmeat.net/projects/ccrtp"
 LICENSE = "GPL"
-PR="r0"
 DEPENDS = "commoncpp2"
-SRC_URI = "ftp://ftp.gnu.org/gnu/ccrtp/ccrtp-${PV}.tar.gz \
-	file://configure.ac.patch;patch=1"
+PR = "r0"
 
-inherit autotools pkgconfig autotools_stage
+SRC_URI = "ftp://ftp.gnu.org/gnu/ccrtp/ccrtp-${PV}.tar.gz;name=archive \
+           file://configure.ac.patch"
+SRC_URI[archive.md5sum] = "eb86cd2ac06af27ea60b1a349122605c"
+SRC_URI[archive.sha256sum] = "923cd26ffc43903ef33704e46fd57f659c3ad01554927fe323635a73082d56ae"
 
-SRC_URI[md5sum] = "eb86cd2ac06af27ea60b1a349122605c"
-SRC_URI[sha256sum] = "923cd26ffc43903ef33704e46fd57f659c3ad01554927fe323635a73082d56ae"
+inherit pkgconfig autotools_stage
+
+do_configure_prepend () {
+        sed -i -e 's#COMMON_LIBPATH=`pkg-config --variable=libdir libccgnu2`#COMMON_LIBPATH=${STAGING_LIBDIR}#' configure.ac
+}
diff --git a/recipes/ccxstream/ccxstream_1.0.15.bb b/recipes/ccxstream/ccxstream_1.0.15.bb
index 18bc77485a..d2970a1ab3 100644
--- a/recipes/ccxstream/ccxstream_1.0.15.bb
+++ b/recipes/ccxstream/ccxstream_1.0.15.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 PR = "r2"
 
 SRC_URI = "http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/${P}.tar.gz \
-	file://ccxstream-termcap.patch;patch=1 \
+	file://ccxstream-termcap.patch \
 	file://ccxstream.init \
 	file://ccxstream.conf"
 
diff --git a/recipes/cdparanoia/cdparanoia_10.2.bb b/recipes/cdparanoia/cdparanoia_10.2.bb
index 66e016a349..181719529d 100644
--- a/recipes/cdparanoia/cdparanoia_10.2.bb
+++ b/recipes/cdparanoia/cdparanoia_10.2.bb
@@ -4,12 +4,12 @@
 LICENSE = "GPL"
 
 SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz \
-         file://fixes10.patch;patch=1 \
-         file://Makefile.in.patch;patch=1 \
-         file://interface_Makefile.in.patch;patch=1 \
-         file://paranoia_Makefile.in.patch;patch=1 \
-         file://cdparanoia-III-10.2-privatefix.patch;patch=1 \
-	 file://configure.in.patch;patch=1"
+         file://fixes10.patch \
+         file://Makefile.in.patch \
+         file://interface_Makefile.in.patch \
+         file://paranoia_Makefile.in.patch \
+         file://cdparanoia-III-10.2-privatefix.patch \
+	 file://configure.in.patch"
 
 S = "${WORKDIR}/cdparanoia-III-10.2"
 
diff --git a/recipes/cdparanoia/cdparanoia_9.8alpha.bb b/recipes/cdparanoia/cdparanoia_9.8alpha.bb
index 34e249087a..9d082a9c06 100644
--- a/recipes/cdparanoia/cdparanoia_9.8alpha.bb
+++ b/recipes/cdparanoia/cdparanoia_9.8alpha.bb
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PR = "r3"
 
 SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \
-         file://fixes.patch;patch=1 \
-         file://Makefile.patch;patch=1"
+         file://fixes.patch \
+         file://Makefile.patch"
 
 S = "${WORKDIR}/cdparanoia-III-alpha9.8"
 
diff --git a/recipes/cdparanoia/cdparanoia_svn.bb b/recipes/cdparanoia/cdparanoia_svn.bb
index 724a9a1712..2bad00ec90 100644
--- a/recipes/cdparanoia/cdparanoia_svn.bb
+++ b/recipes/cdparanoia/cdparanoia_svn.bb
@@ -9,11 +9,11 @@ PV = "10.2+svnr${SRCPV}"
 SRCREV = "16684"
 
 SRC_URI = "svn://svn.xiph.org/trunk;module=cdparanoia;proto=http \
-	 file://fixes10.patch;patch=1 \
-	 file://Makefile.in.patch;patch=1 \
-	 file://interface_Makefile.in.patch;patch=1 \
-	 file://paranoia_Makefile.in.patch;patch=1 \
-	 file://configure.in.patch;patch=1 "
+	 file://fixes10.patch \
+	 file://Makefile.in.patch \
+	 file://interface_Makefile.in.patch \
+	 file://paranoia_Makefile.in.patch \
+	 file://configure.in.patch "
 
 S = "${WORKDIR}/cdparanoia"
 
diff --git a/recipes/cdrkit/cdrkit_1.1.9.bb b/recipes/cdrkit/cdrkit_1.1.9.bb
index 2ed036a491..298632889a 100644
--- a/recipes/cdrkit/cdrkit_1.1.9.bb
+++ b/recipes/cdrkit/cdrkit_1.1.9.bb
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.cdrkit.org"
 PARALLEL_MAKE = ""
 DEPENDS = "libcap"
 SRC_URI="http://cdrkit.org/releases/cdrkit-${PV}.tar.gz \
-	file://xconfig.patch;patch=1"
+	file://xconfig.patch"
 
 S="${WORKDIR}/cdrkit-${PV}"
 PR = "r2"
diff --git a/recipes/cdstatus/cdstatus_0.96.05.bb b/recipes/cdstatus/cdstatus_0.96.05.bb
index cef02b8cf1..997fb635fd 100644
--- a/recipes/cdstatus/cdstatus_0.96.05.bb
+++ b/recipes/cdstatus/cdstatus_0.96.05.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://cdstatus.sourceforge.net/"
 FILES_${PN} += "${datadir}/cdstatus.cfg"
 
 SRC_URI="${SOURCEFORGE_MIRROR}/cdstatus/cdstatus-0.96.05.tar.gz \
-	 file://cdstatus.patch;patch=1"
+	 file://cdstatus.patch"
 
 S="${WORKDIR}/cdstatus-0.96.05"
 
diff --git a/recipes/cdstatus/cdstatus_0.97.01.bb b/recipes/cdstatus/cdstatus_0.97.01.bb
index 44b20ed293..838ab72eed 100644
--- a/recipes/cdstatus/cdstatus_0.97.01.bb
+++ b/recipes/cdstatus/cdstatus_0.97.01.bb
@@ -8,9 +8,9 @@ FILES_${PN} += "${datadir}/cdstatus.cfg"
 CFLAGS += -D__USE_MISC
 
 SRC_URI="${SOURCEFORGE_MIRROR}/cdstatus/cdstatus-0.97.01.tar.gz \
-	 file://Makefile.am.patch;patch=1 \
-	 file://cddb_connect_to_server.c.patch;patch=1 \
-	 file://cdstatus.patch;patch=1"
+	 file://Makefile.am.patch \
+	 file://cddb_connect_to_server.c.patch \
+	 file://cdstatus.patch"
 
 S="${WORKDIR}/cdstatus-0.97.01"
 
diff --git a/recipes/cdtool/cdtool_2.1.8.bb b/recipes/cdtool/cdtool_2.1.8.bb
index 141be66ff1..eaed3f62f5 100644
--- a/recipes/cdtool/cdtool_2.1.8.bb
+++ b/recipes/cdtool/cdtool_2.1.8.bb
@@ -8,7 +8,7 @@ of an attached CDROM drive from the command line in a quick and scriptable way."
 LICENSE = "GPL"
 
 SRC_URI="http://hinterhof.net/${PN}/dist/${PN}-${PV}.tar.gz \
-	file://install-no-owner.patch;patch=1"
+	file://install-no-owner.patch"
 
 inherit autotools
 
diff --git a/recipes/cetools/cetools_0.3.bb b/recipes/cetools/cetools_0.3.bb
index b31074df8a..3a9c774210 100644
--- a/recipes/cetools/cetools_0.3.bb
+++ b/recipes/cetools/cetools_0.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Ethload for Linux is a tool to send ROM images over ethernet usin
 SECTION = "console/network"
 LICENSE = "GPL"
 SRC_URI = "http://linuxsh.free.fr/tools/cetools-${PV}.tar.gz \
-	   file://sean-hsieh.patch;patch=1"
+	   file://sean-hsieh.patch"
 S = "${WORKDIR}/cetools-${PV}"
 PR = "r1"
 
diff --git a/recipes/cflow/cflow_2.0.bb b/recipes/cflow/cflow_2.0.bb
index 7f9da7369b..9bd800dd98 100644
--- a/recipes/cflow/cflow_2.0.bb
+++ b/recipes/cflow/cflow_2.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Utility for viewing function call flow."
 SECTION = "devel"
 SRC_URI = "http://www.ibiblio.org/pub/Linux/devel/lang/c/cflow-${PV}.tar.gz \
-	   file://compile.patch;patch=1"
+	   file://compile.patch"
 LICENSE = "PD"
 
 do_install () {
diff --git a/recipes/changedfiles/changedfiles-daemon_1.0-rc1.bb b/recipes/changedfiles/changedfiles-daemon_1.0-rc1.bb
index 31500ecb8f..2461947bec 100644
--- a/recipes/changedfiles/changedfiles-daemon_1.0-rc1.bb
+++ b/recipes/changedfiles/changedfiles-daemon_1.0-rc1.bb
@@ -1,7 +1,7 @@
 require changedfiles.inc
 PR = "r1"
 
-SRC_URI += "file://autofoo.patch;patch=1"
+SRC_URI += "file://autofoo.patch"
 
 inherit autotools
 
diff --git a/recipes/char-driver/char-driver.bb b/recipes/char-driver/char-driver.bb
index 5e703d602d..22f6d5efe8 100644
--- a/recipes/char-driver/char-driver.bb
+++ b/recipes/char-driver/char-driver.bb
@@ -11,8 +11,8 @@ DEPENDS = "virtual/kernel"
 PR = "r3"
 
 SRC_URI = "http://www.davehylands.com/gumstix-wiki/char-driver/char-driver-2.6.21.tar.gz \
-   file://makefile.patch;patch=1 \
-#   file://sysctl.patch;patch=1 \
+   file://makefile.patch \
+#   file://sysctl.patch \
    "
 
 S = "${WORKDIR}/char-driver"
diff --git a/recipes/check/check_0.9.5.bb b/recipes/check/check_0.9.5.bb
index 3c5dd5a8ab..5328dbd43e 100644
--- a/recipes/check/check_0.9.5.bb
+++ b/recipes/check/check_0.9.5.bb
@@ -6,7 +6,7 @@ SECTION = "devel"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz \
-           file://configure_fix.patch;patch=1"
+           file://configure_fix.patch"
 S = "${WORKDIR}/check-${PV}"
 
 inherit autotools_stage pkgconfig
diff --git a/recipes/cherokee/cherokee_0.4.29.bb b/recipes/cherokee/cherokee_0.4.29.bb
index f1c3cfc718..adbdc3f435 100644
--- a/recipes/cherokee/cherokee_0.4.29.bb
+++ b/recipes/cherokee/cherokee_0.4.29.bb
@@ -4,10 +4,10 @@ LICENSE = "GPL"
 SECTION = "network"
 DEPENDS = "openssl libpcre"
 SRC_URI = "http://www.0x50.org/download/0.4/${PV}/${P}.tar.gz \
-	  file://configure.patch;patch=1 \
-	  file://Makefile.in.patch;patch=1 \
-	  file://Makefile.cget.patch;patch=1 \
-	  file://util.patch;patch=1"
+	  file://configure.patch \
+	  file://Makefile.in.patch \
+	  file://Makefile.cget.patch \
+	  file://util.patch"
 INC_PR = "r7"
 PR = "${INC_PR}.0"
 
@@ -23,7 +23,7 @@ do_configure() {
 }
 
 do_install_prepend () {
-	$BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
+	${BUILD_CC} ${BUILD_CFLAGS} -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
 }
 
 SRC_URI[md5sum] = "854e6e61a69781746496012658d8ef98"
diff --git a/recipes/cherokee/cherokee_0.5.3.bb b/recipes/cherokee/cherokee_0.5.3.bb
index 30807ba963..6815108276 100644
--- a/recipes/cherokee/cherokee_0.5.3.bb
+++ b/recipes/cherokee/cherokee_0.5.3.bb
@@ -1,7 +1,7 @@
-SRC_URI_append = "file://configure.patch;patch=1 \
-                  file://Makefile.in.patch;patch=1 \
-                  file://Makefile.cget.patch;patch=1 \
-                  file://util.patch;patch=1"
+SRC_URI_append = "file://configure.patch \
+                  file://Makefile.in.patch \
+                  file://Makefile.cget.patch \
+                  file://util.patch"
 
 require cherokee.inc
 PR = "${INC_PR}.0"
@@ -14,7 +14,7 @@ do_configure() {
 
 do_install_prepend () {
         # It only needs this app during the install, so compile it natively
-        $BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
+        ${BUILD_CC} ${BUILD_CFLAGS} -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
 }
 
 SRC_URI[md5sum] = "9e8dfc46f94ee150515be5d31bd40d16"
diff --git a/recipes/cherokee/cherokee_0.5.5.bb b/recipes/cherokee/cherokee_0.5.5.bb
index 98c6c885a8..df9499338c 100644
--- a/recipes/cherokee/cherokee_0.5.5.bb
+++ b/recipes/cherokee/cherokee_0.5.5.bb
@@ -1,9 +1,9 @@
-SRC_URI_append = "file://configure.in.patch;patch=1 \
-                  file://Makefile.am.patch;patch=1"
+SRC_URI_append = "file://configure.in.patch \
+                  file://Makefile.am.patch"
 
 do_install_prepend () {
         # It only needs this app during the install, so compile it natively
-        $BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
+        ${BUILD_CC} ${BUILD_CFLAGS} -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
 }
 
 require cherokee.inc
diff --git a/recipes/chicken/chicken.inc b/recipes/chicken/chicken.inc
index 229de94cba..178a41f427 100644
--- a/recipes/chicken/chicken.inc
+++ b/recipes/chicken/chicken.inc
@@ -6,8 +6,8 @@ LICENSE = "BSD"
 INC_PR = "r3"
 
 SRC_URI = "http://chicken.wiki.br/releases/${PV}/chicken-${PV}.tar.gz \
-           file://soname.patch;patch=1 \
-           file://translator-cross.patch;patch=1"
+           file://soname.patch \
+           file://translator-cross.patch"
 
 # Parallel building is not supported
 PARALLEL_MAKE = ""
diff --git a/recipes/chillispot/chillispot_0.98.bb b/recipes/chillispot/chillispot_0.98.bb
index c4d89bc2c9..7fa01f1875 100644
--- a/recipes/chillispot/chillispot_0.98.bb
+++ b/recipes/chillispot/chillispot_0.98.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://www.chillispot.org/download/chillispot-${PV}.tar.gz \
-	file://no-ansi.patch;patch=1 \
+	file://no-ansi.patch \
 	file://init"
 RRECOMMENDS = "kernel-module-tun"
 
diff --git a/recipes/chillispot/chillispot_1.0RC3.bb b/recipes/chillispot/chillispot_1.0RC3.bb
index 4afd46f09a..7b060e00ee 100644
--- a/recipes/chillispot/chillispot_1.0RC3.bb
+++ b/recipes/chillispot/chillispot_1.0RC3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ChilliSpot is an open source captive portal or wireless LAN acces
 HOMEPAGE = "http://www.chillispot.org/"
 LICENSE = "GPL"
 SRC_URI = "http://www.chillispot.org/download/chillispot-${PV}.tar.gz \
-	file://no-ansi.patch;patch=1 \
+	file://no-ansi.patch \
 	file://init"
 RDEPENDS = "kernel-module-tun"
 
diff --git a/recipes/chromium/chromium_svn.bb b/recipes/chromium/chromium_svn.bb
index c6b9565b02..a71f947525 100644
--- a/recipes/chromium/chromium_svn.bb
+++ b/recipes/chromium/chromium_svn.bb
@@ -11,7 +11,7 @@ SRC_URI = "svn://src.chromium.org/svn/trunk/;module=src;proto=http \
            git://git.chromium.org/cros.git;protocol=git;rev=07f1fc0ce7a4bbd57f6b057435ad86f0a98e073d\
            http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz;name=depot \
            file://include.gypi \
-           file://gypi.patch;patch=1 \
+           file://gypi.patch \
 "
 
 SRC_URI[depot.md5sum] = "0d0f198a2b3c5495f75d95b867ae89b4"
diff --git a/recipes/clamav/clamav_0.95.3.bb b/recipes/clamav/clamav_0.95.3.bb
index 7df5a926d3..6431c68224 100644
--- a/recipes/clamav/clamav_0.95.3.bb
+++ b/recipes/clamav/clamav_0.95.3.bb
@@ -1,6 +1,6 @@
 require clamav.inc
 
-SRC_URI += "file://clamav-fix-_SC_PAGESIZE-missing.patch;patch=1"
+SRC_URI += "file://clamav-fix-_SC_PAGESIZE-missing.patch"
 
 SRC_URI[clamav-0.95.3.md5sum] = "eaf9fccc3cc3567605a9732313652967"
 SRC_URI[clamav-0.95.3.sha256sum] = "003e7a570932fdffbd19fa7a7996274fbfc93f890d26c3066a36eb824c906250"
diff --git a/recipes/clamsmtp/clamsmtp_1.8.bb b/recipes/clamsmtp/clamsmtp_1.8.bb
index 82b6a463bd..070d4afb83 100644
--- a/recipes/clamsmtp/clamsmtp_1.8.bb
+++ b/recipes/clamsmtp/clamsmtp_1.8.bb
@@ -11,7 +11,7 @@ RDEPENDS_${PN} = "clamav-daemon"
 PR = "r2"
 
 SRC_URI = "http://memberwebs.com/nielsen/software/clamsmtp/clamsmtp-${PV}.tar.gz \
-           file://update-config.patch;patch=1 \
+           file://update-config.patch \
            file://clamsmtp.init \
            file://doc.configure.txt"
 
diff --git a/recipes/classpath/classpath-initial_0.93.bb b/recipes/classpath/classpath-initial_0.93.bb
index 2837775897..28e3277a64 100644
--- a/recipes/classpath/classpath-initial_0.93.bb
+++ b/recipes/classpath/classpath-initial_0.93.bb
@@ -10,8 +10,8 @@ PR = "r6"
 DEPENDS = "zip-native fastjar-native jikes-native gettext-native"
 
 SRC_URI += "\
-	file://autotools.patch;patch=1 \
-	file://miscompilation-0.93.patch;patch=1 \
+	file://autotools.patch \
+	file://miscompilation-0.93.patch \
 	"
 
 EXTRA_OECONF = "\
diff --git a/recipes/classpath/classpath-minimal_0.96.1.bb b/recipes/classpath/classpath-minimal_0.96.1.bb
index 4b886ff5c1..2bdca7ce0b 100644
--- a/recipes/classpath/classpath-minimal_0.96.1.bb
+++ b/recipes/classpath/classpath-minimal_0.96.1.bb
@@ -3,8 +3,8 @@ require classpath.inc
 PR = "r7"
 
 SRC_URI += "\
-  file://gjar-prefix-patch.diff;patch=1;pnum=0 \
-  file://xmlstream-fix.patch;patch=1;pnum=0 \
+  file://gjar-prefix-patch.diff;striplevel=0 \
+  file://xmlstream-fix.patch;striplevel=0 \
   "
 
 PROVIDES = "${PN} classpath"
diff --git a/recipes/classpath/classpath-minimal_0.97.2.bb b/recipes/classpath/classpath-minimal_0.97.2.bb
index 5920109abc..ce5eb20e64 100644
--- a/recipes/classpath/classpath-minimal_0.97.2.bb
+++ b/recipes/classpath/classpath-minimal_0.97.2.bb
@@ -3,13 +3,13 @@ require classpath.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/${PBN}-${PV}"
 
 SRC_URI += "\
-  file://netif_16.patch;patch=1;pnum=0 \
-  file://SimpleName.diff;patch=1;pnum=0 \
-  file://javanet-local.patch;patch=1;pnum=0 \
-  file://ecj_java_dir.patch;patch=1 \
-  file://autotools.patch;patch=1 \
-  file://decimalformat.patch;patch=1 \
-  file://cp-byte-loophelper.patch;patch=1;pnum=0 \
+  file://netif_16.patch;striplevel=0 \
+  file://SimpleName.diff;striplevel=0 \
+  file://javanet-local.patch;striplevel=0 \
+  file://ecj_java_dir.patch \
+  file://autotools.patch \
+  file://decimalformat.patch \
+  file://cp-byte-loophelper.patch;striplevel=0 \
   "
 
 PR = "r3"
diff --git a/recipes/classpath/classpath-native.inc b/recipes/classpath/classpath-native.inc
index a2e19fdb14..6f737aee3c 100644
--- a/recipes/classpath/classpath-native.inc
+++ b/recipes/classpath/classpath-native.inc
@@ -37,6 +37,3 @@ EXTRA_OECONF = "\
   --with-vm=java \
   "
 
-do_stage() {
-	oe_runmake install
-}
diff --git a/recipes/classpath/classpath-native_0.97.2.bb b/recipes/classpath/classpath-native_0.97.2.bb
index bea4b7683b..19c07a0578 100644
--- a/recipes/classpath/classpath-native_0.97.2.bb
+++ b/recipes/classpath/classpath-native_0.97.2.bb
@@ -6,16 +6,16 @@ PR = "r7"
 # is usually not compiled. However if someone changes
 # to --enable-local-sockets it will.
 SRC_URI += "\
-  file://netif_16.patch;patch=1;pnum=0 \
-  file://SimpleName.diff;patch=1;pnum=0 \
-  file://javanet-local.patch;patch=1;pnum=0 \
-  file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \
-  file://ecj_java_dir.patch;patch=1 \
-  file://autotools.patch;patch=1 \
-  file://decimalformat.patch;patch=1 \
-  file://cp-byte-loophelper.patch;patch=1;pnum=0 \
-  file://miscompilation.patch;patch=1 \
-  file://toolwrapper-exithook.patch;patch=1 \
+  file://netif_16.patch;striplevel=0 \
+  file://SimpleName.diff;striplevel=0 \
+  file://javanet-local.patch;striplevel=0 \
+  file://sun-security-getproperty_0.96.1.patch;striplevel=0 \
+  file://ecj_java_dir.patch \
+  file://autotools.patch \
+  file://decimalformat.patch \
+  file://cp-byte-loophelper.patch;striplevel=0 \
+  file://miscompilation.patch \
+  file://toolwrapper-exithook.patch \
   "
 
 do_unpackpost() {
diff --git a/recipes/classpath/classpath-native_0.98.bb b/recipes/classpath/classpath-native_0.98.bb
index 44a1530675..a8d8276bcf 100644
--- a/recipes/classpath/classpath-native_0.98.bb
+++ b/recipes/classpath/classpath-native_0.98.bb
@@ -9,12 +9,12 @@ PR = "r3"
 # is usually not compiled. However if someone changes
 # to --enable-local-sockets it will.
 SRC_URI += "\
-  file://SimpleName.diff;patch=1;pnum=0 \
-  file://sun-security-getproperty.patch;patch=1;pnum=0 \
-  file://ecj_java_dir.patch;patch=1 \
-  file://autotools.patch;patch=1 \
-  file://miscompilation.patch;patch=1 \
-  file://toolwrapper-exithook.patch;patch=1 \
+  file://SimpleName.diff;striplevel=0 \
+  file://sun-security-getproperty.patch;striplevel=0 \
+  file://ecj_java_dir.patch \
+  file://autotools.patch \
+  file://miscompilation.patch \
+  file://toolwrapper-exithook.patch \
   "
 
 do_unpackpost() {
diff --git a/recipes/classpath/classpath_0.95.bb b/recipes/classpath/classpath_0.95.bb
index 0dfad33444..384636960f 100644
--- a/recipes/classpath/classpath_0.95.bb
+++ b/recipes/classpath/classpath_0.95.bb
@@ -1,9 +1,9 @@
 require classpath.inc
 
 SRC_URI += "\
-  file://gjar-prefix-patch.diff;patch=1;pnum=0 \
-  file://xmlstream-fix.patch;patch=1;pnum=0 \
-  file://javanet-local.patch;patch=1;pnum=0 \
+  file://gjar-prefix-patch.diff;striplevel=0 \
+  file://xmlstream-fix.patch;striplevel=0 \
+  file://javanet-local.patch;striplevel=0 \
   "
 
 PR = "r7"
diff --git a/recipes/classpath/classpath_0.96.1.bb b/recipes/classpath/classpath_0.96.1.bb
index 19e0059c7f..9751bbe8c1 100644
--- a/recipes/classpath/classpath_0.96.1.bb
+++ b/recipes/classpath/classpath_0.96.1.bb
@@ -1,9 +1,9 @@
 require classpath.inc
 
 SRC_URI += "\
-  file://gjar-prefix-patch.diff;patch=1;pnum=0 \
-  file://xmlstream-fix.patch;patch=1;pnum=0 \
-  file://javanet-local.patch;patch=1;pnum=0 \
+  file://gjar-prefix-patch.diff;striplevel=0 \
+  file://xmlstream-fix.patch;striplevel=0 \
+  file://javanet-local.patch;striplevel=0 \
   "
 
 PR = "r9"
diff --git a/recipes/classpath/classpath_0.97.2.bb b/recipes/classpath/classpath_0.97.2.bb
index d8f070c2d3..b53ba2b456 100644
--- a/recipes/classpath/classpath_0.97.2.bb
+++ b/recipes/classpath/classpath_0.97.2.bb
@@ -1,16 +1,16 @@
 require classpath.inc
 
 SRC_URI += "\
-  file://netif_16.patch;patch=1;pnum=0 \
-  file://SimpleName.diff;patch=1;pnum=0 \
-  file://javanet-local.patch;patch=1;pnum=0 \
-  file://ecj_java_dir.patch;patch=1 \
-  file://autotools.patch;patch=1 \
-  file://decimalformat.patch;patch=1 \
-  file://cp-byte-loophelper.patch;patch=1;pnum=0 \
-  file://drawpolyline.patch;patch=1;pnum=0 \
-  file://gtk-fix.patch;patch=1;pnum=0 \
-  file://toolwrapper-exithook.patch;patch=1 \
+  file://netif_16.patch;striplevel=0 \
+  file://SimpleName.diff;striplevel=0 \
+  file://javanet-local.patch;striplevel=0 \
+  file://ecj_java_dir.patch \
+  file://autotools.patch \
+  file://decimalformat.patch \
+  file://cp-byte-loophelper.patch;striplevel=0 \
+  file://drawpolyline.patch;striplevel=0 \
+  file://gtk-fix.patch;striplevel=0 \
+  file://toolwrapper-exithook.patch \
   "
 
 PR = "r10"
diff --git a/recipes/classpath/classpath_0.98.bb b/recipes/classpath/classpath_0.98.bb
index 693ed8b7a3..d64fa078bf 100644
--- a/recipes/classpath/classpath_0.98.bb
+++ b/recipes/classpath/classpath_0.98.bb
@@ -1,11 +1,11 @@
 require classpath.inc
 
 SRC_URI += "\
-  file://SimpleName.diff;patch=1;pnum=0 \
-  file://ecj_java_dir.patch;patch=1 \
-  file://autotools.patch;patch=1 \
-  file://fix-gmp.patch;patch=1 \
-  file://toolwrapper-exithook.patch;patch=1 \
+  file://SimpleName.diff;striplevel=0 \
+  file://ecj_java_dir.patch \
+  file://autotools.patch \
+  file://fix-gmp.patch \
+  file://toolwrapper-exithook.patch \
   "
 
 PR = "r3"
diff --git a/recipes/classpath/inetlib_1.1.1.bb b/recipes/classpath/inetlib_1.1.1.bb
index e4b782406c..362d0aa1cf 100644
--- a/recipes/classpath/inetlib_1.1.1.bb
+++ b/recipes/classpath/inetlib_1.1.1.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://gnu.org/software/classpath/inetlib.html"
 
 SRC_URI = "\
   http://ftp.gnu.org/gnu/classpath/${BP}.tar.gz \
-  file://datadir_java.patch;patch=1 \
+  file://datadir_java.patch \
   "
 
 inherit java-library autotools
diff --git a/recipes/classpathx/gnujaf_1.1.1.bb b/recipes/classpathx/gnujaf_1.1.1.bb
index f8f6440624..7ba6e67781 100644
--- a/recipes/classpathx/gnujaf_1.1.1.bb
+++ b/recipes/classpathx/gnujaf_1.1.1.bb
@@ -4,7 +4,7 @@ AUTHOR = "GNU ClasspathX"
 
 SRC_URI = "\
   http://ftp.gnu.org/gnu/classpathx/activation-${PV}.tar.gz \
-  file://datadir_java.patch;patch=1 \
+  file://datadir_java.patch \
   "
 
 # java-library must be last (it defines do_stage)
@@ -12,8 +12,6 @@ inherit autotools java-library
 
 S = "${WORKDIR}/activation-${PV}"
 
-DEPENDS = "fastjar-native"
-
 export JAVAC = "javac"
 
 # Fake javadoc
@@ -30,9 +28,5 @@ do_compile() {
   fastjar -C build -c -f ${JARFILENAME} .
 }
 
-do_install() {
-  java_install
-}
-
 SRC_URI[md5sum] = "de50d7728e8140eb404f2b4554321f8c"
 SRC_URI[sha256sum] = "b1b5ef560d30fcb11fbf537246857d14110ce4eb2b200d4c54690472305d87b7"
diff --git a/recipes/classpathx/gnumail_1.1.2.bb b/recipes/classpathx/gnumail_1.1.2.bb
index 7d2c9d39b5..cf85587015 100644
--- a/recipes/classpathx/gnumail_1.1.2.bb
+++ b/recipes/classpathx/gnumail_1.1.2.bb
@@ -4,7 +4,7 @@ AUTHOR = "GNU ClasspathX"
 
 SRC_URI = "\
   http://ftp.gnu.org/gnu/classpathx/mail-${PV}.tar.gz \
-  file://datadir_java.patch;patch=1 \
+  file://datadir_java.patch \
   "
 
 inherit java-library autotools
diff --git a/recipes/clearsilver/clearsilver_0.10.3.bb b/recipes/clearsilver/clearsilver_0.10.3.bb
index 529a23d176..fe7f28d0d4 100644
--- a/recipes/clearsilver/clearsilver_0.10.3.bb
+++ b/recipes/clearsilver/clearsilver_0.10.3.bb
@@ -6,7 +6,7 @@ DEPENDS = "python"
 PR = "r2"
 
 SRC_URI = "http://www.clearsilver.net/downloads/${P}.tar.gz \
-           file://crosscompile.patch;patch=1"
+           file://crosscompile.patch"
 
 EXTRA_OECONF = "--disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp --enable-gettext --with-python=${STAGING_BINDIR_NATIVE}/python"
 
diff --git a/recipes/clish/clish_0.7.3.bb b/recipes/clish/clish_0.7.3.bb
index 7241e13c60..71e36c2fd8 100644
--- a/recipes/clish/clish_0.7.3.bb
+++ b/recipes/clish/clish_0.7.3.bb
@@ -6,7 +6,7 @@ SECTION = "console/utils"
 PR ="r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/clish/clish-${PV}.tar.gz \
-           file://configure.patch;patch=1"
+           file://configure.patch"
 
 PARALLEL_MAKE=""
 
diff --git a/recipes/clutter/clutter-0.9_git.bb b/recipes/clutter/clutter-0.9_git.bb
index 039417c626..5bbd8a8367 100644
--- a/recipes/clutter/clutter-0.9_git.bb
+++ b/recipes/clutter/clutter-0.9_git.bb
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0"
 PR_append = "+git${SRCREV}"
 
 SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git \
-           file://enable_tests.patch;patch=1 "
+           file://enable_tests.patch "
 S = "${WORKDIR}/git"
 
 BASE_CONF += "--disable-introspection"
diff --git a/recipes/clutter/clutter-cairo_svn.bb b/recipes/clutter/clutter-cairo_svn.bb
index bd09579cdb..db270c123b 100644
--- a/recipes/clutter/clutter-cairo_svn.bb
+++ b/recipes/clutter/clutter-cairo_svn.bb
@@ -4,7 +4,7 @@ PV = "0.8.0+svnr${SRCPV}"
 SRCREV = "3210"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
-           file://enable_examples.patch;patch=1"
+           file://enable_examples.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/clutter/clutter-gst_0.4svn.bb b/recipes/clutter/clutter-gst_0.4svn.bb
index bf74893db6..35f94c2f5d 100644
--- a/recipes/clutter/clutter-gst_0.4svn.bb
+++ b/recipes/clutter/clutter-gst_0.4svn.bb
@@ -3,7 +3,7 @@ require clutter-gst.inc
 PV = "0.4.0+svnr${SRCPV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-4;proto=http \
-           file://autofoo-0.4.patch;patch=1"
+           file://autofoo-0.4.patch"
 
 
 S = "${WORKDIR}/clutter-gst-0-4"
diff --git a/recipes/clutter/clutter-gst_svn.bb b/recipes/clutter/clutter-gst_svn.bb
index 74798ac4a1..42dc2d81c6 100644
--- a/recipes/clutter/clutter-gst_svn.bb
+++ b/recipes/clutter/clutter-gst_svn.bb
@@ -4,6 +4,6 @@ PV = "0.8.0+svnr${SRCPV}"
 SRCREV = "3188"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
-           file://autofoo.patch;patch=1"
+           file://autofoo.patch"
 
 S = "${WORKDIR}/${PN}"
diff --git a/recipes/clutter/clutter-gtk-0.6_git.bb b/recipes/clutter/clutter-gtk-0.6_git.bb
index 0b0dd705a4..e37c4c9a82 100644
--- a/recipes/clutter/clutter-gtk-0.6_git.bb
+++ b/recipes/clutter/clutter-gtk-0.6_git.bb
@@ -1,7 +1,7 @@
 require clutter-gtk.inc
 
 SRCREV = "2ba362a1a223c2b28541030a80aa11191615340a"
-PV = "0.6.0+gitr${SRCPV}"
+PV = "0.6.0+git${SRCREV}"
 
 DEPENDS += "clutter-0.6"
 
diff --git a/recipes/clutter/clutter-gtk-0.8_git.bb b/recipes/clutter/clutter-gtk-0.8_git.bb
index d065cc9a2f..b06e2661a5 100644
--- a/recipes/clutter/clutter-gtk-0.8_git.bb
+++ b/recipes/clutter/clutter-gtk-0.8_git.bb
@@ -1,7 +1,7 @@
 require clutter-gtk.inc
 
 SRCREV = "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
-PV = "0.8.0+gitr${SRCPV}"
+PV = "0.8.0+git${SRCREV}"
 
 DEPENDS += "clutter"
 
diff --git a/recipes/clutter/clutter-gtk.inc b/recipes/clutter/clutter-gtk.inc
index 9d0efc9ac4..bbecee548c 100644
--- a/recipes/clutter/clutter-gtk.inc
+++ b/recipes/clutter/clutter-gtk.inc
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPL"
 
 DEPENDS = "gtk+"
-PE = "1"
 
 FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
 
diff --git a/recipes/clutter/clutter-gtk_git.bb b/recipes/clutter/clutter-gtk_git.bb
index 5fff33e90e..c3e3d49159 100644
--- a/recipes/clutter/clutter-gtk_git.bb
+++ b/recipes/clutter/clutter-gtk_git.bb
@@ -1,7 +1,7 @@
 require clutter-gst.inc
 
 SRCREV = "70f4b0cbd568dfa265484a03be3bd08ad15ed12e"
-PV = "0.9.0+gitr${SRCPV}"
+PV = "0.9.0+git${SRCREV}"
 PR = "r0"
 
 SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git"
diff --git a/recipes/clutter/clutter_0.4svn.bb b/recipes/clutter/clutter_0.4svn.bb
index aea2a4c350..9399180502 100644
--- a/recipes/clutter/clutter_0.4svn.bb
+++ b/recipes/clutter/clutter_0.4svn.bb
@@ -5,7 +5,7 @@ PR = "${INC_PR}.0"
 SRCREV = "3240"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \
-	   file://enable_tests-0.4.patch;patch=1 "
+	   file://enable_tests-0.4.patch "
 
 S = "${WORKDIR}/clutter-0-4"
 
diff --git a/recipes/clutter/clutter_0.6svn.bb b/recipes/clutter/clutter_0.6svn.bb
index 8bb56a7aa3..e86cbaf4a7 100644
--- a/recipes/clutter/clutter_0.6svn.bb
+++ b/recipes/clutter/clutter_0.6svn.bb
@@ -5,6 +5,6 @@ PR = "${INC_PR}.0"
 SRCREV = "3240"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=http \
-	   file://enable_tests-0.6.patch;patch=1 "
+	   file://enable_tests-0.6.patch "
 
 S = "${WORKDIR}/clutter-0-6"
diff --git a/recipes/clutter/clutter_0.8+git.bb b/recipes/clutter/clutter_0.8+git.bb
index 391e5fea35..b6f52cf4c3 100644
--- a/recipes/clutter/clutter_0.8+git.bb
+++ b/recipes/clutter/clutter_0.8+git.bb
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0"
 PR_append = "+gitr${CLUTTER_REV}"
 
 SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8;rev=${CLUTTER_REV} \
-           file://enable-tests-r2990.patch;patch=1"
+           file://enable-tests-r2990.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/clutter/clutter_svn.bb b/recipes/clutter/clutter_svn.bb
index 26eb359a5b..f2cd50be9d 100644
--- a/recipes/clutter/clutter_svn.bb
+++ b/recipes/clutter/clutter_svn.bb
@@ -7,8 +7,8 @@ PR = "${INC_PR}.0"
 SRCREV = "3240"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
-           file://enable_tests.patch;patch=1;maxrev=2989 \
-           file://enable-tests-r2990.patch;patch=1;minrev=2990"
+           file://enable_tests.patch;maxrev=2989 \
+           file://enable-tests-r2990.patch;minrev=2990"
 
 S = "${WORKDIR}/clutter"
 
diff --git a/recipes/clutter/moblin-proto_git.bb b/recipes/clutter/moblin-proto_git.bb
index 2e8ee93c5f..299cc17c6e 100644
--- a/recipes/clutter/moblin-proto_git.bb
+++ b/recipes/clutter/moblin-proto_git.bb
@@ -1,12 +1,12 @@
 DEPENDS = "clutter-box2d"
 
 SRCREV = "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
-PV = "0.0+gitr${SRCPV}"
+PV = "0.0+gitr${SRCREV}"
 PR = "r1"
-PE = "2"
+PE = "1"
 
 SRC_URI = "git://git.moblin.org/repos/users/pippin/prototype.git/;protocol=http \
-           file://paths.patch;patch=1"
+           file://paths.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/clutter/table_svn.bb b/recipes/clutter/table_svn.bb
index e02ff7368d..b4308d8b9f 100644
--- a/recipes/clutter/table_svn.bb
+++ b/recipes/clutter/table_svn.bb
@@ -4,7 +4,7 @@ SRCREV = "2191"
 PV = "0.3.0+svnr${SRCPV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=table;proto=http \
-           file://fixes.patch;patch=1"
+           file://fixes.patch"
 
 S = "${WORKDIR}/table"
 
diff --git a/recipes/clutter/tidy_svn.bb b/recipes/clutter/tidy_svn.bb
index 89d5a5a572..f81c788657 100644
--- a/recipes/clutter/tidy_svn.bb
+++ b/recipes/clutter/tidy_svn.bb
@@ -4,7 +4,7 @@ PV = "0.1.0+svnr${SRCPV}"
 PR = "6"
 
 SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \
-           file://tidy-enable-tests.patch;patch=1"
+           file://tidy-enable-tests.patch"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/cnc/openredalert_r438.bb b/recipes/cnc/openredalert_r438.bb
index 4723822685..8ff80e991d 100644
--- a/recipes/cnc/openredalert_r438.bb
+++ b/recipes/cnc/openredalert_r438.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 DEPENDS = "virtual/libsdl libsdl-mixer" 
 
 SRC_URI = "http://openredalert.googlecode.com/files/openredalert-${PV}-src.tar.gz \
-           file://gcc43-fix.patch;patch=1 \
+           file://gcc43-fix.patch \
            file://openredalert-launcher"
 
 PR = "r1"
diff --git a/recipes/commoncpp/commoncpp2_1.7.1.bb b/recipes/commoncpp/commoncpp2_1.7.1.bb
index f632d212f9..cd0c2825ec 100644
--- a/recipes/commoncpp/commoncpp2_1.7.1.bb
+++ b/recipes/commoncpp/commoncpp2_1.7.1.bb
@@ -5,7 +5,7 @@ PR="r2"
 PARALLEL_MAKE = ""
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/commoncpp/commoncpp2-${PV}.tar.gz \
-	file://configure.ac.patch;patch=1"
+	file://configure.ac.patch"
 
 inherit autotools pkgconfig autotools_stage binconfig
 
diff --git a/recipes/compcache/compcache_0.5+0.6pre3.bb b/recipes/compcache/compcache_0.5+0.6pre3.bb
index b8dafe7c22..24078fd535 100644
--- a/recipes/compcache/compcache_0.5+0.6pre3.bb
+++ b/recipes/compcache/compcache_0.5+0.6pre3.bb
@@ -5,9 +5,9 @@ LICENSE = "GPLv2"
 inherit module
 
 SRC_URI = "http://compcache.googlecode.com/files/${PN}-0.6pre3.tar.gz \
-	file://000-compcache-KERNELDIR.patch;patch=1 \
-	file://001-compcache-rzscontrol-cross-compile.patch;patch=1 \
-	file://002-compcache-modules-install.patch;patch=1 \
+	file://000-compcache-KERNELDIR.patch \
+	file://001-compcache-rzscontrol-cross-compile.patch \
+	file://002-compcache-modules-install.patch \
 	   "
 S = "${WORKDIR}/${PN}-0.6pre3"
 
diff --git a/recipes/compcache/compcache_0.6.bb b/recipes/compcache/compcache_0.6.bb
index a852403636..a3a0be791e 100644
--- a/recipes/compcache/compcache_0.6.bb
+++ b/recipes/compcache/compcache_0.6.bb
@@ -5,9 +5,9 @@ LICENSE = "GPLv2"
 inherit module
 
 SRC_URI = "http://compcache.googlecode.com/files/${PN}-${PV}.tar.gz \
-	file://003-compcache-0.6-KERNELDIR.patch;patch=1 \
-	file://001-compcache-rzscontrol-cross-compile.patch;patch=1 \
-	file://002-compcache-modules-install.patch;patch=1 \
+	file://003-compcache-0.6-KERNELDIR.patch \
+	file://001-compcache-rzscontrol-cross-compile.patch \
+	file://002-compcache-modules-install.patch \
 	   "
 TARGET_CC_ARCH += "${LDFLAGS}"
 
diff --git a/recipes/comprec/comprec_0.01.bb b/recipes/comprec/comprec_0.01.bb
index 3ec8558841..34ff9a45d6 100644
--- a/recipes/comprec/comprec_0.01.bb
+++ b/recipes/comprec/comprec_0.01.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 SRC_URI = "http://unimut.fsk.uni-heidelberg.de/demi/comprec/comprec-${PV}.tar.gz \
-	   file://makefile.patch;patch=1"
+	   file://makefile.patch"
 
 export AS = "${TARGET_PREFIX}as"
 
diff --git a/recipes/comprec/comprec_0.02.bb b/recipes/comprec/comprec_0.02.bb
index a96572c5c9..fadee9fc00 100644
--- a/recipes/comprec/comprec_0.02.bb
+++ b/recipes/comprec/comprec_0.02.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 SRC_URI = "http://unimut.fsk.uni-heidelberg.de/demi/comprec/comprec-${PV}.tar.gz \
-	   file://makefile.patch;patch=1"
+	   file://makefile.patch"
 
 export AS = "${TARGET_PREFIX}as"
 
diff --git a/recipes/confuse/confuse_2.5.bb b/recipes/confuse/confuse_2.5.bb
index 48f674ebf5..f4ce36972f 100644
--- a/recipes/confuse/confuse_2.5.bb
+++ b/recipes/confuse/confuse_2.5.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
 SECTION = "libs"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/confuse/confuse-${PV}.tar.gz \
-           file://build-only-library.patch;patch=1"
+           file://build-only-library.patch"
 S = "${WORKDIR}/confuse-${PV}"
 
 inherit autotools binconfig pkgconfig lib_package
diff --git a/recipes/connman/connman-gnome_0.4.bb b/recipes/connman/connman-gnome_0.4.bb
index 85640291ff..9c5e46b4eb 100644
--- a/recipes/connman/connman-gnome_0.4.bb
+++ b/recipes/connman/connman-gnome_0.4.bb
@@ -8,7 +8,7 @@ PR = "r7"
 RRECOMMENDS_${PN} = "connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi"
 
 SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \
-           file://phrase-lenght.diff;patch=1 \
+           file://phrase-lenght.diff \
            file://connman-applet.desktop"
 
 inherit autotools gtk-icon-cache
diff --git a/recipes/connman/connman_0.10.bb b/recipes/connman/connman_0.10.bb
deleted file mode 100644
index eb0cfaeb70..0000000000
--- a/recipes/connman/connman_0.10.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-require connman.inc
-PR = "r6"
-
-EXTRA_OECONF += "\
-  --disable-gtk-doc \
-  --enable-debug \
-  --enable-threads \
-  --enable-loopback \
-  --enable-ethernet \
-  --enable-wifi \
-  --disable-wimax \
-  --enable-bluetooth \
-  --enable-udhcp \
-  --enable-dhclient \
-  --enable-resolvconf \
-  --enable-dnsproxy \
-  --disable-novatel \
-  --disable-huawei \
-  --disable-hso \
-  --enable-ppp \
-# needs udev >= 129
-  --disable-udev \
-  --disable-polkit \
-  --enable-client \
-  --enable-fake \
-#  --with-udhcpc=PROGRAM \
-#  --with-dhclient=PROGRAM \
-#  --with-resolvconf=PROGRAM \
-#  --with-pppd=PROGRAM \
-"
-
-SRC_URI  = "\
-  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
-  file://connman \
-"
-
-
-SRC_URI[md5sum] = "094743343e062ea370fcd461aa48a7fe"
-SRC_URI[sha256sum] = "bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e"
diff --git a/recipes/connman/connman_0.12.bb b/recipes/connman/connman_0.12.bb
deleted file mode 100644
index 475171e0b7..0000000000
--- a/recipes/connman/connman_0.12.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-require connman.inc
-PR = "r0"
-
-EXTRA_OECONF += "\
-  --disable-gtk-doc \
-  --enable-debug \
-  --enable-threads \
-  --enable-loopback \
-  --enable-ethernet \
-  --enable-wifi \
-  --disable-wimax \
-  --enable-bluetooth \
-  --enable-udhcp \
-  --enable-dhclient \
-  --enable-resolvconf \
-  --enable-dnsproxy \
-  --disable-novatel \
-  --disable-huawei \
-  --disable-hso \
-  --enable-ppp \
-# needs udev >= 129
-  --disable-udev \
-  --disable-polkit \
-  --enable-client \
-  --enable-fake \
-#  --with-udhcpc=PROGRAM \
-#  --with-dhclient=PROGRAM \
-#  --with-resolvconf=PROGRAM \
-#  --with-pppd=PROGRAM \
-"
-
-SRC_URI  = "\
-  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
-  file://connman \
-"
-
-
-SRC_URI[md5sum] = "c0d27961dbdcb92b79dfde9c532dd348"
-SRC_URI[sha256sum] = "2dda1ba0d18e2b6de5fddd33a18324c8e75cddfc7df61595babfc19931fa4507"
diff --git a/recipes/connman/connman_0.14.bb b/recipes/connman/connman_0.14.bb
deleted file mode 100644
index 01277b63fa..0000000000
--- a/recipes/connman/connman_0.14.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-require connman.inc
-PR = "r0"
-
-EXTRA_OECONF += "\
-  --disable-gtk-doc \
-  --enable-debug \
-  --enable-threads \
-  --enable-loopback \
-  --enable-ethernet \
-  --enable-wifi \
-  --disable-wimax \
-  --enable-bluetooth \
-  --enable-udhcp \
-  --enable-dhclient \
-  --enable-resolvconf \
-  --enable-dnsproxy \
-  --disable-novatel \
-  --disable-huawei \
-  --disable-hso \
-  --enable-ppp \
-# needs udev >= 129
-  --disable-udev \
-  --disable-polkit \
-  --enable-client \
-  --enable-fake \
-#  --with-udhcpc=PROGRAM \
-#  --with-dhclient=PROGRAM \
-#  --with-resolvconf=PROGRAM \
-#  --with-pppd=PROGRAM \
-"
-
-SRC_URI  = "\
-  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
-  file://connman \
-"
-
-
-SRC_URI[md5sum] = "746dc6b68cb99536ed4e7f8d6125f02b"
-SRC_URI[sha256sum] = "79e7d8948e11b94ced41f030c495706baca4bd9dafdfe730cf537fd0907ed3ef"
diff --git a/recipes/connman/connman_0.15.bb b/recipes/connman/connman_0.15.bb
deleted file mode 100644
index a0f151ff57..0000000000
--- a/recipes/connman/connman_0.15.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-require connman.inc
-PR = "r1"
-
-EXTRA_OECONF += "\
-  --disable-gtk-doc \
-  --enable-debug \
-  --enable-threads \
-  --enable-loopback \
-  --enable-ethernet \
-  --enable-wifi \
-  --disable-wimax \
-  --enable-bluetooth \
-  --enable-udhcp \
-  --enable-dhclient \
-  --enable-resolvconf \
-  --enable-dnsproxy \
-  --disable-novatel \
-  --disable-huawei \
-  --disable-hso \
-  --enable-ppp \
-# needs udev >= 129
-  --disable-udev \
-  --disable-polkit \
-  --enable-client \
-  --enable-fake \
-#  --with-udhcpc=PROGRAM \
-#  --with-dhclient=PROGRAM \
-#  --with-resolvconf=PROGRAM \
-#  --with-pppd=PROGRAM \
-"
-
-SRC_URI  = "\
-  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
-  file://connman \
-"
-
-
-SRC_URI[md5sum] = "c7d5cbcdaaf98f194c2a59b26436ce34"
-SRC_URI[sha256sum] = "73f3b92c0f85ab2bf0f9bb18f928a8b84cacdbb459f3a530df540d4ddf134405"
diff --git a/recipes/connman/connman_0.16.bb b/recipes/connman/connman_0.16.bb
deleted file mode 100644
index 1e5391459a..0000000000
--- a/recipes/connman/connman_0.16.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require connman.inc
-
-EXTRA_OECONF += "\
-  --disable-gtk-doc \
-  --enable-debug \
-  --enable-threads \
-  --enable-loopback \
-  --enable-ethernet \
-  --enable-wifi \
-  --disable-wimax \
-  --enable-bluetooth \
-  --enable-udhcp \
-  --enable-dhclient \
-  --enable-resolvconf \
-  --enable-dnsproxy \
-  --disable-novatel \
-  --disable-huawei \
-  --disable-hso \
-  --enable-ppp \
-# needs udev >= 129
-  --disable-udev \
-  --disable-polkit \
-  --enable-client \
-  --enable-fake \
-#  --with-udhcpc=PROGRAM \
-#  --with-dhclient=PROGRAM \
-#  --with-resolvconf=PROGRAM \
-#  --with-pppd=PROGRAM \
-"
-
-SRC_URI  = "\
-  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
-  file://connman \
-"
-
-
-SRC_URI[md5sum] = "7bc5c89870d47c88f407fcfd666c739d"
-SRC_URI[sha256sum] = "102bb7a5d329dd6831bc8a923fa0b5d7634efa215e3d15377630d9b738df49da"
diff --git a/recipes/connman/connman_0.19.bb b/recipes/connman/connman_0.19.bb
deleted file mode 100644
index 0672e76513..0000000000
--- a/recipes/connman/connman_0.19.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-require connman.inc
-
-PR = "r1"
-
-EXTRA_OECONF += "\
-  --disable-gtk-doc \
-  --enable-debug \
-  --enable-threads \
-  --enable-loopback \
-  --enable-ethernet \
-  --enable-wifi \
-  --disable-wimax \
-  --enable-bluetooth \
-  --enable-udhcp \
-  --enable-dhclient \
-  --enable-resolvconf \
-  --enable-dnsproxy \
-  --disable-novatel \
-  --disable-huawei \
-  --disable-hso \
-  --enable-ppp \
-# needs udev >= 129
-  --disable-udev \
-  --disable-polkit \
-  --enable-client \
-  --enable-fake \
-#  --with-udhcpc=PROGRAM \
-#  --with-dhclient=PROGRAM \
-#  --with-resolvconf=PROGRAM \
-#  --with-pppd=PROGRAM \
-"
-
-SRC_URI  = "\
-  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
-  file://connman \
-"
-
-
-SRC_URI[md5sum] = "3d61c5db55d225c3efbf4c950dc0842f"
-SRC_URI[sha256sum] = "cc4a4b73d8d7b0e19dd2dd274ba91acb67b14c84fc448a921d1359e25e4d2df0"
diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb
index 862765fda9..a7bf286720 100644
--- a/recipes/connman/connman_0.46.bb
+++ b/recipes/connman/connman_0.46.bb
@@ -32,8 +32,8 @@ EXTRA_OECONF += "\
 
 SRC_URI  = "\
   http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
-  file://link-against-libnl2.patch;patch=1 \
-  file://no_system_user_perms.patch;patch=1 \
+  file://link-against-libnl2.patch \
+  file://no_system_user_perms.patch \
   file://connman \
 "
 
diff --git a/recipes/connman/connman_0.51.bb b/recipes/connman/connman_0.51.bb
index 2d13049b93..f1c50038b8 100644
--- a/recipes/connman/connman_0.51.bb
+++ b/recipes/connman/connman_0.51.bb
@@ -32,7 +32,7 @@ EXTRA_OECONF += "\
 
 SRC_URI  = "\
   http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
-  file://link-against-libnl2.patch;patch=1 \
+  file://link-against-libnl2.patch \
   file://connman \
 "
 
diff --git a/recipes/connman/connman_0.8.bb b/recipes/connman/connman_0.8.bb
deleted file mode 100644
index cfa3e9a492..0000000000
--- a/recipes/connman/connman_0.8.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-require connman.inc
-PR = "r4"
-
-EXTRA_OECONF += "\
-  --disable-gtk-doc \
-  --enable-debug \
-  --enable-threads \
-  --enable-loopback \
-  --enable-ethernet \
-  --enable-wifi \
-  --disable-wimax \
-  --enable-bluetooth \
-  --enable-udhcp \
-  --enable-dhclient \
-  --enable-resolvconf \
-  --enable-dnsproxy \
-  --disable-novatel \
-  --disable-huawei \
-  --disable-hso \
-  --enable-ppp \
-# needs udev >= 129
-  --disable-udev \
-  --disable-polkit \
-  --enable-client \
-  --enable-fake \
-#  --with-udhcpc=PROGRAM \
-#  --with-dhclient=PROGRAM \
-#  --with-resolvconf=PROGRAM \
-#  --with-pppd=PROGRAM \
-"
-
-SRC_URI  = "\
-  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
-  file://connman \
-"
-
-
-SRC_URI[md5sum] = "3f1995bf91846b601a25a37832c88cb6"
-SRC_URI[sha256sum] = "d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d"
diff --git a/recipes/connman/connman_0.9.bb b/recipes/connman/connman_0.9.bb
deleted file mode 100644
index bc5023aba8..0000000000
--- a/recipes/connman/connman_0.9.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-require connman.inc
-PR = "r4"
-
-EXTRA_OECONF += "\
-  --disable-gtk-doc \
-  --enable-debug \
-  --enable-threads \
-  --enable-loopback \
-  --enable-ethernet \
-  --enable-wifi \
-  --disable-wimax \
-  --enable-bluetooth \
-  --enable-udhcp \
-  --enable-dhclient \
-  --enable-resolvconf \
-  --enable-dnsproxy \
-  --disable-novatel \
-  --disable-huawei \
-  --disable-hso \
-  --enable-ppp \
-# needs udev >= 129
-  --disable-udev \
-  --disable-polkit \
-  --enable-client \
-  --enable-fake \
-#  --with-udhcpc=PROGRAM \
-#  --with-dhclient=PROGRAM \
-#  --with-resolvconf=PROGRAM \
-#  --with-pppd=PROGRAM \
-"
-
-SRC_URI  = "\
-  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
-  file://connman \
-"
-
-
-SRC_URI[md5sum] = "a5ebd17ff19e8f9b4d5e783d345d135b"
-SRC_URI[sha256sum] = "9c626bda7e2cc460cdbfe9a14c13208253de6922a341ef60ba51a673c0317996"
diff --git a/recipes/connman/files/use_nm_in_cross_compiling.patch b/recipes/connman/files/use_nm_in_cross_compiling.patch
deleted file mode 100644
index e9f2b29e3e..0000000000
--- a/recipes/connman/files/use_nm_in_cross_compiling.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: git/src/Makefile.am
-===================================================================
---- git.orig/src/Makefile.am	2008-09-18 16:48:44.000000000 +0800
-+++ git/src/Makefile.am	2008-09-18 16:49:54.000000000 +0800
-@@ -44,7 +44,11 @@
- MAINTAINERCLEANFILES = Makefile.in
- 
- connman.exp:
--	nm -B *.o | awk '{ print $$3 }' | sort -u | grep -E -e '^connman_' > $@
-+	if test -n $$host ; then \
-+		$(host)-nm -B *.o | awk '{ print $$3 }' | sort -u | grep -E -e '^connman_' > $@ ;\
-+	else \
-+		nm -B *.o | awk '{ print $$3 }' | sort -u | grep -E -e '^connman_' > $@ ;\
-+	fi 
- 
- connman.ver: connman.exp
- 	echo "{ global:" > $@
diff --git a/recipes/console-tools/console-tools_0.3.2.bb b/recipes/console-tools/console-tools_0.3.2.bb
index 6fb2e8dd06..5894a3af21 100644
--- a/recipes/console-tools/console-tools_0.3.2.bb
+++ b/recipes/console-tools/console-tools_0.3.2.bb
@@ -4,11 +4,11 @@ DESCRIPTION = "Allows you to set-up and manipulate the Linux console."
 PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
-           file://codepage.patch;patch=1 \
-           file://configure.patch;patch=1 \
-           file://compile.patch;patch=1 \
-           file://kbdrate.patch;patch=1 \
-           file://uclibc-fileno.patch;patch=1 \
+           file://codepage.patch \
+           file://configure.patch \
+           file://compile.patch \
+           file://kbdrate.patch \
+           file://uclibc-fileno.patch \
            file://config"
 
 export SUBDIRS = "fontfiletools vttools kbdtools screenfonttools contrib \
diff --git a/recipes/coreutils/coreutils-6.0.inc b/recipes/coreutils/coreutils-6.0.inc
index 0dd2512021..41f26cff72 100644
--- a/recipes/coreutils/coreutils-6.0.inc
+++ b/recipes/coreutils/coreutils-6.0.inc
@@ -2,6 +2,6 @@ require coreutils.inc
 
 SRC_URI = "\
   ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
-  file://futimens.patch;patch=1 \
-  file://coreutils-install-use-STRIP.patch;patch=1 \
+  file://futimens.patch \
+  file://coreutils-install-use-STRIP.patch \
 "
diff --git a/recipes/coreutils/coreutils-7.2.inc b/recipes/coreutils/coreutils-7.2.inc
index 7ab42213c9..d91a181429 100644
--- a/recipes/coreutils/coreutils-7.2.inc
+++ b/recipes/coreutils/coreutils-7.2.inc
@@ -1,4 +1,4 @@
 require coreutils.inc
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \
-           file://coreutils-7.2-fix-sort-segfault.patch;patch=1"
+           file://coreutils-7.2-fix-sort-segfault.patch"
diff --git a/recipes/coreutils/coreutils_6.0.bb b/recipes/coreutils/coreutils_6.0.bb
index 2cb147f211..32f0f1f702 100644
--- a/recipes/coreutils/coreutils_6.0.bb
+++ b/recipes/coreutils/coreutils_6.0.bb
@@ -4,8 +4,8 @@ require coreutils-target.inc
 PR = "r3"
 
 SRC_URI += "\
-  file://man.patch;patch=1 \
-  file://oe-old-tools.patch;patch=1 \
+  file://man.patch \
+  file://oe-old-tools.patch \
 "
 
 SRC_URI[md5sum] = "c15219721e6590fa13bf50af49e712c2"
diff --git a/recipes/coreutils/coreutils_7.1.bb b/recipes/coreutils/coreutils_7.1.bb
index 9a7f52ecef..539340f910 100644
--- a/recipes/coreutils/coreutils_7.1.bb
+++ b/recipes/coreutils/coreutils_7.1.bb
@@ -3,8 +3,8 @@ require coreutils-target.inc
 
 PR = "r0.1"
 
-SRC_URI += "file://automake-version.patch;patch=1 \
-            file://man.patch;patch=1"
+SRC_URI += "file://automake-version.patch \
+            file://man.patch"
 
 SRC_URI[md5sum] = "cbb2b3d1718ee1237b808e00b5c11b1e"
 SRC_URI[sha256sum] = "813cb19fa19a885f342664109c7c5810f0081b624ff317bba8d1b6ccd83c2a05"
diff --git a/recipes/coreutils/coreutils_7.2.bb b/recipes/coreutils/coreutils_7.2.bb
index 3a0fae5e5b..709bd4a67b 100644
--- a/recipes/coreutils/coreutils_7.2.bb
+++ b/recipes/coreutils/coreutils_7.2.bb
@@ -3,8 +3,8 @@ require coreutils-target.inc
 
 PR = "r0"
 
-SRC_URI += "file://automake-version.patch;patch=1 \
-            file://man.patch;patch=1"
+SRC_URI += "file://automake-version.patch \
+            file://man.patch"
 
 SRC_URI[md5sum] = "427c2914d3eab956f317c9ec6a45e62a"
 SRC_URI[sha256sum] = "dd77bfec92e5a3ad48abd8a5bda3f8d40149c4e24744e4173abc3cc6a731fdb2"
diff --git a/recipes/corkscrew/corkscrew_2.0.bb b/recipes/corkscrew/corkscrew_2.0.bb
index 0d05006a06..4602b8da2f 100644
--- a/recipes/corkscrew/corkscrew_2.0.bb
+++ b/recipes/corkscrew/corkscrew_2.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Tunnel SSH throught HTTP proxies"
 LICENSE = "GPL"
 SECTION = "console/network"
 SRC_URI = "http://www.agroman.net/corkscrew/corkscrew-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/corosync/corosync_1.2.0.bb b/recipes/corosync/corosync_1.2.1.bb
index 758f45577d..9ebea888c6 100644
--- a/recipes/corosync/corosync_1.2.0.bb
+++ b/recipes/corosync/corosync_1.2.1.bb
@@ -1,15 +1,17 @@
 DESCRIPTION = "OSI Certified implementation of a complete cluster engine"
 LICENSE = "BSD"
 
+PR = "r0"
+
 SRC_URI = " \
 	ftp://ftp@corosync.org/downloads/corosync-${PV}/corosync-${PV}.tar.gz;name=tar \
-	file://fix-lcrso-linkage.patch;patch=1 \
+	file://fix-lcrso-linkage.patch \
 	file://init \
 	file://corosync.conf \
 	file://volatiles \
 	"
-SRC_URI[tar.md5sum] = "789bea831a97977e56900477c3022cc1"
-SRC_URI[tar.sha256sum] = "3cee3be9f747c7031da9eafdffa5e3009513f4ac93ce021a49574e3de1fd93f0"
+SRC_URI[tar.md5sum] = "cba5eb5da41630f53e54b90c449c056d"
+SRC_URI[tar.sha256sum] = "d919d9817c4cde9e3d38e6f79731d9e1cd53485c6160bd253d888fa58a87a43d"
 
 inherit autotools_stage update-rc.d
 
diff --git a/recipes/corosync/files/corosync.conf b/recipes/corosync/files/corosync.conf
index 4caea969ec..f84679fe03 100644
--- a/recipes/corosync/files/corosync.conf
+++ b/recipes/corosync/files/corosync.conf
@@ -35,7 +35,7 @@ totem {
 
 logging {
 	fileline: off
-	to_stderr: yes
+	to_stderr: no
 	to_logfile: yes
 	to_syslog: yes
 	logfile: /var/log/corosync.log
diff --git a/recipes/corosync/files/volatiles b/recipes/corosync/files/volatiles
index d778fe10c9..2dc6eec99a 100644
--- a/recipes/corosync/files/volatiles
+++ b/recipes/corosync/files/volatiles
@@ -1,2 +1 @@
 d hacluster haclient 0755 /var/lib/corosync none
-
diff --git a/recipes/corsair/corsair_0.2.6.bb b/recipes/corsair/corsair_0.2.6.bb
index 5bd7c617fa..5bb7ee24c4 100644
--- a/recipes/corsair/corsair_0.2.6.bb
+++ b/recipes/corsair/corsair_0.2.6.bb
@@ -10,7 +10,7 @@ PR = "r1"
 inherit palmtop
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/corsair/corsair-${PV}.tar.gz \
-           file://corsair-opie.patch;patch=1"
+           file://corsair-opie.patch"
 
 S = "${WORKDIR}/corsair"
 
diff --git a/recipes/cpio/cpio_2.5.bb b/recipes/cpio/cpio_2.5.bb
index 6830900d54..b4504bac22 100644
--- a/recipes/cpio/cpio_2.5.bb
+++ b/recipes/cpio/cpio_2.5.bb
@@ -7,7 +7,7 @@ PR = "r5"
 DEPENDS += " texinfo-native "
 
 SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \
-	   file://install.patch;patch=1"
+	   file://install.patch"
 S = "${WORKDIR}/cpio-${PV}"
 
 inherit autotools
diff --git a/recipes/cpuburn/cpuburn_1.4.bb b/recipes/cpuburn/cpuburn_1.4.bb
index 5b40c14f06..048c450571 100644
--- a/recipes/cpuburn/cpuburn_1.4.bb
+++ b/recipes/cpuburn/cpuburn_1.4.bb
@@ -7,7 +7,7 @@ HOMEPAGE="http://pages.sbcglobal.net/redelm/"
 LICENSE="GPL"
 
 SRC_URI="http://pages.sbcglobal.net/redelm/${PN}_1_4_tar.gz \
-	file://gcc_CC.patch;patch=1"
+	file://gcc_CC.patch"
 
 python do_unpack () {
 	bb.build.exec_func('base_do_unpack', d)
diff --git a/recipes/cpufreqd/cpufreqd_1.1.2.bb b/recipes/cpufreqd/cpufreqd_1.1.2.bb
index 0f0a7ce93b..efbc7f33de 100644
--- a/recipes/cpufreqd/cpufreqd_1.1.2.bb
+++ b/recipes/cpufreqd/cpufreqd_1.1.2.bb
@@ -6,7 +6,7 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cpufreqd/cpufreqd-${PV}.tar.gz \
-	   file://nonrootinstall.patch;patch=1"
+	   file://nonrootinstall.patch"
 
 inherit autotools
 
diff --git a/recipes/cpufreqd/cpufrequtils_006.bb b/recipes/cpufreqd/cpufrequtils_006.bb
index 7fb45921e4..4574e396dc 100644
--- a/recipes/cpufreqd/cpufrequtils_006.bb
+++ b/recipes/cpufreqd/cpufrequtils_006.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "To make access to the Linux kernel cpufreq subsystem easier for u
 PR = "r1"
 
 SRC_URI = "http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-${PV}.tar.bz2 \
-           file://fix-proc-stat-reading.patch;patch=1 \
+           file://fix-proc-stat-reading.patch \
 "
 
 export CROSS = "${TARGET_PREFIX}"
diff --git a/recipes/cpusage/cpusage_0.1.bb b/recipes/cpusage/cpusage_0.1.bb
index 9f5d9a4d9b..3f4ddfcdcc 100644
--- a/recipes/cpusage/cpusage_0.1.bb
+++ b/recipes/cpusage/cpusage_0.1.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 SRC_URI = "http://www8.in.tum.de/~schneifa/group/sources/cpusage-${PV}.tar.gz \
-           file://cpusage.patch;patch=1"
+           file://cpusage.patch"
 
 S = "${WORKDIR}/cpusage-${PV}"
 
diff --git a/recipes/cramfs/cramfs-native_1.1.bb b/recipes/cramfs/cramfs-native_1.1.bb
index 7a0e7cbd4a..e3e2df557d 100644
--- a/recipes/cramfs/cramfs-native_1.1.bb
+++ b/recipes/cramfs/cramfs-native_1.1.bb
@@ -7,8 +7,8 @@ LICENSE="GPL"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cramfs/cramfs-1.1.tar.gz \
-	file://makefile.patch;patch=1 \
-	file://cramfs-andersee.patch;patch=1"
+	file://makefile.patch \
+	file://cramfs-andersee.patch"
 
 DEPENDS = "zlib-native"
 
diff --git a/recipes/cramfs/cramfs_1.1.bb b/recipes/cramfs/cramfs_1.1.bb
index 14c23859f2..2a08477ad4 100644
--- a/recipes/cramfs/cramfs_1.1.bb
+++ b/recipes/cramfs/cramfs_1.1.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2"
 DEPENDS = "zlib"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cramfs/cramfs-1.1.tar.gz \
-	file://makefile.patch;patch=1 \
-	file://cramfs-andersee.patch;patch=1"
+	file://makefile.patch \
+	file://cramfs-andersee.patch"
 
 do_compile() {
 	oe_runmake
diff --git a/recipes/crda/crda_1.1.1.bb b/recipes/crda/crda_1.1.1.bb
new file mode 100644
index 0000000000..8d6cf38661
--- /dev/null
+++ b/recipes/crda/crda_1.1.1.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Wireless Central Regulatory Domain Agent"
+HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "ISC"
+PR = "r0"
+
+DEPENDS = "libgcrypt libnl python-native python-m2crypto-native"
+RDEPENDS = "udev"
+
+SRC_URI = "http://wireless.kernel.org/download/crda/${P}.tar.bz2;name=crda \
+	http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/2009.11.25-regulatory.bin;name=reg \
+	"
+
+do_install() {
+	oe_runmake DESTDIR=${D} install
+	install -d ${D}/usr/lib/crda/
+	install -m 0644 ${WORKDIR}/2009.11.25-regulatory.bin ${D}/usr/lib/crda/regulatory.bin
+}
+
+SRC_URI[crda.md5sum] = "5fc77af68b3e21736b8ef2f8b061c810"
+SRC_URI[crda.sha256sum] = "59b4760da44a8f803caeaaa7fb97e0c6bd3f35f40445b28258e7f14c2fbe13b5"
+SRC_URI[reg.md5sum] = "873b5c55a26c8ba7674e083f51cb10aa"
+SRC_URI[reg.sha256sum] = "3ac77fa4d8034e4f5bc484adc4b073c3636dea26803e5e695cc54c15b629154a"
+
+FILES_${PN} += "\
+	/lib/udev/rules.d/85-regulatory.rules \
+	/usr/lib/crda/regulatory.bin \
+	"
diff --git a/recipes/crimsonfields/crimsonfields_0.4.8.bb b/recipes/crimsonfields/crimsonfields_0.4.8.bb
index 81366a81e9..94879b3d10 100644
--- a/recipes/crimsonfields/crimsonfields_0.4.8.bb
+++ b/recipes/crimsonfields/crimsonfields_0.4.8.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "http://crimson.seul.org/files/crimson-${PV}.tar.bz2 \
-           file://native-tools.patch;patch=1"
+           file://native-tools.patch"
 S = "${WORKDIR}/crimson-${PV}"
 
 inherit autotools
diff --git a/recipes/cron/cron_3.0pl1.bb b/recipes/cron/cron_3.0pl1.bb
index cc7af8be0d..685ad187c7 100644
--- a/recipes/cron/cron_3.0pl1.bb
+++ b/recipes/cron/cron_3.0pl1.bb
@@ -4,8 +4,8 @@ LICENSE = "cron"
 PR ="r8"
 
 SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \
-	   file://nonrootinstall.patch;patch=1 \
-	   file://time.patch;patch=1 \
+	   file://nonrootinstall.patch \
+	   file://time.patch \
 	   file://init"
 S = "${WORKDIR}/cron${PV}"
 
diff --git a/recipes/ctorrent/ctorrent_1.3.4.bb b/recipes/ctorrent/ctorrent_1.3.4.bb
index 02abb62181..991e090ea9 100644
--- a/recipes/ctorrent/ctorrent_1.3.4.bb
+++ b/recipes/ctorrent/ctorrent_1.3.4.bb
@@ -1,7 +1,7 @@
 require ctorrent.inc
 PR = "r6"
 
-SRC_URI += "file://extended_ctorrent.diff;patch=1"
+SRC_URI += "file://extended_ctorrent.diff"
 
 SRC_URI[md5sum] = "823010ec78215d476537c9eba9381cdd"
 SRC_URI[sha256sum] = "7e2ef5d0656ac23cecd03374d9b00291a55b274c972adfe94d6f41ae3ba60c73"
diff --git a/recipes/ctorrent/ctorrent_3.3.1.bb b/recipes/ctorrent/ctorrent_3.3.1.bb
index faa43e8f1a..efc2eca0d1 100644
--- a/recipes/ctorrent/ctorrent_3.3.1.bb
+++ b/recipes/ctorrent/ctorrent_3.3.1.bb
@@ -3,7 +3,7 @@ require ctorrent.inc
 DESCRIPTION += "This is the Enhanced version from the dtorrent project"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dtorrent/ctorrent-dnh${PV}.tar.gz \
-           file://CVE-2009-1759.patch;patch=1;pnum=0 "
+           file://CVE-2009-1759.patch;striplevel=0 "
 
 S = "${WORKDIR}/${PN}-dnh${PV}"
 PR="r1"
diff --git a/recipes/cumulus/cumulus_1.2.1.bb b/recipes/cumulus/cumulus_1.2.1.bb
index 3972c7cb67..e636a7ff6b 100644
--- a/recipes/cumulus/cumulus_1.2.1.bb
+++ b/recipes/cumulus/cumulus_1.2.1.bb
@@ -8,7 +8,7 @@ APPDESKTOP = "${S}"
 PR = "r1"
 
 SRC_URI = "http://www.kflog.org/fileadmin/user_upload/cumulus_downloads/${PV}/cumulus-${PV}.src.tar.bz2 \
-	file://open_max.patch;patch=1"
+	file://open_max.patch"
 S = "${WORKDIR}/cumulus_${PV}/cumulus"
 
 inherit opie
diff --git a/recipes/cups/cups_1.1.23.bb b/recipes/cups/cups_1.1.23.bb
index 705271a0c2..877187f587 100644
--- a/recipes/cups/cups_1.1.23.bb
+++ b/recipes/cups/cups_1.1.23.bb
@@ -6,7 +6,7 @@ INC_PR = "r7"
 PR = "${INC_PR}.1"
 
 SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
-           file://strftime_fix.patch;patch=1"
+           file://strftime_fix.patch"
 
 inherit autotools binconfig
 
diff --git a/recipes/cups/cups_1.3.8.bb b/recipes/cups/cups_1.3.8.bb
index f5c63f2dbc..fd37246b1c 100644
--- a/recipes/cups/cups_1.3.8.bb
+++ b/recipes/cups/cups_1.3.8.bb
@@ -1,6 +1,6 @@
 require cups.inc
 
-SRC_URI += "file://use_echo_only_in_init.patch;patch=1"
+SRC_URI += "file://use_echo_only_in_init.patch"
 PR = "${INC_PR}.1"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/cups/cups_1.4.3.bb b/recipes/cups/cups_1.4.3.bb
index b57d1c0994..c65cbb7d2f 100644
--- a/recipes/cups/cups_1.4.3.bb
+++ b/recipes/cups/cups_1.4.3.bb
@@ -1,8 +1,8 @@
 require cups14.inc
 
-SRC_URI += "file://use_echo_only_in_init.patch;patch=1 \
-		    file://skip_tools.patch;patch=1 \
-		    file://configure.patch;patch=1 \
+SRC_URI += "file://use_echo_only_in_init.patch \
+		    file://skip_tools.patch \
+		    file://configure.patch \
 			"
 
 SRC_URI[archive.md5sum] = "e70b1c3f60143d7310c1d74c111a21ab"
diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc
index 67614c8c28..0209e8dbf6 100644
--- a/recipes/curl/curl-common.inc
+++ b/recipes/curl/curl-common.inc
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 SECTION = "console/network"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2;name=tarball \
-           file://pkgconfig_fix.patch;patch=1"
+           file://pkgconfig_fix.patch"
 S = "${WORKDIR}/curl-${PV}"
 
 INC_PR = "r3"
diff --git a/recipes/curl/curl-native_7.18.2.bb b/recipes/curl/curl-native_7.18.2.bb
index 1274213ff4..28072deb3a 100644
--- a/recipes/curl/curl-native_7.18.2.bb
+++ b/recipes/curl/curl-native_7.18.2.bb
@@ -1,7 +1,7 @@
 require curl-common.inc
 inherit native
 DEPENDS = "zlib-native"
-SRC_URI += "file://curl-7.18.1-CVE-2009-2417.patch;patch=1;pnum=0"
+SRC_URI += "file://curl-7.18.1-CVE-2009-2417.patch;striplevel=0"
 
 PR = "${INC_PR}.2"
 
diff --git a/recipes/curl/curl_7.18.2.bb b/recipes/curl/curl_7.18.2.bb
index a90eeb7e08..d1985d5388 100644
--- a/recipes/curl/curl_7.18.2.bb
+++ b/recipes/curl/curl_7.18.2.bb
@@ -1,7 +1,7 @@
 require curl-common.inc
 require curl-target.inc
 
-SRC_URI += "file://curl-7.18.1-CVE-2009-2417.patch;patch=1;pnum=0"
+SRC_URI += "file://curl-7.18.1-CVE-2009-2417.patch;striplevel=0"
 
 PR = "${INC_PR}.2"
 
diff --git a/recipes/curl/curl_7.19.5.bb b/recipes/curl/curl_7.19.5.bb
index 4c4699fd70..2a720225a3 100644
--- a/recipes/curl/curl_7.19.5.bb
+++ b/recipes/curl/curl_7.19.5.bb
@@ -1,9 +1,9 @@
 require curl-common.inc
 require curl-target.inc
 
-SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0 \
-            file://curl-add_all_algorithms.patch;patch=1 \
-            file://curl-7.19.5-CVE-2009-2417.patch;patch=1;pnum=0"
+SRC_URI += "file://off_t_abi_fix.patch;striplevel=0 \
+            file://curl-add_all_algorithms.patch \
+            file://curl-7.19.5-CVE-2009-2417.patch;striplevel=0"
 
 PR = "${INC_PR}.2"
 
diff --git a/recipes/curl/curl_7.19.6.bb b/recipes/curl/curl_7.19.6.bb
index aceb2e543c..2a113c0992 100644
--- a/recipes/curl/curl_7.19.6.bb
+++ b/recipes/curl/curl_7.19.6.bb
@@ -1,7 +1,7 @@
 require curl-common.inc
 require curl-target.inc
 
-SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0"
+SRC_URI += "file://off_t_abi_fix.patch;striplevel=0"
 PR = "${INC_PR}.1"
 
 SRC_URI[tarball.md5sum] = "8402c1f654c51ad7287aad57c3aa79be"
diff --git a/recipes/curl/curl_7.19.7.bb b/recipes/curl/curl_7.19.7.bb
index 87e7ef9c28..500294f25f 100644
--- a/recipes/curl/curl_7.19.7.bb
+++ b/recipes/curl/curl_7.19.7.bb
@@ -1,7 +1,7 @@
 require curl-common.inc
 require curl-target.inc
 
-SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0"
+SRC_URI += "file://off_t_abi_fix.patch;striplevel=0"
 PR = "${INC_PR}"
 
 SRC_URI[tarball.md5sum] = "79a8fbb2eed5464b97bdf94bee109380"
diff --git a/recipes/curl/curl_7.20.0.bb b/recipes/curl/curl_7.20.0.bb
index 48248b2b77..a7864db6ad 100644
--- a/recipes/curl/curl_7.20.0.bb
+++ b/recipes/curl/curl_7.20.0.bb
@@ -4,7 +4,7 @@ require curl-target.inc
 PR = "${INC_PR}"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2;name=tarball \
-           file://off_t_abi_fix.patch;patch=1;pnum=0"
+           file://off_t_abi_fix.patch;striplevel=0"
 
 SRC_URI[tarball.md5sum] = "3dda78c4a808d9a779dc3a2ae81b47d8"
 SRC_URI[tarball.sha256sum] = "eb516915da615d8f6b2b855004d5d4b19c468f080e3736d7a73c5599b9acab11"
diff --git a/recipes/cvs/cvs_1.12.8.bb b/recipes/cvs/cvs_1.12.8.bb
index daa7fa1fbc..cab5dd2991 100644
--- a/recipes/cvs/cvs_1.12.8.bb
+++ b/recipes/cvs/cvs_1.12.8.bb
@@ -5,7 +5,7 @@ DEPENDS = ""
 LICENSE = "GPL"
 
 SRC_URI = "http://musthave.sunbase.org/progs/ccvs/Old/cvs-${PV}/cvs-${PV}.tar.bz2 \
-	   file://m4.patch;patch=1"
+	   file://m4.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/cvs/cvs_1.12.9.bb b/recipes/cvs/cvs_1.12.9.bb
index a5a3d149fe..b345a9c73a 100644
--- a/recipes/cvs/cvs_1.12.9.bb
+++ b/recipes/cvs/cvs_1.12.9.bb
@@ -5,7 +5,7 @@ DEPENDS = ""
 LICENSE = "GPL"
 
 SRC_URI = "http://musthave.sunbase.org/progs/ccvs/cvs-${PV}/cvs-${PV}.tar.bz2 \
-	   file://m4.patch;patch=1"
+	   file://m4.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb b/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb
index ba6a6284d7..37ddbebf06 100644
--- a/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -4,15 +4,15 @@ LICENSE = "BSD"
 PR = "r12"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
-           file://autotools.patch;patch=1 \
-           file://tail.patch;patch=1 \
-           file://imapopts.c.gcc4.patch;patch=1 \
-           file://imapopts.h.gcc4.patch;patch=1 \
+           file://autotools.patch \
+           file://tail.patch \
+           file://imapopts.c.gcc4.patch \
+           file://imapopts.h.gcc4.patch \
 	   file://cyrus \
 	   file://cyrus.conf_2.2 \
 	   file://imapd.conf_2.2 \
 	   file://volatiles \
-           file://remove-install-strip.patch;patch=1 \
+           file://remove-install-strip.patch \
 	   "
 
 inherit autotools update-rc.d
diff --git a/recipes/cyrus-imapd/cyrus-imapd_2.2.5.bb b/recipes/cyrus-imapd/cyrus-imapd_2.2.5.bb
index 350fd790d5..648ccea188 100644
--- a/recipes/cyrus-imapd/cyrus-imapd_2.2.5.bb
+++ b/recipes/cyrus-imapd/cyrus-imapd_2.2.5.bb
@@ -4,8 +4,8 @@ PR = "r2"
 LICENSE = "BSD"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/cyrus-imapd-${PV}.tar.gz \
-           file://autotools.patch;patch=1 \
-           file://tail.patch;patch=1"
+           file://autotools.patch \
+           file://tail.patch"
 
 inherit autotools
 
diff --git a/recipes/cyrus-sasl/cyrus-sasl_2.1.17.bb b/recipes/cyrus-sasl/cyrus-sasl_2.1.17.bb
index bc24679e63..47a26e0cb2 100644
--- a/recipes/cyrus-sasl/cyrus-sasl_2.1.17.bb
+++ b/recipes/cyrus-sasl/cyrus-sasl_2.1.17.bb
@@ -6,7 +6,7 @@ LICENSE = "BSD"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/cyrus-sasl/cyrus-sasl_2.1.19.bb b/recipes/cyrus-sasl/cyrus-sasl_2.1.19.bb
index ead7f1563b..d83670e91b 100644
--- a/recipes/cyrus-sasl/cyrus-sasl_2.1.19.bb
+++ b/recipes/cyrus-sasl/cyrus-sasl_2.1.19.bb
@@ -5,8 +5,8 @@ LICENSE = "BSD"
 PR = "r10"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \
-	   file://berkdb.m4.patch;patch=1 \
-	   file://client.c.patch;patch=1"
+	   file://berkdb.m4.patch \
+	   file://client.c.patch"
 
 inherit autotools
 
diff --git a/recipes/dash/dash_0.5.5.1.bb b/recipes/dash/dash_0.5.5.1.bb
index 51984ecd3b..319917d944 100644
--- a/recipes/dash/dash_0.5.5.1.bb
+++ b/recipes/dash/dash_0.5.5.1.bb
@@ -3,8 +3,8 @@ PROVIDES = "virtual/sh"
 LICENSE = "BSD GPL"
 
 SRC_URI = "http://ftp.debian.org/debian/pool/main/d/dash/dash_${PV}.orig.tar.gz;name=archive \
-	http://ftp.debian.org/debian/pool/main/d/dash/dash_${PV}-2.3.diff.gz;patch=1;name=patch \
-	file://makefile-build-cc.diff;patch=1"
+	http://ftp.debian.org/debian/pool/main/d/dash/dash_${PV}-2.3.diff.gz;name=patch \
+	file://makefile-build-cc.diff"
 
 SRC_URI[archive.md5sum] = "7ac832b440b91f5a52cf8eb68e172616"
 SRC_URI[archive.sha256sum] = "1c6717a1014c73aa16bc78a4767f1e00b40ff2a01a6c2cf2cce9a5335c24493f"
diff --git a/recipes/dasher/dasher-gpe_0.0-svn.bb b/recipes/dasher/dasher-gpe_0.0-svn.bb
index 1185b8514a..5ca02ca27d 100644
--- a/recipes/dasher/dasher-gpe_0.0-svn.bb
+++ b/recipes/dasher/dasher-gpe_0.0-svn.bb
@@ -5,7 +5,7 @@ SRCREV = "1251"
 DEPENDS = "libxsettings-client libglade libxtst gconf gtk+"
 SECTION = "gpe"
 SRC_URI = "svn://svn.gnome.org/svn/dasher;module=trunk \
-	file://configure-lossage.patch;patch=1"
+	file://configure-lossage.patch"
 
 S = "${WORKDIR}/trunk"
 FILES_${PN} += "${datadir}/dasher"
diff --git a/recipes/davfs2/davfs2_0.2.7.bb b/recipes/davfs2/davfs2_0.2.7.bb
index 9a620e4084..1ba7d43faa 100644
--- a/recipes/davfs2/davfs2_0.2.7.bb
+++ b/recipes/davfs2/davfs2_0.2.7.bb
@@ -9,9 +9,9 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \
-           file://no-func-checks.patch;patch=1 \
-           file://no-neon-version-test.patch;patch=1 \
-           file://Makefile.in.patch;patch=1 \
+           file://no-func-checks.patch \
+           file://no-neon-version-test.patch \
+           file://Makefile.in.patch \
            file://volatiles"
 
 inherit autotools
diff --git a/recipes/davfs2/davfs2_0.2.8.bb b/recipes/davfs2/davfs2_0.2.8.bb
index 415d764c2d..6cdef4b871 100644
--- a/recipes/davfs2/davfs2_0.2.8.bb
+++ b/recipes/davfs2/davfs2_0.2.8.bb
@@ -9,7 +9,7 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \
-           file://Makefile.in.patch;patch=1 \
+           file://Makefile.in.patch \
            file://volatiles"
 
 inherit autotools
diff --git a/recipes/db/db3_3.2.9.bb b/recipes/db/db3_3.2.9.bb
index 48b637f181..e1d3a128b4 100644
--- a/recipes/db/db3_3.2.9.bb
+++ b/recipes/db/db3_3.2.9.bb
@@ -12,7 +12,7 @@ CONFLICTS = "db"
 PROVIDES += "${VIRTUAL_NAME}"
 
 SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz \
-	   file://autofoo.patch;patch=1"
+	   file://autofoo.patch"
 S = "${WORKDIR}/db-${PV}/dist"
 B = "${WORKDIR}/db-${PV}/build_unix"
 
diff --git a/recipes/db/db_4.2.52.bb b/recipes/db/db_4.2.52.bb
index 54cd86a7ca..3b9bab83a8 100644
--- a/recipes/db/db_4.2.52.bb
+++ b/recipes/db/db_4.2.52.bb
@@ -5,7 +5,7 @@ PVM = "4.2"
 
 require db4.inc
 
-#TODO SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
+#TODO SRC_URI += "file://arm-thumb-mutex.patch"
 
 #configuration - set in local.conf to override
 DB4_CONFIG ?= " --disable-cryptography --disable-queue --disable-replication --disable-verify --enable-hash"
diff --git a/recipes/db/db_4.3.29.bb b/recipes/db/db_4.3.29.bb
index 1f563d753a..c5ecfde976 100644
--- a/recipes/db/db_4.3.29.bb
+++ b/recipes/db/db_4.3.29.bb
@@ -5,7 +5,7 @@ PVM = "4.3"
 
 require db4.inc
 
-SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
+SRC_URI += "file://arm-thumb-mutex.patch"
 
 #configuration - set in local.conf to override
 # All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
diff --git a/recipes/dbench/dbench_4.0.bb b/recipes/dbench/dbench_4.0.bb
index 39aba0a971..483a0bf8fc 100644
--- a/recipes/dbench/dbench_4.0.bb
+++ b/recipes/dbench/dbench_4.0.bb
@@ -7,8 +7,8 @@ PR = "r0"
 
 SRC_URI = "\
   http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \
-  file://destdir.patch;patch=1 \
-  file://makefile.patch;patch=1"
+  file://destdir.patch \
+  file://makefile.patch"
 
 inherit autotools
 
diff --git a/recipes/dbh/dbh_1.0-18.bb b/recipes/dbh/dbh_1.0-18.bb
index cc698bab7d..4f69104db9 100644
--- a/recipes/dbh/dbh_1.0-18.bb
+++ b/recipes/dbh/dbh_1.0-18.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dbh/dbh_${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 
 S="${WORKDIR}/dbh_${PV}"
 
diff --git a/recipes/dbus/dbus-c++-native_svn.bb b/recipes/dbus/dbus-c++-native_git.bb
index 5599aeb1d2..dd43f911fe 100644
--- a/recipes/dbus/dbus-c++-native_svn.bb
+++ b/recipes/dbus/dbus-c++-native_git.bb
@@ -1,4 +1,4 @@
-require dbus-c++_${PV}.bb
+require dbus-c++_git.bb
 inherit native
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-c++"
diff --git a/recipes/dbus/dbus-c++_svn.bb b/recipes/dbus/dbus-c++_git.bb
index 80e6f14e0a..7d9db3e7a6 100644
--- a/recipes/dbus/dbus-c++_svn.bb
+++ b/recipes/dbus/dbus-c++_git.bb
@@ -2,11 +2,14 @@ DESCRIPTION = "C++ bindings for dbus"
 LICENSE = "LGPL"
 SECTION = "libs"
 DEPENDS = "dbus dbus-c++-native expat"
-SRCREV = "13131"
+SRCREV = "530a887913d3b0dd7091eabb8eef8e3c279e3bb8"
 
-SRC_URI = "svn://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs;module=dbus;proto=http"
-#           file://fix-linking.patch;patch=1"
-S = "${WORKDIR}/dbus"
+PE = "1"
+PV = "0.5.0+gitr${SRCPV}"
+
+SRC_URI = "git://gitorious.org/dbus-cplusplus/mainline.git;protocol=git"
+#           file://fix-linking.patch"
+S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/dbus/dbus-daemon-proxy_git.bb b/recipes/dbus/dbus-daemon-proxy_git.bb
new file mode 100644
index 0000000000..99f4372b72
--- /dev/null
+++ b/recipes/dbus/dbus-daemon-proxy_git.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "dbus forwarding daemon"
+LICENSE = "GPL"
+DEPENDS = "dbus dbus-glib"
+SRCREV = "1226a0a1374628ff191f6d8a56000be5e53e7608"
+PV = "0.0.0+gitr${SRCPV}"
+
+SRC_URI = "git://git.collabora.co.uk/git/user/alban/dbus-daemon-proxy;protocol=git"
+S = "${WORKDIR}/git"
+
+do_compile() {
+	${CC} `pkg-config --cflags --libs dbus-glib-1` -o dbus-daemon-proxy dbus-daemon-proxy.c
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 dbus-daemon-proxy ${D}${bindir}
+}
+
diff --git a/recipes/dbus/dbus-glib-native_0.74.bb b/recipes/dbus/dbus-glib-native_0.74.bb
index 0fc745eb62..f41aec5a14 100644
--- a/recipes/dbus/dbus-glib-native_0.74.bb
+++ b/recipes/dbus/dbus-glib-native_0.74.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Message bus system for applications to talk to one another"
 LICENSE = "GPL"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://run-with-tmp-session-bus.patch;patch=1"
+	   file://run-with-tmp-session-bus.patch"
 
 inherit autotools pkgconfig gettext native
 
diff --git a/recipes/dbus/dbus-glib-native_0.76.bb b/recipes/dbus/dbus-glib-native_0.76.bb
index 06d7bace00..a40e3fa24b 100644
--- a/recipes/dbus/dbus-glib-native_0.76.bb
+++ b/recipes/dbus/dbus-glib-native_0.76.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://run-with-tmp-session-bus.patch;patch=1"
+	   file://run-with-tmp-session-bus.patch"
 
 inherit autotools pkgconfig gettext native
 
diff --git a/recipes/dbus/dbus-glib.inc b/recipes/dbus/dbus-glib.inc
index bfc7f7c037..54997c3845 100644
--- a/recipes/dbus/dbus-glib.inc
+++ b/recipes/dbus/dbus-glib.inc
@@ -7,8 +7,8 @@ INC_PR = "r1"
 
 SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz;name=archive \
-  file://no-introspect.patch;patch=1 \
-  file://no-examples.patch;patch=1 \
+  file://no-introspect.patch \
+  file://no-examples.patch \
 "
 
 inherit autotools pkgconfig gettext
diff --git a/recipes/dbus/dbus-glib_0.74.bb b/recipes/dbus/dbus-glib_0.74.bb
index c69c2452e1..149ebac702 100644
--- a/recipes/dbus/dbus-glib_0.74.bb
+++ b/recipes/dbus/dbus-glib_0.74.bb
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://no-examples.patch;patch=1 \
-	   file://no-introspect.patch;patch=1"
+	   file://no-examples.patch \
+	   file://no-introspect.patch"
 
 inherit autotools pkgconfig gettext
 
diff --git a/recipes/dbus/dbus-glib_0.76.bb b/recipes/dbus/dbus-glib_0.76.bb
index 982ffd070b..35975c8f8c 100644
--- a/recipes/dbus/dbus-glib_0.76.bb
+++ b/recipes/dbus/dbus-glib_0.76.bb
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://no-examples.patch;patch=1 \
-	   file://no-introspect.patch;patch=1"
+	   file://no-examples.patch \
+	   file://no-introspect.patch"
 
 inherit autotools pkgconfig gettext
 
diff --git a/recipes/dbus/dbus-glib_0.78.bb b/recipes/dbus/dbus-glib_0.78.bb
index f11d244a46..7cae6ad48c 100644
--- a/recipes/dbus/dbus-glib_0.78.bb
+++ b/recipes/dbus/dbus-glib_0.78.bb
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://no-examples.patch;patch=1 \
-	   file://no-introspect.patch;patch=1"
+	   file://no-examples.patch \
+	   file://no-introspect.patch"
 
 inherit autotools_stage gettext
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
diff --git a/recipes/dbus/dbus-native_1.0.3.bb b/recipes/dbus/dbus-native_1.0.3.bb
index faad448bf1..d883f0a2d0 100644
--- a/recipes/dbus/dbus-native_1.0.3.bb
+++ b/recipes/dbus/dbus-native_1.0.3.bb
@@ -12,9 +12,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
 
 SRC_URI = "\
   http://freedesktop.org/software/dbus/releases/dbus/dbus-${PV}.tar.gz \
-  file://cross.patch;patch=1 \
-  file://tmpdir.patch;patch=1 \
-  file://fedora-compile-fix.patch;patch=1 \
+  file://cross.patch \
+  file://tmpdir.patch \
+  file://fedora-compile-fix.patch \
   file://dbus-1.init \
 "
 
diff --git a/recipes/dbus/dbus-native_1.2.1.bb b/recipes/dbus/dbus-native_1.2.1.bb
index 2626095a43..97d27b3e9d 100644
--- a/recipes/dbus/dbus-native_1.2.1.bb
+++ b/recipes/dbus/dbus-native_1.2.1.bb
@@ -11,9 +11,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
 
 SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-  file://cross.patch;patch=1 \
-  file://tmpdir.patch;patch=1 \
-  file://fix-install-daemon.patch;patch=1 \
+  file://cross.patch \
+  file://tmpdir.patch \
+  file://fix-install-daemon.patch \
   file://dbus-1.init \
 "
 
diff --git a/recipes/dbus/dbus.inc b/recipes/dbus/dbus.inc
index 2c41eb12c9..ec66960ad3 100644
--- a/recipes/dbus/dbus.inc
+++ b/recipes/dbus/dbus.inc
@@ -8,10 +8,10 @@ INC_PR = "r18"
 
 SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz;name=dbus \
-  file://cross.patch;patch=1 \
-  file://tmpdir.patch;patch=1 \
-  file://fix-install-daemon.patch;patch=1 \
-  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;patch=1 \
+  file://cross.patch \
+  file://tmpdir.patch \
+  file://fix-install-daemon.patch \
+  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch \
   file://dbus-1.init \
 "
 
diff --git a/recipes/dbus/dbus_1.2.20.bb b/recipes/dbus/dbus_1.2.20.bb
index 0e96b74c54..43805a5ae2 100644
--- a/recipes/dbus/dbus_1.2.20.bb
+++ b/recipes/dbus/dbus_1.2.20.bb
@@ -2,9 +2,9 @@ include dbus.inc
 
 SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz;name=dbus \
-  file://tmpdir.patch;patch=1 \
-  file://fix-install-daemon.patch;patch=1 \
-  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;patch=1 \
+  file://tmpdir.patch \
+  file://fix-install-daemon.patch \
+  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch \
   file://dbus-1.init \
 "
 
diff --git a/recipes/dbus/dbus_1.2.22.bb b/recipes/dbus/dbus_1.2.22.bb
index 2e10ddebaf..35a5267f82 100644
--- a/recipes/dbus/dbus_1.2.22.bb
+++ b/recipes/dbus/dbus_1.2.22.bb
@@ -2,9 +2,9 @@ include dbus.inc
 
 SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz;name=dbus \
-  file://tmpdir.patch;patch=1 \
-  file://fix-install-daemon.patch;patch=1 \
-  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;patch=1 \
+  file://tmpdir.patch \
+  file://fix-install-daemon.patch \
+  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch \
   file://dbus-1.init \
 "
 
diff --git a/recipes/dbus/dbus_1.2.24.bb b/recipes/dbus/dbus_1.2.24.bb
index 0be93b07d5..4e408e7bd8 100644
--- a/recipes/dbus/dbus_1.2.24.bb
+++ b/recipes/dbus/dbus_1.2.24.bb
@@ -2,9 +2,9 @@ include dbus.inc
 
 SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz;name=dbus \
-  file://tmpdir.patch;patch=1 \
-  file://fix-install-daemon.patch;patch=1 \
-  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;patch=1 \
+  file://tmpdir.patch \
+  file://fix-install-daemon.patch \
+  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch \
   file://dbus-1.init \
 "
 
diff --git a/recipes/dbus/dbus_1.3.0.bb b/recipes/dbus/dbus_1.3.0.bb
index 77043e0e45..830816fd41 100644
--- a/recipes/dbus/dbus_1.3.0.bb
+++ b/recipes/dbus/dbus_1.3.0.bb
@@ -3,17 +3,17 @@ include dbus.inc
 SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
   \
-  file://will-1.patch;patch=1 \
-  file://will-2.patch;patch=1 \
-  file://will-3.patch;patch=1 \
-  file://will-4.patch;patch=1 \
-  file://will-5.patch;patch=1 \
-  file://will-6.patch;patch=1 \
+  file://will-1.patch \
+  file://will-2.patch \
+  file://will-3.patch \
+  file://will-4.patch \
+  file://will-5.patch \
+  file://will-6.patch \
   \
-  file://improve-threading-stability.patch;patch=1 \
-  file://tmpdir.patch;patch=1 \
-  file://fix-install-daemon.patch;patch=1 \
-  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;patch=1 \
+  file://improve-threading-stability.patch \
+  file://tmpdir.patch \
+  file://fix-install-daemon.patch \
+  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch \
   file://dbus-1.init \
 "            
 
diff --git a/recipes/dcop/dcopidl-native_3.5.8.bb b/recipes/dcop/dcopidl-native_3.5.8.bb
index a3028b2fc7..df3f761121 100644
--- a/recipes/dcop/dcopidl-native_3.5.8.bb
+++ b/recipes/dcop/dcopidl-native_3.5.8.bb
@@ -5,7 +5,7 @@ LICENSE     = "GPL"
 DEPENDS     = "uicmoc3-native"
 
 SRC_URI     = "ftp://download.kde.org/pub/kde/stable/${PV}/src/kdelibs-${PV}.tar.bz2 \
-	      file://dcopidl-compile.patch;patch=1 "
+	      file://dcopidl-compile.patch "
 S           = "${WORKDIR}/kdelibs-${PV}/dcop/dcopidl"
 
 inherit native qmake qt3e
diff --git a/recipes/dcop/dcopidl2cpp-native_3.5.8.bb b/recipes/dcop/dcopidl2cpp-native_3.5.8.bb
index 6fbca7a1c3..761ef87c92 100644
--- a/recipes/dcop/dcopidl2cpp-native_3.5.8.bb
+++ b/recipes/dcop/dcopidl2cpp-native_3.5.8.bb
@@ -6,7 +6,7 @@ DEPENDS     = "uicmoc3-native"
 
 SRC_URI     = "ftp://download.kde.org/pub/kde/stable/${PV}/src/kdelibs-${PV}.tar.bz2"
 #\
-#	      file://dcopidl-compile.patch;patch=1 "
+#	      file://dcopidl-compile.patch "
 S           = "${WORKDIR}/kdelibs-${PV}/dcop/dcopidl2cpp"
 
 inherit native qmake qt3e
diff --git a/recipes/dcron/dcron_2.3.3.bb b/recipes/dcron/dcron_2.3.3.bb
index 65e8f28fdb..6ee8fc92a3 100644
--- a/recipes/dcron/dcron_2.3.3.bb
+++ b/recipes/dcron/dcron_2.3.3.bb
@@ -5,8 +5,8 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/dcron-${PV}.tar.gz \
-	   file://compile.patch;patch=1 \
-	   file://strip.patch;patch=1"
+	   file://compile.patch \
+	   file://strip.patch"
 
 do_install () {
 	install -d ${D}${bindir} ${D}${sbindir} \
diff --git a/recipes/desktop-file-utils/desktop-file-utils_0.3.bb b/recipes/desktop-file-utils/desktop-file-utils_0.3.bb
index cfa52e33be..b4a35aeae6 100644
--- a/recipes/desktop-file-utils/desktop-file-utils_0.3.bb
+++ b/recipes/desktop-file-utils/desktop-file-utils_0.3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "popt glib-2.0"
 
 SRC_URI = "http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
+	   file://m4.patch"
 
 inherit autotools
 
diff --git a/recipes/detect-stylus/detect-stylus_0.13.bb b/recipes/detect-stylus/detect-stylus_0.13.bb
index 872880100d..dc11678676 100644
--- a/recipes/detect-stylus/detect-stylus_0.13.bb
+++ b/recipes/detect-stylus/detect-stylus_0.13.bb
@@ -10,9 +10,9 @@ RDEPENDS = "xrdb"
 DESCRIPTION = "Touchscreen detection utility"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
-           file://access.patch;patch=1;pnum=0 \
-	   file://extra-device-check.patch;patch=1 \
-	   file://correct-theme-name.patch;patch=1"
+           file://access.patch;striplevel=0 \
+	   file://extra-device-check.patch \
+	   file://correct-theme-name.patch"
 
 export CVSBUILD="no"
 
diff --git a/recipes/detect-stylus/detect-stylus_svn.bb b/recipes/detect-stylus/detect-stylus_svn.bb
index cc778c6f3e..c82ecd4c5c 100644
--- a/recipes/detect-stylus/detect-stylus_svn.bb
+++ b/recipes/detect-stylus/detect-stylus_svn.bb
@@ -9,8 +9,8 @@ PR = "r0"
 inherit gpe pkgconfig
 
 SRC_URI = "${GPE_SVN} \
-           file://detect-stylus-svn-build.patch;patch=1 \
-           file://install-detect-tsdevice.patch;patch=1"
+           file://detect-stylus-svn-build.patch \
+           file://install-detect-tsdevice.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/devhelp/devhelp_0.23.bb b/recipes/devhelp/devhelp_0.23.bb
index 34a5325a7f..a1e5531b48 100644
--- a/recipes/devhelp/devhelp_0.23.bb
+++ b/recipes/devhelp/devhelp_0.23.bb
@@ -5,8 +5,8 @@ PR = "r0"
 
 inherit gnome
 
-SRC_URI += "file://devhelp-includes.patch;patch=1 \
-	    file://devhelp-webkit.patch;patch=1"
+SRC_URI += "file://devhelp-includes.patch \
+	    file://devhelp-webkit.patch"
 
 PACKAGES += "gedit-plugin-${PN}"
 FILES_gedit-plugin-${PN} += "${libdir}/gedit-2"
diff --git a/recipes/device-mapper/device-mapper_1.01.04.bb b/recipes/device-mapper/device-mapper_1.01.04.bb
index 7f6cbc7e61..e761d4813f 100644
--- a/recipes/device-mapper/device-mapper_1.01.04.bb
+++ b/recipes/device-mapper/device-mapper_1.01.04.bb
@@ -8,7 +8,7 @@ PR = "r2"
 S = "${WORKDIR}/${PN}.${PV}"
 
 SRC_URI = "ftp://sources.redhat.com/pub/dm/device-mapper.${PV}.tgz \
-	   file://devmap-mknod-busybox.patch;patch=1"
+	   file://devmap-mknod-busybox.patch"
 
 inherit autotools update-rc.d
 
diff --git a/recipes/device-mapper/device-mapper_1.01.05.bb b/recipes/device-mapper/device-mapper_1.01.05.bb
index a313ae200a..ad9bf79f18 100644
--- a/recipes/device-mapper/device-mapper_1.01.05.bb
+++ b/recipes/device-mapper/device-mapper_1.01.05.bb
@@ -8,8 +8,8 @@ PR = "r4"
 S = "${WORKDIR}/${PN}.${PV}"
 
 SRC_URI = "ftp://sources.redhat.com/pub/dm/device-mapper.${PV}.tgz \
-	   file://devmap-mknod-busybox.patch;patch=1 \
-	   file://remove_insanity.patch;patch=1 "
+	   file://devmap-mknod-busybox.patch \
+	   file://remove_insanity.patch "
 
 inherit autotools update-rc.d
 
diff --git a/recipes/device-mapper/device-mapper_1.02.28.bb b/recipes/device-mapper/device-mapper_1.02.28.bb
index 8f1754524b..bd0cbb98ab 100644
--- a/recipes/device-mapper/device-mapper_1.02.28.bb
+++ b/recipes/device-mapper/device-mapper_1.02.28.bb
@@ -7,8 +7,8 @@ LICENSE = "GPL"
 S = "${WORKDIR}/${PN}.${PV}"
 
 SRC_URI = "ftp://sources.redhat.com/pub/dm/device-mapper.${PV}.tgz \
-       file://devmap-mknod-busybox.patch;patch=1 \
-	   file://remove_insanity.patch;patch=1 "
+       file://devmap-mknod-busybox.patch \
+	   file://remove_insanity.patch "
 
 inherit autotools_stage update-rc.d
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
diff --git a/recipes/dgen/dgen-sdl_1.23.bb b/recipes/dgen/dgen-sdl_1.23.bb
index c66503f19d..a7f033974e 100644
--- a/recipes/dgen/dgen-sdl_1.23.bb
+++ b/recipes/dgen/dgen-sdl_1.23.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 
 SRC_URI = "\
   http://pknet.com/~joe/${PN}-${PV}.tar.gz \
-  file://fix-configure-and-make.patch;patch=1 \
+  file://fix-configure-and-make.patch \
 "
 
 inherit autotools
diff --git a/recipes/dhcdbd/dhcdbd_1.14.bb b/recipes/dhcdbd/dhcdbd_1.14.bb
index 850ae5456f..69d11d6ed2 100644
--- a/recipes/dhcdbd/dhcdbd_1.14.bb
+++ b/recipes/dhcdbd/dhcdbd_1.14.bb
@@ -7,8 +7,8 @@ DEPENDS = "dbus"
 PR = "r1"
 
 SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \
-           file://dhcdbd-1.14-pkgconfig_dbus.patch;patch=1 \
-           file://dbus-api-fix.patch;patch=1 \
+           file://dhcdbd-1.14-pkgconfig_dbus.patch \
+           file://dbus-api-fix.patch \
            file://dhcdbd"
 
 do_compile() {
diff --git a/recipes/dhcdbd/dhcdbd_1.16.bb b/recipes/dhcdbd/dhcdbd_1.16.bb
index 61ebf8ae84..4acc05c401 100644
--- a/recipes/dhcdbd/dhcdbd_1.16.bb
+++ b/recipes/dhcdbd/dhcdbd_1.16.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "dbus"
 
 SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.gz \
-           file://dhcdbd-1.14-pkgconfig_dbus.patch;patch=1 \
+           file://dhcdbd-1.14-pkgconfig_dbus.patch \
            file://dhcdbd"
 
 do_compile() {
diff --git a/recipes/dhcdbd/dhcdbd_2.0.bb b/recipes/dhcdbd/dhcdbd_2.0.bb
index 4b0408f4df..b29bdad593 100644
--- a/recipes/dhcdbd/dhcdbd_2.0.bb
+++ b/recipes/dhcdbd/dhcdbd_2.0.bb
@@ -6,9 +6,9 @@ RDEPENDS = "dhcp-client"
 PR = "r1"
 
 SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \
-           file://dbus_connection_unref.patch;patch=1 \
-           file://paths.patch;patch=1 \
-           file://no-ext-options.patch;patch=1 \
+           file://dbus_connection_unref.patch \
+           file://paths.patch \
+           file://no-ext-options.patch \
            file://dhcdbd"
 
 inherit update-rc.d
diff --git a/recipes/dhcdbd/dhcdbd_3.0.bb b/recipes/dhcdbd/dhcdbd_3.0.bb
index 563155e021..e34665e64e 100644
--- a/recipes/dhcdbd/dhcdbd_3.0.bb
+++ b/recipes/dhcdbd/dhcdbd_3.0.bb
@@ -6,8 +6,8 @@ RDEPENDS = "dhcp-client"
 PR = "r1"
 
 SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \
-           file://dbus_connection_unref.patch;patch=1 \
-           file://paths.patch;patch=1 \
+           file://dbus_connection_unref.patch \
+           file://paths.patch \
            file://dhcdbd"
 
 inherit update-rc.d
diff --git a/recipes/dhclient/dhclient_2.0pl5.bb b/recipes/dhclient/dhclient_2.0pl5.bb
index 7b5e9b5597..6d1289959c 100644
--- a/recipes/dhclient/dhclient_2.0pl5.bb
+++ b/recipes/dhclient/dhclient_2.0pl5.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-2.0-history/dhcp-${PV}.tar.gz \
-	   file://make.patch;patch=1"
+	   file://make.patch"
 S = "${WORKDIR}/dhcp-${PV}"
 
 export BINDIR = "${sbindir}"
diff --git a/recipes/dhcp/dhcp3.inc b/recipes/dhcp/dhcp3.inc
index f099003bee..c719ec0475 100644
--- a/recipes/dhcp/dhcp3.inc
+++ b/recipes/dhcp/dhcp3.inc
@@ -5,10 +5,10 @@ LICENSE = "BSD"
 INC_PR = "r11"
 
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-${PV}.tar.gz \
-	   file://fixincludes.patch;patch=1 \
-	   file://useless-use-of-bash.patch;patch=1 \
-           file://dhclient-script-exit-status.dpatch;patch=1 \
-	   file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \
+	   file://fixincludes.patch \
+	   file://useless-use-of-bash.patch \
+           file://dhclient-script-exit-status.dpatch;apply=yes \
+	   file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
 	   file://init-relay file://default-relay \
 	   file://init-server file://default-server \
 	   file://dhclient.conf file://dhcpd.conf"
diff --git a/recipes/dhcp/dhcp_3.0.1.bb b/recipes/dhcp/dhcp_3.0.1.bb
index 9ed4c2b91c..28ba70d389 100644
--- a/recipes/dhcp/dhcp_3.0.1.bb
+++ b/recipes/dhcp/dhcp_3.0.1.bb
@@ -4,9 +4,9 @@ HOMEPAGE = "http://www.isc.org/"
 LICENSE = "BSD"
 PR = "r4"
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
-	   file://noattrmode.patch;patch=1 \
-	   file://fixincludes.patch;patch=1 \
-	   file://useless-use-of-bash.patch;patch=1 \
+	   file://noattrmode.patch \
+	   file://fixincludes.patch \
+	   file://useless-use-of-bash.patch \
 	   file://init-relay file://default-relay \
 	   file://init-server file://default-server \
 	   file://dhclient.conf file://dhcpd.conf"
diff --git a/recipes/dhcp/dhcp_3.0.2.bb b/recipes/dhcp/dhcp_3.0.2.bb
index f84a0a650b..9feec74988 100644
--- a/recipes/dhcp/dhcp_3.0.2.bb
+++ b/recipes/dhcp/dhcp_3.0.2.bb
@@ -1,11 +1,11 @@
 require dhcp3.inc
 
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
-	   file://noattrmode.patch;patch=1 \
-	   file://fixincludes.patch;patch=1 \
-	   file://useless-use-of-bash.patch;patch=1 \
-	   file://dhclient-script-exit-status.dpatch;patch=1 \
-	   file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \
+	   file://noattrmode.patch \
+	   file://fixincludes.patch \
+	   file://useless-use-of-bash.patch \
+	   file://dhclient-script-exit-status.dpatch;apply=yes \
+	   file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
 	   file://init-relay file://default-relay \
 	   file://init-server file://default-server \
 	   file://dhclient.conf file://dhcpd.conf"
diff --git a/recipes/dhcp/dhcp_3.1.2p1.bb b/recipes/dhcp/dhcp_3.1.2p1.bb
index e05417541b..1882de9fa6 100644
--- a/recipes/dhcp/dhcp_3.1.2p1.bb
+++ b/recipes/dhcp/dhcp_3.1.2p1.bb
@@ -1,10 +1,10 @@
 require dhcp3.inc
 
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-${PV}.tar.gz \
-	   file://fixincludes.patch;patch=1 \
-	   file://useless-use-of-bash.patch;patch=1 \
-	   file://dhclient-script-exit-status.dpatch;patch=1 \
-	   file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \
+	   file://fixincludes.patch \
+	   file://useless-use-of-bash.patch \
+	   file://dhclient-script-exit-status.dpatch;apply=yes \
+	   file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
 	   file://init-relay file://default-relay \
 	   file://init-server file://default-server \
 	   file://dhclient.conf file://dhcpd.conf"
diff --git a/recipes/dhcpcd/dhcpcd_1.3.22-pl4.bb b/recipes/dhcpcd/dhcpcd_1.3.22-pl4.bb
index 6211e5baab..a9f57b4707 100644
--- a/recipes/dhcpcd/dhcpcd_1.3.22-pl4.bb
+++ b/recipes/dhcpcd/dhcpcd_1.3.22-pl4.bb
@@ -10,8 +10,8 @@ PR = "r1"
 sbindir = "/sbin"
 
 SRC_URI = "http://www.phystech.com/ftp/dhcpcd-${PV}.tar.gz \
-	   file://config_dir.patch;patch=1 \
-	   file://paths.patch;patch=1"
+	   file://config_dir.patch \
+	   file://paths.patch"
 
 inherit autotools
 
diff --git a/recipes/dietlibc/dietlibc_0.31.bb b/recipes/dietlibc/dietlibc_0.31.bb
index 2b6d960782..b5da9ec70c 100644
--- a/recipes/dietlibc/dietlibc_0.31.bb
+++ b/recipes/dietlibc/dietlibc_0.31.bb
@@ -2,9 +2,9 @@ require dietlibc.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://ccache.patch;patch=1 \
-            file://ceil.patch;patch=1 \
-            file://ai_addrconfig.patch;patch=1 \
+SRC_URI += "file://ccache.patch \
+            file://ceil.patch \
+            file://ai_addrconfig.patch \
            "
 
 SRC_URI[md5sum] = "acb98d469ee932d902fdf6de07802b7c"
diff --git a/recipes/dietlibc/dietlibc_0.32.bb b/recipes/dietlibc/dietlibc_0.32.bb
index 19e4e7da7c..ce6c53fdb2 100644
--- a/recipes/dietlibc/dietlibc_0.32.bb
+++ b/recipes/dietlibc/dietlibc_0.32.bb
@@ -2,10 +2,10 @@ require dietlibc.inc
 
 PR = "${INC_PR}.2"
 
-SRC_URI += "file://ccache.patch;patch=1 \
-            file://ceil.patch;patch=1 \
-            file://diethome.patch;patch=1 \
-            file://getrlimit.patch;patch=1 \
+SRC_URI += "file://ccache.patch \
+            file://ceil.patch \
+            file://diethome.patch \
+            file://getrlimit.patch \
            " 
 
 
diff --git a/recipes/diffstat/diffstat_1.47.bb b/recipes/diffstat/diffstat_1.47.bb
index fcdbd562ad..16043e9f45 100644
--- a/recipes/diffstat/diffstat_1.47.bb
+++ b/recipes/diffstat/diffstat_1.47.bb
@@ -10,7 +10,7 @@ SECTION = "devel"
 # I'd rather rely on debian, and possible have the sources vanish, than risk
 # the sources _changing_ underneith us. -CL
 SRC_URI = "${DEBIAN_MIRROR}/main/d/diffstat/diffstat_${PV}.orig.tar.gz;name=archive \
-	   ${DEBIAN_MIRROR}/main/d/diffstat/diffstat_${PV}-1.diff.gz;patch=1;name=patch"
+	   ${DEBIAN_MIRROR}/main/d/diffstat/diffstat_${PV}-1.diff.gz;name=patch"
 S = "${WORKDIR}/diffstat-${PV}"
 
 inherit autotools
diff --git a/recipes/dillo/dillo2_0.6.6.bb b/recipes/dillo/dillo2_0.6.6.bb
index 3662c85ebd..48d3ae5394 100644
--- a/recipes/dillo/dillo2_0.6.6.bb
+++ b/recipes/dillo/dillo2_0.6.6.bb
@@ -4,9 +4,9 @@ LICENSE = "GPL"
 DEPENDS = "gtk+"
 RDEPENDS = "gdk-pixbuf-loader-xpm"
 SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.gz \
-         file://dillo2-gcc4.patch;patch=1;pnum=1 \
-         file://gtk2.patch;patch=1;pnum=1 \
-         file://fix_about_syntax.patch;patch=1;pnum=1 \
+         file://dillo2-gcc4.patch \
+         file://gtk2.patch \
+         file://fix_about_syntax.patch \
          file://dillo.desktop \
          file://dillo.png \
          file://dillorc"
diff --git a/recipes/dillo/dillo2_2.1.1.bb b/recipes/dillo/dillo2_2.1.1.bb
index 776fb6003e..b867072c50 100644
--- a/recipes/dillo/dillo2_2.1.1.bb
+++ b/recipes/dillo/dillo2_2.1.1.bb
@@ -8,7 +8,7 @@ RDEPENDS = "fltk2-images"
 SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \
          file://dillo.desktop \
          file://dillo.png"
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/dillo-${PV}/"
 
@@ -18,7 +18,7 @@ FILES_${PN} += " /usr/lib/dillo/ /usr/bin/dpid /usr/bin/dpidc "
 FILES_${PN}-dbg += " ${libdir}/dillo/dpi/*/.debug/"
 
 
-EXTRA_OECONF = "--enable-ipv6"
+EXTRA_OECONF = "--enable-ipv6 --enable-ssl"
 
 do_install_append() {
         install -d ${D}${datadir}/applications
diff --git a/recipes/dillo/dillo_0.8.6.bb b/recipes/dillo/dillo_0.8.6.bb
index 1f432b0cfc..bcfb8ea308 100644
--- a/recipes/dillo/dillo_0.8.6.bb
+++ b/recipes/dillo/dillo_0.8.6.bb
@@ -7,7 +7,7 @@ DEPENDS = "gtk+-1.2 libpng openssl"
 RCONFLICTS = "dillo2"
 PR = "r2"
 SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \
-         file://dillo-i18n.diff;patch=1 \
+         file://dillo-i18n.diff \
          file://dillo.desktop \
          file://dillo.png"
 
diff --git a/recipes/dircproxy/dircproxy_1.1.0.bb b/recipes/dircproxy/dircproxy_1.1.0.bb
index 430906983a..ec2a802367 100644
--- a/recipes/dircproxy/dircproxy_1.1.0.bb
+++ b/recipes/dircproxy/dircproxy_1.1.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI = "http://dircproxy.securiweb.net/pub/1.1/dircproxy-${PV}.tar.gz\
-           file://dircproxy.patch;patch=1"
+           file://dircproxy.patch"
 
 inherit autotools
 
diff --git a/recipes/directfb/directfb.inc b/recipes/directfb/directfb.inc
index 9066ff2218..f6508d7339 100644
--- a/recipes/directfb/directfb.inc
+++ b/recipes/directfb/directfb.inc
@@ -10,12 +10,12 @@ DEPENDS = "jpeg libpng freetype zlib tslib"
 
 SRC_URI = " \
     http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \
-    file://fix-pkgconfig-cflags.patch;patch=1 \
-    file://fix-font-missing-char.patch;patch=1 \
-    file://getpagesize.patch;patch=1 \
-    file://mkdfiff.patch;patch=1 \
-    file://dont-use-linux-config.patch;patch=1 \
-    file://ts_lib_autotools.patch;patch=1 \
+    file://fix-pkgconfig-cflags.patch \
+    file://fix-font-missing-char.patch \
+    file://getpagesize.patch \
+    file://mkdfiff.patch \
+    file://dont-use-linux-config.patch \
+    file://ts_lib_autotools.patch \
 "
 S = "${WORKDIR}/DirectFB-${PV}"
 
diff --git a/recipes/directfb/directfb_1.0.0.bb b/recipes/directfb/directfb_1.0.0.bb
index f10b533897..414bcfec09 100644
--- a/recipes/directfb/directfb_1.0.0.bb
+++ b/recipes/directfb/directfb_1.0.0.bb
@@ -1,7 +1,7 @@
 require directfb.inc
 
 
-SRC_URI += "file://fix-includes.patch;patch=1" 
+SRC_URI += "file://fix-includes.patch" 
 
 RV = "1.0-0"
 PR = "r6"
diff --git a/recipes/directfb/directfb_1.1.1.bb b/recipes/directfb/directfb_1.1.1.bb
index e6b747eac3..573e319c55 100644
--- a/recipes/directfb/directfb_1.1.1.bb
+++ b/recipes/directfb/directfb_1.1.1.bb
@@ -9,11 +9,11 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = " \
     http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \
-    file://fix-pkgconfig-cflags.patch;patch=1 \
-    file://fix-font-missing-char.patch;patch=1 \
-    file://mkdfiff.patch;patch=1 \
-    file://dont-use-linux-config.patch;patch=1 \
-    file://ts_lib_autotools.patch;patch=1 \
+    file://fix-pkgconfig-cflags.patch \
+    file://fix-font-missing-char.patch \
+    file://mkdfiff.patch \
+    file://dont-use-linux-config.patch \
+    file://ts_lib_autotools.patch \
 "
 
 EXTRA_OECONF = "\
diff --git a/recipes/directfb/directfb_1.2.3.bb b/recipes/directfb/directfb_1.2.3.bb
index 4f1f95e331..4581616061 100644
--- a/recipes/directfb/directfb_1.2.3.bb
+++ b/recipes/directfb/directfb_1.2.3.bb
@@ -7,10 +7,10 @@ DEPENDS += "sysfsutils"
 
 SRC_URI = " \
     http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \
-    file://directfb-1.2.x-fix-pkgconfig-cflags.patch;patch=1 \
-    file://mkdfiff.patch;patch=1 \
-    file://dont-use-linux-config.patch;patch=1 \
-    file://ts_lib_autotools.patch;patch=1 \
+    file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
+    file://mkdfiff.patch \
+    file://dont-use-linux-config.patch \
+    file://ts_lib_autotools.patch \
 "
 
 EXTRA_OECONF = "\
diff --git a/recipes/directfb/directfb_1.2.7.bb b/recipes/directfb/directfb_1.2.7.bb
index 7a0ebec7c3..06d8ea8e0b 100644
--- a/recipes/directfb/directfb_1.2.7.bb
+++ b/recipes/directfb/directfb_1.2.7.bb
@@ -7,10 +7,10 @@ DEPENDS += "sysfsutils"
 
 SRC_URI = " \
     http://directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \
-    file://directfb-1.2.x-fix-pkgconfig-cflags.patch;patch=1 \
-    file://mkdfiff.patch;patch=1 \
-    file://dont-use-linux-config.patch;patch=1 \
-    file://ts_lib_autotools.patch;patch=1 \
+    file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
+    file://mkdfiff.patch \
+    file://dont-use-linux-config.patch \
+    file://ts_lib_autotools.patch \
 "
 
 EXTRA_OECONF = "\
diff --git a/recipes/directfb/directfb_1.2.8.bb b/recipes/directfb/directfb_1.2.8.bb
index 2ef2a2b137..35eb7c63a1 100644
--- a/recipes/directfb/directfb_1.2.8.bb
+++ b/recipes/directfb/directfb_1.2.8.bb
@@ -6,10 +6,10 @@ DEPENDS += "sysfsutils"
 
 SRC_URI = " \
     http://directfb.org/downloads/Core/DirectFB-1.2/DirectFB-${PV}.tar.gz \
-    file://directfb-1.2.x-fix-pkgconfig-cflags.patch;patch=1 \
-    file://mkdfiff.patch;patch=1 \
-    file://dont-use-linux-config.patch;patch=1 \
-    file://ts_lib_autotools.patch;patch=1 \
+    file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
+    file://mkdfiff.patch \
+    file://dont-use-linux-config.patch \
+    file://ts_lib_autotools.patch \
 "
 
 EXTRA_OECONF = "\
diff --git a/recipes/directfb/directfb_1.4.1.bb b/recipes/directfb/directfb_1.4.1.bb
index ef3b0dff49..cc0e4c0735 100644
--- a/recipes/directfb/directfb_1.4.1.bb
+++ b/recipes/directfb/directfb_1.4.1.bb
@@ -6,10 +6,10 @@ DEPENDS += "sysfsutils"
 
 SRC_URI = " \
     http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${PV}.tar.gz \
-    file://directfb-1.2.x-fix-pkgconfig-cflags.patch;patch=1 \
-    file://mkdfiff.patch;patch=1 \
-    file://dont-use-linux-config.patch;patch=1 \
-    file://ts_lib_autotools.patch;patch=1 \
+    file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
+    file://mkdfiff.patch \
+    file://dont-use-linux-config.patch \
+    file://ts_lib_autotools.patch \
 "
 
 EXTRA_OECONF = "\
diff --git a/recipes/directfb/directfb_1.4.2.bb b/recipes/directfb/directfb_1.4.2.bb
index af2da86b9a..d56bce5ac6 100644
--- a/recipes/directfb/directfb_1.4.2.bb
+++ b/recipes/directfb/directfb_1.4.2.bb
@@ -6,10 +6,10 @@ DEPENDS += "sysfsutils"
 
 SRC_URI = " \
     http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${PV}.tar.gz \
-    file://directfb-1.2.x-fix-pkgconfig-cflags.patch;patch=1 \
-    file://mkdfiff.patch;patch=1 \
-    file://dont-use-linux-config.patch;patch=1 \
-    file://ts_lib_autotools.patch;patch=1 \
+    file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
+    file://mkdfiff.patch \
+    file://dont-use-linux-config.patch \
+    file://ts_lib_autotools.patch \
 "
 
 EXTRA_OECONF = "\
diff --git a/recipes/directfb/fusionsound_1.1.0+git20070709.bb b/recipes/directfb/fusionsound_1.1.0+git20070709.bb
index dda1de5333..50f093c6ba 100644
--- a/recipes/directfb/fusionsound_1.1.0+git20070709.bb
+++ b/recipes/directfb/fusionsound_1.1.0+git20070709.bb
@@ -5,8 +5,8 @@ LICENSE = "LGPL"
 PR = "r2"
 
 SRC_URI = "git://git.directfb.org/git/directfb/core/FusionSound;protocol=git;tag=0b2162b570c8314fd1240b08d6ab4a8d074ccf37 \
-	   file://fix-pkgconfig-cflags.patch;patch=1 \
-	   file://use_limits_h.patch;patch=1 \
+	   file://fix-pkgconfig-cflags.patch \
+	   file://use_limits_h.patch \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/disko/disko_1.6.0.bb b/recipes/disko/disko_1.6.0.bb
index 4b5a44b272..4e43ec068d 100644
--- a/recipes/disko/disko_1.6.0.bb
+++ b/recipes/disko/disko_1.6.0.bb
@@ -7,7 +7,7 @@ require disko.inc
 DEPENDS += "taglib directfb virtual/libx11 hal libxv libxxf86vm"
 
 SRC_URI = "http://www.diskohq.org/downloads/${PN}-${PV}.tar.gz \
-	   file://pkgconfig.patch;patch=1 \
+	   file://pkgconfig.patch \
 	  "
 
 do_compile() {
diff --git a/recipes/disko/disko_git.bb b/recipes/disko/disko_git.bb
index 6a301bc390..71d694da1e 100644
--- a/recipes/disko/disko_git.bb
+++ b/recipes/disko/disko_git.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Disko is an application framework, that can be used to develop GUI applications for embedded devices. It is closely connected to the DirectFB"
 LICENSE = "GPL"
 SRCREV = "f52597b8d5d584811cbe8f9e0bf25ea372526953"
-PV = "1.6.1+gitr${SRCPV}"
-PE = "1"
+PV = "1.6.1+gitr${SRCREV}"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
@@ -12,7 +11,7 @@ require disko.inc
 DEPENDS += "taglib directfb virtual/libx11 hal libxv libxxf86vm"
 
 SRC_URI = "git://www.diskohq.org/disko.git;protocol=git \
-	   file://pkgconfig.patch;patch=1 \
+	   file://pkgconfig.patch \
 	  "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/distcc/distcc_2.18.3.bb b/recipes/distcc/distcc_2.18.3.bb
index 4f59d2787a..0034a06b1c 100644
--- a/recipes/distcc/distcc_2.18.3.bb
+++ b/recipes/distcc/distcc_2.18.3.bb
@@ -8,8 +8,8 @@ DEPENDS = "avahi gtk+"
 RRECOMMENDS = "avahi-daemon"
 
 SRC_URI = "http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2 \
-	   file://distcc-avahi.patch;patch=1 \
-	   file://no-man.patch;patch=1 \
+	   file://distcc-avahi.patch \
+	   file://no-man.patch \
            file://default \
 	   file://distccmon-gnome.desktop \
 	   file://distcc"
diff --git a/recipes/djvulibre/djvulibre_3.5.20.bb b/recipes/djvulibre/djvulibre_3.5.20.bb
index 2dc3fd1639..e427a729dc 100644
--- a/recipes/djvulibre/djvulibre_3.5.20.bb
+++ b/recipes/djvulibre/djvulibre_3.5.20.bb
@@ -4,7 +4,7 @@ DEPENDS = "jpeg libpng tiff"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
-           file://fix-cross-configure.patch;patch=1"
+           file://fix-cross-configure.patch"
 
 inherit qt4x11 autotools pkgconfig
 
diff --git a/recipes/djvulibre/djvulibre_3.5.21.bb b/recipes/djvulibre/djvulibre_3.5.21.bb
index ae70ac2fc6..ce57cf0d9d 100644
--- a/recipes/djvulibre/djvulibre_3.5.21.bb
+++ b/recipes/djvulibre/djvulibre_3.5.21.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "jpeg libpng tiff"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
-           file://fix-cross-configure.patch;patch=1"
+           file://fix-cross-configure.patch"
 
 inherit qt4x11 autotools pkgconfig
 
diff --git a/recipes/dmalloc/dmalloc_5.5.2.bb b/recipes/dmalloc/dmalloc_5.5.2.bb
index ce6217b640..614201db8c 100644
--- a/recipes/dmalloc/dmalloc_5.5.2.bb
+++ b/recipes/dmalloc/dmalloc_5.5.2.bb
@@ -5,7 +5,7 @@ LICENSE = "CCSA"
 
 SRC_URI = "\
   http://dmalloc.com/releases/dmalloc-${PV}.tgz \
-  file://configure-pagesize-HACK.patch;patch=1 \
+  file://configure-pagesize-HACK.patch \
 # HACK we ship a preconfigured conf.h since otherwise it misses a whole lot of stuff and compilation fails.
 # TODO find out why and get rid of it
   file://conf.h \
diff --git a/recipes/dosbox/dosbox.inc b/recipes/dosbox/dosbox.inc
index 9cad5f35cd..18110efea3 100644
--- a/recipes/dosbox/dosbox.inc
+++ b/recipes/dosbox/dosbox.inc
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/dosbox/dosbox-${PV}.tar.gz \
-	file://nocdrom.patch;patch=1"
+	file://nocdrom.patch"
 
 CXXFLAGS_append = " -DC_SDL_NOCDROM"
 
diff --git a/recipes/dosbox/dosbox_0.72.bb b/recipes/dosbox/dosbox_0.72.bb
index 28eb9023da..dbd8cec872 100644
--- a/recipes/dosbox/dosbox_0.72.bb
+++ b/recipes/dosbox/dosbox_0.72.bb
@@ -2,7 +2,7 @@ require dosbox.inc
 
 PR = "r1"
 
-SRC_URI += "file://gcc-4.3.patch;patch=1"
+SRC_URI += "file://gcc-4.3.patch"
 
 
 SRC_URI[md5sum] = "262939cc28966c1f9b07c2bc472b699f"
diff --git a/recipes/dosfstools/dosfstools-native_2.10.bb b/recipes/dosfstools/dosfstools-native_2.10.bb
index 0aae86beb9..c61e33d2e9 100644
--- a/recipes/dosfstools/dosfstools-native_2.10.bb
+++ b/recipes/dosfstools/dosfstools-native_2.10.bb
@@ -10,14 +10,14 @@ S="${WORKDIR}/dosfstools-${PV}"
 PR ="r4"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
-	file://mkdosfs-bootcode.patch;patch=1 \
-	file://mkdosfs-dir.patch;patch=1 \
-	file://alignment_hack.patch;patch=1 \
-	file://dosfstools-2.10-kernel-2.6.patch;patch=1 \
-	file://msdos_fat12_undefined.patch;patch=1 \
-	file://dosfstools-msdos_fs-types.patch;patch=1 \
-	file://include-linux-types.patch;patch=1 \
-	file://2.6.20-syscall.patch;patch=1"
+	file://mkdosfs-bootcode.patch \
+	file://mkdosfs-dir.patch \
+	file://alignment_hack.patch \
+	file://dosfstools-2.10-kernel-2.6.patch \
+	file://msdos_fat12_undefined.patch \
+	file://dosfstools-msdos_fs-types.patch \
+	file://include-linux-types.patch \
+	file://2.6.20-syscall.patch"
 
 inherit native
 
diff --git a/recipes/dosfstools/dosfstools_2.10.bb b/recipes/dosfstools/dosfstools_2.10.bb
index 119a4c3115..bc5a87ead3 100644
--- a/recipes/dosfstools/dosfstools_2.10.bb
+++ b/recipes/dosfstools/dosfstools_2.10.bb
@@ -11,10 +11,10 @@ LICENSE = "GPLv2"
 PR = "r2"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
-	   file://alignment_hack.patch;patch=1 \
-	   file://dosfstools-2.10-kernel-2.6.patch;patch=1 \
-           file://msdos_fat12_undefined.patch;patch=1 \
-	   file://include-linux-types.patch;patch=1"
+	   file://alignment_hack.patch \
+	   file://dosfstools-2.10-kernel-2.6.patch \
+           file://msdos_fat12_undefined.patch \
+	   file://include-linux-types.patch"
 
 do_install () {
 	oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
diff --git a/recipes/dosfstools/dosfstools_2.11.bb b/recipes/dosfstools/dosfstools_2.11.bb
index cb70a9f54f..211912a116 100644
--- a/recipes/dosfstools/dosfstools_2.11.bb
+++ b/recipes/dosfstools/dosfstools_2.11.bb
@@ -11,9 +11,9 @@ LICENSE = "GPLv2"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
-	   file://alignment_hack.patch;patch=1 \
-           file://msdos_fat12_undefined.patch;patch=1 \
-	   file://include-linux-types.patch;patch=1"
+	   file://alignment_hack.patch \
+           file://msdos_fat12_undefined.patch \
+	   file://include-linux-types.patch"
 
 do_install () {
 	oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
diff --git a/recipes/dpkg/dpkg-native.inc b/recipes/dpkg/dpkg-native.inc
index 771476ff2f..72db286d36 100644
--- a/recipes/dpkg/dpkg-native.inc
+++ b/recipes/dpkg/dpkg-native.inc
@@ -5,7 +5,7 @@ inherit native
 DEPENDS = "perl-native bzip2-native zlib-native virtual/update-alternatives-native"
 RDEPENDS = ""
 
-SRC_URI += "file://noman.patch;patch=1"
+SRC_URI += "file://noman.patch"
 FILESPATH += "dpkg-${PV}"
 
 # We need to do this so our perl is picked up.
diff --git a/recipes/dpkg/dpkg.inc b/recipes/dpkg/dpkg.inc
index b15a6365b4..c3c9a90ab7 100644
--- a/recipes/dpkg/dpkg.inc
+++ b/recipes/dpkg/dpkg.inc
@@ -3,8 +3,8 @@ LICENSE = "GPL"
 SECTION = "base"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
-           file://ignore_extra_fields.patch;patch=1 \
-           file://noupdalt.patch;patch=1"
+           file://ignore_extra_fields.patch \
+           file://noupdalt.patch"
 
 S = "${WORKDIR}/dpkg-${PV}"
 
diff --git a/recipes/dpkg/dpkg_1.13.22.bb b/recipes/dpkg/dpkg_1.13.22.bb
index 766b10883d..9d2771de6a 100644
--- a/recipes/dpkg/dpkg_1.13.22.bb
+++ b/recipes/dpkg/dpkg_1.13.22.bb
@@ -1,7 +1,7 @@
 require dpkg.inc
 PR = "r6"
 DEPENDS += "zlib bzip2"
-SRC_URI += "file://noman.patch;patch=1"
+SRC_URI += "file://noman.patch"
 
 EXTRA_OECONF = "--without-static-progs \
 		--without-dselect \
diff --git a/recipes/dpkg/dpkg_1.13.25.bb b/recipes/dpkg/dpkg_1.13.25.bb
index 609ead1103..0fa48e664d 100644
--- a/recipes/dpkg/dpkg_1.13.25.bb
+++ b/recipes/dpkg/dpkg_1.13.25.bb
@@ -1,7 +1,7 @@
 require dpkg.inc
 PR = "r2"
 DEPENDS += "zlib bzip2"
-SRC_URI += "file://noman.patch;patch=1"
+SRC_URI += "file://noman.patch"
 
 EXTRA_OECONF = "--without-static-progs \
 		--without-dselect \
diff --git a/recipes/dpkg/dpkg_1.14.19.bb b/recipes/dpkg/dpkg_1.14.19.bb
index a3321a6f53..556d317a28 100644
--- a/recipes/dpkg/dpkg_1.14.19.bb
+++ b/recipes/dpkg/dpkg_1.14.19.bb
@@ -2,7 +2,7 @@ require dpkg.inc
 PR = "r2"
 DEPENDS += "zlib bzip2"
 #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
-SRC_URI += "file://noman.patch;patch=1"
+SRC_URI += "file://noman.patch"
 
 EXTRA_OECONF = "--without-static-progs \
 		--without-dselect \
diff --git a/recipes/dpkg/dpkg_1.14.23.bb b/recipes/dpkg/dpkg_1.14.23.bb
index 3f8139bdcf..0c23708562 100644
--- a/recipes/dpkg/dpkg_1.14.23.bb
+++ b/recipes/dpkg/dpkg_1.14.23.bb
@@ -2,7 +2,7 @@ require dpkg.inc
 PR = "r2"
 DEPENDS += "zlib bzip2"
 #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
-SRC_URI += "file://noman.patch;patch=1"
+SRC_URI += "file://noman.patch"
 
 EXTRA_OECONF = "--without-static-progs \
 		--without-dselect \
diff --git a/recipes/dpkg/dpkg_1.14.29.bb b/recipes/dpkg/dpkg_1.14.29.bb
index 40a77d3c07..92c8a96d8d 100644
--- a/recipes/dpkg/dpkg_1.14.29.bb
+++ b/recipes/dpkg/dpkg_1.14.29.bb
@@ -2,7 +2,7 @@ require dpkg.inc
 PR = "r1"
 DEPENDS += "zlib bzip2"
 #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
-SRC_URI += "file://noman.patch;patch=1"
+SRC_URI += "file://noman.patch"
 SRC_URI[md5sum] = "4326172a959b5b6484b4bc126e9f628d"
 SRC_URI[sha256sum] = "ea7ec1c861af43ba534a0d7997774a5f1fd4e25a7eea4ff229c9c7bf89aed633"
 
diff --git a/recipes/dri/drm-kernel_cvs.bb b/recipes/dri/drm-kernel_cvs.bb
index 9e04cc4d7e..15ec0de2b4 100644
--- a/recipes/dri/drm-kernel_cvs.bb
+++ b/recipes/dri/drm-kernel_cvs.bb
@@ -6,7 +6,7 @@ PR = "r3"
 LICENSE = "MIT"
 
 SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver \
-	file://make.patch;patch=1"
+	file://make.patch"
 
 inherit module-base
 
diff --git a/recipes/dri/libdrm.inc b/recipes/dri/libdrm.inc
new file mode 100644
index 0000000000..eebd6b2200
--- /dev/null
+++ b/recipes/dri/libdrm.inc
@@ -0,0 +1,8 @@
+SECTION = "x11/base"
+LICENSE = "MIT"
+SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
+PROVIDES = "drm"
+
+INC_PR = "r3"
+
+inherit autotools pkgconfig
diff --git a/recipes/dri/libdrm_2.3.0.bb b/recipes/dri/libdrm_2.3.0.bb
index 8aa62fabaf..1d7046ba49 100644
--- a/recipes/dri/libdrm_2.3.0.bb
+++ b/recipes/dri/libdrm_2.3.0.bb
@@ -1,13 +1,6 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
-PROVIDES = "drm"
+require libdrm.inc
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "01a1e1ee0268a2403db42fa630036ab2"
 SRC_URI[sha256sum] = "f8c711427fea50845811360c92f6350ff3dacb9533741470d54ae5d0a2f6848e"
diff --git a/recipes/dri/libdrm_2.3.1.bb b/recipes/dri/libdrm_2.3.1.bb
index f28094f5cb..dc0e91e082 100644
--- a/recipes/dri/libdrm_2.3.1.bb
+++ b/recipes/dri/libdrm_2.3.1.bb
@@ -1,13 +1,6 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
-PROVIDES = "drm"
+require libdrm.inc
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "620fe7dd02c3236c3e9881a3a238173d"
 SRC_URI[sha256sum] = "ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c"
diff --git a/recipes/dri/libdrm_2.4.11.bb b/recipes/dri/libdrm_2.4.11.bb
index 5d85042ca7..e49d6a2b5b 100644
--- a/recipes/dri/libdrm_2.4.11.bb
+++ b/recipes/dri/libdrm_2.4.11.bb
@@ -1,15 +1,6 @@
-SECTION = "x11/base"
-DEPENDS = "libpthread-stubs"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
-PROVIDES = "drm"
-PR = "r1"
+require libdrm.inc
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+PR = "${INC_PR}.0"
 
 PACKAGES =+ "${PN}-intel"
 
diff --git a/recipes/dri/libdrm_2.4.17.bb b/recipes/dri/libdrm_2.4.17.bb
index 96edd2a5f8..902db026ab 100644
--- a/recipes/dri/libdrm_2.4.17.bb
+++ b/recipes/dri/libdrm_2.4.17.bb
@@ -1,18 +1,9 @@
-SECTION = "x11/base"
-DEPENDS = "libpthread-stubs"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
-PROVIDES = "drm"
-PR = "r2"
+require libdrm.inc
 
-inherit autotools pkgconfig
+PR = "${INC_PR}.0"
 
 EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel',d)}"
 
-do_stage() {
-	autotools_stage_all
-}
-
 PACKAGES =+ "${@base_contains('MACHINE_FEATURES', 'x86', '${PN}-intel', '',d)}"
 
 FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
diff --git a/recipes/dri/libdrm_2.4.18.bb b/recipes/dri/libdrm_2.4.18.bb
index 085a730861..e3bb393d8a 100644
--- a/recipes/dri/libdrm_2.4.18.bb
+++ b/recipes/dri/libdrm_2.4.18.bb
@@ -1,20 +1,12 @@
-SECTION = "x11/base"
-DEPENDS = "libpthread-stubs"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2;name=archive"
-PROVIDES = "drm"
-PR = "r0"
+require libdrm.inc
 
-SRC_URI[archive.md5sum] = "d2b5fbfd37742af7d2169f7d26ce3007"
-SRC_URI[archive.sha256sum] = "f6c5b44fff5cb602096cc48a1bced426496bc8060463c577a7d86f2e56eeb604"
+PR = "${INC_PR}.0"
 
-inherit autotools pkgconfig
+SRC_URI[md5sum] = "d2b5fbfd37742af7d2169f7d26ce3007"
+SRC_URI[sha256sum] = "f6c5b44fff5cb602096cc48a1bced426496bc8060463c577a7d86f2e56eeb604"
 
-EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel',d)}"
 
-do_stage() {
-	autotools_stage_all
-}
+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel',d)}"
 
 PACKAGES =+ "${@base_contains('MACHINE_FEATURES', 'x86', '${PN}-intel', '',d)}"
 
diff --git a/recipes/dri/libdrm_git.bb b/recipes/dri/libdrm_git.bb
index 3f81cdd8ff..e48a2aa33a 100644
--- a/recipes/dri/libdrm_git.bb
+++ b/recipes/dri/libdrm_git.bb
@@ -1,11 +1,11 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
+require libdrm.inc
 SRC_URI = "git://anongit.freedesktop.org/mesa/drm;protocol=git;branch=master"
 SRC_URI_shr = "git://git.bitwiz.org.uk/libdrm.git;protocol=git;branch=glamo"
 
-PROVIDES = "drm"
 DEPENDS = "libpthread-stubs virtual/kernel"
 
+PR = "${INC_PR}.0"
+
 PE = "1"
 PV = "2.4.18+gitr${SRCPV}"
 PR = "r0"
@@ -19,9 +19,3 @@ DEFAULT_PREFERENCE_shr = "1"
 S = "${WORKDIR}/git"
 
 EXTRA_OECONF_append_shr = " --enable-glamo-experimental-api --disable-radeon --disable-intel"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/recipes/driftnet/driftnet-nogui_0.1.6.bb b/recipes/driftnet/driftnet-nogui_0.1.6.bb
index 48d0fee179..ff963201c7 100644
--- a/recipes/driftnet/driftnet-nogui_0.1.6.bb
+++ b/recipes/driftnet/driftnet-nogui_0.1.6.bb
@@ -9,7 +9,7 @@ DEPENDS = "libpcap jpeg libungif"
 PV = "0.1.6"
 
 SRC_URI = "http://www.ex-parrot.com/~chris/driftnet/driftnet-${PV}.tar.gz \
-	file://arm.patch;patch=1"
+	file://arm.patch"
 
 S = "${WORKDIR}/driftnet-${PV}"
 
diff --git a/recipes/driftnet/driftnet_0.1.6.bb b/recipes/driftnet/driftnet_0.1.6.bb
index 2e4302955c..ec4ff395fb 100644
--- a/recipes/driftnet/driftnet_0.1.6.bb
+++ b/recipes/driftnet/driftnet_0.1.6.bb
@@ -9,7 +9,7 @@ DEPENDS = "libpcap jpeg libungif gtk+ libgpewidget"
 PV = "0.1.6"
 
 SRC_URI = "http://www.ex-parrot.com/~chris/driftnet/${PN}-${PV}.tar.gz \
-	file://arm.patch;patch=1"
+	file://arm.patch"
 
 S = "${WORKDIR}/driftnet-${PV}"
 
diff --git a/recipes/dropbear/dropbear.inc b/recipes/dropbear/dropbear.inc
index 364799f12e..056732fab3 100644
--- a/recipes/dropbear/dropbear.inc
+++ b/recipes/dropbear/dropbear.inc
@@ -8,10 +8,10 @@ RPROVIDES = "ssh sshd"
 
 SRC_URI = "\
   http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2 \
-  file://urandom-xauth-changes-to-options.h.patch;patch=1 \
-  file://configure.patch;patch=1 \
-  file://fix-2kb-keys.patch;patch=1 \
-  file://allow-nopw.patch \
+  file://urandom-xauth-changes-to-options.h.patch \
+  file://configure.patch \
+  file://fix-2kb-keys.patch \
+  file://allow-nopw.patch;apply=no \
   file://init \
 "
 SRC_URI_append_openmoko = "\
diff --git a/recipes/dropbear/dropbear_0.49.bb b/recipes/dropbear/dropbear_0.49.bb
index 4773841b3e..79a2de6630 100644
--- a/recipes/dropbear/dropbear_0.49.bb
+++ b/recipes/dropbear/dropbear_0.49.bb
@@ -2,7 +2,7 @@ require dropbear.inc
 
 PR = "r2"
 
-SRC_URI += "file://scp-argument-fix.patch;patch=1"
+SRC_URI += "file://scp-argument-fix.patch"
 
 SRC_URI[md5sum] = "ed2cd18abcebbc7c9dbebe68f605e3bb"
 SRC_URI[sha256sum] = "f178c45ae2fa24897c832a81476d22cfd2044d8b06a874d3198cee40e18f9228"
diff --git a/recipes/dropbear/dropbear_0.51.bb b/recipes/dropbear/dropbear_0.51.bb
index f2060eff99..168f5bbe00 100644
--- a/recipes/dropbear/dropbear_0.51.bb
+++ b/recipes/dropbear/dropbear_0.51.bb
@@ -1,7 +1,7 @@
 require dropbear.inc
 PR = "r1.01"
 
-SRC_URI += "file://no-host-lookup.patch;patch=1"
+SRC_URI += "file://no-host-lookup.patch"
 
 SRC_URI[md5sum] = "95d900913bee4b27d7e9ce55f8a55427"
 SRC_URI[sha256sum] = "8daa89512f9349fc131d48555726ffe1187e0f7d9f4cef992464c8098d86e77c"
diff --git a/recipes/dropbear/dropbear_0.52.bb b/recipes/dropbear/dropbear_0.52.bb
index 15e6bf0273..0e36b99509 100644
--- a/recipes/dropbear/dropbear_0.52.bb
+++ b/recipes/dropbear/dropbear_0.52.bb
@@ -1,7 +1,7 @@
 require dropbear.inc
 PR = "r0"
 
-SRC_URI += "file://no-host-lookup.patch;patch=1"
+SRC_URI += "file://no-host-lookup.patch"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/dsniff/dsniff_2.3.bb b/recipes/dsniff/dsniff_2.3.bb
index 403a50eacc..03ef527d09 100644
--- a/recipes/dsniff/dsniff_2.3.bb
+++ b/recipes/dsniff/dsniff_2.3.bb
@@ -12,7 +12,7 @@ DEPENDS = "virtual/db libpcap libnet-1.0 libnids openssl"
 
 SRC_URI = "\
   http://www.monkey.org/~dugsong/dsniff/dsniff-${PV}.tar.gz \
-  file://configure.patch;patch=1 \
+  file://configure.patch \
 "
 
 inherit autotools
diff --git a/recipes/dt/dt_15.14.bb b/recipes/dt/dt_15.14.bb
index 161304a3b9..39dc18534e 100644
--- a/recipes/dt/dt_15.14.bb
+++ b/recipes/dt/dt_15.14.bb
@@ -2,8 +2,8 @@ require dt.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI_append_linux-uclibc = " file://no_aio.patch;patch=1 "
-SRC_URI_append_linux-uclibcgnueabi = " file://no_aio.patch;patch=1 "
+SRC_URI_append_linux-uclibc = " file://no_aio.patch "
+SRC_URI_append_linux-uclibcgnueabi = " file://no_aio.patch "
 
 do_install() {
 	install -d ${D}${bindir}
diff --git a/recipes/dtnrg/dtn_2.5.0.bb b/recipes/dtnrg/dtn_2.5.0.bb
index 3604fc69ea..e926de962e 100644
--- a/recipes/dtnrg/dtn_2.5.0.bb
+++ b/recipes/dtnrg/dtn_2.5.0.bb
@@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "\
   http://www.dtnrg.org/docs/code/dtn_${PV}.tgz \
-  file://configure_fix.patch;patch=1 \
+  file://configure_fix.patch \
 "
 
 inherit autotools distutils-base
diff --git a/recipes/dvbtools/dvb-apps_1.1.1.bb b/recipes/dvbtools/dvb-apps_1.1.1.bb
index 4f91623913..77a8509c7c 100644
--- a/recipes/dvbtools/dvb-apps_1.1.1.bb
+++ b/recipes/dvbtools/dvb-apps_1.1.1.bb
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.linuxtv.org"
 LICENSE = "GPL"
 
 SRC_URI = "http://linuxtv.org/downloads/linuxtv-dvb-apps-${PV}.tar.bz2 \
-           file://update-to-trunk.diff;patch=1"
+           file://update-to-trunk.diff"
 
 PR = "r1"
 
diff --git a/recipes/dvd+rw-tools/dvd+rw-tools_7.1.bb b/recipes/dvd+rw-tools/dvd+rw-tools_7.1.bb
index c89e60262e..124ade76b8 100644
--- a/recipes/dvd+rw-tools/dvd+rw-tools_7.1.bb
+++ b/recipes/dvd+rw-tools/dvd+rw-tools_7.1.bb
@@ -3,14 +3,14 @@ PR = "r2"
 DEPENDS += "m4-native"
 RDEPENDS += "cdrkit"
 SRC_URI = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-${PV}.tar.gz \
-           file://01-growisofs-pioneer.dpatch;patch=1 \
-           file://02-growisofs-manpage.dpatch;patch=1 \
-           file://03-growisofs-dvd-dl.dpatch;patch=1 \
-           file://04-kfreebsd.dpatch;patch=1 \
-           file://07-beeping.dpatch;patch=1 \
-           file://08-cdrkit-code.dpatch;patch=1 \
-           file://09-cdrkit-doc.dpatch;patch=1 \
-           file://10-includes.dpatch;patch=1 \
+           file://01-growisofs-pioneer.dpatch;apply=yes \
+           file://02-growisofs-manpage.dpatch;apply=yes \
+           file://03-growisofs-dvd-dl.dpatch;apply=yes \
+           file://04-kfreebsd.dpatch;apply=yes \
+           file://07-beeping.dpatch;apply=yes \
+           file://08-cdrkit-code.dpatch;apply=yes \
+           file://09-cdrkit-doc.dpatch;apply=yes \
+           file://10-includes.dpatch;apply=yes \
           "
 
 do_configure() {
diff --git a/recipes/e17/e-tasks_svn.bb b/recipes/e17/e-tasks_svn.bb
index 28bc900f98..3fd3fbc09b 100644
--- a/recipes/e17/e-tasks_svn.bb
+++ b/recipes/e17/e-tasks_svn.bb
@@ -7,7 +7,7 @@ DEPENDS = "elementary eina edbus sqlite3"
 
 inherit autotools
 
-SRCREV = "24"
+SRCREV = "25"
 PV = "0.0.1+svnr${SRCPV}"
 PR = "r1"
 
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index 2ab6b82198..97724a06cc 100644
--- a/recipes/e17/e-wm_svn.bb
+++ b/recipes/e17/e-wm_svn.bb
@@ -11,18 +11,18 @@ inherit e update-alternatives
 SRC_URI += "\
   file://enlightenment_start.oe \
   file://applications.menu \
-  file://gsm-segfault-fix.patch;patch=1;maxrev=37617 \
-  file://fix-profiles.diff;patch=1;maxrev=39889 \
-  file://drop-illume-keyboards.patch;patch=1 \
+  file://gsm-segfault-fix.patch;maxrev=37617 \
+  file://fix-profiles.diff;maxrev=39889 \
+  file://drop-illume-keyboards.patch \
 "
 
-SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch;patch=1"
+SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch"
 
 SRC_URI_append_shr = " \
-  file://illume-disable-screensaver.patch;patch=1 \
-  file://wizard-module-skipping.patch;patch=1 \
-  file://illume-flaunch-fix.patch;patch=1 \
-  file://illume-keyboard-flow.patch;patch=1;maxrev=46549 \
+  file://illume-disable-screensaver.patch \
+  file://wizard-module-skipping.patch \
+  file://illume-flaunch-fix.patch \
+  file://illume-keyboard-flow.patch;maxrev=46549 \
 "
 
 EXTRA_OECONF = "\
diff --git a/recipes/e17/entrance_0.9.0.010.bb b/recipes/e17/entrance_0.9.0.010.bb
index a988e50b80..92c235b23b 100644
--- a/recipes/e17/entrance_0.9.0.010.bb
+++ b/recipes/e17/entrance_0.9.0.010.bb
@@ -11,11 +11,11 @@ SRCREV = "46589"
 inherit e
 
 SRC_URI += "\
-           file://rebased_config-db.patch;patch=1 \
-           file://allow-missing-xsession.patch;patch=1 \
-           file://run-Xinit.patch;patch=1 \
-           file://fix-auth-mode.patch;patch=1 \
-           file://use-bash.patch;patch=1 \
+           file://rebased_config-db.patch \
+           file://allow-missing-xsession.patch \
+           file://run-Xinit.patch \
+           file://fix-auth-mode.patch \
+           file://use-bash.patch \
            file://Sessions"
 
 S = "${WORKDIR}/entrance"
diff --git a/recipes/e17/illume-keyboards-shr_git.bb b/recipes/e17/illume-keyboards-shr_git.bb
index 90aab16529..49abb9c1a5 100644
--- a/recipes/e17/illume-keyboards-shr_git.bb
+++ b/recipes/e17/illume-keyboards-shr_git.bb
@@ -3,13 +3,14 @@ SECTION = "x11/data"
 SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;branch=master"
 S = "${WORKDIR}/git"
 
-SRCREV = "9bd2c8f060c48eee3ab247838d8ecf2cf7082472"
+SRCREV = "4064489f359a1addf572089b582f317dff5f50e1"
 PV = "0.0+gitr${SRCPV}"
 PE = "1"
 PR = "r3"
 
 
 PACKAGES = "\
+illume-keyboard-alpha \
 illume-keyboard-arabic \
 illume-keyboard-browse \
 illume-keyboard-danish \
@@ -29,6 +30,10 @@ illume-keyboard-persian \
 PACKAGE_ARCH = "all"
 KEYBOARDS_DIR="${libdir}/enlightenment/modules/illume/keyboards"
 
+AUTHOR_illume-keyboard-alpha = "Jesus McCloud"
+DESCRIPTION_illume-keyboard-alpha = "Illume keyboard with phone-like layout"
+FILES_illume-keyboard-alpha = "${KEYBOARDS_DIR}/Alpha.kbd"
+
 AUTHOR_illume-keyboard-arabic = "Mohammad Fahmi / Tom Hacohen"
 DESCRIPTION_illume-keyboard-arabic = "Illume keyboard with arabic layout"
 FILES_illume-keyboard-arabic = "${KEYBOARDS_DIR}/Arabic.kbd ${KEYBOARDS_DIR}/Arabic.png"
diff --git a/recipes/e17/places_svn.bb b/recipes/e17/places_svn.bb
index 13ef860f77..d6ab46d7e1 100644
--- a/recipes/e17/places_svn.bb
+++ b/recipes/e17/places_svn.bb
@@ -5,15 +5,12 @@ PR = "r4"
 
 require e-module.inc
 
-SRC_URI += "file://fix-api.diff;patch=1;maxrev=39830;pnum=3"
+SRC_URI += "file://fix-api.diff;maxrev=39830;striplevel=3"
 
 do_configure_prepend() {
-       sed -i -e /po/d -e /AM_GNU_GETTEXT/d configure.ac 
+       sed -i -e /po/d -e /AM_GNU_GETTEXT/d configure.ac
        sed -i -e s:\ po::g Makefile.am
 }
 
 # Calls /usr/bin/eject for media
 RRECOMMENDS_${PN} += "eject"
-
-
-
diff --git a/recipes/e2fsprogs/e2fsprogs_1.38.bb b/recipes/e2fsprogs/e2fsprogs_1.38.bb
index e949e85c4b..3401ed0d74 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.38.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.38.bb
@@ -2,9 +2,9 @@ require e2fsprogs.inc
 
 PR = "${INC_PR}"
 
-SRC_URI += "file://no-hardlinks.patch;patch=1 \
-	    file://mkinstalldirs.patch;patch=1 \
-            file://file-open-mode.patch;patch=1 \
+SRC_URI += "file://no-hardlinks.patch \
+	    file://mkinstalldirs.patch \
+            file://file-open-mode.patch \
            "
 
 TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
index a59222df1f..d51cdcc482 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
@@ -2,7 +2,7 @@ require e2fsprogs.inc
 
 PR = "${INC_PR}"
 
-SRC_URI += "file://mkinstalldirs.patch;patch=1"
+SRC_URI += "file://mkinstalldirs.patch"
 
 SRC_URI[md5sum] = "59033388df36987d2b9c9bbf7e19bd57"
 SRC_URI[sha256sum] = "2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc"
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb
index 13830a249c..9e9d7c0ec6 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.41.5.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb
@@ -2,7 +2,7 @@ require e2fsprogs.inc
 
 PR = "${INC_PR}"
 
-SRC_URI += "file://mkinstalldirs.patch;patch=1"
+SRC_URI += "file://mkinstalldirs.patch"
 
 SRC_URI[md5sum] = "e218df6c84fc17c1126d31de9472a76c"
 SRC_URI[sha256sum] = "b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198"
diff --git a/recipes/e2tools/e2tools_0.0.16.bb b/recipes/e2tools/e2tools_0.0.16.bb
index 856a33d2e0..379c07afc5 100644
--- a/recipes/e2tools/e2tools_0.0.16.bb
+++ b/recipes/e2tools/e2tools_0.0.16.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "A simple set of utilities for reading, writing, and \
 manipulating files in an ext2/ext3 filesystem."
 DEPENDS = "e2fsprogs"
 SRC_URI = "http://www.pobox.com/~sheff/sw/e2tools/e2tools-${PV}.tar.gz \
-	   file://autofoo.patch;patch=1"
+	   file://autofoo.patch"
 S = "${WORKDIR}/e2tools-${PV}"
 
 inherit autotools
diff --git a/recipes/ebtables/ebtables_2.0.6.bb b/recipes/ebtables/ebtables_2.0.6.bb
index 7eb33fc9cb..98a21406e2 100644
--- a/recipes/ebtables/ebtables_2.0.6.bb
+++ b/recipes/ebtables/ebtables_2.0.6.bb
@@ -7,10 +7,10 @@ PR = "r2"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \
-           file://gcc34.patch;patch=1 \
-           file://gcc4.patch;patch=1 \
-           file://installnonroot.patch;patch=1 \
-           file://installcreatedirs.patch;patch=1"
+           file://gcc34.patch \
+           file://gcc4.patch \
+           file://installnonroot.patch \
+           file://installcreatedirs.patch"
 S = "${WORKDIR}/ebtables-v${PV}"
 
 do_compile () {
diff --git a/recipes/eciadsl/eciadsl_0.11.bb b/recipes/eciadsl/eciadsl_0.11.bb
index 55a8b943f0..fa5c2c2d2a 100644
--- a/recipes/eciadsl/eciadsl_0.11.bb
+++ b/recipes/eciadsl/eciadsl_0.11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "eciadsl is a usermode driver for GlobeSpan-based ADSL modems"
 SECTION = "net"
 SRC_URI = "http://eciadsl.flashtux.org/download/eciadsl-usermode-${PV}.tar.gz \
-           file://eciadsl-bash.patch;patch=1"
+           file://eciadsl-bash.patch"
 LICENSE = "GPL"
 RDEPENDS = "bash kernel-module-n_hdlc ppp grep"
 S = "${WORKDIR}/eciadsl-usermode-${PV}"
diff --git a/recipes/ecj/ecj-bootstrap-native.bb b/recipes/ecj/ecj-bootstrap-native.bb
index 6c80de749a..594b08cb9c 100644
--- a/recipes/ecj/ecj-bootstrap-native.bb
+++ b/recipes/ecj/ecj-bootstrap-native.bb
@@ -21,6 +21,8 @@ PR = "r2"
 
 JAR = "ecj-bootstrap.jar"
 
+NATIVE_INSTALL_WORKS = "1"
+
 inherit native
 
 do_compile() {
@@ -31,8 +33,8 @@ do_compile() {
   cat ecj.in >> ecj-bootstrap
 }
 
-do_stage() {
-  install -d ${STAGING_BINDIR}
-  install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}
-  install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac
+do_install() {
+  install -d ${D}${bindir}
+  install -m 755 ${S}/ecj-bootstrap ${D}${bindir}
+  install -m 755 ${S}/ecj-bootstrap ${D}${bindir}/javac
 }
diff --git a/recipes/ecj/ecj-initial.bb b/recipes/ecj/ecj-initial.bb
index 6695fbd2b2..8ddbc7ccf6 100644
--- a/recipes/ecj/ecj-initial.bb
+++ b/recipes/ecj/ecj-initial.bb
@@ -13,6 +13,8 @@ PR = "r1"
 
 SRC_URI = "file://ecj.in"
 
+NATIVE_INSTALL_WORKS = "1"
+
 S = "${WORKDIR}"
 
 inherit native
@@ -27,7 +29,7 @@ do_compile() {
   cat ecj.in >> ecj-initial
 }
 
-do_stage() {
-  install -d ${STAGING_BINDIR}
-  install -m 755 ${S}/ecj-initial ${STAGING_BINDIR}
+do_install() {
+  install -d ${D}${bindir}
+  install -m 755 ${S}/ecj-initial ${D}${bindir}
 }
diff --git a/recipes/ecj/libecj-bootstrap.inc b/recipes/ecj/libecj-bootstrap.inc
index c24c1af5ca..a92e87e86d 100644
--- a/recipes/ecj/libecj-bootstrap.inc
+++ b/recipes/ecj/libecj-bootstrap.inc
@@ -12,6 +12,8 @@ S = "${WORKDIR}"
 
 JAR = "ecj-bootstrap-${PV}.jar"
 
+NATIVE_INSTALL_WORKS = "1"
+
 do_unpackpost() {
   if [ ! -d source ]; then
     mkdir source
@@ -61,7 +63,7 @@ do_compile() {
   fastjar -c -C build . -f ${JAR}
 }
 
-do_stage() {
-  oe_jarinstall -s ${JAR} ecj-bootstrap.jar
+do_install() {
+  oe_jarinstall ${JAR} ecj-bootstrap.jar
 }
 
diff --git a/recipes/eds/eds-dbus_svn.bb b/recipes/eds/eds-dbus_svn.bb
index 274f55d352..20d7f79ae2 100644
--- a/recipes/eds/eds-dbus_svn.bb
+++ b/recipes/eds/eds-dbus_svn.bb
@@ -8,9 +8,9 @@ PR = "r7"
 SRCREV = "736"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
-           file://no_libdb.patch;patch=1;maxrev=659 \
-           file://no_iconv_test.patch;patch=1 \
-           file://no_libedataserverui.patch;patch=1;maxrev=659 \
+           file://no_libdb.patch;maxrev=659 \
+           file://no_iconv_test.patch \
+           file://no_libedataserverui.patch;maxrev=659 \
            file://iconv-detect.h"
 
 S = "${WORKDIR}/trunk"
diff --git a/recipes/eel/eel_2.12.2.bb b/recipes/eel/eel_2.12.2.bb
index 996c92f166..5821c5586a 100644
--- a/recipes/eel/eel_2.12.2.bb
+++ b/recipes/eel/eel_2.12.2.bb
@@ -6,7 +6,7 @@ inherit gnome
 PR = "r2"
 
 LICENSE="GPL"
-SRC_URI += "file://configure.patch;patch=1"
+SRC_URI += "file://configure.patch"
 
 DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail"
 EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/recipes/eel/eel_2.22.2.bb b/recipes/eel/eel_2.22.2.bb
index 6dc1d6312b..0a24a3a93c 100644
--- a/recipes/eel/eel_2.22.2.bb
+++ b/recipes/eel/eel_2.22.2.bb
@@ -7,7 +7,7 @@ PR = "r2"
 
 LICENSE="GPL"
 
-SRC_URI += "file://eel-no-strftime.patch;patch=1"
+SRC_URI += "file://eel-no-strftime.patch"
 
 DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail"
 EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/recipes/eel/eel_2.24.1.bb b/recipes/eel/eel_2.24.1.bb
index 482fdb90f8..258e4987e3 100644
--- a/recipes/eel/eel_2.24.1.bb
+++ b/recipes/eel/eel_2.24.1.bb
@@ -7,7 +7,7 @@ PR = "r2"
 
 LICENSE="GPL"
 
-SRC_URI += "file://eel-no-strftime.patch;patch=1"
+SRC_URI += "file://eel-no-strftime.patch"
 
 DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail"
 EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/recipes/eel/eel_2.26.0.bb b/recipes/eel/eel_2.26.0.bb
index 90f6b0d6fe..0da61f840b 100644
--- a/recipes/eel/eel_2.26.0.bb
+++ b/recipes/eel/eel_2.26.0.bb
@@ -7,7 +7,7 @@ PR = "r0"
 
 LICENSE="GPL"
 
-SRC_URI += "file://eel-no-strftime.patch;patch=1"
+SRC_URI += "file://eel-no-strftime.patch"
 
 DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail"
 EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/recipes/eel/eel_2.6.1.bb b/recipes/eel/eel_2.6.1.bb
index d86061dceb..4ccfd28fca 100644
--- a/recipes/eel/eel_2.6.1.bb
+++ b/recipes/eel/eel_2.6.1.bb
@@ -6,7 +6,7 @@ inherit gnome
 PR = "r2"
 
 LICENSE="GPL"
-SRC_URI += "file://configure.patch;patch=1"
+SRC_URI += "file://configure.patch"
 
 DEPENDS="libgnomeui virtual/gail"
 EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc
index 183f25203a..bb7eea5dc6 100644
--- a/recipes/efl1/ecore.inc
+++ b/recipes/efl1/ecore.inc
@@ -12,7 +12,7 @@ inherit efl
 
 BBCLASSEXTEND = "native"
 
-SRC_URI += "file://fix-ecore-fb-initialization.patch;patch=1"
+SRC_URI += "file://fix-ecore-fb-initialization.patch"
 
 do_configure_prepend() {
 	touch ${S}/po/Makefile.in.in || true
diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb
index bcee012da4..f32df8e842 100644
--- a/recipes/efl1/ecore_svn.bb
+++ b/recipes/efl1/ecore_svn.bb
@@ -3,9 +3,9 @@ SRCREV = "${EFL_SRCREV}"
 PR = "r11"
 
 SRC_URI += "\
-  file://iconv.patch;patch=1;maxrev=43996 \
-  file://exit_uclibc_dns.patch;patch=1;maxrev=47076 \
-  file://exit_uclibc.patch;patch=1 \
+  file://iconv.patch;maxrev=43996 \
+  file://exit_uclibc_dns.patch;maxrev=47076 \
+  file://exit_uclibc.patch \
 "
 
 ECORE_OECONF = "\
diff --git a/recipes/efl1/efreet_svn.bb b/recipes/efl1/efreet_svn.bb
index dda0874624..555016dcf4 100644
--- a/recipes/efl1/efreet_svn.bb
+++ b/recipes/efl1/efreet_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment freedesktop.org library"
 DEPENDS = "ecore"
 LICENSE = "MIT BSD"
 PV = "0.5.0.060+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
 SRCREV = "${EFL_SRCREV}"
 
 inherit efl
@@ -12,4 +12,4 @@ FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*"
 FILES_${PN}-trash = "${libdir}/libefreet_trash.so.*"
 
 # efreet_desktop_cache_create is needed for e-wm start, don't include it in -tests
-FILES_${PN} += "${bindir}/efreet_desktop_cache_create"
+FILES_${PN} += "${libdir}/efreet/efreet_desktop_cache_create"
diff --git a/recipes/efl1/eina_svn.bb b/recipes/efl1/eina_svn.bb
index 6873e83750..34e1aa89cf 100644
--- a/recipes/efl1/eina_svn.bb
+++ b/recipes/efl1/eina_svn.bb
@@ -6,7 +6,7 @@ SRCREV = "${EFL_SRCREV}"
 
 inherit efl
 
-SRC_URI += "file://gnu_source.patch;patch=1"
+SRC_URI += "file://gnu_source.patch"
 
 # Some upgrade path tweaking
 AUTO_LIBNAME_PKGS = ""
diff --git a/recipes/efl1/epdf_svn.bb b/recipes/efl1/epdf_svn.bb
index c905051837..eac8e87123 100644
--- a/recipes/efl1/epdf_svn.bb
+++ b/recipes/efl1/epdf_svn.bb
@@ -8,7 +8,7 @@ SRCREV = "${EFL_SRCREV}"
 inherit efl
 
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=epdf;proto=http"
-#           file://fix-plugin-path-check.patch;HACK=1;patch=1"
+#           file://fix-plugin-path-check.patch;HACK=1"
 # FIXME This package is not really working correctly at the moment. It doesn't
 # recognize epsilon and doesn't build everything. The next one actually using
 # this package is welcome to fix it.
diff --git a/recipes/eggdbus/eggdbus_0.6.bb b/recipes/eggdbus/eggdbus_0.6.bb
index ff2c5ff747..a7b5b87e36 100644
--- a/recipes/eggdbus/eggdbus_0.6.bb
+++ b/recipes/eggdbus/eggdbus_0.6.bb
@@ -9,11 +9,11 @@ SRC_URI[eggdbus.md5sum] = "0a111faa54dfba2cf432c2c8e8a76e06"
 SRC_URI[eggdbus.sha256sum] = "3ad26e271c1a879bafcd181e065fe0ed53b542299a773c3188c9edb25b895ed1"
 
 BASE_SRC_URI = "http://cgit.freedesktop.org/~david/${BPN}/snapshot/${BPN}-${PV}.tar.bz2;name=eggdbus \
-          file://gtk-doc.patch;patch=1 \
+          file://gtk-doc.patch \
           "
 
 SRC_URI = "${BASE_SRC_URI} \
-           file://marshal.patch;patch=1 \
+           file://marshal.patch \
           "
 
 SRC_URI_virtclass-native = "${BASE_SRC_URI}"
diff --git a/recipes/eglibc/eglibc-initial.inc b/recipes/eglibc/eglibc-initial.inc
index 7a5a7b22f4..eb765df178 100644
--- a/recipes/eglibc/eglibc-initial.inc
+++ b/recipes/eglibc/eglibc-initial.inc
@@ -13,7 +13,7 @@ do_configure () {
 	${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
 		--prefix=/usr \
 		--without-cvs --disable-sanity-checks \
-		--with-headers=${STAGING_DIR_TARGET}${layout_includedir} \
+		--with-headers=${STAGING_DIR_TARGET}${includedir} \
 		--enable-hacker-mode --enable-addons
 }
 
@@ -21,18 +21,24 @@ do_compile () {
 	:
 }
 
-do_stage () {
-	oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \
-	includedir='${layout_includedir}' prefix='${layout_prefix}' install-headers \
-	install-bootstrap-headers=yes
-        oe_runmake csu/subdir_lib
+do_install () {
+       oe_runmake cross-compiling=yes install_root=${D} \
+       includedir='${includedir}' prefix='${prefix}' \
+       install-bootstrap-headers=yes install-headers
 
-        mkdir -p ${STAGING_DIR_TARGET}${layout_libdir}
-        install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${layout_libdir}
-        ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-                       -o ${STAGING_DIR_TARGET}${layout_libdir}/libc.so
-}
+       oe_runmake csu/subdir_lib
+       # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
+       # so do them by hand.  We can tolerate an empty stubs.h for the moment.
+       # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
+       mkdir -p ${D}${includedir}/gnu/
+       touch ${D}${includedir}/gnu/stubs.h
+       cp ${S}/include/features.h ${D}${includedir}/features.h
 
-do_install () {
-	:
+       if [ -e ${B}/bits/stdio_lim.h ]; then
+               cp ${B}/bits/stdio_lim.h  ${D}${includedir}/bits/
+       fi
+       mkdir -p ${D}${libdir}/
+       install -m 644 csu/crt[1in].o ${D}${libdir}
+       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+               -o ${D}${libdir}/libc.so
 }
diff --git a/recipes/eglibc/eglibc-initial_2.12.bb b/recipes/eglibc/eglibc-initial_2.12.bb
new file mode 100644
index 0000000000..787c762609
--- /dev/null
+++ b/recipes/eglibc/eglibc-initial_2.12.bb
@@ -0,0 +1,6 @@
+require eglibc_${PV}.bb
+require eglibc-initial.inc
+
+do_configure_prepend () {
+        unset CFLAGS
+}
diff --git a/recipes/eglibc/eglibc-stage.inc b/recipes/eglibc/eglibc-stage.inc
deleted file mode 100644
index 79ca8c8ca1..0000000000
--- a/recipes/eglibc/eglibc-stage.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-do_stage() {
-    # Installing directly into staging creates some races between existing
-    # glibc-initial files and us. We could use a new DESTDIR but we may as
-    # well just copy the data installed by do_install
-    cp -pPR ${D}/* ${STAGING_DIR_HOST}/
-}
diff --git a/recipes/eglibc/eglibc.inc b/recipes/eglibc/eglibc.inc
index 5c06ae6160..10a4a2341b 100644
--- a/recipes/eglibc/eglibc.inc
+++ b/recipes/eglibc/eglibc.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.eglibc.org/home"
 SECTION = "libs"
 PRIORITY = "required"
 LICENSE = "LGPL"
-INC_PR = "r9"
+INC_PR = "r10"
 # nptl needs unwind support in gcc, which can't be built without glibc.
 DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
 #this leads to circular deps, so lets not add it yet
diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb
index a65a2bf304..c2ed43585b 100644
--- a/recipes/eglibc/eglibc_2.10.bb
+++ b/recipes/eglibc/eglibc_2.10.bb
@@ -4,13 +4,14 @@ DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
 PV = "2.10"
 PR = "${INC_PR}.9"
-SVN_REV="10152"
+PR_append = "+svnr${SRCPV}"
+SRCREV="10152"
 EGLIBC_BRANCH="eglibc-2_10"
-SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};rev=${SVN_REV};proto=svn \
-           file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
-           file://armv4t-interworking.patch;patch=1 \
-           file://IO-acquire-lock-fix.patch;patch=1 \
-           file://shorten-build-commands.patch;patch=1 \
+SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \
+           file://eglibc-svn-arm-lowlevellock-include-tls.patch \
+           file://armv4t-interworking.patch \
+           file://IO-acquire-lock-fix.patch \
+           file://shorten-build-commands.patch \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
@@ -96,6 +97,4 @@ do_compile () {
 	)
 }
 
-require eglibc-stage.inc
-
 require eglibc-package.bbclass
diff --git a/recipes/eglibc/eglibc_2.11.bb b/recipes/eglibc/eglibc_2.11.bb
index 6d78bde69e..26bef4c90e 100644
--- a/recipes/eglibc/eglibc_2.11.bb
+++ b/recipes/eglibc/eglibc_2.11.bb
@@ -4,13 +4,14 @@ DEFAULT_PREFERENCE = "-1"
 DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
 PV = "2.11"
-PR = "${INC_PR}.4"
-SVN_REV="10151"
+PR = "${INC_PR}.5"
+PR_append = "+svnr${SRCPV}"
+SRCREV="10454"
 EGLIBC_BRANCH="eglibc-2_11"
-SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};rev=${SVN_REV};proto=svn \
-           file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
-           file://IO-acquire-lock-fix.patch;patch=1 \
-           file://shorten-build-commands.patch;patch=1 \
+SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \
+           file://eglibc-svn-arm-lowlevellock-include-tls.patch \
+           file://IO-acquire-lock-fix.patch \
+           file://shorten-build-commands.patch \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
@@ -96,6 +97,4 @@ do_compile () {
 	)
 }
 
-require eglibc-stage.inc
-
 require eglibc-package.bbclass
diff --git a/recipes/eglibc/eglibc_2.12.bb b/recipes/eglibc/eglibc_2.12.bb
new file mode 100644
index 0000000000..a040c76456
--- /dev/null
+++ b/recipes/eglibc/eglibc_2.12.bb
@@ -0,0 +1,100 @@
+require eglibc.inc
+
+DEFAULT_PREFERENCE = "-1"
+DEPENDS += "gperf-native"
+FILESPATHPKG =. "eglibc-svn:"
+PV = "2.12"
+PR = "${INC_PR}.1"
+PR_append = "+svnr${SRCPV}"
+SRCREV="10495"
+EGLIBC_BRANCH="eglibc-2_12"
+SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \
+           file://eglibc-svn-arm-lowlevellock-include-tls.patch \
+           file://IO-acquire-lock-fix.patch \
+           file://shorten-build-commands.patch \
+           file://etc/ld.so.conf \
+           file://generate-supported.mk"
+S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+PACKAGES_DYNAMIC = "libc6*"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
+PROVIDES_${PN}-dbg = "glibc-dbg"
+
+# the -isystem in bitbake.conf screws up glibc do_stage
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
+
+GLIBC_ADDONS ?= "ports,nptl,libidn"
+
+GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
+
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+    import bb, re
+    uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
+                --without-cvs --disable-profile --disable-debug --without-gd \
+                --enable-clocale=gnu \
+                --enable-add-ons=${GLIBC_ADDONS},ports \
+                --with-headers=${STAGING_INCDIR} \
+                --without-selinux \
+                ${GLIBC_EXTRA_OECONF}"
+
+EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}"
+
+do_unpack_append() {
+	bb.build.exec_func('do_move_ports', d)
+}
+
+do_move_ports() {
+        if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then
+	    rm -rf ${S}/ports
+	    mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${S}/
+	fi
+}
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+        if [ -z "`which rpcgen`" ]; then
+                echo "rpcgen not found.  Install glibc-devel."
+                exit 1
+        fi
+        (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+        find ${S} -name "configure" | xargs touch
+        CPPFLAGS="" oe_runconf
+}
+
+rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
+	  yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+	  rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
+
+do_compile () {
+	# -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
+	unset LDFLAGS
+	base_do_compile
+	(
+		cd ${S}/sunrpc/rpcsvc
+		for r in ${rpcsvc}; do
+			h=`echo $r|sed -e's,\.x$,.h,'`
+			rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
+		done
+	)
+}
+
+require eglibc-package.bbclass
diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb
index 031f1127f3..a7d9aedea1 100644
--- a/recipes/eglibc/eglibc_2.9.bb
+++ b/recipes/eglibc/eglibc_2.9.bb
@@ -4,13 +4,14 @@ DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
 PV = "2.9"
 PR = "${INC_PR}.9"
-SVN_REV="10153"
+PR_append = "+svnr${SRCPV}"
+SRCREV="10153"
 EGLIBC_BRANCH="eglibc-2_9"
-SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};rev=${SVN_REV};proto=svn \
-           file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
-	   file://armv4t-interworking.patch;patch=1 \
-	   file://IO-acquire-lock-fix.patch;patch=1 \
-           file://shorten-build-commands.patch;patch=1 \
+SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \
+           file://eglibc-svn-arm-lowlevellock-include-tls.patch \
+	   file://armv4t-interworking.patch \
+	   file://IO-acquire-lock-fix.patch \
+           file://shorten-build-commands.patch \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
@@ -96,6 +97,4 @@ do_compile () {
 	)
 }
 
-require eglibc-stage.inc
-
 require eglibc-package.bbclass
diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb
index 73af01bc46..bd42030d58 100644
--- a/recipes/eglibc/eglibc_svn.bb
+++ b/recipes/eglibc/eglibc_svn.bb
@@ -1,15 +1,15 @@
 require eglibc.inc
 
 DEPENDS += "gperf-native"
-SRCREV = "10150"
+SRCREV = "10505"
 DEFAULT_PREFERENCE = "-1"
 FILESPATHPKG =. "eglibc-svn:"
 PV = "2.11+svnr${SRCPV}"
 PR = "${INC_PR}.4"
 EGLIBC_BRANCH="trunk"
 SRC_URI = "svn://svn.eglibc.org;module=${EGLIBC_BRANCH} \
-           file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
-	   file://IO-acquire-lock-fix.patch;patch=1 \
+           file://eglibc-svn-arm-lowlevellock-include-tls.patch \
+	   file://IO-acquire-lock-fix.patch \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
@@ -95,6 +95,4 @@ do_compile () {
 	)
 }
 
-require eglibc-stage.inc
-
 require eglibc-package.bbclass
diff --git a/recipes/ekiga/ekiga_3.0.2.bb b/recipes/ekiga/ekiga_3.0.2.bb
index 951168a950..585332c48c 100644
--- a/recipes/ekiga/ekiga_3.0.2.bb
+++ b/recipes/ekiga/ekiga_3.0.2.bb
@@ -10,7 +10,7 @@ DEPENDS += " avahi libnotify eds-dbus libgnome gtkmm libsigc++-2.0 gstreamer opa
 RDEPENDS += "opal ptlib"
 
 SRC_URI = "http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PV}/ekiga-${PV}.tar.gz \
-           file://static-fix.diff;patch=1"
+           file://static-fix.diff"
 
 EXTRA_OECONF = "  --enable-static-libs --disable-gdu --disable-scrollkeeper "
 
diff --git a/recipes/ekiga/ekiga_git.bb b/recipes/ekiga/ekiga_git.bb
index 91e73d26ff..a4d62e06ae 100644
--- a/recipes/ekiga/ekiga_git.bb
+++ b/recipes/ekiga/ekiga_git.bb
@@ -11,7 +11,7 @@ SRCREV = "c81cabbee7901b6643907d08f9a530308044ec22"
 inherit gnome
 
 SRC_URI = "git://git.gnome.org/ekiga;protocol=git;branch=master \
-           file://rgb16.patch;patch=1 \
+           file://rgb16.patch \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/ekiga/opal_3.4.4.bb b/recipes/ekiga/opal_3.4.4.bb
index 052d7989e2..fb0e41754f 100644
--- a/recipes/ekiga/opal_3.4.4.bb
+++ b/recipes/ekiga/opal_3.4.4.bb
@@ -6,7 +6,7 @@ inherit gnome
 DEPENDS += " ffmpeg ptlib virtual/libsdl openldap"
 
 SRC_URI = "http://www.ekiga.org/admin/downloads/latest/sources/ekiga_3.0.2/opal-${PV}.tar.bz2 \
-           file://configure.diff;patch=1 \
+           file://configure.diff \
           "
 
 EXTRA_OECONF = "--enable-localgsm --disable-spandsp "
diff --git a/recipes/ekiga/opal_3.5.2.bb b/recipes/ekiga/opal_3.5.2.bb
index 2407e9b0ab..71f82fec9d 100644
--- a/recipes/ekiga/opal_3.5.2.bb
+++ b/recipes/ekiga/opal_3.5.2.bb
@@ -8,7 +8,7 @@ inherit gnome
 DEPENDS += " ffmpeg ptlib virtual/libsdl openldap"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/opal-${PV}.tar.bz2 \
-           file://configure.diff;patch=1 \
+           file://configure.diff \
           "
 
 EXTRA_OECONF = "--enable-localgsm --disable-spandsp "
diff --git a/recipes/ekiga/opal_3.6.1.bb b/recipes/ekiga/opal_3.6.1.bb
index 4460d76e6c..c53b72e621 100644
--- a/recipes/ekiga/opal_3.6.1.bb
+++ b/recipes/ekiga/opal_3.6.1.bb
@@ -6,7 +6,7 @@ inherit gnome
 DEPENDS += " ffmpeg ptlib virtual/libsdl openldap"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/opal-${PV}.tar.bz2 \
-           file://configure.diff;patch=1 \
+           file://configure.diff \
           "
 
 EXTRA_OECONF = "--enable-localgsm --disable-spandsp "
diff --git a/recipes/ekiga/opal_3.6.2.bb b/recipes/ekiga/opal_3.6.2.bb
index 5ba8f1191c..3a24c31d54 100644
--- a/recipes/ekiga/opal_3.6.2.bb
+++ b/recipes/ekiga/opal_3.6.2.bb
@@ -6,7 +6,7 @@ inherit gnome
 DEPENDS += " ffmpeg ptlib virtual/libsdl openldap"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/opal-${PV}.tar.bz2 \
-           file://configure.diff;patch=1 \
+           file://configure.diff \
           "
 
 EXTRA_OECONF = "--enable-localgsm --disable-spandsp "
diff --git a/recipes/ekiga/opal_3.6.4.bb b/recipes/ekiga/opal_3.6.4.bb
index 28ce3e709d..827c8f33fa 100644
--- a/recipes/ekiga/opal_3.6.4.bb
+++ b/recipes/ekiga/opal_3.6.4.bb
@@ -6,7 +6,7 @@ inherit gnome
 DEPENDS += " ffmpeg ptlib virtual/libsdl openldap"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/opal-${PV}.tar.bz2 \
-           file://configure.diff;patch=1 \
+           file://configure.diff \
           "
 
 EXTRA_OECONF = "--enable-localgsm --disable-spandsp "
diff --git a/recipes/ekiga/opal_3.6.6.bb b/recipes/ekiga/opal_3.6.6.bb
index d8cf9c852c..6591bd775c 100644
--- a/recipes/ekiga/opal_3.6.6.bb
+++ b/recipes/ekiga/opal_3.6.6.bb
@@ -6,7 +6,7 @@ inherit gnome
 DEPENDS += " ffmpeg ptlib virtual/libsdl openldap"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/opal-${PV}.tar.bz2 \
-           file://configure.diff;patch=1 \
+           file://configure.diff \
           "
 
 EXTRA_OECONF = "--enable-localgsm --disable-spandsp "
diff --git a/recipes/ekiga/ptlib_2.6.5.bb b/recipes/ekiga/ptlib_2.6.5.bb
index c6a19b997e..7d544d5cf1 100644
--- a/recipes/ekiga/ptlib_2.6.5.bb
+++ b/recipes/ekiga/ptlib_2.6.5.bb
@@ -8,7 +8,7 @@ inherit gnome
 DEPENDS += "libgsm openldap openssl expat virtual/libsdl alsa-lib"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/ptlib-${PV}.tar.bz2 \
-           file://rgb16.patch;patch=1 \
+           file://rgb16.patch \
 "
 
 do_configure() {
diff --git a/recipes/elfkickers/elfkickers_2.0a.bb b/recipes/elfkickers/elfkickers_2.0a.bb
index 9b3337efb0..3474b56caa 100644
--- a/recipes/elfkickers/elfkickers_2.0a.bb
+++ b/recipes/elfkickers/elfkickers_2.0a.bb
@@ -4,8 +4,8 @@ PRIORITY = "optional"
 SECTION = "devel"
 
 SRC_URI = "http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${PV}.tar.gz \
-           file://gentoo.patch;patch=1 \
-           file://mjn3-sstrip.patch;patch=1"
+           file://gentoo.patch \
+           file://mjn3-sstrip.patch"
 S = "${WORKDIR}/ELFkickers"
 
 ELFPKGS = "ebfc elfls elftoc \
diff --git a/recipes/elfutils/elfutils_0.127.bb b/recipes/elfutils/elfutils_0.127.bb
index b9e2516f98..59588b1a52 100644
--- a/recipes/elfutils/elfutils_0.127.bb
+++ b/recipes/elfutils/elfutils_0.127.bb
@@ -4,7 +4,7 @@ LICENSE = "OSL"
 DEPENDS = "libtool"
 
 SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \
-	   file://warnings.patch;patch=1"
+	   file://warnings.patch"
 
 inherit autotools
 
diff --git a/recipes/elfutils/elfutils_0.131.bb b/recipes/elfutils/elfutils_0.131.bb
index 44ff36c50f..c250c9fbda 100644
--- a/recipes/elfutils/elfutils_0.131.bb
+++ b/recipes/elfutils/elfutils_0.131.bb
@@ -4,7 +4,7 @@ LICENSE = "OSL"
 DEPENDS = "libtool"
 
 SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \
-	   file://warnings.patch;patch=1"
+	   file://warnings.patch"
 
 inherit autotools
 
diff --git a/recipes/elfutils/elfutils_0.143.bb b/recipes/elfutils/elfutils_0.143.bb
index 7c0e16e3cc..24cf074e3e 100644
--- a/recipes/elfutils/elfutils_0.143.bb
+++ b/recipes/elfutils/elfutils_0.143.bb
@@ -2,11 +2,12 @@ DESCRIPTION = "A collection of utilities and DSOs to handle compiled objects."
 SECTION = "base"
 LICENSE = "OSL"
 DEPENDS = "libtool"
+PR = "r1"
 
 inherit autotools
 
 SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2;name=archive \
-           http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.143-1.diff.gz;patch=1;name=patch \
+           http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.143-1.diff.gz;name=patch \
            file://i386_dis.h \
            file://x86_64_dis.h \
 "
@@ -25,3 +26,5 @@ SRC_URI[archive.md5sum] = "06e35c348e78dec58f6aeb51bd397760"
 SRC_URI[archive.sha256sum] = "435c0c8a7ed5ca34ea5ac985041faedf56b21a6cdd24058e3c2f3b5347d238ff"
 SRC_URI[patch.md5sum] = "c211d10508e3494cfce77f5807bbfff2"
 SRC_URI[patch.sha256sum] = "d69dd1c9885752c2b1a00403d1ac2a876268701654a31723123e26ab72be4258"
+
+FILES_${PN} += "${libdir}/libasm-${PV}.so ${libdir}/libdw-${PV}.so ${libdir}/libelf-${PV}.so"
diff --git a/recipes/elfutils/elfutils_0.89.bb b/recipes/elfutils/elfutils_0.89.bb
index 1fac965d20..a6f56a6338 100644
--- a/recipes/elfutils/elfutils_0.89.bb
+++ b/recipes/elfutils/elfutils_0.89.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "A collection of utilities and DSOs to handle compiled objects."
 DEPENDS = "libtool"
 
 SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \
-	   file://warnings.patch;patch=1"
+	   file://warnings.patch"
 
 SRC_URI[md5sum] = "a690778e93e4b04eb531c6a3ef0ad23a"
 SRC_URI[sha256sum] = "a87a193cb0f63267573611c7adba0dab033f34cb760b2b1009ee3ca9fddb5a09"
diff --git a/recipes/em8300/em8300_0.16.3.bb b/recipes/em8300/em8300_0.16.3.bb
index 75a948e861..6401b779a3 100644
--- a/recipes/em8300/em8300_0.16.3.bb
+++ b/recipes/em8300/em8300_0.16.3.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+"
 # Be sure to have the I2C bitbanging interface enabled in your kernel config
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dxr3/${PN}-${PV}.tar.gz \
-           file://kernel-source-dir.diff;patch=1 \
+           file://kernel-source-dir.diff \
           "
 
 SRC_URI[md5sum] = "3ec91423f6a0b274b5bf56bfc3b98ac6"
diff --git a/recipes/emacs/emacs-x11_22.3.bb b/recipes/emacs/emacs-x11_22.3.bb
index 3569d6075c..02bc951a88 100644
--- a/recipes/emacs/emacs-x11_22.3.bb
+++ b/recipes/emacs/emacs-x11_22.3.bb
@@ -9,8 +9,8 @@ RREPLACES = "emacs"
 
 FILESPATH = "${FILE_DIRNAME}/emacs-${PV}:${FILE_DIRNAME}/files"
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz \
-	   file://use-qemu.patch;patch=1 \
-	   file://nostdlib-unwind.patch;patch=1"
+	   file://use-qemu.patch \
+	   file://nostdlib-unwind.patch"
 
 S = "${WORKDIR}/emacs-${PV}"
 
diff --git a/recipes/emacs/emacs-x11_23.1.bb b/recipes/emacs/emacs-x11_23.1.bb
index 65665f22a6..62a5ccde25 100644
--- a/recipes/emacs/emacs-x11_23.1.bb
+++ b/recipes/emacs/emacs-x11_23.1.bb
@@ -1,7 +1,9 @@
 require emacs.inc
 
 # full X (non-diet) is needed for X support
-DEPENDS += "gtk+ libungif"
+DEPENDS += "gtk+ libungif dbus"
+
+PR = "r1"
 
 EXTRA_OECONF = "--without-sound --with-x-toolkit=gtk"
 
@@ -11,8 +13,8 @@ RREPLACES = "emacs"
 
 FILESPATH = "${FILE_DIRNAME}/emacs-${PV}:${FILE_DIRNAME}/files"
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
-	   file://emacs23.1-use-qemu.patch;patch=1 \
-	   file://nostdlib-unwind.patch;patch=1"
+	   file://emacs23.1-use-qemu.patch \
+	   file://nostdlib-unwind.patch"
 SRC_URI[tarball.md5sum] = "a620d4452769d04ad8864d662f34f8dd"
 SRC_URI[tarball.sha256sum] = "a94cd46301f000d2d1dcd3fd7ef08ad952846d01ca5d4168b4ec3e38e857da47"
 
diff --git a/recipes/emacs/emacs.inc b/recipes/emacs/emacs.inc
index d643d31624..6645f410e6 100644
--- a/recipes/emacs/emacs.inc
+++ b/recipes/emacs/emacs.inc
@@ -50,6 +50,11 @@ do_compile_prepend() {
         if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then
                 cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
         fi
+	# stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails
+	# temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one
+	if [ ! -f $treedir/lib/libc.so ]; then
+		ln -s libc.so.6 $treedir/lib/libc.so
+	fi
 }
 
 EXTRA_OEMAKE += 'QEMU="${QEMU}"'
diff --git a/recipes/emacs/emacs_22.3.bb b/recipes/emacs/emacs_22.3.bb
index 5ec66e9371..5360483280 100644
--- a/recipes/emacs/emacs_22.3.bb
+++ b/recipes/emacs/emacs_22.3.bb
@@ -5,8 +5,8 @@ PR="r1"
 EXTRA_OECONF = "--without-sound --without-x"
 
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz \
-	   file://use-qemu.patch;patch=1 \
-	   file://nostdlib-unwind.patch;patch=1"
+	   file://use-qemu.patch \
+	   file://nostdlib-unwind.patch"
 
 S = "${WORKDIR}/emacs-${PV}"
 
diff --git a/recipes/emacs/emacs_23.1.bb b/recipes/emacs/emacs_23.1.bb
index feb56d4e44..7b1a6c7e2a 100644
--- a/recipes/emacs/emacs_23.1.bb
+++ b/recipes/emacs/emacs_23.1.bb
@@ -8,8 +8,8 @@ DEFAULT_PREFERENCE = "-2"
 
 FILESPATH = "${FILE_DIRNAME}/emacs-${PV}:${FILE_DIRNAME}/files"
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
-	   file://emacs23.1-use-qemu.patch;patch=1 \
-	   file://nostdlib-unwind.patch;patch=1"
+	   file://emacs23.1-use-qemu.patch \
+	   file://nostdlib-unwind.patch"
 SRC_URI[tarball.md5sum] = "a620d4452769d04ad8864d662f34f8dd"
 SRC_URI[tarball.sha256sum] = "a94cd46301f000d2d1dcd3fd7ef08ad952846d01ca5d4168b4ec3e38e857da47"
 
diff --git a/recipes/emacs/emacs_cvs.bb b/recipes/emacs/emacs_cvs.bb
index 4a406d6516..c3a98a39e5 100644
--- a/recipes/emacs/emacs_cvs.bb
+++ b/recipes/emacs/emacs_cvs.bb
@@ -14,7 +14,7 @@ PR = "r9"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "cvs://anoncvs:anonymous@cvs.savannah.gnu.org/sources/emacs;module=emacs \
-           file://use-qemu.patch;patch=1"
+           file://use-qemu.patch"
 S = "${WORKDIR}/emacs"
 
 inherit autotools
diff --git a/recipes/emacs/files/emacs23.1-use-qemu.patch b/recipes/emacs/files/emacs23.1-use-qemu.patch
index dd1f384d6d..255b07fc92 100644
--- a/recipes/emacs/files/emacs23.1-use-qemu.patch
+++ b/recipes/emacs/files/emacs23.1-use-qemu.patch
@@ -64,6 +64,15 @@ Index: emacs-23.1/src/Makefile.in
 ===================================================================
 --- emacs-23.1.orig/src/Makefile.in
 +++ emacs-23.1/src/Makefile.in
+@@ -497,7 +497,7 @@
+    this with the shell''s ``for'' construct.
+    Note that some people do not have '.'  in their paths, so we must
+    use ./prefix-args.  */
+-#define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags`
++#define YMF_PASS_LDFLAGS(flags) `${QEMU} ./prefix-args -Xlinker flags`
+ #else
+ #define YMF_PASS_LDFLAGS(flags) flags
+ #endif
 @@ -895,9 +895,9 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(L
  #endif
  
diff --git a/recipes/emelfm2/emelfm2_0.0.8.bb b/recipes/emelfm2/emelfm2_0.0.8.bb
index 303968c985..855fcbba29 100644
--- a/recipes/emelfm2/emelfm2_0.0.8.bb
+++ b/recipes/emelfm2/emelfm2_0.0.8.bb
@@ -6,7 +6,7 @@ DESCRIPTION="emelFM2 is a GTK2+ file manager that implements the popular \
 	two-pane design."
 HOMEPAGE="http://dasui.prima.de/e2wiki/"
 SRC_URI="http://dasui.prima.de/~tooar/emelfm2-${PV}.tar.gz \
-	file://makefile.patch;patch=1"
+	file://makefile.patch"
 
 SRC_URI[md5sum] = "70baf819021f2d733c122e3350764483"
 SRC_URI[sha256sum] = "14955a6ef5115165dc8e74c68fdda8feda365ec45a3b2a3241ea3d2ba6b959da"
diff --git a/recipes/enca/enca_1.9.bb b/recipes/enca/enca_1.9.bb
index c6561c1583..86eae4c0ca 100644
--- a/recipes/enca/enca_1.9.bb
+++ b/recipes/enca/enca_1.9.bb
@@ -6,10 +6,10 @@ HOMEPAGE = "http://trific.ath.cx/software/enca/"
 PR = "r4"
 
 SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \
-	file://configure-hack.patch;patch=1 \
-	file://dont-run-tests.patch;patch=1 \
-	file://configure-remove-dumbness.patch;patch=1 \
-	file://makefile-remove-tools.patch;patch=1 "
+	file://configure-hack.patch \
+	file://dont-run-tests.patch \
+	file://configure-remove-dumbness.patch \
+	file://makefile-remove-tools.patch "
 
 inherit autotools
 
diff --git a/recipes/enchant/enchant_1.2.5.bb b/recipes/enchant/enchant_1.2.5.bb
index 6d0adaa4ed..7713a9dfa1 100644
--- a/recipes/enchant/enchant_1.2.5.bb
+++ b/recipes/enchant/enchant_1.2.5.bb
@@ -12,7 +12,7 @@ PR = "r1"
 S = "${WORKDIR}/enchant-${PV}"
 
 SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz \
-           file://configure.patch;patch=1"
+           file://configure.patch"
 
 EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} --enable-aspell --disable-binreloc"
 
diff --git a/recipes/enchant/enchant_1.3.0.bb b/recipes/enchant/enchant_1.3.0.bb
index 5fb97ceb62..7349762b80 100644
--- a/recipes/enchant/enchant_1.3.0.bb
+++ b/recipes/enchant/enchant_1.3.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Enchant Spell checker API Library"
 PRIORITY    = "optional"
 SECTION     = "libs"
 LICENSE     = "LGPL"
-DEPENDS     = "aspell"
+DEPENDS     = "aspell glib-2.0"
 RDEPENDS    = "aspell"
 
 inherit autotools pkgconfig
diff --git a/recipes/enscript/enscript_1.6.4.bb b/recipes/enscript/enscript_1.6.4.bb
index 78a5bd3f4e..21c20551f5 100644
--- a/recipes/enscript/enscript_1.6.4.bb
+++ b/recipes/enscript/enscript_1.6.4.bb
@@ -5,7 +5,7 @@ output to a file or sends it directly to the printer."
 LICENSE = "GPL"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/e/enscript/enscript_${PV}.orig.tar.gz \
-	   file://autotools.patch;patch=1"
+	   file://autotools.patch"
 
 inherit autotools
 
diff --git a/recipes/epdfview/epdfview_svn.bb b/recipes/epdfview/epdfview_svn.bb
index a524a328eb..72faec31d1 100644
--- a/recipes/epdfview/epdfview_svn.bb
+++ b/recipes/epdfview/epdfview_svn.bb
@@ -6,7 +6,7 @@ DEPENDS = "poppler gtk+ cups"
 
 SRCREV = "346"
 PV = "0.1.7+svnr${SRCPV}"
-PR = "r0.6"
+PR = "r0"
 
 SRC_URI = "svn://svn.emma-soft.com/epdfview;module=trunk;proto=svn \
 	  "
diff --git a/recipes/erlang/erlang_R11B.1.bb b/recipes/erlang/erlang_R11B.1.bb
index 18888e0f2b..a2a30c9a36 100644
--- a/recipes/erlang/erlang_R11B.1.bb
+++ b/recipes/erlang/erlang_R11B.1.bb
@@ -1,12 +1,12 @@
 include erlang.inc
 DEPENDS += "erlang-native openssl"
 
-SRC_URI += "file://erts-configure.in.patch;patch=1 \
-            file://erts-emulator-Makefile.in.patch;patch=1 \
-            file://erts-etc-unix-Install.src.patch;patch=1 \
-            file://lib-crypto-c_src-Makefile.in.patch;patch=1 \
-            file://lib-erl_interface-src-Makefile.in.patch;patch=1 \
-            file://Makefile.in.patch;patch=1 \
+SRC_URI += "file://erts-configure.in.patch \
+            file://erts-emulator-Makefile.in.patch \
+            file://erts-etc-unix-Install.src.patch \
+            file://lib-crypto-c_src-Makefile.in.patch \
+            file://lib-erl_interface-src-Makefile.in.patch \
+            file://Makefile.in.patch \
             "
 
 EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'"
diff --git a/recipes/erlang/erlang_R13B01.bb b/recipes/erlang/erlang_R13B01.bb
index 7f1ae707be..570b3bbcc9 100644
--- a/recipes/erlang/erlang_R13B01.bb
+++ b/recipes/erlang/erlang_R13B01.bb
@@ -4,10 +4,10 @@ DEPENDS += "erlang-native openssl"
 PR = "r2"
 
 SRC_URI += "\
-            file://erts-emulator-Makefile.in.patch;patch=1 \
-            file://erts-etc-unix-Install.src.patch;patch=1 \
-            file://lib-erl_interface-src-Makefile.in.patch;patch=1 \
-            file://Makefile.in.patch;patch=1 \
+            file://erts-emulator-Makefile.in.patch \
+            file://erts-etc-unix-Install.src.patch \
+            file://lib-erl_interface-src-Makefile.in.patch \
+            file://Makefile.in.patch \
             "
 
 TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/recipes/esound/esound_0.2.36.bb b/recipes/esound/esound_0.2.36.bb
index de281d7ef8..578b6ec277 100644
--- a/recipes/esound/esound_0.2.36.bb
+++ b/recipes/esound/esound_0.2.36.bb
@@ -8,9 +8,9 @@ PR = "r3"
 inherit gnome binconfig
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2;name=archive \
-	   https://launchpad.net/ubuntu/breezy/+source/esound/0.2.36-1ubuntu5/+files/esound_0.2.36-1ubuntu5.diff.gz;patch=1;name=patch \
-           file://no-docs.patch;patch=1 \
-	   file://configure-fix.patch;patch=1"
+	   https://launchpad.net/ubuntu/breezy/+source/esound/0.2.36-1ubuntu5/+files/esound_0.2.36-1ubuntu5.diff.gz;name=patch \
+           file://no-docs.patch \
+	   file://configure-fix.patch"
 
 EXTRA_OECONF = " \
     --disable-alsa \
diff --git a/recipes/ettercap/ettercap-ng_0.7.3.bb b/recipes/ettercap/ettercap-ng_0.7.3.bb
index a6d23f80bc..701a19cab4 100644
--- a/recipes/ettercap/ettercap-ng_0.7.3.bb
+++ b/recipes/ettercap/ettercap-ng_0.7.3.bb
@@ -8,8 +8,8 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-NG-${PV}.tar.gz \
-           file://autotools.patch;patch=1 \
-           file://configure.patch;patch=1 "
+           file://autotools.patch \
+           file://configure.patch "
 
 S = "${WORKDIR}/ettercap-NG-${PV}"
 
diff --git a/recipes/evince/evince_0.5.2.bb b/recipes/evince/evince_0.5.2.bb
index 13823d47a2..3cda4a4d82 100644
--- a/recipes/evince/evince_0.5.2.bb
+++ b/recipes/evince/evince_0.5.2.bb
@@ -9,7 +9,7 @@ PR = "r2"
 inherit gnome pkgconfig
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.5/${PN}-${PV}.tar.bz2 \
-          file://more-no-doc.patch;patch=1"
+          file://more-no-doc.patch"
 
 EXTRA_OECONF = "--disable-tiff"
 
diff --git a/recipes/evince/evince_0.6.1.bb b/recipes/evince/evince_0.6.1.bb
index fa1639782c..50650a4b3b 100644
--- a/recipes/evince/evince_0.6.1.bb
+++ b/recipes/evince/evince_0.6.1.bb
@@ -9,7 +9,7 @@ PR = "r1"
 inherit gnome pkgconfig
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.6/${PN}-${PV}.tar.bz2 \
-          file://more-no-doc.patch;patch=1"
+          file://more-no-doc.patch"
 
 FILES_${PN} += "${datadir}/icons"
 
diff --git a/recipes/evince/evince_0.9.0.bb b/recipes/evince/evince_0.9.0.bb
index 3acc26748c..7d3ec11c38 100644
--- a/recipes/evince/evince_0.9.0.bb
+++ b/recipes/evince/evince_0.9.0.bb
@@ -9,8 +9,8 @@ PR = "r2"
 inherit gnome pkgconfig gtk-icon-cache
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 \
-           file://no-icon-theme.diff;patch=1;pnum=0 \
-           file://no-help-dir.patch;patch=1"
+           file://no-icon-theme.diff;striplevel=0 \
+           file://no-help-dir.patch"
 
 EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper"
 
diff --git a/recipes/evince/evince_0.9.2.bb b/recipes/evince/evince_0.9.2.bb
index b9ccf31ebd..d3487a0b34 100644
--- a/recipes/evince/evince_0.9.2.bb
+++ b/recipes/evince/evince_0.9.2.bb
@@ -9,8 +9,8 @@ PR = "r2"
 inherit gnome pkgconfig gtk-icon-cache
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 \
-           file://no-icon-theme.diff;patch=1;pnum=0 \
-           file://no-help-dir.patch;patch=1"
+           file://no-icon-theme.diff;striplevel=0 \
+           file://no-help-dir.patch"
 
 EXTRA_OECONF = " --without-libgnome \
                  --disable-thumbnailer \
diff --git a/recipes/evince/evince_2.20.0.bb b/recipes/evince/evince_2.20.0.bb
index b652281252..aa50c75b04 100644
--- a/recipes/evince/evince_2.20.0.bb
+++ b/recipes/evince/evince_2.20.0.bb
@@ -8,8 +8,8 @@ PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
-SRC_URI += "file://no-icon-theme.diff;patch=1;pnum=0 \
-            file://no-help-dir.patch;patch=1"
+SRC_URI += "file://no-icon-theme.diff;striplevel=0 \
+            file://no-help-dir.patch"
 
 EXTRA_OECONF = " --without-libgnome \
                  --disable-thumbnailer \
diff --git a/recipes/evince/evince_2.23.4.bb b/recipes/evince/evince_2.23.4.bb
index d95d897198..052e8cac38 100644
--- a/recipes/evince/evince_2.23.4.bb
+++ b/recipes/evince/evince_2.23.4.bb
@@ -8,7 +8,7 @@ PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
-SRC_URI += " file://no-help-dir.patch;patch=1"
+SRC_URI += " file://no-help-dir.patch"
 
 EXTRA_OECONF = " --without-libgnome \
                  --disable-thumbnailer \
diff --git a/recipes/evince/evince_2.24.1.bb b/recipes/evince/evince_2.24.1.bb
index ea75132c0d..d9d3389c3c 100644
--- a/recipes/evince/evince_2.24.1.bb
+++ b/recipes/evince/evince_2.24.1.bb
@@ -7,7 +7,7 @@ PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
-SRC_URI += " file://no-help-dir.patch;patch=1"
+SRC_URI += " file://no-help-dir.patch"
 
 EXTRA_OECONF = "  \
                  --enable-thumbnailer \
diff --git a/recipes/evince/evince_2.26.2.bb b/recipes/evince/evince_2.26.2.bb
index 18c8933eee..f3dcaceba2 100644
--- a/recipes/evince/evince_2.26.2.bb
+++ b/recipes/evince/evince_2.26.2.bb
@@ -6,7 +6,7 @@ RDEPENDS = "espgs gnome-icon-theme"
 
 inherit gnome pkgconfig gtk-icon-cache
 
-SRC_URI += " file://no-help-dir.patch;patch=1"
+SRC_URI += " file://no-help-dir.patch"
 
 EXTRA_OECONF = "  \
                  --enable-thumbnailer \
diff --git a/recipes/evopedia/evopedia_git.bb b/recipes/evopedia/evopedia_git.bb
index 4e26194112..09f148db57 100644
--- a/recipes/evopedia/evopedia_git.bb
+++ b/recipes/evopedia/evopedia_git.bb
@@ -6,8 +6,10 @@ LICENSE = "GPL"
 RDEPENDS = "python python-xml python-shell python-netclient python-mime \
             python-netserver python-io python-compression"
 RRECOMMENDS = "midori"
+RRECOMMENDS_shr = "ventura"
+
 PV = "0.3.0-rc3+gitr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://github.com/crei/evopedia.git;protocol=http;branch=master"
 
@@ -16,6 +18,10 @@ S = "${WORKDIR}/git/evopedia"
 
 inherit distutils
 
+do_configure_append_shr() {
+  sed -i "s#/usr/bin/midori#/usr/bin/ventura#g" ${S}/evopedia.sh
+}
+
 PACKAGE_ARCH = "all"
 
 FILES_${PN} += "${datadir}/applications \
diff --git a/recipes/evtest/evtest_1.25.bb b/recipes/evtest/evtest_1.25.bb
index 55de6cb2e1..c48381e03f 100644
--- a/recipes/evtest/evtest_1.25.bb
+++ b/recipes/evtest/evtest_1.25.bb
@@ -4,7 +4,9 @@ AUTHOR = "Vojtech Pavlik <vojtech@suse.cz>"
 SECTION = "console/utils"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
+
+DEPENDS = "libxml2"
 
 SRC_URI = "http://cgit.freedesktop.org/~whot/evtest/snapshot/evtest-${PV}.tar.bz2;name=archive"
 SRC_URI[archive.md5sum] = "770d6af03affe976bdbe3ad1a922c973"
diff --git a/recipes/expat/expat_1.95.7.bb b/recipes/expat/expat_1.95.7.bb
index 0b230d7588..61b2c5d597 100644
--- a/recipes/expat/expat_1.95.7.bb
+++ b/recipes/expat/expat_1.95.7.bb
@@ -1,8 +1,8 @@
 require expat.inc
 PR = "r3"
 
-SRC_URI += "file://autotools.patch;patch=1 \
-	    file://expat-XMLCALL.patch;patch=1 \
+SRC_URI += "file://autotools.patch \
+	    file://expat-XMLCALL.patch \
 	   "
 
 inherit lib_package
diff --git a/recipes/expat/expat_2.0.1.bb b/recipes/expat/expat_2.0.1.bb
index 1d06b9ed2c..db21b67f5c 100644
--- a/recipes/expat/expat_2.0.1.bb
+++ b/recipes/expat/expat_2.0.1.bb
@@ -1,7 +1,7 @@
 require expat.inc
 PR = "r3"
 
-SRC_URI += "file://autotools.patch;patch=1"
+SRC_URI += "file://autotools.patch"
 SRC_URI[src.md5sum] = "ee8b492592568805593f81f8cdf2a04c"
 SRC_URI[src.sha256sum] = "847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93"
 
diff --git a/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb b/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb
index c57ab6e655..360e7aa250 100644
--- a/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb
+++ b/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb
@@ -7,10 +7,10 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "http://www.ez-ipupdate.com/dist/ez-ipupdate-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://conffile.patch;patch=1 \
-	   file://zoneedit.patch;patch=1 \
-	   file://CVE-2004-0980.patch;patch=1;pnum=0 \
+	   file://configure.patch \
+	   file://conffile.patch \
+	   file://zoneedit.patch \
+	   file://CVE-2004-0980.patch;striplevel=0 \
 	   file://init \
 	   file://ipupdate.conf \
 	  "
diff --git a/recipes/ezx/ezx-gen-blob_svn.bb b/recipes/ezx/ezx-gen-blob_svn.bb
index cf9f117cdd..9b56c2493f 100644
--- a/recipes/ezx/ezx-gen-blob_svn.bb
+++ b/recipes/ezx/ezx-gen-blob_svn.bb
@@ -12,7 +12,7 @@ PR = "r1"
 
 SRC_URI = "\
   svn://svn.openezx.org/trunk/src/blob/;module=gen-blob;proto=http \
-  file://remove-bogus-sed.patch;patch=1 \
+  file://remove-bogus-sed.patch \
 "
 S = "${WORKDIR}/gen-blob"
 
diff --git a/recipes/faad2/faad2_2.0.bb b/recipes/faad2/faad2_2.0.bb
index ebb59feb01..fba2f55f24 100644
--- a/recipes/faad2/faad2_2.0.bb
+++ b/recipes/faad2/faad2_2.0.bb
@@ -3,13 +3,13 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = ""
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 PR ="r2"
 
 inherit autotools
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${PN}-${PV}.zip \
-           file://faad2-gcc-fix.patch;patch=1 \
+           file://faad2-gcc-fix.patch \
  	   file://Makefile.am"
 
 S="${WORKDIR}/${PN}"
diff --git a/recipes/fakechroot/fakechroot_2.5.bb b/recipes/fakechroot/fakechroot_2.5.bb
index a2d9b3b551..5b76b0b4d3 100644
--- a/recipes/fakechroot/fakechroot_2.5.bb
+++ b/recipes/fakechroot/fakechroot_2.5.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Gives a fake root environment which can support chroot"
 LICENSE = "GPL"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz \
-           file://fix-readlink.patch;patch=1"
+           file://fix-readlink.patch"
 
 inherit autotools
 
diff --git a/recipes/fakeroot/fakeroot-native_1.12.4.bb b/recipes/fakeroot/fakeroot-native_1.12.4.bb
index 429052a8f9..915886b0e2 100644
--- a/recipes/fakeroot/fakeroot-native_1.12.4.bb
+++ b/recipes/fakeroot/fakeroot-native_1.12.4.bb
@@ -1,6 +1,6 @@
 require fakeroot_${PV}.bb
 
-SRC_URI += "file://fix-prefix.patch;patch=1"
+SRC_URI += "file://fix-prefix.patch"
 S = "${WORKDIR}/fakeroot-${PV}"
 
 inherit native
diff --git a/recipes/fakeroot/fakeroot-native_1.9.6.bb b/recipes/fakeroot/fakeroot-native_1.9.6.bb
index 77d6f58651..ceaaddf84c 100644
--- a/recipes/fakeroot/fakeroot-native_1.9.6.bb
+++ b/recipes/fakeroot/fakeroot-native_1.9.6.bb
@@ -2,7 +2,7 @@ require fakeroot_${PV}.bb
 
 RDEPENDS="util-linux-native"
 
-SRC_URI += "file://fix-prefix.patch;patch=1 "
+SRC_URI += "file://fix-prefix.patch "
 S = "${WORKDIR}/fakeroot-${PV}"
 
 inherit native
diff --git a/recipes/fakeroot/fakeroot_1.12.4.bb b/recipes/fakeroot/fakeroot_1.12.4.bb
index 6d1b4201c8..f0f00f3e61 100644
--- a/recipes/fakeroot/fakeroot_1.12.4.bb
+++ b/recipes/fakeroot/fakeroot_1.12.4.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 
 SRC_URI = "\
   ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
-  file://configure-libtool.patch;patch=1 \
+  file://configure-libtool.patch \
 "
 	    
 inherit autotools
diff --git a/recipes/fakeroot/fakeroot_1.9.6.bb b/recipes/fakeroot/fakeroot_1.9.6.bb
index af84cdae7b..a25f2b2fcd 100644
--- a/recipes/fakeroot/fakeroot_1.9.6.bb
+++ b/recipes/fakeroot/fakeroot_1.9.6.bb
@@ -7,7 +7,7 @@ RDEPENDS = "util-linux"
 PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 	    
 inherit autotools
 
diff --git a/recipes/fam/fam_2.6.10.bb b/recipes/fam/fam_2.6.10.bb
index 714142aaef..6feae814b4 100644
--- a/recipes/fam/fam_2.6.10.bb
+++ b/recipes/fam/fam_2.6.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL LGPL"
 
 SRC_URI = "ftp://oss.sgi.com/projects/fam/download/stable/fam-${PV}.tar.gz \
-	   file://rpcsvc.patch;patch=1"
+	   file://rpcsvc.patch"
 
 inherit autotools
 
diff --git a/recipes/fam/fam_2.7.0.bb b/recipes/fam/fam_2.7.0.bb
index 44fab1b833..cca391593e 100644
--- a/recipes/fam/fam_2.7.0.bb
+++ b/recipes/fam/fam_2.7.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL LGPL"
 
 SRC_URI = "ftp://oss.sgi.com/projects/fam/download/stable/fam-${PV}.tar.gz \
-	   file://compile-fix.patch;patch=1"
+	   file://compile-fix.patch"
 
 inherit autotools
 
diff --git a/recipes/fastcgi/fastcgi_2.4.0.bb b/recipes/fastcgi/fastcgi_2.4.0.bb
index b53516a5db..7915107f27 100644
--- a/recipes/fastcgi/fastcgi_2.4.0.bb
+++ b/recipes/fastcgi/fastcgi_2.4.0.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "Fast CGI backend (web server to CGI handler) library"
 PR = "r4"
 
 SRC_URI = "http://www.fastcgi.com/dist/fcgi-${PV}.tar.gz \
-file://link-against-math.patch;patch=1 \
-file://cstdio.patch;patch=1 "
+file://link-against-math.patch \
+file://cstdio.patch "
 
 S=${WORKDIR}/fcgi-${PV}
 
diff --git a/recipes/fastjar/fastjar-native.inc b/recipes/fastjar/fastjar-native.inc
deleted file mode 100644
index e4d7084138..0000000000
--- a/recipes/fastjar/fastjar-native.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-DEPENDS = "zlib-native"
-
-S = "${WORKDIR}/fastjar-${PV}"
-
-inherit native
-
-do_configure () {
-	gnu-configize || die "failure running gnu-configize"
-	oe_runconf
-}
-
-do_make() {
-	oe_runmake bin_PROGRAMS
-}
-
-do_stage() {
-	oe_runmake install-binPROGRAMS
-}
diff --git a/recipes/fastjar/fastjar-native_0.92+gcc3.4.2.bb b/recipes/fastjar/fastjar-native_0.92+gcc3.4.2.bb
deleted file mode 100644
index 7da694873e..0000000000
--- a/recipes/fastjar/fastjar-native_0.92+gcc3.4.2.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "jar replacement written in C."
-HOMEPAGE = "http://sourceforge.net/projects/fastjar/"
-SECTION = "devel"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-DEPENDS = "zlib"
-
-GCC_VER = "${@bb.data.getVar('PV',d,1).split('gcc')[1]}"
-SRC_URI = "${GNU_MIRROR}/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.bz2"
-
-S = "${WORKDIR}/gcc-${GCC_VER}"
-
-inherit autotools native
-
-EXTRA_OECONF = "--with-system-zlib --with-fastjar"
-
-do_configure () {
-	gnu-configize || die "failure running gnu-configize"
-	oe_runconf
-}
-
-do_compile() {
-	oe_runmake maybe-all-fastjar
-}
-
-do_stage() {
-	install -d ${STAGING_BINDIR}
-	install -m 755 fastjar/jar ${STAGING_BINDIR}/fastjar
-	install -m 755 fastjar/grepjar ${STAGING_BINDIR}
-}
-
-SRC_URI[md5sum] = "2fada3a3effd2fd791df09df1f1534b3"
-SRC_URI[sha256sum] = "522c53b92ff9096089f3074c50e17a5169952d32f4c883c6fdae350e8f1b344e"
diff --git a/recipes/fastjar/fastjar-native_0.95.bb b/recipes/fastjar/fastjar-native_0.95.bb
deleted file mode 100644
index 5ca9b5fc9b..0000000000
--- a/recipes/fastjar/fastjar-native_0.95.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require fastjar.inc
-require fastjar-native.inc
-
-PR = "${INC_PR}.1"
-
-SRC_URI[md5sum] = "92a70f9e56223b653bce0f58f90cf950"
-SRC_URI[sha256sum] = "ca03811490c965abc9f466e75418ae48bb71f14d8e8ed4c43e8109207b85ce54"
diff --git a/recipes/fastjar/fastjar-native_0.98.bb b/recipes/fastjar/fastjar-native_0.98.bb
deleted file mode 100644
index 11f76f41c7..0000000000
--- a/recipes/fastjar/fastjar-native_0.98.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require fastjar.inc
-require fastjar-native.inc
-
-PR = "${INC_PR}.1"
-
-SRC_URI[md5sum] = "d2d264d343d4d0e1575832cc1023c3bf"
-SRC_URI[sha256sum] = "f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145"
diff --git a/recipes/fastjar/fastjar.inc b/recipes/fastjar/fastjar.inc
index 7c5439edb4..5f6285a1f2 100644
--- a/recipes/fastjar/fastjar.inc
+++ b/recipes/fastjar/fastjar.inc
@@ -2,15 +2,17 @@ DESCRIPTION = "jar replacement written in C."
 HOMEPAGE = "http://savannah.nongnu.org/projects/fastjar/"
 SECTION = "devel"
 PRIORITY = "optional"
-LICENSE = "GPL"
+LICENSE = "GPLv2"
 
 DEPENDS = "zlib"
 
-INC_PR = "r3"
+INC_PR = "r4"
+
+BBCLASSEXTEND = "native"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz"
 
 inherit autotools
 
-PACKAGES =+ "${PN}-grepjar"
+PACKAGES = "${PN}-grepjar ${PN} ${PN}-dbg ${PN}-doc"
 FILES_${PN}-grepjar = "${bindir}/grepjar"
diff --git a/recipes/fastjar/fastjar_0.98.bb b/recipes/fastjar/fastjar_0.98.bb
index 652e8e71dc..e9be4e14a9 100644
--- a/recipes/fastjar/fastjar_0.98.bb
+++ b/recipes/fastjar/fastjar_0.98.bb
@@ -1,4 +1,6 @@
 require fastjar.inc
 
+PR = "${INC_PR}.1"
+
 SRC_URI[md5sum] = "d2d264d343d4d0e1575832cc1023c3bf"
 SRC_URI[sha256sum] = "f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145"
diff --git a/recipes/fbgetty/fbgetty_0.1.698.bb b/recipes/fbgetty/fbgetty_0.1.698.bb
index a0d4fb7801..f00bbab1d0 100644
--- a/recipes/fbgetty/fbgetty_0.1.698.bb
+++ b/recipes/fbgetty/fbgetty_0.1.698.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "framebuffer getty."
 LICENSE = "GPL"
 
 SRC_URI = "http://ftp3.ie.freebsd.org/pub/gentoo/distfiles/fbgetty-${PV}.tar.gz \
-	   file://compile.patch;patch=1"
+	   file://compile.patch"
 B = "${WORKDIR}/build.${HOST_SYS}.${TARGET_SYS}"
 
 inherit autotools
diff --git a/recipes/fbgrab/fbgrab_1.0.bb b/recipes/fbgrab/fbgrab_1.0.bb
index c4da2f02bf..891657aed8 100644
--- a/recipes/fbgrab/fbgrab_1.0.bb
+++ b/recipes/fbgrab/fbgrab_1.0.bb
@@ -7,9 +7,9 @@ PR = "r2"
 DEPENDS = " zlib libpng "
 
 SRC_URI = "http://hem.bredband.net/gmogmo/fbgrab/fbgrab-${PV}.tar.gz;name=archive \
-           file://makefile.patch;patch=1 \
-	   http://people.openezx.org/ao2/fbgrab_network_mode.diff;patch=1;name=patch \
-	   file://fbgrab_1bpp.patch;patch=1 \
+           file://makefile.patch \
+	   http://people.openezx.org/ao2/fbgrab_network_mode.diff;name=patch \
+	   file://fbgrab_1bpp.patch \
 	   "
 
 do_install() {
diff --git a/recipes/fbida/fbida_2.07.bb b/recipes/fbida/fbida_2.07.bb
index 801d1d2e06..886fe8179d 100644
--- a/recipes/fbida/fbida_2.07.bb
+++ b/recipes/fbida/fbida_2.07.bb
@@ -14,10 +14,10 @@ DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif"
 RDEPENDS = "ttf-dejavu-sans-mono"
 
 SRC_URI = "http://dl.bytesex.org/releases/fbida/fbida-${PV}.tar.gz \
-	   file://exiftran.c.patch;patch=1 \
-	   file://fbi.c.patch;patch=1 \
-	   file://GNUmakefile.patch;patch=1 \
-	   file://sys_siglist.patch;patch=1 \
+	   file://exiftran.c.patch \
+	   file://fbi.c.patch \
+	   file://GNUmakefile.patch \
+	   file://sys_siglist.patch \
 	  "
 
 EXTRA_OEMAKE = ""
diff --git a/recipes/fbpanel/fbpanel_4.3.bb b/recipes/fbpanel/fbpanel_4.3.bb
index 68671126d5..f2af419a7d 100644
--- a/recipes/fbpanel/fbpanel_4.3.bb
+++ b/recipes/fbpanel/fbpanel_4.3.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ libxmu libxpm"
 HOMEPAGE = "http://fbpanel.sourceforge.net/"
 SRC_URI = "${SOURCEFORGE_MIRROR}/fbpanel/fbpanel-${PV}.tgz \
-           file://makefile.common.patch;patch=1 "
+           file://makefile.common.patch "
 
 PR = "r1"
 
diff --git a/recipes/fbreader/fbreader_0.10.7.bb b/recipes/fbreader/fbreader_0.10.7.bb
index e6bb98bf21..acaa8e5ff6 100644
--- a/recipes/fbreader/fbreader_0.10.7.bb
+++ b/recipes/fbreader/fbreader_0.10.7.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi"
 PR = "r1"
 
-SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz file://help.patch;patch=1"
+SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz file://help.patch"
 	   
 # Set the defaults
 READER_RESOLUTION ?= "1024x600"
diff --git a/recipes/fbreader/fbreader_0.12.1.bb b/recipes/fbreader/fbreader_0.12.1.bb
index 9a62464ea2..62ec9f2ddb 100644
--- a/recipes/fbreader/fbreader_0.12.1.bb
+++ b/recipes/fbreader/fbreader_0.12.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libf
 PR = "r2"
 
 SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
-file://Makefile.patch;patch=1"
+file://Makefile.patch"
 	   
 # Set the defaults
 READER_RESOLUTION ?= "1024x600"
diff --git a/recipes/fbreader/fbreader_0.7.3d.bb b/recipes/fbreader/fbreader_0.7.3d.bb
index 63276150b8..011f7644a2 100644
--- a/recipes/fbreader/fbreader_0.7.3d.bb
+++ b/recipes/fbreader/fbreader_0.7.3d.bb
@@ -7,7 +7,7 @@ DEPENDS = "gtk+ enca expat bzip2"
 PR = "r2"
 
 SRC_URI = "http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-${PV}.tgz \
-	file://fbreader-0.7.3d_buildsys_oe.patch;patch=1"
+	file://fbreader-0.7.3d_buildsys_oe.patch"
 
 FILES_${PN} += "${datadir}/FBReader"
 
diff --git a/recipes/fbreader/fbreader_0.7.4q.bb b/recipes/fbreader/fbreader_0.7.4q.bb
index 83b4d4cec7..9bee0c0e99 100644
--- a/recipes/fbreader/fbreader_0.7.4q.bb
+++ b/recipes/fbreader/fbreader_0.7.4q.bb
@@ -7,7 +7,7 @@ DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
 PR = "r2"
 
 SRC_URI = "http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-${PV}.tgz \
-	file://fbreader-0.7.4q_buildsys_oe.patch;patch=1"
+	file://fbreader-0.7.4q_buildsys_oe.patch"
 
 FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary"
 
diff --git a/recipes/fbreader/fbreader_0.8.2a.bb b/recipes/fbreader/fbreader_0.8.2a.bb
index eda49bae7f..50e27c5517 100644
--- a/recipes/fbreader/fbreader_0.8.2a.bb
+++ b/recipes/fbreader/fbreader_0.8.2a.bb
@@ -11,17 +11,17 @@ PR = "r7"
 PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
 
 SRC_URI = "http://www.fbreader.org/obsolete/fbreader-sources-${PV}.tgz \
-	   file://fbreader-0.8.2a_buildsys_oe.patch;patch=1 \
-	   file://480x640-buildfix.patch;patch=1"
+	   file://fbreader-0.8.2a_buildsys_oe.patch \
+	   file://480x640-buildfix.patch"
 	   
 SRC_URI_append_spitz = "\
-		  file://zaurus-VGA.patch;patch=1"
+		  file://zaurus-VGA.patch"
 
 SRC_URI_append_akita = "\
-		  file://zaurus-VGA.patch;patch=1"
+		  file://zaurus-VGA.patch"
 
 SRC_URI_append_htcuniversal = "\
-		  file://zaurus-VGA.patch;patch=1"
+		  file://zaurus-VGA.patch"
 
 # Set the defaults
 READER_RESOLUTION = "240x320"
diff --git a/recipes/fbset/fbset-modes.bb b/recipes/fbset/fbset-modes.bb
index 0f57609ab7..407d824b79 100644
--- a/recipes/fbset/fbset-modes.bb
+++ b/recipes/fbset/fbset-modes.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Default display timings and resolutions for fbset"
+LICENSE = "MIT"
 PV = "0.1.0"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "file://fb.modes"
 
diff --git a/recipes/fbset/fbset_2.1.bb b/recipes/fbset/fbset_2.1.bb
index 5d5c0c41ba..e1bbd57f94 100644
--- a/recipes/fbset/fbset_2.1.bb
+++ b/recipes/fbset/fbset_2.1.bb
@@ -12,7 +12,7 @@ RRECOMMENDS = "fbset-modes"
 PR = "r2"
 
 SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \
-           file://makefile.patch;patch=1"
+           file://makefile.patch"
 
 inherit autotools update-alternatives
 
diff --git a/recipes/fbv/fbv_1.0b.bb b/recipes/fbv/fbv_1.0b.bb
index 52e19a819f..2e2d7ba1be 100644
--- a/recipes/fbv/fbv_1.0b.bb
+++ b/recipes/fbv/fbv_1.0b.bb
@@ -4,8 +4,8 @@ DEPENDS = "libpng jpeg"
 PR = "r2"
 
 SRC_URI = "http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz \
-	file://cross_compile.patch;patch=1 \
-	file://fbv-1.0b.patch;patch=1 \
+	file://cross_compile.patch \
+	file://fbv-1.0b.patch \
 	"
 
 do_configure() {
diff --git a/recipes/fceu/fceu_0.98.13-pre.bb b/recipes/fceu/fceu_0.98.13-pre.bb
index 36e9e2e0ed..85b4301f1e 100644
--- a/recipes/fceu/fceu_0.98.13-pre.bb
+++ b/recipes/fceu/fceu_0.98.13-pre.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libsdl"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/fceultra/fceu-${PV}.src.tar.bz2 \
-	   file://fceu.patch;pnum=0;patch=1 \
+	   file://fceu.patch;striplevel=0 \
 	  "
 
 S = "${WORKDIR}/fceu"
diff --git a/recipes/feh/feh_1.2.6.bb b/recipes/feh/feh_1.2.6.bb
index 3271fd3f18..5077053668 100644
--- a/recipes/feh/feh_1.2.6.bb
+++ b/recipes/feh/feh_1.2.6.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt"
 
 SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \
-	   file://cross.patch;patch=1"
+	   file://cross.patch"
 S = "${WORKDIR}/feh-${PV}"
 
 inherit autotools
diff --git a/recipes/feh/feh_1.2.7.bb b/recipes/feh/feh_1.2.7.bb
index b5f4d57e6c..598a3f6024 100644
--- a/recipes/feh/feh_1.2.7.bb
+++ b/recipes/feh/feh_1.2.7.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt"
 
 SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \
-	   file://cross.patch;patch=1"
+	   file://cross.patch"
 S = "${WORKDIR}/feh-${PV}"
 
 inherit autotools
diff --git a/recipes/fetchmail/fetchmail_6.2.3.bb b/recipes/fetchmail/fetchmail_6.2.3.bb
index 132bc9af52..31268ede16 100644
--- a/recipes/fetchmail/fetchmail_6.2.3.bb
+++ b/recipes/fetchmail/fetchmail_6.2.3.bb
@@ -6,7 +6,7 @@ intended to be used over on-demand TCP/IP links \
 (such as SLIP or PPP connections)."
 
 SRC_URI = "http://catb.org/~esr/fetchmail/fetchmail-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/fetchmail/fetchmail_6.2.5.bb b/recipes/fetchmail/fetchmail_6.2.5.bb
index e355a7ca3f..de2af94a0c 100644
--- a/recipes/fetchmail/fetchmail_6.2.5.bb
+++ b/recipes/fetchmail/fetchmail_6.2.5.bb
@@ -12,7 +12,7 @@ intended to be used over on-demand TCP/IP links \
 #DEPENDS = "virtual/libintl"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/ffalarms/atd-over-fso_0.70.bb b/recipes/ffalarms/atd-over-fso_0.70.bb
index 940eefc341..4b2bd0fd04 100644
--- a/recipes/ffalarms/atd-over-fso_0.70.bb
+++ b/recipes/ffalarms/atd-over-fso_0.70.bb
@@ -16,11 +16,11 @@ RDEPENDS += "dbus dbus-glib frameworkd"
 PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \
-			file://atd-startup.patch;patch=1;pnum=0 \
-			file://atd-startup-restart.patch;patch=2;pnum=0 \
-			file://atd-alarm-glue.patch;patch=3;pnum=0 \
-			file://atd-over-fso.conf.patch;patch=4;pnum=0 \
-			file://run-over-fso.patch;patch=5;pnum=1"
+			file://atd-startup.patch;striplevel=0 \
+			file://atd-startup-restart.patch;striplevel=0 \
+			file://atd-alarm-glue.patch;striplevel=0 \
+			file://atd-over-fso.conf.patch;striplevel=0 \
+			file://run-over-fso.patch"
 S = "${WORKDIR}/atd"
 
 inherit update-rc.d
diff --git a/recipes/ffalarms/ffalarms_git.bb b/recipes/ffalarms/ffalarms_git.bb
index 2cf01ffaa8..8516b7d667 100644
--- a/recipes/ffalarms/ffalarms_git.bb
+++ b/recipes/ffalarms/ffalarms_git.bb
@@ -34,11 +34,6 @@ pkg_postrm_${PN}() {
 /etc/init.d/dbus-1 reload
 }
 
-# needed because there is do_stage_append in vala.bbclass and do_stage() was removed..
-do_stage() {
-
-}
-
 FILES_${PN} += "${datadir}/${PN} ${datadir}/applications ${datadir}/pixmaps"
 
 MAINTAINER = "Lukasz Pankowski <lukpank@o2.pl>"
diff --git a/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb b/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb
index 3c6197d67d..1ac8610ef8 100644
--- a/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb
+++ b/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb
@@ -3,12 +3,12 @@ require ffmpeg.inc
 PR = "${INC_PR}.0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
-           file://configure.patch;patch=0 \
-           file://gcc4.patch;patch=1 \
-           file://soname.patch;patch=1 \
-	   file://Makefile-avformat-use-LDFLAGS.patch;patch=1 \
-           file://Makefile-add-liblame.patch;patch=1 \
-           file://install-must-not-strip.patch;patch=1 \
+           file://configure.patch \
+           file://gcc4.patch \
+           file://soname.patch \
+	   file://Makefile-avformat-use-LDFLAGS.patch \
+           file://Makefile-add-liblame.patch \
+           file://install-must-not-strip.patch \
           "
 
 EXTRA_OECONF += " \
diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index 956d0cb09b..d24ff145b9 100644
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -8,8 +8,8 @@ DEFAULT_PREFERENCE = "1"
 
 SRCREV_libswscale = "b2e1c8222eeef74b0ca8053b400957dd69e18e4d"
 SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2 \
-	   file://armv4.patch;patch=1 \
-       file://ffmpeg-arm-update.diff;patch=1 \
+	   file://armv4.patch \
+       file://ffmpeg-arm-update.diff \
 	  "
 
 #S = "${WORKDIR}/git"
diff --git a/recipes/ffmpeg/omapfbplay-xv_git.bb b/recipes/ffmpeg/omapfbplay-xv_git.bb
index 11c5db087f..3e676e92bb 100644
--- a/recipes/ffmpeg/omapfbplay-xv_git.bb
+++ b/recipes/ffmpeg/omapfbplay-xv_git.bb
@@ -3,8 +3,7 @@ DEPENDS = "libxv bzip2 lame ffmpeg virtual/kernel"
 LICENSE = "MIT"
 
 PR = "r1"
-PV = "0.0+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+${PR}+gitr${SRCREV}"
 
 SRCREV = "e66bf25df1f1ff085e6db102b282d90e7ceff4bf"
 SRC_URI = "git://git.mansr.com/omapfbplay;protocol=git \
diff --git a/recipes/ffmpeg/omapfbplay_git.bb b/recipes/ffmpeg/omapfbplay_git.bb
index 881cd5b2c6..29b851a363 100644
--- a/recipes/ffmpeg/omapfbplay_git.bb
+++ b/recipes/ffmpeg/omapfbplay_git.bb
@@ -4,12 +4,11 @@ LICENSE = "MIT"
 
 PR = "r18"
 
-PV = "0.0+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+${PR}+gitr${SRCREV}"
 
 SRCREV = "26df4208b57ccb0f0ca101ae4ddb92c956a0ecc0"
 SRC_URI = "git://git.mansr.com/${PN};protocol=git \
-           file://fbplay-static.diff;patch=1 "
+           file://fbplay-static.diff "
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/figment/figment_0.3.5.bb b/recipes/figment/figment_0.3.5.bb
index abc9820c61..28330218f9 100644
--- a/recipes/figment/figment_0.3.5.bb
+++ b/recipes/figment/figment_0.3.5.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 # original src_uri, http://handhelds.org/~mallum/downloadables/figment/figment-${PV}.tar.gz, is now unfetchable
 SRC_URI = "http://ftp.sh.cvut.cz/MIRRORS/rock/ROCK-2.0/gnome2/figment/figment-${PV}.tar.bz2 \
-	file://dotdesktop-name-comment.patch;patch=1"
+	file://dotdesktop-name-comment.patch"
 S = "${WORKDIR}/figment-${PV}"
 
 inherit autotools
diff --git a/recipes/file/file_4.18.bb b/recipes/file/file_4.18.bb
index 37e15cc041..08b627a128 100644
--- a/recipes/file/file_4.18.bb
+++ b/recipes/file/file_4.18.bb
@@ -6,7 +6,7 @@ SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
            file://dump \
            file://filesystems"
 
-SRC_URI_append_virtclass-native = " file://native-fix.diff;patch=1"
+SRC_URI_append_virtclass-native = " file://native-fix.diff"
 
 do_configure_prepend() {
 	sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
diff --git a/recipes/file/file_4.21.bb b/recipes/file/file_4.21.bb
index 9378f46d91..6f16e3ce54 100644
--- a/recipes/file/file_4.21.bb
+++ b/recipes/file/file_4.21.bb
@@ -6,7 +6,7 @@ PR = "${INCPR}.0"
 
 SRC_URI = "ftp://ftp.fi.debian.org/pub/gentoo/distfiles/file-${PV}.tar.gz"
 
-SRC_URI_append_virtclass-native = " file://native-fix.diff;patch=1"
+SRC_URI_append_virtclass-native = " file://native-fix.diff"
 
 do_configure_prepend() {
 	sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
diff --git a/recipes/fileschanged/fileschanged.inc b/recipes/fileschanged/fileschanged.inc
index 73376b5251..2752db7364 100644
--- a/recipes/fileschanged/fileschanged.inc
+++ b/recipes/fileschanged/fileschanged.inc
@@ -4,7 +4,7 @@ DEPENDS = "gamin"
 
 SRC_URI = " \
 	${SOURCEFORGE_MIRROR}/fileschanged/fileschanged-${PV}.tar.gz;name=fileschanged-${PV} \
-	file://fileschanged-no-man-build.patch;patch=1 \
+	file://fileschanged-no-man-build.patch \
 	"
 
 inherit autotools
diff --git a/recipes/findutils/findutils_4.2.29.bb b/recipes/findutils/findutils_4.2.29.bb
index e6a015e5a8..e278bee5ac 100644
--- a/recipes/findutils/findutils_4.2.29.bb
+++ b/recipes/findutils/findutils_4.2.29.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://mkinstalldirs.patch;patch=1"
+SRC_URI += "file://mkinstalldirs.patch"
 
 EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
 
diff --git a/recipes/firmwares/firmware-marvell-sd8688_10.38.1-p25.bb b/recipes/firmwares/firmware-marvell-sd8688_10.38.1-p25.bb
new file mode 100644
index 0000000000..de571e3e9f
--- /dev/null
+++ b/recipes/firmwares/firmware-marvell-sd8688_10.38.1-p25.bb
@@ -0,0 +1,11 @@
+require linux-firmware.inc
+
+DESCRIPTION = "Firmware for Marvell 8688 sdio wifi/bt chipset"
+
+SRCREV = "09a550b63d05ae12892efaea05417955eaf9e21f"
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	install -m 0644 libertas/sd8688.bin libertas/sd8688_helper.bin ${D}${base_libdir}/firmware
+	install -m 0644 LICENCE.libertas ${D}${base_libdir}/firmware/LICENCE_sd8688.txt
+}
diff --git a/recipes/firmwares/linux-firmware.inc b/recipes/firmwares/linux-firmware.inc
new file mode 100644
index 0000000000..38b33b462e
--- /dev/null
+++ b/recipes/firmwares/linux-firmware.inc
@@ -0,0 +1,10 @@
+LICENCE = "closed"
+
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+PACKAGES = "${PN}"
+FILES_${PN} += "${base_libdir}/firmware"
+
+PACKAGE_ARCH = "all"
diff --git a/recipes/flac/flac_1.1.0.bb b/recipes/flac/flac_1.1.0.bb
index 45ae1bbf98..32e5e75a3a 100644
--- a/recipes/flac/flac_1.1.0.bb
+++ b/recipes/flac/flac_1.1.0.bb
@@ -2,7 +2,7 @@ require flac.inc
 
 PR = "r7"
 
-SRC_URI += "file://disable-xmms-plugin.patch;patch=1"
+SRC_URI += "file://disable-xmms-plugin.patch"
 
 SRC_URI[md5sum] = "19b456a27b5fcf502c76cc33f33e1490"
 SRC_URI[sha256sum] = "897b0ac415b36ea241932c56852b8d6f3e083d0db66be9a96fc83c9cc42932a1"
diff --git a/recipes/flac/flac_1.1.2.bb b/recipes/flac/flac_1.1.2.bb
index 48b64b7096..3927f7d609 100644
--- a/recipes/flac/flac_1.1.2.bb
+++ b/recipes/flac/flac_1.1.2.bb
@@ -2,7 +2,7 @@ require flac.inc
 
 PR = "r7"
 
-SRC_URI += "file://disable-xmms-plugin.patch;patch=1"
+SRC_URI += "file://disable-xmms-plugin.patch"
 
 do_configure_append () {
 	# removes '-read-only-relocs' which is enabled for PowerPC builds.
diff --git a/recipes/flac/flac_1.2.1.bb b/recipes/flac/flac_1.2.1.bb
index c06f52a48e..b1924243f2 100644
--- a/recipes/flac/flac_1.2.1.bb
+++ b/recipes/flac/flac_1.2.1.bb
@@ -3,8 +3,8 @@ require flac.inc
 PR = "r1"
 
 # fixes from openSUSE:
-SRC_URI += "file://flac-gcc43-fixes.diff;patch=1;pnum=0 \
-            file://flac-printf-format-fix.diff;patch=1;pnum=0"
+SRC_URI += "file://flac-gcc43-fixes.diff;striplevel=0 \
+            file://flac-printf-format-fix.diff;striplevel=0"
 
 SRC_URI[md5sum] = "153c8b15a54da428d1f0fadc756c22c7"
 SRC_URI[sha256sum] = "9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf"
diff --git a/recipes/flashrom/flashrom_svn.bb b/recipes/flashrom/flashrom_svn.bb
index 7193c13482..f8aed8379c 100644
--- a/recipes/flashrom/flashrom_svn.bb
+++ b/recipes/flashrom/flashrom_svn.bb
@@ -9,7 +9,7 @@ PR = "r0"
 
 SRC_URI = " \
 	svn://coreboot.org/repos/trunk/util/;module=flashrom \
-	file://makefile-disable-strip.patch;patch=1 \
+	file://makefile-disable-strip.patch \
 	"
 
 S = "${WORKDIR}/${PN}"
diff --git a/recipes/flex/flex.inc b/recipes/flex/flex.inc
index a1b3f99c72..a61ad1ee95 100644
--- a/recipes/flex/flex.inc
+++ b/recipes/flex/flex.inc
@@ -6,7 +6,7 @@ DEPENDS = "gettext"
 
 S = "${WORKDIR}/flex-${PV}"
 
-inherit autotools
+inherit autotools gettext
 
 # >> flex-2.5.31-r4: /usr/lib/libfl.a
 # That one is a special case: it wants to stay in the main flex package,
diff --git a/recipes/flex/flex_2.5.31.bb b/recipes/flex/flex_2.5.31.bb
index 71b8e69b45..b7cb0f7d5a 100644
--- a/recipes/flex/flex_2.5.31.bb
+++ b/recipes/flex/flex_2.5.31.bb
@@ -2,9 +2,9 @@ require flex.inc
 PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \
-           file://flex-lvalue.diff;patch=1 \
-           file://fix-gen.patch;patch=1 \
-           file://include.patch;patch=1"
+           file://flex-lvalue.diff \
+           file://fix-gen.patch \
+           file://include.patch"
 
 
 BBCLASSEXTEND = "native"
diff --git a/recipes/flite/flite-alsa_1.2.bb b/recipes/flite/flite-alsa_1.2.bb
index 8885491798..a62ee16837 100644
--- a/recipes/flite/flite-alsa_1.2.bb
+++ b/recipes/flite/flite-alsa_1.2.bb
@@ -5,9 +5,9 @@ PR = "r1"
 EXTRA_OECONF = "--with-audio=alsa --enable-shared"
 
 SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \
-#          file://fix-read-only-assignments.patch;patch=1 \  # included in the alsa patch
+#          file://fix-read-only-assignments.patch \  # included in the alsa patch
 #source    http://homepage.hispeed.ch/loehrer/downloads/flite-1.2-alsa_support-1.2.diff.bz2 \
-           file://flite-1.2-alsa_support-1.2.diff;patch=1"
+           file://flite-1.2-alsa_support-1.2.diff"
 
 SRC_URI[md5sum] = "24c1576f5b3eb23ecedf4bebde96710f"
 SRC_URI[sha256sum] = "10ff42ce08a628c7fd84d26b5228d549e9eecb1eb03cb158e87d8be66bc58ae2"
diff --git a/recipes/flite/flite-alsa_1.3.bb b/recipes/flite/flite-alsa_1.3.bb
index 9421c62f52..9db0629552 100644
--- a/recipes/flite/flite-alsa_1.3.bb
+++ b/recipes/flite/flite-alsa_1.3.bb
@@ -5,10 +5,10 @@ PR = "r1"
 EXTRA_OECONF = "--with-audio=alsa --enable-shared"
 
 SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.gz \
-#          file://fix-read-only-assignments.patch;patch=1 \   # fixed elsewhere in 1.3 release?
+#          file://fix-read-only-assignments.patch \   # fixed elsewhere in 1.3 release?
 #source    http://homepage.hispeed.ch/loehrer/downloads/flite-1.3-alsa_support-1.2.diff.bz2 \
-           file://flite-1.3-alsa_support-1.2.diff;patch=1 \
-           file://flite-alsa-1.3-configure-with-audio.patch;patch=1"
+           file://flite-1.3-alsa_support-1.2.diff \
+           file://flite-alsa-1.3-configure-with-audio.patch"
 
 SRC_URI[md5sum] = "ae0aca1cb7b4801f4372f3a75a9e52b5"
 SRC_URI[sha256sum] = "922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b"
diff --git a/recipes/flite/flite_1.2.bb b/recipes/flite/flite_1.2.bb
index 5a1c79362b..3d9a2f58a1 100644
--- a/recipes/flite/flite_1.2.bb
+++ b/recipes/flite/flite_1.2.bb
@@ -5,8 +5,8 @@ PR = "r5"
 EXTRA_OECONF = "--with-audio=oss --enable-shared"
 
 SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \
-           file://fix-read-only-assignments.patch;patch=1 \
-           file://configure-with-audio.patch;patch=1"
+           file://fix-read-only-assignments.patch \
+           file://configure-with-audio.patch"
 
 SRC_URI[md5sum] = "24c1576f5b3eb23ecedf4bebde96710f"
 SRC_URI[sha256sum] = "10ff42ce08a628c7fd84d26b5228d549e9eecb1eb03cb158e87d8be66bc58ae2"
diff --git a/recipes/flite/flite_1.3.bb b/recipes/flite/flite_1.3.bb
index 5d55fd1333..6060b1238b 100644
--- a/recipes/flite/flite_1.3.bb
+++ b/recipes/flite/flite_1.3.bb
@@ -5,9 +5,9 @@ PR = "r5"
 EXTRA_OECONF = "--with-audio=oss --enable-shared"
 
 SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.gz \
-           file://flite-1.3-Makefile.patch;patch=1 \
-#          file://flite-1.3-fix-read-only-assignments.patch;patch=1 \  # fixed elsewhere in 1.3 release?
-           file://flite-1.3-configure-with-audio.patch;patch=1"
+           file://flite-1.3-Makefile.patch \
+#          file://flite-1.3-fix-read-only-assignments.patch \  # fixed elsewhere in 1.3 release?
+           file://flite-1.3-configure-with-audio.patch"
 
 SRC_URI[md5sum] = "ae0aca1cb7b4801f4372f3a75a9e52b5"
 SRC_URI[sha256sum] = "922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b"
diff --git a/recipes/flnx/flnx_0.18.bb b/recipes/flnx/flnx_0.18.bb
index b0c438830a..5172aa3306 100644
--- a/recipes/flnx/flnx_0.18.bb
+++ b/recipes/flnx/flnx_0.18.bb
@@ -3,7 +3,7 @@ DEPENDS = "microwindows"
 RDEPENDS = "microwindows"
 DESCRIPTION = "fltk library for microwindows."
 SRC_URI = "ftp://ftp.microwindows.org/pub/microwindows/flnx/flnx-${PV}.tar.gz \
-	   file://gcc3.patch;patch=1"
+	   file://gcc3.patch"
 S = "${WORKDIR}/flnx"
 LICENSE = "LGPL"
 
diff --git a/recipes/fltk/efltk_2.0.7.bb b/recipes/fltk/efltk_2.0.7.bb
index 90e7e1b704..2da7ae0f06 100644
--- a/recipes/fltk/efltk_2.0.7.bb
+++ b/recipes/fltk/efltk_2.0.7.bb
@@ -7,7 +7,7 @@ DEPENDS = "zlib jpeg libpng libxext libxft"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ede/efltk-${PV}.tar.gz \
-           file://fix.void.cast.patch;patch=1"
+           file://fix.void.cast.patch"
 S = "${WORKDIR}/efltk"
 
 inherit autotools binconfig
diff --git a/recipes/fltk/fltk2_svn.bb b/recipes/fltk/fltk2_svn.bb
index 95ed5c6d7f..97599d7811 100644
--- a/recipes/fltk/fltk2_svn.bb
+++ b/recipes/fltk/fltk2_svn.bb
@@ -11,7 +11,7 @@ PR = "r1"
 
 SRC_URI = "\
   svn://svn.easysw.com/public/fltk/fltk;proto=http;module=trunk \
-  file://fix-it-damnit.patch;patch=1 \
+  file://fix-it-damnit.patch \
 "
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/fltk/fltk_1.1.10.bb b/recipes/fltk/fltk_1.1.10.bb
index cbc066ddc9..085d8e63e7 100644
--- a/recipes/fltk/fltk_1.1.10.bb
+++ b/recipes/fltk/fltk_1.1.10.bb
@@ -8,8 +8,8 @@ DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \
-	   file://disable_test.patch;patch=1 \
-#       http://ftp.de.debian.org/debian/pool/main/f/fltk1.1/fltk1.1_1.1.10-2.diff.gz;patch=1 \
+	   file://disable_test.patch \
+#       http://ftp.de.debian.org/debian/pool/main/f/fltk1.1/fltk1.1_1.1.10-2.diff.gz \
 	  "
 
 S = "${WORKDIR}/fltk-${PV}"
diff --git a/recipes/fltk/fltk_1.1.9.bb b/recipes/fltk/fltk_1.1.9.bb
index caf31eb570..c52fb5c8e8 100644
--- a/recipes/fltk/fltk_1.1.9.bb
+++ b/recipes/fltk/fltk_1.1.9.bb
@@ -7,7 +7,7 @@ DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \
-	   file://disable_test.patch;patch=1 \
+	   file://disable_test.patch \
 	  "
 
 S = "${WORKDIR}/fltk-${PV}"
diff --git a/recipes/flumotion/flumotion_0.4.1.bb b/recipes/flumotion/flumotion_0.4.1.bb
index d22b9a97e9..7bc107f707 100644
--- a/recipes/flumotion/flumotion_0.4.1.bb
+++ b/recipes/flumotion/flumotion_0.4.1.bb
@@ -12,8 +12,8 @@ RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo"
 PR = "r10"
 
 SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \
-           file://python-path.patch;patch=1 \
-           file://no-check-for-python-stuff.patch;patch=1"
+           file://python-path.patch \
+           file://no-check-for-python-stuff.patch"
 
 inherit autotools distutils-base pkgconfig
 
diff --git a/recipes/fmtools/fmtools_1.0.2.bb b/recipes/fmtools/fmtools_1.0.2.bb
index 3b7cfc13e0..2d060cc46c 100644
--- a/recipes/fmtools/fmtools_1.0.2.bb
+++ b/recipes/fmtools/fmtools_1.0.2.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "http://www.stanford.edu/~blp/fmtools/fmtools-1.0.2.tar.gz \
-           file://makefile.patch;patch=1"
+           file://makefile.patch"
 
 inherit autotools
 
diff --git a/recipes/fontconfig/fontconfig_2.2.95.bb b/recipes/fontconfig/fontconfig_2.2.95.bb
index 9e23c65b46..bde0c7c975 100644
--- a/recipes/fontconfig/fontconfig_2.2.95.bb
+++ b/recipes/fontconfig/fontconfig_2.2.95.bb
@@ -2,8 +2,8 @@ require fontconfig.inc
 
 DEPENDS += "fontconfig-native"
 
-SRC_URI += "file://fc-glyphname.patch;patch=1 \
-           file://fc-lang.patch;patch=1 \
+SRC_URI += "file://fc-glyphname.patch \
+           file://fc-lang.patch \
 	   file://local.conf"
 PR = "r9"
 
diff --git a/recipes/fontconfig/fontconfig_2.3.91.bb b/recipes/fontconfig/fontconfig_2.3.91.bb
index 7d83193566..b099385582 100644
--- a/recipes/fontconfig/fontconfig_2.3.91.bb
+++ b/recipes/fontconfig/fontconfig_2.3.91.bb
@@ -2,9 +2,9 @@ require fontconfig.inc
 
 DEPENDS += "fontconfig-native"
 
-SRC_URI += "file://fc-glyphname.patch;patch=1 \
-           file://fc-lang.patch;patch=1 \
-           file://one-j-too-many.patch;patch=1 \
+SRC_URI += "file://fc-glyphname.patch \
+           file://fc-lang.patch \
+           file://one-j-too-many.patch \
            file://local.conf"
 
 PR = "r4"
diff --git a/recipes/fontconfig/fontconfig_2.3.95.bb b/recipes/fontconfig/fontconfig_2.3.95.bb
index 7f01e9a238..77cb2fa495 100644
--- a/recipes/fontconfig/fontconfig_2.3.95.bb
+++ b/recipes/fontconfig/fontconfig_2.3.95.bb
@@ -1,6 +1,6 @@
 require fontconfig.inc
 
-SRC_URI += "file://one-j-too-many.patch;patch=1"
+SRC_URI += "file://one-j-too-many.patch"
 
 PR = "r3"
 
diff --git a/recipes/fontconfig/fontconfig_2.4.1.bb b/recipes/fontconfig/fontconfig_2.4.1.bb
index 465b7724de..4b4b128773 100644
--- a/recipes/fontconfig/fontconfig_2.4.1.bb
+++ b/recipes/fontconfig/fontconfig_2.4.1.bb
@@ -3,7 +3,7 @@ require fontconfig.inc
 PR = "r4"
 
 SRC_URI += "https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h;name=deviceSymbols \
-	    file://configure_fix.patch;patch=1 "
+	    file://configure_fix.patch "
 
 EXTRA_OECONF += " --with-arch=${HOST_ARCH}"
 
diff --git a/recipes/fontconfig/fontconfig_2.6.0.bb b/recipes/fontconfig/fontconfig_2.6.0.bb
index 9ce9674ac4..e1c9cedddd 100644
--- a/recipes/fontconfig/fontconfig_2.6.0.bb
+++ b/recipes/fontconfig/fontconfig_2.6.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "expat freetype zlib"
 PR = "r3"
 
 SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
-           file://fix-pkgconfig.patch;patch=1"
+           file://fix-pkgconfig.patch"
 
 PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
 FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
diff --git a/recipes/forte/forte_0.3.5.bb b/recipes/forte/forte_0.3.5.bb
index dde9cbcb59..51e862d546 100644
--- a/recipes/forte/forte_0.3.5.bb
+++ b/recipes/forte/forte_0.3.5.bb
@@ -3,9 +3,9 @@ require forte.inc
 PR = "r0"
 
 SRC_URI = "http://downloads.sourceforge.net/fordiac/FORTE-0.3.5.zip \
-	file://forte-0.3.5_socket_reuse.patch;patch=1 \
-	file://forte-0.3.5_timer.patch;patch=1 \
-	file://forte-0.3.5_stdlib_inc_fix.patch;patch=1"
+	file://forte-0.3.5_socket_reuse.patch \
+	file://forte-0.3.5_timer.patch \
+	file://forte-0.3.5_stdlib_inc_fix.patch"
 
 S="${WORKDIR}/FORTE-${PV}"
 
diff --git a/recipes/forte/forte_0.3.bb b/recipes/forte/forte_0.3.bb
index dbf59c2a5a..f787722d66 100644
--- a/recipes/forte/forte_0.3.bb
+++ b/recipes/forte/forte_0.3.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_oxnas = "1"
 DEFAULT_PREFERENCE_hipox = "1"
 
 SRC_URI = "http://kent.dl.sourceforge.net/sourceforge/fordiac/forte-0.3.zip \
-	file://forte-0.3-patch_20081008.diff;patch=1"
+	file://forte-0.3-patch_20081008.diff"
 
 S="${WORKDIR}/forte-${PV}"
 
diff --git a/recipes/fortune-mod/fortune-mod_1.99.1.bb b/recipes/fortune-mod/fortune-mod_1.99.1.bb
index 02b8a034c1..1c022b8977 100644
--- a/recipes/fortune-mod/fortune-mod_1.99.1.bb
+++ b/recipes/fortune-mod/fortune-mod_1.99.1.bb
@@ -6,7 +6,7 @@ DEBV = "2"
 PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/fortune-mod/fortune-mod_${PV}.orig.tar.gz;name=archive \
-           ${DEBIAN_MIRROR}/main/f/fortune-mod/fortune-mod_${PV}-${DEBV}.diff.gz;patch=1;name=patch"
+           ${DEBIAN_MIRROR}/main/f/fortune-mod/fortune-mod_${PV}-${DEBV}.diff.gz;name=patch"
 
 PARALLEL_MAKE = ""
 CFLAGS += '\$(DEFINES)'
diff --git a/recipes/fping/fping_2.3+2.4b2to.bb b/recipes/fping/fping_2.3+2.4b2to.bb
index ad19238a20..d73eed4f89 100644
--- a/recipes/fping/fping_2.3+2.4b2to.bb
+++ b/recipes/fping/fping_2.3+2.4b2to.bb
@@ -4,7 +4,7 @@ PR = "r0"
 
 SRC_URI = " \
 	http://fping.sourceforge.net/download/fping.tar.gz \
-	file://sourceforge-truckload.patch;patch=1 \
+	file://sourceforge-truckload.patch \
 "
 
 S = "${WORKDIR}/fping-2.4b2_to"
diff --git a/recipes/free42/free42-vga_1.4.41.bb b/recipes/free42/free42-vga_1.4.41.bb
index 56d4fd3b00..1d4ab8fec8 100644
--- a/recipes/free42/free42-vga_1.4.41.bb
+++ b/recipes/free42/free42-vga_1.4.41.bb
@@ -6,9 +6,9 @@ PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/free42/free42.tgz;name=archive \
            http://sense.net/zc/free42/42c_skins.tgz;name=skins \
-           file://free42-bcd-gtk-only.patch;patch=1 \
-           file://free42-vga-skin.patch;patch=1 \
-           file://free42-dont-declare-sincos.patch;patch=1 \
+           file://free42-bcd-gtk-only.patch \
+           file://free42-vga-skin.patch \
+           file://free42-dont-declare-sincos.patch \
            file://free42dec.desktop"
 
 S = "${WORKDIR}/free42"
diff --git a/recipes/freedoom/freedoom_0.3.bb b/recipes/freedoom/freedoom_0.3.bb
index 6cd002cd55..002f54441d 100644
--- a/recipes/freedoom/freedoom_0.3.bb
+++ b/recipes/freedoom/freedoom_0.3.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "The Freedoom project aims at collaboratively creating a Free IWAD
 HOMEPAGE = "http://freedoom.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "GPL"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 
 SRC_URI = "http://ovh.dl.sourceforge.net/sourceforge/freedoom/freedoom-iwad-0.3.zip"
 
diff --git a/recipes/freedoom/freedoom_0.6.2.bb b/recipes/freedoom/freedoom_0.6.2.bb
index 06cccc671a..655441c2c7 100644
--- a/recipes/freedoom/freedoom_0.6.2.bb
+++ b/recipes/freedoom/freedoom_0.6.2.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "The Freedoom project aims at collaboratively creating a Free IWAD
 HOMEPAGE = "http://freedoom.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "GPL"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freedoom/freedoom-iwad-${PV}.zip"
 
diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc
index 4962263a10..11cbdd3b78 100644
--- a/recipes/freesmartphone/cornucopia.inc
+++ b/recipes/freesmartphone/cornucopia.inc
@@ -1,16 +1,19 @@
 DESCRIPTION = "The freesmartphone.org API reference implementation (FSO 2.0)"
 AUTHOR = "Team FSO"
+HOMEPAGE = "http://www.freesmartphone.org"
 LICENSE = "LGPL"
 SECTION = "devel"
 DEPENDS = "vala-native glib-2.0 dbus dbus-glib libfso-glib libgee"
 DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}"
 PV = "invalid, please override"
+
+FSO_CORNUCOPIA_SRCREV ?= "38d52c14a09dd7afc22048f2ed278e336f42a933"
 INC_PR = "r2"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master"
 S = "${WORKDIR}/git/${PN}"
 
-inherit autotools_stage pkgconfig vala
+inherit autotools pkgconfig vala
 
 FILES_${PN} += "\
   ${sysconfdir} \
diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb
index 2b6b0bba64..395a137156 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -4,7 +4,7 @@ AUTHOR = "FreeSmartphone.Org Development Team"
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
-SRCREV = "f751f2724eea23d0ca050bdf2672f9011ae09517"
+SRCREV = "93673aa09cafc8fb5cfc3cb4055a73e25e595b70"
 PV = "0.9.5.9+gitr${SRCPV}"
 PR = "r3"
 PE = "1"
@@ -18,7 +18,7 @@ SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \
            file://frameworkd \
            file://frameworkd.conf \
 	   "
-SRC_URI_append_shr = "file://oeventsd-use-opimd-signals.patch;patch=1"
+SRC_URI_append_shr = "file://oeventsd-use-opimd-signals.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/freesmartphone/fso-abyss_git.bb b/recipes/freesmartphone/fso-abyss_git.bb
index c23bbf457b..b052e88202 100644
--- a/recipes/freesmartphone/fso-abyss_git.bb
+++ b/recipes/freesmartphone/fso-abyss_git.bb
@@ -1,21 +1,18 @@
+require cornucopia.inc
+
 DESCRIPTION = "Abyss is a GSM 07.10 muxer userspace daemon"
 HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/Abyss"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
-DEPENDS = "vala-native dbus dbus-glib libgsm0710mux"
+DEPENDS = "dbus dbus-glib libgsm0710mux"
 LICENSE = "GPL"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "0.9.2+gitr${SRCPV}"
 PE = "1"
-PR = "r1"
-
-SRC_URI = "\
-  ${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master \
-  file://fso-abyss.conf \
-"
-S = "${WORKDIR}/git/tools/fso-abyss"
+PR = "${INC_PR}.0"
 
-inherit autotools_stage
+SRC_URI += " file://fso-abyss.conf"
+S = "${WORKDIR}/git/tools/${PN}"
 
 do_install_append() {
 	install -d ${D}${sysconfdir}
diff --git a/recipes/freesmartphone/fso-alsa_git.bb b/recipes/freesmartphone/fso-alsa_git.bb
index 8f5e173bdd..77261726bc 100644
--- a/recipes/freesmartphone/fso-alsa_git.bb
+++ b/recipes/freesmartphone/fso-alsa_git.bb
@@ -1,18 +1,13 @@
+require cornucopia.inc
+
 DESCRIPTION = "Mickey's DBus introspection and calling Program V2"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/multimedia"
 LICENSE = "GPLv2"
 DEPENDS = "fsodeviced glib-2.0 dbus dbus-glib"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "1.0.0+gitr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
-S = "${WORKDIR}/git/tools/fso-alsa"
-
-do_stage() {
-	:
-}
+PV = "1.0.0+gitr${SRCPV}"
+PR = "${INC_PR}.0"
+PE = "1"
 
-inherit autotools_stage vala
+S = "${WORKDIR}/git/tools/${PN}"
diff --git a/recipes/freesmartphone/fso-apm_git.bb b/recipes/freesmartphone/fso-apm_git.bb
index a42492f0f0..004786028e 100644
--- a/recipes/freesmartphone/fso-apm_git.bb
+++ b/recipes/freesmartphone/fso-apm_git.bb
@@ -1,18 +1,13 @@
+require cornucopia.inc
+
 DESCRIPTION = "freesmartphone.org apm compatibility utility"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console"
 LICENSE = "GPLv2"
 PE = "1"
-DEPENDS = "vala-native"
 RCONFLICTS = "apm"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "2.0.0+gitr${SRCPV}"
-PR = "r1"
+PR = "${INC_PR}.0"
 
-SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/tools/apm2"
-
-inherit autotools
-
-
diff --git a/recipes/freesmartphone/fso-monitord_git.bb b/recipes/freesmartphone/fso-monitord_git.bb
index 0c931bdad0..808a17f1ba 100644
--- a/recipes/freesmartphone/fso-monitord_git.bb
+++ b/recipes/freesmartphone/fso-monitord_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "freesmartphone.org monitor daemon"
 AUTHOR = "freesmartphone.org development team"
 SECTION = "console/network"
-DEPENDS = "vala-native dbus dbus-glib"
+DEPENDS = "vala dbus dbus-glib"
 LICENSE = "GPL"
 SRCREV = "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
 PV = "0.0.0+gitr${SRCPV}"
@@ -11,7 +11,7 @@ PR = "r0"
 SRC_URI = "${FREESMARTPHONE_GIT}/fso-monitord.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d vala
 
 INITSCRIPT_NAME = "fso-monitord"
 INITSCRIPT_PARAMS = "defaults 35"
diff --git a/recipes/freesmartphone/fso-specs_git.bb b/recipes/freesmartphone/fso-specs_git.bb
index 045ae34f9f..a003637fa9 100644
--- a/recipes/freesmartphone/fso-specs_git.bb
+++ b/recipes/freesmartphone/fso-specs_git.bb
@@ -4,10 +4,9 @@ HOMEPAGE = "http://docs.freesmartphone.org"
 LICENSE = "BSD"
 DEPENDS = "libxslt-native"
 SECTION = "devel/specifications"
-SRCREV = "1dd28e0a716c10564b3b1c6f5c696e7afa19bff6"
-PV = "0.5.0+gitr${SRCPV}"
+SRCREV = "5e5c9b52e7525085f0d8601861d712f05523ad0a"
+PV = "2010.05.11.2+gitr${SRCPV}"
 PE = "1"
-PR = "r2"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/specs.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
@@ -15,7 +14,6 @@ S = "${WORKDIR}/git"
 inherit autotools pkgconfig
 
 FILES_${PN}-dev += "${datadir}/freesmartphone/xml"
-PACKAGE_ARCH = "all"
 
 do_compile_append() {
 	sed -i -e s,\$\{datarootdir\},${STAGING_DATADIR},g *.pc
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 1e1f73e710..e7ea1c0a6a 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -9,7 +9,7 @@ RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "0.9.0+gitr${SRCPV}"
 PE = "2"
-PR = "${INC_PR}.11"
+PR = "${INC_PR}.12"
 
 EXTRA_OECONF = "\
   --enable-kernel26-rfkill \
@@ -23,6 +23,12 @@ INITSCRIPT_PARAMS = "defaults 27"
 
 SRC_URI += "file://fsodeviced"
 
+CONFFILES_${PN} = "${sysconfdir}/freesmartphone/conf/openmoko_gta/fsodeviced.conf \
+                   ${sysconfdir}/freesmartphone/conf/palm_pre/fsodeviced.conf \
+                   ${sysconfdir}/freesmartphone/conf/htc_qualcomm_dream/fsodeviced.conf \
+                   ${sysconfdir}/freesmartphone/conf/htc_qualcomm_msm/fsodeviced.conf \
+                  "
+
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d/
 	install -m 0755 ${WORKDIR}/fsodeviced ${D}${sysconfdir}/init.d/
diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb
index d331f312f1..e2cbd53e27 100644
--- a/recipes/freesmartphone/fsogsmd_git.bb
+++ b/recipes/freesmartphone/fsogsmd_git.bb
@@ -1,7 +1,7 @@
 require cornucopia.inc
 inherit fso-plugin
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.2"
 PV = "0.5.0+gitr${SRCPV}"
 PE = "1"
 
@@ -12,7 +12,8 @@ EXTRA_OECONF_append = "\
   --enable-modem-qualcomm-palm \
 "
 
-do_install_append_shr() {
-	# remove .service file to disable fsogsmd autostart
-	rm -f ${D}${datadir}/dbus-1/system-services/org.freesmartphone.ogsmd.service
-}
+CONFFILES_${PN} = "${sysconfdir}/freesmartphone/conf/openmoko_gta/fsogsmd.conf \
+                   ${sysconfdir}/freesmartphone/conf/palm_pre/fsogsmd.conf \
+                   ${sysconfdir}/freesmartphone/conf/htc_qualcomm_dream/fsogsmd.conf \
+                   ${sysconfdir}/freesmartphone/conf/htc_qualcomm_msm/fsogsmd.conf \
+                  "
diff --git a/recipes/freesmartphone/fsoinitd_git.bb b/recipes/freesmartphone/fsoinitd_git.bb
new file mode 100644
index 0000000000..dfb0b94f86
--- /dev/null
+++ b/recipes/freesmartphone/fsoinitd_git.bb
@@ -0,0 +1,13 @@
+require cornucopia.inc
+inherit fso-plugin
+
+SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
+PV = "0.0.0+gitr${SRCPV}"
+PR = "${INC_PR}.1"
+
+EXTRA_OECONF = ""
+EXTRA_OECONF_append_palmpre = "--with-machine=palmpre"
+EXTRA_OECONF_append_om-gta02 = "--with-machine=om-gta02"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
diff --git a/recipes/freesmartphone/fsonetworkd_git.bb b/recipes/freesmartphone/fsonetworkd_git.bb
index e64de8e96d..974ac3ccc7 100644
--- a/recipes/freesmartphone/fsonetworkd_git.bb
+++ b/recipes/freesmartphone/fsonetworkd_git.bb
@@ -3,4 +3,5 @@ inherit fso-plugin
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "0.1.0.0+gitr${SRCPV}"
 PE = "1"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
+RDEPENDS += "iptables"
diff --git a/recipes/freesmartphone/fsoraw_git.bb b/recipes/freesmartphone/fsoraw_git.bb
new file mode 100644
index 0000000000..d16811b03a
--- /dev/null
+++ b/recipes/freesmartphone/fsoraw_git.bb
@@ -0,0 +1,18 @@
+require cornucopia.inc
+
+DESCRIPTION = "A console wrapper for the FSO Usage API"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+SECTION = "fso/base"
+LICENSE = "GPLv2"
+SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
+PV = "1.0.0+gitr${SRCPV}"
+PR = "${INC_PR}.0"
+PE = "1"
+
+S = "${WORKDIR}/git/tools/fso-raw"
+
+# for backward compatibility in scripts
+do_install_append() {
+        install -d ${D}${bindir}
+	ln -s fso-raw ${D}${bindir}/fsoraw
+}
diff --git a/recipes/freesmartphone/fsoraw_svn.bb b/recipes/freesmartphone/fsoraw_svn.bb
index 74b1274782..f10f2212f0 100644
--- a/recipes/freesmartphone/fsoraw_svn.bb
+++ b/recipes/freesmartphone/fsoraw_svn.bb
@@ -12,3 +12,9 @@ SRC_URI = "svn://noko.svn.sourceforge.net/svnroot/noko/trunk;module=fsoraw;proto
 S = "${WORKDIR}/fsoraw/"
 
 inherit autotools
+
+# for forward compatibility in scripts
+do_install_append() {
+        install -d ${D}${bindir}
+        ln -s fsoraw ${D}${bindir}/fso-raw
+}
diff --git a/recipes/freesmartphone/libframeworkd-glib_git.bb b/recipes/freesmartphone/libframeworkd-glib_git.bb
index 5fa47d835f..15ef006273 100644
--- a/recipes/freesmartphone/libframeworkd-glib_git.bb
+++ b/recipes/freesmartphone/libframeworkd-glib_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "freesmartphone.org API glib wrapper"
 LICENSE = "LGPL"
 SECTION = "devel"
 DEPENDS = "dbus-glib"
-SRCREV = "66eab3e4c444f161497268953b47192a2d7c80bc"
+SRCREV = "43f25d7343145111e70dceaa610decab84366cbb"
 PV = "0.0.1+gitr${SRCPV}"
 PE = "1"
 PR = "r0"
diff --git a/recipes/freesmartphone/libfso-glib_git.bb b/recipes/freesmartphone/libfso-glib_git.bb
index 8984741be7..dad6c002dd 100644
--- a/recipes/freesmartphone/libfso-glib_git.bb
+++ b/recipes/freesmartphone/libfso-glib_git.bb
@@ -2,17 +2,12 @@ DESCRIPTION = "GLib-based DBus bindings for freesmartphone.org - Vala implementa
 AUTHOR = "Didier 'Ptitjes"
 LICENSE = "LGPL"
 SECTION = "devel"
-DEPENDS = "vala-native vala-dbus-binding-tool-native dbus-glib glib-2.0 fso-specs"
-SRCREV = "f1a0b3fe2ed6e15d83ad4880b4eb7aece00f9d57"
-PV = "0.2.2+gitr${SRCPV}"
+DEPENDS = "vala-dbus-binding-tool-native dbus-glib glib-2.0 fso-specs"
+SRCREV = "5cda3952855d6c4273929449339b04509387bdd2"
+PV = "2010.05.11.2+gitr${SRCPV}"
 PE = "1"
-PR = "r4"
 
-inherit autotools_stage pkgconfig vala
-
-PARALLEL_MAKE = ""
+inherit autotools vala
 
 SRC_URI = "${FREESMARTPHONE_GIT}/libfso-glib.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
-
-FILES_${PN}-dev += "${datadir}/gir-1.0/*.gir"
diff --git a/recipes/freesmartphone/libgsm0710_git.bb b/recipes/freesmartphone/libgsm0710_git.bb
index 6b78c9f922..2c78789d9b 100644
--- a/recipes/freesmartphone/libgsm0710_git.bb
+++ b/recipes/freesmartphone/libgsm0710_git.bb
@@ -9,4 +9,4 @@ PR = "r0"
 SRC_URI = "${FREESMARTPHONE_GIT}/libgsm0710.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage pkgconfig vala
+inherit autotools vala
diff --git a/recipes/freesmartphone/libgsm0710mux_git.bb b/recipes/freesmartphone/libgsm0710mux_git.bb
index f85be3c238..4c791d70e2 100644
--- a/recipes/freesmartphone/libgsm0710mux_git.bb
+++ b/recipes/freesmartphone/libgsm0710mux_git.bb
@@ -1,3 +1,5 @@
+require cornucopia.inc
+
 DESCRIPTION = "A GSM 07.10 Multiplexing Engine"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 LICENSE = "GPL"
@@ -6,9 +8,4 @@ DEPENDS = "glib-2.0 libgsm0710 libfsotransport"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "0.9.2+gitr${SRCPV}"
 PE = "1"
-PR = "r0"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
-S = "${WORKDIR}/git/libgsm0710mux"
-
-inherit autotools_stage pkgconfig vala
+PR = "${INC_PR}.0"
diff --git a/recipes/freesmartphone/libpersistence_git.bb b/recipes/freesmartphone/libpersistence_git.bb
index 0550045aed..ab1892e246 100644
--- a/recipes/freesmartphone/libpersistence_git.bb
+++ b/recipes/freesmartphone/libpersistence_git.bb
@@ -13,4 +13,4 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/git"
 
-inherit autotools_stage pkgconfig vala
+inherit autotools vala
diff --git a/recipes/freesmartphone/mdbus2_git.bb b/recipes/freesmartphone/mdbus2_git.bb
index 76af519d4b..cfa6ef3698 100644
--- a/recipes/freesmartphone/mdbus2_git.bb
+++ b/recipes/freesmartphone/mdbus2_git.bb
@@ -1,19 +1,13 @@
+require cornucopia.inc
+
 DESCRIPTION = "Mickey's DBus introspection and calling Program V2"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 DEPENDS = "glib-2.0 dbus dbus-glib"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "2.0.0+gitr${SRCPV}"
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
-SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
-S = "${WORKDIR}/git/tools/mdbus2"
-
-do_stage() {
-	:
-}
-
-inherit autotools_stage vala
+S = "${WORKDIR}/git/tools/${PN}"
diff --git a/recipes/freesmartphone/mdbus_git.bb b/recipes/freesmartphone/mdbus_git.bb
index f90fd7eb8c..14a676e017 100644
--- a/recipes/freesmartphone/mdbus_git.bb
+++ b/recipes/freesmartphone/mdbus_git.bb
@@ -1,16 +1,13 @@
 DESCRIPTION = "Mickey's DBus introspection and calling Program"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
-LICENSE = "GPLv2"
+
+require python-helpers.inc
+
 SRCREV = "${FSO_PYTHONHELPERS_SRCREV}"
 PV = "0.9.2+gitr${SRCPV}"
-PE = "1"
 PR = "r2"
 
-SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
-S = "${WORKDIR}/git"
-
 do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 mickeydbus/mdbus ${D}${bindir}
diff --git a/recipes/freesmartphone/mickeyterm_git.bb b/recipes/freesmartphone/mickeyterm_git.bb
index 20730218f1..41b5636625 100644
--- a/recipes/freesmartphone/mickeyterm_git.bb
+++ b/recipes/freesmartphone/mickeyterm_git.bb
@@ -1,16 +1,13 @@
 DESCRIPTION = "Mickey's Terminal Program"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
-LICENSE = "GPLv2"
+
+require python-helpers.inc
+
 SRCREV = "${FSO_PYTHONHELPERS_SRCREV}"
 PV = "2.9.1+gitr${SRCPV}"
-PE = "1"
 PR = "r3"
 
-SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
-S = "${WORKDIR}/git"
-
 do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 mickeyterm/mickeyterm ${D}${bindir}
diff --git a/recipes/freesmartphone/mioctl_git.bb b/recipes/freesmartphone/mioctl_git.bb
index 56bb1c42af..e09c424b51 100644
--- a/recipes/freesmartphone/mioctl_git.bb
+++ b/recipes/freesmartphone/mioctl_git.bb
@@ -10,8 +10,4 @@ PR = "r0"
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/tools/mioctl"
 
-do_stage() {
-	:
-}
-
 inherit autotools vala
diff --git a/recipes/freesmartphone/mkdump_git.bb b/recipes/freesmartphone/mkdump_git.bb
new file mode 100644
index 0000000000..d3171bbd2c
--- /dev/null
+++ b/recipes/freesmartphone/mkdump_git.bb
@@ -0,0 +1,15 @@
+require cornucopia.inc
+
+DESCRIPTION = "mkdump is a kernel message dumper"
+HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/mkdump"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+SECTION = "console/network"
+DEPENDS = "libfsoframework"
+LICENSE = "GPL"
+
+#SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV = "696d93d7146adffdb76ddb951a7d8199b3dc8a81"
+PV = "1.0.0+gitr${SRCPV}"
+PR = "${INC_PR}.0"
+
+S = "${WORKDIR}/git/tools/${PN}"
diff --git a/recipes/freesmartphone/msmcommd_git.bb b/recipes/freesmartphone/msmcommd_git.bb
index 7177e50fc1..e1f69bbbf4 100644
--- a/recipes/freesmartphone/msmcommd_git.bb
+++ b/recipes/freesmartphone/msmcommd_git.bb
@@ -4,7 +4,7 @@ AUTHOR = "Simon Busch <morphis@gravedo.de>"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "libgee libfsotransport"
-SRCREV = "23c0cd870fc989792a20c6c662db4400129bd471"
+SRCREV = "cdbb26ba215cf314cf8ccf25a5e7cbdcb9f7bece"
 PV = "0.1.0+gitr${SRCPV}"
 PR = "r2"
 PE = "1"
@@ -12,9 +12,7 @@ PE = "1"
 SRC_URI = "${FREESMARTPHONE_GIT}/msmcomm.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage vala
-
-PARALLEL_MAKE = ""
+inherit autotools vala
 
 PACKAGES =+ "${PN}-lib ${PN}-term"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
diff --git a/recipes/freesmartphone/mterm2_git.bb b/recipes/freesmartphone/mterm2_git.bb
index f459a4ab65..8615af7678 100644
--- a/recipes/freesmartphone/mterm2_git.bb
+++ b/recipes/freesmartphone/mterm2_git.bb
@@ -1,3 +1,5 @@
+require cornucopia.inc
+
 DESCRIPTION = "mterm is a versatile muxer-aware terminal program"
 HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/fso-term"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
@@ -7,17 +9,8 @@ LICENSE = "GPL"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "0.1.0+gitr${SRCPV}"
 PE = "1"
-PR = "r0"
-
-SRC_URI = "\
-  ${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master \
-"
-S = "${WORKDIR}/git/tools/mterm2"
-
-do_stage() {
-	:
-}
+PR = "${INC_PR}.0"
 
-inherit autotools vala
+S = "${WORKDIR}/git/tools/${PN}"
 
 FILES_${PN} += "${datadir}"
diff --git a/recipes/freesmartphone/multicat_git.bb b/recipes/freesmartphone/multicat_git.bb
index a47f6056e0..77d61159b3 100644
--- a/recipes/freesmartphone/multicat_git.bb
+++ b/recipes/freesmartphone/multicat_git.bb
@@ -1,16 +1,13 @@
 DESCRIPTION = "Multiple cat utility"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console"
-LICENSE = "GPLv2"
+
+require python-helpers.inc
+
 SRCREV = "${FSO_PYTHONHELPERS_SRCREV}"
 PV = "0.0.0+gitr${SRCPV}"
-PE = "1"
 PR = "r1"
 
-SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
-S = "${WORKDIR}/git"
-
 do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 multicat/multicat ${D}${bindir}
diff --git a/recipes/freesmartphone/opimd-utils_git.bb b/recipes/freesmartphone/opimd-utils_git.bb
index 79a44ae6ff..446cc059bb 100644
--- a/recipes/freesmartphone/opimd-utils_git.bb
+++ b/recipes/freesmartphone/opimd-utils_git.bb
@@ -4,7 +4,7 @@ SHR_RELEASE ?= "shr"
 LICENSE ?= "GPL"
 RDEPENDS = "python-elementary python-dbus python-codecs python-shell python python-core python-edbus frameworkd"
 SECTION = "x11/application"
-SRCREV = "1872cdebe1209123710259e25cb8c8b47a627112"
+SRCREV = "5618e320f5380a51c43e0aebeb0783c976c3091f"
 PV = "0.0.3+gitr${SRCPV}"
 PR = "r0"
 PE = "1"
diff --git a/recipes/freesmartphone/pycd_git.bb b/recipes/freesmartphone/pycd_git.bb
index 92b0bb951d..eebc11c0a0 100644
--- a/recipes/freesmartphone/pycd_git.bb
+++ b/recipes/freesmartphone/pycd_git.bb
@@ -1,14 +1,13 @@
 DESCRIPTION = "Python Clone Factory"
 AUTHOR = "Jan Luebbe <jluebbe@debian.org>"
-HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
-LICENSE = "GPLv2"
+
+require python-helpers.inc
+
 SRCREV = "${FSO_PYTHONHELPERS_SRCREV}"
 PV = "0.1+gitr${SRCPV}"
-PE = "1"
 PR = "r0"
 
-SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/${PN}"
 
 RDEPENDS_${PN} = "\
diff --git a/recipes/freesmartphone/python-helpers.inc b/recipes/freesmartphone/python-helpers.inc
new file mode 100644
index 0000000000..4397627e6d
--- /dev/null
+++ b/recipes/freesmartphone/python-helpers.inc
@@ -0,0 +1,8 @@
+HOMEPAGE = "http://www.freesmartphone.org"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+PE = "1"
+
+FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
+SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
diff --git a/recipes/freesmartphone/zhone2_git.bb b/recipes/freesmartphone/zhone2_git.bb
index 11402b4649..440b922dac 100644
--- a/recipes/freesmartphone/zhone2_git.bb
+++ b/recipes/freesmartphone/zhone2_git.bb
@@ -3,7 +3,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "x11"
 LICENSE = "GPLv2"
-DEPENDS = "edje-native vala-native evas ecore edje libeflvala libfsobasics libfsoframework libfso-glib"
+DEPENDS = "edje-native evas ecore edje libeflvala libfsobasics libfsoframework libfso-glib"
 SRCREV = "1e3dca8a407f4e69636c47d9f22b31f8ae718d5a"
 PV = "2.0.0+gitr${SRCPV}"
 PR = "r2"
@@ -18,7 +18,7 @@ SRC_URI[splash.md5sum] = "e198d5c83cc47a216562e435df0e03c3"
 SRC_URI[splash.sha256sum] = "3e41bcf4ea50ab7406d3833e412a78ddb9afaab4b0a8cca1bf93755d1ce9a215"
 S = "${WORKDIR}/git/zhone2"
 
-inherit autotools_stage update-rc.d
+inherit autotools update-rc.d vala
 
 INITSCRIPT_NAME = "zhone2"
 INITSCRIPT_PARAMS = "defaults 40"
diff --git a/recipes/freetype/freetype-2.3.11/fix-configure.patch b/recipes/freetype/freetype-2.3.11/fix-configure.patch
new file mode 100644
index 0000000000..ecd96738d4
--- /dev/null
+++ b/recipes/freetype/freetype-2.3.11/fix-configure.patch
@@ -0,0 +1,13 @@
+Index: freetype-2.3.6/builds/unix/configure.ac
+===================================================================
+--- freetype-2.3.6.orig/builds/unix/configure.ac
++++ freetype-2.3.6/builds/unix/configure.ac
+@@ -506,8 +506,6 @@ AC_SUBST([FT2_EXTRA_LIBS])
+ AC_SUBST([SYSTEM_ZLIB])
+ 
+ 
+-LT_INIT(win32-dll)
+-
+ AC_SUBST([hardcode_libdir_flag_spec])
+ AC_SUBST([wl])
+ AC_SUBST([build_libtool_libs])
diff --git a/recipes/freetype/freetype-2.3.11/libtool-tag.patch b/recipes/freetype/freetype-2.3.11/libtool-tag.patch
new file mode 100644
index 0000000000..2f096cdd46
--- /dev/null
+++ b/recipes/freetype/freetype-2.3.11/libtool-tag.patch
@@ -0,0 +1,20 @@
+--- freetype-2.3.6/builds/unix/unix-cc.in	
++++ freetype-2.3.6/builds/unix/unix-cc.in	
+@@ -88,7 +88,7 @@ 
+ #
+ #
+ CCraw := $(CC)
+-CC    := $(LIBTOOL) --mode=compile $(CCraw)
++CC    := $(LIBTOOL) --tag=CC --mode=compile $(CCraw)
+ 
+ # Linker flags.
+ #
+@@ -105,7 +105,7 @@ 
+ 
+ # Library linking
+ #
+-LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
++LINK_LIBRARY = $(LIBTOOL) --tag=CC --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
+                           -rpath $(libdir) -version-info $(version_info) \
+                           $(LDFLAGS) -no-undefined \
+                           # -export-symbols $(EXPORTS_LIST)
diff --git a/recipes/freetype/freetype_2.1.10.bb b/recipes/freetype/freetype_2.1.10.bb
index 64e441a4b5..9fe742fa35 100644
--- a/recipes/freetype/freetype_2.1.10.bb
+++ b/recipes/freetype/freetype_2.1.10.bb
@@ -5,8 +5,8 @@ LICENSE = "freetype"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-	   file://no-hardcode.patch;patch=1"
+	   file://configure.patch \
+	   file://no-hardcode.patch"
 S = "${WORKDIR}/freetype-${PV}"
 
 inherit autotools pkgconfig binconfig
diff --git a/recipes/freetype/freetype_2.1.8.bb b/recipes/freetype/freetype_2.1.8.bb
index 13c9b8b4a8..b561475d50 100644
--- a/recipes/freetype/freetype_2.1.8.bb
+++ b/recipes/freetype/freetype_2.1.8.bb
@@ -4,7 +4,7 @@ LICENSE = "freetype"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 S = "${WORKDIR}/freetype-${PV}"
 
 inherit autotools pkgconfig binconfig
diff --git a/recipes/freetype/freetype_2.2.1.bb b/recipes/freetype/freetype_2.2.1.bb
index a8027744eb..0fb2c9c34e 100644
--- a/recipes/freetype/freetype_2.2.1.bb
+++ b/recipes/freetype/freetype_2.2.1.bb
@@ -4,8 +4,8 @@ LICENSE = "freetype"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-           file://no-hardcode.patch;patch=1"
+	   file://configure.patch \
+           file://no-hardcode.patch"
 S = "${WORKDIR}/freetype-${PV}"
 
 inherit autotools pkgconfig binconfig
diff --git a/recipes/freetype/freetype_2.3.0.bb b/recipes/freetype/freetype_2.3.0.bb
index 677c0c6899..8487eb1910 100644
--- a/recipes/freetype/freetype_2.3.0.bb
+++ b/recipes/freetype/freetype_2.3.0.bb
@@ -4,8 +4,8 @@ LICENSE = "freetype"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-           file://no-hardcode.patch;patch=1"
+	   file://configure.patch \
+           file://no-hardcode.patch"
 S = "${WORKDIR}/freetype-${PV}"
 
 inherit autotools pkgconfig binconfig
diff --git a/recipes/freetype/freetype_2.3.1.bb b/recipes/freetype/freetype_2.3.1.bb
index a38c5a4ca9..a8e3b62e01 100644
--- a/recipes/freetype/freetype_2.3.1.bb
+++ b/recipes/freetype/freetype_2.3.1.bb
@@ -4,9 +4,9 @@ LICENSE = "freetype"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-           file://fix-x86_64-build.patch;patch=1"
-#           file://no-hardcode.patch;patch=1"
-#	   file://configure.patch;patch=1 \
+           file://fix-x86_64-build.patch"
+#           file://no-hardcode.patch"
+#	   file://configure.patch \
 S = "${WORKDIR}/freetype-${PV}"
 
 inherit autotools pkgconfig binconfig
diff --git a/recipes/freetype/freetype_2.3.11.bb b/recipes/freetype/freetype_2.3.11.bb
new file mode 100644
index 0000000000..1474bb924e
--- /dev/null
+++ b/recipes/freetype/freetype_2.3.11.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "Freetype font rendering library"
+SECTION = "libs"
+LICENSE = "freetype"
+PR = "r0"
+
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
+  file://no-hardcode.patch \
+  file://fix-configure.patch \
+  file://libtool-tag.patch \
+"
+S = "${WORKDIR}/freetype-${PV}"
+
+inherit autotools pkgconfig binconfig
+
+LIBTOOL = "${HOST_SYS}-libtool"
+EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
+EXTRA_OECONF = "--without-zlib"
+
+do_configure() {
+	cd builds/unix
+	libtoolize --force --copy
+	gnu-configize --force
+	aclocal -I .
+	autoconf
+	cd ${S}
+	oe_runconf
+}
+
+do_compile_prepend() {
+	${BUILD_CC} -o objs/apinames src/tools/apinames.c
+}
+
+BBCLASSEXTEND = "native"
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
+
+SRC_URI[md5sum] = "519c7cbf5cbd72ffa822c66844d3114c"
+SRC_URI[sha256sum] = "8a033b1e6018a1e9ea381b09b2347b02c6686bdf7e4ee86a6714b6b90f1e2ec9"
diff --git a/recipes/freetype/freetype_2.3.4.bb b/recipes/freetype/freetype_2.3.4.bb
index 0a83fe522a..136dfbc795 100644
--- a/recipes/freetype/freetype_2.3.4.bb
+++ b/recipes/freetype/freetype_2.3.4.bb
@@ -4,8 +4,8 @@ LICENSE = "freetype"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-           file://fix-x86_64-build.patch;patch=1 \
-           file://no-hardcode.patch;patch=1 \
+           file://fix-x86_64-build.patch \
+           file://no-hardcode.patch \
 	  "
 
 S = "${WORKDIR}/freetype-${PV}"
diff --git a/recipes/freetype/freetype_2.3.5.bb b/recipes/freetype/freetype_2.3.5.bb
index 2344f0164d..eca7e91638 100644
--- a/recipes/freetype/freetype_2.3.5.bb
+++ b/recipes/freetype/freetype_2.3.5.bb
@@ -4,8 +4,8 @@ LICENSE = "freetype"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-           file://fix-x86_64-build.patch;patch=1 \
-           file://no-hardcode.patch;patch=1 \
+           file://fix-x86_64-build.patch \
+           file://no-hardcode.patch \
 	  "
 
 S = "${WORKDIR}/freetype-${PV}"
diff --git a/recipes/freetype/freetype_2.3.6.bb b/recipes/freetype/freetype_2.3.6.bb
index 9c52807b2c..b70bf56ac5 100644
--- a/recipes/freetype/freetype_2.3.6.bb
+++ b/recipes/freetype/freetype_2.3.6.bb
@@ -5,9 +5,9 @@ PR = "r0"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-  file://no-hardcode.patch;patch=1 \
-  file://fix-configure.patch;patch=1 \
-  file://libtool-tag.patch;patch=1 \
+  file://no-hardcode.patch \
+  file://fix-configure.patch \
+  file://libtool-tag.patch \
 "
 S = "${WORKDIR}/freetype-${PV}"
 
diff --git a/recipes/freetype/freetype_2.3.9.bb b/recipes/freetype/freetype_2.3.9.bb
index 031923bb81..37dda5d66f 100644
--- a/recipes/freetype/freetype_2.3.9.bb
+++ b/recipes/freetype/freetype_2.3.9.bb
@@ -5,9 +5,9 @@ PR = "r1"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-  file://no-hardcode.patch;patch=1 \
-  file://fix-configure.patch;patch=1 \
-  file://libtool-tag.patch;patch=1 \
+  file://no-hardcode.patch \
+  file://fix-configure.patch \
+  file://libtool-tag.patch \
 "
 S = "${WORKDIR}/freetype-${PV}"
 
diff --git a/recipes/frodo/frodo_4.1b.bb b/recipes/frodo/frodo_4.1b.bb
index c6fb23ec98..daf2d51e6b 100644
--- a/recipes/frodo/frodo_4.1b.bb
+++ b/recipes/frodo/frodo_4.1b.bb
@@ -5,8 +5,8 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://frodo.cebix.net/downloads/FrodoV4_1b.Src.tar.gz \
-           file://frodo-qte.diff;patch=1 \
-           file://frodo-joystick-4state.diff;patch=1 \
+           file://frodo-qte.diff \
+           file://frodo-joystick-4state.diff \
            file://frodorc \
            file://Frodo.png \
            file://frodo.desktop"
diff --git a/recipes/frodo/frodo_4.2.bb b/recipes/frodo/frodo_4.2.bb
index 8f8812a6d4..4bc3b39668 100644
--- a/recipes/frodo/frodo_4.2.bb
+++ b/recipes/frodo/frodo_4.2.bb
@@ -7,7 +7,7 @@ SRCDATE = "20040801"
 PR = "r2"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cebix.net/home/cvs/cebix;module=Frodo4 \
-           file://configure.patch;patch=1 \
+           file://configure.patch \
            file://frodorc \
            file://Frodo.png \
            file://frodo.desktop"
diff --git a/recipes/frotz/frotz_2.42.bb b/recipes/frotz/frotz_2.42.bb
index 2da4e40135..f102305882 100644
--- a/recipes/frotz/frotz_2.42.bb
+++ b/recipes/frotz/frotz_2.42.bb
@@ -5,7 +5,7 @@ SECTION = "console/games"
 DEPENDS = "ncurses"
 
 SRC_URI = "http://www.cs.csubak.edu/~dgriffi/proj/frotz/files/frotz-${PV}.tar.gz \
-	file://Makefile.patch;patch=1 "
+	file://Makefile.patch "
 
 do_configure() {
 	patch -N ${s}/ux_init.c < remove_root_restriction.patch || :
diff --git a/recipes/frotz/frotz_2.43.bb b/recipes/frotz/frotz_2.43.bb
index fec0088f04..3a28295e4e 100644
--- a/recipes/frotz/frotz_2.43.bb
+++ b/recipes/frotz/frotz_2.43.bb
@@ -5,8 +5,8 @@ SECTION = "console/games"
 DEPENDS = "ncurses"
 
 SRC_URI = "http://www.cs.csubak.edu/~dgriffi/proj/frotz/files/frotz-${PV}.tar.gz \
-	file://Makefile-${PV}.patch;patch=1 \
-	file://remove_root_restriction.patch;patch=1 "
+	file://Makefile-${PV}.patch \
+	file://remove_root_restriction.patch "
 
 do_configure() {
 	rm -f ${SourceTree}/frotz.conf
diff --git a/recipes/frozen-bubble/frozen-bubble_1.0.0.bb b/recipes/frozen-bubble/frozen-bubble_1.0.0.bb
index 4799cb6242..2ac3009ea1 100644
--- a/recipes/frozen-bubble/frozen-bubble_1.0.0.bb
+++ b/recipes/frozen-bubble/frozen-bubble_1.0.0.bb
@@ -16,9 +16,9 @@ RDEPENDS_${PN} = "${PN}-data perl sdl-perl \
 PR = "r1"
 
 SRC_URI = "http://zarb.org/~gc/fb//frozen-bubble-${PV}.tar.bz2 \
-	file://Makefile_top.patch;patch=1 \
-	file://Makefile.patch;patch=1 \
-	file://Makefile.PL.patch;patch=1"
+	file://Makefile_top.patch \
+	file://Makefile.patch \
+	file://Makefile.PL.patch"
 # The Makefile needs to be patched to look in STAGING_LIBDIR/perl/... - It's looking in i686-linux/lib at the moment, regardless of arch
 BROKEN = "1"
 
diff --git a/recipes/frozen-bubble/frozen-bubble_2.2.0.bb b/recipes/frozen-bubble/frozen-bubble_2.2.0.bb
index 2fc7c1ea58..8ed505ec59 100644
--- a/recipes/frozen-bubble/frozen-bubble_2.2.0.bb
+++ b/recipes/frozen-bubble/frozen-bubble_2.2.0.bb
@@ -22,10 +22,10 @@ inherit cpan-base
 PERL_VERSION = ${@get_perl_version(d)}
 
 SRC_URI = "http://www.frozen-bubble.org/data/frozen-bubble-${PV}.tar.bz2 \
-	   file://Makefile.PL.patch;patch=1 \
-	   file://Makefile.patch;patch=1 \
-	   file://Makefile_top.patch;patch=1 \
-	   file://localespath-fix.patch;patch=1 \
+	   file://Makefile.PL.patch \
+	   file://Makefile.patch \
+	   file://Makefile_top.patch \
+	   file://localespath-fix.patch \
 	  "
 
 #permit the installation of the locales in ${datadir}/locales otherwise they are installed in /usr/local/share/locales
diff --git a/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb b/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb
index 32e5be5928..504f652393 100755
--- a/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb
+++ b/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb
@@ -7,8 +7,8 @@ PR = "r3"
 
 SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_5 \
 	   cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_5 \
-	   file://syslog.patch;patch=1 \
-	   file://usb-header-name-2-6-23.patch;patch=1 \
+	   file://syslog.patch \
+	   file://usb-header-name-2-6-23.patch \
 	   file://init"
 
 # The source will end up in the subdirectory 'ftpd-topfield' - no release name
diff --git a/recipes/fuse/fuse-module_2.5.3.bb b/recipes/fuse/fuse-module_2.5.3.bb
index 0317aeb9a2..0e28207d1d 100644
--- a/recipes/fuse/fuse-module_2.5.3.bb
+++ b/recipes/fuse/fuse-module_2.5.3.bb
@@ -2,7 +2,7 @@ require fuse.inc
 
 PR = "r0"
 
-SRC_URI += "file://preserve_CC_with_2_4_kernel.patch;patch=1"
+SRC_URI += "file://preserve_CC_with_2_4_kernel.patch"
 
 S = "${WORKDIR}/fuse-${PV}"
 
diff --git a/recipes/fuse/fuse_2.6.5.bb b/recipes/fuse/fuse_2.6.5.bb
index bb2a01efd8..5cc26161a3 100644
--- a/recipes/fuse/fuse_2.6.5.bb
+++ b/recipes/fuse/fuse_2.6.5.bb
@@ -2,7 +2,7 @@ require fuse.inc
 
 PR = "r0"
 
-SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
+SRC_URI += "file://not-run-updaterc.d-on-host.patch"
 
 EXTRA_OECONF = " --disable-kernel-module"
 
diff --git a/recipes/fuse/fuse_2.7.1.bb b/recipes/fuse/fuse_2.7.1.bb
index 3e1362f078..aae5441148 100644
--- a/recipes/fuse/fuse_2.7.1.bb
+++ b/recipes/fuse/fuse_2.7.1.bb
@@ -2,7 +2,7 @@ require fuse.inc
 
 PR = "r0"
 
-SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
+SRC_URI += "file://not-run-updaterc.d-on-host.patch"
 
 EXTRA_OECONF = " --disable-kernel-module"
 
diff --git a/recipes/fuse/fuse_2.7.4.bb b/recipes/fuse/fuse_2.7.4.bb
index ecf1961c84..27a23dcfb1 100644
--- a/recipes/fuse/fuse_2.7.4.bb
+++ b/recipes/fuse/fuse_2.7.4.bb
@@ -2,7 +2,7 @@ require fuse.inc
 
 PR = "r0"
 
-SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
+SRC_URI += "file://not-run-updaterc.d-on-host.patch"
 
 EXTRA_OECONF = " --disable-kernel-module"
 
diff --git a/recipes/fush/fush_0.9.0.bb b/recipes/fush/fush_0.9.0.bb
index b955d782bb..b214af0748 100644
--- a/recipes/fush/fush_0.9.0.bb
+++ b/recipes/fush/fush_0.9.0.bb
@@ -8,9 +8,9 @@ PR = "r3"
 
 RV = "${@bb.data.getVar('PV', d, 1).replace('.', '-')}"
 SRC_URI = "${SOURCEFORGE_MIRROR}/foosh/fush-${RV}.tar.gz \
-	   file://openpty.patch;patch=1 \
-	   file://install.patch;patch=1 \
-	   file://paths.patch;patch=1"
+	   file://openpty.patch \
+	   file://install.patch \
+	   file://paths.patch"
 S = "${WORKDIR}/fush-${RV}"
 
 inherit autotools
diff --git a/recipes/fvwm/fvwm_2.5.26.bb b/recipes/fvwm/fvwm_2.5.26.bb
index ffaea48b39..cccda600de 100644
--- a/recipes/fvwm/fvwm_2.5.26.bb
+++ b/recipes/fvwm/fvwm_2.5.26.bb
@@ -4,9 +4,9 @@ LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxext libxfixes libxpm xrandr xft libxml2 zlib libice libxau libxcb libxcursor libxdmcp libxrender libpng librsvg fontconfig libstroke"
 
 SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 \
-	file://oe-configure.ac.patch;patch=1 \
-	file://upstream-configure.ac.patch;patch=1 \
-	file://acinclude.m4.patch;patch=1 \
+	file://oe-configure.ac.patch \
+	file://upstream-configure.ac.patch \
+	file://acinclude.m4.patch \
 	"
 
 inherit autotools pkgconfig
diff --git a/recipes/fxload/fxload_0.0.20020411.bb b/recipes/fxload/fxload_0.0.20020411.bb
index e739eeba3d..5d5cf31680 100644
--- a/recipes/fxload/fxload_0.0.20020411.bb
+++ b/recipes/fxload/fxload_0.0.20020411.bb
@@ -7,7 +7,7 @@ DEPENDS = "linux-libc-headers"
 PR = "r1"
 
 SRC_URI = "http://dfn.dl.sourceforge.net/sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz \
-           file://usbheader.patch;patch=1"
+           file://usbheader.patch"
 
 S = "${WORKDIR}/fxload-2002_04_11"
 
diff --git a/recipes/gal/gal-2.0_1.99.11.bb b/recipes/gal/gal-2.0_1.99.11.bb
index 9f78e456f8..8d8b32dbd7 100644
--- a/recipes/gal/gal-2.0_1.99.11.bb
+++ b/recipes/gal/gal-2.0_1.99.11.bb
@@ -5,8 +5,8 @@ DEPENDS = "intltool libgnomeprint gtk+ libglade libgnomeui libgnomecanvas libxml
 inherit gnome
 
 SRC_URI = "${GNOME_MIRROR}/gal/1.99/gal-${PV}.tar.bz2 \
-	file://configure.patch;patch=1 \
-	file://forward-decl.patch;patch=1 \
+	file://configure.patch \
+	file://forward-decl.patch \
 	file://iconv-detect.h"
 
 S = "${WORKDIR}/gal-${PV}"
diff --git a/recipes/gal/gal-2.1_2.1.10.bb b/recipes/gal/gal-2.1_2.1.10.bb
index 6d299e537a..03c6bdcd6f 100644
--- a/recipes/gal/gal-2.1_2.1.10.bb
+++ b/recipes/gal/gal-2.1_2.1.10.bb
@@ -5,8 +5,8 @@ DEPENDS = "intltool libgnomeprint gtk+ libglade libgnomeui libgnomecanvas libxml
 inherit gnome
 
 SRC_URI = "${GNOME_MIRROR}/gal/2.1/gal-${PV}.tar.bz2 \
-	file://configure.patch;patch=1 \
-	file://forward-decl.patch;patch=1 \
+	file://configure.patch \
+	file://forward-decl.patch \
 	file://iconv-detect.h"
 
 S = "${WORKDIR}/gal-${PV}"
diff --git a/recipes/galago/eds-feed_0.3.2.bb b/recipes/galago/eds-feed_0.3.2.bb
index bd97b70337..e42f6e8bad 100644
--- a/recipes/galago/eds-feed_0.3.2.bb
+++ b/recipes/galago/eds-feed_0.3.2.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 DEPENDS = "gettext libgalago dbus glib-2.0 eds-dbus"
 
 SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
-           file://disable-bonobo.patch;patch=1"
-#           file://no-check.patch;patch=1"
+           file://disable-bonobo.patch"
+#           file://no-check.patch"
 #EXTRA_OECONF =	"--disable-binreloc"
 
 FILES_${PN} += "${libdir}/galago/eds-feed"
diff --git a/recipes/galago/galago-daemon_0.3.4.bb b/recipes/galago/galago-daemon_0.3.4.bb
index 4bffa28d57..84c0885e5b 100644
--- a/recipes/galago/galago-daemon_0.3.4.bb
+++ b/recipes/galago/galago-daemon_0.3.4.bb
@@ -5,7 +5,7 @@ DEPENDS = "gettext libgalago dbus glib-2.0"
 PR = "r1"
 
 SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
-           file://no-check.patch;patch=1"
+           file://no-check.patch"
 EXTRA_OECONF =	"--disable-binreloc"
 
 FILES_${PN} += "${datadir}/dbus-1/services/"
diff --git a/recipes/galago/libgalago_0.3.3.bb b/recipes/galago/libgalago_0.3.3.bb
index d58f3b93f6..8c1ef614d8 100644
--- a/recipes/galago/libgalago_0.3.3.bb
+++ b/recipes/galago/libgalago_0.3.3.bb
@@ -6,7 +6,7 @@ PR =		"r1"
 
 
 SRC_URI =	"http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
-		 file://no-check.patch;patch=1"
+		 file://no-check.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/galculator/galculator_1.2.3.bb b/recipes/galculator/galculator_1.2.3.bb
index 64f19823f0..8888c9a13f 100644
--- a/recipes/galculator/galculator_1.2.3.bb
+++ b/recipes/galculator/galculator_1.2.3.bb
@@ -11,9 +11,9 @@ SECTION = "gpe"
 PRIORITY = "optional"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
-        file://desktop-categories.patch;patch=1 \
-        file://Makefile.am.patch;patch=1 \
-        file://src-ui.c.patch;patch=1;pnum=0"
+        file://desktop-categories.patch \
+        file://Makefile.am.patch \
+        file://src-ui.c.patch;striplevel=0"
 
 LDFLAGS += '-Wl,--export-dynamic'
 
diff --git a/recipes/gamin/gamin_0.1.10.bb b/recipes/gamin/gamin_0.1.10.bb
index 9e19d54f83..392e3c3530 100644
--- a/recipes/gamin/gamin_0.1.10.bb
+++ b/recipes/gamin/gamin_0.1.10.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 DEPENDS = "glib-2.0"
 
 SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \
-           file://no-abstract-sockets.patch;patch=1"
+           file://no-abstract-sockets.patch"
 
 EXTRA_OECONF = " --without-python " 
 
diff --git a/recipes/gamin/gamin_0.1.8.bb b/recipes/gamin/gamin_0.1.8.bb
index 77a2c74161..7d76b9004a 100644
--- a/recipes/gamin/gamin_0.1.8.bb
+++ b/recipes/gamin/gamin_0.1.8.bb
@@ -3,8 +3,8 @@ LICENSE = "LGPL"
 DEPENDS = "glib-2.0"
 
 SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \
-           file://no-abstract-sockets.patch;patch=1 \
-           file://configure_ucred.patch;patch=1 "
+           file://no-abstract-sockets.patch \
+           file://configure_ucred.patch "
 
 EXTRA_OECONF = " --without-python " 
 
diff --git a/recipes/gcalctool/gcalctool_5.28.0.bb b/recipes/gcalctool/gcalctool_5.28.0.bb
index 31ce77e751..17552377f7 100644
--- a/recipes/gcalctool/gcalctool_5.28.0.bb
+++ b/recipes/gcalctool/gcalctool_5.28.0.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+"
 DESCRIPTION = "gcalctool is a powerful calculator"
 PR = "r0"
 
-SRC_URI = "file://makefile-fix.diff;patch=1"
+SRC_URI = "file://makefile-fix.diff"
 
 inherit gnome
 
diff --git a/recipes/gcalctool/gcalctool_5.5.21.bb b/recipes/gcalctool/gcalctool_5.5.21.bb
index db4c1d8f2e..5fc088e14b 100644
--- a/recipes/gcalctool/gcalctool_5.5.21.bb
+++ b/recipes/gcalctool/gcalctool_5.5.21.bb
@@ -11,7 +11,7 @@ DEPENDS = "gnome-common gtk+ libgnomeui"
 
 EXTRA_OECONF = "--disable-schemas-install"
 
-SRC_URI += "file://noscrollkeeper.patch;patch=1"
+SRC_URI += "file://noscrollkeeper.patch"
 
 do_configure_prepend () {
 	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
diff --git a/recipes/gcalctool/gcalctool_5.7.32.bb b/recipes/gcalctool/gcalctool_5.7.32.bb
index 69f31fa414..0b5db62ace 100644
--- a/recipes/gcalctool/gcalctool_5.7.32.bb
+++ b/recipes/gcalctool/gcalctool_5.7.32.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "gcalctool is a powerful calculator"
 PR = "r1"
 
 SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \
-        file://makefile-fix.diff;patch=1"
+        file://makefile-fix.diff"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gcc/gcc-3.3.3.inc b/recipes/gcc/gcc-3.3.3.inc
index b6d7648c5e..695af62b68 100644
--- a/recipes/gcc/gcc-3.3.3.inc
+++ b/recipes/gcc/gcc-3.3.3.inc
@@ -1,42 +1,42 @@
 require gcc-common.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive\
-	   file://config.sub.patch;patch=1 \
-	   file://empty6.patch;patch=1 \
-	   file://pr10392-1-test.patch;patch=1 \
-	   file://pr10412-1-test.patch;patch=1 \
-	   file://pr10589-1-test.patch;patch=1 \
-	   file://pr11162-1-test.patch;patch=1 \
-	   file://pr11587-1-test.patch;patch=1 \
-	   file://pr11608.patch;patch=1 \
-	   file://pr11736-1-test.patch;patch=1 \
-	   file://pr11864-1-test.patch;patch=1 \
-	   file://pr12009.patch;patch=1 \
-	   file://pr12010.patch;patch=1 \
-	   file://pr13260-test.patch;patch=1 \
-	   file://pr9365-1-test.patch;patch=1 \
-	   file://sh-lib1funcs_sizeAndType.patch;patch=1 \
-	   file://sh-pic-set_fpscr-gcc-3.3.2.patch;patch=1 \
-	   file://thunk3.patch;patch=1 \
-	   file://arm-10730.dpatch;patch=1;pnum=0 \
-	   file://arm-12527.dpatch;patch=1;pnum=0 \
-	   file://arm-14558.dpatch;patch=1;pnum=0 \
-	   file://arm-common.dpatch;patch=1;pnum=0 \
-	   file://arm-gotoff.dpatch;patch=1;pnum=0 \
-	   file://arm-ldm.dpatch;patch=1;pnum=0 \
-	   file://arm-tune.patch;patch=1;pnum=0 \
-	   file://arm-xscale.patch;patch=1;pnum=0 \
-	   file://arm-14302.patch;patch=1;pnum=0 \
-	   file://arm-ldm-peephole.patch;patch=1;pnum=0 \
-	   file://libibery-crosstool.patch;patch=1;pnum=1 \
-	   file://reverse-compare.patch;patch=1 \
-	   file://gcc34-15089.patch;patch=1 \
-	file://gcc-uclibc-3.3-100-conf.patch;patch=1 \
-	file://gcc-uclibc-3.3-110-conf.patch;patch=1 \
-	file://gcc-uclibc-3.3-120-softfloat.patch;patch=1 \
-	file://gcc-uclibc-3.3-200-code.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://bash3.patch;patch=1"
+	   file://config.sub.patch \
+	   file://empty6.patch \
+	   file://pr10392-1-test.patch \
+	   file://pr10412-1-test.patch \
+	   file://pr10589-1-test.patch \
+	   file://pr11162-1-test.patch \
+	   file://pr11587-1-test.patch \
+	   file://pr11608.patch \
+	   file://pr11736-1-test.patch \
+	   file://pr11864-1-test.patch \
+	   file://pr12009.patch \
+	   file://pr12010.patch \
+	   file://pr13260-test.patch \
+	   file://pr9365-1-test.patch \
+	   file://sh-lib1funcs_sizeAndType.patch \
+	   file://sh-pic-set_fpscr-gcc-3.3.2.patch \
+	   file://thunk3.patch \
+	   file://arm-10730.dpatch;apply=yes;striplevel=0 \
+	   file://arm-12527.dpatch;apply=yes;striplevel=0 \
+	   file://arm-14558.dpatch;apply=yes;striplevel=0 \
+	   file://arm-common.dpatch;apply=yes;striplevel=0 \
+	   file://arm-gotoff.dpatch;apply=yes;striplevel=0 \
+	   file://arm-ldm.dpatch;apply=yes;striplevel=0 \
+	   file://arm-tune.patch;striplevel=0 \
+	   file://arm-xscale.patch;striplevel=0 \
+	   file://arm-14302.patch;striplevel=0 \
+	   file://arm-ldm-peephole.patch;striplevel=0 \
+	   file://libibery-crosstool.patch \
+	   file://reverse-compare.patch \
+	   file://gcc34-15089.patch \
+	file://gcc-uclibc-3.3-100-conf.patch \
+	file://gcc-uclibc-3.3-110-conf.patch \
+	file://gcc-uclibc-3.3-120-softfloat.patch \
+	file://gcc-uclibc-3.3-200-code.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://bash3.patch"
 
 SRC_URI[archive.md5sum] = "3c6cfd9fcd180481063b4058cf6faff2"
 SRC_URI[archive.sha256sum] = "9ac6618495b7dd2ff0cd50abd76fe3c51287efcc724340687407f9fc250bdc6a"
diff --git a/recipes/gcc/gcc-3.3.4.inc b/recipes/gcc/gcc-3.3.4.inc
index 0425749c85..8ec9dc09a6 100644
--- a/recipes/gcc/gcc-3.3.4.inc
+++ b/recipes/gcc/gcc-3.3.4.inc
@@ -3,20 +3,20 @@ require gcc-common.inc
 INC_PR = "r11"
 
 SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	   file://arm-gotoff.dpatch;patch=1;pnum=0 \
-	   file://arm-ldm.dpatch;patch=1;pnum=0 \
-	   file://arm-tune.patch;patch=1;pnum=0 \
-	   file://arm-ldm-peephole.patch;patch=1;pnum=0 \
-	   file://libibery-crosstool.patch;patch=1;pnum=1 \
-	   file://reverse-compare.patch;patch=1 \
-	   file://gcc34-15089.patch;patch=1 \
-	   file://gcc-uclibc-3.3-100-conf.patch;patch=1 \
-	   file://gcc-uclibc-3.3-110-conf.patch;patch=1 \
-	   file://gcc-uclibc-3.3-120-softfloat.patch;patch=1 \
-	   file://gcc-uclibc-3.3-200-code.patch;patch=1 \
-	   file://zecke-xgcc-cpp.patch;patch=1 \
-	   file://gcc-com.patch;patch=1 \
-	   file://bash3.patch;patch=1"
+	   file://arm-gotoff.dpatch;apply=yes;striplevel=0 \
+	   file://arm-ldm.dpatch;apply=yes;striplevel=0 \
+	   file://arm-tune.patch;striplevel=0 \
+	   file://arm-ldm-peephole.patch;striplevel=0 \
+	   file://libibery-crosstool.patch \
+	   file://reverse-compare.patch \
+	   file://gcc34-15089.patch \
+	   file://gcc-uclibc-3.3-100-conf.patch \
+	   file://gcc-uclibc-3.3-110-conf.patch \
+	   file://gcc-uclibc-3.3-120-softfloat.patch \
+	   file://gcc-uclibc-3.3-200-code.patch \
+	   file://zecke-xgcc-cpp.patch \
+	   file://gcc-com.patch \
+	   file://bash3.patch"
 
 SRC_URI[archive.md5sum] = "a1c267b34f05c8660b24251865614d8b"
 SRC_URI[archive.sha256sum] = "3f409186acee739641341e5486e30ea9acecc039452e97a9eb850afbc6c3a691"
diff --git a/recipes/gcc/gcc-3.4.3.inc b/recipes/gcc/gcc-3.4.3.inc
index 5bb6d31549..d3823b3a94 100644
--- a/recipes/gcc/gcc-3.4.3.inc
+++ b/recipes/gcc/gcc-3.4.3.inc
@@ -3,20 +3,20 @@ require gcc-common.inc
 INC_PR = "r19"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	   file://gcc34-reverse-compare.patch;patch=1 \
-	   file://gcc34-arm-ldm.patch;patch=1 \
-	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
-	   file://gcc34-arm-tune.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
-	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
-	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
-	   file://GCC3.4.0VisibilityPatch.diff;patch=1 \
-	   file://15342.patch;patch=1 \
-	   file://always-fixincperm.patch;patch=1 \
-	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
-	   file://zecke-xgcc-cpp.patch;patch=1 "
+	   file://gcc34-reverse-compare.patch \
+	   file://gcc34-arm-ldm.patch \
+	   file://gcc34-arm-ldm-peephole.patch \
+	   file://gcc34-arm-tune.patch \
+	   file://gcc-3.4.1-uclibc-100-conf.patch \
+	   file://gcc-3.4.1-uclibc-200-locale.patch \
+	   file://gcc-3.4.0-arm-lib1asm.patch \
+	   file://gcc-3.4.0-arm-nolibfloat.patch \
+	   file://gcc-3.4.0-arm-bigendian.patch \
+	   file://gcc-3.4.0-arm-bigendian-uclibc.patch \
+	   file://GCC3.4.0VisibilityPatch.diff \
+	   file://15342.patch \
+	   file://always-fixincperm.patch \
+	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch \
+	   file://zecke-xgcc-cpp.patch "
 SRC_URI[archive.md5sum] = "e744b30c834360fccac41eb7269a3011"
 SRC_URI[archive.sha256sum] = "63dc1c03a107ec73871151bb765da7d5dfc1d699c0d0d6a3d244cf5ccb030913"
diff --git a/recipes/gcc/gcc-3.4.4.inc b/recipes/gcc/gcc-3.4.4.inc
index daa25fd53d..b63f59e2b0 100644
--- a/recipes/gcc/gcc-3.4.4.inc
+++ b/recipes/gcc/gcc-3.4.4.inc
@@ -3,30 +3,30 @@ require gcc-common.inc
 INC_PR = "r15"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	   file://gcc34-reverse-compare.patch;patch=1 \
-	   file://gcc34-arm-ldm.patch;patch=1 \
-	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
-	   file://gcc34-arm-tune.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
-	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
-	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
-	   file://GCC3.4.0VisibilityPatch.diff;patch=1 \
-	   file://15342.patch;patch=1 \
-	   file://jarfix.patch;patch=1 \
-	   file://always-fixincperm.patch;patch=1 \
-	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
-	   file://zecke-xgcc-cpp.patch;patch=1 \
-	   file://gcc-libgcc2-inhibit-libc.patch;patch=1 \
-	   file://gcc4-mtune-compat.patch;patch=1 \
-	   file://gcc34-configure.in.patch;patch=1 \
-	   file://gcc34-thumb-support.patch;patch=1 \
-	   file://gcc-cross-fixincl.patch;patch=1 \
-	   file://gcc-posix-open-fix.patch;patch=1 \
+	   file://gcc34-reverse-compare.patch \
+	   file://gcc34-arm-ldm.patch \
+	   file://gcc34-arm-ldm-peephole.patch \
+	   file://gcc34-arm-tune.patch \
+	   file://gcc-3.4.1-uclibc-100-conf.patch \
+	   file://gcc-3.4.1-uclibc-200-locale.patch \
+	   file://gcc-3.4.0-arm-lib1asm.patch \
+	   file://gcc-3.4.0-arm-nolibfloat.patch \
+	   file://gcc-3.4.0-arm-bigendian.patch \
+	   file://gcc-3.4.0-arm-bigendian-uclibc.patch \
+	   file://GCC3.4.0VisibilityPatch.diff \
+	   file://15342.patch \
+	   file://jarfix.patch \
+	   file://always-fixincperm.patch \
+	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch \
+	   file://zecke-xgcc-cpp.patch \
+	   file://gcc-libgcc2-inhibit-libc.patch \
+	   file://gcc4-mtune-compat.patch \
+	   file://gcc34-configure.in.patch \
+	   file://gcc34-thumb-support.patch \
+	   file://gcc-cross-fixincl.patch \
+	   file://gcc-posix-open-fix.patch \
 	   "
-SRC_URI_append = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append = " file://zecke-no-host-includes.patch "
 
 SRC_URI[archive.md5sum] = "b594ff4ea4fbef4ba9220887de713dfe"
 SRC_URI[archive.sha256sum] = "3444179840638cb8664e8e53604900c4521d29d57785a5091202ee4937d8d0fd"
diff --git a/recipes/gcc/gcc-3.4.6.inc b/recipes/gcc/gcc-3.4.6.inc
index c6d62e7c19..b6b01e3737 100644
--- a/recipes/gcc/gcc-3.4.6.inc
+++ b/recipes/gcc/gcc-3.4.6.inc
@@ -1,27 +1,27 @@
 require gcc-common.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	   file://gcc34-reverse-compare.patch;patch=1 \
-	   file://gcc34-arm-ldm.patch;patch=1 \
-	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
-	   file://gcc34-arm-tune.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
-	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
-	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
-	   file://GCC3.4.0VisibilityPatch.diff;patch=1 \
-	   file://jarfix.patch;patch=1 \
-	   file://always-fixincperm.patch;patch=1 \
-	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
-	   file://zecke-xgcc-cpp.patch;patch=1 \
-	   file://gcc-posix-open-fix.patch;patch=1 \
-	   file://gcc4-mtune-compat.patch;patch=1"
+	   file://gcc34-reverse-compare.patch \
+	   file://gcc34-arm-ldm.patch \
+	   file://gcc34-arm-ldm-peephole.patch \
+	   file://gcc34-arm-tune.patch \
+	   file://gcc-3.4.1-uclibc-100-conf.patch \
+	   file://gcc-3.4.1-uclibc-200-locale.patch \
+	   file://gcc-3.4.0-arm-lib1asm.patch \
+	   file://gcc-3.4.0-arm-nolibfloat.patch \
+	   file://gcc-3.4.0-arm-bigendian.patch \
+	   file://gcc-3.4.0-arm-bigendian-uclibc.patch \
+	   file://GCC3.4.0VisibilityPatch.diff \
+	   file://jarfix.patch \
+	   file://always-fixincperm.patch \
+	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch \
+	   file://zecke-xgcc-cpp.patch \
+	   file://gcc-posix-open-fix.patch \
+	   file://gcc4-mtune-compat.patch"
 
-SRC_URI += "file://gcc34-configure.in.patch;patch=1"
-SRC_URI += "file://gcc34-thumb-support.patch;patch=1"
-SRC_URI_append = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI += "file://gcc34-configure.in.patch"
+SRC_URI += "file://gcc34-thumb-support.patch"
+SRC_URI_append = " file://zecke-no-host-includes.patch "
 
 SRC_URI[archive.md5sum] = "4a21ac777d4b5617283ce488b808da7b"
 SRC_URI[archive.sha256sum] = "7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39"
diff --git a/recipes/gcc/gcc-4.0.0.inc b/recipes/gcc/gcc-4.0.0.inc
index 2267826c42..dd48595212 100644
--- a/recipes/gcc/gcc-4.0.0.inc
+++ b/recipes/gcc/gcc-4.0.0.inc
@@ -1,16 +1,19 @@
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://gcc-posix-open-fix.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1"
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+	file://gcc-posix-open-fix.patch \
+	file://zecke-xgcc-cpp.patch"
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 # Language Overrides
 FORTRAN = ",f95"
 
 EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp"
 
 SRC_URI[archive.md5sum] = "55ee7df1b29f719138ec063c57b89db6"
 SRC_URI[archive.sha256sum] = "38a9a01e195000976dcd04ec854c398478ada839510b1de384ffbd5f99791bdc"
diff --git a/recipes/gcc/gcc-4.0.2.inc b/recipes/gcc/gcc-4.0.2.inc
index 01b6f77e9b..16584ecc89 100644
--- a/recipes/gcc/gcc-4.0.2.inc
+++ b/recipes/gcc/gcc-4.0.2.inc
@@ -1,31 +1,34 @@
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://gcc-posix-open-fix.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 "
+	file://gcc-posix-open-fix.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch \
+	file://zecke-xgcc-cpp.patch "
 
 # uclibc patches below
-SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
-                   file://200-uclibc-locale.patch;patch=1 \
-                   file://301-missing-execinfo_h.patch;patch=1 \
-                   file://302-c99-snprintf.patch;patch=1  \
-                   file://303-c99-complex-ugly-hack.patch;patch=1 \
-                   file://800-arm-bigendian.patch;patch=1 \
-                   file://zecke-host-cpp-ac-hack.patch;patch=1 \
-		   file://gcc-4.0.2-atmel.0.99.2.patch;patch=1 \
+SRC_URI_append = " file://100-uclibc-conf.patch   \
+                   file://200-uclibc-locale.patch \
+                   file://301-missing-execinfo_h.patch \
+                   file://302-c99-snprintf.patch  \
+                   file://303-c99-complex-ugly-hack.patch \
+                   file://800-arm-bigendian.patch \
+                   file://zecke-host-cpp-ac-hack.patch \
+		   file://gcc-4.0.2-atmel.0.99.2.patch \
 		   "
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 # Language Overrides
 FORTRAN = ""
 
 EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp"
 
 SRC_URI[archive.md5sum] = "a659b8388cac9db2b13e056e574ceeb0"
 SRC_URI[archive.sha256sum] = "37b3286c2bfb68da9df983f60721f868e29897f7a426306748fee93b25c5fb61"
diff --git a/recipes/gcc/gcc-4.1.0.inc b/recipes/gcc/gcc-4.1.0.inc
index 8bfd374fbc..bfaf699963 100644
--- a/recipes/gcc/gcc-4.1.0.inc
+++ b/recipes/gcc/gcc-4.1.0.inc
@@ -8,14 +8,16 @@ DEFAULT_PREFERENCE = "-1"
 FILESPATHPKG .= ":gcc-4.1.1"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-    file://pr34130.patch;patch=1"
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://zecke-xgcc-cpp.patch \
+    file://pr34130.patch"
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp"
 
 # Language Overrides
 FORTRAN = ""
diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc
index 53d6052953..3b813b0626 100644
--- a/recipes/gcc/gcc-4.1.1.inc
+++ b/recipes/gcc/gcc-4.1.1.inc
@@ -1,50 +1,53 @@
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://110-arm-eabi.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://801-arm-bigendian-eabi.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://gcc41-configure.in.patch;patch=1 \
-	file://arm-thumb.patch;patch=1 \
-	file://arm-thumb-cache.patch;patch=1 \
-	file://cse.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
-        file://gcc-4.1.1-pr13685-1.patch;patch=1 \
-        file://gcc-ignore-cache.patch;patch=1 \
-        file://gcc-4.1.1-e300cx.patch;patch=1 \
-        file://pr34130.patch;patch=1 \
-	file://sed-fixinc-backslash.patch;patch=1 \
+	file://100-uclibc-conf.patch \
+	file://110-arm-eabi.patch \
+	file://200-uclibc-locale.patch \
+	file://300-libstdc++-pic.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://801-arm-bigendian-eabi.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://gcc41-configure.in.patch \
+	file://arm-thumb.patch \
+	file://arm-thumb-cache.patch \
+	file://cse.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://unbreak-armv4t.patch \
+        file://fix-ICE-in-arm_unwind_emit_set.diff \
+        file://gcc-4.1.1-pr13685-1.patch \
+        file://gcc-ignore-cache.patch \
+        file://gcc-4.1.1-e300cx.patch \
+        file://pr34130.patch \
+	file://sed-fixinc-backslash.patch \
 	"
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 #This is a dirty hack to get gcc 4.1.1 to compile for glibc AND uclibc on ppc
 #the patch that is need it to get gcc support soft-floats with glibc, makes gcc fail with uclibc
-SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \
-                         file://ppc-sfp-long-double-gcc411-7.patch;patch=1 "
+SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch \
+                         file://ppc-sfp-long-double-gcc411-7.patch "
 
 # Language Overrides
 FORTRAN = ""
 JAVA = ""
 
 EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp --disable-libunwind-exceptions"
 
 SRC_URI[archive.md5sum] = "ad9f97a4d04982ccf4fd67cb464879f3"
 SRC_URI[archive.sha256sum] = "985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7"
diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc
index 3cec5a6c4a..e89a8de241 100644
--- a/recipes/gcc/gcc-4.1.2.inc
+++ b/recipes/gcc/gcc-4.1.2.inc
@@ -1,49 +1,50 @@
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r22"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://110-arm-eabi.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://gcc41-configure.in.patch;patch=1 \
-	file://arm-thumb.patch;patch=1 \
-	file://arm-thumb-cache.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran.patch;patch=1 \
-        file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-        file://pr34130.patch;patch=1 \
+	file://100-uclibc-conf.patch \
+	file://110-arm-eabi.patch \
+	file://200-uclibc-locale.patch \
+	file://300-libstdc++-pic.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://gcc41-configure.in.patch \
+	file://arm-thumb.patch \
+	file://arm-thumb-cache.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://unbreak-armv4t.patch \
+        file://fix-ICE-in-arm_unwind_emit_set.diff \
+	file://cache-amnesia.patch \
+	file://gfortran.patch \
+        file://gcc-4.0.2-e300c2c3.patch \
+        file://pr34130.patch \
        "
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 SRC_URI_avr32 = "http://www.angstrom-distribution.org/unstable/sources/gcc-4.1.2-atmel.1.1.0.tar.gz;name=atmel \
-#           file://100-uclibc-conf.patch;patch=1 \
-#           file://200-uclibc-locale.patch;patch=1 \
-#           file://300-libstdc++-pic.patch;patch=1 \
-           file://301-missing-execinfo_h.patch;patch=1 \
-           file://302-c99-snprintf.patch;patch=1 \
-           file://303-c99-complex-ugly-hack.patch;patch=1 \
-           file://304-index_macro.patch;patch=1 \
-           file://602-sdk-libstdc++-includes.patch;patch=1 \
-           file://gcc41-configure.in.patch;patch=1 \
-           file://zecke-xgcc-cpp.patch;patch=1 \
-           file://cache-amnesia.patch;patch=1 \
+#           file://100-uclibc-conf.patch \
+#           file://200-uclibc-locale.patch \
+#           file://300-libstdc++-pic.patch \
+           file://301-missing-execinfo_h.patch \
+           file://302-c99-snprintf.patch \
+           file://303-c99-complex-ugly-hack.patch \
+           file://304-index_macro.patch \
+           file://602-sdk-libstdc++-includes.patch \
+           file://gcc41-configure.in.patch \
+           file://zecke-xgcc-cpp.patch \
+           file://cache-amnesia.patch \
            "
 
 do_compile_prepend_avr32() {
@@ -56,6 +57,9 @@ FORTRAN = ""
 JAVA = ""
 
 EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp"
+
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/recipes/gcc/gcc-4.2.1.inc b/recipes/gcc/gcc-4.2.1.inc
index 87d9b43354..63876f74d0 100644
--- a/recipes/gcc/gcc-4.2.1.inc
+++ b/recipes/gcc/gcc-4.2.1.inc
@@ -1,88 +1,89 @@
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://103-uclibc-conf-noupstream.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://203-uclibc-locale-no__x.patch;patch=1 \
-	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-	file://205-uclibc-locale-update.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-	file://306-libstdc++-namespace.patch;patch=1 \
-	file://307-locale_facets.patch;patch=1 \
-	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://904-flatten-switch-stmt-00.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://gcc41-configure.in.patch;patch=1 \
-	file://arm-thumb.patch;patch=1 \
-	file://arm-thumb-cache.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran.patch;patch=1 \
-	file://pr34130.patch;patch=1 \
+	file://100-uclibc-conf.patch \
+	file://103-uclibc-conf-noupstream.patch \
+	file://200-uclibc-locale.patch \
+	file://203-uclibc-locale-no__x.patch \
+	file://204-uclibc-locale-wchar_fix.patch \
+	file://205-uclibc-locale-update.patch \
+	file://300-libstdc++-pic.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://305-libmudflap-susv3-legacy.patch \
+	file://306-libstdc++-namespace.patch \
+	file://307-locale_facets.patch \
+	file://402-libbackend_dep_gcov-iov.h.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://904-flatten-switch-stmt-00.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://gcc41-configure.in.patch \
+	file://arm-thumb.patch \
+	file://arm-thumb-cache.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://unbreak-armv4t.patch \
+	file://cache-amnesia.patch \
+	file://gfortran.patch \
+	file://pr34130.patch \
 "
 
 SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.3.tar.gz;name=atmel \
-        file://gcc-pr32889.patch;patch=1 \
-        file://100-uclibc-conf.patch;patch=1 \
-        file://103-uclibc-conf-noupstream.patch;patch=1 \
-        file://200-uclibc-locale.patch;patch=1 \
-        file://203-uclibc-locale-no__x.patch;patch=1 \
-        file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-        file://205-uclibc-locale-update.patch;patch=1 \
-        file://300-libstdc++-pic.patch;patch=1 \
-        file://301-missing-execinfo_h.patch;patch=1 \
-        file://302-c99-snprintf.patch;patch=1 \
-        file://303-c99-complex-ugly-hack.patch;patch=1 \
-        file://304-index_macro.patch;patch=1 \
-        file://305-libmudflap-susv3-legacy.patch;patch=1 \
-        file://306-libstdc++-namespace.patch;patch=1 \
-        file://307-locale_facets.patch;patch=1 \
-        file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-        file://602-sdk-libstdc++-includes.patch;patch=1 \
-        file://740-sh-pr24836.patch;patch=1 \
-        file://904-flatten-switch-stmt-00.patch;patch=1 \
-        file://gcc41-configure.in.patch;patch=1 \
-        file://zecke-xgcc-cpp.patch;patch=1 \
-        file://cache-amnesia.patch;patch=1 \
-        file://gfortran.patch;patch=1 \
+        file://gcc-pr32889.patch \
+        file://100-uclibc-conf.patch \
+        file://103-uclibc-conf-noupstream.patch \
+        file://200-uclibc-locale.patch \
+        file://203-uclibc-locale-no__x.patch \
+        file://204-uclibc-locale-wchar_fix.patch \
+        file://205-uclibc-locale-update.patch \
+        file://300-libstdc++-pic.patch \
+        file://301-missing-execinfo_h.patch \
+        file://302-c99-snprintf.patch \
+        file://303-c99-complex-ugly-hack.patch \
+        file://304-index_macro.patch \
+        file://305-libmudflap-susv3-legacy.patch \
+        file://306-libstdc++-namespace.patch \
+        file://307-locale_facets.patch \
+        file://402-libbackend_dep_gcov-iov.h.patch \
+        file://602-sdk-libstdc++-includes.patch \
+        file://740-sh-pr24836.patch \
+        file://904-flatten-switch-stmt-00.patch \
+        file://gcc41-configure.in.patch \
+        file://zecke-xgcc-cpp.patch \
+        file://cache-amnesia.patch \
+        file://gfortran.patch \
 "
 
 SRC_URI_append_ep93xx = " \
-        file://arm-crunch-saveregs.patch;patch=1 \
-        file://arm-crunch-20000320.patch;patch=1 \
-        file://arm-crunch-compare.patch;patch=1 \
-        file://arm-crunch-compare-unordered.patch;patch=1 \
-        file://arm-crunch-compare-geu.patch;patch=1 \
-        file://arm-crunch-eabi-ieee754.patch;patch=1 \
-        file://arm-crunch-eabi-ieee754-div.patch;patch=1 \
-        file://arm-crunch-64bit-disable0.patch;patch=1 \
-        file://arm-crunch-offset.patch;patch=1 \
-        file://arm-crunch-fp_consts.patch;patch=1 \
-        file://arm-crunch-neg2.patch;patch=1 \
-        file://arm-crunch-predicates3.patch;patch=1 \
-        file://arm-crunch-cfcvtds-disable.patch;patch=1 \
-        file://arm-crunch-floatsi-disable.patch;patch=1 \
-        file://arm-crunch-truncsi-disable.patch;patch=1 \
-        file://arm-crunch-cfcvt64-disable.patch;patch=1 \
-        file://arm-crunch-cirrus-bugfixes.patch;patch=1 \
+        file://arm-crunch-saveregs.patch \
+        file://arm-crunch-20000320.patch \
+        file://arm-crunch-compare.patch \
+        file://arm-crunch-compare-unordered.patch \
+        file://arm-crunch-compare-geu.patch \
+        file://arm-crunch-eabi-ieee754.patch \
+        file://arm-crunch-eabi-ieee754-div.patch \
+        file://arm-crunch-64bit-disable0.patch \
+        file://arm-crunch-offset.patch \
+        file://arm-crunch-fp_consts.patch \
+        file://arm-crunch-neg2.patch \
+        file://arm-crunch-predicates3.patch \
+        file://arm-crunch-cfcvtds-disable.patch \
+        file://arm-crunch-floatsi-disable.patch \
+        file://arm-crunch-truncsi-disable.patch \
+        file://arm-crunch-cfcvt64-disable.patch \
+        file://arm-crunch-cirrus-bugfixes.patch \
        "
 
 PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}"
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 # Language Overrides
 FORTRAN = ""
@@ -90,6 +91,8 @@ FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
 EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc
index c80342cd49..2a5334a30a 100644
--- a/recipes/gcc/gcc-4.2.2.inc
+++ b/recipes/gcc/gcc-4.2.2.inc
@@ -2,77 +2,78 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r16"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://103-uclibc-conf-noupstream.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://203-uclibc-locale-no__x.patch;patch=1 \
-	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-	file://205-uclibc-locale-update.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-	file://306-libstdc++-namespace.patch;patch=1 \
-	file://307-locale_facets.patch;patch=1 \
-	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://801-arm-bigendian-eabi.patch;patch=1 \
-	file://904-flatten-switch-stmt-00.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://gcc41-configure.in.patch;patch=1 \
-	file://arm-thumb.patch;patch=1 \
-	file://arm-thumb-cache.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran.patch;patch=1 \
-	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-	file://pr34130.patch;patch=1 \
-	file://fortran-static-linking.patch;patch=1 \
-	file://intermask-bigendian.patch;patch=1 \
+	file://100-uclibc-conf.patch \
+	file://103-uclibc-conf-noupstream.patch \
+	file://200-uclibc-locale.patch \
+	file://203-uclibc-locale-no__x.patch \
+	file://204-uclibc-locale-wchar_fix.patch \
+	file://205-uclibc-locale-update.patch \
+	file://300-libstdc++-pic.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://305-libmudflap-susv3-legacy.patch \
+	file://306-libstdc++-namespace.patch \
+	file://307-locale_facets.patch \
+	file://402-libbackend_dep_gcov-iov.h.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://801-arm-bigendian-eabi.patch \
+	file://904-flatten-switch-stmt-00.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://gcc41-configure.in.patch \
+	file://arm-thumb.patch \
+	file://arm-thumb-cache.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://unbreak-armv4t.patch \
+	file://cache-amnesia.patch \
+	file://gfortran.patch \
+	file://gcc-4.0.2-e300c2c3.patch \
+	file://pr34130.patch \
+	file://fortran-static-linking.patch \
+	file://intermask-bigendian.patch \
 "
 
 
 SRC_URI_append_avr32 = " \
-        file://gcc-4.2.2.atmel.1.0.8.patch.bz2;patch=1 \
-	file://901-avr32-fix-no-cond-exec-before-reload.patch;patch=1 \
-	file://902-avr32-fix-sync-insn-instructions.patch;patch=1 \
-	file://903-avr32-fix-removal-of-redundant-cast-operations.patch;patch=1 \
+        file://gcc-4.2.2.atmel.1.0.8.patch.bz2 \
+	file://901-avr32-fix-no-cond-exec-before-reload.patch \
+	file://902-avr32-fix-sync-insn-instructions.patch \
+	file://903-avr32-fix-removal-of-redundant-cast-operations.patch \
 "
 
 
 SRC_URI_append_ep93xx = " \
-        file://arm-crunch-saveregs.patch;patch=1 \
-        file://arm-crunch-20000320.patch;patch=1 \
-        file://arm-crunch-compare.patch;patch=1 \
-        file://arm-crunch-compare-unordered.patch;patch=1 \
-        file://arm-crunch-compare-geu.patch;patch=1 \
-        file://arm-crunch-eabi-ieee754.patch;patch=1 \
-        file://arm-crunch-eabi-ieee754-div.patch;patch=1 \
-        file://arm-crunch-64bit-disable0.patch;patch=1 \
-        file://arm-crunch-offset.patch;patch=1 \
-        file://arm-crunch-fp_consts.patch;patch=1 \
-        file://arm-crunch-neg2.patch;patch=1 \
-        file://arm-crunch-predicates3.patch;patch=1 \
-        file://arm-crunch-cfcvtds-disable.patch;patch=1 \
-        file://arm-crunch-floatsi-disable.patch;patch=1 \
-        file://arm-crunch-truncsi-disable.patch;patch=1 \
-        file://arm-crunch-cfcvt64-disable.patch;patch=1 \
-        file://arm-crunch-cirrus-bugfixes.patch;patch=1 \
+        file://arm-crunch-saveregs.patch \
+        file://arm-crunch-20000320.patch \
+        file://arm-crunch-compare.patch \
+        file://arm-crunch-compare-unordered.patch \
+        file://arm-crunch-compare-geu.patch \
+        file://arm-crunch-eabi-ieee754.patch \
+        file://arm-crunch-eabi-ieee754-div.patch \
+        file://arm-crunch-64bit-disable0.patch \
+        file://arm-crunch-offset.patch \
+        file://arm-crunch-fp_consts.patch \
+        file://arm-crunch-neg2.patch \
+        file://arm-crunch-predicates3.patch \
+        file://arm-crunch-cfcvtds-disable.patch \
+        file://arm-crunch-floatsi-disable.patch \
+        file://arm-crunch-truncsi-disable.patch \
+        file://arm-crunch-cfcvt64-disable.patch \
+        file://arm-crunch-cirrus-bugfixes.patch \
        "
 
 PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}"
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 # Language Overrides
 FORTRAN = ""
@@ -80,6 +81,8 @@ FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
 EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc
index 955a894106..e947cba3b7 100644
--- a/recipes/gcc/gcc-4.2.3.inc
+++ b/recipes/gcc/gcc-4.2.3.inc
@@ -2,67 +2,68 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r17"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://103-uclibc-conf-noupstream.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://203-uclibc-locale-no__x.patch;patch=1 \
-	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-	file://205-uclibc-locale-update.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-	file://306-libstdc++-namespace.patch;patch=1 \
-	file://307-locale_facets.patch;patch=1 \
-	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://801-arm-bigendian-eabi.patch;patch=1 \
-	file://904-flatten-switch-stmt-00.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://gcc41-configure.in.patch;patch=1 \
-	file://arm-thumb.patch;patch=1 \
-	file://arm-thumb-cache.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran.patch;patch=1 \
-	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-	file://fortran-static-linking.patch;patch=1 \
-	file://intermask-bigendian.patch;patch=1 \
+	file://100-uclibc-conf.patch \
+	file://103-uclibc-conf-noupstream.patch \
+	file://200-uclibc-locale.patch \
+	file://203-uclibc-locale-no__x.patch \
+	file://204-uclibc-locale-wchar_fix.patch \
+	file://205-uclibc-locale-update.patch \
+	file://300-libstdc++-pic.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://305-libmudflap-susv3-legacy.patch \
+	file://306-libstdc++-namespace.patch \
+	file://307-locale_facets.patch \
+	file://402-libbackend_dep_gcov-iov.h.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://801-arm-bigendian-eabi.patch \
+	file://904-flatten-switch-stmt-00.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://gcc41-configure.in.patch \
+	file://arm-thumb.patch \
+	file://arm-thumb-cache.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://unbreak-armv4t.patch \
+	file://cache-amnesia.patch \
+	file://gfortran.patch \
+	file://gcc-4.0.2-e300c2c3.patch \
+	file://fortran-static-linking.patch \
+	file://intermask-bigendian.patch \
 "
 
 SRC_URI_append_ep93xx = " \
-        file://arm-crunch-saveregs.patch;patch=1 \
-        file://arm-crunch-20000320.patch;patch=1 \
-        file://arm-crunch-compare.patch;patch=1 \
-        file://arm-crunch-compare-unordered.patch;patch=1 \
-        file://arm-crunch-compare-geu.patch;patch=1 \
-        file://arm-crunch-eabi-ieee754.patch;patch=1 \
-        file://arm-crunch-eabi-ieee754-div.patch;patch=1 \
-        file://arm-crunch-64bit-disable0.patch;patch=1 \
-        file://arm-crunch-offset.patch;patch=1 \
-        file://arm-crunch-fp_consts.patch;patch=1 \
-        file://arm-crunch-neg2.patch;patch=1 \
-        file://arm-crunch-predicates3.patch;patch=1 \
-        file://arm-crunch-cfcvtds-disable.patch;patch=1 \
-        file://arm-crunch-floatsi-disable.patch;patch=1 \
-        file://arm-crunch-truncsi-disable.patch;patch=1 \
-        file://arm-crunch-cfcvt64-disable.patch;patch=1 \
-        file://arm-crunch-cirrus-bugfixes.patch;patch=1 \
+        file://arm-crunch-saveregs.patch \
+        file://arm-crunch-20000320.patch \
+        file://arm-crunch-compare.patch \
+        file://arm-crunch-compare-unordered.patch \
+        file://arm-crunch-compare-geu.patch \
+        file://arm-crunch-eabi-ieee754.patch \
+        file://arm-crunch-eabi-ieee754-div.patch \
+        file://arm-crunch-64bit-disable0.patch \
+        file://arm-crunch-offset.patch \
+        file://arm-crunch-fp_consts.patch \
+        file://arm-crunch-neg2.patch \
+        file://arm-crunch-predicates3.patch \
+        file://arm-crunch-cfcvtds-disable.patch \
+        file://arm-crunch-floatsi-disable.patch \
+        file://arm-crunch-truncsi-disable.patch \
+        file://arm-crunch-cfcvt64-disable.patch \
+        file://arm-crunch-cirrus-bugfixes.patch \
        "
 
 PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}"
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 # Language Overrides
 FORTRAN = ""
@@ -70,6 +71,8 @@ FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
 EXTRA_OECONF_BASE += " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc
index e31c0d46c8..d2a6b3eea2 100644
--- a/recipes/gcc/gcc-4.2.4.inc
+++ b/recipes/gcc/gcc-4.2.4.inc
@@ -2,79 +2,80 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r10"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://103-uclibc-conf-noupstream.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://203-uclibc-locale-no__x.patch;patch=1 \
-	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-	file://205-uclibc-locale-update.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-	file://306-libstdc++-namespace.patch;patch=1 \
-	file://307-locale_facets.patch;patch=1 \
-	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://801-arm-bigendian-eabi.patch;patch=1 \
-	file://904-flatten-switch-stmt-00.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://gcc41-configure.in.patch;patch=1 \
-	file://arm-thumb.patch;patch=1 \
-	file://arm-thumb-cache.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran.patch;patch=1 \
-	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-	file://fortran-static-linking.patch;patch=1 \
-	file://intermask-bigendian.patch;patch=1 \
+	file://100-uclibc-conf.patch \
+	file://103-uclibc-conf-noupstream.patch \
+	file://200-uclibc-locale.patch \
+	file://203-uclibc-locale-no__x.patch \
+	file://204-uclibc-locale-wchar_fix.patch \
+	file://205-uclibc-locale-update.patch \
+	file://300-libstdc++-pic.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://305-libmudflap-susv3-legacy.patch \
+	file://306-libstdc++-namespace.patch \
+	file://307-locale_facets.patch \
+	file://402-libbackend_dep_gcov-iov.h.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://801-arm-bigendian-eabi.patch \
+	file://904-flatten-switch-stmt-00.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://gcc41-configure.in.patch \
+	file://arm-thumb.patch \
+	file://arm-thumb-cache.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://unbreak-armv4t.patch \
+	file://cache-amnesia.patch \
+	file://gfortran.patch \
+	file://gcc-4.0.2-e300c2c3.patch \
+	file://fortran-static-linking.patch \
+	file://intermask-bigendian.patch \
 "
 
 SRC_URI_append_ep93xx = " \
-        file://ep93xx/arm-crunch-readme.patch;patch=1 \
-        file://ep93xx/arm-crunch-saveregs.patch;patch=1 \
-        file://ep93xx/arm-crunch-scratch.patch;patch=1 \
-        file://ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch;patch=1 \
-        file://ep93xx/arm-crunch-eabi-mvf0-scratch-ieee754.patch;patch=1 \
-        file://ep93xx/arm-crunch-20000320.patch;patch=1 \
-        file://ep93xx/arm-crunch-disable-cmpdi.patch;patch=1 \
-        file://ep93xx/arm-crunch-fix-64bit-const-offsets.patch;patch=1 \
-        file://ep93xx/arm-crunch-fp_consts.patch;patch=1 \
-        file://ep93xx/arm-crunch-neg-enable.patch;patch=1 \
-        file://ep93xx/arm-crunch-neg-protect.patch;patch=1 \
-        file://ep93xx/arm-crunch-repair-truncxfsi.patch;patch=1 \
-        file://ep93xx/arm-crunch-floatsi-no-scratch.patch;patch=1 \
-        file://ep93xx/arm-crunch-movsf-movdf-Uy.patch;patch=1 \
-        file://ep93xx/arm-crunch-drop-thumb2.patch;patch=1 \
-        file://ep93xx/arm-crunch-arm_dbx_register_number.patch;patch=1 \
-        file://ep93xx/arm-crunch-pipeline.patch;patch=1 \
-        file://ep93xx/arm-crunch-ccmav-mode.patch;patch=1 \
-        file://ep93xx/arm-crunch-cfcpy-with-cfsh64.patch;patch=1 \
-        file://ep93xx/arm-crunch-mieee.patch;patch=1 \
-        file://ep93xx/arm-size-bugfix.patch;patch=1 \
-        file://ep93xx/arm-prologue_use-length.patch;patch=1 \
-        file://ep93xx/arm-crunch-cftruncd32-attr.patch;patch=1 \
-        file://ep93xx/arm-crunch-fix-cirrus-reorg7.patch;patch=1 \
-        file://ep93xx/arm-crunch-cirrus-di-flag.patch;patch=1 \
-        file://ep93xx/arm-crunch-disable-floatsi.patch;patch=1 \
+        file://ep93xx/arm-crunch-readme.patch \
+        file://ep93xx/arm-crunch-saveregs.patch \
+        file://ep93xx/arm-crunch-scratch.patch \
+        file://ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch \
+        file://ep93xx/arm-crunch-eabi-mvf0-scratch-ieee754.patch \
+        file://ep93xx/arm-crunch-20000320.patch \
+        file://ep93xx/arm-crunch-disable-cmpdi.patch \
+        file://ep93xx/arm-crunch-fix-64bit-const-offsets.patch \
+        file://ep93xx/arm-crunch-fp_consts.patch \
+        file://ep93xx/arm-crunch-neg-enable.patch \
+        file://ep93xx/arm-crunch-neg-protect.patch \
+        file://ep93xx/arm-crunch-repair-truncxfsi.patch \
+        file://ep93xx/arm-crunch-floatsi-no-scratch.patch \
+        file://ep93xx/arm-crunch-movsf-movdf-Uy.patch \
+        file://ep93xx/arm-crunch-drop-thumb2.patch \
+        file://ep93xx/arm-crunch-arm_dbx_register_number.patch \
+        file://ep93xx/arm-crunch-pipeline.patch \
+        file://ep93xx/arm-crunch-ccmav-mode.patch \
+        file://ep93xx/arm-crunch-cfcpy-with-cfsh64.patch \
+        file://ep93xx/arm-crunch-mieee.patch \
+        file://ep93xx/arm-size-bugfix.patch \
+        file://ep93xx/arm-prologue_use-length.patch \
+        file://ep93xx/arm-crunch-cftruncd32-attr.patch \
+        file://ep93xx/arm-crunch-fix-cirrus-reorg7.patch \
+        file://ep93xx/arm-crunch-cirrus-di-flag.patch \
+        file://ep93xx/arm-crunch-disable-floatsi.patch \
        "
 
 PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}"
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
-SRC_URI_append_sh4  = " file://sh_unwind.patch;patch=1 \
-			file://cppdefault_cross.patch;patch=1 \
+SRC_URI_append_sh4  = " file://sh_unwind.patch \
+			file://cppdefault_cross.patch \
 		      "
 
 
@@ -84,6 +85,8 @@ FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
 EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --enable-libgomp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc
index 720e46fc8e..3352868986 100644
--- a/recipes/gcc/gcc-4.3.1.inc
+++ b/recipes/gcc/gcc-4.3.1.inc
@@ -6,64 +6,65 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r20"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-ppc32-retaddr.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr27898.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr32139.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr33763.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh330771.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh341221.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-cpp-pragma.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-java-debug-iface-type.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-libgomp-speedup.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-i386-libgomp.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh251682.patch;patch=1;pnum=0 \
-    file://debian/arm-unbreak-eabi-armv4t.dpatch;patch=1 \
-	file://debian/libstdc++-pic.dpatch;patch=1;pnum=0 \
-	file://debian/gcc-ice-hack.dpatch;patch=1;pnum=0 \ 
-	file://debian/pr30961.dpatch;patch=1;pnum=0 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://103-uclibc-conf-noupstream.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://203-uclibc-locale-no__x.patch;patch=1 \
-	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-	file://205-uclibc-locale-update.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-	file://306-libstdc++-namespace.patch;patch=1 \
-	file://307-locale_facets.patch;patch=1 \
-#	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://904-flatten-switch-stmt-00.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://arm-thumb.patch;patch=1 \
-	file://arm-thumb-cache.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran-4.3.x.patch;patch=1 \
-	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-#	file://pr34130.patch;patch=1 \
-#	file://fortran-static-linking.patch;patch=1 \
-	file://gcc-arm-frename-registers.patch;patch=1 \
-	file://gcc-release-branch/PR-36500-fix-neon.patch;patch=1 \
-	file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
-	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://gcc-flags-for-build.patch;patch=1 \
+	file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
+	file://fedora/gcc43-ia64-libunwind.patch;striplevel=0 \
+	file://fedora/gcc43-java-nomulti.patch;striplevel=0 \
+	file://fedora/gcc43-ppc32-retaddr.patch;striplevel=0 \
+	file://fedora/gcc43-pr27898.patch;striplevel=0 \
+	file://fedora/gcc43-pr32139.patch;striplevel=0 \
+	file://fedora/gcc43-pr33763.patch;striplevel=0 \
+	file://fedora/gcc43-rh330771.patch;striplevel=0 \
+	file://fedora/gcc43-rh341221.patch;striplevel=0 \
+	file://fedora/gcc43-cpp-pragma.patch;striplevel=0 \
+	file://fedora/gcc43-java-debug-iface-type.patch;striplevel=0 \
+	file://fedora/gcc43-libgomp-speedup.patch;striplevel=0 \
+	file://fedora/gcc43-i386-libgomp.patch;striplevel=0 \
+	file://fedora/gcc43-rh251682.patch;striplevel=0 \
+    file://debian/arm-unbreak-eabi-armv4t.dpatch;apply=yes \
+	file://debian/libstdc++-pic.dpatch;apply=yes;striplevel=0 \
+	file://debian/gcc-ice-hack.dpatch;apply=yes;striplevel=0 \ 
+	file://debian/pr30961.dpatch;apply=yes;striplevel=0 \
+	file://100-uclibc-conf.patch \
+	file://103-uclibc-conf-noupstream.patch \
+	file://200-uclibc-locale.patch \
+	file://203-uclibc-locale-no__x.patch \
+	file://204-uclibc-locale-wchar_fix.patch \
+	file://205-uclibc-locale-update.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://305-libmudflap-susv3-legacy.patch \
+	file://306-libstdc++-namespace.patch \
+	file://307-locale_facets.patch \
+#	file://402-libbackend_dep_gcov-iov.h.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://904-flatten-switch-stmt-00.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://arm-thumb.patch \
+	file://arm-thumb-cache.patch \
+	file://cache-amnesia.patch \
+	file://gfortran-4.3.x.patch \
+	file://gcc-4.0.2-e300c2c3.patch \
+#	file://pr34130.patch \
+#	file://fortran-static-linking.patch \
+	file://gcc-arm-frename-registers.patch \
+	file://gcc-release-branch/PR-36500-fix-neon.patch \
+	file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch \
+	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://gcc-flags-for-build.patch \
 "
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 # Language Overrides
 FORTRAN = ""
@@ -71,6 +72,8 @@ JAVA = ""
 FORTRAN_linux-gnueabi = ",fortran"
 
 EXTRA_OECONF_BASE = "  --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
 
 SRC_URI[archive.md5sum] = "4afa0290cc3a41ac8822666f1110de98"
 SRC_URI[archive.sha256sum] = "66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5"
diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc
index 9f7d5510cf..897d4f3964 100644
--- a/recipes/gcc/gcc-4.3.2.inc
+++ b/recipes/gcc/gcc-4.3.2.inc
@@ -6,69 +6,72 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r10"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-ppc32-retaddr.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr27898.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr32139.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr33763.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh330771.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh341221.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-cpp-pragma.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-java-debug-iface-type.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-libgomp-speedup.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-i386-libgomp.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh251682.patch;patch=1;pnum=0 \
-    file://debian/arm-unbreak-eabi-armv4t.dpatch;patch=1 \
-	file://debian/libstdc++-pic.dpatch;patch=1;pnum=0 \
-	file://debian/gcc-ice-hack.dpatch;patch=1;pnum=0 \ 
-	file://debian/pr30961.dpatch;patch=1;pnum=0 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://103-uclibc-conf-noupstream.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://203-uclibc-locale-no__x.patch;patch=1 \
-	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-	file://205-uclibc-locale-update.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-	file://306-libstdc++-namespace.patch;patch=1 \
-	file://307-locale_facets.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://904-flatten-switch-stmt-00.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran-4.3.x.patch;patch=1 \
-	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-#	file://pr34130.patch;patch=1 \
-#	file://fortran-static-linking.patch;patch=1 \
-	file://gcc-arm-frename-registers.patch;patch=1 \
-	file://gcc-4.3.2-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
-	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://gcc-flags-for-build.patch;patch=1 \
+	file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
+	file://fedora/gcc43-ia64-libunwind.patch;striplevel=0 \
+	file://fedora/gcc43-java-nomulti.patch;striplevel=0 \
+	file://fedora/gcc43-ppc32-retaddr.patch;striplevel=0 \
+	file://fedora/gcc43-pr27898.patch;striplevel=0 \
+	file://fedora/gcc43-pr32139.patch;striplevel=0 \
+	file://fedora/gcc43-pr33763.patch;striplevel=0 \
+	file://fedora/gcc43-rh330771.patch;striplevel=0 \
+	file://fedora/gcc43-rh341221.patch;striplevel=0 \
+	file://fedora/gcc43-cpp-pragma.patch;striplevel=0 \
+	file://fedora/gcc43-java-debug-iface-type.patch;striplevel=0 \
+	file://fedora/gcc43-libgomp-speedup.patch;striplevel=0 \
+	file://fedora/gcc43-i386-libgomp.patch;striplevel=0 \
+	file://fedora/gcc43-rh251682.patch;striplevel=0 \
+    file://debian/arm-unbreak-eabi-armv4t.dpatch;apply=yes \
+	file://debian/libstdc++-pic.dpatch;apply=yes;striplevel=0 \
+	file://debian/gcc-ice-hack.dpatch;apply=yes;striplevel=0 \ 
+	file://debian/pr30961.dpatch;apply=yes;striplevel=0 \
+	file://100-uclibc-conf.patch \
+	file://103-uclibc-conf-noupstream.patch \
+	file://200-uclibc-locale.patch \
+	file://203-uclibc-locale-no__x.patch \
+	file://204-uclibc-locale-wchar_fix.patch \
+	file://205-uclibc-locale-update.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://305-libmudflap-susv3-legacy.patch \
+	file://306-libstdc++-namespace.patch \
+	file://307-locale_facets.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://904-flatten-switch-stmt-00.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://cache-amnesia.patch \
+	file://gfortran-4.3.x.patch \
+	file://gcc-4.0.2-e300c2c3.patch \
+#	file://pr34130.patch \
+#	file://fortran-static-linking.patch \
+	file://gcc-arm-frename-registers.patch \
+	file://gcc-4.3.2-SYSROOT_CFLAGS_FOR_TARGET.patch \
+	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://gcc-flags-for-build.patch \
 "
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
-SRC_URI_append_sh4  = " file://sh_unwind.patch;patch=1 \
-			file://gcc-4.2.3-linux-multilib-fix.patch;patch=1 \
+SRC_URI_append_sh4  = " file://sh_unwind.patch \
+			file://gcc-4.2.3-linux-multilib-fix.patch \
 		      "
 # Language Overrides
 FORTRAN = ""
 JAVA = ""
 
 EXTRA_OECONF_BASE = "  --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
 
 SRC_URI[archive.md5sum] = "5dfac5da961ecd5f227c3175859a486d"
 SRC_URI[archive.sha256sum] = "bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165"
diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc
index 6725e19957..77cd521839 100644
--- a/recipes/gcc/gcc-4.3.3.inc
+++ b/recipes/gcc/gcc-4.3.3.inc
@@ -6,92 +6,94 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
-INC_PR = "r11"
+INC_PR = "r12"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-ppc32-retaddr.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr27898.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr32139.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr33763.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh330771.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh341221.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-cpp-pragma.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-java-debug-iface-type.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-libgomp-speedup.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-i386-libgomp.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh251682.patch;patch=1;pnum=0 \
-	file://debian/arm-unbreak-eabi-armv4t.dpatch;patch=1 \
-	file://debian/libstdc++-pic.dpatch;patch=1;pnum=0 \
-	file://debian/gcc-ice-hack.dpatch;patch=1;pnum=0 \ 
-	file://debian/pr30961.dpatch;patch=1;pnum=0 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://103-uclibc-conf-noupstream.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://203-uclibc-locale-no__x.patch;patch=1 \
-	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-	file://205-uclibc-locale-update.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-	file://306-libstdc++-namespace.patch;patch=1 \
-	file://307-locale_facets.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://904-flatten-switch-stmt-00.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran-4.3.x.patch;patch=1 \
-	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-#	file://pr34130.patch;patch=1 \
-#	file://fortran-static-linking.patch;patch=1 \
-	file://gcc-arm-frename-registers.patch;patch=1 \
-	file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
-	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://gcc-flags-for-build.patch;patch=1 \
-        file://arm-gcc-objective.patch;patch=1 \
+	file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
+	file://fedora/gcc43-ia64-libunwind.patch;striplevel=0 \
+	file://fedora/gcc43-java-nomulti.patch;striplevel=0 \
+	file://fedora/gcc43-ppc32-retaddr.patch;striplevel=0 \
+	file://fedora/gcc43-pr27898.patch;striplevel=0 \
+	file://fedora/gcc43-pr32139.patch;striplevel=0 \
+	file://fedora/gcc43-pr33763.patch;striplevel=0 \
+	file://fedora/gcc43-rh330771.patch;striplevel=0 \
+	file://fedora/gcc43-rh341221.patch;striplevel=0 \
+	file://fedora/gcc43-cpp-pragma.patch;striplevel=0 \
+	file://fedora/gcc43-java-debug-iface-type.patch;striplevel=0 \
+	file://fedora/gcc43-libgomp-speedup.patch;striplevel=0 \
+	file://fedora/gcc43-i386-libgomp.patch;striplevel=0 \
+	file://fedora/gcc43-rh251682.patch;striplevel=0 \
+	file://debian/arm-unbreak-eabi-armv4t.dpatch;apply=yes \
+	file://debian/libstdc++-pic.dpatch;apply=yes;striplevel=0 \
+	file://debian/gcc-ice-hack.dpatch;apply=yes;striplevel=0 \ 
+	file://debian/pr30961.dpatch;apply=yes;striplevel=0 \
+	file://100-uclibc-conf.patch \
+	file://103-uclibc-conf-noupstream.patch \
+	file://200-uclibc-locale.patch \
+	file://203-uclibc-locale-no__x.patch \
+	file://204-uclibc-locale-wchar_fix.patch \
+	file://205-uclibc-locale-update.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://305-libmudflap-susv3-legacy.patch \
+	file://306-libstdc++-namespace.patch \
+	file://307-locale_facets.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://904-flatten-switch-stmt-00.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://cache-amnesia.patch \
+	file://gfortran-4.3.x.patch \
+	file://gcc-4.0.2-e300c2c3.patch \
+#	file://pr34130.patch \
+#	file://fortran-static-linking.patch \
+	file://gcc-arm-frename-registers.patch \
+	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://gcc-flags-for-build.patch \
+	file://gcc-pr36218.patch \
+	file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
+        file://arm-gcc-objective.patch \
 "
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
-SRC_URI_append_sh4  = " file://sh_unwind.patch;patch=1 \
-			file://gcc-4.2.3-linux-multilib-fix.patch;patch=1 \
+SRC_URI_append_sh4  = " file://sh_unwind.patch \
+			file://gcc-4.2.3-linux-multilib-fix.patch \
 		      "
 SRC_URI_append_ep93xx = " \
-	file://ep93xx/arm-crunch-readme.patch;patch=1 \
-	file://ep93xx/arm-crunch-saveregs.patch;patch=1 \
-	file://ep93xx/arm-crunch-scratch.patch;patch=1 \
-	file://ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch;patch=1 \
-	file://ep93xx/arm-crunch-eabi-mvf0-scratch-ieee754.patch;patch=1 \
-	file://ep93xx/arm-crunch-20000320.patch;patch=1 \
-	file://ep93xx/arm-crunch-disable-cmpdi.patch;patch=1 \
-	file://ep93xx/arm-crunch-fix-64bit-const-offsets.patch;patch=1 \
-	file://ep93xx/arm-crunch-fp_consts.patch;patch=1 \
-	file://ep93xx/arm-crunch-neg-enable.patch;patch=1 \
-	file://ep93xx/arm-crunch-neg-protect.patch;patch=1 \
-	file://ep93xx/arm-crunch-repair-truncxfsi.patch;patch=1 \
-	file://ep93xx/arm-crunch-floatsi-no-scratch.patch;patch=1 \
-	file://ep93xx/arm-crunch-movsf-movdf-Uy.patch;patch=1 \
-	file://ep93xx/arm-crunch-drop-thumb2.patch;patch=1 \
-	file://ep93xx/arm-crunch-arm_dbx_register_number.patch;patch=1 \
-	file://ep93xx/arm-crunch-pipeline.patch;patch=1 \
-	file://ep93xx/arm-crunch-ccmav-mode.patch;patch=1 \
-	file://ep93xx/arm-crunch-cfcpy-with-cfsh64.patch;patch=1 \
-	file://ep93xx/arm-crunch-mieee.patch;patch=1 \
-	file://ep93xx/arm-size-bugfix.patch;patch=1 \
-	file://ep93xx/arm-prologue_use-length.patch;patch=1 \
-	file://ep93xx/arm-crunch-cftruncd32-attr.patch;patch=1 \
-	file://ep93xx/arm-crunch-fix-cirrus-reorg7.patch;patch=1 \
-	file://ep93xx/arm-crunch-cirrus-di-flag.patch;patch=1 \
-	file://ep93xx/arm-crunch-disable-floatsi.patch;patch=1 \
+	file://ep93xx/arm-crunch-readme.patch \
+	file://ep93xx/arm-crunch-saveregs.patch \
+	file://ep93xx/arm-crunch-scratch.patch \
+	file://ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch \
+	file://ep93xx/arm-crunch-eabi-mvf0-scratch-ieee754.patch \
+	file://ep93xx/arm-crunch-20000320.patch \
+	file://ep93xx/arm-crunch-disable-cmpdi.patch \
+	file://ep93xx/arm-crunch-fix-64bit-const-offsets.patch \
+	file://ep93xx/arm-crunch-fp_consts.patch \
+	file://ep93xx/arm-crunch-neg-enable.patch \
+	file://ep93xx/arm-crunch-neg-protect.patch \
+	file://ep93xx/arm-crunch-repair-truncxfsi.patch \
+	file://ep93xx/arm-crunch-floatsi-no-scratch.patch \
+	file://ep93xx/arm-crunch-movsf-movdf-Uy.patch \
+	file://ep93xx/arm-crunch-drop-thumb2.patch \
+	file://ep93xx/arm-crunch-arm_dbx_register_number.patch \
+	file://ep93xx/arm-crunch-pipeline.patch \
+	file://ep93xx/arm-crunch-ccmav-mode.patch \
+	file://ep93xx/arm-crunch-cfcpy-with-cfsh64.patch \
+	file://ep93xx/arm-crunch-mieee.patch \
+	file://ep93xx/arm-size-bugfix.patch \
+	file://ep93xx/arm-prologue_use-length.patch \
+	file://ep93xx/arm-crunch-cftruncd32-attr.patch \
+	file://ep93xx/arm-crunch-fix-cirrus-reorg7.patch \
+	file://ep93xx/arm-crunch-cirrus-di-flag.patch \
+	file://ep93xx/arm-crunch-disable-floatsi.patch \
 "
 # Language Overrides
 FORTRAN = ""
@@ -99,6 +101,8 @@ FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
 EXTRA_OECONF_BASE = "  --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
 
 SRC_URI[archive.md5sum] = "cc3c5565fdb9ab87a05ddb106ba0bd1f"
 SRC_URI[archive.sha256sum] = "309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de"
diff --git a/recipes/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/recipes/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index 1d3936bc39..951e6838b4 100644
--- a/recipes/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/recipes/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -71,9 +71,9 @@ gcc:
 
 Index: gcc-4.3.3/configure.ac
 ===================================================================
---- gcc-4.3.3.orig/configure.ac	2008-02-01 20:29:30.000000000 -0700
-+++ gcc-4.3.3/configure.ac	2009-04-29 18:03:50.025603468 -0700
-@@ -1667,6 +1667,38 @@
+--- gcc-4.3.3.orig/configure.ac	2010-05-16 23:25:38.000000000 -0700
++++ gcc-4.3.3/configure.ac	2010-05-16 23:26:54.363020511 -0700
+@@ -1667,6 +1667,38 @@ AC_ARG_WITH([debug-prefix-map],
    [DEBUG_PREFIX_CFLAGS_FOR_TARGET=])
  AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
  
@@ -114,17 +114,9 @@ Index: gcc-4.3.3/configure.ac
  if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
 Index: gcc-4.3.3/Makefile.def
 ===================================================================
---- gcc-4.3.3.orig/Makefile.def	2007-10-23 08:53:18.000000000 -0700
-+++ gcc-4.3.3/Makefile.def	2009-04-29 18:03:50.029603058 -0700
-@@ -214,6 +214,7 @@
- flags_to_pass = { flag= INSTALL_DATA ; };
- flags_to_pass = { flag= INSTALL_PROGRAM ; };
- flags_to_pass = { flag= INSTALL_SCRIPT ; };
-+flags_to_pass = { flag= LDFLAGS_FOR_BUILD ; };
- flags_to_pass = { flag= LEX ; };
- flags_to_pass = { flag= M4 ; };
- flags_to_pass = { flag= MAKE ; };
-@@ -511,43 +512,51 @@
+--- gcc-4.3.3.orig/Makefile.def	2010-05-16 23:25:38.000000000 -0700
++++ gcc-4.3.3/Makefile.def	2010-05-16 23:26:54.363020511 -0700
+@@ -513,43 +513,51 @@ bootstrap_stage = {
  	//   compiler probably has never heard of them.
  	stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \
  	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
@@ -186,9 +178,9 @@ Index: gcc-4.3.3/Makefile.def
 +	stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; };
 Index: gcc-4.3.3/Makefile.tpl
 ===================================================================
---- gcc-4.3.3.orig/Makefile.tpl	2008-08-16 00:28:01.000000000 -0700
-+++ gcc-4.3.3/Makefile.tpl	2009-04-29 18:04:16.836611837 -0700
-@@ -23,6 +23,14 @@
+--- gcc-4.3.3.orig/Makefile.tpl	2010-05-16 23:25:38.000000000 -0700
++++ gcc-4.3.3/Makefile.tpl	2010-05-16 23:56:35.720617708 -0700
+@@ -23,6 +23,14 @@ in
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  #
  
@@ -203,21 +195,7 @@ Index: gcc-4.3.3/Makefile.tpl
  # -------------------------------
  # Standard Autoconf-set variables
  # -------------------------------
-@@ -139,6 +147,13 @@
- 	WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
- 	WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
- 
-+# These variables must be set on the make command line for directories
-+# built for the build system to override those in BASE_FLAGS_TO_PASSS.
-+EXTRA_BUILD_FLAGS = \
-+	CFLAGS="$(CFLAGS_FOR_BUILD)" \
-+	LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
-+	LIBCFLAGS=""
-+
- # This is the list of directories to built for the host system.
- SUBDIRS = @configdirs@
- # This is set by the configure script to the arguments to use when configuring
-@@ -153,6 +168,7 @@
+@@ -159,6 +167,7 @@ HOST_SUBDIR = @host_subdir@
  HOST_EXPORTS = \
  	$(BASE_EXPORTS) \
  	CC="$(CC)"; export CC; \
@@ -225,10 +203,10 @@ Index: gcc-4.3.3/Makefile.tpl
  	CFLAGS="$(CFLAGS)"; export CFLAGS; \
  	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
  	CXX="$(CXX)"; export CXX; \
-@@ -207,10 +223,10 @@
- 	AR="$(AR_FOR_TARGET)"; export AR; \
+@@ -214,10 +223,10 @@ BASE_TARGET_EXPORTS = \
  	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
  	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CPP="$(CC_FOR_TARGET) -E"; export CPP; \
 -	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
 +	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
  	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
@@ -238,7 +216,7 @@ Index: gcc-4.3.3/Makefile.tpl
  	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
  	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
  	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-@@ -323,7 +339,6 @@
+@@ -331,7 +340,6 @@ LDFLAGS = @LDFLAGS@
  LIBCFLAGS = $(CFLAGS)
  CXXFLAGS = @CXXFLAGS@
  LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
@@ -246,7 +224,7 @@ Index: gcc-4.3.3/Makefile.tpl
  
  # Only build the C compiler for stage1, because that is the only one that
  # we can guarantee will build with the native compiler, and also it is the
-@@ -331,14 +346,19 @@
+@@ -339,14 +347,19 @@ PICFLAG = 
  # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
  # overrideable (for a bootstrap build stage1 also builds gcc.info).
  
@@ -267,7 +245,7 @@ Index: gcc-4.3.3/Makefile.tpl
  do-compare = @do_compare@
  do-compare3 = $(do-compare)
  do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
-@@ -377,22 +397,14 @@
+@@ -385,22 +398,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_
  COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
  COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
  
@@ -290,11 +268,11 @@ Index: gcc-4.3.3/Makefile.tpl
  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 -LDFLAGS_FOR_TARGET = 
 -PICFLAG_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@
++LDFLAGS_FOR_TARGET =
  
  # ------------------------------------
  # Miscellaneous targets and flag lists
-@@ -492,19 +504,20 @@
+@@ -500,19 +505,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \
  # Flags to pass down to makes which are built with the target environment.
  # The double $ decreases the length of the command line; those variables
  # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
@@ -320,7 +298,7 @@ Index: gcc-4.3.3/Makefile.tpl
  	'NM=$(COMPILER_NM_FOR_TARGET)' \
  	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
  	'RANLIB=$$(RANLIB_FOR_TARGET)' \
-@@ -852,9 +865,11 @@
+@@ -860,9 +866,11 @@ configure-stage[+id+]-[+prefix+][+module
  	fi; \
  	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
  	[+exports+][+ IF prev +] \
@@ -334,7 +312,7 @@ Index: gcc-4.3.3/Makefile.tpl
  	echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
  	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
  	cd [+subdir+]/[+module+] || exit 1; \
-@@ -891,7 +906,8 @@
+@@ -899,7 +907,8 @@ all-[+prefix+][+module+]: configure-[+pr
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	[+exports+] \
  	(cd [+subdir+]/[+module+] && \
@@ -344,7 +322,7 @@ Index: gcc-4.3.3/Makefile.tpl
  @endif [+prefix+][+module+]
  
  [+ IF bootstrap +]
-@@ -911,8 +927,11 @@
+@@ -919,8 +928,11 @@ all-stage[+id+]-[+prefix+][+module+]: co
  	[+exports+][+ IF prev +] \
  	[+poststage1_exports+][+ ENDIF prev +] \
  	cd [+subdir+]/[+module+] && \
@@ -358,17 +336,7 @@ Index: gcc-4.3.3/Makefile.tpl
  		IF prev +][+poststage1_args+][+ ENDIF prev
  		+] [+extra_make_flags+] \
  		$(TARGET-stage[+id+]-[+prefix+][+module+])
-@@ -945,7 +964,8 @@
- 	     target_alias=(get "target" "${target_alias}")
- 	     args="$(BUILD_CONFIGARGS)" no-config-site=true +]
- 
--[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +]
-+[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)"
-+	     args="$(EXTRA_BUILD_FLAGS)" +]
- [+ ENDFOR build_module +]
- 
- # --------------------------------------
-@@ -962,7 +982,7 @@
+@@ -971,7 +983,7 @@ clean-stage[+id+]-[+prefix+][+module+]:
  [+ all prefix="" subdir="$(HOST_SUBDIR)"
         exports="$(HOST_EXPORTS)"
         poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
@@ -377,7 +345,7 @@ Index: gcc-4.3.3/Makefile.tpl
         poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +]
  
  .PHONY: check-[+module+] maybe-check-[+module+]
-@@ -1060,7 +1080,7 @@
+@@ -1069,7 +1081,7 @@ maybe-[+make_target+]-[+module+]: [+make
  
  [+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
         exports="$(RAW_CXX_TARGET_EXPORTS)"
@@ -386,7 +354,7 @@ Index: gcc-4.3.3/Makefile.tpl
  [+ ELSE +]
  [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
  	     check_multilibs=true
-@@ -1071,7 +1091,7 @@
+@@ -1080,7 +1092,7 @@ maybe-[+make_target+]-[+module+]: [+make
  
  [+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
         exports="$(NORMAL_TARGET_EXPORTS)"
@@ -395,7 +363,7 @@ Index: gcc-4.3.3/Makefile.tpl
  [+ ENDIF +]
  
  .PHONY: check-target-[+module+] maybe-check-target-[+module+]
-@@ -1301,7 +1321,7 @@
+@@ -1310,7 +1322,7 @@ stage[+id+]-end:: [+ FOR host_modules +]
  
  # Bubble a bug fix through all the stages up to stage [+id+].  They are
  # remade, but not reconfigured.  The next stage (if any) will not be
@@ -404,7 +372,7 @@ Index: gcc-4.3.3/Makefile.tpl
  .PHONY: stage[+id+]-bubble
  stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
  	@r=`${PWD_COMMAND}`; export r; \
-@@ -1440,11 +1460,11 @@
+@@ -1449,11 +1461,11 @@ stage_current:
  	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
  
  .PHONY: restrap
@@ -418,7 +386,7 @@ Index: gcc-4.3.3/Makefile.tpl
  @endif gcc-bootstrap
  
  # --------------------------------------
-@@ -1475,7 +1495,7 @@
+@@ -1484,7 +1496,7 @@ configure-target-[+module+]: maybe-all-g
  
  [+ ;; These Scheme functions build the bulk of the dependencies.
     ;; dep-target builds a string like "maybe-all-MODULE_KIND-gcc",
@@ -427,7 +395,7 @@ Index: gcc-4.3.3/Makefile.tpl
     ;; is taken from VAR-NAME.
     (define dep-target (lambda (module-kind var-name hard)
        (string-append
-@@ -1633,7 +1653,8 @@
+@@ -1642,7 +1654,8 @@ config.status: configure
  
  # Rebuilding configure.
  AUTOCONF = autoconf
@@ -440,7 +408,7 @@ Index: gcc-4.3.3/Makefile.tpl
 Index: gcc-4.3.3/config/mh-ppc-darwin
 ===================================================================
 --- gcc-4.3.3.orig/config/mh-ppc-darwin	2007-05-23 07:26:31.000000000 -0700
-+++ gcc-4.3.3/config/mh-ppc-darwin	2009-04-29 18:03:50.057603252 -0700
++++ gcc-4.3.3/config/mh-ppc-darwin	2010-05-16 23:26:54.363020511 -0700
 @@ -2,5 +2,4 @@
  # position-independent-code -- the usual default on Darwin. This fix speeds
  # compiles by 3-5%.
@@ -450,9 +418,9 @@ Index: gcc-4.3.3/config/mh-ppc-darwin
 +BOOT_CFLAGS=-g -O2 -mdynamic-no-pic
 Index: gcc-4.3.3/gcc/doc/install.texi
 ===================================================================
---- gcc-4.3.3.orig/gcc/doc/install.texi	2009-01-06 17:52:26.000000000 -0700
-+++ gcc-4.3.3/gcc/doc/install.texi	2009-04-29 18:03:50.065603803 -0700
-@@ -1778,33 +1778,35 @@
+--- gcc-4.3.3.orig/gcc/doc/install.texi	2009-01-06 16:52:26.000000000 -0800
++++ gcc-4.3.3/gcc/doc/install.texi	2010-05-16 23:26:54.363020511 -0700
+@@ -1778,33 +1778,35 @@ same described above, but object files f
  stage2 of the 3-stage bootstrap of the compiler are deleted as
  soon as they are no longer needed.
  
@@ -513,7 +481,7 @@ Index: gcc-4.3.3/gcc/doc/install.texi
  
  If you used the flag @option{--enable-languages=@dots{}} to restrict
  the compilers to be built, only those you've actually enabled will be
-@@ -2687,8 +2689,8 @@
+@@ -2687,8 +2689,8 @@ new version of DEC Unix, you should rebu
  stamp.
  
  @samp{make compare} may fail on old versions of DEC Unix unless you add
@@ -526,8 +494,8 @@ Index: gcc-4.3.3/gcc/doc/install.texi
  fixed name to be used for the assembler input file, instead of a
 Index: gcc-4.3.3/Makefile.in
 ===================================================================
---- gcc-4.3.3.orig/Makefile.in	2008-08-16 00:28:01.000000000 -0700
-+++ gcc-4.3.3/Makefile.in	2009-04-29 18:04:32.133111439 -0700
+--- gcc-4.3.3.orig/Makefile.in	2010-05-16 23:25:38.000000000 -0700
++++ gcc-4.3.3/Makefile.in	2010-05-16 23:56:50.000000000 -0700
 @@ -20,6 +20,14 @@
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  #
@@ -543,21 +511,7 @@ Index: gcc-4.3.3/Makefile.in
  # -------------------------------
  # Standard Autoconf-set variables
  # -------------------------------
-@@ -136,6 +144,13 @@
- 	WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
- 	WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
- 
-+# These variables must be set on the make command line for directories
-+# built for the build system to override those in BASE_FLAGS_TO_PASSS.
-+EXTRA_BUILD_FLAGS = \
-+	CFLAGS="$(CFLAGS_FOR_BUILD)" \
-+	LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
-+	LIBCFLAGS=""
-+
- # This is the list of directories to built for the host system.
- SUBDIRS = @configdirs@
- # This is set by the configure script to the arguments to use when configuring
-@@ -150,6 +165,7 @@
+@@ -156,6 +164,7 @@ HOST_SUBDIR = @host_subdir@
  HOST_EXPORTS = \
  	$(BASE_EXPORTS) \
  	CC="$(CC)"; export CC; \
@@ -565,10 +519,10 @@ Index: gcc-4.3.3/Makefile.in
  	CFLAGS="$(CFLAGS)"; export CFLAGS; \
  	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
  	CXX="$(CXX)"; export CXX; \
-@@ -204,10 +220,10 @@
- 	AR="$(AR_FOR_TARGET)"; export AR; \
+@@ -211,10 +220,10 @@ BASE_TARGET_EXPORTS = \
  	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
  	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CPP="$(CC_FOR_TARGET) -E"; export CPP; \
 -	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
 +	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
  	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
@@ -578,7 +532,7 @@ Index: gcc-4.3.3/Makefile.in
  	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
  	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
  	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-@@ -320,7 +336,6 @@
+@@ -328,7 +337,6 @@ LDFLAGS = @LDFLAGS@
  LIBCFLAGS = $(CFLAGS)
  CXXFLAGS = @CXXFLAGS@
  LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
@@ -586,7 +540,7 @@ Index: gcc-4.3.3/Makefile.in
  
  # Only build the C compiler for stage1, because that is the only one that
  # we can guarantee will build with the native compiler, and also it is the
-@@ -328,14 +343,19 @@
+@@ -336,14 +344,19 @@ PICFLAG = 
  # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
  # overrideable (for a bootstrap build stage1 also builds gcc.info).
  
@@ -607,7 +561,7 @@ Index: gcc-4.3.3/Makefile.in
  do-compare = @do_compare@
  do-compare3 = $(do-compare)
  do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
-@@ -374,22 +394,14 @@
+@@ -382,22 +395,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_
  COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
  COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
  
@@ -630,19 +584,11 @@ Index: gcc-4.3.3/Makefile.in
  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 -LDFLAGS_FOR_TARGET = 
 -PICFLAG_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@
++LDFLAGS_FOR_TARGET =
  
  # ------------------------------------
  # Miscellaneous targets and flag lists
-@@ -496,6 +508,7 @@
- 	"INSTALL_DATA=$(INSTALL_DATA)" \
- 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
- 	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-+	"LDFLAGS_FOR_BUILD=$(LDFLAGS_FOR_BUILD)" \
- 	"LEX=$(LEX)" \
- 	"M4=$(M4)" \
- 	"MAKE=$(MAKE)" \
-@@ -592,19 +605,20 @@
+@@ -602,19 +607,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \
  # Flags to pass down to makes which are built with the target environment.
  # The double $ decreases the length of the command line; those variables
  # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
@@ -668,77 +614,77 @@ Index: gcc-4.3.3/Makefile.in
  	'NM=$(COMPILER_NM_FOR_TARGET)' \
  	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
  	'RANLIB=$$(RANLIB_FOR_TARGET)' \
-@@ -2738,7 +2752,8 @@
+@@ -2748,7 +2754,8 @@ all-build-libiberty: configure-build-lib
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(BUILD_EXPORTS) \
  	(cd $(BUILD_SUBDIR)/libiberty && \
--	  $(MAKE)   $(TARGET-build-libiberty))
+-	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-libiberty))
 +	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
 +		$(TARGET-build-libiberty))
  @endif build-libiberty
  
  
-@@ -2793,7 +2808,8 @@
+@@ -2803,7 +2810,8 @@ all-build-bison: configure-build-bison
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(BUILD_EXPORTS) \
  	(cd $(BUILD_SUBDIR)/bison && \
--	  $(MAKE)   $(TARGET-build-bison))
+-	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-bison))
 +	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
 +		$(TARGET-build-bison))
  @endif build-bison
  
  
-@@ -2848,7 +2864,8 @@
+@@ -2858,7 +2866,8 @@ all-build-byacc: configure-build-byacc
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(BUILD_EXPORTS) \
  	(cd $(BUILD_SUBDIR)/byacc && \
--	  $(MAKE)   $(TARGET-build-byacc))
+-	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-byacc))
 +	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
 +		$(TARGET-build-byacc))
  @endif build-byacc
  
  
-@@ -2903,7 +2920,8 @@
+@@ -2913,7 +2922,8 @@ all-build-flex: configure-build-flex
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(BUILD_EXPORTS) \
  	(cd $(BUILD_SUBDIR)/flex && \
--	  $(MAKE)   $(TARGET-build-flex))
+-	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-flex))
 +	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
 +		$(TARGET-build-flex))
  @endif build-flex
  
  
-@@ -2958,7 +2976,8 @@
+@@ -2968,7 +2978,8 @@ all-build-m4: configure-build-m4
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(BUILD_EXPORTS) \
  	(cd $(BUILD_SUBDIR)/m4 && \
--	  $(MAKE)   $(TARGET-build-m4))
+-	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-m4))
 +	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
 +		$(TARGET-build-m4))
  @endif build-m4
  
  
-@@ -3013,7 +3032,8 @@
+@@ -3023,7 +3034,8 @@ all-build-texinfo: configure-build-texin
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(BUILD_EXPORTS) \
  	(cd $(BUILD_SUBDIR)/texinfo && \
--	  $(MAKE)   $(TARGET-build-texinfo))
+-	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-texinfo))
 +	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
 +		$(TARGET-build-texinfo))
  @endif build-texinfo
  
  
-@@ -3068,7 +3088,8 @@
+@@ -3078,7 +3090,8 @@ all-build-fixincludes: configure-build-f
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(BUILD_EXPORTS) \
  	(cd $(BUILD_SUBDIR)/fixincludes && \
--	  $(MAKE)   $(TARGET-build-fixincludes))
+-	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-fixincludes))
 +	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
 +		$(TARGET-build-fixincludes))
  @endif build-fixincludes
  
  
-@@ -3127,7 +3148,8 @@
+@@ -3137,7 +3150,8 @@ all-ash: configure-ash
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/ash && \
@@ -748,7 +694,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif ash
  
  
-@@ -3551,7 +3573,8 @@
+@@ -3561,7 +3575,8 @@ all-autoconf: configure-autoconf
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/autoconf && \
@@ -758,7 +704,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif autoconf
  
  
-@@ -3975,7 +3998,8 @@
+@@ -3985,7 +4000,8 @@ all-automake: configure-automake
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/automake && \
@@ -768,7 +714,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif automake
  
  
-@@ -4399,7 +4423,8 @@
+@@ -4409,7 +4425,8 @@ all-bash: configure-bash
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/bash && \
@@ -778,7 +724,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif bash
  
  
-@@ -4816,9 +4841,9 @@
+@@ -4826,9 +4843,9 @@ configure-stage1-bfd:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
@@ -790,7 +736,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
  	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4847,9 +4872,9 @@
+@@ -4857,9 +4874,9 @@ configure-stage2-bfd:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -802,7 +748,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
  	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4878,9 +4903,9 @@
+@@ -4888,9 +4905,9 @@ configure-stageb2g0-bfd:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -814,7 +760,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
  	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4909,9 +4934,9 @@
+@@ -4919,9 +4936,9 @@ configure-stage3-bfd:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -826,7 +772,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
  	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4940,9 +4965,9 @@
+@@ -4950,9 +4967,9 @@ configure-stageb3g2-bfd:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -838,7 +784,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
  	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4971,9 +4996,9 @@
+@@ -4981,9 +4998,9 @@ configure-stage4-bfd:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -850,7 +796,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
  	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -5002,9 +5027,9 @@
+@@ -5012,9 +5029,9 @@ configure-stageprofile-bfd:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -862,7 +808,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
  	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -5033,9 +5058,9 @@
+@@ -5043,9 +5060,9 @@ configure-stagefeedback-bfd:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -874,7 +820,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
  	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -5070,7 +5095,8 @@
+@@ -5080,7 +5097,8 @@ all-bfd: configure-bfd
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/bfd && \
@@ -884,7 +830,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif bfd
  
  
-@@ -5089,8 +5115,11 @@
+@@ -5099,8 +5117,11 @@ all-stage1-bfd: configure-stage1-bfd
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -898,7 +844,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-bfd)
  
  maybe-clean-stage1-bfd: clean-stage1-bfd
-@@ -5103,7 +5132,7 @@
+@@ -5113,7 +5134,7 @@ clean-stage1-bfd:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -907,7 +853,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif bfd-bootstrap
  
-@@ -5123,8 +5152,11 @@
+@@ -5133,8 +5154,11 @@ all-stage2-bfd: configure-stage2-bfd
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -921,7 +867,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-bfd)
  
  maybe-clean-stage2-bfd: clean-stage2-bfd
-@@ -5137,7 +5169,7 @@
+@@ -5147,7 +5171,7 @@ clean-stage2-bfd:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -930,7 +876,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif bfd-bootstrap
-@@ -5158,8 +5190,11 @@
+@@ -5168,8 +5192,11 @@ all-stageb2g0-bfd: configure-stageb2g0-b
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -944,7 +890,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-bfd)
  
  maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd
-@@ -5172,7 +5207,7 @@
+@@ -5182,7 +5209,7 @@ clean-stageb2g0-bfd:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -953,7 +899,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif bfd-bootstrap
-@@ -5193,8 +5228,11 @@
+@@ -5203,8 +5230,11 @@ all-stage3-bfd: configure-stage3-bfd
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -967,7 +913,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-bfd)
  
  maybe-clean-stage3-bfd: clean-stage3-bfd
-@@ -5207,7 +5245,7 @@
+@@ -5217,7 +5247,7 @@ clean-stage3-bfd:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -976,7 +922,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif bfd-bootstrap
-@@ -5228,8 +5266,11 @@
+@@ -5238,8 +5268,11 @@ all-stageb3g2-bfd: configure-stageb3g2-b
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -990,7 +936,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-bfd)
  
  maybe-clean-stageb3g2-bfd: clean-stageb3g2-bfd
-@@ -5242,7 +5283,7 @@
+@@ -5252,7 +5285,7 @@ clean-stageb3g2-bfd:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -999,7 +945,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif bfd-bootstrap
-@@ -5263,8 +5304,11 @@
+@@ -5273,8 +5306,11 @@ all-stage4-bfd: configure-stage4-bfd
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -1013,7 +959,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-bfd)
  
  maybe-clean-stage4-bfd: clean-stage4-bfd
-@@ -5277,7 +5321,7 @@
+@@ -5287,7 +5323,7 @@ clean-stage4-bfd:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -1022,7 +968,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif bfd-bootstrap
-@@ -5298,8 +5342,11 @@
+@@ -5308,8 +5344,11 @@ all-stageprofile-bfd: configure-stagepro
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -1036,7 +982,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-bfd)
  
  maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
-@@ -5312,7 +5359,7 @@
+@@ -5322,7 +5361,7 @@ clean-stageprofile-bfd:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -1045,7 +991,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif bfd-bootstrap
-@@ -5333,8 +5380,11 @@
+@@ -5343,8 +5382,11 @@ all-stagefeedback-bfd: configure-stagefe
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -1059,7 +1005,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-bfd)
  
  maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
-@@ -5347,7 +5397,7 @@
+@@ -5357,7 +5399,7 @@ clean-stagefeedback-bfd:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/bfd && \
@@ -1068,7 +1014,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif bfd-bootstrap
-@@ -5754,9 +5804,9 @@
+@@ -5764,9 +5806,9 @@ configure-stage1-opcodes:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
@@ -1080,7 +1026,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
  	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5785,9 +5835,9 @@
+@@ -5795,9 +5837,9 @@ configure-stage2-opcodes:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1092,7 +1038,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
  	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5816,9 +5866,9 @@
+@@ -5826,9 +5868,9 @@ configure-stageb2g0-opcodes:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1104,7 +1050,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/opcodes ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
  	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5847,9 +5897,9 @@
+@@ -5857,9 +5899,9 @@ configure-stage3-opcodes:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1116,7 +1062,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
  	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5878,9 +5928,9 @@
+@@ -5888,9 +5930,9 @@ configure-stageb3g2-opcodes:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1128,7 +1074,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/opcodes ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
  	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5909,9 +5959,9 @@
+@@ -5919,9 +5961,9 @@ configure-stage4-opcodes:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1140,7 +1086,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
  	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5940,9 +5990,9 @@
+@@ -5950,9 +5992,9 @@ configure-stageprofile-opcodes:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1152,7 +1098,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
  	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5971,9 +6021,9 @@
+@@ -5981,9 +6023,9 @@ configure-stagefeedback-opcodes:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1164,7 +1110,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
  	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -6008,7 +6058,8 @@
+@@ -6018,7 +6060,8 @@ all-opcodes: configure-opcodes
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/opcodes && \
@@ -1174,7 +1120,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif opcodes
  
  
-@@ -6027,8 +6078,11 @@
+@@ -6037,8 +6080,11 @@ all-stage1-opcodes: configure-stage1-opc
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1188,7 +1134,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-opcodes)
  
  maybe-clean-stage1-opcodes: clean-stage1-opcodes
-@@ -6041,7 +6095,7 @@
+@@ -6051,7 +6097,7 @@ clean-stage1-opcodes:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1197,7 +1143,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif opcodes-bootstrap
  
-@@ -6061,8 +6115,11 @@
+@@ -6071,8 +6117,11 @@ all-stage2-opcodes: configure-stage2-opc
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1211,7 +1157,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-opcodes)
  
  maybe-clean-stage2-opcodes: clean-stage2-opcodes
-@@ -6075,7 +6132,7 @@
+@@ -6085,7 +6134,7 @@ clean-stage2-opcodes:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1220,7 +1166,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif opcodes-bootstrap
-@@ -6096,8 +6153,11 @@
+@@ -6106,8 +6155,11 @@ all-stageb2g0-opcodes: configure-stageb2
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1234,7 +1180,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-opcodes)
  
  maybe-clean-stageb2g0-opcodes: clean-stageb2g0-opcodes
-@@ -6110,7 +6170,7 @@
+@@ -6120,7 +6172,7 @@ clean-stageb2g0-opcodes:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1243,7 +1189,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif opcodes-bootstrap
-@@ -6131,8 +6191,11 @@
+@@ -6141,8 +6193,11 @@ all-stage3-opcodes: configure-stage3-opc
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1257,7 +1203,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-opcodes)
  
  maybe-clean-stage3-opcodes: clean-stage3-opcodes
-@@ -6145,7 +6208,7 @@
+@@ -6155,7 +6210,7 @@ clean-stage3-opcodes:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1266,7 +1212,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif opcodes-bootstrap
-@@ -6166,8 +6229,11 @@
+@@ -6176,8 +6231,11 @@ all-stageb3g2-opcodes: configure-stageb3
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1280,7 +1226,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-opcodes)
  
  maybe-clean-stageb3g2-opcodes: clean-stageb3g2-opcodes
-@@ -6180,7 +6246,7 @@
+@@ -6190,7 +6248,7 @@ clean-stageb3g2-opcodes:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1289,7 +1235,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif opcodes-bootstrap
-@@ -6201,8 +6267,11 @@
+@@ -6211,8 +6269,11 @@ all-stage4-opcodes: configure-stage4-opc
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1303,7 +1249,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-opcodes)
  
  maybe-clean-stage4-opcodes: clean-stage4-opcodes
-@@ -6215,7 +6284,7 @@
+@@ -6225,7 +6286,7 @@ clean-stage4-opcodes:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1312,7 +1258,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif opcodes-bootstrap
-@@ -6236,8 +6305,11 @@
+@@ -6246,8 +6307,11 @@ all-stageprofile-opcodes: configure-stag
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1326,7 +1272,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-opcodes)
  
  maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
-@@ -6250,7 +6322,7 @@
+@@ -6260,7 +6324,7 @@ clean-stageprofile-opcodes:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1335,7 +1281,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif opcodes-bootstrap
-@@ -6271,8 +6343,11 @@
+@@ -6281,8 +6345,11 @@ all-stagefeedback-opcodes: configure-sta
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1349,7 +1295,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-opcodes)
  
  maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
-@@ -6285,7 +6360,7 @@
+@@ -6295,7 +6362,7 @@ clean-stagefeedback-opcodes:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/opcodes && \
@@ -1358,7 +1304,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif opcodes-bootstrap
-@@ -6692,9 +6767,9 @@
+@@ -6702,9 +6769,9 @@ configure-stage1-binutils:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
@@ -1370,7 +1316,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
  	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6723,9 +6798,9 @@
+@@ -6733,9 +6800,9 @@ configure-stage2-binutils:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1382,7 +1328,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
  	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6754,9 +6829,9 @@
+@@ -6764,9 +6831,9 @@ configure-stageb2g0-binutils:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1394,7 +1340,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/binutils ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
  	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6785,9 +6860,9 @@
+@@ -6795,9 +6862,9 @@ configure-stage3-binutils:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1406,7 +1352,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
  	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6816,9 +6891,9 @@
+@@ -6826,9 +6893,9 @@ configure-stageb3g2-binutils:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1418,7 +1364,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/binutils ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
  	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6847,9 +6922,9 @@
+@@ -6857,9 +6924,9 @@ configure-stage4-binutils:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1430,7 +1376,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
  	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6878,9 +6953,9 @@
+@@ -6888,9 +6955,9 @@ configure-stageprofile-binutils:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1442,7 +1388,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
  	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6909,9 +6984,9 @@
+@@ -6919,9 +6986,9 @@ configure-stagefeedback-binutils:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1454,7 +1400,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
  	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6946,7 +7021,8 @@
+@@ -6956,7 +7023,8 @@ all-binutils: configure-binutils
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/binutils && \
@@ -1464,7 +1410,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif binutils
  
  
-@@ -6965,8 +7041,11 @@
+@@ -6975,8 +7043,11 @@ all-stage1-binutils: configure-stage1-bi
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1478,7 +1424,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-binutils)
  
  maybe-clean-stage1-binutils: clean-stage1-binutils
-@@ -6979,7 +7058,7 @@
+@@ -6989,7 +7060,7 @@ clean-stage1-binutils:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1487,7 +1433,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif binutils-bootstrap
  
-@@ -6999,8 +7078,11 @@
+@@ -7009,8 +7080,11 @@ all-stage2-binutils: configure-stage2-bi
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1501,7 +1447,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-binutils)
  
  maybe-clean-stage2-binutils: clean-stage2-binutils
-@@ -7013,7 +7095,7 @@
+@@ -7023,7 +7097,7 @@ clean-stage2-binutils:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1510,7 +1456,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif binutils-bootstrap
-@@ -7034,8 +7116,11 @@
+@@ -7044,8 +7118,11 @@ all-stageb2g0-binutils: configure-stageb
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1524,7 +1470,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-binutils)
  
  maybe-clean-stageb2g0-binutils: clean-stageb2g0-binutils
-@@ -7048,7 +7133,7 @@
+@@ -7058,7 +7135,7 @@ clean-stageb2g0-binutils:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1533,7 +1479,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif binutils-bootstrap
-@@ -7069,8 +7154,11 @@
+@@ -7079,8 +7156,11 @@ all-stage3-binutils: configure-stage3-bi
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1547,7 +1493,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-binutils)
  
  maybe-clean-stage3-binutils: clean-stage3-binutils
-@@ -7083,7 +7171,7 @@
+@@ -7093,7 +7173,7 @@ clean-stage3-binutils:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1556,7 +1502,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif binutils-bootstrap
-@@ -7104,8 +7192,11 @@
+@@ -7114,8 +7194,11 @@ all-stageb3g2-binutils: configure-stageb
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1570,7 +1516,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-binutils)
  
  maybe-clean-stageb3g2-binutils: clean-stageb3g2-binutils
-@@ -7118,7 +7209,7 @@
+@@ -7128,7 +7211,7 @@ clean-stageb3g2-binutils:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1579,7 +1525,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif binutils-bootstrap
-@@ -7139,8 +7230,11 @@
+@@ -7149,8 +7232,11 @@ all-stage4-binutils: configure-stage4-bi
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1593,7 +1539,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-binutils)
  
  maybe-clean-stage4-binutils: clean-stage4-binutils
-@@ -7153,7 +7247,7 @@
+@@ -7163,7 +7249,7 @@ clean-stage4-binutils:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1602,7 +1548,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif binutils-bootstrap
-@@ -7174,8 +7268,11 @@
+@@ -7184,8 +7270,11 @@ all-stageprofile-binutils: configure-sta
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1616,7 +1562,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-binutils)
  
  maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
-@@ -7188,7 +7285,7 @@
+@@ -7198,7 +7287,7 @@ clean-stageprofile-binutils:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1625,7 +1571,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif binutils-bootstrap
-@@ -7209,8 +7306,11 @@
+@@ -7219,8 +7308,11 @@ all-stagefeedback-binutils: configure-st
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1639,7 +1585,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-binutils)
  
  maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
-@@ -7223,7 +7323,7 @@
+@@ -7233,7 +7325,7 @@ clean-stagefeedback-binutils:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/binutils && \
@@ -1648,7 +1594,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif binutils-bootstrap
-@@ -7637,7 +7737,8 @@
+@@ -7647,7 +7739,8 @@ all-bison: configure-bison
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/bison && \
@@ -1658,7 +1604,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif bison
  
  
-@@ -8064,7 +8165,8 @@
+@@ -8074,7 +8167,8 @@ all-byacc: configure-byacc
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/byacc && \
@@ -1668,7 +1614,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif byacc
  
  
-@@ -8491,7 +8593,8 @@
+@@ -8501,7 +8595,8 @@ all-bzip2: configure-bzip2
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/bzip2 && \
@@ -1678,7 +1624,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif bzip2
  
  
-@@ -8915,7 +9018,8 @@
+@@ -8925,7 +9020,8 @@ all-dejagnu: configure-dejagnu
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/dejagnu && \
@@ -1688,7 +1634,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif dejagnu
  
  
-@@ -9339,7 +9443,8 @@
+@@ -9349,7 +9445,8 @@ all-diff: configure-diff
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/diff && \
@@ -1698,7 +1644,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif diff
  
  
-@@ -9763,7 +9868,8 @@
+@@ -9773,7 +9870,8 @@ all-dosutils: configure-dosutils
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/dosutils && \
@@ -1708,7 +1654,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif dosutils
  
  
-@@ -10181,7 +10287,8 @@
+@@ -10191,7 +10289,8 @@ all-etc: configure-etc
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/etc && \
@@ -1718,7 +1664,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif etc
  
  
-@@ -10605,7 +10712,8 @@
+@@ -10615,7 +10714,8 @@ all-fastjar: configure-fastjar
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/fastjar && \
@@ -1728,7 +1674,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif fastjar
  
  
-@@ -11032,7 +11140,8 @@
+@@ -11042,7 +11142,8 @@ all-fileutils: configure-fileutils
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/fileutils && \
@@ -1738,7 +1684,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif fileutils
  
  
-@@ -11456,7 +11565,8 @@
+@@ -11466,7 +11567,8 @@ all-findutils: configure-findutils
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/findutils && \
@@ -1748,7 +1694,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif findutils
  
  
-@@ -11880,7 +11990,8 @@
+@@ -11890,7 +11992,8 @@ all-find: configure-find
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/find && \
@@ -1758,7 +1704,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif find
  
  
-@@ -12304,7 +12415,8 @@
+@@ -12314,7 +12417,8 @@ all-fixincludes: configure-fixincludes
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/fixincludes && \
@@ -1768,7 +1714,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif fixincludes
  
  
-@@ -12712,7 +12824,8 @@
+@@ -12722,7 +12826,8 @@ all-flex: configure-flex
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/flex && \
@@ -1778,7 +1724,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif flex
  
  
-@@ -13132,9 +13245,9 @@
+@@ -13142,9 +13247,9 @@ configure-stage1-gas:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
@@ -1790,7 +1736,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
  	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13163,9 +13276,9 @@
+@@ -13173,9 +13278,9 @@ configure-stage2-gas:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1802,7 +1748,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
  	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13194,9 +13307,9 @@
+@@ -13204,9 +13309,9 @@ configure-stageb2g0-gas:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1814,7 +1760,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/gas ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
  	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13225,9 +13338,9 @@
+@@ -13235,9 +13340,9 @@ configure-stage3-gas:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1826,7 +1772,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
  	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13256,9 +13369,9 @@
+@@ -13266,9 +13371,9 @@ configure-stageb3g2-gas:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1838,7 +1784,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/gas ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
  	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13287,9 +13400,9 @@
+@@ -13297,9 +13402,9 @@ configure-stage4-gas:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1850,7 +1796,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
  	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13318,9 +13431,9 @@
+@@ -13328,9 +13433,9 @@ configure-stageprofile-gas:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1862,7 +1808,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
  	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13349,9 +13462,9 @@
+@@ -13359,9 +13464,9 @@ configure-stagefeedback-gas:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -1874,7 +1820,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
  	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13386,7 +13499,8 @@
+@@ -13396,7 +13501,8 @@ all-gas: configure-gas
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/gas && \
@@ -1884,7 +1830,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif gas
  
  
-@@ -13405,8 +13519,11 @@
+@@ -13415,8 +13521,11 @@ all-stage1-gas: configure-stage1-gas
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gas && \
@@ -1898,7 +1844,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-gas)
  
  maybe-clean-stage1-gas: clean-stage1-gas
-@@ -13419,7 +13536,7 @@
+@@ -13429,7 +13538,7 @@ clean-stage1-gas:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gas && \
@@ -1907,7 +1853,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif gas-bootstrap
  
-@@ -13439,8 +13556,11 @@
+@@ -13449,8 +13558,11 @@ all-stage2-gas: configure-stage2-gas
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gas && \
@@ -1921,7 +1867,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-gas)
  
  maybe-clean-stage2-gas: clean-stage2-gas
-@@ -13453,7 +13573,7 @@
+@@ -13463,7 +13575,7 @@ clean-stage2-gas:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gas && \
@@ -1930,7 +1876,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gas-bootstrap
-@@ -13474,8 +13594,11 @@
+@@ -13484,8 +13596,11 @@ all-stageb2g0-gas: configure-stageb2g0-g
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gas && \
@@ -1944,7 +1890,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-gas)
  
  maybe-clean-stageb2g0-gas: clean-stageb2g0-gas
-@@ -13488,7 +13611,7 @@
+@@ -13498,7 +13613,7 @@ clean-stageb2g0-gas:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gas && \
@@ -1953,7 +1899,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gas-bootstrap
-@@ -13509,8 +13632,11 @@
+@@ -13519,8 +13634,11 @@ all-stage3-gas: configure-stage3-gas
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gas && \
@@ -1967,7 +1913,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-gas)
  
  maybe-clean-stage3-gas: clean-stage3-gas
-@@ -13523,7 +13649,7 @@
+@@ -13533,7 +13651,7 @@ clean-stage3-gas:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gas && \
@@ -1976,7 +1922,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gas-bootstrap
-@@ -13544,8 +13670,11 @@
+@@ -13554,8 +13672,11 @@ all-stageb3g2-gas: configure-stageb3g2-g
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gas && \
@@ -1990,7 +1936,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-gas)
  
  maybe-clean-stageb3g2-gas: clean-stageb3g2-gas
-@@ -13558,7 +13687,7 @@
+@@ -13568,7 +13689,7 @@ clean-stageb3g2-gas:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gas && \
@@ -1999,7 +1945,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gas-bootstrap
-@@ -13579,8 +13708,11 @@
+@@ -13589,8 +13710,11 @@ all-stage4-gas: configure-stage4-gas
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gas && \
@@ -2013,7 +1959,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-gas)
  
  maybe-clean-stage4-gas: clean-stage4-gas
-@@ -13593,7 +13725,7 @@
+@@ -13603,7 +13727,7 @@ clean-stage4-gas:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gas && \
@@ -2022,7 +1968,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gas-bootstrap
-@@ -13614,8 +13746,11 @@
+@@ -13624,8 +13748,11 @@ all-stageprofile-gas: configure-stagepro
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gas && \
@@ -2036,7 +1982,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-gas)
  
  maybe-clean-stageprofile-gas: clean-stageprofile-gas
-@@ -13628,7 +13763,7 @@
+@@ -13638,7 +13765,7 @@ clean-stageprofile-gas:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gas && \
@@ -2045,7 +1991,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gas-bootstrap
-@@ -13649,8 +13784,11 @@
+@@ -13659,8 +13786,11 @@ all-stagefeedback-gas: configure-stagefe
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gas && \
@@ -2059,7 +2005,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-gas)
  
  maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
-@@ -13663,7 +13801,7 @@
+@@ -13673,7 +13803,7 @@ clean-stagefeedback-gas:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gas && \
@@ -2068,7 +2014,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gas-bootstrap
-@@ -14070,9 +14208,9 @@
+@@ -14080,9 +14210,9 @@ configure-stage1-gcc:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
@@ -2080,7 +2026,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
  	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14101,9 +14239,9 @@
+@@ -14111,9 +14241,9 @@ configure-stage2-gcc:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2092,7 +2038,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
  	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14132,9 +14270,9 @@
+@@ -14142,9 +14272,9 @@ configure-stageb2g0-gcc:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2104,7 +2050,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/gcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
  	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14163,9 +14301,9 @@
+@@ -14173,9 +14303,9 @@ configure-stage3-gcc:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2116,7 +2062,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
  	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14194,9 +14332,9 @@
+@@ -14204,9 +14334,9 @@ configure-stageb3g2-gcc:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2128,7 +2074,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/gcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
  	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14225,9 +14363,9 @@
+@@ -14235,9 +14365,9 @@ configure-stage4-gcc:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2140,7 +2086,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
  	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14256,9 +14394,9 @@
+@@ -14266,9 +14396,9 @@ configure-stageprofile-gcc:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2152,7 +2098,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
  	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14287,9 +14425,9 @@
+@@ -14297,9 +14427,9 @@ configure-stagefeedback-gcc:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2164,7 +2110,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
  	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14324,7 +14462,8 @@
+@@ -14334,7 +14464,8 @@ all-gcc: configure-gcc
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/gcc && \
@@ -2174,7 +2120,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif gcc
  
  
-@@ -14343,8 +14482,11 @@
+@@ -14353,8 +14484,11 @@ all-stage1-gcc: configure-stage1-gcc
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2188,7 +2134,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-gcc)
  
  maybe-clean-stage1-gcc: clean-stage1-gcc
-@@ -14357,7 +14499,7 @@
+@@ -14367,7 +14501,7 @@ clean-stage1-gcc:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2197,7 +2143,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
  
-@@ -14377,8 +14519,11 @@
+@@ -14387,8 +14521,11 @@ all-stage2-gcc: configure-stage2-gcc
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2211,7 +2157,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-gcc)
  
  maybe-clean-stage2-gcc: clean-stage2-gcc
-@@ -14391,7 +14536,7 @@
+@@ -14401,7 +14538,7 @@ clean-stage2-gcc:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2220,7 +2166,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		$(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
-@@ -14412,8 +14557,11 @@
+@@ -14422,8 +14559,11 @@ all-stageb2g0-gcc: configure-stageb2g0-g
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2234,7 +2180,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-gcc)
  
  maybe-clean-stageb2g0-gcc: clean-stageb2g0-gcc
-@@ -14426,7 +14574,7 @@
+@@ -14436,7 +14576,7 @@ clean-stageb2g0-gcc:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2243,7 +2189,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		$(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
-@@ -14447,8 +14595,11 @@
+@@ -14457,8 +14597,11 @@ all-stage3-gcc: configure-stage3-gcc
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2257,7 +2203,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-gcc)
  
  maybe-clean-stage3-gcc: clean-stage3-gcc
-@@ -14461,7 +14612,7 @@
+@@ -14471,7 +14614,7 @@ clean-stage3-gcc:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2266,7 +2212,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		$(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
-@@ -14482,8 +14633,11 @@
+@@ -14492,8 +14635,11 @@ all-stageb3g2-gcc: configure-stageb3g2-g
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2280,7 +2226,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-gcc)
  
  maybe-clean-stageb3g2-gcc: clean-stageb3g2-gcc
-@@ -14496,7 +14650,7 @@
+@@ -14506,7 +14652,7 @@ clean-stageb3g2-gcc:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2289,7 +2235,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		$(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
-@@ -14517,8 +14671,11 @@
+@@ -14527,8 +14673,11 @@ all-stage4-gcc: configure-stage4-gcc
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2303,7 +2249,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-gcc)
  
  maybe-clean-stage4-gcc: clean-stage4-gcc
-@@ -14531,7 +14688,7 @@
+@@ -14541,7 +14690,7 @@ clean-stage4-gcc:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2312,7 +2258,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		$(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
-@@ -14552,8 +14709,11 @@
+@@ -14562,8 +14711,11 @@ all-stageprofile-gcc: configure-stagepro
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2326,7 +2272,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-gcc)
  
  maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
-@@ -14566,7 +14726,7 @@
+@@ -14576,7 +14728,7 @@ clean-stageprofile-gcc:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2335,7 +2281,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		$(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
-@@ -14587,8 +14747,11 @@
+@@ -14597,8 +14749,11 @@ all-stagefeedback-gcc: configure-stagefe
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2349,7 +2295,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-gcc)
  
  maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
-@@ -14601,7 +14764,7 @@
+@@ -14611,7 +14766,7 @@ clean-stagefeedback-gcc:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gcc && \
@@ -2358,7 +2304,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		$(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
-@@ -15015,7 +15178,8 @@
+@@ -15025,7 +15180,8 @@ all-gawk: configure-gawk
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/gawk && \
@@ -2368,7 +2314,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif gawk
  
  
-@@ -15439,7 +15603,8 @@
+@@ -15449,7 +15605,8 @@ all-gettext: configure-gettext
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/gettext && \
@@ -2378,7 +2324,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif gettext
  
  
-@@ -15856,9 +16021,9 @@
+@@ -15866,9 +16023,9 @@ configure-stage1-gmp:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
@@ -2390,7 +2336,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
  	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15887,9 +16052,9 @@
+@@ -15897,9 +16054,9 @@ configure-stage2-gmp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2402,7 +2348,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
  	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15918,9 +16083,9 @@
+@@ -15928,9 +16085,9 @@ configure-stageb2g0-gmp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2414,7 +2360,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/gmp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
  	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15949,9 +16114,9 @@
+@@ -15959,9 +16116,9 @@ configure-stage3-gmp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2426,7 +2372,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
  	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15980,9 +16145,9 @@
+@@ -15990,9 +16147,9 @@ configure-stageb3g2-gmp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2438,7 +2384,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/gmp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
  	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16011,9 +16176,9 @@
+@@ -16021,9 +16178,9 @@ configure-stage4-gmp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2450,7 +2396,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
  	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16042,9 +16207,9 @@
+@@ -16052,9 +16209,9 @@ configure-stageprofile-gmp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2462,7 +2408,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
  	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16073,9 +16238,9 @@
+@@ -16083,9 +16240,9 @@ configure-stagefeedback-gmp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2474,7 +2420,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
  	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16110,7 +16275,8 @@
+@@ -16120,7 +16277,8 @@ all-gmp: configure-gmp
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/gmp && \
@@ -2484,7 +2430,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif gmp
  
  
-@@ -16129,8 +16295,11 @@
+@@ -16139,8 +16297,11 @@ all-stage1-gmp: configure-stage1-gmp
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2498,7 +2444,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-gmp)
  
  maybe-clean-stage1-gmp: clean-stage1-gmp
-@@ -16143,7 +16312,7 @@
+@@ -16153,7 +16314,7 @@ clean-stage1-gmp:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2507,7 +2453,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif gmp-bootstrap
  
-@@ -16163,8 +16332,11 @@
+@@ -16173,8 +16334,11 @@ all-stage2-gmp: configure-stage2-gmp
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2521,7 +2467,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-gmp)
  
  maybe-clean-stage2-gmp: clean-stage2-gmp
-@@ -16177,7 +16349,7 @@
+@@ -16187,7 +16351,7 @@ clean-stage2-gmp:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2530,7 +2476,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gmp-bootstrap
-@@ -16198,8 +16370,11 @@
+@@ -16208,8 +16372,11 @@ all-stageb2g0-gmp: configure-stageb2g0-g
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2544,7 +2490,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-gmp)
  
  maybe-clean-stageb2g0-gmp: clean-stageb2g0-gmp
-@@ -16212,7 +16387,7 @@
+@@ -16222,7 +16389,7 @@ clean-stageb2g0-gmp:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2553,7 +2499,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gmp-bootstrap
-@@ -16233,8 +16408,11 @@
+@@ -16243,8 +16410,11 @@ all-stage3-gmp: configure-stage3-gmp
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2567,7 +2513,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-gmp)
  
  maybe-clean-stage3-gmp: clean-stage3-gmp
-@@ -16247,7 +16425,7 @@
+@@ -16257,7 +16427,7 @@ clean-stage3-gmp:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2576,7 +2522,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gmp-bootstrap
-@@ -16268,8 +16446,11 @@
+@@ -16278,8 +16448,11 @@ all-stageb3g2-gmp: configure-stageb3g2-g
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2590,7 +2536,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-gmp)
  
  maybe-clean-stageb3g2-gmp: clean-stageb3g2-gmp
-@@ -16282,7 +16463,7 @@
+@@ -16292,7 +16465,7 @@ clean-stageb3g2-gmp:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2599,7 +2545,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gmp-bootstrap
-@@ -16303,8 +16484,11 @@
+@@ -16313,8 +16486,11 @@ all-stage4-gmp: configure-stage4-gmp
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2613,7 +2559,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-gmp)
  
  maybe-clean-stage4-gmp: clean-stage4-gmp
-@@ -16317,7 +16501,7 @@
+@@ -16327,7 +16503,7 @@ clean-stage4-gmp:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2622,7 +2568,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gmp-bootstrap
-@@ -16338,8 +16522,11 @@
+@@ -16348,8 +16524,11 @@ all-stageprofile-gmp: configure-stagepro
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2636,7 +2582,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-gmp)
  
  maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
-@@ -16352,7 +16539,7 @@
+@@ -16362,7 +16541,7 @@ clean-stageprofile-gmp:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2645,7 +2591,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gmp-bootstrap
-@@ -16373,8 +16560,11 @@
+@@ -16383,8 +16562,11 @@ all-stagefeedback-gmp: configure-stagefe
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2659,7 +2605,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-gmp)
  
  maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
-@@ -16387,7 +16577,7 @@
+@@ -16397,7 +16579,7 @@ clean-stagefeedback-gmp:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/gmp && \
@@ -2668,7 +2614,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif gmp-bootstrap
-@@ -16788,9 +16978,9 @@
+@@ -16798,9 +16980,9 @@ configure-stage1-mpfr:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
@@ -2680,7 +2626,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
  	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16819,9 +17009,9 @@
+@@ -16829,9 +17011,9 @@ configure-stage2-mpfr:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2692,7 +2638,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
  	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16850,9 +17040,9 @@
+@@ -16860,9 +17042,9 @@ configure-stageb2g0-mpfr:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2704,7 +2650,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/mpfr ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
  	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16881,9 +17071,9 @@
+@@ -16891,9 +17073,9 @@ configure-stage3-mpfr:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2716,7 +2662,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
  	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16912,9 +17102,9 @@
+@@ -16922,9 +17104,9 @@ configure-stageb3g2-mpfr:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2728,7 +2674,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/mpfr ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
  	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16943,9 +17133,9 @@
+@@ -16953,9 +17135,9 @@ configure-stage4-mpfr:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2740,7 +2686,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
  	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16974,9 +17164,9 @@
+@@ -16984,9 +17166,9 @@ configure-stageprofile-mpfr:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2752,7 +2698,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
  	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -17005,9 +17195,9 @@
+@@ -17015,9 +17197,9 @@ configure-stagefeedback-mpfr:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -2764,7 +2710,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
  	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -17042,7 +17232,8 @@
+@@ -17052,7 +17234,8 @@ all-mpfr: configure-mpfr
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/mpfr && \
@@ -2774,7 +2720,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif mpfr
  
  
-@@ -17061,8 +17252,11 @@
+@@ -17071,8 +17254,11 @@ all-stage1-mpfr: configure-stage1-mpfr
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2788,7 +2734,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-mpfr)
  
  maybe-clean-stage1-mpfr: clean-stage1-mpfr
-@@ -17075,7 +17269,7 @@
+@@ -17085,7 +17271,7 @@ clean-stage1-mpfr:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2797,7 +2743,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif mpfr-bootstrap
  
-@@ -17095,8 +17289,11 @@
+@@ -17105,8 +17291,11 @@ all-stage2-mpfr: configure-stage2-mpfr
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2811,7 +2757,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-mpfr)
  
  maybe-clean-stage2-mpfr: clean-stage2-mpfr
-@@ -17109,7 +17306,7 @@
+@@ -17119,7 +17308,7 @@ clean-stage2-mpfr:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2820,7 +2766,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif mpfr-bootstrap
-@@ -17130,8 +17327,11 @@
+@@ -17140,8 +17329,11 @@ all-stageb2g0-mpfr: configure-stageb2g0-
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2834,7 +2780,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-mpfr)
  
  maybe-clean-stageb2g0-mpfr: clean-stageb2g0-mpfr
-@@ -17144,7 +17344,7 @@
+@@ -17154,7 +17346,7 @@ clean-stageb2g0-mpfr:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2843,7 +2789,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif mpfr-bootstrap
-@@ -17165,8 +17365,11 @@
+@@ -17175,8 +17367,11 @@ all-stage3-mpfr: configure-stage3-mpfr
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2857,7 +2803,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-mpfr)
  
  maybe-clean-stage3-mpfr: clean-stage3-mpfr
-@@ -17179,7 +17382,7 @@
+@@ -17189,7 +17384,7 @@ clean-stage3-mpfr:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2866,7 +2812,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif mpfr-bootstrap
-@@ -17200,8 +17403,11 @@
+@@ -17210,8 +17405,11 @@ all-stageb3g2-mpfr: configure-stageb3g2-
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2880,7 +2826,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-mpfr)
  
  maybe-clean-stageb3g2-mpfr: clean-stageb3g2-mpfr
-@@ -17214,7 +17420,7 @@
+@@ -17224,7 +17422,7 @@ clean-stageb3g2-mpfr:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2889,7 +2835,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif mpfr-bootstrap
-@@ -17235,8 +17441,11 @@
+@@ -17245,8 +17443,11 @@ all-stage4-mpfr: configure-stage4-mpfr
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2903,7 +2849,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-mpfr)
  
  maybe-clean-stage4-mpfr: clean-stage4-mpfr
-@@ -17249,7 +17458,7 @@
+@@ -17259,7 +17460,7 @@ clean-stage4-mpfr:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2912,7 +2858,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif mpfr-bootstrap
-@@ -17270,8 +17479,11 @@
+@@ -17280,8 +17481,11 @@ all-stageprofile-mpfr: configure-stagepr
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2926,7 +2872,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-mpfr)
  
  maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
-@@ -17284,7 +17496,7 @@
+@@ -17294,7 +17498,7 @@ clean-stageprofile-mpfr:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2935,7 +2881,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif mpfr-bootstrap
-@@ -17305,8 +17517,11 @@
+@@ -17315,8 +17519,11 @@ all-stagefeedback-mpfr: configure-stagef
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2949,7 +2895,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-mpfr)
  
  maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
-@@ -17319,7 +17534,7 @@
+@@ -17329,7 +17536,7 @@ clean-stagefeedback-mpfr:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/mpfr && \
@@ -2958,7 +2904,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif mpfr-bootstrap
-@@ -17727,7 +17942,8 @@
+@@ -17737,7 +17944,8 @@ all-gnuserv: configure-gnuserv
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/gnuserv && \
@@ -2968,7 +2914,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif gnuserv
  
  
-@@ -18151,7 +18367,8 @@
+@@ -18161,7 +18369,8 @@ all-gprof: configure-gprof
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/gprof && \
@@ -2978,7 +2924,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif gprof
  
  
-@@ -18575,7 +18792,8 @@
+@@ -18585,7 +18794,8 @@ all-gzip: configure-gzip
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/gzip && \
@@ -2988,7 +2934,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif gzip
  
  
-@@ -18999,7 +19217,8 @@
+@@ -19009,7 +19219,8 @@ all-hello: configure-hello
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/hello && \
@@ -2998,7 +2944,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif hello
  
  
-@@ -19423,7 +19642,8 @@
+@@ -19433,7 +19644,8 @@ all-indent: configure-indent
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/indent && \
@@ -3008,7 +2954,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif indent
  
  
-@@ -19840,9 +20060,9 @@
+@@ -19850,9 +20062,9 @@ configure-stage1-intl:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
@@ -3020,7 +2966,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
  	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19871,9 +20091,9 @@
+@@ -19881,9 +20093,9 @@ configure-stage2-intl:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3032,7 +2978,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
  	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19902,9 +20122,9 @@
+@@ -19912,9 +20124,9 @@ configure-stageb2g0-intl:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3044,7 +2990,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/intl ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
  	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19933,9 +20153,9 @@
+@@ -19943,9 +20155,9 @@ configure-stage3-intl:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3056,7 +3002,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
  	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19964,9 +20184,9 @@
+@@ -19974,9 +20186,9 @@ configure-stageb3g2-intl:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3068,7 +3014,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/intl ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
  	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19995,9 +20215,9 @@
+@@ -20005,9 +20217,9 @@ configure-stage4-intl:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3080,7 +3026,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
  	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20026,9 +20246,9 @@
+@@ -20036,9 +20248,9 @@ configure-stageprofile-intl:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3092,7 +3038,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
  	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20057,9 +20277,9 @@
+@@ -20067,9 +20279,9 @@ configure-stagefeedback-intl:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3104,7 +3050,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
  	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20094,7 +20314,8 @@
+@@ -20104,7 +20316,8 @@ all-intl: configure-intl
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/intl && \
@@ -3114,7 +3060,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif intl
  
  
-@@ -20113,8 +20334,11 @@
+@@ -20123,8 +20336,11 @@ all-stage1-intl: configure-stage1-intl
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3128,7 +3074,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-intl)
  
  maybe-clean-stage1-intl: clean-stage1-intl
-@@ -20127,7 +20351,7 @@
+@@ -20137,7 +20353,7 @@ clean-stage1-intl:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3137,7 +3083,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif intl-bootstrap
  
-@@ -20147,8 +20371,11 @@
+@@ -20157,8 +20373,11 @@ all-stage2-intl: configure-stage2-intl
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3151,7 +3097,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-intl)
  
  maybe-clean-stage2-intl: clean-stage2-intl
-@@ -20161,7 +20388,7 @@
+@@ -20171,7 +20390,7 @@ clean-stage2-intl:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3160,7 +3106,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif intl-bootstrap
-@@ -20182,8 +20409,11 @@
+@@ -20192,8 +20411,11 @@ all-stageb2g0-intl: configure-stageb2g0-
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3174,7 +3120,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-intl)
  
  maybe-clean-stageb2g0-intl: clean-stageb2g0-intl
-@@ -20196,7 +20426,7 @@
+@@ -20206,7 +20428,7 @@ clean-stageb2g0-intl:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3183,7 +3129,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif intl-bootstrap
-@@ -20217,8 +20447,11 @@
+@@ -20227,8 +20449,11 @@ all-stage3-intl: configure-stage3-intl
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3197,7 +3143,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-intl)
  
  maybe-clean-stage3-intl: clean-stage3-intl
-@@ -20231,7 +20464,7 @@
+@@ -20241,7 +20466,7 @@ clean-stage3-intl:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3206,7 +3152,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif intl-bootstrap
-@@ -20252,8 +20485,11 @@
+@@ -20262,8 +20487,11 @@ all-stageb3g2-intl: configure-stageb3g2-
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3220,7 +3166,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-intl)
  
  maybe-clean-stageb3g2-intl: clean-stageb3g2-intl
-@@ -20266,7 +20502,7 @@
+@@ -20276,7 +20504,7 @@ clean-stageb3g2-intl:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3229,7 +3175,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif intl-bootstrap
-@@ -20287,8 +20523,11 @@
+@@ -20297,8 +20525,11 @@ all-stage4-intl: configure-stage4-intl
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3243,7 +3189,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-intl)
  
  maybe-clean-stage4-intl: clean-stage4-intl
-@@ -20301,7 +20540,7 @@
+@@ -20311,7 +20542,7 @@ clean-stage4-intl:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3252,7 +3198,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif intl-bootstrap
-@@ -20322,8 +20561,11 @@
+@@ -20332,8 +20563,11 @@ all-stageprofile-intl: configure-stagepr
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3266,7 +3212,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-intl)
  
  maybe-clean-stageprofile-intl: clean-stageprofile-intl
-@@ -20336,7 +20578,7 @@
+@@ -20346,7 +20580,7 @@ clean-stageprofile-intl:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3275,7 +3221,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif intl-bootstrap
-@@ -20357,8 +20599,11 @@
+@@ -20367,8 +20601,11 @@ all-stagefeedback-intl: configure-stagef
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3289,7 +3235,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-intl)
  
  maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
-@@ -20371,7 +20616,7 @@
+@@ -20381,7 +20618,7 @@ clean-stagefeedback-intl:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/intl && \
@@ -3298,7 +3244,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif intl-bootstrap
-@@ -20785,7 +21030,8 @@
+@@ -20795,7 +21032,8 @@ all-tcl: configure-tcl
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/tcl && \
@@ -3308,7 +3254,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif tcl
  
  
-@@ -21194,7 +21440,8 @@
+@@ -21204,7 +21442,8 @@ all-itcl: configure-itcl
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/itcl && \
@@ -3318,7 +3264,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif itcl
  
  
-@@ -21611,9 +21858,9 @@
+@@ -21621,9 +21860,9 @@ configure-stage1-ld:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
@@ -3330,7 +3276,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
  	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21642,9 +21889,9 @@
+@@ -21652,9 +21891,9 @@ configure-stage2-ld:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3342,7 +3288,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
  	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21673,9 +21920,9 @@
+@@ -21683,9 +21922,9 @@ configure-stageb2g0-ld:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3354,7 +3300,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/ld ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
  	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21704,9 +21951,9 @@
+@@ -21714,9 +21953,9 @@ configure-stage3-ld:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3366,7 +3312,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
  	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21735,9 +21982,9 @@
+@@ -21745,9 +21984,9 @@ configure-stageb3g2-ld:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3378,7 +3324,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/ld ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
  	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21766,9 +22013,9 @@
+@@ -21776,9 +22015,9 @@ configure-stage4-ld:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3390,7 +3336,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
  	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21797,9 +22044,9 @@
+@@ -21807,9 +22046,9 @@ configure-stageprofile-ld:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3402,7 +3348,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
  	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21828,9 +22075,9 @@
+@@ -21838,9 +22077,9 @@ configure-stagefeedback-ld:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3414,7 +3360,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
  	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21865,7 +22112,8 @@
+@@ -21875,7 +22114,8 @@ all-ld: configure-ld
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/ld && \
@@ -3424,7 +3370,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif ld
  
  
-@@ -21884,8 +22132,11 @@
+@@ -21894,8 +22134,11 @@ all-stage1-ld: configure-stage1-ld
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3438,7 +3384,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-ld)
  
  maybe-clean-stage1-ld: clean-stage1-ld
-@@ -21898,7 +22149,7 @@
+@@ -21908,7 +22151,7 @@ clean-stage1-ld:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3447,7 +3393,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif ld-bootstrap
  
-@@ -21918,8 +22169,11 @@
+@@ -21928,8 +22171,11 @@ all-stage2-ld: configure-stage2-ld
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3461,7 +3407,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-ld)
  
  maybe-clean-stage2-ld: clean-stage2-ld
-@@ -21932,7 +22186,7 @@
+@@ -21942,7 +22188,7 @@ clean-stage2-ld:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3470,7 +3416,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif ld-bootstrap
-@@ -21953,8 +22207,11 @@
+@@ -21963,8 +22209,11 @@ all-stageb2g0-ld: configure-stageb2g0-ld
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3484,7 +3430,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-ld)
  
  maybe-clean-stageb2g0-ld: clean-stageb2g0-ld
-@@ -21967,7 +22224,7 @@
+@@ -21977,7 +22226,7 @@ clean-stageb2g0-ld:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3493,7 +3439,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif ld-bootstrap
-@@ -21988,8 +22245,11 @@
+@@ -21998,8 +22247,11 @@ all-stage3-ld: configure-stage3-ld
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3507,7 +3453,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-ld)
  
  maybe-clean-stage3-ld: clean-stage3-ld
-@@ -22002,7 +22262,7 @@
+@@ -22012,7 +22264,7 @@ clean-stage3-ld:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3516,7 +3462,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif ld-bootstrap
-@@ -22023,8 +22283,11 @@
+@@ -22033,8 +22285,11 @@ all-stageb3g2-ld: configure-stageb3g2-ld
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3530,7 +3476,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-ld)
  
  maybe-clean-stageb3g2-ld: clean-stageb3g2-ld
-@@ -22037,7 +22300,7 @@
+@@ -22047,7 +22302,7 @@ clean-stageb3g2-ld:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3539,7 +3485,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif ld-bootstrap
-@@ -22058,8 +22321,11 @@
+@@ -22068,8 +22323,11 @@ all-stage4-ld: configure-stage4-ld
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3553,7 +3499,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-ld)
  
  maybe-clean-stage4-ld: clean-stage4-ld
-@@ -22072,7 +22338,7 @@
+@@ -22082,7 +22340,7 @@ clean-stage4-ld:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3562,7 +3508,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif ld-bootstrap
-@@ -22093,8 +22359,11 @@
+@@ -22103,8 +22361,11 @@ all-stageprofile-ld: configure-stageprof
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3576,7 +3522,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-ld)
  
  maybe-clean-stageprofile-ld: clean-stageprofile-ld
-@@ -22107,7 +22376,7 @@
+@@ -22117,7 +22378,7 @@ clean-stageprofile-ld:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3585,7 +3531,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif ld-bootstrap
-@@ -22128,8 +22397,11 @@
+@@ -22138,8 +22399,11 @@ all-stagefeedback-ld: configure-stagefee
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3599,7 +3545,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-ld)
  
  maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
-@@ -22142,7 +22414,7 @@
+@@ -22152,7 +22416,7 @@ clean-stagefeedback-ld:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/ld && \
@@ -3608,7 +3554,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif ld-bootstrap
-@@ -22549,9 +22821,9 @@
+@@ -22559,9 +22823,9 @@ configure-stage1-libcpp:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
@@ -3620,7 +3566,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
  	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22580,9 +22852,9 @@
+@@ -22590,9 +22854,9 @@ configure-stage2-libcpp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3632,7 +3578,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
  	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22611,9 +22883,9 @@
+@@ -22621,9 +22885,9 @@ configure-stageb2g0-libcpp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3644,7 +3590,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/libcpp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
  	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22642,9 +22914,9 @@
+@@ -22652,9 +22916,9 @@ configure-stage3-libcpp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3656,7 +3602,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
  	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22673,9 +22945,9 @@
+@@ -22683,9 +22947,9 @@ configure-stageb3g2-libcpp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3668,7 +3614,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/libcpp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
  	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22704,9 +22976,9 @@
+@@ -22714,9 +22978,9 @@ configure-stage4-libcpp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3680,7 +3626,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
  	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22735,9 +23007,9 @@
+@@ -22745,9 +23009,9 @@ configure-stageprofile-libcpp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3692,7 +3638,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
  	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22766,9 +23038,9 @@
+@@ -22776,9 +23040,9 @@ configure-stagefeedback-libcpp:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3704,7 +3650,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
  	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22803,7 +23075,8 @@
+@@ -22813,7 +23077,8 @@ all-libcpp: configure-libcpp
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/libcpp && \
@@ -3714,7 +3660,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif libcpp
  
  
-@@ -22822,8 +23095,11 @@
+@@ -22832,8 +23097,11 @@ all-stage1-libcpp: configure-stage1-libc
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3728,7 +3674,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-libcpp)
  
  maybe-clean-stage1-libcpp: clean-stage1-libcpp
-@@ -22836,7 +23112,7 @@
+@@ -22846,7 +23114,7 @@ clean-stage1-libcpp:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3737,7 +3683,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif libcpp-bootstrap
  
-@@ -22856,8 +23132,11 @@
+@@ -22866,8 +23134,11 @@ all-stage2-libcpp: configure-stage2-libc
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3751,7 +3697,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-libcpp)
  
  maybe-clean-stage2-libcpp: clean-stage2-libcpp
-@@ -22870,7 +23149,7 @@
+@@ -22880,7 +23151,7 @@ clean-stage2-libcpp:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3760,7 +3706,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libcpp-bootstrap
-@@ -22891,8 +23170,11 @@
+@@ -22901,8 +23172,11 @@ all-stageb2g0-libcpp: configure-stageb2g
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3774,7 +3720,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-libcpp)
  
  maybe-clean-stageb2g0-libcpp: clean-stageb2g0-libcpp
-@@ -22905,7 +23187,7 @@
+@@ -22915,7 +23189,7 @@ clean-stageb2g0-libcpp:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3783,7 +3729,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libcpp-bootstrap
-@@ -22926,8 +23208,11 @@
+@@ -22936,8 +23210,11 @@ all-stage3-libcpp: configure-stage3-libc
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3797,7 +3743,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-libcpp)
  
  maybe-clean-stage3-libcpp: clean-stage3-libcpp
-@@ -22940,7 +23225,7 @@
+@@ -22950,7 +23227,7 @@ clean-stage3-libcpp:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3806,7 +3752,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libcpp-bootstrap
-@@ -22961,8 +23246,11 @@
+@@ -22971,8 +23248,11 @@ all-stageb3g2-libcpp: configure-stageb3g
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3820,7 +3766,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-libcpp)
  
  maybe-clean-stageb3g2-libcpp: clean-stageb3g2-libcpp
-@@ -22975,7 +23263,7 @@
+@@ -22985,7 +23265,7 @@ clean-stageb3g2-libcpp:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3829,7 +3775,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libcpp-bootstrap
-@@ -22996,8 +23284,11 @@
+@@ -23006,8 +23286,11 @@ all-stage4-libcpp: configure-stage4-libc
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3843,7 +3789,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-libcpp)
  
  maybe-clean-stage4-libcpp: clean-stage4-libcpp
-@@ -23010,7 +23301,7 @@
+@@ -23020,7 +23303,7 @@ clean-stage4-libcpp:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3852,7 +3798,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libcpp-bootstrap
-@@ -23031,8 +23322,11 @@
+@@ -23041,8 +23324,11 @@ all-stageprofile-libcpp: configure-stage
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3866,7 +3812,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-libcpp)
  
  maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
-@@ -23045,7 +23339,7 @@
+@@ -23055,7 +23341,7 @@ clean-stageprofile-libcpp:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3875,7 +3821,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libcpp-bootstrap
-@@ -23066,8 +23360,11 @@
+@@ -23076,8 +23362,11 @@ all-stagefeedback-libcpp: configure-stag
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3889,7 +3835,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-libcpp)
  
  maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
-@@ -23080,7 +23377,7 @@
+@@ -23090,7 +23379,7 @@ clean-stagefeedback-libcpp:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libcpp && \
@@ -3898,7 +3844,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libcpp-bootstrap
-@@ -23487,9 +23784,9 @@
+@@ -23497,9 +23786,9 @@ configure-stage1-libdecnumber:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
@@ -3910,7 +3856,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
  	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23518,9 +23815,9 @@
+@@ -23528,9 +23817,9 @@ configure-stage2-libdecnumber:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3922,7 +3868,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
  	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23549,9 +23846,9 @@
+@@ -23559,9 +23848,9 @@ configure-stageb2g0-libdecnumber:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3934,7 +3880,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/libdecnumber ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
  	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23580,9 +23877,9 @@
+@@ -23590,9 +23879,9 @@ configure-stage3-libdecnumber:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3946,7 +3892,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
  	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23611,9 +23908,9 @@
+@@ -23621,9 +23910,9 @@ configure-stageb3g2-libdecnumber:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3958,7 +3904,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/libdecnumber ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
  	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23642,9 +23939,9 @@
+@@ -23652,9 +23941,9 @@ configure-stage4-libdecnumber:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3970,7 +3916,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
  	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23673,9 +23970,9 @@
+@@ -23683,9 +23972,9 @@ configure-stageprofile-libdecnumber:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3982,7 +3928,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
  	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23704,9 +24001,9 @@
+@@ -23714,9 +24003,9 @@ configure-stagefeedback-libdecnumber:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -3994,7 +3940,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
  	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23741,7 +24038,8 @@
+@@ -23751,7 +24040,8 @@ all-libdecnumber: configure-libdecnumber
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4004,7 +3950,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif libdecnumber
  
  
-@@ -23760,8 +24058,11 @@
+@@ -23770,8 +24060,11 @@ all-stage1-libdecnumber: configure-stage
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4018,7 +3964,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-libdecnumber)
  
  maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
-@@ -23774,7 +24075,7 @@
+@@ -23784,7 +24077,7 @@ clean-stage1-libdecnumber:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4027,7 +3973,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif libdecnumber-bootstrap
  
-@@ -23794,8 +24095,11 @@
+@@ -23804,8 +24097,11 @@ all-stage2-libdecnumber: configure-stage
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4041,7 +3987,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-libdecnumber)
  
  maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
-@@ -23808,7 +24112,7 @@
+@@ -23818,7 +24114,7 @@ clean-stage2-libdecnumber:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4050,7 +3996,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libdecnumber-bootstrap
-@@ -23829,8 +24133,11 @@
+@@ -23839,8 +24135,11 @@ all-stageb2g0-libdecnumber: configure-st
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4064,7 +4010,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-libdecnumber)
  
  maybe-clean-stageb2g0-libdecnumber: clean-stageb2g0-libdecnumber
-@@ -23843,7 +24150,7 @@
+@@ -23853,7 +24152,7 @@ clean-stageb2g0-libdecnumber:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4073,7 +4019,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libdecnumber-bootstrap
-@@ -23864,8 +24171,11 @@
+@@ -23874,8 +24173,11 @@ all-stage3-libdecnumber: configure-stage
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4087,7 +4033,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-libdecnumber)
  
  maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
-@@ -23878,7 +24188,7 @@
+@@ -23888,7 +24190,7 @@ clean-stage3-libdecnumber:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4096,7 +4042,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libdecnumber-bootstrap
-@@ -23899,8 +24209,11 @@
+@@ -23909,8 +24211,11 @@ all-stageb3g2-libdecnumber: configure-st
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4110,7 +4056,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-libdecnumber)
  
  maybe-clean-stageb3g2-libdecnumber: clean-stageb3g2-libdecnumber
-@@ -23913,7 +24226,7 @@
+@@ -23923,7 +24228,7 @@ clean-stageb3g2-libdecnumber:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4119,7 +4065,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libdecnumber-bootstrap
-@@ -23934,8 +24247,11 @@
+@@ -23944,8 +24249,11 @@ all-stage4-libdecnumber: configure-stage
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4133,7 +4079,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-libdecnumber)
  
  maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
-@@ -23948,7 +24264,7 @@
+@@ -23958,7 +24266,7 @@ clean-stage4-libdecnumber:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4142,7 +4088,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libdecnumber-bootstrap
-@@ -23969,8 +24285,11 @@
+@@ -23979,8 +24287,11 @@ all-stageprofile-libdecnumber: configure
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4156,7 +4102,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-libdecnumber)
  
  maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
-@@ -23983,7 +24302,7 @@
+@@ -23993,7 +24304,7 @@ clean-stageprofile-libdecnumber:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4165,7 +4111,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libdecnumber-bootstrap
-@@ -24004,8 +24323,11 @@
+@@ -24014,8 +24325,11 @@ all-stagefeedback-libdecnumber: configur
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4179,7 +4125,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-libdecnumber)
  
  maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
-@@ -24018,7 +24340,7 @@
+@@ -24028,7 +24342,7 @@ clean-stagefeedback-libdecnumber:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4188,7 +4134,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libdecnumber-bootstrap
-@@ -24432,7 +24754,8 @@
+@@ -24442,7 +24756,8 @@ all-libgui: configure-libgui
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/libgui && \
@@ -4198,7 +4144,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif libgui
  
  
-@@ -24849,9 +25172,9 @@
+@@ -24859,9 +25174,9 @@ configure-stage1-libiberty:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
@@ -4210,7 +4156,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
  	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24880,9 +25203,9 @@
+@@ -24890,9 +25205,9 @@ configure-stage2-libiberty:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4222,7 +4168,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
  	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24911,9 +25234,9 @@
+@@ -24921,9 +25236,9 @@ configure-stageb2g0-libiberty:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4234,7 +4180,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/libiberty ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
  	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24942,9 +25265,9 @@
+@@ -24952,9 +25267,9 @@ configure-stage3-libiberty:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4246,7 +4192,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
  	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24973,9 +25296,9 @@
+@@ -24983,9 +25298,9 @@ configure-stageb3g2-libiberty:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4258,7 +4204,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/libiberty ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
  	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25004,9 +25327,9 @@
+@@ -25014,9 +25329,9 @@ configure-stage4-libiberty:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4270,7 +4216,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
  	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25035,9 +25358,9 @@
+@@ -25045,9 +25360,9 @@ configure-stageprofile-libiberty:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4282,7 +4228,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
  	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25066,9 +25389,9 @@
+@@ -25076,9 +25391,9 @@ configure-stagefeedback-libiberty:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4294,7 +4240,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
  	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25103,7 +25426,8 @@
+@@ -25113,7 +25428,8 @@ all-libiberty: configure-libiberty
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/libiberty && \
@@ -4304,7 +4250,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif libiberty
  
  
-@@ -25122,8 +25446,11 @@
+@@ -25132,8 +25448,11 @@ all-stage1-libiberty: configure-stage1-l
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4318,7 +4264,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-libiberty)
  
  maybe-clean-stage1-libiberty: clean-stage1-libiberty
-@@ -25136,7 +25463,7 @@
+@@ -25146,7 +25465,7 @@ clean-stage1-libiberty:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4327,7 +4273,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif libiberty-bootstrap
  
-@@ -25156,8 +25483,11 @@
+@@ -25166,8 +25485,11 @@ all-stage2-libiberty: configure-stage2-l
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4341,7 +4287,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-libiberty)
  
  maybe-clean-stage2-libiberty: clean-stage2-libiberty
-@@ -25170,7 +25500,7 @@
+@@ -25180,7 +25502,7 @@ clean-stage2-libiberty:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4350,7 +4296,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libiberty-bootstrap
-@@ -25191,8 +25521,11 @@
+@@ -25201,8 +25523,11 @@ all-stageb2g0-libiberty: configure-stage
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4364,7 +4310,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-libiberty)
  
  maybe-clean-stageb2g0-libiberty: clean-stageb2g0-libiberty
-@@ -25205,7 +25538,7 @@
+@@ -25215,7 +25540,7 @@ clean-stageb2g0-libiberty:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4373,7 +4319,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libiberty-bootstrap
-@@ -25226,8 +25559,11 @@
+@@ -25236,8 +25561,11 @@ all-stage3-libiberty: configure-stage3-l
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4387,7 +4333,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-libiberty)
  
  maybe-clean-stage3-libiberty: clean-stage3-libiberty
-@@ -25240,7 +25576,7 @@
+@@ -25250,7 +25578,7 @@ clean-stage3-libiberty:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4396,7 +4342,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libiberty-bootstrap
-@@ -25261,8 +25597,11 @@
+@@ -25271,8 +25599,11 @@ all-stageb3g2-libiberty: configure-stage
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4410,7 +4356,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-libiberty)
  
  maybe-clean-stageb3g2-libiberty: clean-stageb3g2-libiberty
-@@ -25275,7 +25614,7 @@
+@@ -25285,7 +25616,7 @@ clean-stageb3g2-libiberty:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4419,7 +4365,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libiberty-bootstrap
-@@ -25296,8 +25635,11 @@
+@@ -25306,8 +25637,11 @@ all-stage4-libiberty: configure-stage4-l
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4433,7 +4379,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-libiberty)
  
  maybe-clean-stage4-libiberty: clean-stage4-libiberty
-@@ -25310,7 +25652,7 @@
+@@ -25320,7 +25654,7 @@ clean-stage4-libiberty:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4442,7 +4388,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libiberty-bootstrap
-@@ -25331,8 +25673,11 @@
+@@ -25341,8 +25675,11 @@ all-stageprofile-libiberty: configure-st
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4456,7 +4402,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-libiberty)
  
  maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
-@@ -25345,7 +25690,7 @@
+@@ -25355,7 +25692,7 @@ clean-stageprofile-libiberty:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4465,7 +4411,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libiberty-bootstrap
-@@ -25366,8 +25711,11 @@
+@@ -25376,8 +25713,11 @@ all-stagefeedback-libiberty: configure-s
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4479,7 +4425,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-libiberty)
  
  maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
-@@ -25380,7 +25728,7 @@
+@@ -25390,7 +25730,7 @@ clean-stagefeedback-libiberty:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/libiberty && \
@@ -4488,7 +4434,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif libiberty-bootstrap
-@@ -25794,7 +26142,8 @@
+@@ -25804,7 +26144,8 @@ all-libtool: configure-libtool
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/libtool && \
@@ -4498,7 +4444,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif libtool
  
  
-@@ -26218,7 +26567,8 @@
+@@ -26228,7 +26569,8 @@ all-m4: configure-m4
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/m4 && \
@@ -4508,7 +4454,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif m4
  
  
-@@ -26642,7 +26992,8 @@
+@@ -26652,7 +26994,8 @@ all-make: configure-make
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/make && \
@@ -4518,7 +4464,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif make
  
  
-@@ -27066,7 +27417,8 @@
+@@ -27076,7 +27419,8 @@ all-mmalloc: configure-mmalloc
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/mmalloc && \
@@ -4528,7 +4474,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif mmalloc
  
  
-@@ -27484,7 +27836,8 @@
+@@ -27494,7 +27838,8 @@ all-patch: configure-patch
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/patch && \
@@ -4538,7 +4484,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif patch
  
  
-@@ -27908,7 +28261,8 @@
+@@ -27918,7 +28263,8 @@ all-perl: configure-perl
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/perl && \
@@ -4548,7 +4494,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif perl
  
  
-@@ -28332,7 +28686,8 @@
+@@ -28342,7 +28688,8 @@ all-prms: configure-prms
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/prms && \
@@ -4558,7 +4504,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif prms
  
  
-@@ -28756,7 +29111,8 @@
+@@ -28766,7 +29113,8 @@ all-rcs: configure-rcs
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/rcs && \
@@ -4568,7 +4514,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif rcs
  
  
-@@ -29180,7 +29536,8 @@
+@@ -29190,7 +29538,8 @@ all-readline: configure-readline
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/readline && \
@@ -4578,7 +4524,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif readline
  
  
-@@ -29604,7 +29961,8 @@
+@@ -29614,7 +29963,8 @@ all-release: configure-release
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/release && \
@@ -4588,7 +4534,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif release
  
  
-@@ -30016,7 +30374,8 @@
+@@ -30026,7 +30376,8 @@ all-recode: configure-recode
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/recode && \
@@ -4598,7 +4544,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif recode
  
  
-@@ -30440,7 +30799,8 @@
+@@ -30450,7 +30801,8 @@ all-sed: configure-sed
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/sed && \
@@ -4608,7 +4554,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif sed
  
  
-@@ -30864,7 +31224,8 @@
+@@ -30874,7 +31226,8 @@ all-send-pr: configure-send-pr
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/send-pr && \
@@ -4618,7 +4564,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif send-pr
  
  
-@@ -31288,7 +31649,8 @@
+@@ -31298,7 +31651,8 @@ all-shellutils: configure-shellutils
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/shellutils && \
@@ -4628,7 +4574,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif shellutils
  
  
-@@ -31712,7 +32074,8 @@
+@@ -31722,7 +32076,8 @@ all-sid: configure-sid
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/sid && \
@@ -4638,7 +4584,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif sid
  
  
-@@ -32136,7 +32499,8 @@
+@@ -32146,7 +32501,8 @@ all-sim: configure-sim
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/sim && \
@@ -4648,7 +4594,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif sim
  
  
-@@ -32560,7 +32924,8 @@
+@@ -32570,7 +32926,8 @@ all-tar: configure-tar
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/tar && \
@@ -4658,7 +4604,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif tar
  
  
-@@ -32984,7 +33349,8 @@
+@@ -32994,7 +33351,8 @@ all-texinfo: configure-texinfo
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/texinfo && \
@@ -4668,7 +4614,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif texinfo
  
  
-@@ -33402,7 +33768,8 @@
+@@ -33412,7 +33770,8 @@ all-textutils: configure-textutils
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/textutils && \
@@ -4678,7 +4624,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif textutils
  
  
-@@ -33826,7 +34193,8 @@
+@@ -33836,7 +34195,8 @@ all-time: configure-time
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/time && \
@@ -4688,7 +4634,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif time
  
  
-@@ -34250,7 +34618,8 @@
+@@ -34260,7 +34620,8 @@ all-uudecode: configure-uudecode
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/uudecode && \
@@ -4698,7 +4644,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif uudecode
  
  
-@@ -34674,7 +35043,8 @@
+@@ -34684,7 +35045,8 @@ all-wdiff: configure-wdiff
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/wdiff && \
@@ -4708,7 +4654,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif wdiff
  
  
-@@ -35098,7 +35468,8 @@
+@@ -35108,7 +35470,8 @@ all-zip: configure-zip
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/zip && \
@@ -4718,7 +4664,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif zip
  
  
-@@ -35518,9 +35889,9 @@
+@@ -35528,9 +35891,9 @@ configure-stage1-zlib:
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
@@ -4730,7 +4676,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
  	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35549,9 +35920,9 @@
+@@ -35559,9 +35922,9 @@ configure-stage2-zlib:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4742,7 +4688,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
  	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35580,9 +35951,9 @@
+@@ -35590,9 +35953,9 @@ configure-stageb2g0-zlib:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4754,7 +4700,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(HOST_SUBDIR)/zlib ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
  	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35611,9 +35982,9 @@
+@@ -35621,9 +35984,9 @@ configure-stage3-zlib:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4766,7 +4712,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
  	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35642,9 +36013,9 @@
+@@ -35652,9 +36015,9 @@ configure-stageb3g2-zlib:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4778,7 +4724,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(HOST_SUBDIR)/zlib ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
  	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35673,9 +36044,9 @@
+@@ -35683,9 +36046,9 @@ configure-stage4-zlib:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4790,7 +4736,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
  	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35704,9 +36075,9 @@
+@@ -35714,9 +36077,9 @@ configure-stageprofile-zlib:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4802,7 +4748,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
  	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35735,9 +36106,9 @@
+@@ -35745,9 +36108,9 @@ configure-stagefeedback-zlib:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
  	$(HOST_EXPORTS) \
@@ -4814,7 +4760,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
  	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35772,7 +36143,8 @@
+@@ -35782,7 +36145,8 @@ all-zlib: configure-zlib
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/zlib && \
@@ -4824,7 +4770,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif zlib
  
  
-@@ -35791,8 +36163,11 @@
+@@ -35801,8 +36165,11 @@ all-stage1-zlib: configure-stage1-zlib
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4838,7 +4784,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-zlib)
  
  maybe-clean-stage1-zlib: clean-stage1-zlib
-@@ -35805,7 +36180,7 @@
+@@ -35815,7 +36182,7 @@ clean-stage1-zlib:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4847,7 +4793,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif zlib-bootstrap
  
-@@ -35825,8 +36200,11 @@
+@@ -35835,8 +36202,11 @@ all-stage2-zlib: configure-stage2-zlib
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4861,7 +4807,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-zlib)
  
  maybe-clean-stage2-zlib: clean-stage2-zlib
-@@ -35839,7 +36217,7 @@
+@@ -35849,7 +36219,7 @@ clean-stage2-zlib:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4870,7 +4816,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif zlib-bootstrap
-@@ -35860,8 +36238,11 @@
+@@ -35870,8 +36240,11 @@ all-stageb2g0-zlib: configure-stageb2g0-
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4884,7 +4830,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-zlib)
  
  maybe-clean-stageb2g0-zlib: clean-stageb2g0-zlib
-@@ -35874,7 +36255,7 @@
+@@ -35884,7 +36257,7 @@ clean-stageb2g0-zlib:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4893,7 +4839,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif zlib-bootstrap
-@@ -35895,8 +36276,11 @@
+@@ -35905,8 +36278,11 @@ all-stage3-zlib: configure-stage3-zlib
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4907,7 +4853,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-zlib)
  
  maybe-clean-stage3-zlib: clean-stage3-zlib
-@@ -35909,7 +36293,7 @@
+@@ -35919,7 +36295,7 @@ clean-stage3-zlib:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4916,7 +4862,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif zlib-bootstrap
-@@ -35930,8 +36314,11 @@
+@@ -35940,8 +36316,11 @@ all-stageb3g2-zlib: configure-stageb3g2-
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4930,7 +4876,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-zlib)
  
  maybe-clean-stageb3g2-zlib: clean-stageb3g2-zlib
-@@ -35944,7 +36331,7 @@
+@@ -35954,7 +36333,7 @@ clean-stageb3g2-zlib:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4939,7 +4885,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif zlib-bootstrap
-@@ -35965,8 +36352,11 @@
+@@ -35975,8 +36354,11 @@ all-stage4-zlib: configure-stage4-zlib
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4953,7 +4899,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-zlib)
  
  maybe-clean-stage4-zlib: clean-stage4-zlib
-@@ -35979,7 +36369,7 @@
+@@ -35989,7 +36371,7 @@ clean-stage4-zlib:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4962,7 +4908,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif zlib-bootstrap
-@@ -36000,8 +36390,11 @@
+@@ -36010,8 +36392,11 @@ all-stageprofile-zlib: configure-stagepr
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4976,7 +4922,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-zlib)
  
  maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
-@@ -36014,7 +36407,7 @@
+@@ -36024,7 +36409,7 @@ clean-stageprofile-zlib:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4985,7 +4931,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif zlib-bootstrap
-@@ -36035,8 +36428,11 @@
+@@ -36045,8 +36430,11 @@ all-stagefeedback-zlib: configure-stagef
  	$(HOST_EXPORTS) \
  	$(POSTSTAGE1_HOST_EXPORTS) \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -4999,7 +4945,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-zlib)
  
  maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
-@@ -36049,7 +36445,7 @@
+@@ -36059,7 +36447,7 @@ clean-stagefeedback-zlib:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(HOST_SUBDIR)/zlib && \
@@ -5008,7 +4954,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(POSTSTAGE1_FLAGS_TO_PASS)  \
  		 clean
  @endif zlib-bootstrap
-@@ -36451,7 +36847,8 @@
+@@ -36461,7 +36849,8 @@ all-gdb: configure-gdb
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/gdb && \
@@ -5018,7 +4964,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif gdb
  
  
-@@ -36875,7 +37272,8 @@
+@@ -36885,7 +37274,8 @@ all-expect: configure-expect
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/expect && \
@@ -5028,7 +4974,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif expect
  
  
-@@ -37299,7 +37697,8 @@
+@@ -37309,7 +37699,8 @@ all-guile: configure-guile
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/guile && \
@@ -5038,7 +4984,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif guile
  
  
-@@ -37723,7 +38122,8 @@
+@@ -37733,7 +38124,8 @@ all-tk: configure-tk
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/tk && \
@@ -5048,7 +4994,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif tk
  
  
-@@ -38147,7 +38547,8 @@
+@@ -38157,7 +38549,8 @@ all-libtermcap: configure-libtermcap
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/libtermcap && \
@@ -5058,7 +5004,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif libtermcap
  
  
-@@ -38505,7 +38906,8 @@
+@@ -38515,7 +38908,8 @@ all-utils: configure-utils
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/utils && \
@@ -5068,7 +5014,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif utils
  
  
-@@ -38923,7 +39325,8 @@
+@@ -38933,7 +39327,8 @@ all-gnattools: configure-gnattools
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(HOST_EXPORTS) \
  	(cd $(HOST_SUBDIR)/gnattools && \
@@ -5078,7 +5024,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif gnattools
  
  
-@@ -39368,7 +39771,8 @@
+@@ -39378,7 +39773,8 @@ all-target-libstdc++-v3: configure-targe
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(RAW_CXX_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
@@ -5088,7 +5034,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libstdc++-v3
  
  
-@@ -39809,7 +40213,8 @@
+@@ -39819,7 +40215,8 @@ all-target-libmudflap: configure-target-
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libmudflap && \
@@ -5098,7 +5044,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libmudflap
  
  
-@@ -40250,7 +40655,8 @@
+@@ -40260,7 +40657,8 @@ all-target-libssp: configure-target-libs
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libssp && \
@@ -5108,7 +5054,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libssp
  
  
-@@ -40691,7 +41097,8 @@
+@@ -40701,7 +41099,8 @@ all-target-newlib: configure-target-newl
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/newlib && \
@@ -5118,7 +5064,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-newlib
  
  
-@@ -41137,9 +41544,9 @@
+@@ -41147,9 +41546,9 @@ configure-stage1-target-libgcc:
  	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
  	fi; \
  	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
@@ -5131,7 +5077,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
  	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41180,9 +41587,9 @@
+@@ -41190,9 +41589,9 @@ configure-stage2-target-libgcc:
  	fi; \
  	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
  	$(NORMAL_TARGET_EXPORTS) \
@@ -5144,7 +5090,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
  	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41223,9 +41630,9 @@
+@@ -41233,9 +41632,9 @@ configure-stageb2g0-target-libgcc:
  	fi; \
  	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
  	$(NORMAL_TARGET_EXPORTS) \
@@ -5157,7 +5103,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b2g0 in $(TARGET_SUBDIR)/libgcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
  	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41266,9 +41673,9 @@
+@@ -41276,9 +41675,9 @@ configure-stage3-target-libgcc:
  	fi; \
  	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
  	$(NORMAL_TARGET_EXPORTS) \
@@ -5170,7 +5116,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
  	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41309,9 +41716,9 @@
+@@ -41319,9 +41718,9 @@ configure-stageb3g2-target-libgcc:
  	fi; \
  	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
  	$(NORMAL_TARGET_EXPORTS) \
@@ -5183,7 +5129,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage b3g2 in $(TARGET_SUBDIR)/libgcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
  	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41352,9 +41759,9 @@
+@@ -41362,9 +41761,9 @@ configure-stage4-target-libgcc:
  	fi; \
  	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
  	$(NORMAL_TARGET_EXPORTS) \
@@ -5196,7 +5142,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
  	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41395,9 +41802,9 @@
+@@ -41405,9 +41804,9 @@ configure-stageprofile-target-libgcc:
  	fi; \
  	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
  	$(NORMAL_TARGET_EXPORTS) \
@@ -5209,7 +5155,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
  	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41438,9 +41845,9 @@
+@@ -41448,9 +41847,9 @@ configure-stagefeedback-target-libgcc:
  	fi; \
  	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
  	$(NORMAL_TARGET_EXPORTS) \
@@ -5222,7 +5168,7 @@ Index: gcc-4.3.3/Makefile.in
  	echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \
  	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
  	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41475,7 +41882,8 @@
+@@ -41485,7 +41884,8 @@ all-target-libgcc: configure-target-libg
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libgcc && \
@@ -5232,7 +5178,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libgcc
  
  
-@@ -41494,8 +41902,11 @@
+@@ -41504,8 +41904,11 @@ all-stage1-target-libgcc: configure-stag
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5246,7 +5192,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage1-target-libgcc)
  
  maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
-@@ -41508,7 +41919,7 @@
+@@ -41518,7 +41921,7 @@ clean-stage1-target-libgcc:
  	  $(MAKE) stage1-start; \
  	fi; \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5255,7 +5201,7 @@ Index: gcc-4.3.3/Makefile.in
  		 clean
  @endif target-libgcc-bootstrap
  
-@@ -41528,8 +41939,11 @@
+@@ -41538,8 +41941,11 @@ all-stage2-target-libgcc: configure-stag
  	$(NORMAL_TARGET_EXPORTS) \
  	 \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5269,7 +5215,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage2-target-libgcc)
  
  maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
-@@ -41542,7 +41956,7 @@
+@@ -41552,7 +41958,7 @@ clean-stage2-target-libgcc:
  	  $(MAKE) stage2-start; \
  	fi; \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5278,7 +5224,7 @@ Index: gcc-4.3.3/Makefile.in
  		  \
  		 clean
  @endif target-libgcc-bootstrap
-@@ -41563,8 +41977,11 @@
+@@ -41573,8 +41979,11 @@ all-stageb2g0-target-libgcc: configure-s
  	$(NORMAL_TARGET_EXPORTS) \
  	 \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5292,7 +5238,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb2g0-target-libgcc)
  
  maybe-clean-stageb2g0-target-libgcc: clean-stageb2g0-target-libgcc
-@@ -41577,7 +41994,7 @@
+@@ -41587,7 +41996,7 @@ clean-stageb2g0-target-libgcc:
  	  $(MAKE) stageb2g0-start; \
  	fi; \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5301,7 +5247,7 @@ Index: gcc-4.3.3/Makefile.in
  		  \
  		 clean
  @endif target-libgcc-bootstrap
-@@ -41598,8 +42015,11 @@
+@@ -41608,8 +42017,11 @@ all-stage3-target-libgcc: configure-stag
  	$(NORMAL_TARGET_EXPORTS) \
  	 \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5315,7 +5261,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage3-target-libgcc)
  
  maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
-@@ -41612,7 +42032,7 @@
+@@ -41622,7 +42034,7 @@ clean-stage3-target-libgcc:
  	  $(MAKE) stage3-start; \
  	fi; \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5324,7 +5270,7 @@ Index: gcc-4.3.3/Makefile.in
  		  \
  		 clean
  @endif target-libgcc-bootstrap
-@@ -41633,8 +42053,11 @@
+@@ -41643,8 +42055,11 @@ all-stageb3g2-target-libgcc: configure-s
  	$(NORMAL_TARGET_EXPORTS) \
  	 \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5338,7 +5284,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageb3g2-target-libgcc)
  
  maybe-clean-stageb3g2-target-libgcc: clean-stageb3g2-target-libgcc
-@@ -41647,7 +42070,7 @@
+@@ -41657,7 +42072,7 @@ clean-stageb3g2-target-libgcc:
  	  $(MAKE) stageb3g2-start; \
  	fi; \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5347,7 +5293,7 @@ Index: gcc-4.3.3/Makefile.in
  		  \
  		 clean
  @endif target-libgcc-bootstrap
-@@ -41668,8 +42091,11 @@
+@@ -41678,8 +42093,11 @@ all-stage4-target-libgcc: configure-stag
  	$(NORMAL_TARGET_EXPORTS) \
  	 \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5361,7 +5307,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stage4-target-libgcc)
  
  maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
-@@ -41682,7 +42108,7 @@
+@@ -41692,7 +42110,7 @@ clean-stage4-target-libgcc:
  	  $(MAKE) stage4-start; \
  	fi; \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5370,7 +5316,7 @@ Index: gcc-4.3.3/Makefile.in
  		  \
  		 clean
  @endif target-libgcc-bootstrap
-@@ -41703,8 +42129,11 @@
+@@ -41713,8 +42131,11 @@ all-stageprofile-target-libgcc: configur
  	$(NORMAL_TARGET_EXPORTS) \
  	 \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5384,7 +5330,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stageprofile-target-libgcc)
  
  maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
-@@ -41717,7 +42146,7 @@
+@@ -41727,7 +42148,7 @@ clean-stageprofile-target-libgcc:
  	  $(MAKE) stageprofile-start; \
  	fi; \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5393,7 +5339,7 @@ Index: gcc-4.3.3/Makefile.in
  		  \
  		 clean
  @endif target-libgcc-bootstrap
-@@ -41738,8 +42167,11 @@
+@@ -41748,8 +42169,11 @@ all-stagefeedback-target-libgcc: configu
  	$(NORMAL_TARGET_EXPORTS) \
  	 \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5407,7 +5353,7 @@ Index: gcc-4.3.3/Makefile.in
  		$(TARGET-stagefeedback-target-libgcc)
  
  maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
-@@ -41752,7 +42184,7 @@
+@@ -41762,7 +42186,7 @@ clean-stagefeedback-target-libgcc:
  	  $(MAKE) stagefeedback-start; \
  	fi; \
  	cd $(TARGET_SUBDIR)/libgcc && \
@@ -5416,7 +5362,7 @@ Index: gcc-4.3.3/Makefile.in
  		  \
  		 clean
  @endif target-libgcc-bootstrap
-@@ -42191,7 +42623,8 @@
+@@ -42201,7 +42625,8 @@ all-target-libgfortran: configure-target
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libgfortran && \
@@ -5426,7 +5372,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libgfortran
  
  
-@@ -42632,7 +43065,8 @@
+@@ -42642,7 +43067,8 @@ all-target-libobjc: configure-target-lib
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libobjc && \
@@ -5436,7 +5382,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libobjc
  
  
-@@ -43073,7 +43507,8 @@
+@@ -43083,7 +43509,8 @@ all-target-libtermcap: configure-target-
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libtermcap && \
@@ -5446,7 +5392,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libtermcap
  
  
-@@ -43449,7 +43884,8 @@
+@@ -43459,7 +43886,8 @@ all-target-winsup: configure-target-wins
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/winsup && \
@@ -5456,7 +5402,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-winsup
  
  
-@@ -43890,7 +44326,8 @@
+@@ -43900,7 +44328,8 @@ all-target-libgloss: configure-target-li
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libgloss && \
@@ -5466,7 +5412,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libgloss
  
  
-@@ -44326,7 +44763,8 @@
+@@ -44336,7 +44765,8 @@ all-target-libiberty: configure-target-l
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libiberty && \
@@ -5476,7 +5422,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libiberty
  
  
-@@ -44767,7 +45205,8 @@
+@@ -44777,7 +45207,8 @@ all-target-gperf: configure-target-gperf
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/gperf && \
@@ -5486,7 +5432,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-gperf
  
  
-@@ -45208,7 +45647,8 @@
+@@ -45218,7 +45649,8 @@ all-target-examples: configure-target-ex
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/examples && \
@@ -5496,7 +5442,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-examples
  
  
-@@ -45639,7 +46079,8 @@
+@@ -45649,7 +46081,8 @@ all-target-libffi: configure-target-libf
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libffi && \
@@ -5506,7 +5452,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libffi
  
  
-@@ -46080,7 +46521,8 @@
+@@ -46090,7 +46523,8 @@ all-target-libjava: configure-target-lib
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(RAW_CXX_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libjava && \
@@ -5516,7 +5462,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libjava
  
  
-@@ -46521,7 +46963,8 @@
+@@ -46531,7 +46965,8 @@ all-target-zlib: configure-target-zlib
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/zlib && \
@@ -5526,7 +5472,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-zlib
  
  
-@@ -46962,7 +47405,8 @@
+@@ -46972,7 +47407,8 @@ all-target-boehm-gc: configure-target-bo
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/boehm-gc && \
@@ -5536,7 +5482,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-boehm-gc
  
  
-@@ -47403,7 +47847,8 @@
+@@ -47413,7 +47849,8 @@ all-target-qthreads: configure-target-qt
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/qthreads && \
@@ -5546,7 +5492,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-qthreads
  
  
-@@ -47844,7 +48289,8 @@
+@@ -47854,7 +48291,8 @@ all-target-rda: configure-target-rda
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/rda && \
@@ -5556,7 +5502,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-rda
  
  
-@@ -48285,7 +48731,8 @@
+@@ -48295,7 +48733,8 @@ all-target-libada: configure-target-liba
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libada && \
@@ -5566,7 +5512,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libada
  
  
-@@ -48726,7 +49173,8 @@
+@@ -48736,7 +49175,8 @@ all-target-libgomp: configure-target-lib
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS) \
  	(cd $(TARGET_SUBDIR)/libgomp && \
@@ -5576,7 +5522,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif target-libgomp
  
  
-@@ -49359,7 +49807,7 @@
+@@ -49369,7 +49809,7 @@ stage1-end:: 
  
  # Bubble a bug fix through all the stages up to stage 1.  They are
  # remade, but not reconfigured.  The next stage (if any) will not be
@@ -5585,7 +5531,7 @@ Index: gcc-4.3.3/Makefile.in
  .PHONY: stage1-bubble
  stage1-bubble:: 
  	@r=`${PWD_COMMAND}`; export r; \
-@@ -49570,7 +50018,7 @@
+@@ -49580,7 +50020,7 @@ stage2-end:: 
  
  # Bubble a bug fix through all the stages up to stage 2.  They are
  # remade, but not reconfigured.  The next stage (if any) will not be
@@ -5594,7 +5540,7 @@ Index: gcc-4.3.3/Makefile.in
  .PHONY: stage2-bubble
  stage2-bubble:: stage1-bubble
  	@r=`${PWD_COMMAND}`; export r; \
-@@ -49802,7 +50250,7 @@
+@@ -49812,7 +50252,7 @@ stageb2g0-end:: 
  
  # Bubble a bug fix through all the stages up to stage b2g0.  They are
  # remade, but not reconfigured.  The next stage (if any) will not be
@@ -5603,7 +5549,7 @@ Index: gcc-4.3.3/Makefile.in
  .PHONY: stageb2g0-bubble
  stageb2g0-bubble:: stage1-bubble
  	@r=`${PWD_COMMAND}`; export r; \
-@@ -50034,7 +50482,7 @@
+@@ -50044,7 +50484,7 @@ stage3-end:: 
  
  # Bubble a bug fix through all the stages up to stage 3.  They are
  # remade, but not reconfigured.  The next stage (if any) will not be
@@ -5612,7 +5558,7 @@ Index: gcc-4.3.3/Makefile.in
  .PHONY: stage3-bubble
  stage3-bubble:: stage2-bubble
  	@r=`${PWD_COMMAND}`; export r; \
-@@ -50320,7 +50768,7 @@
+@@ -50330,7 +50770,7 @@ stageb3g2-end:: 
  
  # Bubble a bug fix through all the stages up to stage b3g2.  They are
  # remade, but not reconfigured.  The next stage (if any) will not be
@@ -5621,7 +5567,7 @@ Index: gcc-4.3.3/Makefile.in
  .PHONY: stageb3g2-bubble
  stageb3g2-bubble:: stageb2g0-bubble
  	@r=`${PWD_COMMAND}`; export r; \
-@@ -50606,7 +51054,7 @@
+@@ -50616,7 +51056,7 @@ stage4-end:: 
  
  # Bubble a bug fix through all the stages up to stage 4.  They are
  # remade, but not reconfigured.  The next stage (if any) will not be
@@ -5630,7 +5576,7 @@ Index: gcc-4.3.3/Makefile.in
  .PHONY: stage4-bubble
  stage4-bubble:: stage3-bubble
  	@r=`${PWD_COMMAND}`; export r; \
-@@ -50881,7 +51329,7 @@
+@@ -50891,7 +51331,7 @@ stageprofile-end:: 
  
  # Bubble a bug fix through all the stages up to stage profile.  They are
  # remade, but not reconfigured.  The next stage (if any) will not be
@@ -5639,7 +5585,7 @@ Index: gcc-4.3.3/Makefile.in
  .PHONY: stageprofile-bubble
  stageprofile-bubble:: stage1-bubble
  	@r=`${PWD_COMMAND}`; export r; \
-@@ -51092,7 +51540,7 @@
+@@ -51102,7 +51542,7 @@ stagefeedback-end:: 
  
  # Bubble a bug fix through all the stages up to stage feedback.  They are
  # remade, but not reconfigured.  The next stage (if any) will not be
@@ -5648,7 +5594,7 @@ Index: gcc-4.3.3/Makefile.in
  .PHONY: stagefeedback-bubble
  stagefeedback-bubble:: stageprofile-bubble
  	@r=`${PWD_COMMAND}`; export r; \
-@@ -51175,10 +51623,10 @@
+@@ -51185,10 +51625,10 @@ stage_current:
  	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
  
  .PHONY: restrap
@@ -5661,7 +5607,7 @@ Index: gcc-4.3.3/Makefile.in
  @endif gcc-bootstrap
  
  # --------------------------------------
-@@ -52004,7 +52452,8 @@
+@@ -52014,7 +52454,8 @@ config.status: configure
  
  # Rebuilding configure.
  AUTOCONF = autoconf
@@ -5673,18 +5619,18 @@ Index: gcc-4.3.3/Makefile.in
  # ------------------------------
 Index: gcc-4.3.3/configure
 ===================================================================
---- gcc-4.3.3.orig/configure	2008-02-01 20:29:30.000000000 -0700
-+++ gcc-4.3.3/configure	2009-04-29 18:03:50.204611816 -0700
-@@ -272,7 +272,7 @@
+--- gcc-4.3.3.orig/configure	2010-05-16 23:25:38.000000000 -0700
++++ gcc-4.3.3/configure	2010-05-16 23:26:54.433023190 -0700
+@@ -272,7 +272,7 @@ PACKAGE_STRING=
  PACKAGE_BUGREPORT=
  
  ac_unique_file="move-if-change"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CPPFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CPPFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
  ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
  
  # Initialize some variables set by options.
-@@ -5147,6 +5147,38 @@
+@@ -5147,6 +5147,38 @@ else
  fi;
  
  
@@ -5723,7 +5669,7 @@ Index: gcc-4.3.3/configure
  # Handle --with-headers=XXX.  If the value is not "yes", the contents of
  # the named directory are copied to $(tooldir)/sys-include.
  if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
-@@ -12825,6 +12857,8 @@
+@@ -12827,6 +12859,8 @@ s,@gmpinc@,$gmpinc,;t t
  s,@stage1_languages@,$stage1_languages,;t t
  s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_CFLAGS_FOR_TARGET,;t t
  s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t
@@ -5735,8 +5681,8 @@ Index: gcc-4.3.3/configure
 Index: gcc-4.3.3/libiberty/Makefile.in
 ===================================================================
 --- gcc-4.3.3.orig/libiberty/Makefile.in	2007-07-24 23:26:45.000000000 -0700
-+++ gcc-4.3.3/libiberty/Makefile.in	2009-04-29 18:03:50.212612133 -0700
-@@ -60,7 +60,7 @@
++++ gcc-4.3.3/libiberty/Makefile.in	2010-05-16 23:26:54.433023190 -0700
+@@ -60,7 +60,7 @@ RANLIB = @RANLIB@
  MAKEINFO = @MAKEINFO@
  PERL = @PERL@
  
@@ -5745,7 +5691,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  
  MAKEOVERRIDES =
  
-@@ -143,10 +143,11 @@
+@@ -143,10 +143,11 @@ CFILES = alloca.c argv.c asprintf.c atex
  	 pex-unix.c pex-win32.c						\
           physmem.c putenv.c						\
  	random.c regex.c rename.c rindex.c				\
@@ -5761,7 +5707,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	tmpnam.c							\
  	unlink-if-ordinary.c						\
  	vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c	\
-@@ -156,7 +157,8 @@
+@@ -156,7 +157,8 @@ CFILES = alloca.c argv.c asprintf.c atex
  
  # These are always included in the library.  The first four are listed
  # first and by compile time to optimize parallel builds.
@@ -5771,7 +5717,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	./alloca.o ./argv.o						\
  	./choose-temp.o ./concat.o ./cp-demint.o			\
  	./dyn-string.o							\
-@@ -473,13 +475,13 @@
+@@ -473,13 +475,13 @@ stamp-h: $(srcdir)/config.in config.stat
  config.status: $(srcdir)/configure
  	$(SHELL) ./config.status --recheck
  
@@ -5787,7 +5733,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	@subdirs='$(SUBDIRS)'; \
  	target=`echo $@ | sed -e 's/-subdir//'`; \
  	for dir in $$subdirs ; do \
-@@ -496,40 +498,41 @@
+@@ -496,40 +498,41 @@ $(CONFIGURED_OFILES): stamp-picdir
  # The dependencies in the remainder of this file are automatically
  # generated by "make maint-deps".  Manual edits will be lost.
  
@@ -5835,7 +5781,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/basename.c -o pic/$@; \
-@@ -548,7 +551,7 @@
+@@ -548,7 +551,7 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/bcopy.c $(OUTPUT_OPTION)
  
@@ -5844,7 +5790,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/bsearch.c -o pic/$@; \
  	else true; fi
-@@ -566,20 +569,21 @@
+@@ -566,20 +569,21 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/calloc.c $(OUTPUT_OPTION)
  
@@ -5869,7 +5815,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/concat.c -o pic/$@; \
  	else true; fi
-@@ -591,7 +595,7 @@
+@@ -591,7 +595,7 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/copysign.c $(OUTPUT_OPTION)
  
@@ -5878,7 +5824,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
  	$(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h
  	if [ x"$(PICFLAG)" != x ]; then \
-@@ -599,7 +603,7 @@
+@@ -599,7 +603,7 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/cp-demangle.c $(OUTPUT_OPTION)
  
@@ -5887,7 +5833,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
  	$(INCDIR)/libiberty.h
  	if [ x"$(PICFLAG)" != x ]; then \
-@@ -607,7 +611,7 @@
+@@ -607,7 +611,7 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/cp-demint.c $(OUTPUT_OPTION)
  
@@ -5896,7 +5842,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
  	$(INCDIR)/safe-ctype.h
  	if [ x"$(PICFLAG)" != x ]; then \
-@@ -615,14 +619,14 @@
+@@ -615,14 +619,14 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/cplus-dem.c $(OUTPUT_OPTION)
  
@@ -5913,7 +5859,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/libiberty.h
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/fdmatch.c -o pic/$@; \
-@@ -635,93 +639,94 @@
+@@ -635,93 +639,94 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/ffs.c $(OUTPUT_OPTION)
  
@@ -6024,7 +5970,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/safe-ctype.h
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/hex.c -o pic/$@; \
-@@ -740,7 +745,7 @@
+@@ -740,7 +745,7 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/insque.c $(OUTPUT_OPTION)
  
@@ -6033,7 +5979,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/filenames.h $(INCDIR)/libiberty.h \
  	$(INCDIR)/safe-ctype.h
  	if [ x"$(PICFLAG)" != x ]; then \
-@@ -748,28 +753,28 @@
+@@ -748,28 +753,28 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/lbasename.c $(OUTPUT_OPTION)
  
@@ -6066,7 +6012,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/md5.c -o pic/$@; \
  	else true; fi
-@@ -811,7 +816,7 @@
+@@ -811,7 +816,7 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/memset.c $(OUTPUT_OPTION)
  
@@ -6075,7 +6021,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/mkstemps.c -o pic/$@; \
  	else true; fi
-@@ -823,41 +828,41 @@
+@@ -823,41 +828,41 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/msdos.c $(OUTPUT_OPTION)
  
@@ -6123,7 +6069,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/libiberty.h $(srcdir)/pex-common.h \
  	$(INCDIR)/safe-ctype.h
  	if [ x"$(PICFLAG)" != x ]; then \
-@@ -865,42 +870,42 @@
+@@ -865,42 +870,42 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/pex-msdos.c $(OUTPUT_OPTION)
  
@@ -6172,7 +6118,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/putenv.c -o pic/$@; \
  	else true; fi
-@@ -912,14 +917,14 @@
+@@ -912,14 +917,14 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/random.c $(OUTPUT_OPTION)
  
@@ -6189,7 +6135,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/rename.c -o pic/$@; \
  	else true; fi
-@@ -938,7 +943,7 @@
+@@ -938,7 +943,7 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/safe-ctype.c $(OUTPUT_OPTION)
  
@@ -6198,7 +6144,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/setenv.c -o pic/$@; \
  	else true; fi
-@@ -956,20 +961,21 @@
+@@ -956,20 +961,21 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/snprintf.c $(OUTPUT_OPTION)
  
@@ -6223,7 +6169,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/libiberty.h $(INCDIR)/splay-tree.h
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/splay-tree.c -o pic/$@; \
-@@ -1006,7 +1012,7 @@
+@@ -1006,7 +1012,7 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/strdup.c $(OUTPUT_OPTION)
  
@@ -6232,7 +6178,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/libiberty.h
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strerror.c -o pic/$@; \
-@@ -1037,7 +1043,7 @@
+@@ -1037,7 +1043,7 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/strrchr.c $(OUTPUT_OPTION)
  
@@ -6241,7 +6187,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/libiberty.h
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strsignal.c -o pic/$@; \
-@@ -1056,13 +1062,13 @@
+@@ -1056,13 +1062,13 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/strtod.c $(OUTPUT_OPTION)
  
@@ -6257,7 +6203,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/safe-ctype.h
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strtoul.c -o pic/$@; \
-@@ -1082,14 +1088,14 @@
+@@ -1082,14 +1088,14 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/tmpnam.c $(OUTPUT_OPTION)
  
@@ -6274,7 +6220,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/libiberty.h
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/vasprintf.c -o pic/$@; \
-@@ -1114,7 +1120,7 @@
+@@ -1114,7 +1120,7 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/vprintf.c $(OUTPUT_OPTION)
  
@@ -6283,7 +6229,7 @@ Index: gcc-4.3.3/libiberty/Makefile.in
  	$(INCDIR)/libiberty.h
  	if [ x"$(PICFLAG)" != x ]; then \
  	  $(COMPILE.c) $(PICFLAG) $(srcdir)/vsnprintf.c -o pic/$@; \
-@@ -1127,54 +1133,54 @@
+@@ -1127,54 +1133,54 @@ $(CONFIGURED_OFILES): stamp-picdir
  	else true; fi
  	$(COMPILE.c) $(srcdir)/vsprintf.c $(OUTPUT_OPTION)
  
@@ -6349,8 +6295,8 @@ Index: gcc-4.3.3/libiberty/Makefile.in
 Index: gcc-4.3.3/libiberty/configure
 ===================================================================
 --- gcc-4.3.3.orig/libiberty/configure	2007-07-17 10:52:28.000000000 -0700
-+++ gcc-4.3.3/libiberty/configure	2009-04-29 18:03:50.224612238 -0700
-@@ -309,7 +309,7 @@
++++ gcc-4.3.3/libiberty/configure	2010-05-16 23:26:54.433023190 -0700
+@@ -309,7 +309,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
@@ -6359,7 +6305,7 @@ Index: gcc-4.3.3/libiberty/configure
  ac_subst_files='host_makefile_frag'
  
  # Initialize some variables set by options.
-@@ -3699,9 +3699,7 @@
+@@ -3699,9 +3699,7 @@ case "${host}" in
  esac
  
  if [ -n "${frag}" ]; then
@@ -6370,7 +6316,7 @@ Index: gcc-4.3.3/libiberty/configure
  fi
  
  # If they didn't specify --enable-shared, don't generate shared libs.
-@@ -3712,34 +3710,35 @@
+@@ -3712,34 +3710,35 @@ case "${enable_shared}" in
    *) shared=yes ;;
  esac
  if [ "${shared}" = "yes" ]; then
@@ -6425,7 +6371,7 @@ Index: gcc-4.3.3/libiberty/configure
  
  # record if we want to build shared libs.
  if [ "${shared}" = "yes" ]; then
-@@ -9671,6 +9670,7 @@
+@@ -9671,6 +9670,7 @@ s,@OUTPUT_OPTION@,$OUTPUT_OPTION,;t t
  s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
  s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
  s,@INSTALL_DATA@,$INSTALL_DATA,;t t
@@ -6436,8 +6382,8 @@ Index: gcc-4.3.3/libiberty/configure
 Index: gcc-4.3.3/libiberty/configure.ac
 ===================================================================
 --- gcc-4.3.3.orig/libiberty/configure.ac	2007-07-17 10:52:28.000000000 -0700
-+++ gcc-4.3.3/libiberty/configure.ac	2009-04-29 18:03:50.224612238 -0700
-@@ -187,9 +187,7 @@
++++ gcc-4.3.3/libiberty/configure.ac	2010-05-16 23:26:54.433023190 -0700
+@@ -187,9 +187,7 @@ case "${host}" in
  esac
  
  if [[ -n "${frag}" ]]; then
@@ -6448,7 +6394,7 @@ Index: gcc-4.3.3/libiberty/configure.ac
  fi
  
  # If they didn't specify --enable-shared, don't generate shared libs.
-@@ -200,34 +198,35 @@
+@@ -200,34 +198,35 @@ case "${enable_shared}" in
    *) shared=yes ;;
  esac
  if [[ "${shared}" = "yes" ]]; then
@@ -6503,189 +6449,3 @@ Index: gcc-4.3.3/libiberty/configure.ac
  
  # record if we want to build shared libs.
  if [[ "${shared}" = "yes" ]]; then
-Index: gcc-4.3.3/gcc/Makefile.in
-===================================================================
---- gcc-4.3.3.orig/gcc/Makefile.in	2009-04-29 17:55:20.000000000 -0700
-+++ gcc-4.3.3/gcc/Makefile.in	2009-04-29 18:03:50.236612117 -0700
-@@ -689,7 +689,7 @@
- BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR_FILE
- 
- # Native linker and preprocessor flags.  For x-fragment overrides.
--BUILD_LDFLAGS=$(LDFLAGS)
-+BUILD_LDFLAGS=@BUILD_LDFLAGS@
- BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
- 
- # Actual name to use when installing a native compiler.
-Index: gcc-4.3.3/gcc/configure
-===================================================================
---- gcc-4.3.3.orig/gcc/configure	2009-04-29 17:55:27.000000000 -0700
-+++ gcc-4.3.3/gcc/configure	2009-04-29 18:03:50.256611768 -0700
-@@ -458,7 +458,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
- ac_subst_files='language_hooks'
- 
- # Initialize some variables set by options.
-@@ -12972,6 +12972,7 @@
- 	esac
- 	saved_CFLAGS="${CFLAGS}"
- 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
-+	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
- 	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
- 		--enable-languages=${enable_languages-all} \
- 		--target=$target_alias --host=$build_alias --build=$build_alias
-@@ -13469,6 +13470,7 @@
- # These are the normal (build=host) settings:
- CC_FOR_BUILD='$(CC)'
- BUILD_CFLAGS='$(ALL_CFLAGS)'
-+BUILD_LDFLAGS='$(LDFLAGS)'
- STMP_FIXINC=stmp-fixinc
- 
- # Possibly disable fixproto, on a per-target basis.
-@@ -13486,6 +13488,7 @@
- if test x$build != x$host || test "x$coverage_flags" != x
- then
-     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
-+    BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
- 
-     if test "x$TARGET_SYSTEM_ROOT" = x; then
- 	if test "x$STMP_FIXPROTO" != x; then
-@@ -14064,13 +14067,13 @@
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:14067: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:14070: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:14070: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:14073: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:14073: output\"" >&5)
-+  (eval echo "\"\$as_me:14076: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -15125,7 +15128,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 15128 "configure"' > conftest.$ac_ext
-+  echo '#line 15131 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -15745,11 +15748,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15748: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15751: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:15752: \$? = $ac_status" >&5
-+   echo "$as_me:15755: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -16067,11 +16070,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16070: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16073: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16074: \$? = $ac_status" >&5
-+   echo "$as_me:16077: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -16172,11 +16175,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16175: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16178: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16179: \$? = $ac_status" >&5
-+   echo "$as_me:16182: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -16227,11 +16230,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16230: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16233: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16234: \$? = $ac_status" >&5
-+   echo "$as_me:16237: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -19024,7 +19027,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 19027 "configure"
-+#line 19030 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -19124,7 +19127,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 19127 "configure"
-+#line 19130 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -23934,6 +23937,7 @@
- s,@inhibit_libc@,$inhibit_libc,;t t
- s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
- s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
-+s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t
- s,@STMP_FIXINC@,$STMP_FIXINC,;t t
- s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t
- s,@collect2@,$collect2,;t t
-Index: gcc-4.3.3/gcc/configure.ac
-===================================================================
---- gcc-4.3.3.orig/gcc/configure.ac	2009-04-29 17:55:27.000000000 -0700
-+++ gcc-4.3.3/gcc/configure.ac	2009-04-29 18:03:50.264611238 -0700
-@@ -1480,6 +1480,7 @@
- 	esac
- 	saved_CFLAGS="${CFLAGS}"
- 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
-+	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
- 	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
- 		--enable-languages=${enable_languages-all} \
- 		--target=$target_alias --host=$build_alias --build=$build_alias
-@@ -1776,6 +1777,7 @@
- # These are the normal (build=host) settings:
- CC_FOR_BUILD='$(CC)'		AC_SUBST(CC_FOR_BUILD)
- BUILD_CFLAGS='$(ALL_CFLAGS)'	AC_SUBST(BUILD_CFLAGS)
-+BUILD_LDFLAGS='$(LDFLAGS)'	AC_SUBST(BUILD_LDFLAGS)
- STMP_FIXINC=stmp-fixinc		AC_SUBST(STMP_FIXINC)
- 
- # Possibly disable fixproto, on a per-target basis.
-@@ -1793,6 +1795,7 @@
- if test x$build != x$host || test "x$coverage_flags" != x
- then
-     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
-+    BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
- 
-     if test "x$TARGET_SYSTEM_ROOT" = x; then
- 	if test "x$STMP_FIXPROTO" != x; then
diff --git a/recipes/gcc/gcc-4.3.3/gcc-flags-for-build.patch b/recipes/gcc/gcc-4.3.3/gcc-flags-for-build.patch
index 43a9d73dcf..554b94844a 100644
--- a/recipes/gcc/gcc-4.3.3/gcc-flags-for-build.patch
+++ b/recipes/gcc/gcc-4.3.3/gcc-flags-for-build.patch
@@ -1,8 +1,8 @@
-Index: gcc-4.3.2/Makefile.def
+Index: gcc-4.3.3/Makefile.def
 ===================================================================
---- gcc-4.3.2.orig/Makefile.def	2008-08-28 18:21:19.000000000 -0700
-+++ gcc-4.3.2/Makefile.def	2008-08-28 18:21:41.000000000 -0700
-@@ -207,6 +207,7 @@
+--- gcc-4.3.3.orig/Makefile.def	2007-10-23 08:53:18.000000000 -0700
++++ gcc-4.3.3/Makefile.def	2010-05-16 18:51:00.933014111 -0700
+@@ -207,6 +207,7 @@ flags_to_pass = { flag= target_alias ; }
  flags_to_pass = { flag= BISON ; };
  flags_to_pass = { flag= CC_FOR_BUILD ; };
  flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
@@ -10,52 +10,50 @@ Index: gcc-4.3.2/Makefile.def
  flags_to_pass = { flag= CXX_FOR_BUILD ; };
  flags_to_pass = { flag= EXPECT ; };
  flags_to_pass = { flag= FLEX ; };
-Index: gcc-4.3.2/gcc/Makefile.in
+Index: gcc-4.3.3/gcc/Makefile.in
 ===================================================================
---- gcc-4.3.2.orig/gcc/Makefile.in	2008-08-28 18:21:20.000000000 -0700
-+++ gcc-4.3.2/gcc/Makefile.in	2008-08-28 18:21:41.000000000 -0700
-@@ -673,7 +673,7 @@
+--- gcc-4.3.3.orig/gcc/Makefile.in	2010-05-16 17:27:08.000000000 -0700
++++ gcc-4.3.3/gcc/Makefile.in	2010-05-16 18:52:35.760534304 -0700
+@@ -690,7 +690,7 @@ BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR
  
  # Native linker and preprocessor flags.  For x-fragment overrides.
- BUILD_LDFLAGS=@BUILD_LDFLAGS@
+ BUILD_LDFLAGS=$(LDFLAGS)
 -BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
 +BUILD_CPPFLAGS=$(INCLUDES) @BUILD_CPPFLAGS@ $(X_CPPFLAGS)
  
  # Actual name to use when installing a native compiler.
  GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
-Index: gcc-4.3.2/gcc/configure.ac
+Index: gcc-4.3.3/gcc/configure.ac
 ===================================================================
---- gcc-4.3.2.orig/gcc/configure.ac	2008-08-28 18:21:20.000000000 -0700
-+++ gcc-4.3.2/gcc/configure.ac	2008-08-28 18:21:41.000000000 -0700
-@@ -1775,10 +1775,11 @@
+--- gcc-4.3.3.orig/gcc/configure.ac	2010-05-16 17:27:04.000000000 -0700
++++ gcc-4.3.3/gcc/configure.ac	2010-05-16 18:57:15.600630389 -0700
+@@ -1774,9 +1774,10 @@ AC_SUBST(inhibit_libc)
  # Also, we cannot run fixincludes or fix-header.
  
  # These are the normal (build=host) settings:
 -CC_FOR_BUILD='$(CC)'		AC_SUBST(CC_FOR_BUILD)
 -BUILD_CFLAGS='$(ALL_CFLAGS)'	AC_SUBST(BUILD_CFLAGS)
--BUILD_LDFLAGS='$(LDFLAGS)'	AC_SUBST(BUILD_LDFLAGS)
 -STMP_FIXINC=stmp-fixinc		AC_SUBST(STMP_FIXINC)
 +CC_FOR_BUILD='$(CC)'			AC_SUBST(CC_FOR_BUILD)
 +BUILD_CFLAGS='$(ALL_CFLAGS)'		AC_SUBST(BUILD_CFLAGS)
-+BUILD_LDFLAGS='$(LDFLAGS)'		AC_SUBST(BUILD_LDFLAGS)
 +BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'	AC_SUBST(BUILD_CPPFLAGS)
 +STMP_FIXINC=stmp-fixinc			AC_SUBST(STMP_FIXINC)
  
  # Possibly disable fixproto, on a per-target basis.
  case ${use_fixproto} in
-@@ -1796,6 +1797,7 @@
+@@ -1793,6 +1794,7 @@ AC_SUBST(STMP_FIXPROTO)
+ if test x$build != x$host || test "x$coverage_flags" != x
  then
      BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
-     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
 +    BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
  
      if test "x$TARGET_SYSTEM_ROOT" = x; then
  	if test "x$STMP_FIXPROTO" != x; then
-Index: gcc-4.3.2/Makefile.in
+Index: gcc-4.3.3/Makefile.in
 ===================================================================
---- gcc-4.3.2.orig/Makefile.in	2008-08-28 18:21:20.000000000 -0700
-+++ gcc-4.3.2/Makefile.in	2008-08-28 18:21:41.000000000 -0700
-@@ -272,6 +272,7 @@
+--- gcc-4.3.3.orig/Makefile.in	2010-05-16 18:50:32.000000000 -0700
++++ gcc-4.3.3/Makefile.in	2010-05-16 18:51:00.953026222 -0700
+@@ -256,6 +256,7 @@ AR_FOR_BUILD = @AR_FOR_BUILD@
  AS_FOR_BUILD = @AS_FOR_BUILD@
  CC_FOR_BUILD = @CC_FOR_BUILD@
  CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
@@ -63,7 +61,7 @@ Index: gcc-4.3.2/Makefile.in
  CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
  CXX_FOR_BUILD = @CXX_FOR_BUILD@
  DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
-@@ -502,6 +503,7 @@
+@@ -490,6 +491,7 @@ BASE_FLAGS_TO_PASS = \
  	"BISON=$(BISON)" \
  	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
  	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
@@ -71,148 +69,148 @@ Index: gcc-4.3.2/Makefile.in
  	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
  	"EXPECT=$(EXPECT)" \
  	"FLEX=$(FLEX)" \
-Index: gcc-4.3.2/gcc/configure
+Index: gcc-4.3.3/gcc/configure
 ===================================================================
---- gcc-4.3.2.orig/gcc/configure	2008-08-28 18:21:20.000000000 -0700
-+++ gcc-4.3.2/gcc/configure	2008-08-28 18:21:50.000000000 -0700
-@@ -458,7 +458,7 @@
+--- gcc-4.3.3.orig/gcc/configure	2010-05-16 17:27:04.000000000 -0700
++++ gcc-4.3.3/gcc/configure	2010-05-16 19:01:39.473013538 -0700
+@@ -458,7 +458,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS BUILD_CPPFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_CPPFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
  ac_subst_files='language_hooks'
  
  # Initialize some variables set by options.
-@@ -13471,6 +13471,7 @@
+@@ -13469,6 +13469,7 @@ fi
+ # These are the normal (build=host) settings:
  CC_FOR_BUILD='$(CC)'
  BUILD_CFLAGS='$(ALL_CFLAGS)'
- BUILD_LDFLAGS='$(LDFLAGS)'
 +BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'
  STMP_FIXINC=stmp-fixinc
  
  # Possibly disable fixproto, on a per-target basis.
-@@ -13489,6 +13490,7 @@
+@@ -13486,6 +13487,7 @@ esac
+ if test x$build != x$host || test "x$coverage_flags" != x
  then
      BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
-     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
 +    BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
  
      if test "x$TARGET_SYSTEM_ROOT" = x; then
  	if test "x$STMP_FIXPROTO" != x; then
-@@ -14067,13 +14069,13 @@
+@@ -14064,13 +14066,13 @@ if test "${lt_cv_nm_interface+set}" = se
  else
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:14070: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:14072: $ac_compile\"" >&5)
+-  (eval echo "\"\$as_me:14067: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:14069: $ac_compile\"" >&5)
    (eval "$ac_compile" 2>conftest.err)
    cat conftest.err >&5
--  (eval echo "\"\$as_me:14073: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:14075: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+-  (eval echo "\"\$as_me:14070: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:14072: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    cat conftest.err >&5
--  (eval echo "\"\$as_me:14076: output\"" >&5)
-+  (eval echo "\"\$as_me:14078: output\"" >&5)
+-  (eval echo "\"\$as_me:14073: output\"" >&5)
++  (eval echo "\"\$as_me:14075: output\"" >&5)
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
-@@ -15128,7 +15130,7 @@
+@@ -15125,7 +15127,7 @@ ia64-*-hpux*)
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 15131 "configure"' > conftest.$ac_ext
-+  echo '#line 15133 "configure"' > conftest.$ac_ext
+-  echo '#line 15128 "configure"' > conftest.$ac_ext
++  echo '#line 15130 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -15748,11 +15750,11 @@
+@@ -15745,11 +15747,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15751: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15753: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15748: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15750: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:15755: \$? = $ac_status" >&5
-+   echo "$as_me:15757: \$? = $ac_status" >&5
+-   echo "$as_me:15752: \$? = $ac_status" >&5
++   echo "$as_me:15754: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16070,11 +16072,11 @@
+@@ -16067,11 +16069,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16073: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16075: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16070: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16072: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16077: \$? = $ac_status" >&5
-+   echo "$as_me:16079: \$? = $ac_status" >&5
+-   echo "$as_me:16074: \$? = $ac_status" >&5
++   echo "$as_me:16076: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16175,11 +16177,11 @@
+@@ -16172,11 +16174,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16178: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16180: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16175: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16177: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16182: \$? = $ac_status" >&5
-+   echo "$as_me:16184: \$? = $ac_status" >&5
+-   echo "$as_me:16179: \$? = $ac_status" >&5
++   echo "$as_me:16181: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -16230,11 +16232,11 @@
+@@ -16227,11 +16229,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16233: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16235: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16230: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16232: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16237: \$? = $ac_status" >&5
-+   echo "$as_me:16239: \$? = $ac_status" >&5
+-   echo "$as_me:16234: \$? = $ac_status" >&5
++   echo "$as_me:16236: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -19027,7 +19029,7 @@
+@@ -19024,7 +19026,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 19030 "configure"
-+#line 19032 "configure"
+-#line 19027 "configure"
++#line 19029 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -19127,7 +19129,7 @@
+@@ -19124,7 +19126,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 19130 "configure"
-+#line 19132 "configure"
+-#line 19127 "configure"
++#line 19129 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -23938,6 +23940,7 @@
+@@ -23934,6 +23936,7 @@ s,@SYSTEM_HEADER_DIR@,$SYSTEM_HEADER_DIR
+ s,@inhibit_libc@,$inhibit_libc,;t t
  s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
  s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
- s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t
 +s,@BUILD_CPPFLAGS@,$BUILD_CPPFLAGS,;t t
  s,@STMP_FIXINC@,$STMP_FIXINC,;t t
  s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t
  s,@collect2@,$collect2,;t t
-Index: gcc-4.3.2/Makefile.tpl
+Index: gcc-4.3.3/Makefile.tpl
 ===================================================================
---- gcc-4.3.2.orig/Makefile.tpl	2008-08-28 18:21:20.000000000 -0700
-+++ gcc-4.3.2/Makefile.tpl	2008-08-28 18:21:41.000000000 -0700
-@@ -275,6 +275,7 @@
+--- gcc-4.3.3.orig/Makefile.tpl	2010-05-16 18:49:57.000000000 -0700
++++ gcc-4.3.3/Makefile.tpl	2010-05-16 18:51:00.980591667 -0700
+@@ -259,6 +259,7 @@ AR_FOR_BUILD = @AR_FOR_BUILD@
  AS_FOR_BUILD = @AS_FOR_BUILD@
  CC_FOR_BUILD = @CC_FOR_BUILD@
  CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
@@ -220,20 +218,20 @@ Index: gcc-4.3.2/Makefile.tpl
  CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
  CXX_FOR_BUILD = @CXX_FOR_BUILD@
  DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
-Index: gcc-4.3.2/configure
+Index: gcc-4.3.3/configure
 ===================================================================
---- gcc-4.3.2.orig/configure	2008-08-28 18:21:20.000000000 -0700
-+++ gcc-4.3.2/configure	2008-08-28 18:21:41.000000000 -0700
-@@ -272,7 +272,7 @@
+--- gcc-4.3.3.orig/configure	2010-05-16 17:27:05.700521719 -0700
++++ gcc-4.3.3/configure	2010-05-16 19:02:27.520529425 -0700
+@@ -272,7 +272,7 @@ PACKAGE_STRING=
  PACKAGE_BUGREPORT=
  
  ac_unique_file="move-if-change"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CPPFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CPPFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
  ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
  
  # Initialize some variables set by options.
-@@ -5914,6 +5914,7 @@
+@@ -5882,6 +5882,7 @@ esac
  # our build compiler if desired.
  if test x"${build}" = x"${host}" ; then
    CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
@@ -241,7 +239,7 @@ Index: gcc-4.3.2/configure
    CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
    LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
  fi
-@@ -5991,6 +5992,7 @@
+@@ -5959,6 +5960,7 @@ done
  
  
  
@@ -249,7 +247,7 @@ Index: gcc-4.3.2/configure
  # Generate default definitions for YACC, M4, LEX and other programs that run
  # on the build machine.  These are used if the Makefile can't locate these
  # programs in objdir.
-@@ -12874,6 +12876,7 @@
+@@ -12840,6 +12842,7 @@ s,@AR_FOR_BUILD@,$AR_FOR_BUILD,;t t
  s,@AS_FOR_BUILD@,$AS_FOR_BUILD,;t t
  s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
  s,@CFLAGS_FOR_BUILD@,$CFLAGS_FOR_BUILD,;t t
@@ -257,11 +255,11 @@ Index: gcc-4.3.2/configure
  s,@CXXFLAGS_FOR_BUILD@,$CXXFLAGS_FOR_BUILD,;t t
  s,@CXX_FOR_BUILD@,$CXX_FOR_BUILD,;t t
  s,@DLLTOOL_FOR_BUILD@,$DLLTOOL_FOR_BUILD,;t t
-Index: gcc-4.3.2/configure.ac
+Index: gcc-4.3.3/configure.ac
 ===================================================================
---- gcc-4.3.2.orig/configure.ac	2008-08-28 18:21:20.000000000 -0700
-+++ gcc-4.3.2/configure.ac	2008-08-28 18:21:41.000000000 -0700
-@@ -2425,6 +2425,7 @@
+--- gcc-4.3.3.orig/configure.ac	2010-05-16 17:27:05.000000000 -0700
++++ gcc-4.3.3/configure.ac	2010-05-16 18:51:00.990613402 -0700
+@@ -2393,6 +2393,7 @@ esac
  # our build compiler if desired.
  if test x"${build}" = x"${host}" ; then
    CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
@@ -269,7 +267,7 @@ Index: gcc-4.3.2/configure.ac
    CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
    LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
  fi
-@@ -2489,6 +2490,7 @@
+@@ -2457,6 +2458,7 @@ AC_SUBST(AR_FOR_BUILD)
  AC_SUBST(AS_FOR_BUILD)
  AC_SUBST(CC_FOR_BUILD)
  AC_SUBST(CFLAGS_FOR_BUILD)
diff --git a/recipes/gcc/gcc-4.3.3/gcc-pr36218.patch b/recipes/gcc/gcc-4.3.3/gcc-pr36218.patch
new file mode 100644
index 0000000000..f025327741
--- /dev/null
+++ b/recipes/gcc/gcc-4.3.3/gcc-pr36218.patch
@@ -0,0 +1,345 @@
+http://gcc.gnu.org/viewcvs?view=revision&revision=136563
+
+2008-06-08  Joseph Myers  <joseph@codesourcery.com>
+
+	PR tree-optimization/36218
+	* Makefile.def (flags_to_pass): Add LDFLAGS_FOR_BUILD.
+	* Makefile.tpl (EXTRA_BUILD_FLAGS): Define.
+	(all prefix="build-"): Pass them to build-system sub-makes.
+	* Makefile.in: Regenerate.
+
+config:
+	* config/mh-mingw (LDFLAGS): Define.
+
+gcc:
+	* configure.ac: Use LDFLAGS="${LDFLAGS_FOR_BUILD}" when running
+	configure for the build system.
+	(BUILD_LDFLAGS): Define.
+	* configure: Regenerate.
+	* Makefile.in (BUILD_LDFLAGS): Define to @BUILD_LDFLAGS@.
+
+
+Index: gcc-4.3.3/Makefile.def
+===================================================================
+--- gcc-4.3.3.orig/Makefile.def	2010-05-16 23:08:16.000000000 -0700
++++ gcc-4.3.3/Makefile.def	2010-05-16 23:09:17.130520085 -0700
+@@ -215,6 +215,7 @@ flags_to_pass = { flag= INSTALL ; };
+ flags_to_pass = { flag= INSTALL_DATA ; };
+ flags_to_pass = { flag= INSTALL_PROGRAM ; };
+ flags_to_pass = { flag= INSTALL_SCRIPT ; };
++flags_to_pass = { flag= LDFLAGS_FOR_BUILD ; };
+ flags_to_pass = { flag= LEX ; };
+ flags_to_pass = { flag= M4 ; };
+ flags_to_pass = { flag= MAKE ; };
+Index: gcc-4.3.3/Makefile.in
+===================================================================
+--- gcc-4.3.3.orig/Makefile.in	2010-05-16 23:08:16.000000000 -0700
++++ gcc-4.3.3/Makefile.in	2010-05-16 23:10:22.000000000 -0700
+@@ -136,6 +136,12 @@ BUILD_EXPORTS = \
+ 	WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
+ 	WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
+ 
++# These variables must be set on the make command line for directories
++# built for the build system to override those in BASE_FLAGS_TO_PASSS.
++EXTRA_BUILD_FLAGS = \
++	CFLAGS="$(CFLAGS_FOR_BUILD)" \
++	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
++
+ # This is the list of directories to built for the host system.
+ SUBDIRS = @configdirs@
+ # This is set by the configure script to the arguments to use when configuring
+@@ -499,6 +505,7 @@ BASE_FLAGS_TO_PASS = \
+ 	"INSTALL_DATA=$(INSTALL_DATA)" \
+ 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+ 	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
++	"LDFLAGS_FOR_BUILD=$(LDFLAGS_FOR_BUILD)" \
+ 	"LEX=$(LEX)" \
+ 	"M4=$(M4)" \
+ 	"MAKE=$(MAKE)" \
+@@ -2741,7 +2748,7 @@ all-build-libiberty: configure-build-lib
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/libiberty && \
+-	  $(MAKE)   $(TARGET-build-libiberty))
++	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-libiberty))
+ @endif build-libiberty
+ 
+ 
+@@ -2796,7 +2803,7 @@ all-build-bison: configure-build-bison
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/bison && \
+-	  $(MAKE)   $(TARGET-build-bison))
++	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-bison))
+ @endif build-bison
+ 
+ 
+@@ -2851,7 +2858,7 @@ all-build-byacc: configure-build-byacc
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/byacc && \
+-	  $(MAKE)   $(TARGET-build-byacc))
++	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-byacc))
+ @endif build-byacc
+ 
+ 
+@@ -2906,7 +2913,7 @@ all-build-flex: configure-build-flex
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/flex && \
+-	  $(MAKE)   $(TARGET-build-flex))
++	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-flex))
+ @endif build-flex
+ 
+ 
+@@ -2961,7 +2968,7 @@ all-build-m4: configure-build-m4
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/m4 && \
+-	  $(MAKE)   $(TARGET-build-m4))
++	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-m4))
+ @endif build-m4
+ 
+ 
+@@ -3016,7 +3023,7 @@ all-build-texinfo: configure-build-texin
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/texinfo && \
+-	  $(MAKE)   $(TARGET-build-texinfo))
++	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-texinfo))
+ @endif build-texinfo
+ 
+ 
+@@ -3071,7 +3078,7 @@ all-build-fixincludes: configure-build-f
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(BUILD_EXPORTS) \
+ 	(cd $(BUILD_SUBDIR)/fixincludes && \
+-	  $(MAKE)   $(TARGET-build-fixincludes))
++	  $(MAKE) $(EXTRA_BUILD_FLAGS)  $(TARGET-build-fixincludes))
+ @endif build-fixincludes
+ 
+ 
+Index: gcc-4.3.3/Makefile.tpl
+===================================================================
+--- gcc-4.3.3.orig/Makefile.tpl	2010-05-16 23:08:16.000000000 -0700
++++ gcc-4.3.3/Makefile.tpl	2010-05-16 23:09:17.170555760 -0700
+@@ -139,6 +139,12 @@ BUILD_EXPORTS = \
+ 	WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
+ 	WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
+ 
++# These variables must be set on the make command line for directories
++# built for the build system to override those in BASE_FLAGS_TO_PASSS.
++EXTRA_BUILD_FLAGS = \
++	CFLAGS="$(CFLAGS_FOR_BUILD)" \
++	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
++
+ # This is the list of directories to built for the host system.
+ SUBDIRS = @configdirs@
+ # This is set by the configure script to the arguments to use when configuring
+@@ -947,7 +953,8 @@ clean-stage[+id+]-[+prefix+][+module+]:
+ 	     target_alias=(get "target" "${target_alias}")
+ 	     args="$(BUILD_CONFIGARGS)" no-config-site=true +]
+ 
+-[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +]
++[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)"
++	     args="$(EXTRA_BUILD_FLAGS)" +]
+ [+ ENDFOR build_module +]
+ 
+ # --------------------------------------
+Index: gcc-4.3.3/config/mh-mingw
+===================================================================
+--- gcc-4.3.3.orig/config/mh-mingw	2007-09-06 08:42:02.000000000 -0700
++++ gcc-4.3.3/config/mh-mingw	2010-05-16 23:09:17.170555760 -0700
+@@ -1,3 +1,6 @@
+ # Add -D__USE_MINGW_ACCESS to enable the built compiler to work on Windows
+ # Vista (see PR33281 for details).
+ BOOT_CFLAGS += -D__USE_MINGW_ACCESS
++# Increase stack limit to same as Linux default.
++LDFLAGS = -Wl,--stack,8388608
++
+Index: gcc-4.3.3/gcc/Makefile.in
+===================================================================
+--- gcc-4.3.3.orig/gcc/Makefile.in	2010-05-16 23:08:16.000000000 -0700
++++ gcc-4.3.3/gcc/Makefile.in	2010-05-16 23:10:11.430519728 -0700
+@@ -689,7 +689,7 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
+ BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR_FILE
+ 
+ # Native linker and preprocessor flags.  For x-fragment overrides.
+-BUILD_LDFLAGS=$(LDFLAGS)
++BUILD_LDFLAGS=@BUILD_LDFLAGS@
+ BUILD_CPPFLAGS=$(INCLUDES) @BUILD_CPPFLAGS@ $(X_CPPFLAGS)
+ 
+ # Actual name to use when installing a native compiler.
+Index: gcc-4.3.3/gcc/configure
+===================================================================
+--- gcc-4.3.3.orig/gcc/configure	2010-05-16 23:08:16.000000000 -0700
++++ gcc-4.3.3/gcc/configure	2010-05-16 23:09:17.170555760 -0700
+@@ -458,7 +458,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_CPPFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS BUILD_CPPFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
+ ac_subst_files='language_hooks'
+ 
+ # Initialize some variables set by options.
+@@ -12972,6 +12972,7 @@ else
+ 	esac
+ 	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
++	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+ 	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
+ 		--enable-languages=${enable_languages-all} \
+ 		--target=$target_alias --host=$build_alias --build=$build_alias
+@@ -13469,6 +13470,7 @@ fi
+ # These are the normal (build=host) settings:
+ CC_FOR_BUILD='$(CC)'
+ BUILD_CFLAGS='$(ALL_CFLAGS)'
++BUILD_LDFLAGS='$(LDFLAGS)'
+ BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'
+ STMP_FIXINC=stmp-fixinc
+ 
+@@ -13488,6 +13490,7 @@ if test x$build != x$host || test "x$cov
+ then
+     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
+     BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
++    BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
+ 
+     if test "x$TARGET_SYSTEM_ROOT" = x; then
+ 	if test "x$STMP_FIXPROTO" != x; then
+@@ -14066,13 +14069,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:14069: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:14072: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:14072: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:14075: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:14075: output\"" >&5)
++  (eval echo "\"\$as_me:14078: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -15127,7 +15130,7 @@ ia64-*-hpux*)
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 15130 "configure"' > conftest.$ac_ext
++  echo '#line 15133 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -15747,11 +15750,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15750: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15753: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15754: \$? = $ac_status" >&5
++   echo "$as_me:15757: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -16069,11 +16072,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16072: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16075: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16076: \$? = $ac_status" >&5
++   echo "$as_me:16079: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -16174,11 +16177,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16177: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16180: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16181: \$? = $ac_status" >&5
++   echo "$as_me:16184: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -16229,11 +16232,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16232: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16235: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16236: \$? = $ac_status" >&5
++   echo "$as_me:16239: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -19026,7 +19029,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 19029 "configure"
++#line 19032 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -19126,7 +19129,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 19129 "configure"
++#line 19132 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -23936,6 +23939,7 @@ s,@SYSTEM_HEADER_DIR@,$SYSTEM_HEADER_DIR
+ s,@inhibit_libc@,$inhibit_libc,;t t
+ s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
+ s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
++s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t
+ s,@BUILD_CPPFLAGS@,$BUILD_CPPFLAGS,;t t
+ s,@STMP_FIXINC@,$STMP_FIXINC,;t t
+ s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t
+Index: gcc-4.3.3/gcc/configure.ac
+===================================================================
+--- gcc-4.3.3.orig/gcc/configure.ac	2010-05-16 23:08:16.000000000 -0700
++++ gcc-4.3.3/gcc/configure.ac	2010-05-16 23:09:17.180525673 -0700
+@@ -1480,6 +1480,7 @@ else
+ 	esac
+ 	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
++	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+ 	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
+ 		--enable-languages=${enable_languages-all} \
+ 		--target=$target_alias --host=$build_alias --build=$build_alias
+@@ -1776,6 +1777,7 @@ AC_SUBST(inhibit_libc)
+ # These are the normal (build=host) settings:
+ CC_FOR_BUILD='$(CC)'			AC_SUBST(CC_FOR_BUILD)
+ BUILD_CFLAGS='$(ALL_CFLAGS)'		AC_SUBST(BUILD_CFLAGS)
++BUILD_LDFLAGS='$(LDFLAGS)'		AC_SUBST(BUILD_LDFLAGS)
+ BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'	AC_SUBST(BUILD_CPPFLAGS)
+ STMP_FIXINC=stmp-fixinc			AC_SUBST(STMP_FIXINC)
+ 
+@@ -1795,6 +1797,7 @@ if test x$build != x$host || test "x$cov
+ then
+     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
+     BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
++    BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
+ 
+     if test "x$TARGET_SYSTEM_ROOT" = x; then
+ 	if test "x$STMP_FIXPROTO" != x; then
diff --git a/recipes/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch b/recipes/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch
index a7722cbfc4..d915b911ba 100644
--- a/recipes/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch
+++ b/recipes/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch
@@ -2,27 +2,27 @@ upstream: n/a
 comment: Use the preprocessor we have just compiled instead the one of
 the system. There might be incompabilities between us and them.
 
-Index: gcc-4.3.1/Makefile.in
+Index: gcc-4.3.3/Makefile.in
 ===================================================================
---- gcc-4.3.1.orig/Makefile.in	2008-08-19 01:09:56.000000000 -0700
-+++ gcc-4.3.1/Makefile.in	2008-08-19 01:13:27.000000000 -0700
-@@ -204,6 +204,7 @@
+--- gcc-4.3.3.orig/Makefile.in	2010-05-16 17:27:06.000000000 -0700
++++ gcc-4.3.3/Makefile.in	2010-05-16 18:50:32.363015133 -0700
+@@ -204,6 +204,7 @@ BASE_TARGET_EXPORTS = \
  	AR="$(AR_FOR_TARGET)"; export AR; \
  	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
  	CC="$(CC_FOR_TARGET)"; export CC; \
 +	CPP="$(CC_FOR_TARGET) -E"; export CPP; \
- 	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
  	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
  	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
-Index: gcc-4.3.1/Makefile.tpl
+Index: gcc-4.3.3/Makefile.tpl
 ===================================================================
---- gcc-4.3.1.orig/Makefile.tpl	2008-08-21 00:07:58.000000000 -0700
-+++ gcc-4.3.1/Makefile.tpl	2008-08-21 00:09:52.000000000 -0700
-@@ -223,6 +223,7 @@
+--- gcc-4.3.3.orig/Makefile.tpl	2010-05-16 17:27:06.000000000 -0700
++++ gcc-4.3.3/Makefile.tpl	2010-05-16 18:49:57.221575513 -0700
+@@ -207,6 +207,7 @@ BASE_TARGET_EXPORTS = \
  	AR="$(AR_FOR_TARGET)"; export AR; \
  	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
  	CC="$(CC_FOR_TARGET)"; export CC; \
 +	CPP="$(CC_FOR_TARGET) -E"; export CPP; \
- 	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
  	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
  	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
diff --git a/recipes/gcc/gcc-4.3.4.inc b/recipes/gcc/gcc-4.3.4.inc
index d214bfb1dc..9711813085 100644
--- a/recipes/gcc/gcc-4.3.4.inc
+++ b/recipes/gcc/gcc-4.3.4.inc
@@ -6,91 +6,92 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r8"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-ppc32-retaddr.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr27898.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr32139.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-pr33763.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh330771.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh341221.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-cpp-pragma.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-java-debug-iface-type.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-libgomp-speedup.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-i386-libgomp.patch;patch=1;pnum=0 \
-	file://fedora/gcc43-rh251682.patch;patch=1;pnum=0 \
-	file://debian/arm-unbreak-eabi-armv4t.dpatch;patch=1 \
-	file://debian/libstdc++-pic.dpatch;patch=1;pnum=0 \
-	file://debian/gcc-ice-hack.dpatch;patch=1;pnum=0 \ 
-	file://debian/pr30961.dpatch;patch=1;pnum=0 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://103-uclibc-conf-noupstream.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://203-uclibc-locale-no__x.patch;patch=1 \
-	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-	file://205-uclibc-locale-update.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-	file://306-libstdc++-namespace.patch;patch=1 \
-	file://307-locale_facets.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://904-flatten-switch-stmt-00.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran-4.3.x.patch;patch=1 \
-	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-#	file://pr34130.patch;patch=1 \
-#	file://fortran-static-linking.patch;patch=1 \
-	file://gcc-arm-frename-registers.patch;patch=1 \
-	file://gcc-4.3.4-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
-	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://gcc-flags-for-build.patch;patch=1 \
+	file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
+	file://fedora/gcc43-ia64-libunwind.patch;striplevel=0 \
+	file://fedora/gcc43-java-nomulti.patch;striplevel=0 \
+	file://fedora/gcc43-ppc32-retaddr.patch;striplevel=0 \
+	file://fedora/gcc43-pr27898.patch;striplevel=0 \
+	file://fedora/gcc43-pr32139.patch;striplevel=0 \
+	file://fedora/gcc43-pr33763.patch;striplevel=0 \
+	file://fedora/gcc43-rh330771.patch;striplevel=0 \
+	file://fedora/gcc43-rh341221.patch;striplevel=0 \
+	file://fedora/gcc43-cpp-pragma.patch;striplevel=0 \
+	file://fedora/gcc43-java-debug-iface-type.patch;striplevel=0 \
+	file://fedora/gcc43-libgomp-speedup.patch;striplevel=0 \
+	file://fedora/gcc43-i386-libgomp.patch;striplevel=0 \
+	file://fedora/gcc43-rh251682.patch;striplevel=0 \
+	file://debian/arm-unbreak-eabi-armv4t.dpatch;apply=yes \
+	file://debian/libstdc++-pic.dpatch;apply=yes;striplevel=0 \
+	file://debian/gcc-ice-hack.dpatch;apply=yes;striplevel=0 \ 
+	file://debian/pr30961.dpatch;apply=yes;striplevel=0 \
+	file://100-uclibc-conf.patch \
+	file://103-uclibc-conf-noupstream.patch \
+	file://200-uclibc-locale.patch \
+	file://203-uclibc-locale-no__x.patch \
+	file://204-uclibc-locale-wchar_fix.patch \
+	file://205-uclibc-locale-update.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://305-libmudflap-susv3-legacy.patch \
+	file://306-libstdc++-namespace.patch \
+	file://307-locale_facets.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://904-flatten-switch-stmt-00.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://cache-amnesia.patch \
+	file://gfortran-4.3.x.patch \
+	file://gcc-4.0.2-e300c2c3.patch \
+#	file://pr34130.patch \
+#	file://fortran-static-linking.patch \
+	file://gcc-arm-frename-registers.patch \
+	file://gcc-4.3.4-SYSROOT_CFLAGS_FOR_TARGET.patch \
+	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://gcc-flags-for-build.patch \
 "
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
-SRC_URI_append_sh4  = " file://sh_unwind.patch;patch=1 \
-			file://gcc-4.2.3-linux-multilib-fix.patch;patch=1 \
+SRC_URI_append_sh4  = " file://sh_unwind.patch \
+			file://gcc-4.2.3-linux-multilib-fix.patch \
 		      "
 SRC_URI_append_ep93xx = " \
-	file://ep93xx/arm-crunch-readme.patch;patch=1 \
-	file://ep93xx/arm-crunch-saveregs.patch;patch=1 \
-	file://ep93xx/arm-crunch-scratch.patch;patch=1 \
-	file://ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch;patch=1 \
-	file://ep93xx/arm-crunch-eabi-mvf0-scratch-ieee754.patch;patch=1 \
-	file://ep93xx/arm-crunch-20000320.patch;patch=1 \
-	file://ep93xx/arm-crunch-disable-cmpdi.patch;patch=1 \
-	file://ep93xx/arm-crunch-fix-64bit-const-offsets.patch;patch=1 \
-	file://ep93xx/arm-crunch-fp_consts.patch;patch=1 \
-	file://ep93xx/arm-crunch-neg-enable.patch;patch=1 \
-	file://ep93xx/arm-crunch-neg-protect.patch;patch=1 \
-	file://ep93xx/arm-crunch-repair-truncxfsi.patch;patch=1 \
-	file://ep93xx/arm-crunch-floatsi-no-scratch.patch;patch=1 \
-	file://ep93xx/arm-crunch-movsf-movdf-Uy.patch;patch=1 \
-	file://ep93xx/arm-crunch-drop-thumb2.patch;patch=1 \
-	file://ep93xx/arm-crunch-arm_dbx_register_number.patch;patch=1 \
-	file://ep93xx/arm-crunch-pipeline.patch;patch=1 \
-	file://ep93xx/arm-crunch-ccmav-mode.patch;patch=1 \
-	file://ep93xx/arm-crunch-cfcpy-with-cfsh64.patch;patch=1 \
-	file://ep93xx/arm-crunch-mieee.patch;patch=1 \
-	file://ep93xx/arm-size-bugfix.patch;patch=1 \
-	file://ep93xx/arm-prologue_use-length.patch;patch=1 \
-	file://ep93xx/arm-crunch-cftruncd32-attr.patch;patch=1 \
-	file://ep93xx/arm-crunch-fix-cirrus-reorg7.patch;patch=1 \
-	file://ep93xx/arm-crunch-cirrus-di-flag.patch;patch=1 \
-	file://ep93xx/arm-crunch-disable-floatsi.patch;patch=1 \
+	file://ep93xx/arm-crunch-readme.patch \
+	file://ep93xx/arm-crunch-saveregs.patch \
+	file://ep93xx/arm-crunch-scratch.patch \
+	file://ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch \
+	file://ep93xx/arm-crunch-eabi-mvf0-scratch-ieee754.patch \
+	file://ep93xx/arm-crunch-20000320.patch \
+	file://ep93xx/arm-crunch-disable-cmpdi.patch \
+	file://ep93xx/arm-crunch-fix-64bit-const-offsets.patch \
+	file://ep93xx/arm-crunch-fp_consts.patch \
+	file://ep93xx/arm-crunch-neg-enable.patch \
+	file://ep93xx/arm-crunch-neg-protect.patch \
+	file://ep93xx/arm-crunch-repair-truncxfsi.patch \
+	file://ep93xx/arm-crunch-floatsi-no-scratch.patch \
+	file://ep93xx/arm-crunch-movsf-movdf-Uy.patch \
+	file://ep93xx/arm-crunch-drop-thumb2.patch \
+	file://ep93xx/arm-crunch-arm_dbx_register_number.patch \
+	file://ep93xx/arm-crunch-pipeline.patch \
+	file://ep93xx/arm-crunch-ccmav-mode.patch \
+	file://ep93xx/arm-crunch-cfcpy-with-cfsh64.patch \
+	file://ep93xx/arm-crunch-mieee.patch \
+	file://ep93xx/arm-size-bugfix.patch \
+	file://ep93xx/arm-prologue_use-length.patch \
+	file://ep93xx/arm-crunch-cftruncd32-attr.patch \
+	file://ep93xx/arm-crunch-fix-cirrus-reorg7.patch \
+	file://ep93xx/arm-crunch-cirrus-di-flag.patch \
+	file://ep93xx/arm-crunch-disable-floatsi.patch \
 "
 # Language Overrides
 FORTRAN = ""
@@ -98,6 +99,8 @@ FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
 EXTRA_OECONF_BASE = "  --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
 
 SRC_URI[archive.md5sum] = "60df63222dbffd53ca11492a2545044f"
 SRC_URI[archive.sha256sum] = "e572453bdb74cc4ceebfab9ffb411d9678343dff5bf86e9338d42fdd0818aa65"
diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc
index 5cae2a9f6e..11b1535428 100644
--- a/recipes/gcc/gcc-4.4.1.inc
+++ b/recipes/gcc/gcc-4.4.1.inc
@@ -6,24 +6,25 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r8"
 
 FILESPATHPKG .= ":gcc-$PV"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-        file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://gcc-uclibc-locale-ctype_touplow_t.patch;patch=1 \
-	file://gcc-disable-linux-unwind-with-libc-inhibit.patch;patch=1 \
-	file://gcc-link-libgcc-with-libm.patch;patch=1 \
-	file://gcc-improve-tls-macro.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gcc-flags-for-build.patch;patch=1 \
-	file://gcc-ppc_single_precision_regs.patch;patch=1 \
-	file://gcc-ppc_add_d_constraint.patch;patch=1 \
-	file://gcc-pr41175.patch;patch=1 \
-	file://gcc-armv4-pass-fix-v4bx-to-ld.patch;patch=1 \
+        file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+	file://100-uclibc-conf.patch \
+	file://gcc-uclibc-locale-ctype_touplow_t.patch \
+	file://gcc-disable-linux-unwind-with-libc-inhibit.patch \
+	file://gcc-link-libgcc-with-libm.patch \
+	file://gcc-improve-tls-macro.patch \
+	file://cache-amnesia.patch \
+	file://gcc-flags-for-build.patch \
+	file://gcc-ppc_single_precision_regs.patch \
+	file://gcc-ppc_add_d_constraint.patch \
+	file://gcc-pr41175.patch \
+	file://gcc-armv4-pass-fix-v4bx-to-ld.patch \
 	"
 # Language Overrides
 FORTRAN = ""
@@ -33,6 +34,9 @@ EXTRA_OECONF_BASE = " --enable-libssp \
 		      --disable-bootstrap --disable-libgomp \
 		      --disable-libmudflap"
 
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
+
 EXTRA_OECONF_append_linux-uclibc = " ${@base_contains('TARGET_ARCH', 'powerpc', '--disable-decimal-float --without-long-double-128', '',d)}"
 
 SRC_URI[archive.md5sum] = "927eaac3d44b22f31f9c83df82f26436"
diff --git a/recipes/gcc/gcc-4.4.2.inc b/recipes/gcc/gcc-4.4.2.inc
index 75e63af55d..8d14c99677 100644
--- a/recipes/gcc/gcc-4.4.2.inc
+++ b/recipes/gcc/gcc-4.4.2.inc
@@ -6,24 +6,25 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r2"
 
 FILESPATHPKG .= ":gcc-$PV"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-        file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://gcc-uclibc-locale-ctype_touplow_t.patch;patch=1 \
-	file://gcc-disable-linux-unwind-with-libc-inhibit.patch;patch=1 \
-	file://gcc-link-libgcc-with-libm.patch;patch=1 \
-	file://gcc-improve-tls-macro.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gcc-flags-for-build.patch;patch=1 \
-	file://gcc-ppc_single_precision_regs.patch;patch=1 \
-	file://gcc-ppc_add_d_constraint.patch;patch=1 \
-	file://gcc-pr41175.patch;patch=1 \
-	file://gcc-armv4-pass-fix-v4bx-to-ld.patch;patch=1 \
+        file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+	file://100-uclibc-conf.patch \
+	file://gcc-uclibc-locale-ctype_touplow_t.patch \
+	file://gcc-disable-linux-unwind-with-libc-inhibit.patch \
+	file://gcc-link-libgcc-with-libm.patch \
+	file://gcc-improve-tls-macro.patch \
+	file://cache-amnesia.patch \
+	file://gcc-flags-for-build.patch \
+	file://gcc-ppc_single_precision_regs.patch \
+	file://gcc-ppc_add_d_constraint.patch \
+	file://gcc-pr41175.patch \
+	file://gcc-armv4-pass-fix-v4bx-to-ld.patch \
 	"
 # Language Overrides
 FORTRAN = ""
@@ -33,6 +34,9 @@ EXTRA_OECONF_BASE = " --enable-libssp \
 		      --disable-bootstrap --disable-libgomp \
 		      --disable-libmudflap"
 
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
+
 EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float "
 EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float "
 EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float "
diff --git a/recipes/gcc/gcc-4.4.3.inc b/recipes/gcc/gcc-4.4.3.inc
deleted file mode 100644
index 25098d523b..0000000000
--- a/recipes/gcc/gcc-4.4.3.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-# No armeb and thumb patches - really needs checking 
-DEFAULT_PREFERENCE = "-999"
-ARM_INSTRUCTION_SET = "arm"
-
-require gcc-common.inc
-LICENSE = "GPLv3"
-
-DEPENDS = "mpfr gmp"
-
-INC_PR = "r0"
-
-FILESPATHPKG .= ":gcc-$PV"
-
-SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=gcc443tarbz2 \
-        file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://gcc-uclibc-locale-ctype_touplow_t.patch;patch=1 \
-	file://gcc-disable-linux-unwind-with-libc-inhibit.patch;patch=1 \
-	file://gcc-link-libgcc-with-libm.patch;patch=1 \
-	file://gcc-improve-tls-macro.patch;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gcc-flags-for-build.patch;patch=1 \
-	file://gcc-ppc_single_precision_regs.patch;patch=1 \
-	file://gcc-ppc_add_d_constraint.patch;patch=1 \
-	file://gcc-pr41175.patch;patch=1 \
-	file://gcc-armv4-pass-fix-v4bx-to-ld.patch;patch=1 \
-	"
-SRC_URI[gcc443tarbz2.md5sum] = "fe1ca818fc6d2caeffc9051fe67ff103"
-SRC_URI[gcc443tarbz2.sha256sum] = "97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040"
-
-# Language Overrides
-FORTRAN = ""
-JAVA = ""
-
-EXTRA_OECONF_BASE = " --enable-libssp \
-		      --disable-bootstrap --disable-libgomp \
-		      --disable-libmudflap"
-
-EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float "
-EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float "
-EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float "
-EXTRA_OECONF_append_linux-uclibc = " ${@base_contains('TARGET_ARCH', 'powerpc', '--without-long-double-128', '',d)}"
diff --git a/recipes/gcc/gcc-4.4.4.inc b/recipes/gcc/gcc-4.4.4.inc
new file mode 100644
index 0000000000..4dd1bf6d70
--- /dev/null
+++ b/recipes/gcc/gcc-4.4.4.inc
@@ -0,0 +1,46 @@
+# No armeb and thumb patches - really needs checking 
+DEFAULT_PREFERENCE = "-999"
+ARM_INSTRUCTION_SET = "arm"
+
+require gcc-common.inc
+LICENSE = "GPLv3"
+
+DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
+
+INC_PR = "r2"
+
+FILESPATHPKG .= ":gcc-$PV"
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=gcc444tarbz2 \
+        file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+	file://100-uclibc-conf.patch \
+	file://gcc-uclibc-locale-ctype_touplow_t.patch \
+	file://gcc-disable-linux-unwind-with-libc-inhibit.patch \
+	file://gcc-link-libgcc-with-libm.patch \
+	file://gcc-improve-tls-macro.patch \
+	file://cache-amnesia.patch \
+	file://gcc-flags-for-build.patch \
+	file://gcc-ppc_single_precision_regs.patch \
+	file://gcc-ppc_add_d_constraint.patch \
+	file://gcc-pr41175.patch \
+	file://gcc-armv4-pass-fix-v4bx-to-ld.patch \
+	file://gcc-add-t-slibgcc-libgcc.patch \
+	"
+SRC_URI[gcc444tarbz2.md5sum] = "7ff5ce9e5f0b088ab48720bbd7203530"
+SRC_URI[gcc444tarbz2.sha256sum] = "e1c13696b45752ad3f652304fab5120a43a8a5c0f438d3bda78cf16b620c0c58"
+
+# Language Overrides
+FORTRAN = ""
+JAVA = ""
+
+EXTRA_OECONF_BASE = " --enable-libssp \
+		      --disable-bootstrap --disable-libgomp \
+		      --disable-libmudflap"
+
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
+
+EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float "
+EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float "
+EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float "
diff --git a/recipes/gcc/gcc-4.4.3/100-uclibc-conf.patch b/recipes/gcc/gcc-4.4.4/100-uclibc-conf.patch
index 0b799607e8..0b799607e8 100644
--- a/recipes/gcc/gcc-4.4.3/100-uclibc-conf.patch
+++ b/recipes/gcc/gcc-4.4.4/100-uclibc-conf.patch
diff --git a/recipes/gcc/gcc-4.4.3/cache-amnesia.patch b/recipes/gcc/gcc-4.4.4/cache-amnesia.patch
index d5281ea575..d5281ea575 100644
--- a/recipes/gcc/gcc-4.4.3/cache-amnesia.patch
+++ b/recipes/gcc/gcc-4.4.4/cache-amnesia.patch
diff --git a/recipes/gcc/gcc-4.4.3/fortran-cross-compile-hack.patch b/recipes/gcc/gcc-4.4.4/fortran-cross-compile-hack.patch
index b3d38ad983..b3d38ad983 100644
--- a/recipes/gcc/gcc-4.4.3/fortran-cross-compile-hack.patch
+++ b/recipes/gcc/gcc-4.4.4/fortran-cross-compile-hack.patch
diff --git a/recipes/gcc/gcc-4.4.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/recipes/gcc/gcc-4.4.4/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index f33e6c1ea6..f33e6c1ea6 100644
--- a/recipes/gcc/gcc-4.4.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/recipes/gcc/gcc-4.4.4/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
diff --git a/recipes/gcc/gcc-4.4.4/gcc-add-t-slibgcc-libgcc.patch b/recipes/gcc/gcc-4.4.4/gcc-add-t-slibgcc-libgcc.patch
new file mode 100644
index 0000000000..337bd9250e
--- /dev/null
+++ b/recipes/gcc/gcc-4.4.4/gcc-add-t-slibgcc-libgcc.patch
@@ -0,0 +1,126 @@
+This is a backport of commit revision 151568 from trunk into 4.4
+the changes for config/t-slibgcc-elf-ver are already available in 4.4
+so they dont reflect in the patch as they are mentioned in the changelog
+message. 
+
+This patch converts the libgcc_s.so to a linker script stub which should
+let static libgcc link in on affected architectures they should include
+t-slibgcc-libgcc in there tmake_file variable. For OE its ppc for now
+which has this problem when using libtool and -Os flag.
+
+-Khem
+
+2009-09-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/t-slibgcc-elf-ver (SHLIB_MAKE_SOLINK, SHLIB_INSTALL_SOLINK):
+	New variables.
+	(SHLIB_LINK, SHLIB_INSTALL): Use them.
+	* config/t-slibgcc-libgcc: New file.
+	* config.gcc (powerpc*-*-linux*, powerpc*-*-gnu*): Use it.
+
+Index: gcc-4.4.4/gcc/config.gcc
+===================================================================
+--- gcc-4.4.4.orig/gcc/config.gcc	2010-02-17 20:24:04.000000000 -0800
++++ gcc-4.4.4/gcc/config.gcc	2010-05-14 13:57:33.701847829 -0700
+@@ -1745,12 +1745,12 @@ powerpc64-*-linux*)
+ 		tm_file="rs6000/secureplt.h ${tm_file}"
+ 	fi
+ 	extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
+-	tmake_file="t-dfprules rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
++	tmake_file="t-dfprules rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64 t-slibgcc-libgcc rs6000/t-fprules-softfp soft-fp/t-softfp"
+ 	;;
+ powerpc64-*-gnu*)
+ 	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux64.h rs6000/gnu.h"
+ 	extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
+-	tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
++	tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
+ 	;;
+ powerpc-*-darwin*)
+ 	extra_options="${extra_options} rs6000/darwin.opt"
+@@ -1827,17 +1827,17 @@ powerpc-*-rtems*)
+ powerpc-*-linux*altivec*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+-	tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
++	tmake_file="rs6000/t-fprules t-slibgcc-libgcc rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+ 	;;
+ powerpc-*-linux*spe*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h rs6000/e500.h"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+-	tmake_file="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
++	tmake_file="t-dfprules rs6000/t-fprules t-slibgcc-libgcc rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+ 	;;
+ powerpc-*-linux*paired*)
+         tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/750cl.h"
+         extra_options="${extra_options} rs6000/sysv4.opt"
+-        tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
++        tmake_file="rs6000/t-fprules t-slibgcc-libgcc rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+         ;;
+ powerpc-*-linux*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+@@ -1856,7 +1856,7 @@ powerpc-*-linux*)
+ 		tm_file="${tm_file} rs6000/linux.h"
+ 		;;
+ 	esac
+-	tmake_file="${tmake_file} rs6000/t-fprules-softfp soft-fp/t-softfp"
++	tmake_file="${tmake_file} t-slibgcc-libgcc rs6000/t-fprules-softfp soft-fp/t-softfp"
+ 	if test x${enable_secureplt} = xyes; then
+ 		tm_file="rs6000/secureplt.h ${tm_file}"
+ 	fi
+@@ -1864,14 +1864,14 @@ powerpc-*-linux*)
+ powerpc-*-gnu-gnualtivec*)
+ 	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+-	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
++	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-ppccomm"
+ 	if test x$enable_threads = xyes; then
+ 		thread_file='posix'
+ 	fi
+ 	;;
+ powerpc-*-gnu*)
+ 	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/gnu.h"
+-	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
++	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-ppccomm"
+ 	extra_options="${extra_options} rs6000/sysv4.opt"
+ 	if test x$enable_threads = xyes; then
+ 		thread_file='posix'
+Index: gcc-4.4.4/gcc/config/t-slibgcc-libgcc
+===================================================================
+--- gcc-4.4.4.orig/gcc/config/t-slibgcc-libgcc	2010-01-04 07:13:08.000000000 -0800
++++ gcc-4.4.4/gcc/config/t-slibgcc-libgcc	2010-05-14 13:44:41.339352736 -0700
+@@ -30,3 +30,35 @@ SHLIB_MAKE_SOLINK = \
+ SHLIB_INSTALL_SOLINK = \
+ 	$(INSTALL_DATA) $(SHLIB_DIR)/$(SHLIB_SOLINK) \
+ 	  $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
++# Copyright (C) 2009 Free Software Foundation, Inc.
++#
++# This file is part of GCC.
++#
++# GCC is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3, or (at your option)
++# any later version.
++#
++# GCC is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with GCC; see the file COPYING3.  If not see
++# <http://www.gnu.org/licenses/>.
++
++# Instead of creating $(SHLIB_SOLINK) symlink create a GNU ld
++# linker script which sources in both $(SHLIB_SONAME) and libgcc.a.
++# This is needed on targets where libgcc.a contains routines that aren't in
++# $(SHLIB_SONAME) and are needed for shared libraries.
++
++SHLIB_MAKE_SOLINK = \
++	(echo "/* GNU ld script"; \
++	 echo "   Use the shared library, but some functions are only in"; \
++	 echo "   the static library.  */"; \
++	 echo "GROUP ( $(SHLIB_SONAME) libgcc.a )" \
++	) > $(SHLIB_DIR)/$(SHLIB_SOLINK)
++SHLIB_INSTALL_SOLINK = \
++	$(INSTALL_DATA) $(SHLIB_DIR)/$(SHLIB_SOLINK) \
++	  $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
diff --git a/recipes/gcc/gcc-4.4.3/gcc-armv4-pass-fix-v4bx-to-ld.patch b/recipes/gcc/gcc-4.4.4/gcc-armv4-pass-fix-v4bx-to-ld.patch
index 37670375e8..37670375e8 100644
--- a/recipes/gcc/gcc-4.4.3/gcc-armv4-pass-fix-v4bx-to-ld.patch
+++ b/recipes/gcc/gcc-4.4.4/gcc-armv4-pass-fix-v4bx-to-ld.patch
diff --git a/recipes/gcc/gcc-4.4.3/gcc-disable-linux-unwind-with-libc-inhibit.patch b/recipes/gcc/gcc-4.4.4/gcc-disable-linux-unwind-with-libc-inhibit.patch
index a6ba7a70ab..a6ba7a70ab 100644
--- a/recipes/gcc/gcc-4.4.3/gcc-disable-linux-unwind-with-libc-inhibit.patch
+++ b/recipes/gcc/gcc-4.4.4/gcc-disable-linux-unwind-with-libc-inhibit.patch
diff --git a/recipes/gcc/gcc-4.4.3/gcc-flags-for-build.patch b/recipes/gcc/gcc-4.4.4/gcc-flags-for-build.patch
index 5193abecdb..5193abecdb 100644
--- a/recipes/gcc/gcc-4.4.3/gcc-flags-for-build.patch
+++ b/recipes/gcc/gcc-4.4.4/gcc-flags-for-build.patch
diff --git a/recipes/gcc/gcc-4.4.3/gcc-improve-tls-macro.patch b/recipes/gcc/gcc-4.4.4/gcc-improve-tls-macro.patch
index 88f110b030..88f110b030 100644
--- a/recipes/gcc/gcc-4.4.3/gcc-improve-tls-macro.patch
+++ b/recipes/gcc/gcc-4.4.4/gcc-improve-tls-macro.patch
diff --git a/recipes/gcc/gcc-4.4.3/gcc-link-libgcc-with-libm.patch b/recipes/gcc/gcc-4.4.4/gcc-link-libgcc-with-libm.patch
index 51abdd8e9b..51abdd8e9b 100644
--- a/recipes/gcc/gcc-4.4.3/gcc-link-libgcc-with-libm.patch
+++ b/recipes/gcc/gcc-4.4.4/gcc-link-libgcc-with-libm.patch
diff --git a/recipes/gcc/gcc-4.4.3/gcc-ppc_add_d_constraint.patch b/recipes/gcc/gcc-4.4.4/gcc-ppc_add_d_constraint.patch
index 5e1da1ad09..5e1da1ad09 100644
--- a/recipes/gcc/gcc-4.4.3/gcc-ppc_add_d_constraint.patch
+++ b/recipes/gcc/gcc-4.4.4/gcc-ppc_add_d_constraint.patch
diff --git a/recipes/gcc/gcc-4.4.3/gcc-ppc_single_precision_regs.patch b/recipes/gcc/gcc-4.4.4/gcc-ppc_single_precision_regs.patch
index 5b35d6e74c..5b35d6e74c 100644
--- a/recipes/gcc/gcc-4.4.3/gcc-ppc_single_precision_regs.patch
+++ b/recipes/gcc/gcc-4.4.4/gcc-ppc_single_precision_regs.patch
diff --git a/recipes/gcc/gcc-4.4.3/gcc-pr41175.patch b/recipes/gcc/gcc-4.4.4/gcc-pr41175.patch
index 10da543958..10da543958 100644
--- a/recipes/gcc/gcc-4.4.3/gcc-pr41175.patch
+++ b/recipes/gcc/gcc-4.4.4/gcc-pr41175.patch
diff --git a/recipes/gcc/gcc-4.4.4/gcc-uclibc-locale-ctype_touplow_t.patch b/recipes/gcc/gcc-4.4.4/gcc-uclibc-locale-ctype_touplow_t.patch
new file mode 100644
index 0000000000..00121c52e6
--- /dev/null
+++ b/recipes/gcc/gcc-4.4.4/gcc-uclibc-locale-ctype_touplow_t.patch
@@ -0,0 +1,67 @@
+Index: gcc-4.4.4/libstdc++-v3/config/locale/generic/c_locale.h
+===================================================================
+--- gcc-4.4.4.orig/libstdc++-v3/config/locale/generic/c_locale.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.4/libstdc++-v3/config/locale/generic/c_locale.h	2010-05-18 03:37:42.003030691 -0700
+@@ -41,12 +41,17 @@
+ 
+ #include <clocale>
+ #include <cstddef>
++#include <features.h>
++#include <ctype.h>
+ 
+ #define _GLIBCXX_NUM_CATEGORIES 0
+ 
+ _GLIBCXX_BEGIN_NAMESPACE(std)
+-
+-  typedef int*			__c_locale;
++#ifdef __UCLIBC__
++   typedef __ctype_touplow_t*   __c_locale;
++#else
++   typedef int*         __c_locale;
++#endif
+ 
+   // Convert numeric value of type double and long double to string and
+   // return length of string.  If vsnprintf is available use it, otherwise
+Index: gcc-4.4.4/libstdc++-v3/config/os/gnu-linux/ctype_base.h
+===================================================================
+--- gcc-4.4.4.orig/libstdc++-v3/config/os/gnu-linux/ctype_base.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.4/libstdc++-v3/config/os/gnu-linux/ctype_base.h	2010-05-18 03:37:42.003030691 -0700
+@@ -33,14 +33,21 @@
+  */
+ 
+ // Information as gleaned from /usr/include/ctype.h
+-  
++
++#include <features.h>
++#include <ctype.h>
++
+ _GLIBCXX_BEGIN_NAMESPACE(std)
+ 
+   /// @brief  Base class for ctype.
+   struct ctype_base
+   {
+     // Non-standard typedefs.
+-    typedef const int* 		__to_type;
++#ifdef __UCLIBC__
++    typedef const __ctype_touplow_t*   __to_type;
++#else
++    typedef const int*         __to_type;
++#endif
+ 
+     // NB: Offsets into ctype<char>::_M_table force a particular size
+     // on the mask type. Because of this, we don't use an enum.
+Index: gcc-4.4.4/libstdc++-v3/config/locale/generic/c_locale.cc
+===================================================================
+--- gcc-4.4.4.orig/libstdc++-v3/config/locale/generic/c_locale.cc	2010-05-18 03:32:27.120513925 -0700
++++ gcc-4.4.4/libstdc++-v3/config/locale/generic/c_locale.cc	2010-05-18 03:36:35.890559135 -0700
+@@ -252,5 +252,10 @@ _GLIBCXX_END_NAMESPACE
+ #ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+ #define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
+   extern "C" void ldbl (void) __attribute__ ((alias (#dbl)))
++#ifdef __UCLIBC__
++// This is because __c_locale is of type __ctype_touplow_t* which is short on uclibc. for glibc its int*
++_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPs, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPs);
++#else
+ _GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPi, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi);
++#endif
+ #endif // _GLIBCXX_LONG_DOUBLE_COMPAT
diff --git a/recipes/gcc/gcc-4.4.3/zecke-no-host-includes.patch b/recipes/gcc/gcc-4.4.4/zecke-no-host-includes.patch
index abf829c60d..abf829c60d 100644
--- a/recipes/gcc/gcc-4.4.3/zecke-no-host-includes.patch
+++ b/recipes/gcc/gcc-4.4.4/zecke-no-host-includes.patch
diff --git a/recipes/gcc/gcc-4.4.3/zecke-xgcc-cpp.patch b/recipes/gcc/gcc-4.4.4/zecke-xgcc-cpp.patch
index a7722cbfc4..a7722cbfc4 100644
--- a/recipes/gcc/gcc-4.4.3/zecke-xgcc-cpp.patch
+++ b/recipes/gcc/gcc-4.4.4/zecke-xgcc-cpp.patch
diff --git a/recipes/gcc/gcc-4.5.0.inc b/recipes/gcc/gcc-4.5.0.inc
new file mode 100644
index 0000000000..f445a5798c
--- /dev/null
+++ b/recipes/gcc/gcc-4.5.0.inc
@@ -0,0 +1,40 @@
+DEFAULT_PREFERENCE = "-999"
+ARM_INSTRUCTION_SET = "arm"
+
+require gcc-common.inc
+LICENSE = "GPLv3"
+
+DEPENDS = "mpfr gmp libmpc"
+NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
+
+FILESPATHPKG .= ":gcc-$PV"
+
+INC_PR = "r1"
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=gcc450tarbz2 \
+	   file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+	   file://100-uclibc-conf.patch \
+           file://gcc-uclibc-locale-ctype_touplow_t.patch \
+	   file://cache-amnesia.patch \
+	   file://gcc-flags-for-build.patch \
+	  "
+
+# Language Overrides
+FORTRAN = ""
+JAVA = ""
+
+EXTRA_OECONF_BASE = " --enable-libssp \
+		      --disable-bootstrap --disable-libgomp \
+		      --disable-libmudflap"
+
+SRC_URI[gcc450tarbz2.md5sum] = "ff27b7c4a5d5060c8a8543a44abca31f"
+SRC_URI[gcc450tarbz2.sha256sum] = "8293e9efa68a8ec0fdd0dae9c9bd128a8e742566acd9c8fbcfe79d98ed3756c8"
+
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
+
+EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float "
+EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float "
+EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float "
+EXTRA_OECONF_append_linux-uclibc = " ${@base_contains('TARGET_ARCH', 'powerpc', '--without-long-double-128', '',d)}"
+
diff --git a/recipes/gcc/gcc-4.5.0/100-uclibc-conf.patch b/recipes/gcc/gcc-4.5.0/100-uclibc-conf.patch
new file mode 100644
index 0000000000..0b799607e8
--- /dev/null
+++ b/recipes/gcc/gcc-4.5.0/100-uclibc-conf.patch
@@ -0,0 +1,37 @@
+Index: gcc-4.3.1/contrib/regression/objs-gcc.sh
+===================================================================
+--- gcc-4.3.1.orig/contrib/regression/objs-gcc.sh	2007-12-24 15:18:57.000000000 -0800
++++ gcc-4.3.1/contrib/regression/objs-gcc.sh	2008-08-16 01:15:12.000000000 -0700
+@@ -105,6 +105,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+Index: gcc-4.3.1/libjava/classpath/ltconfig
+===================================================================
+--- gcc-4.3.1.orig/libjava/classpath/ltconfig	2007-06-03 16:18:43.000000000 -0700
++++ gcc-4.3.1/libjava/classpath/ltconfig	2008-08-16 01:15:12.000000000 -0700
+@@ -603,7 +603,7 @@
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1251,7 +1251,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/recipes/gcc/gcc-4.5.0/cache-amnesia.patch b/recipes/gcc/gcc-4.5.0/cache-amnesia.patch
new file mode 100644
index 0000000000..b889f9b6ca
--- /dev/null
+++ b/recipes/gcc/gcc-4.5.0/cache-amnesia.patch
@@ -0,0 +1,31 @@
+---
+ gcc/configure    |    2 +-
+ gcc/configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: gcc-4.5+svnr155514/gcc/configure
+===================================================================
+--- gcc-4.5+svnr155514.orig/gcc/configure	2009-12-29 22:00:40.000000000 -0800
++++ gcc-4.5+svnr155514/gcc/configure	2009-12-29 23:52:43.381592113 -0800
+@@ -10467,7 +10467,7 @@ else
+ 	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+ 	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+-	${realsrcdir}/configure \
++	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
+ 		--enable-languages=${enable_languages-all} \
+ 		--target=$target_alias --host=$build_alias --build=$build_alias
+ 	CFLAGS="${saved_CFLAGS}"
+Index: gcc-4.5+svnr155514/gcc/configure.ac
+===================================================================
+--- gcc-4.5+svnr155514.orig/gcc/configure.ac	2009-12-29 22:00:40.000000000 -0800
++++ gcc-4.5+svnr155514/gcc/configure.ac	2009-12-29 23:51:54.589091778 -0800
+@@ -1458,7 +1458,7 @@ else
+ 	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+ 	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+-	${realsrcdir}/configure \
++	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
+ 		--enable-languages=${enable_languages-all} \
+ 		--target=$target_alias --host=$build_alias --build=$build_alias
+ 	CFLAGS="${saved_CFLAGS}"
diff --git a/recipes/gcc/gcc-4.5.0/fortran-cross-compile-hack.patch b/recipes/gcc/gcc-4.5.0/fortran-cross-compile-hack.patch
new file mode 100644
index 0000000000..348c77006f
--- /dev/null
+++ b/recipes/gcc/gcc-4.5.0/fortran-cross-compile-hack.patch
@@ -0,0 +1,30 @@
+* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used
+  used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross
+  directory.
+
+Index: gcc-4.5+svnr155514/libgfortran/configure
+===================================================================
+--- gcc-4.5+svnr155514.orig/libgfortran/configure	2009-12-29 22:02:01.000000000 -0800
++++ gcc-4.5+svnr155514/libgfortran/configure	2009-12-30 08:12:40.889091657 -0800
+@@ -11655,7 +11655,7 @@ CC="$lt_save_CC"
+ 
+ # We need gfortran to compile parts of the library
+ #AC_PROG_FC(gfortran)
+-FC="$GFORTRAN"
++#FC="$GFORTRAN"
+ ac_ext=${ac_fc_srcext-f}
+ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+Index: gcc-4.5+svnr155514/libgfortran/configure.ac
+===================================================================
+--- gcc-4.5+svnr155514.orig/libgfortran/configure.ac	2009-12-29 22:02:01.000000000 -0800
++++ gcc-4.5+svnr155514/libgfortran/configure.ac	2009-12-30 08:12:13.453094218 -0800
+@@ -187,7 +187,7 @@ AC_SUBST(enable_static)
+ 
+ # We need gfortran to compile parts of the library
+ #AC_PROG_FC(gfortran)
+-FC="$GFORTRAN"
++#FC="$GFORTRAN"
+ AC_PROG_FC(gfortran)
+ 
+ # extra LD Flags which are required for targets
diff --git a/recipes/gcc/gcc-4.5.0/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/recipes/gcc/gcc-4.5.0/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
new file mode 100644
index 0000000000..f33e6c1ea6
--- /dev/null
+++ b/recipes/gcc/gcc-4.5.0/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
@@ -0,0 +1,31 @@
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: gcc-4.3.1/configure.ac
+===================================================================
+--- gcc-4.3.1.orig/configure.ac	2008-07-21 12:29:18.000000000 -0700
++++ gcc-4.3.1/configure.ac	2008-07-21 12:29:35.000000000 -0700
+@@ -2352,7 +2352,7 @@ fi
+ # for target_alias and gcc doesn't manage it consistently.
+ target_configargs="--cache-file=./config.cache ${target_configargs}"
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in
+Index: gcc-4.3.1/configure
+===================================================================
+--- gcc-4.3.1.orig/configure	2008-07-21 12:29:48.000000000 -0700
++++ gcc-4.3.1/configure	2008-07-21 12:29:59.000000000 -0700
+@@ -5841,7 +5841,7 @@ fi
+ # for target_alias and gcc doesn't manage it consistently.
+ target_configargs="--cache-file=./config.cache ${target_configargs}"
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in
diff --git a/recipes/gcc/gcc-4.5.0/gcc-flags-for-build.patch b/recipes/gcc/gcc-4.5.0/gcc-flags-for-build.patch
new file mode 100644
index 0000000000..98b3ecf2e1
--- /dev/null
+++ b/recipes/gcc/gcc-4.5.0/gcc-flags-for-build.patch
@@ -0,0 +1,178 @@
+Index: gcc-4.5+svnr155680/Makefile.def
+===================================================================
+--- gcc-4.5+svnr155680.orig/Makefile.def	2010-01-13 01:02:22.627540169 -0800
++++ gcc-4.5+svnr155680/Makefile.def	2010-01-13 01:05:24.260056951 -0800
+@@ -240,6 +240,7 @@ flags_to_pass = { flag= AWK ; };
+ flags_to_pass = { flag= BISON ; };
+ flags_to_pass = { flag= CC_FOR_BUILD ; };
+ flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
++flags_to_pass = { flag= CPPFLAGS_FOR_BUILD ; };
+ flags_to_pass = { flag= CXX_FOR_BUILD ; };
+ flags_to_pass = { flag= EXPECT ; };
+ flags_to_pass = { flag= FLEX ; };
+Index: gcc-4.5+svnr155680/gcc/Makefile.in
+===================================================================
+--- gcc-4.5+svnr155680.orig/gcc/Makefile.in	2010-01-13 01:02:22.675542832 -0800
++++ gcc-4.5+svnr155680/gcc/Makefile.in	2010-01-13 01:05:24.264047000 -0800
+@@ -755,7 +755,7 @@ BUILD_LINKERFLAGS = $(BUILD_CFLAGS)
+ 
+ # Native linker and preprocessor flags.  For x-fragment overrides.
+ BUILD_LDFLAGS=@BUILD_LDFLAGS@
+-BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
++BUILD_CPPFLAGS=$(INCLUDES) @BUILD_CPPFLAGS@ $(X_CPPFLAGS)
+ 
+ # Actual name to use when installing a native compiler.
+ GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
+Index: gcc-4.5+svnr155680/gcc/configure.ac
+===================================================================
+--- gcc-4.5+svnr155680.orig/gcc/configure.ac	2010-01-13 01:02:22.687541624 -0800
++++ gcc-4.5+svnr155680/gcc/configure.ac	2010-01-13 01:06:55.711583352 -0800
+@@ -1774,16 +1774,18 @@ AC_SUBST(inhibit_libc)
+ # Also, we cannot run fixincludes.
+ 
+ # These are the normal (build=host) settings:
+-CC_FOR_BUILD='$(CC)'		AC_SUBST(CC_FOR_BUILD)
+-BUILD_CFLAGS='$(ALL_CFLAGS)'	AC_SUBST(BUILD_CFLAGS)
+-BUILD_LDFLAGS='$(LDFLAGS)'	AC_SUBST(BUILD_LDFLAGS)
+-STMP_FIXINC=stmp-fixinc		AC_SUBST(STMP_FIXINC)
++CC_FOR_BUILD='$(CC)'			AC_SUBST(CC_FOR_BUILD)
++BUILD_CFLAGS='$(ALL_CFLAGS)'		AC_SUBST(BUILD_CFLAGS)
++BUILD_LDFLAGS='$(LDFLAGS)'		AC_SUBST(BUILD_LDFLAGS)
++BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'	AC_SUBST(BUILD_CPPFLAGS)
++STMP_FIXINC=stmp-fixinc			AC_SUBST(STMP_FIXINC)
+ 
+ # And these apply if build != host, or we are generating coverage data
+ if test x$build != x$host || test "x$coverage_flags" != x
+ then
+     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
+     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
++    BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
+ fi
+ 
+ # Expand extra_headers to include complete path.
+Index: gcc-4.5+svnr155680/Makefile.in
+===================================================================
+--- gcc-4.5+svnr155680.orig/Makefile.in	2010-01-13 01:02:22.639539865 -0800
++++ gcc-4.5+svnr155680/Makefile.in	2010-01-13 01:05:24.288038715 -0800
+@@ -328,6 +328,7 @@ AR_FOR_BUILD = @AR_FOR_BUILD@
+ AS_FOR_BUILD = @AS_FOR_BUILD@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
++CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+ CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
+ CXX_FOR_BUILD = @CXX_FOR_BUILD@
+ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
+@@ -657,6 +658,7 @@ BASE_FLAGS_TO_PASS = \
+ 	"BISON=$(BISON)" \
+ 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+ 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
++	"CPPFLAGS_FOR_BUILD=$(CPPFLAGS_FOR_BUILD)" \
+ 	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
+ 	"EXPECT=$(EXPECT)" \
+ 	"FLEX=$(FLEX)" \
+Index: gcc-4.5+svnr155680/gcc/configure
+===================================================================
+--- gcc-4.5+svnr155680.orig/gcc/configure	2010-01-13 01:02:22.663539713 -0800
++++ gcc-4.5+svnr155680/gcc/configure	2010-01-13 01:07:24.315537016 -0800
+@@ -705,6 +705,7 @@ SED
+ LIBTOOL
+ collect2
+ STMP_FIXINC
++BUILD_CPPFLAGS
+ BUILD_LDFLAGS
+ BUILD_CFLAGS
+ CC_FOR_BUILD
+@@ -10911,6 +10912,7 @@ fi
+ CC_FOR_BUILD='$(CC)'
+ BUILD_CFLAGS='$(ALL_CFLAGS)'
+ BUILD_LDFLAGS='$(LDFLAGS)'
++BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'
+ STMP_FIXINC=stmp-fixinc
+ 
+ # And these apply if build != host, or we are generating coverage data
+@@ -10918,6 +10920,7 @@ if test x$build != x$host || test "x$cov
+ then
+     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
+     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
++    BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
+ fi
+ 
+ # Expand extra_headers to include complete path.
+@@ -17037,7 +17040,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 17040 "configure"
++#line 17043 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -17143,7 +17146,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 17146 "configure"
++#line 17149 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+Index: gcc-4.5+svnr155680/Makefile.tpl
+===================================================================
+--- gcc-4.5+svnr155680.orig/Makefile.tpl	2010-01-13 01:02:22.603540396 -0800
++++ gcc-4.5+svnr155680/Makefile.tpl	2010-01-13 01:05:24.332038114 -0800
+@@ -331,6 +331,7 @@ AR_FOR_BUILD = @AR_FOR_BUILD@
+ AS_FOR_BUILD = @AS_FOR_BUILD@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
++CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+ CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
+ CXX_FOR_BUILD = @CXX_FOR_BUILD@
+ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
+Index: gcc-4.5+svnr155680/configure
+===================================================================
+--- gcc-4.5+svnr155680.orig/configure	2010-01-13 01:02:22.615539634 -0800
++++ gcc-4.5+svnr155680/configure	2010-01-13 01:07:18.940037187 -0800
+@@ -651,6 +651,7 @@ GCJ_FOR_BUILD
+ DLLTOOL_FOR_BUILD
+ CXX_FOR_BUILD
+ CXXFLAGS_FOR_BUILD
++CPPFLAGS_FOR_BUILD
+ CFLAGS_FOR_BUILD
+ CC_FOR_BUILD
+ AS_FOR_BUILD
+@@ -7862,6 +7863,7 @@ esac
+ # our build compiler if desired.
+ if test x"${build}" = x"${host}" ; then
+   CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
++  CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
+   CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
+   LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
+ fi
+@@ -7940,6 +7942,7 @@ done
+ 
+ 
+ 
++
+ # Generate default definitions for YACC, M4, LEX and other programs that run
+ # on the build machine.  These are used if the Makefile can't locate these
+ # programs in objdir.
+Index: gcc-4.5+svnr155680/configure.ac
+===================================================================
+--- gcc-4.5+svnr155680.orig/configure.ac	2010-01-13 01:02:22.651540130 -0800
++++ gcc-4.5+svnr155680/configure.ac	2010-01-13 01:05:24.340037763 -0800
+@@ -3022,6 +3022,7 @@ esac
+ # our build compiler if desired.
+ if test x"${build}" = x"${host}" ; then
+   CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
++  CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
+   CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
+   LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
+ fi
+@@ -3087,6 +3088,7 @@ AC_SUBST(AR_FOR_BUILD)
+ AC_SUBST(AS_FOR_BUILD)
+ AC_SUBST(CC_FOR_BUILD)
+ AC_SUBST(CFLAGS_FOR_BUILD)
++AC_SUBST(CPPFLAGS_FOR_BUILD)
+ AC_SUBST(CXXFLAGS_FOR_BUILD)
+ AC_SUBST(CXX_FOR_BUILD)
+ AC_SUBST(DLLTOOL_FOR_BUILD)
diff --git a/recipes/gcc/gcc-4.4.3/gcc-uclibc-locale-ctype_touplow_t.patch b/recipes/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch
index ffb37d2976..ffb37d2976 100644
--- a/recipes/gcc/gcc-4.4.3/gcc-uclibc-locale-ctype_touplow_t.patch
+++ b/recipes/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch
diff --git a/recipes/gcc/gcc-4.5.0/zecke-no-host-includes.patch b/recipes/gcc/gcc-4.5.0/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..4ccf35f627
--- /dev/null
+++ b/recipes/gcc/gcc-4.5.0/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.4+svnr145550/gcc/incpath.c
+===================================================================
+--- gcc-4.4+svnr145550.orig/gcc/incpath.c	2009-04-04 13:48:31.000000000 -0700
++++ gcc-4.4+svnr145550/gcc/incpath.c	2009-04-04 14:49:29.000000000 -0700
+@@ -417,6 +417,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+ 
diff --git a/recipes/gcc/gcc-4.5.0/zecke-xgcc-cpp.patch b/recipes/gcc/gcc-4.5.0/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..a7722cbfc4
--- /dev/null
+++ b/recipes/gcc/gcc-4.5.0/zecke-xgcc-cpp.patch
@@ -0,0 +1,28 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
+Index: gcc-4.3.1/Makefile.in
+===================================================================
+--- gcc-4.3.1.orig/Makefile.in	2008-08-19 01:09:56.000000000 -0700
++++ gcc-4.3.1/Makefile.in	2008-08-19 01:13:27.000000000 -0700
+@@ -204,6 +204,7 @@
+ 	AR="$(AR_FOR_TARGET)"; export AR; \
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
++	CPP="$(CC_FOR_TARGET) -E"; export CPP; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+Index: gcc-4.3.1/Makefile.tpl
+===================================================================
+--- gcc-4.3.1.orig/Makefile.tpl	2008-08-21 00:07:58.000000000 -0700
++++ gcc-4.3.1/Makefile.tpl	2008-08-21 00:09:52.000000000 -0700
+@@ -223,6 +223,7 @@
+ 	AR="$(AR_FOR_TARGET)"; export AR; \
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
++	CPP="$(CC_FOR_TARGET) -E"; export CPP; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
index 249621ef27..7a1402f993 100644
--- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
+++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
@@ -14,11 +14,11 @@ DEPENDS = "gmp-canadian mpfr-canadian"
 require gcc-configure-canadian-sdk.inc
 require gcc-package-sdk.inc
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1 \
-		  file://pr22133-mingw-path-fixup.patch;patch=1 \
-		  file://pr33281-mingw-host-fragment.patch;patch=1 \
-		  file://pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch;patch=1 \
-		  file://canadian-build-modules-configure.patch;patch=1 \
+SRC_URI_append = "file://fortran-cross-compile-hack.patch \
+		  file://pr22133-mingw-path-fixup.patch \
+		  file://pr33281-mingw-host-fragment.patch \
+		  file://pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch \
+		  file://canadian-build-modules-configure.patch \
 "
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
diff --git a/recipes/gcc/gcc-common.inc b/recipes/gcc/gcc-common.inc
index 97b140cb0f..7aee542461 100644
--- a/recipes/gcc/gcc-common.inc
+++ b/recipes/gcc/gcc-common.inc
@@ -3,6 +3,8 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 
+NATIVEDEPS = ""
+
 inherit autotools gettext
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc
index 3ec896bb64..892d6846e2 100644
--- a/recipes/gcc/gcc-configure-common.inc
+++ b/recipes/gcc/gcc-configure-common.inc
@@ -21,16 +21,15 @@ OBJC ?= ",objc"
 # hidden symbols in libgcc.a which linker complains
 # when linking shared libraries further in the build like (gnutls)
 
-OPTSPACE_linux-gnuspe ?= ""
-OPTSPACE_linux-uclibcspe ?= ""
-OPTSPACE ?= "--enable-target-optspace"
-
+OPTSPACE = "${@base_contains('TARGET_ARCH', 'powerpc', '', '--enable-target-optspace',d)}"
 # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
 FORTRAN ?= ",f77"
 LANGUAGES ?= "c,c++${OBJC}${FORTRAN}${JAVA}"
 
 EXTRA_OECONF_BASE ?= ""
 EXTRA_OECONF_PATHS ?= ""
+EXTRA_OECONF_INITIAL ?= ""
+EXTRA_OECONF_INTERMEDIATE ?= ""
 
 EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
                 --with-gnu-ld \
diff --git a/recipes/gcc/gcc-configure-cross.inc b/recipes/gcc/gcc-configure-cross.inc
index 7dde9de064..8b97b097ef 100644
--- a/recipes/gcc/gcc-configure-cross.inc
+++ b/recipes/gcc/gcc-configure-cross.inc
@@ -22,47 +22,3 @@ do_configure_prepend () {
 
 LIBGCCS_VAR = "-lgcc_s"
 LIBGCCS_VAR_avr32 = ""
-
-do_stage_append () {
-	for d in info man share/doc share/locale ; do
-		rm -rf ${CROSS_DIR}/$d
-	done
-
-	# Fix a few include links so cross builds are happier
-	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
-		mkdir -p ${STAGING_INCDIR}
-		mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/c++
-		ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-			${STAGING_INCDIR}/
-	fi
-
-	# We probably don't need these
-	rmdir ${CROSS_DIR}/include || :
-
-	# We don't really need to keep this around
-	# rm -rf ${CROSS_DIR}/share but leave java there
-	for d in share/man share/info;
-	do
-		rm -rf ${CROSS_DIR}/$d
-	done
-
-	#fix up libsupc++ and libstdc++ la files
-	for d in lib lib/nof; do
-		sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/$d ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/$d/libsupc++.la || true
-		sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/$d ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/$d/libstdc++.la || true
-	done
-
-    # Link gfortran to g77 to satisfy not-so-smart configure or hard coded g77
-    # gfortran is fully backwards compatible. This is a safe and practical solution.
-    if [ -f ${CROSS_DIR}/bin/${TARGET_PREFIX}gfortran ]; then
-           currdir="$PWD"
-           cd ${CROSS_DIR}/bin/
-           ln -sf ${TARGET_PREFIX}gfortran ${TARGET_PREFIX}g77 || true
-           if [ -d ${CROSS_DIR}/${TARGET_SYS}/bin/ ] ; then 
-               cd ${CROSS_DIR}/${TARGET_SYS}/bin/
-               ln -sf gfortran g77 || true
-           fi
-           cd $currdir
-    fi
-}
-
diff --git a/recipes/gcc/gcc-cross-initial.inc b/recipes/gcc/gcc-cross-initial.inc
index 2ab1d7f990..25d7ba519a 100644
--- a/recipes/gcc/gcc-cross-initial.inc
+++ b/recipes/gcc/gcc-cross-initial.inc
@@ -1,4 +1,4 @@
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 PACKAGES = ""
 
@@ -12,13 +12,11 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
 		--disable-multilib \
 		--disable-__cxa_atexit \
 		--enable-languages=c \
-		--enable-target-optspace \
 		--program-prefix=${TARGET_PREFIX} \
 		--with-sysroot=${STAGING_DIR_TARGET} \
 		--with-build-sysroot=${STAGING_DIR_TARGET} \
+		${EXTRA_OECONF_INITIAL} \
+		${OPTSPACE} \
 		${@get_gcc_fpu_setting(bb, d)} \
 		${@get_gcc_mips_plt_setting(bb, d)}"
 
-do_install () {
-	:
-}
diff --git a/recipes/gcc/gcc-cross-initial_4.0.0.bb b/recipes/gcc/gcc-cross-initial_4.0.0.bb
index dd9071ac02..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.0.0.bb
+++ b/recipes/gcc/gcc-cross-initial_4.0.0.bb
@@ -1,7 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap"
-
diff --git a/recipes/gcc/gcc-cross-initial_4.0.2.bb b/recipes/gcc/gcc-cross-initial_4.0.2.bb
index 6407c4cc64..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.0.2.bb
+++ b/recipes/gcc/gcc-cross-initial_4.0.2.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap"
-
diff --git a/recipes/gcc/gcc-cross-initial_4.1.0.bb b/recipes/gcc/gcc-cross-initial_4.1.0.bb
index 1c1d094382..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.1.0.bb
+++ b/recipes/gcc/gcc-cross-initial_4.1.0.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-EXTRA_OECONF += "--disable-libmudflap \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-initial_4.1.1.bb b/recipes/gcc/gcc-cross-initial_4.1.1.bb
index 1c1d094382..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.1.1.bb
+++ b/recipes/gcc/gcc-cross-initial_4.1.1.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-EXTRA_OECONF += "--disable-libmudflap \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-initial_4.1.2.bb b/recipes/gcc/gcc-cross-initial_4.1.2.bb
index 30f77b7441..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.1.2.bb
+++ b/recipes/gcc/gcc-cross-initial_4.1.2.bb
@@ -1,6 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-EXTRA_OECONF += "--disable-libmudflap \
-		--disable-libssp"
-
diff --git a/recipes/gcc/gcc-cross-initial_4.2.1.bb b/recipes/gcc/gcc-cross-initial_4.2.1.bb
index fe326d304b..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.2.1.bb
+++ b/recipes/gcc/gcc-cross-initial_4.2.1.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-initial_4.2.2.bb b/recipes/gcc/gcc-cross-initial_4.2.2.bb
index fe326d304b..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.2.2.bb
+++ b/recipes/gcc/gcc-cross-initial_4.2.2.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-initial_4.2.3.bb b/recipes/gcc/gcc-cross-initial_4.2.3.bb
index fe326d304b..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.2.3.bb
+++ b/recipes/gcc/gcc-cross-initial_4.2.3.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-initial_4.2.4.bb b/recipes/gcc/gcc-cross-initial_4.2.4.bb
index 7e9e1c3972..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.2.4.bb
+++ b/recipes/gcc/gcc-cross-initial_4.2.4.bb
@@ -1,6 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
-		--disable-libssp"
-
diff --git a/recipes/gcc/gcc-cross-initial_4.3.1.bb b/recipes/gcc/gcc-cross-initial_4.3.1.bb
index 22f500af62..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.3.1.bb
+++ b/recipes/gcc/gcc-cross-initial_4.3.1.bb
@@ -1,10 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --enable-decimal-float=no \
-		  --disable-libssp"
-
diff --git a/recipes/gcc/gcc-cross-initial_4.3.2.bb b/recipes/gcc/gcc-cross-initial_4.3.2.bb
index 22f500af62..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.3.2.bb
+++ b/recipes/gcc/gcc-cross-initial_4.3.2.bb
@@ -1,10 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --enable-decimal-float=no \
-		  --disable-libssp"
-
diff --git a/recipes/gcc/gcc-cross-initial_4.3.3.bb b/recipes/gcc/gcc-cross-initial_4.3.3.bb
index 067ab61be3..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.3.3.bb
+++ b/recipes/gcc/gcc-cross-initial_4.3.3.bb
@@ -1,9 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --enable-decimal-float=no \
-		  --disable-libssp"
diff --git a/recipes/gcc/gcc-cross-initial_4.3.4.bb b/recipes/gcc/gcc-cross-initial_4.3.4.bb
index 067ab61be3..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.3.4.bb
+++ b/recipes/gcc/gcc-cross-initial_4.3.4.bb
@@ -1,9 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --enable-decimal-float=no \
-		  --disable-libssp"
diff --git a/recipes/gcc/gcc-cross-initial_4.4.1.bb b/recipes/gcc/gcc-cross-initial_4.4.1.bb
index 22f500af62..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.4.1.bb
+++ b/recipes/gcc/gcc-cross-initial_4.4.1.bb
@@ -1,10 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --enable-decimal-float=no \
-		  --disable-libssp"
-
diff --git a/recipes/gcc/gcc-cross-initial_4.4.2.bb b/recipes/gcc/gcc-cross-initial_4.4.2.bb
index 067ab61be3..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.4.2.bb
+++ b/recipes/gcc/gcc-cross-initial_4.4.2.bb
@@ -1,9 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --enable-decimal-float=no \
-		  --disable-libssp"
diff --git a/recipes/gcc/gcc-cross-initial_4.4.3.bb b/recipes/gcc/gcc-cross-initial_4.4.3.bb
deleted file mode 100644
index 067ab61be3..0000000000
--- a/recipes/gcc/gcc-cross-initial_4.4.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require gcc-cross_${PV}.bb
-require gcc-cross-initial.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --enable-decimal-float=no \
-		  --disable-libssp"
diff --git a/recipes/gcc/gcc-cross-initial_4.4.4.bb b/recipes/gcc/gcc-cross-initial_4.4.4.bb
new file mode 100644
index 0000000000..1639511362
--- /dev/null
+++ b/recipes/gcc/gcc-cross-initial_4.4.4.bb
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
diff --git a/recipes/gcc/gcc-cross-initial_4.5.0.bb b/recipes/gcc/gcc-cross-initial_4.5.0.bb
new file mode 100644
index 0000000000..1639511362
--- /dev/null
+++ b/recipes/gcc/gcc-cross-initial_4.5.0.bb
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
diff --git a/recipes/gcc/gcc-cross-initial_csl-arm-2006q1.bb b/recipes/gcc/gcc-cross-initial_csl-arm-2006q1.bb
index 2a5d4fc0cc..af4fcbb5c1 100644
--- a/recipes/gcc/gcc-cross-initial_csl-arm-2006q1.bb
+++ b/recipes/gcc/gcc-cross-initial_csl-arm-2006q1.bb
@@ -2,6 +2,3 @@ require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
 S = "${WORKDIR}/gcc-2006q1"
-
-EXTRA_OECONF += "--disable-libmudflap \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb
index 22ec008046..2019def10c 100644
--- a/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb
+++ b/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb
@@ -3,8 +3,6 @@ require gcc-cross-initial.inc
 
 S = "${WORKDIR}/gcc-4.2"
 
-EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
-
 # Hack till we fix *libc properly
 do_install_append() {
 	ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
diff --git a/recipes/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross-initial_csl-arm-2008q1.bb
index c9f03a7920..773fc172e6 100644
--- a/recipes/gcc/gcc-cross-initial_csl-arm-2008q1.bb
+++ b/recipes/gcc/gcc-cross-initial_csl-arm-2008q1.bb
@@ -2,5 +2,3 @@ require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
 S = "${WORKDIR}/gcc-4.2"
-
-EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
diff --git a/recipes/gcc/gcc-cross-initial_svn.bb b/recipes/gcc/gcc-cross-initial_svn.bb
index 8356dd1fac..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_svn.bb
+++ b/recipes/gcc/gcc-cross-initial_svn.bb
@@ -1,9 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-DEPENDS += "gmp-native mpfr-native libmpc-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --enable-decimal-float=no \
-		  --disable-libssp"
diff --git a/recipes/gcc/gcc-cross-intermediate.inc b/recipes/gcc/gcc-cross-intermediate.inc
index 50792b697c..cbc86388a5 100644
--- a/recipes/gcc/gcc-cross-intermediate.inc
+++ b/recipes/gcc/gcc-cross-intermediate.inc
@@ -1,4 +1,4 @@
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
 DEPENDS += "virtual/${TARGET_PREFIX}libc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate"
 PACKAGES = ""
@@ -10,20 +10,20 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
 		--disable-multilib \
 		--disable-threads \
 		--enable-languages=c \
-		--enable-target-optspace \
 		--program-prefix=${TARGET_PREFIX} \
 		--with-sysroot=${STAGING_DIR_TARGET} \
 		--with-build-sysroot=${STAGING_DIR_TARGET} \
+		${OPTSPACE} \
+		${EXTRA_OECONF_INTERMEDIATE} \
 		${@get_gcc_fpu_setting(bb, d)} \
 		${@get_gcc_mips_plt_setting(bb, d)}"
 
-do_stage_append () {
-	# get rid of dummy libc.so
-	if [ -z "`file ${STAGING_DIR_TARGET}${target_libdir}/libc.so | grep "ASCII C program text"`" ]; then
-		rm -rf ${STAGING_DIR_TARGET}${target_libdir}/libc.so
-	fi
-}
-
 do_install () {
-	:
+	oe_runmake 'DESTDIR=${D}' install
+
+    # If this is important, we should remove the staging package here
+	# get rid of dummy libc.so
+	#if [ -z "`file ${STAGING_DIR_TARGET}${target_libdir}/libc.so | grep "ASCII C program text"`" ]; then
+	#	rm -rf ${STAGING_DIR_TARGET}${target_libdir}/libc.so
+	#fi
 }
diff --git a/recipes/gcc/gcc-cross-intermediate_4.0.0.bb b/recipes/gcc/gcc-cross-intermediate_4.0.0.bb
index 73256f8f7f..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.0.0.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.0.0.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap"
-
diff --git a/recipes/gcc/gcc-cross-intermediate_4.0.2.bb b/recipes/gcc/gcc-cross-intermediate_4.0.2.bb
index 73256f8f7f..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.0.2.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.0.2.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap"
-
diff --git a/recipes/gcc/gcc-cross-intermediate_4.1.0.bb b/recipes/gcc/gcc-cross-intermediate_4.1.0.bb
index 3e103aa24e..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.1.0.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.1.0.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-EXTRA_OECONF += "--disable-libmudflap \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.1.1.bb b/recipes/gcc/gcc-cross-intermediate_4.1.1.bb
index 837237e7d4..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.1.1.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.1.1.bb
@@ -1,6 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-EXTRA_OECONF += "--disable-libmudflap \
-		--disable-libunwind-exceptions \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.1.2.bb b/recipes/gcc/gcc-cross-intermediate_4.1.2.bb
index 3e103aa24e..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.1.2.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.1.2.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-EXTRA_OECONF += "--disable-libmudflap \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.2.1.bb b/recipes/gcc/gcc-cross-intermediate_4.2.1.bb
index 1bdb6f4fd4..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.2.1.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.2.1.bb
@@ -1,6 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
-		--disable-libssp"
-
diff --git a/recipes/gcc/gcc-cross-intermediate_4.2.2.bb b/recipes/gcc/gcc-cross-intermediate_4.2.2.bb
index 7acca81c3b..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.2.2.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.2.2.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.2.3.bb b/recipes/gcc/gcc-cross-intermediate_4.2.3.bb
index 1bdb6f4fd4..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.2.3.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.2.3.bb
@@ -1,6 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
-		--disable-libssp"
-
diff --git a/recipes/gcc/gcc-cross-intermediate_4.2.4.bb b/recipes/gcc/gcc-cross-intermediate_4.2.4.bb
index 7acca81c3b..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.2.4.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.2.4.bb
@@ -1,5 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.1.bb b/recipes/gcc/gcc-cross-intermediate_4.3.1.bb
index a9ae5bdf20..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.3.1.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.3.1.bb
@@ -1,8 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --disable-libssp"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.2.bb b/recipes/gcc/gcc-cross-intermediate_4.3.2.bb
index 5f55396867..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.3.2.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.3.2.bb
@@ -1,9 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --disable-libssp"
-
diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.3.bb b/recipes/gcc/gcc-cross-intermediate_4.3.3.bb
index 5f55396867..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.3.3.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.3.3.bb
@@ -1,9 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --disable-libssp"
-
diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.4.bb b/recipes/gcc/gcc-cross-intermediate_4.3.4.bb
index a9ae5bdf20..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.3.4.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.3.4.bb
@@ -1,8 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --disable-libssp"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.4.1.bb b/recipes/gcc/gcc-cross-intermediate_4.4.1.bb
index 86e9a430ce..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.4.1.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.4.1.bb
@@ -1,10 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --disable-libssp \
-		"
-
diff --git a/recipes/gcc/gcc-cross-intermediate_4.4.2.bb b/recipes/gcc/gcc-cross-intermediate_4.4.2.bb
index 3ca59aa02f..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.4.2.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.4.2.bb
@@ -1,9 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --disable-libssp \
-		"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.4.3.bb b/recipes/gcc/gcc-cross-intermediate_4.4.3.bb
deleted file mode 100644
index 3ca59aa02f..0000000000
--- a/recipes/gcc/gcc-cross-intermediate_4.4.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require gcc-cross_${PV}.bb
-require gcc-cross-intermediate.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --disable-libssp \
-		"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.4.4.bb b/recipes/gcc/gcc-cross-intermediate_4.4.4.bb
new file mode 100644
index 0000000000..eb59de9461
--- /dev/null
+++ b/recipes/gcc/gcc-cross-intermediate_4.4.4.bb
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
diff --git a/recipes/gcc/gcc-cross-intermediate_4.5.0.bb b/recipes/gcc/gcc-cross-intermediate_4.5.0.bb
new file mode 100644
index 0000000000..eb59de9461
--- /dev/null
+++ b/recipes/gcc/gcc-cross-intermediate_4.5.0.bb
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
diff --git a/recipes/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb b/recipes/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb
index 2d4b55f997..6db4c71c37 100644
--- a/recipes/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb
+++ b/recipes/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb
@@ -2,6 +2,3 @@ require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 
 S = "${WORKDIR}/gcc-2006q1"
-
-EXTRA_OECONF += "--disable-libmudflap \
-		--disable-libssp"
diff --git a/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
index 5758df33d3..7bcf5d2396 100644
--- a/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
+++ b/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
@@ -3,8 +3,6 @@ require gcc-cross-intermediate.inc
 
 S = "${WORKDIR}/gcc-4.2"
 
-EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
-
 # Hack till we fix *libc properly
 do_install_append() {
 	ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
diff --git a/recipes/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
index 5423626a99..793f546f3b 100644
--- a/recipes/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
+++ b/recipes/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
@@ -2,5 +2,3 @@ require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 
 S = "${WORKDIR}/gcc-4.2"
-
-EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
diff --git a/recipes/gcc/gcc-cross-intermediate_svn.bb b/recipes/gcc/gcc-cross-intermediate_svn.bb
index b816c8b81c..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_svn.bb
+++ b/recipes/gcc/gcc-cross-intermediate_svn.bb
@@ -1,8 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-DEPENDS += "libmpc-native gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --disable-libssp"
diff --git a/recipes/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb b/recipes/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
index 07da82eda8..c7dda1de3b 100644
--- a/recipes/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
+++ b/recipes/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
@@ -1,4 +1,4 @@
 require gcc-cross-initial_${PV}.bb
 require gcc-cross-kernel.inc
 
-SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
+SRC_URI += "file://gcc-3.4.4-makefile-fix.patch"
diff --git a/recipes/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/recipes/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
index e8051dde22..700839cbec 100644
--- a/recipes/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
+++ b/recipes/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
@@ -9,5 +9,5 @@ require gcc-cross-kernel.inc
 
 PR = "r3"
 
-SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
+SRC_URI += "file://gcc-3.4.4-makefile-fix.patch"
 
diff --git a/recipes/gcc/gcc-cross-sdk.inc b/recipes/gcc/gcc-cross-sdk.inc
index fb24342939..ef8cbcb377 100644
--- a/recipes/gcc/gcc-cross-sdk.inc
+++ b/recipes/gcc/gcc-cross-sdk.inc
@@ -1,4 +1,7 @@
 inherit sdk
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc ${NATIVEDEPS}"
+
+require gcc-configure-sdk.inc
+require gcc-package-sdk.inc
 
diff --git a/recipes/gcc/gcc-cross-sdk_3.3.4.bb b/recipes/gcc/gcc-cross-sdk_3.3.4.bb
index 9fc7123044..b9fca30d68 100644
--- a/recipes/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_3.3.4.bb
@@ -4,8 +4,6 @@ inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
 
-SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
+SRC_URI += 'file://sdk-libstdc++-includes.patch'
 
diff --git a/recipes/gcc/gcc-cross-sdk_3.4.3.bb b/recipes/gcc/gcc-cross-sdk_3.4.3.bb
index 78c4cc0f4f..b1ca74bd0b 100644
--- a/recipes/gcc/gcc-cross-sdk_3.4.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_3.4.3.bb
@@ -2,7 +2,5 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
 
-SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
+SRC_URI += 'file://sdk-libstdc++-includes.patch'
diff --git a/recipes/gcc/gcc-cross-sdk_3.4.4.bb b/recipes/gcc/gcc-cross-sdk_3.4.4.bb
index c3017c7673..16ca9e4317 100644
--- a/recipes/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_3.4.4.bb
@@ -2,10 +2,8 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
 
-SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
+SRC_URI += 'file://sdk-libstdc++-includes.patch'
 
 do_compile_prepend () {
 	mkdir -p gcc
diff --git a/recipes/gcc/gcc-cross-sdk_4.1.0.bb b/recipes/gcc/gcc-cross-sdk_4.1.0.bb
index da5ffae413..9aa6a56d7e 100644
--- a/recipes/gcc/gcc-cross-sdk_4.1.0.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.1.0.bb
@@ -1,9 +1,5 @@
+
 PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
diff --git a/recipes/gcc/gcc-cross-sdk_4.1.1.bb b/recipes/gcc/gcc-cross-sdk_4.1.1.bb
index f133db31b1..26eb80b8b0 100644
--- a/recipes/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.1.1.bb
@@ -2,7 +2,3 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "gmp-native mpfr-native"
diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb b/recipes/gcc/gcc-cross-sdk_4.1.2.bb
index c5030e3517..2475f3efd8 100644
--- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb
@@ -2,10 +2,6 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb b/recipes/gcc/gcc-cross-sdk_4.2.2.bb
index bea9839246..eb30315a62 100644
--- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb
@@ -4,10 +4,6 @@ inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb b/recipes/gcc/gcc-cross-sdk_4.2.3.bb
index de0f65356f..fbbfbcece3 100644
--- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb
@@ -4,10 +4,6 @@ inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb
index c451da11b9..28cdbb73a2 100644
--- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb
@@ -4,10 +4,6 @@ inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --enable-libssp \
 		--enable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb
index de0f65356f..fbbfbcece3 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb
@@ -4,10 +4,6 @@ inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb
index de0f65356f..fbbfbcece3 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb
@@ -4,10 +4,6 @@ inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb
index 8ed1df5230..62de382797 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb
@@ -4,10 +4,6 @@ inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.4.bb b/recipes/gcc/gcc-cross-sdk_4.3.4.bb
index ae6b2988f1..1a2ed67342 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.4.bb
@@ -4,10 +4,6 @@ inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross-sdk_4.4.1.bb b/recipes/gcc/gcc-cross-sdk_4.4.1.bb
index 76a28f18bd..77ccf728ab 100644
--- a/recipes/gcc/gcc-cross-sdk_4.4.1.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.4.1.bb
@@ -2,12 +2,8 @@ inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
 PR = "${INC_PR}.1"
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
 		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.4.2.bb b/recipes/gcc/gcc-cross-sdk_4.4.2.bb
index 76a28f18bd..77ccf728ab 100644
--- a/recipes/gcc/gcc-cross-sdk_4.4.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.4.2.bb
@@ -2,12 +2,8 @@ inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
 PR = "${INC_PR}.1"
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
 		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.4.3.bb b/recipes/gcc/gcc-cross-sdk_4.4.4.bb
index e1b510e58f..44abbcf75b 100644
--- a/recipes/gcc/gcc-cross-sdk_4.4.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.4.4.bb
@@ -2,12 +2,8 @@ inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
 PR = "${INC_PR}.1"
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
 		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.5.0.bb b/recipes/gcc/gcc-cross-sdk_4.5.0.bb
new file mode 100644
index 0000000000..a316cd282e
--- /dev/null
+++ b/recipes/gcc/gcc-cross-sdk_4.5.0.bb
@@ -0,0 +1,10 @@
+PR = "r2"
+
+inherit sdk
+
+require gcc-${PV}.inc
+require gcc-cross-sdk.inc
+
+EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
+		--disable-libgomp --disable-libmudflap \
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
diff --git a/recipes/gcc/gcc-cross.inc b/recipes/gcc/gcc-cross.inc
index 3485824b8a..44917f0dde 100644
--- a/recipes/gcc/gcc-cross.inc
+++ b/recipes/gcc/gcc-cross.inc
@@ -1,13 +1,11 @@
-# Path mangling needed by the cross packaging
-# Note that we use := here, and require that this is included at the correct 
-# point (before inheriting cross) to ensure that libdir and includedir are
-# target paths, not CROSS_DIR paths.
-target_libdir := "${libdir}"
-target_includedir := "${includedir}"
-target_base_libdir := "${base_libdir}"
-target_prefix := "${prefix}"
-
 inherit cross
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc ${NATIVEDEPS}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+
+do_stage () {
+    use_do_install_for_stage
+}
+
+require gcc-configure-cross.inc
+require gcc-package-cross.inc
diff --git a/recipes/gcc/gcc-cross4.inc b/recipes/gcc/gcc-cross4.inc
index 77a55968fa..51d0529342 100644
--- a/recipes/gcc/gcc-cross4.inc
+++ b/recipes/gcc/gcc-cross4.inc
@@ -1,5 +1,3 @@
 require gcc-cross.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF_append_sh4 = " --with-multilib-list=m4,m4-nofpu "
diff --git a/recipes/gcc/gcc-cross_3.3.3.bb b/recipes/gcc/gcc-cross_3.3.3.bb
index 26b021e762..c2835db4f8 100644
--- a/recipes/gcc/gcc-cross_3.3.3.bb
+++ b/recipes/gcc/gcc-cross_3.3.3.bb
@@ -2,7 +2,5 @@ PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
 
diff --git a/recipes/gcc/gcc-cross_3.3.4.bb b/recipes/gcc/gcc-cross_3.3.4.bb
index 39a3829e1a..40ea603c2a 100644
--- a/recipes/gcc/gcc-cross_3.3.4.bb
+++ b/recipes/gcc/gcc-cross_3.3.4.bb
@@ -2,6 +2,3 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
-
diff --git a/recipes/gcc/gcc-cross_3.4.3.bb b/recipes/gcc/gcc-cross_3.4.3.bb
index 0bf1951bea..40ea603c2a 100644
--- a/recipes/gcc/gcc-cross_3.4.3.bb
+++ b/recipes/gcc/gcc-cross_3.4.3.bb
@@ -2,5 +2,3 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
diff --git a/recipes/gcc/gcc-cross_3.4.4.bb b/recipes/gcc/gcc-cross_3.4.4.bb
index 39a3829e1a..40ea603c2a 100644
--- a/recipes/gcc/gcc-cross_3.4.4.bb
+++ b/recipes/gcc/gcc-cross_3.4.4.bb
@@ -2,6 +2,3 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
-
diff --git a/recipes/gcc/gcc-cross_4.0.0.bb b/recipes/gcc/gcc-cross_4.0.0.bb
index e42dc88274..2ab9ef4a5f 100644
--- a/recipes/gcc/gcc-cross_4.0.0.bb
+++ b/recipes/gcc/gcc-cross_4.0.0.bb
@@ -2,6 +2,3 @@ PR = "r9"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
-
diff --git a/recipes/gcc/gcc-cross_4.0.2.bb b/recipes/gcc/gcc-cross_4.0.2.bb
index bc50519b2a..1294af5864 100644
--- a/recipes/gcc/gcc-cross_4.0.2.bb
+++ b/recipes/gcc/gcc-cross_4.0.2.bb
@@ -2,6 +2,3 @@ PR = "r15"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
-
diff --git a/recipes/gcc/gcc-cross_4.1.0.bb b/recipes/gcc/gcc-cross_4.1.0.bb
index 4591397559..39ad5fe327 100644
--- a/recipes/gcc/gcc-cross_4.1.0.bb
+++ b/recipes/gcc/gcc-cross_4.1.0.bb
@@ -2,8 +2,6 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.1.1.bb b/recipes/gcc/gcc-cross_4.1.1.bb
index e96867e682..1864078f71 100644
--- a/recipes/gcc/gcc-cross_4.1.1.bb
+++ b/recipes/gcc/gcc-cross_4.1.1.bb
@@ -2,9 +2,7 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
diff --git a/recipes/gcc/gcc-cross_4.1.2.bb b/recipes/gcc/gcc-cross_4.1.2.bb
index c11aba28a8..d2038c71b9 100644
--- a/recipes/gcc/gcc-cross_4.1.2.bb
+++ b/recipes/gcc/gcc-cross_4.1.2.bb
@@ -2,10 +2,8 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF_append_avr32= "  --disable-libmudflap "
 
diff --git a/recipes/gcc/gcc-cross_4.2.1.bb b/recipes/gcc/gcc-cross_4.2.1.bb
index 8c7f4c50ed..ae7f2b7312 100644
--- a/recipes/gcc/gcc-cross_4.2.1.bb
+++ b/recipes/gcc/gcc-cross_4.2.1.bb
@@ -2,10 +2,8 @@ PR = "r21"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.2.2.bb b/recipes/gcc/gcc-cross_4.2.2.bb
index cf1bf6837f..30c1d78912 100644
--- a/recipes/gcc/gcc-cross_4.2.2.bb
+++ b/recipes/gcc/gcc-cross_4.2.2.bb
@@ -2,10 +2,8 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.2.3.bb b/recipes/gcc/gcc-cross_4.2.3.bb
index fb6105b433..13dec2718e 100644
--- a/recipes/gcc/gcc-cross_4.2.3.bb
+++ b/recipes/gcc/gcc-cross_4.2.3.bb
@@ -2,10 +2,8 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.2.4.bb b/recipes/gcc/gcc-cross_4.2.4.bb
index fb6105b433..13dec2718e 100644
--- a/recipes/gcc/gcc-cross_4.2.4.bb
+++ b/recipes/gcc/gcc-cross_4.2.4.bb
@@ -2,10 +2,8 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.3.1.bb b/recipes/gcc/gcc-cross_4.3.1.bb
index 97f4e3151b..1c191faedb 100644
--- a/recipes/gcc/gcc-cross_4.3.1.bb
+++ b/recipes/gcc/gcc-cross_4.3.1.bb
@@ -2,10 +2,8 @@ PR = "${INC_PR}.1"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.3.2.bb b/recipes/gcc/gcc-cross_4.3.2.bb
index 94b98b9e63..322a203bf4 100644
--- a/recipes/gcc/gcc-cross_4.3.2.bb
+++ b/recipes/gcc/gcc-cross_4.3.2.bb
@@ -1,10 +1,8 @@
 PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.3.3.bb b/recipes/gcc/gcc-cross_4.3.3.bb
index 4399c93cd5..c8e2f9bc10 100644
--- a/recipes/gcc/gcc-cross_4.3.3.bb
+++ b/recipes/gcc/gcc-cross_4.3.3.bb
@@ -1,10 +1,8 @@
 PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.3.4.bb b/recipes/gcc/gcc-cross_4.3.4.bb
index 5f91981aa8..7edb21b3ff 100644
--- a/recipes/gcc/gcc-cross_4.3.4.bb
+++ b/recipes/gcc/gcc-cross_4.3.4.bb
@@ -1,10 +1,8 @@
 PR = "${INC_PR}.0"
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.4.1.bb b/recipes/gcc/gcc-cross_4.4.1.bb
index f3b4b93bfb..fce459b494 100644
--- a/recipes/gcc/gcc-cross_4.4.1.bb
+++ b/recipes/gcc/gcc-cross_4.4.1.bb
@@ -1,10 +1,8 @@
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 PR = "${INC_PR}.1"
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.4.2.bb b/recipes/gcc/gcc-cross_4.4.2.bb
index f3b4b93bfb..fce459b494 100644
--- a/recipes/gcc/gcc-cross_4.4.2.bb
+++ b/recipes/gcc/gcc-cross_4.4.2.bb
@@ -1,10 +1,8 @@
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 PR = "${INC_PR}.1"
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.4.3.bb b/recipes/gcc/gcc-cross_4.4.4.bb
index 11eb29d419..4309fd4baf 100644
--- a/recipes/gcc/gcc-cross_4.4.3.bb
+++ b/recipes/gcc/gcc-cross_4.4.4.bb
@@ -1,10 +1,8 @@
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_4.5.0.bb b/recipes/gcc/gcc-cross_4.5.0.bb
new file mode 100644
index 0000000000..825a7bde8a
--- /dev/null
+++ b/recipes/gcc/gcc-cross_4.5.0.bb
@@ -0,0 +1,11 @@
+PR = "r0"
+require gcc-${PV}.inc
+require gcc-cross4.inc
+
+DEPENDS += "libmpc-native"
+
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
+
+EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} --with-system-zlib"
+
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_csl-arm-2005q3.bb b/recipes/gcc/gcc-cross_csl-arm-2005q3.bb
index 112bfe5736..9ad84cd704 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -5,5 +5,3 @@ FORTRAN = ""
 
 require gcc-csl-arm-2005q3.inc
 require gcc-cross.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
diff --git a/recipes/gcc/gcc-cross_csl-arm-2006q1.bb b/recipes/gcc/gcc-cross_csl-arm-2006q1.bb
index 0f28986478..29efa49897 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2006q1.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2006q1.bb
@@ -2,5 +2,3 @@ PR = "r6"
 
 require gcc-csl-arm-2006q1.inc
 require gcc-cross.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
diff --git a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
index adf7f5ae4c..945e8ac144 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
@@ -2,10 +2,8 @@ PR = "r6"
 
 require gcc-csl-arm-2007q3.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
index d534574c2e..a3edb288be 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -2,10 +2,8 @@ PR = "r5"
 
 require gcc-csl-arm-2008q1.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb
index ef4ef304ef..88b222e3c4 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb
@@ -2,10 +2,8 @@ PR = "r1"
 
 require gcc-csl-arm-2008q3.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
 
diff --git a/recipes/gcc/gcc-cross_svn.bb b/recipes/gcc/gcc-cross_svn.bb
index 2d3c1368dc..825a7bde8a 100644
--- a/recipes/gcc/gcc-cross_svn.bb
+++ b/recipes/gcc/gcc-cross_svn.bb
@@ -1,12 +1,10 @@
 PR = "r0"
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
 DEPENDS += "libmpc-native"
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} --with-system-zlib"
 
diff --git a/recipes/gcc/gcc-csl-arm-2005q3.inc b/recipes/gcc/gcc-csl-arm-2005q3.inc
index 4ed1c05a71..3e9f3db2e8 100644
--- a/recipes/gcc/gcc-csl-arm-2005q3.inc
+++ b/recipes/gcc/gcc-csl-arm-2005q3.inc
@@ -7,10 +7,10 @@ PV_chinook-compat = "3.4.4cs2005q3.2"
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi.src.tar.bz2;name=archive \
-           file://gcc_optab_arm.patch;patch=1 \
-           file://gcc-3.4.4-eabi-bigendian.patch;patch=1 \
-           file://libstdc++_configure.patch;patch=1 \
-           file://demangle.patch;patch=1 \
+           file://gcc_optab_arm.patch \
+           file://gcc-3.4.4-eabi-bigendian.patch \
+           file://libstdc++_configure.patch \
+           file://demangle.patch \
           "
 
 S = "${WORKDIR}/gcc-2005q3"
diff --git a/recipes/gcc/gcc-csl-arm-2006q1.inc b/recipes/gcc/gcc-csl-arm-2006q1.inc
index e7b78ee2c8..0fabaef92f 100644
--- a/recipes/gcc/gcc-csl-arm-2006q1.inc
+++ b/recipes/gcc/gcc-csl-arm-2006q1.inc
@@ -6,8 +6,8 @@ PV = "4.1.0+csl-arm-2006q1-6"
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2;name=archive \
-           file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
-           file://gcc-new-makeinfo.patch;patch=1"
+           file://gcc-configure-no-fortran.patch \
+           file://gcc-new-makeinfo.patch"
 
 S = "${WORKDIR}/gcc-2006q1"
 
@@ -17,5 +17,9 @@ do_unpack2() {
 }
 
 addtask unpack2 after do_unpack before do_patch
+
 SRC_URI[archive.md5sum] = "c0d60035d45c7f43d2ddd3c021709220"
 SRC_URI[archive.sha256sum] = "693609f59d0c0a6518a3654314aaef841305e029c8f7de4c42fbc0fd7f2dbb35"
+
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp"
diff --git a/recipes/gcc/gcc-csl-arm-2007q3.inc b/recipes/gcc/gcc-csl-arm-2007q3.inc
index 98edfff1a5..7242313036 100644
--- a/recipes/gcc/gcc-csl-arm-2007q3.inc
+++ b/recipes/gcc/gcc-csl-arm-2007q3.inc
@@ -6,31 +6,31 @@ PV = "4.2.1+csl-arm-2007q3-53"
 FILESPATH = "${FILE_DIRNAME}/gcc-csl-arm-2007q3:${FILE_DIRNAME}/gcc-csl-arm"
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2007q3-53-arm-none-eabi.src.tar.bz2;name=archive \
-           file://gcc-new-makeinfo.patch;patch=1 \
-#           file://100-uclibc-conf.patch;patch=1 \
-#           file://103-uclibc-conf-noupstream.patch;patch=1 \
-#           file://200-uclibc-locale.patch;patch=1 \
-#           file://203-uclibc-locale-no__x.patch;patch=1 \
-#           file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-#           file://205-uclibc-locale-update.patch;patch=1 \
-#           file://300-libstdc++-pic.patch;patch=1 \
-#           file://302-c99-snprintf.patch;patch=1 \
-#           file://303-c99-complex-ugly-hack.patch;patch=1 \
-#           file://304-index_macro.patch;patch=1 \
-#           file://305-libmudflap-susv3-legacy.patch;patch=1 \
-#           file://306-libstdc++-namespace.patch;patch=1 \
-#           file://307-locale_facets.patch;patch=1 \
-#           file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-#           file://602-sdk-libstdc++-includes.patch;patch=1 \
-           file://gcc41-configure.in.patch;patch=1 \
-           file://arm-nolibfloat.patch;patch=1 \
-           file://arm-softfloat.patch;patch=1 \
-           file://zecke-xgcc-cpp.patch;patch=1 \
-#           file://gfortran.patch;patch=1 \
-#           file://fortran-static-linking.patch;patch=1 \
-#           file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
-#           file://gcc-new-makeinfo.patch;patch=1 \
-           file://gcc-Os-fix.diff;patch=1 \
+           file://gcc-new-makeinfo.patch \
+#           file://100-uclibc-conf.patch \
+#           file://103-uclibc-conf-noupstream.patch \
+#           file://200-uclibc-locale.patch \
+#           file://203-uclibc-locale-no__x.patch \
+#           file://204-uclibc-locale-wchar_fix.patch \
+#           file://205-uclibc-locale-update.patch \
+#           file://300-libstdc++-pic.patch \
+#           file://302-c99-snprintf.patch \
+#           file://303-c99-complex-ugly-hack.patch \
+#           file://304-index_macro.patch \
+#           file://305-libmudflap-susv3-legacy.patch \
+#           file://306-libstdc++-namespace.patch \
+#           file://307-locale_facets.patch \
+#           file://402-libbackend_dep_gcov-iov.h.patch \
+#           file://602-sdk-libstdc++-includes.patch \
+           file://gcc41-configure.in.patch \
+           file://arm-nolibfloat.patch \
+           file://arm-softfloat.patch \
+           file://zecke-xgcc-cpp.patch \
+#           file://gfortran.patch \
+#           file://fortran-static-linking.patch \
+#           file://gcc-configure-no-fortran.patch \
+#           file://gcc-new-makeinfo.patch \
+           file://gcc-Os-fix.diff \
 "
 
 
@@ -47,6 +47,10 @@ FORTRAN = ""
 #JAVA = ",java"
 
 EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap"
+
+
 ARM_INSTRUCTION_SET = "arm"
 
 addtask unpack2 after do_unpack before do_patch
diff --git a/recipes/gcc/gcc-csl-arm-2008q1.inc b/recipes/gcc/gcc-csl-arm-2008q1.inc
index 8209cc9c34..be686a880b 100644
--- a/recipes/gcc/gcc-csl-arm-2008q1.inc
+++ b/recipes/gcc/gcc-csl-arm-2008q1.inc
@@ -6,29 +6,29 @@ PV = "4.2.3+csl-arm-2008q1-126"
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q1-126-arm-none-eabi.src.tar.bz2;name=archive \
-#           file://100-uclibc-conf.patch;patch=1 \
-#           file://103-uclibc-conf-noupstream.patch;patch=1 \
-#           file://200-uclibc-locale.patch;patch=1 \
-#           file://203-uclibc-locale-no__x.patch;patch=1 \
-#           file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-#           file://205-uclibc-locale-update.patch;patch=1 \
-#           file://300-libstdc++-pic.patch;patch=1 \
-#           file://302-c99-snprintf.patch;patch=1 \
-#           file://303-c99-complex-ugly-hack.patch;patch=1 \
-#           file://304-index_macro.patch;patch=1 \
-#           file://305-libmudflap-susv3-legacy.patch;patch=1 \
-#           file://306-libstdc++-namespace.patch;patch=1 \
-#           file://307-locale_facets.patch;patch=1 \
-#           file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-#           file://602-sdk-libstdc++-includes.patch;patch=1 \
-           file://gcc41-configure.in.patch;patch=1 \
-           file://arm-nolibfloat.patch;patch=1 \
-           file://arm-softfloat.patch;patch=1 \
-           file://zecke-xgcc-cpp.patch;patch=1 \
-#           file://gfortran-4.3.x.patch;patch=1 \
-#           file://fortran-static-linking.patch;patch=1 \
-#           file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
-#           file://gcc-new-makeinfo.patch;patch=1 \
+#           file://100-uclibc-conf.patch \
+#           file://103-uclibc-conf-noupstream.patch \
+#           file://200-uclibc-locale.patch \
+#           file://203-uclibc-locale-no__x.patch \
+#           file://204-uclibc-locale-wchar_fix.patch \
+#           file://205-uclibc-locale-update.patch \
+#           file://300-libstdc++-pic.patch \
+#           file://302-c99-snprintf.patch \
+#           file://303-c99-complex-ugly-hack.patch \
+#           file://304-index_macro.patch \
+#           file://305-libmudflap-susv3-legacy.patch \
+#           file://306-libstdc++-namespace.patch \
+#           file://307-locale_facets.patch \
+#           file://402-libbackend_dep_gcov-iov.h.patch \
+#           file://602-sdk-libstdc++-includes.patch \
+           file://gcc41-configure.in.patch \
+           file://arm-nolibfloat.patch \
+           file://arm-softfloat.patch \
+           file://zecke-xgcc-cpp.patch \
+#           file://gfortran-4.3.x.patch \
+#           file://fortran-static-linking.patch \
+#           file://gcc-configure-no-fortran.patch \
+#           file://gcc-new-makeinfo.patch \
 "
 
 
@@ -45,6 +45,10 @@ FORTRAN = ""
 #JAVA = ",java"
 
 EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap"
+
+
 ARM_INSTRUCTION_SET = "arm"
 
 addtask unpack2 after do_unpack before do_patch
diff --git a/recipes/gcc/gcc-csl-arm-2008q3.inc b/recipes/gcc/gcc-csl-arm-2008q3.inc
index acfad31284..79a9f8feba 100644
--- a/recipes/gcc/gcc-csl-arm-2008q3.inc
+++ b/recipes/gcc/gcc-csl-arm-2008q3.inc
@@ -6,13 +6,13 @@ PV = "4.3.2+csl-arm-2008q3-39"
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm-2008q3"
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q3-39-arm-none-eabi.src.tar.bz2;name=archive \
-           file://gcc-csl-2008q3-hotfix.diff;patch=1 \
-           file://arm-nolibfloat.patch;patch=1 \
-           file://arm-softfloat.patch;patch=1 \
-           file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
-           file://gcc-flags-for-build.patch;patch=1 \
-           file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
-           file://gfortran-4.3.x.patch;patch=1 \
+           file://gcc-csl-2008q3-hotfix.diff \
+           file://arm-nolibfloat.patch \
+           file://arm-softfloat.patch \
+           file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+           file://gcc-flags-for-build.patch \
+           file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch \
+           file://gfortran-4.3.x.patch \
 "
 
 
diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc
index 0f918611cf..5236928d83 100644
--- a/recipes/gcc/gcc-package-cross.inc
+++ b/recipes/gcc/gcc-package-cross.inc
@@ -1,6 +1,6 @@
-INHIBIT_PACKAGE_STRIP ?= ""
-OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP ?= ""
+OLD_PACKAGE_STRIP := "${PACKAGE_STRIP}"
+PACKAGE_STRIP = "no"
 
 PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran"
 
@@ -18,63 +18,36 @@ FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 
-	# Move libgcc_s into /lib
-        mkdir -p ${D}${target_base_libdir}
-        if [ -f ${D}${target_base_libdir}/libgcc_s.so.? ]; then
-                # Already in the right location
-                :
-        elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then
-                mv -f ${D}${prefix}/lib/libgcc_s.so* ${D}${target_base_libdir} || true
-
-        elif [  -f ${D}${prefix}/*/lib/nof/libgcc_s.so.? ]; then
-                mv -f ${D}${prefix}/*/lib/nof/libgcc_s.so* ${D}${target_base_libdir}
-        else
-                # Look for .../${TARGET_SYS}/lib/libgcc_s*
-                # (or /lib64/, on x86_64)
-                mv -f ${D}${prefix}/*/${target_base_libdir}/libgcc_s.so* ${D}${target_base_libdir} || true 
-        fi
-
-
-
-	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
-        mkdir -p ${D}${target_libdir}
-
-        if [ -f ${D}${prefix}/*/lib/nof/libstdc++.so ]; then
-
-           mv -f ${D}${prefix}/*/lib/nof/libstdc++.so* ${D}${target_libdir} || true
-           mv -f ${D}${prefix}/*/lib/nof/libg2c.so* ${D}${target_libdir} || true
-           mv -f ${D}${prefix}/*/lib/nof/libgfortran*.so* ${D}${target_libdir} || true
-           mv -f ${D}${prefix}/*/lib/nof/libssp*.so* ${D}${target_libdir} || true 	
-
-        else
-           # Look for .../${TARGET_SYS}/lib/lib* (or /lib64/ on x86_64)
-           mv -f ${D}${prefix}/*/${target_base_libdir}/libstdc++.so* ${D}${target_libdir} || true
-           mv -f ${D}${prefix}/*/${target_base_libdir}/libg2c.so* ${D}${target_libdir} || true
-           mv -f ${D}${prefix}/*/${target_base_libdir}/libgfortran*.so* ${D}${target_libdir} || true
-           mv -f ${D}${prefix}/*/${target_base_libdir}/libssp*.so* ${D}${target_libdir} || true
-        fi
-
-
-
-       # Manually run the target stripper since we won't get it run by
-       # the packaging.
-       if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
-               ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.* || true
-               ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* || true
-               ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.* || true
-               ${TARGET_PREFIX}strip ${D}${target_libdir}/libgfortran*.so* || true
-       fi
+	install -d ${D}${target_base_libdir}
+	install -d ${D}${target_libdir}
+
+	for d in ${TARGET_SYS}/lib/nof ${TARGET_SYS}/lib64 ${TARGET_SYS}/lib; do
+		if [ -d ${D}${prefix}/$d/ ]; then
+			mv -f ${D}${prefix}/$d/libgcc* ${D}${target_base_libdir} || true
+			mv -f ${D}${prefix}/$d/* ${D}${target_libdir} || true
+		fi
+	done
+
+	# Manually run the target stripper since we won't get it run by
+	# the packaging.
+	if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
+		${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.* || true
+		${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* || true
+		${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.* || true
+		${TARGET_PREFIX}strip ${D}${target_libdir}/libgfortran*.so* || true
+	fi
      
-       # Link gfortran to g77 to satisfy not-so-smart configure or hard coded g77
-       # gfortran is fully backwards compatible. This is a safe and practical solution.
-       if [ -f ${D}${CROSS_DIR}/bin/${TARGET_PREFIX}gfortran ]; then
-              currdir="$PWD"
-              cd ${D}${CROSS_DIR}/bin/
-              ln -sf ${TARGET_PREFIX}gfortran ${TARGET_PREFIX}g77 || true
-              if [ -d ${CROSS_DIR}/${TARGET_SYS}/bin/ ] ; then 
-                  cd ${CROSS_DIR}/${TARGET_SYS}/bin/
-                  ln -sf gfortran g77 || true
-              fi
-              cd $currdir
-        fi
+	# Link gfortran to g77 to satisfy not-so-smart configure or hard coded g77
+	# gfortran is fully backwards compatible. This is a safe and practical solution.
+	if [ -f ${D}${CROSS_DIR}/bin/${TARGET_PREFIX}gfortran ]; then
+		currdir="$PWD"
+		cd ${D}${CROSS_DIR}/bin/
+		ln -sf ${TARGET_PREFIX}gfortran ${TARGET_PREFIX}g77 || true
+		if [ -d ${CROSS_DIR}/${TARGET_SYS}/bin/ ] ; then 
+			cd ${CROSS_DIR}/${TARGET_SYS}/bin/
+			ln -sf gfortran g77 || true
+		fi
+		cd $currdir
+	fi
 }
+
diff --git a/recipes/gcc/gcc-package-sdk.inc b/recipes/gcc/gcc-package-sdk.inc
index dcf2c890e4..dd32ec7561 100644
--- a/recipes/gcc/gcc-package-sdk.inc
+++ b/recipes/gcc/gcc-package-sdk.inc
@@ -1,6 +1,6 @@
-INHIBIT_PACKAGE_STRIP ?= ""
-OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP ?= ""
+OLD_PACKAGE_STRIP := "${PACKAGE_STRIP}"
+PACKAGE_STRIP = "no"
 
 # Having anything auto depending on gcc-cross-sdk is a really bad idea...
 EXCLUDE_FROM_SHLIBS = "1"
@@ -54,7 +54,7 @@ do_install () {
 
 	# Manually run the target stripper since we won't get it run by
 	# the packaging.
-	if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
+	if [ "x${OLD_PACKAGE_STRIP}" != "xno" ]; then
 		${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libstdc++.so.*
 		${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libg2c.so.* || true
 		${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libgcc_s.so.*
diff --git a/recipes/gcc/gcc-svn.inc b/recipes/gcc/gcc-svn.inc
index 9f97202165..14175e736d 100644
--- a/recipes/gcc/gcc-svn.inc
+++ b/recipes/gcc/gcc-svn.inc
@@ -1,23 +1,24 @@
 DEFAULT_PREFERENCE = "-999"
 ARM_INSTRUCTION_SET = "arm"
 
-SRCREV = "156750"
+SRCREV = "158653"
 
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp libmpc"
+NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
 
-BINV = "4.5.0"
-PV = "4.5+svnr${SRCPV}"
+BINV = "4.6.0"
+PV = "4.6+svnr${SRCPV}"
 
 FILESPATHPKG .= ":gcc-svn"
 
 SRC_URI = "svn://gcc.gnu.org/svn/gcc;module=trunk \
-	   file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
-	   file://100-uclibc-conf.patch;patch=1 \
-           file://gcc-uclibc-locale-ctype_touplow_t.patch;patch=1 \
-	   file://cache-amnesia.patch;patch=1 \
-	   file://gcc-flags-for-build.patch;patch=1 \
+	   file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+	   file://100-uclibc-conf.patch \
+           file://gcc-uclibc-locale-ctype_touplow_t.patch \
+	   file://cache-amnesia.patch \
+	   file://gcc-flags-for-build.patch \
 	  "
 
 # Language Overrides
@@ -28,6 +29,9 @@ EXTRA_OECONF_BASE = " --enable-libssp \
 		      --disable-bootstrap --disable-libgomp \
 		      --disable-libmudflap"
 
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
+
 rename_srcdir (){
 	mv ${WORKDIR}/trunk ${WORKDIR}/gcc-${PV}
 }
diff --git a/recipes/gcc/gcc_4.2.2.bb b/recipes/gcc/gcc_4.2.2.bb
index 2153f272ee..30713f8a47 100644
--- a/recipes/gcc/gcc_4.2.2.bb
+++ b/recipes/gcc/gcc_4.2.2.bb
@@ -4,6 +4,6 @@ require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/recipes/gcc/gcc_4.2.3.bb b/recipes/gcc/gcc_4.2.3.bb
index 1da86a3fc5..6fe30282d6 100644
--- a/recipes/gcc/gcc_4.2.3.bb
+++ b/recipes/gcc/gcc_4.2.3.bb
@@ -4,7 +4,7 @@ require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.2.4.bb b/recipes/gcc/gcc_4.2.4.bb
index 1da86a3fc5..6fe30282d6 100644
--- a/recipes/gcc/gcc_4.2.4.bb
+++ b/recipes/gcc/gcc_4.2.4.bb
@@ -4,7 +4,7 @@ require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.3.1.bb b/recipes/gcc/gcc_4.3.1.bb
index 6b20b47f1a..442c273ffc 100644
--- a/recipes/gcc/gcc_4.3.1.bb
+++ b/recipes/gcc/gcc_4.3.1.bb
@@ -4,7 +4,7 @@ require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.3.2.bb b/recipes/gcc/gcc_4.3.2.bb
index 60180755c9..c73dfc1c84 100644
--- a/recipes/gcc/gcc_4.3.2.bb
+++ b/recipes/gcc/gcc_4.3.2.bb
@@ -8,6 +8,6 @@ FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/recipes/gcc/gcc_4.3.3.bb b/recipes/gcc/gcc_4.3.3.bb
index 4001767860..274f474d37 100644
--- a/recipes/gcc/gcc_4.3.3.bb
+++ b/recipes/gcc/gcc_4.3.3.bb
@@ -8,7 +8,7 @@ FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.3.4.bb b/recipes/gcc/gcc_4.3.4.bb
index b360ed84e9..ec20085d90 100644
--- a/recipes/gcc/gcc_4.3.4.bb
+++ b/recipes/gcc/gcc_4.3.4.bb
@@ -8,6 +8,6 @@ FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/recipes/gcc/gcc_4.4.1.bb b/recipes/gcc/gcc_4.4.1.bb
index 85606ce4a5..52b09cf661 100644
--- a/recipes/gcc/gcc_4.4.1.bb
+++ b/recipes/gcc/gcc_4.4.1.bb
@@ -8,7 +8,7 @@ FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.4.2.bb b/recipes/gcc/gcc_4.4.2.bb
index 65a73cd68a..d1d50adacf 100644
--- a/recipes/gcc/gcc_4.4.2.bb
+++ b/recipes/gcc/gcc_4.4.2.bb
@@ -8,7 +8,7 @@ FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.4.3.bb b/recipes/gcc/gcc_4.4.4.bb
index 8b29e4a420..271e9d152d 100644
--- a/recipes/gcc/gcc_4.4.3.bb
+++ b/recipes/gcc/gcc_4.4.4.bb
@@ -8,6 +8,6 @@ FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/recipes/gcc/gcc_4.5.0.bb b/recipes/gcc/gcc_4.5.0.bb
new file mode 100644
index 0000000000..40e1f7c3e5
--- /dev/null
+++ b/recipes/gcc/gcc_4.5.0.bb
@@ -0,0 +1,13 @@
+PR = "r0"
+require gcc-${PV}.inc
+require gcc-configure-target.inc
+require gcc-package-target.inc
+
+# Gcc 4.3.3 installs crt* in a '4.3.1' dir....
+FILES_${PN} += "\
+        ${gcclibdir}/${TARGET_SYS}/*/*.o \
+"
+
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/recipes/gcc/gcc_svn.bb b/recipes/gcc/gcc_svn.bb
index 55725b0044..40e1f7c3e5 100644
--- a/recipes/gcc/gcc_svn.bb
+++ b/recipes/gcc/gcc_svn.bb
@@ -8,6 +8,6 @@ FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/recipes/gcc/mingw-gcc-canadian-cross-initial_3.4.5-20060117-2.bb b/recipes/gcc/mingw-gcc-canadian-cross-initial_3.4.5-20060117-2.bb
index 0117106e5a..acdccc82f5 100644
--- a/recipes/gcc/mingw-gcc-canadian-cross-initial_3.4.5-20060117-2.bb
+++ b/recipes/gcc/mingw-gcc-canadian-cross-initial_3.4.5-20060117-2.bb
@@ -3,5 +3,5 @@ require gcc-canadian-cross-initial.inc
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/mingw/gcc-core-${PV}-src.tar.gz;name=core \
-	file://includedir.patch;patch=1 \
+	file://includedir.patch \
 "
diff --git a/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb b/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb
index 2a62056698..0c0c74f75b 100644
--- a/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb
+++ b/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb
@@ -16,7 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mingw/gcc-core-${PV}-src.tar.gz;name=core \
 	   ${SOURCEFORGE_MIRROR}/mingw/gcc-java-${PV}-src.tar.gz;name=java \
 	   ${SOURCEFORGE_MIRROR}/mingw/gcc-objc-${PV}-src.tar.gz;name=objc \
 	   ${SOURCEFORGE_MIRROR}/mingw/gcc-ada-${PV}-src.tar.gz;name=ada \
-	   file://includedir.patch;patch=1 \
+	   file://includedir.patch \
 "
 
 
diff --git a/recipes/gdal/gdal_1.5.2.bb b/recipes/gdal/gdal_1.5.2.bb
index 0cbd6dec25..4ad15ea4c5 100644
--- a/recipes/gdal/gdal_1.5.2.bb
+++ b/recipes/gdal/gdal_1.5.2.bb
@@ -5,7 +5,7 @@ DEPENDS = "proj-4 sqlite3 zlib jpeg libpng tiff giflib curl jasper expat"
 PR = "r3"
 
 SRC_URI = "http://www.gdal.org/dl/${P}.tar.gz \
-	   file://gdal_config.patch;patch=1 \
+	   file://gdal_config.patch \
  	  "
 
 ARM_INSTRUCTION_SET = "arm"
diff --git a/recipes/gdb/gdb-7.1/gdb-6.8-fix-compile-karmic.patch b/recipes/gdb/gdb-7.1/gdb-6.8-fix-compile-karmic.patch
new file mode 100644
index 0000000000..1080b162aa
--- /dev/null
+++ b/recipes/gdb/gdb-7.1/gdb-6.8-fix-compile-karmic.patch
@@ -0,0 +1,22 @@
+fix this on karmic
+
+cc1: warnings being treated as errors
+/home/ich/build/arm/armv5t/tmp/work/i686-armv5te-sdk-oe-linux-gnueabi/gdb-cross-sdk-6.8-r2/gdb-6.8/gdb/eval.c: In function 'evaluate_subexp_standard':
+/home/ich/build/arm/armv5t/tmp/work/i686-armv5te-sdk-oe-linux-gnueabi/gdb-cross-sdk-6.8-r2/gdb-6.8/gdb/eval.c:1705: error: 'subscript_array' may be used uninitialized in this function
+/home/ich/build/arm/armv5t/tmp/work/i686-armv5te-sdk-oe-linux-gnueabi/gdb-cross-sdk-6.8-r2/gdb-6.8/gdb/eval.c:1644: note: 'subscript_array' was declared here
+
+
+
+Index: gdb-6.8/gdb/eval.c
+===================================================================
+--- gdb-6.8.orig/gdb/eval.c	2009-08-02 03:25:20.000000000 +0200
++++ gdb-6.8/gdb/eval.c	2009-08-02 03:53:39.000000000 +0200
+@@ -1656,6 +1656,8 @@
+ 	if (nargs != ndimensions)
+ 	  error (_("Wrong number of subscripts"));
+ 
++        memset(&subscript_array, 0, sizeof(subscript_array));
++
+ 	/* Now that we know we have a legal array subscript expression 
+ 	   let us actually find out where this element exists in the array. */
+ 
diff --git a/recipes/gdb/gdb-7.1/gdb-6.8-mingw-3.patch b/recipes/gdb/gdb-7.1/gdb-6.8-mingw-3.patch
new file mode 100644
index 0000000000..5bede42eb0
--- /dev/null
+++ b/recipes/gdb/gdb-7.1/gdb-6.8-mingw-3.patch
@@ -0,0 +1,374 @@
+Index: gdb-7.0/gdb/gdbserver/remote-utils.c
+===================================================================
+--- gdb-7.0.orig/gdb/gdbserver/remote-utils.c	2009-07-06 11:31:20.000000000 -0700
++++ gdb-7.0/gdb/gdbserver/remote-utils.c	2009-10-13 15:16:16.495396950 -0700
+@@ -778,7 +778,12 @@ input_interrupt (int unused)
+ 
+       cc = read (remote_desc, &c, 1);
+ 
++#ifdef _WIN32_WINNT
++      // its normal in windows for current_inferior to be null.
++      if (cc != 1 || c != '\003' /*|| current_inferior == NULL*/)
++#else
+       if (cc != 1 || c != '\003' || current_inferior == NULL)
++#endif
+ 	{
+ 	  fprintf (stderr, "input_interrupt, count = %d c = %d ('%c')\n",
+ 		   cc, c, c);
+Index: gdb-7.0/gdb/gdbserver/server.c
+===================================================================
+--- gdb-7.0.orig/gdb/gdbserver/server.c	2009-06-30 09:35:25.000000000 -0700
++++ gdb-7.0/gdb/gdbserver/server.c	2009-10-13 15:18:08.065401029 -0700
+@@ -31,6 +31,9 @@
+ #if HAVE_MALLOC_H
+ #include <malloc.h>
+ #endif
++#ifdef _WIN32
++#include <windows.h>
++#endif
+ 
+ ptid_t cont_thread;
+ ptid_t general_thread;
+@@ -502,6 +505,20 @@ monitor_show_help (void)
+   monitor_output ("    Enable h/w breakpoint/watchpoint debugging messages\n");
+   monitor_output ("  set remote-debug <0|1>\n");
+   monitor_output ("    Enable remote protocol debugging messages\n");
++#ifdef _WIN32
++  monitor_output ("  get processlist\n");
++  monitor_output ("    List remote processes with names and pid\n");
++  monitor_output ("  get processlistmi\n");
++  monitor_output ("    Process list in an MI-like format\n");
++#endif
++  monitor_output ("  set env <name=value>\n");
++  monitor_output ("    Set environment variable in remote environment\n");
++  monitor_output ("  cd <directory>\n");
++  monitor_output ("    Change current working directory\n");
++  monitor_output ("  pwd\n");
++  monitor_output ("    Print current working directory\n");
++  monitor_output ("  shell <command line>\n");
++  monitor_output ("    Execute command on remote target\n");
+   monitor_output ("  exit\n");
+   monitor_output ("    Quit GDBserver\n");
+ }
+@@ -660,6 +677,47 @@ handle_search_memory (char *own_buf, int
+       return;					\
+     }
+ 
++#ifdef _WIN32
++typedef DWORD (__stdcall *GETPROCESSIMAGEFILENAME)(HANDLE hProcess, LPTSTR lpImageFileName, DWORD nSize);
++typedef BOOL (__stdcall *ENUMPROCESSES)(DWORD* pProcessIds, DWORD cb, DWORD* pBytesReturned);
++
++# define HAS_DEVICE(P) \
++((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
++&& (P)[1] == ':')
++# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
++# define ISSLASH(C) ((C) == '/' || (C) == '\\')
++
++char *
++__basename (char const *name)
++{
++	char const *base = name += FILE_SYSTEM_PREFIX_LEN (name);
++	int all_slashes = 1;
++	char const *p;
++	
++	for (p = name; *p; p++)
++    {
++		if (ISSLASH (*p))
++			base = p + 1;
++		else
++			all_slashes = 0;
++    }
++	
++	/* If NAME is all slashes, arrange to return `/'.  */
++	if (*base == '\0' && ISSLASH (*name) && all_slashes)
++		--base;
++	
++	/* Make sure the last byte is not a slash.  */
++	//assert (all_slashes || !ISSLASH (*(p - 1)));
++	
++	return (char *) base;
++}
++#endif
++
++#ifndef _POSIX_PATH_MAX
++#define _POSIX_PATH_MAX 1024
++#define _POSIX_PATH_MAX_WAS_UNDEFINED
++#endif
++
+ /* Handle all of the extended 'q' packets.  */
+ void
+ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
+@@ -1216,6 +1274,158 @@ handle_query (char *own_buf, int packet_
+ 	  debug_threads = 1;
+ 	  monitor_output ("Debug output enabled.\n");
+ 	}
++#ifdef _WIN32
++  else if (strncmp (mon, "get processlist", 15) == 0)
++  {
++	  HINSTANCE lib = LoadLibrary("PSAPI.DLL");
++	  GETPROCESSIMAGEFILENAME imageFilename = (GETPROCESSIMAGEFILENAME)GetProcAddress(lib, "GetProcessImageFileNameA");
++	  ENUMPROCESSES enumProcesses = (ENUMPROCESSES)GetProcAddress(lib, "EnumProcesses");
++	  
++	  char* name = (char*)malloc(MAX_PATH);
++	  
++	  int miMode = (strcmp(mon, "get processlistmi") == 0);
++	  
++	  DWORD* pids = (DWORD*)malloc(sizeof(DWORD)*1024);
++	  memset(pids, 0, sizeof(pids));
++	  DWORD size = 0;
++	  
++	  if (!enumProcesses(pids, 1024 * sizeof(DWORD), &size))
++	  {
++		  free(pids);
++		  free(mon);
++		  return;
++	  }
++	  
++	  int cnt = 0;
++	  int number = size / sizeof(DWORD);
++	  
++	  char* miOutput = NULL;
++	  
++	  if (!miMode) 
++		  monitor_output("Remote process list:\n");
++	  else
++	  {
++		  miOutput = (char*)malloc((number * 255) * sizeof(char));
++		  strcpy(miOutput, "^done,processlist=[");
++	  }
++	  
++	  for (cnt = 0; cnt < number; cnt++)
++	  {
++		  HMODULE hProcess = (HMODULE)OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pids[cnt]);
++		  strcpy(name, "");
++		  printf(name);
++		  
++		  imageFilename(hProcess, name, MAX_PATH);
++		  
++		  if (pids[cnt] > 4 && strcmp(name, "") != 0)
++		  {
++			  char item[2048] = "";
++			  char tmp[24] = "0";
++			  itoa(pids[cnt], tmp, 10);
++			  strcat(item, tmp);
++			  strcat(item, "=");
++			  strcat(item, __basename(name));
++			  
++			  if (!miMode)
++			  {
++				  strcat(item, "\n");
++				  monitor_output(item);
++			  }
++			  else
++			  {
++				  strcat(miOutput, item);
++				  strcat(miOutput, ",");
++			  }
++		  }
++		  
++		  CloseHandle(hProcess);
++	  }
++	  
++	  if (miMode)
++	  {
++		  strcat(miOutput, "]\n");
++		  monitor_output(miOutput);
++		  free(miOutput);
++	  }
++	  
++	  FreeLibrary(lib);
++	  
++	  free(pids);
++	  free(name);	  
++  }
++#endif		
++  else if (strncmp (mon, "set env ", 8) == 0)
++  {
++	  char* envLine = mon + 8;
++	  char* envName = strtok(envLine, "= ");
++	  char* envValue = strtok(NULL, "= ");
++	  if (envName && envValue)
++	  {
++#ifdef _WIN32
++		  SetEnvironmentVariable(envName, envValue);
++#else
++		  setenv(envName, envValue, 1);
++#endif 
++		  monitor_output("Target environment variable set (");
++		  monitor_output(envName);
++		  monitor_output(" = ");
++		  monitor_output(envValue);
++		  monitor_output(").\n");
++	  }
++	  else
++		  monitor_output("Incorrect format for environment variable.\n");
++  }
++  else if (strncmp (mon, "cd ", 3) == 0)
++  {
++	  char* dir = mon + 3;
++	  if (strlen(dir) > 0)
++		  chdir(dir);
++  }
++  else if (strcmp(mon, "pwd") == 0)
++  {
++	  long size = _POSIX_PATH_MAX;
++	  char* current_directory = (char*)malloc(size);	  
++	  getcwd(current_directory, size);
++	  if (strlen(current_directory) > 0)
++	  {
++		  monitor_output(current_directory);
++		  monitor_output("\n");
++	  }
++	  free(current_directory);
++  }
++  else if (strncmp (mon, "shell ", 6) == 0)
++  {
++	  char* arg = mon + 6;
++	  
++	  if (strlen(arg) == 0)
++	  {
++		  monitor_output("Inferior shells are not supported.");
++		  free(mon);
++		  return;
++	  }
++	  
++	  long size = _POSIX_PATH_MAX;
++	  char* current_directory = (char*)malloc(size);  
++	  getcwd(current_directory, size);
++
++	  int rc = system (arg);
++	  char msg[255];
++	  if (rc == -1)
++	  {
++		  sprintf(msg, "Cannot execute '%s': %s.\n", arg, strerror(errno));
++		  monitor_output(msg);
++	  }
++	  else if (rc != -1)
++	  {
++		  sprintf(msg, "'%s' exited with status %d.\n", arg, rc);
++		  monitor_output(msg);
++	  }
++
++	  /* Make sure to return to the directory GDB thinks it is, in case the
++	   shell command we just ran changed it.  */
++	  chdir(current_directory);
++	  free(current_directory);
++  }
+       else if (strcmp (mon, "set debug 0") == 0)
+ 	{
+ 	  debug_threads = 0;
+@@ -1295,6 +1505,11 @@ handle_query (char *own_buf, int packet_
+   own_buf[0] = 0;
+ }
+ 
++#ifdef _POSIX_PATH_MAX_WAS_UNDEFINED
++#undef _POSIX_PATH_MAX
++#undef _POSIX_PATH_MAX_WAS_UNDEFINED
++#endif
++
+ /* Parse vCont packets.  */
+ void
+ handle_v_cont (char *own_buf)
+Index: gdb-7.0/gdb/gdbserver/win32-low.c
+===================================================================
+--- gdb-7.0.orig/gdb/gdbserver/win32-low.c	2009-07-04 11:13:28.000000000 -0700
++++ gdb-7.0/gdb/gdbserver/win32-low.c	2009-10-13 15:16:16.495396950 -0700
+@@ -38,7 +38,7 @@
+ #include <sys/cygwin.h>
+ #endif
+ 
+-#define LOG 0
++#define LOG 1
+ 
+ #define OUTMSG(X) do { printf X; fflush (stdout); } while (0)
+ #if LOG
+@@ -556,9 +556,9 @@ win32_create_inferior (char *program, ch
+     }
+   OUTMSG2 (("Command line is \"%s\"\n", args));
+ 
+-#ifdef CREATE_NEW_PROCESS_GROUP
++//#ifdef CREATE_NEW_PROCESS_GROUP
+   flags |= CREATE_NEW_PROCESS_GROUP;
+-#endif
++//#endif
+ 
+   ret = create_process (program, args, flags, &pi);
+   err = GetLastError ();
+@@ -699,8 +699,37 @@ win32_kill (int pid)
+   if (current_process_handle == NULL)
+     return -1;
+ 
+-  TerminateProcess (current_process_handle, 0);
+-  for (;;)
++	TerminateProcess (current_process_handle, 0);
++
++	// BKS - fix for terminating apps prior to their exit, lets go of execs.
++	winapi_DebugActiveProcessStop DebugActiveProcessStop = NULL;
++	winapi_DebugSetProcessKillOnExit DebugSetProcessKillOnExit = NULL;
++#ifdef _WIN32_WCE
++	HMODULE dll = GetModuleHandle (_T("COREDLL.DLL"));
++#else
++	HMODULE dll = GetModuleHandle (_T("KERNEL32.DLL"));
++#endif
++	DebugActiveProcessStop = GETPROCADDRESS (dll, DebugActiveProcessStop);
++	DebugSetProcessKillOnExit = GETPROCADDRESS (dll, DebugSetProcessKillOnExit);
++
++	if (DebugSetProcessKillOnExit != NULL
++		&& DebugActiveProcessStop != NULL)
++	{
++		{
++			struct thread_resume resume;
++			resume.thread = -1;
++			resume.step = 0;
++			resume.sig = 0;
++			resume.leave_stopped = 0;
++			win32_resume (&resume);
++		}
++
++		DebugActiveProcessStop (current_process_id);
++		DebugSetProcessKillOnExit (FALSE);
++	}
++	// end BKS
++
++   for (;;)
+     {
+       if (!child_continue (DBG_CONTINUE, -1))
+ 	break;
+@@ -1207,6 +1236,7 @@ handle_exception (struct target_waitstat
+ 
+   ourstatus->kind = TARGET_WAITKIND_STOPPED;
+ 
++	//printf("handle exception....................%X\n", (unsigned int)code);
+   switch (code)
+     {
+     case EXCEPTION_ACCESS_VIOLATION:
+@@ -1217,7 +1247,13 @@ handle_exception (struct target_waitstat
+       OUTMSG2 (("STATUS_STACK_OVERFLOW"));
+       ourstatus->value.sig = TARGET_SIGNAL_SEGV;
+       break;
+-    case STATUS_FLOAT_DENORMAL_OPERAND:
++	// BKS
++	case STATUS_INVALID_HANDLE:
++      OUTMSG2 (("STATUS_INVALID_HANDLE"));
++	  ourstatus->value.sig = TARGET_SIGNAL_TRAP;
++	  break;
++	// BKS
++	case STATUS_FLOAT_DENORMAL_OPERAND:
+       OUTMSG2 (("STATUS_FLOAT_DENORMAL_OPERAND"));
+       ourstatus->value.sig = TARGET_SIGNAL_FPE;
+       break;
+Index: gdb-7.0/gdb/windows-nat.c
+===================================================================
+--- gdb-7.0.orig/gdb/windows-nat.c	2009-09-30 00:40:10.000000000 -0700
++++ gdb-7.0/gdb/windows-nat.c	2009-10-13 15:16:16.505397243 -0700
+@@ -1035,6 +1035,10 @@ handle_exception (struct target_waitstat
+       DEBUG_EXCEPTION_SIMPLE ("STATUS_STACK_OVERFLOW");
+       ourstatus->value.sig = TARGET_SIGNAL_SEGV;
+       break;
++	case STATUS_INVALID_HANDLE:
++	  DEBUG_EXCEPTION_SIMPLE ("STATUS_INVALID_HANDLE");
++	  ourstatus->value.sig = TARGET_SIGNAL_TRAP;
++	  break;
+     case STATUS_FLOAT_DENORMAL_OPERAND:
+       DEBUG_EXCEPTION_SIMPLE ("STATUS_FLOAT_DENORMAL_OPERAND");
+       ourstatus->value.sig = TARGET_SIGNAL_FPE;
diff --git a/recipes/gdb/gdb-7.1/gdb-6.8-pr9638-ppc-canadian-configh.patch b/recipes/gdb/gdb-7.1/gdb-6.8-pr9638-ppc-canadian-configh.patch
new file mode 100644
index 0000000000..83e85ba3cd
--- /dev/null
+++ b/recipes/gdb/gdb-7.1/gdb-6.8-pr9638-ppc-canadian-configh.patch
@@ -0,0 +1,179 @@
+diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
+--- gdb-6.8-pl1/sim/ppc/Makefile.in	2006-05-31 17:14:45.000000000 +0200
++++ gdb-6.8-pl2/sim/ppc/Makefile.in	2008-09-30 15:56:33.000000000 +0200
+@@ -61,7 +61,7 @@
+ AR = @AR@
+ AR_FLAGS = rc
+ CC = @CC@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+ BISON = bison
+@@ -115,8 +115,8 @@
+   $(DEVZERO_CFLAGS)
+ SIM_FPU_CFLAGS = @sim_fpu_cflags@
+ 
+-STD_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
+-NOWARN_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
++STD_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
++NOWARN_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
+ BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
+ 
+ BUILD_LDFLAGS	=
+diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
+--- gdb-6.8-orig/sim/ppc/basics.h	1999-04-16 03:35:08.000000000 +0200
++++ gdb-6.8-pl1/sim/ppc/basics.h	2008-09-30 15:12:32.000000000 +0200
+@@ -86,7 +86,9 @@
+ 
+ /* Basic configuration */
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ #include "ppc-config.h"
+ #include "inline.h"
+ 
+diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
+--- gdb-6.8-orig/sim/ppc/debug.c	1999-04-16 03:35:08.000000000 +0200
++++ gdb-6.8-pl1/sim/ppc/debug.c	2008-09-30 15:12:27.000000000 +0200
+@@ -22,7 +22,9 @@
+ #ifndef _DEBUG_C_
+ #define _DEBUG_C_
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ #include "basics.h"
+ 
+ #ifdef HAVE_STDLIB_H
+diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
+--- gdb-6.8-orig/sim/ppc/dgen.c	1999-04-16 03:35:08.000000000 +0200
++++ gdb-6.8-pl1/sim/ppc/dgen.c	2008-09-30 15:12:22.000000000 +0200
+@@ -27,7 +27,9 @@
+ #include <ctype.h>
+ #include <stdarg.h>
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ #include "misc.h"
+ #include "lf.h"
+ #include "table.h"
+diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
+--- gdb-6.8-orig/sim/ppc/filter.c	1999-04-16 03:35:09.000000000 +0200
++++ gdb-6.8-pl1/sim/ppc/filter.c	2008-09-30 15:12:15.000000000 +0200
+@@ -21,7 +21,9 @@
+ 
+ #include <stdio.h>
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ 
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c
+--- gdb-6.8-orig/sim/ppc/filter_filename.c	1999-04-16 03:35:08.000000000 +0200
++++ gdb-6.8-pl1/sim/ppc/filter_filename.c	2008-09-30 15:12:11.000000000 +0200
+@@ -18,7 +18,9 @@
+  
+     */
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ #include "ppc-config.h"
+ #include "filter_filename.h"
+ 
+diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
+--- gdb-6.8-orig/sim/ppc/igen.c	2003-06-20 05:59:33.000000000 +0200
++++ gdb-6.8-pl1/sim/ppc/igen.c	2008-09-30 15:12:06.000000000 +0200
+@@ -25,7 +25,9 @@
+ #include "misc.h"
+ #include "lf.h"
+ #include "table.h"
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ 
+ #include "filter.h"
+ 
+diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
+--- gdb-6.8-orig/sim/ppc/inline.c	1999-04-16 03:35:10.000000000 +0200
++++ gdb-6.8-pl1/sim/ppc/inline.c	2008-09-30 15:11:58.000000000 +0200
+@@ -22,7 +22,9 @@
+ #ifndef _INLINE_C_
+ #define _INLINE_C_
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ #include "ppc-config.h"
+ 
+ #include "inline.h"
+diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
+--- gdb-6.8-orig/sim/ppc/lf.c	2002-05-30 17:07:06.000000000 +0200
++++ gdb-6.8-pl1/sim/ppc/lf.c	2008-09-30 15:33:35.000000000 +0200
+@@ -23,7 +23,9 @@
+ #include <stdarg.h>
+ #include <ctype.h>
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ #include "misc.h"
+ #include "lf.h"
+ 
+diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
+--- gdb-6.8-orig/sim/ppc/misc.c	1999-04-16 03:35:11.000000000 +0200
++++ gdb-6.8-pl1/sim/ppc/misc.c	2008-09-30 15:11:54.000000000 +0200
+@@ -23,7 +23,9 @@
+ #include <stdarg.h>
+ #include <ctype.h>
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ #include "misc.h"
+ 
+ #ifdef HAVE_STDLIB_H
+diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
+--- gdb-6.8-orig/sim/ppc/misc.h	2002-01-12 11:21:12.000000000 +0100
++++ gdb-6.8-pl1/sim/ppc/misc.h	2008-09-30 15:11:49.000000000 +0200
+@@ -21,7 +21,9 @@
+ 
+ /* Frustrating header junk */
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ 
+ #include <stdio.h>
+ #include <ctype.h>
+diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
+--- gdb-6.8-orig/sim/ppc/sim-endian.c	1999-04-16 03:35:11.000000000 +0200
++++ gdb-6.8-pl1/sim/ppc/sim-endian.c	2008-09-30 15:11:44.000000000 +0200
+@@ -22,7 +22,9 @@
+ #ifndef _SIM_ENDIAN_C_
+ #define _SIM_ENDIAN_C_
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ #include "basics.h"
+ 
+ 
+diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c
+--- gdb-6.8-orig/sim/ppc/table.c	2002-01-12 11:21:12.000000000 +0100
++++ gdb-6.8-pl1/sim/ppc/table.c	2008-09-30 15:11:38.000000000 +0200
+@@ -25,7 +25,9 @@
+ #include <fcntl.h>
+ #include <ctype.h>
+ 
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ #include "misc.h"
+ #include "lf.h"
+ #include "table.h"
diff --git a/recipes/gdb/gdb-7.1/gdbserver-cflags-last.diff b/recipes/gdb/gdb-7.1/gdbserver-cflags-last.diff
new file mode 100644
index 0000000000..57e78f6b3d
--- /dev/null
+++ b/recipes/gdb/gdb-7.1/gdbserver-cflags-last.diff
@@ -0,0 +1,15 @@
+Index: gdb/gdbserver/Makefile.in
+===================================================================
+--- gdb/gdbserver/Makefile.in.orig	2009-07-31 08:23:20.000000000 -0700
++++ gdb/gdbserver/Makefile.in	2009-10-13 14:47:21.365401025 -0700
+@@ -89,8 +89,8 @@ WARN_CFLAGS = -Wall
+ CFLAGS = @CFLAGS@
+ 
+ # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
+-INTERNAL_CFLAGS =  $(WARN_CFLAGS) ${CFLAGS} ${GLOBAL_CFLAGS} \
+-	${PROFILE_CFLAGS} ${INCLUDE_CFLAGS}
++INTERNAL_CFLAGS =  $(WARN_CFLAGS) ${GLOBAL_CFLAGS} \
++	${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CFLAGS}
+ 
+ # LDFLAGS is specifically reserved for setting from the command line
+ # when running make.
diff --git a/recipes/gdb/gdb-canadian-sdk_6.8.bb b/recipes/gdb/gdb-canadian-sdk_6.8.bb
index be05d50f0d..51731ff70a 100644
--- a/recipes/gdb/gdb-canadian-sdk_6.8.bb
+++ b/recipes/gdb/gdb-canadian-sdk_6.8.bb
@@ -1,11 +1,11 @@
 require gdb-canadian-cross.inc
 LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
-	    file://gdb-6.8-mingw-3.patch;patch=1 \
-	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch;patch=1 \
-	    file://gdb-6.8-fix-compile-karmic.patch;patch=1 \
-	    file://gdb-6.8-mips-mingw-sim-fixup.patch;patch=1"
+SRC_URI += "file://gcc-4.3-build-error.patch;striplevel=0 \
+	    file://gdb-6.8-mingw-3.patch \
+	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch \
+	    file://gdb-6.8-fix-compile-karmic.patch \
+	    file://gdb-6.8-mips-mingw-sim-fixup.patch"
 
 PR = "r1"
 
diff --git a/recipes/gdb/gdb-canadian-sdk_7.0.bb b/recipes/gdb/gdb-canadian-sdk_7.0.bb
index d09530720a..2178c97261 100644
--- a/recipes/gdb/gdb-canadian-sdk_7.0.bb
+++ b/recipes/gdb/gdb-canadian-sdk_7.0.bb
@@ -2,9 +2,9 @@ require gdb-canadian-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-	    file://gdb-6.8-mingw-3.patch;patch=1 \
-	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch;patch=1 \
-	    file://gdb-6.8-fix-compile-karmic.patch;patch=1 \
+	    file://gdb-6.8-mingw-3.patch \
+	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch \
+	    file://gdb-6.8-fix-compile-karmic.patch \
 	    "
 do_stage() {
 	:
diff --git a/recipes/gdb/gdb-canadian-sdk_7.1.bb b/recipes/gdb/gdb-canadian-sdk_7.1.bb
new file mode 100644
index 0000000000..334d5557c3
--- /dev/null
+++ b/recipes/gdb/gdb-canadian-sdk_7.1.bb
@@ -0,0 +1,14 @@
+require gdb-canadian-cross.inc
+LICENSE = "GPLv3"
+
+SRC_URI += "\
+	    file://gdb-6.8-mingw-3.patch \
+	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch \
+	    file://gdb-6.8-fix-compile-karmic.patch \
+	    "
+do_stage() {
+	:
+}
+
+SRC_URI[md5sum] = "01a6ce13bab5307cfac5c405e4afd1cf"
+SRC_URI[sha256sum] = "fc839b5226b94e58a5c7a526e67b7f8f93c7829d05dae1b6247f1bfe3829f291"
diff --git a/recipes/gdb/gdb-cross-sdk_6.6.bb b/recipes/gdb/gdb-cross-sdk_6.6.bb
index 62b9f825c7..fb81c5ee19 100644
--- a/recipes/gdb/gdb-cross-sdk_6.6.bb
+++ b/recipes/gdb/gdb-cross-sdk_6.6.bb
@@ -7,7 +7,7 @@ DEPENDS = "ncurses-sdk zlib-sdk flex-native"
 
 PR = "r3"
 
-SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
+SRC_URI += "file://early_debug_in_nptl.patch;striplevel=0"
 
 do_stage() {
 	:
diff --git a/recipes/gdb/gdb-cross-sdk_6.8.bb b/recipes/gdb/gdb-cross-sdk_6.8.bb
index ff27808f23..34108c8315 100644
--- a/recipes/gdb/gdb-cross-sdk_6.8.bb
+++ b/recipes/gdb/gdb-cross-sdk_6.8.bb
@@ -1,8 +1,8 @@
 require gdb-cross.inc
 LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+SRC_URI += "file://gcc-4.3-build-error.patch;striplevel=0 \
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 DEPENDS = "ncurses-sdk zlib-sdk flex-native"
 
diff --git a/recipes/gdb/gdb-cross-sdk_7.0.bb b/recipes/gdb/gdb-cross-sdk_7.0.bb
index 16f3a56986..238ce15017 100644
--- a/recipes/gdb/gdb-cross-sdk_7.0.bb
+++ b/recipes/gdb/gdb-cross-sdk_7.0.bb
@@ -2,7 +2,7 @@ require gdb-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 DEPENDS = "ncurses-sdk zlib-sdk flex-native"
 
diff --git a/recipes/gdb/gdb-cross-sdk_7.1.bb b/recipes/gdb/gdb-cross-sdk_7.1.bb
new file mode 100644
index 0000000000..54cc1130d3
--- /dev/null
+++ b/recipes/gdb/gdb-cross-sdk_7.1.bb
@@ -0,0 +1,16 @@
+require gdb-cross.inc
+LICENSE = "GPLv3"
+
+SRC_URI += "\
+            file://gdb-6.8-fix-compile-karmic.patch"
+
+DEPENDS = "ncurses-sdk zlib-sdk flex-native"
+
+inherit sdk
+
+do_stage() {
+	:
+}
+
+SRC_URI[md5sum] = "01a6ce13bab5307cfac5c405e4afd1cf"
+SRC_URI[sha256sum] = "fc839b5226b94e58a5c7a526e67b7f8f93c7829d05dae1b6247f1bfe3829f291"
diff --git a/recipes/gdb/gdb-cross.inc b/recipes/gdb/gdb-cross.inc
index ca89d4fdb0..f92d798576 100644
--- a/recipes/gdb/gdb-cross.inc
+++ b/recipes/gdb/gdb-cross.inc
@@ -19,6 +19,4 @@ do_configure () {
 	oe_runconf
 }
 
-do_stage () {
-	oe_runmake install
-}
+inherit cross
diff --git a/recipes/gdb/gdb-cross_6.3.bb b/recipes/gdb/gdb-cross_6.3.bb
index 52f0575db1..937b669cbe 100644
--- a/recipes/gdb/gdb-cross_6.3.bb
+++ b/recipes/gdb/gdb-cross_6.3.bb
@@ -1,12 +1,10 @@
 require gdb-cross.inc
 LICENSE = "GPLv2"
 
-inherit cross
-
 PR = "r3"
 
-SRC_URI += "file://sim-install-makefile.patch;patch=1 \
-	file://sim-install-makefile-common.patch;patch=1"
+SRC_URI += "file://sim-install-makefile.patch \
+	file://sim-install-makefile-common.patch"
 
 SRC_URI[md5sum] = "812de9e756d53c749ea5516d9ffa5905"
 SRC_URI[sha256sum] = "c06bf9715436b3a28c189163aa5ca42b46af8286659827f033eaaf7d8b1fc342"
diff --git a/recipes/gdb/gdb-cross_6.4.bb b/recipes/gdb/gdb-cross_6.4.bb
index 7ea01473ac..8fe4bce858 100644
--- a/recipes/gdb/gdb-cross_6.4.bb
+++ b/recipes/gdb/gdb-cross_6.4.bb
@@ -1,8 +1,6 @@
 require gdb-cross.inc
 LICENSE = "GPLv2"
 
-inherit cross
-
 PR = "r1"
 
 SRC_URI[md5sum] = "7dc98022ee96bba5331f195dc8a5491a"
diff --git a/recipes/gdb/gdb-cross_6.6.bb b/recipes/gdb/gdb-cross_6.6.bb
index 9040e54f17..b9a9f5fee8 100644
--- a/recipes/gdb/gdb-cross_6.6.bb
+++ b/recipes/gdb/gdb-cross_6.6.bb
@@ -1,11 +1,9 @@
 require gdb-cross.inc
 LICENSE = "GPLv2"
 
-inherit cross
-
 PR = "r3"
 
-SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
+SRC_URI += "file://early_debug_in_nptl.patch;striplevel=0"
 
 
 SRC_URI[md5sum] = "18be4e7a1ac713bda93d00fee20bbef8"
diff --git a/recipes/gdb/gdb-cross_6.7.1.bb b/recipes/gdb/gdb-cross_6.7.1.bb
index 59cc945c61..9b156a28ea 100644
--- a/recipes/gdb/gdb-cross_6.7.1.bb
+++ b/recipes/gdb/gdb-cross_6.7.1.bb
@@ -1,8 +1,6 @@
 require gdb-cross.inc
 LICENSE = "GPLv3"
 
-inherit cross
-
 DEFAULT_PREFERENCE_avr32 = "99"
 SRC_URI_avr32 = " http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2"
 S_avr32 = "${WORKDIR}/gdb-6.7.1.atmel.1.0.3"
diff --git a/recipes/gdb/gdb-cross_6.8.bb b/recipes/gdb/gdb-cross_6.8.bb
index d0ba1302c7..f943bc27bc 100644
--- a/recipes/gdb/gdb-cross_6.8.bb
+++ b/recipes/gdb/gdb-cross_6.8.bb
@@ -1,10 +1,8 @@
 require gdb-cross.inc
 LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
-
-inherit cross
+SRC_URI += "file://gcc-4.3-build-error.patch;striplevel=0 \
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 PR = "r3"
 
diff --git a/recipes/gdb/gdb-cross_7.0.bb b/recipes/gdb/gdb-cross_7.0.bb
index 1075356ced..421403aa00 100644
--- a/recipes/gdb/gdb-cross_7.0.bb
+++ b/recipes/gdb/gdb-cross_7.0.bb
@@ -2,9 +2,7 @@ require gdb-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += " \
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
-
-inherit cross
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 SRC_URI[md5sum] = "67b4144db385620d7b93f7b0c26800f7"
 SRC_URI[sha256sum] = "ccff6cab0e847c486d30b70bdddac4e6646bafcecaa3b63134d6e3d4d5a4b91d"
diff --git a/recipes/gdb/gdb-cross_7.1.bb b/recipes/gdb/gdb-cross_7.1.bb
new file mode 100644
index 0000000000..2c022db054
--- /dev/null
+++ b/recipes/gdb/gdb-cross_7.1.bb
@@ -0,0 +1,8 @@
+require gdb-cross.inc
+LICENSE = "GPLv3"
+
+SRC_URI += " \
+            file://gdb-6.8-fix-compile-karmic.patch"
+
+SRC_URI[md5sum] = "01a6ce13bab5307cfac5c405e4afd1cf"
+SRC_URI[sha256sum] = "fc839b5226b94e58a5c7a526e67b7f8f93c7829d05dae1b6247f1bfe3829f291"
diff --git a/recipes/gdb/gdb.inc b/recipes/gdb/gdb.inc
index a519cef584..3500e1accb 100644
--- a/recipes/gdb/gdb.inc
+++ b/recipes/gdb/gdb.inc
@@ -16,15 +16,15 @@ RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db "
 
 inherit gettext
 
-SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \
-            file://gdbserver-cflags-last.diff;patch=1;pnum=0"
-#FIXME	   file://uclibc.patch;patch=1 \
+SRC_URI += "file://kill_arm_map_symbols.patch \
+            file://gdbserver-cflags-last.diff;striplevel=0"
+#FIXME	   file://uclibc.patch \
 
 EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
 
 EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
                 --with-curses --disable-multilib --with-readline --disable-sim \
-                --program-prefix=''"
+                --program-prefix='' --disable-lto"
 
 LDFLAGS_append = " -s"
 export CFLAGS_append=" -L${STAGING_LIBDIR}"
diff --git a/recipes/gdb/gdb_6.6.bb b/recipes/gdb/gdb_6.6.bb
index 5ed504a357..7f18882079 100644
--- a/recipes/gdb/gdb_6.6.bb
+++ b/recipes/gdb/gdb_6.6.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 
 PR = "r5"
 
-SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
+SRC_URI += "file://early_debug_in_nptl.patch;striplevel=0"
 
 SRC_URI[md5sum] = "18be4e7a1ac713bda93d00fee20bbef8"
 SRC_URI[sha256sum] = "c119ce82f0e42d3412420c42c1ead75e0b9de67131a5c9dd3cdab509f65ddfdd"
diff --git a/recipes/gdb/gdb_6.8.bb b/recipes/gdb/gdb_6.8.bb
index 00d1a67a0b..9d6d54fb81 100644
--- a/recipes/gdb/gdb_6.8.bb
+++ b/recipes/gdb/gdb_6.8.bb
@@ -1,8 +1,8 @@
 require gdb.inc
 LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+SRC_URI += "file://gcc-4.3-build-error.patch;striplevel=0 \
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 PR = "r3"
 
diff --git a/recipes/gdb/gdb_7.0.bb b/recipes/gdb/gdb_7.0.bb
index ba40e25b64..72a78db134 100644
--- a/recipes/gdb/gdb_7.0.bb
+++ b/recipes/gdb/gdb_7.0.bb
@@ -2,7 +2,7 @@ require gdb.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 # Work-around problems while creating libbfd.a
 EXTRA_OECONF += "--enable-static"
diff --git a/recipes/gdb/gdb_7.1.bb b/recipes/gdb/gdb_7.1.bb
new file mode 100644
index 0000000000..5489c80b61
--- /dev/null
+++ b/recipes/gdb/gdb_7.1.bb
@@ -0,0 +1,11 @@
+require gdb.inc
+LICENSE = "GPLv3"
+
+SRC_URI += "\
+            file://gdb-6.8-fix-compile-karmic.patch"
+
+# Work-around problems while creating libbfd.a
+EXTRA_OECONF += "--enable-static"
+
+SRC_URI[md5sum] = "01a6ce13bab5307cfac5c405e4afd1cf"
+SRC_URI[sha256sum] = "fc839b5226b94e58a5c7a526e67b7f8f93c7829d05dae1b6247f1bfe3829f291"
diff --git a/recipes/gdb/gdbserver.inc b/recipes/gdb/gdbserver.inc
index f477c3aa9c..115f293578 100644
--- a/recipes/gdb/gdbserver.inc
+++ b/recipes/gdb/gdbserver.inc
@@ -17,9 +17,9 @@ inherit gettext
 
 FILESPATHPKG =. "gdb-${PV}:"
 
-SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \
-            file://gdbserver-cflags-last.diff;patch=1;pnum=0"
-#FIXME	   file://uclibc.patch;patch=1 \
+SRC_URI += "file://kill_arm_map_symbols.patch \
+            file://gdbserver-cflags-last.diff;striplevel=0"
+#FIXME	   file://uclibc.patch \
 
 EXTRA_OEMAKE = "gdbserver"
 
diff --git a/recipes/gdb/gdbserver_7.1.bb b/recipes/gdb/gdbserver_7.1.bb
new file mode 100644
index 0000000000..341d5bcd40
--- /dev/null
+++ b/recipes/gdb/gdbserver_7.1.bb
@@ -0,0 +1,8 @@
+require gdbserver.inc
+
+LICENSE = "GPLv3"
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "01a6ce13bab5307cfac5c405e4afd1cf"
+SRC_URI[sha256sum] = "fc839b5226b94e58a5c7a526e67b7f8f93c7829d05dae1b6247f1bfe3829f291"
diff --git a/recipes/gdbm/gdbm-native_1.8.3.bb b/recipes/gdbm/gdbm-native_1.8.3.bb
index a9b60db733..8009e1e26c 100644
--- a/recipes/gdbm/gdbm-native_1.8.3.bb
+++ b/recipes/gdbm/gdbm-native_1.8.3.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
-	   file://makefile.patch;patch=1"
+	   file://makefile.patch"
 S = "${WORKDIR}/gdbm-${PV}"
 
 inherit autotools native
diff --git a/recipes/gdbm/gdbm_1.8.3.bb b/recipes/gdbm/gdbm_1.8.3.bb
index 148266e3c1..e84777e739 100644
--- a/recipes/gdbm/gdbm_1.8.3.bb
+++ b/recipes/gdbm/gdbm_1.8.3.bb
@@ -7,8 +7,8 @@ LICENSE = "GPL"
 PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
-	   file://makefile.patch;patch=1 \
-           file://libtool-mode.patch;patch=1"
+	   file://makefile.patch \
+           file://libtool-mode.patch"
 
 inherit autotools
 
diff --git a/recipes/geany/geany_0.18.bb b/recipes/geany/geany_0.18.bb
index 60ac2c0dcb..7cb5c60366 100644
--- a/recipes/geany/geany_0.18.bb
+++ b/recipes/geany/geany_0.18.bb
@@ -8,7 +8,7 @@ DEPENDS = "gtk+ vte"
 inherit gnome
 
 SRC_URI = "http://download.geany.org/geany-${PV}.tar.bz2 \
-           file://no-bogus-cxx-check.diff;patch=1 \
+           file://no-bogus-cxx-check.diff \
 "
 
 
diff --git a/recipes/geda/geda-gattrib_1.4.3.bb b/recipes/geda/geda-gattrib_1.4.3.bb
index 60ac7b21e7..8617311d05 100644
--- a/recipes/geda/geda-gattrib_1.4.3.bb
+++ b/recipes/geda/geda-gattrib_1.4.3.bb
@@ -15,7 +15,7 @@ do_patch_prepend() {
         if bb.data.getVar('PREFERRED_VERSION_gtk+', d, 1) and
         bb.data.getVar('PREFERRED_VERSION_gtk+', d, 1).split('.')[0] <= '2' and 
         bb.data.getVar('PREFERRED_VERSION_gtk+', d, 1).split('.')[1] < '18':
-            SRC_URI_append = "file://gattrib-gtk218.patch;patch=1"
+            SRC_URI_append = "file://gattrib-gtk218.patch"
 }
 
 SRC_URI[md5sum] = "e1f68401e7ca5fff16292358f0dfd553"
diff --git a/recipes/geda/geda-gschem_1.4.3.bb b/recipes/geda/geda-gschem_1.4.3.bb
index b4d00b7f16..611a4cbd19 100644
--- a/recipes/geda/geda-gschem_1.4.3.bb
+++ b/recipes/geda/geda-gschem_1.4.3.bb
@@ -6,7 +6,7 @@ PR = "r1"
 DEPENDS = "gtk+ libgeda"
 
 SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz \
-	   file://bad-include.patch;patch=1"
+	   file://bad-include.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/geda/geda-xgsch2pcb_0.1.2.bb b/recipes/geda/geda-xgsch2pcb_0.1.2.bb
index 3c1e55a651..93511d24fc 100644
--- a/recipes/geda/geda-xgsch2pcb_0.1.2.bb
+++ b/recipes/geda/geda-xgsch2pcb_0.1.2.bb
@@ -9,7 +9,7 @@ DEPENDS = "python-native"
 RDEPENDS = "geda-gschem geda-utils pcb python-codecs python-dbus python-pygtk python-subprocess"
 
 SRC_URI = "http://geda.seul.org/dist/${P}.tar.gz \
-           file://skip-python-checks.patch;patch=1"
+           file://skip-python-checks.patch"
 
 inherit autotools
 
diff --git a/recipes/genext2fs/genext2fs_1.3+1.4rc1.bb b/recipes/genext2fs/genext2fs_1.3+1.4rc1.bb
index 5372604fc3..2eab2ffddc 100644
--- a/recipes/genext2fs/genext2fs_1.3+1.4rc1.bb
+++ b/recipes/genext2fs/genext2fs_1.3+1.4rc1.bb
@@ -3,7 +3,7 @@ require genext2fs.inc
 TRIMMEDV = "${@bb.data.getVar('PV', d, 1).split('+')[1]}"
 FILESPATH = "${FILE_DIRNAME}/genext2fs-${PV}:${FILE_DIRNAME}/genext2fs:${FILE_DIRNAME}/files"
 SRC_URI = "${SOURCEFORGE_MIRROR}/genext2fs/genext2fs-${TRIMMEDV}.tar.gz \
-	   file://volume.patch;patch=1"
+	   file://volume.patch"
 S = "${WORKDIR}/genext2fs-${TRIMMEDV}"
 DEFAULT_PREFERENCE = "1"
 
diff --git a/recipes/genext2fs/genext2fs_1.3.bb b/recipes/genext2fs/genext2fs_1.3.bb
index 091cd06d16..90018b0f18 100644
--- a/recipes/genext2fs/genext2fs_1.3.bb
+++ b/recipes/genext2fs/genext2fs_1.3.bb
@@ -3,7 +3,7 @@ require genext2fs.inc
 PR = "r3"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/g/genext2fs/genext2fs_${PV}.orig.tar.gz \
-	   file://misc.patch;patch=1"
+	   file://misc.patch"
 S = "${WORKDIR}/genext2fs-${PV}.orig"
 
 do_compile () {
diff --git a/recipes/genext2fs/genext2fs_1.4.1.bb b/recipes/genext2fs/genext2fs_1.4.1.bb
index fabc0d1c10..e907abbf20 100644
--- a/recipes/genext2fs/genext2fs_1.4.1.bb
+++ b/recipes/genext2fs/genext2fs_1.4.1.bb
@@ -2,7 +2,7 @@ require genext2fs.inc
 
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/genext2fs/genext2fs-${PV}.tar.gz \
-	   file://volume.patch;patch=1"
+	   file://volume.patch"
 
 DEFAULT_PREFERENCE = "1"
 
diff --git a/recipes/geos/geos_3.2.0.bb b/recipes/geos/geos_3.2.0.bb
index d5d91b06a3..4d45c4ce59 100644
--- a/recipes/geos/geos_3.2.0.bb
+++ b/recipes/geos/geos_3.2.0.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 PR = "r1"
 
 SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2;name=geos \
-	   file://geos-arm.patch;patch=1 \
+	   file://geos-arm.patch \
 	  "
 
 S = "${WORKDIR}/${PN}-${PV}"
diff --git a/recipes/gettext/gettext_0.14.1.bb b/recipes/gettext/gettext_0.14.1.bb
index 72cb5736a1..535fcebf0a 100644
--- a/recipes/gettext/gettext_0.14.1.bb
+++ b/recipes/gettext/gettext_0.14.1.bb
@@ -9,15 +9,15 @@ PROVIDES = "virtual/libintl"
 PROVIDES_virtclass-native = ""
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
-	   file://gettext-vpath.patch;patch=1;pnum=1 \
-	   file://fixchicken.patch;patch=1;pnum=1 \
-	   file://linklib_from_0.17.patch;patch=1 \
-	   file://gettext-autoconf-lib-link-no-L.patch;patch=1 \
-           file://getline.m4.patch;patch=1 \
-           file://disable_java.patch;patch=1"
-
-SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
-SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1"
+	   file://gettext-vpath.patch \
+	   file://fixchicken.patch \
+	   file://linklib_from_0.17.patch \
+	   file://gettext-autoconf-lib-link-no-L.patch \
+           file://getline.m4.patch \
+           file://disable_java.patch"
+
+SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch"
+SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/gettext/gettext_0.17.bb b/recipes/gettext/gettext_0.17.bb
index 9973419e3f..9bd145d46e 100644
--- a/recipes/gettext/gettext_0.17.bb
+++ b/recipes/gettext/gettext_0.17.bb
@@ -12,15 +12,15 @@ RCONFLICTS_gettext-libintl = "proxy-libintl"
 BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
-	   file://autotools.patch;patch=1 \
-	   file://wchar-uclibc.patch;patch=1 \
-	   file://use_open_properly.patch;patch=1 \
-	   file://gettext-autoconf-lib-link-no-L.patch;patch=1 \
-	   file://m4_copy.patch;patch=1 \
+	   file://autotools.patch \
+	   file://wchar-uclibc.patch \
+	   file://use_open_properly.patch \
+	   file://gettext-autoconf-lib-link-no-L.patch \
+	   file://m4_copy.patch \
 	  "
 
-SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
-SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1"
+SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch"
+SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/gftp/gftp_2.0.18.bb b/recipes/gftp/gftp_2.0.18.bb
index 294d088d30..5db223edc0 100644
--- a/recipes/gftp/gftp_2.0.18.bb
+++ b/recipes/gftp/gftp_2.0.18.bb
@@ -9,12 +9,12 @@ LICENSE="GPL"
 PR = "r4"
 
 SRC_URI="http://www.gftp.org/gftp-${PV}.tar.bz2 \
-	 file://configure.patch;patch=1 \
-	 file://gftp-2.0.18-188252.patch;patch=1 \
-	 file://gftp-2.0.18-ipv6.patch;patch=1;pnum=2 \
-	 file://gftp-2.0.18-ssh2-read.patch;patch=1 \
-	 file://gftp-2.0.18-ssl-wildcardcert.patch;patch=1;pnum=0 \
-	 file://gftp-2.0.18-mkinstalldir.patch;patch=1 "
+	 file://configure.patch \
+	 file://gftp-2.0.18-188252.patch \
+	 file://gftp-2.0.18-ipv6.patch;striplevel=2 \
+	 file://gftp-2.0.18-ssh2-read.patch \
+	 file://gftp-2.0.18-ssl-wildcardcert.patch;striplevel=0 \
+	 file://gftp-2.0.18-mkinstalldir.patch "
 
 DEPENDS="gtk+ openssl"
 
diff --git a/recipes/gftp/gftp_2.0.19.bb b/recipes/gftp/gftp_2.0.19.bb
index 1959506e84..52d805ed75 100644
--- a/recipes/gftp/gftp_2.0.19.bb
+++ b/recipes/gftp/gftp_2.0.19.bb
@@ -11,7 +11,7 @@ DEPENDS = "gtk+ openssl"
 inherit autotools
 
 SRC_URI = "http://www.gftp.org/gftp-${PV}.tar.bz2;name=archive \
-           file://configure.patch;patch=1"
+           file://configure.patch"
 
 SRC_URI[archive.md5sum] = "5183cb4955d94be0e03c892585547c64"
 SRC_URI[archive.sha256sum] = "5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd"
diff --git a/recipes/ggz/ggz-client-libs_0.0.14.1.bb b/recipes/ggz/ggz-client-libs_0.0.14.1.bb
index 440a01127f..74b7046594 100644
--- a/recipes/ggz/ggz-client-libs_0.0.14.1.bb
+++ b/recipes/ggz/ggz-client-libs_0.0.14.1.bb
@@ -5,7 +5,7 @@ DEPENDS = "libggz"
 PR = "r2"
 
 SRC_URI = "http://ftp.belnet.be/packages/ggzgamingzone/ggz/${PV}/${PN}-${PV}.tar.gz \
-           file://ggz-unbreak-m4.patch;patch=1 \
+           file://ggz-unbreak-m4.patch \
           "
 
 inherit autotools
diff --git a/recipes/giblib/giblib.inc b/recipes/giblib/giblib.inc
index 8540e29d60..01af60b8aa 100644
--- a/recipes/giblib/giblib.inc
+++ b/recipes/giblib/giblib.inc
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 DEPENDS = "virtual/imlib2"
 
 SRC_URI = "http://linuxbrit.co.uk/downloads/giblib-${PV}.tar.gz \
-	   file://binconfig.patch;patch=1"
+	   file://binconfig.patch"
 S = "${WORKDIR}/giblib-${PV}"
 
 inherit autotools pkgconfig binconfig
diff --git a/recipes/giblib/giblib_1.2.3.bb b/recipes/giblib/giblib_1.2.3.bb
index 3c3eaf4895..fcfb83dee1 100644
--- a/recipes/giblib/giblib_1.2.3.bb
+++ b/recipes/giblib/giblib_1.2.3.bb
@@ -2,7 +2,7 @@ require giblib.inc
 
 PR = "r3"
 
-SRC_URI += "file://pkgconfig.patch;patch=1"
+SRC_URI += "file://pkgconfig.patch"
 
 SRC_URI[md5sum] = "06ae3113fdfe9f05a642bd844cc85eab"
 SRC_URI[sha256sum] = "42eb6bff68e88ef12a7ac2aa69848aeb29a8b69176b3bd3d9d67cf9a1233fe85"
diff --git a/recipes/giflib/giflib_4.1.6.bb b/recipes/giflib/giflib_4.1.6.bb
index e5bf3ef977..16be642a2d 100644
--- a/recipes/giflib/giflib_4.1.6.bb
+++ b/recipes/giflib/giflib_4.1.6.bb
@@ -7,6 +7,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2"
 
 inherit autotools
 
+DEPENDS = "libsm"
+
 PACKAGES += "${PN}-utils"
 FILES_${PN} = "${libdir}/libgif.so.*"
 FILES_${PN}-utils = "${bindir}"
diff --git a/recipes/giftcurs/giftcurs_0.6.2.bb b/recipes/giftcurs/giftcurs_0.6.2.bb
index 8547711de1..71c7b3ed19 100644
--- a/recipes/giftcurs/giftcurs_0.6.2.bb
+++ b/recipes/giftcurs/giftcurs_0.6.2.bb
@@ -7,7 +7,7 @@ has been described as 'seriously slick'. It wont work that well \
 without giFT, which you should have already."
 
 SRC_URI = "http://fnord.csbnet.se/giftcurs/giFTcurs-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
+	   file://m4.patch"
 S = "${WORKDIR}/giFTcurs-${PV}"
 
 inherit autotools
diff --git a/recipes/gimp/gegl_svn.bb b/recipes/gimp/gegl_svn.bb
index 9562ffb456..86051679a2 100644
--- a/recipes/gimp/gegl_svn.bb
+++ b/recipes/gimp/gegl_svn.bb
@@ -10,7 +10,7 @@ PR = "r1"
 inherit gnome
 
 SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk \
-           file://gegl-resilience.patch;patch=1"
+           file://gegl-resilience.patch"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/gimp/gimp.inc b/recipes/gimp/gimp.inc
index 2894582a8e..64621120b9 100644
--- a/recipes/gimp/gimp.inc
+++ b/recipes/gimp/gimp.inc
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "sed-native gdk-pixbuf-csource-native libart-lgpl gtk+ jpeg libpng libexif tiff"
 
 SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
-                 file://configure-libwmf.patch;patch=1"
+                 file://configure-libwmf.patch"
 
 inherit gnome
 
diff --git a/recipes/gimp/gimp_2.4.0.bb b/recipes/gimp/gimp_2.4.0.bb
index cf7c441967..92a7af83c7 100644
--- a/recipes/gimp/gimp_2.4.0.bb
+++ b/recipes/gimp/gimp_2.4.0.bb
@@ -1,7 +1,7 @@
 require gimp.inc
 
 SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.4/gimp-${PV}.tar.bz2 \
-                 file://configure-libwmf.patch;patch=1"
+                 file://configure-libwmf.patch"
 
 
 SRC_URI[md5sum] = "35fecf14cd5237065aef624b93030d5e"
diff --git a/recipes/git/files/git-less-hardlinks.diff b/recipes/git/files/git-less-hardlinks.diff
new file mode 100644
index 0000000000..183fe8fe31
--- /dev/null
+++ b/recipes/git/files/git-less-hardlinks.diff
@@ -0,0 +1,49 @@
+From: Koen Kooi <k-kooi@ti.com>
+Subject: Git: don't use hardlink, try softlinks and fall back to plain 'cp'
+
+Using hardlinks confuses packaging an ends up giving us a *copy* of the git binary,
+making the resulting package 54MB big. This brings it down a more managable 4.4M.
+
+This patch isn't complete though:
+
+12cb2bfcde40ce7084ae44af7db88f29  git-cvsserver
+2404a2cd2838be3841eac93de40a644e  git
+2404a2cd2838be3841eac93de40a644e  git-receive-pack
+2404a2cd2838be3841eac93de40a644e  git-upload-archive
+61631194968f67e12abd1f80103a2c68  git-upload-pack
+7b8faebe64076d65934a05cd60bbeb29  git-shell
+
+---
+
+--- /tmp/Makefile	2010-05-15 09:39:26.000000000 +0200
++++ git-1.7.0.2/Makefile	2010-05-15 09:44:21.000000000 +0200
+@@ -1453,7 +1453,6 @@
+ 
+ $(BUILT_INS): git$X
+ 	$(QUIET_BUILT_IN)$(RM) $@ && \
+-	ln git$X $@ 2>/dev/null || \
+ 	ln -s git$X $@ 2>/dev/null || \
+ 	cp git$X $@
+ 
+@@ -1626,7 +1625,6 @@
+ 
+ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
+ 	$(QUIET_LNCP)$(RM) $@ && \
+-	ln $< $@ 2>/dev/null || \
+ 	ln -s $< $@ 2>/dev/null || \
+ 	cp $< $@
+ 
+@@ -1830,13 +1828,11 @@
+ 		cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
+ 	{ for p in $(BUILT_INS); do \
+ 		$(RM) "$$execdir/$$p" && \
+-		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
+ 		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
+ 	  done; } && \
+ 	{ for p in $(REMOTE_CURL_ALIASES); do \
+ 		$(RM) "$$execdir/$$p" && \
+-		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ 		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
+ 	  done; } && \
diff --git a/recipes/git/git_1.7.0.2.bb b/recipes/git/git_1.7.0.2.bb
index 40052bb742..a3a73f02ba 100644
--- a/recipes/git/git_1.7.0.2.bb
+++ b/recipes/git/git_1.7.0.2.bb
@@ -3,11 +3,26 @@ require git.inc
 SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1"
 SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f"
 
+SRC_URI += "file://git-less-hardlinks.diff"
+
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes"
 
 
 DEPENDS = "openssl curl zlib expat"
-RDEPENDS = "perl perl-module-file-path cpio findutils sed"
-PR = "r4"
+RDEPENDS_${PN} = "perl perl-module-file-path cpio findutils sed"
+
+# Dropbear ssh needs a wrapper script, so install openssh-ssh to make it work out of the box
+RRECOMMENDS_${PN} = "openssh-ssh"
+
+PR = "r6"
+
+do_install_append() {
+	# Fix broken hardlinks
+	for gitprog in git-receive-pack git-upload-archive ; do
+		rm ${D}${bindir}/$gitprog 
+		ln -sf ${bindir}/git ${D}${bindir}/$gitprog
+	done
+	rm ${D}${libexecdir}/git-core/git && ln -sf ${bindir}/git ${D}${libexecdir}/git-core/git
+}
 
 FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
diff --git a/recipes/gizmod/gizmod_2.3.bb b/recipes/gizmod/gizmod_2.3.bb
index 00bd6c27c6..d02cc49a40 100644
--- a/recipes/gizmod/gizmod_2.3.bb
+++ b/recipes/gizmod/gizmod_2.3.bb
@@ -4,9 +4,9 @@ LICENSE = "GPLv2"
 SECTION = "console/multimedia"
 DEPENDS = "python virtual/libx11 xf86vidmodeproto alsa-lib"
 SRC_URI = "${SOURCEFORGE_MIRROR}/gizmod/gizmod-${PV}.tar.bz2 \
-           file://disable-xmms.patch;patch=1 \
-           file://fix-python-configure.patch;patch=1 \
-           file://disable-bmp.patch;patch=1"
+           file://disable-xmms.patch \
+           file://fix-python-configure.patch \
+           file://disable-bmp.patch"
 
 PR = "r0"
 
diff --git a/recipes/gizmod/gizmod_3.4.bb b/recipes/gizmod/gizmod_3.4.bb
index d6d485186f..8dfd930ade 100644
--- a/recipes/gizmod/gizmod_3.4.bb
+++ b/recipes/gizmod/gizmod_3.4.bb
@@ -6,7 +6,7 @@ DEPENDS = "python virtual/libx11 xf86vidmodeproto alsa-lib boost libvisual"
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/gizmod/gizmod-${PV}.tar.bz2 \
-	file://${PV}-build-fix.patch;patch=1 \
+	file://${PV}-build-fix.patch \
 	"
 
 PR = "r0"
diff --git a/recipes/gkdial/gkdial_1.8.1.bb b/recipes/gkdial/gkdial_1.8.1.bb
index 4b5b5727c2..27df6a84db 100644
--- a/recipes/gkdial/gkdial_1.8.1.bb
+++ b/recipes/gkdial/gkdial_1.8.1.bb
@@ -9,10 +9,10 @@ PRIORITY = "optional"
 PR = "r4"
 
 SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \
-           file://gkdial-pgpe.patch;patch=1 \
-           file://gkdial-ungnome.patch;patch=1;pnum=0 \
-           file://gkdial-gladedir.patch;patch=1;pnum=0 \
-           file://gkdial-gpepda.patch;patch=1;pnum=1 \
+           file://gkdial-pgpe.patch \
+           file://gkdial-ungnome.patch;striplevel=0 \
+           file://gkdial-gladedir.patch;striplevel=0 \
+           file://gkdial-gpepda.patch \
            file://gkdial.desktop \
            file://gkdial.png"
 
diff --git a/recipes/gkrellm/gkrellm_2.2.10.bb b/recipes/gkrellm/gkrellm_2.2.10.bb
index fa8f77b923..bcba59460a 100644
--- a/recipes/gkrellm/gkrellm_2.2.10.bb
+++ b/recipes/gkrellm/gkrellm_2.2.10.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ glib-2.0 libsm libice"
 
 SRC_URI = "http://members.dslextreme.com/users/billw/gkrellm/gkrellm-${PV}.tar.bz2 \
-           file://destdir.patch;patch=1"
+           file://destdir.patch"
 
 inherit pkgconfig
 
diff --git a/recipes/glew/libglew_1.5.1.bb b/recipes/glew/libglew_1.5.1.bb
index 25619a67ee..75a9a380e7 100644
--- a/recipes/glew/libglew_1.5.1.bb
+++ b/recipes/glew/libglew_1.5.1.bb
@@ -8,7 +8,7 @@ PR = "r1"
 
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/1.5.1/glew-1.5.1-src.tgz \
-           file://autotools.patch;patch=1 \
+           file://autotools.patch \
           "
 
 inherit autotools lib_package
diff --git a/recipes/glib-1.2/glib-1.2-native_1.2.10.bb b/recipes/glib-1.2/glib-1.2-native_1.2.10.bb
index 159dc98e3c..d00e9a174e 100644
--- a/recipes/glib-1.2/glib-1.2-native_1.2.10.bb
+++ b/recipes/glib-1.2/glib-1.2-native_1.2.10.bb
@@ -13,9 +13,9 @@ EXTRA_OECONF = "--disable-debug"
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/glib-${PV}.tar.gz \
            file://glibconfig-sysdefs.h \
            file://depcomp \
-           file://glib-reconf-fix;patch=1 \
-           file://posix-conf-changes;patch=1 \
-           file://gcc-3.4-pretty_function;patch=1"
+           file://glib-reconf-fix;apply=yes \
+           file://posix-conf-changes;apply=yes \
+           file://gcc-3.4-pretty_function;apply=yes"
 
 
 S = "${WORKDIR}/glib-${PV}"
diff --git a/recipes/glib-1.2/glib-1.2_1.2.10.bb b/recipes/glib-1.2/glib-1.2_1.2.10.bb
index 5b463cba10..72ee8264c2 100644
--- a/recipes/glib-1.2/glib-1.2_1.2.10.bb
+++ b/recipes/glib-1.2/glib-1.2_1.2.10.bb
@@ -15,10 +15,10 @@ EXTRA_OECONF = "--disable-debug"
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/glib-${PV}.tar.gz \
            file://glibconfig-sysdefs.h \
 	   file://depcomp \
-	   file://glib-reconf-fix;patch=1 \
-           file://posix-conf-changes;patch=1 \
-           file://glib-config-use-pkg-config;patch=1 \
-	   file://gcc-3.4-pretty_function;patch=1"
+	   file://glib-reconf-fix;apply=yes \
+           file://posix-conf-changes;apply=yes \
+           file://glib-config-use-pkg-config;apply=yes \
+	   file://gcc-3.4-pretty_function;apply=yes"
 
 S = "${WORKDIR}/glib-${PV}"
 
diff --git a/recipes/glib-2.0/glib-2.0-2.24.0/60_wait-longer-for-threads-to-die.patch b/recipes/glib-2.0/glib-2.0-2.24.0/60_wait-longer-for-threads-to-die.patch
new file mode 100644
index 0000000000..02fe9ff0ab
--- /dev/null
+++ b/recipes/glib-2.0/glib-2.0-2.24.0/60_wait-longer-for-threads-to-die.patch
@@ -0,0 +1,26 @@
+--- glib/tests/threadpool-test.c.old	2008-02-12 06:11:21.000000000 +0100
++++ glib/tests/threadpool-test.c	2008-02-12 06:11:52.000000000 +0100
+@@ -5,8 +5,8 @@
+ 
+ #include <glib.h>
+ 
+-#define DEBUG_MSG(x)
+-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");  */
++/* #define DEBUG_MSG(x) */
++#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
+ 
+ #define WAIT                5    /* seconds */
+ #define MAX_THREADS         10
+@@ -124,10 +124,10 @@
+    DEBUG_MSG (("[unused] stopping unused threads"));
+    g_thread_pool_stop_unused_threads ();
+ 
+-   DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
++   DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
+ 
+    /* Some time for threads to die. */
+-   g_usleep (G_USEC_PER_SEC);
++   g_usleep (5 * G_USEC_PER_SEC);
+ 
+    DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist",
+ 	       g_thread_pool_get_num_unused_threads (),
diff --git a/recipes/glib-2.0/glib-2.0-2.24.0/gasync.patch b/recipes/glib-2.0/glib-2.0-2.24.0/gasync.patch
new file mode 100644
index 0000000000..d9f36a757e
--- /dev/null
+++ b/recipes/glib-2.0/glib-2.0-2.24.0/gasync.patch
@@ -0,0 +1,22 @@
+From 324f928af62d8a0aa132a5caaec107d4daa76429 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Mon, 19 Apr 2010 14:42:42 +0000
+Subject: Bug 615111 – GAsyncInitable's default implementation is broken
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+diff --git a/gio/gasyncinitable.c b/gio/gasyncinitable.c
+index 05e17e2..c369a4e 100644
+--- a/gio/gasyncinitable.c
++++ b/gio/gasyncinitable.c
+@@ -201,7 +201,7 @@ async_init_thread (GSimpleAsyncResult *res,
+ {
+   GError *error = NULL;
+ 
+-  if (!g_initable_init (G_INITABLE (res), cancellable, &error))
++  if (!g_initable_init (G_INITABLE (object), cancellable, &error))
+     {
+       g_simple_async_result_set_from_error (res, error);
+       g_error_free (error);
+--
+cgit v0.8.3.1
diff --git a/recipes/glib-2.0/glib-2.0-2.24.0/gatomic_armv6.patch b/recipes/glib-2.0/glib-2.0-2.24.0/gatomic_armv6.patch
index b17f80dbab..b17f80dbab 100755..100644
--- a/recipes/glib-2.0/glib-2.0-2.24.0/gatomic_armv6.patch
+++ b/recipes/glib-2.0/glib-2.0-2.24.0/gatomic_armv6.patch
diff --git a/recipes/glib-2.0/glib-2.0-2.24.0/gvariant.patch b/recipes/glib-2.0/glib-2.0-2.24.0/gvariant.patch
new file mode 100644
index 0000000000..633f0aa8f3
--- /dev/null
+++ b/recipes/glib-2.0/glib-2.0-2.24.0/gvariant.patch
@@ -0,0 +1,32 @@
+From e51ec13ab4bc629f73b41f2ad3e96b3a787a8760 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Sun, 11 Apr 2010 02:01:02 +0000
+Subject: Add g_return_if_fail()s to g_variant_new_from_data()
+
+also, document that @type must be definite
+---
+diff --git a/glib/gvariant.c b/glib/gvariant.c
+index 721740f..f8f29e0 100644
+--- a/glib/gvariant.c
++++ b/glib/gvariant.c
+@@ -4087,7 +4087,7 @@ g_variant_byteswap (GVariant *value)
+ 
+ /**
+  * g_variant_new_from_data:
+- * @type: a #GVariantType
++ * @type: a definite #GVariantType
+  * @data: the serialised data
+  * @size: the size of @data
+  * @trusted: %TRUE if @data is definitely in normal form
+@@ -4129,6 +4129,9 @@ g_variant_new_from_data (const GVariantType *type,
+   GVariant *value;
+   GBuffer *buffer;
+ 
++  g_return_val_if_fail (g_variant_type_is_definite (type), NULL);
++  g_return_val_if_fail (data != NULL || size == 0, NULL);
++
+   if (notify)
+     buffer = g_buffer_new_from_pointer (data, size, notify, user_data);
+   else
+--
+cgit v0.8.3.1
diff --git a/recipes/glib-2.0/glib-2.0-native_2.12.4.bb b/recipes/glib-2.0/glib-2.0-native_2.12.4.bb
index 0d4e45d918..3fa560c105 100644
--- a/recipes/glib-2.0/glib-2.0-native_2.12.4.bb
+++ b/recipes/glib-2.0/glib-2.0-native_2.12.4.bb
@@ -12,7 +12,7 @@ PR ="r1"
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "http://download.gnome.org/sources/glib/2.12/glib-${PV}.tar.bz2 \
-           file://glib-gettextize-dir.patch;patch=1 \
+           file://glib-gettextize-dir.patch \
            file://glibconfig-sysdefs.h"
 
 S = "${WORKDIR}/glib-${PV}"
diff --git a/recipes/glib-2.0/glib-2.0-native_2.2.3.bb b/recipes/glib-2.0/glib-2.0-native_2.2.3.bb
index cf3c49b47a..2604c400c4 100644
--- a/recipes/glib-2.0/glib-2.0-native_2.2.3.bb
+++ b/recipes/glib-2.0/glib-2.0-native_2.2.3.bb
@@ -4,9 +4,9 @@ DEPENDS = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glib-2.0-${PV}"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \
-           file://automake-lossage.patch;patch=1 \
+           file://automake-lossage.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 S = "${WORKDIR}/glib-${PV}"
 PR = "r1"
 
diff --git a/recipes/glib-2.0/glib-2.0-native_2.4.6.bb b/recipes/glib-2.0/glib-2.0-native_2.4.6.bb
index 75e847b178..f04979f2c1 100644
--- a/recipes/glib-2.0/glib-2.0-native_2.4.6.bb
+++ b/recipes/glib-2.0/glib-2.0-native_2.4.6.bb
@@ -12,9 +12,9 @@ PR = "r6"
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
-           file://visibility.patch;patch=1 \
+           file://visibility.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 S = "${WORKDIR}/glib-${PV}"
 
diff --git a/recipes/glib-2.0/glib-2.0-native_2.6.5.bb b/recipes/glib-2.0/glib-2.0-native_2.6.5.bb
index c6580a6330..6a1582b397 100644
--- a/recipes/glib-2.0/glib-2.0-native_2.6.5.bb
+++ b/recipes/glib-2.0/glib-2.0-native_2.6.5.bb
@@ -13,10 +13,10 @@ export PERL_PATH="/usr/bin/env perl"
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
-	   file://glib-gettextize-dir.patch;patch=1 \
-	   file://glib-mkenums-nowarn.patch;patch=1 \
+	   file://glib-gettextize-dir.patch \
+	   file://glib-mkenums-nowarn.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 S = "${WORKDIR}/glib-${PV}"
 
diff --git a/recipes/glib-2.0/glib-2.0-native_2.6.6.bb b/recipes/glib-2.0/glib-2.0-native_2.6.6.bb
index a9d52d24d5..4170f79064 100644
--- a/recipes/glib-2.0/glib-2.0-native_2.6.6.bb
+++ b/recipes/glib-2.0/glib-2.0-native_2.6.6.bb
@@ -13,10 +13,10 @@ export PERL_PATH="/usr/bin/env perl"
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
-	   file://glib-gettextize-dir.patch;patch=1 \
-	   file://glib-mkenums-nowarn.patch;patch=1 \
+	   file://glib-gettextize-dir.patch \
+	   file://glib-mkenums-nowarn.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 S = "${WORKDIR}/glib-${PV}"
 
diff --git a/recipes/glib-2.0/glib-2.0_2.12.10.bb b/recipes/glib-2.0/glib-2.0_2.12.10.bb
index 19d2dbce04..3617f6c1b7 100644
--- a/recipes/glib-2.0/glib-2.0_2.12.10.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.10.bb
@@ -2,7 +2,7 @@ require glib.inc
 PR = "${INC_PR}.0"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 
 SRC_URI[md5sum] = "82d44a53690b0eff8f7a5dc65e592f61"
diff --git a/recipes/glib-2.0/glib-2.0_2.12.11.bb b/recipes/glib-2.0/glib-2.0_2.12.11.bb
index ea47790a5c..4ab344e910 100644
--- a/recipes/glib-2.0/glib-2.0_2.12.11.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.11.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 
 SRC_URI[md5sum] = "077a9917b673a9a0bc63f351786dde24"
diff --git a/recipes/glib-2.0/glib-2.0_2.12.12.bb b/recipes/glib-2.0/glib-2.0_2.12.12.bb
index 3d5c7f03bc..12b24e2a7f 100644
--- a/recipes/glib-2.0/glib-2.0_2.12.12.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.12.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 
 SRC_URI[md5sum] = "0b3a42098243d054475ff6eb51ed2be1"
diff --git a/recipes/glib-2.0/glib-2.0_2.12.13.bb b/recipes/glib-2.0/glib-2.0_2.12.13.bb
index e0354f3995..4e04ec8233 100644
--- a/recipes/glib-2.0/glib-2.0_2.12.13.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.13.bb
@@ -4,7 +4,7 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 
 SRC_URI[md5sum] = "d76124236e4e216e8c0861341e967a76"
diff --git a/recipes/glib-2.0/glib-2.0_2.12.6.bb b/recipes/glib-2.0/glib-2.0_2.12.6.bb
index 3dd82c8ec1..9c526a8d9d 100644
--- a/recipes/glib-2.0/glib-2.0_2.12.6.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.6.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 
 SRC_URI[md5sum] = "b13d971e7de0b844fc4ced7367702003"
diff --git a/recipes/glib-2.0/glib-2.0_2.12.9.bb b/recipes/glib-2.0/glib-2.0_2.12.9.bb
index 41d483b36a..5db6bbffbf 100644
--- a/recipes/glib-2.0/glib-2.0_2.12.9.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.9.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 
 SRC_URI[md5sum] = "b3f6a2a318610af6398b3445f1a2d6c6"
diff --git a/recipes/glib-2.0/glib-2.0_2.14.0.bb b/recipes/glib-2.0/glib-2.0_2.14.0.bb
index 2f6ca089b4..04da06c929 100644
--- a/recipes/glib-2.0/glib-2.0_2.14.0.bb
+++ b/recipes/glib-2.0/glib-2.0_2.14.0.bb
@@ -3,8 +3,8 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1 \
-           file://gcc-4.2-inline-fix.patch;patch=1"
+           file://configure-libtool.patch \
+           file://gcc-4.2-inline-fix.patch"
 
 SRC_URI[md5sum] = "6fabf21f68631043bc6924e01398e3af"
 SRC_URI[sha256sum] = "92e0aed2b5816bfcdfcd943215a7b59e9000f89ae7824218b7959c90161560a8"
diff --git a/recipes/glib-2.0/glib-2.0_2.14.1.bb b/recipes/glib-2.0/glib-2.0_2.14.1.bb
index 96f4e981ab..c1664df067 100644
--- a/recipes/glib-2.0/glib-2.0_2.14.1.bb
+++ b/recipes/glib-2.0/glib-2.0_2.14.1.bb
@@ -3,8 +3,8 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1 \
-           file://gcc-4.2-inline-fix.patch;patch=1"
+           file://configure-libtool.patch \
+           file://gcc-4.2-inline-fix.patch"
 
 SRC_URI[md5sum] = "196d7944a8ddc1f7c3d1e9c7146dd560"
 SRC_URI[sha256sum] = "6f36ca624a12dce03cdea59c9eb900eda49ea2f463b329737eb9f2a8f3ac144d"
diff --git a/recipes/glib-2.0/glib-2.0_2.14.4.bb b/recipes/glib-2.0/glib-2.0_2.14.4.bb
index 0fb58261a2..82aff6d48e 100644
--- a/recipes/glib-2.0/glib-2.0_2.14.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.14.4.bb
@@ -3,8 +3,8 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1 \
-           file://gcc-4.2-inline-fix.patch;patch=1"
+           file://configure-libtool.patch \
+           file://gcc-4.2-inline-fix.patch"
 
 SRC_URI[md5sum] = "7ee7874108cbe9ea7fff1f4ab3389ce8"
 SRC_URI[sha256sum] = "10e6ebecc2cbd07f193a5d26b88c3bf2107e32b2a4d024f10f77f59a98d579ff"
diff --git a/recipes/glib-2.0/glib-2.0_2.15.6.bb b/recipes/glib-2.0/glib-2.0_2.15.6.bb
index fe73e78a68..ece8c0c1af 100644
--- a/recipes/glib-2.0/glib-2.0_2.15.6.bb
+++ b/recipes/glib-2.0/glib-2.0_2.15.6.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.15/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1 \
+           file://configure-libtool.patch \
           "
 
 SRC_URI[md5sum] = "62b1a3c1fa52b8d91b4535e4a4ab3057"
diff --git a/recipes/glib-2.0/glib-2.0_2.16.1.bb b/recipes/glib-2.0/glib-2.0_2.16.1.bb
index d940165477..06ef68820d 100644
--- a/recipes/glib-2.0/glib-2.0_2.16.1.bb
+++ b/recipes/glib-2.0/glib-2.0_2.16.1.bb
@@ -3,9 +3,9 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1 \
-           file://gcc-4.2-inline-fix.patch;patch=1 \
-           file://hurd-arg-max.patch;patch=1 \
+           file://configure-libtool.patch \
+           file://gcc-4.2-inline-fix.patch \
+           file://hurd-arg-max.patch \
 "
 S = "${WORKDIR}/glib-${PV}"
 
diff --git a/recipes/glib-2.0/glib-2.0_2.16.3.bb b/recipes/glib-2.0/glib-2.0_2.16.3.bb
index 215fe0e7b5..b2815dad87 100644
--- a/recipes/glib-2.0/glib-2.0_2.16.3.bb
+++ b/recipes/glib-2.0/glib-2.0_2.16.3.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1 \
+           file://configure-libtool.patch \
           "
 
 SRC_URI[md5sum] = "195f9a803cc5279dbb39afdf985f44cb"
diff --git a/recipes/glib-2.0/glib-2.0_2.16.4.bb b/recipes/glib-2.0/glib-2.0_2.16.4.bb
index de858e2cc3..632eaf6d66 100644
--- a/recipes/glib-2.0/glib-2.0_2.16.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.16.4.bb
@@ -6,10 +6,10 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1 \
+           file://configure-libtool.patch \
           "
 
-SRC_URI_append_arm = "file://atomic-thumb.patch;patch=1"
+SRC_URI_append_arm = "file://atomic-thumb.patch"
 
 SRC_URI[md5sum] = "2ab79b3c93258827cc6ea8ee50128e49"
 SRC_URI[sha256sum] = "16ac93dc0da95cb20e4f14507fab688c4be1d23bcd2f28bc069c8ca7dc9d7e9d"
diff --git a/recipes/glib-2.0/glib-2.0_2.16.5.bb b/recipes/glib-2.0/glib-2.0_2.16.5.bb
index 11aa92d337..497d2b4b9f 100644
--- a/recipes/glib-2.0/glib-2.0_2.16.5.bb
+++ b/recipes/glib-2.0/glib-2.0_2.16.5.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1 \
+           file://configure-libtool.patch \
           "
 
 SRC_URI[md5sum] = "039f02d47d4071322a3f00abf031e5d9"
diff --git a/recipes/glib-2.0/glib-2.0_2.18.0.bb b/recipes/glib-2.0/glib-2.0_2.18.0.bb
index 018013230e..d657462b96 100644
--- a/recipes/glib-2.0/glib-2.0_2.18.0.bb
+++ b/recipes/glib-2.0/glib-2.0_2.18.0.bb
@@ -4,7 +4,7 @@ PR = "${INC_PR}.0"
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
   file://glibconfig-sysdefs.h \
-  file://configure-libtool.patch;patch=1 \
+  file://configure-libtool.patch \
 "
 
 SRC_URI[md5sum] = "06e5afe4ce055085dc5fd9fdab527bf7"
diff --git a/recipes/glib-2.0/glib-2.0_2.18.1.bb b/recipes/glib-2.0/glib-2.0_2.18.1.bb
index 02e5f1dbc7..cf676eff2b 100644
--- a/recipes/glib-2.0/glib-2.0_2.18.1.bb
+++ b/recipes/glib-2.0/glib-2.0_2.18.1.bb
@@ -4,9 +4,9 @@ PR = "${INC_PR}.0"
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
   file://glibconfig-sysdefs.h \
-  file://configure-libtool.patch;patch=1 \
+  file://configure-libtool.patch \
 "
-SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1"
+SRC_URI_append_arm = " file://atomic-thumb.patch"
 
 SRC_URI[md5sum] = "51a9a33f49a4896d4d95d8e980666b9e"
 SRC_URI[sha256sum] = "57a47d4cd19757de0a7764488e6d4d8b0afa4849356a332b721a5219a991a0d0"
diff --git a/recipes/glib-2.0/glib-2.0_2.18.3.bb b/recipes/glib-2.0/glib-2.0_2.18.3.bb
index 18eee7d610..d4f609e0b9 100644
--- a/recipes/glib-2.0/glib-2.0_2.18.3.bb
+++ b/recipes/glib-2.0/glib-2.0_2.18.3.bb
@@ -4,9 +4,9 @@ PR = "${INC_PR}.0"
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
   file://glibconfig-sysdefs.h \
-  file://configure-libtool.patch;patch=1 \
+  file://configure-libtool.patch \
 "
-SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1"
+SRC_URI_append_arm = " file://atomic-thumb.patch"
 
 SRC_URI[md5sum] = "f13996a7bd57525d796a6593f26a7771"
 SRC_URI[sha256sum] = "9f769e8449c8cc1d8789ba987e446bdac3ed22671d71f946c973c7aadccc0b36"
diff --git a/recipes/glib-2.0/glib-2.0_2.2.3.bb b/recipes/glib-2.0/glib-2.0_2.2.3.bb
index b06153da00..b85ecb3cb1 100644
--- a/recipes/glib-2.0/glib-2.0_2.2.3.bb
+++ b/recipes/glib-2.0/glib-2.0_2.2.3.bb
@@ -10,9 +10,9 @@ DEPENDS = "glib-2.0-native"
 DEPENDS += "virtual/libiconv virtual/libintl"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \
-           file://automake-lossage.patch;patch=1 \
+           file://automake-lossage.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 S = "${WORKDIR}/glib-${PV}"
 PR = "r1"
diff --git a/recipes/glib-2.0/glib-2.0_2.20.3.bb b/recipes/glib-2.0/glib-2.0_2.20.3.bb
index f41560b7fd..157ef8077f 100644
--- a/recipes/glib-2.0/glib-2.0_2.20.3.bb
+++ b/recipes/glib-2.0/glib-2.0_2.20.3.bb
@@ -4,9 +4,9 @@ PR = "${INC_PR}.0"
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-${PV}.tar.bz2;name=tarball \
   file://glibconfig-sysdefs.h \
-  file://configure-libtool.patch;patch=1 \
+  file://configure-libtool.patch \
 "
-SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1"
+SRC_URI_append_arm = " file://atomic-thumb.patch"
 
 SRC_URI[tarball.md5sum] = "1173688c58b4b62809c83bb07a2cf71a"
 SRC_URI[tarball.sha256sum] = "37f098617c2fac11eee4c6289d576300abd0a01825d4c809462f5b698d1127b0"
diff --git a/recipes/glib-2.0/glib-2.0_2.20.4.bb b/recipes/glib-2.0/glib-2.0_2.20.4.bb
index 76a95852ba..3d8bb77cd7 100644
--- a/recipes/glib-2.0/glib-2.0_2.20.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.20.4.bb
@@ -4,9 +4,9 @@ PR = "${INC_PR}.0"
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-${PV}.tar.bz2 \
   file://glibconfig-sysdefs.h \
-  file://configure-libtool.patch;patch=1 \
+  file://configure-libtool.patch \
 "
-SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1"
+SRC_URI_append_arm = " file://atomic-thumb.patch"
 
 SRC_URI[md5sum] = "346916673c0eab72191cf44b4afe535f"
 SRC_URI[sha256sum] = "af709f0eabfbbfa5c59a02764ca1dd5e6509bbe7fb67a474b2c448bda7b06fb9"
diff --git a/recipes/glib-2.0/glib-2.0_2.22.1.bb b/recipes/glib-2.0/glib-2.0_2.22.1.bb
index 706e7212a6..ac2cdef6a0 100644
--- a/recipes/glib-2.0/glib-2.0_2.22.1.bb
+++ b/recipes/glib-2.0/glib-2.0_2.22.1.bb
@@ -4,17 +4,17 @@ PR = "${INC_PR}.2"
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-${PV}.tar.bz2 \
   file://glibconfig-sysdefs.h \
-  file://configure-libtool.patch;patch=1 \
-  file://bug-556515.patch;patch=1 \
-  file://g_once_init_enter.patch;patch=1 \
-  file://uclibc-res_query.patch;patch=1 \
+  file://configure-libtool.patch \
+  file://bug-556515.patch \
+  file://g_once_init_enter.patch \
+  file://uclibc-res_query.patch \
 "
 
 
-SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1 \
+SRC_URI_append_arm = " file://atomic-thumb.patch \
 "
-SRC_URI_append_armv6 = " file://gatomic_armv6.patch;patch=1"
-SRC_URI_append_armv7a = " file://gatomic_armv6.patch;patch=1" 
+SRC_URI_append_armv6 = " file://gatomic_armv6.patch"
+SRC_URI_append_armv7a = " file://gatomic_armv6.patch" 
 
 SRC_URI[md5sum] = "12297a7da577321647b38ade0593cb3c"
 SRC_URI[sha256sum] = "4898d340c830a5903115412ec5b95eb03b410efdfb1c5316d36f12f8be85577d"
diff --git a/recipes/glib-2.0/glib-2.0_2.22.4.bb b/recipes/glib-2.0/glib-2.0_2.22.4.bb
index c86905e2fa..05a1342f26 100644
--- a/recipes/glib-2.0/glib-2.0_2.22.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.22.4.bb
@@ -11,16 +11,16 @@ DEPENDS = "glib-2.0-native gtk-doc virtual/libiconv virtual/libintl"
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-${PV}.tar.bz2;name=archive \
   file://glibconfig-sysdefs.h \
-  file://configure-libtool.patch;patch=1 \
-  file://g_once_init_enter.patch;patch=1 \
-  file://uclibc-res_query.patch;patch=1 \
+  file://configure-libtool.patch \
+  file://g_once_init_enter.patch \
+  file://uclibc-res_query.patch \
 "
 SRC_URI[archive.md5sum] = "d91bcbe27556430ddecce65086355708"
 SRC_URI[archive.sha256sum] = "0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14"
 
-SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1"
-SRC_URI_append_armv6 = " file://gatomic_armv6.patch;patch=1"
-SRC_URI_append_armv7a = " file://gatomic_armv6.patch;patch=1" 
+SRC_URI_append_arm = " file://atomic-thumb.patch"
+SRC_URI_append_armv6 = " file://gatomic_armv6.patch"
+SRC_URI_append_armv7a = " file://gatomic_armv6.patch" 
 
 PR = "r1"
 
diff --git a/recipes/glib-2.0/glib-2.0_2.23.6.bb b/recipes/glib-2.0/glib-2.0_2.23.6.bb
index dfbda5cd30..51a2153b27 100644
--- a/recipes/glib-2.0/glib-2.0_2.23.6.bb
+++ b/recipes/glib-2.0/glib-2.0_2.23.6.bb
@@ -12,16 +12,16 @@ PR = "r2"
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.23/glib-${PV}.tar.bz2;name=archive \
   file://glibconfig-sysdefs.h \
-  file://configure-libtool.patch;patch=1 \
-  file://g_once_init_enter.patch;patch=1 \
-  file://gatomic-proper-pointer-get-cast.patch;patch=1 \
+  file://configure-libtool.patch \
+  file://g_once_init_enter.patch \
+  file://gatomic-proper-pointer-get-cast.patch \
 "
 SRC_URI[archive.md5sum] = "72e6eadc16d7022376ecef12c6fe905e"
 SRC_URI[archive.sha256sum] = "f91840e27ad4cd48e655a6babed7e2024f86814f94961da88ca2adba447c6e77"
 
-SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1"
-SRC_URI_append_armv6 = " file://gatomic_armv6.patch;patch=1"
-SRC_URI_append_armv7a = " file://gatomic_armv6.patch;patch=1"
+SRC_URI_append_arm = " file://atomic-thumb.patch"
+SRC_URI_append_armv6 = " file://gatomic_armv6.patch"
+SRC_URI_append_armv7a = " file://gatomic_armv6.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/glib-2.0/glib-2.0_2.24.0.bb b/recipes/glib-2.0/glib-2.0_2.24.0.bb
index 0f2123b840..56fe567d69 100644
--- a/recipes/glib-2.0/glib-2.0_2.24.0.bb
+++ b/recipes/glib-2.0/glib-2.0_2.24.0.bb
@@ -8,23 +8,26 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0-native gtk-doc virtual/libiconv virtual/libintl zlib"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${PV}.tar.bz2;name=archive \
   file://glibconfig-sysdefs.h \
-  file://configure-libtool.patch;patch=1 \
-  file://g_once_init_enter.patch;patch=1 \
-  file://gatomic-proper-pointer-get-cast.patch;patch=1 \
-  file://gio.patch;patch=1 \
+  file://configure-libtool.patch \
+  file://g_once_init_enter.patch \
+  file://gatomic-proper-pointer-get-cast.patch \
+  file://gio.patch \
+  file://gvariant.patch \
+  file://gasync.patch \
+  file://60_wait-longer-for-threads-to-die.patch \
 "
 
 SRC_URI[archive.md5sum] = "45a8bc697d07f859566c0b64c40382a8"
 SRC_URI[archive.sha256sum] = "7b6aa2cf21e734a6092a711bf196b8d2ddc589b971f93337610c10fa4f23400d"
 
-SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1"
-SRC_URI_append_armv6 = " file://gatomic_armv6.patch;patch=1"
-SRC_URI_append_armv7a = " file://gatomic_armv6.patch;patch=1"
+SRC_URI_append_arm = " file://atomic-thumb.patch"
+SRC_URI_append_armv6 = " file://gatomic_armv6.patch"
+SRC_URI_append_armv7a = " file://gatomic_armv6.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/glib-2.0/glib-2.0_2.4.6.bb b/recipes/glib-2.0/glib-2.0_2.4.6.bb
index ab2b08ad07..2e6fa66652 100644
--- a/recipes/glib-2.0/glib-2.0_2.4.6.bb
+++ b/recipes/glib-2.0/glib-2.0_2.4.6.bb
@@ -22,10 +22,10 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
-           file://glibinclude.patch;patch=1;pnum=2 \
-           file://visibility.patch;patch=1 \
+           file://glibinclude.patch;striplevel=2 \
+           file://visibility.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 S = "${WORKDIR}/glib-${PV}"
 
diff --git a/recipes/glib-2.0/glib-2.0_2.6.4.bb b/recipes/glib-2.0/glib-2.0_2.6.4.bb
index 026354caf7..1a483f4281 100644
--- a/recipes/glib-2.0/glib-2.0_2.6.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.6.4.bb
@@ -22,9 +22,9 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
-           file://glibinclude.patch;patch=1;pnum=2 \
+           file://glibinclude.patch;striplevel=2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 S = "${WORKDIR}/glib-${PV}"
 
diff --git a/recipes/glib-2.0/glib-2.0_2.6.6.bb b/recipes/glib-2.0/glib-2.0_2.6.6.bb
index f0a5646101..2be60f9f0b 100644
--- a/recipes/glib-2.0/glib-2.0_2.6.6.bb
+++ b/recipes/glib-2.0/glib-2.0_2.6.6.bb
@@ -22,9 +22,9 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
-           file://glibinclude.patch;patch=1;pnum=2 \
+           file://glibinclude.patch;striplevel=2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 S = "${WORKDIR}/glib-${PV}"
 
diff --git a/recipes/glib-2.0/glib-2.0_2.8.6.bb b/recipes/glib-2.0/glib-2.0_2.8.6.bb
index 4af8287240..f0250461e3 100644
--- a/recipes/glib-2.0/glib-2.0_2.8.6.bb
+++ b/recipes/glib-2.0/glib-2.0_2.8.6.bb
@@ -20,7 +20,7 @@ EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch"
 
 S = "${WORKDIR}/glib-${PV}"
 
diff --git a/recipes/glibc/glibc-initial.inc b/recipes/glibc/glibc-initial.inc
index 6468f0df6d..effebf12f6 100644
--- a/recipes/glibc/glibc-initial.inc
+++ b/recipes/glibc/glibc-initial.inc
@@ -11,7 +11,7 @@ do_configure () {
 	find ${S} -name "configure" | xargs touch
 	${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
 		--without-cvs --disable-sanity-checks \
-		--with-headers=${STAGING_DIR_TARGET}${layout_includedir} \
+		--with-headers=${STAGING_DIR_TARGET}${includedir} \
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
@@ -29,28 +29,24 @@ do_compile () {
 	:
 }
 
-do_stage () {
-	oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \
-	includedir='${layout_includedir}' prefix='${layout_prefix}' \
+do_install () {
+	oe_runmake cross-compiling=yes install_root=${D} \
+	includedir='${includedir}' prefix='${prefix}' \
 	install-bootstrap-headers=yes install-headers
 
 	oe_runmake csu/subdir_lib
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-	mkdir -p ${STAGING_INCDIR}/gnu
-	touch ${STAGING_INCDIR}/gnu/stubs.h
-	cp ${S}/include/features.h ${STAGING_INCDIR}/features.h
+	mkdir -p ${D}${includedir}/gnu/
+	touch ${D}${includedir}/gnu/stubs.h
+	cp ${S}/include/features.h ${D}${includedir}/features.h
 
 	if [ -e ${B}/bits/stdio_lim.h ]; then
-		cp ${B}/bits/stdio_lim.h  ${STAGING_INCDIR}/bits/
+		cp ${B}/bits/stdio_lim.h  ${D}${includedir}/bits/
 	fi
-	mkdir -p ${STAGING_DIR_TARGET}${layout_libdir}
-	install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${layout_libdir}
+	mkdir -p ${D}${libdir}/
+	install -m 644 csu/crt[1in].o ${D}${libdir}
 	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-		-o ${STAGING_DIR_TARGET}${layout_libdir}/libc.so
-}
-
-do_install () {
-	:
+		-o ${D}${libdir}/libc.so
 }
diff --git a/recipes/glibc/glibc-stage.inc b/recipes/glibc/glibc-stage.inc
index cb9ab04e1f..e69de29bb2 100644
--- a/recipes/glibc/glibc-stage.inc
+++ b/recipes/glibc/glibc-stage.inc
@@ -1,16 +0,0 @@
-do_stage() {
-	rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
-	oe_runmake 'install_root=${STAGING_DIR_HOST}' \
-		   'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
-		   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
-		   install
-
-	# "make install" omits some (not all) RPC headers that other distros
-	# ship.
-	install -d ${STAGING_INCDIR}/rpcsvc
-
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
-	done
-}
diff --git a/recipes/glibc/glibc.inc b/recipes/glibc/glibc.inc
index 6741b21a58..19b5524293 100644
--- a/recipes/glibc/glibc.inc
+++ b/recipes/glibc/glibc.inc
@@ -11,7 +11,7 @@ PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES += "virtual/libintl virtual/libiconv"
 
 # INC_PR for glibc.inc, glibc-initial.inc and glibc-stage.inc
-INC_PR = "r35"
+INC_PR = "r36"
 
 inherit autotools
 
diff --git a/recipes/glibc/glibc_2.10.1.bb b/recipes/glibc/glibc_2.10.1.bb
index 3db617b17e..6f0d0f6971 100644
--- a/recipes/glibc/glibc_2.10.1.bb
+++ b/recipes/glibc/glibc_2.10.1.bb
@@ -37,34 +37,34 @@ RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2;name=ports \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2;name=libidn \
-	   file://nscd-init.patch;patch=1;pnum=0 \
-           file://arm-memcpy.patch;patch=1 \
-           file://arm-longlong.patch;patch=1 \
-           file://fhs-linux-paths.patch;patch=1 \
-           file://dl-cache-libcmp.patch;patch=1 \
-           file://ldsocache-varrun.patch;patch=1 \
-           file://nptl-crosscompile.patch;patch=1 \
-	   file://glibc-check_pf.patch;patch=1;pnum=0 \
-           file://ldd-unbash.patch;patch=1 \
-	   file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
+	   file://nscd-init.patch;striplevel=0 \
+           file://arm-memcpy.patch \
+           file://arm-longlong.patch \
+           file://fhs-linux-paths.patch \
+           file://dl-cache-libcmp.patch \
+           file://ldsocache-varrun.patch \
+           file://nptl-crosscompile.patch \
+	   file://glibc-check_pf.patch;striplevel=0 \
+           file://ldd-unbash.patch \
+	   file://glibc-arm-IO-acquire-lock-fix.diff \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
 	   file://generic-bits_time.h \
            file://etc/ld.so.conf \
            file://generate-supported.mk \
-           file://march-i686.patch;patch=1;pnum=0 \
-           file://arm-lowlevellock-include-tls.patch;patch=1 \
-           file://glibc-2.9-enable-binutils-2.2.patch;patch=1 \
-	   file://armv4t-interworking.patch;patch=1 \
+           file://march-i686.patch;striplevel=0 \
+           file://arm-lowlevellock-include-tls.patch \
+           file://glibc-2.9-enable-binutils-2.2.patch \
+	   file://armv4t-interworking.patch \
            "
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch"
+SRC_URI_append_sh4 = " file://no-z-defs.patch"
 
 #powerpc patches to add support for soft-float
-SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;patch=1"
+SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff"
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.2.5.bb b/recipes/glibc/glibc_2.2.5.bb
index a1c00e7d4b..8622950d76 100644
--- a/recipes/glibc/glibc_2.2.5.bb
+++ b/recipes/glibc/glibc_2.2.5.bb
@@ -42,68 +42,68 @@ FILES_localedef = "${bindir}/localedef"
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
 
-#	   file://noinfo.patch;patch=1 \
-#	   file://ldconfig.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch \
+#	   file://ldconfig.patch;striplevel=0 \
 
 SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz;name=archive \
 	   ${GNU_MIRROR}/glibc/glibc-linuxthreads-${PV}.tar.gz;name=linuxthreads \
-	   file://alpha-build-failure.patch;patch=1 \
-	   file://arm-asm-clobber.patch;patch=1 \
-	   file://arm-ctl_bus_isa.patch;patch=1 \
-	   file://cris-libc-symbols.patch;patch=1 \
-	   file://cris-stack-direction.patch;patch=1 \
-	   file://dl-machine-alpha.patch;patch=1 \
-	   file://dl-machine-arm.patch;patch=1 \
-	   file://dl-machine-m68k.patch;patch=1 \
-	   file://dl-machine-mips.patch;patch=1 \
-	   file://dl-machine-sh.patch;patch=1 \
-	   file://dl-machine-sparc.patch;patch=1 \
-	   file://errlist-1.9.patch;patch=1 \
-	   file://errlist-arm.patch;patch=1 \
-	   file://glibc-2.2.5-allow-gcc-3.4-fixup.patch;patch=1 \
-	   file://glibc-2.2.5-allow-gcc-3.4-grp.patch;patch=1 \
-	   file://glibc-2.2.5-allow-gcc-4.x-configure.patch;patch=1 \
-	   file://glibc-2.2.5-alpha-pwrite64.patch;patch=1 \
-	   file://glibc-2.2.5-arm-pwrite64.patch;patch=1 \
-	   file://glibc-2.2.5-crosstest.patch;patch=1 \
-	   file://glibc-2.2.5-crossyes.patch;patch=1 \
-	   file://glibc-2.2.5-cygwin.patch;patch=1 \
-	   file://glibc-2.2.5-hhl-powerpc-fpu.patch;patch=1 \
-	   file://glibc-2.2.5-mips-build-gmon.patch;patch=1 \
-	   file://glibc-2.2.5-mips-clone-local-label.patch;patch=1 \
-	   file://glibc-2.2.5-ppc405erratum77.patch;patch=1 \
-	   file://glibc-drow-sh.patch;patch=1 \
-	   file://glibc-test-lowram.patch;patch=1 \
-	   file://initfini-alpha.patch;patch=1 \
-	   file://initfini-sh.patch;patch=1 \
-	   file://longjmp-sparc.patch;patch=1 \
-	   file://sh-setjmp-fix.patch;patch=1 \
-	   file://sprintf-prototype.patch;patch=1 \
-	   file://sscanf.patch;patch=1 \
-	   file://unwind-arm.patch;patch=1 \
-	   file://ldd.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1;pnum=1 \
-	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://arm-memcpy.patch;patch=1;pnum=0 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
-	   file://glibc-2.2.5-allow-gcc-3.4-td.patch;patch=1 \
-	   file://glibc-2.2.5-alpha-self-clobber.patch;patch=1 \
-	   file://pt-initfini-alpha.patch;patch=1 \
-	   file://pt-initfini-sh.patch;patch=1 \
-	   file://linuxthreads-2.2.5-ppc405erratum77.patch;patch=1 \
-	   file://threadparam.patch;patch=1 \
-	   file://initfini-flags.patch;patch=1 \
-	   file://pt-initfini-flags.patch;patch=1 \
-	   file://glibc-2.3.2-allow-solaris.patch;patch=1 \
+	   file://alpha-build-failure.patch \
+	   file://arm-asm-clobber.patch \
+	   file://arm-ctl_bus_isa.patch \
+	   file://cris-libc-symbols.patch \
+	   file://cris-stack-direction.patch \
+	   file://dl-machine-alpha.patch \
+	   file://dl-machine-arm.patch \
+	   file://dl-machine-m68k.patch \
+	   file://dl-machine-mips.patch \
+	   file://dl-machine-sh.patch \
+	   file://dl-machine-sparc.patch \
+	   file://errlist-1.9.patch \
+	   file://errlist-arm.patch \
+	   file://glibc-2.2.5-allow-gcc-3.4-fixup.patch \
+	   file://glibc-2.2.5-allow-gcc-3.4-grp.patch \
+	   file://glibc-2.2.5-allow-gcc-4.x-configure.patch \
+	   file://glibc-2.2.5-alpha-pwrite64.patch \
+	   file://glibc-2.2.5-arm-pwrite64.patch \
+	   file://glibc-2.2.5-crosstest.patch \
+	   file://glibc-2.2.5-crossyes.patch \
+	   file://glibc-2.2.5-cygwin.patch \
+	   file://glibc-2.2.5-hhl-powerpc-fpu.patch \
+	   file://glibc-2.2.5-mips-build-gmon.patch \
+	   file://glibc-2.2.5-mips-clone-local-label.patch \
+	   file://glibc-2.2.5-ppc405erratum77.patch \
+	   file://glibc-drow-sh.patch \
+	   file://glibc-test-lowram.patch \
+	   file://initfini-alpha.patch \
+	   file://initfini-sh.patch \
+	   file://longjmp-sparc.patch \
+	   file://sh-setjmp-fix.patch \
+	   file://sprintf-prototype.patch \
+	   file://sscanf.patch \
+	   file://unwind-arm.patch \
+	   file://ldd.patch;striplevel=0 \
+	   file://fhs-linux-paths.patch \
+	   file://arm-no-hwcap.patch;striplevel=0 \
+	   file://arm-memcpy.patch;striplevel=0 \
+	   file://arm-longlong.patch;striplevel=0 \
+	   file://arm-machine-gmon.patch;striplevel=0 \
+	   file://glibc-2.2.5-allow-gcc-3.4-td.patch \
+	   file://glibc-2.2.5-alpha-self-clobber.patch \
+	   file://pt-initfini-alpha.patch \
+	   file://pt-initfini-sh.patch \
+	   file://linuxthreads-2.2.5-ppc405erratum77.patch \
+	   file://threadparam.patch \
+	   file://initfini-flags.patch \
+	   file://pt-initfini-flags.patch \
+	   file://glibc-2.3.2-allow-solaris.patch \
 	   \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
-#	   file://makeconfig.patch;patch=1;pnum=0
+#	   file://makeconfig.patch;striplevel=0
 
 
 # seems to break on TLS platforms
-# SRC_URI_append_arm = " file://dyn-ldconfig.patch;patch=1;pnum=0"
+# SRC_URI_append_arm = " file://dyn-ldconfig.patch;striplevel=0"
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.2+cvs20040726.bb b/recipes/glibc/glibc_2.3.2+cvs20040726.bb
index 7773e9cd52..712ad3f28c 100644
--- a/recipes/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/recipes/glibc/glibc_2.3.2+cvs20040726.bb
@@ -7,26 +7,26 @@ PR = "${INC_PR}.0"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
-	   file://arm-ioperm.patch;patch=1;pnum=0 \
-	   file://makeconfig.patch;patch=1;pnum=0 \
-	   file://ldd.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://arm-memcpy.patch;patch=1;pnum=0 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
-	   file://glibc-fp-byteorder.patch;patch=1 \
+	   file://arm-ioperm.patch;striplevel=0 \
+	   file://makeconfig.patch;striplevel=0 \
+	   file://ldd.patch;striplevel=0 \
+	   file://fhs-linux-paths.patch \
+	   file://arm-no-hwcap.patch;striplevel=0 \
+	   file://arm-memcpy.patch;striplevel=0 \
+	   file://arm-longlong.patch;striplevel=0 \
+	   file://arm-machine-gmon.patch;striplevel=0 \
+	   file://glibc-fp-byteorder.patch \
 	   \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig.patch;patch=1;pnum=0"
+SRC_URI_append_arm = " file://dyn-ldconfig.patch;striplevel=0"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.2.bb b/recipes/glibc/glibc_2.3.2.bb
index 6c8c6a5f1f..632df5b5d6 100644
--- a/recipes/glibc/glibc_2.3.2.bb
+++ b/recipes/glibc/glibc_2.3.2.bb
@@ -43,71 +43,71 @@ RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz;name=archive \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.2.tar.gz;name=linuxthreads \
-	   file://noinfo.patch;patch=1 \
-	   file://10_cvs.patch;patch=1 \
- 	   file://arm-ioperm.patch;patch=1;pnum=0 \
-	   file://glibc-i686-timing.patch;patch=1;pnum=1 \
- 	   file://makeconfig.patch;patch=1;pnum=0 \
-	   file://locale-es_AR.patch;patch=1;pnum=0 \
-	   file://ldconfig.patch;patch=1;pnum=0 \
- 	   file://ldd.patch;patch=1;pnum=0 \
- 	   file://fhs-linux-paths.patch;patch=1;pnum=1 \
-	   file://glibc22-nss-upgrade.patch;patch=1;pnum=1 \
-	   file://glibc22-eo_EO.patch;patch=1;pnum=1 \
-	   file://glibc22-m68k-compat.patch;patch=1;pnum=1 \
-	   file://glibc22-m68k-fpic.patch;patch=1;pnum=1 \
-	   file://glibc22-locales.patch;patch=1;pnum=0 \
-	   file://sparc64-fixups.patch;patch=1;pnum=1 \
-	   file://glibc22-ttyname-devfs.patch;patch=1;pnum=0 \
-	   file://powerpc-sysconf.patch;patch=1;pnum=1 \
- 	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://locales-stuff.patch;patch=1;pnum=1 \
-	   file://librt-mips.patch;patch=1;pnum=0 \
-	   file://glibc23-ctype-compat.patch;patch=1;pnum=1 \
-	   file://glibc23-hppa-Rminkernel.patch;patch=1;pnum=0 \
-	   file://glibc23-function-compat.patch;patch=1;pnum=1 \
-	   file://glibc23-errno.patch;patch=1;pnum=1 \
-	   file://glibc23-asserth-decls.patch;patch=1;pnum=0 \
-	   file://alpha-pic.patch;patch=1;pnum=0 \
-	   file://glibc23-cmov.patch;patch=1;pnum=1 \
-	   file://libgcc-compat-all.patch;patch=1;pnum=0 \
-	   file://locales-supported.patch;patch=1;pnum=0 \
-	   file://libgcc-compat-other.patch;patch=1;pnum=1 \
-	   file://s390-tls.patch;patch=1;pnum=0 \
-	   file://hurd-enable-ldconfig.patch;patch=1;pnum=1 \
-	   file://30_glibc232-base.patch;patch=1;pnum=0 \
-	   file://sparcv8-target.patch;patch=1;pnum=0 \
-	   file://50_glibc232-arm-dwarf2-buildfix.patch;patch=1;pnum=0 \
-	   file://50_glibc232-m68k-dwarf2-buildfix.patch;patch=1;pnum=1 \
-	   file://arm-output-format.patch;patch=1;pnum=0 \
-	   file://pthread-cleanup.patch;patch=1;pnum=0 \
-	   file://glibc-${PV}-ldconfig-tls.patch;patch=1;pnum=1 \
-	   file://glibc23-mips-msq.patch;patch=1;pnum=0 \
-	   file://glibc23-libio-compat.patch;patch=1;pnum=1 \
-	   file://80_glibc232-locales-nb_NO-fix.patch;patch=1;pnum=0 \
-	   file://ldso-disable-hwcap.patch;patch=1;pnum=1 \
-	   file://11_shlib-lds.patch;patch=1;pnum=1 \
-	   file://glibc23-version-sanity.patch;patch=1;pnum=1 \
-	   file://glibc23-sse-oldkernel.patch;patch=1;pnum=1 \
-	   file://glibc23-sparc-pread64.patch;patch=1;pnum=1 \
-	   file://glibc23-powerpc-sigcontext.patch;patch=1;pnum=1 \
-	   file://hppa-syscall.patch;patch=1;pnum=0 \
-	   file://glibc23-errno-hack.patch;patch=1;pnum=1 \
-	   file://90_glibc232-statvfs.patch;patch=1;pnum=0 \
-	   file://90_glibc232-timezones.patch;patch=1;pnum=0 \
- 	   file://arm-memcpy.patch;patch=1;pnum=0 \
- 	   file://arm-longlong.patch;patch=1;pnum=0 \
- 	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
-           file://dyn-ldconfig.diff;patch=1;pnum=0 \
-	   file://glibc232-gcc34-i386-fixup-attribute.patch;patch=1;pnum=1 \
-	   file://glibc232-gcc34-no-unit-at-a-time.patch;patch=1;pnum=1 \
+	   file://noinfo.patch \
+	   file://10_cvs.patch \
+ 	   file://arm-ioperm.patch;striplevel=0 \
+	   file://glibc-i686-timing.patch \
+ 	   file://makeconfig.patch;striplevel=0 \
+	   file://locale-es_AR.patch;striplevel=0 \
+	   file://ldconfig.patch;striplevel=0 \
+ 	   file://ldd.patch;striplevel=0 \
+ 	   file://fhs-linux-paths.patch \
+	   file://glibc22-nss-upgrade.patch \
+	   file://glibc22-eo_EO.patch \
+	   file://glibc22-m68k-compat.patch \
+	   file://glibc22-m68k-fpic.patch \
+	   file://glibc22-locales.patch;striplevel=0 \
+	   file://sparc64-fixups.patch \
+	   file://glibc22-ttyname-devfs.patch;striplevel=0 \
+	   file://powerpc-sysconf.patch \
+ 	   file://arm-no-hwcap.patch;striplevel=0 \
+	   file://locales-stuff.patch \
+	   file://librt-mips.patch;striplevel=0 \
+	   file://glibc23-ctype-compat.patch \
+	   file://glibc23-hppa-Rminkernel.patch;striplevel=0 \
+	   file://glibc23-function-compat.patch \
+	   file://glibc23-errno.patch \
+	   file://glibc23-asserth-decls.patch;striplevel=0 \
+	   file://alpha-pic.patch;striplevel=0 \
+	   file://glibc23-cmov.patch \
+	   file://libgcc-compat-all.patch;striplevel=0 \
+	   file://locales-supported.patch;striplevel=0 \
+	   file://libgcc-compat-other.patch \
+	   file://s390-tls.patch;striplevel=0 \
+	   file://hurd-enable-ldconfig.patch \
+	   file://30_glibc232-base.patch;striplevel=0 \
+	   file://sparcv8-target.patch;striplevel=0 \
+	   file://50_glibc232-arm-dwarf2-buildfix.patch;striplevel=0 \
+	   file://50_glibc232-m68k-dwarf2-buildfix.patch \
+	   file://arm-output-format.patch;striplevel=0 \
+	   file://pthread-cleanup.patch;striplevel=0 \
+	   file://glibc-${PV}-ldconfig-tls.patch \
+	   file://glibc23-mips-msq.patch;striplevel=0 \
+	   file://glibc23-libio-compat.patch \
+	   file://80_glibc232-locales-nb_NO-fix.patch;striplevel=0 \
+	   file://ldso-disable-hwcap.patch \
+	   file://11_shlib-lds.patch \
+	   file://glibc23-version-sanity.patch \
+	   file://glibc23-sse-oldkernel.patch \
+	   file://glibc23-sparc-pread64.patch \
+	   file://glibc23-powerpc-sigcontext.patch \
+	   file://hppa-syscall.patch;striplevel=0 \
+	   file://glibc23-errno-hack.patch \
+	   file://90_glibc232-statvfs.patch;striplevel=0 \
+	   file://90_glibc232-timezones.patch;striplevel=0 \
+ 	   file://arm-memcpy.patch;striplevel=0 \
+ 	   file://arm-longlong.patch;striplevel=0 \
+ 	   file://arm-machine-gmon.patch;striplevel=0 \
+           file://dyn-ldconfig.diff;striplevel=0 \
+	   file://glibc232-gcc34-i386-fixup-attribute.patch \
+	   file://glibc232-gcc34-no-unit-at-a-time.patch \
 	   file://etc/ld.so.conf \
  	   file://generate-supported.mk"
 
-SRC_URI_append_mtx-1 = " file://mips-abio32.patch;patch=1 \
-                         file://allow-gcc.patch;patch=1 "
-SRC_URI_append_mtx-2 = " file://mips-abio32.patch;patch=1 \
-                         file://allow-gcc.patch;patch=1 "
+SRC_URI_append_mtx-1 = " file://mips-abio32.patch \
+                         file://allow-gcc.patch "
+SRC_URI_append_mtx-2 = " file://mips-abio32.patch \
+                         file://allow-gcc.patch "
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.3+cvs20041128.bb b/recipes/glibc/glibc_2.3.3+cvs20041128.bb
index f52bb07643..b1e5509e16 100644
--- a/recipes/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/recipes/glibc/glibc_2.3.3+cvs20041128.bb
@@ -28,24 +28,24 @@ python __anonymous () {
                                    bb.data.getVar('TARGET_OS', d, 1))
 }
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
-	   file://arm-ioperm.patch;patch=1;pnum=0 \
-	   file://ldd.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://arm-memcpy.patch;patch=1;pnum=0 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+	   file://arm-ioperm.patch;striplevel=0 \
+	   file://ldd.patch;striplevel=0 \
+	   file://fhs-linux-paths.patch \
+	   file://arm-no-hwcap.patch;striplevel=0 \
+	   file://arm-memcpy.patch;striplevel=0 \
+	   file://arm-longlong.patch;striplevel=0 \
+	   file://arm-machine-gmon.patch;striplevel=0 \
 	   \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.3+cvs20050221.bb b/recipes/glibc/glibc_2.3.3+cvs20050221.bb
index 34efe71ed5..3164a57b47 100644
--- a/recipes/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/recipes/glibc/glibc_2.3.3+cvs20050221.bb
@@ -12,25 +12,25 @@ DEFAULT_PREFERENCE_i686 = "0"
 DEFAULT_PREFERENCE_sh3 = "0"
 DEFAULT_PREFERENCE_sh4 = "0"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
-	   file://arm-ioperm.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://arm-memcpy.patch;patch=1;pnum=0 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
-	   file://trampoline.patch;patch=1;pnum=0 \
-	   file://dl-cache-libcmp.patch;patch=1 \
+	   file://arm-ioperm.patch;striplevel=0 \
+	   file://fhs-linux-paths.patch \
+	   file://arm-no-hwcap.patch;striplevel=0 \
+	   file://arm-memcpy.patch;striplevel=0 \
+	   file://arm-longlong.patch;striplevel=0 \
+	   file://arm-machine-gmon.patch;striplevel=0 \
+	   file://trampoline.patch;striplevel=0 \
+	   file://dl-cache-libcmp.patch \
 	   \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.3+cvs20050420.bb b/recipes/glibc/glibc_2.3.3+cvs20050420.bb
index 36b2c2cfd0..1169d4271e 100644
--- a/recipes/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/recipes/glibc/glibc_2.3.3+cvs20050420.bb
@@ -11,27 +11,27 @@ GLIBC_ADDONS ?= "linuxthreads"
 
 DEFAULT_PREFERENCE = "-1"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
-	   file://arm-ioperm.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://arm-memcpy.patch;patch=1;pnum=0 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
-	   file://trampoline.patch;patch=1;pnum=0 \
-	   file://eabi-patch-1;patch=1 \
-	   file://eabi-patch-2;patch=1 \
-	   file://eabi-patch-3;patch=1 \
-	   file://5090_all_stubs-rule-fix.patch;patch=1 \
+	   file://arm-ioperm.patch;striplevel=0 \
+	   file://fhs-linux-paths.patch \
+	   file://arm-no-hwcap.patch;striplevel=0 \
+	   file://arm-memcpy.patch;striplevel=0 \
+	   file://arm-longlong.patch;striplevel=0 \
+	   file://arm-machine-gmon.patch;striplevel=0 \
+	   file://trampoline.patch;striplevel=0 \
+	   file://eabi-patch-1;apply=yes \
+	   file://eabi-patch-2;apply=yes \
+	   file://eabi-patch-3;apply=yes \
+	   file://5090_all_stubs-rule-fix.patch \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.3.bb b/recipes/glibc/glibc_2.3.3.bb
index 3ca8b80ed9..6e0ed6bd68 100644
--- a/recipes/glibc/glibc_2.3.3.bb
+++ b/recipes/glibc/glibc_2.3.3.bb
@@ -49,10 +49,10 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz;name=archive \
 	   file://etc/ld.so.conf \
  	   file://generate-supported.mk"
 
-SRC_URI_append_mtx-1 = " file://mips-abio32.patch;patch=1 \
-                         file://allow-gcc.patch;patch=1 "
-SRC_URI_append_mtx-2 = " file://mips-abio32.patch;patch=1 \
-                         file://allow-gcc.patch;patch=1 "
+SRC_URI_append_mtx-1 = " file://mips-abio32.patch \
+                         file://allow-gcc.patch "
+SRC_URI_append_mtx-2 = " file://mips-abio32.patch \
+                         file://allow-gcc.patch "
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.5+cvs20050627.bb b/recipes/glibc/glibc_2.3.5+cvs20050627.bb
index 02970c47d5..212445390f 100644
--- a/recipes/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/recipes/glibc/glibc_2.3.5+cvs20050627.bb
@@ -30,39 +30,39 @@ python __anonymous () {
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
-#	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
+#	   file://arm-machine-gmon.patch;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;patch=1;pnum=0 \
-#	   file://ldd.patch;patch=1;pnum=0 \
+#	   file://arm-ioperm.patch;striplevel=0 \
+#	   file://ldd.patch;striplevel=0 \
 SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat.com__20050627.tar.gz;name=archive \
 	   http://familiar.handhelds.org/source/v0.8.3/stash_ports_sources.redhat.com__20050627.tar.gz;name=ports \
-	   file://arm-audit.patch;patch=1 \
-	   file://arm-audit2.patch;patch=1 \
-	   file://arm-no-hwcap.patch;patch=1 \
-	   file://arm-memcpy.patch;patch=1 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://dl-cache-libcmp.patch;patch=1 \
-	   file://ldsocache-varrun.patch;patch=1 \
-	   file://5090_all_stubs-rule-fix.patch;patch=1 \
-	   file://raise.patch;patch=1 \
-	   file://zecke-sane-readelf.patch;patch=1 \
-	   file://glibc-2.3.5-fix-weak-alias-arm.patch;patch=1 \
-	   file://glibc-2.3.5-fix-weak-alias-arm-2.patch;patch=1 \
+	   file://arm-audit.patch \
+	   file://arm-audit2.patch \
+	   file://arm-no-hwcap.patch \
+	   file://arm-memcpy.patch \
+	   file://arm-longlong.patch;striplevel=0 \
+	   file://fhs-linux-paths.patch \
+	   file://dl-cache-libcmp.patch \
+	   file://ldsocache-varrun.patch \
+	   file://5090_all_stubs-rule-fix.patch \
+	   file://raise.patch \
+	   file://zecke-sane-readelf.patch \
+	   file://glibc-2.3.5-fix-weak-alias-arm.patch \
+	   file://glibc-2.3.5-fix-weak-alias-arm-2.patch \
 	   file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
-SRC_URI_append_armeb = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch"
+SRC_URI_append_armeb = " file://dyn-ldconfig-20041128.patch"
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1 \
-                       file://superh-fcntl.patch;patch=1;pnum=0"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1 \
-                       file://superh-fcntl.patch;patch=1;pnum=0"
+SRC_URI_append_sh3 = " file://no-z-defs.patch \
+                       file://superh-fcntl.patch;striplevel=0"
+SRC_URI_append_sh4 = " file://no-z-defs.patch \
+                       file://superh-fcntl.patch;striplevel=0"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.6.bb b/recipes/glibc/glibc_2.3.6.bb
index ea0fd9c2c3..a2b2953222 100644
--- a/recipes/glibc/glibc_2.3.6.bb
+++ b/recipes/glibc/glibc_2.3.6.bb
@@ -4,29 +4,29 @@ PR = "${INC_PR}.0"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
-#           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-cygwin.patch;patch=1
+#           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-cygwin.patch
 
 CROSSTOOL_PATCH_URL = "http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/"
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
            ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.bz2;name=linuxthreads \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-sh-lowlevellock.patch;patch=1;name=crosspatch1 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-sh-memset.patch;patch=1;name=crosspatch2 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-arm.patch;patch=1;name=crosspatch3 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-elf.patch;patch=1;name=crosspatch4 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-configure-apple-as.patch;patch=1;name=crosspatch5 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-fix-pr631.patch;patch=1;name=crosspatch6 \
-           ${CROSSTOOL_PATCH_URL}glibc-fp-byteorder.patch;patch=1;name=crosspatch7 \
-           ${CROSSTOOL_PATCH_URL}glibc-mips-bootstrap-gcc-header-install.patch;patch=1;name=crosspatch8 \
-           ${CROSSTOOL_PATCH_URL}arm-ctl_bus_isa.patch;patch=1;name=crosspatch9 \
-           ${CROSSTOOL_PATCH_URL}make-install-lib-all.patch;patch=1;name=crosspatch10 \
-           ${CROSSTOOL_PATCH_URL}maybe/glibc-2.3.6-allow-gcc-4.0-powerpc32.patch;patch=1;name=crosspatch11 \
-           file://glibc-2.3.6-bind-already-defined-on-powerpc.patch;patch=1 \
-           file://glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch;patch=1 \
-           file://glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch;patch=1 \
-           file://late-install-loop-break.patch;patch=1 \
-           file://glibc-arm-socket-weakalias.patch;patch=1 \
-           file://glibc-2.3.6-linuxthreads-pthread-raise.patch;patch=1 \
-           file://glibc-cross_sunrpc.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-sh-lowlevellock.patch;name=crosspatch1 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-sh-memset.patch;name=crosspatch2 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-arm.patch;name=crosspatch3 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-elf.patch;name=crosspatch4 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-configure-apple-as.patch;name=crosspatch5 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-fix-pr631.patch;name=crosspatch6 \
+           ${CROSSTOOL_PATCH_URL}glibc-fp-byteorder.patch;name=crosspatch7 \
+           ${CROSSTOOL_PATCH_URL}glibc-mips-bootstrap-gcc-header-install.patch;name=crosspatch8 \
+           ${CROSSTOOL_PATCH_URL}arm-ctl_bus_isa.patch;name=crosspatch9 \
+           ${CROSSTOOL_PATCH_URL}make-install-lib-all.patch;name=crosspatch10 \
+           ${CROSSTOOL_PATCH_URL}maybe/glibc-2.3.6-allow-gcc-4.0-powerpc32.patch;name=crosspatch11 \
+           file://glibc-2.3.6-bind-already-defined-on-powerpc.patch \
+           file://glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch \
+           file://glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch \
+           file://late-install-loop-break.patch \
+           file://glibc-arm-socket-weakalias.patch \
+           file://glibc-2.3.6-linuxthreads-pthread-raise.patch \
+           file://glibc-cross_sunrpc.patch \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
@@ -86,10 +86,6 @@ do_compile () {
 	)
 }
 
-do_stage_prepend() {
-	( cd ${S} ; patch -p1 < ${WORKDIR}/late-install-loop-break.patch )
-}
-
 require glibc-stage.inc
 
 require glibc-package.inc
diff --git a/recipes/glibc/glibc_2.4.bb b/recipes/glibc/glibc_2.4.bb
index 2f255a65fe..cba0fb3492 100644
--- a/recipes/glibc/glibc_2.4.bb
+++ b/recipes/glibc/glibc_2.4.bb
@@ -36,26 +36,26 @@ python __anonymous () {
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
-#	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
+#	   file://arm-machine-gmon.patch;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;patch=1;pnum=0 \
-#	   file://ldd.patch;patch=1;pnum=0 \
+#	   file://arm-ioperm.patch;striplevel=0 \
+#	   file://ldd.patch;striplevel=0 \
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.4.tar.bz2;name=archive \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.4.tar.bz2;name=ports \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.4.tar.bz2;name=libidn \
-           file://arm-memcpy.patch;patch=1 \
-           file://arm-longlong.patch;patch=1 \
-           file://fhs-linux-paths.patch;patch=1 \
-           file://dl-cache-libcmp.patch;patch=1 \
-           file://ldsocache-varrun.patch;patch=1 \
-           file://nptl-crosscompile.patch;patch=1 \
-	   file://glibc-2.4-compile.patch;patch=1 \
-	   file://glibc-2.4-openat-3.patch;patch=1 \
-	   file://fixup-aeabi-syscalls.patch;patch=1 \
-	   file://zecke-sane-readelf.patch;patch=1 \
-	   file://arm_eabi_ipc_fix.patch;patch=1 \
+           file://arm-memcpy.patch \
+           file://arm-longlong.patch \
+           file://fhs-linux-paths.patch \
+           file://dl-cache-libcmp.patch \
+           file://ldsocache-varrun.patch \
+           file://nptl-crosscompile.patch \
+	   file://glibc-2.4-compile.patch \
+	   file://glibc-2.4-openat-3.patch \
+	   file://fixup-aeabi-syscalls.patch \
+	   file://zecke-sane-readelf.patch \
+	   file://arm_eabi_ipc_fix.patch \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
@@ -65,8 +65,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.4.tar.bz2;name=archive \
 
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch"
+SRC_URI_append_sh4 = " file://no-z-defs.patch"
 
 S = "${WORKDIR}/glibc-2.4"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.5.bb b/recipes/glibc/glibc_2.5.bb
index 21a2ae748e..06b813d895 100644
--- a/recipes/glibc/glibc_2.5.bb
+++ b/recipes/glibc/glibc_2.5.bb
@@ -38,18 +38,18 @@ SRC_URI = "\
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2;name=ports \
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2;name=libidn \
-  file://arm-memcpy.patch;patch=1 \
-  file://arm-longlong.patch;patch=1 \
-  file://fhs-linux-paths.patch;patch=1 \
-  file://dl-cache-libcmp.patch;patch=1 \
-  file://ldsocache-varrun.patch;patch=1 \
-  file://nptl-crosscompile.patch;patch=1 \
-  file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \
-  file://glibc-check_pf.patch;patch=1;pnum=0 \
-  file://zecke-sane-readelf.patch;patch=1 \
-  file://ldd-unbash.patch;patch=1 \
-  file://glibc-2.6.1-use-short-for-fnstsw.patch;patch=1 \
-  file://glibc-arm-no-asm-page.patch;patch=1 \
+  file://arm-memcpy.patch \
+  file://arm-longlong.patch \
+  file://fhs-linux-paths.patch \
+  file://dl-cache-libcmp.patch \
+  file://ldsocache-varrun.patch \
+  file://nptl-crosscompile.patch \
+  file://glibc-2.5-local-dynamic-resolvconf.patch;striplevel=0 \
+  file://glibc-check_pf.patch;striplevel=0 \
+  file://zecke-sane-readelf.patch \
+  file://ldd-unbash.patch \
+  file://glibc-2.6.1-use-short-for-fnstsw.patch \
+  file://glibc-arm-no-asm-page.patch \
   file://generic-bits_select.h \
   file://generic-bits_types.h \
   file://generic-bits_typesizes.h \
@@ -59,16 +59,16 @@ SRC_URI = "\
 "
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch"
+SRC_URI_append_sh4 = " file://no-z-defs.patch"
 
 # Powerpc patches to add support for soft-float
-SRC_URI_append_powerpc = " file://ppc-sfp-machine.patch;patch=1 \
-                           file://ppc-soft-fp-20070115.patch;patch=1 \
-                           file://ppc-ld-nofpu-20070104.patch;patch=1 \
-                           file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \
-                           file://powerpc-sqrt-hack.diff;patch=1 \
-                           file://glibc-2.5-soft-fp-separate-strong-alias.patch;patch=1"
+SRC_URI_append_powerpc = " file://ppc-sfp-machine.patch \
+                           file://ppc-soft-fp-20070115.patch \
+                           file://ppc-ld-nofpu-20070104.patch \
+                           file://ppc-ports-ld-nofpu-20070114.patch \
+                           file://powerpc-sqrt-hack.diff \
+                           file://glibc-2.5-soft-fp-separate-strong-alias.patch"
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.6.1.bb b/recipes/glibc/glibc_2.6.1.bb
index 86e6dca9b6..8acfeffad9 100644
--- a/recipes/glibc/glibc_2.6.1.bb
+++ b/recipes/glibc/glibc_2.6.1.bb
@@ -37,46 +37,46 @@ SRC_URI = "\
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2;name=ports \
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2;name=libidn \
-  file://arm-memcpy.patch;patch=1 \
-  file://arm-longlong.patch;patch=1 \
-  file://fhs-linux-paths.patch;patch=1 \
-  file://dl-cache-libcmp.patch;patch=1 \
-  file://nptl-crosscompile.patch;patch=1 \
-  file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \
-  file://glibc-check_pf.patch;patch=1;pnum=0 \
-  file://zecke-sane-readelf.patch;patch=1 \
-  file://ldd-unbash.patch;patch=1 \
+  file://arm-memcpy.patch \
+  file://arm-longlong.patch \
+  file://fhs-linux-paths.patch \
+  file://dl-cache-libcmp.patch \
+  file://nptl-crosscompile.patch \
+  file://glibc-2.5-local-dynamic-resolvconf.patch;striplevel=0 \
+  file://glibc-check_pf.patch;striplevel=0 \
+  file://zecke-sane-readelf.patch \
+  file://ldd-unbash.patch \
   file://generic-bits_select.h \
   file://generic-bits_types.h \
   file://generic-bits_typesizes.h \
   file://generic-bits_time.h \
   file://etc/ld.so.conf \
   file://generate-supported.mk \
-  file://glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch;patch=1 \
-  file://glibc-2.6.1-use-short-for-fnstsw.patch;patch=1 \
-  file://glibc-use-isystem-include-fixed.patch;patch=1 \
-  file://glibc-arm-no-asm-page.patch;patch=1 \
-  file://armv4t-interworking.patch;patch=1 \
-  file://march-i686.patch;patch=1;pnum=0 \
+  file://glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch \
+  file://glibc-2.6.1-use-short-for-fnstsw.patch \
+  file://glibc-use-isystem-include-fixed.patch \
+  file://glibc-arm-no-asm-page.patch \
+  file://armv4t-interworking.patch \
+  file://march-i686.patch;striplevel=0 \
 "
 
 SRC_URI_append_ep9312 = "\
-  file://glibc-crunch-endian-littleword-littlebyte.patch;patch=1 \
-  file://glibc-crunch-eabi-setjmp_longjmp.patch;patch=1 \
-  file://glibc-crunch-eabi-unwind.patch;patch=1 \
-  file://glibc-crunch-eabi.patch;patch=1 \
-  file://glibc-crunch-eabi-force.patch;patch=1 \
-  file://glibc-crunch-eabi-fraiseexcpt.patch;patch=1 \
+  file://glibc-crunch-endian-littleword-littlebyte.patch \
+  file://glibc-crunch-eabi-setjmp_longjmp.patch \
+  file://glibc-crunch-eabi-unwind.patch \
+  file://glibc-crunch-eabi.patch \
+  file://glibc-crunch-eabi-force.patch \
+  file://glibc-crunch-eabi-fraiseexcpt.patch \
 "
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch"
+SRC_URI_append_sh4 = " file://no-z-defs.patch"
 
 # PowerPC Patches to add support for soft-float
 SRC_URI_append_powerpc = "\
-  file://powerpc-sqrt-hack.diff;patch=1 \
-  file://glibc-2.6.1-powerpc-nofpu.patch;patch=1 \
+  file://powerpc-sqrt-hack.diff \
+  file://glibc-2.6.1-powerpc-nofpu.patch \
 "
 
 S = "${WORKDIR}/glibc-${PV}"
diff --git a/recipes/glibc/glibc_2.7.bb b/recipes/glibc/glibc_2.7.bb
index 56275f8b12..2f2fc364eb 100644
--- a/recipes/glibc/glibc_2.7.bb
+++ b/recipes/glibc/glibc_2.7.bb
@@ -36,48 +36,48 @@ python __anonymous () {
 
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
-#	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
+#	   file://arm-machine-gmon.patch;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;patch=1;pnum=0 \
-#	   file://ldd.patch;patch=1;pnum=0 \
+#	   file://arm-ioperm.patch;striplevel=0 \
+#	   file://ldd.patch;striplevel=0 \
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2;name=ports \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2;name=libidn \
-           file://arm-memcpy.patch;patch=1 \
-           file://arm-longlong.patch;patch=1 \
-           file://fhs-linux-paths.patch;patch=1 \
-           file://dl-cache-libcmp.patch;patch=1 \
-           file://ldsocache-varrun.patch;patch=1 \
-           file://nptl-crosscompile.patch;patch=1 \
-	   file://glibc-check_pf.patch;patch=1;pnum=0 \
-#	   file://glibc-2.4-compile.patch;patch=1 \
-#	   file://glibc-2.4-openat-3.patch;patch=1 \
-#	   file://fixup-aeabi-syscalls.patch;patch=1 \
-#	   file://zecke-sane-readelf.patch;patch=1 \
-           file://ldd-unbash.patch;patch=1 \
-	   file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
-	   file://all_glibc-i586-chk.patch;patch=1 \
-	   file://glibc-2.6.1-use-short-for-fnstsw.patch;patch=1 \
-           file://glibc-use-isystem-include-fixed.patch;patch=1 \
+           file://arm-memcpy.patch \
+           file://arm-longlong.patch \
+           file://fhs-linux-paths.patch \
+           file://dl-cache-libcmp.patch \
+           file://ldsocache-varrun.patch \
+           file://nptl-crosscompile.patch \
+	   file://glibc-check_pf.patch;striplevel=0 \
+#	   file://glibc-2.4-compile.patch \
+#	   file://glibc-2.4-openat-3.patch \
+#	   file://fixup-aeabi-syscalls.patch \
+#	   file://zecke-sane-readelf.patch \
+           file://ldd-unbash.patch \
+	   file://glibc-arm-IO-acquire-lock-fix.diff \
+	   file://all_glibc-i586-chk.patch \
+	   file://glibc-2.6.1-use-short-for-fnstsw.patch \
+           file://glibc-use-isystem-include-fixed.patch \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
 	   file://generic-bits_time.h \
            file://etc/ld.so.conf \
            file://generate-supported.mk \
-           file://march-i686.patch;patch=1;pnum=0 \
-	   file://glibc-arm-no-asm-page.patch;patch=1 \
+           file://march-i686.patch;striplevel=0 \
+	   file://glibc-arm-no-asm-page.patch \
            "
 
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch"
+SRC_URI_append_sh4 = " file://no-z-defs.patch"
 
 #powerpc patches to add support for soft-float
-SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;patch=1"
+SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff"
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb
index 43a4fcafaa..e7ab63d6d6 100644
--- a/recipes/glibc/glibc_2.9.bb
+++ b/recipes/glibc/glibc_2.9.bb
@@ -36,52 +36,52 @@ python __anonymous () {
 
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
-#	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
+#	   file://arm-machine-gmon.patch;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;patch=1;pnum=0 \
-#	   file://ldd.patch;patch=1;pnum=0 \
+#	   file://arm-ioperm.patch;striplevel=0 \
+#	   file://ldd.patch;striplevel=0 \
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2;name=ports \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2;name=libidn \
-	   file://nscd-init.patch;patch=1;pnum=0 \
-           file://arm-memcpy.patch;patch=1 \
-           file://arm-longlong.patch;patch=1 \
-           file://fhs-linux-paths.patch;patch=1 \
-           file://dl-cache-libcmp.patch;patch=1 \
-           file://ldsocache-varrun.patch;patch=1 \
-           file://nptl-crosscompile.patch;patch=1 \
-	   file://glibc-check_pf.patch;patch=1;pnum=0 \
-           file://ldd-unbash.patch;patch=1 \
-	   file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
+	   file://nscd-init.patch;striplevel=0 \
+           file://arm-memcpy.patch \
+           file://arm-longlong.patch \
+           file://fhs-linux-paths.patch \
+           file://dl-cache-libcmp.patch \
+           file://ldsocache-varrun.patch \
+           file://nptl-crosscompile.patch \
+	   file://glibc-check_pf.patch;striplevel=0 \
+           file://ldd-unbash.patch \
+	   file://glibc-arm-IO-acquire-lock-fix.diff \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
 	   file://generic-bits_time.h \
            file://etc/ld.so.conf \
            file://generate-supported.mk \
-           file://march-i686.patch;patch=1;pnum=0 \
-	   file://tls_i486.patch;patch=1 \
-	   file://glibc-2.9-use-_begin.patch;patch=1 \
-           file://arm-lowlevellock-include-tls.patch;patch=1 \
-           file://glibc-2.9-enable-binutils-2.2.patch;patch=1 \
+           file://march-i686.patch;striplevel=0 \
+	   file://tls_i486.patch \
+	   file://glibc-2.9-use-_begin.patch \
+           file://arm-lowlevellock-include-tls.patch \
+           file://glibc-2.9-enable-binutils-2.2.patch \
            "
 
 # patches to fix libmemusage.so
-SRC_URI_append = " file://0001-malloc-memusage.c-update_data-Fix-handling-of-wrappi.patch;patch=1 \
-                   file://0002-malloc-memusage.c-DEFAULT_BUFFER_SIZE-Change-to-3276.patch;patch=1 \
-                   file://0003-Fix-wrap-around-in-memusage.patch;patch=1 "
+SRC_URI_append = " file://0001-malloc-memusage.c-update_data-Fix-handling-of-wrappi.patch \
+                   file://0002-malloc-memusage.c-DEFAULT_BUFFER_SIZE-Change-to-3276.patch \
+                   file://0003-Fix-wrap-around-in-memusage.patch "
 
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1 \
-		file://glibc-2.9-sh-fix.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1 \
-		file://glibc-2.9-sh-fix.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch \
+		file://glibc-2.9-sh-fix.patch"
+SRC_URI_append_sh4 = " file://no-z-defs.patch \
+		file://glibc-2.9-sh-fix.patch"
 
 #powerpc patches to add support for soft-float
-SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;patch=1"
+SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff"
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_cvs.bb b/recipes/glibc/glibc_cvs.bb
index 22f48d29fc..1c7a785931 100644
--- a/recipes/glibc/glibc_cvs.bb
+++ b/recipes/glibc/glibc_cvs.bb
@@ -27,29 +27,29 @@ python __anonymous () {
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
-#	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-#	   file://arm-memcpy.patch;patch=1;pnum=0 \
-#	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
+#	   file://arm-no-hwcap.patch;striplevel=0 \
+#	   file://arm-memcpy.patch;striplevel=0 \
+#	   file://arm-machine-gmon.patch;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;patch=1;pnum=0 \
-#	   file://ldd.patch;patch=1;pnum=0 \
+#	   file://arm-ioperm.patch;striplevel=0 \
+#	   file://ldd.patch;striplevel=0 \
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \
 	   cvs://anoncvs@sources.redhat.com/cvs/glibc;module=ports \
-	   file://nscd-init.patch;patch=1;pnum=0 \
-	   file://arm-audit.patch;patch=1 \
-	   file://arm-audit2.patch;patch=1 \
-	   file://arm-memcpy.patch;patch=1 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://dl-cache-libcmp.patch;patch=1 \
-	   file://ldsocache-varrun.patch;patch=1 \
+	   file://nscd-init.patch;striplevel=0 \
+	   file://arm-audit.patch \
+	   file://arm-audit2.patch \
+	   file://arm-memcpy.patch \
+	   file://arm-longlong.patch;striplevel=0 \
+	   file://fhs-linux-paths.patch \
+	   file://dl-cache-libcmp.patch \
+	   file://ldsocache-varrun.patch \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibmm/glibmm_2.22.1.bb b/recipes/glibmm/glibmm_2.22.1.bb
index 888cc3eb39..2f76941745 100644
--- a/recipes/glibmm/glibmm_2.22.1.bb
+++ b/recipes/glibmm/glibmm_2.22.1.bb
@@ -2,7 +2,7 @@ require glibmm.inc
 
 DEPENDS += "mm-common"
 
-SRC_URI += " file://remove-examples.patch;patch=1"
+SRC_URI += " file://remove-examples.patch"
 
 PR = "r1"
 
diff --git a/recipes/glibmm/glibmm_2.24.0.bb b/recipes/glibmm/glibmm_2.24.0.bb
index 0de5ebf2f6..be5a885047 100644
--- a/recipes/glibmm/glibmm_2.24.0.bb
+++ b/recipes/glibmm/glibmm_2.24.0.bb
@@ -2,7 +2,7 @@ require glibmm.inc
 
 DEPENDS += "mm-common"
 
-SRC_URI += " file://remove-examples.patch;patch=1"
+SRC_URI += " file://remove-examples.patch"
 
 SRC_URI[archive.md5sum] = "58cec0c50bb079638265f3340565b421"
 SRC_URI[archive.sha256sum] = "ff93ec4e3c9c54d91e5ecc1b5dde0acceeeeb0e03d6031db8587b27a2f83743f"
diff --git a/recipes/gloox/gloox_0.8.9.bb b/recipes/gloox/gloox_0.8.9.bb
index a67bb614e7..8424d29fc2 100644
--- a/recipes/gloox/gloox_0.8.9.bb
+++ b/recipes/gloox/gloox_0.8.9.bb
@@ -9,7 +9,7 @@ DEPENDS = "iksemel libidn gnutls"
 inherit autotools pkgconfig
 
 SRC_URI = "http://camaya.net/download/${P}.tar.bz2 \
-	   file://gloox-fix-pc.diff;patch=1"
+	   file://gloox-fix-pc.diff"
 
 do_stage () {
 	autotools_stage_all
diff --git a/recipes/gmp/gmp.inc b/recipes/gmp/gmp.inc
index 67e5c49bda..601122360b 100644
--- a/recipes/gmp/gmp.inc
+++ b/recipes/gmp/gmp.inc
@@ -4,8 +4,8 @@ HOMEPAGE = "http://www.swox.com/gmp/"
 LICENSE = "GPL LGPL"
 
 SRC_URI = "${GNU_MIRROR}/gmp/gmp-${PV}.tar.bz2;name=gmp \
-	   file://configure.patch;patch=1 \
-	   file://amd64.patch;patch=1"
+	   file://configure.patch \
+	   file://amd64.patch"
 
 inherit autotools 
 
diff --git a/recipes/gmp/gmp_4.1.2.bb b/recipes/gmp/gmp_4.1.2.bb
index 19ad8f8eae..2b814ce596 100644
--- a/recipes/gmp/gmp_4.1.2.bb
+++ b/recipes/gmp/gmp_4.1.2.bb
@@ -1,5 +1,5 @@
 require gmp.inc
 
-SRC_URI += "file://gcc-compile.patch;patch=1"
+SRC_URI += "file://gcc-compile.patch"
 SRC_URI[gmp.md5sum] = "ed39b34dd14014cc504840776af5ba10"
 SRC_URI[gmp.sha256sum] = "51ba8551092510ef5c61798584f4cff054e0fbbe7c46fea2c8ff9ea9a52edcd1"
diff --git a/recipes/gmp/gmp_4.1.4.bb b/recipes/gmp/gmp_4.1.4.bb
index 03bc5127f1..18d8889167 100644
--- a/recipes/gmp/gmp_4.1.4.bb
+++ b/recipes/gmp/gmp_4.1.4.bb
@@ -2,6 +2,6 @@ require gmp.inc
 
 PR = "r1"
 
-SRC_URI += "file://sh4-asmfix.patch;patch=1"
+SRC_URI += "file://sh4-asmfix.patch"
 SRC_URI[gmp.md5sum] = "0aa7d3b3f5b5ec5951e7dddd6f65e891"
 SRC_URI[gmp.sha256sum] = "1a6ed0ea17b24ea8864c4df516d20c41fac97a448559ddee5a8477aeeecca1a3"
diff --git a/recipes/gmp/gmp_4.2.1.bb b/recipes/gmp/gmp_4.2.1.bb
index 85ed420c2b..8d1444d5dd 100644
--- a/recipes/gmp/gmp_4.2.1.bb
+++ b/recipes/gmp/gmp_4.2.1.bb
@@ -1,7 +1,7 @@
 PR = "r2"
 
-SRC_URI_append += "file://sh4-asmfix.patch;patch=1 \
-                   file://x86-fat.diff;patch=1;pnum=0 "
+SRC_URI_append += "file://sh4-asmfix.patch \
+                   file://x86-fat.diff;striplevel=0 "
 
 require gmp.inc
 
diff --git a/recipes/gmp/gmp_4.2.2.bb b/recipes/gmp/gmp_4.2.2.bb
index 540dbed80a..c8c1d68b3c 100644
--- a/recipes/gmp/gmp_4.2.2.bb
+++ b/recipes/gmp/gmp_4.2.2.bb
@@ -1,9 +1,9 @@
 PR = "r1"
 
-SRC_URI_append += "file://02_noexec-stack.diff;patch=1 \
-		   file://03_gnu89-inline.diff;patch=1 \
-		   file://mpf_set_str_c.diff;patch=1 \
-		   file://sh4-asmfix.patch;patch=1 \
+SRC_URI_append += "file://02_noexec-stack.diff \
+		   file://03_gnu89-inline.diff \
+		   file://mpf_set_str_c.diff \
+		   file://sh4-asmfix.patch \
 		  "
 require gmp.inc
 
diff --git a/recipes/gmp/gmp_4.2.4.bb b/recipes/gmp/gmp_4.2.4.bb
index c01c7058b4..963a4622a2 100644
--- a/recipes/gmp/gmp_4.2.4.bb
+++ b/recipes/gmp/gmp_4.2.4.bb
@@ -1,9 +1,9 @@
 INC_PR = "r0"
 PR = "${INC_PR}.5"
 
-SRC_URI_append += "file://sh4-asmfix.patch;patch=1 \
-                   file://use-includedir.patch;patch=1 \
-                   file://dont_use_mips_h_constraint.patch;patch=1 \
+SRC_URI_append += "file://sh4-asmfix.patch \
+                   file://use-includedir.patch \
+                   file://dont_use_mips_h_constraint.patch \
 		  "
 require gmp.inc
 LICENSE = "GPLv3 LGPLv3"
diff --git a/recipes/gnash/gnash-fb_0.8.5.bb b/recipes/gnash/gnash-fb_0.8.5.bb
index a92b1e9664..fecb3a0ce6 100644
--- a/recipes/gnash/gnash-fb_0.8.5.bb
+++ b/recipes/gnash/gnash-fb_0.8.5.bb
@@ -7,7 +7,7 @@ acpaths = " -Imacros"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 
-SRC_URI += "file://gnash-glib-dependency.patch;patch=1"
+SRC_URI += "file://gnash-glib-dependency.patch"
 
 S = "${WORKDIR}/gnash-${PV}"
 
diff --git a/recipes/gnash/gnash-minimal_0.8.3.bb b/recipes/gnash/gnash-minimal_0.8.3.bb
index 5852388867..f769996a2c 100644
--- a/recipes/gnash/gnash-minimal_0.8.3.bb
+++ b/recipes/gnash/gnash-minimal_0.8.3.bb
@@ -7,7 +7,7 @@ EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-lib=${STAGING_LIBDIR} \
 "
 
-SRC_URI += "file://libtool-2.2.patch;patch=1 file://libintl.patch;patch=1"
+SRC_URI += "file://libtool-2.2.patch file://libintl.patch"
 
 
 
diff --git a/recipes/gnash/gnash-minimal_cvs.bb b/recipes/gnash/gnash-minimal_cvs.bb
index e1eff37b88..fcef623060 100644
--- a/recipes/gnash/gnash-minimal_cvs.bb
+++ b/recipes/gnash/gnash-minimal_cvs.bb
@@ -6,9 +6,9 @@ PR = "r4"
 PV = "0.8.3+cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash"
-SRC_URI += "file://libtool-2.2.patch;patch=1 \
-            file://libintl.patch;patch=1 \
-            file://fix-trunc.diff;patch=1"
+SRC_URI += "file://libtool-2.2.patch \
+            file://libintl.patch \
+            file://fix-trunc.diff"
 
 S = ${WORKDIR}/gnash
 
diff --git a/recipes/gnash/gnash_0.8.3.bb b/recipes/gnash/gnash_0.8.3.bb
index ccb8f28723..f3bb166b4e 100644
--- a/recipes/gnash/gnash_0.8.3.bb
+++ b/recipes/gnash/gnash_0.8.3.bb
@@ -7,7 +7,7 @@ EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-lib=${STAGING_LIBDIR} \
 "
 
-SRC_URI += "file://libtool-2.2.patch;patch=1"
+SRC_URI += "file://libtool-2.2.patch"
 
 
 SRC_URI[md5sum] = "5033ef2602ea1234a9ccb73000a0dedb"
diff --git a/recipes/gnash/gnash_0.8.7.bb b/recipes/gnash/gnash_0.8.7.bb
new file mode 100644
index 0000000000..2926fa7e88
--- /dev/null
+++ b/recipes/gnash/gnash_0.8.7.bb
@@ -0,0 +1,55 @@
+DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v8 features"
+HOMEPAGE = "http://www.gnu.org/software/gnash"
+LICENSE = "GPLv3"
+DEPENDS = "giflib cairo libtool gtk+ agg libsdl-mixer zlib boost jpeg pango curl freetype \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg', d)} speex"
+DEPENDS += "gst-plugins-base"
+          
+PR = "r0"
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/gnash/0.8.7/gnash-0.8.7.tar.bz2"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-gui=gtk \
+                --enable-renderer=agg \
+                ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-media=ffmpeg', d)} \
+                --with-plugins-install=system \
+		--enable-plugins \
+                --disable-dependency-tracking \
+                --disable-testsuite \
+                --enable-media=ffmpeg \
+                --with-speex-incl=${STAGING_INCDIR}/speex \
+		--with-cairo-incl=${STAGING_INCDIR}/cairo \
+                --with-cairo-lib=${STAGING_LIBDIR} \
+                --with-jpeg-incl=${STAGING_INCDIR} \
+                --with-jpeg-lib=${STAGING_LIBDIR} \
+                --with-top-level=${STAGING_DIR_HOST}/usr \
+		--disable-avm2 \
+		"
+
+PACKAGES =+ " gnash-browser-plugin libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
+
+FILES_gnash-browser-plugin= "${libdir}/mozilla/plugins/*"
+FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so"
+FILES_libgnashbackend = "${libdir}/gnash/libgnashbackend-${PV}.so"
+FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so"
+FILES_libgnashgeo = "${libdir}/gnash/libgnashgeo-${PV}.so"
+FILES_libgnashgui = "${libdir}/gnash/libgnashgui-${PV}.so"
+FILES_libgnashplayer = "${libdir}/gnash/libgnashplayer-${PV}.so"
+FILES_libgnashserver = "${libdir}/gnash/libgnashserver-${PV}.so"
+
+RDEPENDS_${PN}-browser-plugin += "${PN}"
+
+acpaths = " -Imacros"
+
+# Boost lacks defines for lots of archs
+TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
+
+
+do_install_append() {
+	oe_runmake DESTDIR=${D} install-plugin
+}
+
+SRC_URI[md5sum] = "039533fec46e46b94ac6b04e33d58f3a"
+SRC_URI[sha256sum] = "73b8a7c788511e453add26fd68cebd5818b39f9da21cc7c78e9cef8bc837e896"
diff --git a/recipes/gnet/gnet_cvs.bb b/recipes/gnet/gnet_cvs.bb
index b36df17c18..93a257c963 100644
--- a/recipes/gnet/gnet_cvs.bb
+++ b/recipes/gnet/gnet_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "glib-2.0"
 PV = "2.0.7+cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gnet \
-           file://buildfix.patch;patch=1"
+           file://buildfix.patch"
 S = "${WORKDIR}/gnet"
 
 EXTRA_OECONF =	"--disable-pthreads"
diff --git a/recipes/gnet/gnet_svn.bb b/recipes/gnet/gnet_svn.bb
index 8132ab51c4..102cb97f79 100644
--- a/recipes/gnet/gnet_svn.bb
+++ b/recipes/gnet/gnet_svn.bb
@@ -8,9 +8,9 @@ PV = "2.0.7+svnr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk;proto=http \
-           file://buildfix.patch;patch=1 \
-           file://configure_fix.patch;patch=1 \
-           file://pkgconfig_fix.patch;patch=1 "
+           file://buildfix.patch \
+           file://configure_fix.patch \
+           file://pkgconfig_fix.patch "
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/gnokii/gnokii_0.6.14.bb b/recipes/gnokii/gnokii_0.6.14.bb
index 75841ae1d0..569d9a2b59 100644
--- a/recipes/gnokii/gnokii_0.6.14.bb
+++ b/recipes/gnokii/gnokii_0.6.14.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DESCRIPTION = "Cellphone tools and driver software"
 SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2 \
-	file://configure.patch;patch=1"
+	file://configure.patch"
 
 DEPENDS = "libxpm gtk+"
 
diff --git a/recipes/gnokii/gnokii_0.6.4.bb b/recipes/gnokii/gnokii_0.6.4.bb
index fc884a8023..23899806e6 100644
--- a/recipes/gnokii/gnokii_0.6.4.bb
+++ b/recipes/gnokii/gnokii_0.6.4.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DESCRIPTION = "Cellphone tools and driver software"
 SRC_URI = "http://www.gnokii.org/download/gnokii/0.6.x/gnokii-${PV}.tar.bz2 \
-	file://configure.patch;patch=1"
+	file://configure.patch"
 
 DEPENDS = "libxpm"
 
diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
index ccd608e328..932d6e98eb 100644
--- a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
+++ b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
@@ -9,7 +9,7 @@ PR = "r8"
 inherit autotools
 
 SRC_URI = "http://gecko-mediaplayer.googlecode.com/files/${P}.tar.gz \
-           file://gecko-mplayer-svn.diff;patch=1;pnum=0 \
+           file://gecko-mplayer-svn.diff;striplevel=0 \
            file://extensions \
 "
 
diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_svn.bb b/recipes/gnome-mplayer/gecko-mediaplayer_svn.bb
index b5c2a48c0f..1bae6fa403 100644
--- a/recipes/gnome-mplayer/gecko-mediaplayer_svn.bb
+++ b/recipes/gnome-mplayer/gecko-mediaplayer_svn.bb
@@ -5,7 +5,7 @@ DEPENDS = "firefox gtk+ gconf dbus-glib"
 RDEPENDS = "firefox gnome-mplayer"
 
 PV = "0.9.9.2+${SRCPV}"
-SRCREV = "385"
+SRCREV = "387"
 
 inherit autotools
 
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
index 9169fbc6e0..32215aa299 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
@@ -1,7 +1,7 @@
 require gnome-mplayer.inc
 
-SRC_URI += "file://gnome-mplayer-svn.diff;patch=1;pnum=0 \
-            file://default.patch;patch=1 \
+SRC_URI += "file://gnome-mplayer-svn.diff;striplevel=0 \
+            file://default.patch \
 "
 
 PR = "${INC_PR}.0"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.9.2.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.9.2.bb
index 834b15442c..8dd85cec7f 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_0.9.9.2.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.9.2.bb
@@ -1,6 +1,6 @@
 require gnome-mplayer.inc
 
-SRC_URI += "file://default.patch;patch=1 \
+SRC_URI += "file://default.patch \
 "
 
 SRC_URI[gnomemplayer.md5sum] = "79810913d245755b60c27d37e1d1f178"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.9.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.9.bb
index 556a9a3cb8..b52c01f930 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_0.9.9.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.9.bb
@@ -1,6 +1,6 @@
 require gnome-mplayer.inc
 
-SRC_URI += "file://default.patch;patch=1 \
+SRC_URI += "file://default.patch \
 "
 
 SRC_URI[gnomemplayer.md5sum] = "335918da07a62941778444e126ae5ede"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_svn.bb b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
index 97ed70e896..77b121a237 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_svn.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
@@ -6,7 +6,7 @@ PR = "${INC_PR}.0"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://gnome-mplayer.googlecode.com/svn/;module=trunk;proto=http \
-           file://default.patch;patch=1 \
+           file://default.patch \
 "
 
 # Untested
diff --git a/recipes/gnome/epiphany_2.21.92.bb b/recipes/gnome/epiphany_2.21.92.bb
index 493f21437a..b9c66911e9 100644
--- a/recipes/gnome/epiphany_2.21.92.bb
+++ b/recipes/gnome/epiphany_2.21.92.bb
@@ -5,7 +5,7 @@ PR ="r2"
 
 inherit gnome
 
-SRC_URI_append = " file://file_contains.patch;patch=1"
+SRC_URI_append = " file://file_contains.patch"
 
 EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
 
diff --git a/recipes/gnome/gconf_2.28.0.bb b/recipes/gnome/gconf_2.28.0.bb
index 225302bbf4..e0aaffed7a 100644
--- a/recipes/gnome/gconf_2.28.0.bb
+++ b/recipes/gnome/gconf_2.28.0.bb
@@ -10,6 +10,10 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.28/GConf-${PV}.tar.bz2
 SRC_URI[archive.md5sum] = "ad2aeb9c7d906b274954c51a615caeac"
 SRC_URI[archive.sha256sum] = "d057dcfe2bfb2a80e592349c2a78d7dce12d19542aeced466c64fb701c806ac8"
 
+PR="r1"
+
+RDEPENDS += "dbus-x11"
+
 EXTRA_OECONF = " --without-openldap --disable-gtk-doc --enable-gtk POLKIT_POLICY_FILE_VALIDATE=true"
 
 inherit autotools gettext
diff --git a/recipes/gnome/gconf_2.6.1.bb b/recipes/gnome/gconf_2.6.1.bb
index 7c4adde966..da112f7666 100644
--- a/recipes/gnome/gconf_2.6.1.bb
+++ b/recipes/gnome/gconf_2.6.1.bb
@@ -8,7 +8,7 @@ PR = "r2"
 S = "${WORKDIR}/GConf-${PV}"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
-	   file://backends.patch;patch=1"
+	   file://backends.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/gdm_2.14.9.bb b/recipes/gnome/gdm_2.14.9.bb
index 66ca994748..85bc216a6a 100644
--- a/recipes/gnome/gdm_2.14.9.bb
+++ b/recipes/gnome/gdm_2.14.9.bb
@@ -5,7 +5,7 @@ DEPENDS = "gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-l
 
 inherit gnome
 
-SRC_URI += "file://gdm-nodocs.patch;patch=1"
+SRC_URI += "file://gdm-nodocs.patch"
 
 FILES_${PN} += "${datadir}/icon* \
 		${datadir}/xsession*"
diff --git a/recipes/gnome/gdm_2.24.1.bb b/recipes/gnome/gdm_2.24.1.bb
index 3bb6b8c2e2..0c6050d63c 100644
--- a/recipes/gnome/gdm_2.24.1.bb
+++ b/recipes/gnome/gdm_2.24.1.bb
@@ -7,7 +7,7 @@ PR = "r3"
 
 inherit gnome update-rc.d
 
-SRC_URI += "file://cross-xdetection.diff;patch=1 \
+SRC_URI += "file://cross-xdetection.diff \
             file://%gconf-tree.xml \
             file://gdm.conf \
             file://gdm \
diff --git a/recipes/gnome/gdm_2.26.1.bb b/recipes/gnome/gdm_2.26.1.bb
index 686ce4051d..40d9c36a0b 100644
--- a/recipes/gnome/gdm_2.26.1.bb
+++ b/recipes/gnome/gdm_2.26.1.bb
@@ -8,8 +8,8 @@ PR = "r1"
 inherit gnome update-rc.d
 
 SRC_URI += " \
-            file://cross-xdetection.diff;patch=1 \
-            file://gdm-xklavier.patch;patch=1 \
+            file://cross-xdetection.diff \
+            file://gdm-xklavier.patch \
             file://%gconf-tree.xml \
             file://gdm \
             file://gdm.conf \
diff --git a/recipes/gnome/gdm_2.28.2.bb b/recipes/gnome/gdm_2.28.2.bb
index a1406d3174..0fb6883b5f 100644
--- a/recipes/gnome/gdm_2.28.2.bb
+++ b/recipes/gnome/gdm_2.28.2.bb
@@ -8,7 +8,7 @@ inherit gnome update-rc.d
 RDEPENDS_${PN} += "grep dbus-x11 shadow libpam-base-files"
 
 SRC_URI += " \
-            file://cross-xdetection.diff;patch=1 \
+            file://cross-xdetection.diff \
             file://%gconf-tree.xml \
             file://gdm \
             file://gdm.conf \
diff --git a/recipes/gnome/gdm_2.30.0.bb b/recipes/gnome/gdm_2.30.0.bb
index c461d86cde..7352bf3e1f 100644
--- a/recipes/gnome/gdm_2.30.0.bb
+++ b/recipes/gnome/gdm_2.30.0.bb
@@ -8,7 +8,7 @@ inherit gnome update-rc.d
 RDEPENDS_${PN} += "grep dbus-x11 shadow libpam-base-files"
 
 SRC_URI += " \
-            file://cross-xdetection.diff;patch=1 \
+            file://cross-xdetection.diff \
             file://%gconf-tree.xml \
             file://gdm \
             file://gdm.conf \
diff --git a/recipes/gnome/gnome-common.inc b/recipes/gnome/gnome-common.inc
index 5a1e2072e2..826052fcb3 100644
--- a/recipes/gnome/gnome-common.inc
+++ b/recipes/gnome/gnome-common.inc
@@ -7,7 +7,7 @@ inherit gnomebase
 # The omf.make file failed if scrollkeeper doesn't happen to be
 # installed
 
-SRC_URI += "file://omf.patch;patch=1"
+SRC_URI += "file://omf.patch"
 
 EXTRA_AUTORECONF = ""
 DEPENDS = ""
diff --git a/recipes/gnome/gnome-desktop_2.16.1.bb b/recipes/gnome/gnome-desktop_2.16.1.bb
index bb45742b26..f036475627 100644
--- a/recipes/gnome/gnome-desktop_2.16.1.bb
+++ b/recipes/gnome/gnome-desktop_2.16.1.bb
@@ -5,8 +5,8 @@ inherit gnome pkgconfig
 
 DEPENDS += "gnome-doc-utils"
 
-SRC_URI += "file://scrollkeeper.patch;patch=1 \
-            file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://scrollkeeper.patch \
+            file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "e92edb17cd75faca45a4fe2d6806bdd8"
 SRC_URI[archive.sha256sum] = "56c7dbe56e6a9fbcd3730c55892734a9daff23a86d69f49a381a4c965732f9d1"
diff --git a/recipes/gnome/gnome-desktop_2.18.3.bb b/recipes/gnome/gnome-desktop_2.18.3.bb
index 221a25f071..fb30071cc8 100644
--- a/recipes/gnome/gnome-desktop_2.18.3.bb
+++ b/recipes/gnome/gnome-desktop_2.18.3.bb
@@ -6,8 +6,8 @@ inherit gnome pkgconfig
 
 DEPENDS += "gnome-doc-utils gnome-vfs"
 
-SRC_URI += "file://scrollkeeper.patch;patch=1 \
-            file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://scrollkeeper.patch \
+            file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "98de3b7d0da690da8b94cddc74f3914b"
 SRC_URI[archive.sha256sum] = "8997a2ceca2dbb28fb402e23ea5f255b68c59ea4f932b253e2843bfe62af7c64"
diff --git a/recipes/gnome/gnome-desktop_2.22.2.bb b/recipes/gnome/gnome-desktop_2.22.2.bb
index 5c24a51ac7..ec3cf2313b 100644
--- a/recipes/gnome/gnome-desktop_2.22.2.bb
+++ b/recipes/gnome/gnome-desktop_2.22.2.bb
@@ -4,8 +4,8 @@ inherit gnome pkgconfig
 
 DEPENDS += "gnome-doc-utils gnome-vfs"
 
-SRC_URI += "file://scrollkeeper.patch;patch=1 \
-            file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://scrollkeeper.patch \
+            file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "6d6271cfa135ce016126414d929b8fb7"
 SRC_URI[archive.sha256sum] = "4bd3141b2c668b24b43ac10a7a7040ce0717d8f088aee8a93ef261e446d88818"
diff --git a/recipes/gnome/gnome-desktop_2.24.0.bb b/recipes/gnome/gnome-desktop_2.24.0.bb
index 78e1f070e5..d1959b1365 100644
--- a/recipes/gnome/gnome-desktop_2.24.0.bb
+++ b/recipes/gnome/gnome-desktop_2.24.0.bb
@@ -4,8 +4,8 @@ inherit gnome pkgconfig
 
 DEPENDS += "gnome-doc-utils gnome-vfs libxrandr"
 
-SRC_URI += "file://scrollkeeper.patch;patch=1 \
-            file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://scrollkeeper.patch \
+            file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "a2cc0424619f271bf1a65cc0fbe782f0"
 SRC_URI[archive.sha256sum] = "7ebe5b0c2bb296386f1d62c3a5d30ed50e353c8d9dc390b77e0b5fdf56e4dad9"
diff --git a/recipes/gnome/gnome-desktop_2.26.0.bb b/recipes/gnome/gnome-desktop_2.26.0.bb
index ed66640c38..28e063a117 100644
--- a/recipes/gnome/gnome-desktop_2.26.0.bb
+++ b/recipes/gnome/gnome-desktop_2.26.0.bb
@@ -5,7 +5,7 @@ inherit gnome pkgconfig
 DEPENDS += "gnome-doc-utils gnome-vfs libxrandr"
 
 SRC_URI += " \
-            file://no-desktop-docs.patch;patch=1;pnum=0"
+            file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "796fc830e0baff24381809a7abe012f8"
 SRC_URI[archive.sha256sum] = "3b3fe18bc30ad60f1bbbb2bc2d2ec14a2f9babb9312eb4834395b5839b7d7ee9"
diff --git a/recipes/gnome/gnome-desktop_2.28.0.bb b/recipes/gnome/gnome-desktop_2.28.0.bb
index 5f74ab9505..9a99d27d83 100644
--- a/recipes/gnome/gnome-desktop_2.28.0.bb
+++ b/recipes/gnome/gnome-desktop_2.28.0.bb
@@ -5,7 +5,7 @@ inherit gnome pkgconfig
 DEPENDS += "gnome-doc-utils gnome-vfs libxrandr"
 
 # FIXME: docs build requires gnome-doc-utils-native (for xml2po) and docbook
-SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "73927d3c43d783f5d7d6cdbb4359d7d6"
 SRC_URI[archive.sha256sum] = "976fde6c0764b7b26b633030032b992c4dcbbaefd29d118303de5f7258794ae5"
diff --git a/recipes/gnome/gnome-desktop_2.30.0.bb b/recipes/gnome/gnome-desktop_2.30.0.bb
index 3c458a41ce..75dc0757cb 100644
--- a/recipes/gnome/gnome-desktop_2.30.0.bb
+++ b/recipes/gnome/gnome-desktop_2.30.0.bb
@@ -8,4 +8,4 @@ SRC_URI[archive.sha256sum] = "cb80b676966127d8ee1a9b5ebbed1c23646d62ecdfccbb46d4
 DEPENDS += "gnome-doc-utils gnome-vfs libxrandr"
 
 # FIXME: docs build requires gnome-doc-utils-native (for xml2po) and docbook
-SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://no-desktop-docs.patch;striplevel=0"
diff --git a/recipes/gnome/gnome-dvb-daemon_0.1.17.bb b/recipes/gnome/gnome-dvb-daemon_0.1.17.bb
index d8faecde98..a30b438f80 100644
--- a/recipes/gnome/gnome-dvb-daemon_0.1.17.bb
+++ b/recipes/gnome/gnome-dvb-daemon_0.1.17.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNOME DVB Daemon is a daemon written in Vala based on GStreamer t
 LICENSE = "GPLv3"
 
 DEPENDS = "libxml2 python-dbus python-gst python-pygtk libgee vala-native gstreamer gst-plugins-good gst-plugins-bad glib-2.0 dbus-glib sqlite3 gst-rtsp"
-RDEPENDS = "python-dbus python-gst python-pygtk gst-plugin-dvb gst-fluendo-mpegdemux dvb-apps dvb-scan dvb-tzap dvb-czap dvbstream"
+RDEPENDS_${PN} = "python-netserver python-dbus python-gst python-pygtk gst-plugin-dvb gst-fluendo-mpegdemux dvb-apps dvb-scan dvb-tzap dvb-czap dvbstream"
 
 inherit gnome
 
diff --git a/recipes/gnome/gnome-dvb-daemon_0.1.18.bb b/recipes/gnome/gnome-dvb-daemon_0.1.18.bb
new file mode 100644
index 0000000000..b472cc8de8
--- /dev/null
+++ b/recipes/gnome/gnome-dvb-daemon_0.1.18.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "GNOME DVB Daemon is a daemon written in Vala based on GStreamer to setup your DVB devices, record and watch TV shows and browse EPG. It can be controlled by any application via its D-Bus interface."
+LICENSE = "GPLv3"
+
+DEPENDS = "totem libxml2 python-dbus python-gst python-pygtk libgee vala-native gstreamer gst-plugins-good gst-plugins-bad glib-2.0 dbus-glib sqlite3 gst-rtsp"
+RDEPENDS_${PN} = "python-netserver python-dbus python-gst python-pygtk gst-plugin-dvb gst-fluendo-mpegdemux dvb-apps dvb-scan dvb-tzap dvb-czap dvbstream"
+
+PR = "r1"
+
+inherit gnome
+
+SRC_URI = "http://launchpad.net/gnome-dvb-daemon/trunk/${PV}/+download/gnome-dvb-daemon-${PV}.tar.bz2;name=archive"
+
+SRC_URI[archive.md5sum] = "2ca8768174e5a90ffe44e954b6503ef2"
+SRC_URI[archive.sha256sum] = "a961ce6ea4e59fc5a316eeafe03db3aadd964eec19d9bd9b5342eea39acfdfa2"
+
+# We have no use for checking using gst-inspect when crosscompiling, so sed out the check
+do_configure_prepend() {
+	sed -i -e /AG_GST_CHECK_GST_INSPECT/d \
+	       -e /G_GST_CHECK_MODULE/d \
+	       -e /AM_CHECK_PYMOD/d \
+	       ${S}/configure.ac
+	sed -i -e 's:PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}":PYTHON_INCLUDES="-I${STAGING_INCDIR}/python$PYTHON_VERSION":g' \
+	       -e 's:PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}":PYTHON_INCLUDES="-I${STAGING_INCDIR}/python$PYTHON_VERSION":g' \
+	       ${S}/m4/python.m4
+}
+
+# TODO: split out UI and python stuff
+FILES_${PN} += "${datadir}/dbus-1 ${libdir}/python*"
+FILES_${PN}-dbg += "${libdir}/python*/*/*/*/.debug"
+
+
diff --git a/recipes/gnome/gnome-games_2.24.3.bb b/recipes/gnome/gnome-games_2.24.3.bb
index 770fdc6def..07b308122a 100644
--- a/recipes/gnome/gnome-games_2.24.3.bb
+++ b/recipes/gnome/gnome-games_2.24.3.bb
@@ -8,7 +8,7 @@ inherit gnome distutils-base gconf
 
 PR = "r2"
 
-SRC_URI += "file://ggz-unbreak-m4.patch;patch=1 \
+SRC_URI += "file://ggz-unbreak-m4.patch \
            "
 
 EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \
diff --git a/recipes/gnome/gnome-keyring_2.28.2.bb b/recipes/gnome/gnome-keyring_2.28.2.bb
index f71e0ac7f1..dceb070835 100644
--- a/recipes/gnome/gnome-keyring_2.28.2.bb
+++ b/recipes/gnome/gnome-keyring_2.28.2.bb
@@ -8,7 +8,7 @@ inherit gnome pkgconfig
 
 EXTRA_OECONF = "--disable-gtk-doc --enable-pam --with-pam-dir=${libdir}/security"
 
-SRC_URI += "file://tasn.m4 file://org.gnome.keyring.service file://libtool.workarround.patch;patch=1"
+SRC_URI += "file://tasn.m4 file://org.gnome.keyring.service file://libtool.workarround.patch"
 
 do_configure_prepend() {
 	cp ${WORKDIR}/tasn.m4 acinclude.m4
diff --git a/recipes/gnome/gnome-panel_2.24.0.bb b/recipes/gnome/gnome-panel_2.24.0.bb
index 60713f39c0..d34343d978 100644
--- a/recipes/gnome/gnome-panel_2.24.0.bb
+++ b/recipes/gnome/gnome-panel_2.24.0.bb
@@ -3,9 +3,9 @@ DEPENDS = "librsvg libgweather startup-notification libwnck orbit2 gtk+ libgnome
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://scrollkeeper.patch;patch=1"
+SRC_URI += "file://scrollkeeper.patch"
 
-SRC_URI += "file://idl-sysroot.patch;patch=1"
+SRC_URI += "file://idl-sysroot.patch"
 
 do_configure_prepend() {
         sed -i -e s:help:: ${S}/Makefile.am
diff --git a/recipes/gnome/gnome-panel_2.26.0.bb b/recipes/gnome/gnome-panel_2.26.0.bb
index 24c22ae230..7511f9af1b 100644
--- a/recipes/gnome/gnome-panel_2.26.0.bb
+++ b/recipes/gnome/gnome-panel_2.26.0.bb
@@ -3,7 +3,7 @@ DEPENDS = "gconf librsvg libgweather startup-notification libwnck orbit2 gtk+ li
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://idl-sysroot.patch;patch=1"
+SRC_URI += "file://idl-sysroot.patch"
 
 do_configure_prepend() {
         sed -i -e s:help:: ${S}/Makefile.am
diff --git a/recipes/gnome/gnome-panel_2.28.0.bb b/recipes/gnome/gnome-panel_2.28.0.bb
index 49e9575a2f..fb5036c0b6 100644
--- a/recipes/gnome/gnome-panel_2.28.0.bb
+++ b/recipes/gnome/gnome-panel_2.28.0.bb
@@ -7,7 +7,7 @@ PR = "r2"
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://idl-sysroot.patch;patch=1"
+SRC_URI += "file://idl-sysroot.patch"
 
 CPPFLAGS += " -I${STAGING_INCDIR}/gnome-desktop-2.0" 
 export SYSROOT = "${STAGING_DIR_HOST}"
diff --git a/recipes/gnome/gnome-panel_2.30.0.bb b/recipes/gnome/gnome-panel_2.30.0.bb
index 87aef8e372..cfe2cfeaec 100644
--- a/recipes/gnome/gnome-panel_2.30.0.bb
+++ b/recipes/gnome/gnome-panel_2.30.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "libcanberra gconf librsvg libgweather startup-notification libwnck or
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://idl-sysroot.patch;patch=1"
+SRC_URI += "file://idl-sysroot.patch"
 
 SRC_URI[archive.md5sum] = "e17f25417b2c9011ed1c3ebd75706de6"
 SRC_URI[archive.sha256sum] = "7e8f99d3105bc0dda038b5859ab56d0a9740e244d7853786f1deb2df0a692220"
diff --git a/recipes/gnome/gnome-system-tools_2.27.1.bb b/recipes/gnome/gnome-system-tools_2.27.1.bb
index b7c90cb041..364720f847 100644
--- a/recipes/gnome/gnome-system-tools_2.27.1.bb
+++ b/recipes/gnome/gnome-system-tools_2.27.1.bb
@@ -6,7 +6,7 @@ inherit gnome pkgconfig
 
 PR = "r2"
 
-SRC_URI += "file://remove-docs.patch;patch=1"
+SRC_URI += "file://remove-docs.patch"
 
 EXTRA_OECONF = "--disable-scrollkeeper \
                "
diff --git a/recipes/gnome/gnome-system-tools_2.28.2.bb b/recipes/gnome/gnome-system-tools_2.28.2.bb
index 503a111ff2..3bb5af62f6 100644
--- a/recipes/gnome/gnome-system-tools_2.28.2.bb
+++ b/recipes/gnome/gnome-system-tools_2.28.2.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "nautilus gnome-common glib-2.0 gtk+ gconf liboobs system-tools-backends gnome-control-center"
 inherit gnome pkgconfig
 
-SRC_URI += "file://remove-docs.patch;patch=1"
+SRC_URI += "file://remove-docs.patch"
 SRC_URI[archive.md5sum] = "6947cd83c8f83af54e76a36ab3bb6cf0"
 SRC_URI[archive.sha256sum] = "806dd14792149b7f01e84a214b8d6debda53965e1eb74d189c66498adeb2af29"
 
diff --git a/recipes/gnome/gnome-system-tools_2.30.0.bb b/recipes/gnome/gnome-system-tools_2.30.0.bb
index 69f32d9a4d..c53a83ea76 100644
--- a/recipes/gnome/gnome-system-tools_2.30.0.bb
+++ b/recipes/gnome/gnome-system-tools_2.30.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "policykit-gnome nautilus gnome-common glib-2.0 gtk+ gconf liboobs system-tools-backends gnome-control-center"
 inherit gnome pkgconfig
 
-SRC_URI += "file://remove-docs.patch;patch=1"
+SRC_URI += "file://remove-docs.patch"
 
 SRC_URI[archive.md5sum] = "e3e779c8a31c34993315a6c6c78a5ed5"
 SRC_URI[archive.sha256sum] = "7bf41b88566f715ede95fd0e4297b64a95450af7f9d63a6741bb9e65ba361c7d"
diff --git a/recipes/gnome/gnome-utils_2.28.0.bb b/recipes/gnome/gnome-utils_2.28.0.bb
index 8380f8d5f2..9b008ac3f0 100644
--- a/recipes/gnome/gnome-utils_2.28.0.bb
+++ b/recipes/gnome/gnome-utils_2.28.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "gnome-common glib-2.0 gtk+ gconf"
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://no-try-run-strftime.diff;patch=1"
+SRC_URI += "file://no-try-run-strftime.diff"
 
 EXTRA_OECONF = "--disable-scrollkeeper"
 
diff --git a/recipes/gnome/gnome-utils_2.30.0.bb b/recipes/gnome/gnome-utils_2.30.0.bb
index ea6d17b1d7..b2f39cfed2 100644
--- a/recipes/gnome/gnome-utils_2.30.0.bb
+++ b/recipes/gnome/gnome-utils_2.30.0.bb
@@ -7,7 +7,7 @@ inherit gnome pkgconfig
 
 PR = "r1"
 
-SRC_URI += "file://no-try-run-strftime.diff;patch=1"
+SRC_URI += "file://no-try-run-strftime.diff"
 SRC_URI[archive.md5sum] = "c6d779ddccf99cbe0667b578078dd011"
 SRC_URI[archive.sha256sum] = "745bb25fce536dc5337e7b5cbcbce9eee66b3cc0c500de302759b98ebcef6a8f"
 
diff --git a/recipes/gnome/gnome-vfs_2.22.0.bb b/recipes/gnome/gnome-vfs_2.22.0.bb
index c71cac9895..d3d24b1f96 100644
--- a/recipes/gnome/gnome-vfs_2.22.0.bb
+++ b/recipes/gnome/gnome-vfs_2.22.0.bb
@@ -7,8 +7,8 @@ PR = "r1"
 
 inherit gnome
 
-SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
-	    file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
+SRC_URI += "file://gconftool-lossage.patch \
+	    file://gnome-vfs-no-kerberos.patch;striplevel=0"
 
 # This is to provide compatibility with the gnome-vfs DBus fork
 PROVIDES = "gnome-vfs-plugin-dbus"
diff --git a/recipes/gnome/gnome-vfs_2.24.1.bb b/recipes/gnome/gnome-vfs_2.24.1.bb
index 5c65839380..3902e7774a 100644
--- a/recipes/gnome/gnome-vfs_2.24.1.bb
+++ b/recipes/gnome/gnome-vfs_2.24.1.bb
@@ -7,9 +7,9 @@ PR = "r2"
 
 inherit gnome
 
-SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
-	    file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0 \
-	    file://03_gnutls27.patch;patch=1"
+SRC_URI += "file://gconftool-lossage.patch \
+	    file://gnome-vfs-no-kerberos.patch;striplevel=0 \
+	    file://03_gnutls27.patch"
 
 # This is to provide compatibility with the gnome-vfs DBus fork
 PROVIDES = "gnome-vfs-plugin-dbus"
diff --git a/recipes/gnome/gnumeric_1.10.1.bb b/recipes/gnome/gnumeric_1.10.1.bb
index 926bdd16bf..5b8240af2a 100644
--- a/recipes/gnome/gnumeric_1.10.1.bb
+++ b/recipes/gnome/gnumeric_1.10.1.bb
@@ -7,7 +7,7 @@ PARALLEL_MAKE = ""
 
 inherit gnome flow-lossage
 
-SRC_URI += " file://nodolt.patch;patch=1 "
+SRC_URI += " file://nodolt.patch "
 
 SRC_URI[archive.md5sum] = "80daf446f299578d05e60e9b7d38900c"
 SRC_URI[archive.sha256sum] = "91a0a9aa47ae82b14fe717e5d49d164cfe871add2bf71d0cb2f68cf3d383c9db"
diff --git a/recipes/gnome/gnumeric_1.8.4.bb b/recipes/gnome/gnumeric_1.8.4.bb
index b3a3aee506..97adddef77 100644
--- a/recipes/gnome/gnumeric_1.8.4.bb
+++ b/recipes/gnome/gnumeric_1.8.4.bb
@@ -10,7 +10,7 @@ PARALLEL_MAKE = ""
 
 inherit gnome flow-lossage
 
-SRC_URI += "file://remove-docs.patch;patch=1"
+SRC_URI += "file://remove-docs.patch"
 
 EXTRA_OECONF=" --without-perl "
 
diff --git a/recipes/gnome/gnumeric_1.9.14.bb b/recipes/gnome/gnumeric_1.9.14.bb
index cf7987107e..1bcd997185 100644
--- a/recipes/gnome/gnumeric_1.9.14.bb
+++ b/recipes/gnome/gnumeric_1.9.14.bb
@@ -7,7 +7,7 @@ PARALLEL_MAKE = ""
 
 inherit gnome flow-lossage
 
-SRC_URI += " file://nodolt.patch;patch=1 "
+SRC_URI += " file://nodolt.patch "
 
 EXTRA_OECONF=" --without-perl "
 
diff --git a/recipes/gnome/goffice_0.7.14.bb b/recipes/gnome/goffice_0.7.14.bb
index 4b25e852ac..e40cb1a5c8 100644
--- a/recipes/gnome/goffice_0.7.14.bb
+++ b/recipes/gnome/goffice_0.7.14.bb
@@ -7,8 +7,8 @@ DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2
 
 inherit gnome pkgconfig
 
-SRC_URI += " file://c99math.patch;patch=1 \
-             file://nodolt.patch;patch=1 "
+SRC_URI += " file://c99math.patch \
+             file://nodolt.patch "
 
 do_stage() {
 	autotools_stage_all
diff --git a/recipes/gnome/goffice_0.8.1.bb b/recipes/gnome/goffice_0.8.1.bb
index 50c431c0d2..6ef4fbf714 100644
--- a/recipes/gnome/goffice_0.8.1.bb
+++ b/recipes/gnome/goffice_0.8.1.bb
@@ -5,8 +5,8 @@ DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2
 
 inherit gnome pkgconfig
 
-SRC_URI += " file://c99math.patch;patch=1 \
-             file://nodolt.patch;patch=1 "
+SRC_URI += " file://c99math.patch \
+             file://nodolt.patch "
 
 SRC_URI[archive.md5sum] = "fdc43c5e04f6ead55bebc034c1d34296"
 SRC_URI[archive.sha256sum] = "9e2497956349fee8e6ec34a13160635455ead79a5118cbe61cb387e4cfd2b31e"
diff --git a/recipes/gnome/gvfs_1.5.5.bb b/recipes/gnome/gvfs_1.5.5.bb
index 1e1106defa..4968d928ce 100644
--- a/recipes/gnome/gvfs_1.5.5.bb
+++ b/recipes/gnome/gvfs_1.5.5.bb
@@ -5,8 +5,8 @@ DEPENDS = "gawk-native libimobiledevice gnome-keyring glib-2.0 obexftp fuse avah
 inherit gnome
 
 SRC_URI += " \
-            file://imobile-fix.patch;patch=1 \
-            file://imobile-fix2.patch;patch=1 \
+            file://imobile-fix.patch \
+            file://imobile-fix2.patch \
 "
 
 SRC_URI[archive.md5sum] = "d4ae94acdea317d8a8bf88a793b8df3f"
diff --git a/recipes/gnome/libart-lgpl.inc b/recipes/gnome/libart-lgpl.inc
index 52ee9b5314..aa06237e4d 100644
--- a/recipes/gnome/libart-lgpl.inc
+++ b/recipes/gnome/libart-lgpl.inc
@@ -9,7 +9,7 @@ INC_PR = "r5"
 # can't use gnome.bbclass due to _ in filename
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
        file://${ART_CONFIG} \
-       file://Makefile.am.patch;patch=1"
+       file://Makefile.am.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gnome/libbonobo_2.22.0.bb b/recipes/gnome/libbonobo_2.22.0.bb
index 0a811a9761..7349bf777a 100644
--- a/recipes/gnome/libbonobo_2.22.0.bb
+++ b/recipes/gnome/libbonobo_2.22.0.bb
@@ -2,7 +2,7 @@ require libbonobo.inc
 
 PR = "r0"
 
-SRC_URI += "file://configure-gthread.patch;patch=1"
+SRC_URI += "file://configure-gthread.patch"
 
 
 SRC_URI[archive.md5sum] = "998a576ad26784ac87eab99e96013527"
diff --git a/recipes/gnome/libgnome_2.6.1.1.bb b/recipes/gnome/libgnome_2.6.1.1.bb
index ca23ba1164..2133cf24d3 100644
--- a/recipes/gnome/libgnome_2.6.1.1.bb
+++ b/recipes/gnome/libgnome_2.6.1.1.bb
@@ -5,7 +5,7 @@ PR = "r2"
 
 inherit gnome
 
-SRC_URI += "file://makefile.patch;patch=1"
+SRC_URI += "file://makefile.patch"
 
 DEPENDS = "gnome-vfs libbonobo"
 
diff --git a/recipes/gnome/libgnomeprintui_2.6.2.bb b/recipes/gnome/libgnomeprintui_2.6.2.bb
index a1a1566813..a532adea12 100644
--- a/recipes/gnome/libgnomeprintui_2.6.2.bb
+++ b/recipes/gnome/libgnomeprintui_2.6.2.bb
@@ -7,7 +7,7 @@ DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://configure.patch;patch=1"
+SRC_URI += "file://configure.patch"
 
 SRC_URI[archive.md5sum] = "b26f7f70eb67fe29f20f6312d4f3085e"
 SRC_URI[archive.sha256sum] = "7869603bbda88f35652d9b70af178836ca7612119ab36084ccc35f2d51c83f13"
diff --git a/recipes/gnome/libgnomeprintui_2.8.2.bb b/recipes/gnome/libgnomeprintui_2.8.2.bb
index 2540ceaef7..630c261b8b 100644
--- a/recipes/gnome/libgnomeprintui_2.8.2.bb
+++ b/recipes/gnome/libgnomeprintui_2.8.2.bb
@@ -7,7 +7,7 @@ DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://configure.patch;patch=1"
+SRC_URI += "file://configure.patch"
 
 SRC_URI[archive.md5sum] = "b38d1f6813dd52879ba4174ddc3f1b1c"
 SRC_URI[archive.sha256sum] = "5c4ba52ca52cdb2d89e2fb7a638891ded38e844c08dd992e482f0793cfbc71c7"
diff --git a/recipes/gnome/libgnomeui.inc b/recipes/gnome/libgnomeui.inc
index 537eb5a08d..4bf97ea7ac 100644
--- a/recipes/gnome/libgnomeui.inc
+++ b/recipes/gnome/libgnomeui.inc
@@ -11,7 +11,7 @@ FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
 FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
 
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/libgnomeui_2.12.0.bb b/recipes/gnome/libgnomeui_2.12.0.bb
index 1f2537cd4c..b3b6803eed 100644
--- a/recipes/gnome/libgnomeui_2.12.0.bb
+++ b/recipes/gnome/libgnomeui_2.12.0.bb
@@ -12,7 +12,7 @@ inherit gnome
 FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
 
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/libgnomeui_2.15.2.bb b/recipes/gnome/libgnomeui_2.15.2.bb
index f080c16ccd..3cf274af7e 100644
--- a/recipes/gnome/libgnomeui_2.15.2.bb
+++ b/recipes/gnome/libgnomeui_2.15.2.bb
@@ -11,7 +11,7 @@ FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
 
 inherit gnome
 
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/libgnomeui_2.16.1.bb b/recipes/gnome/libgnomeui_2.16.1.bb
index 16a26edb28..98d53751bb 100644
--- a/recipes/gnome/libgnomeui_2.16.1.bb
+++ b/recipes/gnome/libgnomeui_2.16.1.bb
@@ -14,7 +14,7 @@ inherit gnome
 FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
 
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/libgnomeui_2.6.1.1.bb b/recipes/gnome/libgnomeui_2.6.1.1.bb
index 921554b8fb..dedfbbc448 100644
--- a/recipes/gnome/libgnomeui_2.6.1.1.bb
+++ b/recipes/gnome/libgnomeui_2.6.1.1.bb
@@ -11,7 +11,7 @@ FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
 
 inherit gnome
 
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/libproxy_0.2.3.bb b/recipes/gnome/libproxy_0.2.3.bb
index 8b768e53ef..eb8a909a23 100644
--- a/recipes/gnome/libproxy_0.2.3.bb
+++ b/recipes/gnome/libproxy_0.2.3.bb
@@ -5,7 +5,7 @@ DEPENDS = "libxmu gconf virtual/libx11"
 PR = "r1"
 
 SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
-	   file://libproxy-move-define-__USE_BSD.patch;patch=1 \
+	   file://libproxy-move-define-__USE_BSD.patch \
 	   "
 
 inherit autotools_stage
diff --git a/recipes/gnome/metacity_2.30.0.bb b/recipes/gnome/metacity_2.30.0.bb
index f3396e92e3..d6028799aa 100644
--- a/recipes/gnome/metacity_2.30.0.bb
+++ b/recipes/gnome/metacity_2.30.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "libcanberra libwnck startup-notification gtk+ gconf gdk-pixbuf-csourc
 
 inherit gnome update-alternatives
 
-SRC_URI += "file://crosscompile.patch;patch=1 "
+SRC_URI += "file://crosscompile.patch "
 
 SRC_URI[archive.md5sum] = "7c8a4c8f3b667efcc60f286adb445d4c"
 SRC_URI[archive.sha256sum] = "5c4e2af2216de022181f692f15427361a1dae3d30756ef89b97a11ff5bd50b22"
diff --git a/recipes/gnome/orbit2-native_2.10.2.bb b/recipes/gnome/orbit2-native_2.10.2.bb
index 492229316c..78448b6288 100644
--- a/recipes/gnome/orbit2-native_2.10.2.bb
+++ b/recipes/gnome/orbit2-native_2.10.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "CORBA ORB"
 LICENSE = "LGPL GPL"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://configure-lossage.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl-native popt-native gtk-doc"
diff --git a/recipes/gnome/orbit2-native_2.13.2.bb b/recipes/gnome/orbit2-native_2.13.2.bb
index 6ca618fbe6..aaf2b385a9 100644
--- a/recipes/gnome/orbit2-native_2.13.2.bb
+++ b/recipes/gnome/orbit2-native_2.13.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "CORBA ORB"
 LICENSE = "LGPL GPL"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.13/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://configure-lossage.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl-native popt-native gtk-doc"
diff --git a/recipes/gnome/orbit2-native_2.14.12.bb b/recipes/gnome/orbit2-native_2.14.12.bb
index a0b0189014..bf69e99dce 100644
--- a/recipes/gnome/orbit2-native_2.14.12.bb
+++ b/recipes/gnome/orbit2-native_2.14.12.bb
@@ -3,7 +3,7 @@ PR = "r0"
 LICENSE = "LGPL GPL"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://configure-lossage.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl-native popt-native gtk-doc"
diff --git a/recipes/gnome/orbit2.inc b/recipes/gnome/orbit2.inc
index 42ade84d1f..157d8d9230 100644
--- a/recipes/gnome/orbit2.inc
+++ b/recipes/gnome/orbit2.inc
@@ -2,8 +2,8 @@ LICENSE = "GPL"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
-           file://pkgconfig-fix.patch;patch=1 \
+           file://configure-lossage.patch \
+           file://pkgconfig-fix.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl popt orbit2-native gtk-doc"
diff --git a/recipes/gnome/orbit2_2.10.2.bb b/recipes/gnome/orbit2_2.10.2.bb
index 012f5f4959..dbcbc501f7 100644
--- a/recipes/gnome/orbit2_2.10.2.bb
+++ b/recipes/gnome/orbit2_2.10.2.bb
@@ -3,7 +3,7 @@ PR = "r2"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://configure-lossage.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl popt orbit2-native gtk-doc"
diff --git a/recipes/gnome/orbit2_2.13.2.bb b/recipes/gnome/orbit2_2.13.2.bb
index 5174ed488c..33f5e912c3 100644
--- a/recipes/gnome/orbit2_2.13.2.bb
+++ b/recipes/gnome/orbit2_2.13.2.bb
@@ -3,7 +3,7 @@ PR = "r2"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.13/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://configure-lossage.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl popt orbit2-native gtk-doc"
diff --git a/recipes/gnome/system-tools-backends_2.10.0.bb b/recipes/gnome/system-tools-backends_2.10.0.bb
index 393f971075..ca4d1024b8 100644
--- a/recipes/gnome/system-tools-backends_2.10.0.bb
+++ b/recipes/gnome/system-tools-backends_2.10.0.bb
@@ -14,7 +14,7 @@ SRC_URI += " \
            "
 
 SRC_URI_append_angstrom = " \
-            file://add-angstrom-distro.patch;patch=1 \
+            file://add-angstrom-distro.patch \
            "
 
 SRC_URI[archive.md5sum] = "01fd8fcfbe5f68492186404c96af915a"
diff --git a/recipes/gnome/system-tools-backends_2.6.1.bb b/recipes/gnome/system-tools-backends_2.6.1.bb
index 2fbc460df9..2bf4915c32 100644
--- a/recipes/gnome/system-tools-backends_2.6.1.bb
+++ b/recipes/gnome/system-tools-backends_2.6.1.bb
@@ -6,7 +6,7 @@ DEPENDS = "dbus dbus-glib glib-2.0 policykit"
 inherit gnome pkgconfig update-rc.d
 
 SRC_URI += " \
-            file://angstrom.patch;patch=1 \
+            file://angstrom.patch \
             file://system-tools-backends \
            "
 
diff --git a/recipes/gnome/system-tools-backends_2.8.1.bb b/recipes/gnome/system-tools-backends_2.8.1.bb
index 5f9a0cd22a..16bc05f260 100644
--- a/recipes/gnome/system-tools-backends_2.8.1.bb
+++ b/recipes/gnome/system-tools-backends_2.8.1.bb
@@ -6,7 +6,7 @@ DEPENDS = "dbus dbus-glib glib-2.0 policykit"
 inherit gnome pkgconfig update-rc.d
 
 SRC_URI += " \
-            file://angstrom.patch;patch=1 \
+            file://angstrom.patch \
             file://system-tools-backends \
            "
 
diff --git a/recipes/gnome/system-tools-backends_2.8.3.bb b/recipes/gnome/system-tools-backends_2.8.3.bb
index 68be130cbc..d924d81a46 100644
--- a/recipes/gnome/system-tools-backends_2.8.3.bb
+++ b/recipes/gnome/system-tools-backends_2.8.3.bb
@@ -16,7 +16,7 @@ SRC_URI += " \
            "
 
 SRC_URI_append_angstrom = " \
-            file://add-angstrom-distro.patch;patch=1 \
+            file://add-angstrom-distro.patch \
            "
 
 EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 "
diff --git a/recipes/gnu-config/gnu-config_20050701.bb b/recipes/gnu-config/gnu-config_20050701.bb
index c6a75ac9c0..178f0c9e8b 100644
--- a/recipes/gnu-config/gnu-config_20050701.bb
+++ b/recipes/gnu-config/gnu-config_20050701.bb
@@ -9,8 +9,8 @@ PV = "0.1+cvs${FIXEDSRCDATE}"
 PR = "r6"
 
 SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
-	   file://config-guess-uclibc.patch;patch=1 \
-           file://avr32.patch;patch=1 \
+	   file://config-guess-uclibc.patch \
+           file://avr32.patch \
            file://gnu-configize.in"
 S = "${WORKDIR}/config"
 
diff --git a/recipes/gnuchess/fltk-chess_0.5.bb b/recipes/gnuchess/fltk-chess_0.5.bb
index b21b2c6017..c2ad342f6c 100644
--- a/recipes/gnuchess/fltk-chess_0.5.bb
+++ b/recipes/gnuchess/fltk-chess_0.5.bb
@@ -8,7 +8,7 @@ RDEPENDS = "gnuchess"
 
 
 SRC_URI = "http://members.cheese.at/woody/fltk-chess/fltk-chess-${PV}.tgz \
-           file://fix_cast_error_and_gnuchess_exec.patch;patch=1 \
+           file://fix_cast_error_and_gnuchess_exec.patch \
            file://fltk-chess.desktop"
 S = "${WORKDIR}/fltk-chess/"
 
diff --git a/recipes/gnupg/gnupg_1.4.10.bb b/recipes/gnupg/gnupg_1.4.10.bb
index 38af0873fa..93bc465584 100644
--- a/recipes/gnupg/gnupg_1.4.10.bb
+++ b/recipes/gnupg/gnupg_1.4.10.bb
@@ -4,7 +4,7 @@ DEPENDS += "readline"
 EXTRA_OECONF += "--with-readline=${STAGING_LIBDIR}/.. ac_cv_sys_symbol_underscore=yes"
 #   --without-readline      do not support fancy command line editing
 
-SRC_URI += "file://long-long-thumb.patch;patch=1"
+SRC_URI += "file://long-long-thumb.patch"
 SRC_URI[src.md5sum] = "dcf7ed712997888d616e029637bfc303"
 SRC_URI[src.sha256sum] = "a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38"
 
diff --git a/recipes/gnuplot/gnuplot_4.0.0.bb b/recipes/gnuplot/gnuplot_4.0.0.bb
index 97ba7a5515..c0b79c7faf 100644
--- a/recipes/gnuplot/gnuplot_4.0.0.bb
+++ b/recipes/gnuplot/gnuplot_4.0.0.bb
@@ -3,11 +3,11 @@ require gnuplot.inc
 PR = "r5"
 
 SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz;name=archive \
-	   file://subdirs.patch;patch=1 \
-	   file://debian-separate-x11-package.patch;patch=1 \
+	   file://subdirs.patch \
+	   file://debian-separate-x11-package.patch \
 	   http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
-	   file://matrix.patch;patch=1 \
-   	   file://term.patch;patch=1 \
+	   file://matrix.patch \
+   	   file://term.patch \
 	   file://gnuplot.desktop \
 	   file://gnuplot.png"
 
diff --git a/recipes/gnuplot/gnuplot_4.2.4.bb b/recipes/gnuplot/gnuplot_4.2.4.bb
index f8290e6ef0..3621727ed2 100644
--- a/recipes/gnuplot/gnuplot_4.2.4.bb
+++ b/recipes/gnuplot/gnuplot_4.2.4.bb
@@ -4,8 +4,8 @@ PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz;name=archive \
            http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
-	   file://subdirs.patch;patch=1 \
-           file://term.patch;patch=1 \
+	   file://subdirs.patch \
+           file://term.patch \
 	   file://gnuplot.desktop \
 	   file://gnuplot.png"
 
diff --git a/recipes/gnuplot/gnuplot_4.4.0.bb b/recipes/gnuplot/gnuplot_4.4.0.bb
index 8fc0ca35e8..bc4727d580 100644
--- a/recipes/gnuplot/gnuplot_4.4.0.bb
+++ b/recipes/gnuplot/gnuplot_4.4.0.bb
@@ -2,7 +2,7 @@ require gnuplot.inc
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz;name=archive \
        http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
-       file://subdirs.patch;patch=1 \
+       file://subdirs.patch \
 	   file://gnuplot.desktop \
 	   file://gnuplot.png"
 
diff --git a/recipes/gnuplot/gnuplot_cvs.bb b/recipes/gnuplot/gnuplot_cvs.bb
index fbe566700c..212164c2dd 100644
--- a/recipes/gnuplot/gnuplot_cvs.bb
+++ b/recipes/gnuplot/gnuplot_cvs.bb
@@ -8,8 +8,8 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "cvs://anonymous@gnuplot.cvs.sourceforge.net/cvsroot/${PN};module=${PN} \
            http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
-           file://subdirs.patch;patch=1 \
-           file://term.patch;patch=1 \
+           file://subdirs.patch \
+           file://term.patch \
            file://gnuplot.desktop \
            file://gnuplot.png"
 
diff --git a/recipes/gnuradio/gnuradio-libusb-compat.inc b/recipes/gnuradio/gnuradio-libusb-compat.inc
index ed97baa68d..efe2b88b4f 100644
--- a/recipes/gnuradio/gnuradio-libusb-compat.inc
+++ b/recipes/gnuradio/gnuradio-libusb-compat.inc
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 LICENSE = "GPLv3"
 DEPENDS = "virtual/libusb0 guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy"
 INC_PR = "r7"
-PE = "1"
 
 inherit distutils-base autotools autotools_stage pkgconfig
 
@@ -48,7 +47,7 @@ do_buildlibusb() {
 
 addtask buildlibusb before do_configure after do_unpack
 
-do_buildlibusb[deptask] = "do_populate_staging"
+do_buildlibusb[deptask] = "do_populate_sysroot"
 
 do_configure_prepend() {
 	if [ -e ${WORKDIR}/acinclude.m4 ] ; then
diff --git a/recipes/gnuradio/gnuradio.inc b/recipes/gnuradio/gnuradio.inc
index 19e0e66337..6eaf119f4c 100644
--- a/recipes/gnuradio/gnuradio.inc
+++ b/recipes/gnuradio/gnuradio.inc
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 LICENSE = "GPLv3"
 DEPENDS = "virtual/libusb0 guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy"
 INC_PR = "r7"
-PE = "1"
 
 inherit distutils-base autotools autotools_stage pkgconfig
 
diff --git a/recipes/gnuradio/gnuradio_3.2.0.bb b/recipes/gnuradio/gnuradio_3.2.0.bb
index 968e3c2529..4769e0bcf4 100644
--- a/recipes/gnuradio/gnuradio_3.2.0.bb
+++ b/recipes/gnuradio/gnuradio_3.2.0.bb
@@ -9,8 +9,8 @@ S = "${WORKDIR}/gnuradio-3.2"
 EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable--usrp2"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.tar.gz;name=archive \
-    file://no-usrp2.patch;patch=1 \
-    file://gnuradio-neon.patch;patch=1;pnum=0 \
+    file://no-usrp2.patch \
+    file://gnuradio-neon.patch;striplevel=0 \
      ${SOURCEFORGE_MIRROR}/libusb/libusb-0.1.12.tar.gz;name=libusb \
 "
 
diff --git a/recipes/gnuradio/gnuradio_3.2.1.bb b/recipes/gnuradio/gnuradio_3.2.1.bb
index fbd6f2fa77..5744f2ddbc 100644
--- a/recipes/gnuradio/gnuradio_3.2.1.bb
+++ b/recipes/gnuradio/gnuradio_3.2.1.bb
@@ -9,8 +9,8 @@ S = "${WORKDIR}/gnuradio-3.2.1"
 EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable--usrp2"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.1.tar.gz;name=archive \
-    file://no-usrp2.patch;patch=1 \
-    file://gnuradio-neon.patch;patch=1;pnum=0 \
+    file://no-usrp2.patch \
+    file://gnuradio-neon.patch;striplevel=0 \
      ${SOURCEFORGE_MIRROR}/libusb/libusb-0.1.12.tar.gz;name=libusb \
 "
 
diff --git a/recipes/gnuradio/gnuradio_git.bb b/recipes/gnuradio/gnuradio_git.bb
index 39cab52636..a769aa26f4 100644
--- a/recipes/gnuradio/gnuradio_git.bb
+++ b/recipes/gnuradio/gnuradio_git.bb
@@ -9,7 +9,7 @@ DEPENDS += " gsl "
 SRCREV = "bf7ad4d17514aba9fc5209bc916ce37482f77eaa"
 
 PR = "${INC_PR}.2"
-PV = "3.2.1-${PR}+gitr${SRCPV}"
+PV = "3.2.1-${PR}+gitr${SRCREV}"
 
 EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable-usrp2 --disable-usrp2-firmware --with-fusb-tech=libusb1"
 
diff --git a/recipes/gnutls/gnutls.inc b/recipes/gnutls/gnutls.inc
index ccf6f6942c..9c10c111db 100644
--- a/recipes/gnutls/gnutls.inc
+++ b/recipes/gnutls/gnutls.inc
@@ -1,13 +1,13 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
-DEPENDS = "zlib libgcrypt lzo guile-native gettext gtk-doc"
+DEPENDS = "zlib libgcrypt lzo guile-native gtk-doc"
 LICENSE = "LGPL"
 
 SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
 
-inherit autotools binconfig pkgconfig
+inherit autotools binconfig pkgconfig gettext
 
-INC_PR = "r9"
+INC_PR = "r10"
 
 EXTRA_OECONF = "--with-included-opencdk --with-included-libtasn1"
 
diff --git a/recipes/gnutls/gnutls_2.8.5.bb b/recipes/gnutls/gnutls_2.8.5.bb
index ec8a1188f3..b0786f63a0 100644
--- a/recipes/gnutls/gnutls_2.8.5.bb
+++ b/recipes/gnutls/gnutls_2.8.5.bb
@@ -2,8 +2,8 @@ require gnutls.inc
 LICENSE_${PN}-extra = "GPLv3"
 
 SRC_URI += "\
-	file://gnutls-openssl.patch;patch=1 \
-	file://gnutls-replace-siginterrupt.patch;patch=1 \
+	file://gnutls-openssl.patch \
+	file://gnutls-replace-siginterrupt.patch \
 	"
 
 EXTRA_OECONF += " --without-libgcrypt-prefix "
diff --git a/recipes/gparted/gparted_0.3.3.bb b/recipes/gparted/gparted_0.3.3.bb
index f8f0c44137..5f0581fd3a 100644
--- a/recipes/gparted/gparted_0.3.3.bb
+++ b/recipes/gparted/gparted_0.3.3.bb
@@ -6,8 +6,8 @@ PR = "r1"
 inherit autotools
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gparted/gparted-${PV}.tar.bz2 \
-           file://cross.patch;patch=1 \
-	   file://gparted-0.3.3-llabs.patch;patch=1;pnum=0"
+           file://cross.patch \
+	   file://gparted-0.3.3-llabs.patch;striplevel=0"
 
 SRC_URI[md5sum] = "f3d16ccfda72fa1dac9fa1ff9ded2c42"
 SRC_URI[sha256sum] = "c7c86abd344055bdf1f840a037d04064759f52039cb075260b60369b721f245c"
diff --git a/recipes/gparted/gparted_0.4.1.bb b/recipes/gparted/gparted_0.4.1.bb
index 7e6f50c210..9652804693 100644
--- a/recipes/gparted/gparted_0.4.1.bb
+++ b/recipes/gparted/gparted_0.4.1.bb
@@ -5,7 +5,7 @@ DEPENDS = "gtkmm parted"
 inherit gnome
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gparted/gparted-${PV}.tar.bz2 \
-           file://cross.patch;patch=1 \
+           file://cross.patch \
 "
 
 EXTRA_OECONF = " --disable-doc  --disable-scrollkeeper "
diff --git a/recipes/gpe-aerial/gpe-aerial_0.2.11.bb b/recipes/gpe-aerial/gpe-aerial_0.2.11.bb
index eb481dd0af..751d1647c7 100644
--- a/recipes/gpe-aerial/gpe-aerial_0.2.11.bb
+++ b/recipes/gpe-aerial/gpe-aerial_0.2.11.bb
@@ -9,8 +9,8 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI += "file://iconlist.patch;patch=1;pnum=0 \
-	    file://fix_makefile.patch;patch=1"
+SRC_URI += "file://iconlist.patch;striplevel=0 \
+	    file://fix_makefile.patch"
 
 SRC_URI[md5sum] = "4b06838f0ad963f8c01640e8311130cb"
 SRC_URI[sha256sum] = "30be2c450915938957bcb077bc5cf17b84eb9163ebe043e7324c359fb965c721"
diff --git a/recipes/gpe-aerial/gpe-aerial_0.2.12.bb b/recipes/gpe-aerial/gpe-aerial_0.2.12.bb
index ee8321e8a6..5d5146dcfc 100644
--- a/recipes/gpe-aerial/gpe-aerial_0.2.12.bb
+++ b/recipes/gpe-aerial/gpe-aerial_0.2.12.bb
@@ -9,8 +9,8 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI += "file://iconlist.patch;patch=1;pnum=0 \
-	    file://fix_makefile.patch;patch=1"
+SRC_URI += "file://iconlist.patch;striplevel=0 \
+	    file://fix_makefile.patch"
 
 SRC_URI[md5sum] = "dcf115e16bcc393b2b45fe34ef06fdbc"
 SRC_URI[sha256sum] = "6280881516f851edb075882d8114bd9bee6906b924a9923645793e937e4d6e68"
diff --git a/recipes/gpe-aerial/gpe-aerial_0.2.13.bb b/recipes/gpe-aerial/gpe-aerial_0.2.13.bb
index 55c711e881..178b63ec0d 100644
--- a/recipes/gpe-aerial/gpe-aerial_0.2.13.bb
+++ b/recipes/gpe-aerial/gpe-aerial_0.2.13.bb
@@ -10,8 +10,8 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI += "file://iconlist.patch;patch=1;pnum=0 \
-	    file://fix_makefile.patch;patch=1"
+SRC_URI += "file://iconlist.patch;striplevel=0 \
+	    file://fix_makefile.patch"
 
 SRC_URI[md5sum] = "528f95a23999a248f4425436d67585a7"
 SRC_URI[sha256sum] = "0cd7a9229a0c583dc9dc74ef3a2c542ee5f64f8e6c641d50cadc11c664c0c109"
diff --git a/recipes/gpe-announce/gpe-announce_0.13.bb b/recipes/gpe-announce/gpe-announce_0.13.bb
index ec80fb5db9..53f443f106 100644
--- a/recipes/gpe-announce/gpe-announce_0.13.bb
+++ b/recipes/gpe-announce/gpe-announce_0.13.bb
@@ -5,8 +5,8 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI += " \
-            file://fix-esound.diff;patch=1 \
-            file://fix-install.diff;patch=1 \
+            file://fix-esound.diff \
+            file://fix-install.diff \
            "
 
 SRC_URI[md5sum] = "74ca3a6e37c9d9ae9fe2c50fc6d8350f"
diff --git a/recipes/gpe-announce/gpe-announce_0.14.bb b/recipes/gpe-announce/gpe-announce_0.14.bb
index d327d84395..e65825457f 100644
--- a/recipes/gpe-announce/gpe-announce_0.14.bb
+++ b/recipes/gpe-announce/gpe-announce_0.14.bb
@@ -4,7 +4,7 @@ DEPENDS = "libsoundgen libschedule gtk+ libgpewidget"
 LICENSE = "GPL"
 PR = "r0"
 
-SRC_URI += "file://fix-esound.diff;patch=1"
+SRC_URI += "file://fix-esound.diff"
 
 SRC_URI[md5sum] = "4ec782fb49dd0e5549817d9e8601f9fc"
 SRC_URI[sha256sum] = "447c23943d4c004ceb25c7079058f79e270915cf6650e31c92498865dbed22a6"
diff --git a/recipes/gpe-appmgr/gpe-appmgr_2.8.bb b/recipes/gpe-appmgr/gpe-appmgr_2.8.bb
index 2b0fdbe8ca..5124992a61 100644
--- a/recipes/gpe-appmgr/gpe-appmgr_2.8.bb
+++ b/recipes/gpe-appmgr/gpe-appmgr_2.8.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 inherit gpe
 
-SRC_URI += " file://no-render-h.patch;patch=1 file://cairo-fixes.patch;patch=1"
+SRC_URI += "file://no-render-h.patch file://cairo-fixes.patch"
 
 SRC_URI[md5sum] = "2dd3d56eee8905451e9c31cfda620f7a"
 SRC_URI[sha256sum] = "1a797188e9786936c32fee6ba3e20f01d562583f6407cf8d83f729ab708e1342"
diff --git a/recipes/gpe-appmgr/gpe-appmgr_svn.bb b/recipes/gpe-appmgr/gpe-appmgr_svn.bb
index 25492b1bc6..aa1efeeb23 100644
--- a/recipes/gpe-appmgr/gpe-appmgr_svn.bb
+++ b/recipes/gpe-appmgr/gpe-appmgr_svn.bb
@@ -8,7 +8,7 @@ PR = "r0"
 inherit gpe
 
 SRC_URI = "${GPE_SVN} \
-           file://svn-build.patch;patch=1"
+           file://svn-build.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/gpe-autostarter/gpe-autostarter_0.11.bb b/recipes/gpe-autostarter/gpe-autostarter_0.11.bb
index cff18d912a..b9e8210035 100644
--- a/recipes/gpe-autostarter/gpe-autostarter_0.11.bb
+++ b/recipes/gpe-autostarter/gpe-autostarter_0.11.bb
@@ -5,8 +5,8 @@ LICENSE = "GPL"
 
 inherit gpe
 
-SRC_URI += "file://dbus-new-api.patch;patch=1 \
-	    file://makefile-fix.patch;patch=1"
+SRC_URI += "file://dbus-new-api.patch \
+	    file://makefile-fix.patch"
 
 
 SRC_URI[md5sum] = "d993818295e00754592ee6c13db4a723"
diff --git a/recipes/gpe-autostarter/gpe-autostarter_0.12.bb b/recipes/gpe-autostarter/gpe-autostarter_0.12.bb
index 41175492cd..dfd1393c1f 100644
--- a/recipes/gpe-autostarter/gpe-autostarter_0.12.bb
+++ b/recipes/gpe-autostarter/gpe-autostarter_0.12.bb
@@ -5,8 +5,8 @@ RDEPENDS = "hotplug-dbus"
 
 inherit gpe
 
-SRC_URI += "file://wireless.patch;patch=1 \
-	    file://makefile-fix.patch;patch=1"
+SRC_URI += "file://wireless.patch \
+	    file://makefile-fix.patch"
 
 
 SRC_URI[md5sum] = "254a580e67d8e804adb3583281ae8586"
diff --git a/recipes/gpe-autostarter/gpe-autostarter_0.6.bb b/recipes/gpe-autostarter/gpe-autostarter_0.6.bb
index 68c225fc0e..1b16bf5d95 100644
--- a/recipes/gpe-autostarter/gpe-autostarter_0.6.bb
+++ b/recipes/gpe-autostarter/gpe-autostarter_0.6.bb
@@ -5,7 +5,7 @@ RDEPENDS = "hotplug-dbus"
 
 inherit gpe
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 SRC_URI[md5sum] = "798085fd2e2b25f5145a05104d39ebc6"
 SRC_URI[sha256sum] = "8ce9aee873a337f876f82d54eb10a258911a03b3abb4eb79f9b2f04c8c304bbb"
diff --git a/recipes/gpe-autostarter/gpe-autostarter_0.7.bb b/recipes/gpe-autostarter/gpe-autostarter_0.7.bb
index 30f6b0c16a..99ef22a8cc 100644
--- a/recipes/gpe-autostarter/gpe-autostarter_0.7.bb
+++ b/recipes/gpe-autostarter/gpe-autostarter_0.7.bb
@@ -5,7 +5,7 @@ RDEPENDS = "hotplug-dbus"
 
 inherit gpe
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 SRC_URI[md5sum] = "f098c17601426c696f45c1b244fa1f73"
 SRC_URI[sha256sum] = "094157f59ac1a5146953bc74e5dac9f4b28fa14545bc12df87899f61cdfe18d6"
diff --git a/recipes/gpe-autostarter/gpe-autostarter_svn.bb b/recipes/gpe-autostarter/gpe-autostarter_svn.bb
index 2742952e0f..16ac050bf2 100644
--- a/recipes/gpe-autostarter/gpe-autostarter_svn.bb
+++ b/recipes/gpe-autostarter/gpe-autostarter_svn.bb
@@ -6,7 +6,7 @@ RDEPENDS = "hotplug-dbus"
 inherit gpe
 
 SRC_URI = "${GPE_SVN} \
-           file://svn-build.patch;patch=1"
+           file://svn-build.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/gpe-beam/gpe-beam_0.2.6.bb b/recipes/gpe-beam/gpe-beam_0.2.6.bb
index 82212ad106..6252ed91af 100644
--- a/recipes/gpe-beam/gpe-beam_0.2.6.bb
+++ b/recipes/gpe-beam/gpe-beam_0.2.6.bb
@@ -3,7 +3,7 @@ require ${PN}.inc
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
 PR = "r1"
 
-SRC_URI += "file://vcard-send.patch;patch=1;pnum=0"
+SRC_URI += "file://vcard-send.patch;striplevel=0"
 
 inherit gpe
 
diff --git a/recipes/gpe-beam/gpe-beam_0.2.7.bb b/recipes/gpe-beam/gpe-beam_0.2.7.bb
index 4ab0445221..19fcbd3bc2 100644
--- a/recipes/gpe-beam/gpe-beam_0.2.7.bb
+++ b/recipes/gpe-beam/gpe-beam_0.2.7.bb
@@ -3,7 +3,7 @@ require ${PN}.inc
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
 PR = "r1"
 
-SRC_URI += "file://decl.patch;patch=1;pnum=0"
+SRC_URI += "file://decl.patch;striplevel=0"
 
 inherit gpe
 
diff --git a/recipes/gpe-beam/gpe-beam_0.2.8.bb b/recipes/gpe-beam/gpe-beam_0.2.8.bb
index 8a11785d8f..99e8db1e7c 100644
--- a/recipes/gpe-beam/gpe-beam_0.2.8.bb
+++ b/recipes/gpe-beam/gpe-beam_0.2.8.bb
@@ -2,7 +2,7 @@ require ${PN}.inc
 
 RDEPENDS = "irda-utils"
 
-SRC_URI += "file://dbus-new-api.patch;patch=1"
+SRC_URI += "file://dbus-new-api.patch"
 
 inherit gpe
 
diff --git a/recipes/gpe-bluetooth/gpe-bluetooth_0.54.bb b/recipes/gpe-bluetooth/gpe-bluetooth_0.54.bb
index e982e571f8..cee9b9fbcc 100644
--- a/recipes/gpe-bluetooth/gpe-bluetooth_0.54.bb
+++ b/recipes/gpe-bluetooth/gpe-bluetooth_0.54.bb
@@ -2,8 +2,8 @@ require gpe-bluetooth.inc
 
 PR = "r1"
 
-SRC_URI += "file://hciattach-bts.patch;patch=1 \
-	file://include-sdp_lib.patch;patch=1"
+SRC_URI += "file://hciattach-bts.patch \
+	file://include-sdp_lib.patch"
 
 SRC_URI[md5sum] = "197603d957dda95a92c92038fb9f8341"
 SRC_URI[sha256sum] = "5ffb41e7375c55450fc55428fd7b19e158a93ee91ae6b9519953363ec05f82c7"
diff --git a/recipes/gpe-bootsplash/gpe-bootsplash_1.13.bb b/recipes/gpe-bootsplash/gpe-bootsplash_1.13.bb
index 63a32f83a7..ae15a9b261 100644
--- a/recipes/gpe-bootsplash/gpe-bootsplash_1.13.bb
+++ b/recipes/gpe-bootsplash/gpe-bootsplash_1.13.bb
@@ -8,7 +8,7 @@ PR = "r3"
 
 SRC_URI += "file://splash-p.svg \
             file://splash-l.svg \
-            file://no-strip-on-install.patch;patch=1"
+            file://no-strip-on-install.patch"
 
 FILES_${PN} += "${datadir}/gpe"
 
diff --git a/recipes/gpe-bootsplash/gpe-bootsplash_1.14.bb b/recipes/gpe-bootsplash/gpe-bootsplash_1.14.bb
index 7943e16eab..406cabb2cb 100644
--- a/recipes/gpe-bootsplash/gpe-bootsplash_1.14.bb
+++ b/recipes/gpe-bootsplash/gpe-bootsplash_1.14.bb
@@ -7,12 +7,12 @@ LICENSE = "GPL"
 PR = "r7"
 
 SRC_URI += "file://splash-p.svg file://splash-l.svg \
-            file://c7x0-rotation.patch;patch=1 \
-            file://cxx0-rotation.patch;patch=1 \
-            file://cairofix.patch;patch=1 \
-            file://no-strip-on-install.patch;patch=1"
+            file://c7x0-rotation.patch \
+            file://cxx0-rotation.patch \
+            file://cairofix.patch \
+            file://no-strip-on-install.patch"
 
-SRC_URI_append_mnci = " file://mnci.patch;patch=1"
+SRC_URI_append_mnci = " file://mnci.patch"
 
 FILES_${PN} += "${datadir}/gpe"
 
diff --git a/recipes/gpe-bootsplash/gpe-bootsplash_1.15.bb b/recipes/gpe-bootsplash/gpe-bootsplash_1.15.bb
index 73a8fbbf79..7af263170c 100644
--- a/recipes/gpe-bootsplash/gpe-bootsplash_1.15.bb
+++ b/recipes/gpe-bootsplash/gpe-bootsplash_1.15.bb
@@ -8,8 +8,8 @@ PR = "r10"
 
 SRC_URI += "file://splash-p.svg \
 	    file://splash-l.svg \
-	    file://init.patch;patch=1 \
-	    file://no-strip-on-install.patch;patch=1"
+	    file://init.patch \
+	    file://no-strip-on-install.patch"
 
 
 FILES_${PN} += "${datadir}/gpe"
diff --git a/recipes/gpe-bootsplash/gpe-bootsplash_svn.bb b/recipes/gpe-bootsplash/gpe-bootsplash_svn.bb
index 56267ce48a..4cfbd5b856 100644
--- a/recipes/gpe-bootsplash/gpe-bootsplash_svn.bb
+++ b/recipes/gpe-bootsplash/gpe-bootsplash_svn.bb
@@ -10,8 +10,8 @@ inherit autotools
 SRC_URI += "${GPE_SVN} \
             file://splash-p.svg \
             file://splash-l.svg \
-            file://init.patch;patch=1 \
-	    file://svn-build.patch;patch=1"
+            file://init.patch \
+	    file://svn-build.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/gpe-calculator/gpe-calculator_0.2.bb b/recipes/gpe-calculator/gpe-calculator_0.2.bb
index efef339e26..4d7451de70 100644
--- a/recipes/gpe-calculator/gpe-calculator_0.2.bb
+++ b/recipes/gpe-calculator/gpe-calculator_0.2.bb
@@ -6,7 +6,7 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI += "file://fix_makefile.patch;patch=1"
+SRC_URI += "file://fix_makefile.patch"
 
 SRC_URI[md5sum] = "6dc5eed9b200a45cf007f7a7ed4c2d23"
 SRC_URI[sha256sum] = "e51bdbba46d7d6950c1f4d3139a167f4c823e403f8a53b30a16cea32c7d540dc"
diff --git a/recipes/gpe-clock/gpe-clock_0.14.bb b/recipes/gpe-clock/gpe-clock_0.14.bb
index c5e9915ddc..2544d354ab 100644
--- a/recipes/gpe-clock/gpe-clock_0.14.bb
+++ b/recipes/gpe-clock/gpe-clock_0.14.bb
@@ -3,7 +3,7 @@ require gpe-clock.inc
 PR = "${INC_PR}.0"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
-	   file://default-time-24hrs.patch;patch=1"
+	   file://default-time-24hrs.patch"
 
 SRC_URI[md5sum] = "367d329ff8af75abcb7f214e9b669c9c"
 SRC_URI[sha256sum] = "fb5790c58430e1ce9cfdccef117de4937c35a411894642aea622638519e5b764"
diff --git a/recipes/gpe-clock/gpe-clock_0.20.bb b/recipes/gpe-clock/gpe-clock_0.20.bb
index 34099674e7..bb2b63baad 100644
--- a/recipes/gpe-clock/gpe-clock_0.20.bb
+++ b/recipes/gpe-clock/gpe-clock_0.20.bb
@@ -2,7 +2,7 @@ require gpe-clock.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://default-time-24hrs.patch;patch=1"
+SRC_URI += "file://default-time-24hrs.patch"
 
 SRC_URI[md5sum] = "3084a12de394a252048603128afe7c08"
 SRC_URI[sha256sum] = "a6e74b2a9a7ccc24e095dbbc473c9ad7e69e06e8a30cd9581941763a75237b78"
diff --git a/recipes/gpe-clock/gpe-clock_0.21.bb b/recipes/gpe-clock/gpe-clock_0.21.bb
index 621f50b747..011db872df 100644
--- a/recipes/gpe-clock/gpe-clock_0.21.bb
+++ b/recipes/gpe-clock/gpe-clock_0.21.bb
@@ -2,7 +2,7 @@ require gpe-clock.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://fix-install.patch;patch=1"
+SRC_URI += "file://fix-install.patch"
 
 SRC_URI[md5sum] = "b0b2c843a562f72df32a66993a215e3c"
 SRC_URI[sha256sum] = "ff0dfe70c1ac68180dfb26da83d9aee9f0e9007d428dae225abe7dc3bba512b9"
diff --git a/recipes/gpe-clock/gpe-clock_0.23.bb b/recipes/gpe-clock/gpe-clock_0.23.bb
index 5c48f10112..e7b6f79b97 100644
--- a/recipes/gpe-clock/gpe-clock_0.23.bb
+++ b/recipes/gpe-clock/gpe-clock_0.23.bb
@@ -2,7 +2,7 @@ require gpe-clock.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://fix-install.patch;patch=1"
+SRC_URI += "file://fix-install.patch"
 
 SRC_URI[md5sum] = "050943c68ee61ef8f2a25410a60d725e"
 SRC_URI[sha256sum] = "5a1d21538353fbb2038b3948385fa32faec1951162cd0d2c52a2687c7fc6669b"
diff --git a/recipes/gpe-clock/gpe-clock_0.24.bb b/recipes/gpe-clock/gpe-clock_0.24.bb
index 3de41ee59e..e3e9a2a9a5 100644
--- a/recipes/gpe-clock/gpe-clock_0.24.bb
+++ b/recipes/gpe-clock/gpe-clock_0.24.bb
@@ -2,7 +2,7 @@ require gpe-clock.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://fix-install.patch;patch=1"
+SRC_URI += "file://fix-install.patch"
 
 SRC_URI[md5sum] = "4e51de389b881d730f56d439e8573271"
 SRC_URI[sha256sum] = "2d40ea6851c2b90261b88941dc7a8ee83c4a333e7a2acdd4eb0afbc87b5e5da1"
diff --git a/recipes/gpe-clock/gpe-clock_0.25.bb b/recipes/gpe-clock/gpe-clock_0.25.bb
index 006936dc5d..8367409794 100644
--- a/recipes/gpe-clock/gpe-clock_0.25.bb
+++ b/recipes/gpe-clock/gpe-clock_0.25.bb
@@ -2,7 +2,7 @@ require gpe-clock.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://fix-install.patch;patch=1"
+SRC_URI += "file://fix-install.patch"
 
 SRC_URI[md5sum] = "75e087fcf8345cf1bfde7e172844e949"
 SRC_URI[sha256sum] = "0070e1c622f3f0cf9c40556f551de3e6059c7f8b3070516c0e4173dd09f57759"
diff --git a/recipes/gpe-clock/gpe-clock_svn.bb b/recipes/gpe-clock/gpe-clock_svn.bb
index b4ff0da4ee..a76f6cfce2 100644
--- a/recipes/gpe-clock/gpe-clock_svn.bb
+++ b/recipes/gpe-clock/gpe-clock_svn.bb
@@ -5,7 +5,7 @@ PR = "${INC_PR}.0"
 inherit autotools
 
 SRC_URI = "${GPE_SVN} \
-           file://svn-build.patch;patch=1"
+           file://svn-build.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/gpe-conf/gpe-conf_0.2.4.bb b/recipes/gpe-conf/gpe-conf_0.2.4.bb
index f979f940d5..2c964eb6b7 100644
--- a/recipes/gpe-conf/gpe-conf_0.2.4.bb
+++ b/recipes/gpe-conf/gpe-conf_0.2.4.bb
@@ -13,7 +13,7 @@ GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpe autotools pkgconfig
 
-SRC_URI += "file://scriptname.patch;patch=1;pnum=0"
+SRC_URI += "file://scriptname.patch;striplevel=0"
 
 PACKAGES += "gpe-conf-panel"
 
diff --git a/recipes/gpe-conf/gpe-conf_0.2.5.bb b/recipes/gpe-conf/gpe-conf_0.2.5.bb
index 38f199044a..e277e1844b 100644
--- a/recipes/gpe-conf/gpe-conf_0.2.5.bb
+++ b/recipes/gpe-conf/gpe-conf_0.2.5.bb
@@ -23,8 +23,8 @@ FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \
                 ${datadir}/gpe-conf"
 FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop"
 
-SRC_URI += "file://backlight-bugfix.patch;patch=1 \
-            file://wireless.patch;patch=1"
+SRC_URI += "file://backlight-bugfix.patch \
+            file://wireless.patch"
 
 SRC_URI[md5sum] = "11b9e8b7d7978fc44e5f079e7daa657f"
 SRC_URI[sha256sum] = "6a246caeb7d29c2afb48e8c70ef8e1f2ba2a4642faeef3defd266522304d278b"
diff --git a/recipes/gpe-conf/gpe-conf_0.2.7.bb b/recipes/gpe-conf/gpe-conf_0.2.7.bb
index 4f05770ee3..5a2c32a037 100644
--- a/recipes/gpe-conf/gpe-conf_0.2.7.bb
+++ b/recipes/gpe-conf/gpe-conf_0.2.7.bb
@@ -16,8 +16,8 @@ GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpe autotools pkgconfig
 
-SRC_URI += "file://poweroff.patch;patch=1 \
-            file://wifi-key.patch;patch=1;pnum=0"
+SRC_URI += "file://poweroff.patch \
+            file://wifi-key.patch;striplevel=0"
 
 PACKAGES += "gpe-conf-panel"
 
diff --git a/recipes/gpe-confd/gpe-confd_0.16.bb b/recipes/gpe-confd/gpe-confd_0.16.bb
index b6faef4758..23d75c4262 100644
--- a/recipes/gpe-confd/gpe-confd_0.16.bb
+++ b/recipes/gpe-confd/gpe-confd_0.16.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "GPE configuration daemon"
 LICENSE = "GPL"
 PR = "r1"
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 SRC_URI[md5sum] = "2677260df7d834ec416450e09ae5ba72"
 SRC_URI[sha256sum] = "9ffba12d92466f9e34fed21e38baae5cbb6608436ee53fa3704fe3be5fceb4af"
diff --git a/recipes/gpe-contacts/gpe-contacts_svn.bb b/recipes/gpe-contacts/gpe-contacts_svn.bb
index bad9aadec8..e167182d43 100644
--- a/recipes/gpe-contacts/gpe-contacts_svn.bb
+++ b/recipes/gpe-contacts/gpe-contacts_svn.bb
@@ -10,7 +10,7 @@ PR = "r2"
 inherit autotools gpe
 
 SRC_URI = "${GPE_SVN}"
-SRC_URI += "file://handle-import-categories.patch;patch=1"
+SRC_URI += "file://handle-import-categories.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/gpe-filemanager/gpe-filemanager_svn.bb b/recipes/gpe-filemanager/gpe-filemanager_svn.bb
index 2c2d82d253..fb9929cffd 100644
--- a/recipes/gpe-filemanager/gpe-filemanager_svn.bb
+++ b/recipes/gpe-filemanager/gpe-filemanager_svn.bb
@@ -10,7 +10,7 @@ PV = "0.25+svn-${SRCDATE}"
 inherit autotools
 
 SRC_URI = "${GPE_SVN} \
-	   file://svn-build.patch;patch=1"
+	   file://svn-build.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/gpe-go/gpe-go_0.05.bb b/recipes/gpe-go/gpe-go_0.05.bb
index a7f0cb9032..d071eca508 100644
--- a/recipes/gpe-go/gpe-go_0.05.bb
+++ b/recipes/gpe-go/gpe-go_0.05.bb
@@ -7,7 +7,7 @@ SECTION = "gpe"
 PRIORITY = "optional"
 PR = "r1"
 
-SRC_URI += "file://fix-make.patch;patch=1"
+SRC_URI += "file://fix-make.patch"
 
 SRC_URI[md5sum] = "79a077b7434e7964afe4c116c9da7295"
 SRC_URI[sha256sum] = "d6fdfd927c926145c488d099d6984c291218f898902bb9607ddef340201ae142"
diff --git a/recipes/gpe-lights/gpe-lights_0.12.bb b/recipes/gpe-lights/gpe-lights_0.12.bb
index 32a75b7be7..f3ef5c2936 100644
--- a/recipes/gpe-lights/gpe-lights_0.12.bb
+++ b/recipes/gpe-lights/gpe-lights_0.12.bb
@@ -7,7 +7,7 @@ SECTION = "gpe/games"
 PRIORITY = "optional"
 PR = "r1"
 
-SRC_URI += "file://fix-makefiles.patch;patch=1"
+SRC_URI += "file://fix-makefiles.patch"
 
 SRC_URI[md5sum] = "91d4344ab6d00115ee73f7d97c58acee"
 SRC_URI[sha256sum] = "98ce715b8627de958cbd4fbc11f72cfb7aed42825eb21995d4d46a676510c126"
diff --git a/recipes/gpe-lights/gpe-lights_0.13.bb b/recipes/gpe-lights/gpe-lights_0.13.bb
index 9d5df189a8..1930ae980a 100644
--- a/recipes/gpe-lights/gpe-lights_0.13.bb
+++ b/recipes/gpe-lights/gpe-lights_0.13.bb
@@ -7,7 +7,7 @@ SECTION = "gpe/games"
 PRIORITY = "optional"
 PR = "r1"
 
-SRC_URI += "file://fix-makefiles.patch;patch=1"
+SRC_URI += "file://fix-makefiles.patch"
 
 SRC_URI[md5sum] = "fa4677ecb8640c5d85c421dcaebf64fb"
 SRC_URI[sha256sum] = "e9de4a153ee3adc66363a583cd7db6676e92f010d783e517ef935aa35e96370e"
diff --git a/recipes/gpe-login/gpe-login_0.93.bb b/recipes/gpe-login/gpe-login_0.93.bb
index 03161bedad..4fdd44c469 100644
--- a/recipes/gpe-login/gpe-login_0.93.bb
+++ b/recipes/gpe-login/gpe-login_0.93.bb
@@ -14,13 +14,13 @@ GPE_TARBALL_SUFFIX = "bz2"
 inherit gpe autotools pkgconfig
 
 
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://c-locale.patch;patch=1 "
+SRC_URI += "file://removeblue-fontsize8.patch"
+SRC_URI += " file://chvt-keylaunch.patch "
+SRC_URI += " file://c-locale.patch "
 
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch"
+SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch"
+SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch"
 
 
 CONFFILES_${PN} += " \
diff --git a/recipes/gpe-login/gpe-login_0.95.bb b/recipes/gpe-login/gpe-login_0.95.bb
index 149a8700c1..4dcc79c8fd 100644
--- a/recipes/gpe-login/gpe-login_0.95.bb
+++ b/recipes/gpe-login/gpe-login_0.95.bb
@@ -16,14 +16,14 @@ GPE_TARBALL_SUFFIX = "bz2"
 inherit gpe autotools pkgconfig
 
 
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://c-locale.patch;patch=1 "
-SRC_URI += " file://no-deprecated-sysfs.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI += "file://removeblue-fontsize8.patch"
+SRC_URI += " file://chvt-keylaunch.patch "
+SRC_URI += " file://c-locale.patch "
+SRC_URI += " file://no-deprecated-sysfs.patch "
+
+SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch"
+SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch"
+SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch"
 
 
 CONFFILES_${PN} += " \
diff --git a/recipes/gpe-login/gpe-login_svn.bb b/recipes/gpe-login/gpe-login_svn.bb
index f02e095698..87ac97fe8f 100644
--- a/recipes/gpe-login/gpe-login_svn.bb
+++ b/recipes/gpe-login/gpe-login_svn.bb
@@ -12,7 +12,7 @@ inherit autotools
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
 
 SRC_URI = "${GPE_SVN} \
-	   file://removeblue-fontsize8.patch;patch=1"
+	   file://removeblue-fontsize8.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/gpe-mini-browser/gpe-mini-browser_0.21.bb b/recipes/gpe-mini-browser/gpe-mini-browser_0.21.bb
index 2f0f890c87..560118049d 100644
--- a/recipes/gpe-mini-browser/gpe-mini-browser_0.21.bb
+++ b/recipes/gpe-mini-browser/gpe-mini-browser_0.21.bb
@@ -6,7 +6,7 @@ RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpe
 
 PR = "r1"
 
-SRC_URI += "file://mini-browser-desktop-fix.patch;patch=0"
+SRC_URI += "file://mini-browser-desktop-fix.patch"
 
 S = "${WORKDIR}/gpe-mini-browser-${PV}"
 
diff --git a/recipes/gpe-mininet/gpe-mininet_0.5.bb b/recipes/gpe-mininet/gpe-mininet_0.5.bb
index d7d72342bb..b320318d3f 100644
--- a/recipes/gpe-mininet/gpe-mininet_0.5.bb
+++ b/recipes/gpe-mininet/gpe-mininet_0.5.bb
@@ -8,7 +8,7 @@ SECTION = "gpe"
 DESCRIPTION = "GPE network connection checker"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
-	   file://makefile-fix.patch;patch=1"
+	   file://makefile-fix.patch"
 
 FILES_${PN} = " ${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN} += " ${datadir}/gpe/pixmaps"
diff --git a/recipes/gpe-mixer/gpe-mixer_0.42.bb b/recipes/gpe-mixer/gpe-mixer_0.42.bb
index ec60342aef..d049c601f2 100644
--- a/recipes/gpe-mixer/gpe-mixer_0.42.bb
+++ b/recipes/gpe-mixer/gpe-mixer_0.42.bb
@@ -3,8 +3,8 @@ PR = "r2"
 
 inherit gpe pkgconfig
 
-SRC_URI += "file://gpemixer-no-host-includes.patch;patch=1 \
-	    file://fix-install.patch;patch=1"
+SRC_URI += "file://gpemixer-no-host-includes.patch \
+	    file://fix-install.patch"
 
 DESCRIPTION = "GPE audio mixer"
 DEPENDS = "gtk+ libgpewidget"
diff --git a/recipes/gpe-nmf/gpe-nmf_0.17.bb b/recipes/gpe-nmf/gpe-nmf_0.17.bb
index 476f67e033..a5646dccaf 100644
--- a/recipes/gpe-nmf/gpe-nmf_0.17.bb
+++ b/recipes/gpe-nmf/gpe-nmf_0.17.bb
@@ -3,7 +3,7 @@ require gpe-nmf.inc
 RDEPENDS = ""
 RRECOMMENDS = ""
 
-SRC_URI += "file://fix_makefiles.patch;patch=1"
+SRC_URI += "file://fix_makefiles.patch"
 
 SRC_URI[md5sum] = "3fd22f7d95f9e1f328d768dedf7313a5"
 SRC_URI[sha256sum] = "6c11e7af568bf13602dec79cba5aacea590a2ec585f96dc96f87fa8950ffc31d"
diff --git a/recipes/gpe-nmf/gpe-nmf_0.22.bb b/recipes/gpe-nmf/gpe-nmf_0.22.bb
index 0a42459dde..c80f78d9fe 100644
--- a/recipes/gpe-nmf/gpe-nmf_0.22.bb
+++ b/recipes/gpe-nmf/gpe-nmf_0.22.bb
@@ -4,8 +4,8 @@ RDEPENDS += "gst-plugin-decodebin"
 RRECOMMENDS += "gst-plugin-ivorbis gst-plugin-tcp"
 PR = "r3"
 
-SRC_URI += " file://playlist-segfault.patch;patch=1;pnum=0 \
-             file://fix-includepath.patch;patch=1"
+SRC_URI += " file://playlist-segfault.patch;striplevel=0 \
+             file://fix-includepath.patch"
 
 do_compile() {
         oe_runmake PREFIX=${prefix} GST_VERSION="0.8"
diff --git a/recipes/gpe-othello/gpe-othello_0.2-1.bb b/recipes/gpe-othello/gpe-othello_0.2-1.bb
index 6976ad26e9..1cb9e3f6a0 100644
--- a/recipes/gpe-othello/gpe-othello_0.2-1.bb
+++ b/recipes/gpe-othello/gpe-othello_0.2-1.bb
@@ -6,7 +6,7 @@ SECTION = "gpe/games"
 PRIORITY = "optional"
 PR = "r1"
 
-SRC_URI += "file://fix-makefiles.patch;patch=1"
+SRC_URI += "file://fix-makefiles.patch"
 
 SRC_URI[md5sum] = "2997e14b0956e73580e6c19ade35eb4f"
 SRC_URI[sha256sum] = "8beb35d6bc48e083adc6dd39851632f042ad364b5b8579c14bf8cdcf7dd91552"
diff --git a/recipes/gpe-ownerinfo/gpe-ownerinfo_0.24.bb b/recipes/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
index 202857aea1..6bedd8ae49 100644
--- a/recipes/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
+++ b/recipes/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
@@ -2,7 +2,7 @@ require gpe-ownerinfo.inc
 
 PR = "r2"
 
-SRC_URI += "file://fixloop.patch;patch=1;pnum=0"
+SRC_URI += "file://fixloop.patch;striplevel=0"
 
 SRC_URI[md5sum] = "c199248a2100398445542af9cab43338"
 SRC_URI[sha256sum] = "e997f5fda35c635533d37827c8a76361e124426ac5a130a18deebbd77b7502a8"
diff --git a/recipes/gpe-ownerinfo/gpe-ownerinfo_0.28.bb b/recipes/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
index 8533765221..482e919b7d 100644
--- a/recipes/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
+++ b/recipes/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
@@ -2,7 +2,7 @@ require gpe-ownerinfo.inc
 
 PR = "r2"
 
-SRC_URI += "file://compile.patch;patch=1"
+SRC_URI += "file://compile.patch"
 
 SRC_URI[md5sum] = "25b02a6d7fbbb2966e2481930bd55591"
 SRC_URI[sha256sum] = "3072876709e8fb58eda893ec0acb50b3eb6b8a7c808f4fbd74657c139933971a"
diff --git a/recipes/gpe-ownerinfo/gpe-ownerinfo_svn.bb b/recipes/gpe-ownerinfo/gpe-ownerinfo_svn.bb
index 036f70eaf1..8bfaffbcef 100644
--- a/recipes/gpe-ownerinfo/gpe-ownerinfo_svn.bb
+++ b/recipes/gpe-ownerinfo/gpe-ownerinfo_svn.bb
@@ -6,6 +6,6 @@ PV = "0.28+svn-${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += "${GPE_SVN} \
-	    file://svn-build.patch;patch=1" 
+	    file://svn-build.patch" 
 
 S = "${WORKDIR}/${PN}"
diff --git a/recipes/gpe-package/gpe-package_0.2.bb b/recipes/gpe-package/gpe-package_0.2.bb
index 086f77a5ab..424ba321a7 100644
--- a/recipes/gpe-package/gpe-package_0.2.bb
+++ b/recipes/gpe-package/gpe-package_0.2.bb
@@ -8,8 +8,8 @@ RDEPENDS = "gpe-icons"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-SRC_URI += "file://use-filesel.patch;patch=1 \
-	    file://nostropts.patch;patch=1"
+SRC_URI += "file://use-filesel.patch \
+	    file://nostropts.patch"
 
 SRC_URI[md5sum] = "764e50856c99140d20842e05ebb95e3e"
 SRC_URI[sha256sum] = "f82ddcf48e582eb1743727c1767a5dc81fa533c1a5ca40f3ac99a50a4479aefd"
diff --git a/recipes/gpe-package/gpe-package_0.3.bb b/recipes/gpe-package/gpe-package_0.3.bb
index df65e5ecc2..81f9b2f59f 100644
--- a/recipes/gpe-package/gpe-package_0.3.bb
+++ b/recipes/gpe-package/gpe-package_0.3.bb
@@ -8,8 +8,8 @@ RDEPENDS = "gpe-icons gpe-su"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-SRC_URI += " file://sbin-and-no-suid-install.patch;patch=1 \
-		file://search.patch;patch=1 \
+SRC_URI += " file://sbin-and-no-suid-install.patch \
+		file://search.patch \
 		file://gpe-package"
 
 FILES_${PN} += " /usr/bin/gpe-package"
diff --git a/recipes/gpe-package/gpe-package_0.4.bb b/recipes/gpe-package/gpe-package_0.4.bb
index 7cdea0b148..77fd48e748 100644
--- a/recipes/gpe-package/gpe-package_0.4.bb
+++ b/recipes/gpe-package/gpe-package_0.4.bb
@@ -8,7 +8,7 @@ RDEPENDS = "gpe-icons gpe-su"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-SRC_URI += " file://sbin-and-no-suid-install.patch;patch=1 \
+SRC_URI += " file://sbin-and-no-suid-install.patch \
 		file://gpe-package"
 
 FILES_${PN} += " /usr/bin/gpe-package"
diff --git a/recipes/gpe-plucker/gpe-plucker_0.4.bb b/recipes/gpe-plucker/gpe-plucker_0.4.bb
index 27e747d2b4..3a37f9de3c 100644
--- a/recipes/gpe-plucker/gpe-plucker_0.4.bb
+++ b/recipes/gpe-plucker/gpe-plucker_0.4.bb
@@ -8,8 +8,8 @@ PRIORITY = "optional"
 PR = "r3"
 
 SRC_URI += " \
-           file://plucker-no-host-includes.patch;patch=1 \
-           file://fix-install.patch;patch=1 \
+           file://plucker-no-host-includes.patch \
+           file://fix-install.patch \
            "
 
 PARALLEL_MAKE=""
diff --git a/recipes/gpe-question/gpe-question_0.04.bb b/recipes/gpe-question/gpe-question_0.04.bb
index e0b82a52fc..ffcf999127 100644
--- a/recipes/gpe-question/gpe-question_0.04.bb
+++ b/recipes/gpe-question/gpe-question_0.04.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 inherit gpe
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 DEPENDS = "libgpewidget"
 RDEPENDS = "gpe-icons"
diff --git a/recipes/gpe-scap/gpe-scap_1.2.bb b/recipes/gpe-scap/gpe-scap_1.2.bb
index b5a0383fc9..899b872b50 100644
--- a/recipes/gpe-scap/gpe-scap_1.2.bb
+++ b/recipes/gpe-scap/gpe-scap_1.2.bb
@@ -12,7 +12,7 @@ GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpe autotools
 
-SRC_URI += " file://deviceinfo.patch;patch=1;pnum=0"
+SRC_URI += " file://deviceinfo.patch;striplevel=0"
 
 SRC_URI[md5sum] = "875ed73f43584cd3ece4a7ac28dd692a"
 SRC_URI[sha256sum] = "a7ec60003a96975523598c2ef5f2927c9a362e689e7159b268c7fe431754635a"
diff --git a/recipes/gpe-scap/gpe-scap_1.3.bb b/recipes/gpe-scap/gpe-scap_1.3.bb
index 3d7d55f96a..edbe529ad5 100644
--- a/recipes/gpe-scap/gpe-scap_1.3.bb
+++ b/recipes/gpe-scap/gpe-scap_1.3.bb
@@ -12,7 +12,7 @@ GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpe autotools
 
-SRC_URI += " file://allow-glade-2.4.0.patch;patch=1"
+SRC_URI += " file://allow-glade-2.4.0.patch"
 
 SRC_URI[md5sum] = "7ba3d2592585c8bcf9d3bf1aafeefef3"
 SRC_URI[sha256sum] = "609e24aa1413b1053ee3fd42c36c6ccf05d8067867021511c7d50d4829875b44"
diff --git a/recipes/gpe-session-scripts/gpe-session-scripts_0.67.bb b/recipes/gpe-session-scripts/gpe-session-scripts_0.67.bb
index dbd8401992..1b1e81f695 100644
--- a/recipes/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/recipes/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -14,11 +14,11 @@ SRC_URI += "file://matchbox-session \
 PR = "r11"
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
-SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_hx4700 = " file://highdpifontfix.patch"
+SRC_URI_append_spitz = " file://highdpifontfix.patch"
+SRC_URI_append_akita = " file://highdpifontfix.patch"
+SRC_URI_append_c7x0 = " file://highdpifontfix.patch"
+SRC_URI_append_nokia770 = " file://highdpifontfix.patch"
 
 
 do_configure_append_angstrom() {
diff --git a/recipes/gpe-session-scripts/gpe-session-scripts_0.68.bb b/recipes/gpe-session-scripts/gpe-session-scripts_0.68.bb
index 96f4e3e2f0..66bf64afd7 100644
--- a/recipes/gpe-session-scripts/gpe-session-scripts_0.68.bb
+++ b/recipes/gpe-session-scripts/gpe-session-scripts_0.68.bb
@@ -14,11 +14,11 @@ SRC_URI += "file://matchbox-session \
 PR = "r0"
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
-SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_hx4700 = " file://highdpifontfix.patch"
+SRC_URI_append_spitz = " file://highdpifontfix.patch"
+SRC_URI_append_akita = " file://highdpifontfix.patch"
+SRC_URI_append_c7x0 = " file://highdpifontfix.patch"
+SRC_URI_append_nokia770 = " file://highdpifontfix.patch"
 
 
 do_configure_append_angstrom() {
diff --git a/recipes/gpe-shield/gpe-shield_0.9.bb b/recipes/gpe-shield/gpe-shield_0.9.bb
index 35288b96ce..c7ee88af53 100644
--- a/recipes/gpe-shield/gpe-shield_0.9.bb
+++ b/recipes/gpe-shield/gpe-shield_0.9.bb
@@ -10,7 +10,7 @@ PR          = "r1"
 
 inherit gpe pkgconfig
 
-SRC_URI += " file://uncrypt-startup-error.patch;patch=1 "
+SRC_URI += " file://uncrypt-startup-error.patch "
 
 SRC_URI[md5sum] = "1373a00d9dba5508da579c585c585d6d"
 SRC_URI[sha256sum] = "07d2a2d1c1868b292e3c362e4df4bf32c2aa4b6b22e394a9c5448b8cff4075dc"
diff --git a/recipes/gpe-sketchbook/gpe-sketchbook_0.2.8.bb b/recipes/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
index a0e514f8eb..bfa9b36fa8 100644
--- a/recipes/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
+++ b/recipes/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
@@ -8,8 +8,8 @@ inherit gpe pkgconfig
 CFLAGS +="-D_GNU_SOURCE"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
-	   file://sketchbook-size.patch;patch=1;pnum=0 \
-	   file://remove-render.patch;patch=1"
+	   file://sketchbook-size.patch;striplevel=0 \
+	   file://remove-render.patch"
 
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN} += " ${datadir}/gpe/pixmaps"
diff --git a/recipes/gpe-sketchbook/gpe-sketchbook_svn.bb b/recipes/gpe-sketchbook/gpe-sketchbook_svn.bb
index 049fe363f8..d0a9b51635 100644
--- a/recipes/gpe-sketchbook/gpe-sketchbook_svn.bb
+++ b/recipes/gpe-sketchbook/gpe-sketchbook_svn.bb
@@ -12,7 +12,7 @@ inherit pkgconfig autotools
 
 SRC_URI = "\
   ${GPE_SVN} \
-  file://svn-build.patch;patch=1 \
+  file://svn-build.patch \
 "
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/gpe-soundbite/gpe-soundbite_1.0.6.bb b/recipes/gpe-soundbite/gpe-soundbite_1.0.6.bb
index 536579019d..e8bd309a12 100644
--- a/recipes/gpe-soundbite/gpe-soundbite_1.0.6.bb
+++ b/recipes/gpe-soundbite/gpe-soundbite_1.0.6.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 inherit gpe pkgconfig
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 DESCRIPTION = "GPE audio Recorder"
 DEPENDS = "gtk+ libgpewidget libglade libgsm gpe-soundserver"
diff --git a/recipes/gpe-soundserver/gpe-soundserver_0.4-1.bb b/recipes/gpe-soundserver/gpe-soundserver_0.4-1.bb
index 608d8f95ba..b28d0e6ece 100644
--- a/recipes/gpe-soundserver/gpe-soundserver_0.4-1.bb
+++ b/recipes/gpe-soundserver/gpe-soundserver_0.4-1.bb
@@ -4,8 +4,8 @@ inherit gpe
 
 DEPENDS = "virtual/libx11 esound"
 
-SRC_URI += "file://makefile-breakage.patch;patch=1 \
-	    file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-breakage.patch \
+	    file://makefile-fix.patch"
 
 SRC_URI[md5sum] = "b9abca6437f13c4fc5bbb244738de9ea"
 SRC_URI[sha256sum] = "07c91f5433d7c6c44c54640e9f5b65addedaf0eec5c5705175608404bee6de37"
diff --git a/recipes/gpe-su/gpe-su.inc b/recipes/gpe-su/gpe-su.inc
index 287915e6f6..d5ba579cc5 100644
--- a/recipes/gpe-su/gpe-su.inc
+++ b/recipes/gpe-su/gpe-su.inc
@@ -7,4 +7,4 @@ SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
 
 inherit gpe pkgconfig
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
diff --git a/recipes/gpe-su/gpe-su_svn.bb b/recipes/gpe-su/gpe-su_svn.bb
index 73d36855e9..c8ae9cc5a8 100644
--- a/recipes/gpe-su/gpe-su_svn.bb
+++ b/recipes/gpe-su/gpe-su_svn.bb
@@ -3,7 +3,7 @@ require gpe-su.inc
 PR = "r1"
 
 SRC_URI = "${GPE_SVN} \
-           file://svn-build.patch;patch=1"
+           file://svn-build.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/gpe-taskmanager/gpe-taskmanager_0.17.bb b/recipes/gpe-taskmanager/gpe-taskmanager_0.17.bb
index 2707d790d1..4f7a8895c8 100644
--- a/recipes/gpe-taskmanager/gpe-taskmanager_0.17.bb
+++ b/recipes/gpe-taskmanager/gpe-taskmanager_0.17.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "GPE task manager"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 SRC_URI[md5sum] = "fd52d952a11913f98c833f6af012099d"
 SRC_URI[sha256sum] = "7d5938bea991f00e33268305ae11c977b92e4ab3392576f59132cd71fb7d782c"
diff --git a/recipes/gpe-taskmanager/gpe-taskmanager_0.18.bb b/recipes/gpe-taskmanager/gpe-taskmanager_0.18.bb
index a323d24f17..f44c793d64 100644
--- a/recipes/gpe-taskmanager/gpe-taskmanager_0.18.bb
+++ b/recipes/gpe-taskmanager/gpe-taskmanager_0.18.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "GPE task manager"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 SRC_URI[md5sum] = "dc5db99c16780086f76f48fc7d2e7ce5"
 SRC_URI[sha256sum] = "d6c219bbcb01db0bce13da92bcba618206a057b6cf191dcac788e8b1d6e858a0"
diff --git a/recipes/gpe-taskmanager/gpe-taskmanager_0.19.bb b/recipes/gpe-taskmanager/gpe-taskmanager_0.19.bb
index f07e092b5d..537b344606 100644
--- a/recipes/gpe-taskmanager/gpe-taskmanager_0.19.bb
+++ b/recipes/gpe-taskmanager/gpe-taskmanager_0.19.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "GPE task manager"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 SRC_URI[md5sum] = "b82b56730f927335f20c6eaf20f509e0"
 SRC_URI[sha256sum] = "406fe2dbc8cb6e8b56fa653f3d7b674203171233da097ee9ebb4413703f132ad"
diff --git a/recipes/gpe-taskmanager/gpe-taskmanager_0.20.bb b/recipes/gpe-taskmanager/gpe-taskmanager_0.20.bb
index 80681a31b8..e6f907774c 100644
--- a/recipes/gpe-taskmanager/gpe-taskmanager_0.20.bb
+++ b/recipes/gpe-taskmanager/gpe-taskmanager_0.20.bb
@@ -5,9 +5,9 @@ DEPENDS = "libgpelaunch libgpewidget"
 
 inherit gpe
 
-SRC_URI += "file://setlocale.patch;patch=1"
+SRC_URI += "file://setlocale.patch"
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 SRC_URI[md5sum] = "3754287bfccdcc7d219a3118ea2dd53f"
 SRC_URI[sha256sum] = "71c07e58b9eaa66ff140f5baa76c14d0fe3120223687bbb4b9817fe55b5e52e4"
diff --git a/recipes/gpe-terminal/gpe-terminal_svn.bb b/recipes/gpe-terminal/gpe-terminal_svn.bb
index 875c675b2c..80fbe7a076 100644
--- a/recipes/gpe-terminal/gpe-terminal_svn.bb
+++ b/recipes/gpe-terminal/gpe-terminal_svn.bb
@@ -8,7 +8,7 @@ PV = "1.1+svn-${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${GPE_EXTRA_SVN} \
-	   file://svn-build.patch;patch=1 \
+	   file://svn-build.patch \
            file://${PN}.desktop \
            file://${PN}.png"
 
diff --git a/recipes/gpe-tetris/gpe-tetris_0.6-2.bb b/recipes/gpe-tetris/gpe-tetris_0.6-2.bb
index b0187d195d..c802768ca6 100644
--- a/recipes/gpe-tetris/gpe-tetris_0.6-2.bb
+++ b/recipes/gpe-tetris/gpe-tetris_0.6-2.bb
@@ -6,7 +6,7 @@ DEPENDS = "gtk+ libgpewidget gpe-icons"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-SRC_URI += "file://fix-makefiles.patch;patch=1"
+SRC_URI += "file://fix-makefiles.patch"
 
 SRC_URI[md5sum] = "5c80c48fb82b88955214786843561e78"
 SRC_URI[sha256sum] = "592d66d654f8f9ffce6c811ae740e076e4be43c25f16c9945bacaa8eea1060c7"
diff --git a/recipes/gpe-tetris/gpe-tetris_0.6-4.bb b/recipes/gpe-tetris/gpe-tetris_0.6-4.bb
index b95da9c200..bfd371b064 100644
--- a/recipes/gpe-tetris/gpe-tetris_0.6-4.bb
+++ b/recipes/gpe-tetris/gpe-tetris_0.6-4.bb
@@ -8,7 +8,7 @@ DEPENDS = "gtk+ libgpewidget gpe-icons"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-SRC_URI += "file://fix-install.patch;patch=1"
+SRC_URI += "file://fix-install.patch"
 
 SRC_URI[md5sum] = "cd15add33be3857018eef8b57fc262a9"
 SRC_URI[sha256sum] = "f43b452ac845b7406fe6b6d7aa9ca64fad731142cd9912e79f03fc5c6b8c10ad"
diff --git a/recipes/gpe-todo/gpe-todo_0.51.bb b/recipes/gpe-todo/gpe-todo_0.51.bb
index b01d51efcd..a0536206ab 100644
--- a/recipes/gpe-todo/gpe-todo_0.51.bb
+++ b/recipes/gpe-todo/gpe-todo_0.51.bb
@@ -7,7 +7,7 @@ SECTION = "gpe"
 PRIORITY = "optional"
 PR ="r1"
 
-SRC_URI += "file://remove-render.patch;patch=1"
+SRC_URI += "file://remove-render.patch"
 
 
 SRC_URI[md5sum] = "cc3b6b7676671b81251fb237118daada"
diff --git a/recipes/gpe-watch/gpe-watch_0.10.bb b/recipes/gpe-watch/gpe-watch_0.10.bb
index cb7e162fd8..bcb8bcb481 100644
--- a/recipes/gpe-watch/gpe-watch_0.10.bb
+++ b/recipes/gpe-watch/gpe-watch_0.10.bb
@@ -7,9 +7,9 @@ DEPENDS = "gtk+ libgpewidget"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-SRC_URI += "file://fix_makefile.patch;patch=1 \
-            file://fix_install.patch;patch=1 \
-            file://no-render-h.patch;patch=1 \
+SRC_URI += "file://fix_makefile.patch \
+            file://fix_install.patch \
+            file://no-render-h.patch \
            "
 
 SRC_URI[md5sum] = "0c1cc9a5e7086194c1d2ff462759f135"
diff --git a/recipes/gpe-what/gpe-what_0.33.bb b/recipes/gpe-what/gpe-what_0.33.bb
index 71ae7dac95..e78275e871 100644
--- a/recipes/gpe-what/gpe-what_0.33.bb
+++ b/recipes/gpe-what/gpe-what_0.33.bb
@@ -1,5 +1,5 @@
 require gpe-what.inc
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 DEPENDS = "virtual/libx11 libxpm libmatchbox"
diff --git a/recipes/gpe-what/gpe-what_0.43.bb b/recipes/gpe-what/gpe-what_0.43.bb
index 95d4400562..1c2384dd39 100644
--- a/recipes/gpe-what/gpe-what_0.43.bb
+++ b/recipes/gpe-what/gpe-what_0.43.bb
@@ -2,7 +2,7 @@ require gpe-what.inc
 
 PR = "r1"
 
-SRC_URI += " file://set-wm-hint.patch;patch=1;pnum=0"
+SRC_URI += " file://set-wm-hint.patch;striplevel=0"
 
 SRC_URI[md5sum] = "f04e358d686a48157248a7a3ba115bf9"
 SRC_URI[sha256sum] = "35b4b6a48f09221c220fb397a3db8725c3c1053a950534310db719fc71123736"
diff --git a/recipes/gpephone/addressbook_0.1.bb b/recipes/gpephone/addressbook_0.1.bb
index 0d7871bc61..2dd01fbfbc 100644
--- a/recipes/gpephone/addressbook_0.1.bb
+++ b/recipes/gpephone/addressbook_0.1.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "LiPS address book"
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r0"
-PE          = "1"
 
 DEPENDS = "gtk+ libgpewidget libgpephone dbus-glib libabenabler libiac libim"
 
diff --git a/recipes/gpephone/addressbook_svn.bb b/recipes/gpephone/addressbook_svn.bb
index 3faaeba654..cb913bc663 100644
--- a/recipes/gpephone/addressbook_svn.bb
+++ b/recipes/gpephone/addressbook_svn.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "LiPS address book"
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r0"
-PV = "0.1+svnr${SRCPV}"
-PE = "1"
+PV = "0.1+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/gpephone/almmgrd_svn.bb b/recipes/gpephone/almmgrd_svn.bb
index 3186b0f3aa..70d02ff018 100644
--- a/recipes/gpephone/almmgrd_svn.bb
+++ b/recipes/gpephone/almmgrd_svn.bb
@@ -3,8 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "required"
 LICENSE = "LiPS"
 DEPENDS = "glib-2.0 libiac sqlite3 libcalenabler2 libalmmgr"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gpephone/calendar2_svn.bb b/recipes/gpephone/calendar2_svn.bb
index ea4392f9bb..a5a09a46fd 100644
--- a/recipes/gpephone/calendar2_svn.bb
+++ b/recipes/gpephone/calendar2_svn.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "Calendar application for GPE Phone Edition"
 LICENSE     = "LiPS"
 SECTION = "gpe"
 PRIORITY    = "optional"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR          = "r1"
 
 DEPENDS = "gtk+ libgpewidget libgpephone libgemwidget dbus-glib libcalenabler2 libiac"
@@ -11,7 +10,7 @@ DEPENDS = "gtk+ libgpewidget libgpephone libgemwidget dbus-glib libcalenabler2 l
 inherit gpephone autotools
 
 SRC_URI = "${GPEPHONE_SVN} \
-           file://disable-broken-tests.patch;patch=1"
+           file://disable-broken-tests.patch"
 
 S = ${WORKDIR}/${PN}
 
diff --git a/recipes/gpephone/cms92init_0.1.bb b/recipes/gpephone/cms92init_0.1.bb
index 48eb903107..3e13c150cd 100644
--- a/recipes/gpephone/cms92init_0.1.bb
+++ b/recipes/gpephone/cms92init_0.1.bb
@@ -8,7 +8,7 @@ PR = "r0"
 inherit gpephone
 
 SRC_URI = "${GPEPHONE_MIRROR}/GPRS/GPRS-${PV}.tar.bz2 \
-           file://oe-install.patch;patch=1"
+           file://oe-install.patch"
 
 
 S  = ${WORKDIR}/GPRS/cms92init-simple
diff --git a/recipes/gpephone/contact_svn.bb b/recipes/gpephone/contact_svn.bb
index b7eba1906a..4d0c7a5c81 100644
--- a/recipes/gpephone/contact_svn.bb
+++ b/recipes/gpephone/contact_svn.bb
@@ -3,8 +3,7 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ libgpephone dbus-glib libabenabler2 librecord2 libgemwidget"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 SRCREV = "1410"
 
diff --git a/recipes/gpephone/dialer_svn.bb b/recipes/gpephone/dialer_svn.bb
index 135c4ef43b..7b1b883652 100644
--- a/recipes/gpephone/dialer_svn.bb
+++ b/recipes/gpephone/dialer_svn.bb
@@ -3,8 +3,7 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ libgpephone libgemwidget"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
 inherit gpephone autotools
diff --git a/recipes/gpephone/firewall_svn.bb b/recipes/gpephone/firewall_svn.bb
index ae452b5200..6c3ed64b26 100644
--- a/recipes/gpephone/firewall_svn.bb
+++ b/recipes/gpephone/firewall_svn.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "Cellphone firewall tool"
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r1"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/gpephone/gpe-applauncher_0.10.bb b/recipes/gpephone/gpe-applauncher_0.10.bb
index cee698127d..bb0c2bb94c 100644
--- a/recipes/gpephone/gpe-applauncher_0.10.bb
+++ b/recipes/gpephone/gpe-applauncher_0.10.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r1"
-PE          = "1"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
diff --git a/recipes/gpephone/gpe-applauncher_0.11.bb b/recipes/gpephone/gpe-applauncher_0.11.bb
index 2961d7e9d9..45606de9e5 100644
--- a/recipes/gpephone/gpe-applauncher_0.11.bb
+++ b/recipes/gpephone/gpe-applauncher_0.11.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r2"
-PE          = "1"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
diff --git a/recipes/gpephone/gpe-applauncher_0.7.bb b/recipes/gpephone/gpe-applauncher_0.7.bb
index 986ec3bafe..6db12c7625 100644
--- a/recipes/gpephone/gpe-applauncher_0.7.bb
+++ b/recipes/gpephone/gpe-applauncher_0.7.bb
@@ -3,14 +3,13 @@ DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r1"
-PE          = "1"
 
 DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-client"
 
 GPE_TARBALL_SUFFIX= "gz"
 inherit gpephone autotools
 
-SRC_URI += " file://default-icon.patch;patch=1;pnum=0"
+SRC_URI += " file://default-icon.patch;striplevel=0"
 
 #EXTRA_OECONF = "--enable-gridlayout"
 
diff --git a/recipes/gpephone/gpe-applauncher_0.8.bb b/recipes/gpephone/gpe-applauncher_0.8.bb
index 70256b125e..0c152dad0f 100644
--- a/recipes/gpephone/gpe-applauncher_0.8.bb
+++ b/recipes/gpephone/gpe-applauncher_0.8.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r0"
-PE          = "1"
 
 DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings"
 
diff --git a/recipes/gpephone/gpe-applauncher_0.9.bb b/recipes/gpephone/gpe-applauncher_0.9.bb
index c74447f004..30af294da5 100644
--- a/recipes/gpephone/gpe-applauncher_0.9.bb
+++ b/recipes/gpephone/gpe-applauncher_0.9.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r0"
-PE          = "1"
 
 DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client"
 
diff --git a/recipes/gpephone/gpe-applauncher_svn.bb b/recipes/gpephone/gpe-applauncher_svn.bb
index 1d4c6990ed..3087088ab8 100644
--- a/recipes/gpephone/gpe-applauncher_svn.bb
+++ b/recipes/gpephone/gpe-applauncher_svn.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r1"
-PV          = "0.11+svnr${SRCPV}"
-PE = "1"
+PV          = "0.11+svnr-${SRCREV}"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gpephone/gpe-session-scripts-phone_0.67.bb b/recipes/gpephone/gpe-session-scripts-phone_0.67.bb
index 296dec0278..a1fdeb3ae1 100644
--- a/recipes/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/recipes/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -12,7 +12,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
            file://matchbox-session.vm \
            file://phonesession \
 	   file://disable-composite.xsettings \
-           file://standard-apps.patch;patch=1"
+           file://standard-apps.patch"
 
 PR = "r10"
 
diff --git a/recipes/gpephone/gsmmux_alpha-2.bb b/recipes/gpephone/gsmmux_alpha-2.bb
index 1c3d1e6257..9c7c9fc80a 100644
--- a/recipes/gpephone/gsmmux_alpha-2.bb
+++ b/recipes/gpephone/gsmmux_alpha-2.bb
@@ -9,7 +9,7 @@ DEPENDS = "glibc"
 inherit gpe
 
 SRC_URI = "http://download2.berlios.de/gsmmux/${P}.tar.gz \
-           file://gsmmux-makefile.patch;patch=1;pnum=0"
+           file://gsmmux-makefile.patch;striplevel=0"
 
 SRC_URI[md5sum] = "5bfa5605d9565ff01138d7a574cc2614"
 SRC_URI[sha256sum] = "fc029984019736eab2b0f10ce28d48ff88f8ceed7a1739cb4b71b851c4b89b91"
diff --git a/recipes/gpephone/libabenabler2_1.0.bb b/recipes/gpephone/libabenabler2_1.0.bb
index 92ee4437a4..cf70030648 100644
--- a/recipes/gpephone/libabenabler2_1.0.bb
+++ b/recipes/gpephone/libabenabler2_1.0.bb
@@ -4,12 +4,11 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 librecord2 gconf sqlite3"
 PR          = "r1"
-PE          = "1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
 
-SRC_URI += "file://i18n.patch;patch=1"
+SRC_URI += "file://i18n.patch"
 
 FILES_${PN} += "${datadir}/contact ${libdir}/lips/*.so"
 FILES_${PN}-dbg += "${libdir}/lips/.debug/*.so"
diff --git a/recipes/gpephone/libabenabler2_svn.bb b/recipes/gpephone/libabenabler2_svn.bb
index fae28a4c80..004ba3ec46 100644
--- a/recipes/gpephone/libabenabler2_svn.bb
+++ b/recipes/gpephone/libabenabler2_svn.bb
@@ -3,8 +3,7 @@ SECTION = "gpe/libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 librecord2 gconf sqlite3"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
 inherit gpephone pkgconfig autotools
diff --git a/recipes/gpephone/libabenabler_0.1.bb b/recipes/gpephone/libabenabler_0.1.bb
index 8cc28ba9c3..e8a999e301 100644
--- a/recipes/gpephone/libabenabler_0.1.bb
+++ b/recipes/gpephone/libabenabler_0.1.bb
@@ -4,7 +4,6 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 librecord liblipsevent libim sqlite3"
 PR          = "r1"
-PE          = "1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/recipes/gpephone/libabenabler_1.0.bb b/recipes/gpephone/libabenabler_1.0.bb
index 0f503bec92..834a201a69 100644
--- a/recipes/gpephone/libabenabler_1.0.bb
+++ b/recipes/gpephone/libabenabler_1.0.bb
@@ -4,7 +4,6 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 librecord liblipsevent libim sqlite3"
 PR          = "r1"
-PE          = "1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/recipes/gpephone/libabenabler_svn.bb b/recipes/gpephone/libabenabler_svn.bb
index f7b28c5b8a..4468c3580e 100644
--- a/recipes/gpephone/libabenabler_svn.bb
+++ b/recipes/gpephone/libabenabler_svn.bb
@@ -4,8 +4,7 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 librecord liblipsevent libim sqlite3"
 PR          = "r0"
-PV = "0.1+svnr${SRCPV}"
-PE = "1"
+PV = "0.1+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/gpephone/libalmmgr_svn.bb b/recipes/gpephone/libalmmgr_svn.bb
index c3bb36c9ce..cbae037109 100644
--- a/recipes/gpephone/libalmmgr_svn.bb
+++ b/recipes/gpephone/libalmmgr_svn.bb
@@ -3,8 +3,7 @@ SECTION = "gpe/libs"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "glib-2.0 libiac"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
 inherit gpephone pkgconfig autotools
diff --git a/recipes/gpephone/libchenabler_0.1.bb b/recipes/gpephone/libchenabler_0.1.bb
index db6f1fdda4..adbe3aa556 100644
--- a/recipes/gpephone/libchenabler_0.1.bb
+++ b/recipes/gpephone/libchenabler_0.1.bb
@@ -9,7 +9,7 @@ GPE_TARBALL_SUFFIX = "gz"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI += "file://po.patch;patch=1"
+SRC_URI += "file://po.patch"
 FILES_${PN} += " ${datadir}/vochistory"
 
 do_configure_prepend () {
diff --git a/recipes/gpephone/libgemwidget_0.1.bb b/recipes/gpephone/libgemwidget_0.1.bb
index f780c2c46b..16a7bba132 100644
--- a/recipes/gpephone/libgemwidget_0.1.bb
+++ b/recipes/gpephone/libgemwidget_0.1.bb
@@ -4,14 +4,13 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ libiac libgpephone"
 PR          = "r1"
-PE          = "1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
 
 # This really is not angstrom specific, but gtk 2.10 specific
 # for a better solution: "patches accepted"
-SRC_URI_append_angstrom = " file://gemfilechooser-NULL-callback.patch;patch=1"
+SRC_URI_append_angstrom = " file://gemfilechooser-NULL-callback.patch"
 
 do_stage () {
 	autotools_stage_all
diff --git a/recipes/gpephone/libgemwidget_1.0.bb b/recipes/gpephone/libgemwidget_1.0.bb
index f1a68fe240..af886cf908 100644
--- a/recipes/gpephone/libgemwidget_1.0.bb
+++ b/recipes/gpephone/libgemwidget_1.0.bb
@@ -4,12 +4,11 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ libiac libgpephone gnome-vfs libxdamage libxcomposite libgpewidget"
 PR          = "r0"
-PE          = "1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
 
-SRC_URI += " file://disable-tests.patch;patch=1 file://libgemwidget-fixup.diff;patch=1"
+SRC_URI += " file://disable-tests.patch file://libgemwidget-fixup.diff"
 
 FILES_${PN} += "${datadir}/gem"
 
diff --git a/recipes/gpephone/libgemwidget_svn.bb b/recipes/gpephone/libgemwidget_svn.bb
index c5ed24af6b..f4e2e350d8 100644
--- a/recipes/gpephone/libgemwidget_svn.bb
+++ b/recipes/gpephone/libgemwidget_svn.bb
@@ -3,8 +3,7 @@ LICENSE     = "LiPS"
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ libiac libgpephone gnome-vfs libxdamage libxcomposite libgpewidget"
-PV = "1.0+svnr${SRCPV}"
-PE = "1"
+PV = "1.0+svnr-${SRCREV}"
 PR          = "r0"
 
 inherit gpephone pkgconfig autotools
diff --git a/recipes/gpephone/libgpephone_0.3.bb b/recipes/gpephone/libgpephone_0.3.bb
index b49b51a31f..7a72851e0b 100644
--- a/recipes/gpephone/libgpephone_0.3.bb
+++ b/recipes/gpephone/libgpephone_0.3.bb
@@ -4,7 +4,6 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ gtk-doc dbus-glib"
 PR          = "r1"
-PE          = "1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
diff --git a/recipes/gpephone/libgpephone_0.4.bb b/recipes/gpephone/libgpephone_0.4.bb
index e9dc1e6061..114b08bfab 100644
--- a/recipes/gpephone/libgpephone_0.4.bb
+++ b/recipes/gpephone/libgpephone_0.4.bb
@@ -4,7 +4,6 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ gtk-doc dbus-glib"
 PR          = "r0"
-PE          = "1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
diff --git a/recipes/gpephone/libgpephone_svn.bb b/recipes/gpephone/libgpephone_svn.bb
index 219e64fb8f..ce960ac3cc 100644
--- a/recipes/gpephone/libgpephone_svn.bb
+++ b/recipes/gpephone/libgpephone_svn.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "Base library for GPE phone environment."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ gtk-doc dbus-glib"
-PV = "0.4+svnr${SRCPV}"
-PE = "1"
+PV = "0.4+svnr-${SRCREV}"
 PR          = "r0"
 
 inherit gpephone pkgconfig autotools
diff --git a/recipes/gpephone/libiac2_svn.bb b/recipes/gpephone/libiac2_svn.bb
index cea56f0d3d..fbec4092e0 100644
--- a/recipes/gpephone/libiac2_svn.bb
+++ b/recipes/gpephone/libiac2_svn.bb
@@ -11,7 +11,7 @@ PR = "r0"
 inherit gpephone pkgconfig autotools
 
 SRC_URI = "${GPEPHONE_SVN} \
-           file://disable-tests.patch;patch=1;pnum=0"
+           file://disable-tests.patch;striplevel=0"
 
 EXTRA_OECONF = "--enable-gui --enable-test=no  --with-cuint=no"
 
diff --git a/recipes/gpephone/libiac_0.1.bb b/recipes/gpephone/libiac_0.1.bb
index 7ec41d4b3c..d33a109886 100644
--- a/recipes/gpephone/libiac_0.1.bb
+++ b/recipes/gpephone/libiac_0.1.bb
@@ -4,12 +4,11 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ gtk-doc"
 PR          = "r2"
-PE          = "1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
 
-SRC_URI += "file://po.patch;patch=1"
+SRC_URI += "file://po.patch"
 
 do_stage () {
 	autotools_stage_all
diff --git a/recipes/gpephone/libiac_1.0.bb b/recipes/gpephone/libiac_1.0.bb
index 840bc5e9e9..16d063440e 100644
--- a/recipes/gpephone/libiac_1.0.bb
+++ b/recipes/gpephone/libiac_1.0.bb
@@ -4,7 +4,6 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ gtk-doc"
 PR          = "r1"
-PE          = "1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
diff --git a/recipes/gpephone/libim2_svn.bb b/recipes/gpephone/libim2_svn.bb
index 1dec41915a..337d73c2c4 100644
--- a/recipes/gpephone/libim2_svn.bb
+++ b/recipes/gpephone/libim2_svn.bb
@@ -3,14 +3,13 @@ DESCRIPTION = "LiPS instant messenger library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 librecord2 libabenabler2 liblipsevent2 telepathy-glib telepathy-mission-control"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR          = "r1"
 
 inherit gpephone pkgconfig autotools
 
 SRC_URI = "${GPEPHONE_SVN} \
-           file://disable-tests.patch;patch=1"
+           file://disable-tests.patch"
 
 EXTRA_OECONF = "--enable-test=no"
 
diff --git a/recipes/gpephone/liblipsevent2_svn.bb b/recipes/gpephone/liblipsevent2_svn.bb
index 5345c5a472..5d2330c671 100644
--- a/recipes/gpephone/liblipsevent2_svn.bb
+++ b/recipes/gpephone/liblipsevent2_svn.bb
@@ -3,8 +3,7 @@ LICENSE     = "LiPS"
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR          = "r0"
 
 inherit gpephone pkgconfig autotools
diff --git a/recipes/gpephone/libmsgenabler2_svn.bb b/recipes/gpephone/libmsgenabler2_svn.bb
index f6d154b32f..a294dc93b7 100644
--- a/recipes/gpephone/libmsgenabler2_svn.bb
+++ b/recipes/gpephone/libmsgenabler2_svn.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "LiPS message backend library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 dbus-glib librecord2 liblipsevent2 telepathy-mission-control libgsmd-lips"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR          = "r2"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gpephone/libmsgenabler_1.0.bb b/recipes/gpephone/libmsgenabler_1.0.bb
index dc79f781e4..b241a351f2 100644
--- a/recipes/gpephone/libmsgenabler_1.0.bb
+++ b/recipes/gpephone/libmsgenabler_1.0.bb
@@ -4,7 +4,6 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 dbus-glib librecord sqlite3"
 PR          = "r2"
-PE          = "1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/recipes/gpephone/libmsgenabler_svn.bb b/recipes/gpephone/libmsgenabler_svn.bb
index d37e519093..c8672e143e 100644
--- a/recipes/gpephone/libmsgenabler_svn.bb
+++ b/recipes/gpephone/libmsgenabler_svn.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "LiPS message backend library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 dbus-glib librecord sqlite3"
-PV = "1.0+svnr${SRCPV}"
-PE = "1"
+PV = "1.0+svnr-${SRCREV}"
 PR          = "r0"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gpephone/librecord2_0.1.bb b/recipes/gpephone/librecord2_0.1.bb
index f14c8e12e1..980531d62a 100644
--- a/recipes/gpephone/librecord2_0.1.bb
+++ b/recipes/gpephone/librecord2_0.1.bb
@@ -4,7 +4,6 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 util-linux-ng sqlite3"
 PR          = "r0"
-PE          = "1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
diff --git a/recipes/gpephone/librecord2_svn.bb b/recipes/gpephone/librecord2_svn.bb
index 9ec3b60ceb..e348376a63 100644
--- a/recipes/gpephone/librecord2_svn.bb
+++ b/recipes/gpephone/librecord2_svn.bb
@@ -4,8 +4,7 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 util-linux-ng sqlite3"
 PR          = "r0"
-PV = "0.1+svnr${SRCPV}"
-PE = "1"
+PV = "0.1+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/gpephone/libsettings_0.3.bb b/recipes/gpephone/libsettings_0.3.bb
index 8e5184b0f4..23507c3156 100644
--- a/recipes/gpephone/libsettings_0.3.bb
+++ b/recipes/gpephone/libsettings_0.3.bb
@@ -4,7 +4,6 @@ PRIORITY = "required"
 LICENSE = "LiPS"
 DEPENDS = "glib-2.0 gconf"
 PR = "r1"
-PE = "1"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/recipes/gpephone/libsettings_svn.bb b/recipes/gpephone/libsettings_svn.bb
index aa55352cd6..770fe8cce6 100644
--- a/recipes/gpephone/libsettings_svn.bb
+++ b/recipes/gpephone/libsettings_svn.bb
@@ -3,8 +3,7 @@ SECTION = "gpe/libs"
 PRIORITY = "required"
 LICENSE = "LiPS"
 DEPENDS = "glib-2.0 gconf"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gpephone/libtapi_svn.bb b/recipes/gpephone/libtapi_svn.bb
index 29bc40cf2d..68e578728a 100644
--- a/recipes/gpephone/libtapi_svn.bb
+++ b/recipes/gpephone/libtapi_svn.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "LiPS telephony library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ libglade libgsmd"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR          = "r0"
 
 inherit gpephone pkgconfig autotools
diff --git a/recipes/gpephone/libvoc_svn.bb b/recipes/gpephone/libvoc_svn.bb
index eaec6d2f51..3389c7d10a 100644
--- a/recipes/gpephone/libvoc_svn.bb
+++ b/recipes/gpephone/libvoc_svn.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "LiPS voice call library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ libglade libgsmd"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 PR          = "r0"
 
 inherit gpephone pkgconfig autotools
diff --git a/recipes/gpephone/linphone_1.5.0.bb b/recipes/gpephone/linphone_1.5.0.bb
index 293ea22dc3..0d20693fad 100644
--- a/recipes/gpephone/linphone_1.5.0.bb
+++ b/recipes/gpephone/linphone_1.5.0.bb
@@ -6,8 +6,8 @@ DEPENDS = "libosip2 speex libogg alsa-lib readline"
 PR = "r2"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/linphone-${PV}.tar.gz \
-           file://linphone-1.5.0.patch;patch=1 \
-           file://linphone-pkgconfig.patch;patch=1;pnum=0"
+           file://linphone-1.5.0.patch \
+           file://linphone-pkgconfig.patch;striplevel=0"
 
 FILES_${PN} += "${datadir}/linphonec"
 
diff --git a/recipes/gpephone/machined_svn.bb b/recipes/gpephone/machined_svn.bb
index 1f1bc01246..0c5ccfff51 100644
--- a/recipes/gpephone/machined_svn.bb
+++ b/recipes/gpephone/machined_svn.bb
@@ -3,8 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 dbus-glib gtk+"
-PV = "0.1+svnr${SRCPV}"
-PE = "1"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gpephone/phoneserver_1.0.bb b/recipes/gpephone/phoneserver_1.0.bb
index 64c88d4174..e2adf2c3f3 100644
--- a/recipes/gpephone/phoneserver_1.0.bb
+++ b/recipes/gpephone/phoneserver_1.0.bb
@@ -11,8 +11,8 @@ DEPENDS = "dbus-glib glib-2.0  libmsgenabler libabenabler"
 GPE_TARBALL_SUFFIX= "bz2"
 inherit gpephone autotools
 
-SRC_URI_append_x86 = " file://changeport.patch;patch=1;pnum=0"
-SRC_URI_append_om-gta01 = " file://phoneserver-gta01.patch;patch=1"
+SRC_URI_append_x86 = " file://changeport.patch;striplevel=0"
+SRC_URI_append_om-gta01 = " file://phoneserver-gta01.patch"
 
 
 SRC_URI[md5sum] = "6f6450c4e762059e790216b15b5930e6"
diff --git a/recipes/gpephone/ptim-engine_1.0.bb b/recipes/gpephone/ptim-engine_1.0.bb
index 2b636ae5f6..21976844fa 100644
--- a/recipes/gpephone/ptim-engine_1.0.bb
+++ b/recipes/gpephone/ptim-engine_1.0.bb
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
 PR = "r0"
-PE = "1"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/recipes/gpephone/ptim-engine_svn.bb b/recipes/gpephone/ptim-engine_svn.bb
index 8f9bf66854..281ee72c26 100644
--- a/recipes/gpephone/ptim-engine_svn.bb
+++ b/recipes/gpephone/ptim-engine_svn.bb
@@ -3,8 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
-PV = "0.1+svnr${SRCPV}"
-PE = "1"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
@@ -21,4 +20,4 @@ FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la"
 
 do_stage () {
     autotools_stage_all
-}
+}
\ No newline at end of file
diff --git a/recipes/gpephone/ptim-headers_1.0.bb b/recipes/gpephone/ptim-headers_1.0.bb
index 24e34cb08a..10d72137f1 100644
--- a/recipes/gpephone/ptim-headers_1.0.bb
+++ b/recipes/gpephone/ptim-headers_1.0.bb
@@ -3,7 +3,6 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+"
-PE = "1"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/recipes/gpephone/ptim-headers_svn.bb b/recipes/gpephone/ptim-headers_svn.bb
index f7a6ba2b77..797d7abfaf 100644
--- a/recipes/gpephone/ptim-headers_svn.bb
+++ b/recipes/gpephone/ptim-headers_svn.bb
@@ -3,8 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+"
-PV = "0.1+svnr${SRCPV}"
-PE = "1"
+PV = "0.1+svnr-${SRCREV}"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/recipes/gpephone/ptim-helper_1.0.bb b/recipes/gpephone/ptim-helper_1.0.bb
index f08fee152e..fc3ed71b06 100644
--- a/recipes/gpephone/ptim-helper_1.0.bb
+++ b/recipes/gpephone/ptim-helper_1.0.bb
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
 PR = "r1"
-PE = "1"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/recipes/gpephone/ptim-helper_svn.bb b/recipes/gpephone/ptim-helper_svn.bb
index e0ebbb6182..c5a84c519a 100644
--- a/recipes/gpephone/ptim-helper_svn.bb
+++ b/recipes/gpephone/ptim-helper_svn.bb
@@ -3,8 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
-PV = "0.1+svnr${SRCPV}"
-PE = "1"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gpephone/ptim-manager_1.0.bb b/recipes/gpephone/ptim-manager_1.0.bb
index eef26145b8..1a09161847 100644
--- a/recipes/gpephone/ptim-manager_1.0.bb
+++ b/recipes/gpephone/ptim-manager_1.0.bb
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers libiac"
 PR = "r0"
-PE = "1"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/recipes/gpephone/ptim-manager_svn.bb b/recipes/gpephone/ptim-manager_svn.bb
index 6c3545dadf..d89a60fe2f 100644
--- a/recipes/gpephone/ptim-manager_svn.bb
+++ b/recipes/gpephone/ptim-manager_svn.bb
@@ -3,8 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers libiac"
-PV = "0.1+svnr${SRCPV}"
-PE = "1"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gpephone/quickdial_svn.bb b/recipes/gpephone/quickdial_svn.bb
index b111fe1ded..2a52510d86 100644
--- a/recipes/gpephone/quickdial_svn.bb
+++ b/recipes/gpephone/quickdial_svn.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "Quickdial application and backend"
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r0"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/gpephone/sms_1.0.bb b/recipes/gpephone/sms_1.0.bb
index 02256f7bdf..151caa3514 100644
--- a/recipes/gpephone/sms_1.0.bb
+++ b/recipes/gpephone/sms_1.0.bb
@@ -10,7 +10,7 @@ GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpephone autotools
 
-SRC_URI += " file://somefixes.patch;patch=1;pnum=0"
+SRC_URI += " file://somefixes.patch;striplevel=0"
 
 FILES_${PN} += "${datadir}/conf ${datadir}/graphic"
 
diff --git a/recipes/gpephone/useen_svn.bb b/recipes/gpephone/useen_svn.bb
index 1dd4a6584d..1a180683a7 100644
--- a/recipes/gpephone/useen_svn.bb
+++ b/recipes/gpephone/useen_svn.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "Useen tool"
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r0"
-PV = "0.0+svnr${SRCPV}"
-PE = "1"
+PV = "0.0+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/gpephone/xoo-vm_0.7-20070204.bb b/recipes/gpephone/xoo-vm_0.7-20070204.bb
index 0bdda47359..3983ea1aef 100644
--- a/recipes/gpephone/xoo-vm_0.7-20070204.bb
+++ b/recipes/gpephone/xoo-vm_0.7-20070204.bb
@@ -9,7 +9,7 @@ PV = "0.7+svn${SRCDATE}"
 PR = "r3"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
-           file://gpephone-vm.patch;patch=1;pnum=0"
+           file://gpephone-vm.patch;striplevel=0"
 
 S = "${WORKDIR}/Xoo"
 
diff --git a/recipes/gperf/gperf_3.0.3.bb b/recipes/gperf/gperf_3.0.3.bb
index 5228d372ab..4f6b5ab6e8 100644
--- a/recipes/gperf/gperf_3.0.3.bb
+++ b/recipes/gperf/gperf_3.0.3.bb
@@ -3,7 +3,7 @@ LICENSE  = "GPL"
 SUMMARY  = "Generate a perfect hash function from a set of keywords"
 
 SRC_URI  = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz \
-            file://autoreconf.patch;patch=1"
+            file://autoreconf.patch"
 
 inherit autotools
 
diff --git a/recipes/gphoto2/gphoto2_2.4.2.bb b/recipes/gphoto2/gphoto2_2.4.2.bb
index 6222f99fa2..cd73d30bf6 100644
--- a/recipes/gphoto2/gphoto2_2.4.2.bb
+++ b/recipes/gphoto2/gphoto2_2.4.2.bb
@@ -5,7 +5,7 @@ DEPENDS = "libtool libgphoto2 popt"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2\
-           file://gphoto-popt-fixup.patch;patch=1"
+           file://gphoto-popt-fixup.patch"
 
 inherit autotools
 
diff --git a/recipes/gphoto2/gphoto2_2.4.4.bb b/recipes/gphoto2/gphoto2_2.4.4.bb
index 86d90f38a1..1ed0a46de8 100644
--- a/recipes/gphoto2/gphoto2_2.4.4.bb
+++ b/recipes/gphoto2/gphoto2_2.4.4.bb
@@ -5,7 +5,7 @@ DEPENDS = "libtool libgphoto2 popt"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2\
-           file://gphoto-popt-fixup.patch;patch=1"
+           file://gphoto-popt-fixup.patch"
 
 inherit autotools
 
diff --git a/recipes/gphoto2/gphoto2_2.4.7.bb b/recipes/gphoto2/gphoto2_2.4.7.bb
index 581c051072..fcb6d27791 100644
--- a/recipes/gphoto2/gphoto2_2.4.7.bb
+++ b/recipes/gphoto2/gphoto2_2.4.7.bb
@@ -5,7 +5,7 @@ DEPENDS = "libtool libgphoto2 popt"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2\
-           file://gphoto-popt-fixup.patch;patch=1"
+           file://gphoto-popt-fixup.patch"
 
 inherit autotools
 
diff --git a/recipes/gphoto2/gphoto2_2.4.8.bb b/recipes/gphoto2/gphoto2_2.4.8.bb
index 45f3caae61..ea54713d70 100644
--- a/recipes/gphoto2/gphoto2_2.4.8.bb
+++ b/recipes/gphoto2/gphoto2_2.4.8.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "libtool libgphoto2 popt"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \
-           file://gphoto-popt-fixup.patch;patch=1"
+           file://gphoto-popt-fixup.patch"
 
 SRC_URI[gphoto2.md5sum] = "401e403ea6e8301d6c87cbe7cd892b8b"
 SRC_URI[gphoto2.sha256sum] = "a2e2f70fd6051234cbc3d76dc82df6991e8a07ead56aa8d5c4452e9bdb0e32a4"
diff --git a/recipes/gphoto2/ptp-gadget_git.bb b/recipes/gphoto2/ptp-gadget_git.bb
index 376ee2120f..580910045b 100644
--- a/recipes/gphoto2/ptp-gadget_git.bb
+++ b/recipes/gphoto2/ptp-gadget_git.bb
@@ -10,7 +10,7 @@ PR_append = "+gitr${SRCREV}"
 
 SRCREV = "ef7ef29b5cdcf8630c901362a66905b956242e0d"
 SRC_URI = "git://git.denx.de/ptp-gadget.git;protocol=git \
-           file://0001-Fix-musb_hdrc-EP_STATUS_NAME.patch;patch=1"
+           file://0001-Fix-musb_hdrc-EP_STATUS_NAME.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/gpicview/gpicview_0.1.5.bb b/recipes/gpicview/gpicview_0.1.5.bb
index 600658f316..5a646f573f 100644
--- a/recipes/gpicview/gpicview_0.1.5.bb
+++ b/recipes/gpicview/gpicview_0.1.5.bb
@@ -7,7 +7,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
-
-
 SRC_URI[md5sum] = "5c484ea089f5a6455265e1e1f472240e"
 SRC_URI[sha256sum] = "7663e1849f3b1f2225a3310f907f86068d7ac5c8957d68fc4a684059b49211ca"
diff --git a/recipes/gpicview/gpicview_0.2.1.bb b/recipes/gpicview/gpicview_0.2.1.bb
new file mode 100644
index 0000000000..bf2b54ec72
--- /dev/null
+++ b/recipes/gpicview/gpicview_0.2.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Extremely lightweight and fast with low memory usage"
+LICENSE = "GPL"
+
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+SRC_URI[md5sum] = "a2de255bf9bdc40746c0dc89b3454a10"
+SRC_URI[sha256sum] = "4c85ef5affba0812b22426217871cc18366fa570e195dc43a5e0f17fbc005639"
+
diff --git a/recipes/gpio-event/gpio-event.bb b/recipes/gpio-event/gpio-event.bb
index be2c0f25a4..582c80b219 100644
--- a/recipes/gpio-event/gpio-event.bb
+++ b/recipes/gpio-event/gpio-event.bb
@@ -11,7 +11,7 @@ DEPENDS = "virtual/kernel"
 PR = "r4"
 
 SRC_URI = "http://davehylands.com/gumstix-wiki/gpio-event/gpio-event-2.6.21-1444-select.tar.gz \
-   file://makefile.patch;patch=1 \
+   file://makefile.patch \
    "
 
 S = "${WORKDIR}/gpio-event"
diff --git a/recipes/gpm/gpm_1.20.1.bb b/recipes/gpm/gpm_1.20.1.bb
index 6506c4d42d..c9422bbe75 100644
--- a/recipes/gpm/gpm_1.20.1.bb
+++ b/recipes/gpm/gpm_1.20.1.bb
@@ -9,9 +9,9 @@ PR = "r3"
 PARALLEL_MAKE = ""
 
 SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-	   file://no-docs.patch;patch=1 \
-	   file://gpm-OPEN_MAX.patch;patch=1 \
+	   file://configure.patch \
+	   file://no-docs.patch \
+	   file://gpm-OPEN_MAX.patch \
 	   file://init"
 
 inherit autotools update-rc.d
diff --git a/recipes/gpsbabel/gpsbabel_1.3.6.bb b/recipes/gpsbabel/gpsbabel_1.3.6.bb
index 6204451f7f..77464c76a0 100644
--- a/recipes/gpsbabel/gpsbabel_1.3.6.bb
+++ b/recipes/gpsbabel/gpsbabel_1.3.6.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gpsbabel.org/"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.gpsbabel.org/plan9.php?dl=gpsbabel-${PV}.tar.gz \
-           file://autotools.patch;patch=1"
+           file://autotools.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gpsd/files/gpsd b/recipes/gpsd/files/gpsd
index fde4285569..3687d24001 100755
--- a/recipes/gpsd/files/gpsd
+++ b/recipes/gpsd/files/gpsd
@@ -52,7 +52,8 @@ do_start()
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test \
+        -- $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES > /dev/null \
 		|| return 1
 	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
 		$GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES \
diff --git a/recipes/gpsd/gpsd.inc b/recipes/gpsd/gpsd.inc
index 5c55e3ff1f..f2fdb4c07e 100644
--- a/recipes/gpsd/gpsd.inc
+++ b/recipes/gpsd/gpsd.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "dbus-glib ncurses python"
 PROVIDES = "virtual/gpsd"
-INC_PR = "r5"
+INC_PR = "r6"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR} \
@@ -86,5 +86,5 @@ RDEPENDS_gps-utils = "python-pygps"
 
 DESCRIPTION_python-pygps = "Python bindings to gpsd"
 FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*"
-RDEPENDS_python-pygps = "python-core python-curses gpsd"
+RDEPENDS_python-pygps = "python-core python-curses gpsd python-json"
 
diff --git a/recipes/gpsd/gpsd_2.90.bb b/recipes/gpsd/gpsd_2.90.bb
index 2131ef7d63..25c739b7a8 100644
--- a/recipes/gpsd/gpsd_2.90.bb
+++ b/recipes/gpsd/gpsd_2.90.bb
@@ -1,6 +1,6 @@
 require gpsd.inc
 
-SRC_URI += "file://libtool.patch;patch=1"
+SRC_URI += "file://libtool.patch"
 SRC_URI[gpsd.md5sum] = "a23c728b8734c542d559c485857238d2"
 SRC_URI[gpsd.sha256sum] = "8c81461266fc95aae6519ec996d7e4f4801fb5a02dbcc7a5d1c130bf7fe0cd53"
 
diff --git a/recipes/gpsd/gpsd_2.91.bb b/recipes/gpsd/gpsd_2.91.bb
index d0e858d09a..7c575cb2b2 100644
--- a/recipes/gpsd/gpsd_2.91.bb
+++ b/recipes/gpsd/gpsd_2.91.bb
@@ -1,7 +1,7 @@
 require gpsd.inc
 
-SRC_URI += "file://libtool.patch;patch=1 \
-            file://cross-compile-on-gentoo.patch;patch=1 "
+SRC_URI += "file://libtool.patch \
+            file://cross-compile-on-gentoo.patch "
 SRC_URI[gpsd.md5sum] = "c1f97199168c03a431db1a6559b13448"
 SRC_URI[gpsd.sha256sum] = "02ee0f0a86a3c74fe807ea0a3fce908cb94dd7ff3afcef0b1fb663a46c1f71d8"
 
diff --git a/recipes/gpsd/gpsd_2.94.bb b/recipes/gpsd/gpsd_2.94.bb
new file mode 100644
index 0000000000..5cf8b2e6f6
--- /dev/null
+++ b/recipes/gpsd/gpsd_2.94.bb
@@ -0,0 +1,9 @@
+require gpsd.inc
+
+SRC_URI += "file://libtool.patch"
+SRC_URI[gpsd.md5sum] = "ce70bcd707ac1df861d4c72f503c09d1"
+SRC_URI[gpsd.sha256sum] = "1520b87d106d198aa42137db4b230615dbd0d06b04e6fcc84e010172fba2da41"
+
+PR = "${INC_PR}.0"
+
+PARALLEL_MAKE = ""
diff --git a/recipes/gpsdrive/gpsdrive-pda_2.10pre2.bb b/recipes/gpsdrive/gpsdrive-pda_2.10pre2.bb
index e79240e392..ea35796f43 100644
--- a/recipes/gpsdrive/gpsdrive-pda_2.10pre2.bb
+++ b/recipes/gpsdrive/gpsdrive-pda_2.10pre2.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.gedanken.demon.co.uk/gpsdrive-ipaq/"
 
 SRC_URI = "http://www.gedanken.demon.co.uk/gpsdrive-ipaq/gpsdrive-2.10pre2-ipaq-r4.tar.gz \
            file://gpsdrive.desktop \
-	   file://makefile.patch;patch=1 "
+	   file://makefile.patch "
 
 S = "${WORKDIR}/gpsdrive-2.10pre2-ipaq"
 
diff --git a/recipes/gpsdrive/gpsdrive_2.10pre4.bb b/recipes/gpsdrive/gpsdrive_2.10pre4.bb
index 37c40464e7..96cd6f1a9c 100644
--- a/recipes/gpsdrive/gpsdrive_2.10pre4.bb
+++ b/recipes/gpsdrive/gpsdrive_2.10pre4.bb
@@ -7,9 +7,9 @@ PR = "r2"
 
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive_2.10pre4.desktop \
-           file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \
-           file://gpsdrive-ifdef-mapnik.patch;patch=1 \
-           file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
+           file://gpsdrive-remove-hardcoded-paths.patch \
+           file://gpsdrive-ifdef-mapnik.patch \
+           file://gpsdrive-2.10pre4-openstreetmap-download.patch"
 
 do_install_append () {
         mkdir -p  ${D}${datadir}/applications
diff --git a/recipes/gpstk/gpstk_1.2.bb b/recipes/gpstk/gpstk_1.2.bb
index 72d6818a2b..53fc07b19e 100644
--- a/recipes/gpstk/gpstk_1.2.bb
+++ b/recipes/gpstk/gpstk_1.2.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gpstk/gpstk-${PV}-src.tar.gz \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 
 inherit autotools lib_package
 
diff --git a/recipes/gqview/gqview_2.1.5.bb b/recipes/gqview/gqview_2.1.5.bb
index a4ef4725ea..5bb2821092 100644
--- a/recipes/gqview/gqview_2.1.5.bb
+++ b/recipes/gqview/gqview_2.1.5.bb
@@ -7,10 +7,10 @@ RRECOMMENDS = "gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png gdk-pixbuf-loader-gi
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gqview/gqview-2.1.5.tar.gz \
-	   file://include-path-fix.patch;patch=1 \
-	   file://gqview-rc-quotes.patch;patch=1;pnum=0 \
-	   file://gqview-motion-hint.patch;patch=1;pnum=0 \
-	   file://gqview-gimp.patch;patch=1;pnum=0"
+	   file://include-path-fix.patch \
+	   file://gqview-rc-quotes.patch;striplevel=0 \
+	   file://gqview-motion-hint.patch;striplevel=0 \
+	   file://gqview-gimp.patch;striplevel=0"
 
 inherit autotools
 
diff --git a/recipes/grdesktop/grdesktop_0.23.bb b/recipes/grdesktop/grdesktop_0.23.bb
index 5beec4587d..6fb64ef1bc 100644
--- a/recipes/grdesktop/grdesktop_0.23.bb
+++ b/recipes/grdesktop/grdesktop_0.23.bb
@@ -13,8 +13,8 @@ RDEPENDS ="rdesktop gail orbit2 gnome-vfs gnome-keyring libbonobo libbonoboui \
 PR = "r1"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/grdesktop/grdesktop-${PV}.tar.gz \
-           file://fr.po.patch;patch=1 \
-           file://install-help.patch;patch=1"
+           file://fr.po.patch \
+           file://install-help.patch"
       
 
 S = "${WORKDIR}/grdesktop-${PV}"
diff --git a/recipes/grep/grep_2.5.1.bb b/recipes/grep/grep_2.5.1.bb
index 3a76f41424..be954a62ad 100644
--- a/recipes/grep/grep_2.5.1.bb
+++ b/recipes/grep/grep_2.5.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "grep GNU utility"
 PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
-           file://uclibc-fix.patch;patch=1"
+           file://uclibc-fix.patch"
 
 inherit autotools
 
diff --git a/recipes/grep/grep_2.5.bb b/recipes/grep/grep_2.5.bb
index f576fc66a2..92e5d9ff01 100644
--- a/recipes/grep/grep_2.5.bb
+++ b/recipes/grep/grep_2.5.bb
@@ -3,7 +3,7 @@ SECTION = "console/utils"
 DESCRIPTION = "grep GNU utility"
 
 SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
-	   file://install.patch;patch=1"
+	   file://install.patch"
 
 inherit autotools
 
diff --git a/recipes/grip/grip_3.2.0.bb b/recipes/grip/grip_3.2.0.bb
index eaa24b097c..11d6ce7bca 100644
--- a/recipes/grip/grip_3.2.0.bb
+++ b/recipes/grip/grip_3.2.0.bb
@@ -6,9 +6,9 @@ HOMEPAGE="http://www.nostatic.org/grip/"
 LICENSE="GPL"
 
 SRC_URI="${SOURCEFORGE_MIRROR}/grip/grip-${PV}.tar.gz \
-         file://patch-src::discdb;patch=1;pnum=0 \
-         file://patch-src::main.c;patch=1;pnum=0 \
-         file://no-host-includes.patch;patch=1 "
+         file://patch-src::discdb;apply=yes;striplevel=0 \
+         file://patch-src::main.c;apply=yes;striplevel=0 \
+         file://no-host-includes.patch "
 DEPENDS="libgnomeui vte curl cdparanoia id3lib"
 
 PR = "r3"
diff --git a/recipes/grip/grip_3.3.1.bb b/recipes/grip/grip_3.3.1.bb
index 965d0464ea..491bd8d8fb 100644
--- a/recipes/grip/grip_3.3.1.bb
+++ b/recipes/grip/grip_3.3.1.bb
@@ -6,7 +6,7 @@ HOMEPAGE="http://www.nostatic.org/grip/"
 LICENSE="GPL"
 
 SRC_URI="${SOURCEFORGE_MIRROR}/${PN}/${PV}/${P}.tar.gz;name=grip \
-         file://no-host-includes.patch;patch=1 "
+         file://no-host-includes.patch "
 SRC_URI[grip.md5sum] = "4b4233999b9f2bc85c711092553ea9aa"
 SRC_URI[grip.sha256sum] = "d46394a1062ed066f9c633b010fd1059e63d9ed791bbb7a85bc6567cf0fd66fd"
 
diff --git a/recipes/groff/groff_1.19.1.bb b/recipes/groff/groff_1.19.1.bb
index 6046e9aedd..7e36d15bf4 100644
--- a/recipes/groff/groff_1.19.1.bb
+++ b/recipes/groff/groff_1.19.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 PR = "r3"
 
 SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \
-	           file://groff.patch;patch=1"
+	           file://groff.patch"
 
 PARALLEL_MAKE = ""
 # prefix and exec-prefix are broken and the .in file is broken too
diff --git a/recipes/groff/groff_1.19.2.bb b/recipes/groff/groff_1.19.2.bb
index f6a19e5a4a..22afab2d98 100644
--- a/recipes/groff/groff_1.19.2.bb
+++ b/recipes/groff/groff_1.19.2.bb
@@ -4,9 +4,9 @@ LICENSE = "GPL"
 PR = "r6"
 
 SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \
-	           file://Makefile.in.patch;patch=1 \
-	           file://Makefile.sub.patch;patch=1 \
-	           file://groff.patch;patch=1"
+	           file://Makefile.in.patch \
+	           file://Makefile.sub.patch \
+	           file://groff.patch"
 
 inherit autotools
 
diff --git a/recipes/grub/grub_0.97.bb b/recipes/grub/grub_0.97.bb
index 24835d8142..98691c1c38 100644
--- a/recipes/grub/grub_0.97.bb
+++ b/recipes/grub/grub_0.97.bb
@@ -6,9 +6,9 @@ RDEPENDS_${PN}-install = "diffutils"
 PR = "r6"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
-           file://automake-1.10.patch;patch=1 \
-           file://grub-0.97-disk_geometry-1.patch;patch=1 \
-           file://grub-support-256byte-inode.diff;patch=1 \
+           file://automake-1.10.patch \
+           file://grub-0.97-disk_geometry-1.patch \
+           file://grub-support-256byte-inode.diff \
            file://menu.lst"
 
 inherit autotools
diff --git a/recipes/gs/gs_8.64.bb b/recipes/gs/gs_8.64.bb
index 20171cab34..9aac182a98 100644
--- a/recipes/gs/gs_8.64.bb
+++ b/recipes/gs/gs_8.64.bb
@@ -6,16 +6,16 @@ DEPENDS = "jpeg zlib fontconfig cups"
 PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/g/ghostscript/ghostscript_${PV}~dfsg.orig.tar.gz;name=tarball \
-           file://0001_svn_snapshot.patch;patch=1 \
-           file://0002_svn_snapshot_jbig2dec.patch;patch=1 \
-           file://1001_install_cjk_examples.patch;patch=1 \
-           file://1002_ps2pdf_man_fix.patch;patch=1 \
-           file://1003_fix_autoconf_create_from_infiles.patch;patch=1 \
-           file://1004_CVE-2009-0792_CVE-2009-0584_CVE-2009-0583.patch;patch=1 \
-           file://1006_system-jasper.patch;patch=1 \
-           file://1007_fix_pphs_script_not_lib.patch;patch=1 \
-           file://2001_docdir_fix_for_debian.patch;patch=1 \
-           file://2002_gs_man_fix_debian.patch;patch=1 \
+           file://0001_svn_snapshot.patch \
+           file://0002_svn_snapshot_jbig2dec.patch \
+           file://1001_install_cjk_examples.patch \
+           file://1002_ps2pdf_man_fix.patch \
+           file://1003_fix_autoconf_create_from_infiles.patch \
+           file://1004_CVE-2009-0792_CVE-2009-0584_CVE-2009-0583.patch \
+           file://1006_system-jasper.patch \
+           file://1007_fix_pphs_script_not_lib.patch \
+           file://2001_docdir_fix_for_debian.patch \
+           file://2002_gs_man_fix_debian.patch \
            "
 
 SRC_URI[tarball.md5sum] = "e42706c2409815df5c959484080fd4a3"
diff --git a/recipes/gsoap/gsoap_2.7.7.bb b/recipes/gsoap/gsoap_2.7.7.bb
index 82af2ff3a2..c713211149 100644
--- a/recipes/gsoap/gsoap_2.7.7.bb
+++ b/recipes/gsoap/gsoap_2.7.7.bb
@@ -6,7 +6,7 @@ DEPENDS = "gsoap-native"
 PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz \
-           file://rename_bogus_ldflags.patch;patch=1"
+           file://rename_bogus_ldflags.patch"
 S = "${WORKDIR}/gsoap-2.7"
 
 inherit autotools_stage
diff --git a/recipes/gsoko/gsoko_0.4.2-gpe5.bb b/recipes/gsoko/gsoko_0.4.2-gpe5.bb
index c8a8bef499..3441aa142b 100644
--- a/recipes/gsoko/gsoko_0.4.2-gpe5.bb
+++ b/recipes/gsoko/gsoko_0.4.2-gpe5.bb
@@ -5,7 +5,7 @@ SECTION = "gpe"
 DESCRIPTION = "Sokoban game for GTK"
 PRIORITY = "optional"
 
-SRC_URI += "file://fix_makefiles.patch;patch=1"
+SRC_URI += "file://fix_makefiles.patch"
 
 SRC_URI[md5sum] = "da4e3d05f18a44af4b43c76829ba110a"
 SRC_URI[sha256sum] = "741af12ec81dff5ba79e6ce284146e26557f267b5a77ccc4c5644f2d5619dcf3"
diff --git a/recipes/gsoko/gsoko_0.4.2-gpe6.bb b/recipes/gsoko/gsoko_0.4.2-gpe6.bb
index 8cdfeee836..b26cd1f27f 100644
--- a/recipes/gsoko/gsoko_0.4.2-gpe6.bb
+++ b/recipes/gsoko/gsoko_0.4.2-gpe6.bb
@@ -7,7 +7,7 @@ PRIORITY = "optional"
 PR = "r1"
 
 SRC_URI += " \
-            file://fix_makefiles.patch;patch=1 \
+            file://fix_makefiles.patch \
            "
 
 SRC_URI[md5sum] = "b10893acb76c5d016c9bcfff6ba9418b"
diff --git a/recipes/gspcav1/gspcav1_20070110.bb b/recipes/gspcav1/gspcav1_20070110.bb
index 585bc4fb0f..9222486ff0 100644
--- a/recipes/gspcav1/gspcav1_20070110.bb
+++ b/recipes/gspcav1/gspcav1_20070110.bb
@@ -9,8 +9,8 @@ PR = "r2"
 RRECOMMENDS = "kernel-module-videodev kernel-module-v4l1-compat kernel-module-v4l2-common"
 
 SRC_URI = "http://mxhaard.free.fr/spca50x/Download/oldrelease/${PN}-${PV}.tar.gz \
-           file://Makefile.patch;patch=1 \
-	   file://MS.patch;patch=1"
+           file://Makefile.patch \
+	   file://MS.patch"
 
 S = "${WORKDIR}/${PN}-${PV}"
 
diff --git a/recipes/gspcav1/gspcav1_20070508.bb b/recipes/gspcav1/gspcav1_20070508.bb
index 94711dc4f5..24325ca38a 100644
--- a/recipes/gspcav1/gspcav1_20070508.bb
+++ b/recipes/gspcav1/gspcav1_20070508.bb
@@ -11,8 +11,8 @@ PR = "r2"
 RRECOMMENDS = "kernel-module-videodev kernel-module-v4l1-compat kernel-module-v4l2-common"
 
 SRC_URI = "http://mxhaard.free.fr/spca50x/Download/oldrelease/${PN}-${PV}.tar.gz \
-           file://Makefile.patch;patch=1 \
-	   file://MS.patch;patch=1"
+           file://Makefile.patch \
+	   file://MS.patch"
 
 S = "${WORKDIR}/${PN}-${PV}"
 
diff --git a/recipes/gspcav1/gspcav1_20071224.bb b/recipes/gspcav1/gspcav1_20071224.bb
index 8fd27b35cf..643143e64e 100644
--- a/recipes/gspcav1/gspcav1_20071224.bb
+++ b/recipes/gspcav1/gspcav1_20071224.bb
@@ -5,7 +5,7 @@ SECTION = "kernel/modules"
 LICENSE = "GPL"
 
 SRC_URI = "http://mxhaard.free.fr/spca50x/Download/gspcav1-${PV}.tar.gz \
-           file://Makefile-fix-cc-quoting.diff;patch=1 \
+           file://Makefile-fix-cc-quoting.diff \
           "
 
 S = "${WORKDIR}/gspcav1-${PV}"
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.10.bb b/recipes/gstreamer/gst-ffmpeg_0.10.10.bb
index bf3206f592..098d5d8f5d 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.10.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.10.bb
@@ -8,7 +8,7 @@ DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib"
 inherit autotools pkgconfig
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2;name=archive \
-           file://lower-rank.diff;patch=1 \
+           file://lower-rank.diff \
 "
 SRC_URI[archive.md5sum] = "447292deff5f3748444e6a5fba41da29"
 SRC_URI[archive.sha256sum] = "697114483444a0a469028857a1d58145c99e6f5d2cd7edd8cb04cdc3fc72ad94"
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.2.bb b/recipes/gstreamer/gst-ffmpeg_0.10.2.bb
index 434a8b4b25..c835011944 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.2.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.2.bb
@@ -9,8 +9,8 @@ PR = "r2"
 inherit autotools pkgconfig
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
-	   file://armv5.patch;patch=1 \
-	   file://autotools.patch;patch=1 \
+	   file://armv5.patch \
+	   file://autotools.patch \
           "
 
 FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.4.bb b/recipes/gstreamer/gst-ffmpeg_0.10.4.bb
index 7200e40177..19d1bb1091 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.4.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.4.bb
@@ -9,7 +9,7 @@ PR = "r7"
 inherit autotools pkgconfig
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
-           file://configure-hack.diff;patch=1 \
+           file://configure-hack.diff \
 "
 
 FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.6.bb b/recipes/gstreamer/gst-ffmpeg_0.10.6.bb
index 76a16a7d85..0a9b373e7f 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.6.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.6.bb
@@ -9,8 +9,8 @@ PR = "r1"
 inherit autotools pkgconfig
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
-           file://configure-hack.diff;patch=1 \
-           file://lower-rank.diff;patch=1 \
+           file://configure-hack.diff \
+           file://lower-rank.diff \
 "
 
 FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.7.bb b/recipes/gstreamer/gst-ffmpeg_0.10.7.bb
index 44591b10e2..c9e33de05f 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.7.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.7.bb
@@ -9,8 +9,8 @@ PR = "r2"
 inherit autotools pkgconfig
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
-           file://configure-hack.diff;patch=1 \
-           file://lower-rank.diff;patch=1 \
+           file://configure-hack.diff \
+           file://lower-rank.diff \
 "
 
 FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.8.bb b/recipes/gstreamer/gst-ffmpeg_0.10.8.bb
index bca1487fde..9ee8cd75ba 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.8.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.8.bb
@@ -8,7 +8,7 @@ DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib"
 inherit autotools pkgconfig
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
-           file://lower-rank.diff;patch=1 \
+           file://lower-rank.diff \
 "
 
 PR = "r2"
diff --git a/recipes/gstreamer/gst-omapfb_1.0.bb b/recipes/gstreamer/gst-omapfb_1.0.bb
index 4c2d3aefb5..6b03e9fa36 100644
--- a/recipes/gstreamer/gst-omapfb_1.0.bb
+++ b/recipes/gstreamer/gst-omapfb_1.0.bb
@@ -6,11 +6,10 @@ inherit autotools
 DEPENDS = "gstreamer virtual/libx11 virtual/kernel"
 
 SRCREV = "6f0b1cb50d1c67c3a3db2f11246256060ac871de"
-PV = "0.0+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+${PR}+gitr${SRCREV}"
 
 SRC_URI = "git://github.com/felipec/${PN}.git;protocol=git \
-           file://0001-Implement-XOverlay-and-I420-to-422-colorspace-conver.patch;patch=1"
+           file://0001-Implement-XOverlay-and-I420-to-422-colorspace-conver.patch"
 
 S  ="${WORKDIR}/git"
 
diff --git a/recipes/gstreamer/gst-player_svn.bb b/recipes/gstreamer/gst-player_svn.bb
index e75b0ffde5..c44213bfa8 100644
--- a/recipes/gstreamer/gst-player_svn.bb
+++ b/recipes/gstreamer/gst-player_svn.bb
@@ -8,9 +8,8 @@ SRC_URI = "svn://gstplayer.googlecode.com/svn;module=trunk;proto=http"
 
 S = "${WORKDIR}/trunk/gstplayer"
 
-PE = "1"
-PV = "1.0.0+svnr${SRCPV}"
-PR = "r0"
+PV = "svnr${SRCREV}"
+PR = "r2"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
diff --git a/recipes/gstreamer/gst-plugin-bc_git.bb b/recipes/gstreamer/gst-plugin-bc_git.bb
index f4c67f1400..732ada0d5b 100644
--- a/recipes/gstreamer/gst-plugin-bc_git.bb
+++ b/recipes/gstreamer/gst-plugin-bc_git.bb
@@ -9,7 +9,7 @@ inherit autotools
 
 SRC_URI = "git://gitorious.org/gst-plugin-bc/gst-plugin-bc.git;protocol=git \
            http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.25.tar.bz2 \
-           file://gst-debug.diff;patch=1 \
+           file://gst-debug.diff \
 "
 
 SRCREV = "e14e249ef6cb67e91be9198b71efc61eb84c11b5"
diff --git a/recipes/gstreamer/gst-plugin-pulse_0.9.7.bb b/recipes/gstreamer/gst-plugin-pulse_0.9.7.bb
index 525cc0b621..de4c9f6a9b 100644
--- a/recipes/gstreamer/gst-plugin-pulse_0.9.7.bb
+++ b/recipes/gstreamer/gst-plugin-pulse_0.9.7.bb
@@ -5,7 +5,7 @@ DEPENDS = "gstreamer pulseaudio gst-plugins-base"
 PR = "r1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz \
-	file://dont-overload-pulseaudio.patch;patch=1"
+	file://dont-overload-pulseaudio.patch"
 S = "${WORKDIR}/gst-pulse-${PV}"
 
 inherit autotools
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb
index 10b95a1d34..b7985236d8 100644
--- a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb
@@ -3,7 +3,7 @@ require gst-plugins.inc
 PR = "${INC_PR}.1"
 
 SRC_URI += "file://vorbisenc.h file://vorbisdec.h \
-            file://ivorbis-thumb.patch;patch=1"
+            file://ivorbis-thumb.patch"
 DEPENDS += "gst-plugins-base directfb"
 
 do_compile_prepend() {
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.12.bb b/recipes/gstreamer/gst-plugins-bad_0.10.12.bb
index 7b1f945657..c357470c58 100644
--- a/recipes/gstreamer/gst-plugins-bad_0.10.12.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.12.bb
@@ -1,7 +1,7 @@
 require gst-plugins.inc
 
 SRC_URI += "file://vorbisenc.h file://vorbisdec.h \
-            file://ivorbis-thumb.patch;patch=1"
+            file://ivorbis-thumb.patch"
 
 DEPENDS += "gst-plugins-base openssl directfb"
 
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb
index 702ed22561..45c36177d2 100644
--- a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb
@@ -3,8 +3,8 @@ require gst-plugins.inc
 PR = "${INC_PR}.1"
 
 SRC_URI += "file://vorbisenc.h file://vorbisdec.h \
-            file://gst-plugins-directfb-fix.patch;patch=1;pnum=2 \
-            file://ivorbis-thumb.patch;patch=1"
+            file://gst-plugins-directfb-fix.patch;striplevel=2 \
+            file://ivorbis-thumb.patch"
 DEPENDS += "gst-plugins-base directfb"
 
 do_compile_prepend() {
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.9.bb b/recipes/gstreamer/gst-plugins-bad_0.10.9.bb
index 25e5b9714a..e69002d38e 100644
--- a/recipes/gstreamer/gst-plugins-bad_0.10.9.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.9.bb
@@ -2,8 +2,8 @@ require gst-plugins.inc
 PR = "r2"
 
 SRC_URI += "file://vorbisenc.h file://vorbisdec.h \
-            file://gst-plugins-directfb-fix.patch;patch=1;pnum=2 \
-            file://ivorbis-thumb.patch;patch=1"
+            file://gst-plugins-directfb-fix.patch;striplevel=2 \
+            file://ivorbis-thumb.patch"
 
 DEPENDS += "gst-plugins-base openssl"
 EXTRA_OECONF += " ac_cv_openssldir=no"
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.25.bb b/recipes/gstreamer/gst-plugins-base_0.10.25.bb
index be82cbb9d2..05381e6627 100644
--- a/recipes/gstreamer/gst-plugins-base_0.10.25.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.25.bb
@@ -1,7 +1,7 @@
 require gst-plugins.inc
 
-SRC_URI += "file://fix-playbin2.patch;patch=1 \
-            file://gst-plugins-base_rowstride.patch;patch=1 \
+SRC_URI += "file://fix-playbin2.patch \
+            file://gst-plugins-base_rowstride.patch \
 "
 
 PR = "${INC_PR}.3"
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.28.bb b/recipes/gstreamer/gst-plugins-base_0.10.28.bb
index 058f6a6c0f..000761f0df 100644
--- a/recipes/gstreamer/gst-plugins-base_0.10.28.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.28.bb
@@ -1,8 +1,8 @@
 require gst-plugins.inc
 
 SRC_URI += " \
-            file://gst-plugins-base_rowstride.patch;patch=1 \
-            file://ivorbis-thumb.patch;patch=1 \
+            file://gst-plugins-base_rowstride.patch \
+            file://ivorbis-thumb.patch \
 "
 
 SRC_URI[archive.md5sum] = "0107cf985ac90544bae70288220f5bab"
diff --git a/recipes/gstreamer/gst-plugins-good_0.10.15.bb b/recipes/gstreamer/gst-plugins-good_0.10.15.bb
index a6b8bfd356..f2b0a5aede 100644
--- a/recipes/gstreamer/gst-plugins-good_0.10.15.bb
+++ b/recipes/gstreamer/gst-plugins-good_0.10.15.bb
@@ -2,7 +2,7 @@ require gst-plugins.inc
 
 PR = "r6"
 
-SRC_URI += "file://fix-unit-scale-asseration.patch;patch=1"
+SRC_URI += "file://fix-unit-scale-asseration.patch"
 
 inherit gconf 
 
diff --git a/recipes/gstreamer/gst-plugins-good_0.10.17.bb b/recipes/gstreamer/gst-plugins-good_0.10.17.bb
index 96aa8dbc62..7875039576 100644
--- a/recipes/gstreamer/gst-plugins-good_0.10.17.bb
+++ b/recipes/gstreamer/gst-plugins-good_0.10.17.bb
@@ -1,6 +1,6 @@
 require gst-plugins.inc
 
-SRC_URI += "file://flvdemux-ecma.diff;patch=1 \
+SRC_URI += "file://flvdemux-ecma.diff \
 "
 
 PR = "r3"
diff --git a/recipes/gstreamer/gst-plugins-good_0.10.21.bb b/recipes/gstreamer/gst-plugins-good_0.10.21.bb
index d93a37d53c..0f6ff3f8ff 100644
--- a/recipes/gstreamer/gst-plugins-good_0.10.21.bb
+++ b/recipes/gstreamer/gst-plugins-good_0.10.21.bb
@@ -1,6 +1,6 @@
 require gst-plugins.inc
 
-SRC_URI += "file://flvdemux-ecma.diff;patch=1 \
+SRC_URI += "file://flvdemux-ecma.diff \
 "
 
 SRC_URI[archive.md5sum] = "9bc5c9b390edbb96bda42fc553eae5ae"
diff --git a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb
index 8321d03087..5c446e69cd 100644
--- a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb
+++ b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb
@@ -6,7 +6,7 @@ PR = "${INC_PR}.1"
 
 SRC_URI = "\
   http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.bz2 \
-  file://gstsid_autofoo_HACK.patch;patch=1 \
+  file://gstsid_autofoo_HACK.patch \
 "
 S = "${WORKDIR}/gst-plugins-ugly-${PV}"
 
diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb
index 18d59a25e3..e21abc951c 100644
--- a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb
+++ b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb
@@ -5,8 +5,8 @@ PR = "${INC_PR}.1"
 DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
 
 SRC_URI += "\
-  file://gstmad_16bit.patch;patch=1 \
-  file://gstsid_autofoo_HACK.patch;patch=1 \
+  file://gstmad_16bit.patch \
+  file://gstsid_autofoo_HACK.patch \
 "
 
 python() {
diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb
index ba65ea230f..c82370b5d0 100644
--- a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb
+++ b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb
@@ -5,8 +5,8 @@ PR = "${INC_PR}.1"
 DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
 
 SRC_URI += "\
-  file://gstmad_16bit.patch;patch=1 \
-  file://gstsid_autofoo_HACK.patch;patch=1 \
+  file://gstmad_16bit.patch \
+  file://gstsid_autofoo_HACK.patch \
 "
 
 python() {
diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.14.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.14.bb
index d8295f5763..bc0a3b9a78 100644
--- a/recipes/gstreamer/gst-plugins-ugly_0.10.14.bb
+++ b/recipes/gstreamer/gst-plugins-ugly_0.10.14.bb
@@ -5,8 +5,8 @@ PR = "${INC_PR}.0"
 DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
 
 SRC_URI += "\
-  file://gstmad_16bit.patch;patch=1 \
-  file://gstsid_autofoo_HACK.patch;patch=1 \
+  file://gstmad_16bit.patch \
+  file://gstsid_autofoo_HACK.patch \
 "
 
 SRC_URI[archive.md5sum] = "0bc0d27bcce88c73ef6c81e88624e686"
diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc
index b060eb2bd4..9cf7de8dc5 100644
--- a/recipes/gstreamer/gst-plugins.inc
+++ b/recipes/gstreamer/gst-plugins.inc
@@ -2,10 +2,10 @@ require gst-common.inc
 require gst-plugins-package.inc
 
 DESCRIPTION = "Plugins for GStreamer"
-DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis"
+DEPENDS = "gstreamer x264 libmms libmusicbrainz schroedinger faac faad2 libmikmod liboil libogg tremor libvorbis"
 DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
 
-INC_PR = "r7"
+INC_PR = "r9"
 
 PACKAGES_DYNAMIC = "gst-plugin-*"
 
diff --git a/recipes/gstreamer/gstreamer_0.10.17.bb b/recipes/gstreamer/gstreamer_0.10.17.bb
index d47be2db27..dd01e16369 100644
--- a/recipes/gstreamer/gstreamer_0.10.17.bb
+++ b/recipes/gstreamer/gstreamer_0.10.17.bb
@@ -2,8 +2,8 @@ require gstreamer.inc
 
 PR = "r4"
 
-SRC_URI += "file://po-makefile-fix.patch;patch=1 \
-            file://registry-do-not-look-into-debug-dirs.patch;patch=1 "
+SRC_URI += "file://po-makefile-fix.patch \
+            file://registry-do-not-look-into-debug-dirs.patch "
 
 
 SRC_URI[archive.md5sum] = "3232416ea6fceab628236d67a7d0a44a"
diff --git a/recipes/gthumb/gthumb_2.10.11.bb b/recipes/gthumb/gthumb_2.10.11.bb
index f6fdfb8c88..079e3bd477 100644
--- a/recipes/gthumb/gthumb_2.10.11.bb
+++ b/recipes/gthumb/gthumb_2.10.11.bb
@@ -5,7 +5,7 @@ DEPENDS = "gtk+ libexif libgnome libgnomeui libgnomeprintui"
 
 inherit gnome
 
-SRC_URI += "file://pkg-config-hack.patch;patch=1"
+SRC_URI += "file://pkg-config-hack.patch"
 
 PR = "r2"
 
diff --git a/recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb b/recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
index 22d30bfd01..86ae530c6a 100644
--- a/recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
+++ b/recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
@@ -3,7 +3,7 @@ inherit native
 DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native libx11-native"
 S = "${WORKDIR}/gtk+-${PV}"
 FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
-SRC_URI += "file://reduce-dependencies.patch;patch=1"
+SRC_URI += "file://reduce-dependencies.patch"
 
 #clear recommends for uclibc builds
 RRECOMMENDS = " "
diff --git a/recipes/gtk+/gdk-pixbuf_2.10.14.bb b/recipes/gtk+/gdk-pixbuf_2.10.14.bb
index 1ff2687bf0..8aa57e9164 100644
--- a/recipes/gtk+/gdk-pixbuf_2.10.14.bb
+++ b/recipes/gtk+/gdk-pixbuf_2.10.14.bb
@@ -12,7 +12,7 @@ FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FIL
 
 SRC_URI = "\
   ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
-  file://automake-lossage.patch;patch=1 \
+  file://automake-lossage.patch \
 "
 
 inherit autotools pkgconfig
diff --git a/recipes/gtk+/gtk+-1.2_1.2.10.bb b/recipes/gtk+/gtk+-1.2_1.2.10.bb
index e072eb625e..0ec1508d00 100644
--- a/recipes/gtk+/gtk+-1.2_1.2.10.bb
+++ b/recipes/gtk+/gtk+-1.2_1.2.10.bb
@@ -7,9 +7,9 @@ DEPENDS = "glib-1.2 jpeg libpng libxext"
 PR = "r3"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
-           file://timezone-fix.patch;patch=1 \
-           file://gtk+1.2-reconf-fix;patch=1 \
-           file://no-xwc;patch=1"
+           file://timezone-fix.patch \
+           file://gtk+1.2-reconf-fix;apply=yes \
+           file://no-xwc;apply=yes"
 S = "${WORKDIR}/gtk+-${PV}"
 
 inherit autotools pkgconfig flow-lossage
diff --git a/recipes/gtk+/gtk+-fastscaling_2.10.14.bb b/recipes/gtk+/gtk+-fastscaling_2.10.14.bb
index 8fcb5667ff..d2b3347d82 100644
--- a/recipes/gtk+/gtk+-fastscaling_2.10.14.bb
+++ b/recipes/gtk+/gtk+-fastscaling_2.10.14.bb
@@ -8,7 +8,7 @@ PROVIDES = "gtk+"
 RPROVIDES_${PN} = "gtk+"
 PR = "r2"
 
-SRC_URI += "file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
+SRC_URI += "file://lower-quality-scaling-in-pixbuf-engine.patch"
 
 S = "${WORKDIR}/gtk+-${PV}"
 
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index b30a4f560b..bb74d785de 100644
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -10,10 +10,10 @@ PROVIDES = "gdk-pixbuf"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.bz2;name=gtk \
-	file://hardcoded_libtool.patch;patch=1 \
-	file://run-iconcache.patch;patch=1 \
-	file://toggle-font.diff;patch=1;pnum=0 \
-	file://xsettings.patch;patch=1 \
+	file://hardcoded_libtool.patch \
+	file://run-iconcache.patch \
+	file://toggle-font.diff;striplevel=0 \
+	file://xsettings.patch \
 	"
 
 INC_PR = "r8"
diff --git a/recipes/gtk+/gtk+_2.10.14.bb b/recipes/gtk+/gtk+_2.10.14.bb
index 81b4983ceb..473de5ad1d 100644
--- a/recipes/gtk+/gtk+_2.10.14.bb
+++ b/recipes/gtk+/gtk+_2.10.14.bb
@@ -3,28 +3,28 @@ require gtk-2.10.inc
 PR = "r9"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch;patch=1 \
-           file://automake-lossage.patch;patch=1 \
-           file://disable-tooltips.patch;patch=1 \
-           file://gtklabel-resize-patch;patch=1 \
-           file://menu-deactivate.patch;patch=1 \
-           file://xsettings.patch;patch=1 \
-           file://scroll-timings.patch;patch=1 \
-           file://small-gtkfilesel.patch;patch=1 \
-           file://small-gtkfilechooser.patch;patch=1 \
-#           file://migration.patch;patch=1;pnum=0 \
-           file://run-iconcache.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://single-click.patch;patch=1 \
-           file://spinbutton.patch;patch=1 \
-           file://gtk+-handhelds.patch;patch=1 \
-           file://filesel-fix-segfault.patch;patch=1 \
-           file://combo-arrow-size.patch;patch=1;pnum=0 \
-           file://range-no-redraw.patch;patch=1;pnum=0 \
-           file://scrolled-placement.patch;patch=1;pnum=0 \
-           file://treeview-checkbox-size.patch;patch=1;pnum=0 \
-           file://cell-renderer-edit-focus.patch;patch=1;pnum=0 \
+           file://no-xwc.patch \
+           file://automake-lossage.patch \
+           file://disable-tooltips.patch \
+           file://gtklabel-resize-patch;apply=yes \
+           file://menu-deactivate.patch \
+           file://xsettings.patch \
+           file://scroll-timings.patch \
+           file://small-gtkfilesel.patch \
+           file://small-gtkfilechooser.patch \
+#           file://migration.patch;striplevel=0 \
+           file://run-iconcache.patch \
+           file://hardcoded_libtool.patch \
+           file://no-demos.patch \
+           file://single-click.patch \
+           file://spinbutton.patch \
+           file://gtk+-handhelds.patch \
+           file://filesel-fix-segfault.patch \
+           file://combo-arrow-size.patch;striplevel=0 \
+           file://range-no-redraw.patch;striplevel=0 \
+           file://scrolled-placement.patch;striplevel=0 \
+           file://treeview-checkbox-size.patch;striplevel=0 \
+           file://cell-renderer-edit-focus.patch;striplevel=0 \
            "
 
 # check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
diff --git a/recipes/gtk+/gtk+_2.12.0.bb b/recipes/gtk+/gtk+_2.12.0.bb
index fb246eee10..664ed7ece1 100644
--- a/recipes/gtk+/gtk+_2.12.0.bb
+++ b/recipes/gtk+/gtk+_2.12.0.bb
@@ -2,16 +2,16 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://disable-print.patch;patch=1 \
-           file://cellrenderer-cairo.patch;patch=1;pnum=0 \
-           file://entry-cairo.patch;patch=1;pnum=0 \
-           file://scrolled-placement.patch;patch=1;pnum=0"
+SRC_URI += "file://disable-print.patch \
+           file://cellrenderer-cairo.patch;striplevel=0 \
+           file://entry-cairo.patch;striplevel=0 \
+           file://scrolled-placement.patch;striplevel=0"
 # temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#           file://combo-arrow-size.patch;patch=1;pnum=0 \
+#           file://gtklabel-resize-patch;apply=yes \
+#           file://menu-deactivate.patch \
+#           file://combo-arrow-size.patch;striplevel=0 \
 # die die die
-#           file://pangoxft2.10.6.diff;patch=1"
+#           file://pangoxft2.10.6.diff"
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
diff --git a/recipes/gtk+/gtk+_2.12.11.bb b/recipes/gtk+/gtk+_2.12.11.bb
index 824d1b4fa9..bf5a41f676 100644
--- a/recipes/gtk+/gtk+_2.12.11.bb
+++ b/recipes/gtk+/gtk+_2.12.11.bb
@@ -2,15 +2,15 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \
-           file://entry-cairo.patch;patch=1;pnum=0 \
-           file://scrolled-placement.patch;patch=1;pnum=0"
+SRC_URI += "file://cellrenderer-cairo.patch;striplevel=0 \
+           file://entry-cairo.patch;striplevel=0 \
+           file://scrolled-placement.patch;striplevel=0"
 # temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#           file://combo-arrow-size.patch;patch=1;pnum=0 \
+#           file://gtklabel-resize-patch;apply=yes \
+#           file://menu-deactivate.patch \
+#           file://combo-arrow-size.patch;striplevel=0 \
 # die die die
-#           file://pangoxft2.10.6.diff;patch=1"
+#           file://pangoxft2.10.6.diff"
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
diff --git a/recipes/gtk+/gtk+_2.12.3.bb b/recipes/gtk+/gtk+_2.12.3.bb
index 6936b52dc6..53b0bb8ecc 100644
--- a/recipes/gtk+/gtk+_2.12.3.bb
+++ b/recipes/gtk+/gtk+_2.12.3.bb
@@ -2,15 +2,15 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \
-           file://entry-cairo.patch;patch=1;pnum=0 \
-           file://scrolled-placement.patch;patch=1;pnum=0"
+SRC_URI += "file://cellrenderer-cairo.patch;striplevel=0 \
+           file://entry-cairo.patch;striplevel=0 \
+           file://scrolled-placement.patch;striplevel=0"
 # temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#           file://combo-arrow-size.patch;patch=1;pnum=0 \
+#           file://gtklabel-resize-patch;apply=yes \
+#           file://menu-deactivate.patch \
+#           file://combo-arrow-size.patch;striplevel=0 \
 # die die die
-#           file://pangoxft2.10.6.diff;patch=1"
+#           file://pangoxft2.10.6.diff"
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
diff --git a/recipes/gtk+/gtk+_2.14.2.bb b/recipes/gtk+/gtk+_2.14.2.bb
index 2114df1f28..cb0d3f7efa 100644
--- a/recipes/gtk+/gtk+_2.14.2.bb
+++ b/recipes/gtk+/gtk+_2.14.2.bb
@@ -2,7 +2,7 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://smallscreen_filechooser.patch;patch=1 \
+SRC_URI += "file://smallscreen_filechooser.patch \
           "
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes"
diff --git a/recipes/gtk+/gtk+_2.18.6.bb b/recipes/gtk+/gtk+_2.18.6.bb
index 14e6f3f7dd..237689dcf6 100644
--- a/recipes/gtk+/gtk+_2.18.6.bb
+++ b/recipes/gtk+/gtk+_2.18.6.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-SRC_URI_append_virtclass-native = " file://no-demos.patch;patch=1 \
+SRC_URI_append_virtclass-native = " file://no-demos.patch \
 "
 
 PR = "${INC_PR}.4"
diff --git a/recipes/gtk+/gtk+_2.20.0.bb b/recipes/gtk+/gtk+_2.20.0.bb
index abddc2756e..68bf212a6b 100644
--- a/recipes/gtk+/gtk+_2.20.0.bb
+++ b/recipes/gtk+/gtk+_2.20.0.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-SRC_URI_append_virtclass-native = " file://no-demos.patch;patch=1 \
+SRC_URI_append_virtclass-native = " file://no-demos.patch \
 "
 
 SRC_URI[gtk.md5sum] = "5517f78b1eb9b1eb60bd48a0152d09e6"
diff --git a/recipes/gtk+/gtk+_2.6.10.bb b/recipes/gtk+/gtk+_2.6.10.bb
index f42be9c51e..45eaf30fa0 100644
--- a/recipes/gtk+/gtk+_2.6.10.bb
+++ b/recipes/gtk+/gtk+_2.6.10.bb
@@ -8,33 +8,33 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
 PR = "r11"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
-           file://help.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://no-xwc.patch;patch=1 \
-           file://automake-lossage.patch;patch=1 \
-           file://gtk+-handhelds.patch;patch=1 \
-           file://spinbutton.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://disable-tooltips.patch;patch=1 \
-           file://gtklabel-resize-patch;patch=1 \
-           file://menu-deactivate.patch;patch=1 \
-           file://xsettings.patch;patch=1 \
-           file://scroll-timings.patch;patch=1 \
-           file://small-gtkfilesel.patch;patch=1 \
-           file://migration.patch;patch=1;pnum=0 \
-           file://single-click.patch;patch=1 \
-           file://menu-styling.patch;patch=1 \
-           file://compile-against-newer-glib.patch;patch=1 \
-           file://gtk.keynav.gtkcombobox.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtkentry.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtkiconview.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtkradiobutton.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtksettings.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtktextview.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtktreeview.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtkwidget.patch;patch=1;pnum=0 \
-           file://gtk+-2.6.10-bg.patch;patch=1 \
-           file://filesel-fix-segfault.patch;patch=1 \
+           file://help.patch \
+           file://no-demos.patch \
+           file://no-xwc.patch \
+           file://automake-lossage.patch \
+           file://gtk+-handhelds.patch \
+           file://spinbutton.patch \
+           file://hardcoded_libtool.patch \
+           file://disable-tooltips.patch \
+           file://gtklabel-resize-patch;apply=yes \
+           file://menu-deactivate.patch \
+           file://xsettings.patch \
+           file://scroll-timings.patch \
+           file://small-gtkfilesel.patch \
+           file://migration.patch;striplevel=0 \
+           file://single-click.patch \
+           file://menu-styling.patch \
+           file://compile-against-newer-glib.patch \
+           file://gtk.keynav.gtkcombobox.patch;striplevel=0 \
+           file://gtk.keynav.gtkentry.patch;striplevel=0 \
+           file://gtk.keynav.gtkiconview.patch;striplevel=0 \
+           file://gtk.keynav.gtkradiobutton.patch;striplevel=0 \
+           file://gtk.keynav.gtksettings.patch;striplevel=0 \
+           file://gtk.keynav.gtktextview.patch;striplevel=0 \
+           file://gtk.keynav.gtktreeview.patch;striplevel=0 \
+           file://gtk.keynav.gtkwidget.patch;striplevel=0 \
+           file://gtk+-2.6.10-bg.patch \
+           file://filesel-fix-segfault.patch \
            "
 
 inherit autotools pkgconfig
diff --git a/recipes/gtk+/gtk+_2.8.16.bb b/recipes/gtk+/gtk+_2.8.16.bb
index f0f01725e2..f1141bebef 100644
--- a/recipes/gtk+/gtk+_2.8.16.bb
+++ b/recipes/gtk+/gtk+_2.8.16.bb
@@ -10,21 +10,21 @@ PR = "r5"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch;patch=1 \
-           file://automake-lossage.patch;patch=1 \
-	   file://spinbutton.patch;patch=1 \
-	   file://hardcoded_libtool.patch;patch=1 \
-	   file://disable-tooltips.patch;patch=1 \
-	   file://gtklabel-resize-patch;patch=1 \
-	   file://gtktreeview-316689.patch;patch=1 \
-	   file://menu-deactivate.patch;patch=1 \
-	   file://xsettings.patch;patch=1 \
-	   file://scroll-timings.patch;patch=1 \
-	   file://small-gtkfilesel.patch;patch=1 \
-	   file://migration.patch;patch=1;pnum=0 \
-	   file://no-demos.patch;patch=1 \
-	   file://gtk+-handhelds.patch;patch=1 \
-	   file://single-click.patch;patch=1"
+           file://no-xwc.patch \
+           file://automake-lossage.patch \
+	   file://spinbutton.patch \
+	   file://hardcoded_libtool.patch \
+	   file://disable-tooltips.patch \
+	   file://gtklabel-resize-patch;apply=yes \
+	   file://gtktreeview-316689.patch \
+	   file://menu-deactivate.patch \
+	   file://xsettings.patch \
+	   file://scroll-timings.patch \
+	   file://small-gtkfilesel.patch \
+	   file://migration.patch;striplevel=0 \
+	   file://no-demos.patch \
+	   file://gtk+-handhelds.patch \
+	   file://single-click.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gtk+/gtk+_2.8.9.bb b/recipes/gtk+/gtk+_2.8.9.bb
index 419a5d04b0..224702e943 100644
--- a/recipes/gtk+/gtk+_2.8.9.bb
+++ b/recipes/gtk+/gtk+_2.8.9.bb
@@ -8,20 +8,20 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt c
 PR = "r7"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch;patch=1 \
-           file://automake-lossage.patch;patch=1 \
-	   file://spinbutton.patch;patch=1 \
-	   file://hardcoded_libtool.patch;patch=1 \
-	   file://disable-tooltips.patch;patch=1 \
-	   file://gtklabel-resize-patch;patch=1 \
-	   file://menu-deactivate.patch;patch=1 \
-	   file://xsettings.patch;patch=1 \
-	   file://scroll-timings.patch;patch=1 \
-	   file://small-gtkfilesel.patch;patch=1 \
-	   file://migration.patch;patch=1;pnum=0 \
-	   file://no-demos.patch;patch=1 \
-	   file://gtk+-handhelds.patch;patch=1 \
-	   file://single-click.patch;patch=1"
+           file://no-xwc.patch \
+           file://automake-lossage.patch \
+	   file://spinbutton.patch \
+	   file://hardcoded_libtool.patch \
+	   file://disable-tooltips.patch \
+	   file://gtklabel-resize-patch;apply=yes \
+	   file://menu-deactivate.patch \
+	   file://xsettings.patch \
+	   file://scroll-timings.patch \
+	   file://small-gtkfilesel.patch \
+	   file://migration.patch;striplevel=0 \
+	   file://no-demos.patch \
+	   file://gtk+-handhelds.patch \
+	   file://single-click.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gtk-engines/gtk-industrial-engine_0.2.46.0.bb b/recipes/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
index 187704bd59..4c9fa1ab57 100644
--- a/recipes/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
+++ b/recipes/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 DEPENDS = "gtk+"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \
-	file://no-gtk1.patch;patch=1"
+	file://no-gtk1.patch"
 
 PACKAGES += "gtk-theme-industrial"
 FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so"
diff --git a/recipes/gtk-webcore/midori_0.1.10.bb b/recipes/gtk-webcore/midori_0.1.10.bb
index a8286d840e..9abe97730d 100644
--- a/recipes/gtk-webcore/midori_0.1.10.bb
+++ b/recipes/gtk-webcore/midori_0.1.10.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://archive.xfce.org/src/apps/midori/0.1/midori-${PV}.tar.bz2 \
            file://waf \
           "
 
-SRC_URI_append_shr = "file://ua-iphone-0.1.10.patch;patch=1 \
+SRC_URI_append_shr = "file://ua-iphone-0.1.10.patch \
                       file://config"
 
 do_configure() {
diff --git a/recipes/gtk-webcore/midori_0.2.1.bb b/recipes/gtk-webcore/midori_0.2.1.bb
index 97de2cb8ad..58f1cd9d41 100644
--- a/recipes/gtk-webcore/midori_0.2.1.bb
+++ b/recipes/gtk-webcore/midori_0.2.1.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://archive.xfce.org/src/apps/midori/0.2/midori-${PV}.tar.bz2 \
            file://waf"
 
 SRC_URI_append_shr = " file://config \
-                       file://retain-navigationbar-in-fullwindow.patch;patch=1 \
+                       file://retain-navigationbar-in-fullwindow.patch \
                      "
 
 PR = "r2"
diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb
index 18b663cb08..f3a28fd665 100644
--- a/recipes/gtk-webcore/midori_git.bb
+++ b/recipes/gtk-webcore/midori_git.bb
@@ -9,7 +9,7 @@ PV = "0.1.7+${PR}+gitr${SRCPV}"
 
 SRC_URI = "git://git.xfce.org/apps/midori;protocol=git \
            file://waf \
-           file://wscript-fix.patch;patch=1"
+           file://wscript-fix.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/gtk-webcore/osb-browser_0.5.0.bb b/recipes/gtk-webcore/osb-browser_0.5.0.bb
index ebf8c52645..ac44373185 100644
--- a/recipes/gtk-webcore/osb-browser_0.5.0.bb
+++ b/recipes/gtk-webcore/osb-browser_0.5.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade"
 SECTION = "gpe"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-browser-${PV}.tar.gz \
-           file://no-pedantic.patch;patch=1"
+           file://no-pedantic.patch"
 
 inherit autotools
 
diff --git a/recipes/gtk-webcore/osb-browser_20050430.bb b/recipes/gtk-webcore/osb-browser_20050430.bb
index 749698eba5..d7692cabbc 100644
--- a/recipes/gtk-webcore/osb-browser_20050430.bb
+++ b/recipes/gtk-webcore/osb-browser_20050430.bb
@@ -12,7 +12,7 @@ DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=osb-browser;date=${FIXEDSRCDATE} \
-           file://no-pedantic.patch;patch=1"
+           file://no-pedantic.patch"
 S = "${WORKDIR}/osb-browser"
 
 inherit autotools
diff --git a/recipes/gtk-webcore/osb-browser_20060212.bb b/recipes/gtk-webcore/osb-browser_20060212.bb
index 608b3ec014..180c149601 100644
--- a/recipes/gtk-webcore/osb-browser_20060212.bb
+++ b/recipes/gtk-webcore/osb-browser_20060212.bb
@@ -12,7 +12,7 @@ DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=osb-browser;date=${FIXEDSRCDATE} \
-           file://no-pedantic.patch;patch=1"
+           file://no-pedantic.patch"
 S = "${WORKDIR}/osb-browser"
 
 DEFAULT_PREFERENCE = "${@['-1', '1'][not bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1) or bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
diff --git a/recipes/gtk-webcore/osb-jscore_0.5.0.bb b/recipes/gtk-webcore/osb-jscore_0.5.0.bb
index 5a4761c862..924b40f741 100644
--- a/recipes/gtk-webcore/osb-jscore_0.5.0.bb
+++ b/recipes/gtk-webcore/osb-jscore_0.5.0.bb
@@ -6,12 +6,12 @@ SECTION = "gpe"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-jscore-${PV}.tar.gz \
-           file://missing-includes.patch;patch=1 \
-           file://libm.patch;patch=1"
+           file://missing-includes.patch \
+           file://libm.patch"
 
-SRC_URI_append_sh3 = " file://superh-aclocal.patch;patch=1 \
-                       file://gcc4-fno-threadsafe-statics.patch;patch=1 \
-		       file://superh-ustring-declaration-error.patch;patch=1"
+SRC_URI_append_sh3 = " file://superh-aclocal.patch \
+                       file://gcc4-fno-threadsafe-statics.patch \
+		       file://superh-ustring-declaration-error.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gtk-webcore/osb-jscore_20050430.bb b/recipes/gtk-webcore/osb-jscore_20050430.bb
index f024bbfa02..bffeae4e14 100644
--- a/recipes/gtk-webcore/osb-jscore_20050430.bb
+++ b/recipes/gtk-webcore/osb-jscore_20050430.bb
@@ -9,7 +9,7 @@ PV = "0.5.0+cvs${FIXEDSRCDATE}"
 PR = "r1"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDSRCDATE} \
-           file://libm.patch;patch=1"
+           file://libm.patch"
 S = "${WORKDIR}/JavaScriptCore"
 
 inherit autotools pkgconfig
diff --git a/recipes/gtk-webcore/osb-jscore_20070816.bb b/recipes/gtk-webcore/osb-jscore_20070816.bb
index 672b0ba0a7..276d055404 100644
--- a/recipes/gtk-webcore/osb-jscore_20070816.bb
+++ b/recipes/gtk-webcore/osb-jscore_20070816.bb
@@ -9,7 +9,7 @@ PV = "0.5.0+cvs${FIXEDSRCDATE}"
 PR = "r0"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDSRCDATE} \
-           file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1"
+           file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch"
 S = "${WORKDIR}/JavaScriptCore"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gtk-webcore/osb-jscore_svn.bb b/recipes/gtk-webcore/osb-jscore_svn.bb
index 434a5f131f..afa65bf534 100644
--- a/recipes/gtk-webcore/osb-jscore_svn.bb
+++ b/recipes/gtk-webcore/osb-jscore_svn.bb
@@ -8,8 +8,8 @@ PV = "0.5.2+svnr${SRCPV}"
 PR = "r2"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \
-           file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1 \
-	   file://no-static-templates.patch;patch=1 \
+           file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch \
+	   file://no-static-templates.patch \
 	"
 
 S = "${WORKDIR}/JavaScriptCore"
diff --git a/recipes/gtk-webcore/osb-nrcit_20050430.bb b/recipes/gtk-webcore/osb-nrcit_20050430.bb
index 261b52f01b..085313adb8 100644
--- a/recipes/gtk-webcore/osb-nrcit_20050430.bb
+++ b/recipes/gtk-webcore/osb-nrcit_20050430.bb
@@ -11,9 +11,9 @@ PR = "r3"
 DEPENDS = "curl librsvg osb-nrcore"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;date=${FIXEDSRCDATE} \
-	   file://stop-load.image-loading.patch;patch=1	\
-   	   file://gdk-colorspace.diff;patch=1 \
-	   file://fix-loading-error-report.patch;patch=1"
+	   file://stop-load.image-loading.patch	\
+   	   file://gdk-colorspace.diff \
+	   file://fix-loading-error-report.patch"
 
 S = "${WORKDIR}/NRCit"
 
diff --git a/recipes/gtk-webcore/osb-nrcit_20070816.bb b/recipes/gtk-webcore/osb-nrcit_20070816.bb
index 3441d1d508..e1b4695103 100644
--- a/recipes/gtk-webcore/osb-nrcit_20070816.bb
+++ b/recipes/gtk-webcore/osb-nrcit_20070816.bb
@@ -11,8 +11,8 @@ PR = "r0"
 DEPENDS = "curl librsvg osb-nrcore"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;date=${FIXEDSRCDATE} \
-           file://stop-load.image-loading.patch;patch=1 \
-           file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
+           file://stop-load.image-loading.patch \
+           file://gcc4-fno-threadsafe-statics-NRCit.patch"
 S = "${WORKDIR}/NRCit"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gtk-webcore/osb-nrcit_svn.bb b/recipes/gtk-webcore/osb-nrcit_svn.bb
index aff5df6c12..00aebce0cb 100644
--- a/recipes/gtk-webcore/osb-nrcit_svn.bb
+++ b/recipes/gtk-webcore/osb-nrcit_svn.bb
@@ -11,8 +11,8 @@ PR = "r1"
 DEPENDS = "curl librsvg osb-nrcore pango"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCit;proto=https \
-           file://pkgconfig_fix.patch;patch=1 \
-           file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
+           file://pkgconfig_fix.patch \
+           file://gcc4-fno-threadsafe-statics-NRCit.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gtk-webcore/osb-nrcore_0.5.0.bb b/recipes/gtk-webcore/osb-nrcore_0.5.0.bb
index 9478fde3f8..e332be40e3 100644
--- a/recipes/gtk-webcore/osb-nrcore_0.5.0.bb
+++ b/recipes/gtk-webcore/osb-nrcore_0.5.0.bb
@@ -3,7 +3,7 @@ require osb-nrcore.inc
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-nrcore-${PV}.tar.gz \
-           file://KWQDictImpl.patch;patch=1"
+           file://KWQDictImpl.patch"
 
 SRC_URI[md5sum] = "16d9a9a322025cae1a7fe8225690695a"
 SRC_URI[sha256sum] = "39123e386671e18873392fe221616bbfc2be5ca6ddc3660d6cc001a6aa1f59a8"
diff --git a/recipes/gtk-webcore/osb-nrcore_20050430.bb b/recipes/gtk-webcore/osb-nrcore_20050430.bb
index c79f2b9fbd..41dd6c4f8b 100644
--- a/recipes/gtk-webcore/osb-nrcore_20050430.bb
+++ b/recipes/gtk-webcore/osb-nrcore_20050430.bb
@@ -5,7 +5,7 @@ PV = "0.5.0+cvs${FIXEDSRCDATE}"
 PR = "r1"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \
-	   file://KWIQ-mimetype-segfault.patch;patch=1 \
-	   file://setHandle_segfault-fix.patch;patch=1"
+	   file://KWIQ-mimetype-segfault.patch \
+	   file://setHandle_segfault-fix.patch"
 
 S = "${WORKDIR}/NRCore"
diff --git a/recipes/gtk-webcore/osb-nrcore_20070816.bb b/recipes/gtk-webcore/osb-nrcore_20070816.bb
index 1c946d05c6..9c1ac02364 100644
--- a/recipes/gtk-webcore/osb-nrcore_20070816.bb
+++ b/recipes/gtk-webcore/osb-nrcore_20070816.bb
@@ -5,9 +5,9 @@ PV = "0.5.0+cvs${FIXEDSRCDATE}"
 PR = "r0"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \
-           file://KWIQ-mimetype-segfault.patch;patch=1 \
-	   file://KWQKURL-urlcmp.patch;patch=1 \
-           file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1"
+           file://KWIQ-mimetype-segfault.patch \
+	   file://KWQKURL-urlcmp.patch \
+           file://gcc4-fno-threadsafe-statics-NRCore.patch"
 
 S = "${WORKDIR}/NRCore"
 
diff --git a/recipes/gtk-webcore/osb-nrcore_svn.bb b/recipes/gtk-webcore/osb-nrcore_svn.bb
index 1579a36f9a..5f364e6af6 100644
--- a/recipes/gtk-webcore/osb-nrcore_svn.bb
+++ b/recipes/gtk-webcore/osb-nrcore_svn.bb
@@ -5,9 +5,9 @@ PV = "0.5.2+svnr${SRCPV}"
 PR = "r3"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \
-           file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \
-	   file://build_silence.patch;patch=0;maxdate=20070401 \
-	   file://path_fixes.patch;patch=1"
+           file://gcc4-fno-threadsafe-statics-NRCore.patch \
+	   file://build_silence.patch;maxdate=20070401 \
+	   file://path_fixes.patch"
 
 S = "${WORKDIR}/NRCore"
 
diff --git a/recipes/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb b/recipes/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
index 5d6a30690e..9c03a507c4 100644
--- a/recipes/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
+++ b/recipes/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 SECTION = "network/misc"
 
 SRC_URI="http://src.gentoo.pl/distfiles/gtk2-ssh-askpass-${PV}.tar.gz \
-	file://makefile.patch;patch=1"
+	file://makefile.patch"
 
 DEPENDS="gtk+"
 
diff --git a/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb b/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb
index 6bbcd4080c..c1af59d742 100644
--- a/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb
+++ b/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
 PR = "r3"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.0/gtkhtml-${PV}.tar.bz2 \
-	file://fix-missing-colormap.patch;patch=1"
+	file://fix-missing-colormap.patch"
 FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so"
 FILES_${PN}-dev += "${libdir}/gtkhtml"
 
diff --git a/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb b/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb
index d802314b85..b5332451c2 100644
--- a/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb
+++ b/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
 PR = "r2"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2 \
-	file://cross-includedir.patch;patch=1"
+	file://cross-includedir.patch"
 PR = "r1"
 FILES_${PN} += "${datadir}/gtkhtml-3.6"
 
diff --git a/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb b/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb
index 181fce9fb6..6bb85cdedc 100644
--- a/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb
+++ b/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb
@@ -6,7 +6,7 @@ DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
 PR = "r2"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.12/gtkhtml-${PV}.tar.bz2 \
-           file://60_glib-2.15-g-gnuc-function.patch;patch=1"
+           file://60_glib-2.15-g-gnuc-function.patch"
 
 S = "${WORKDIR}/gtkhtml-${PV}"
 
diff --git a/recipes/gtkhtml2/gtkhtml2_svn.bb b/recipes/gtkhtml2/gtkhtml2_svn.bb
index 1dea7520a3..d2b1760dea 100644
--- a/recipes/gtkhtml2/gtkhtml2_svn.bb
+++ b/recipes/gtkhtml2/gtkhtml2_svn.bb
@@ -6,12 +6,12 @@ SRCREV = "1158"
 PV = "2.11.0+svnr${SRCPV}"
 
 SRC_URI = "svn://anonymous@svn.gnome.org/svn/gtkhtml2/;module=trunk \
-	http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch;patch=1;pnum=0;maxrev=1157;name=patch1 \
-	http://svn.o-hand.com/repos/web/trunk/patches/css-stylesheet-user.patch;patch=1;pnum=0;maxrev=1157;name=patch2 \
-	http://svn.o-hand.com/repos/web/trunk/patches/css-media.patch;patch=1;pnum=0;maxrev=1157;name=patch3 \
-	http://svn.o-hand.com/repos/web/trunk/patches/add-end-element-signal.patch;patch=1;pnum=0;maxrev=1157;name=patch4 \
-	http://svn.o-hand.com/repos/web/trunk/patches/add-dom-functions.patch;patch=1;pnum=0;maxrev=1157;name=patch5 \
-	http://svn.o-hand.com/repos/web/trunk/patches/iain-mem-leak.patch;patch=1;pnum=0;maxrev=1157;name=patch6"
+	http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch;striplevel=0;maxrev=1157;name=patch1 \
+	http://svn.o-hand.com/repos/web/trunk/patches/css-stylesheet-user.patch;striplevel=0;maxrev=1157;name=patch2 \
+	http://svn.o-hand.com/repos/web/trunk/patches/css-media.patch;striplevel=0;maxrev=1157;name=patch3 \
+	http://svn.o-hand.com/repos/web/trunk/patches/add-end-element-signal.patch;striplevel=0;maxrev=1157;name=patch4 \
+	http://svn.o-hand.com/repos/web/trunk/patches/add-dom-functions.patch;striplevel=0;maxrev=1157;name=patch5 \
+	http://svn.o-hand.com/repos/web/trunk/patches/iain-mem-leak.patch;striplevel=0;maxrev=1157;name=patch6"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/guichan/guichan_0.7.1.bb b/recipes/guichan/guichan_0.7.1.bb
index 76c421fb56..2426980946 100644
--- a/recipes/guichan/guichan_0.7.1.bb
+++ b/recipes/guichan/guichan_0.7.1.bb
@@ -4,7 +4,7 @@ DEPENDS = "virtual/libsdl libsdl-image"
 PR = "r1"
 
 SRC_URI = "http://guichan.googlecode.com/files/${PN}-${PV}.tar.gz \
-           file://link-against-sdlimage.patch;patch=1"
+           file://link-against-sdlimage.patch"
 
 inherit autotools
 
diff --git a/recipes/guile/guile-native_1.8.5.bb b/recipes/guile/guile-native_1.8.5.bb
index 5cb1d2e435..01325ba277 100644
--- a/recipes/guile/guile-native_1.8.5.bb
+++ b/recipes/guile/guile-native_1.8.5.bb
@@ -3,8 +3,8 @@ require guile-native.inc
 DEPENDS = "libtool (< 2)"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
-           file://configure-fix.patch;patch=1 \
-           file://cpp-linemarkers.patch;patch=1 \
+           file://configure-fix.patch \
+           file://cpp-linemarkers.patch \
           "
 
 PR = "r1"
diff --git a/recipes/guile/guile-native_1.8.6.bb b/recipes/guile/guile-native_1.8.6.bb
index 2307d14872..c4bc392df2 100644
--- a/recipes/guile/guile-native_1.8.6.bb
+++ b/recipes/guile/guile-native_1.8.6.bb
@@ -1,7 +1,7 @@
 require guile-native.inc
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
-           file://configure-fix.patch;patch=1 \
-           file://cpp-linemarkers.patch;patch=1 \
+           file://configure-fix.patch \
+           file://cpp-linemarkers.patch \
           "
 
 SRC_URI[md5sum] = "9e23d3dbea0e89bab8a9acc6880150de"
diff --git a/recipes/guile/guile-native_1.8.7.bb b/recipes/guile/guile-native_1.8.7.bb
index 25d66d9406..aa4fbb0394 100644
--- a/recipes/guile/guile-native_1.8.7.bb
+++ b/recipes/guile/guile-native_1.8.7.bb
@@ -1,7 +1,7 @@
 require guile-native.inc
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
-           file://configure-fix.patch;patch=1 \
-           file://cpp-linemarkers.patch;patch=1 \
+           file://configure-fix.patch \
+           file://cpp-linemarkers.patch \
           "
 
 SRC_URI[md5sum] = "991b5b3efcbbc3f7507d05bc42f80a5e"
diff --git a/recipes/guile/guile_1.8.5.bb b/recipes/guile/guile_1.8.5.bb
index 1d071e767b..95cdfaa660 100644
--- a/recipes/guile/guile_1.8.5.bb
+++ b/recipes/guile/guile_1.8.5.bb
@@ -3,7 +3,7 @@ require guile.inc
 DEPENDS = "libtool (< 2)"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
-           file://configure-fix.patch;patch=1 \
+           file://configure-fix.patch \
           "
 
 PR = "r4"
diff --git a/recipes/guile/guile_1.8.6.bb b/recipes/guile/guile_1.8.6.bb
index 58fd5b70c9..493e067d60 100644
--- a/recipes/guile/guile_1.8.6.bb
+++ b/recipes/guile/guile_1.8.6.bb
@@ -1,7 +1,7 @@
 require guile.inc
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
-           file://configure-fix.patch;patch=1 \
+           file://configure-fix.patch \
           "
 
 
diff --git a/recipes/guile/guile_1.8.7.bb b/recipes/guile/guile_1.8.7.bb
index 61d9bc4396..b5d49fc2f1 100644
--- a/recipes/guile/guile_1.8.7.bb
+++ b/recipes/guile/guile_1.8.7.bb
@@ -1,7 +1,7 @@
 require guile.inc
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
-           file://configure-fix.patch;patch=1 \
+           file://configure-fix.patch \
           "
 
 
diff --git a/recipes/gweled/gweled_0.5.bb b/recipes/gweled/gweled_0.5.bb
index c420239854..3b63ce3724 100644
--- a/recipes/gweled/gweled_0.5.bb
+++ b/recipes/gweled/gweled_0.5.bb
@@ -6,7 +6,7 @@ DEPENDS = "gtk+ librsvg"
 PRIORITY = "optional"
 
 SRC_URI = "http://sebdelestaing.free.fr/gweled/Release/gweled-0.5.tar.gz \
-	   file://de-gnome.patch;patch=1"
+	   file://de-gnome.patch"
 
 EXTRA_OECONF = " --disable-setgid --prefix=/usr"
 
diff --git a/recipes/gxine/gxine_0.4.1.bb b/recipes/gxine/gxine_0.4.1.bb
index e39b714e78..73c739b893 100644
--- a/recipes/gxine/gxine_0.4.1.bb
+++ b/recipes/gxine/gxine_0.4.1.bb
@@ -31,7 +31,7 @@ RDEPENDS = "libxine-plugin-vo-out-xshm \
 
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-${PV}.tar.gz \
-	   file://disable-browser-plugin.patch;patch=1"
+	   file://disable-browser-plugin.patch"
 
 EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \
 		--libdir=${STAGING_LIBDIR} \
diff --git a/recipes/gxine/gxine_0.4.1enhanced.bb b/recipes/gxine/gxine_0.4.1enhanced.bb
index a3abf8838d..3e11065d4c 100644
--- a/recipes/gxine/gxine_0.4.1enhanced.bb
+++ b/recipes/gxine/gxine_0.4.1enhanced.bb
@@ -34,7 +34,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-0.4.1.tar.gz \
 	   file://rhythmbox-volume-medium.png \
 	   file://rhythmbox-volume-min.png \
 	   file://rhythmbox-volume-zero.png \
-	   file://enhance.patch;patch=1"
+	   file://enhance.patch"
 
 EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \
 		--libdir=${STAGING_LIBDIR} \
diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb
index 9c1fb4177a..9b112dd8e9 100644
--- a/recipes/gypsy/gypsy_0.7.bb
+++ b/recipes/gypsy/gypsy_0.7.bb
@@ -1,8 +1,8 @@
 require gypsy.inc
 
 SRC_URI = "http://gypsy.freedesktop.org/gypsy-releases/gypsy-0.7.tar.gz;name=gypsy \
-           file://docs-reference-am.patch;patch=1 \
-           file://remove-werror.patch;patch=1 \
+           file://docs-reference-am.patch \
+           file://remove-werror.patch \
 "
 
 SRC_URI[gypsy.md5sum] = "cde52c121693014efa75d9098fd7de22"
diff --git a/recipes/gzip/gzip_1.3.13.bb b/recipes/gzip/gzip_1.3.13.bb
index 86c1abede6..a4dadea5e2 100644
--- a/recipes/gzip/gzip_1.3.13.bb
+++ b/recipes/gzip/gzip_1.3.13.bb
@@ -7,7 +7,7 @@ the standard compression program for its system."
 PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz;name=src \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 SRC_URI[src.md5sum] = "c54a31b93e865f6a4410b2dc64662706"
 SRC_URI[src.sha256sum] = "1d06ff9f5c523651bed3dcde6e6aa8118eee48b22534a157a2588705fa517ca3"
 
diff --git a/recipes/hal/hal_0.5.11.bb b/recipes/hal/hal_0.5.11.bb
index a0df6192c6..315570bf07 100644
--- a/recipes/hal/hal_0.5.11.bb
+++ b/recipes/hal/hal_0.5.11.bb
@@ -2,9 +2,9 @@ require hal.inc
 
 PR = "r6"
 
-SRC_URI += " file://hal-right-input-h.patch;patch=1 \
-             file://fix-configure.diff;patch=1 \
-             file://wifi-2.6.27.diff;patch=1"
+SRC_URI += " file://hal-right-input-h.patch \
+             file://fix-configure.diff \
+             file://wifi-2.6.27.diff"
 
 # The following code finds the right linux/input.h,
 # which also works with external-toolchain/SDK
diff --git a/recipes/hal/hal_0.5.14+git.bb b/recipes/hal/hal_0.5.14+git.bb
index 1e1f10e01a..36d5b3b779 100644
--- a/recipes/hal/hal_0.5.14+git.bb
+++ b/recipes/hal/hal_0.5.14+git.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 
 SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
-        file://0001-Add-touchscreen-option.patch;patch=1 \
+        file://0001-Add-touchscreen-option.patch \
         file://20hal \
         file://99_hal"
 
diff --git a/recipes/hal/hal_0.5.9.1.bb b/recipes/hal/hal_0.5.9.1.bb
index 0e2caf50e4..ef4b0446bb 100644
--- a/recipes/hal/hal_0.5.9.1.bb
+++ b/recipes/hal/hal_0.5.9.1.bb
@@ -9,8 +9,8 @@ RDEPENDS_${PN} += "udev-utils hal-info"
 PR = "r10"
 
 SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
-           file://configure_fix.patch;patch=1 \
-           file://sg-inhibit.patch;patch=1 \
+           file://configure_fix.patch \
+           file://sg-inhibit.patch \
            file://20hal \
            file://99_hal"
 
diff --git a/recipes/hal/ohm_git.bb b/recipes/hal/ohm_git.bb
index af2377e436..64a0a7ebef 100644
--- a/recipes/hal/ohm_git.bb
+++ b/recipes/hal/ohm_git.bb
@@ -5,11 +5,11 @@ LICENSE = "LGPL"
 DEPENDS = "gtk+ dbus-glib intltool-native hal"
 RDEPENDS_${PN} += "udev hal-info"
 SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \
-           file://fix_configure.patch;patch=1"
+           file://fix_configure.patch"
 
 SRCREV = "edfe25d49d67884bf004de7ae0724c162bb5e65e"
-PV = "0.1.2+${PR}+gitr${SRCPV}"
-PE = "2"
+PV = "0.1.2+${PR}+gitr${SRCREV}"
+PE = "1"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/handsfree/handsfree_0.1.bb b/recipes/handsfree/handsfree_0.1.bb
index 5bd2376aff..85d8a13713 100644
--- a/recipes/handsfree/handsfree_0.1.bb
+++ b/recipes/handsfree/handsfree_0.1.bb
@@ -9,7 +9,7 @@ PR = "r0"
 
 SRC_URI = "\
    http://www.soft.uni-linz.ac.at/~vogl/bluez/handsfree-040326.tar.gz \
-  file://Makefile.patch;patch=1 \
+  file://Makefile.patch \
 "
 S = "${WORKDIR}/handsfree"
 
diff --git a/recipes/havp/havp_0.82.bb b/recipes/havp/havp_0.82.bb
index 50f6974cbc..9ec48e68e9 100644
--- a/recipes/havp/havp_0.82.bb
+++ b/recipes/havp/havp_0.82.bb
@@ -2,7 +2,7 @@ require havp.inc
 
 PR = "r3"
 
-SRC_URI_append += " file://sysconfdir-is-etc.patch;patch=1"
+SRC_URI_append += " file://sysconfdir-is-etc.patch"
 
 SRC_URI[md5sum] = "9e6a16b7d074782d1c62f1f7316e56ab"
 SRC_URI[sha256sum] = "e2db8d3383cd8eca6a18ebee85875de895f3ac7414eab091a87f052d79a87b09"
diff --git a/recipes/havp/havp_0.86.bb b/recipes/havp/havp_0.86.bb
index b68e5ef988..0b4f16a77a 100644
--- a/recipes/havp/havp_0.86.bb
+++ b/recipes/havp/havp_0.86.bb
@@ -2,7 +2,7 @@ require havp.inc
 
 PR = "r1"
 
-SRC_URI_append += " file://reconfigure.patch;patch=1"
+SRC_URI_append += " file://reconfigure.patch"
 
 SRC_URI[md5sum] = "c99c8da224c72844882623086e2b1618"
 SRC_URI[sha256sum] = "1649ab227c7fd7b4af5ab602a3cdff16c038965c6673c09a239d5df35fa88da8"
diff --git a/recipes/hddtemp/hddtemp_0.3-beta15.bb b/recipes/hddtemp/hddtemp_0.3-beta15.bb
index c1f0490303..f3e281164a 100644
--- a/recipes/hddtemp/hddtemp_0.3-beta15.bb
+++ b/recipes/hddtemp/hddtemp_0.3-beta15.bb
@@ -4,7 +4,7 @@ PR = "r0"
 LICENSE = "GPL"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 \
-	   file://hddtemp-no-nls-support.patch;patch=1 \
+	   file://hddtemp-no-nls-support.patch \
 	   file://hddtemp.db \
 		"
 
diff --git a/recipes/hdparm/hdparm_6.3.bb b/recipes/hdparm/hdparm_6.3.bb
index 6e89c0286e..b6d3de662d 100644
--- a/recipes/hdparm/hdparm_6.3.bb
+++ b/recipes/hdparm/hdparm_6.3.bb
@@ -5,8 +5,8 @@ PRIORITY = "optional"
 LICENSE = "BSD"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz \
-	   file://bswap.patch;patch=1 \
-	   file://uclibc.patch;patch=1"
+	   file://bswap.patch \
+	   file://uclibc.patch"
 
 do_install () {
 	install -d ${D}/${sbindir} ${D}/${mandir}/man8
diff --git a/recipes/hdparm/hdparm_6.6.bb b/recipes/hdparm/hdparm_6.6.bb
index ffec921ca7..8cc9294e00 100644
--- a/recipes/hdparm/hdparm_6.6.bb
+++ b/recipes/hdparm/hdparm_6.6.bb
@@ -5,8 +5,8 @@ PRIORITY = "optional"
 LICENSE = "BSD"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz \
-	   file://bswap.patch;patch=1 \
-	   file://uclibc.patch;patch=1"
+	   file://bswap.patch \
+	   file://uclibc.patch"
 
 do_install () {
 	install -d ${D}/${sbindir} ${D}/${mandir}/man8
diff --git a/recipes/hdparm/hdparm_6.9.bb b/recipes/hdparm/hdparm_6.9.bb
index d6878da425..8bf7e1a661 100644
--- a/recipes/hdparm/hdparm_6.9.bb
+++ b/recipes/hdparm/hdparm_6.9.bb
@@ -7,8 +7,8 @@ LICENSE = "BSD"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz \
-	   file://bswap.patch;patch=1 \
-	   file://uclibc.patch;patch=1"
+	   file://bswap.patch \
+	   file://uclibc.patch"
 
 do_install () {
 	install -d ${D}/${base_sbindir} ${D}/${mandir}/man8
diff --git a/recipes/hfsplusutils/hfsplusutils_1.0.4-4.bb b/recipes/hfsplusutils/hfsplusutils_1.0.4-4.bb
index 400dc4713a..22e9cb8834 100644
--- a/recipes/hfsplusutils/hfsplusutils_1.0.4-4.bb
+++ b/recipes/hfsplusutils/hfsplusutils_1.0.4-4.bb
@@ -10,10 +10,10 @@ inherit kernel-arch autotools pkgconfig
 DEPENDS = " rpm2cpio-native"
 
 SRC_URI = "http://penguinppc.org/historical/hfsplus/hfsplusutils-1.0.4-4.src.rpm \
-	   file://hfsplusutils-1.0.4-errno.patch;patch=1 \
-	   file://hfsplusutils-1.0.4-gcc4.patch;patch=1 \
-	   file://hfsplusutils-1.0.4-glob.patch;patch=1 \
-	   file://hfsplusutils-1.0.4-string.patch;patch=1 \
+	   file://hfsplusutils-1.0.4-errno.patch \
+	   file://hfsplusutils-1.0.4-gcc4.patch \
+	   file://hfsplusutils-1.0.4-glob.patch \
+	   file://hfsplusutils-1.0.4-string.patch \
 		"
 
 do_unpack() {
diff --git a/recipes/hfsutils/hfsutils_3.2.6.bb b/recipes/hfsutils/hfsutils_3.2.6.bb
index 75b3297d8e..708ad84a17 100644
--- a/recipes/hfsutils/hfsutils_3.2.6.bb
+++ b/recipes/hfsutils/hfsutils_3.2.6.bb
@@ -6,8 +6,8 @@ PR = "r2"
 inherit autotools pkgconfig
 
 SRC_URI = "ftp://ftp.mars.org/pub/hfs/hfsutils-3.2.6.tar.gz \
-	   file://hfsutils-3.2.6-errno.patch;patch=1 \
-	   file://largerthan2gb.patch;patch=1 \
+	   file://hfsutils-3.2.6-errno.patch \
+	   file://largerthan2gb.patch \
 		"
 
 do_configure () {
diff --git a/recipes/horizon/horizon_cvs.bb b/recipes/horizon/horizon_cvs.bb
index bfa26b54a1..c106d834ff 100644
--- a/recipes/horizon/horizon_cvs.bb
+++ b/recipes/horizon/horizon_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 libpng jpeg virtual/libsdl"
 PR = "r1"
 
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=horizon \
-	file://makefile.patch;patch=1"
+	file://makefile.patch"
 
 inherit pkgconfig binconfig
 
diff --git a/recipes/hostap/hostap-daemon.inc b/recipes/hostap/hostap-daemon.inc
index f723d07575..33dc1c140e 100644
--- a/recipes/hostap/hostap-daemon.inc
+++ b/recipes/hostap/hostap-daemon.inc
@@ -11,8 +11,8 @@ CPPFLAGS_append_mtx-1 = " -I${STAGING_INCDIR}/madwifi/"
 CPPFLAGS_append_mtx-2 = " -I${STAGING_INCDIR}/madwifi/"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
-	file://makefile-cross.diff;patch=1;pnum=0 \
-	file://madwifi-bsd-fix.diff;patch=1;pnum=0 \
+	file://makefile-cross.diff;striplevel=0 \
+	file://madwifi-bsd-fix.diff;striplevel=0 \
 	file://defconfig \
 	file://init"
 
diff --git a/recipes/hostap/hostap-daemon_0.4.4.bb b/recipes/hostap/hostap-daemon_0.4.4.bb
index f1a73c3358..197e6cd81b 100644
--- a/recipes/hostap/hostap-daemon_0.4.4.bb
+++ b/recipes/hostap/hostap-daemon_0.4.4.bb
@@ -1,7 +1,7 @@
 require hostap-daemon.inc
 
 SRC_URI_append_nylon = "\
-	file://hostap-no-bsd.patch;patch=1"
+	file://hostap-no-bsd.patch"
 
 
 PR = "r2"
diff --git a/recipes/hostap/hostap-daemon_0.5.10.bb b/recipes/hostap/hostap-daemon_0.5.10.bb
index 79441ffe90..d5a71fc2f5 100644
--- a/recipes/hostap/hostap-daemon_0.5.10.bb
+++ b/recipes/hostap/hostap-daemon_0.5.10.bb
@@ -15,7 +15,7 @@ MY_ARCH := "${PACKAGE_ARCH}"
 PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'madwifi', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
-	file://makefile-cross.diff;patch=1 \
+	file://makefile-cross.diff \
 	file://defconfig \
 	file://init"
 
diff --git a/recipes/hostap/hostap-daemon_0.6.9.bb b/recipes/hostap/hostap-daemon_0.6.9.bb
index 7ffa2a1f80..ba8761ec97 100644
--- a/recipes/hostap/hostap-daemon_0.6.9.bb
+++ b/recipes/hostap/hostap-daemon_0.6.9.bb
@@ -9,7 +9,7 @@ PR = "r2"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
-	file://ldflags.patch;patch=1 \
+	file://ldflags.patch \
 	file://defconfig \
 	file://init"
 
diff --git a/recipes/hostap/hostap-modules-rawtx_0.4.7.bb b/recipes/hostap/hostap-modules-rawtx_0.4.7.bb
index 7227b609af..bed65fe1e6 100644
--- a/recipes/hostap/hostap-modules-rawtx_0.4.7.bb
+++ b/recipes/hostap/hostap-modules-rawtx_0.4.7.bb
@@ -4,11 +4,11 @@ DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3
 RDEPENDS_hostap-modules-cs-rawtx = "hostap-modules-rawtx"
 RDEPENDS_hostap-modules-pci-rawtx = "hostap-modules-rawtx"
 
-SRC_URI += "file://kernel_updates.patch;patch=1 \
-	   file://hostap-driver-0.4.7.patch;patch=1;pnum=1 \
+SRC_URI += "file://kernel_updates.patch \
+	   file://hostap-driver-0.4.7.patch \
            file://hostap_cs.conf "
-SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
-	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
+SRC_URI_append_mtx-1 = " file://mtx_compat.diff;striplevel=0 \
+	file://mtx_hostap_deferred_irq.diff;striplevel=0"
 
 S = "${WORKDIR}/hostap-driver-${PV}"
 
diff --git a/recipes/hostap/hostap-modules.inc b/recipes/hostap/hostap-modules.inc
index 3184f00fb3..40e6742c45 100644
--- a/recipes/hostap/hostap-modules.inc
+++ b/recipes/hostap/hostap-modules.inc
@@ -5,11 +5,11 @@ LICENSE = "GPL"
 RRECOMMENDS = "apm-wifi-suspendfix"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz"
-SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
-	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
-SRC_URI_append_mtx-2 = " file://mtx_compat.diff;patch=1;pnum=0 \
-	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
-SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
+SRC_URI_append_mtx-1 = " file://mtx_compat.diff;striplevel=0 \
+	file://mtx_hostap_deferred_irq.diff;striplevel=0"
+SRC_URI_append_mtx-2 = " file://mtx_compat.diff;striplevel=0 \
+	file://mtx_hostap_deferred_irq.diff;striplevel=0"
+SRC_URI_append_h3900 = " file://ipaq_compat.patch "
 
 S = "${WORKDIR}/hostap-driver-${PV}"
 
diff --git a/recipes/hostap/hostap-modules_0.4.4.bb b/recipes/hostap/hostap-modules_0.4.4.bb
index b75eb0dddc..e7cd26db3c 100644
--- a/recipes/hostap/hostap-modules_0.4.4.bb
+++ b/recipes/hostap/hostap-modules_0.4.4.bb
@@ -1,7 +1,7 @@
 require hostap-modules.inc
 PR = "r7"
 
-SRC_URI += "file://kernel_updates.patch;patch=1"
+SRC_URI += "file://kernel_updates.patch"
 
 SRC_URI[md5sum] = "e9b4a5cb992e06c3c6bf2bc99eca6625"
 SRC_URI[sha256sum] = "7b9ad6bb5cf6c485e320bd8901d2e398cb6661cda633ba6360200a9bf94eb5fb"
diff --git a/recipes/hostap/hostap-modules_0.4.7.bb b/recipes/hostap/hostap-modules_0.4.7.bb
index 8ca4161361..2254598d42 100644
--- a/recipes/hostap/hostap-modules_0.4.7.bb
+++ b/recipes/hostap/hostap-modules_0.4.7.bb
@@ -1,7 +1,7 @@
 require hostap-modules.inc
 PR = "r5"
 
-SRC_URI += "file://kernel_updates.patch;patch=1"
+SRC_URI += "file://kernel_updates.patch"
 
 SRC_URI[md5sum] = "ee495686cf27011b4e401963c2c7f62a"
 SRC_URI[sha256sum] = "e9a3e035a1483b371269936c6fde46bfbae71dc38fa04685c1338ca8ffe900a5"
diff --git a/recipes/hostap/hostap-utils_0.4.7.bb b/recipes/hostap/hostap-utils_0.4.7.bb
index 084f6d14cf..fffa2a7bfc 100644
--- a/recipes/hostap/hostap-utils_0.4.7.bb
+++ b/recipes/hostap/hostap-utils_0.4.7.bb
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PR = "r6"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
-	   file://hostap-fw-load.patch;patch=1 \
-	   file://ldflags.patch;patch=1"
+	   file://hostap-fw-load.patch \
+	   file://ldflags.patch"
 
 S = "${WORKDIR}/hostap-utils-${PV}"
 
diff --git a/recipes/hotplug-ng/hotplug-ng_001.bb b/recipes/hotplug-ng/hotplug-ng_001.bb
index 35499bdc43..1b0185c9fc 100644
--- a/recipes/hotplug-ng/hotplug-ng_001.bb
+++ b/recipes/hotplug-ng/hotplug-ng_001.bb
@@ -8,7 +8,7 @@ RREPLACES = "hotplug"
 PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-ng-${PV}.tar.gz \
-	   file://flags.patch;patch=1"
+	   file://flags.patch"
 S = "${WORKDIR}/hotplug-ng-${PV}"
 
 LD = "${CC}"
diff --git a/recipes/howl/howl_1.0.0.bb b/recipes/howl/howl_1.0.0.bb
index 3837f3baf6..fa2eb343fb 100644
--- a/recipes/howl/howl_1.0.0.bb
+++ b/recipes/howl/howl_1.0.0.bb
@@ -1,6 +1,6 @@
 SRC_URI = "http://www.porchdogsoft.com/download/howl-${PV}.tar.gz \
-	file://posix.patch;patch=1;pnum=0 \
-	file://configure.patch;patch=1;pnum=0 \
+	file://posix.patch;striplevel=0 \
+	file://configure.patch;striplevel=0 \
 	file://mdnsresponder.init"
 LICENSE = "howl"
 
diff --git a/recipes/hping/hping2_1.9.9+2.0.0rc3.bb b/recipes/hping/hping2_1.9.9+2.0.0rc3.bb
index 0d463f20b3..4a7fe8bb95 100644
--- a/recipes/hping/hping2_1.9.9+2.0.0rc3.bb
+++ b/recipes/hping/hping2_1.9.9+2.0.0rc3.bb
@@ -10,8 +10,8 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://www.hping.org/hping2.0.0-rc3.tar.gz \
-	   file://hping2_debian.patch;patch=1 \
-	   file://hping2_configure.patch;patch=1"
+	   file://hping2_debian.patch \
+	   file://hping2_configure.patch"
 S = "${WORKDIR}/hping2-rc3"
 
 inherit siteinfo
diff --git a/recipes/hplip/hplip_2.8.10.bb b/recipes/hplip/hplip_2.8.10.bb
index da69d24a74..5215796785 100644
--- a/recipes/hplip/hplip_2.8.10.bb
+++ b/recipes/hplip/hplip_2.8.10.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL, MIT"
 # for embedded systems.
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
-           file://cross-build.patch;patch=1"
+           file://cross-build.patch"
 
 PR = "r1"
 
diff --git a/recipes/hsetroot/hsetroot_1.0.2.bb b/recipes/hsetroot/hsetroot_1.0.2.bb
index 0fc05fc3d1..6b17bb0df8 100644
--- a/recipes/hsetroot/hsetroot_1.0.2.bb
+++ b/recipes/hsetroot/hsetroot_1.0.2.bb
@@ -4,7 +4,7 @@ RDEPENDS += "imlib2-loaders"
 LICENSE = "GPL"
 
 SRC_URI = "http://thegraveyard.org/files/hsetroot-${PV}.tar.gz \
-           file://pkgconfigize-imlib.patch;patch=1"
+           file://pkgconfigize-imlib.patch"
 
 inherit autotools
 
diff --git a/recipes/htb-init/htb-init_0.8.5.bb b/recipes/htb-init/htb-init_0.8.5.bb
index e6a7408e25..2ef889b230 100644
--- a/recipes/htb-init/htb-init_0.8.5.bb
+++ b/recipes/htb-init/htb-init_0.8.5.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/htbinit/htb.init-v${PV} \
-	file://htb.init+ingress+predef+verbose.diff;patch=1;pnum=0 \
-	file://htb-basic-verbose.diff;patch=1;pnum=0"
+	file://htb.init+ingress+predef+verbose.diff;striplevel=0 \
+	file://htb-basic-verbose.diff;striplevel=0"
 RRECOMMENDS = "kernel-module-sch-ingress kernel-module-cls-route kernel-module-cls-u32 kernel-module-cls-fw kernel-module-sch-sfq kernel-module-sch-htb"
 RDEPENDS = "iproute2"
 
diff --git a/recipes/htmldoc/htmldoc-gui_1.8.27.bb b/recipes/htmldoc/htmldoc-gui_1.8.27.bb
index c9defd20ba..2c702e6905 100644
--- a/recipes/htmldoc/htmldoc-gui_1.8.27.bb
+++ b/recipes/htmldoc/htmldoc-gui_1.8.27.bb
@@ -4,7 +4,7 @@ PR = "r2"
 
 
 SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/${PV}/htmldoc-${PV}-source.tar.bz2 \
-file://paths_1.8.27.patch;patch=1"
+file://paths_1.8.27.patch"
 
 
 S = "${WORKDIR}/htmldoc-${PV}"
diff --git a/recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb b/recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb
index 574a04aab8..098bf63057 100644
--- a/recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb
+++ b/recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb
@@ -4,7 +4,7 @@ PR = "r2"
 
 
 SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \
-file://paths_1.9.x.patch;patch=1"
+file://paths_1.9.x.patch"
 
 
 S = "${WORKDIR}/htmldoc-${PV}"
diff --git a/recipes/htmldoc/htmldoc-native_1.8.27.bb b/recipes/htmldoc/htmldoc-native_1.8.27.bb
index 3631da1bf7..36a6dee7c9 100644
--- a/recipes/htmldoc/htmldoc-native_1.8.27.bb
+++ b/recipes/htmldoc/htmldoc-native_1.8.27.bb
@@ -3,7 +3,7 @@ PR = "r2"
 
 
 SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/${PV}/htmldoc-${PV}-source.tar.bz2 \
-file://paths_1.8.27.patch;patch=1"
+file://paths_1.8.27.patch"
 
 
 inherit autotools native
diff --git a/recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb b/recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb
index b6f6564b53..60d9360dc7 100644
--- a/recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb
+++ b/recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb
@@ -3,7 +3,7 @@ PR = "r2"
 
 
 SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \
-file://paths_1.9.x.patch;patch=1"
+file://paths_1.9.x.patch"
 
 
 inherit autotools native
diff --git a/recipes/htmldoc/htmldoc_1.8.27.bb b/recipes/htmldoc/htmldoc_1.8.27.bb
index 088c08f321..bb5ce8b78a 100644
--- a/recipes/htmldoc/htmldoc_1.8.27.bb
+++ b/recipes/htmldoc/htmldoc_1.8.27.bb
@@ -4,7 +4,7 @@ PR = "r2"
 
 
 SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/${PV}/htmldoc-${PV}-source.tar.bz2 \
-file://paths_1.8.27.patch;patch=1"
+file://paths_1.8.27.patch"
 
 
 inherit autotools pkgconfig
diff --git a/recipes/htmldoc/htmldoc_1.9.x-r1571.bb b/recipes/htmldoc/htmldoc_1.9.x-r1571.bb
index 629fc8c2c4..aac761ebe3 100644
--- a/recipes/htmldoc/htmldoc_1.9.x-r1571.bb
+++ b/recipes/htmldoc/htmldoc_1.9.x-r1571.bb
@@ -4,7 +4,7 @@ PR = "r2"
 
 
 SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \
-file://paths_1.9.x.patch;patch=1"
+file://paths_1.9.x.patch"
 
 
 inherit autotools pkgconfig
diff --git a/recipes/htop/htop_0.7.bb b/recipes/htop/htop_0.7.bb
index 62ed7d157b..4474bea9ab 100644
--- a/recipes/htop/htop_0.7.bb
+++ b/recipes/htop/htop_0.7.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
 DEPENDS = "ncurses"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/htop/htop-${PV}.tar.gz \
-           file://remove-proc-test.patch;patch=1"
+           file://remove-proc-test.patch"
 
 inherit autotools
 
diff --git a/recipes/httppc/httppc_0.8.5.bb b/recipes/httppc/httppc_0.8.5.bb
index a7bd207174..cfa41479ea 100644
--- a/recipes/httppc/httppc_0.8.5.bb
+++ b/recipes/httppc/httppc_0.8.5.bb
@@ -8,7 +8,7 @@ DNS resolution."
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/httppc/httppc-${PV}.tar.gz \
-	   file://install.patch;patch=1"
+	   file://install.patch"
 
 inherit autotools
 
diff --git a/recipes/hwdata/hwdata_0.191.bb b/recipes/hwdata/hwdata_0.191.bb
index 231c434345..527efdfb37 100644
--- a/recipes/hwdata/hwdata_0.191.bb
+++ b/recipes/hwdata/hwdata_0.191.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL + X11"
 PR = "r1"
 
 SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/h/hwdata/hwdata_0.191.orig.tar.gz;name=archive \
-           http://archive.ubuntu.com/ubuntu/pool/main/h/hwdata/hwdata_0.191-1.diff.gz;patch=1;name=patch \
+           http://archive.ubuntu.com/ubuntu/pool/main/h/hwdata/hwdata_0.191-1.diff.gz;name=patch \
 	   "
 
 PACKAGE_ARCH = "all"
diff --git a/recipes/i2c-tools/i2c-tools_3.0.1.bb b/recipes/i2c-tools/i2c-tools_3.0.1.bb
index 69fa3edfe2..69e0f5302b 100644
--- a/recipes/i2c-tools/i2c-tools_3.0.1.bb
+++ b/recipes/i2c-tools/i2c-tools_3.0.1.bb
@@ -7,8 +7,8 @@ SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2"
 inherit autotools
 
 do_compile_prepend() {
-        sed -i 's_/usr/local_/usr_' Makefile
-        sed -i 's_CC\t:= gcc_CC\t:= ${CC}_' Makefile
+        sed -i 's#/usr/local#/usr#' Makefile
+        sed -i 's#CC\t:= gcc#CC\t:= ${CC}#' Makefile
 }
 
 SRC_URI[md5sum] = "0f5c7ce5fd3c65113909db0ef3a3a8c8"
diff --git a/recipes/i2c-tools/i2c-tools_3.0.2.bb b/recipes/i2c-tools/i2c-tools_3.0.2.bb
index bf792fb976..9c5efcccb8 100644
--- a/recipes/i2c-tools/i2c-tools_3.0.2.bb
+++ b/recipes/i2c-tools/i2c-tools_3.0.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Set of i2c tools for linux"
 SECTION = "base"
 LICENSE = "GPLv2"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2 \
            file://Module.mk \
@@ -12,8 +12,8 @@ inherit autotools
 
 do_compile_prepend() {
         cp ${WORKDIR}/Module.mk ${S}/eepromer/
-        sed -i 's_/usr/local_/usr_' Makefile
-        sed -i 's_CC\t:= gcc_CC\t:= ${CC}_' Makefile
+        sed -i 's#/usr/local#/usr#' Makefile
+        sed -i 's#CC\t:= gcc#CC\t:= ${CC}#' Makefile
         echo "include eepromer/Module.mk" >> Makefile
 }
 
diff --git a/recipes/i2c-tools/omap3-writeprom.bb b/recipes/i2c-tools/omap3-writeprom.bb
new file mode 100644
index 0000000000..485d06fe43
--- /dev/null
+++ b/recipes/i2c-tools/omap3-writeprom.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Writeprom script for omap3 boards with EEPROM on there expansionboard - see http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs"
+
+
+SRC_URI = "file://writeprom.sh"
+
+S = "${WORKDIR}"
+
+do_install () {
+  install -d ${D}${bindir}/
+  install -m 0755 ${WORKDIR}/writeprom.sh ${D}${bindir}/
+}
+
+PACKAGE_ARCH = "all"
+RDEPENDS_${PN} = "i2c-tools"
+FILES_${PN} = "${bindir}"
+
diff --git a/recipes/i2c-tools/omap3-writeprom/writeprom.sh b/recipes/i2c-tools/omap3-writeprom/writeprom.sh
new file mode 100755
index 0000000000..d1e2b09dcc
--- /dev/null
+++ b/recipes/i2c-tools/omap3-writeprom/writeprom.sh
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+machine_id() {          # return the machine ID
+    awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
+}
+
+if [ $# -ne 4 ] && [ $# -ne 6 ];
+then
+	echo "Usage:"
+	echo ""
+	echo "writeprom.sh vendorid deviceid rev fab_rev [envvar envsetting]"
+	echo	
+	echo " vendorid, deviceid - expansion board device number from http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs"
+	echo
+	echo " rev          - board revision (e.g. 0x00)"
+	echo " fab_rev      - revision marking from pcb (e.g. R2411)"
+	echo " envvar       - optional u-boot env variable name"
+	echo "                (e.g. dvimode)"
+	echo " envsetting   - optional u-boot env variable setting"
+	echo "                (e.g. 1024x768MR-16@60)"
+	echo
+	echo "Don't forget to make the EEPROM writeable if it has a writeprotect jumper!"
+	exit 1
+fi
+
+fabrevision=$4
+if [ ${#fabrevision} -ge 8 ]; then
+	echo "Error: fab revision string must less than 8 characters"
+	exit 1
+fi
+
+envvar=$5
+if [ ${#envar} -ge 16 ]; then
+	echo "Error: environment variable name string must less than 16 characters"
+	exit 1
+fi
+
+envsetting=$6
+if [ ${#ensetting} -ge 64 ]; then
+	echo "Error: environment setting string must less than 64 characters"
+	exit 1
+fi
+
+case `machine_id` in                                                        
+  "omap3_beagle_board")                                                         
+      bus=2
+      device=0x50
+      ;;
+  *)                                                              
+      bus=3
+      device=0x51
+      ;;                                               
+esac
+
+device=0x50
+vendorid=$1
+if [ ${#vendorid} -ge 6 ]; then
+    echo "Error: vendorid number must be less than 6 digits"
+    exit 1
+fi
+
+i2cset -y $bus $device 0x00 0x00
+i2cset -y $bus $device 0x01 $vendorid
+i2cset -y $bus $device 0x02 0x00
+i2cset -y $bus $device 0x03 $2
+i2cset -y $bus $device 0x04 $3
+i2cset -y $bus $device 0x05 00
+
+let i=6
+hexdumpargs="'${#fabrevision}/1 \"0x%02x \"'"
+command="echo -n \"$fabrevision\" | hexdump -e $hexdumpargs"
+hex=$(eval $command)
+for character in $hex; do
+	i2cset -y $bus $device $i $character
+	let i=$i+1
+done
+i2cset -y $bus $device $i 0x00
+
+if [ $# -eq 5 ]
+then
+	i2cset -y $bus $device 0x05 0x01
+
+	let i=14
+	hexdumpargs="'${#envvar}/1 \"0x%02x \"'"
+	command="echo -n \"$envvar\" | hexdump -e $hexdumpargs"
+	hex=$(eval $command)
+	for character in $hex; do
+		i2cset -y $bus $device $i $character
+		let i=$i+1
+	done
+ 	i2cset -y $bus $device $i 0x00
+
+	let i=30
+	hexdumpargs="'${#envsetting}/1 \"0x%02x \"'"
+	command="echo -n \"$envsetting\" | hexdump -e $hexdumpargs"
+	hex=$(eval $command)
+	for character in $hex; do
+		i2cset -y $bus $device $i $character
+		let i=$i+1
+	done	 
+	i2cset -y $bus $device $i 0x00
+fi
+
diff --git a/recipes/i2c-tools/read-edid_1.4.1.bb b/recipes/i2c-tools/read-edid_1.4.1.bb
index 2d951d7902..b2c0216e3f 100644
--- a/recipes/i2c-tools/read-edid_1.4.1.bb
+++ b/recipes/i2c-tools/read-edid_1.4.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://john.fremlin.de/programs/linux/read-edid/read-edid-${PV}.tar.gz;name=archive \
-           http://ftp.de.debian.org/debian/pool/main/r/read-edid/read-edid_1.4.1-2.1.diff.gz;patch=1;name=patch "
+           http://ftp.de.debian.org/debian/pool/main/r/read-edid/read-edid_1.4.1-2.1.diff.gz;name=patch "
 
 inherit autotools
 
diff --git a/recipes/ibrdtn/ibrcommon_0.3.23.bb b/recipes/ibrdtn/ibrcommon_0.3.23.bb
new file mode 100644
index 0000000000..ee67f36bfa
--- /dev/null
+++ b/recipes/ibrdtn/ibrcommon_0.3.23.bb
@@ -0,0 +1,6 @@
+include ibrdtn.inc
+
+SRC_URI = "http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/nightly-builds/archives/ibrcommon-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "4da2d4a1f8141caeae5b5e8eb1d3aaa2"
+SRC_URI[sha256sum] = "e4514f67967e72d1edc412147a7175c92627fd266a741d72add58fe2f7daaf2a"
diff --git a/recipes/ibrdtn/ibrdtn-tools_0.3.24.bb b/recipes/ibrdtn/ibrdtn-tools_0.3.24.bb
new file mode 100644
index 0000000000..2a42c33251
--- /dev/null
+++ b/recipes/ibrdtn/ibrdtn-tools_0.3.24.bb
@@ -0,0 +1,8 @@
+include ibrdtn.inc
+
+DEPEND += "ibrdtn"
+
+SRC_URI = "http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/nightly-builds/archives/ibrdtn-tools-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "a93f23c6f0ae4421f91cc1711ae5762d"
+SRC_URI[sha256sum] = "2eb0b8f17f44a792f2f64ce47b0eb3c9005d5802f582a900da6d3b0b631d4a79"
diff --git a/recipes/ibrdtn/ibrdtn.inc b/recipes/ibrdtn/ibrdtn.inc
new file mode 100644
index 0000000000..8a9fc5eae4
--- /dev/null
+++ b/recipes/ibrdtn/ibrdtn.inc
@@ -0,0 +1,7 @@
+DESCRIPTION = "Implementation of the bundle protocol RFC5050"
+HOMEPAGE = "http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/"
+SECTION = "devel"
+DEPENDS = "libpthread-stubs sqlite3 lua5.1"
+PR = "r0"
+
+inherit autotools
diff --git a/recipes/ibrdtn/ibrdtn_0.1.1.bb b/recipes/ibrdtn/ibrdtn_0.1.1.bb
index 470422856f..3e76e72cc9 100644
--- a/recipes/ibrdtn/ibrdtn_0.1.1.bb
+++ b/recipes/ibrdtn/ibrdtn_0.1.1.bb
@@ -5,7 +5,7 @@ DEPENDS = "libpthread-stubs sqlite3 lua5.1"
 PR = "r0"
 
 SRC_URI = "http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/ibrdtn-${PV}.tar.gz \
-        file://0001-fix-header-include-for-gcc44.patch;patch=1 \
+        file://0001-fix-header-include-for-gcc44.patch \
         "
 
 inherit autotools
diff --git a/recipes/ibrdtn/ibrdtn_0.1.2.bb b/recipes/ibrdtn/ibrdtn_0.1.2.bb
new file mode 100644
index 0000000000..cdaede4c36
--- /dev/null
+++ b/recipes/ibrdtn/ibrdtn_0.1.2.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Implementation of the bundle protocol RFC5050"
+HOMEPAGE = "http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/"
+SECTION = "devel"
+DEPENDS = "libpthread-stubs sqlite3 lua5.1"
+PR = "r0"
+
+SRC_URI = "http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/ibrdtn-${PV}.tar.gz \
+        "
+
+inherit autotools
+
+EXTRA_OECONF = "--prefix=${D} --exec-prefix=${D} --libdir=${STAGING_LIBDIR} --includedir=${STAGING_INCDIR}"
+
+do_configure() {
+        oe_runconf
+}
+
+SRC_URI[md5sum] = "7e7063276492dc0a681810ccf7c26a3b"
+SRC_URI[sha256sum] = "b6a8c216fe28181484f5758297da3f9f54295199e65ee22acd100c75e1bdadd8"
diff --git a/recipes/ibrdtn/ibrdtn_0.3.28.bb b/recipes/ibrdtn/ibrdtn_0.3.28.bb
new file mode 100644
index 0000000000..06a8c9a20c
--- /dev/null
+++ b/recipes/ibrdtn/ibrdtn_0.3.28.bb
@@ -0,0 +1,8 @@
+include ibrdtn.inc
+
+DEPENDS += "ibrcommon"
+
+SRC_URI = "http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/nightly-builds/archives/ibrdtn-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "2e446611601803f15ab5dade39b210a6"
+SRC_URI[sha256sum] = "3b124a5ac0e5e529c2c7b46928fd9102eca83e1e596a6a1a2f67933eeff3111f"
diff --git a/recipes/ibrdtn/ibrdtnd_0.3.29.bb b/recipes/ibrdtn/ibrdtnd_0.3.29.bb
new file mode 100644
index 0000000000..44e64f4388
--- /dev/null
+++ b/recipes/ibrdtn/ibrdtnd_0.3.29.bb
@@ -0,0 +1,8 @@
+include ibrdtn.inc
+
+DEPENDS += "ibrdtn"
+
+SRC_URI = "http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/nightly-builds/archives/ibrdtnd-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "be4f804a303690029d26fce249479a61"
+SRC_URI[sha256sum] = "30b6c53be8dd201d056fedde783fa6faa5dd80266a1b5a4622e071be398abf2f"
diff --git a/recipes/icewm/icewm_1.2.30.bb b/recipes/icewm/icewm_1.2.30.bb
index 5d235419dc..18af8e458b 100644
--- a/recipes/icewm/icewm_1.2.30.bb
+++ b/recipes/icewm/icewm_1.2.30.bb
@@ -7,8 +7,8 @@ PR = "r2"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
-  file://makefile.patch;patch=1 \
-  file://configure.patch;patch=1 \
+  file://makefile.patch \
+  file://configure.patch \
 "
 
 inherit autotools pkgconfig
diff --git a/recipes/icommand/icommand-bluez_0.7.bb b/recipes/icommand/icommand-bluez_0.7.bb
index 70d78f02d0..38b383d196 100644
--- a/recipes/icommand/icommand-bluez_0.7.bb
+++ b/recipes/icommand/icommand-bluez_0.7.bb
@@ -8,7 +8,7 @@ inherit java
 
 SRC_URI = "\
     svn://nxtcommand.svn.sourceforge.net/svnroot/nxtcommand;module=icommand-projects/trunk/icommand-bluez;rev=134;proto=https \
-    file://makefile.patch;patch=1 \
+    file://makefile.patch \
     "
 
 DEPENDS = "bluez-libs"
diff --git a/recipes/icu/icu-3.6.inc b/recipes/icu/icu-3.6.inc
index 198c73f491..68d89a21a7 100644
--- a/recipes/icu/icu-3.6.inc
+++ b/recipes/icu/icu-3.6.inc
@@ -4,7 +4,7 @@ LICENSE = "ICU"
 INC_PR = "r5"
 
 SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
-           file://elif-to-else.patch;patch=1"
+           file://elif-to-else.patch"
 
 S = "${WORKDIR}/icu/source"
 
diff --git a/recipes/icu/icu_3.6.bb b/recipes/icu/icu_3.6.bb
index cb0d4c5b5b..cbc426e8f9 100644
--- a/recipes/icu/icu_3.6.bb
+++ b/recipes/icu/icu_3.6.bb
@@ -3,8 +3,8 @@ require icu-3.6.inc
 DEPENDS += "icu-native"
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://use-g++-for-linking.patch;patch=1 \
-            file://rematch-gcc-bug.patch;patch=1"
+SRC_URI += "file://use-g++-for-linking.patch \
+            file://rematch-gcc-bug.patch"
 
 do_configure_append() {
         for i in */Makefile */*.inc */*/Makefile */*/*.inc icudefs.mk ; do
diff --git a/recipes/id3lib/id3lib_3.8.3.bb b/recipes/id3lib/id3lib_3.8.3.bb
index 7ddacbba2c..365495f8a3 100644
--- a/recipes/id3lib/id3lib_3.8.3.bb
+++ b/recipes/id3lib/id3lib_3.8.3.bb
@@ -8,7 +8,7 @@ PR = "r2"
 inherit autotools
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz;name=archive \
-           http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz;patch=1;name=patch \
+           http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz;name=patch \
           "
 
 do_stage() {
diff --git a/recipes/ifplugd/ifplugd_0.25.bb b/recipes/ifplugd/ifplugd_0.25.bb
index b2683bc89f..e60542cf19 100644
--- a/recipes/ifplugd/ifplugd_0.25.bb
+++ b/recipes/ifplugd/ifplugd_0.25.bb
@@ -7,8 +7,8 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz \
- file://kernel-types.patch;patch=1 \
- file://nobash.patch;patch=1"
+ file://kernel-types.patch \
+ file://nobash.patch"
 
 inherit autotools update-rc.d pkgconfig
 
diff --git a/recipes/ifupdown/ifupdown_0.6.10.bb b/recipes/ifupdown/ifupdown_0.6.10.bb
index 12e64d82db..31e24d58be 100644
--- a/recipes/ifupdown/ifupdown_0.6.10.bb
+++ b/recipes/ifupdown/ifupdown_0.6.10.bb
@@ -8,8 +8,8 @@ PR = "r2"
 
 
 SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.tar.gz;name=ifupdown \
-           file://busybox.patch;patch=1 \
-           file://zeroconf.patch;patch=1 \
+           file://busybox.patch \
+           file://zeroconf.patch \
            file://init "
 
 EXTRA_OEMAKE = ""
diff --git a/recipes/iksemel/iksemel_1.4.bb b/recipes/iksemel/iksemel_1.4.bb
index 85c1fe969e..69879200ec 100644
--- a/recipes/iksemel/iksemel_1.4.bb
+++ b/recipes/iksemel/iksemel_1.4.bb
@@ -8,7 +8,7 @@ DEPENDS = "gnutls"
 PR = "r1"
 
 SRC_URI = "http://iksemel.googlecode.com/files/${P}.tar.gz;name=archive \
-           file://r25.diff;patch=1"
+           file://r25.diff"
 SRC_URI[archive.md5sum] = "532e77181694f87ad5eb59435d11c1ca"
 SRC_URI[archive.sha256sum] = "458c1b8fb3349076a6cecf26c29db1d561315d84e16bfcfba419f327f502e244"
 
diff --git a/recipes/imagemagick/imagemagick_6.3.5-10.bb b/recipes/imagemagick/imagemagick_6.3.5-10.bb
index 3562a3e901..dcbdebe1b7 100644
--- a/recipes/imagemagick/imagemagick_6.3.5-10.bb
+++ b/recipes/imagemagick/imagemagick_6.3.5-10.bb
@@ -5,11 +5,11 @@ DEPENDS = "tiff jpeg libpng librsvg tiff zlib"
 PR = "r9"
 
 SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \
-           file://PerlMagic_MakePatch;patch=1 \
-           file://makefile-am.patch;patch=1 \
-           file://binconfig-fixes.patch;patch=1 \
-           file://fix_open_file.patch;patch=1 \
-           file://openm4-autoconf-fix.patch;patch=1"
+           file://PerlMagic_MakePatch;apply=yes \
+           file://makefile-am.patch \
+           file://binconfig-fixes.patch \
+           file://fix_open_file.patch \
+           file://openm4-autoconf-fix.patch"
 
 IMVER = "6.3.5"
 
diff --git a/recipes/imagemagick/imagemagick_6.4.4-1.bb b/recipes/imagemagick/imagemagick_6.4.4-1.bb
index 1392bbd9f8..2edf484393 100644
--- a/recipes/imagemagick/imagemagick_6.4.4-1.bb
+++ b/recipes/imagemagick/imagemagick_6.4.4-1.bb
@@ -7,7 +7,7 @@ DEPENDS = "bzip2 jpeg libpng librsvg tiff zlib"
 PR = "r4"
 
 SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \
-           file://PerlMagic_MakePatch;patch=1 \
+           file://PerlMagic_MakePatch;apply=yes \
           "
 
 IMVER = "6.4.4"
diff --git a/recipes/images/angstrom-gnome-image-big.bb b/recipes/images/angstrom-gnome-image-big.bb
new file mode 100644
index 0000000000..837ceb81e2
--- /dev/null
+++ b/recipes/images/angstrom-gnome-image-big.bb
@@ -0,0 +1,4 @@
+require angstrom-gnome-image.bb
+
+IMAGE_INSTALL += "task-gnome-apps"
+IMAGE_BASENAME_append = "-big"
diff --git a/recipes/images/beagleboard-linuxtag2010-demo-image.bb b/recipes/images/beagleboard-linuxtag2010-demo-image.bb
new file mode 100644
index 0000000000..4bf4a0881c
--- /dev/null
+++ b/recipes/images/beagleboard-linuxtag2010-demo-image.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "Image used for Linuxtag 2010 demo"
+
+inherit image
+
+XSERVER ?= "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-fbdev \
+           xf86-video-sisusb \
+           xf86-input-keyboard \
+"
+
+export IMAGE_BASENAME = "Linuxtag2010-image"
+
+IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
+ROOTFS_POSTPROCESS_COMMAND += 'install_linguas;'
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+IMAGE_LOGIN_MANAGER = "shadow"
+IMAGE_SPLASH = "psplash-angstrom"
+
+
+ANGSTROM_EXTRA_INSTALL ?= ""
+
+IMAGE_INSTALL += " \
+  task-base-extended \
+  ${ANGSTROM_EXTRA_INSTALL} \
+  ${IMAGE_SPLASH} \
+  angstrom-task-gnome \
+  bash \
+  gstreamer-ti \
+  libgles-omap3-x11wsegl \
+  bc-cube-x11 \
+  mplayer \
+  omapfbplay \
+  cpufrequtils \
+  htop \
+  powertop \
+  ntpdate \
+  libgles-omap3-x11demos \
+  abiword \
+  gnumeric \
+  epiphany \
+  memtester \
+  kernel-modules \
+"
+
diff --git a/recipes/images/illume-image.bb b/recipes/images/illume-image.bb
index 9482257d39..8d87d92ae1 100644
--- a/recipes/images/illume-image.bb
+++ b/recipes/images/illume-image.bb
@@ -38,6 +38,7 @@ X_INSTALL = "\
   shared-mime-info \
   mime-support \
   e-wm \
+  e-wm-menu \
   e-wm-sysactions \
   e-wm-config-illume \
   e-wm-config-standard \
@@ -135,7 +136,7 @@ ZHONE_INSTALL = "\
 
 # additional apps
 APPS_INSTALL = "\
-   elementary-alarm \
+#   elementary-alarm \
    expedite \
    expedite-themes \
 #   libefso \
diff --git a/recipes/images/imote2-image.bb b/recipes/images/imote2-image.bb
index 92578e9bdf..9809ba3e3c 100644
--- a/recipes/images/imote2-image.bb
+++ b/recipes/images/imote2-image.bb
@@ -8,7 +8,6 @@ IMAGE_INSTALL = "task-boot \
             util-linux-ng-mount util-linux-ng-umount \
             ${DISTRO_SSH_DAEMON} \
             lowpan-tools \
-            ibrdtn \
             angstrom-version \
 	   "
 
diff --git a/recipes/images/shr-image.inc b/recipes/images/shr-image.inc
index 4668f155e4..160593b77f 100644
--- a/recipes/images/shr-image.inc
+++ b/recipes/images/shr-image.inc
@@ -30,88 +30,19 @@ IMAGE_INSTALL += "\
 
 inherit image
 
-# perform some SHR convenience tweaks to the rootfs
-shr_rootfs_postprocess() {
-    dirs=`find ${FILESDIR} -type d -printf "%P\n" | grep -v "^.$" | grep -v ".git"`
-    for dir in $dirs; do
-        mkdir -p ${IMAGE_ROOTFS}/$dir
-    done
-    files=`find ${FILESDIR} -type f -printf "%P\n" | grep -v ".git"`
-    for file in $files; do
-        cp -f ${FILESDIR}/$file ${IMAGE_ROOTFS}/$file
-    done
-
-    curdir=$PWD
-    cd ${IMAGE_ROOTFS}
-    # date/time
-    date "+%m%d%H%M%Y" >./etc/timestamp
-    # alias foo
-    echo "alias pico=nano" >>./etc/profile
-    echo "alias fso='cd /local/pkg/fso'" >>./etc/profile
-    echo "alias ipkg='opkg'" >>./etc/profile
-    # dns
-    echo "nameserver 208.67.222.222" >./etc/resolv.conf
-    echo "nameserver 208.67.220.220" >>./etc/resolv.conf
-    # nfs
-    mkdir -p ./local/pkg
-    echo >>./etc/fstab
-    echo "# NFS Host" >>./etc/fstab
-    echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab
-
-    # minimal gtk theme foo
-    # this should be set in postinst phase of installed gtk-theme package
-    #mkdir -p ./etc/gtk-2.0/
-    #echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc.default
-    #echo 'gtk-theme-name = "shr-theme-gtk-e17lookalike"' >> ./etc/gtk-2.0/gtkrc.default
-    #echo 'gtk-icon-theme-name = "openmoko-standard"' >> ./etc/gtk-2.0/gtkrc.default
-    #echo 'style "treeview"' >> ./etc/gtk-2.0/gtkrc.default
-    #echo '{   ' >> ./etc/gtk-2.0/gtkrc.default
-    #echo '    GtkTreeView::expander-size = 40' >> ./etc/gtk-2.0/gtkrc.default
-    #echo '}' >> ./etc/gtk-2.0/gtkrc.default
-    #echo 'widget_class "*TreeView*" style "treeview"' >> ./etc/gtk-2.0/gtkrc.default
-    #update-alternatives --install /etc/gtk-2.0/gtkrc gtk-theme /etc/gtk-2.0/gtkrc.default 1
-
-    # elementary theme foo
-    ELM_PROFILE_SCR=./etc/profile.d/elementary.sh
-    echo 'export ELM_ENGINE=x11' > ${ELM_PROFILE_SCR}
-    echo 'export ELM_THEME=gry' >> ${ELM_PROFILE_SCR}
-    echo 'export ELM_SCALE=2' >> ${ELM_PROFILE_SCR}
-    echo 'export ELM_FINGER_SIZE=70' >> ${ELM_PROFILE_SCR}
-    chmod +x ${ELM_PROFILE_SCR}
-
-    echo '' >> ./etc/ld.so.conf
-    # fix strange iconv/gconf bug
-    ln -s libc.so.6 ./lib/libc.so
-
-    #font cache optimization, persistent cache
-    sed -i "s/<cachedir>.*\/var\/cache\/\(.*\)<\/cachedir>/<cachedir>\/var\/local\/\1<\/cachedir>/g" ./etc/fonts/fonts.conf
-
-    # Add some missing entries to the passwd and group file; but do so carefully
-    # since this will be fixed upstream at some point.
-    grep -q '^tss:' ./etc/passwd || echo 'tss:x:93:93:Linux TSS User:/bin:/bin/sh' >>./etc/passwd
-    grep -q '^scanner:' ./etc/group || echo 'scanner:*:91:' >>./etc/group
-    grep -q '^nvram:'   ./etc/group || echo 'nvram:*:92:'   >>./etc/group
-    grep -q '^tss:'     ./etc/group || echo 'tss:*:93:'     >>./etc/group
-    grep -q '^fuse:'    ./etc/group || echo 'fuse:*:94:'    >>./etc/group
-    grep -q '^kvm:'     ./etc/group || echo 'kvm:*:95:'     >>./etc/group
-    grep -q '^rdma:'    ./etc/group || echo 'rdma:*:96:'    >>./etc/group
-
-    cd $curdir
-}
-
 shr_rootfs_gta02_postprocess() {
     curdir=$PWD
-    cd ${IMAGE_ROOTFS}
     cd ${IMAGE_ROOTFS}/boot
     ln -s uImage uImage-GTA02.bin
+    echo 'loglevel=1 quiet splash' > append-GTA02
     cd $curdir
 }
 
 shr_rootfs_gta01_postprocess() {
     curdir=$PWD
-    cd ${IMAGE_ROOTFS}
     cd ${IMAGE_ROOTFS}/boot
     ln -s uImage uImage-GTA01.bin
+    echo 'loglevel=1 quiet splash' > append-GTA01
     cd $curdir
 }
 
@@ -120,8 +51,8 @@ IMAGE_CMD_jffs2 = "mv ${IMAGE_ROOTFS}/boot ${IMAGE_ROOTFS}-boot && mkfs.jffs2 -x
 IMAGE_CMD_ubi = "mv ${IMAGE_ROOTFS}/boot ${IMAGE_ROOTFS}-boot && echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg && mv ${IMAGE_ROOTFS}-boot ${IMAGE_ROOTFS}/boot"
 IMAGE_CMD_ubifs = "mv ${IMAGE_ROOTFS}/boot ${IMAGE_ROOTFS}-boot && mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS} && mv ${IMAGE_ROOTFS}-boot ${IMAGE_ROOTFS}/boot"
 
-ROOTFS_POSTPROCESS_COMMAND += " shr_rootfs_postprocess"
-ROOTFS_POSTPROCESS_COMMAND += " install_linguas"
+ROOTFS_POSTPROCESS_COMMAND += " rootfs_update_timestamp;"
+ROOTFS_POSTPROCESS_COMMAND += " install_linguas;"
 
-ROOTFS_POSTPROCESS_COMMAND_append_om-gta02 = ";shr_rootfs_gta02_postprocess"
-ROOTFS_POSTPROCESS_COMMAND_append_om-gta01 = ";shr_rootfs_gta01_postprocess"
+ROOTFS_POSTPROCESS_COMMAND_append_om-gta02 = " shr_rootfs_gta02_postprocess;"
+ROOTFS_POSTPROCESS_COMMAND_append_om-gta01 = " shr_rootfs_gta01_postprocess;"
diff --git a/recipes/images/shr-image/boot/append-GTA02 b/recipes/images/shr-image/boot/append-GTA02
deleted file mode 100644
index 4901a091e7..0000000000
--- a/recipes/images/shr-image/boot/append-GTA02
+++ /dev/null
@@ -1,2 +0,0 @@
-loglevel=1 quiet splash 
-
diff --git a/recipes/images/shr-image/etc/htoprc b/recipes/images/shr-image/etc/htoprc
deleted file mode 100644
index e7bb5b7879..0000000000
--- a/recipes/images/shr-image/etc/htoprc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Beware! This file is rewritten every time htop exits.
-# The parser is also very primitive, and not human-friendly.
-# (I know, it's in the todo list).
-fields=39 46 47 49 1 
-sort_key=46
-sort_direction=1
-hide_threads=0
-hide_kernel_threads=1
-hide_userland_threads=0
-shadow_other_users=0
-highlight_base_name=0
-highlight_megabytes=1
-tree_view=0
-header_margin=0
-detailed_cpu_time=1
-color_scheme=0
-delay=15
-left_meters=AllCPUs Memory 
-left_meter_modes=1 1 
-right_meters=Tasks LoadAverage Uptime 
-right_meter_modes=2 2 2
diff --git a/recipes/images/shr-image/etc/logrotate.d/50freesmartphone b/recipes/images/shr-image/etc/logrotate.d/50freesmartphone
deleted file mode 100644
index 2d3fb8196f..0000000000
--- a/recipes/images/shr-image/etc/logrotate.d/50freesmartphone
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/frameworkd.log { 
-    rotate 5 
-    weekly 
-    compress 
-} 
-
-/var/log/ophonekitd.log { 
-    rotate 5 
-    weekly 
-    compress 
-} 
diff --git a/recipes/images/shr-lite-image.bb b/recipes/images/shr-lite-image.bb
index fa1a7ac71a..881c3d6d23 100644
--- a/recipes/images/shr-lite-image.bb
+++ b/recipes/images/shr-lite-image.bb
@@ -1,5 +1,3 @@
 require shr-image.inc
 
 IMAGE_BASENAME = "lite"
-
-IMAGES_LINGUAS="en-us"
diff --git a/recipes/images/shr-lite-image/boot/append-GTA02 b/recipes/images/shr-lite-image/boot/append-GTA02
deleted file mode 100644
index 4901a091e7..0000000000
--- a/recipes/images/shr-lite-image/boot/append-GTA02
+++ /dev/null
@@ -1,2 +0,0 @@
-loglevel=1 quiet splash 
-
diff --git a/recipes/images/shr-lite-image/etc/htoprc b/recipes/images/shr-lite-image/etc/htoprc
deleted file mode 100644
index e7bb5b7879..0000000000
--- a/recipes/images/shr-lite-image/etc/htoprc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Beware! This file is rewritten every time htop exits.
-# The parser is also very primitive, and not human-friendly.
-# (I know, it's in the todo list).
-fields=39 46 47 49 1 
-sort_key=46
-sort_direction=1
-hide_threads=0
-hide_kernel_threads=1
-hide_userland_threads=0
-shadow_other_users=0
-highlight_base_name=0
-highlight_megabytes=1
-tree_view=0
-header_margin=0
-detailed_cpu_time=1
-color_scheme=0
-delay=15
-left_meters=AllCPUs Memory 
-left_meter_modes=1 1 
-right_meters=Tasks LoadAverage Uptime 
-right_meter_modes=2 2 2
diff --git a/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone b/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone
deleted file mode 100644
index 2d3fb8196f..0000000000
--- a/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/frameworkd.log { 
-    rotate 5 
-    weekly 
-    compress 
-} 
-
-/var/log/ophonekitd.log { 
-    rotate 5 
-    weekly 
-    compress 
-} 
diff --git a/recipes/images/shr-lite-image/etc/profile.d/elementary.sh b/recipes/images/shr-lite-image/etc/profile.d/elementary.sh
deleted file mode 100755
index da435964a7..0000000000
--- a/recipes/images/shr-lite-image/etc/profile.d/elementary.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export ELM_ENGINE=x11
-export ELM_THEME=default
-export ELM_SCALE=2
-export ELM_FINGER_SIZE=70
diff --git a/recipes/imlib/imlib_1.9.15.bb b/recipes/imlib/imlib_1.9.15.bb
index bbdd01ed89..ee624d0ed9 100644
--- a/recipes/imlib/imlib_1.9.15.bb
+++ b/recipes/imlib/imlib_1.9.15.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+-1.2 jpeg tiff libpng libungif"
 
 inherit gnome binconfig
 
-SRC_URI += "file://configure.patch;patch=1"
+SRC_URI += "file://configure.patch"
 
 EXTRA_OECONF = " --enable-modules \
 		 --disable-gtktest \
diff --git a/recipes/inetutils/inetutils_1.4.2.bb b/recipes/inetutils/inetutils_1.4.2.bb
index 564456e60f..fa38ade049 100644
--- a/recipes/inetutils/inetutils_1.4.2.bb
+++ b/recipes/inetutils/inetutils_1.4.2.bb
@@ -7,7 +7,7 @@ rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \
 talkd, telnet, telnetd, tftp, tftpd, and uucpd."
 
 SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/initscripts/initscripts-slugos_1.0.bb b/recipes/initscripts/initscripts-slugos_1.0.bb
index 1530d04733..43153c060d 100644
--- a/recipes/initscripts/initscripts-slugos_1.0.bb
+++ b/recipes/initscripts/initscripts-slugos_1.0.bb
@@ -17,7 +17,11 @@ RDEPENDS = "update-rc.d"
 # All other standard definitions inherited from initscripts
 # Except the PR which is hacked here.  The format used is
 # a suffix
-PR := "${PR}.22"
+PR := "${PR}.23"
+
+# Avoid a clash on /etc/device_table by ensuring that it gets removed
+# from the list of configuration files handled specially by opkg.
+CONFFILES_${PN} = ""
 
 # We wish to search the same file paths as does the initscripts recipe.
 FILESPATHPKG = "initscripts-${PV}:initscripts:files"
diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb
index 2c0689ffc8..588375d1b7 100644
--- a/recipes/initscripts/initscripts_1.0.bb
+++ b/recipes/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r117"
+PR = "r120"
 
 SRC_URI = "file://functions \
            file://halt \
@@ -35,6 +35,8 @@ SRC_URI = "file://functions \
 
 SRC_URI_append_arm = " file://alignment.sh"
 
+CONFFILES_${PN} += "${sysconfdir}/device_table" 
+
 KERNEL_VERSION = ""
 
 do_install () {
diff --git a/recipes/inkscape/inkscape_0.43.bb b/recipes/inkscape/inkscape_0.43.bb
index e5c0db52d0..7fdbf0f96c 100644
--- a/recipes/inkscape/inkscape_0.43.bb
+++ b/recipes/inkscape/inkscape_0.43.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 
 #we know that GC version is 6.5, so we patch out the version check, since gc_open was already detected
 SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2 \
-           file://no-boehm-version-check.patch;patch=1"
+           file://no-boehm-version-check.patch"
 
 S = "${WORKDIR}/inkscape-${PV}"
 
diff --git a/recipes/inkscape/inkscape_0.47.bb b/recipes/inkscape/inkscape_0.47.bb
index 248343fe75..14837a8267 100644
--- a/recipes/inkscape/inkscape_0.47.bb
+++ b/recipes/inkscape/inkscape_0.47.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 
 #we know that GC version is 6.5, so we patch out the version check, since gc_open was already detected
 SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2 \
-           file://no-boehm-version-check.patch;patch=1"
+           file://no-boehm-version-check.patch"
 
 S = "${WORKDIR}/inkscape-${PV}"
 
diff --git a/recipes/inotify-tools/inotify-tools_3.12.bb b/recipes/inotify-tools/inotify-tools_3.12.bb
index b0a8459d41..f61fb1b9a4 100644
--- a/recipes/inotify-tools/inotify-tools_3.12.bb
+++ b/recipes/inotify-tools/inotify-tools_3.12.bb
@@ -8,7 +8,7 @@ PR = "r0"
 EXTRA_OECONF = "--disable-doxygen"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/inotify-tools/inotify-tools-3.12.tar.gz \
-file://no-tests.patch;patch=1"
+file://no-tests.patch"
 
 inherit autotools
 
diff --git a/recipes/inotify-tools/inotify-tools_3.13.bb b/recipes/inotify-tools/inotify-tools_3.13.bb
index 9f8f96867d..b139c1e527 100644
--- a/recipes/inotify-tools/inotify-tools_3.13.bb
+++ b/recipes/inotify-tools/inotify-tools_3.13.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://inotify-tools.sourceforge.net/"
 EXTRA_OECONF = "--disable-doxygen"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/inotify-tools/inotify-tools-${PV}.tar.gz \
-           file://no-tests.patch;patch=1 \
+           file://no-tests.patch \
           "
 
 inherit autotools
diff --git a/recipes/insttrain/insttrain_1.0.5.bb b/recipes/insttrain/insttrain_1.0.5.bb
index 3cdd4220a3..313f3d984c 100644
--- a/recipes/insttrain/insttrain_1.0.5.bb
+++ b/recipes/insttrain/insttrain_1.0.5.bb
@@ -8,7 +8,7 @@ APPDESKTOP = "../Qtopia/opt/QtPalmtop/apps/Applications"
 inherit opie
 
 SRC_URI = "http://www.Vanille.de/mirror/insttrain-${PV}.tgz \
-           file://gcc3.patch;patch=1"
+           file://gcc3.patch"
 S = "${WORKDIR}/insttrain-${PV}/src"
 
 QMAKE_PROFILES = "rmi.pro"
diff --git a/recipes/intltool/intltool-native_0.35.0.bb b/recipes/intltool/intltool-native_0.35.0.bb
index a3daf34e7f..6675686e45 100644
--- a/recipes/intltool/intltool-native_0.35.0.bb
+++ b/recipes/intltool/intltool-native_0.35.0.bb
@@ -3,7 +3,7 @@ require intltool_${PV}.bb
 inherit native
 
 export PERL = "/usr/bin/env perl"
-SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
+SRC_URI_append = " file://intltool-nowarn.patch"
 
 SRC_URI[md5sum] = "95c4bd2a91419083ee880a3f53f86edf"
 SRC_URI[sha256sum] = "4ebece4bb752e22b2f15a9fe24e83aec59a3a41b67a9fa9ffd6b805c519e90ba"
diff --git a/recipes/intltool/intltool-native_0.35.5.bb b/recipes/intltool/intltool-native_0.35.5.bb
index 0d5281d932..aa7a94d125 100644
--- a/recipes/intltool/intltool-native_0.35.5.bb
+++ b/recipes/intltool/intltool-native_0.35.5.bb
@@ -3,7 +3,7 @@ require intltool_${PV}.bb
 inherit native
 
 export PERL = "/usr/bin/env perl"
-SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
+SRC_URI_append = " file://intltool-nowarn.patch"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/intltool/intltool-native_0.37.1.bb b/recipes/intltool/intltool-native_0.37.1.bb
index 1d14d898f9..ee1fa8cf27 100644
--- a/recipes/intltool/intltool-native_0.37.1.bb
+++ b/recipes/intltool/intltool-native_0.37.1.bb
@@ -3,4 +3,4 @@ require intltool_${PV}.bb
 inherit native
 
 export PERL = "/usr/bin/env perl"
-SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
+SRC_URI_append = " file://intltool-nowarn.patch"
diff --git a/recipes/intltool/intltool_0.35.5.bb b/recipes/intltool/intltool_0.35.5.bb
index b83bd29fe1..6db0f23b01 100644
--- a/recipes/intltool/intltool_0.35.5.bb
+++ b/recipes/intltool/intltool_0.35.5.bb
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI += "file://intltool-0.35.5-polkit.patch;patch=1"
+SRC_URI += "file://intltool-0.35.5-polkit.patch"
 
 SRC_URI[md5sum] = "f52d5fa7f128db94e884cd21dd45d2e2"
 SRC_URI[sha256sum] = "38bd74418bbac5a34884221e2b710a81876d445d8acfc7d22bde67fe882f96d8"
diff --git a/recipes/intone/intone_svn.bb b/recipes/intone/intone_svn.bb
index e2b2a5f089..d1561f3f4c 100644
--- a/recipes/intone/intone_svn.bb
+++ b/recipes/intone/intone_svn.bb
@@ -11,7 +11,7 @@ PV = "0.66+svnr${SRCPV}"
 PR = "r3"
 
 SRC_URI = "svn://intone.googlecode.com/svn;module=trunk;proto=http \
-file://vorbis-include-id3tag.patch;pnum=1;patch=1;maxrev=18"
+file://vorbis-include-id3tag.patch;maxrev=18"
 S = "${WORKDIR}/trunk"
 
 inherit autotools
diff --git a/recipes/ion/ion3_0.0+ds20041104.bb b/recipes/ion/ion3_0.0+ds20041104.bb
index f9ea5e2504..9a5850a9a0 100644
--- a/recipes/ion/ion3_0.0+ds20041104.bb
+++ b/recipes/ion/ion3_0.0+ds20041104.bb
@@ -15,14 +15,14 @@ SNAPDATE = "${@(bb.data.getVar('PV', d, 1) or '')[-8:]}"
 BROKEN = "1"
 
 SRC_URI = "http://modeemi.fi/~tuomov/ion/dl/ion-3ds-${SNAPDATE}.tar.gz \
-	   file://201_fix-paths.diff;patch=1 \
-	   file://202_fix-menus.diff;patch=1 \
-	   file://203_fix-kludges.diff;patch=1 \
-	   file://204_fix-bindings.diff;patch=1 \
-	   file://205_ion-lock.diff;patch=1 \
-	   file://206_use-xterm.diff;patch=1 \
-	   file://luaconfig.patch;patch=1 \
-	   file://cross.patch;patch=1"
+	   file://201_fix-paths.diff \
+	   file://202_fix-menus.diff \
+	   file://203_fix-kludges.diff \
+	   file://204_fix-bindings.diff \
+	   file://205_ion-lock.diff \
+	   file://206_use-xterm.diff \
+	   file://luaconfig.patch \
+	   file://cross.patch"
 S = "${WORKDIR}/ion-3ds-${SNAPDATE}"
 
 EXTRA_OECONF += "--disable-xinerama --disable-xfree86-textprop-bug-workaround \
diff --git a/recipes/iozone3/iozone3_263.bb b/recipes/iozone3/iozone3_263.bb
index fea371a3b0..a44096c5b3 100644
--- a/recipes/iozone3/iozone3_263.bb
+++ b/recipes/iozone3/iozone3_263.bb
@@ -8,7 +8,7 @@ PR = "r1"
 
 SRC_URI = "http://www.iozone.org/src/current/iozone3_263.tar \
 	   file://copyright.txt \
-           file://fileop-arm.patch;patch=1"
+           file://fileop-arm.patch"
 
 S = "${WORKDIR}/${PN}_${PV}/src/current/"
 
diff --git a/recipes/ipaq-sleep/ipaq-sleep_0.9.bb b/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
index f417611276..fa5ab6ab54 100644
--- a/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
+++ b/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
@@ -8,9 +8,9 @@ PR = "r7"
 
 inherit gpe pkgconfig
 
-SRC_URI_append = " file://init-script-busybox.patch;patch=1"
-SRC_URI_append = " file://install-fix.patch;patch=1"
-SRC_URI_append = " file://unbreak.patch;patch=1"
+SRC_URI_append = " file://init-script-busybox.patch"
+SRC_URI_append = " file://install-fix.patch"
+SRC_URI_append = " file://unbreak.patch"
 
 CONFFILES_${PN} += "${sysconfdir}/ipaq-sleep.conf"
 
diff --git a/recipes/ipatience/ipatience_0.1.bb b/recipes/ipatience/ipatience_0.1.bb
index 95c62cac57..1e2cf99f8f 100644
--- a/recipes/ipatience/ipatience_0.1.bb
+++ b/recipes/ipatience/ipatience_0.1.bb
@@ -7,7 +7,7 @@ SRCDATE = "20061112"
 PR = "r0"
 
 SRC_URI = "cvs://anoncvs@keithp.com/local/src/CVS;method=pserver;module=ipatience \
-          file://fix-make.patch;patch=1"
+          file://fix-make.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/iperf/iperf_1.7.0.bb b/recipes/iperf/iperf_1.7.0.bb
index 0051a3b5e1..d1a1262dc9 100644
--- a/recipes/iperf/iperf_1.7.0.bb
+++ b/recipes/iperf/iperf_1.7.0.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 PR = "r1"
 
 SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \
-	file://socketaddr-h-errno.diff;patch=1"
+	file://socketaddr-h-errno.diff"
 
 inherit autotools
 
diff --git a/recipes/iphone/gcc-iphone-cross_git.bb b/recipes/iphone/gcc-iphone-cross_git.bb
index f9e1b45b49..ea351cf0bf 100644
--- a/recipes/iphone/gcc-iphone-cross_git.bb
+++ b/recipes/iphone/gcc-iphone-cross_git.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "GCC for iPhone"
 DEPENDS = "iphone-sdks"
-PV = "4.2.1+gitr${SRCPV}"
-PE = "1"
+PV = "4.2.1+git${SRCREV}"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
diff --git a/recipes/ipkg-utils/ipkg-link_1.6+cvs20050404.bb b/recipes/ipkg-utils/ipkg-link_1.6+cvs20050404.bb
index 496c975748..6687129a3a 100644
--- a/recipes/ipkg-utils/ipkg-link_1.6+cvs20050404.bb
+++ b/recipes/ipkg-utils/ipkg-link_1.6+cvs20050404.bb
@@ -6,7 +6,7 @@ SRCDATE = "20050930"
 PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
-	   file://link-vfat-libs.patch;patch=1"
+	   file://link-vfat-libs.patch"
 
 S = "${WORKDIR}/ipkg-utils"
 
diff --git a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index ec479c96ca..98b0cf7cdf 100644
--- a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -8,13 +8,13 @@ SRCDATE = "20050930"
 PR = "r24"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
-           file://ipkg-utils-fix.patch;patch=1 \
-           file://ipkg-py-sane-vercompare.patch;patch=1 \
-           file://ipkg-py-tarfile.patch;patch=1 \
-           file://arfile_even_alignment.patch;patch=1 \
-           file://ipkg-make-index-track-stamps.patch;patch=1 \
-           file://fields_tweaks.patch;patch=1 \
-           file://ipkg-env.patch;patch=1 \
+           file://ipkg-utils-fix.patch \
+           file://ipkg-py-sane-vercompare.patch \
+           file://ipkg-py-tarfile.patch \
+           file://arfile_even_alignment.patch \
+           file://ipkg-make-index-track-stamps.patch \
+           file://fields_tweaks.patch \
+           file://ipkg-env.patch \
 	   "
 
 S = "${WORKDIR}/ipkg-utils"
diff --git a/recipes/ipkg/ipkg-native_0.99.163.bb b/recipes/ipkg/ipkg-native_0.99.163.bb
index 8d7ad84767..21792df91c 100644
--- a/recipes/ipkg/ipkg-native_0.99.163.bb
+++ b/recipes/ipkg/ipkg-native_0.99.163.bb
@@ -7,11 +7,11 @@ PR = "r6"
 inherit autotools pkgconfig native
 
 SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
-           file://update_version_comparision.patch;patch=1 \
-           file://enable_debversion.patch;patch=1 \
-           file://is-processing.patch;patch=1 \
-           file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \
-           file://2-pkg-vec--Optimize-gross-inefficiency.patch;patch=1 \
+           file://update_version_comparision.patch \
+           file://enable_debversion.patch \
+           file://is-processing.patch \
+           file://1-pkg-parse--Optimize-inefficient-parsing.patch \
+           file://2-pkg-vec--Optimize-gross-inefficiency.patch \
           "
 
 
diff --git a/recipes/ipkg/ipkg.inc b/recipes/ipkg/ipkg.inc
index ee5da71c22..c28cf8be8c 100644
--- a/recipes/ipkg/ipkg.inc
+++ b/recipes/ipkg/ipkg.inc
@@ -10,10 +10,10 @@ FILES_libipkg = "${libdir}/*.so.*"
 AUTO_LIBNAME_PKGS = "libipkg"
 
 SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-        file://update_version_comparision.patch;patch=1 \
-        file://enable_debversion.patch;patch=1 \
+        file://update_version_comparision.patch \
+        file://enable_debversion.patch \
         file://ipkg-configure \
-	file://terse.patch;patch=1"
+	file://terse.patch"
 
 S = "${WORKDIR}/ipkg/C"
 
diff --git a/recipes/ipkg/ipkg_0.99.163.bb b/recipes/ipkg/ipkg_0.99.163.bb
index e090014de9..8eb83a12e6 100644
--- a/recipes/ipkg/ipkg_0.99.163.bb
+++ b/recipes/ipkg/ipkg_0.99.163.bb
@@ -5,11 +5,11 @@ S = "${WORKDIR}/ipkg-${PV}"
 
 SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
 	file://ipkg-configure \
-	file://terse.patch;patch=1 \
-	file://is-processing.patch;patch=1 \
-	file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \
-	file://2-pkg-vec--Optimize-gross-inefficiency.patch;patch=1 \
-	file://lonk-link-name.patch;patch=1 \
+	file://terse.patch \
+	file://is-processing.patch \
+	file://1-pkg-parse--Optimize-inefficient-parsing.patch \
+	file://2-pkg-vec--Optimize-gross-inefficiency.patch \
+	file://lonk-link-name.patch \
 	"
 
 do_stage() {
diff --git a/recipes/iproute2/iproute2_2.6.18.bb b/recipes/iproute2/iproute2_2.6.18.bb
index aafd44aaf6..ac3d831fb2 100644
--- a/recipes/iproute2/iproute2_2.6.18.bb
+++ b/recipes/iproute2/iproute2_2.6.18.bb
@@ -2,8 +2,8 @@ PR = "${INC_PR}.0"
 
 require iproute2.inc
 
-SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
-            file://new-flex-fix.patch;patch=1"
+SRC_URI += "file://iproute2-2.6.15_no_strip.diff;striplevel=0 \
+            file://new-flex-fix.patch"
 
 DATE = "061002"
 
diff --git a/recipes/iproute2/iproute2_2.6.20.bb b/recipes/iproute2/iproute2_2.6.20.bb
index 69e0c1a3c7..193cd00f41 100644
--- a/recipes/iproute2/iproute2_2.6.20.bb
+++ b/recipes/iproute2/iproute2_2.6.20.bb
@@ -3,11 +3,11 @@ require iproute2.inc
 PR = "${INC_PR}.1"
 DATE = "070313"
 
-SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
-                   file://ip6tunnel.patch;patch=1 \
-                   file://man-pages-fix.patch;patch=1 \
-                   file://remove-bashisms.patch;patch=1 \
-                   file://no-strip.patch;patch=1"
+SRC_URI_append = " file://new-flex-fix.patch \
+                   file://ip6tunnel.patch \
+                   file://man-pages-fix.patch \
+                   file://remove-bashisms.patch \
+                   file://no-strip.patch"
 
 S = "${WORKDIR}/iproute-${PV}-${DATE}"
 
diff --git a/recipes/iproute2/iproute2_2.6.22.bb b/recipes/iproute2/iproute2_2.6.22.bb
index 5c9bbc3e21..a0261c2da0 100644
--- a/recipes/iproute2/iproute2_2.6.22.bb
+++ b/recipes/iproute2/iproute2_2.6.22.bb
@@ -3,10 +3,10 @@ require iproute2.inc
 PR = "${INC_PR}.1"
 DATE = "070710"
 
-SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
-                   file://ip6tunnel.patch;patch=1 \
-                   file://remove-bashisms.patch;patch=1 \
-                   file://no-strip.patch;patch=1"
+SRC_URI_append = " file://new-flex-fix.patch \
+                   file://ip6tunnel.patch \
+                   file://remove-bashisms.patch \
+                   file://no-strip.patch"
 
 S = "${WORKDIR}"
 
diff --git a/recipes/iproute2/iproute2_2.6.29.bb b/recipes/iproute2/iproute2_2.6.29.bb
index 9afdc479ce..48317108ca 100644
--- a/recipes/iproute2/iproute2_2.6.29.bb
+++ b/recipes/iproute2/iproute2_2.6.29.bb
@@ -3,10 +3,10 @@ require iproute2.inc
 PR = "${INC_PR}.1"
 
 SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \
-	   file://new-flex-fix.patch;patch=1 \
-	   file://compilation-fix.patch;patch=1 \
-	   file://use-cross-compiler.patch;patch=1 \
-	   file://remove-bashisms.patch;patch=1 \
+	   file://new-flex-fix.patch \
+	   file://compilation-fix.patch \
+	   file://use-cross-compiler.patch \
+	   file://remove-bashisms.patch \
 	  "
 
 S = "${WORKDIR}/iproute2-${PV}"
diff --git a/recipes/iproute2/iproute2_2.6.31.bb b/recipes/iproute2/iproute2_2.6.31.bb
index 543e1b1351..b952fa53cb 100644
--- a/recipes/iproute2/iproute2_2.6.31.bb
+++ b/recipes/iproute2/iproute2_2.6.31.bb
@@ -3,7 +3,7 @@ require iproute2.inc
 PR = "${INC_PR}.0"
 
 SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \
-	   file://new-flex-fix.patch;patch=1 \
+	   file://new-flex-fix.patch \
 	  "
 
 S = "${WORKDIR}/iproute2-${PV}"
diff --git a/recipes/ipsec-tools/ipsec-tools_0.6.6.bb b/recipes/ipsec-tools/ipsec-tools_0.6.6.bb
index 577f2b227b..719d515b2b 100644
--- a/recipes/ipsec-tools/ipsec-tools_0.6.6.bb
+++ b/recipes/ipsec-tools/ipsec-tools_0.6.6.bb
@@ -2,6 +2,6 @@ PR = "${INC_PR}.0"
 
 require ipsec-tools.inc
 
-SRC_URI += "file://racoon-search-missing.patch;patch=1 file://gcc-4.2.patch;patch=1"
+SRC_URI += "file://racoon-search-missing.patch file://gcc-4.2.patch"
 SRC_URI[ipsec-tools-0.6.6.md5sum] = "e908f3cf367e31c7902df5ab16fbe5c3"
 SRC_URI[ipsec-tools-0.6.6.sha256sum] = "2291dd75794a4fc307eb420eb035087a4cf56d3ef6b187f1a1386d3e33851044"
diff --git a/recipes/ipsec-tools/ipsec-tools_0.6.7.bb b/recipes/ipsec-tools/ipsec-tools_0.6.7.bb
index 20066baa59..4b538e6d8c 100644
--- a/recipes/ipsec-tools/ipsec-tools_0.6.7.bb
+++ b/recipes/ipsec-tools/ipsec-tools_0.6.7.bb
@@ -2,6 +2,6 @@ PR = "${INC_PR}.0"
 
 require ipsec-tools.inc
 
-SRC_URI += "file://racoon-search-missing.patch;patch=1 file://gcc-4.2.patch;patch=1"
+SRC_URI += "file://racoon-search-missing.patch file://gcc-4.2.patch"
 SRC_URI[ipsec-tools-0.6.7.md5sum] = "4fb764f282dc21cf9a656c58e13dacbb"
 SRC_URI[ipsec-tools-0.6.7.sha256sum] = "4239f836dc610a2443ded7ba35cb3b87de9d582c800e5d9eb5eed37defd61ef2"
diff --git a/recipes/iptables/iptables_1.3.8.bb b/recipes/iptables/iptables_1.3.8.bb
index ed08138ff2..a24ab4fc99 100644
--- a/recipes/iptables/iptables_1.3.8.bb
+++ b/recipes/iptables/iptables_1.3.8.bb
@@ -13,9 +13,9 @@ EXTRA_OEMAKE = "'COPT_FLAGS=${CFLAGS}' \
 CFLAGS[unexport] = "1"
 
 SRC_URI += "\
-  file://getsockopt-failed.patch;patch=1 \
-  file://iptables-use-s6_addr32.patch;patch=1 \
-  file://cross-iptables.diff;patch=1 \
+  file://getsockopt-failed.patch \
+  file://iptables-use-s6_addr32.patch \
+  file://cross-iptables.diff \
 "
 
 do_install () {
diff --git a/recipes/iptables/iptables_1.4.6.bb b/recipes/iptables/iptables_1.4.6.bb
index 389801f193..fb1c79fc09 100644
--- a/recipes/iptables/iptables_1.4.6.bb
+++ b/recipes/iptables/iptables_1.4.6.bb
@@ -6,7 +6,7 @@ EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
 PR = "${INC_PR}.0"
 
 SRC_URI += "\
-	file://netfilter_remove_ipt_DSCP.patch;patch=1 \
+	file://netfilter_remove_ipt_DSCP.patch \
 	"
 
 SRC_URI[iptables-1.4.6.md5sum] = "c67cf30e281a924def6426be0973df56"
diff --git a/recipes/iptraf/iptraf_3.0.0.bb b/recipes/iptraf/iptraf_3.0.0.bb
index 89007078b4..242ec13ebf 100644
--- a/recipes/iptraf/iptraf_3.0.0.bb
+++ b/recipes/iptraf/iptraf_3.0.0.bb
@@ -5,8 +5,8 @@ PR = "r0"
 
 SRC_URI = " \
     ${DEBIAN_MIRROR}/main/i/iptraf/iptraf_${PV}.orig.tar.gz;name=archive \
-    ${DEBIAN_MIRROR}/main/i/iptraf/iptraf_3.0.0-6.diff.gz;patch=1;name=patch \
-    file://support-makefile.patch;patch=1 \
+    ${DEBIAN_MIRROR}/main/i/iptraf/iptraf_3.0.0-6.diff.gz;name=patch \
+    file://support-makefile.patch \
 "
 
 # iptraf will store user filters etc. in /var/run/iptraf, which is probably
diff --git a/recipes/iptstate/iptstate_2.2.2.bb b/recipes/iptstate/iptstate_2.2.2.bb
index c6734d488b..70a4c72163 100644
--- a/recipes/iptstate/iptstate_2.2.2.bb
+++ b/recipes/iptstate/iptstate_2.2.2.bb
@@ -2,7 +2,7 @@ include iptstate.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://iptstate-use-ldflags.patch;patch=1"
+SRC_URI += "file://iptstate-use-ldflags.patch"
 
 SRC_URI[iptstate-2.2.2.md5sum] = "b3f2e89ef38d6e8a85c8ab88a9c514d8"
 SRC_URI[iptstate-2.2.2.sha256sum] = "2d9654a30a1e22159d93b2988c140571d048d08370b4869b1cb91562c29e1c39"
diff --git a/recipes/iputils/iputils_20020927.bb b/recipes/iputils/iputils_20020927.bb
index e89716768b..d094d4d90f 100644
--- a/recipes/iputils/iputils_20020927.bb
+++ b/recipes/iputils/iputils_20020927.bb
@@ -6,13 +6,13 @@ LICENSE ="BSD"
 PR = "r5"
 
 SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz \
-	    file://debian-fixes.patch;patch=1 \
-	    file://makefile.patch;patch=1 \
-	    file://standard-header-types.patch;patch=1 \
-	    file://tracepath6-mtu-opt.patch;patch=1 \
-	    file://remove-glibc-headers.patch;patch=1 \
-	    file://iputils-retvals.patch;patch=1 \
-	    file://glibc-2.4-compat.patch;patch=1"
+	    file://debian-fixes.patch \
+	    file://makefile.patch \
+	    file://standard-header-types.patch \
+	    file://tracepath6-mtu-opt.patch \
+	    file://remove-glibc-headers.patch \
+	    file://iputils-retvals.patch \
+	    file://glibc-2.4-compat.patch"
 S = "${WORKDIR}/iputils"
 
 PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6"
diff --git a/recipes/iputils/iputils_20071127.bb b/recipes/iputils/iputils_20071127.bb
index 2233632388..580909956c 100644
--- a/recipes/iputils/iputils_20071127.bb
+++ b/recipes/iputils/iputils_20071127.bb
@@ -10,14 +10,14 @@ PR = "r1"
 DEFAULT_PREFERENCE_angstrom = "2"
 
 SRC_URI = "http://ftp.de.debian.org/debian/pool/main/i/iputils/iputils_${PV}.orig.tar.gz \
-           file://debian/fix-dead-host-ping-stats.diff;patch=1 \
-           file://debian/add-icmp-return-codes.diff;patch=1 \
-           file://debian/use_gethostbyname2.diff;patch=1 \
-           file://debian/fix-cmsghdr-offset-bug.diff;patch=1 \
-           file://debian/cleanup-docbook-formatting.diff;patch=1 \
-           file://debian/targets.diff;patch=1 \
-           file://debian/fix-tracepath-docs.diff;patch=1 \
-           file://debian/fix-arping-timeouts.diff;patch=1 \
+           file://debian/fix-dead-host-ping-stats.diff \
+           file://debian/add-icmp-return-codes.diff \
+           file://debian/use_gethostbyname2.diff \
+           file://debian/fix-cmsghdr-offset-bug.diff \
+           file://debian/cleanup-docbook-formatting.diff \
+           file://debian/targets.diff \
+           file://debian/fix-tracepath-docs.diff \
+           file://debian/fix-arping-timeouts.diff \
 "
 
 S = "${WORKDIR}/iputils_20071127.orig"
diff --git a/recipes/iqnotes/iqnotes_2.0.2.bb b/recipes/iqnotes/iqnotes_2.0.2.bb
index 1c3b3afeb7..95cf9ae16a 100644
--- a/recipes/iqnotes/iqnotes_2.0.2.bb
+++ b/recipes/iqnotes/iqnotes_2.0.2.bb
@@ -3,8 +3,8 @@ require iqnotes.inc
 PR = "r5"
 
 SRC_URI = "http://www.vanille.de/mirror/iqnotes-2.0.2-src.tar.bz2 \
-           file://md5.diff;patch=1 \
-           file://qt2310-fontbug.patch;patch=1"
+           file://md5.diff \
+           file://qt2310-fontbug.patch"
 
 SRC_URI[md5sum] = "9d9504055b37247ece87b31895eb2e5b"
 SRC_URI[sha256sum] = "27badd5d9f3167443099c6b6cf66b05b9e32cc71f03d692cff474c2279c4f4cd"
diff --git a/recipes/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb b/recipes/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb
index 18e9a17047..f4a7aead35 100644
--- a/recipes/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb
+++ b/recipes/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb
@@ -5,7 +5,7 @@ UPV = "2.1.0rc1"
 PR = "r2"
 
 SRC_URI = "http://download.berlios.de/iqnotes/iqnotes-${UPV}.tar.bz2 \
-           file://pro.patch;patch=1"
+           file://pro.patch"
 
 S = "${WORKDIR}/iqnotes-${UPV}/iqnotes/"
 
diff --git a/recipes/irda-utils/irda-utils_0.9.15.bb b/recipes/irda-utils/irda-utils_0.9.15.bb
index 5d048bdca5..129029f039 100644
--- a/recipes/irda-utils/irda-utils_0.9.15.bb
+++ b/recipes/irda-utils/irda-utils_0.9.15.bb
@@ -5,8 +5,8 @@ such as phones and laptops."
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://m4.patch;patch=1"
+	   file://configure.patch \
+	   file://m4.patch"
 
 export SYS_INCLUDES="-I${STAGING_INCDIR}"
 BROKEN = "1"
diff --git a/recipes/irda-utils/irda-utils_0.9.16.bb b/recipes/irda-utils/irda-utils_0.9.16.bb
index 696e0bd37e..bb11cda34b 100644
--- a/recipes/irda-utils/irda-utils_0.9.16.bb
+++ b/recipes/irda-utils/irda-utils_0.9.16.bb
@@ -6,10 +6,10 @@ LICENSE = "GPL"
 PR = "r9"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://m4.patch;patch=1 \
-	   file://ldflags.patch;patch=1 \
-           file://sbindir.patch;patch=1 \
+	   file://configure.patch \
+	   file://m4.patch \
+	   file://ldflags.patch \
+           file://sbindir.patch \
 	   file://init"
 
 export SYS_INCLUDES="-I${STAGING_INCDIR}"
diff --git a/recipes/irda-utils/irdadump_0.9.16.bb b/recipes/irda-utils/irdadump_0.9.16.bb
index 3c954af1ca..8f88ad7fda 100644
--- a/recipes/irda-utils/irdadump_0.9.16.bb
+++ b/recipes/irda-utils/irdadump_0.9.16.bb
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pkgconfig"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
-	   file://glib2.patch;patch=1"
+	   file://glib2.patch"
 
 S="${WORKDIR}/irda-utils-${PV}/irdadump"
 
diff --git a/recipes/irk/irk-belkin_0.11.bb b/recipes/irk/irk-belkin_0.11.bb
index 8e5dd43883..e9c3dc1034 100644
--- a/recipes/irk/irk-belkin_0.11.bb
+++ b/recipes/irk/irk-belkin_0.11.bb
@@ -6,7 +6,7 @@ RREPLACES = "irk-targus"
 PR = "r3"
 
 SRC_URI = "http://www.openzaurus.org/download/3.5.4/sources/irk-current.tgz \
-           file://install-default-conf.patch;patch=1"
+           file://install-default-conf.patch"
 
 SRC_URI[md5sum] = "a77eaea6930b9af5bbcd59bf9f8859c8"
 SRC_URI[sha256sum] = "942240421710da8a04fa6c7071f50f0737ab7198e31c1d96f1e0b73330e0d066"
diff --git a/recipes/irk/irk-targus_0.11.0.bb b/recipes/irk/irk-targus_0.11.0.bb
index 75e690803f..30f53c8c03 100644
--- a/recipes/irk/irk-targus_0.11.0.bb
+++ b/recipes/irk/irk-targus_0.11.0.bb
@@ -8,7 +8,7 @@ RCONFLICTS = "irk-belkin"
 RREPLACES = "irk-belkin"
 
 SRC_URI = "http://www.openzaurus.org/download/3.5.4/sources/irk-${PV}.tgz \
-           file://install-default-conf.patch;patch=1"
+           file://install-default-conf.patch"
 
 SRC_URI[md5sum] = "5b39a7fb06fd24edfb543a3a0130065c"
 SRC_URI[sha256sum] = "5eeba81a5e5163e0b0b92b5e5aaf91c07b412a743a98f59975c75d28c133a85f"
diff --git a/recipes/irrlicht/irrlicht-examples-gles.bb b/recipes/irrlicht/irrlicht-examples-gles.bb
index 7cfab4e343..6bce68a8f6 100644
--- a/recipes/irrlicht/irrlicht-examples-gles.bb
+++ b/recipes/irrlicht/irrlicht-examples-gles.bb
@@ -6,7 +6,7 @@ SRCREV = "2409"
 PV = "1.6+svnr${SRCPV}"
 
 SRC_URI = "svn://irrlicht.svn.sourceforge.net/svnroot/irrlicht/branches;module=ogl-es;proto=https \
-           file://irrlicht_beagle.diff;patch=1;pnum=0 \
+           file://irrlicht_beagle.diff;striplevel=0 \
           "
 
 TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/recipes/irssi/irssi_0.8.10.bb b/recipes/irssi/irssi_0.8.10.bb
index 6dbdd44c18..6af65694bc 100644
--- a/recipes/irssi/irssi_0.8.10.bb
+++ b/recipes/irssi/irssi_0.8.10.bb
@@ -13,7 +13,7 @@ RDEPENDS_${PN} += "${PN}-common"
 inherit autotools
 
 SRC_URI = "http://www.irssi.org/files/${P}.tar.bz2 \
-	   file://autofoo.patch;patch=1"
+	   file://autofoo.patch"
 
 EXTRA_OECONF = "--enable-ipv6 \
 		--disable-ssl \
diff --git a/recipes/iscsi-target/iscsi-target_0.4.17.bb b/recipes/iscsi-target/iscsi-target_0.4.17.bb
index cae33457fd..1e12338e24 100644
--- a/recipes/iscsi-target/iscsi-target_0.4.17.bb
+++ b/recipes/iscsi-target/iscsi-target_0.4.17.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \
-           file://libs.patch;patch=1 \
-           file://2.6.29.patch;patch=1 \
+           file://libs.patch \
+           file://2.6.29.patch \
            file://ietd.conf \
            file://init"
 S = "${WORKDIR}/iscsitarget-${PV}"
diff --git a/recipes/iscsi-target/iscsi-target_1.4.19.bb b/recipes/iscsi-target/iscsi-target_1.4.19.bb
index ce23e2ff91..ff38f156cb 100644
--- a/recipes/iscsi-target/iscsi-target_1.4.19.bb
+++ b/recipes/iscsi-target/iscsi-target_1.4.19.bb
@@ -5,9 +5,9 @@ PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz;name=iscsitarget1419targz \
 
-           file://libs.patch;patch=1 \
-           file://2.6.31.patch;patch=1 \
-           file://2.6.32.patch;patch=1 \
+           file://libs.patch \
+           file://2.6.31.patch \
+           file://2.6.32.patch \
            file://ietd.conf \
            file://init"
 SRC_URI[iscsitarget1419targz.md5sum] = "9beca214c28949cce1716b49fec57de4"
diff --git a/recipes/iscsi-target/iscsi-target_svn.bb b/recipes/iscsi-target/iscsi-target_svn.bb
index 774674002e..289d025207 100644
--- a/recipes/iscsi-target/iscsi-target_svn.bb
+++ b/recipes/iscsi-target/iscsi-target_svn.bb
@@ -6,7 +6,7 @@ PR = "r13"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.berlios.de/iscsitarget/;module=trunk;rev=HEAD \
-	   file://libs.patch;patch=1 \
+	   file://libs.patch \
 	   file://init \
 	   file://ietd.conf \
 		"
diff --git a/recipes/ivman/ivman_0.6.14.bb b/recipes/ivman/ivman_0.6.14.bb
index 9d06832634..72ec23dbd6 100644
--- a/recipes/ivman/ivman_0.6.14.bb
+++ b/recipes/ivman/ivman_0.6.14.bb
@@ -7,8 +7,8 @@ DEPENDS = "hal libxml2"
 RDEPENDS = "hal pmount-hal"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ivman/${P}.tar.bz2 \
-           file://ivman-0.6-hotpluggable.patch;patch=1 \
-           file://ivman-launch.patch;patch=1 "
+           file://ivman-0.6-hotpluggable.patch \
+           file://ivman-launch.patch "
 
 inherit autotools
 
diff --git a/recipes/iw/iw_0.9.19.bb b/recipes/iw/iw_0.9.19.bb
new file mode 100644
index 0000000000..8e33e23eb4
--- /dev/null
+++ b/recipes/iw/iw_0.9.19.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "nl80211 based CLI configuration utility for wireless devices"
+HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/iw"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "BSD"
+PR = "r0"
+
+DEPENDS = "libnl pkgconfig"
+
+SRC_URI = "http://wireless.kernel.org/download/iw/${P}.tar.bz2"
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	oe_runmake DESTDIR=${D} install
+}
+
+SRC_URI[md5sum] = "3b88743f9c6ce8a7e2f5fd7d18fdea42"
+SRC_URI[sha256sum] = "f59191bb9c50bc64787fff65037de597b6c5ee790622a088e4bab85287798a8c"
diff --git a/recipes/ixp4xx/ixp4xx-npe-native_2.1.bb b/recipes/ixp4xx/ixp4xx-npe-native_2.1.bb
index 1510a750a9..f7ff764765 100644
--- a/recipes/ixp4xx/ixp4xx-npe-native_2.1.bb
+++ b/recipes/ixp4xx/ixp4xx-npe-native_2.1.bb
@@ -4,7 +4,7 @@ PR = "r3"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip"
 SRC_URI += "file://IxNpeMicrocode.h"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 inherit native
 S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
diff --git a/recipes/ixp4xx/ixp4xx-npe-native_2.3.2.bb b/recipes/ixp4xx/ixp4xx-npe-native_2.3.2.bb
index 926fa98dcc..aabc043c6c 100644
--- a/recipes/ixp4xx/ixp4xx-npe-native_2.3.2.bb
+++ b/recipes/ixp4xx/ixp4xx-npe-native_2.3.2.bb
@@ -4,7 +4,7 @@ PR = "r1"
 
 SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip"
 SRC_URI += "file://IxNpeMicrocode.h"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 inherit native
 S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
diff --git a/recipes/ixp4xx/ixp4xx-npe-native_2.4.bb b/recipes/ixp4xx/ixp4xx-npe-native_2.4.bb
index 7bc28e6181..1ac22b2cdb 100644
--- a/recipes/ixp4xx/ixp4xx-npe-native_2.4.bb
+++ b/recipes/ixp4xx/ixp4xx-npe-native_2.4.bb
@@ -4,7 +4,7 @@ PR = "r0"
 
 SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip"
 SRC_URI += "file://IxNpeMicrocode.h"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 inherit native
 S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
diff --git a/recipes/ixp4xx/ixp4xx-npe_2.1.bb b/recipes/ixp4xx/ixp4xx-npe_2.1.bb
index 7eb3a3dbe0..ff10ff040c 100644
--- a/recipes/ixp4xx/ixp4xx-npe_2.1.bb
+++ b/recipes/ixp4xx/ixp4xx-npe_2.1.bb
@@ -4,7 +4,7 @@ PR = "r6"
 DEPENDS = "ixp4xx-npe-native"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
diff --git a/recipes/ixp4xx/ixp4xx-npe_2.3.2.bb b/recipes/ixp4xx/ixp4xx-npe_2.3.2.bb
index 40ef4e653f..540528b2a6 100644
--- a/recipes/ixp4xx/ixp4xx-npe_2.3.2.bb
+++ b/recipes/ixp4xx/ixp4xx-npe_2.3.2.bb
@@ -9,7 +9,7 @@ DEPENDS = "ixp4xx-npe-native"
 # Make sure you *read* and accept the license - it is not a standard one.
 
 SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
diff --git a/recipes/ixp4xx/ixp4xx-npe_2.4.bb b/recipes/ixp4xx/ixp4xx-npe_2.4.bb
index 900ef8928a..bae416d121 100644
--- a/recipes/ixp4xx/ixp4xx-npe_2.4.bb
+++ b/recipes/ixp4xx/ixp4xx-npe_2.4.bb
@@ -11,7 +11,7 @@ DEPENDS = "ixp4xx-npe-native"
 
 SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip \
            file://Intel"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx|kixrp435)"
diff --git a/recipes/jaaa/clalsadrv_1.2.2.bb b/recipes/jaaa/clalsadrv_1.2.2.bb
index 48ba67ff84..5174dcac02 100644
--- a/recipes/jaaa/clalsadrv_1.2.2.bb
+++ b/recipes/jaaa/clalsadrv_1.2.2.bb
@@ -7,7 +7,7 @@ PR = "r0"
 DEPENDS = "alsa-lib"
 
 SRC_URI = "http://www.kokkinizita.net/linuxaudio/downloads/clalsadrv-${PV}.tar.bz2 \
-	file://clalsadrv-Makefile.patch;patch=1 \
+	file://clalsadrv-Makefile.patch \
 "
 
 S = "${WORKDIR}/clalsadrv"
diff --git a/recipes/jaaa/clthreads_2.4.0.bb b/recipes/jaaa/clthreads_2.4.0.bb
index 16da50f399..4f7d244637 100644
--- a/recipes/jaaa/clthreads_2.4.0.bb
+++ b/recipes/jaaa/clthreads_2.4.0.bb
@@ -7,7 +7,7 @@ PR = "r0"
 DEPENDS = ""
 
 SRC_URI = "http://www.kokkinizita.net/linuxaudio/downloads/clthreads-${PV}.tar.bz2 \
-	file://clthreads-Makefile.patch;patch=1 \
+	file://clthreads-Makefile.patch \
 "
 
 S = "${WORKDIR}/clthreads-${PV}"
diff --git a/recipes/jaaa/clxclient_3.6.1.bb b/recipes/jaaa/clxclient_3.6.1.bb
index 7d3deea557..9f2ed50b76 100644
--- a/recipes/jaaa/clxclient_3.6.1.bb
+++ b/recipes/jaaa/clxclient_3.6.1.bb
@@ -8,7 +8,7 @@ DEPENDS = "libx11 clthreads freetype libxft"
 RDEPENDS = "libx11-locale"
 
 SRC_URI = "http://www.kokkinizita.net/linuxaudio/downloads/clxclient-${PV}.tar.bz2 \
-	file://clxclient-Makefile.patch;patch=1 \
+	file://clxclient-Makefile.patch \
 "
 
 S = "${WORKDIR}/clxclient-${PV}"
diff --git a/recipes/jaaa/jaaa_0.4.2.bb b/recipes/jaaa/jaaa_0.4.2.bb
index 61ed764ca4..b729813582 100644
--- a/recipes/jaaa/jaaa_0.4.2.bb
+++ b/recipes/jaaa/jaaa_0.4.2.bb
@@ -7,7 +7,7 @@ PR = "r0"
 DEPENDS = "clthreads clxclient clalsadrv jack freetype fftwf"
 
 SRC_URI = "http://www.kokkinizita.net/linuxaudio/downloads/jaaa-${PV}.tar.bz2 \
-			file://jaaa-Makefile.patch;patch=1 \
+			file://jaaa-Makefile.patch \
 "
 
 S = "${WORKDIR}/jaaa"
diff --git a/recipes/jamvm/jamvm-initial_1.4.5.bb b/recipes/jamvm/jamvm-initial_1.4.5.bb
index 200c0168c1..fb2f4bf330 100644
--- a/recipes/jamvm/jamvm-initial_1.4.5.bb
+++ b/recipes/jamvm/jamvm-initial_1.4.5.bb
@@ -11,7 +11,7 @@ PROVIDES = "virtual/java-initial"
 S = "${WORKDIR}/jamvm-${PV}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \
-          file://jamvm_${PV}-initial.patch;patch=1;pnum=1 \
+          file://jamvm_${PV}-initial.patch \
           "
 
 # This uses 32 bit arm, so force the instruction set to arm, not thumb
diff --git a/recipes/jamvm/jamvm-initial_1.5.0.bb b/recipes/jamvm/jamvm-initial_1.5.0.bb
index c56dc754a4..3986861a1a 100644
--- a/recipes/jamvm/jamvm-initial_1.5.0.bb
+++ b/recipes/jamvm/jamvm-initial_1.5.0.bb
@@ -11,7 +11,7 @@ PROVIDES = "virtual/java-initial"
 S = "${WORKDIR}/jamvm-${PV}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \
-          file://jamvm_${PV}-initial.patch;patch=1;pnum=1 \
+          file://jamvm_${PV}-initial.patch \
           "
 
 # This uses 32 bit arm, so force the instruction set to arm, not thumb
@@ -36,9 +36,8 @@ do_compile() {
     GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-initial/glibj.zip
 }
 
-do_stage_append() {
-  install -d ${STAGING_BINDIR}
-  install -m 0755 java-initial ${STAGING_BINDIR}
+do_install_append() {
+  install -m 0755 java-initial ${D}${bindir}
 }
 
 SRC_URI[md5sum] = "a965452442cdbfc94caba57d0dd25a8f"
diff --git a/recipes/jamvm/jamvm-native_1.5.3.bb b/recipes/jamvm/jamvm-native_1.5.3.bb
index 73b43fb064..10036efd1f 100644
--- a/recipes/jamvm/jamvm-native_1.5.3.bb
+++ b/recipes/jamvm/jamvm-native_1.5.3.bb
@@ -4,7 +4,7 @@ require jamvm-native.inc
 
 PR = "r1"
 
-SRC_URI += "file://jamvm-1.5.3-jni_h-noinst.patch;patch=1"
+SRC_URI += "file://jamvm-1.5.3-jni_h-noinst.patch"
 
 
 SRC_URI[md5sum] = "ce886163658d748113b0570dfae12aea"
diff --git a/recipes/jamvm/jamvm_1.4.5.bb b/recipes/jamvm/jamvm_1.4.5.bb
index 0d353a7fd0..0e9636622b 100644
--- a/recipes/jamvm/jamvm_1.4.5.bb
+++ b/recipes/jamvm/jamvm_1.4.5.bb
@@ -2,7 +2,7 @@ require jamvm.inc
 
 PR = "r3"
 
-SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;patch=1"
+SRC_URI += "file://jamvm-1.3.1-size-defaults.patch"
 
 
 SRC_URI[md5sum] = "3f538bab6e1c77aed331e5e71f754f5b"
diff --git a/recipes/jamvm/jamvm_1.5.0.bb b/recipes/jamvm/jamvm_1.5.0.bb
index be8cb4cc8b..2231566bb0 100644
--- a/recipes/jamvm/jamvm_1.5.0.bb
+++ b/recipes/jamvm/jamvm_1.5.0.bb
@@ -1,6 +1,6 @@
 require jamvm.inc
 
-SRC_URI += "file://debian-jni.patch;patch=1;pnum=0"
+SRC_URI += "file://debian-jni.patch;striplevel=0"
 
 PR = "r4"
 
diff --git a/recipes/jamvm/jamvm_1.5.2.bb b/recipes/jamvm/jamvm_1.5.2.bb
index 258629684c..68949ab44d 100644
--- a/recipes/jamvm/jamvm_1.5.2.bb
+++ b/recipes/jamvm/jamvm_1.5.2.bb
@@ -1,6 +1,6 @@
 require jamvm.inc
 
-SRC_URI += "file://debian-jni.patch;patch=1;pnum=0"
+SRC_URI += "file://debian-jni.patch;striplevel=0"
 
 PR = "r0"
 
diff --git a/recipes/jamvm/jamvm_1.5.3.bb b/recipes/jamvm/jamvm_1.5.3.bb
new file mode 100644
index 0000000000..19eabfd669
--- /dev/null
+++ b/recipes/jamvm/jamvm_1.5.3.bb
@@ -0,0 +1,15 @@
+require jamvm.inc
+
+SRC_URI += "file://debian-jni.patch;striplevel=0"
+
+PR = "r0"
+
+do_configure_prepend() {
+  # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
+  # configured in OE.
+  sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/dll.c
+}
+
+SRC_URI[md5sum] = "ce886163658d748113b0570dfae12aea"
+SRC_URI[sha256sum] = "f2795ab62635df1c9bc6c4a7b90f53d0d846c0c26f5ec7b352f687506407ebd8"
+
diff --git a/recipes/jansson/jansson.inc b/recipes/jansson/jansson.inc
new file mode 100644
index 0000000000..38a108cdf2
--- /dev/null
+++ b/recipes/jansson/jansson.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "Jansson is a C library for encoding, decoding and manipulating JSON data."
+HOMEPAGE = "http://www.digip.org/jansson/"
+LICENSE = "MIT"
+INC_PR = "r1"
+
+SRC_URI = "http://www.digip.org/jansson/releases/${PN}-${PV}.tar.gz"
+
+inherit autotools
diff --git a/recipes/jansson/jansson_1.2.1.bb b/recipes/jansson/jansson_1.2.1.bb
new file mode 100644
index 0000000000..18b19e20ee
--- /dev/null
+++ b/recipes/jansson/jansson_1.2.1.bb
@@ -0,0 +1,5 @@
+require jansson.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "c3b88efcf1973d60b19302eae4dfae34"
+SRC_URI[sha256sum] = "c74ff4d2b8180f00260284fd3e7876e2aa385f7f3ab410c354a1f937ff902950"
diff --git a/recipes/javasqlite/javasqlite-mkconst-native_20080130.bb b/recipes/javasqlite/javasqlite-mkconst-native_20080130.bb
index 1cffc9e46e..c0a9b90cc5 100644
--- a/recipes/javasqlite/javasqlite-mkconst-native_20080130.bb
+++ b/recipes/javasqlite/javasqlite-mkconst-native_20080130.bb
@@ -6,7 +6,7 @@ DEPENDS = "sqlite-native sqlite3-native"
 
 SRC_URI = "\
   http://www.ch-werner.de/javasqlite/javasqlite-${PV}.tar.gz \
-  file://build-fix.patch;patch=1"
+  file://build-fix.patch"
 
 S = "${WORKDIR}/javasqlite-${PV}"
 
diff --git a/recipes/javasqlite/javasqlite_20080130.bb b/recipes/javasqlite/javasqlite_20080130.bb
index d78bf5dd62..e1b99d812d 100644
--- a/recipes/javasqlite/javasqlite_20080130.bb
+++ b/recipes/javasqlite/javasqlite_20080130.bb
@@ -6,7 +6,7 @@ PR = "r2"
 
 SRC_URI = "\
   http://www.ch-werner.de/javasqlite/javasqlite-${PV}.tar.gz \
-  file://build-fix.patch;patch=1"
+  file://build-fix.patch"
 
 DEPENDS = "virtual/javac-native fastjar-native classpath-tools-native javasqlite-mkconst-native classpath sqlite sqlite3"
 RDEPENDS_${JPN} = "lib${PN}-jni"
diff --git a/recipes/jhead/jhead_2.6.0.bb b/recipes/jhead/jhead_2.6.0.bb
index 64fd9ec1aa..c741ad4004 100644
--- a/recipes/jhead/jhead_2.6.0.bb
+++ b/recipes/jhead/jhead_2.6.0.bb
@@ -2,7 +2,7 @@ SECTION = "apps"
 PR = "r0"
 
 SRC_URI = "http://www.sentex.net/~mwandel/jhead/jhead-2.6.tar.gz \
-           file://makefile.patch;patch=1"
+           file://makefile.patch"
 
 S = "${WORKDIR}/jhead-2.6"
 
diff --git a/recipes/jikes/jikes-initial.bb b/recipes/jikes/jikes-initial.bb
index 0e2f4d0748..bf2fdd1168 100644
--- a/recipes/jikes/jikes-initial.bb
+++ b/recipes/jikes/jikes-initial.bb
@@ -2,8 +2,6 @@ SUMMARY = "Initial Java 1.4-compatible (and not higher) compiler"
 
 DEPENDS = "jikes-native classpath-initial"
 
-SRC_URI = ""
-
 S = "${WORKDIR}"
 
 inherit native
@@ -17,7 +15,9 @@ do_compile() {
   echo "${STAGING_BINDIR_NATIVE}/jikes -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath-initial/glibj.zip \$@" >> jikes-initial
 }
 
-do_stage() {
-  install -d ${STAGING_BINDIR}
-  install -m 0755 jikes-initial ${STAGING_BINDIR}
+do_install() {
+  install -d ${D}${bindir}
+  install -m 0755 jikes-initial ${D}${bindir}
 }
+
+NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/jikes/jikes-native_1.21.bb b/recipes/jikes/jikes-native_1.21.bb
deleted file mode 100644
index b95cbfcd75..0000000000
--- a/recipes/jikes/jikes-native_1.21.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-inherit native
-require jikes_${PV}.bb
-
-S = "${WORKDIR}/jikes-${PV}"
-
-do_stage() {
-	install -d ${STAGING_BINDIR}
-	install -m 755 src/jikes ${STAGING_BINDIR}
-}
diff --git a/recipes/jikes/jikes_1.21.bb b/recipes/jikes/jikes_1.21.bb
index 83ca22f2da..ade11e6f01 100644
--- a/recipes/jikes/jikes_1.21.bb
+++ b/recipes/jikes/jikes_1.21.bb
@@ -9,6 +9,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/jikes/jikes-${PV}.tar.bz2"
 
 inherit autotools
 
+PROVIDES_virtclass-native = ""
+
+BBCLASSEXTEND = "native"
+
+
 EXTRA_OECONF = "--disable-fp-emulation"
 
 # configure script incorrectly defines these when cross compiling for ARM
diff --git a/recipes/jikes/jikes_1.22.bb b/recipes/jikes/jikes_1.22.bb
index 567cbd8823..62bb40f239 100644
--- a/recipes/jikes/jikes_1.22.bb
+++ b/recipes/jikes/jikes_1.22.bb
@@ -6,6 +6,10 @@ LICENSE = "IBM"
 PR = "r1"
 
 RDEPENDS = "classpath"
+PROVIDES_virtclass-native = ""
+RDEPENDS_virtclass-native = ""
+
+BBCLASSEXTEND = "native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/jikes/jikes-${PV}.tar.bz2"
 
diff --git a/recipes/jpeg/jasper_1.900.1.bb b/recipes/jpeg/jasper_1.900.1.bb
index 2598088ecd..94b83b953b 100644
--- a/recipes/jpeg/jasper_1.900.1.bb
+++ b/recipes/jpeg/jasper_1.900.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Jpeg 2000 implementation"
 LICENSE = "MIT"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 
 SRC_URI = "http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-${PV}.zip"
 
diff --git a/recipes/jpeg/jpeg_6b.bb b/recipes/jpeg/jpeg_6b.bb
index 929711eee7..2158c6e5c0 100644
--- a/recipes/jpeg/jpeg_6b.bb
+++ b/recipes/jpeg/jpeg_6b.bb
@@ -10,10 +10,10 @@ PR = "r9"
 
 #SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 SRC_URI = "ftp://aeneas.mit.edu/pub/gnu/ghostscript/jpegsrc.v${PV}.tar.gz \
-	   file://debian.patch;patch=1 \
-	   file://ldflags.patch;patch=1 \
-	   file://paths.patch;patch=1 \
-	   file://libtool_tweak.patch;patch=1"
+	   file://debian.patch \
+	   file://ldflags.patch \
+	   file://paths.patch \
+	   file://libtool_tweak.patch"
 S = "${WORKDIR}/jpeg-${PV}"
 
 inherit autotools
diff --git a/recipes/juce/juce_1.29.bb b/recipes/juce/juce_1.29.bb
index a007313005..58617246c4 100644
--- a/recipes/juce/juce_1.29.bb
+++ b/recipes/juce/juce_1.29.bb
@@ -3,13 +3,13 @@ HOMEPAGE = "http://www.rawmaterialsoftware.com/juce"
 AUTHOR = "Julian Stoerer"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib freetype virtual/libx11"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 PR = "r0"
 
 #FIXME the patches are a) HACKS and b) something's wrong with lineend conversion
 SRC_URI = "http://downloads.openmoko.org/sources/juce_${@bb.data.getVar('PV',d,1).split('.')[0]}_${@bb.data.getVar('PV',d,1).split('.')[1]}.zip \
-           file://remove-x86isms.patch;patch=1 \
-           file://no-opengl.patch;patch=1"
+           file://remove-x86isms.patch \
+           file://no-opengl.patch"
 S = "${WORKDIR}/juce"
 
 LIB = "libjuce_debug"
diff --git a/recipes/julius/julius_4.1.2.bb b/recipes/julius/julius_4.1.2.bb
index 57e78a67b3..c6c24c4d94 100644
--- a/recipes/julius/julius_4.1.2.bb
+++ b/recipes/julius/julius_4.1.2.bb
@@ -5,7 +5,7 @@ DEPENDS = "libsndfile1 flex zlib alsa-lib"
 PR = "r1"
 
 SRC_URI = "http://iij.dl.sourceforge.jp/julius/37582/julius-${PV}.tar.gz \
-           file://patch-julius-4.1.2-command-pipe.patch;patch=1 "
+           file://patch-julius-4.1.2-command-pipe.patch "
 
 inherit autotools
 
diff --git a/recipes/justreader/justreader_2.0k.bb b/recipes/justreader/justreader_2.0k.bb
index eb4eba4e1f..9df89fa02e 100644
--- a/recipes/justreader/justreader_2.0k.bb
+++ b/recipes/justreader/justreader_2.0k.bb
@@ -6,8 +6,8 @@ HOMEPAGE = "http://justreader.sourceforge.net/"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/justreader/justreader_${PV}.tgz \
-file://correct-settings-path.patch;patch=1 \
-file://missing-include.patch;patch=1"
+file://correct-settings-path.patch \
+file://missing-include.patch"
 
 S = "${WORKDIR}/TextReader2"
 
diff --git a/recipes/kaffe/kaffe.inc b/recipes/kaffe/kaffe.inc
index 7863f733c0..d0997de1ac 100644
--- a/recipes/kaffe/kaffe.inc
+++ b/recipes/kaffe/kaffe.inc
@@ -5,7 +5,7 @@ LICENSE  = "GPL LGPL W3C Classpath BSD"
 DEPENDS = "virtual/javac-native fastjar-native libffi zip-native libart-lgpl"
 RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
 
-SRC_URI += "file://disable-automake-checks.patch;patch=1"
+SRC_URI += "file://disable-automake-checks.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/kakasi/kakasi_2.3.4.bb b/recipes/kakasi/kakasi_2.3.4.bb
index 2dca82ba4f..843f6fb2bb 100644
--- a/recipes/kakasi/kakasi_2.3.4.bb
+++ b/recipes/kakasi/kakasi_2.3.4.bb
@@ -3,7 +3,7 @@ require kakasi.inc
 SECTION = "utils"
 DEPENDS = "kakasi-native"
 
-SRC_URI += "file://makefile.patch;patch=1"
+SRC_URI += "file://makefile.patch"
 
 do_stage () {
         install -m 0644 lib/*.h ${STAGING_INCDIR}
diff --git a/recipes/kanjipad/kpengine_0.1.bb b/recipes/kanjipad/kpengine_0.1.bb
index 3ba05df38f..913d12c7b4 100644
--- a/recipes/kanjipad/kpengine_0.1.bb
+++ b/recipes/kanjipad/kpengine_0.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Japanese HWR engine used by a number of programs. Original algori
 SECTION = "inputmethods"
 PR = "r1"
 
-SRC_URI += "file://Makefile-kpengine-only.patch;patch=1"
+SRC_URI += "file://Makefile-kpengine-only.patch"
 
 FILES_${PN} = "${bindir}/kpengine ${datadir}"
 
diff --git a/recipes/kdepimpi/kdepimpi-x11_2.2.3.bb b/recipes/kdepimpi/kdepimpi-x11_2.2.3.bb
index 5357ffb184..c565cfcb0c 100644
--- a/recipes/kdepimpi/kdepimpi-x11_2.2.3.bb
+++ b/recipes/kdepimpi/kdepimpi-x11_2.2.3.bb
@@ -1,9 +1,9 @@
 SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
-file://libkcal.patch;patch=1 \
-file://kabc.patch;patch=1 \
-file://kammu.patch;patch=1 \
-file://korganizer.patch;patch=1 \
-file://nomail.patch;patch=1 \
+file://libkcal.patch \
+file://kabc.patch \
+file://kammu.patch \
+file://korganizer.patch \
+file://nomail.patch \
 "
 
 include kdepimpi-base.inc
diff --git a/recipes/kdepimpi/kdepimpi_2.2.10.bb b/recipes/kdepimpi/kdepimpi_2.2.10.bb
index 1d7a28d118..126c3f11be 100644
--- a/recipes/kdepimpi/kdepimpi_2.2.10.bb
+++ b/recipes/kdepimpi/kdepimpi_2.2.10.bb
@@ -1,5 +1,5 @@
 SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
-            file://qt-mt.patch;patch=1" 
+            file://qt-mt.patch" 
 
 require kdepimpi-base.inc
 
diff --git a/recipes/kexec-tools/kexec-tools-dietlibc_2.0.1.bb b/recipes/kexec-tools/kexec-tools-dietlibc_2.0.1.bb
index 4691587eaa..ab9cb51d55 100644
--- a/recipes/kexec-tools/kexec-tools-dietlibc_2.0.1.bb
+++ b/recipes/kexec-tools/kexec-tools-dietlibc_2.0.1.bb
@@ -1,7 +1,7 @@
 # the binaries are statical linked against dietlibc
 require kexec-tools2.inc
 
-SRC_URI += "file://dietlibc.patch;patch=1"
+SRC_URI += "file://dietlibc.patch"
 
 inherit dietlibc
 
diff --git a/recipes/kexec-tools/kexec-tools-klibc-static_1.101.bb b/recipes/kexec-tools/kexec-tools-klibc-static_1.101.bb
index e4b948822e..65fb02165c 100644
--- a/recipes/kexec-tools/kexec-tools-klibc-static_1.101.bb
+++ b/recipes/kexec-tools/kexec-tools-klibc-static_1.101.bb
@@ -4,8 +4,8 @@ require kexec-tools.inc
 PR = "r8"
 DEPENDS = "klibc"
 
-SRC_URI += "file://kexec-static.patch;patch=1 \
-	    file://kexec-klibc.patch;patch=1 \
+SRC_URI += "file://kexec-static.patch \
+	    file://kexec-klibc.patch \
 	    "
 S = "${WORKDIR}/kexec-tools-${PV}"
 
diff --git a/recipes/kexec-tools/kexec-tools-klibc-static_2.0.1.bb b/recipes/kexec-tools/kexec-tools-klibc-static_2.0.1.bb
index 880383f64a..bbd1753af0 100644
--- a/recipes/kexec-tools/kexec-tools-klibc-static_2.0.1.bb
+++ b/recipes/kexec-tools/kexec-tools-klibc-static_2.0.1.bb
@@ -6,8 +6,8 @@ DEFAULT_PREFERENCE = "1"
 PR = "r4"
 DEPENDS = "klibc"
 
-SRC_URI += "file://kexec-tools-2-headers.patch;patch=1 \
-	    file://kexec-tools-2-klibc.patch;patch=1 \
+SRC_URI += "file://kexec-tools-2-headers.patch \
+	    file://kexec-tools-2-klibc.patch \
 	    "
 
 S = "${WORKDIR}/kexec-tools-${PV}"
diff --git a/recipes/kexec-tools/kexec-tools.inc b/recipes/kexec-tools/kexec-tools.inc
index f806e71480..0ff1c31cc0 100644
--- a/recipes/kexec-tools/kexec-tools.inc
+++ b/recipes/kexec-tools/kexec-tools.inc
@@ -9,5 +9,5 @@ inherit autotools
 
 
 SRC_URI = "http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-${PV}.tar.gz \
-           file://kexec-tools-arm.patch;patch=1 \
-           file://kexec-arm-atags.patch;patch=1"
+           file://kexec-tools-arm.patch \
+           file://kexec-arm-atags.patch"
diff --git a/recipes/kexec-tools/kexec-tools2.inc b/recipes/kexec-tools/kexec-tools2.inc
index 68dc5ba396..a007cc2565 100644
--- a/recipes/kexec-tools/kexec-tools2.inc
+++ b/recipes/kexec-tools/kexec-tools2.inc
@@ -9,8 +9,8 @@ inherit autotools
 
 
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-${PV}.tar.gz \
-           file://fix-arm-arch-detection.patch;patch=1 \
-           file://no-getline-no-fscanf.patch;patch=1 \
-           file://kexec-tools-2-arm-add-uImage.patch;patch=1 \
-           file://kexec-tools-2-autoconf-post-2.63.patch;patch=1 \
+           file://fix-arm-arch-detection.patch \
+           file://no-getline-no-fscanf.patch \
+           file://kexec-tools-2-arm-add-uImage.patch \
+           file://kexec-tools-2-autoconf-post-2.63.patch \
            "
diff --git a/recipes/kexecboot/kexecboot.inc b/recipes/kexecboot/kexecboot.inc
index 3f37f9e720..069019c0ff 100644
--- a/recipes/kexecboot/kexecboot.inc
+++ b/recipes/kexecboot/kexecboot.inc
@@ -15,17 +15,36 @@ SRC_URI += "file://logo-img.h \
 export CC=${TARGET_PREFIX}klcc
 
 # Defaults as in ver 0.5+0.6b
-# --with_static_linking=no
-# --with_fbmenu=yes
-# --with_cfgfiles=yes
-# --with_icons=yes
-# --with_zaurus=no
-# --with_zimage=yes
-# --with_uimage=no
-# --with_machine_kernel=no
-# --enable_devices_recreating="yes"
-# --enable_debug="no"
-# --enable_host_debug="no"
+#############################
+# Optional Features:
+#  --disable-option-checking  ignore unrecognized --enable/--with options
+#  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+#  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+#  --enable-maintainer-mode  enable make rules and dependencies not useful
+#                          (and sometimes confusing) to the casual installer
+#  --enable-devices-recreating
+#                          enable devices re-creating [default=yes]
+#  --enable-debug          enable debug output [default=no]
+#  --enable-host-debug     allow for non-destructive executing of kexecboot on
+#                          host system[default=no]
+#  --disable-dependency-tracking  speeds up one-time build
+#  --enable-dependency-tracking   do not reject slow dependency extractors
+#
+# Optional Packages:
+#  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+#  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+#  --with-static-linking   compiles kexecboot as a static executable
+#                          [default=no]
+#  --with-fbmenu           support framebuffer menu [default=yes]
+#  --with-cfgfiles         support config files [default=yes]
+#  --with-icons            support custom icons (depends on fbmenu)
+#                          [default=yes]
+#  --with-zaurus           compile Sharp Zaurus specific code [default=no]
+#  --with-zimage           compile with zImage support [default=yes]
+#  --with-uimage           compile with uImage support [default=no]
+#  --with-machine-kernel   enable looking for machine-specific zImage kernel
+#                          [default=no]
+############################
 
 EXTRA_OECONF_akita = "--with-zaurus"
 EXTRA_OECONF_c7x0 = "--with-zaurus"
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33/c7x0/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.33/c7x0/defconfig
deleted file mode 100644
index 632a25d75c..0000000000
--- a/recipes/kexecboot/linux-kexecboot-2.6.33/c7x0/defconfig
+++ /dev/null
@@ -1,1316 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.33-rc6
-# Tue Feb  9 22:56:42 2010
-#
-CONFIG_ARM=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_ARCH_HAS_CPUFREQ=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_MTD_XIP=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_TINY_RCU is not set
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_RELAY is not set
-# CONFIG_NAMESPACES is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma"
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_RD_GZIP=y
-# CONFIG_RD_BZIP2 is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
-# CONFIG_INITRAMFS_COMPRESSION_NONE is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-CONFIG_INITRAMFS_COMPRESSION_LZMA=y
-# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_EMBEDDED=y
-# CONFIG_UID16 is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-# CONFIG_ELF_CORE is not set
-# CONFIG_BASE_FULL is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-# CONFIG_PROFILING is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_CLK=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_SLOW_WORK is not set
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=1
-# CONFIG_MODULES is not set
-CONFIG_BLOCK=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_FREEZER=y
-
-#
-# System Type
-#
-CONFIG_MMU=y
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCH_PNX4008 is not set
-CONFIG_ARCH_PXA=y
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_U8500 is not set
-
-#
-# Intel PXA2xx/PXA3xx Implementations
-#
-
-#
-# Intel/Marvell Dev Platforms (sorted by hardware release time)
-#
-# CONFIG_ARCH_LUBBOCK is not set
-# CONFIG_MACH_MAINSTONE is not set
-# CONFIG_MACH_ZYLONITE300 is not set
-# CONFIG_MACH_ZYLONITE320 is not set
-# CONFIG_MACH_LITTLETON is not set
-# CONFIG_MACH_TAVOREVB is not set
-# CONFIG_MACH_SAAR is not set
-
-#
-# Third Party Dev Platforms (sorted by vendor name)
-#
-# CONFIG_ARCH_PXA_IDP is not set
-# CONFIG_ARCH_VIPER is not set
-# CONFIG_MACH_ARCOM_ZEUS is not set
-# CONFIG_MACH_BALLOON3 is not set
-# CONFIG_MACH_CSB726 is not set
-# CONFIG_MACH_ARMCORE is not set
-# CONFIG_MACH_EM_X270 is not set
-# CONFIG_MACH_EXEDA is not set
-# CONFIG_MACH_CM_X300 is not set
-# CONFIG_ARCH_GUMSTIX is not set
-# CONFIG_MACH_INTELMOTE2 is not set
-# CONFIG_MACH_STARGATE2 is not set
-# CONFIG_MACH_XCEP is not set
-# CONFIG_TRIZEPS_PXA is not set
-# CONFIG_MACH_LOGICPD_PXA270 is not set
-# CONFIG_MACH_PCM027 is not set
-# CONFIG_MACH_COLIBRI is not set
-# CONFIG_MACH_COLIBRI300 is not set
-# CONFIG_MACH_COLIBRI320 is not set
-
-#
-# End-user Products (sorted by vendor name)
-#
-# CONFIG_MACH_H4700 is not set
-# CONFIG_MACH_H5000 is not set
-# CONFIG_MACH_HIMALAYA is not set
-# CONFIG_MACH_MAGICIAN is not set
-# CONFIG_MACH_MIOA701 is not set
-# CONFIG_PXA_EZX is not set
-# CONFIG_MACH_MP900C is not set
-# CONFIG_ARCH_PXA_PALM is not set
-CONFIG_PXA_SHARPSL=y
-CONFIG_SHARPSL_PM=y
-# CONFIG_MACH_POODLE is not set
-CONFIG_MACH_CORGI=y
-CONFIG_MACH_SHEPHERD=y
-CONFIG_MACH_HUSKY=y
-# CONFIG_MACH_AKITA is not set
-# CONFIG_MACH_SPITZ is not set
-# CONFIG_MACH_BORZOI is not set
-# CONFIG_MACH_TOSA is not set
-# CONFIG_ARCH_PXA_ESERIES is not set
-CONFIG_PXA25x=y
-CONFIG_PXA_SHARP_C7xx=y
-CONFIG_PXA_SSP=y
-CONFIG_PLAT_PXA=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_XSCALE=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5T=y
-CONFIG_CPU_PABRT_LEGACY=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-
-#
-# Processor Features
-#
-CONFIG_ARM_THUMB=y
-# CONFIG_CPU_DCACHE_DISABLE is not set
-CONFIG_ARM_L1_CACHE_SHIFT=5
-# CONFIG_IWMMXT is not set
-CONFIG_XSCALE_PMU=y
-CONFIG_SHARP_PARAM=y
-CONFIG_SHARP_SCOOP=y
-CONFIG_COMMON_CLKDEV=y
-
-#
-# Bus support
-#
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_PCCARD=y
-CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_IOCTL is not set
-
-#
-# PC-card bridges
-#
-CONFIG_PCMCIA_SOC_COMMON=y
-CONFIG_PCMCIA_PXA2XX=y
-# CONFIG_PCMCIA_DEBUG is not set
-
-#
-# Kernel Features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-# CONFIG_HIGH_RES_TIMERS is not set
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_HZ=100
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-
-#
-# Boot options
-#
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 loglevel=3 "
-# CONFIG_XIP_KERNEL is not set
-CONFIG_KEXEC=y
-CONFIG_ATAGS_PROC=y
-
-#
-# CPU Power Management
-#
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-
-#
-# Floating point emulation
-#
-
-#
-# At least one emulation must be selected
-#
-
-#
-# Userspace binary formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_HAVE_AOUT=y
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Power management options
-#
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_APM_EMULATION=y
-# CONFIG_PM_RUNTIME is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_NET is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_MTD_OOPS is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=y
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_H1900 is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-CONFIG_MTD_NAND_SHARPSL=y
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-
-#
-# UBI - Unsorted block images
-#
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
-
-#
-# UBI debugging options
-#
-# CONFIG_MTD_UBI_DEBUG is not set
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-
-#
-# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
-#
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_MG_DISK is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_DS1682 is not set
-# CONFIG_TI_DAC7512 is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_IWMC3200TOP is not set
-CONFIG_HAVE_IDE=y
-CONFIG_IDE=y
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-# CONFIG_IDE_GD_ATAPI is not set
-CONFIG_BLK_DEV_IDECS=y
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_ATA is not set
-# CONFIG_MD is not set
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
-# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-CONFIG_INPUT_APMPOWER=y
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_QT2160 is not set
-# CONFIG_KEYBOARD_CORGI is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_KEYBOARD_MATRIX=y
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_SPITZ is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_CORGI is not set
-# CONFIG_TOUCHSCREEN_DYNAPRO is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_DEVKMEM is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MAX3100 is not set
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_R3964 is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-# CONFIG_I2C_CHARDEV is not set
-CONFIG_I2C_HELPER_AUTO=y
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_DESIGNWARE is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_PXA=y
-# CONFIG_I2C_PXA_SLAVE is not set
-# CONFIG_I2C_SIMTEC is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_TAOS_EVM is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_PCA_PLATFORM is not set
-
-#
-# Miscellaneous I2C Chip support
-#
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_GPIO is not set
-CONFIG_SPI_PXA2XX=y
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_TLE62X0 is not set
-
-#
-# PPS support
-#
-# CONFIG_PPS is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
-
-#
-# Memory mapped GPIO expanders:
-#
-
-#
-# I2C GPIO expanders:
-#
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_ADP5588 is not set
-
-#
-# PCI GPIO expanders:
-#
-
-#
-# SPI GPIO expanders:
-#
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_MC33880 is not set
-
-#
-# AC97 GPIO expanders:
-#
-# CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=y
-CONFIG_APM_POWER=y
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LM95241 is not set
-CONFIG_SENSORS_MAX1111=y
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-# CONFIG_SSB is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_MC13783 is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_88PM8607 is not set
-# CONFIG_AB4500_CORE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FB_MBX is not set
-CONFIG_FB_W100=y
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_CORGI=y
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=y
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_SOUND is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_SDIO_UART is not set
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_PXA=y
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_ATMELMCI is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MEMSTICK is not set
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_PCA9532 is not set
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_GPIO_PLATFORM=y
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_DAC124S085 is not set
-# CONFIG_LEDS_BD2802 is not set
-# CONFIG_LEDS_LT3593 is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-# CONFIG_ACCESSIBILITY is not set
-CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-
-#
-# TI VLYNQ
-#
-# CONFIG_STAGING is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_EXT4_FS_XATTR is not set
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=y
-CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_FILE_LOCKING is not set
-# CONFIG_FSNOTIFY is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_QUOTA is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_XATTR is not set
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_NLS is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_MEMORY_INIT is not set
-CONFIG_FRAME_POINTER=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_DEBUG_USER is not set
-# CONFIG_OC_ETM is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_SEQIV is not set
-
-#
-# Block modes
-#
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-
-#
-# Hash modes
-#
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-# CONFIG_CRYPTO_AES is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-# CONFIG_CRYPTO_ZLIB is not set
-CONFIG_CRYPTO_LZO=y
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_BINARY_PRINTF is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33/spitz/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.33/spitz/defconfig
deleted file mode 100644
index a9bcc7bd94..0000000000
--- a/recipes/kexecboot/linux-kexecboot-2.6.33/spitz/defconfig
+++ /dev/null
@@ -1,1320 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.33-rc6
-# Tue Feb  9 22:56:42 2010
-#
-CONFIG_ARM=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_ARCH_HAS_CPUFREQ=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_MTD_XIP=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_TINY_RCU is not set
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_RELAY is not set
-# CONFIG_NAMESPACES is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma"
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_RD_GZIP=y
-# CONFIG_RD_BZIP2 is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
-# CONFIG_INITRAMFS_COMPRESSION_NONE is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-CONFIG_INITRAMFS_COMPRESSION_LZMA=y
-# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_EMBEDDED=y
-# CONFIG_UID16 is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-# CONFIG_ELF_CORE is not set
-# CONFIG_BASE_FULL is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-# CONFIG_PROFILING is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_CLK=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_SLOW_WORK is not set
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=1
-# CONFIG_MODULES is not set
-CONFIG_BLOCK=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_FREEZER=y
-
-#
-# System Type
-#
-CONFIG_MMU=y
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCH_PNX4008 is not set
-CONFIG_ARCH_PXA=y
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_U8500 is not set
-
-#
-# Intel PXA2xx/PXA3xx Implementations
-#
-
-#
-# Intel/Marvell Dev Platforms (sorted by hardware release time)
-#
-# CONFIG_ARCH_LUBBOCK is not set
-# CONFIG_MACH_MAINSTONE is not set
-# CONFIG_MACH_ZYLONITE300 is not set
-# CONFIG_MACH_ZYLONITE320 is not set
-# CONFIG_MACH_LITTLETON is not set
-# CONFIG_MACH_TAVOREVB is not set
-# CONFIG_MACH_SAAR is not set
-
-#
-# Third Party Dev Platforms (sorted by vendor name)
-#
-# CONFIG_ARCH_PXA_IDP is not set
-# CONFIG_ARCH_VIPER is not set
-# CONFIG_MACH_ARCOM_ZEUS is not set
-# CONFIG_MACH_BALLOON3 is not set
-# CONFIG_MACH_CSB726 is not set
-# CONFIG_MACH_ARMCORE is not set
-# CONFIG_MACH_EM_X270 is not set
-# CONFIG_MACH_EXEDA is not set
-# CONFIG_MACH_CM_X300 is not set
-# CONFIG_ARCH_GUMSTIX is not set
-# CONFIG_MACH_INTELMOTE2 is not set
-# CONFIG_MACH_STARGATE2 is not set
-# CONFIG_MACH_XCEP is not set
-# CONFIG_TRIZEPS_PXA is not set
-# CONFIG_MACH_LOGICPD_PXA270 is not set
-# CONFIG_MACH_PCM027 is not set
-# CONFIG_MACH_COLIBRI is not set
-# CONFIG_MACH_COLIBRI300 is not set
-# CONFIG_MACH_COLIBRI320 is not set
-
-#
-# End-user Products (sorted by vendor name)
-#
-# CONFIG_MACH_H4700 is not set
-# CONFIG_MACH_H5000 is not set
-# CONFIG_MACH_HIMALAYA is not set
-# CONFIG_MACH_MAGICIAN is not set
-# CONFIG_MACH_MIOA701 is not set
-# CONFIG_PXA_EZX is not set
-# CONFIG_MACH_MP900C is not set
-# CONFIG_ARCH_PXA_PALM is not set
-CONFIG_PXA_SHARPSL=y
-CONFIG_SHARPSL_PM=y
-# CONFIG_MACH_POODLE is not set
-# CONFIG_MACH_CORGI is not set
-# CONFIG_MACH_SHEPHERD is not set
-# CONFIG_MACH_HUSKY is not set
-CONFIG_MACH_AKITA=y
-CONFIG_MACH_SPITZ=y
-CONFIG_MACH_BORZOI=y
-# CONFIG_MACH_TOSA is not set
-# CONFIG_ARCH_PXA_ESERIES is not set
-CONFIG_PXA27x=y
-CONFIG_PXA_SHARP_Cxx00=y
-CONFIG_PXA_SSP=y
-CONFIG_PLAT_PXA=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_XSCALE=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5T=y
-CONFIG_CPU_PABRT_LEGACY=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-
-#
-# Processor Features
-#
-CONFIG_ARM_THUMB=y
-# CONFIG_CPU_DCACHE_DISABLE is not set
-CONFIG_ARM_L1_CACHE_SHIFT=5
-# CONFIG_IWMMXT is not set
-CONFIG_XSCALE_PMU=y
-CONFIG_SHARP_PARAM=y
-CONFIG_SHARP_SCOOP=y
-CONFIG_COMMON_CLKDEV=y
-
-#
-# Bus support
-#
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_PCCARD=y
-CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_IOCTL is not set
-
-#
-# PC-card bridges
-#
-CONFIG_PCMCIA_SOC_COMMON=y
-CONFIG_PCMCIA_PXA2XX=y
-# CONFIG_PCMCIA_DEBUG is not set
-
-#
-# Kernel Features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-# CONFIG_HIGH_RES_TIMERS is not set
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_HZ=100
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-
-#
-# Boot options
-#
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 loglevel=3 "
-# CONFIG_XIP_KERNEL is not set
-CONFIG_KEXEC=y
-CONFIG_ATAGS_PROC=y
-
-#
-# CPU Power Management
-#
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-
-#
-# Floating point emulation
-#
-
-#
-# At least one emulation must be selected
-#
-
-#
-# Userspace binary formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_HAVE_AOUT=y
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Power management options
-#
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_APM_EMULATION=y
-# CONFIG_PM_RUNTIME is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_NET is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_MTD_OOPS is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=y
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_H1900 is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-CONFIG_MTD_NAND_SHARPSL=y
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-
-#
-# UBI - Unsorted block images
-#
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
-
-#
-# UBI debugging options
-#
-# CONFIG_MTD_UBI_DEBUG is not set
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-
-#
-# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
-#
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_MG_DISK is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_DS1682 is not set
-# CONFIG_TI_DAC7512 is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_IWMC3200TOP is not set
-CONFIG_HAVE_IDE=y
-CONFIG_IDE=y
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-# CONFIG_IDE_GD_ATAPI is not set
-CONFIG_BLK_DEV_IDECS=y
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_ATA is not set
-# CONFIG_MD is not set
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
-# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-CONFIG_INPUT_APMPOWER=y
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_QT2160 is not set
-# CONFIG_KEYBOARD_CORGI is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_KEYBOARD_MATRIX=y
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_PXA27x is not set
-# CONFIG_KEYBOARD_SPITZ is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_CORGI is not set
-# CONFIG_TOUCHSCREEN_DYNAPRO is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_DEVKMEM is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MAX3100 is not set
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_R3964 is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-# CONFIG_I2C_CHARDEV is not set
-CONFIG_I2C_HELPER_AUTO=y
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_DESIGNWARE is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_PXA=y
-# CONFIG_I2C_PXA_SLAVE is not set
-# CONFIG_I2C_SIMTEC is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_TAOS_EVM is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_PCA_PLATFORM is not set
-
-#
-# Miscellaneous I2C Chip support
-#
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_GPIO is not set
-CONFIG_SPI_PXA2XX=y
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_TLE62X0 is not set
-
-#
-# PPS support
-#
-# CONFIG_PPS is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
-
-#
-# Memory mapped GPIO expanders:
-#
-
-#
-# I2C GPIO expanders:
-#
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_ADP5588 is not set
-
-#
-# PCI GPIO expanders:
-#
-
-#
-# SPI GPIO expanders:
-#
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_MC33880 is not set
-
-#
-# AC97 GPIO expanders:
-#
-# CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=y
-CONFIG_APM_POWER=y
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LM95241 is not set
-CONFIG_SENSORS_MAX1111=y
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-# CONFIG_SSB is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_MC13783 is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_88PM8607 is not set
-# CONFIG_AB4500_CORE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_PXA=y
-# CONFIG_FB_PXA_OVERLAY is not set
-# CONFIG_FB_PXA_SMARTPANEL is not set
-# CONFIG_FB_PXA_PARAMETERS is not set
-# CONFIG_FB_MBX is not set
-# CONFIG_FB_W100 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_CORGI=y
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=y
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_SOUND is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_SDIO_UART is not set
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_PXA=y
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_ATMELMCI is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MEMSTICK is not set
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_PCA9532 is not set
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_GPIO_PLATFORM=y
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_DAC124S085 is not set
-# CONFIG_LEDS_BD2802 is not set
-# CONFIG_LEDS_LT3593 is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-# CONFIG_ACCESSIBILITY is not set
-CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-
-#
-# TI VLYNQ
-#
-# CONFIG_STAGING is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_EXT4_FS_XATTR is not set
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=y
-CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_FILE_LOCKING is not set
-# CONFIG_FSNOTIFY is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_QUOTA is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_XATTR is not set
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_NLS is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_MEMORY_INIT is not set
-CONFIG_FRAME_POINTER=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_DEBUG_USER is not set
-# CONFIG_OC_ETM is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_SEQIV is not set
-
-#
-# Block modes
-#
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-
-#
-# Hash modes
-#
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-# CONFIG_CRYPTO_AES is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-# CONFIG_CRYPTO_ZLIB is not set
-CONFIG_CRYPTO_LZO=y
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_BINARY_PRINTF is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.34/ARM-Add-support-for-LZMA-compressed-kernel-images.patch b/recipes/kexecboot/linux-kexecboot-2.6.34/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
new file mode 100644
index 0000000000..2142cc8c07
--- /dev/null
+++ b/recipes/kexecboot/linux-kexecboot-2.6.34/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
@@ -0,0 +1,51 @@
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index 350921d..34163da 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -21,6 +21,7 @@
+	select HAVE_GENERIC_DMA_COHERENT
+	select HAVE_KERNEL_GZIP
+	select HAVE_KERNEL_LZO
++	select HAVE_KERNEL_LZMA
+	select HAVE_PERF_EVENTS
+	select PERF_USE_VMALLOC
+	help
+diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
+index 2d4d88b..3906432 100644
+--- a/arch/arm/boot/compressed/Makefile
++++ b/arch/arm/boot/compressed/Makefile
+@@ -65,6 +65,7 @@ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
+
+ suffix_$(CONFIG_KERNEL_GZIP) = gzip
+ suffix_$(CONFIG_KERNEL_LZO)  = lzo
++suffix_$(CONFIG_KERNEL_LZMA)  = lzma
+
+ targets       := vmlinux vmlinux.lds \
+		 piggy.$(suffix_y) piggy.$(suffix_y).o \
+diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
+index 7e0fe4d..4e35a10 100644
+--- a/arch/arm/boot/compressed/decompress.c
++++ b/arch/arm/boot/compressed/decompress.c
+@@ -40,6 +40,10 @@
+ #include "../../../../lib/decompress_unlzo.c"
+ #endif
+
++#ifdef CONFIG_KERNEL_LZMA
++#include "../../../../lib/decompress_unlzma.c"
++#endif
++
+ void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
+ {
+	decompress(input, len, NULL, NULL, output, NULL, error);
+diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
+new file mode 100644
+index 0000000..d7e69cf
+--- /dev/null
++++ b/arch/arm/boot/compressed/piggy.lzma.S
+@@ -0,0 +1,6 @@
++	.section .piggydata,#alloc
++	.globl	input_data
++input_data:
++	.incbin	"arch/arm/boot/compressed/piggy.lzma"
++	.globl	input_data_end
++input_data_end:
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/spitz/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.34/akita/defconfig
index a080a055eb..b4c40fb19d 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/spitz/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.34/akita/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc4
-# Sat Apr 17 02:23:04 2010
+# Linux kernel version: 2.6.34
+# Sat May 22 23:05:08 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -59,7 +59,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -426,8 +425,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -607,7 +604,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_QT2160 is not set
 # CONFIG_KEYBOARD_CORGI is not set
 # CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_MATRIX=y
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
@@ -750,7 +747,6 @@ CONFIG_SPI_PXA2XX=y
 # CONFIG_PPS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
 
 #
 # Memory mapped GPIO expanders:
@@ -1060,20 +1056,19 @@ CONFIG_JBD=y
 CONFIG_JBD2=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
+# CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_FILE_LOCKING is not set
-CONFIG_FSNOTIFY=y
+# CONFIG_FSNOTIFY is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY is not set
-CONFIG_INOTIFY_USER=y
+# CONFIG_INOTIFY_USER is not set
 # CONFIG_QUOTA is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
-CONFIG_GENERIC_ACL=y
 
 #
 # Caches
@@ -1089,8 +1084,11 @@ CONFIG_GENERIC_ACL=y
 #
 # DOS/FAT/NT Filesystems
 #
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_NTFS_FS is not set
 
 #
@@ -1099,11 +1097,9 @@ CONFIG_GENERIC_ACL=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_SYSFS is not set
+# CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
@@ -1166,7 +1162,46 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
-# CONFIG_NLS is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
 
 #
 # Kernel hacking
@@ -1178,7 +1213,6 @@ CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -1200,7 +1234,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 # Security options
 #
 # CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
 # CONFIG_DEFAULT_SECURITY_SELINUX is not set
 # CONFIG_DEFAULT_SECURITY_SMACK is not set
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/c7x0/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.34/c7x0/defconfig
index 0ea1211375..6a660103c7 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/c7x0/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.34/c7x0/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc4
-# Sat Apr 17 01:48:33 2010
+# Linux kernel version: 2.6.34
+# Sat May 22 23:09:31 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -59,7 +59,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -426,8 +425,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -607,7 +604,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_QT2160 is not set
 # CONFIG_KEYBOARD_CORGI is not set
 # CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_MATRIX=y
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
@@ -749,7 +746,6 @@ CONFIG_SPI_PXA2XX=y
 # CONFIG_PPS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
 
 #
 # Memory mapped GPIO expanders:
@@ -1056,20 +1052,19 @@ CONFIG_JBD=y
 CONFIG_JBD2=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
+# CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_FILE_LOCKING is not set
-CONFIG_FSNOTIFY=y
+# CONFIG_FSNOTIFY is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY is not set
-CONFIG_INOTIFY_USER=y
+# CONFIG_INOTIFY_USER is not set
 # CONFIG_QUOTA is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
-CONFIG_GENERIC_ACL=y
 
 #
 # Caches
@@ -1085,8 +1080,11 @@ CONFIG_GENERIC_ACL=y
 #
 # DOS/FAT/NT Filesystems
 #
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_NTFS_FS is not set
 
 #
@@ -1095,11 +1093,9 @@ CONFIG_GENERIC_ACL=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_SYSFS is not set
+# CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
@@ -1162,7 +1158,46 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
-# CONFIG_NLS is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
 
 #
 # Kernel hacking
@@ -1174,7 +1209,6 @@ CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -1196,7 +1230,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 # Security options
 #
 # CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
 # CONFIG_DEFAULT_SECURITY_SELINUX is not set
 # CONFIG_DEFAULT_SECURITY_SMACK is not set
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/collie/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.34/collie/defconfig
index 69455605d6..fdf8e3f6fc 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/collie/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.34/collie/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc4
-# Sat Apr 17 01:00:42 2010
+# Linux kernel version: 2.6.34
+# Sat May 22 23:47:14 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -59,7 +59,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -389,8 +388,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -483,6 +480,7 @@ CONFIG_MTD_NAND_IDS=y
 #
 # UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
@@ -491,7 +489,6 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
 #
 # UBI debugging options
 #
-# CONFIG_MTD_UBI_DEBUG is not set
 # CONFIG_PARPORT is not set
 # CONFIG_PNP is not set
 CONFIG_BLK_DEV=y
@@ -711,7 +708,6 @@ CONFIG_SPI_GPIO=y
 # CONFIG_PPS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
 
 #
 # Memory mapped GPIO expanders:
@@ -954,20 +950,19 @@ CONFIG_JBD=y
 CONFIG_JBD2=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
+# CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_FILE_LOCKING is not set
-CONFIG_FSNOTIFY=y
+# CONFIG_FSNOTIFY is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY is not set
-CONFIG_INOTIFY_USER=y
+# CONFIG_INOTIFY_USER is not set
 # CONFIG_QUOTA is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
-CONFIG_GENERIC_ACL=y
 
 #
 # Caches
@@ -983,8 +978,11 @@ CONFIG_GENERIC_ACL=y
 #
 # DOS/FAT/NT Filesystems
 #
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_NTFS_FS is not set
 
 #
@@ -993,11 +991,9 @@ CONFIG_GENERIC_ACL=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_SYSFS is not set
+# CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
@@ -1060,7 +1056,46 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
-# CONFIG_NLS is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
 
 #
 # Kernel hacking
@@ -1072,7 +1107,6 @@ CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -1094,7 +1128,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 # Security options
 #
 # CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
 # CONFIG_DEFAULT_SECURITY_SELINUX is not set
 # CONFIG_DEFAULT_SECURITY_SMACK is not set
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/poodle/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.34/poodle/defconfig
index 5c00d5ef55..85df179d5d 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/poodle/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.34/poodle/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc4
-# Sat Apr 17 01:58:03 2010
+# Linux kernel version: 2.6.34
+# Sat May 22 23:35:10 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -59,7 +59,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -425,8 +424,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -521,6 +518,7 @@ CONFIG_MTD_NAND_SHARPSL=y
 #
 # UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
@@ -529,7 +527,6 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
 #
 # UBI debugging options
 #
-# CONFIG_MTD_UBI_DEBUG is not set
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -590,8 +587,8 @@ CONFIG_INPUT=y
 #
 CONFIG_INPUT_MOUSEDEV=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
 # CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
@@ -749,7 +746,6 @@ CONFIG_SPI_PXA2XX=y
 # CONFIG_PPS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
 
 #
 # Memory mapped GPIO expanders:
@@ -988,20 +984,19 @@ CONFIG_JBD=y
 CONFIG_JBD2=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
+# CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_FILE_LOCKING is not set
-CONFIG_FSNOTIFY=y
+# CONFIG_FSNOTIFY is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY is not set
-CONFIG_INOTIFY_USER=y
+# CONFIG_INOTIFY_USER is not set
 # CONFIG_QUOTA is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
-CONFIG_GENERIC_ACL=y
 
 #
 # Caches
@@ -1017,8 +1012,11 @@ CONFIG_GENERIC_ACL=y
 #
 # DOS/FAT/NT Filesystems
 #
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_NTFS_FS is not set
 
 #
@@ -1027,11 +1025,9 @@ CONFIG_GENERIC_ACL=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_SYSFS is not set
+# CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
@@ -1094,7 +1090,46 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
-# CONFIG_NLS is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
 
 #
 # Kernel hacking
@@ -1106,7 +1141,6 @@ CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -1128,7 +1162,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 # Security options
 #
 # CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
 # CONFIG_DEFAULT_SECURITY_SELINUX is not set
 # CONFIG_DEFAULT_SECURITY_SMACK is not set
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33/akita/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.34/spitz/defconfig
index a9bcc7bd94..b4c40fb19d 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33/akita/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.34/spitz/defconfig
@@ -1,13 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.33-rc6
-# Tue Feb  9 22:56:42 2010
+# Linux kernel version: 2.6.34
+# Sat May 22 23:05:08 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_HAVE_PROC_CPU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -19,6 +20,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_VECTORS_BASE=0xffff0000
@@ -40,11 +42,9 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_SWAP is not set
+# CONFIG_SYSVIPC is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
 
 #
 # RCU Subsystem
@@ -58,9 +58,7 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_GROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -95,16 +93,19 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
 
 #
 # Kernel Performance Events And Counters
 #
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
+# CONFIG_SLUB is not set
+CONFIG_SLOB=y
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_KPROBES=y
@@ -174,6 +175,7 @@ CONFIG_MMU=y
 # CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCMRING is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_EBSA110 is not set
@@ -183,7 +185,6 @@ CONFIG_MMU=y
 # CONFIG_ARCH_STMP3XXX is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
@@ -200,21 +201,26 @@ CONFIG_MMU=y
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_NUC93X is not set
 # CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_SHMOBILE is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P6440 is not set
+# CONFIG_ARCH_S5P6442 is not set
 # CONFIG_ARCH_S5PC1XX is not set
+# CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_U8500 is not set
 
 #
 # Intel PXA2xx/PXA3xx Implementations
@@ -243,6 +249,7 @@ CONFIG_ARCH_PXA=y
 # CONFIG_MACH_EM_X270 is not set
 # CONFIG_MACH_EXEDA is not set
 # CONFIG_MACH_CM_X300 is not set
+# CONFIG_MACH_CAPC7117 is not set
 # CONFIG_ARCH_GUMSTIX is not set
 # CONFIG_MACH_INTELMOTE2 is not set
 # CONFIG_MACH_STARGATE2 is not set
@@ -265,8 +272,12 @@ CONFIG_ARCH_PXA=y
 # CONFIG_PXA_EZX is not set
 # CONFIG_MACH_MP900C is not set
 # CONFIG_ARCH_PXA_PALM is not set
+# CONFIG_MACH_RAUMFELD_RC is not set
+# CONFIG_MACH_RAUMFELD_CONNECTOR is not set
+# CONFIG_MACH_RAUMFELD_SPEAKER is not set
 CONFIG_PXA_SHARPSL=y
 CONFIG_SHARPSL_PM=y
+CONFIG_SHARPSL_PM_MAX1111=y
 # CONFIG_MACH_POODLE is not set
 # CONFIG_MACH_CORGI is not set
 # CONFIG_MACH_SHEPHERD is not set
@@ -275,6 +286,7 @@ CONFIG_MACH_AKITA=y
 CONFIG_MACH_SPITZ=y
 CONFIG_MACH_BORZOI=y
 # CONFIG_MACH_TOSA is not set
+# CONFIG_MACH_ICONTROL is not set
 # CONFIG_ARCH_PXA_ESERIES is not set
 CONFIG_PXA27x=y
 CONFIG_PXA_SHARP_Cxx00=y
@@ -301,6 +313,7 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_L1_CACHE_SHIFT=5
 # CONFIG_IWMMXT is not set
 CONFIG_XSCALE_PMU=y
+CONFIG_CPU_HAS_PMU=y
 CONFIG_SHARP_PARAM=y
 CONFIG_SHARP_SCOOP=y
 CONFIG_COMMON_CLKDEV=y
@@ -363,7 +376,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 loglevel=3 "
+CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 loglevel=3"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
@@ -400,6 +413,7 @@ CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_APM_EMULATION=y
 # CONFIG_PM_RUNTIME is not set
+CONFIG_PM_OPS=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_NET is not set
 
@@ -410,9 +424,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 #
 # Generic Driver Options
 #
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -528,24 +540,7 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_MG_DISK is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_DS1682 is not set
-# CONFIG_TI_DAC7512 is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_IWMC3200TOP is not set
+# CONFIG_MISC_DEVICES is not set
 CONFIG_HAVE_IDE=y
 CONFIG_IDE=y
 
@@ -560,7 +555,7 @@ CONFIG_BLK_DEV_IDECS=y
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
+# CONFIG_IDE_PROC_FS is not set
 
 #
 # IDE chipset support/bugfixes
@@ -571,6 +566,7 @@ CONFIG_IDE_PROC_FS=y
 #
 # SCSI device support
 #
+CONFIG_SCSI_MOD=y
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_DMA is not set
@@ -608,7 +604,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_QT2160 is not set
 # CONFIG_KEYBOARD_CORGI is not set
 # CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_MATRIX=y
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
@@ -645,9 +641,7 @@ CONFIG_TOUCHSCREEN_ADS7846=y
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_MISC is not set
 
 #
 # Hardware I/O ports
@@ -679,6 +673,7 @@ CONFIG_SERIAL_PXA=y
 CONFIG_SERIAL_PXA_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_TIMBERDALE is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
@@ -696,7 +691,7 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_TCG_TPM is not set
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
+# CONFIG_I2C_COMPAT is not set
 # CONFIG_I2C_CHARDEV is not set
 CONFIG_I2C_HELPER_AUTO=y
 
@@ -713,6 +708,7 @@ CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_PXA=y
 # CONFIG_I2C_PXA_SLAVE is not set
 # CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_XILINX is not set
 
 #
 # External I2C/SMBus adapter drivers
@@ -724,15 +720,9 @@ CONFIG_I2C_PXA=y
 # Other I2C/SMBus bus drivers
 #
 # CONFIG_I2C_PCA_PLATFORM is not set
-
-#
-# Miscellaneous I2C Chip support
-#
-# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
 
@@ -757,15 +747,16 @@ CONFIG_SPI_PXA2XX=y
 # CONFIG_PPS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
 
 #
 # Memory mapped GPIO expanders:
 #
+# CONFIG_GPIO_IT8761E is not set
 
 #
 # I2C GPIO expanders:
 #
+# CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
@@ -810,10 +801,11 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_ADM1029 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7411 is not set
 # CONFIG_SENSORS_ADT7462 is not set
 # CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
 # CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_ASC7621 is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
@@ -879,10 +871,12 @@ CONFIG_SSB_POSSIBLE=y
 # Multifunction device drivers
 #
 # CONFIG_MFD_CORE is not set
+# CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
 # CONFIG_TPS65010 is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_MFD_TMIO is not set
@@ -891,14 +885,15 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X is not set
 # CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_MC13783 is not set
 # CONFIG_AB3100_CORE is not set
 # CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_88PM8607 is not set
 # CONFIG_AB4500_CORE is not set
 # CONFIG_REGULATOR is not set
 # CONFIG_MEDIA_SUPPORT is not set
@@ -944,6 +939,7 @@ CONFIG_FB_PXA=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_CORGI=y
+# CONFIG_LCD_L4F00242T03 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_ILI9320 is not set
@@ -1001,8 +997,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 #
 CONFIG_MMC_PXA=y
 # CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_ATMELMCI is not set
 # CONFIG_MMC_SPI is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
@@ -1019,11 +1013,11 @@ CONFIG_LEDS_GPIO_PLATFORM=y
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
+CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
-CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -1090,8 +1084,11 @@ CONFIG_JBD2=y
 #
 # DOS/FAT/NT Filesystems
 #
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_NTFS_FS is not set
 
 #
@@ -1100,11 +1097,9 @@ CONFIG_JBD2=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_SYSFS is not set
+# CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
@@ -1134,6 +1129,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_FS_DEBUG is not set
+# CONFIG_LOGFS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_SQUASHFS is not set
 # CONFIG_VXFS_FS is not set
@@ -1166,7 +1162,46 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
-# CONFIG_NLS is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
 
 #
 # Kernel hacking
@@ -1178,7 +1213,6 @@ CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -1200,7 +1234,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 # Security options
 #
 # CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
 # CONFIG_DEFAULT_SECURITY_SELINUX is not set
 # CONFIG_DEFAULT_SECURITY_SMACK is not set
@@ -1318,3 +1351,4 @@ CONFIG_DECOMPRESS_LZMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_GENERIC_ATOMIC64=y
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/tosa/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.34/tosa/defconfig
index 9881af8bcd..94e59c1e7c 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/tosa/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.34/tosa/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc4
-# Sat Apr 17 02:36:51 2010
+# Linux kernel version: 2.6.34
+# Sat May 22 23:20:02 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -59,7 +59,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -425,8 +424,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -522,6 +519,7 @@ CONFIG_MTD_NAND_SHARPSL=y
 #
 # UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
@@ -530,7 +528,6 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
 #
 # UBI debugging options
 #
-# CONFIG_MTD_UBI_DEBUG is not set
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -755,7 +752,6 @@ CONFIG_SPI_PXA2XX=y
 # CONFIG_PPS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
 
 #
 # Memory mapped GPIO expanders:
@@ -1040,20 +1036,19 @@ CONFIG_JBD=y
 CONFIG_JBD2=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
+# CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_FILE_LOCKING is not set
-CONFIG_FSNOTIFY=y
+# CONFIG_FSNOTIFY is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY is not set
-CONFIG_INOTIFY_USER=y
+# CONFIG_INOTIFY_USER is not set
 # CONFIG_QUOTA is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
-CONFIG_GENERIC_ACL=y
 
 #
 # Caches
@@ -1069,8 +1064,11 @@ CONFIG_GENERIC_ACL=y
 #
 # DOS/FAT/NT Filesystems
 #
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_NTFS_FS is not set
 
 #
@@ -1079,11 +1077,9 @@ CONFIG_GENERIC_ACL=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_SYSFS is not set
+# CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
@@ -1146,7 +1142,46 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
-# CONFIG_NLS is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
 
 #
 # Kernel hacking
@@ -1158,7 +1193,6 @@ CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -1180,7 +1214,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 # Security options
 #
 # CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
 # CONFIG_DEFAULT_SECURITY_SELINUX is not set
 # CONFIG_DEFAULT_SECURITY_SMACK is not set
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/ARM-Add-support-for-LZMA-compressed-kernel-images.patch b/recipes/kexecboot/linux-kexecboot/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
index 6f5e00aa8e..6f5e00aa8e 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
+++ b/recipes/kexecboot/linux-kexecboot/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/akita/defconfig b/recipes/kexecboot/linux-kexecboot/spitz/defconfig
index b8a00112fd..b38a65976b 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/akita/defconfig
+++ b/recipes/kexecboot/linux-kexecboot/spitz/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc4
-# Sat Apr 17 02:11:48 2010
+# Linux kernel version: 2.6.34
+# Mon May 17 09:50:34 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -123,7 +123,7 @@ CONFIG_BASE_SMALL=1
 # CONFIG_MODULES is not set
 CONFIG_BLOCK=y
 # CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
+CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
 #
@@ -377,7 +377,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 loglevel=3"
+CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
@@ -977,10 +977,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 # CONFIG_SOUND is not set
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
diff --git a/recipes/kexecboot/linux-kexecboot_2.6.21-hh20.bb b/recipes/kexecboot/linux-kexecboot_2.6.21-hh20.bb
index a81865fe20..619f771780 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.21-hh20.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.21-hh20.bb
@@ -7,9 +7,9 @@ DEFAULT_PREFERENCE_hx4700 = "1"
 DEFAULT_PREFERENCE_h2200 = "1"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch;patch=1 \
-           http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;patch=1;name=rppatch35 \
-           file://gcc4x-limits.patch;patch=1 \
+           file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch \
+           http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;name=rppatch35 \
+           file://gcc4x-limits.patch \
 	   file://defconfig"
 
 SRC_URI += "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2"
@@ -24,6 +24,6 @@ do_configure_append() {
 
 
 
-#           ${RPSRC}/export_atags-r0a.patch;patch=1;status=pending;name=rppatch35 \
+#           ${RPSRC}/export_atags-r0a.patch;status=pending;name=rppatch35 \
 SRC_URI[rppatch35.md5sum] = "8ab51e8ff728f4155db64b9bb6ea6d71"
 SRC_URI[rppatch35.sha256sum] = "75d4c6ddbfc5e4fff7690a3308e2574f89a0e2709fb91caccb29067a9dad251a"
diff --git a/recipes/kexecboot/linux-kexecboot_2.6.24.bb b/recipes/kexecboot/linux-kexecboot_2.6.24.bb
index 6612286605..55f0b7d397 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.24.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.24.bb
@@ -16,180 +16,180 @@ DEFAULT_PREFERENCE_spitz = "1"
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;apply=yes
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
-	   file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \
-           ${RPSRC}/export_atags-r2.patch;patch=1;status=pending;name=rppatch54 \
-           ${RPSRC}/lzo_crypto-r2.patch;patch=1;status=pending;name=rppatch36 \
-           ${RPSRC}/corgi_rearrange_lcd-r0.patch;patch=1;status=pending;name=rppatch55 \
-	   file://hrw-hostapcard.patch;patch=1;status=pending \
-           ${RPSRC}/allow_disable_deferrred-r0.patch;patch=1;name=rppatch56 \
-           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;patch=1;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r33.patch;patch=1;name=rppatch57 \
-           ${RPSRC}/hx2750_bl-r9.patch;patch=1;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r3.patch;patch=1;name=rppatch4 \
-           ${RPSRC}/pxa_keys-r8.patch;patch=1;name=rppatch58 \
-           ${RPSRC}/tsc2101-r18.patch;patch=1;name=rppatch59 \
-           ${RPSRC}/hx2750_test1-r8.patch;patch=1;name=rppatch7 \
-           ${RPSRC}/input_power-r10.patch;patch=1;name=rppatch60 \
-           ${RPSRC}/pxa25x_cpufreq-r2.patch;patch=1;name=rppatch44 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;patch=1;name=rppatch9 \
-           ${RPSRC}/usb_add_epalloc-r4.patch;patch=1;name=rppatch61 \
-           ${RPSRC}/usb_pxa27x_udc-r8.patch;patch=1;name=rppatch62 \
-           ${RPSRC}/locomo_kbd_tweak-r1a.patch;patch=1;name=rppatch63 \
-           ${RPSRC}/pxa27x_overlay-r8.patch;patch=1;name=rppatch11 \
-           ${RPSRC}/w100_extaccel-r2.patch;patch=1;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;patch=1;name=rppatch13 \
-           ${RPSRC}/poodle_pm-r5.patch;patch=1;name=rppatch64 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1;name=rppatch16 \
-           file://pxa27x-resume.patch;patch=1;status=external \
-           file://mtd-module.patch;patch=1;status=external \
-           file://wm8750-treble.patch;patch=1;status=external \
-           file://spitz_h_rewrite.patch;patch=1;status=external \
-           file://pxa2xx_udc-clock.patch;patch=1 \
-           file://sharpsl-rc-r1.patch;patch=1 \
-           file://sharpsl-rc-r2.patch;patch=1 \
-           file://squashfs3.3.patch;patch=1;status=external \
-#           ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;patch=1;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;patch=1;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack;name=rppatch22 \
-           file://pxa-serial-hack.patch;patch=1;status=hack \
-           file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
-           file://binutils-buildid-arm.patch;patch=1 \
-           file://versatile-armv6.patch;patch=1 \
-           file://htcuni.patch;patch=1 \
+	   file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch \
+           ${RPSRC}/export_atags-r2.patch;status=pending;name=rppatch54 \
+           ${RPSRC}/lzo_crypto-r2.patch;status=pending;name=rppatch36 \
+           ${RPSRC}/corgi_rearrange_lcd-r0.patch;status=pending;name=rppatch55 \
+	   file://hrw-hostapcard.patch;status=pending \
+           ${RPSRC}/allow_disable_deferrred-r0.patch;name=rppatch56 \
+           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;name=rppatch1 \
+           ${RPSRC}/hx2750_base-r33.patch;name=rppatch57 \
+           ${RPSRC}/hx2750_bl-r9.patch;name=rppatch3 \
+           ${RPSRC}/hx2750_pcmcia-r3.patch;name=rppatch4 \
+           ${RPSRC}/pxa_keys-r8.patch;name=rppatch58 \
+           ${RPSRC}/tsc2101-r18.patch;name=rppatch59 \
+           ${RPSRC}/hx2750_test1-r8.patch;name=rppatch7 \
+           ${RPSRC}/input_power-r10.patch;name=rppatch60 \
+           ${RPSRC}/pxa25x_cpufreq-r2.patch;name=rppatch44 \
+           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;name=rppatch8 \
+           ${RPSRC}/pm_changes-r1.patch;name=rppatch9 \
+           ${RPSRC}/usb_add_epalloc-r4.patch;name=rppatch61 \
+           ${RPSRC}/usb_pxa27x_udc-r8.patch;name=rppatch62 \
+           ${RPSRC}/locomo_kbd_tweak-r1a.patch;name=rppatch63 \
+           ${RPSRC}/pxa27x_overlay-r8.patch;name=rppatch11 \
+           ${RPSRC}/w100_extaccel-r2.patch;name=rppatch12 \
+           ${RPSRC}/w100_extmem-r1.patch;name=rppatch13 \
+           ${RPSRC}/poodle_pm-r5.patch;name=rppatch64 \
+           ${RPSRC}/poodle_lcd_hack-r0.patch;name=rppatch15 \
+           ${RPSRC}/poodle_asoc_fix-r1.patch;name=rppatch16 \
+           file://pxa27x-resume.patch;status=external \
+           file://mtd-module.patch;status=external \
+           file://wm8750-treble.patch;status=external \
+           file://spitz_h_rewrite.patch;status=external \
+           file://pxa2xx_udc-clock.patch \
+           file://sharpsl-rc-r1.patch \
+           file://sharpsl-rc-r2.patch \
+           file://squashfs3.3.patch;status=external \
+#           ${RPSRC}/logo_oh-r1.patch.bz2;status=unmergable;name=rppatch17 \
+           ${RPSRC}/pxa-linking-bug.patch;status=unmergable;name=rppatch18 \
+           file://hostap-monitor-mode.patch;status=unmergable \
+           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;status=unmergable \
+           ${RPSRC}/mmcsd_large_cards-r1.patch;status=hack;name=rppatch19 \
+           ${RPSRC}/mmcsd_no_scr_check-r2.patch;status=hack;name=rppatch20 \
+           ${RPSRC}/integrator_rgb-r1.patch;status=hack;name=rppatch21 \
+           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;status=hack;name=rppatch22 \
+           file://pxa-serial-hack.patch;status=hack \
+           file://connectplus-remove-ide-HACK.patch;status=hack \
+           file://connectplus-prevent-oops-HACK.patch;status=hack \
+           file://binutils-buildid-arm.patch \
+           file://versatile-armv6.patch \
+           file://htcuni.patch \
            file://defconfig"
 
 # FIXMEs before made default	   
-# ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack;name=rppatch50
+# ${RPSRC}/mmcsd_no_scr_check-r1.patch;status=hack;name=rppatch50
 
 
 # Add this to enable pm debug code (useful with a serial lead)
-#  ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1;name=rppatch51
+#  ${RPSRC}/sharpsl_pm_debug-r0.patch;name=rppatch51
 
 # Disabled until I find the reason this gives issues with cdc_subset
-#            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1;name=rppatch52 \
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 
 
 SRC_URI_append_collie = "\
-	${TKSRC}/mtd-sharp-flash-hack-r4.patch;patch=1;name=tkpatch1 \
-	${TKSRC}/mcp-sa11x0-r0.patch;patch=1;name=tkpatch2 \
-	${TKSRC}/locomo-r1.patch;patch=1;name=tkpatch3 \
-	${TKSRC}/collie-kexec-r1.patch;patch=1;name=tkpatch4 \
-	${TKSRC}/sharpsl_pm-4.patch;patch=1;name=tkpatch5 \
-	${TKSRC}/collie_pm-3.patch;patch=1;name=tkpatch6 \
-	${TKSRC}/ucb1x00_suspend.patch;patch=1;name=tkpatch7 \
-	${TKSRC}/collie-ts.patch;patch=1;name=tkpatch8 \
-	${TKSRC}/pcmcia_suspend.patch;patch=1;name=tkpatch9 \
-	${TKSRC}/locomo_spi-6.patch;patch=1;name=tkpatch10 \
-	${TKSRC}/config.patch;patch=1;name=tkpatch11 \
-	${TKSRC}/mmc-spi.patch;patch=1;name=tkpatch12 \
-	${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1;name=tkpatch13 \
-	${TKSRC}/sa1100_spinlock.patch;patch=1;name=tkpatch14 \
-	${TKSRC}/sa1100-dma.patch;patch=1;name=tkpatch15 \
+	${TKSRC}/mtd-sharp-flash-hack-r4.patch;name=tkpatch1 \
+	${TKSRC}/mcp-sa11x0-r0.patch;name=tkpatch2 \
+	${TKSRC}/locomo-r1.patch;name=tkpatch3 \
+	${TKSRC}/collie-kexec-r1.patch;name=tkpatch4 \
+	${TKSRC}/sharpsl_pm-4.patch;name=tkpatch5 \
+	${TKSRC}/collie_pm-3.patch;name=tkpatch6 \
+	${TKSRC}/ucb1x00_suspend.patch;name=tkpatch7 \
+	${TKSRC}/collie-ts.patch;name=tkpatch8 \
+	${TKSRC}/pcmcia_suspend.patch;name=tkpatch9 \
+	${TKSRC}/locomo_spi-6.patch;name=tkpatch10 \
+	${TKSRC}/config.patch;name=tkpatch11 \
+	${TKSRC}/mmc-spi.patch;name=tkpatch12 \
+	${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;name=tkpatch13 \
+	${TKSRC}/sa1100_spinlock.patch;name=tkpatch14 \
+	${TKSRC}/sa1100-dma.patch;name=tkpatch15 \
 "
 
 SRC_URI_append_poodle = "\
-           ${RPSRC}/poodle_serial_vcc-r0.patch;patch=1;name=rppatch53 \
-           file://poodle_ts.patch;patch=1 \
-           file://pxafb.patch;patch=1 \
+           ${RPSRC}/poodle_serial_vcc-r0.patch;name=rppatch53 \
+           file://poodle_ts.patch \
+           file://pxafb.patch \
 "
 
 SRC_URI_append_tosa = "\
-           file://tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch;patch=1 \
-           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch;patch=1 \
-           file://tosa/0003-Core-MFD-support.patch;patch=1 \
-           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch;patch=1 \
-           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch;patch=1 \
-           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch;patch=1 \
-           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch;patch=1 \
-           file://tosa/0008-Nand-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0009-FB-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0011-MMC-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0012-Tosa-keyboard-support.patch;patch=1 \
-           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch;patch=1 \
-           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch;patch=1 \
-           file://tosa/0015-sharpsl-export-params.patch;patch=1 \
-           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch;patch=1 \
-           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch;patch=1 \
-           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch;patch=1 \
-           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch;patch=1 \
-           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch;patch=1 \
-           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch;patch=1 \
-           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch;patch=1 \
-           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch;patch=1 \
-           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch;patch=1 \
-           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch;patch=1 \
-           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch;patch=1 \
-           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch;patch=1 \
-           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
-           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
-           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch;patch=1 \
-           file://tosa/0045-Update-tmio_ohci.patch;patch=1 \
-           file://tosa/0046-patch-tc6393xb-cleanup.patch;patch=1 \
-           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch;patch=1 \
-           file://tosa/0048-tc6393xb-GPIO-support.patch;patch=1 \
-           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch;patch=1 \
-           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch;patch=1 \
-           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch;patch=1 \
-           file://tosa/0052-tosa-platform-backlight-support.patch;patch=1 \
-           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch;patch=1 \
-           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch;patch=1 \
-           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch;patch=1 \
-           file://tosa/0058-Fix-tosakbd-suspend.patch;patch=1 \
-           file://tosa/0059-patch-tosa-wakeup-test.patch;patch=1 \
-           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch;patch=1 \
-           file://tosa/0061-tosa-bat-unify.patch;patch=1 \
-           file://tosa/0062-tosa-bat-fix-charging.patch;patch=1 \
-           file://tosa/0063-patch-tosa-bat-jacket-detect.patch;patch=1 \
-           file://tosa/0064-Export-modes-via-sysfs.patch;patch=1 \
-           file://tosa/0065-wm97xx-core-fixes.patch;patch=1 \
-           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch;patch=1 \
-           file://tosa/0067-modeswitching.patch;patch=1 \
-           file://tosa/0068-Preliminary-tosa-denoiser.patch;patch=1 \
-           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch;patch=1 \
-           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch;patch=1 \
-           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch;patch=1 \
-           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch;patch=1 \
-           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch;patch=1 \
-           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch;patch=1 \
-           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch;patch=1 \
-           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch;patch=1 \
-           file://tosa/0040-Clocklib-debugfs-support.patch;patch=1 \
-           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch;patch=1 \
-           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch;patch=1 \
-           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch;patch=1 \
-           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch;patch=1 \
-           file://tosa/0057-Clean-up-tosa-resetting.patch;patch=1 \
-           file://tosa/0001-pxa2xx-ac97-switch-AC-unit-to-correct-state-before.patch;patch=1 \
-	   file://tosa/tosa-bl-fixup.diff;patch=1 \
-           file://tosa/tmiofb-fix-unaccel.patch;patch=1 \
+           file://tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch \
+           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch \
+           file://tosa/0003-Core-MFD-support.patch \
+           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch \
+           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch \
+           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch \
+           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch \
+           file://tosa/0008-Nand-driver-for-TMIO-devices.patch \
+           file://tosa/0009-FB-driver-for-TMIO-devices.patch \
+           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch \
+           file://tosa/0011-MMC-driver-for-TMIO-devices.patch \
+           file://tosa/0012-Tosa-keyboard-support.patch \
+           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch \
+           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch \
+           file://tosa/0015-sharpsl-export-params.patch \
+           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch \
+           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch \
+           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch \
+           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch \
+           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch \
+           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch \
+           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch \
+           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch \
+           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch \
+           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch \
+           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch \
+           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch \
+           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch \
+           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch \
+           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch \
+           file://tosa/0045-Update-tmio_ohci.patch \
+           file://tosa/0046-patch-tc6393xb-cleanup.patch \
+           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch \
+           file://tosa/0048-tc6393xb-GPIO-support.patch \
+           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch \
+           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch \
+           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch \
+           file://tosa/0052-tosa-platform-backlight-support.patch \
+           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch \
+           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch \
+           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch \
+           file://tosa/0058-Fix-tosakbd-suspend.patch \
+           file://tosa/0059-patch-tosa-wakeup-test.patch \
+           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch \
+           file://tosa/0061-tosa-bat-unify.patch \
+           file://tosa/0062-tosa-bat-fix-charging.patch \
+           file://tosa/0063-patch-tosa-bat-jacket-detect.patch \
+           file://tosa/0064-Export-modes-via-sysfs.patch \
+           file://tosa/0065-wm97xx-core-fixes.patch \
+           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch \
+           file://tosa/0067-modeswitching.patch \
+           file://tosa/0068-Preliminary-tosa-denoiser.patch \
+           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch \
+           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch \
+           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch \
+           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch \
+           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch \
+           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch \
+           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch \
+           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch \
+           file://tosa/0040-Clocklib-debugfs-support.patch \
+           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch \
+           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch \
+           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch \
+           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch \
+           file://tosa/0057-Clean-up-tosa-resetting.patch \
+           file://tosa/0001-pxa2xx-ac97-switch-AC-unit-to-correct-state-before.patch \
+	   file://tosa/tosa-bl-fixup.diff \
+           file://tosa/tmiofb-fix-unaccel.patch \
            "
-#           file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch;patch=1 \
-#           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch;patch=1 \
+#           file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch \
+#           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch \
 
 SRC_URI_append_htcuniversal ="\
-	file://htcuni-acx.patch;patch=1;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://pxa_fb_overlay.patch;patch=1 \
-	file://zylonite-boot.patch;patch=1 \
+	file://pxa_fb_overlay.patch \
+	file://zylonite-boot.patch \
 	"
 
 S = "${WORKDIR}/linux-2.6.24"
diff --git a/recipes/kexecboot/linux-kexecboot_2.6.26.bb b/recipes/kexecboot/linux-kexecboot_2.6.26.bb
index ff0ef14190..cdc3f56368 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.26.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.26.bb
@@ -15,74 +15,74 @@ DEFAULT_PREFERENCE_akita = "1"
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;apply=yes
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2;name=kernel \
-           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;patch=1;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r34.patch;patch=1;name=rppatch2 \
-           ${RPSRC}/hx2750_bl-r9.patch;patch=1;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r3.patch;patch=1;name=rppatch4 \
-           ${RPSRC}/pxa_keys-r9.patch;patch=1;name=rppatch5 \
-           ${RPSRC}/tsc2101-r19.patch;patch=1;name=rppatch6 \
-           ${RPSRC}/hx2750_test1-r8.patch;patch=1;name=rppatch7 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;patch=1;name=rppatch9 \
-           ${RPSRC}/locomo_kbd_tweak-r2.patch;patch=1;name=rppatch10 \
-#           ${RPSRC}/pxa27x_overlay-r8.patch;patch=1;name=rppatch11 \
-           ${RPSRC}/w100_extaccel-r2.patch;patch=1;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;patch=1;name=rppatch13 \
-           ${RPSRC}/poodle_pm-r6.patch;patch=1;name=rppatch14 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1;name=rppatch16 \
-           file://zaurus-i2c-init.patch;patch=1;status=upstream \
-#           ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;patch=1;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;patch=1;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack;name=rppatch22 \
-           file://sharpsl-rc-r1.patch;patch=1 \
-           file://spitz_h_rewrite.patch;patch=1 \
-           file://pxa-serial-hack.patch;patch=1;status=hack \
-           file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
-           file://htcuni.patch;patch=1 \
-           file://versatile-armv6.patch;patch=1 \
+           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;name=rppatch1 \
+           ${RPSRC}/hx2750_base-r34.patch;name=rppatch2 \
+           ${RPSRC}/hx2750_bl-r9.patch;name=rppatch3 \
+           ${RPSRC}/hx2750_pcmcia-r3.patch;name=rppatch4 \
+           ${RPSRC}/pxa_keys-r9.patch;name=rppatch5 \
+           ${RPSRC}/tsc2101-r19.patch;name=rppatch6 \
+           ${RPSRC}/hx2750_test1-r8.patch;name=rppatch7 \
+           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;name=rppatch8 \
+           ${RPSRC}/pm_changes-r1.patch;name=rppatch9 \
+           ${RPSRC}/locomo_kbd_tweak-r2.patch;name=rppatch10 \
+#           ${RPSRC}/pxa27x_overlay-r8.patch;name=rppatch11 \
+           ${RPSRC}/w100_extaccel-r2.patch;name=rppatch12 \
+           ${RPSRC}/w100_extmem-r1.patch;name=rppatch13 \
+           ${RPSRC}/poodle_pm-r6.patch;name=rppatch14 \
+           ${RPSRC}/poodle_lcd_hack-r0.patch;name=rppatch15 \
+           ${RPSRC}/poodle_asoc_fix-r1.patch;name=rppatch16 \
+           file://zaurus-i2c-init.patch;status=upstream \
+#           ${RPSRC}/logo_oh-r1.patch.bz2;status=unmergable;name=rppatch17 \
+           ${RPSRC}/pxa-linking-bug.patch;status=unmergable;name=rppatch18 \
+           file://hostap-monitor-mode.patch;status=unmergable \
+           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;status=unmergable \
+           ${RPSRC}/mmcsd_large_cards-r1.patch;status=hack;name=rppatch19 \
+           ${RPSRC}/mmcsd_no_scr_check-r2.patch;status=hack;name=rppatch20 \
+           ${RPSRC}/integrator_rgb-r1.patch;status=hack;name=rppatch21 \
+           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;status=hack;name=rppatch22 \
+           file://sharpsl-rc-r1.patch \
+           file://spitz_h_rewrite.patch \
+           file://pxa-serial-hack.patch;status=hack \
+           file://connectplus-remove-ide-HACK.patch;status=hack \
+           file://connectplus-prevent-oops-HACK.patch;status=hack \
+           file://htcuni.patch \
+           file://versatile-armv6.patch \
            file://defconfig"
 
 # FIXMEs before made default	   
-# ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack;name=rppatch50
+# ${RPSRC}/mmcsd_no_scr_check-r1.patch;status=hack;name=rppatch50
 
 
 # Add this to enable pm debug code (useful with a serial lead)
-#  ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1;name=rppatch51
+#  ${RPSRC}/sharpsl_pm_debug-r0.patch;name=rppatch51
 
 # Disabled until I find the reason this gives issues with cdc_subset
-#            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1;name=rppatch52 \
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 
 
 SRC_URI_append_collie = "\
-	file://collie.patch;patch=1 \
-	file://collie_keymap.patch;patch=1 \
+	file://collie.patch \
+	file://collie_keymap.patch \
 "
 
 SRC_URI_append_htcuniversal ="\
-	file://htcuni-acx.patch;patch=1;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://pxa_fb_overlay.patch;patch=1 \
-	file://zylonite-boot.patch;patch=1 \
-	file://zylonite_mtd-r0.patch;patch=1 \
-	file://zylonite_touch-r0.patch;patch=1 \
-	file://zylonite_keypad-r0.patch;patch=1 \
+	file://pxa_fb_overlay.patch \
+	file://zylonite-boot.patch \
+	file://zylonite_mtd-r0.patch \
+	file://zylonite_touch-r0.patch \
+	file://zylonite_keypad-r0.patch \
 	"
 
 S = "${WORKDIR}/linux-2.6.26"
diff --git a/recipes/kexecboot/linux-kexecboot_2.6.29.bb b/recipes/kexecboot/linux-kexecboot_2.6.29.bb
index b840f17eb7..6624317ddb 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.29.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.29.bb
@@ -13,159 +13,159 @@ SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.
 	   file://defconfig"
 
 SRC_URI_append = " \
-           file://no-empty-flash-warnings.patch;patch=1 \
-           file://no-cortex-deadlock.patch;patch=1 \
-           file://read_die_ids.patch;patch=1 \
-           file://fix-install.patch;patch=1 \
-           file://dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch;patch=1 \
-           file://dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch;patch=1 \
-           file://dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch;patch=1 \
-           file://dss2/0004-DSS2-OMAP-framebuffer-driver.patch;patch=1 \
-           file://dss2/0005-DSS2-Add-panel-drivers.patch;patch=1 \
-           file://dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch;patch=1 \
-           file://dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch;patch=1 \
-           file://dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch;patch=1 \
-           file://dss2/0009-DSS2-Add-acx565akm-panel.patch;patch=1 \
-           file://dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch;patch=1 \
-           file://dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch;patch=1 \
-           file://dss2/0012-DSS2-Fix-DMA-rotation.patch;patch=1 \
-           file://dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch;patch=1 \
-           file://dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch;patch=1 \
-           file://dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch;patch=1 \
-           file://dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch;patch=1 \
-           file://dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch;patch=1 \
-           file://dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch;patch=1 \
-           file://dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch;patch=1 \
-           file://dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch;patch=1 \
-           file://dss2/0021-DSS2-Add-venc-register-dump.patch;patch=1 \
-           file://dss2/0022-DSS2-FB-remove-unused-var-warning.patch;patch=1 \
-           file://dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch;patch=1 \
-           file://dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch;patch=1 \
-           file://dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch;patch=1 \
-           file://dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch;patch=1 \
-           file://dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch;patch=1 \
-           file://dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch;patch=1 \
-           file://dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch;patch=1 \
-           file://dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch;patch=1 \
-           file://dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch;patch=1 \
-           file://dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch;patch=1 \
-           file://dss2/0033-DSS2-Prefer-3-tap-filter.patch;patch=1 \
-           file://dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch;patch=1 \
-           file://dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch;patch=1 \
-           file://dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch;patch=1 \
-           file://dss2/0037-DSS2-Added-support-for-querying-color-keying.patch;patch=1 \
-           file://dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch;patch=1 \
-           file://dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch;patch=1 \
-           file://dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch;patch=1 \
-           file://dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch;patch=1 \
-           file://dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch;patch=1 \
-           file://dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch;patch=1 \
-           file://dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch;patch=1 \
-           file://dss2/0045-DSS2-Fixed-line-endings-from-to.patch;patch=1 \
-           file://dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch;patch=1 \
-           file://dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch;patch=1 \
-           file://dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch;patch=1 \
-           file://dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch;patch=1 \
-           file://dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch;patch=1 \
-           file://dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch;patch=1 \
-           file://dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch;patch=1 \
-           file://dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch;patch=1 \
-           file://dss2/0054-DSS2-DSI-more-error-handling.patch;patch=1 \
-           file://dss2/0055-DSS2-Added-global-alpha-support.patch;patch=1 \
-           file://dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch;patch=1 \
-           file://dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch;patch=1 \
-           file://dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch;patch=1 \
-           file://dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch;patch=1 \
-           file://dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch;patch=1 \
-           file://dss2/0061-DSS2-VRFB-save-restore-context.patch;patch=1 \
-           file://dss2/0062-DSS2-VRAM-Fix-indentation.patch;patch=1 \
-           file://dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch;patch=1 \
-           file://dss2/0064-VRFB-fix-debug-messages.patch;patch=1 \
-           file://dss2/0065-VRFB-add-suspend-resume-functionality.patch;patch=1 \
-           file://dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch;patch=1 \
-           file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch;patch=1 \
-           file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch;patch=1 \
-           file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch;patch=1 \
-           file://dss2/0070-DSS2-fix-irq1.diff;patch=1 \
-           file://dss2/0071-DSS2-fix-irq2.diff;patch=1 \
-           file://0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch;patch=1 \
-           file://fix-unaligned-access.diff;patch=1 \
-           file://make-alignment-visible.diff;patch=1 \
-           file://mmctiming.patch;patch=1 \
-           file://ehci.patch;patch=1 \
-           file://fix-audio-capture.patch;patch=1 \
-           file://ads7846-detection.patch;patch=1 \
-           file://musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch;patch=1 \
-           file://musb/0002-USB-composite-avoid-inconsistent-lock-state.patch;patch=1 \
-           file://musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch;patch=1 \
-           file://musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch;patch=1 \
-           file://musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch;patch=1 \
-           file://musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch;patch=1 \
-           file://musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch;patch=1 \
-           file://musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch;patch=1 \
-           file://musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch;patch=1 \
-           file://musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch;patch=1 \
-           file://musb/0011-musb-fix-isochronous-TXDMA-take-2.patch;patch=1 \
-           file://musb/0012-musb-fix-possible-panic-while-resuming.patch;patch=1 \
-           file://musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch;patch=1 \
-           file://musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch;patch=1 \
-           file://musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch;patch=1 \
-           file://musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch;patch=1 \
-           file://musb/0017-musb_host-refactor-URB-giveback.patch;patch=1 \
-           file://musb/0018-musb-split-out-CPPI-interrupt-handler.patch;patch=1 \
-           file://musb/0019-musb_host-simplify-check-for-active-URB.patch;patch=1 \
-           file://musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch;patch=1 \
-           file://musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch;patch=1 \
-           file://musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch;patch=1 \
-           file://musb/0023-musb-add-high-bandwidth-ISO-support.patch;patch=1 \
-           file://musb/0024-USB-otg-adding-nop-usb-transceiver.patch;patch=1 \
-           file://musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch;patch=1 \
-           file://musb/0026-musb-proper-hookup-to-transceiver-drivers.patch;patch=1 \
-           file://musb/0027-musb-otg-timer-cleanup.patch;patch=1 \
-           file://musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch;patch=1 \
-           file://musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch;patch=1 \
-           file://isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch;patch=1 \
-           file://isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch;patch=1 \
-           file://isp/v4l/0003-V4L-Int-if-Dummy-slave.patch;patch=1 \
-           file://isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch;patch=1 \
-           file://isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch;patch=1 \
-           file://isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch;patch=1 \
-           file://isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch;patch=1 \
-           file://isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch;patch=1 \
-           file://isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch;patch=1 \
-           file://isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch;patch=1 \
-           file://isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch;patch=1 \
-           file://isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch;patch=1 \
-           file://isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch;patch=1 \
-           file://isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch;patch=1 \
-           file://isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch;patch=1 \
-           file://isp/omap3camera/0003-omap3isp-Add-userspace-header.patch;patch=1 \
-           file://isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch;patch=1 \
-           file://isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch;patch=1 \
-           file://isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch;patch=1 \
-           file://isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch;patch=1 \
-           file://isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch;patch=1 \
-           file://isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch;patch=1 \
-           file://isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch;patch=1 \
-           file://isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch;patch=1 \
-           file://isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch;patch=1 \
-           file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \
-           file://modedb-hd720.patch;patch=1 \
-           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
-           file://vfp/02-vfp-ptrace.patch;patch=1 \
-           file://vfp/03-vfp-corruption.patch;patch=1 \
-           file://vfp/04-vfp-threads.patch;patch=1 \
-           file://vfp/05-vfp-signal-handlers.patch;patch=1 \
+           file://no-empty-flash-warnings.patch \
+           file://no-cortex-deadlock.patch \
+           file://read_die_ids.patch \
+           file://fix-install.patch \
+           file://dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch \
+           file://dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch \
+           file://dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch \
+           file://dss2/0004-DSS2-OMAP-framebuffer-driver.patch \
+           file://dss2/0005-DSS2-Add-panel-drivers.patch \
+           file://dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch \
+           file://dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch \
+           file://dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch \
+           file://dss2/0009-DSS2-Add-acx565akm-panel.patch \
+           file://dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch \
+           file://dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch \
+           file://dss2/0012-DSS2-Fix-DMA-rotation.patch \
+           file://dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch \
+           file://dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch \
+           file://dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch \
+           file://dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch \
+           file://dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch \
+           file://dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch \
+           file://dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch \
+           file://dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch \
+           file://dss2/0021-DSS2-Add-venc-register-dump.patch \
+           file://dss2/0022-DSS2-FB-remove-unused-var-warning.patch \
+           file://dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch \
+           file://dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch \
+           file://dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch \
+           file://dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch \
+           file://dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch \
+           file://dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch \
+           file://dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch \
+           file://dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch \
+           file://dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch \
+           file://dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch \
+           file://dss2/0033-DSS2-Prefer-3-tap-filter.patch \
+           file://dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch \
+           file://dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch \
+           file://dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch \
+           file://dss2/0037-DSS2-Added-support-for-querying-color-keying.patch \
+           file://dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch \
+           file://dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch \
+           file://dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch \
+           file://dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch \
+           file://dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch \
+           file://dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch \
+           file://dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch \
+           file://dss2/0045-DSS2-Fixed-line-endings-from-to.patch \
+           file://dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch \
+           file://dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch \
+           file://dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch \
+           file://dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch \
+           file://dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch \
+           file://dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch \
+           file://dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch \
+           file://dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch \
+           file://dss2/0054-DSS2-DSI-more-error-handling.patch \
+           file://dss2/0055-DSS2-Added-global-alpha-support.patch \
+           file://dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch \
+           file://dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch \
+           file://dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch \
+           file://dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch \
+           file://dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch \
+           file://dss2/0061-DSS2-VRFB-save-restore-context.patch \
+           file://dss2/0062-DSS2-VRAM-Fix-indentation.patch \
+           file://dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch \
+           file://dss2/0064-VRFB-fix-debug-messages.patch \
+           file://dss2/0065-VRFB-add-suspend-resume-functionality.patch \
+           file://dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch \
+           file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch \
+           file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch \
+           file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch \
+           file://dss2/0070-DSS2-fix-irq1.diff \
+           file://dss2/0071-DSS2-fix-irq2.diff \
+           file://0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch \
+           file://fix-unaligned-access.diff \
+           file://make-alignment-visible.diff \
+           file://mmctiming.patch \
+           file://ehci.patch \
+           file://fix-audio-capture.patch \
+           file://ads7846-detection.patch \
+           file://musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch \
+           file://musb/0002-USB-composite-avoid-inconsistent-lock-state.patch \
+           file://musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch \
+           file://musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch \
+           file://musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch \
+           file://musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch \
+           file://musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch \
+           file://musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch \
+           file://musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch \
+           file://musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch \
+           file://musb/0011-musb-fix-isochronous-TXDMA-take-2.patch \
+           file://musb/0012-musb-fix-possible-panic-while-resuming.patch \
+           file://musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch \
+           file://musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch \
+           file://musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch \
+           file://musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch \
+           file://musb/0017-musb_host-refactor-URB-giveback.patch \
+           file://musb/0018-musb-split-out-CPPI-interrupt-handler.patch \
+           file://musb/0019-musb_host-simplify-check-for-active-URB.patch \
+           file://musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch \
+           file://musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch \
+           file://musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch \
+           file://musb/0023-musb-add-high-bandwidth-ISO-support.patch \
+           file://musb/0024-USB-otg-adding-nop-usb-transceiver.patch \
+           file://musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch \
+           file://musb/0026-musb-proper-hookup-to-transceiver-drivers.patch \
+           file://musb/0027-musb-otg-timer-cleanup.patch \
+           file://musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch \
+           file://musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch \
+           file://isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch \
+           file://isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch \
+           file://isp/v4l/0003-V4L-Int-if-Dummy-slave.patch \
+           file://isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch \
+           file://isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch \
+           file://isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch \
+           file://isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch \
+           file://isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch \
+           file://isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch \
+           file://isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch \
+           file://isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch \
+           file://isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch \
+           file://isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch \
+           file://isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch \
+           file://isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch \
+           file://isp/omap3camera/0003-omap3isp-Add-userspace-header.patch \
+           file://isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch \
+           file://isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch \
+           file://isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch \
+           file://isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch \
+           file://isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch \
+           file://isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch \
+           file://isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch \
+           file://isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch \
+           file://isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch \
+           file://0124-leds-gpio-broken-with-current-git.patch \
+           file://modedb-hd720.patch \
+           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch \
+           file://vfp/02-vfp-ptrace.patch \
+           file://vfp/03-vfp-corruption.patch \
+           file://vfp/04-vfp-threads.patch \
+           file://vfp/05-vfp-signal-handlers.patch \
 "
 
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
-			                   file://beagle-asoc.patch;patch=1 \
-                               file://tincantools-puppy.diff;patch=1 \
+			                   file://beagle-asoc.patch \
+                               file://tincantools-puppy.diff \
 "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;patch=1 \
+	file://evm-mcspi-ts.diff \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/kexecboot/linux-kexecboot_2.6.32.bb b/recipes/kexecboot/linux-kexecboot_2.6.32.bb
index 1851fa8bc3..22e95809d6 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.32.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.32.bb
@@ -18,11 +18,11 @@ DEFAULT_PREFERENCE_omap3 = "1"
 
 
 SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           file://v3-1-4-Add-support-for-LZO-compressed-kernels.patch;patch=1;status=pending \
-           file://v3-2-4-Add-support-for-LZO-compressed-kernels-for-ARM.patch;patch=1;status=pending \
-           file://v3-3-4-Add-support-for-LZO-compressed-kernels-on-x86.patch;patch=1;status=pending \
-           file://v3-4-4-Add-LZO-compression-support-for-initramfs-and-old-style-initrd.patch;patch=1;status=pending \
-           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;patch=1;status=pending \
+           file://v3-1-4-Add-support-for-LZO-compressed-kernels.patch;status=pending \
+           file://v3-2-4-Add-support-for-LZO-compressed-kernels-for-ARM.patch;status=pending \
+           file://v3-3-4-Add-support-for-LZO-compressed-kernels-on-x86.patch;status=pending \
+           file://v3-4-4-Add-LZO-compression-support-for-initramfs-and-old-style-initrd.patch;status=pending \
+           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \
            file://defconfig"
 
 SRC_URI[kernel.md5sum] = "260551284ac224c3a43c4adac7df4879"
@@ -30,25 +30,25 @@ SRC_URI[kernel.sha256sum] = "5099786d80b8407d98a619df00209c2353517f22d804fdd9533
 
 SRC_URI_append_omap3 = " git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git;rev=6833f1a8cdcb65a370f898bde6b6af63f81962df \
 file://defconfig \
-file://sctp-fix.patch;patch=1 \
-file://cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch;patch=1 \
-file://cm-t35/0001-OMAP-DSS2-add-Toppoly-TDO35S-panel.patch;patch=1 \
-file://cm-t35/0002-omap3-cm-t35-add-DSS2-display-support.patch;patch=1 \
-file://cm-t35/0003-omap3-cm-t35-update-defconfig-for-DSS2.patch;patch=1 \
-file://cm-t35/0006-omap3-cm-t35-update-defconfig.patch;patch=1 \
-file://0001-ARM-OMAP-Overo-Add-support-for-second-ethernet-po.patch;patch=1 \
-file://0003-drivers-net-smsc911x-return-ENODEV-if-device-is-n.patch;patch=1 \
-file://0004-drivers-input-touchscreen-ads7846-return-ENODEV.patch;patch=1 \
-file://0005-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board.patch;patch=1 \
-file://0006-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch;patch=1 \
-file://0007-ASoC-enable-audio-capture-by-default-for-twl4030.patch;patch=1 \
-file://0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch;patch=1 \
-file://madc/0009-drivers-mfd-add-twl4030-madc-driver.patch;patch=1 \
-file://madc/0010-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch;patch=1 \
-file://madc/0011-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch;patch=1 \
-file://madc/0013-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch;patch=1 \
-file://dss2/0012-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-pane.patch;patch=1 \
-#file://dss2/0014-OMAP-DSS-Add-DSS2-support-for-Overo.patch;patch=1 \
-file://dss2/0015-OMAP-DSS-Add-DSS2-support-for-Beagle.patch;patch=1 \
-file://dss2/0016-video-add-timings-for-hd720.patch;patch=1 \
+file://sctp-fix.patch \
+file://cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch \
+file://cm-t35/0001-OMAP-DSS2-add-Toppoly-TDO35S-panel.patch \
+file://cm-t35/0002-omap3-cm-t35-add-DSS2-display-support.patch \
+file://cm-t35/0003-omap3-cm-t35-update-defconfig-for-DSS2.patch \
+file://cm-t35/0006-omap3-cm-t35-update-defconfig.patch \
+file://0001-ARM-OMAP-Overo-Add-support-for-second-ethernet-po.patch \
+file://0003-drivers-net-smsc911x-return-ENODEV-if-device-is-n.patch \
+file://0004-drivers-input-touchscreen-ads7846-return-ENODEV.patch \
+file://0005-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board.patch \
+file://0006-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch \
+file://0007-ASoC-enable-audio-capture-by-default-for-twl4030.patch \
+file://0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch \
+file://madc/0009-drivers-mfd-add-twl4030-madc-driver.patch \
+file://madc/0010-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch \
+file://madc/0011-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch \
+file://madc/0013-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch \
+file://dss2/0012-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-pane.patch \
+#file://dss2/0014-OMAP-DSS-Add-DSS2-support-for-Overo.patch \
+file://dss2/0015-OMAP-DSS-Add-DSS2-support-for-Beagle.patch \
+file://dss2/0016-video-add-timings-for-hd720.patch \
 "
diff --git a/recipes/kexecboot/linux-kexecboot_2.6.33+2.6.34-rc4.bb b/recipes/kexecboot/linux-kexecboot_2.6.33+2.6.34-rc4.bb
deleted file mode 100644
index 665c8f76e1..0000000000
--- a/recipes/kexecboot/linux-kexecboot_2.6.33+2.6.34-rc4.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require linux-kexecboot.inc
-
-KERNEL_RELEASE = "2.6.34-rc4"
-OLD_KERNEL_RELEASE = "2.6.33"
-PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}"
-PR = "${INC_PR}.0"
-
-S = "${WORKDIR}/linux-${OLD_KERNEL_RELEASE}"
-
-# Mark archs/machines that this kernel supports
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;name=patch;patch=1 \
-           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;patch=1;status=pending \
-           file://defconfig"
-
-SRC_URI[kernel.md5sum] = "c3883760b18d50e8d78819c54d579b00"
-SRC_URI[kernel.sha256sum] = "63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6"
-
-SRC_URI[patch.md5sum] = "c103b3168ad6128272c347f15822c77a"
-SRC_URI[patch.sha256sum] = "944e167133fe0be7215ff09cc690e5fd2a63e189d3b95ee22aa736043af22061"
diff --git a/recipes/kexecboot/linux-kexecboot_2.6.33.bb b/recipes/kexecboot/linux-kexecboot_2.6.34.bb
index 52c9ff1a87..97293e1ca8 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.33.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.34.bb
@@ -8,8 +8,8 @@ S = "${WORKDIR}/linux-${PV}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;patch=1;status=pending \
+           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \
            file://defconfig"
 
-SRC_URI[kernel.md5sum] = "c3883760b18d50e8d78819c54d579b00"
-SRC_URI[kernel.sha256sum] = "63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6"
+SRC_URI[kernel.md5sum] = "10eebcb0178fb4540e2165bfd7efc7ad"
+SRC_URI[kernel.sha256sum] = "fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633"
diff --git a/recipes/kexecboot/linux-kexecboot_git.bb b/recipes/kexecboot/linux-kexecboot_git.bb
new file mode 100644
index 0000000000..0f8a4257d4
--- /dev/null
+++ b/recipes/kexecboot/linux-kexecboot_git.bb
@@ -0,0 +1,14 @@
+require linux-kexecboot.inc
+
+KERNEL_RELEASE = "2.6.34"
+SRCREV = "e40152ee1e1c7a63f4777791863215e3faa37a86"
+PV = "${KERNEL_RELEASE}+gitr${SRCPV}"
+
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \
+           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \
+           file://defconfig"
+
+S = "${WORKDIR}/git"
+
+# Mark archs/machines that this kernel supports
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/keylaunch/keylaunch_2.0.10.bb b/recipes/keylaunch/keylaunch_2.0.10.bb
index 6869415fde..0ea3247184 100644
--- a/recipes/keylaunch/keylaunch_2.0.10.bb
+++ b/recipes/keylaunch/keylaunch_2.0.10.bb
@@ -13,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\
  rather than just running another copy."
 PR = "r14"
 
-SRC_URI += " file://makefile-fix.patch;patch=1 file://unbreak-keyevents.patch;patch=1"
+SRC_URI += " file://makefile-fix.patch file://unbreak-keyevents.patch"
 
 export CVSBUILD="no"
 
diff --git a/recipes/keyring/keyring_0.6.8.bb b/recipes/keyring/keyring_0.6.8.bb
index 9f5572cf9f..3908006063 100644
--- a/recipes/keyring/keyring_0.6.8.bb
+++ b/recipes/keyring/keyring_0.6.8.bb
@@ -6,7 +6,7 @@ DEPENDS = "gdbm"
 PR = "r2"
 
 SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz \
-	   file://keyring-0.6.8-datatype.patch;patch=1"
+	   file://keyring-0.6.8-datatype.patch"
 S = "${WORKDIR}/Keyring"
 
 inherit palmtop
diff --git a/recipes/kf/kf_0.5.4.1.bb b/recipes/kf/kf_0.5.4.1.bb
index d6ca5c9a01..b62c3714db 100755
--- a/recipes/kf/kf_0.5.4.1.bb
+++ b/recipes/kf/kf_0.5.4.1.bb
@@ -4,9 +4,9 @@ DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth"
 PR = "r3"
 
 SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \
-           file://fix-configure.patch;patch=1 \
-           file://fix-desktop-file.patch;patch=0 \
-           file://gcc4.patch;patch=1"
+           file://fix-configure.patch \
+           file://fix-desktop-file.patch \
+           file://gcc4.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/kismet/kismet_2007-10-R1.bb b/recipes/kismet/kismet_2007-10-R1.bb
index b508986aa0..f69af3a047 100644
--- a/recipes/kismet/kismet_2007-10-R1.bb
+++ b/recipes/kismet/kismet_2007-10-R1.bb
@@ -1,7 +1,7 @@
 require kismet.inc
 
-SRC_URI += "file://fix_strip.patch;patch=1 \
-            file://string_h.patch;patch=1"
+SRC_URI += "file://fix_strip.patch \
+            file://string_h.patch"
 
 PR = "r5"
 
diff --git a/recipes/kismet/kismet_2008-05-R1.bb b/recipes/kismet/kismet_2008-05-R1.bb
index d3c9636fec..a58a6d7aa6 100644
--- a/recipes/kismet/kismet_2008-05-R1.bb
+++ b/recipes/kismet/kismet_2008-05-R1.bb
@@ -1,11 +1,11 @@
 require kismet.inc
 
 # patches *.diff are from openSUSE
-SRC_URI += "file://kismet-2008-05-R1-crash.diff;patch=1;pnum=0 \
-            file://kismet-2008-05-R1-fmt.diff;patch=1;pnum=0 \
-            file://kismet-2008-05-R1-infinite-loop.diff;patch=1;pnum=0 \
-            file://kismet-2008-05-R1-nonvoid.diff;patch=1;pnum=0 \
-            file://fix_strip.patch;patch=1"
+SRC_URI += "file://kismet-2008-05-R1-crash.diff;striplevel=0 \
+            file://kismet-2008-05-R1-fmt.diff;striplevel=0 \
+            file://kismet-2008-05-R1-infinite-loop.diff;striplevel=0 \
+            file://kismet-2008-05-R1-nonvoid.diff;striplevel=0 \
+            file://fix_strip.patch"
 
 PR = "r0"
 
diff --git a/recipes/klibc/klibc-1.5.17/modprobe.patch b/recipes/klibc/klibc-1.5.17/modprobe.patch
new file mode 100644
index 0000000000..d89010cc1c
--- /dev/null
+++ b/recipes/klibc/klibc-1.5.17/modprobe.patch
@@ -0,0 +1,1993 @@
+---
+ usr/utils/Kbuild     |    4 +-
+ usr/utils/list.h     |  238 +++++++
+ usr/utils/modprobe.c | 1710 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 1951 insertions(+), 1 deletions(-)
+ create mode 100644 usr/utils/list.h
+ create mode 100644 usr/utils/modprobe.c
+
+diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild
+index 57e2d08..a52ea61 100644
+--- a/usr/utils/Kbuild
++++ b/usr/utils/Kbuild
+@@ -4,7 +4,7 @@
+ 
+ progs := chroot dd mkdir mkfifo mknod mount pivot_root umount
+ progs += true false sleep ln nuke minips cat ls losetup
+-progs += uname halt kill readlink cpio sync dmesg
++progs += uname halt kill readlink cpio sync dmesg modprobe
+ 
+ static-y := $(addprefix static/, $(progs))
+ shared-y := $(addprefix shared/, $(progs))
+@@ -58,6 +58,8 @@ static/sync-y       := sync.o
+ shared/sync-y       := sync.o
+ static/losetup-y    := losetup.o
+ shared/losetup-y    := losetup.o
++static/modprobe-y   := modprobe.o
++shared/modprobe-y   := modprobe.o
+ 
+ # Additionally linked targets
+ always := static/reboot static/poweroff shared/reboot shared/poweroff
+diff --git a/usr/utils/list.h b/usr/utils/list.h
+new file mode 100644
+index 0000000..511303d
+--- /dev/null
++++ b/usr/utils/list.h
+@@ -0,0 +1,238 @@
++/* Stolen from Linux Kernel Source's list.h -- GPL. */
++#ifndef _MODINITTOOLS_LIST_H
++#define _MODINITTOOLS_LIST_H
++
++#undef offsetof
++#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
++
++/**
++ * container_of - cast a member of a structure out to the containing structure
++ *
++ * @ptr:	the pointer to the member.
++ * @type:	the type of the container struct this is embedded in.
++ * @member:	the name of the member within the struct.
++ *
++ */
++#define container_of(ptr, type, member) ({			\
++        const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
++        (type *)( (char *)__mptr - offsetof(type,member) );})
++
++/*
++ * Simple doubly linked list implementation.
++ *
++ * Some of the internal functions ("__xxx") are useful when
++ * manipulating whole lists rather than single entries, as
++ * sometimes we already know the next/prev entries and we can
++ * generate better code by using them directly rather than
++ * using the generic single-entry routines.
++ */
++
++struct list_head {
++	struct list_head *next, *prev;
++};
++
++#define LIST_HEAD_INIT(name) { &(name), &(name) }
++
++#define LIST_HEAD(name) \
++	struct list_head name = LIST_HEAD_INIT(name)
++
++#define INIT_LIST_HEAD(ptr) do { \
++	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
++} while (0)
++
++/*
++ * Insert a new entry between two known consecutive entries.
++ *
++ * This is only for internal list manipulation where we know
++ * the prev/next entries already!
++ */
++static inline void __list_add(struct list_head *new,
++			      struct list_head *prev,
++			      struct list_head *next)
++{
++	next->prev = new;
++	new->next = next;
++	new->prev = prev;
++	prev->next = new;
++}
++
++/**
++ * list_add - add a new entry
++ * @new: new entry to be added
++ * @head: list head to add it after
++ *
++ * Insert a new entry after the specified head.
++ * This is good for implementing stacks.
++ */
++static inline void list_add(struct list_head *new, struct list_head *head)
++{
++	__list_add(new, head, head->next);
++}
++
++/**
++ * list_add_tail - add a new entry
++ * @new: new entry to be added
++ * @head: list head to add it before
++ *
++ * Insert a new entry before the specified head.
++ * This is useful for implementing queues.
++ */
++static inline void list_add_tail(struct list_head *new, struct list_head *head)
++{
++	__list_add(new, head->prev, head);
++}
++
++/*
++ * Delete a list entry by making the prev/next entries
++ * point to each other.
++ *
++ * This is only for internal list manipulation where we know
++ * the prev/next entries already!
++ */
++static inline void __list_del(struct list_head * prev, struct list_head * next)
++{
++	next->prev = prev;
++	prev->next = next;
++}
++
++/**
++ * list_del - deletes entry from list.
++ * @entry: the element to delete from the list.
++ * Note: list_empty on entry does not return true after this, the entry is
++ * in an undefined state.
++ */
++static inline void list_del(struct list_head *entry)
++{
++	__list_del(entry->prev, entry->next);
++}
++
++/**
++ * list_del_init - deletes entry from list and reinitialize it.
++ * @entry: the element to delete from the list.
++ */
++static inline void list_del_init(struct list_head *entry)
++{
++	__list_del(entry->prev, entry->next);
++	INIT_LIST_HEAD(entry);
++}
++
++/**
++ * list_move - delete from one list and add as another's head
++ * @list: the entry to move
++ * @head: the head that will precede our entry
++ */
++static inline void list_move(struct list_head *list, struct list_head *head)
++{
++        __list_del(list->prev, list->next);
++        list_add(list, head);
++}
++
++/**
++ * list_move_tail - delete from one list and add as another's tail
++ * @list: the entry to move
++ * @head: the head that will follow our entry
++ */
++static inline void list_move_tail(struct list_head *list,
++				  struct list_head *head)
++{
++        __list_del(list->prev, list->next);
++        list_add_tail(list, head);
++}
++
++/**
++ * list_empty - tests whether a list is empty
++ * @head: the list to test.
++ */
++static inline int list_empty(struct list_head *head)
++{
++	return head->next == head;
++}
++
++static inline void __list_splice(struct list_head *list,
++				 struct list_head *head)
++{
++	struct list_head *first = list->next;
++	struct list_head *last = list->prev;
++	struct list_head *at = head->next;
++
++	first->prev = head;
++	head->next = first;
++
++	last->next = at;
++	at->prev = last;
++}
++
++/**
++ * list_splice - join two lists
++ * @list: the new list to add.
++ * @head: the place to add it in the first list.
++ */
++static inline void list_splice(struct list_head *list, struct list_head *head)
++{
++	if (!list_empty(list))
++		__list_splice(list, head);
++}
++
++/**
++ * list_splice_init - join two lists and reinitialise the emptied list.
++ * @list: the new list to add.
++ * @head: the place to add it in the first list.
++ *
++ * The list at @list is reinitialised
++ */
++static inline void list_splice_init(struct list_head *list,
++				    struct list_head *head)
++{
++	if (!list_empty(list)) {
++		__list_splice(list, head);
++		INIT_LIST_HEAD(list);
++	}
++}
++
++/**
++ * list_entry - get the struct for this entry
++ * @ptr:	the &struct list_head pointer.
++ * @type:	the type of the struct this is embedded in.
++ * @member:	the name of the list_struct within the struct.
++ */
++#define list_entry(ptr, type, member) \
++	container_of(ptr, type, member)
++
++/**
++ * list_for_each	-	iterate over a list
++ * @pos:	the &struct list_head to use as a loop counter.
++ * @head:	the head for your list.
++ */
++#define list_for_each(pos, head) \
++	for (pos = (head)->next; pos != (head); pos = pos->next)
++
++/**
++ * list_for_each_prev	-	iterate over a list backwards
++ * @pos:	the &struct list_head to use as a loop counter.
++ * @head:	the head for your list.
++ */
++#define list_for_each_prev(pos, head) \
++	for (pos = (head)->prev; pos != (head); pos = pos->prev)
++
++/**
++ * list_for_each_safe	-	iterate over a list safe against removal of list entry
++ * @pos:	the &struct list_head to use as a loop counter.
++ * @n:		another &struct list_head to use as temporary storage
++ * @head:	the head for your list.
++ */
++#define list_for_each_safe(pos, n, head) \
++	for (pos = (head)->next, n = pos->next; pos != (head); \
++		pos = n, n = pos->next)
++
++/**
++ * list_for_each_entry	-	iterate over list of given type
++ * @pos:	the type * to use as a loop counter.
++ * @head:	the head for your list.
++ * @member:	the name of the list_struct within the struct.
++ */
++#define list_for_each_entry(pos, head, member)				\
++	for (pos = list_entry((head)->next, typeof(*pos), member);	\
++	     &pos->member != (head);					\
++	     pos = list_entry(pos->member.next, typeof(*pos), member))
++
++#endif
+diff --git a/usr/utils/modprobe.c b/usr/utils/modprobe.c
+new file mode 100644
+index 0000000..8e8a437
+--- /dev/null
++++ b/usr/utils/modprobe.c
+@@ -0,0 +1,1710 @@
++/* modprobe.c: insert a module into the kernel, intelligently.
++    Copyright (C) 2001  Rusty Russell.
++    Copyright (C) 2002, 2003  Rusty Russell, IBM Corporation.
++
++    This program is free software; you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++*/
++#define _GNU_SOURCE /* asprintf */
++
++#include <sys/utsname.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++#include <stdarg.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <ctype.h>
++#include <string.h>
++#include <errno.h>
++#include <unistd.h>
++#include <dirent.h>
++#include <limits.h>
++#include <elf.h>
++#include <getopt.h>
++#include <fnmatch.h>
++#include <asm/unistd.h>
++#include <sys/wait.h>
++#include <syslog.h>
++#include <zlib.h>
++
++#define streq(a,b) (strcmp((a),(b)) == 0)
++#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
++
++#include "list.h"
++static inline void try_old_version(const char *progname, char *argv[])
++{
++}
++extern long init_module(void *, unsigned long, const char *);
++extern long delete_module(const char *, unsigned int);
++
++struct module {
++	struct list_head list;
++	char *modname;
++	char filename[0];
++};
++
++#ifndef MODULE_DIR
++#define MODULE_DIR "/lib/modules"
++#endif
++
++typedef void (*errfn_t)(const char *fmt, ...);
++
++/* Do we use syslog or stderr for messages? */
++static int log;
++
++static void message(const char *prefix, const char *fmt, va_list *arglist)
++{
++	char *buf, *buf2;
++
++	vasprintf(&buf, fmt, *arglist);
++	asprintf(&buf2, "%s%s", prefix, buf);
++
++	if (log)
++		syslog(LOG_NOTICE, "%s", buf2);
++	else
++		fprintf(stderr, "%s", buf2);
++	free(buf2);
++	free(buf);
++}
++void *grab_contents(gzFile *gzfd, unsigned long *size)
++{
++        unsigned int max = 16384;
++        void *buffer = malloc(max);
++        int ret;
++
++        if (!buffer)
++                return NULL;
++
++        *size = 0;
++        while ((ret = gzread(gzfd, buffer + *size, max - *size)) > 0) {
++                *size += ret;
++                if (*size == max) {
++                        buffer = realloc(buffer, max *= 2);
++                        if (!buffer)
++                                return NULL;
++                }
++        }
++        if (ret < 0) {
++                free(buffer);
++                buffer = NULL;
++        }
++        return buffer;
++}
++
++void *grab_fd(int fd, unsigned long *size)
++{
++        gzFile gzfd;
++
++        gzfd = gzdopen(fd, "rb");
++        if (!gzfd)
++                return NULL;
++
++        /* gzclose(gzfd) would close fd, which would drop locks.
++           Don't blame zlib: POSIX locking semantics are so horribly
++           broken that they should be ripped out. */
++        return grab_contents(gzfd, size);
++}
++void release_file(void *data, unsigned long size)
++{
++        free(data);
++}
++
++
++static int warned = 0;
++static void warn(const char *fmt, ...)
++{
++	va_list arglist;
++	warned++;
++	va_start(arglist, fmt);
++	message("WARNING: ", fmt, &arglist);
++	va_end(arglist);
++}
++
++static void fatal(const char *fmt, ...)
++{
++	va_list arglist;
++	va_start(arglist, fmt);
++	message("FATAL: ", fmt, &arglist);
++	va_end(arglist);
++	exit(1);
++}
++
++
++static void grammar(const char *cmd, const char *filename, unsigned int line)
++{
++	warn("%s line %u: ignoring bad line starting with '%s'\n",
++	     filename, line, cmd);
++}
++
++static void *do_nofail(void *ptr, const char *file, int line, const char *expr)
++{
++	if (!ptr) {
++		fatal("Memory allocation failure %s line %d: %s.\n",
++		      file, line, expr);
++	}
++	return ptr;
++}
++
++#define NOFAIL(ptr)	do_nofail((ptr), __FILE__, __LINE__, #ptr)
++
++static void print_usage(const char *progname)
++{
++	fprintf(stderr,
++		"Usage: %s [-v] [-V] [-C config-file] [-n] [-i] [-q] [-b] [-o <modname>] <modname> [parameters...]\n"
++		"%s -r [-n] [-i] [-v] <modulename> ...\n"
++		"%s -l -t <dirname> [ -a <modulename> ...]\n",
++		progname, progname, progname);
++	exit(1);
++}
++
++static int fgetc_wrapped(FILE *file, unsigned int *linenum)
++{
++	for (;;) {
++	  	int ch = fgetc(file);
++		if (ch != '\\')
++			return ch;
++		ch = fgetc(file);
++		if (ch != '\n')
++			return ch;
++		if (linenum)
++			(*linenum)++;
++	}
++}
++
++static char *getline_wrapped(FILE *file, unsigned int *linenum)
++{
++	int size = 1024;
++	int i = 0;
++	char *buf = NOFAIL(malloc(size));
++	for(;;) {
++		int ch = fgetc_wrapped(file, linenum);
++		if (i == size) {
++			size *= 2;
++			buf = NOFAIL(realloc(buf, size));
++		}
++		if (ch < 0 && i == 0) {
++			free(buf);
++			return NULL;
++		}
++		if (ch < 0 || ch == '\n') {
++			if (linenum)
++				(*linenum)++;
++			buf[i] = '\0';
++			return NOFAIL(realloc(buf, i+1));
++		}
++		buf[i++] = ch;
++	}
++}
++
++static struct module *find_module(const char *filename, struct list_head *list)
++{
++	struct module *i;
++
++	list_for_each_entry(i, list, list) {
++		if (strcmp(i->filename, filename) == 0)
++			return i;
++	}
++	return NULL;
++}
++
++/* Convert filename to the module name.  Works if filename == modname, too. */
++static void filename2modname(char *modname, const char *filename)
++{
++	const char *afterslash;
++	unsigned int i;
++
++	afterslash = strrchr(filename, '/');
++	if (!afterslash)
++		afterslash = filename;
++	else
++		afterslash++;
++
++	/* Convert to underscores, stop at first . */
++	for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) {
++		if (afterslash[i] == '-')
++			modname[i] = '_';
++		else
++			modname[i] = afterslash[i];
++	}
++	modname[i] = '\0';
++}
++
++static int lock_file(const char *filename)
++{
++	int fd = open(filename, O_RDWR, 0);
++
++	if (fd >= 0) {
++		struct flock lock;
++		lock.l_type = F_WRLCK;
++		lock.l_whence = SEEK_SET;
++		lock.l_start = 0;
++		lock.l_len = 1;
++		fcntl(fd, F_SETLKW, &lock);
++	} else
++		/* Read-only filesystem?  There goes locking... */
++		fd = open(filename, O_RDONLY, 0);
++	return fd;
++}
++
++static void unlock_file(int fd)
++{
++	/* Valgrind is picky... */
++	close(fd);
++}
++
++static void add_module(char *filename, int namelen, struct list_head *list)
++{
++	struct module *mod;
++
++	/* If it's a duplicate: move it to the end, so it gets
++	   inserted where it is *first* required. */
++	mod = find_module(filename, list);
++	if (mod)
++		list_del(&mod->list);
++	else {
++		/* No match.  Create a new module. */
++		mod = NOFAIL(malloc(sizeof(struct module) + namelen + 1));
++		memcpy(mod->filename, filename, namelen);
++		mod->filename[namelen] = '\0';
++		mod->modname = NOFAIL(malloc(namelen + 1));
++		filename2modname(mod->modname, mod->filename);
++	}
++
++	list_add_tail(&mod->list, list);
++}
++
++/* Compare len chars of a to b, with _ and - equivalent. */
++static int modname_equal(const char *a, const char *b, unsigned int len)
++{
++	unsigned int i;
++
++	if (strlen(b) != len)
++		return 0;
++
++	for (i = 0; i < len; i++) {
++		if ((a[i] == '_' || a[i] == '-')
++		    && (b[i] == '_' || b[i] == '-'))
++			continue;
++		if (a[i] != b[i])
++			return 0;
++	}
++	return 1;
++}
++
++/* Fills in list of modules if this is the line we want. */
++static int add_modules_dep_line(char *line,
++				const char *name,
++				struct list_head *list)
++{
++	char *ptr;
++	int len;
++	char *modname;
++
++	/* Ignore lines without : or which start with a # */
++	ptr = strchr(line, ':');
++	if (ptr == NULL || line[strspn(line, "\t ")] == '#')
++		return 0;
++
++	/* Is this the module we are looking for? */
++	*ptr = '\0';
++	if (strrchr(line, '/'))
++		modname = strrchr(line, '/') + 1;
++	else
++		modname = line;
++
++	len = strlen(modname);
++	if (strchr(modname, '.'))
++		len = strchr(modname, '.') - modname;
++	if (!modname_equal(modname, name, len))
++		return 0;
++
++	/* Create the list. */
++	add_module(line, ptr - line, list);
++
++	ptr++;
++	for(;;) {
++		char *dep_start;
++		ptr += strspn(ptr, " \t");
++		if (*ptr == '\0')
++			break;
++		dep_start = ptr;
++		ptr += strcspn(ptr, " \t");
++		add_module(dep_start, ptr - dep_start, list);
++	}
++	return 1;
++}
++
++static void read_depends(const char *dirname,
++			 const char *start_name,
++			 struct list_head *list)
++{
++	char *modules_dep_name;
++	char *line;
++	FILE *modules_dep;
++	int done = 0;
++
++	asprintf(&modules_dep_name, "%s/%s", dirname, "modules.dep");
++	modules_dep = fopen(modules_dep_name, "r");
++	if (!modules_dep)
++		fatal("Could not load %s: %s\n",
++		      modules_dep_name, strerror(errno));
++
++	/* Stop at first line, as we can have duplicates (eg. symlinks
++           from boot/ */
++	while (!done && (line = getline_wrapped(modules_dep, NULL)) != NULL) {
++		done = add_modules_dep_line(line, start_name, list);
++		free(line);
++	}
++	fclose(modules_dep);
++	free(modules_dep_name);
++}
++
++/* We use error numbers in a loose translation... */
++static const char *insert_moderror(int err)
++{
++	switch (err) {
++	case ENOEXEC:
++		return "Invalid module format";
++	case ENOENT:
++		return "Unknown symbol in module, or unknown parameter (see dmesg)";
++	case ENOSYS:
++		return "Kernel does not have module support";
++	default:
++		return strerror(err);
++	}
++}
++
++static const char *remove_moderror(int err)
++{
++	switch (err) {
++	case ENOENT:
++		return "No such module";
++	case ENOSYS:
++		return "Kernel does not have module unloading support";
++	default:
++		return strerror(err);
++	}
++}
++
++/* Is module in /proc/modules?  If so, fill in usecount if not NULL. 
++   0 means no, 1 means yes, -1 means unknown.
++ */
++static int module_in_kernel(const char *modname, unsigned int *usecount)
++{
++	FILE *proc_modules;
++	char *line;
++
++again:
++	/* Might not be mounted yet.  Don't fail. */
++	proc_modules = fopen("/proc/modules", "r");
++	if (!proc_modules)
++		return -1;
++
++	while ((line = getline_wrapped(proc_modules, NULL)) != NULL) {
++		char *entry = strtok(line, " \n");
++
++		if (entry && streq(entry, modname)) {
++			/* If it exists, usecount is the third entry. */
++			if (!strtok(NULL, " \n"))
++				goto out;
++
++			if (!(entry = strtok(NULL, " \n"))) /* usecount */
++				goto out;
++			else
++				if (usecount)
++					*usecount = atoi(entry);
++
++			/* Followed by - then status. */
++			if (strtok(NULL, " \n")
++			    && (entry = strtok(NULL, " \n")) != NULL) {
++				/* Locking will fail on ro fs, we might hit
++				 * cases where module is in flux.  Spin. */
++				if (streq(entry, "Loading")
++				    || streq(entry, "Unloading")) {
++					usleep(100000);
++					free(line);
++					fclose(proc_modules);
++					goto again;
++				}
++			}
++
++		out:
++			free(line);
++			fclose(proc_modules);
++			return 1;
++		}
++		free(line);
++	}
++	fclose(proc_modules);
++	return 0;
++}
++
++static void replace_modname(struct module *module,
++			    void *mem, unsigned long len,
++			    const char *oldname, const char *newname)
++{
++	char *p;
++
++	/* 64 - sizeof(unsigned long) - 1 */
++	if (strlen(newname) > 55)
++		fatal("New name %s is too long\n", newname);
++
++	/* Find where it is in the module structure.  Don't assume layout! */
++	for (p = mem; p < (char *)mem + len - strlen(oldname); p++) {
++		if (memcmp(p, oldname, strlen(oldname)) == 0) {
++			strcpy(p, newname);
++			return;
++		}
++	}
++
++	warn("Could not find old name in %s to replace!\n", module->filename);
++}
++
++static void *get_section32(void *file,
++			   unsigned long size,
++			   const char *name,
++			   unsigned long *secsize)
++{
++	Elf32_Ehdr *hdr = file;
++	Elf32_Shdr *sechdrs = file + hdr->e_shoff;
++	const char *secnames;
++	unsigned int i;
++
++	/* Too short? */
++	if (size < sizeof(*hdr))
++		return NULL;
++	if (size < hdr->e_shoff + hdr->e_shnum * sizeof(sechdrs[0]))
++		return NULL;
++	if (size < sechdrs[hdr->e_shstrndx].sh_offset)
++		return NULL;
++		
++	secnames = file + sechdrs[hdr->e_shstrndx].sh_offset;
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (strcmp(secnames + sechdrs[i].sh_name, name) == 0) {
++			*secsize = sechdrs[i].sh_size;
++			return file + sechdrs[i].sh_offset;
++		}
++	return NULL;
++}
++
++static void *get_section64(void *file,
++			   unsigned long size,
++			   const char *name,
++			   unsigned long *secsize)
++{
++	Elf64_Ehdr *hdr = file;
++	Elf64_Shdr *sechdrs = file + hdr->e_shoff;
++	const char *secnames;
++	unsigned int i;
++
++	/* Too short? */
++	if (size < sizeof(*hdr))
++		return NULL;
++	if (size < hdr->e_shoff + hdr->e_shnum * sizeof(sechdrs[0]))
++		return NULL;
++	if (size < sechdrs[hdr->e_shstrndx].sh_offset)
++		return NULL;
++		
++	secnames = file + sechdrs[hdr->e_shstrndx].sh_offset;
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (strcmp(secnames + sechdrs[i].sh_name, name) == 0) {
++			*secsize = sechdrs[i].sh_size;
++			return file + sechdrs[i].sh_offset;
++		}
++	return NULL;
++}
++
++static int elf_ident(void *mod, unsigned long size)
++{
++	/* "\177ELF" <byte> where byte = 001 for 32-bit, 002 for 64 */
++	char *ident = mod;
++
++	if (size < EI_CLASS || memcmp(mod, ELFMAG, SELFMAG) != 0)
++		return ELFCLASSNONE;
++	return ident[EI_CLASS];
++}
++
++static void *get_section(void *file,
++			 unsigned long size,
++			 const char *name,
++			 unsigned long *secsize)
++{
++	switch (elf_ident(file, size)) {
++	case ELFCLASS32:
++		return get_section32(file, size, name, secsize);
++	case ELFCLASS64:
++		return get_section64(file, size, name, secsize);
++	default:
++		return NULL;
++	}
++}
++
++static void rename_module(struct module *module,
++			  void *mod,
++			  unsigned long len,
++			  const char *newname)
++{
++	void *modstruct;
++	unsigned long modstruct_len;
++
++	/* Old-style */
++	modstruct = get_section(mod, len, ".gnu.linkonce.this_module",
++				&modstruct_len);
++	/* New-style */
++	if (!modstruct)
++		modstruct = get_section(mod, len, "__module", &modstruct_len);
++	if (!modstruct)
++		warn("Could not find module name to change in %s\n",
++		     module->filename);
++	else
++		replace_modname(module, modstruct, modstruct_len,
++				module->modname, newname);
++}
++
++/* Kernel told to ignore these sections if SHF_ALLOC not set. */
++static void invalidate_section32(void *mod, const char *secname)
++{
++	Elf32_Ehdr *hdr = mod;
++	Elf32_Shdr *sechdrs = mod + hdr->e_shoff;
++	const char *secnames = mod + sechdrs[hdr->e_shstrndx].sh_offset;
++	unsigned int i;
++
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (strcmp(secnames+sechdrs[i].sh_name, secname) == 0)
++			sechdrs[i].sh_flags &= ~SHF_ALLOC;
++}
++
++static void invalidate_section64(void *mod, const char *secname)
++{
++	Elf64_Ehdr *hdr = mod;
++	Elf64_Shdr *sechdrs = mod + hdr->e_shoff;
++	const char *secnames = mod + sechdrs[hdr->e_shstrndx].sh_offset;
++	unsigned int i;
++
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (strcmp(secnames+sechdrs[i].sh_name, secname) == 0)
++			sechdrs[i].sh_flags &= ~(unsigned long long)SHF_ALLOC;
++}
++
++static void strip_section(struct module *module,
++			  void *mod,
++			  unsigned long len,
++			  const char *secname)
++{
++	switch (elf_ident(mod, len)) {
++	case ELFCLASS32:
++		invalidate_section32(mod, secname);
++		break;
++	case ELFCLASS64:
++		invalidate_section64(mod, secname);
++		break;
++	default:
++		warn("Unknown module format in %s: not forcing version\n",
++		     module->filename);
++	}
++}
++
++static const char *next_string(const char *string, unsigned long *secsize)
++{
++	/* Skip non-zero chars */
++	while (string[0]) {
++		string++;
++		if ((*secsize)-- <= 1)
++			return NULL;
++	}
++
++	/* Skip any zero padding. */
++	while (!string[0]) {
++		string++;
++		if ((*secsize)-- <= 1)
++			return NULL;
++	}
++	return string;
++}
++
++static void clear_magic(struct module *module, void *mod, unsigned long len)
++{
++	const char *p;
++	unsigned long modlen;
++
++	/* Old-style: __vermagic section */
++	strip_section(module, mod, len, "__vermagic");
++
++	/* New-style: in .modinfo section */
++	for (p = get_section(mod, len, ".modinfo", &modlen);
++	     p;
++	     p = next_string(p, &modlen)) {
++		if (strncmp(p, "vermagic=", strlen("vermagic=")) == 0) {
++			memset((char *)p, 0, strlen(p));
++			return;
++		}
++	}
++}
++
++struct module_options
++{
++	struct module_options *next;
++	char *modulename;
++	char *options;
++};
++
++struct module_command
++{
++	struct module_command *next;
++	char *modulename;
++	char *command;
++};
++
++struct module_alias
++{
++	struct module_alias *next;
++	char *module;
++};
++
++struct module_blacklist
++{
++	struct module_blacklist *next;
++	char *modulename;
++};
++
++/* Link in a new option line from the config file. */
++static struct module_options *
++add_options(const char *modname,
++	    const char *option,
++	    struct module_options *options)
++{
++	struct module_options *new;
++	char *tab; 
++
++	new = NOFAIL(malloc(sizeof(*new)));
++	new->modulename = NOFAIL(strdup(modname));
++	new->options = NOFAIL(strdup(option));
++	/* We can handle tabs, kernel can't. */
++	for (tab = strchr(new->options, '\t'); tab; tab = strchr(tab, '\t'))
++		*tab = ' ';
++	new->next = options;
++	return new;
++}
++
++/* Link in a new install line from the config file. */
++static struct module_command *
++add_command(const char *modname,
++	       const char *command,
++	       struct module_command *commands)
++{
++	struct module_command *new;
++
++	new = NOFAIL(malloc(sizeof(*new)));
++	new->modulename = NOFAIL(strdup(modname));
++	new->command = NOFAIL(strdup(command));
++	new->next = commands;
++	return new;
++}
++
++/* Link in a new alias line from the config file. */
++static struct module_alias *
++add_alias(const char *modname, struct module_alias *aliases)
++{
++	struct module_alias *new;
++
++	new = NOFAIL(malloc(sizeof(*new)));
++	new->module = NOFAIL(strdup(modname));
++	new->next = aliases;
++	return new;
++}
++
++/* Link in a new blacklist line from the config file. */
++static struct module_blacklist *
++add_blacklist(const char *modname, struct module_blacklist *blacklist)
++{
++	struct module_blacklist *new;
++
++	new = NOFAIL(malloc(sizeof(*new)));
++	new->modulename = NOFAIL(strdup(modname));
++	new->next = blacklist;
++	return new;
++}
++
++/* Find blacklist commands if any. */
++static  int
++find_blacklist(const char *modname, const struct module_blacklist *blacklist)
++{
++	while (blacklist) {
++		if (strcmp(blacklist->modulename, modname) == 0)
++			return 1;
++		blacklist = blacklist->next;
++	}
++	return 0;
++}
++
++/* return a new alias list, with backlisted elems filtered out */
++static struct module_alias *
++apply_blacklist(const struct module_alias *aliases,
++		const struct module_blacklist *blacklist)
++{
++	struct module_alias *result = NULL;
++	while (aliases) {
++		char *modname = aliases->module;
++		if (!find_blacklist(modname, blacklist))
++			result = add_alias(modname, result);
++		aliases = aliases->next;
++	}
++	return result;
++}
++
++/* Find install commands if any. */
++static const char *find_command(const char *modname,
++				const struct module_command *commands)
++{
++	while (commands) {
++		if (fnmatch(commands->modulename, modname, 0) == 0)
++			return commands->command;
++		commands = commands->next;
++	}
++	return NULL;
++}
++
++static char *append_option(char *options, const char *newoption)
++{
++	options = NOFAIL(realloc(options, strlen(options) + 1
++				 + strlen(newoption) + 1));
++	if (strlen(options)) strcat(options, " ");
++	strcat(options, newoption);
++	return options;
++}
++
++/* Add to options */
++static char *add_extra_options(const char *modname,
++			       char *optstring,
++			       const struct module_options *options)
++{
++	while (options) {
++		if (strcmp(options->modulename, modname) == 0)
++			optstring = append_option(optstring, options->options);
++		options = options->next;
++	}
++	return optstring;
++}
++
++/* If we don't flush, then child processes print before we do */
++static void verbose_printf(int verbose, const char *fmt, ...)
++{
++	va_list arglist;
++
++	if (verbose) {
++		va_start(arglist, fmt);
++		vprintf(fmt, arglist);
++		fflush(stdout);
++		va_end(arglist);
++	}
++}
++
++/* Do an install/remove command: replace $CMDLINE_OPTS if it's specified. */
++static void do_command(const char *modname,
++		       const char *command,
++		       int verbose, int dry_run,
++		       errfn_t error,
++		       const char *type,
++		       const char *cmdline_opts)
++{
++	int ret;
++	char *p, *replaced_cmd = NOFAIL(strdup(command));
++
++	while ((p = strstr(replaced_cmd, "$CMDLINE_OPTS")) != NULL) {
++		char *new;
++		asprintf(&new, "%.*s%s%s",
++			 p - replaced_cmd, replaced_cmd, cmdline_opts,
++			 p + strlen("$CMDLINE_OPTS"));
++		NOFAIL(new);
++		free(replaced_cmd);
++		replaced_cmd = new;
++	}
++
++	verbose_printf(verbose, "%s %s\n", type, replaced_cmd);
++	if (dry_run)
++		return;
++
++	setenv("MODPROBE_MODULE", modname, 1);
++	ret = system(replaced_cmd);
++	if (ret == -1 || WEXITSTATUS(ret))
++		error("Error running %s command for %s\n", type, modname);
++	free(replaced_cmd);
++}
++
++/* Actually do the insert.  Frees second arg. */
++static void insmod(struct list_head *list,
++		   char *optstring,
++		   const char *newname,
++		   int first_time,
++		   errfn_t error,
++		   int dry_run,
++		   int verbose,
++		   const struct module_options *options,
++		   const struct module_command *commands,
++		   int ignore_commands,
++		   int ignore_proc,
++		   int strip_vermagic,
++		   int strip_modversion,
++		   const char *cmdline_opts)
++{
++	int ret, fd;
++	unsigned long len;
++	void *map;
++	const char *command;
++	struct module *mod = list_entry(list->next, struct module, list);
++
++	/* Take us off the list. */
++	list_del(&mod->list);
++
++	/* Do things we (or parent) depend on first, but don't die if
++	 * they fail. */
++	if (!list_empty(list)) {
++		insmod(list, NOFAIL(strdup("")), NULL, 0, warn,
++		       dry_run, verbose, options, commands, 0, ignore_proc,
++		       strip_vermagic, strip_modversion, cmdline_opts);
++	}
++
++	/* Lock before we look, in case it's initializing. */
++	fd = lock_file(mod->filename);
++	if (fd < 0) {
++		error("Could not open '%s': %s\n",
++		      mod->filename, strerror(errno));
++		goto out_optstring;
++	}
++
++	/* Don't do ANYTHING if already in kernel. */
++	if (!ignore_proc
++	    && module_in_kernel(newname ?: mod->modname, NULL) == 1) {
++		if (first_time)
++			error("Module %s already in kernel.\n",
++			      newname ?: mod->modname);
++		goto out_unlock;
++	}
++
++	command = find_command(mod->modname, commands);
++	if (command && !ignore_commands) {
++		/* It might recurse: unlock. */
++		unlock_file(fd);
++		do_command(mod->modname, command, verbose, dry_run, error,
++			   "install", cmdline_opts);
++		goto out_optstring;
++	}
++
++	map = grab_fd(fd, &len);
++	if (!map) {
++		error("Could not read '%s': %s\n",
++		      mod->filename, strerror(errno));
++		goto out_unlock;
++	}
++
++	/* Rename it? */
++	if (newname)
++		rename_module(mod, map, len, newname);
++
++	if (strip_modversion)
++		strip_section(mod, map, len, "__versions");
++	if (strip_vermagic)
++		clear_magic(mod, map, len);
++
++	/* Config file might have given more options */
++	optstring = add_extra_options(mod->modname, optstring, options);
++
++	verbose_printf(verbose, "insmod %s %s\n", mod->filename, optstring);
++
++	if (dry_run)
++		goto out;
++
++	ret = init_module(map, len, optstring);
++	if (ret != 0) {
++		if (errno == EEXIST) {
++			if (first_time)
++				error("Module %s already in kernel.\n",
++				      newname ?: mod->modname);
++			goto out_unlock;
++		}
++		error("Error inserting %s (%s): %s\n",
++		      mod->modname, mod->filename, insert_moderror(errno));
++	}
++ out:
++	release_file(map, len);
++ out_unlock:
++	unlock_file(fd);
++ out_optstring:
++	free(optstring);
++	return;
++}
++
++/* Do recursive removal. */
++static void rmmod(struct list_head *list,
++		  const char *name,
++		  int first_time,
++		  errfn_t error,
++		  int dry_run,
++		  int verbose,
++		  struct module_command *commands,
++		  int ignore_commands,
++		  int ignore_inuse,
++		  const char *cmdline_opts)
++{
++	const char *command;
++	unsigned int usecount = 0;
++	int lock;
++	struct module *mod = list_entry(list->next, struct module, list);
++
++	/* Take first one off the list. */
++	list_del(&mod->list);
++
++	/* Ignore failure; it's best effort here. */
++	lock = lock_file(mod->filename);
++
++	if (!name)
++		name = mod->modname;
++
++	/* Even if renamed, find commands to orig. name. */
++	command = find_command(mod->modname, commands);
++	if (command && !ignore_commands) {
++		/* It might recurse: unlock. */
++		unlock_file(lock);
++		do_command(mod->modname, command, verbose, dry_run, error,
++			   "remove", cmdline_opts);
++		goto remove_rest_no_unlock;
++	}
++
++	if (module_in_kernel(name, &usecount) == 0)
++		goto nonexistent_module;
++
++	if (usecount != 0) {
++		if (!ignore_inuse)
++			error("Module %s is in use.\n", name);
++		goto remove_rest;
++	}
++
++	verbose_printf(verbose, "rmmod %s\n", mod->filename);
++
++	if (dry_run)
++		goto remove_rest;
++
++	if (delete_module(name, O_EXCL) != 0) {
++		if (errno == ENOENT)
++			goto nonexistent_module;
++		error("Error removing %s (%s): %s\n",
++		      name, mod->filename,
++		      remove_moderror(errno));
++	}
++
++ remove_rest:
++	unlock_file(lock);
++ remove_rest_no_unlock:
++	/* Now do things we depend. */
++	if (!list_empty(list))
++		rmmod(list, NULL, 0, warn, dry_run, verbose, commands,
++		      0, 1, cmdline_opts);
++	return;
++
++nonexistent_module:
++	if (first_time)
++		fatal("Module %s is not in kernel.\n", mod->modname);
++	goto remove_rest;
++}
++
++/* Does path contain directory(s) subpath? */
++static int type_matches(const char *path, const char *subpath)
++{
++	char *subpath_with_slashes;
++	int ret;
++
++	asprintf(&subpath_with_slashes, "/%s/", subpath);
++	NOFAIL(subpath_with_slashes);
++
++	ret = (strstr(path, subpath_with_slashes) != NULL);
++	free(subpath_with_slashes);
++	return ret;
++}
++
++static char *underscores(char *string)
++{
++	if (string) {
++		unsigned int i;
++		for (i = 0; string[i]; i++)
++			if (string[i] == '-')
++				string[i] = '_';
++	}
++	return string;
++}
++
++static int do_wildcard(const char *dirname,
++		       const char *type,
++		       const char *wildcard)
++{
++	char modules_dep_name[strlen(dirname) + sizeof("modules.dep") + 1];
++	char *line, *wcard;
++	FILE *modules_dep;
++
++	/* Canonicalize wildcard */
++	wcard = strdup(wildcard);
++	underscores(wcard);
++
++	sprintf(modules_dep_name, "%s/%s", dirname, "modules.dep");
++	modules_dep = fopen(modules_dep_name, "r");
++	if (!modules_dep)
++		fatal("Could not load %s: %s\n",
++		      modules_dep_name, strerror(errno));
++
++	while ((line = getline_wrapped(modules_dep, NULL)) != NULL) {
++		char *ptr;
++
++		/* Ignore lines without : or which start with a # */
++		ptr = strchr(line, ':');
++		if (ptr == NULL || line[strspn(line, "\t ")] == '#')
++			goto next;
++		*ptr = '\0';
++
++		/* "type" must match complete directory component(s). */
++		if (!type || type_matches(line, type)) {
++			char modname[strlen(line)+1];
++
++			filename2modname(modname, line);
++			if (fnmatch(wcard, modname, 0) == 0)
++				printf("%s\n", line);
++		}
++	next:
++		free(line);
++	}
++
++	free(wcard);
++	return 0;
++}
++
++static char *strsep_skipspace(char **string, char *delim)
++{
++	if (!*string)
++		return NULL;
++	*string += strspn(*string, delim);
++	return strsep(string, delim);
++}
++
++/* Recursion */
++static int read_config(const char *filename,
++		       const char *name,
++		       int dump_only,
++		       int removing,
++		       struct module_options **options,
++		       struct module_command **commands,
++		       struct module_alias **alias,
++		       struct module_blacklist **blacklist);
++
++/* FIXME: Maybe should be extended to "alias a b [and|or c]...". --RR */
++static int read_config_file(const char *filename,
++			    const char *name,
++			    int dump_only,
++			    int removing,
++			    struct module_options **options,
++			    struct module_command **commands,
++			    struct module_alias **aliases,
++			    struct module_blacklist **blacklist)
++{
++	char *line;
++	unsigned int linenum = 0;
++	FILE *cfile;
++
++	cfile = fopen(filename, "r");
++	if (!cfile)
++		return 0;
++
++	while ((line = getline_wrapped(cfile, &linenum)) != NULL) {
++		char *ptr = line;
++		char *cmd, *modname;
++
++		if (dump_only)
++			printf("%s\n", line);
++
++		cmd = strsep_skipspace(&ptr, "\t ");
++		if (cmd == NULL || cmd[0] == '#' || cmd[0] == '\0')
++			continue;
++
++		if (strcmp(cmd, "alias") == 0) {
++			char *wildcard
++				= underscores(strsep_skipspace(&ptr, "\t "));
++			char *realname
++				= underscores(strsep_skipspace(&ptr, "\t "));
++
++			if (!wildcard || !realname)
++				grammar(cmd, filename, linenum);
++			else if (fnmatch(wildcard,name,0) == 0)
++				*aliases = add_alias(realname, *aliases);
++		} else if (strcmp(cmd, "include") == 0) {
++			struct module_alias *newalias = NULL;
++			char *newfilename;
++
++			newfilename = strsep_skipspace(&ptr, "\t ");
++			if (!newfilename)
++				grammar(cmd, filename, linenum);
++			else {
++				if (!read_config(newfilename, name,
++						 dump_only, removing,
++						 options, commands, &newalias,
++						 blacklist))
++					warn("Failed to open included"
++					      " config file %s: %s\n",
++					      newfilename, strerror(errno));
++
++				/* Files included override aliases,
++				   etc that was already set ... */
++				if (newalias)
++					*aliases = newalias;
++			}
++		} else if (strcmp(cmd, "options") == 0) {
++			modname = strsep_skipspace(&ptr, "\t ");
++			if (!modname || !ptr)
++				grammar(cmd, filename, linenum);
++			else {
++				ptr += strspn(ptr, "\t ");
++				*options = add_options(underscores(modname),
++						       ptr, *options);
++			}
++		} else if (strcmp(cmd, "install") == 0) {
++			modname = strsep_skipspace(&ptr, "\t ");
++			if (!modname || !ptr)
++				grammar(cmd, filename, linenum);
++			else if (!removing) {
++				ptr += strspn(ptr, "\t ");
++				*commands = add_command(underscores(modname),
++							ptr, *commands);
++			}
++		} else if (strcmp(cmd, "blacklist") == 0) {
++			modname = strsep_skipspace(&ptr, "\t ");
++			if (!modname)
++				grammar(cmd, filename, linenum);
++			else if (!removing) {
++				*blacklist = add_blacklist(underscores(modname),
++							*blacklist);
++			}
++		} else if (strcmp(cmd, "remove") == 0) {
++			modname = strsep_skipspace(&ptr, "\t ");
++			if (!modname || !ptr)
++				grammar(cmd, filename, linenum);
++			else if (removing) {
++				ptr += strspn(ptr, "\t ");
++				*commands = add_command(underscores(modname),
++							ptr, *commands);
++			}
++		} else
++			grammar(cmd, filename, linenum);
++
++		free(line);
++	}
++	fclose(cfile);
++	return 1;
++}
++
++/* Simple format, ignore lines starting with #, one command per line.
++   Returns true or false. */
++static int read_config(const char *filename,
++		       const char *name,
++		       int dump_only,
++		       int removing,
++		       struct module_options **options,
++		       struct module_command **commands,
++		       struct module_alias **aliases,
++		       struct module_blacklist **blacklist)
++{
++	DIR *dir;
++	int ret = 0;
++
++	/* ignore everything in this directory */
++	if (streq(filename, "/etc/modprobe.d/arch"))
++		return 1;
++
++	/* Reiser4 has file/directory duality: treat it as both. */
++	dir = opendir(filename);
++	if (dir) {
++		struct dirent *i;
++		while ((i = readdir(dir)) != NULL) {
++			if (!streq(i->d_name,".") && !streq(i->d_name,"..")) {
++				char sub[strlen(filename) + 1
++					 + strlen(i->d_name) + 1];
++
++				sprintf(sub, "%s/%s", filename, i->d_name);
++				if (!read_config(sub, name,
++						 dump_only, removing, options,
++						 commands, aliases, blacklist))
++					warn("Failed to open"
++					     " config file %s: %s\n",
++					     sub, strerror(errno));
++			}
++		}
++		closedir(dir);
++		ret = 1;
++	}
++
++	if (read_config_file(filename, name, dump_only, removing,
++			     options, commands, aliases, blacklist))
++		ret = 1;
++
++	return ret;
++}
++
++static const char *default_configs[] = 
++{
++	"/etc/modprobe.conf",
++	"/etc/modprobe.d",
++};
++
++static void read_toplevel_config(const char *filename,
++				 const char *name,
++				 int dump_only,
++				 int removing,
++				 struct module_options **options,
++				 struct module_command **commands,
++				 struct module_alias **aliases,
++				 struct module_blacklist **blacklist)
++{
++	unsigned int i;
++
++	if (filename) {
++		if (!read_config(filename, name, dump_only, removing,
++				 options, commands, aliases, blacklist))
++			fatal("Failed to open config file %s: %s\n",
++			      filename, strerror(errno));
++		return;
++	}
++
++	/* Try defaults. */
++	for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
++		if (read_config(default_configs[i], name, dump_only, removing,
++				options, commands, aliases, blacklist))
++			return;
++	}
++}
++
++static void add_to_env_var(const char *option)
++{
++	const char *oldenv;
++
++	if ((oldenv = getenv("MODPROBE_OPTIONS")) != NULL) {
++		char *newenv;
++		asprintf(&newenv, "%s %s", oldenv, option);
++		setenv("MODPROBE_OPTIONS", newenv, 1);
++	} else
++		setenv("MODPROBE_OPTIONS", option, 1);
++}
++
++/* Prepend options from environment. */
++static char **merge_args(char *args, char *argv[], int *argc)
++{
++	char *arg, *argstring;
++	char **newargs = NULL;
++	unsigned int i, num_env = 0;
++
++	if (!args)
++		return argv;
++
++	argstring = NOFAIL(strdup(args));
++	for (arg = strtok(argstring, " "); arg; arg = strtok(NULL, " ")) {
++		num_env++;
++		newargs = NOFAIL(realloc(newargs,
++					 sizeof(newargs[0])
++					 * (num_env + *argc + 1)));
++		newargs[num_env] = arg;
++	}
++
++	/* Append commandline args */
++	newargs[0] = argv[0];
++	for (i = 1; i <= *argc; i++)
++		newargs[num_env+i] = argv[i];
++
++	*argc += num_env;
++	return newargs;
++}
++
++static char *gather_options(char *argv[])
++{
++	char *optstring = NOFAIL(strdup(""));
++
++	/* Rest is module options */
++	while (*argv) {
++		/* Quote value if it contains spaces. */
++		unsigned int eq = strcspn(*argv, "=");
++
++		if (strchr(*argv+eq, ' ') && !strchr(*argv, '"')) {
++			char quoted[strlen(*argv) + 3];
++			(*argv)[eq] = '\0';
++			sprintf(quoted, "%s=\"%s\"", *argv, *argv+eq+1);
++			optstring = append_option(optstring, quoted);
++		} else
++			optstring = append_option(optstring, *argv);
++		argv++;
++	}
++	return optstring;
++}
++
++static void handle_module(const char *modname,
++			  struct list_head *todo_list,
++			  const char *newname,
++			  int remove,
++			  char *options,
++			  int first_time,
++			  errfn_t error,
++			  int dry_run,
++			  int verbose,
++			  struct module_options *modoptions,
++			  struct module_command *commands,
++			  int ignore_commands,
++			  int ignore_proc,
++			  int strip_vermagic,
++			  int strip_modversion,
++			  int unknown_silent,
++			  const char *cmdline_opts)
++{
++	if (list_empty(todo_list)) {
++		const char *command;
++
++		/* The dependencies have to be real modules, but
++		   handle case where the first is completely bogus. */
++		command = find_command(modname, commands);
++		if (command && !ignore_commands) {
++			do_command(modname, command, verbose, dry_run, error,
++				   remove ? "remove":"install", cmdline_opts);
++			return;
++		}
++
++		if (unknown_silent)
++			exit(1);
++		error("Module %s not found.\n", modname);
++		return;
++	}
++
++	if (remove)
++		rmmod(todo_list, newname, first_time, error, dry_run, verbose,
++		      commands, ignore_commands, 0, cmdline_opts);
++	else
++		insmod(todo_list, NOFAIL(strdup(options)), newname,
++		       first_time, error, dry_run, verbose, modoptions,
++		       commands, ignore_commands, ignore_proc, strip_vermagic,
++		       strip_modversion, cmdline_opts);
++}
++
++static struct option options[] = { { "verbose", 0, NULL, 'v' },
++				   { "version", 0, NULL, 'V' },
++				   { "config", 1, NULL, 'C' },
++				   { "name", 1, NULL, 'o' },
++				   { "remove", 0, NULL, 'r' },
++				   { "showconfig", 0, NULL, 'c' },
++				   { "autoclean", 0, NULL, 'k' },
++				   { "quiet", 0, NULL, 'q' },
++				   { "show", 0, NULL, 'n' },
++				   { "dry-run", 0, NULL, 'n' },
++				   { "syslog", 0, NULL, 's' },
++				   { "type", 1, NULL, 't' },
++				   { "list", 0, NULL, 'l' },
++				   { "all", 0, NULL, 'a' },
++				   { "ignore-install", 0, NULL, 'i' },
++				   { "ignore-remove", 0, NULL, 'i' },
++				   { "force", 0, NULL, 'f' },
++				   { "force-vermagic", 0, NULL, 1 },
++				   { "force-modversion", 0, NULL, 2 },
++				   { "set-version", 1, NULL, 'S' },
++				   { "show-depends", 0, NULL, 'D' },
++				   { "first-time", 0, NULL, 3 },
++				   { "use-blacklist", 0, NULL, 'b' },
++				   { NULL, 0, NULL, 0 } };
++
++#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs"
++
++/* This is a horrible hack to allow devfsd, which calls modprobe with
++   -C /etc/modules.conf or /etc/modules.devfs, to work.  FIXME. */
++/* Modern devfsd or variants should use -q explicitly in 2.6. */
++static int is_devfs_call(char *argv[])
++{
++	unsigned int i;
++
++	/* Look for "/dev" arg */
++	for (i = 1; argv[i]; i++) {
++		if (strncmp(argv[i], "/dev/", 5) == 0)
++			return 1;
++	}
++	return 0;
++}
++
++int main(int argc, char *argv[])
++{
++	struct utsname buf;
++	struct stat statbuf;
++	int opt;
++	int dump_only = 0;
++	int dry_run = 0;
++	int remove = 0;
++	int verbose = 0;
++	int unknown_silent = 0;
++	int list_only = 0;
++	int all = 0;
++	int ignore_commands = 0;
++	int strip_vermagic = 0;
++	int strip_modversion = 0;
++	int ignore_proc = 0;
++	int first_time = 0;
++	int use_blacklist = 0;
++	unsigned int i, num_modules;
++	char *type = NULL;
++	const char *config = NULL;
++	char *dirname, *optstring;
++	char *newname = NULL;
++	char *aliasfilename, *symfilename;
++	errfn_t error = fatal;
++
++	/* Prepend options from environment. */
++	argv = merge_args(getenv("MODPROBE_OPTIONS"), argv, &argc);
++
++	/* --set-version overrides version, and disables backwards compat. */
++	for (opt = 1; opt < argc; opt++)
++		if (strncmp(argv[opt],"--set-version",strlen("--set-version"))
++		    == 0)
++			break;
++
++	if (opt == argc)
++		try_old_version("modprobe", argv);
++
++	uname(&buf);
++	while ((opt = getopt_long(argc, argv, "vVC:o:rknqQsclt:aifb", options, NULL)) != -1){
++		switch (opt) {
++		case 'v':
++			add_to_env_var("-v");
++			verbose = 1;
++			break;
++		case 'V':
++			puts("module-init-tools version 3.2.2");
++			exit(0);
++		case 'S':
++			strncpy(buf.release, optarg, sizeof(buf.release));
++			buf.release[sizeof(buf.release)-1] = '\0';
++			break;
++		case 'C':
++			if (is_devfs_call(argv)) {
++				if (streq("/etc/modules.devfs", optarg)) {
++					config = MODPROBE_DEVFSD_CONF;
++					add_to_env_var("-C");
++					add_to_env_var(config);
++					/* Fall thru to -q */
++				} else if (streq("/etc/modules.conf", optarg))
++					/* Ignore config, fall thru to -q */
++					;
++				else {
++					/* False alarm.  Treat as normal. */
++					config = optarg;
++					add_to_env_var("-C");
++					add_to_env_var(config);
++					break;
++				}
++			} else {
++				config = optarg;
++				add_to_env_var("-C");
++				add_to_env_var(config);
++				break;
++			}
++		case 'q':
++			unknown_silent = 1;
++			add_to_env_var("-q");
++			break;
++		case 'D':
++			dry_run = 1;
++			ignore_proc = 1;
++			verbose = 1;
++			add_to_env_var("-D");
++			break;
++		case 'o':
++			newname = optarg;
++			break;
++		case 'r':
++			remove = 1;
++			break;
++		case 'c':
++			dump_only = 1;
++			break;
++		case 't':
++			type = optarg;
++			break;
++		case 'l':
++			list_only = 1;
++			break;
++		case 'a':
++			all = 1;
++			error = warn;
++			break;
++		case 'k':
++			/* FIXME: This should actually do something */
++			break;
++		case 'n':
++			dry_run = 1;
++			break;
++		case 's':
++			add_to_env_var("-s");
++			log = 1;
++			break;
++		case 'i':
++			ignore_commands = 1;
++			break;
++		case 'f':
++			strip_vermagic = 1;
++			strip_modversion = 1;
++			break;
++		case 'b':
++			use_blacklist = 1;
++			break;
++		case 1:
++			strip_vermagic = 1;
++			break;
++		case 2:
++			strip_modversion = 1;
++			break;
++		case 3:
++			first_time = 1;
++			break;
++		default:
++			print_usage(argv[0]);
++		}
++	}
++
++	/* If stderr not open, go to syslog */
++	if (log || fstat(STDERR_FILENO, &statbuf) != 0) {
++		openlog("modprobe", LOG_CONS, LOG_DAEMON);
++		log = 1;
++	}
++
++	if (argc < optind + 1 && !dump_only && !list_only && !remove)
++		print_usage(argv[0]);
++
++	dirname = NOFAIL(malloc(strlen(buf.release) + sizeof(MODULE_DIR) + 1));
++	sprintf(dirname, "%s/%s", MODULE_DIR, buf.release);
++	aliasfilename = NOFAIL(malloc(strlen(dirname)
++				      + sizeof("/modules.alias")));
++	sprintf(aliasfilename, "%s/modules.alias", dirname);
++	symfilename = NOFAIL(malloc(strlen(dirname)
++				    + sizeof("/modules.symbols")));
++	sprintf(symfilename, "%s/modules.symbols", dirname);
++
++	/* Old-style -t xxx wildcard?  Only with -l. */
++	if (list_only) {
++		if (optind+1 < argc)
++			fatal("Can't have multiple wildcards\n");
++		/* fprintf(stderr, "man find\n"); return 1; */
++		return do_wildcard(dirname, type, argv[optind]?:"*");
++	}
++	if (type)
++		fatal("-t only supported with -l");
++
++	if (dump_only) {
++		struct module_command *commands = NULL;
++		struct module_options *modoptions = NULL;
++		struct module_alias *aliases = NULL;
++		struct module_blacklist *blacklist = NULL;
++
++		read_toplevel_config(config, "", 1, 0,
++			     &modoptions, &commands, &aliases, &blacklist);
++		read_config(aliasfilename, "", 1, 0,&modoptions, &commands,
++			    &aliases, &blacklist);
++		read_config(symfilename, "", 1, 0, &modoptions, &commands,
++			    &aliases, &blacklist);
++		exit(0);
++	}
++
++	if (remove || all) {
++		num_modules = argc - optind;
++		optstring = NOFAIL(strdup(""));
++	} else {
++		num_modules = 1;
++		optstring = gather_options(argv+optind+1);
++	}
++
++	/* num_modules is always 1 except for -r or -a. */
++	for (i = 0; i < num_modules; i++) {
++		struct module_command *commands = NULL;
++		struct module_options *modoptions = NULL;
++		struct module_alias *aliases = NULL;
++		struct module_blacklist *blacklist = NULL;
++		LIST_HEAD(list);
++		char *modulearg = argv[optind + i];
++
++		/* Convert name we are looking for */
++		underscores(modulearg);
++
++		/* Returns the resolved alias, options */
++		read_toplevel_config(config, modulearg, 0,
++		     remove, &modoptions, &commands, &aliases, &blacklist);
++
++		/* No luck?  Try symbol names, if starts with symbol:. */
++		if (!aliases
++		    && strncmp(modulearg, "symbol:", strlen("symbol:")) == 0)
++			read_config(symfilename, modulearg, 0,
++			    remove, &modoptions, &commands,
++			    	&aliases, &blacklist);
++
++		if (!aliases) {
++			/* We only use canned aliases as last resort. */
++			read_depends(dirname, modulearg, &list);
++
++			if (list_empty(&list)
++			    && !find_command(modulearg, commands))
++			{
++				read_config(aliasfilename, modulearg, 0,
++					    remove, &modoptions, &commands,
++					    &aliases, &blacklist);
++				aliases = apply_blacklist(aliases, blacklist);
++			}
++		}
++
++		if (aliases) {
++			errfn_t err = error;
++
++			/* More than one alias?  Don't bail out on failure. */
++			if (aliases->next)
++				err = warn;
++			while (aliases) {
++				/* Add the options for this alias. */
++				char *opts = NOFAIL(strdup(optstring));
++				opts = add_extra_options(modulearg,
++							 opts, modoptions);
++
++				read_depends(dirname, aliases->module, &list);
++				handle_module(aliases->module, &list, newname,
++					      remove, opts, first_time, err,
++					      dry_run, verbose, modoptions,
++					      commands, ignore_commands,
++					      ignore_proc, strip_vermagic,
++					      strip_modversion,
++					      unknown_silent,
++					      optstring);
++
++				aliases = aliases->next;
++				INIT_LIST_HEAD(&list);
++			}
++		} else {
++			if (use_blacklist
++			    && find_blacklist(modulearg, blacklist))
++				continue;
++
++			handle_module(modulearg, &list, newname, remove,
++				      optstring, first_time, error, dry_run,
++				      verbose, modoptions, commands,
++				      ignore_commands, ignore_proc,
++				      strip_vermagic, strip_modversion,
++				      unknown_silent, optstring);
++		}
++	}
++	if (log)
++		closelog();
++
++	return 0;
++}
+-- 
+1.6.3.3
+
diff --git a/recipes/klibc/klibc-1.5.17/staging.patch b/recipes/klibc/klibc-1.5.17/staging.patch
new file mode 100644
index 0000000000..9418c6b764
--- /dev/null
+++ b/recipes/klibc/klibc-1.5.17/staging.patch
@@ -0,0 +1,134 @@
+Index: klibc-1.5/Makefile
+===================================================================
+--- klibc-1.5.orig/Makefile	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/Makefile	2008-02-24 15:25:15.213824149 +0100
+@@ -33,7 +33,7 @@
+ export PERL       := perl
+ 
+ # Location for installation
+-export prefix      = /usr
++export prefix      = $(INST)
+ export bindir      = $(prefix)/bin
+ export libdir      = $(prefix)/lib
+ export mandir      = $(prefix)/man
+Index: klibc-1.5/scripts/Kbuild.install
+===================================================================
+--- klibc-1.5.orig/scripts/Kbuild.install	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/scripts/Kbuild.install	2008-02-24 15:24:28.085825030 +0100
+@@ -88,16 +88,12 @@
+ header:
+ 	$(Q)echo "  INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
+ 	$(Q)mkdir -p $(INSTALLROOT)$(bindir)
+-	$(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1
+-	$(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR)
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)
+ 	$(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+-	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+ 	$(Q)make -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
+ 	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
+-	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
+ 	$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
+ 
+ footer: header
+Index: klibc-1.5/usr/dash/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/dash/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/dash/Kbuild	2008-02-24 15:13:50.189827040 +0100
+@@ -107,5 +107,3 @@
+ $(obj)/arith.c: $(obj)/arith.h
+ 	$(Q):
+ 
+-# Targets to install
+-install-y := sh.shared
+Index: klibc-1.5/usr/gzip/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/gzip/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/gzip/Kbuild	2008-02-24 15:13:50.197824604 +0100
+@@ -21,5 +21,3 @@
+ # Cleaning
+ targets := gzip gzip.g gunzip zcat
+ 
+-# Targets to install
+-install-y := gzip gunzip zcat
+Index: klibc-1.5/usr/kinit/fstype/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/fstype/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/fstype/Kbuild	2008-02-24 15:13:50.201824503 +0100
+@@ -21,5 +21,3 @@
+ # Cleaning
+ clean-dirs := static shared
+ 
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/ipconfig/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/ipconfig/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/ipconfig/Kbuild	2008-02-24 15:13:50.205824123 +0100
+@@ -27,5 +27,3 @@
+ # Cleaning
+ clean-dirs := static shared
+ 
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/Kbuild	2008-02-24 15:13:50.209824302 +0100
+@@ -33,5 +33,3 @@
+ subdir- := fstype ipconfig nfsmount resume run-init
+ 
+ 
+-# install binary
+-install-y := kinit kinit.shared
+Index: klibc-1.5/usr/kinit/nfsmount/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/nfsmount/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/nfsmount/Kbuild	2008-02-24 15:13:50.213824201 +0100
+@@ -23,5 +23,3 @@
+ 
+ clean-dirs := static shared
+ 
+-# Install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/resume/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/resume/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/resume/Kbuild	2008-02-24 15:13:50.217824380 +0100
+@@ -26,5 +26,3 @@
+ # Cleaning
+ clean-dirs := static shared
+ 
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/run-init/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/run-init/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/run-init/Kbuild	2008-02-24 15:13:50.221824559 +0100
+@@ -25,5 +25,3 @@
+ # Cleaning
+ clean-dirs := static shared
+ 
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/klibc/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/klibc/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/klibc/Kbuild	2008-02-24 15:13:50.229824358 +0100
+@@ -175,5 +175,3 @@
+ 	          $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib))
+ 	$(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
+ 	                      $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib
+-	$(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
+-	                      $(INSTALLROOT)$(SHLIBDIR)
+Index: klibc-1.5/usr/utils/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/utils/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/utils/Kbuild	2008-02-24 15:13:50.229824358 +0100
+@@ -66,5 +66,3 @@
+ # Clean deletes the static and shared dir
+ clean-dirs := static shared
+ 
+-# install only install the shared binaries
+-install-y := $(shared-y) shared/reboot shared/poweroff
diff --git a/recipes/klibc/klibc-1.5.17/wc.patch b/recipes/klibc/klibc-1.5.17/wc.patch
new file mode 100644
index 0000000000..9063a5a1c3
--- /dev/null
+++ b/recipes/klibc/klibc-1.5.17/wc.patch
@@ -0,0 +1,245 @@
+---
+ usr/utils/Kbuild |    4 +-
+ usr/utils/wc.c   |  208 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 211 insertions(+), 1 deletions(-)
+ create mode 100644 usr/utils/wc.c
+
+diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild
+index a52ea61..7c8ccfb 100644
+--- a/usr/utils/Kbuild
++++ b/usr/utils/Kbuild
+@@ -3,7 +3,7 @@
+ #
+ 
+ progs := chroot dd mkdir mkfifo mknod mount pivot_root umount
+-progs += true false sleep ln nuke minips cat ls losetup
++progs += true false sleep ln nuke minips cat ls losetup wc
+ progs += uname halt kill readlink cpio sync dmesg modprobe
+ 
+ static-y := $(addprefix static/, $(progs))
+@@ -60,6 +60,8 @@ static/losetup-y    := losetup.o
+ shared/losetup-y    := losetup.o
+ static/modprobe-y   := modprobe.o
+ shared/modprobe-y   := modprobe.o
++static/wc-y	    := wc.o
++shared/wc-y	    := wc.o
+ 
+ # Additionally linked targets
+ always := static/reboot static/poweroff shared/reboot shared/poweroff
+diff --git a/usr/utils/wc.c b/usr/utils/wc.c
+new file mode 100644
+index 0000000..f5059fc
+--- /dev/null
++++ b/usr/utils/wc.c
+@@ -0,0 +1,208 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * wc implementation for busybox
++ *
++ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
++ *
++ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
++ */
++
++/* BB_AUDIT SUSv3 _NOT_ compliant -- option -m is not currently supported. */
++/* http://www.opengroup.org/onlinepubs/007904975/utilities/wc.html */
++
++/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
++ *
++ * Rewritten to fix a number of problems and do some size optimizations.
++ * Problems in the previous busybox implementation (besides bloat) included:
++ *  1) broken 'wc -c' optimization (read note below)
++ *  2) broken handling of '-' args
++ *  3) no checking of ferror on EOF returns
++ *  4) isprint() wasn't considered when word counting.
++ *
++ * TODO:
++ *
++ * When locale support is enabled, count multibyte chars in the '-m' case.
++ *
++ * NOTES:
++ *
++ * The previous busybox wc attempted an optimization using stat for the
++ * case of counting chars only.  I omitted that because it was broken.
++ * It didn't take into account the possibility of input coming from a
++ * pipe, or input from a file with file pointer not at the beginning.
++ *
++ * To implement such a speed optimization correctly, not only do you
++ * need the size, but also the file position.  Note also that the
++ * file position may be past the end of file.  Consider the example
++ * (adapted from example in gnu wc.c)
++ *
++ *      echo hello > /tmp/testfile &&
++ *      (dd ibs=1k skip=1 count=0 &> /dev/null; wc -c) < /tmp/testfile
++ *
++ * for which 'wc -c' should output '0'.
++ */
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#undef isspace
++#undef isprint
++#define isspace(c) ((((c) == ' ') || (((unsigned int)((c) - 9)) <= (13 - 9))))
++#define isprint(c) (((unsigned int)((c) - 0x20)) <= (0x7e - 0x20))
++#define isspace_given_isprint(c) ((c) == ' ')
++
++#define COUNT_T unsigned long
++#define COUNT_FMT "u"
++#define optind 1
++FILE *fopen_or_warn_stdin(const char *filename)
++{
++        FILE *fp = stdin;
++
++        if (filename[0]) {
++                fp = fopen(filename, "r");
++        }
++
++        return fp;
++}
++
++enum {
++	WC_LINES	= 0,
++	WC_WORDS	= 1,
++	WC_CHARS	= 2,
++	WC_LENGTH	= 3
++};
++
++int main(int argc, char **argv)
++{
++	FILE *fp;
++	const char *s, *arg;
++	const char *start_fmt = "%9"COUNT_FMT;
++	const char *fname_fmt = " %s\n";
++	COUNT_T *pcounts;
++	COUNT_T counts[4];
++	COUNT_T totals[4];
++	unsigned linepos;
++	unsigned u;
++	int num_files = 0;
++	int c;
++	signed char status = EXIT_SUCCESS;
++	signed char in_word;
++	unsigned print_type;
++
++	print_type = getopt(argc, argv, "lwcL");
++
++	if (print_type == 0) {
++		print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS);
++	}
++
++	argv += optind;
++	if (!argv[0]) {
++		*--argv = (char *) "wc";
++		fname_fmt = "\n";
++		if (!((print_type-1) & print_type)) /* exactly one option? */
++			start_fmt = "%"COUNT_FMT;
++	}
++
++	memset(totals, 0, sizeof(totals));
++
++	pcounts = counts;
++
++	while ((arg = *argv++) != 0) {
++		++num_files;
++		fp = fopen_or_warn_stdin(arg);
++		if (!fp) {
++			status = EXIT_FAILURE;
++			continue;
++		}
++
++		memset(counts, 0, sizeof(counts));
++		linepos = 0;
++		in_word = 0;
++
++		do {
++			/* Our -w doesn't match GNU wc exactly... oh well */
++
++			++counts[WC_CHARS];
++			c = getc(fp);
++			if (isprint(c)) {
++				++linepos;
++				if (!isspace_given_isprint(c)) {
++					in_word = 1;
++					continue;
++				}
++			} else if (((unsigned int)(c - 9)) <= 4) {
++				/* \t  9
++				 * \n 10
++				 * \v 11
++				 * \f 12
++				 * \r 13
++				 */
++				if (c == '\t') {
++					linepos = (linepos | 7) + 1;
++				} else {			/* '\n', '\r', '\f', or '\v' */
++				DO_EOF:
++					if (linepos > counts[WC_LENGTH]) {
++						counts[WC_LENGTH] = linepos;
++					}
++					if (c == '\n') {
++						++counts[WC_LINES];
++					}
++					if (c != '\v') {
++						linepos = 0;
++					}
++				}
++			} else if (c == EOF) {
++/*				if (ferror(fp)) {
++					status = EXIT_FAILURE;
++				}
++*/				--counts[WC_CHARS];
++				goto DO_EOF;		/* Treat an EOF as '\r'. */
++			} else {
++				continue;
++			}
++
++			counts[WC_WORDS] += in_word;
++			in_word = 0;
++			if (c == EOF) {
++				break;
++			}
++		} while (1);
++
++		if (totals[WC_LENGTH] < counts[WC_LENGTH]) {
++			totals[WC_LENGTH] = counts[WC_LENGTH];
++		}
++		totals[WC_LENGTH] -= counts[WC_LENGTH];
++
++		if(fp != stdin)
++			fclose(fp);
++
++	OUTPUT:
++		/* coreutils wc tries hard to print pretty columns
++		 * (saves results for all files, find max col len etc...)
++		 * we won't try that hard, it will bloat us too much */
++		s = start_fmt;
++		u = 0;
++		do {
++			if (print_type & (1 << u)) {
++				printf(s, pcounts[u]);
++				s = " %9"COUNT_FMT; /* Ok... restore the leading space. */
++			}
++			totals[u] += pcounts[u];
++		} while (++u < 4);
++		printf(fname_fmt, arg);
++	}
++
++	/* If more than one file was processed, we want the totals.  To save some
++	 * space, we set the pcounts ptr to the totals array.  This has the side
++	 * effect of trashing the totals array after outputting it, but that's
++	 * irrelavent since we no longer need it. */
++	if (num_files > 1) {
++		num_files = 0;				/* Make sure we don't get here again. */
++		arg = "total";
++		pcounts = totals;
++		--argv;
++		goto OUTPUT;
++	}
++
++	fflush(stdout);
++	exit(status);
++}
+-- 
+1.6.3.3
+
diff --git a/recipes/klibc/klibc-1.5.18/dash_readopt.patch b/recipes/klibc/klibc-1.5.18/dash_readopt.patch
new file mode 100644
index 0000000000..0633417f38
--- /dev/null
+++ b/recipes/klibc/klibc-1.5.18/dash_readopt.patch
@@ -0,0 +1,106 @@
+diff -uNr klibc-1.5.18.orig//usr/dash/miscbltin.c klibc-1.5.18/usr/dash/miscbltin.c
+--- klibc-1.5.18.orig//usr/dash/miscbltin.c	2010-04-22 02:08:49.000000000 +0200
++++ klibc-1.5.18/usr/dash/miscbltin.c	2010-05-03 13:55:32.000000000 +0200
+@@ -46,6 +46,7 @@
+ #include <ctype.h>
+ #include <stdint.h>
+ #include <time.h>		/* strtotimeval() */
++#include <termios.h>
+ 
+ #include "shell.h"
+ #include "options.h"
+@@ -140,6 +141,11 @@
+ 	int timeout;
+ 	int i;
+ 	fd_set set;
++	int n_flag = 0;
++	unsigned int nchars = 0;
++	int silent = 0;
++	struct termios tty, old_tty;
++
+ 	struct timeval ts, t0, t1, to;
+ 
+ 	ts.tv_sec = ts.tv_usec = 0;
+@@ -147,11 +153,18 @@
+ 	rflag = 0;
+ 	timeout = 0;
+ 	prompt = NULL;
+-	while ((i = nextopt("p:rt:")) != '\0') {
++	while ((i = nextopt("p:rt:n:s")) != '\0') {
+ 		switch(i) {
+ 		case 'p':
+ 			prompt = optionarg;
+ 			break;
++		case 'n':
++			nchars = strtoul(optionarg, NULL, 10);
++			n_flag = nchars; /* just a flag "nchars is nonzero" */
++			break;
++		case 's':
++			silent = 1;
++			break;
+ 		case 't':
+ 			p = strtotimeval(optionarg, &ts);
+ 			if (*p || (!ts.tv_sec && !ts.tv_usec))
+@@ -173,6 +186,24 @@
+ 	}
+ 	if (*(ap = argptr) == NULL)
+ 		sh_error("arg count");
++	if (n_flag || silent) {
++		if (tcgetattr(0, &tty) != 0) {
++			/* Not a tty */
++			n_flag = 0;
++			silent = 0;
++		} else {
++			old_tty = tty;
++			if (n_flag) {
++				tty.c_lflag &= ~ICANON;
++				tty.c_cc[VMIN] = nchars < 256 ? nchars : 255;
++			}
++			if (silent) {
++				tty.c_lflag &= ~(ECHO | ECHOK | ECHONL);
++			}
++			tcsetattr(0, TCSANOW, &tty);
++		}
++	}
++
+ 	status = 0;
+ 	backslash = 0;
+ 	if (timeout) {
+@@ -187,13 +218,15 @@
+ 		ts.tv_sec += t0.tv_sec;
+ 	}
+ 	STARTSTACKSTR(p);
+-	for (;;) {
++	do {
+ 		if (timeout) {
+ 			gettimeofday(&t1, NULL);
+ 			if (t1.tv_sec > ts.tv_sec ||
+ 			    (t1.tv_sec == ts.tv_sec &&
+ 			     t1.tv_usec >= ts.tv_usec)) {
+ 				status = 1;
++				if (n_flag)
++					tcsetattr(0, TCSANOW, &old_tty);
+ 				break;	/* Timeout! */
+ 			}
+ 
+@@ -210,6 +243,8 @@
+ 			FD_SET(0, &set);
+ 			if (select(1, &set, NULL, NULL, &to) != 1) {
+ 				status = 1;
++				if (n_flag)
++					tcsetattr(0, TCSANOW, &old_tty);
+ 				break; /* Timeout! */
+ 			}
+ 		}
+@@ -235,7 +270,10 @@
+ 		STPUTC(c, p);
+ resetbs:
+ 		backslash = 0;
+-	}
++	} while (!n_flag || --nchars);
++	if (n_flag || silent)
++		tcsetattr(0, TCSANOW, &old_tty);
++
+ 	STACKSTRNUL(p);
+ 	readcmd_handle_line(stackblock(), ap, p + 1 - (char *)stackblock());
+ 	return status;
diff --git a/recipes/klibc/klibc-1.5.18/modprobe.patch b/recipes/klibc/klibc-1.5.18/modprobe.patch
new file mode 100644
index 0000000000..d89010cc1c
--- /dev/null
+++ b/recipes/klibc/klibc-1.5.18/modprobe.patch
@@ -0,0 +1,1993 @@
+---
+ usr/utils/Kbuild     |    4 +-
+ usr/utils/list.h     |  238 +++++++
+ usr/utils/modprobe.c | 1710 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 1951 insertions(+), 1 deletions(-)
+ create mode 100644 usr/utils/list.h
+ create mode 100644 usr/utils/modprobe.c
+
+diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild
+index 57e2d08..a52ea61 100644
+--- a/usr/utils/Kbuild
++++ b/usr/utils/Kbuild
+@@ -4,7 +4,7 @@
+ 
+ progs := chroot dd mkdir mkfifo mknod mount pivot_root umount
+ progs += true false sleep ln nuke minips cat ls losetup
+-progs += uname halt kill readlink cpio sync dmesg
++progs += uname halt kill readlink cpio sync dmesg modprobe
+ 
+ static-y := $(addprefix static/, $(progs))
+ shared-y := $(addprefix shared/, $(progs))
+@@ -58,6 +58,8 @@ static/sync-y       := sync.o
+ shared/sync-y       := sync.o
+ static/losetup-y    := losetup.o
+ shared/losetup-y    := losetup.o
++static/modprobe-y   := modprobe.o
++shared/modprobe-y   := modprobe.o
+ 
+ # Additionally linked targets
+ always := static/reboot static/poweroff shared/reboot shared/poweroff
+diff --git a/usr/utils/list.h b/usr/utils/list.h
+new file mode 100644
+index 0000000..511303d
+--- /dev/null
++++ b/usr/utils/list.h
+@@ -0,0 +1,238 @@
++/* Stolen from Linux Kernel Source's list.h -- GPL. */
++#ifndef _MODINITTOOLS_LIST_H
++#define _MODINITTOOLS_LIST_H
++
++#undef offsetof
++#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
++
++/**
++ * container_of - cast a member of a structure out to the containing structure
++ *
++ * @ptr:	the pointer to the member.
++ * @type:	the type of the container struct this is embedded in.
++ * @member:	the name of the member within the struct.
++ *
++ */
++#define container_of(ptr, type, member) ({			\
++        const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
++        (type *)( (char *)__mptr - offsetof(type,member) );})
++
++/*
++ * Simple doubly linked list implementation.
++ *
++ * Some of the internal functions ("__xxx") are useful when
++ * manipulating whole lists rather than single entries, as
++ * sometimes we already know the next/prev entries and we can
++ * generate better code by using them directly rather than
++ * using the generic single-entry routines.
++ */
++
++struct list_head {
++	struct list_head *next, *prev;
++};
++
++#define LIST_HEAD_INIT(name) { &(name), &(name) }
++
++#define LIST_HEAD(name) \
++	struct list_head name = LIST_HEAD_INIT(name)
++
++#define INIT_LIST_HEAD(ptr) do { \
++	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
++} while (0)
++
++/*
++ * Insert a new entry between two known consecutive entries.
++ *
++ * This is only for internal list manipulation where we know
++ * the prev/next entries already!
++ */
++static inline void __list_add(struct list_head *new,
++			      struct list_head *prev,
++			      struct list_head *next)
++{
++	next->prev = new;
++	new->next = next;
++	new->prev = prev;
++	prev->next = new;
++}
++
++/**
++ * list_add - add a new entry
++ * @new: new entry to be added
++ * @head: list head to add it after
++ *
++ * Insert a new entry after the specified head.
++ * This is good for implementing stacks.
++ */
++static inline void list_add(struct list_head *new, struct list_head *head)
++{
++	__list_add(new, head, head->next);
++}
++
++/**
++ * list_add_tail - add a new entry
++ * @new: new entry to be added
++ * @head: list head to add it before
++ *
++ * Insert a new entry before the specified head.
++ * This is useful for implementing queues.
++ */
++static inline void list_add_tail(struct list_head *new, struct list_head *head)
++{
++	__list_add(new, head->prev, head);
++}
++
++/*
++ * Delete a list entry by making the prev/next entries
++ * point to each other.
++ *
++ * This is only for internal list manipulation where we know
++ * the prev/next entries already!
++ */
++static inline void __list_del(struct list_head * prev, struct list_head * next)
++{
++	next->prev = prev;
++	prev->next = next;
++}
++
++/**
++ * list_del - deletes entry from list.
++ * @entry: the element to delete from the list.
++ * Note: list_empty on entry does not return true after this, the entry is
++ * in an undefined state.
++ */
++static inline void list_del(struct list_head *entry)
++{
++	__list_del(entry->prev, entry->next);
++}
++
++/**
++ * list_del_init - deletes entry from list and reinitialize it.
++ * @entry: the element to delete from the list.
++ */
++static inline void list_del_init(struct list_head *entry)
++{
++	__list_del(entry->prev, entry->next);
++	INIT_LIST_HEAD(entry);
++}
++
++/**
++ * list_move - delete from one list and add as another's head
++ * @list: the entry to move
++ * @head: the head that will precede our entry
++ */
++static inline void list_move(struct list_head *list, struct list_head *head)
++{
++        __list_del(list->prev, list->next);
++        list_add(list, head);
++}
++
++/**
++ * list_move_tail - delete from one list and add as another's tail
++ * @list: the entry to move
++ * @head: the head that will follow our entry
++ */
++static inline void list_move_tail(struct list_head *list,
++				  struct list_head *head)
++{
++        __list_del(list->prev, list->next);
++        list_add_tail(list, head);
++}
++
++/**
++ * list_empty - tests whether a list is empty
++ * @head: the list to test.
++ */
++static inline int list_empty(struct list_head *head)
++{
++	return head->next == head;
++}
++
++static inline void __list_splice(struct list_head *list,
++				 struct list_head *head)
++{
++	struct list_head *first = list->next;
++	struct list_head *last = list->prev;
++	struct list_head *at = head->next;
++
++	first->prev = head;
++	head->next = first;
++
++	last->next = at;
++	at->prev = last;
++}
++
++/**
++ * list_splice - join two lists
++ * @list: the new list to add.
++ * @head: the place to add it in the first list.
++ */
++static inline void list_splice(struct list_head *list, struct list_head *head)
++{
++	if (!list_empty(list))
++		__list_splice(list, head);
++}
++
++/**
++ * list_splice_init - join two lists and reinitialise the emptied list.
++ * @list: the new list to add.
++ * @head: the place to add it in the first list.
++ *
++ * The list at @list is reinitialised
++ */
++static inline void list_splice_init(struct list_head *list,
++				    struct list_head *head)
++{
++	if (!list_empty(list)) {
++		__list_splice(list, head);
++		INIT_LIST_HEAD(list);
++	}
++}
++
++/**
++ * list_entry - get the struct for this entry
++ * @ptr:	the &struct list_head pointer.
++ * @type:	the type of the struct this is embedded in.
++ * @member:	the name of the list_struct within the struct.
++ */
++#define list_entry(ptr, type, member) \
++	container_of(ptr, type, member)
++
++/**
++ * list_for_each	-	iterate over a list
++ * @pos:	the &struct list_head to use as a loop counter.
++ * @head:	the head for your list.
++ */
++#define list_for_each(pos, head) \
++	for (pos = (head)->next; pos != (head); pos = pos->next)
++
++/**
++ * list_for_each_prev	-	iterate over a list backwards
++ * @pos:	the &struct list_head to use as a loop counter.
++ * @head:	the head for your list.
++ */
++#define list_for_each_prev(pos, head) \
++	for (pos = (head)->prev; pos != (head); pos = pos->prev)
++
++/**
++ * list_for_each_safe	-	iterate over a list safe against removal of list entry
++ * @pos:	the &struct list_head to use as a loop counter.
++ * @n:		another &struct list_head to use as temporary storage
++ * @head:	the head for your list.
++ */
++#define list_for_each_safe(pos, n, head) \
++	for (pos = (head)->next, n = pos->next; pos != (head); \
++		pos = n, n = pos->next)
++
++/**
++ * list_for_each_entry	-	iterate over list of given type
++ * @pos:	the type * to use as a loop counter.
++ * @head:	the head for your list.
++ * @member:	the name of the list_struct within the struct.
++ */
++#define list_for_each_entry(pos, head, member)				\
++	for (pos = list_entry((head)->next, typeof(*pos), member);	\
++	     &pos->member != (head);					\
++	     pos = list_entry(pos->member.next, typeof(*pos), member))
++
++#endif
+diff --git a/usr/utils/modprobe.c b/usr/utils/modprobe.c
+new file mode 100644
+index 0000000..8e8a437
+--- /dev/null
++++ b/usr/utils/modprobe.c
+@@ -0,0 +1,1710 @@
++/* modprobe.c: insert a module into the kernel, intelligently.
++    Copyright (C) 2001  Rusty Russell.
++    Copyright (C) 2002, 2003  Rusty Russell, IBM Corporation.
++
++    This program is free software; you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++*/
++#define _GNU_SOURCE /* asprintf */
++
++#include <sys/utsname.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++#include <stdarg.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <ctype.h>
++#include <string.h>
++#include <errno.h>
++#include <unistd.h>
++#include <dirent.h>
++#include <limits.h>
++#include <elf.h>
++#include <getopt.h>
++#include <fnmatch.h>
++#include <asm/unistd.h>
++#include <sys/wait.h>
++#include <syslog.h>
++#include <zlib.h>
++
++#define streq(a,b) (strcmp((a),(b)) == 0)
++#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
++
++#include "list.h"
++static inline void try_old_version(const char *progname, char *argv[])
++{
++}
++extern long init_module(void *, unsigned long, const char *);
++extern long delete_module(const char *, unsigned int);
++
++struct module {
++	struct list_head list;
++	char *modname;
++	char filename[0];
++};
++
++#ifndef MODULE_DIR
++#define MODULE_DIR "/lib/modules"
++#endif
++
++typedef void (*errfn_t)(const char *fmt, ...);
++
++/* Do we use syslog or stderr for messages? */
++static int log;
++
++static void message(const char *prefix, const char *fmt, va_list *arglist)
++{
++	char *buf, *buf2;
++
++	vasprintf(&buf, fmt, *arglist);
++	asprintf(&buf2, "%s%s", prefix, buf);
++
++	if (log)
++		syslog(LOG_NOTICE, "%s", buf2);
++	else
++		fprintf(stderr, "%s", buf2);
++	free(buf2);
++	free(buf);
++}
++void *grab_contents(gzFile *gzfd, unsigned long *size)
++{
++        unsigned int max = 16384;
++        void *buffer = malloc(max);
++        int ret;
++
++        if (!buffer)
++                return NULL;
++
++        *size = 0;
++        while ((ret = gzread(gzfd, buffer + *size, max - *size)) > 0) {
++                *size += ret;
++                if (*size == max) {
++                        buffer = realloc(buffer, max *= 2);
++                        if (!buffer)
++                                return NULL;
++                }
++        }
++        if (ret < 0) {
++                free(buffer);
++                buffer = NULL;
++        }
++        return buffer;
++}
++
++void *grab_fd(int fd, unsigned long *size)
++{
++        gzFile gzfd;
++
++        gzfd = gzdopen(fd, "rb");
++        if (!gzfd)
++                return NULL;
++
++        /* gzclose(gzfd) would close fd, which would drop locks.
++           Don't blame zlib: POSIX locking semantics are so horribly
++           broken that they should be ripped out. */
++        return grab_contents(gzfd, size);
++}
++void release_file(void *data, unsigned long size)
++{
++        free(data);
++}
++
++
++static int warned = 0;
++static void warn(const char *fmt, ...)
++{
++	va_list arglist;
++	warned++;
++	va_start(arglist, fmt);
++	message("WARNING: ", fmt, &arglist);
++	va_end(arglist);
++}
++
++static void fatal(const char *fmt, ...)
++{
++	va_list arglist;
++	va_start(arglist, fmt);
++	message("FATAL: ", fmt, &arglist);
++	va_end(arglist);
++	exit(1);
++}
++
++
++static void grammar(const char *cmd, const char *filename, unsigned int line)
++{
++	warn("%s line %u: ignoring bad line starting with '%s'\n",
++	     filename, line, cmd);
++}
++
++static void *do_nofail(void *ptr, const char *file, int line, const char *expr)
++{
++	if (!ptr) {
++		fatal("Memory allocation failure %s line %d: %s.\n",
++		      file, line, expr);
++	}
++	return ptr;
++}
++
++#define NOFAIL(ptr)	do_nofail((ptr), __FILE__, __LINE__, #ptr)
++
++static void print_usage(const char *progname)
++{
++	fprintf(stderr,
++		"Usage: %s [-v] [-V] [-C config-file] [-n] [-i] [-q] [-b] [-o <modname>] <modname> [parameters...]\n"
++		"%s -r [-n] [-i] [-v] <modulename> ...\n"
++		"%s -l -t <dirname> [ -a <modulename> ...]\n",
++		progname, progname, progname);
++	exit(1);
++}
++
++static int fgetc_wrapped(FILE *file, unsigned int *linenum)
++{
++	for (;;) {
++	  	int ch = fgetc(file);
++		if (ch != '\\')
++			return ch;
++		ch = fgetc(file);
++		if (ch != '\n')
++			return ch;
++		if (linenum)
++			(*linenum)++;
++	}
++}
++
++static char *getline_wrapped(FILE *file, unsigned int *linenum)
++{
++	int size = 1024;
++	int i = 0;
++	char *buf = NOFAIL(malloc(size));
++	for(;;) {
++		int ch = fgetc_wrapped(file, linenum);
++		if (i == size) {
++			size *= 2;
++			buf = NOFAIL(realloc(buf, size));
++		}
++		if (ch < 0 && i == 0) {
++			free(buf);
++			return NULL;
++		}
++		if (ch < 0 || ch == '\n') {
++			if (linenum)
++				(*linenum)++;
++			buf[i] = '\0';
++			return NOFAIL(realloc(buf, i+1));
++		}
++		buf[i++] = ch;
++	}
++}
++
++static struct module *find_module(const char *filename, struct list_head *list)
++{
++	struct module *i;
++
++	list_for_each_entry(i, list, list) {
++		if (strcmp(i->filename, filename) == 0)
++			return i;
++	}
++	return NULL;
++}
++
++/* Convert filename to the module name.  Works if filename == modname, too. */
++static void filename2modname(char *modname, const char *filename)
++{
++	const char *afterslash;
++	unsigned int i;
++
++	afterslash = strrchr(filename, '/');
++	if (!afterslash)
++		afterslash = filename;
++	else
++		afterslash++;
++
++	/* Convert to underscores, stop at first . */
++	for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) {
++		if (afterslash[i] == '-')
++			modname[i] = '_';
++		else
++			modname[i] = afterslash[i];
++	}
++	modname[i] = '\0';
++}
++
++static int lock_file(const char *filename)
++{
++	int fd = open(filename, O_RDWR, 0);
++
++	if (fd >= 0) {
++		struct flock lock;
++		lock.l_type = F_WRLCK;
++		lock.l_whence = SEEK_SET;
++		lock.l_start = 0;
++		lock.l_len = 1;
++		fcntl(fd, F_SETLKW, &lock);
++	} else
++		/* Read-only filesystem?  There goes locking... */
++		fd = open(filename, O_RDONLY, 0);
++	return fd;
++}
++
++static void unlock_file(int fd)
++{
++	/* Valgrind is picky... */
++	close(fd);
++}
++
++static void add_module(char *filename, int namelen, struct list_head *list)
++{
++	struct module *mod;
++
++	/* If it's a duplicate: move it to the end, so it gets
++	   inserted where it is *first* required. */
++	mod = find_module(filename, list);
++	if (mod)
++		list_del(&mod->list);
++	else {
++		/* No match.  Create a new module. */
++		mod = NOFAIL(malloc(sizeof(struct module) + namelen + 1));
++		memcpy(mod->filename, filename, namelen);
++		mod->filename[namelen] = '\0';
++		mod->modname = NOFAIL(malloc(namelen + 1));
++		filename2modname(mod->modname, mod->filename);
++	}
++
++	list_add_tail(&mod->list, list);
++}
++
++/* Compare len chars of a to b, with _ and - equivalent. */
++static int modname_equal(const char *a, const char *b, unsigned int len)
++{
++	unsigned int i;
++
++	if (strlen(b) != len)
++		return 0;
++
++	for (i = 0; i < len; i++) {
++		if ((a[i] == '_' || a[i] == '-')
++		    && (b[i] == '_' || b[i] == '-'))
++			continue;
++		if (a[i] != b[i])
++			return 0;
++	}
++	return 1;
++}
++
++/* Fills in list of modules if this is the line we want. */
++static int add_modules_dep_line(char *line,
++				const char *name,
++				struct list_head *list)
++{
++	char *ptr;
++	int len;
++	char *modname;
++
++	/* Ignore lines without : or which start with a # */
++	ptr = strchr(line, ':');
++	if (ptr == NULL || line[strspn(line, "\t ")] == '#')
++		return 0;
++
++	/* Is this the module we are looking for? */
++	*ptr = '\0';
++	if (strrchr(line, '/'))
++		modname = strrchr(line, '/') + 1;
++	else
++		modname = line;
++
++	len = strlen(modname);
++	if (strchr(modname, '.'))
++		len = strchr(modname, '.') - modname;
++	if (!modname_equal(modname, name, len))
++		return 0;
++
++	/* Create the list. */
++	add_module(line, ptr - line, list);
++
++	ptr++;
++	for(;;) {
++		char *dep_start;
++		ptr += strspn(ptr, " \t");
++		if (*ptr == '\0')
++			break;
++		dep_start = ptr;
++		ptr += strcspn(ptr, " \t");
++		add_module(dep_start, ptr - dep_start, list);
++	}
++	return 1;
++}
++
++static void read_depends(const char *dirname,
++			 const char *start_name,
++			 struct list_head *list)
++{
++	char *modules_dep_name;
++	char *line;
++	FILE *modules_dep;
++	int done = 0;
++
++	asprintf(&modules_dep_name, "%s/%s", dirname, "modules.dep");
++	modules_dep = fopen(modules_dep_name, "r");
++	if (!modules_dep)
++		fatal("Could not load %s: %s\n",
++		      modules_dep_name, strerror(errno));
++
++	/* Stop at first line, as we can have duplicates (eg. symlinks
++           from boot/ */
++	while (!done && (line = getline_wrapped(modules_dep, NULL)) != NULL) {
++		done = add_modules_dep_line(line, start_name, list);
++		free(line);
++	}
++	fclose(modules_dep);
++	free(modules_dep_name);
++}
++
++/* We use error numbers in a loose translation... */
++static const char *insert_moderror(int err)
++{
++	switch (err) {
++	case ENOEXEC:
++		return "Invalid module format";
++	case ENOENT:
++		return "Unknown symbol in module, or unknown parameter (see dmesg)";
++	case ENOSYS:
++		return "Kernel does not have module support";
++	default:
++		return strerror(err);
++	}
++}
++
++static const char *remove_moderror(int err)
++{
++	switch (err) {
++	case ENOENT:
++		return "No such module";
++	case ENOSYS:
++		return "Kernel does not have module unloading support";
++	default:
++		return strerror(err);
++	}
++}
++
++/* Is module in /proc/modules?  If so, fill in usecount if not NULL. 
++   0 means no, 1 means yes, -1 means unknown.
++ */
++static int module_in_kernel(const char *modname, unsigned int *usecount)
++{
++	FILE *proc_modules;
++	char *line;
++
++again:
++	/* Might not be mounted yet.  Don't fail. */
++	proc_modules = fopen("/proc/modules", "r");
++	if (!proc_modules)
++		return -1;
++
++	while ((line = getline_wrapped(proc_modules, NULL)) != NULL) {
++		char *entry = strtok(line, " \n");
++
++		if (entry && streq(entry, modname)) {
++			/* If it exists, usecount is the third entry. */
++			if (!strtok(NULL, " \n"))
++				goto out;
++
++			if (!(entry = strtok(NULL, " \n"))) /* usecount */
++				goto out;
++			else
++				if (usecount)
++					*usecount = atoi(entry);
++
++			/* Followed by - then status. */
++			if (strtok(NULL, " \n")
++			    && (entry = strtok(NULL, " \n")) != NULL) {
++				/* Locking will fail on ro fs, we might hit
++				 * cases where module is in flux.  Spin. */
++				if (streq(entry, "Loading")
++				    || streq(entry, "Unloading")) {
++					usleep(100000);
++					free(line);
++					fclose(proc_modules);
++					goto again;
++				}
++			}
++
++		out:
++			free(line);
++			fclose(proc_modules);
++			return 1;
++		}
++		free(line);
++	}
++	fclose(proc_modules);
++	return 0;
++}
++
++static void replace_modname(struct module *module,
++			    void *mem, unsigned long len,
++			    const char *oldname, const char *newname)
++{
++	char *p;
++
++	/* 64 - sizeof(unsigned long) - 1 */
++	if (strlen(newname) > 55)
++		fatal("New name %s is too long\n", newname);
++
++	/* Find where it is in the module structure.  Don't assume layout! */
++	for (p = mem; p < (char *)mem + len - strlen(oldname); p++) {
++		if (memcmp(p, oldname, strlen(oldname)) == 0) {
++			strcpy(p, newname);
++			return;
++		}
++	}
++
++	warn("Could not find old name in %s to replace!\n", module->filename);
++}
++
++static void *get_section32(void *file,
++			   unsigned long size,
++			   const char *name,
++			   unsigned long *secsize)
++{
++	Elf32_Ehdr *hdr = file;
++	Elf32_Shdr *sechdrs = file + hdr->e_shoff;
++	const char *secnames;
++	unsigned int i;
++
++	/* Too short? */
++	if (size < sizeof(*hdr))
++		return NULL;
++	if (size < hdr->e_shoff + hdr->e_shnum * sizeof(sechdrs[0]))
++		return NULL;
++	if (size < sechdrs[hdr->e_shstrndx].sh_offset)
++		return NULL;
++		
++	secnames = file + sechdrs[hdr->e_shstrndx].sh_offset;
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (strcmp(secnames + sechdrs[i].sh_name, name) == 0) {
++			*secsize = sechdrs[i].sh_size;
++			return file + sechdrs[i].sh_offset;
++		}
++	return NULL;
++}
++
++static void *get_section64(void *file,
++			   unsigned long size,
++			   const char *name,
++			   unsigned long *secsize)
++{
++	Elf64_Ehdr *hdr = file;
++	Elf64_Shdr *sechdrs = file + hdr->e_shoff;
++	const char *secnames;
++	unsigned int i;
++
++	/* Too short? */
++	if (size < sizeof(*hdr))
++		return NULL;
++	if (size < hdr->e_shoff + hdr->e_shnum * sizeof(sechdrs[0]))
++		return NULL;
++	if (size < sechdrs[hdr->e_shstrndx].sh_offset)
++		return NULL;
++		
++	secnames = file + sechdrs[hdr->e_shstrndx].sh_offset;
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (strcmp(secnames + sechdrs[i].sh_name, name) == 0) {
++			*secsize = sechdrs[i].sh_size;
++			return file + sechdrs[i].sh_offset;
++		}
++	return NULL;
++}
++
++static int elf_ident(void *mod, unsigned long size)
++{
++	/* "\177ELF" <byte> where byte = 001 for 32-bit, 002 for 64 */
++	char *ident = mod;
++
++	if (size < EI_CLASS || memcmp(mod, ELFMAG, SELFMAG) != 0)
++		return ELFCLASSNONE;
++	return ident[EI_CLASS];
++}
++
++static void *get_section(void *file,
++			 unsigned long size,
++			 const char *name,
++			 unsigned long *secsize)
++{
++	switch (elf_ident(file, size)) {
++	case ELFCLASS32:
++		return get_section32(file, size, name, secsize);
++	case ELFCLASS64:
++		return get_section64(file, size, name, secsize);
++	default:
++		return NULL;
++	}
++}
++
++static void rename_module(struct module *module,
++			  void *mod,
++			  unsigned long len,
++			  const char *newname)
++{
++	void *modstruct;
++	unsigned long modstruct_len;
++
++	/* Old-style */
++	modstruct = get_section(mod, len, ".gnu.linkonce.this_module",
++				&modstruct_len);
++	/* New-style */
++	if (!modstruct)
++		modstruct = get_section(mod, len, "__module", &modstruct_len);
++	if (!modstruct)
++		warn("Could not find module name to change in %s\n",
++		     module->filename);
++	else
++		replace_modname(module, modstruct, modstruct_len,
++				module->modname, newname);
++}
++
++/* Kernel told to ignore these sections if SHF_ALLOC not set. */
++static void invalidate_section32(void *mod, const char *secname)
++{
++	Elf32_Ehdr *hdr = mod;
++	Elf32_Shdr *sechdrs = mod + hdr->e_shoff;
++	const char *secnames = mod + sechdrs[hdr->e_shstrndx].sh_offset;
++	unsigned int i;
++
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (strcmp(secnames+sechdrs[i].sh_name, secname) == 0)
++			sechdrs[i].sh_flags &= ~SHF_ALLOC;
++}
++
++static void invalidate_section64(void *mod, const char *secname)
++{
++	Elf64_Ehdr *hdr = mod;
++	Elf64_Shdr *sechdrs = mod + hdr->e_shoff;
++	const char *secnames = mod + sechdrs[hdr->e_shstrndx].sh_offset;
++	unsigned int i;
++
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (strcmp(secnames+sechdrs[i].sh_name, secname) == 0)
++			sechdrs[i].sh_flags &= ~(unsigned long long)SHF_ALLOC;
++}
++
++static void strip_section(struct module *module,
++			  void *mod,
++			  unsigned long len,
++			  const char *secname)
++{
++	switch (elf_ident(mod, len)) {
++	case ELFCLASS32:
++		invalidate_section32(mod, secname);
++		break;
++	case ELFCLASS64:
++		invalidate_section64(mod, secname);
++		break;
++	default:
++		warn("Unknown module format in %s: not forcing version\n",
++		     module->filename);
++	}
++}
++
++static const char *next_string(const char *string, unsigned long *secsize)
++{
++	/* Skip non-zero chars */
++	while (string[0]) {
++		string++;
++		if ((*secsize)-- <= 1)
++			return NULL;
++	}
++
++	/* Skip any zero padding. */
++	while (!string[0]) {
++		string++;
++		if ((*secsize)-- <= 1)
++			return NULL;
++	}
++	return string;
++}
++
++static void clear_magic(struct module *module, void *mod, unsigned long len)
++{
++	const char *p;
++	unsigned long modlen;
++
++	/* Old-style: __vermagic section */
++	strip_section(module, mod, len, "__vermagic");
++
++	/* New-style: in .modinfo section */
++	for (p = get_section(mod, len, ".modinfo", &modlen);
++	     p;
++	     p = next_string(p, &modlen)) {
++		if (strncmp(p, "vermagic=", strlen("vermagic=")) == 0) {
++			memset((char *)p, 0, strlen(p));
++			return;
++		}
++	}
++}
++
++struct module_options
++{
++	struct module_options *next;
++	char *modulename;
++	char *options;
++};
++
++struct module_command
++{
++	struct module_command *next;
++	char *modulename;
++	char *command;
++};
++
++struct module_alias
++{
++	struct module_alias *next;
++	char *module;
++};
++
++struct module_blacklist
++{
++	struct module_blacklist *next;
++	char *modulename;
++};
++
++/* Link in a new option line from the config file. */
++static struct module_options *
++add_options(const char *modname,
++	    const char *option,
++	    struct module_options *options)
++{
++	struct module_options *new;
++	char *tab; 
++
++	new = NOFAIL(malloc(sizeof(*new)));
++	new->modulename = NOFAIL(strdup(modname));
++	new->options = NOFAIL(strdup(option));
++	/* We can handle tabs, kernel can't. */
++	for (tab = strchr(new->options, '\t'); tab; tab = strchr(tab, '\t'))
++		*tab = ' ';
++	new->next = options;
++	return new;
++}
++
++/* Link in a new install line from the config file. */
++static struct module_command *
++add_command(const char *modname,
++	       const char *command,
++	       struct module_command *commands)
++{
++	struct module_command *new;
++
++	new = NOFAIL(malloc(sizeof(*new)));
++	new->modulename = NOFAIL(strdup(modname));
++	new->command = NOFAIL(strdup(command));
++	new->next = commands;
++	return new;
++}
++
++/* Link in a new alias line from the config file. */
++static struct module_alias *
++add_alias(const char *modname, struct module_alias *aliases)
++{
++	struct module_alias *new;
++
++	new = NOFAIL(malloc(sizeof(*new)));
++	new->module = NOFAIL(strdup(modname));
++	new->next = aliases;
++	return new;
++}
++
++/* Link in a new blacklist line from the config file. */
++static struct module_blacklist *
++add_blacklist(const char *modname, struct module_blacklist *blacklist)
++{
++	struct module_blacklist *new;
++
++	new = NOFAIL(malloc(sizeof(*new)));
++	new->modulename = NOFAIL(strdup(modname));
++	new->next = blacklist;
++	return new;
++}
++
++/* Find blacklist commands if any. */
++static  int
++find_blacklist(const char *modname, const struct module_blacklist *blacklist)
++{
++	while (blacklist) {
++		if (strcmp(blacklist->modulename, modname) == 0)
++			return 1;
++		blacklist = blacklist->next;
++	}
++	return 0;
++}
++
++/* return a new alias list, with backlisted elems filtered out */
++static struct module_alias *
++apply_blacklist(const struct module_alias *aliases,
++		const struct module_blacklist *blacklist)
++{
++	struct module_alias *result = NULL;
++	while (aliases) {
++		char *modname = aliases->module;
++		if (!find_blacklist(modname, blacklist))
++			result = add_alias(modname, result);
++		aliases = aliases->next;
++	}
++	return result;
++}
++
++/* Find install commands if any. */
++static const char *find_command(const char *modname,
++				const struct module_command *commands)
++{
++	while (commands) {
++		if (fnmatch(commands->modulename, modname, 0) == 0)
++			return commands->command;
++		commands = commands->next;
++	}
++	return NULL;
++}
++
++static char *append_option(char *options, const char *newoption)
++{
++	options = NOFAIL(realloc(options, strlen(options) + 1
++				 + strlen(newoption) + 1));
++	if (strlen(options)) strcat(options, " ");
++	strcat(options, newoption);
++	return options;
++}
++
++/* Add to options */
++static char *add_extra_options(const char *modname,
++			       char *optstring,
++			       const struct module_options *options)
++{
++	while (options) {
++		if (strcmp(options->modulename, modname) == 0)
++			optstring = append_option(optstring, options->options);
++		options = options->next;
++	}
++	return optstring;
++}
++
++/* If we don't flush, then child processes print before we do */
++static void verbose_printf(int verbose, const char *fmt, ...)
++{
++	va_list arglist;
++
++	if (verbose) {
++		va_start(arglist, fmt);
++		vprintf(fmt, arglist);
++		fflush(stdout);
++		va_end(arglist);
++	}
++}
++
++/* Do an install/remove command: replace $CMDLINE_OPTS if it's specified. */
++static void do_command(const char *modname,
++		       const char *command,
++		       int verbose, int dry_run,
++		       errfn_t error,
++		       const char *type,
++		       const char *cmdline_opts)
++{
++	int ret;
++	char *p, *replaced_cmd = NOFAIL(strdup(command));
++
++	while ((p = strstr(replaced_cmd, "$CMDLINE_OPTS")) != NULL) {
++		char *new;
++		asprintf(&new, "%.*s%s%s",
++			 p - replaced_cmd, replaced_cmd, cmdline_opts,
++			 p + strlen("$CMDLINE_OPTS"));
++		NOFAIL(new);
++		free(replaced_cmd);
++		replaced_cmd = new;
++	}
++
++	verbose_printf(verbose, "%s %s\n", type, replaced_cmd);
++	if (dry_run)
++		return;
++
++	setenv("MODPROBE_MODULE", modname, 1);
++	ret = system(replaced_cmd);
++	if (ret == -1 || WEXITSTATUS(ret))
++		error("Error running %s command for %s\n", type, modname);
++	free(replaced_cmd);
++}
++
++/* Actually do the insert.  Frees second arg. */
++static void insmod(struct list_head *list,
++		   char *optstring,
++		   const char *newname,
++		   int first_time,
++		   errfn_t error,
++		   int dry_run,
++		   int verbose,
++		   const struct module_options *options,
++		   const struct module_command *commands,
++		   int ignore_commands,
++		   int ignore_proc,
++		   int strip_vermagic,
++		   int strip_modversion,
++		   const char *cmdline_opts)
++{
++	int ret, fd;
++	unsigned long len;
++	void *map;
++	const char *command;
++	struct module *mod = list_entry(list->next, struct module, list);
++
++	/* Take us off the list. */
++	list_del(&mod->list);
++
++	/* Do things we (or parent) depend on first, but don't die if
++	 * they fail. */
++	if (!list_empty(list)) {
++		insmod(list, NOFAIL(strdup("")), NULL, 0, warn,
++		       dry_run, verbose, options, commands, 0, ignore_proc,
++		       strip_vermagic, strip_modversion, cmdline_opts);
++	}
++
++	/* Lock before we look, in case it's initializing. */
++	fd = lock_file(mod->filename);
++	if (fd < 0) {
++		error("Could not open '%s': %s\n",
++		      mod->filename, strerror(errno));
++		goto out_optstring;
++	}
++
++	/* Don't do ANYTHING if already in kernel. */
++	if (!ignore_proc
++	    && module_in_kernel(newname ?: mod->modname, NULL) == 1) {
++		if (first_time)
++			error("Module %s already in kernel.\n",
++			      newname ?: mod->modname);
++		goto out_unlock;
++	}
++
++	command = find_command(mod->modname, commands);
++	if (command && !ignore_commands) {
++		/* It might recurse: unlock. */
++		unlock_file(fd);
++		do_command(mod->modname, command, verbose, dry_run, error,
++			   "install", cmdline_opts);
++		goto out_optstring;
++	}
++
++	map = grab_fd(fd, &len);
++	if (!map) {
++		error("Could not read '%s': %s\n",
++		      mod->filename, strerror(errno));
++		goto out_unlock;
++	}
++
++	/* Rename it? */
++	if (newname)
++		rename_module(mod, map, len, newname);
++
++	if (strip_modversion)
++		strip_section(mod, map, len, "__versions");
++	if (strip_vermagic)
++		clear_magic(mod, map, len);
++
++	/* Config file might have given more options */
++	optstring = add_extra_options(mod->modname, optstring, options);
++
++	verbose_printf(verbose, "insmod %s %s\n", mod->filename, optstring);
++
++	if (dry_run)
++		goto out;
++
++	ret = init_module(map, len, optstring);
++	if (ret != 0) {
++		if (errno == EEXIST) {
++			if (first_time)
++				error("Module %s already in kernel.\n",
++				      newname ?: mod->modname);
++			goto out_unlock;
++		}
++		error("Error inserting %s (%s): %s\n",
++		      mod->modname, mod->filename, insert_moderror(errno));
++	}
++ out:
++	release_file(map, len);
++ out_unlock:
++	unlock_file(fd);
++ out_optstring:
++	free(optstring);
++	return;
++}
++
++/* Do recursive removal. */
++static void rmmod(struct list_head *list,
++		  const char *name,
++		  int first_time,
++		  errfn_t error,
++		  int dry_run,
++		  int verbose,
++		  struct module_command *commands,
++		  int ignore_commands,
++		  int ignore_inuse,
++		  const char *cmdline_opts)
++{
++	const char *command;
++	unsigned int usecount = 0;
++	int lock;
++	struct module *mod = list_entry(list->next, struct module, list);
++
++	/* Take first one off the list. */
++	list_del(&mod->list);
++
++	/* Ignore failure; it's best effort here. */
++	lock = lock_file(mod->filename);
++
++	if (!name)
++		name = mod->modname;
++
++	/* Even if renamed, find commands to orig. name. */
++	command = find_command(mod->modname, commands);
++	if (command && !ignore_commands) {
++		/* It might recurse: unlock. */
++		unlock_file(lock);
++		do_command(mod->modname, command, verbose, dry_run, error,
++			   "remove", cmdline_opts);
++		goto remove_rest_no_unlock;
++	}
++
++	if (module_in_kernel(name, &usecount) == 0)
++		goto nonexistent_module;
++
++	if (usecount != 0) {
++		if (!ignore_inuse)
++			error("Module %s is in use.\n", name);
++		goto remove_rest;
++	}
++
++	verbose_printf(verbose, "rmmod %s\n", mod->filename);
++
++	if (dry_run)
++		goto remove_rest;
++
++	if (delete_module(name, O_EXCL) != 0) {
++		if (errno == ENOENT)
++			goto nonexistent_module;
++		error("Error removing %s (%s): %s\n",
++		      name, mod->filename,
++		      remove_moderror(errno));
++	}
++
++ remove_rest:
++	unlock_file(lock);
++ remove_rest_no_unlock:
++	/* Now do things we depend. */
++	if (!list_empty(list))
++		rmmod(list, NULL, 0, warn, dry_run, verbose, commands,
++		      0, 1, cmdline_opts);
++	return;
++
++nonexistent_module:
++	if (first_time)
++		fatal("Module %s is not in kernel.\n", mod->modname);
++	goto remove_rest;
++}
++
++/* Does path contain directory(s) subpath? */
++static int type_matches(const char *path, const char *subpath)
++{
++	char *subpath_with_slashes;
++	int ret;
++
++	asprintf(&subpath_with_slashes, "/%s/", subpath);
++	NOFAIL(subpath_with_slashes);
++
++	ret = (strstr(path, subpath_with_slashes) != NULL);
++	free(subpath_with_slashes);
++	return ret;
++}
++
++static char *underscores(char *string)
++{
++	if (string) {
++		unsigned int i;
++		for (i = 0; string[i]; i++)
++			if (string[i] == '-')
++				string[i] = '_';
++	}
++	return string;
++}
++
++static int do_wildcard(const char *dirname,
++		       const char *type,
++		       const char *wildcard)
++{
++	char modules_dep_name[strlen(dirname) + sizeof("modules.dep") + 1];
++	char *line, *wcard;
++	FILE *modules_dep;
++
++	/* Canonicalize wildcard */
++	wcard = strdup(wildcard);
++	underscores(wcard);
++
++	sprintf(modules_dep_name, "%s/%s", dirname, "modules.dep");
++	modules_dep = fopen(modules_dep_name, "r");
++	if (!modules_dep)
++		fatal("Could not load %s: %s\n",
++		      modules_dep_name, strerror(errno));
++
++	while ((line = getline_wrapped(modules_dep, NULL)) != NULL) {
++		char *ptr;
++
++		/* Ignore lines without : or which start with a # */
++		ptr = strchr(line, ':');
++		if (ptr == NULL || line[strspn(line, "\t ")] == '#')
++			goto next;
++		*ptr = '\0';
++
++		/* "type" must match complete directory component(s). */
++		if (!type || type_matches(line, type)) {
++			char modname[strlen(line)+1];
++
++			filename2modname(modname, line);
++			if (fnmatch(wcard, modname, 0) == 0)
++				printf("%s\n", line);
++		}
++	next:
++		free(line);
++	}
++
++	free(wcard);
++	return 0;
++}
++
++static char *strsep_skipspace(char **string, char *delim)
++{
++	if (!*string)
++		return NULL;
++	*string += strspn(*string, delim);
++	return strsep(string, delim);
++}
++
++/* Recursion */
++static int read_config(const char *filename,
++		       const char *name,
++		       int dump_only,
++		       int removing,
++		       struct module_options **options,
++		       struct module_command **commands,
++		       struct module_alias **alias,
++		       struct module_blacklist **blacklist);
++
++/* FIXME: Maybe should be extended to "alias a b [and|or c]...". --RR */
++static int read_config_file(const char *filename,
++			    const char *name,
++			    int dump_only,
++			    int removing,
++			    struct module_options **options,
++			    struct module_command **commands,
++			    struct module_alias **aliases,
++			    struct module_blacklist **blacklist)
++{
++	char *line;
++	unsigned int linenum = 0;
++	FILE *cfile;
++
++	cfile = fopen(filename, "r");
++	if (!cfile)
++		return 0;
++
++	while ((line = getline_wrapped(cfile, &linenum)) != NULL) {
++		char *ptr = line;
++		char *cmd, *modname;
++
++		if (dump_only)
++			printf("%s\n", line);
++
++		cmd = strsep_skipspace(&ptr, "\t ");
++		if (cmd == NULL || cmd[0] == '#' || cmd[0] == '\0')
++			continue;
++
++		if (strcmp(cmd, "alias") == 0) {
++			char *wildcard
++				= underscores(strsep_skipspace(&ptr, "\t "));
++			char *realname
++				= underscores(strsep_skipspace(&ptr, "\t "));
++
++			if (!wildcard || !realname)
++				grammar(cmd, filename, linenum);
++			else if (fnmatch(wildcard,name,0) == 0)
++				*aliases = add_alias(realname, *aliases);
++		} else if (strcmp(cmd, "include") == 0) {
++			struct module_alias *newalias = NULL;
++			char *newfilename;
++
++			newfilename = strsep_skipspace(&ptr, "\t ");
++			if (!newfilename)
++				grammar(cmd, filename, linenum);
++			else {
++				if (!read_config(newfilename, name,
++						 dump_only, removing,
++						 options, commands, &newalias,
++						 blacklist))
++					warn("Failed to open included"
++					      " config file %s: %s\n",
++					      newfilename, strerror(errno));
++
++				/* Files included override aliases,
++				   etc that was already set ... */
++				if (newalias)
++					*aliases = newalias;
++			}
++		} else if (strcmp(cmd, "options") == 0) {
++			modname = strsep_skipspace(&ptr, "\t ");
++			if (!modname || !ptr)
++				grammar(cmd, filename, linenum);
++			else {
++				ptr += strspn(ptr, "\t ");
++				*options = add_options(underscores(modname),
++						       ptr, *options);
++			}
++		} else if (strcmp(cmd, "install") == 0) {
++			modname = strsep_skipspace(&ptr, "\t ");
++			if (!modname || !ptr)
++				grammar(cmd, filename, linenum);
++			else if (!removing) {
++				ptr += strspn(ptr, "\t ");
++				*commands = add_command(underscores(modname),
++							ptr, *commands);
++			}
++		} else if (strcmp(cmd, "blacklist") == 0) {
++			modname = strsep_skipspace(&ptr, "\t ");
++			if (!modname)
++				grammar(cmd, filename, linenum);
++			else if (!removing) {
++				*blacklist = add_blacklist(underscores(modname),
++							*blacklist);
++			}
++		} else if (strcmp(cmd, "remove") == 0) {
++			modname = strsep_skipspace(&ptr, "\t ");
++			if (!modname || !ptr)
++				grammar(cmd, filename, linenum);
++			else if (removing) {
++				ptr += strspn(ptr, "\t ");
++				*commands = add_command(underscores(modname),
++							ptr, *commands);
++			}
++		} else
++			grammar(cmd, filename, linenum);
++
++		free(line);
++	}
++	fclose(cfile);
++	return 1;
++}
++
++/* Simple format, ignore lines starting with #, one command per line.
++   Returns true or false. */
++static int read_config(const char *filename,
++		       const char *name,
++		       int dump_only,
++		       int removing,
++		       struct module_options **options,
++		       struct module_command **commands,
++		       struct module_alias **aliases,
++		       struct module_blacklist **blacklist)
++{
++	DIR *dir;
++	int ret = 0;
++
++	/* ignore everything in this directory */
++	if (streq(filename, "/etc/modprobe.d/arch"))
++		return 1;
++
++	/* Reiser4 has file/directory duality: treat it as both. */
++	dir = opendir(filename);
++	if (dir) {
++		struct dirent *i;
++		while ((i = readdir(dir)) != NULL) {
++			if (!streq(i->d_name,".") && !streq(i->d_name,"..")) {
++				char sub[strlen(filename) + 1
++					 + strlen(i->d_name) + 1];
++
++				sprintf(sub, "%s/%s", filename, i->d_name);
++				if (!read_config(sub, name,
++						 dump_only, removing, options,
++						 commands, aliases, blacklist))
++					warn("Failed to open"
++					     " config file %s: %s\n",
++					     sub, strerror(errno));
++			}
++		}
++		closedir(dir);
++		ret = 1;
++	}
++
++	if (read_config_file(filename, name, dump_only, removing,
++			     options, commands, aliases, blacklist))
++		ret = 1;
++
++	return ret;
++}
++
++static const char *default_configs[] = 
++{
++	"/etc/modprobe.conf",
++	"/etc/modprobe.d",
++};
++
++static void read_toplevel_config(const char *filename,
++				 const char *name,
++				 int dump_only,
++				 int removing,
++				 struct module_options **options,
++				 struct module_command **commands,
++				 struct module_alias **aliases,
++				 struct module_blacklist **blacklist)
++{
++	unsigned int i;
++
++	if (filename) {
++		if (!read_config(filename, name, dump_only, removing,
++				 options, commands, aliases, blacklist))
++			fatal("Failed to open config file %s: %s\n",
++			      filename, strerror(errno));
++		return;
++	}
++
++	/* Try defaults. */
++	for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
++		if (read_config(default_configs[i], name, dump_only, removing,
++				options, commands, aliases, blacklist))
++			return;
++	}
++}
++
++static void add_to_env_var(const char *option)
++{
++	const char *oldenv;
++
++	if ((oldenv = getenv("MODPROBE_OPTIONS")) != NULL) {
++		char *newenv;
++		asprintf(&newenv, "%s %s", oldenv, option);
++		setenv("MODPROBE_OPTIONS", newenv, 1);
++	} else
++		setenv("MODPROBE_OPTIONS", option, 1);
++}
++
++/* Prepend options from environment. */
++static char **merge_args(char *args, char *argv[], int *argc)
++{
++	char *arg, *argstring;
++	char **newargs = NULL;
++	unsigned int i, num_env = 0;
++
++	if (!args)
++		return argv;
++
++	argstring = NOFAIL(strdup(args));
++	for (arg = strtok(argstring, " "); arg; arg = strtok(NULL, " ")) {
++		num_env++;
++		newargs = NOFAIL(realloc(newargs,
++					 sizeof(newargs[0])
++					 * (num_env + *argc + 1)));
++		newargs[num_env] = arg;
++	}
++
++	/* Append commandline args */
++	newargs[0] = argv[0];
++	for (i = 1; i <= *argc; i++)
++		newargs[num_env+i] = argv[i];
++
++	*argc += num_env;
++	return newargs;
++}
++
++static char *gather_options(char *argv[])
++{
++	char *optstring = NOFAIL(strdup(""));
++
++	/* Rest is module options */
++	while (*argv) {
++		/* Quote value if it contains spaces. */
++		unsigned int eq = strcspn(*argv, "=");
++
++		if (strchr(*argv+eq, ' ') && !strchr(*argv, '"')) {
++			char quoted[strlen(*argv) + 3];
++			(*argv)[eq] = '\0';
++			sprintf(quoted, "%s=\"%s\"", *argv, *argv+eq+1);
++			optstring = append_option(optstring, quoted);
++		} else
++			optstring = append_option(optstring, *argv);
++		argv++;
++	}
++	return optstring;
++}
++
++static void handle_module(const char *modname,
++			  struct list_head *todo_list,
++			  const char *newname,
++			  int remove,
++			  char *options,
++			  int first_time,
++			  errfn_t error,
++			  int dry_run,
++			  int verbose,
++			  struct module_options *modoptions,
++			  struct module_command *commands,
++			  int ignore_commands,
++			  int ignore_proc,
++			  int strip_vermagic,
++			  int strip_modversion,
++			  int unknown_silent,
++			  const char *cmdline_opts)
++{
++	if (list_empty(todo_list)) {
++		const char *command;
++
++		/* The dependencies have to be real modules, but
++		   handle case where the first is completely bogus. */
++		command = find_command(modname, commands);
++		if (command && !ignore_commands) {
++			do_command(modname, command, verbose, dry_run, error,
++				   remove ? "remove":"install", cmdline_opts);
++			return;
++		}
++
++		if (unknown_silent)
++			exit(1);
++		error("Module %s not found.\n", modname);
++		return;
++	}
++
++	if (remove)
++		rmmod(todo_list, newname, first_time, error, dry_run, verbose,
++		      commands, ignore_commands, 0, cmdline_opts);
++	else
++		insmod(todo_list, NOFAIL(strdup(options)), newname,
++		       first_time, error, dry_run, verbose, modoptions,
++		       commands, ignore_commands, ignore_proc, strip_vermagic,
++		       strip_modversion, cmdline_opts);
++}
++
++static struct option options[] = { { "verbose", 0, NULL, 'v' },
++				   { "version", 0, NULL, 'V' },
++				   { "config", 1, NULL, 'C' },
++				   { "name", 1, NULL, 'o' },
++				   { "remove", 0, NULL, 'r' },
++				   { "showconfig", 0, NULL, 'c' },
++				   { "autoclean", 0, NULL, 'k' },
++				   { "quiet", 0, NULL, 'q' },
++				   { "show", 0, NULL, 'n' },
++				   { "dry-run", 0, NULL, 'n' },
++				   { "syslog", 0, NULL, 's' },
++				   { "type", 1, NULL, 't' },
++				   { "list", 0, NULL, 'l' },
++				   { "all", 0, NULL, 'a' },
++				   { "ignore-install", 0, NULL, 'i' },
++				   { "ignore-remove", 0, NULL, 'i' },
++				   { "force", 0, NULL, 'f' },
++				   { "force-vermagic", 0, NULL, 1 },
++				   { "force-modversion", 0, NULL, 2 },
++				   { "set-version", 1, NULL, 'S' },
++				   { "show-depends", 0, NULL, 'D' },
++				   { "first-time", 0, NULL, 3 },
++				   { "use-blacklist", 0, NULL, 'b' },
++				   { NULL, 0, NULL, 0 } };
++
++#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs"
++
++/* This is a horrible hack to allow devfsd, which calls modprobe with
++   -C /etc/modules.conf or /etc/modules.devfs, to work.  FIXME. */
++/* Modern devfsd or variants should use -q explicitly in 2.6. */
++static int is_devfs_call(char *argv[])
++{
++	unsigned int i;
++
++	/* Look for "/dev" arg */
++	for (i = 1; argv[i]; i++) {
++		if (strncmp(argv[i], "/dev/", 5) == 0)
++			return 1;
++	}
++	return 0;
++}
++
++int main(int argc, char *argv[])
++{
++	struct utsname buf;
++	struct stat statbuf;
++	int opt;
++	int dump_only = 0;
++	int dry_run = 0;
++	int remove = 0;
++	int verbose = 0;
++	int unknown_silent = 0;
++	int list_only = 0;
++	int all = 0;
++	int ignore_commands = 0;
++	int strip_vermagic = 0;
++	int strip_modversion = 0;
++	int ignore_proc = 0;
++	int first_time = 0;
++	int use_blacklist = 0;
++	unsigned int i, num_modules;
++	char *type = NULL;
++	const char *config = NULL;
++	char *dirname, *optstring;
++	char *newname = NULL;
++	char *aliasfilename, *symfilename;
++	errfn_t error = fatal;
++
++	/* Prepend options from environment. */
++	argv = merge_args(getenv("MODPROBE_OPTIONS"), argv, &argc);
++
++	/* --set-version overrides version, and disables backwards compat. */
++	for (opt = 1; opt < argc; opt++)
++		if (strncmp(argv[opt],"--set-version",strlen("--set-version"))
++		    == 0)
++			break;
++
++	if (opt == argc)
++		try_old_version("modprobe", argv);
++
++	uname(&buf);
++	while ((opt = getopt_long(argc, argv, "vVC:o:rknqQsclt:aifb", options, NULL)) != -1){
++		switch (opt) {
++		case 'v':
++			add_to_env_var("-v");
++			verbose = 1;
++			break;
++		case 'V':
++			puts("module-init-tools version 3.2.2");
++			exit(0);
++		case 'S':
++			strncpy(buf.release, optarg, sizeof(buf.release));
++			buf.release[sizeof(buf.release)-1] = '\0';
++			break;
++		case 'C':
++			if (is_devfs_call(argv)) {
++				if (streq("/etc/modules.devfs", optarg)) {
++					config = MODPROBE_DEVFSD_CONF;
++					add_to_env_var("-C");
++					add_to_env_var(config);
++					/* Fall thru to -q */
++				} else if (streq("/etc/modules.conf", optarg))
++					/* Ignore config, fall thru to -q */
++					;
++				else {
++					/* False alarm.  Treat as normal. */
++					config = optarg;
++					add_to_env_var("-C");
++					add_to_env_var(config);
++					break;
++				}
++			} else {
++				config = optarg;
++				add_to_env_var("-C");
++				add_to_env_var(config);
++				break;
++			}
++		case 'q':
++			unknown_silent = 1;
++			add_to_env_var("-q");
++			break;
++		case 'D':
++			dry_run = 1;
++			ignore_proc = 1;
++			verbose = 1;
++			add_to_env_var("-D");
++			break;
++		case 'o':
++			newname = optarg;
++			break;
++		case 'r':
++			remove = 1;
++			break;
++		case 'c':
++			dump_only = 1;
++			break;
++		case 't':
++			type = optarg;
++			break;
++		case 'l':
++			list_only = 1;
++			break;
++		case 'a':
++			all = 1;
++			error = warn;
++			break;
++		case 'k':
++			/* FIXME: This should actually do something */
++			break;
++		case 'n':
++			dry_run = 1;
++			break;
++		case 's':
++			add_to_env_var("-s");
++			log = 1;
++			break;
++		case 'i':
++			ignore_commands = 1;
++			break;
++		case 'f':
++			strip_vermagic = 1;
++			strip_modversion = 1;
++			break;
++		case 'b':
++			use_blacklist = 1;
++			break;
++		case 1:
++			strip_vermagic = 1;
++			break;
++		case 2:
++			strip_modversion = 1;
++			break;
++		case 3:
++			first_time = 1;
++			break;
++		default:
++			print_usage(argv[0]);
++		}
++	}
++
++	/* If stderr not open, go to syslog */
++	if (log || fstat(STDERR_FILENO, &statbuf) != 0) {
++		openlog("modprobe", LOG_CONS, LOG_DAEMON);
++		log = 1;
++	}
++
++	if (argc < optind + 1 && !dump_only && !list_only && !remove)
++		print_usage(argv[0]);
++
++	dirname = NOFAIL(malloc(strlen(buf.release) + sizeof(MODULE_DIR) + 1));
++	sprintf(dirname, "%s/%s", MODULE_DIR, buf.release);
++	aliasfilename = NOFAIL(malloc(strlen(dirname)
++				      + sizeof("/modules.alias")));
++	sprintf(aliasfilename, "%s/modules.alias", dirname);
++	symfilename = NOFAIL(malloc(strlen(dirname)
++				    + sizeof("/modules.symbols")));
++	sprintf(symfilename, "%s/modules.symbols", dirname);
++
++	/* Old-style -t xxx wildcard?  Only with -l. */
++	if (list_only) {
++		if (optind+1 < argc)
++			fatal("Can't have multiple wildcards\n");
++		/* fprintf(stderr, "man find\n"); return 1; */
++		return do_wildcard(dirname, type, argv[optind]?:"*");
++	}
++	if (type)
++		fatal("-t only supported with -l");
++
++	if (dump_only) {
++		struct module_command *commands = NULL;
++		struct module_options *modoptions = NULL;
++		struct module_alias *aliases = NULL;
++		struct module_blacklist *blacklist = NULL;
++
++		read_toplevel_config(config, "", 1, 0,
++			     &modoptions, &commands, &aliases, &blacklist);
++		read_config(aliasfilename, "", 1, 0,&modoptions, &commands,
++			    &aliases, &blacklist);
++		read_config(symfilename, "", 1, 0, &modoptions, &commands,
++			    &aliases, &blacklist);
++		exit(0);
++	}
++
++	if (remove || all) {
++		num_modules = argc - optind;
++		optstring = NOFAIL(strdup(""));
++	} else {
++		num_modules = 1;
++		optstring = gather_options(argv+optind+1);
++	}
++
++	/* num_modules is always 1 except for -r or -a. */
++	for (i = 0; i < num_modules; i++) {
++		struct module_command *commands = NULL;
++		struct module_options *modoptions = NULL;
++		struct module_alias *aliases = NULL;
++		struct module_blacklist *blacklist = NULL;
++		LIST_HEAD(list);
++		char *modulearg = argv[optind + i];
++
++		/* Convert name we are looking for */
++		underscores(modulearg);
++
++		/* Returns the resolved alias, options */
++		read_toplevel_config(config, modulearg, 0,
++		     remove, &modoptions, &commands, &aliases, &blacklist);
++
++		/* No luck?  Try symbol names, if starts with symbol:. */
++		if (!aliases
++		    && strncmp(modulearg, "symbol:", strlen("symbol:")) == 0)
++			read_config(symfilename, modulearg, 0,
++			    remove, &modoptions, &commands,
++			    	&aliases, &blacklist);
++
++		if (!aliases) {
++			/* We only use canned aliases as last resort. */
++			read_depends(dirname, modulearg, &list);
++
++			if (list_empty(&list)
++			    && !find_command(modulearg, commands))
++			{
++				read_config(aliasfilename, modulearg, 0,
++					    remove, &modoptions, &commands,
++					    &aliases, &blacklist);
++				aliases = apply_blacklist(aliases, blacklist);
++			}
++		}
++
++		if (aliases) {
++			errfn_t err = error;
++
++			/* More than one alias?  Don't bail out on failure. */
++			if (aliases->next)
++				err = warn;
++			while (aliases) {
++				/* Add the options for this alias. */
++				char *opts = NOFAIL(strdup(optstring));
++				opts = add_extra_options(modulearg,
++							 opts, modoptions);
++
++				read_depends(dirname, aliases->module, &list);
++				handle_module(aliases->module, &list, newname,
++					      remove, opts, first_time, err,
++					      dry_run, verbose, modoptions,
++					      commands, ignore_commands,
++					      ignore_proc, strip_vermagic,
++					      strip_modversion,
++					      unknown_silent,
++					      optstring);
++
++				aliases = aliases->next;
++				INIT_LIST_HEAD(&list);
++			}
++		} else {
++			if (use_blacklist
++			    && find_blacklist(modulearg, blacklist))
++				continue;
++
++			handle_module(modulearg, &list, newname, remove,
++				      optstring, first_time, error, dry_run,
++				      verbose, modoptions, commands,
++				      ignore_commands, ignore_proc,
++				      strip_vermagic, strip_modversion,
++				      unknown_silent, optstring);
++		}
++	}
++	if (log)
++		closelog();
++
++	return 0;
++}
+-- 
+1.6.3.3
+
diff --git a/recipes/klibc/klibc-1.5.18/staging.patch b/recipes/klibc/klibc-1.5.18/staging.patch
new file mode 100644
index 0000000000..9418c6b764
--- /dev/null
+++ b/recipes/klibc/klibc-1.5.18/staging.patch
@@ -0,0 +1,134 @@
+Index: klibc-1.5/Makefile
+===================================================================
+--- klibc-1.5.orig/Makefile	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/Makefile	2008-02-24 15:25:15.213824149 +0100
+@@ -33,7 +33,7 @@
+ export PERL       := perl
+ 
+ # Location for installation
+-export prefix      = /usr
++export prefix      = $(INST)
+ export bindir      = $(prefix)/bin
+ export libdir      = $(prefix)/lib
+ export mandir      = $(prefix)/man
+Index: klibc-1.5/scripts/Kbuild.install
+===================================================================
+--- klibc-1.5.orig/scripts/Kbuild.install	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/scripts/Kbuild.install	2008-02-24 15:24:28.085825030 +0100
+@@ -88,16 +88,12 @@
+ header:
+ 	$(Q)echo "  INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
+ 	$(Q)mkdir -p $(INSTALLROOT)$(bindir)
+-	$(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1
+-	$(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR)
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)
+ 	$(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+-	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+ 	$(Q)make -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
+ 	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
+-	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
+ 	$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
+ 
+ footer: header
+Index: klibc-1.5/usr/dash/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/dash/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/dash/Kbuild	2008-02-24 15:13:50.189827040 +0100
+@@ -107,5 +107,3 @@
+ $(obj)/arith.c: $(obj)/arith.h
+ 	$(Q):
+ 
+-# Targets to install
+-install-y := sh.shared
+Index: klibc-1.5/usr/gzip/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/gzip/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/gzip/Kbuild	2008-02-24 15:13:50.197824604 +0100
+@@ -21,5 +21,3 @@
+ # Cleaning
+ targets := gzip gzip.g gunzip zcat
+ 
+-# Targets to install
+-install-y := gzip gunzip zcat
+Index: klibc-1.5/usr/kinit/fstype/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/fstype/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/fstype/Kbuild	2008-02-24 15:13:50.201824503 +0100
+@@ -21,5 +21,3 @@
+ # Cleaning
+ clean-dirs := static shared
+ 
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/ipconfig/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/ipconfig/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/ipconfig/Kbuild	2008-02-24 15:13:50.205824123 +0100
+@@ -27,5 +27,3 @@
+ # Cleaning
+ clean-dirs := static shared
+ 
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/Kbuild	2008-02-24 15:13:50.209824302 +0100
+@@ -33,5 +33,3 @@
+ subdir- := fstype ipconfig nfsmount resume run-init
+ 
+ 
+-# install binary
+-install-y := kinit kinit.shared
+Index: klibc-1.5/usr/kinit/nfsmount/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/nfsmount/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/nfsmount/Kbuild	2008-02-24 15:13:50.213824201 +0100
+@@ -23,5 +23,3 @@
+ 
+ clean-dirs := static shared
+ 
+-# Install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/resume/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/resume/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/resume/Kbuild	2008-02-24 15:13:50.217824380 +0100
+@@ -26,5 +26,3 @@
+ # Cleaning
+ clean-dirs := static shared
+ 
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/kinit/run-init/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/run-init/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/run-init/Kbuild	2008-02-24 15:13:50.221824559 +0100
+@@ -25,5 +25,3 @@
+ # Cleaning
+ clean-dirs := static shared
+ 
+-# install binary
+-install-y := $(shared-y)
+Index: klibc-1.5/usr/klibc/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/klibc/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/klibc/Kbuild	2008-02-24 15:13:50.229824358 +0100
+@@ -175,5 +175,3 @@
+ 	          $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib))
+ 	$(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
+ 	                      $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib
+-	$(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
+-	                      $(INSTALLROOT)$(SHLIBDIR)
+Index: klibc-1.5/usr/utils/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/utils/Kbuild	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/utils/Kbuild	2008-02-24 15:13:50.229824358 +0100
+@@ -66,5 +66,3 @@
+ # Clean deletes the static and shared dir
+ clean-dirs := static shared
+ 
+-# install only install the shared binaries
+-install-y := $(shared-y) shared/reboot shared/poweroff
diff --git a/recipes/klibc/klibc-1.5.18/wc.patch b/recipes/klibc/klibc-1.5.18/wc.patch
new file mode 100644
index 0000000000..9063a5a1c3
--- /dev/null
+++ b/recipes/klibc/klibc-1.5.18/wc.patch
@@ -0,0 +1,245 @@
+---
+ usr/utils/Kbuild |    4 +-
+ usr/utils/wc.c   |  208 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 211 insertions(+), 1 deletions(-)
+ create mode 100644 usr/utils/wc.c
+
+diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild
+index a52ea61..7c8ccfb 100644
+--- a/usr/utils/Kbuild
++++ b/usr/utils/Kbuild
+@@ -3,7 +3,7 @@
+ #
+ 
+ progs := chroot dd mkdir mkfifo mknod mount pivot_root umount
+-progs += true false sleep ln nuke minips cat ls losetup
++progs += true false sleep ln nuke minips cat ls losetup wc
+ progs += uname halt kill readlink cpio sync dmesg modprobe
+ 
+ static-y := $(addprefix static/, $(progs))
+@@ -60,6 +60,8 @@ static/losetup-y    := losetup.o
+ shared/losetup-y    := losetup.o
+ static/modprobe-y   := modprobe.o
+ shared/modprobe-y   := modprobe.o
++static/wc-y	    := wc.o
++shared/wc-y	    := wc.o
+ 
+ # Additionally linked targets
+ always := static/reboot static/poweroff shared/reboot shared/poweroff
+diff --git a/usr/utils/wc.c b/usr/utils/wc.c
+new file mode 100644
+index 0000000..f5059fc
+--- /dev/null
++++ b/usr/utils/wc.c
+@@ -0,0 +1,208 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * wc implementation for busybox
++ *
++ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
++ *
++ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
++ */
++
++/* BB_AUDIT SUSv3 _NOT_ compliant -- option -m is not currently supported. */
++/* http://www.opengroup.org/onlinepubs/007904975/utilities/wc.html */
++
++/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
++ *
++ * Rewritten to fix a number of problems and do some size optimizations.
++ * Problems in the previous busybox implementation (besides bloat) included:
++ *  1) broken 'wc -c' optimization (read note below)
++ *  2) broken handling of '-' args
++ *  3) no checking of ferror on EOF returns
++ *  4) isprint() wasn't considered when word counting.
++ *
++ * TODO:
++ *
++ * When locale support is enabled, count multibyte chars in the '-m' case.
++ *
++ * NOTES:
++ *
++ * The previous busybox wc attempted an optimization using stat for the
++ * case of counting chars only.  I omitted that because it was broken.
++ * It didn't take into account the possibility of input coming from a
++ * pipe, or input from a file with file pointer not at the beginning.
++ *
++ * To implement such a speed optimization correctly, not only do you
++ * need the size, but also the file position.  Note also that the
++ * file position may be past the end of file.  Consider the example
++ * (adapted from example in gnu wc.c)
++ *
++ *      echo hello > /tmp/testfile &&
++ *      (dd ibs=1k skip=1 count=0 &> /dev/null; wc -c) < /tmp/testfile
++ *
++ * for which 'wc -c' should output '0'.
++ */
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#undef isspace
++#undef isprint
++#define isspace(c) ((((c) == ' ') || (((unsigned int)((c) - 9)) <= (13 - 9))))
++#define isprint(c) (((unsigned int)((c) - 0x20)) <= (0x7e - 0x20))
++#define isspace_given_isprint(c) ((c) == ' ')
++
++#define COUNT_T unsigned long
++#define COUNT_FMT "u"
++#define optind 1
++FILE *fopen_or_warn_stdin(const char *filename)
++{
++        FILE *fp = stdin;
++
++        if (filename[0]) {
++                fp = fopen(filename, "r");
++        }
++
++        return fp;
++}
++
++enum {
++	WC_LINES	= 0,
++	WC_WORDS	= 1,
++	WC_CHARS	= 2,
++	WC_LENGTH	= 3
++};
++
++int main(int argc, char **argv)
++{
++	FILE *fp;
++	const char *s, *arg;
++	const char *start_fmt = "%9"COUNT_FMT;
++	const char *fname_fmt = " %s\n";
++	COUNT_T *pcounts;
++	COUNT_T counts[4];
++	COUNT_T totals[4];
++	unsigned linepos;
++	unsigned u;
++	int num_files = 0;
++	int c;
++	signed char status = EXIT_SUCCESS;
++	signed char in_word;
++	unsigned print_type;
++
++	print_type = getopt(argc, argv, "lwcL");
++
++	if (print_type == 0) {
++		print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS);
++	}
++
++	argv += optind;
++	if (!argv[0]) {
++		*--argv = (char *) "wc";
++		fname_fmt = "\n";
++		if (!((print_type-1) & print_type)) /* exactly one option? */
++			start_fmt = "%"COUNT_FMT;
++	}
++
++	memset(totals, 0, sizeof(totals));
++
++	pcounts = counts;
++
++	while ((arg = *argv++) != 0) {
++		++num_files;
++		fp = fopen_or_warn_stdin(arg);
++		if (!fp) {
++			status = EXIT_FAILURE;
++			continue;
++		}
++
++		memset(counts, 0, sizeof(counts));
++		linepos = 0;
++		in_word = 0;
++
++		do {
++			/* Our -w doesn't match GNU wc exactly... oh well */
++
++			++counts[WC_CHARS];
++			c = getc(fp);
++			if (isprint(c)) {
++				++linepos;
++				if (!isspace_given_isprint(c)) {
++					in_word = 1;
++					continue;
++				}
++			} else if (((unsigned int)(c - 9)) <= 4) {
++				/* \t  9
++				 * \n 10
++				 * \v 11
++				 * \f 12
++				 * \r 13
++				 */
++				if (c == '\t') {
++					linepos = (linepos | 7) + 1;
++				} else {			/* '\n', '\r', '\f', or '\v' */
++				DO_EOF:
++					if (linepos > counts[WC_LENGTH]) {
++						counts[WC_LENGTH] = linepos;
++					}
++					if (c == '\n') {
++						++counts[WC_LINES];
++					}
++					if (c != '\v') {
++						linepos = 0;
++					}
++				}
++			} else if (c == EOF) {
++/*				if (ferror(fp)) {
++					status = EXIT_FAILURE;
++				}
++*/				--counts[WC_CHARS];
++				goto DO_EOF;		/* Treat an EOF as '\r'. */
++			} else {
++				continue;
++			}
++
++			counts[WC_WORDS] += in_word;
++			in_word = 0;
++			if (c == EOF) {
++				break;
++			}
++		} while (1);
++
++		if (totals[WC_LENGTH] < counts[WC_LENGTH]) {
++			totals[WC_LENGTH] = counts[WC_LENGTH];
++		}
++		totals[WC_LENGTH] -= counts[WC_LENGTH];
++
++		if(fp != stdin)
++			fclose(fp);
++
++	OUTPUT:
++		/* coreutils wc tries hard to print pretty columns
++		 * (saves results for all files, find max col len etc...)
++		 * we won't try that hard, it will bloat us too much */
++		s = start_fmt;
++		u = 0;
++		do {
++			if (print_type & (1 << u)) {
++				printf(s, pcounts[u]);
++				s = " %9"COUNT_FMT; /* Ok... restore the leading space. */
++			}
++			totals[u] += pcounts[u];
++		} while (++u < 4);
++		printf(fname_fmt, arg);
++	}
++
++	/* If more than one file was processed, we want the totals.  To save some
++	 * space, we set the pcounts ptr to the totals array.  This has the side
++	 * effect of trashing the totals array after outputting it, but that's
++	 * irrelavent since we no longer need it. */
++	if (num_files > 1) {
++		num_files = 0;				/* Make sure we don't get here again. */
++		arg = "total";
++		pcounts = totals;
++		--argv;
++		goto OUTPUT;
++	}
++
++	fflush(stdout);
++	exit(status);
++}
+-- 
+1.6.3.3
+
diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc
index 20154ccb92..7b7a3cb43e 100644
--- a/recipes/klibc/klibc-common.inc
+++ b/recipes/klibc/klibc-common.inc
@@ -9,6 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV
 
 S = "${WORKDIR}/klibc-${PV}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+INC_PR = "r14"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'
@@ -23,8 +24,8 @@ KLIBC_ARCH_pentium = 'i386'
 # could be fixed, but for the moment:
 ARM_INSTRUCTION_SET = "arm"
 
-SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1"
-SRC_URI_append_linux-uclibceabi = "file://klibc-config-eabi.patch;patch=1"
+SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch"
+SRC_URI_append_linux-uclibceabi = "file://klibc-config-eabi.patch"
 
 EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
                 'CROSS_COMPILE=${TARGET_PREFIX}' \
diff --git a/recipes/klibc/klibc-utils-static.inc b/recipes/klibc/klibc-utils-static.inc
new file mode 100644
index 0000000000..e7ec1ecc0d
--- /dev/null
+++ b/recipes/klibc/klibc-utils-static.inc
@@ -0,0 +1,14 @@
+FILESPATHPKG =. "klibc-${PV}:"
+
+do_install() {
+       install -d ${D}${base_bindir}
+       install -m 755 usr/dash/sh ${D}${base_bindir}
+       install -m 755 usr/kinit/kinit ${D}${base_bindir}
+}
+
+#Package only separate utils
+PACKAGES = ""
+
+KLIBC_UTILS_VARIANT = "static"
+KLIBC_UTILS_PKGNAME = "klibc-utils-static"
+require klibc-utils.inc
diff --git a/recipes/klibc/klibc-utils-static_1.5.15+1.5.16.bb b/recipes/klibc/klibc-utils-static_1.5.15+1.5.16.bb
index b6f34b7464..b3599163a0 100644
--- a/recipes/klibc/klibc-utils-static_1.5.15+1.5.16.bb
+++ b/recipes/klibc/klibc-utils-static_1.5.15+1.5.16.bb
@@ -1,138 +1,3 @@
-require klibc-common.inc
-PR = "r1"
-
-KLIBC_FETCHDIR = "Testing"
-
-DEFAULT_PREFERENCE = "-1"
-
-# temporary override here in the recipe
-# until 1.5.16 is released
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-1.5.15.tar.bz2 \
-            file://1.5.15+1.5.16.patch;patch=1 \
-            "
-
-S = "${WORKDIR}/klibc-1.5.15"
-
-#
-# end override
-
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-            file://modprobe.patch;patch=1 \
-            file://losetup.patch;patch=1 \
-            file://dash_readopt.patch;patch=1 \
-            file://wc.patch;patch=1 \
-            file://staging.patch;patch=1 \
-            file://klibc_kexecsyscall.patch;patch=1 \
-            file://mntproc-definitions.patch;patch=1 \
-            file://signal-cleanup.patch;patch=1 \
-            file://isystem.patch;patch=1 \
-            "
-
-FILESPATHPKG =. "klibc-${PV}:"
-
-# We only want the static utils. klibc build both. So we install only what we want.
-do_install() {
-        install -d ${D}${base_bindir}
-        install -d ${D}${base_sbindir}
-        install -m 755 usr/dash/sh ${D}${base_bindir}
-        install -m 755 usr/gzip/gzip ${D}${base_bindir}
-        install -m 755 usr/kinit/kinit ${D}${base_bindir}
-        install -m 755 usr/kinit/fstype/static/fstype ${D}${base_bindir}
-        install -m 755 usr/kinit/ipconfig/static/ipconfig ${D}${base_bindir}
-        install -m 755 usr/kinit/nfsmount/static/nfsmount ${D}${base_bindir}
-        install -m 755 usr/kinit/resume/static/resume ${D}${base_bindir}
-        install -m 755 usr/kinit/run-init/static/run-init ${D}${base_bindir}
-        install -m 755 usr/utils/static/cat ${D}${base_bindir}
-        install -m 755 usr/utils/static/chroot ${D}${base_bindir}
-        install -m 755 usr/utils/static/cpio ${D}${base_bindir}
-        install -m 755 usr/utils/static/dd ${D}${base_bindir}
-        install -m 755 usr/utils/static/dmesg ${D}${base_bindir}
-        install -m 755 usr/utils/static/false ${D}${base_bindir}
-        install -m 755 usr/utils/static/halt ${D}${base_bindir}
-        install -m 755 usr/utils/static/kill ${D}${base_bindir}
-        install -m 755 usr/utils/static/ln ${D}${base_bindir}
-        install -m 755 usr/utils/static/minips ${D}${base_bindir}
-        install -m 755 usr/utils/static/mkdir ${D}${base_bindir}
-        install -m 755 usr/utils/static/mkfifo ${D}${base_bindir}
-        install -m 755 usr/utils/static/mknod ${D}${base_bindir}
-        install -m 755 usr/utils/static/mount ${D}${base_bindir}
-        install -m 755 usr/utils/static/nuke ${D}${base_bindir}
-        install -m 755 usr/utils/static/pivot_root ${D}${base_bindir}
-        install -m 755 usr/utils/static/poweroff ${D}${base_bindir}
-        install -m 755 usr/utils/static/readlink ${D}${base_bindir}
-        install -m 755 usr/utils/static/reboot ${D}${base_bindir}
-        install -m 755 usr/utils/static/sleep ${D}${base_bindir}
-        install -m 755 usr/utils/static/sync ${D}${base_bindir}
-        install -m 755 usr/utils/static/true ${D}${base_bindir}
-        install -m 755 usr/utils/static/umount ${D}${base_bindir}
-        install -m 755 usr/utils/static/uname ${D}${base_bindir}
-        install -m 755 usr/utils/static/modprobe ${D}${base_sbindir}
-        install -m 755 usr/utils/static/losetup ${D}${base_bindir}
-        install -m 755 usr/utils/static/wc ${D}${base_bindir}
-        install -m 755 usr/utils/static/ls ${D}${base_bindir}
-        cd ${D}${base_bindir}
-        ln -s gzip gunzip
-        ln -s gzip zcat
-        cd -
-}
-
-PACKAGES = "klibc-utils-static-sh klibc-utils-static-gzip \
-        klibc-utils-static-kinit klibc-utils-static-fstype \
-        klibc-utils-static-ipconfig klibc-utils-static-nfsmount \
-        klibc-utils-static-resume klibc-utils-static-run-init \
-        klibc-utils-static-cat klibc-utils-static-chroot \
-        klibc-utils-static-cpio klibc-utils-static-dd \
-        klibc-utils-static-dmesg klibc-utils-static-false \
-        klibc-utils-static-halt klibc-utils-static-kill \
-        klibc-utils-static-ln klibc-utils-static-minips \
-        klibc-utils-static-mkdir klibc-utils-static-mkfifo \
-        klibc-utils-static-mknod klibc-utils-static-mount \
-        klibc-utils-static-nuke klibc-utils-static-pivot-root \
-        klibc-utils-static-poweroff klibc-utils-static-readlink \
-        klibc-utils-static-reboot klibc-utils-static-sleep \
-        klibc-utils-static-sync \
-        klibc-utils-static-true klibc-utils-static-umount \
-        klibc-utils-static-uname klibc-utils-static-modprobe \
-        klibc-utils-static-losetup klibc-utils-static-wc \
-        klibc-utils-static-ls"
-
-FILES_klibc-utils-static-sh = "${base_bindir}/sh"
-FILES_klibc-utils-static-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"
-FILES_klibc-utils-static-kinit = "${base_bindir}/kinit"
-FILES_klibc-utils-static-fstype = "${base_bindir}/fstype"
-FILES_klibc-utils-static-ipconfig = "${base_bindir}/ipconfig"
-FILES_klibc-utils-static-nfsmount = "${base_bindir}/nfsmount"
-FILES_klibc-utils-static-resume = "${base_bindir}/resume"
-FILES_klibc-utils-static-run-init = "${base_bindir}/run-init"
-FILES_klibc-utils-static-cat = "${base_bindir}/cat"
-FILES_klibc-utils-static-chroot = "${base_bindir}/chroot"
-FILES_klibc-utils-static-cpio = "${base_bindir}/cpio"
-FILES_klibc-utils-static-dd = "${base_bindir}/dd"
-FILES_klibc-utils-static-dmesg = "${base_bindir}/dmesg"
-FILES_klibc-utils-static-false = "${base_bindir}/false"
-FILES_klibc-utils-static-halt = "${base_bindir}/halt"
-FILES_klibc-utils-static-kill = "${base_bindir}/kill"
-FILES_klibc-utils-static-ln = "${base_bindir}/ln"
-FILES_klibc-utils-static-minips = "${base_bindir}/minips"
-FILES_klibc-utils-static-mkdir = "${base_bindir}/mkdir"
-FILES_klibc-utils-static-mkfifo = "${base_bindir}/mkfifo"
-FILES_klibc-utils-static-mknod = "${base_bindir}/mknod"
-FILES_klibc-utils-static-mount = "${base_bindir}/mount"
-FILES_klibc-utils-static-nuke = "${base_bindir}/nuke"
-FILES_klibc-utils-static-pivot-root = "${base_bindir}/pivot_root"
-FILES_klibc-utils-static-poweroff = "${base_bindir}/poweroff"
-FILES_klibc-utils-static-readlink = "${base_bindir}/readlink"
-FILES_klibc-utils-static-reboot = "${base_bindir}/reboot"
-FILES_klibc-utils-static-sleep = "${base_bindir}/sleep"
-FILES_klibc-utils-static-sync = "${base_bindir}/sync"
-FILES_klibc-utils-static-true = "${base_bindir}/true"
-FILES_klibc-utils-static-umount = "${base_bindir}/umount"
-FILES_klibc-utils-static-uname = "${base_bindir}/uname"
-FILES_klibc-utils-static-modprobe = "${base_sbindir}/modprobe"
-FILES_klibc-utils-static-losetup = "${base_bindir}/losetup"
-FILES_klibc-utils-static-wc = "${base_bindir}/wc"
-FILES_klibc-utils-static-ls = "${base_bindir}/ls"
-
-SRC_URI[md5sum] = "db2152a8a03bd81e21a5f451f537ae3d"
-SRC_URI[sha256sum] = "8b5334ef88b075f374b031695181b4302c3e5621bf2737a39fdf28262b0f80f4"
+require klibc-utils-static.inc
+require klibc_${PV}.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/klibc/klibc-utils-static_1.5.15.bb b/recipes/klibc/klibc-utils-static_1.5.15.bb
index 8bad3f503f..b3599163a0 100644
--- a/recipes/klibc/klibc-utils-static_1.5.15.bb
+++ b/recipes/klibc/klibc-utils-static_1.5.15.bb
@@ -1,121 +1,3 @@
-require klibc-common.inc
-PR = "r3"
-
-KLIBC_FETCHDIR = "Testing"
-
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-            file://modprobe.patch;patch=1 \
-            file://losetup.patch;patch=1 \
-            file://dash_readopt.patch;patch=1 \
-            file://wc.patch;patch=1 \
-            file://staging.patch;patch=1 \
-            file://klibc_kexecsyscall.patch;patch=1 \
-            file://mntproc-definitions.patch;patch=1 \
-            file://signal-cleanup.patch;patch=1 \
-            file://isystem.patch;patch=1 \
-            "
-
-FILESPATHPKG =. "klibc-${PV}:"
-
-# We only want the static utils. klibc build both. So we install only what we want.
-do_install() {
-        install -d ${D}${base_bindir}
-        install -d ${D}${base_sbindir}
-        install -m 755 usr/dash/sh ${D}${base_bindir}
-        install -m 755 usr/gzip/gzip ${D}${base_bindir}
-        install -m 755 usr/kinit/kinit ${D}${base_bindir}
-        install -m 755 usr/kinit/fstype/static/fstype ${D}${base_bindir}
-        install -m 755 usr/kinit/ipconfig/static/ipconfig ${D}${base_bindir}
-        install -m 755 usr/kinit/nfsmount/static/nfsmount ${D}${base_bindir}
-        install -m 755 usr/kinit/resume/static/resume ${D}${base_bindir}
-        install -m 755 usr/kinit/run-init/static/run-init ${D}${base_bindir}
-        install -m 755 usr/utils/static/cat ${D}${base_bindir}
-        install -m 755 usr/utils/static/chroot ${D}${base_bindir}
-        install -m 755 usr/utils/static/cpio ${D}${base_bindir}
-        install -m 755 usr/utils/static/dd ${D}${base_bindir}
-        install -m 755 usr/utils/static/dmesg ${D}${base_bindir}
-        install -m 755 usr/utils/static/false ${D}${base_bindir}
-        install -m 755 usr/utils/static/halt ${D}${base_bindir}
-        install -m 755 usr/utils/static/kill ${D}${base_bindir}
-        install -m 755 usr/utils/static/ln ${D}${base_bindir}
-        install -m 755 usr/utils/static/minips ${D}${base_bindir}
-        install -m 755 usr/utils/static/mkdir ${D}${base_bindir}
-        install -m 755 usr/utils/static/mkfifo ${D}${base_bindir}
-        install -m 755 usr/utils/static/mknod ${D}${base_bindir}
-        install -m 755 usr/utils/static/mount ${D}${base_bindir}
-        install -m 755 usr/utils/static/nuke ${D}${base_bindir}
-        install -m 755 usr/utils/static/pivot_root ${D}${base_bindir}
-        install -m 755 usr/utils/static/poweroff ${D}${base_bindir}
-        install -m 755 usr/utils/static/readlink ${D}${base_bindir}
-        install -m 755 usr/utils/static/reboot ${D}${base_bindir}
-        install -m 755 usr/utils/static/sleep ${D}${base_bindir}
-        install -m 755 usr/utils/static/sync ${D}${base_bindir}
-        install -m 755 usr/utils/static/true ${D}${base_bindir}
-        install -m 755 usr/utils/static/umount ${D}${base_bindir}
-        install -m 755 usr/utils/static/uname ${D}${base_bindir}
-        install -m 755 usr/utils/static/modprobe ${D}${base_sbindir}
-        install -m 755 usr/utils/static/losetup ${D}${base_bindir}
-        install -m 755 usr/utils/static/wc ${D}${base_bindir}
-        cd ${D}${base_bindir}
-        ln -s gzip gunzip
-        ln -s gzip zcat
-        cd -
-}
-
-PACKAGES = "klibc-utils-static-sh klibc-utils-static-gzip \
-        klibc-utils-static-kinit klibc-utils-static-fstype \
-        klibc-utils-static-ipconfig klibc-utils-static-nfsmount \
-        klibc-utils-static-resume klibc-utils-static-run-init \
-        klibc-utils-static-cat klibc-utils-static-chroot \
-        klibc-utils-static-cpio klibc-utils-static-dd \
-        klibc-utils-static-dmesg klibc-utils-static-false \
-        klibc-utils-static-halt klibc-utils-static-kill \
-        klibc-utils-static-ln klibc-utils-static-minips \
-        klibc-utils-static-mkdir klibc-utils-static-mkfifo \
-        klibc-utils-static-mknod klibc-utils-static-mount \
-        klibc-utils-static-nuke klibc-utils-static-pivot-root \
-        klibc-utils-static-poweroff klibc-utils-static-readlink \
-        klibc-utils-static-reboot klibc-utils-static-sleep \
-        klibc-utils-static-sync \
-        klibc-utils-static-true klibc-utils-static-umount \
-        klibc-utils-static-uname klibc-utils-static-modprobe \
-        klibc-utils-static-losetup klibc-utils-static-wc"
-
-FILES_klibc-utils-static-sh = "${base_bindir}/sh"
-FILES_klibc-utils-static-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"
-FILES_klibc-utils-static-kinit = "${base_bindir}/kinit"
-FILES_klibc-utils-static-fstype = "${base_bindir}/fstype"
-FILES_klibc-utils-static-ipconfig = "${base_bindir}/ipconfig"
-FILES_klibc-utils-static-nfsmount = "${base_bindir}/nfsmount"
-FILES_klibc-utils-static-resume = "${base_bindir}/resume"
-FILES_klibc-utils-static-run-init = "${base_bindir}/run-init"
-FILES_klibc-utils-static-cat = "${base_bindir}/cat"
-FILES_klibc-utils-static-chroot = "${base_bindir}/chroot"
-FILES_klibc-utils-static-cpio = "${base_bindir}/cpio"
-FILES_klibc-utils-static-dd = "${base_bindir}/dd"
-FILES_klibc-utils-static-dmesg = "${base_bindir}/dmesg"
-FILES_klibc-utils-static-false = "${base_bindir}/false"
-FILES_klibc-utils-static-halt = "${base_bindir}/halt"
-FILES_klibc-utils-static-kill = "${base_bindir}/kill"
-FILES_klibc-utils-static-ln = "${base_bindir}/ln"
-FILES_klibc-utils-static-minips = "${base_bindir}/minips"
-FILES_klibc-utils-static-mkdir = "${base_bindir}/mkdir"
-FILES_klibc-utils-static-mkfifo = "${base_bindir}/mkfifo"
-FILES_klibc-utils-static-mknod = "${base_bindir}/mknod"
-FILES_klibc-utils-static-mount = "${base_bindir}/mount"
-FILES_klibc-utils-static-nuke = "${base_bindir}/nuke"
-FILES_klibc-utils-static-pivot-root = "${base_bindir}/pivot_root"
-FILES_klibc-utils-static-poweroff = "${base_bindir}/poweroff"
-FILES_klibc-utils-static-readlink = "${base_bindir}/readlink"
-FILES_klibc-utils-static-reboot = "${base_bindir}/reboot"
-FILES_klibc-utils-static-sleep = "${base_bindir}/sleep"
-FILES_klibc-utils-static-sync = "${base_bindir}/sync"
-FILES_klibc-utils-static-true = "${base_bindir}/true"
-FILES_klibc-utils-static-umount = "${base_bindir}/umount"
-FILES_klibc-utils-static-uname = "${base_bindir}/uname"
-FILES_klibc-utils-static-modprobe = "${base_sbindir}/modprobe"
-FILES_klibc-utils-static-losetup = "${base_bindir}/losetup"
-FILES_klibc-utils-static-wc = "${base_bindir}/wc"
-
-SRC_URI[md5sum] = "db2152a8a03bd81e21a5f451f537ae3d"
-SRC_URI[sha256sum] = "8b5334ef88b075f374b031695181b4302c3e5621bf2737a39fdf28262b0f80f4"
+require klibc-utils-static.inc
+require klibc_${PV}.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/klibc/klibc-utils-static_1.5.17.bb b/recipes/klibc/klibc-utils-static_1.5.17.bb
new file mode 100644
index 0000000000..b3599163a0
--- /dev/null
+++ b/recipes/klibc/klibc-utils-static_1.5.17.bb
@@ -0,0 +1,3 @@
+require klibc-utils-static.inc
+require klibc_${PV}.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/klibc/klibc-utils-static_1.5.18.bb b/recipes/klibc/klibc-utils-static_1.5.18.bb
new file mode 100644
index 0000000000..b3599163a0
--- /dev/null
+++ b/recipes/klibc/klibc-utils-static_1.5.18.bb
@@ -0,0 +1,3 @@
+require klibc-utils-static.inc
+require klibc_${PV}.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/klibc/klibc-utils-static_1.5.bb b/recipes/klibc/klibc-utils-static_1.5.bb
index 7602a9be71..b3599163a0 100644
--- a/recipes/klibc/klibc-utils-static_1.5.bb
+++ b/recipes/klibc/klibc-utils-static_1.5.bb
@@ -1,115 +1,3 @@
-require klibc-common.inc
-PR = "r13"
-
-KLIBC_FETCHDIR = "Stable"
-
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-            file://modprobe.patch;patch=1 \
-            file://losetup.patch;patch=1 \
-            file://dash_readopt.patch;patch=1 \
-            file://wc.patch;patch=1 \
-            file://staging.patch;patch=1 \
-            file://klibc_kexecsyscall.patch;patch=1 \
-            "
-
-FILESPATHPKG =. "klibc-${PV}:"
-
-# We only want the static utils. klibc build both. So we install only what we want.
-do_install() {
-        install -d ${D}${base_bindir}
-        install -d ${D}${base_sbindir}
-        install -m 755 usr/dash/sh ${D}${base_bindir}
-        install -m 755 usr/gzip/gzip ${D}${base_bindir}
-        install -m 755 usr/kinit/kinit ${D}${base_bindir}
-        install -m 755 usr/kinit/fstype/static/fstype ${D}${base_bindir}
-        install -m 755 usr/kinit/ipconfig/static/ipconfig ${D}${base_bindir}
-        install -m 755 usr/kinit/nfsmount/static/nfsmount ${D}${base_bindir}
-        install -m 755 usr/kinit/resume/static/resume ${D}${base_bindir}
-        install -m 755 usr/kinit/run-init/static/run-init ${D}${base_bindir}
-        install -m 755 usr/utils/static/cat ${D}${base_bindir}
-        install -m 755 usr/utils/static/chroot ${D}${base_bindir}
-        install -m 755 usr/utils/static/cpio ${D}${base_bindir}
-        install -m 755 usr/utils/static/dd ${D}${base_bindir}
-        install -m 755 usr/utils/static/false ${D}${base_bindir}
-        install -m 755 usr/utils/static/halt ${D}${base_bindir}
-        install -m 755 usr/utils/static/insmod ${D}${base_bindir}
-        install -m 755 usr/utils/static/kill ${D}${base_bindir}
-        install -m 755 usr/utils/static/ln ${D}${base_bindir}
-        install -m 755 usr/utils/static/minips ${D}${base_bindir}
-        install -m 755 usr/utils/static/mkdir ${D}${base_bindir}
-        install -m 755 usr/utils/static/mkfifo ${D}${base_bindir}
-        install -m 755 usr/utils/static/mknod ${D}${base_bindir}
-        install -m 755 usr/utils/static/mount ${D}${base_bindir}
-        install -m 755 usr/utils/static/nuke ${D}${base_bindir}
-        install -m 755 usr/utils/static/pivot_root ${D}${base_bindir}
-        install -m 755 usr/utils/static/poweroff ${D}${base_bindir}
-        install -m 755 usr/utils/static/readlink ${D}${base_bindir}
-        install -m 755 usr/utils/static/reboot ${D}${base_bindir}
-        install -m 755 usr/utils/static/sleep ${D}${base_bindir}
-        install -m 755 usr/utils/static/true ${D}${base_bindir}
-        install -m 755 usr/utils/static/umount ${D}${base_bindir}
-        install -m 755 usr/utils/static/uname ${D}${base_bindir}
-        install -m 755 usr/utils/static/modprobe ${D}${base_sbindir}
-        install -m 755 usr/utils/static/losetup ${D}${base_bindir}
-        install -m 755 usr/utils/static/wc ${D}${base_bindir}
-        cd ${D}${base_bindir}
-        ln -s gzip gunzip
-        ln -s gzip zcat
-        cd -
-}
-
-PACKAGES = "klibc-utils-static-sh klibc-utils-static-gzip \
-        klibc-utils-static-kinit klibc-utils-static-fstype \
-        klibc-utils-static-ipconfig klibc-utils-static-nfsmount \
-        klibc-utils-static-resume klibc-utils-static-run-init \
-        klibc-utils-static-cat klibc-utils-static-chroot \
-        klibc-utils-static-cpio klibc-utils-static-dd \
-        klibc-utils-static-false klibc-utils-static-halt \
-        klibc-utils-static-insmod klibc-utils-static-kill \
-        klibc-utils-static-ln klibc-utils-static-minips \
-        klibc-utils-static-mkdir klibc-utils-static-mkfifo \
-        klibc-utils-static-mknod klibc-utils-static-mount \
-        klibc-utils-static-nuke klibc-utils-static-pivot-root \
-        klibc-utils-static-poweroff klibc-utils-static-readlink \
-        klibc-utils-static-reboot klibc-utils-static-sleep \
-        klibc-utils-static-true klibc-utils-static-umount \
-        klibc-utils-static-uname klibc-utils-static-modprobe \
-        klibc-utils-static-losetup klibc-utils-static-wc"
-
-FILES_klibc-utils-static-sh = "${base_bindir}/sh"
-FILES_klibc-utils-static-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"
-FILES_klibc-utils-static-kinit = "${base_bindir}/kinit"
-FILES_klibc-utils-static-fstype = "${base_bindir}/fstype"
-FILES_klibc-utils-static-ipconfig = "${base_bindir}/ipconfig"
-FILES_klibc-utils-static-nfsmount = "${base_bindir}/nfsmount"
-FILES_klibc-utils-static-resume = "${base_bindir}/resume"
-FILES_klibc-utils-static-run-init = "${base_bindir}/run-init"
-FILES_klibc-utils-static-cat = "${base_bindir}/cat"
-FILES_klibc-utils-static-chroot = "${base_bindir}/chroot"
-FILES_klibc-utils-static-cpio = "${base_bindir}/cpio"
-FILES_klibc-utils-static-dd = "${base_bindir}/dd"
-FILES_klibc-utils-static-false = "${base_bindir}/false"
-FILES_klibc-utils-static-halt = "${base_bindir}/halt"
-FILES_klibc-utils-static-insmod = "${base_bindir}/insmod"
-FILES_klibc-utils-static-kill = "${base_bindir}/kill"
-FILES_klibc-utils-static-ln = "${base_bindir}/ln"
-FILES_klibc-utils-static-minips = "${base_bindir}/minips"
-FILES_klibc-utils-static-mkdir = "${base_bindir}/mkdir"
-FILES_klibc-utils-static-mkfifo = "${base_bindir}/mkfifo"
-FILES_klibc-utils-static-mknod = "${base_bindir}/mknod"
-FILES_klibc-utils-static-mount = "${base_bindir}/mount"
-FILES_klibc-utils-static-nuke = "${base_bindir}/nuke"
-FILES_klibc-utils-static-pivot-root = "${base_bindir}/pivot_root"
-FILES_klibc-utils-static-poweroff = "${base_bindir}/poweroff"
-FILES_klibc-utils-static-readlink = "${base_bindir}/readlink"
-FILES_klibc-utils-static-reboot = "${base_bindir}/reboot"
-FILES_klibc-utils-static-sleep = "${base_bindir}/sleep"
-FILES_klibc-utils-static-true = "${base_bindir}/true"
-FILES_klibc-utils-static-umount = "${base_bindir}/umount"
-FILES_klibc-utils-static-uname = "${base_bindir}/uname"
-FILES_klibc-utils-static-modprobe = "${base_sbindir}/modprobe"
-FILES_klibc-utils-static-losetup = "${base_bindir}/losetup"
-FILES_klibc-utils-static-wc = "${base_bindir}/wc"
-
-SRC_URI[md5sum] = "481dfdef7273f2cc776c2637f481f017"
-SRC_URI[sha256sum] = "27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7"
+require klibc-utils-static.inc
+require klibc_${PV}.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/klibc/klibc-utils.inc b/recipes/klibc/klibc-utils.inc
new file mode 100644
index 0000000000..7bbcee3241
--- /dev/null
+++ b/recipes/klibc/klibc-utils.inc
@@ -0,0 +1,125 @@
+KLIBC_UTILS_VARIANT ?= "shared"
+KLIBC_UTILS_PKGNAME ?= "klibc-utils"
+
+# We only want the static utils. klibc build both. So we install only what we want.
+do_install_append() {
+        install -d ${D}${base_bindir}
+        install -d ${D}${base_sbindir}
+        install -m 755 usr/gzip/gzip ${D}${base_bindir}
+        install -m 755 usr/kinit/fstype/${KLIBC_UTILS_VARIANT}/fstype ${D}${base_bindir}
+        install -m 755 usr/kinit/ipconfig/${KLIBC_UTILS_VARIANT}/ipconfig ${D}${base_bindir}
+        install -m 755 usr/kinit/nfsmount/${KLIBC_UTILS_VARIANT}/nfsmount ${D}${base_bindir}
+        install -m 755 usr/kinit/resume/${KLIBC_UTILS_VARIANT}/resume ${D}${base_bindir}
+        install -m 755 usr/kinit/run-init/${KLIBC_UTILS_VARIANT}/run-init ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cat ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/chroot ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cpio ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dd ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/false ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/halt ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/kill ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ln ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/minips ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkdir ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkfifo ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mknod ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mount ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/nuke ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/pivot_root ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/poweroff ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/readlink ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/reboot ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sleep ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/modprobe ${D}${base_sbindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/losetup ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/wc ${D}${base_bindir}
+        ln -s gzip ${D}${base_bindir}/gunzip
+        ln -s gzip ${D}${base_bindir}/zcat
+}
+
+# only in 1.5
+# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir}
+
+# only in >= 1.5.15
+# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir}
+# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir}
+
+# only in >= 1.5.15+1.5.16
+# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir}
+
+PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \
+             ${KLIBC_UTILS_PKGNAME}-gzip \
+             ${KLIBC_UTILS_PKGNAME}-kinit \
+             ${KLIBC_UTILS_PKGNAME}-fstype \
+             ${KLIBC_UTILS_PKGNAME}-ipconfig \
+             ${KLIBC_UTILS_PKGNAME}-nfsmount \
+             ${KLIBC_UTILS_PKGNAME}-resume \
+             ${KLIBC_UTILS_PKGNAME}-run-init \
+             ${KLIBC_UTILS_PKGNAME}-cat \
+             ${KLIBC_UTILS_PKGNAME}-chroot \
+             ${KLIBC_UTILS_PKGNAME}-cpio \
+             ${KLIBC_UTILS_PKGNAME}-dd \
+             ${KLIBC_UTILS_PKGNAME}-dmesg \
+             ${KLIBC_UTILS_PKGNAME}-false \
+             ${KLIBC_UTILS_PKGNAME}-halt \
+             ${KLIBC_UTILS_PKGNAME}-kill \
+             ${KLIBC_UTILS_PKGNAME}-ln \
+             ${KLIBC_UTILS_PKGNAME}-minips \
+             ${KLIBC_UTILS_PKGNAME}-mkdir \
+             ${KLIBC_UTILS_PKGNAME}-mkfifo \
+             ${KLIBC_UTILS_PKGNAME}-mknod \
+             ${KLIBC_UTILS_PKGNAME}-mount \
+             ${KLIBC_UTILS_PKGNAME}-nuke \
+             ${KLIBC_UTILS_PKGNAME}-pivot-root \
+             ${KLIBC_UTILS_PKGNAME}-poweroff \
+             ${KLIBC_UTILS_PKGNAME}-readlink \
+             ${KLIBC_UTILS_PKGNAME}-reboot \
+             ${KLIBC_UTILS_PKGNAME}-sleep \
+             ${KLIBC_UTILS_PKGNAME}-sync \
+             ${KLIBC_UTILS_PKGNAME}-true \
+             ${KLIBC_UTILS_PKGNAME}-umount \
+             ${KLIBC_UTILS_PKGNAME}-uname \
+             ${KLIBC_UTILS_PKGNAME}-modprobe \
+             ${KLIBC_UTILS_PKGNAME}-losetup \
+             ${KLIBC_UTILS_PKGNAME}-wc \
+             ${KLIBC_UTILS_PKGNAME}-ls"
+
+FILES_${KLIBC_UTILS_PKGNAME}-sh = "${base_bindir}/sh"
+FILES_${KLIBC_UTILS_PKGNAME}-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"
+FILES_${KLIBC_UTILS_PKGNAME}-kinit = "${base_bindir}/kinit"
+FILES_${KLIBC_UTILS_PKGNAME}-fstype = "${base_bindir}/fstype"
+FILES_${KLIBC_UTILS_PKGNAME}-ipconfig = "${base_bindir}/ipconfig"
+FILES_${KLIBC_UTILS_PKGNAME}-nfsmount = "${base_bindir}/nfsmount"
+FILES_${KLIBC_UTILS_PKGNAME}-resume = "${base_bindir}/resume"
+FILES_${KLIBC_UTILS_PKGNAME}-run-init = "${base_bindir}/run-init"
+FILES_${KLIBC_UTILS_PKGNAME}-cat = "${base_bindir}/cat"
+FILES_${KLIBC_UTILS_PKGNAME}-chroot = "${base_bindir}/chroot"
+FILES_${KLIBC_UTILS_PKGNAME}-cpio = "${base_bindir}/cpio"
+FILES_${KLIBC_UTILS_PKGNAME}-dd = "${base_bindir}/dd"
+FILES_${KLIBC_UTILS_PKGNAME}-dmesg = "${base_bindir}/dmesg"
+FILES_${KLIBC_UTILS_PKGNAME}-false = "${base_bindir}/false"
+FILES_${KLIBC_UTILS_PKGNAME}-halt = "${base_bindir}/halt"
+FILES_${KLIBC_UTILS_PKGNAME}-kill = "${base_bindir}/kill"
+FILES_${KLIBC_UTILS_PKGNAME}-ln = "${base_bindir}/ln"
+FILES_${KLIBC_UTILS_PKGNAME}-minips = "${base_bindir}/minips"
+FILES_${KLIBC_UTILS_PKGNAME}-mkdir = "${base_bindir}/mkdir"
+FILES_${KLIBC_UTILS_PKGNAME}-mkfifo = "${base_bindir}/mkfifo"
+FILES_${KLIBC_UTILS_PKGNAME}-mknod = "${base_bindir}/mknod"
+FILES_${KLIBC_UTILS_PKGNAME}-mount = "${base_bindir}/mount"
+FILES_${KLIBC_UTILS_PKGNAME}-nuke = "${base_bindir}/nuke"
+FILES_${KLIBC_UTILS_PKGNAME}-pivot-root = "${base_bindir}/pivot_root"
+FILES_${KLIBC_UTILS_PKGNAME}-poweroff = "${base_bindir}/poweroff"
+FILES_${KLIBC_UTILS_PKGNAME}-readlink = "${base_bindir}/readlink"
+FILES_${KLIBC_UTILS_PKGNAME}-reboot = "${base_bindir}/reboot"
+FILES_${KLIBC_UTILS_PKGNAME}-sleep = "${base_bindir}/sleep"
+FILES_${KLIBC_UTILS_PKGNAME}-sync = "${base_bindir}/sync"
+FILES_${KLIBC_UTILS_PKGNAME}-true = "${base_bindir}/true"
+FILES_${KLIBC_UTILS_PKGNAME}-umount = "${base_bindir}/umount"
+FILES_${KLIBC_UTILS_PKGNAME}-uname = "${base_bindir}/uname"
+FILES_${KLIBC_UTILS_PKGNAME}-modprobe = "${base_sbindir}/modprobe"
+FILES_${KLIBC_UTILS_PKGNAME}-losetup = "${base_bindir}/losetup"
+FILES_${KLIBC_UTILS_PKGNAME}-wc = "${base_bindir}/wc"
+FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls"
diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc
new file mode 100644
index 0000000000..9ae6c5b634
--- /dev/null
+++ b/recipes/klibc/klibc.inc
@@ -0,0 +1,61 @@
+do_install() {
+        install -d ${D}${base_bindir}
+        install -m 755 usr/dash/sh.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/sh
+        install -m 755 usr/kinit/kinit.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/kinit
+
+        install -d ${D}${base_libdir}
+        install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir}
+        cd ${D}${base_libdir}
+        ln -s klibc-*.so klibc.so
+        cd -
+}
+
+export INST=${STAGING_DIR_TARGET}
+do_stage() {
+        oe_runmake  install
+        cp '${STAGING_DIR_TARGET}/bin/klcc'  '${CROSS_DIR}/bin/${TARGET_PREFIX}klcc'
+}
+
+PACKAGES = "${PN} ${PN}-dev "
+FILES_${PN} = "${base_libdir}/klibc-*.so"
+FILES_${PN}-dev = "${base_libdir}/klibc.so"
+
+require klibc-utils.inc
+
+# Yes we want exactly the klibc that was compiled with the utils
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-sh = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-kinit = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-fstype = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-ipconfig = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-nfsmount = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-resume = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-run-init = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-cat = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-chroot = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-cpio = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-dd = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-dmesg = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-false = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-halt = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-insmod = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-kill = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-ln = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-minips = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkdir = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkfifo = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-mknod = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-mount = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-nuke = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-pivot-root = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-poweroff = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-readlink = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-reboot = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-sleep = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-sync = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-true = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-umount = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-uname = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-modprobe = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-losetup = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-ls = "${PN} (=${PV}-${PR})"
diff --git a/recipes/klibc/klibc_1.5.15+1.5.16.bb b/recipes/klibc/klibc_1.5.15+1.5.16.bb
index ba3eb49948..4b299f226e 100644
--- a/recipes/klibc/klibc_1.5.15+1.5.16.bb
+++ b/recipes/klibc/klibc_1.5.15+1.5.16.bb
@@ -1,9 +1,3 @@
-require klibc_1.5.15+1.5.16.inc
-PR = "r1"
-
-KLIBC_FETCHDIR = "Testing"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI[md5sum] = "db2152a8a03bd81e21a5f451f537ae3d"
-SRC_URI[sha256sum] = "8b5334ef88b075f374b031695181b4302c3e5621bf2737a39fdf28262b0f80f4"
+require klibc.inc
+require klibc_${PV}.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/klibc/klibc_1.5.15+1.5.16.inc b/recipes/klibc/klibc_1.5.15+1.5.16.inc
index 7685cf8411..f638e14626 100644
--- a/recipes/klibc/klibc_1.5.15+1.5.16.inc
+++ b/recipes/klibc/klibc_1.5.15+1.5.16.inc
@@ -4,175 +4,35 @@ require klibc-common.inc
 # until 1.5.16 is released
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-1.5.15.tar.bz2 \
-            file://1.5.15+1.5.16.patch;patch=1 \
+            file://1.5.15+1.5.16.patch \
             "
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-            file://modprobe.patch;patch=1 \
-            file://losetup.patch;patch=1 \
-            file://dash_readopt.patch;patch=1 \
-            file://wc.patch;patch=1 \
-            file://staging.patch;patch=1 \
-            file://klibc_kexecsyscall.patch;patch=1 \
-            file://mntproc-definitions.patch;patch=1 \
-            file://signal-cleanup.patch;patch=1 \
-            file://isystem.patch;patch=1 \
-            file://socket.h.patch;patch=1 \
+SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
+            file://modprobe.patch \
+            file://losetup.patch \
+            file://dash_readopt.patch \
+            file://wc.patch \
+            file://staging.patch \
+            file://klibc_kexecsyscall.patch \
+            file://mntproc-definitions.patch \
+            file://signal-cleanup.patch \
+            file://isystem.patch \
+            file://socket.h.patch \
             "
 
 S = "${WORKDIR}/klibc-1.5.15"
 
 # end temporary overrides
 
-# we want only the shared programms and the lib so we chose them manually
-do_install() {
-        install -d ${D}${base_bindir}
-        install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh
-        install -m 755 usr/gzip/gzip ${D}${base_bindir}
-        install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit
-        install -m 755 usr/kinit/fstype/shared/fstype ${D}${base_bindir}
-        install -m 755 usr/kinit/ipconfig/shared/ipconfig ${D}${base_bindir}
-        install -m 755 usr/kinit/nfsmount/shared/nfsmount ${D}${base_bindir}
-        install -m 755 usr/kinit/resume/shared/resume ${D}${base_bindir}
-        install -m 755 usr/kinit/run-init/shared/run-init ${D}${base_bindir}
-        install -m 755 usr/utils/shared/cat ${D}${base_bindir}
-        install -m 755 usr/utils/shared/chroot ${D}${base_bindir}
-        install -m 755 usr/utils/shared/cpio ${D}${base_bindir}
-        install -m 755 usr/utils/shared/dd ${D}${base_bindir}
-        install -m 755 usr/utils/shared/dmesg ${D}${base_bindir}
-        install -m 755 usr/utils/shared/false ${D}${base_bindir}
-        install -m 755 usr/utils/shared/halt ${D}${base_bindir}
-        install -m 755 usr/utils/shared/kill ${D}${base_bindir}
-        install -m 755 usr/utils/shared/ln ${D}${base_bindir}
-        install -m 755 usr/utils/shared/minips ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mkdir ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mkfifo ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mknod ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mount ${D}${base_bindir}
-        install -m 755 usr/utils/shared/nuke ${D}${base_bindir}
-        install -m 755 usr/utils/shared/pivot_root ${D}${base_bindir}
-        install -m 755 usr/utils/shared/poweroff ${D}${base_bindir}
-        install -m 755 usr/utils/shared/readlink ${D}${base_bindir}
-        install -m 755 usr/utils/shared/reboot ${D}${base_bindir}
-        install -m 755 usr/utils/shared/sleep ${D}${base_bindir}
-        install -m 755 usr/utils/shared/sync ${D}${base_bindir}
-        install -m 755 usr/utils/shared/true ${D}${base_bindir}
-        install -m 755 usr/utils/shared/umount ${D}${base_bindir}
-        install -m 755 usr/utils/shared/uname ${D}${base_bindir}
-        install -m 755 usr/utils/shared/modprobe ${D}${base_bindir}
-        install -m 755 usr/utils/shared/losetup ${D}${base_bindir}
-        install -m 755 usr/utils/shared/wc ${D}${base_bindir}
-        install -m 755 usr/utils/shared/ls ${D}${base_bindir}
+DEFAULT_PREFERENCE = "-1"
 
-        install -d ${D}${base_libdir}
-        install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir}
-        cd ${D}${base_libdir}
-        ln -s klibc-*.so klibc.so
-        cd -
-        cd ${D}${base_bindir}
-        ln -s gzip gunzip
-        ln -s gzip zcat
-        cd -
-}
-
-export INST=${STAGING_DIR_TARGET}
-do_stage() {
-        oe_runmake  install
-        cp '${STAGING_DIR_TARGET}/bin/klcc'  '${CROSS_DIR}/bin/${TARGET_PREFIX}klcc'
-}
+KLIBC_FETCHDIR = "1.5"
 
-PACKAGES = "${PN} ${PN}-dev klibc-utils-sh klibc-utils-kinit \
-        klibc-utils-fstype klibc-utils-ipconfig \
-        klibc-utils-nfsmount klibc-utils-resume \
-        klibc-utils-run-init klibc-utils-cat \
-        klibc-utils-chroot klibc-utils-cpio \
-        klibc-utils-dd klibc-utils-dmesg \
-        klibc-utils-false klibc-utils-halt \
-        klibc-utils-kill klibc-utils-ln \
-        klibc-utils-minips klibc-utils-mkdir \
-        klibc-utils-mkfifo klibc-utils-mknod \
-        klibc-utils-mount klibc-utils-nuke \
-        klibc-utils-pivot-root klibc-utils-poweroff \
-        klibc-utils-readlink klibc-utils-reboot \
-        klibc-utils-sleep \
-        klibc-utils-sync klibc-utils-true \
-        klibc-utils-umount klibc-utils-uname \
-        klibc-utils-gzip klibc-utils-modprobe \
-        klibc-utils-losetup klibc-utils-wc \
-        klibc-utils-ls"
+SRC_URI[md5sum] = "db2152a8a03bd81e21a5f451f537ae3d"
+SRC_URI[sha256sum] = "8b5334ef88b075f374b031695181b4302c3e5621bf2737a39fdf28262b0f80f4"
 
-FILES_${PN} = "${base_libdir}/klibc-*.so"
-FILES_${PN}-dev = "${base_libdir}/klibc.so"
-FILES_klibc-utils-sh = "${base_bindir}/sh"
-FILES_klibc-utils-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"
-FILES_klibc-utils-kinit = "${base_bindir}/kinit"
-FILES_klibc-utils-fstype = "${base_bindir}/fstype"
-FILES_klibc-utils-ipconfig = "${base_bindir}/ipconfig"
-FILES_klibc-utils-nfsmount = "${base_bindir}/nfsmount"
-FILES_klibc-utils-resume = "${base_bindir}/resume"
-FILES_klibc-utils-run-init = "${base_bindir}/run-init"
-FILES_klibc-utils-cat = "${base_bindir}/cat"
-FILES_klibc-utils-chroot = "${base_bindir}/chroot"
-FILES_klibc-utils-cpio = "${base_bindir}/cpio"
-FILES_klibc-utils-dd = "${base_bindir}/dd"
-FILES_klibc-utils-dmesg = "${base_bindir}/dmesg"
-FILES_klibc-utils-false = "${base_bindir}/false"
-FILES_klibc-utils-halt = "${base_bindir}/halt"
-FILES_klibc-utils-kill = "${base_bindir}/kill"
-FILES_klibc-utils-ln = "${base_bindir}/ln"
-FILES_klibc-utils-minips = "${base_bindir}/minips"
-FILES_klibc-utils-mkdir = "${base_bindir}/mkdir"
-FILES_klibc-utils-mkfifo = "${base_bindir}/mkfifo"
-FILES_klibc-utils-mknod = "${base_bindir}/mknod"
-FILES_klibc-utils-mount = "${base_bindir}/mount"
-FILES_klibc-utils-nuke = "${base_bindir}/nuke"
-FILES_klibc-utils-pivot-root = "${base_bindir}/pivot_root"
-FILES_klibc-utils-poweroff = "${base_bindir}/poweroff"
-FILES_klibc-utils-readlink = "${base_bindir}/readlink"
-FILES_klibc-utils-reboot = "${base_bindir}/reboot"
-FILES_klibc-utils-sleep = "${base_bindir}/sleep"
-FILES_klibc-utils-sync = "${base_bindir}/sync"
-FILES_klibc-utils-true = "${base_bindir}/true"
-FILES_klibc-utils-umount = "${base_bindir}/umount"
-FILES_klibc-utils-uname = "${base_bindir}/uname"
-FILES_klibc-utils-modprobe = "${base_bindir}/modprobe"
-FILES_klibc-utils-losetup = "${base_bindir}/losetup"
-FILES_klibc-utils-wc = "${base_bindir}/wc"
-FILES_klibc-utils-ls = "${base_bindir}/ls"
-
-# Yes we want exactly the klibc that was compiled with the utils
-RDEPENDS_klibc-utils-sh = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-kinit = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-fstype = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-ipconfig = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-nfsmount = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-resume = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-run-init = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-cat = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-chroot = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-cpio = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-dd = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-dmesg = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-false = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-halt = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-kill = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-ln = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-minips = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mkdir = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mkfifo = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mknod = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mount = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-nuke = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-pivot-root = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-poweroff = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-readlink = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-reboot = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-sleep = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-sync = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-true = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-umount = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-uname = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-modprobe = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-losetup = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-wc = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-ls = "${PN} (=${PV}-${PR})"
+do_install_append() {
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir}
+}
diff --git a/recipes/klibc/klibc_1.5.15.bb b/recipes/klibc/klibc_1.5.15.bb
index 1c81818b0f..4b299f226e 100644
--- a/recipes/klibc/klibc_1.5.15.bb
+++ b/recipes/klibc/klibc_1.5.15.bb
@@ -1,7 +1,3 @@
-require klibc_1.5.15.inc
-PR = "r6"
-
-KLIBC_FETCHDIR = "Testing"
-
-SRC_URI[md5sum] = "db2152a8a03bd81e21a5f451f537ae3d"
-SRC_URI[sha256sum] = "8b5334ef88b075f374b031695181b4302c3e5621bf2737a39fdf28262b0f80f4"
+require klibc.inc
+require klibc_${PV}.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/klibc/klibc_1.5.15.inc b/recipes/klibc/klibc_1.5.15.inc
index fa4fae13f8..22bd84ceef 100644
--- a/recipes/klibc/klibc_1.5.15.inc
+++ b/recipes/klibc/klibc_1.5.15.inc
@@ -1,162 +1,23 @@
 require klibc-common.inc
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-            file://modprobe.patch;patch=1 \
-            file://losetup.patch;patch=1 \
-            file://dash_readopt.patch;patch=1 \
-            file://wc.patch;patch=1 \
-            file://staging.patch;patch=1 \
-            file://klibc_kexecsyscall.patch;patch=1 \
-            file://mntproc-definitions.patch;patch=1 \
-            file://signal-cleanup.patch;patch=1 \
-            file://isystem.patch;patch=1 \
+SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
+            file://modprobe.patch \
+            file://losetup.patch \
+            file://dash_readopt.patch \
+            file://wc.patch \
+            file://staging.patch \
+            file://klibc_kexecsyscall.patch \
+            file://mntproc-definitions.patch \
+            file://signal-cleanup.patch \
+            file://isystem.patch \
             "
 
-# we want only the shared programms and the lib so we chose them manually
-do_install() {
-        install -d ${D}${base_bindir}
-        install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh
-        install -m 755 usr/gzip/gzip ${D}${base_bindir}
-        install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit
-        install -m 755 usr/kinit/fstype/shared/fstype ${D}${base_bindir}
-        install -m 755 usr/kinit/ipconfig/shared/ipconfig ${D}${base_bindir}
-        install -m 755 usr/kinit/nfsmount/shared/nfsmount ${D}${base_bindir}
-        install -m 755 usr/kinit/resume/shared/resume ${D}${base_bindir}
-        install -m 755 usr/kinit/run-init/shared/run-init ${D}${base_bindir}
-        install -m 755 usr/utils/shared/cat ${D}${base_bindir}
-        install -m 755 usr/utils/shared/chroot ${D}${base_bindir}
-        install -m 755 usr/utils/shared/cpio ${D}${base_bindir}
-        install -m 755 usr/utils/shared/dd ${D}${base_bindir}
-        install -m 755 usr/utils/shared/dmesg ${D}${base_bindir}
-        install -m 755 usr/utils/shared/false ${D}${base_bindir}
-        install -m 755 usr/utils/shared/halt ${D}${base_bindir}
-        install -m 755 usr/utils/shared/kill ${D}${base_bindir}
-        install -m 755 usr/utils/shared/ln ${D}${base_bindir}
-        install -m 755 usr/utils/shared/minips ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mkdir ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mkfifo ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mknod ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mount ${D}${base_bindir}
-        install -m 755 usr/utils/shared/nuke ${D}${base_bindir}
-        install -m 755 usr/utils/shared/pivot_root ${D}${base_bindir}
-        install -m 755 usr/utils/shared/poweroff ${D}${base_bindir}
-        install -m 755 usr/utils/shared/readlink ${D}${base_bindir}
-        install -m 755 usr/utils/shared/reboot ${D}${base_bindir}
-        install -m 755 usr/utils/shared/sleep ${D}${base_bindir}
-        install -m 755 usr/utils/shared/sync ${D}${base_bindir}
-        install -m 755 usr/utils/shared/true ${D}${base_bindir}
-        install -m 755 usr/utils/shared/umount ${D}${base_bindir}
-        install -m 755 usr/utils/shared/uname ${D}${base_bindir}
-        install -m 755 usr/utils/shared/modprobe ${D}${base_bindir}
-        install -m 755 usr/utils/shared/losetup ${D}${base_bindir}
-        install -m 755 usr/utils/shared/wc ${D}${base_bindir}
+KLIBC_FETCHDIR = "1.5"
 
-        install -d ${D}${base_libdir}
-        install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir}
-        cd ${D}${base_libdir}
-        ln -s klibc-*.so klibc.so
-        cd -
-        cd ${D}${base_bindir}
-        ln -s gzip gunzip
-        ln -s gzip zcat
-        cd -
-}
+SRC_URI[md5sum] = "db2152a8a03bd81e21a5f451f537ae3d"
+SRC_URI[sha256sum] = "8b5334ef88b075f374b031695181b4302c3e5621bf2737a39fdf28262b0f80f4"
 
-export INST=${STAGING_DIR_TARGET}
-do_stage() {
-        oe_runmake  install
-        cp '${STAGING_DIR_TARGET}/bin/klcc'  '${CROSS_DIR}/bin/${TARGET_PREFIX}klcc'
+do_install_append() {
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir}
 }
-
-PACKAGES = "${PN} ${PN}-dev klibc-utils-sh klibc-utils-kinit \
-        klibc-utils-fstype klibc-utils-ipconfig \
-        klibc-utils-nfsmount klibc-utils-resume \
-        klibc-utils-run-init klibc-utils-cat \
-        klibc-utils-chroot klibc-utils-cpio \
-        klibc-utils-dd klibc-utils-dmesg \
-        klibc-utils-false klibc-utils-halt \
-        klibc-utils-kill klibc-utils-ln \
-        klibc-utils-minips klibc-utils-mkdir \
-        klibc-utils-mkfifo klibc-utils-mknod \
-        klibc-utils-mount klibc-utils-nuke \
-        klibc-utils-pivot-root klibc-utils-poweroff \
-        klibc-utils-readlink klibc-utils-reboot \
-        klibc-utils-sleep \
-        klibc-utils-sync klibc-utils-true \
-        klibc-utils-umount klibc-utils-uname \
-        klibc-utils-gzip klibc-utils-modprobe \
-        klibc-utils-losetup klibc-utils-wc"
-
-FILES_${PN} = "${base_libdir}/klibc-*.so"
-FILES_${PN}-dev = "${base_libdir}/klibc.so"
-FILES_klibc-utils-sh = "${base_bindir}/sh"
-FILES_klibc-utils-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"
-FILES_klibc-utils-kinit = "${base_bindir}/kinit"
-FILES_klibc-utils-fstype = "${base_bindir}/fstype"
-FILES_klibc-utils-ipconfig = "${base_bindir}/ipconfig"
-FILES_klibc-utils-nfsmount = "${base_bindir}/nfsmount"
-FILES_klibc-utils-resume = "${base_bindir}/resume"
-FILES_klibc-utils-run-init = "${base_bindir}/run-init"
-FILES_klibc-utils-cat = "${base_bindir}/cat"
-FILES_klibc-utils-chroot = "${base_bindir}/chroot"
-FILES_klibc-utils-cpio = "${base_bindir}/cpio"
-FILES_klibc-utils-dd = "${base_bindir}/dd"
-FILES_klibc-utils-dmesg = "${base_bindir}/dmesg"
-FILES_klibc-utils-false = "${base_bindir}/false"
-FILES_klibc-utils-halt = "${base_bindir}/halt"
-FILES_klibc-utils-kill = "${base_bindir}/kill"
-FILES_klibc-utils-ln = "${base_bindir}/ln"
-FILES_klibc-utils-minips = "${base_bindir}/minips"
-FILES_klibc-utils-mkdir = "${base_bindir}/mkdir"
-FILES_klibc-utils-mkfifo = "${base_bindir}/mkfifo"
-FILES_klibc-utils-mknod = "${base_bindir}/mknod"
-FILES_klibc-utils-mount = "${base_bindir}/mount"
-FILES_klibc-utils-nuke = "${base_bindir}/nuke"
-FILES_klibc-utils-pivot-root = "${base_bindir}/pivot_root"
-FILES_klibc-utils-poweroff = "${base_bindir}/poweroff"
-FILES_klibc-utils-readlink = "${base_bindir}/readlink"
-FILES_klibc-utils-reboot = "${base_bindir}/reboot"
-FILES_klibc-utils-sleep = "${base_bindir}/sleep"
-FILES_klibc-utils-sync = "${base_bindir}/sync"
-FILES_klibc-utils-true = "${base_bindir}/true"
-FILES_klibc-utils-umount = "${base_bindir}/umount"
-FILES_klibc-utils-uname = "${base_bindir}/uname"
-FILES_klibc-utils-modprobe = "${base_bindir}/modprobe"
-FILES_klibc-utils-losetup = "${base_bindir}/losetup"
-FILES_klibc-utils-wc = "${base_bindir}/wc"
-
-# Yes we want exactly the klibc that was compiled with the utils
-RDEPENDS_klibc-utils-sh = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-kinit = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-fstype = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-ipconfig = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-nfsmount = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-resume = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-run-init = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-cat = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-chroot = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-cpio = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-dd = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-dmesg = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-false = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-halt = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-kill = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-ln = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-minips = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mkdir = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mkfifo = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mknod = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mount = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-nuke = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-pivot-root = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-poweroff = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-readlink = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-reboot = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-sleep = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-sync = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-true = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-umount = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-uname = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-modprobe = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-losetup = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-wc = "${PN} (=${PV}-${PR})"
diff --git a/recipes/klibc/klibc_1.5.17.bb b/recipes/klibc/klibc_1.5.17.bb
new file mode 100644
index 0000000000..4b299f226e
--- /dev/null
+++ b/recipes/klibc/klibc_1.5.17.bb
@@ -0,0 +1,3 @@
+require klibc.inc
+require klibc_${PV}.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/klibc/klibc_1.5.17.inc b/recipes/klibc/klibc_1.5.17.inc
new file mode 100644
index 0000000000..69d0dc7ea6
--- /dev/null
+++ b/recipes/klibc/klibc_1.5.17.inc
@@ -0,0 +1,45 @@
+require klibc-common.inc
+
+SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
+            file://modprobe.patch \
+            file://dash_readopt.patch \
+            file://wc.patch \
+            file://staging.patch \
+            file://klibc_kexecsyscall.patch \
+            file://mntproc-definitions.patch \
+            file://isystem.patch \
+	    "
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_aquides = "1"
+
+KLIBC_FETCHDIR = "1.5"
+
+KLIBC_ARCH_x86 = 'x86'
+KLIBC_ARCH_i486 = 'x86'
+KLIBC_ARCH_i586 = 'x86'
+KLIBC_ARCH_i686 = 'x86'
+KLIBC_ARCH_pentium = 'x86'
+
+EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
+                'CROSS_COMPILE=${TARGET_PREFIX}' \
+		'KLIBCKERNELSRC=${STAGING_KERNEL_DIR}' \
+                "
+
+do_configure () {
+	ln -sf ${STAGING_KERNEL_DIR} linux
+	cd ${S}/usr/klibc/arch/
+	ln -s i386 x86
+	cd ${S}/usr/include/arch/
+	ln -s i386 x86
+	cd ${S}
+}
+
+SRC_URI[md5sum] = "5ac5b944223f63ed037350795924d1b9"
+SRC_URI[sha256sum] = "a67b976db1958a66bb4887d70c45f83f63751a287b5a715c929fb69bdcd7b1ca"
+
+do_install_append() {
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir}
+}
diff --git a/recipes/klibc/klibc_1.5.18.bb b/recipes/klibc/klibc_1.5.18.bb
new file mode 100644
index 0000000000..4b299f226e
--- /dev/null
+++ b/recipes/klibc/klibc_1.5.18.bb
@@ -0,0 +1,3 @@
+require klibc.inc
+require klibc_${PV}.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/klibc/klibc_1.5.18.inc b/recipes/klibc/klibc_1.5.18.inc
new file mode 100644
index 0000000000..c426b066c1
--- /dev/null
+++ b/recipes/klibc/klibc_1.5.18.inc
@@ -0,0 +1,44 @@
+require klibc-common.inc
+
+SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
+            file://modprobe.patch \
+            file://dash_readopt.patch \
+            file://wc.patch \
+            file://staging.patch \
+            file://klibc_kexecsyscall.patch \
+            file://mntproc-definitions.patch \
+            file://isystem.patch \
+	    "
+
+DEFAULT_PREFERENCE = "-1"
+
+KLIBC_FETCHDIR = "1.5"
+
+KLIBC_ARCH_x86 = 'x86'
+KLIBC_ARCH_i486 = 'x86'
+KLIBC_ARCH_i586 = 'x86'
+KLIBC_ARCH_i686 = 'x86'
+KLIBC_ARCH_pentium = 'x86'
+
+EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
+                'CROSS_COMPILE=${TARGET_PREFIX}' \
+		'KLIBCKERNELSRC=${STAGING_KERNEL_DIR}' \
+                "
+
+do_configure () {
+	ln -sf ${STAGING_KERNEL_DIR} linux
+	cd ${S}/usr/klibc/arch/
+	ln -s i386 x86
+	cd ${S}/usr/include/arch/
+	ln -s i386 x86
+	cd ${S}
+}
+
+SRC_URI[md5sum] = "5c8b6577b9acb3809cace6e118cdd55b"
+SRC_URI[sha256sum] = "e4104f8b34a5f354222bd4622f50b58c6218bf70614450d68539cbef666b6446"
+
+do_install_append() {
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir}
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir}
+}
diff --git a/recipes/klibc/klibc_1.5.bb b/recipes/klibc/klibc_1.5.bb
index 1655100551..4b299f226e 100644
--- a/recipes/klibc/klibc_1.5.bb
+++ b/recipes/klibc/klibc_1.5.bb
@@ -1,7 +1,3 @@
-require klibc_1.5.inc
-PR = "r10"
-
-KLIBC_FETCHDIR = "Stable"
-
-SRC_URI[md5sum] = "481dfdef7273f2cc776c2637f481f017"
-SRC_URI[sha256sum] = "27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7"
+require klibc.inc
+require klibc_${PV}.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/klibc/klibc_1.5.inc b/recipes/klibc/klibc_1.5.inc
index 5c10df76f4..b00f02cc56 100644
--- a/recipes/klibc/klibc_1.5.inc
+++ b/recipes/klibc/klibc_1.5.inc
@@ -1,155 +1,19 @@
 require klibc-common.inc
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-            file://modprobe.patch;patch=1 \
-            file://losetup.patch;patch=1 \
-            file://dash_readopt.patch;patch=1 \
-            file://wc.patch;patch=1 \
-            file://staging.patch;patch=1 \
-            file://klibc_kexecsyscall.patch;patch=1 \
+SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
+            file://modprobe.patch \
+            file://losetup.patch \
+            file://dash_readopt.patch \
+            file://wc.patch \
+            file://staging.patch \
+            file://klibc_kexecsyscall.patch \
             "
 
-# we want only the shared programms and the lib so we chose them manually
-do_install() {
-        install -d ${D}${base_bindir}
-        install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh
-        install -m 755 usr/gzip/gzip ${D}${base_bindir}
-        install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit
-        install -m 755 usr/kinit/fstype/shared/fstype ${D}${base_bindir}
-        install -m 755 usr/kinit/ipconfig/shared/ipconfig ${D}${base_bindir}
-        install -m 755 usr/kinit/nfsmount/shared/nfsmount ${D}${base_bindir}
-        install -m 755 usr/kinit/resume/shared/resume ${D}${base_bindir}
-        install -m 755 usr/kinit/run-init/shared/run-init ${D}${base_bindir}
-        install -m 755 usr/utils/shared/cat ${D}${base_bindir}
-        install -m 755 usr/utils/shared/chroot ${D}${base_bindir}
-        install -m 755 usr/utils/shared/cpio ${D}${base_bindir}
-        install -m 755 usr/utils/shared/dd ${D}${base_bindir}
-        install -m 755 usr/utils/shared/false ${D}${base_bindir}
-        install -m 755 usr/utils/shared/halt ${D}${base_bindir}
-        install -m 755 usr/utils/shared/insmod ${D}${base_bindir}
-        install -m 755 usr/utils/shared/kill ${D}${base_bindir}
-        install -m 755 usr/utils/shared/ln ${D}${base_bindir}
-        install -m 755 usr/utils/shared/minips ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mkdir ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mkfifo ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mknod ${D}${base_bindir}
-        install -m 755 usr/utils/shared/mount ${D}${base_bindir}
-        install -m 755 usr/utils/shared/nuke ${D}${base_bindir}
-        install -m 755 usr/utils/shared/pivot_root ${D}${base_bindir}
-        install -m 755 usr/utils/shared/poweroff ${D}${base_bindir}
-        install -m 755 usr/utils/shared/readlink ${D}${base_bindir}
-        install -m 755 usr/utils/shared/reboot ${D}${base_bindir}
-        install -m 755 usr/utils/shared/sleep ${D}${base_bindir}
-        install -m 755 usr/utils/shared/true ${D}${base_bindir}
-        install -m 755 usr/utils/shared/umount ${D}${base_bindir}
-        install -m 755 usr/utils/shared/uname ${D}${base_bindir}
-        install -m 755 usr/utils/shared/modprobe ${D}${base_bindir}
-        install -m 755 usr/utils/shared/losetup ${D}${base_bindir}
-        install -m 755 usr/utils/shared/wc ${D}${base_bindir}
+KLIBC_FETCHDIR = "1.5"
 
-        install -d ${D}${base_libdir}
-        install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir}
-        cd ${D}${base_libdir}
-        ln -s klibc-*.so klibc.so
-        cd -
-        cd ${D}${base_bindir}
-        ln -s gzip gunzip
-        ln -s gzip zcat
-        cd -
-}
+SRC_URI[md5sum] = "481dfdef7273f2cc776c2637f481f017"
+SRC_URI[sha256sum] = "27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7"
 
-export INST=${STAGING_DIR_TARGET}
-do_stage() {
-        oe_runmake  install
-        cp '${STAGING_DIR_TARGET}/bin/klcc'  '${CROSS_DIR}/bin/${TARGET_PREFIX}klcc'
+do_install_append() {
+        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir}
 }
-
-PACKAGES = "${PN} ${PN}-dev klibc-utils-sh klibc-utils-kinit \
-        klibc-utils-fstype klibc-utils-ipconfig \
-        klibc-utils-nfsmount klibc-utils-resume \
-        klibc-utils-run-init klibc-utils-cat \
-        klibc-utils-chroot klibc-utils-cpio \
-        klibc-utils-dd klibc-utils-false \
-        klibc-utils-halt klibc-utils-insmod \
-        klibc-utils-kill klibc-utils-ln \
-        klibc-utils-minips klibc-utils-mkdir \
-        klibc-utils-mkfifo klibc-utils-mknod \
-        klibc-utils-mount klibc-utils-nuke \
-        klibc-utils-pivot-root klibc-utils-poweroff \
-        klibc-utils-readlink klibc-utils-reboot \
-        klibc-utils-sleep klibc-utils-true \
-        klibc-utils-umount klibc-utils-uname \
-        klibc-utils-gzip klibc-utils-modprobe \
-        klibc-utils-losetup klibc-utils-wc"
-
-FILES_${PN} = "${base_libdir}/klibc-*.so"
-FILES_${PN}-dev = "${base_libdir}/klibc.so"
-FILES_klibc-utils-sh = "${base_bindir}/sh"
-FILES_klibc-utils-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"
-FILES_klibc-utils-kinit = "${base_bindir}/kinit"
-FILES_klibc-utils-fstype = "${base_bindir}/fstype"
-FILES_klibc-utils-ipconfig = "${base_bindir}/ipconfig"
-FILES_klibc-utils-nfsmount = "${base_bindir}/nfsmount"
-FILES_klibc-utils-resume = "${base_bindir}/resume"
-FILES_klibc-utils-run-init = "${base_bindir}/run-init"
-FILES_klibc-utils-cat = "${base_bindir}/cat"
-FILES_klibc-utils-chroot = "${base_bindir}/chroot"
-FILES_klibc-utils-cpio = "${base_bindir}/cpio"
-FILES_klibc-utils-dd = "${base_bindir}/dd"
-FILES_klibc-utils-false = "${base_bindir}/false"
-FILES_klibc-utils-halt = "${base_bindir}/halt"
-FILES_klibc-utils-insmod = "${base_bindir}/insmod"
-FILES_klibc-utils-kill = "${base_bindir}/kill"
-FILES_klibc-utils-ln = "${base_bindir}/ln"
-FILES_klibc-utils-minips = "${base_bindir}/minips"
-FILES_klibc-utils-mkdir = "${base_bindir}/mkdir"
-FILES_klibc-utils-mkfifo = "${base_bindir}/mkfifo"
-FILES_klibc-utils-mknod = "${base_bindir}/mknod"
-FILES_klibc-utils-mount = "${base_bindir}/mount"
-FILES_klibc-utils-nuke = "${base_bindir}/nuke"
-FILES_klibc-utils-pivot-root = "${base_bindir}/pivot_root"
-FILES_klibc-utils-poweroff = "${base_bindir}/poweroff"
-FILES_klibc-utils-readlink = "${base_bindir}/readlink"
-FILES_klibc-utils-reboot = "${base_bindir}/reboot"
-FILES_klibc-utils-sleep = "${base_bindir}/sleep"
-FILES_klibc-utils-true = "${base_bindir}/true"
-FILES_klibc-utils-umount = "${base_bindir}/umount"
-FILES_klibc-utils-uname = "${base_bindir}/uname"
-FILES_klibc-utils-modprobe = "${base_bindir}/modprobe"
-FILES_klibc-utils-losetup = "${base_bindir}/losetup"
-FILES_klibc-utils-wc = "${base_bindir}/wc"
-
-# Yes we want exactly the klibc that was compiled with the utils
-RDEPENDS_klibc-utils-sh = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-kinit = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-fstype = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-ipconfig = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-nfsmount = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-resume = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-run-init = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-cat = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-chroot = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-cpio = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-dd = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-false = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-halt = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-insmod = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-kill = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-ln = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-minips = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mkdir = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mkfifo = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mknod = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-mount = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-nuke = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-pivot-root = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-poweroff = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-readlink = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-reboot = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-sleep = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-true = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-umount = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-uname = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-modprobe = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-losetup = "${PN} (=${PV}-${PR})"
-RDEPENDS_klibc-utils-wc = "${PN} (=${PV}-${PR})"
diff --git a/recipes/klimt/klimt_0.6.1.bb b/recipes/klimt/klimt_0.6.1.bb
index 2ad9628dca..d6bd55cda8 100644
--- a/recipes/klimt/klimt_0.6.1.bb
+++ b/recipes/klimt/klimt_0.6.1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/klimt/klimt-src-${PV}.zip"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 S = "${WORKDIR}/klimt/build/LinuxQTE"
 
 EXTRA_QMAKEVARS_POST += " QMAKE_CXXFLAGS+=-fpermissive"
diff --git a/recipes/knights/knights_1.14.bb b/recipes/knights/knights_1.14.bb
index c61840d1d6..4e64a633c3 100644
--- a/recipes/knights/knights_1.14.bb
+++ b/recipes/knights/knights_1.14.bb
@@ -8,8 +8,8 @@ RDEPENDS = "phalanx"
 PR = "r2"
 
 SRC_URI = "http://www.openzaurus.org/mirror/knights.tar.gz \
-           file://libqpe-opie.patch;patch=1 \
-           file://gcc3.patch;patch=1"
+           file://libqpe-opie.patch \
+           file://gcc3.patch"
 S = "${WORKDIR}/knights"
 
 inherit palmtop
diff --git a/recipes/kobodeluxe/kobodeluxe_0.5.1.bb b/recipes/kobodeluxe/kobodeluxe_0.5.1.bb
index 70478d7de9..a22894ef93 100644
--- a/recipes/kobodeluxe/kobodeluxe_0.5.1.bb
+++ b/recipes/kobodeluxe/kobodeluxe_0.5.1.bb
@@ -13,11 +13,11 @@ RDEPENDS_${PN} = "${PN}-data"
 
 SRC_URI = "http://olofson.net/kobodl/download/KoboDeluxe-${PV}.tar.bz2 \
            file://fighter-48.xpm \
-					 file://debian-kobo.patch;patch=1 \
-					 file://kobodeluxe-putenv.patch;patch=1 \
-					 file://kobodeluxe-sysconf-support.patch;patch=1 \
-					 file://kobodeluxe-menu-pointer.patch;patch=1 \
-					 file://kobodeluxe-dimension-autoswap.patch;patch=1 \
+					 file://debian-kobo.patch \
+					 file://kobodeluxe-putenv.patch \
+					 file://kobodeluxe-sysconf-support.patch \
+					 file://kobodeluxe-menu-pointer.patch \
+					 file://kobodeluxe-dimension-autoswap.patch \
            file://default-config \
           "
 
diff --git a/recipes/konqueror/konqueror-embedded_20030705.bb b/recipes/konqueror/konqueror-embedded_20030705.bb
index beb98e3466..264ae7bad1 100644
--- a/recipes/konqueror/konqueror-embedded_20030705.bb
+++ b/recipes/konqueror/konqueror-embedded_20030705.bb
@@ -12,15 +12,15 @@ PR = "r5"
 # machine (Ubuntu/Debain) or your distro's equivalent (FC = pcre-devel).
 
 SRC_URI = "http://devel-home.kde.org/~hausmann/snapshots/Attic/konqueror-embedded-snapshot-${PV}.tar.gz \
-           file://opie1.patch;patch=1 \
-           file://packing.patch;patch=1 \
-           file://include_qconfig.patch;patch=1 \
-           file://useragent.patch;patch=1 \
-           file://kcookiejar-merge.patch;patch=1 \
-           file://malformed.patch;patch=1 \
-           file://cachepath.patch;patch=1 \
-           file://vit.patch;patch=1 \
-           file://gcc4.patch;patch=1 \
+           file://opie1.patch \
+           file://packing.patch \
+           file://include_qconfig.patch \
+           file://useragent.patch \
+           file://kcookiejar-merge.patch \
+           file://malformed.patch \
+           file://cachepath.patch \
+           file://vit.patch \
+           file://gcc4.patch \
            file://konq-embedrc"
 S = "${WORKDIR}/konqueror-embedded-snapshot-${PV}"
 
diff --git a/recipes/konqueror/konqueror-embedded_20060404.bb b/recipes/konqueror/konqueror-embedded_20060404.bb
index 9f6ed35aeb..177b5dfaca 100644
--- a/recipes/konqueror/konqueror-embedded_20060404.bb
+++ b/recipes/konqueror/konqueror-embedded_20060404.bb
@@ -12,10 +12,10 @@ inherit autotools
 
 SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.1;module=kdelibs;date=${PV} \
            svn://anonsvn.kde.org/home/kde/trunk;module=kdenox;date=${PV} \
-           file://gcc4.patch;patch=1 \
-	   file://dont-use-kde-config.patch;patch=0"
+           file://gcc4.patch \
+	   file://dont-use-kde-config.patch"
 # uncomment this for a static build
-#          file://inject-extraflags.patch;patch=1"
+#          file://inject-extraflags.patch"
 S = "${WORKDIR}/kdenox"
 
 export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
diff --git a/recipes/konqueror/konqueror-embedded_20070316.bb b/recipes/konqueror/konqueror-embedded_20070316.bb
index 868c63cb44..06d422fbdf 100644
--- a/recipes/konqueror/konqueror-embedded_20070316.bb
+++ b/recipes/konqueror/konqueror-embedded_20070316.bb
@@ -11,12 +11,12 @@ PR = "r7"
 inherit autotools
 
 SRC_URI = "http://www.basyskom.de/uploads/175/37/kdenox_snapshot_qt2_20070316.tar.bz2 \
-	   file://dont-use-kde-config.patch;patch=1 \
-           file://konqe_new_opie.patch;patch=1 \
-	   file://konqe-kapplication.patch;patch=1 \
-           file://fix_configure.patch;patch=1 \
-           file://fix_acinclude.patch;patch=1 \
-           file://fix_KDE_LDPATH_HACK.patch;patch=1 \
+	   file://dont-use-kde-config.patch \
+           file://konqe_new_opie.patch \
+	   file://konqe-kapplication.patch \
+           file://fix_configure.patch \
+           file://fix_acinclude.patch \
+           file://fix_KDE_LDPATH_HACK.patch \
 	   "
 S = "${WORKDIR}/kdenox"
 
diff --git a/recipes/krb/krb5_1.6.3.bb b/recipes/krb/krb5_1.6.3.bb
index e25cdcf333..33949946f4 100644
--- a/recipes/krb/krb5_1.6.3.bb
+++ b/recipes/krb/krb5_1.6.3.bb
@@ -8,7 +8,7 @@ DEPENDS = "perl-native ncurses util-linux-ng e2fsprogs-native"
 inherit autotools binconfig
 
 SRC_URI = "http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.3-signed.tar \
-           file://fix-uclibc-ruserpass-collision.patch \
+           file://fix-uclibc-ruserpass-collision.patch;apply=no \
            file://copyperms.patch"
 
 S = "${WORKDIR}/${PN}-${PV}/src/"
diff --git a/recipes/ksymoops/ksymoops_2.4.9.bb b/recipes/ksymoops/ksymoops_2.4.9.bb
index ff67ca0b6a..662299daa7 100644
--- a/recipes/ksymoops/ksymoops_2.4.9.bb
+++ b/recipes/ksymoops/ksymoops_2.4.9.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 DEPENDS = "binutils"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/ksymoops/v2.4/ksymoops-${PV}.tar.bz2 \
-	   file://flags.patch;patch=1"
+	   file://flags.patch"
 S = "${WORKDIR}/ksymoops-${PV}"
 
 do_install () {
diff --git a/recipes/kxml2/kxml2_2.3.0.bb b/recipes/kxml2/kxml2_2.3.0.bb
index 227f9cec49..e91a8ad754 100644
--- a/recipes/kxml2/kxml2_2.3.0.bb
+++ b/recipes/kxml2/kxml2_2.3.0.bb
@@ -16,7 +16,7 @@ JAR = "${PN}-${PV}.jar"
 
 SRC_URI = "\
     ${SOURCEFORGE_MIRROR}/kxml/${PN}-src-${PV}.zip \
-    file://makefile.patch;patch=1 \
+    file://makefile.patch \
     "
 
 do_compile() {
diff --git a/recipes/lame/lame_3.96.1.bb b/recipes/lame/lame_3.96.1.bb
index 47cbde342c..dca8bc9fc3 100644
--- a/recipes/lame/lame_3.96.1.bb
+++ b/recipes/lame/lame_3.96.1.bb
@@ -4,9 +4,9 @@ LICENSE = "LGPL"
 PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
-	file://no-gtk1.patch;patch=1 \
-	file://Makefile-lm.patch;patch=1 \
-	file://ldflags-qa.patch;patch=1"
+	file://no-gtk1.patch \
+	file://Makefile-lm.patch \
+	file://ldflags-qa.patch"
 
 inherit autotools
 
diff --git a/recipes/lame/lame_3.98.2.bb b/recipes/lame/lame_3.98.2.bb
index db7d120bd8..e9aabaa6c2 100644
--- a/recipes/lame/lame_3.98.2.bb
+++ b/recipes/lame/lame_3.98.2.bb
@@ -5,8 +5,8 @@ PR = "r0"
 
 S = "${WORKDIR}/${PN}-398-2"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-398-2.tar.gz \
-	file://no-gtk1.patch;patch=1 \
-	file://ldflags-qa.patch;patch=1"
+	file://no-gtk1.patch \
+	file://ldflags-qa.patch"
 
 inherit autotools_stage
 
diff --git a/recipes/lcd4linux/lcd4linux_0.10.0.bb b/recipes/lcd4linux/lcd4linux_0.10.0.bb
index 3c4bd3ba44..5c7272bd84 100644
--- a/recipes/lcd4linux/lcd4linux_0.10.0.bb
+++ b/recipes/lcd4linux/lcd4linux_0.10.0.bb
@@ -7,7 +7,7 @@ PV = "0.10.0+0.10.1-RC2"
 PR = "r4"
 
 SRC_URI = "http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.10.1-RC2.tar.gz \
-           file://libusb-compat.diff;patch=1 \ 
+           file://libusb-compat.diff \ 
            file://lcd4linux.init"
 
 S =  "${WORKDIR}/lcd4linux-0.10.1-RC2"
diff --git a/recipes/led/led_cvs.bb b/recipes/led/led_cvs.bb
index 8c1ce2dc1e..6f303d10b9 100644
--- a/recipes/led/led_cvs.bb
+++ b/recipes/led/led_cvs.bb
@@ -5,7 +5,7 @@ PV = "0.0cvs${SRCDATE}"
 DESCRIPTION = "Command line tool for iPaq LED control"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/h3600_test \
-           file://nokernelheader.patch;patch=1;pnum=0"
+           file://nokernelheader.patch;striplevel=0"
 inherit module-base
 
 S = "${WORKDIR}/h3600_test"
diff --git a/recipes/lesstif/lesstif_0.95.0.bb b/recipes/lesstif/lesstif_0.95.0.bb
index 0149511c72..d9c1312710 100644
--- a/recipes/lesstif/lesstif_0.95.0.bb
+++ b/recipes/lesstif/lesstif_0.95.0.bb
@@ -5,17 +5,17 @@ PR = "r2"
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/lesstif/${BP}.tar.bz2 \
-	file://000_bootstrap_script.diff;patch=1 \
-	file://000_libtool_linking.diff;patch=1 \
-	file://010_rebootstrap-small.diff;patch=1 \
-	file://020_bad_integer_cast.diff;patch=1 \
-	file://020_missing_xm_h.diff;patch=1 \
-	file://020_render_table_crash.diff;patch=1 \
-	file://020_unsigned_int.diff;patch=1 \
-	file://020_xpmpipethrough.diff;patch=1 \
-	file://021_xim_chained_list_crash.diff;patch=1 \
-	file://030_manpage.diff;patch=1 \
-	file://disable-docs.patch;patch=1 \
+	file://000_bootstrap_script.diff \
+	file://000_libtool_linking.diff \
+	file://010_rebootstrap-small.diff \
+	file://020_bad_integer_cast.diff \
+	file://020_missing_xm_h.diff \
+	file://020_render_table_crash.diff \
+	file://020_unsigned_int.diff \
+	file://020_xpmpipethrough.diff \
+	file://021_xim_chained_list_crash.diff \
+	file://030_manpage.diff \
+	file://disable-docs.patch \
 	"
 
 DEPENDS = "flex-native bison-native libice libsm libx11 libxext libxp libxt libxrender libxft fontconfig freetype"
diff --git a/recipes/liba52/liba52_0.7.4.bb b/recipes/liba52/liba52_0.7.4.bb
index 94229be2b5..7cf630e076 100644
--- a/recipes/liba52/liba52_0.7.4.bb
+++ b/recipes/liba52/liba52_0.7.4.bb
@@ -7,7 +7,7 @@ PR = "r3"
 inherit autotools
 
 SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz \
-           file://01-enable-pic.diff;patch=1"
+           file://01-enable-pic.diff"
 S = "${WORKDIR}/a52dec-${PV}"
 
 EXTRA_OECONF = " --enable-shared "
diff --git a/recipes/libacpi/libacpi_0.2.bb b/recipes/libacpi/libacpi_0.2.bb
index 97c6d935ef..458fc30ecf 100644
--- a/recipes/libacpi/libacpi_0.2.bb
+++ b/recipes/libacpi/libacpi_0.2.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 PR = "r1"
 
 SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
-	   file://makefile-fix.patch;patch=1 "
+	   file://makefile-fix.patch "
 
 PACKAGES += "${PN}-bin"
 
diff --git a/recipes/libaio/libaio_0.3.103.bb b/recipes/libaio/libaio_0.3.103.bb
index 3ffe4c98f1..3ffadcb4bc 100644
--- a/recipes/libaio/libaio_0.3.103.bb
+++ b/recipes/libaio/libaio_0.3.103.bb
@@ -7,7 +7,7 @@ HOMEPAGE="https://rhn.redhat.com/errata/RHBA-2005-085.html"
 LICENSE="GPL"
 
 SRC_URI="http://search.belnet.be/packages/lineox/4.0/updates/SRPMS/${P}-3.src.rpm \
-file://${P}-more-arches.patch;patch=1"
+file://${P}-more-arches.patch"
 
 S="${WORKDIR}/${P}"
 
diff --git a/recipes/libaio/libaio_0.3.106.bb b/recipes/libaio/libaio_0.3.106.bb
index 7f58fd208f..815c96fb8d 100644
--- a/recipes/libaio/libaio_0.3.106.bb
+++ b/recipes/libaio/libaio_0.3.106.bb
@@ -3,8 +3,8 @@ LICENSE = "LGPL"
 PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/liba/libaio/libaio_${PV}.orig.tar.gz \
-           file://00_arches.patch;patch=1 \
-           file://destdir.patch;patch=1"
+           file://00_arches.patch \
+           file://destdir.patch"
 
 do_stage() {
     install -d ${STAGING_INCDIR} ${STAGING_LIBDIR}
diff --git a/recipes/libc-client/libc-client_2007b.bb b/recipes/libc-client/libc-client_2007b.bb
index 8e850f7996..ffe9561de5 100644
--- a/recipes/libc-client/libc-client_2007b.bb
+++ b/recipes/libc-client/libc-client_2007b.bb
@@ -5,7 +5,7 @@ LICENSE = "University of Washingtons Free-Fork License"
 DEPENDS = "libpam openssl libpam"
 
 SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.Z \
-	   file://quote_cctype.patch;patch=1"
+	   file://quote_cctype.patch"
 
 S = "${WORKDIR}/imap-${PV}"
 
diff --git a/recipes/libcap/libcap2_2.16.bb b/recipes/libcap/libcap2_2.16.bb
index 600f48a053..ebcb981525 100644
--- a/recipes/libcap/libcap2_2.16.bb
+++ b/recipes/libcap/libcap2_2.16.bb
@@ -10,7 +10,7 @@ CFLAGS += "-I${S}/libcap/include"
 LDFLAGS =+ "-L../libcap"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libcap-${PV}.tar.bz2 \
-	   file://make.patch;patch=1 \
+	   file://make.patch \
 	"
 
 S = "${WORKDIR}/libcap-${PV}"
diff --git a/recipes/libcap/libcap_1.10.bb b/recipes/libcap/libcap_1.10.bb
index 02de66c112..e6ca393df7 100644
--- a/recipes/libcap/libcap_1.10.bb
+++ b/recipes/libcap/libcap_1.10.bb
@@ -8,9 +8,9 @@ PR = "r2"
 CFLAGS_append = " -I${S}/libcap/include -fPIC"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/kernel-2.4/${PN}-${PV}.tar.bz2 \
-	   file://makenames.patch;patch=1 \
-	   file://make.patch;patch=1 \
-	   file://syscall.patch;patch=1"
+	   file://makenames.patch \
+	   file://make.patch \
+	   file://syscall.patch"
 
 FILES_${PN} = "${libdir}"
 FILES_${PN}-dev = "${includedir}"
diff --git a/recipes/libccaudio2/libccaudio2_0.9.0.bb b/recipes/libccaudio2/libccaudio2_0.9.0.bb
index a4d20c9179..901da2b9cd 100644
--- a/recipes/libccaudio2/libccaudio2_0.9.0.bb
+++ b/recipes/libccaudio2/libccaudio2_0.9.0.bb
@@ -5,9 +5,9 @@ SECTION = "libs"
 PR = "r1"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/ccaudio/ccaudio2-${PV}.tar.gz \
-	file://01-ccaudio-fixed-point.diff;patch=1 \
-	file://02-ccaudio-stereo.diff;patch=1 \
-	file://03-ccaudio-dtmf-reset.diff;patch=1"
+	file://01-ccaudio-fixed-point.diff \
+	file://02-ccaudio-stereo.diff \
+	file://03-ccaudio-dtmf-reset.diff"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libccaudio2-${PV}"
 
diff --git a/recipes/libchm/chmlib_0.38.bb b/recipes/libchm/chmlib_0.38.bb
index 7261b08ff5..c872f69d16 100644
--- a/recipes/libchm/chmlib_0.38.bb
+++ b/recipes/libchm/chmlib_0.38.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 HOMEPAGE = "http://66.93.236.84/~jedwin/projects/chmlib/"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/c/chmlib/chmlib_0.380.orig.tar.gz \
-	   file://arm-guess.patch;patch=1"
+	   file://arm-guess.patch"
 
 S = "${WORKDIR}/chmlib-0.380"
 
diff --git a/recipes/libcli/libcli_1.9.4.bb b/recipes/libcli/libcli_1.9.4.bb
index 10d96e321d..89c0da9ed3 100644
--- a/recipes/libcli/libcli_1.9.4.bb
+++ b/recipes/libcli/libcli_1.9.4.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 PR = "r1"
 
 SRC_URI = "http://libcli.googlecode.com/files/${PN}-${PV}.tar.gz \
-           file://autotools.patch;patch=1 \
+           file://autotools.patch \
           "
 
 inherit autotools lib_package
diff --git a/recipes/libconfig/libconfig_1.3.2.bb b/recipes/libconfig/libconfig_1.3.2.bb
index 701ac73b34..fbe9dd9948 100644
--- a/recipes/libconfig/libconfig_1.3.2.bb
+++ b/recipes/libconfig/libconfig_1.3.2.bb
@@ -7,7 +7,7 @@ LICENSE = "LGPLv2"
 PR = "r1"
 
 SRC_URI = "http://www.hyperrealm.com/libconfig/libconfig-${PV}.tar.gz \
-           file://libconfig.newer.automake-1.11.patch;patch=1"
+           file://libconfig.newer.automake-1.11.patch"
 
 S = "${WORKDIR}/libconfig-${PV}"
 
diff --git a/recipes/libcroco/libcroco_0.6.0.bb b/recipes/libcroco/libcroco_0.6.0.bb
index e49359d609..576314c1e1 100644
--- a/recipes/libcroco/libcroco_0.6.0.bb
+++ b/recipes/libcroco/libcroco_0.6.0.bb
@@ -6,7 +6,7 @@ PR = "r2"
 
 inherit autotools pkgconfig gnome
 
-SRC_URI_append = " file://croco.patch;patch=1 "
+SRC_URI_append = " file://croco.patch "
 
 do_stage() {
 	install -d ${STAGING_LIBDIR}
diff --git a/recipes/libcroco/libcroco_0.6.1.bb b/recipes/libcroco/libcroco_0.6.1.bb
index d8376fbecf..55944dd7ff 100644
--- a/recipes/libcroco/libcroco_0.6.1.bb
+++ b/recipes/libcroco/libcroco_0.6.1.bb
@@ -6,7 +6,7 @@ PR = "r3"
 
 inherit gnome
 
-SRC_URI_append = " file://croco.patch;patch=1 "
+SRC_URI_append = " file://croco.patch "
 
 
 SRC_URI[archive.md5sum] = "b0975bd01eb11964f1b3f254f267a43d"
diff --git a/recipes/libdes/libdes_4.01.bb b/recipes/libdes/libdes_4.01.bb
index e724fda1f6..fc75cc0c44 100644
--- a/recipes/libdes/libdes_4.01.bb
+++ b/recipes/libdes/libdes_4.01.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "libdes"
 SRC_URI = "http://www.agentpp.com/libdes-l-${PV}.tar.gz \
-           file://cross-compile.patch;patch=1"
+           file://cross-compile.patch"
 S = "${WORKDIR}/libdes"
 
 do_compile() {
diff --git a/recipes/libdessert/libdessert_0.86.14.bb b/recipes/libdessert/libdessert_0.86.14.bb
index 57ef633769..1308f71860 100644
--- a/recipes/libdessert/libdessert_0.86.14.bb
+++ b/recipes/libdessert/libdessert_0.86.14.bb
@@ -7,7 +7,7 @@ PR = "r2"
 DEPENDS = "net-snmp libpcap libcli"
 
 SRC_URI = "http://www.des-testbed.net/sites/default/files/${PN}${PV}.tar.gz \
-	   file://0001-big-fat-autotools-patch.patch;patch=1 \
+	   file://0001-big-fat-autotools-patch.patch \
 	  "
 
 S = "${WORKDIR}/${PN}0.86-${PV}"
diff --git a/recipes/libdiscid/libdiscid.inc b/recipes/libdiscid/libdiscid.inc
index a8ebfafe8a..8dc7b54171 100644
--- a/recipes/libdiscid/libdiscid.inc
+++ b/recipes/libdiscid/libdiscid.inc
@@ -8,7 +8,4 @@ SRC_URI = "http://users.musicbrainz.org/~matt/libdiscid-${PV}.tar.gz"
 
 inherit cmake pkgconfig
 
-do_stage() {
-	autotools_stage_all
-}
 
diff --git a/recipes/libdisplaymigration/libdisplaymigration_0.28.bb b/recipes/libdisplaymigration/libdisplaymigration_0.28.bb
index 4b8dffd606..659f05bd40 100644
--- a/recipes/libdisplaymigration/libdisplaymigration_0.28.bb
+++ b/recipes/libdisplaymigration/libdisplaymigration_0.28.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 inherit pkgconfig gpe
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 headers = "displaymigration.h auth.h crypt.h"
 
diff --git a/recipes/libdisplaymigration/libdisplaymigration_0.99.bb b/recipes/libdisplaymigration/libdisplaymigration_0.99.bb
index db75ff7ab3..60e20daf04 100644
--- a/recipes/libdisplaymigration/libdisplaymigration_0.99.bb
+++ b/recipes/libdisplaymigration/libdisplaymigration_0.99.bb
@@ -7,7 +7,7 @@ PR = "r0"
 
 inherit pkgconfig gpe
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 headers = "displaymigration.h auth.h crypt.h"
 
diff --git a/recipes/libdotconf/libdotconf_1.0.13.bb b/recipes/libdotconf/libdotconf_1.0.13.bb
index b928edefe8..077d1f1397 100644
--- a/recipes/libdotconf/libdotconf_1.0.13.bb
+++ b/recipes/libdotconf/libdotconf_1.0.13.bb
@@ -7,7 +7,7 @@ PR = "r0"
 inherit autotools
 
 SRC_URI = "http://www.azzit.de/dotconf/download/v1.0/dotconf-${PV}.tar.gz \
-	  file://srcMakefile.am_00.patch;patch=1"
+	  file://srcMakefile.am_00.patch"
 
 S = "${WORKDIR}/dotconf-${PV}"
 
diff --git a/recipes/libdotdesktop/libdotdesktop_0.11.bb b/recipes/libdotdesktop/libdotdesktop_0.11.bb
index 5d6ecb5542..8f8e4b08b1 100644
--- a/recipes/libdotdesktop/libdotdesktop_0.11.bb
+++ b/recipes/libdotdesktop/libdotdesktop_0.11.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 inherit pkgconfig
 
 SRC_URI = "${GPE_MIRROR}/libdotdesktop-${PV}.tar.gz \
-	file://make_build_var.patch;patch=1"
+	file://make_build_var.patch"
 
 headers = "dotdesktop.h"
 
diff --git a/recipes/libdvb/libdvb_0.5.5.1.bb b/recipes/libdvb/libdvb_0.5.5.1.bb
index e8024e0e88..5b6257ac9a 100644
--- a/recipes/libdvb/libdvb_0.5.5.1.bb
+++ b/recipes/libdvb/libdvb_0.5.5.1.bb
@@ -7,9 +7,9 @@ LICENSE = "GPL"
 PR = "r3"
 
 SRC_URI = "http://www.metzlerbros.org/dvb/${P}.tar.gz \
-          file://topf2ps.patch;patch=1 \
-          file://gcc4.patch;patch=1 \
-          file://ldflags.patch;patch=1"
+          file://topf2ps.patch \
+          file://gcc4.patch \
+          file://ldflags.patch"
 
 S = "${WORKDIR}/${PN}-${PV}"
 
diff --git a/recipes/libeasysoap++/libeasysoap++0_0.6.1.bb b/recipes/libeasysoap++/libeasysoap++0_0.6.1.bb
index 0d990c56b3..9b9b87db4f 100644
--- a/recipes/libeasysoap++/libeasysoap++0_0.6.1.bb
+++ b/recipes/libeasysoap++/libeasysoap++0_0.6.1.bb
@@ -5,10 +5,10 @@ LICENSE = "LGPL"
 PR = "r1"
 
 SRC_URI = "http://activecampus2.ucsd.edu/apt/sarge/easysoap++/easysoap++_${PV}.orig.tar.gz;name=archive \
-  http://activecampus2.ucsd.edu/apt/sarge/easysoap++/easysoap++_${PV}-5.diff.gz;patch=1;name=patch \
-  file://libeasysoap++0-0.6.1/libeasysoap++0-0.6.1-template-keyword-qualifier-swb.patch;patch=1 \
-  file://libeasysoap++0-0.6.1/libeasysoap++0-0.6.1-compile-errors-swb.patch;patch=1 \
-  file://libeasysoap++0-0.6.1/libeasysoap++0-0.6.1-autoreconf-fixes-swb.patch;patch=1"
+  http://activecampus2.ucsd.edu/apt/sarge/easysoap++/easysoap++_${PV}-5.diff.gz;name=patch \
+  file://libeasysoap++0-0.6.1/libeasysoap++0-0.6.1-template-keyword-qualifier-swb.patch \
+  file://libeasysoap++0-0.6.1/libeasysoap++0-0.6.1-compile-errors-swb.patch \
+  file://libeasysoap++0-0.6.1/libeasysoap++0-0.6.1-autoreconf-fixes-swb.patch"
 
 S = "${WORKDIR}/EasySoap++-${PV}"
 
diff --git a/recipes/libedit/libedit_20050118.bb b/recipes/libedit/libedit_20050118.bb
index 71029330cc..096316530c 100644
--- a/recipes/libedit/libedit_20050118.bb
+++ b/recipes/libedit/libedit_20050118.bb
@@ -6,8 +6,8 @@ DEPENDS = "ncurses"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/libedit-${PV}.tar.bz2 \
-	file://20031222-debian-to-gentoo.patch;patch=1;pnum=1 \
-	file://libedit-add-soname.diff;patch=1;pnum=0"
+	file://20031222-debian-to-gentoo.patch \
+	file://libedit-add-soname.diff;striplevel=0"
 
 S = "${WORKDIR}/netbsd-cvs"
 
diff --git a/recipes/libeina/libeina_0.96.7.bb b/recipes/libeina/libeina_0.96.7.bb
index a195d1ebca..d46e33f48d 100644
--- a/recipes/libeina/libeina_0.96.7.bb
+++ b/recipes/libeina/libeina_0.96.7.bb
@@ -6,7 +6,7 @@ PR = "r2"
 DEPENDS = "glib-2.0 gstreamer"
 
 SRC_URI = "http://bolgo.cent.uji.es/files/libeina/${P}.tar.gz \
-		  file://nomagic.diff;patch=1"
+		  file://nomagic.diff"
 
 EXTRA_OECONF = "--disable-magic"
 
diff --git a/recipes/libetpan/libetpan_0.46.bb b/recipes/libetpan/libetpan_0.46.bb
index 7165979f46..a3bee28a40 100644
--- a/recipes/libetpan/libetpan_0.46.bb
+++ b/recipes/libetpan/libetpan_0.46.bb
@@ -7,7 +7,7 @@ LICENSE = "BSD"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
-           file://honor-oe-lflags.patch;patch=1"
+           file://honor-oe-lflags.patch"
 
 inherit autotools pkgconfig gettext binconfig
 
diff --git a/recipes/libetpan/libetpan_0.48.bb b/recipes/libetpan/libetpan_0.48.bb
index 87ead5f67b..5e8b52073b 100644
--- a/recipes/libetpan/libetpan_0.48.bb
+++ b/recipes/libetpan/libetpan_0.48.bb
@@ -7,7 +7,7 @@ LICENSE = "BSD"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
-           file://honor-oe-lflags.patch;patch=1"
+           file://honor-oe-lflags.patch"
 
 inherit autotools pkgconfig gettext binconfig
 
diff --git a/recipes/libetpan/libetpan_0.57.bb b/recipes/libetpan/libetpan_0.57.bb
index b3505aa039..37599fc07e 100644
--- a/recipes/libetpan/libetpan_0.57.bb
+++ b/recipes/libetpan/libetpan_0.57.bb
@@ -7,8 +7,8 @@ LICENSE = "BSD"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
-	   file://libetpan-autoreconf.patch;patch=1 \
-           file://libetpan-ldflags.patch;patch=1"
+	   file://libetpan-autoreconf.patch \
+           file://libetpan-ldflags.patch"
 
 inherit autotools pkgconfig gettext binconfig
 
diff --git a/recipes/libeventdb/libeventdb_0.90.bb b/recipes/libeventdb/libeventdb_0.90.bb
index 68139ba617..84912fbfde 100644
--- a/recipes/libeventdb/libeventdb_0.90.bb
+++ b/recipes/libeventdb/libeventdb_0.90.bb
@@ -1,7 +1,7 @@
 require libeventdb.inc
 
 PR = "r2"
-SRC_URI += "file://libeventdb-unbreak-LIVE-macro.patch;patch=1"
+SRC_URI += "file://libeventdb-unbreak-LIVE-macro.patch"
 
 SRC_URI[md5sum] = "fd7975bb5f3ddb46e6f318e69c3d92d4"
 SRC_URI[sha256sum] = "b3bc81803e890514e9e0ed491c05af701dfc58e985b071a4a408ba99dd858180"
diff --git a/recipes/libevnet/libevnet_0.3.1.bb b/recipes/libevnet/libevnet_0.3.1.bb
index 8b3e337d16..f4385df98f 100644
--- a/recipes/libevnet/libevnet_0.3.1.bb
+++ b/recipes/libevnet/libevnet_0.3.1.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.25thandclement.com/~william/projects/libevnet.html"
 DEPENDS = "libarena libevent openssl"
 
 SRC_URI = "http://www.25thandclement.com/~william/projects/releases/libevnet-${PV}.tgz \
-           file://stdargs.patch;patch=1"
+           file://stdargs.patch"
 
 do_stage() {
 	oe_libinstall -C src -a libevnet ${STAGING_LIBDIR}
diff --git a/recipes/libexif/libexif.inc b/recipes/libexif/libexif.inc
new file mode 100644
index 0000000000..9284d19edf
--- /dev/null
+++ b/recipes/libexif/libexif.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures"
+HOMEPAGE = "http://sourceforge.net/projects/libexif"
+SECTION = "libs"
+LICENSE = "LGPL"
+DEPENDS = "gettext"
+INC_PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2"
+
+inherit autotools 
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_configure_append() {
+    sed -i s:doc\ binary:binary:g Makefile
+}
diff --git a/recipes/libexif/libexif_0.6.16.bb b/recipes/libexif/libexif_0.6.16.bb
index 20ebc71984..3fa9fd5be3 100644
--- a/recipes/libexif/libexif_0.6.16.bb
+++ b/recipes/libexif/libexif_0.6.16.bb
@@ -1,21 +1,6 @@
-DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures"
-HOMEPAGE = "http://sourceforge.net/projects/libexif"
-SECTION = "libs"
-LICENSE = "LGPL"
+require libexif.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2"
-
-inherit autotools 
-
-do_configure_append() {
-	sed -i s:doc\ binary:binary:g Makefile
-}
-
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-
-do_stage() {
-	autotools_stage_all
-}
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "deee153b1ded5a944ea05d041d959eca"
 SRC_URI[sha256sum] = "db6885d5e40e3a273ff8bb9708ab739c8ace3c5abdd75509eec8ea31a31aac43"
diff --git a/recipes/libexif/libexif_0.6.17.bb b/recipes/libexif/libexif_0.6.17.bb
index 5b52092c0f..4acd35af86 100644
--- a/recipes/libexif/libexif_0.6.17.bb
+++ b/recipes/libexif/libexif_0.6.17.bb
@@ -1,21 +1,6 @@
-DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures"
-HOMEPAGE = "http://sourceforge.net/projects/libexif"
-SECTION = "libs"
-LICENSE = "LGPL"
+require libexif.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2"
-
-inherit autotools 
-
-do_configure_append() {
-	sed -i s:doc\ binary:binary:g Makefile
-}
-
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-
-do_stage() {
-	autotools_stage_all
-}
+PR = "${INC_PR}.1"
 
 SRC_URI[md5sum] = "f7cf4e623a48c9a3b13f7f95f0a41015"
 SRC_URI[sha256sum] = "dceb9355b148a8ee6aa96e3dff82a06c066c81e6ab18c190c946ed3b30fc7353"
diff --git a/recipes/libexosip2/libexosip2_2.2.3.bb b/recipes/libexosip2/libexosip2_2.2.3.bb
index a255bead85..dd7082800e 100644
--- a/recipes/libexosip2/libexosip2_2.2.3.bb
+++ b/recipes/libexosip2/libexosip2_2.2.3.bb
@@ -8,7 +8,7 @@ LEAD_SONAME = "libeXosip2"
 
 PR = "r0"
 SRC_URI = "http://download.savannah.nongnu.org/releases/exosip/${SRCNAME}-${PV}.tar.gz \
-           file://simplify-flags.patch;patch=1"
+           file://simplify-flags.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/recipes/libfakekey/libfakekey_svn.bb b/recipes/libfakekey/libfakekey_svn.bb
index 94aa8c57b8..89aa223ba1 100644
--- a/recipes/libfakekey/libfakekey_svn.bb
+++ b/recipes/libfakekey/libfakekey_svn.bb
@@ -7,7 +7,7 @@ PV = "0.2+svnr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
-	   file://configure-fix.patch;patch=1"
+	   file://configure-fix.patch"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/libffi/libffi_2.0+gcc3.4.1.bb b/recipes/libffi/libffi_2.0+gcc3.4.1.bb
index 41ad8726e3..ceb46b18fc 100644
--- a/recipes/libffi/libffi_2.0+gcc3.4.1.bb
+++ b/recipes/libffi/libffi_2.0+gcc3.4.1.bb
@@ -18,7 +18,7 @@ FILES_${PN}-dev = "${includedir}/ffi* \
 GCC_VER = "${@bb.data.getVar('PV',d,1).split('gcc')[1]}"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.bz2 \
-	   file://soname.patch;patch=1"
+	   file://soname.patch"
 
 MIRRORS_prepend () {
 ${GNU_MIRROR}/gcc/	http://gcc.get-software.com/releases/
diff --git a/recipes/libffi/libffi_2.0+gcc4.3.2.bb b/recipes/libffi/libffi_2.0+gcc4.3.2.bb
index 6b1caec400..1694ce4ab2 100644
--- a/recipes/libffi/libffi_2.0+gcc4.3.2.bb
+++ b/recipes/libffi/libffi_2.0+gcc4.3.2.bb
@@ -1,4 +1,4 @@
-require recipes/gcc/gcc-common.inc
+require ../gcc/gcc-common.inc
 SECTION = "libs"
 DESCRIPTION = "Foreign Function Interface library"
 LICENSE = "libffi"
diff --git a/recipes/libffi/libffi_3.0.8.bb b/recipes/libffi/libffi_3.0.8.bb
index 2399e84354..b31d9eea79 100644
--- a/recipes/libffi/libffi_3.0.8.bb
+++ b/recipes/libffi/libffi_3.0.8.bb
@@ -1,4 +1,4 @@
-require recipes/gcc/gcc-common.inc
+require ../gcc/gcc-common.inc
 
 SECTION = "libs"
 DESCRIPTION = "Foreign Function Interface library"
@@ -25,7 +25,7 @@ FILES_${PN}-dev = "${includedir}/${TARGET_SYS}/ffi* \
 "
 
 SRC_URI = "ftp://sourceware.org/pub/libffi/${P}.tar.gz \
-           file://autoconf-2.64.patch;patch=1"
+           file://autoconf-2.64.patch"
 
 EXTRA_OECONF = "--with-gnu-ld \
                 --enable-shared \
diff --git a/recipes/libfribidi/libfribidi-native_0.10.4.bb b/recipes/libfribidi/libfribidi-native_0.10.4.bb
index 2a9b78b3da..4e1ae87cd2 100644
--- a/recipes/libfribidi/libfribidi-native_0.10.4.bb
+++ b/recipes/libfribidi/libfribidi-native_0.10.4.bb
@@ -9,7 +9,7 @@ PR = "r0"
 S = "${WORKDIR}/fribidi-${PV}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/fribidi/fribidi-${PV}.tar.bz2 \
-           file://libtool-update.patch;patch=1"
+           file://libtool-update.patch"
 
 #PACKAGES += " ${PN}-bin"
 FILES_${PN} = "${libdir}/lib*.so.*"
diff --git a/recipes/libfribidi/libfribidi_0.10.4.bb b/recipes/libfribidi/libfribidi_0.10.4.bb
index 359c66341b..c46909b073 100644
--- a/recipes/libfribidi/libfribidi_0.10.4.bb
+++ b/recipes/libfribidi/libfribidi_0.10.4.bb
@@ -9,7 +9,7 @@ PR = "r0"
 S = "${WORKDIR}/fribidi-${PV}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/fribidi/fribidi-${PV}.tar.bz2 \
-           file://libtool-update.patch;patch=1"
+           file://libtool-update.patch"
 
 #PACKAGES += " ${PN}-bin"
 FILES_${PN} = "${libdir}/lib*.so.*"
diff --git a/recipes/libftdi/ftdi-eeprom_0.2.bb b/recipes/libftdi/ftdi-eeprom_0.2.bb
index a8991ebc94..4a142f6557 100644
--- a/recipes/libftdi/ftdi-eeprom_0.2.bb
+++ b/recipes/libftdi/ftdi-eeprom_0.2.bb
@@ -5,7 +5,7 @@ DEPENDS = "libftdi confuse"
 PR = "r1"
 
 SRC_URI = "http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/ftdi_eeprom-${PV}.tar.gz \
-           file://ftdi_eeprom-0.2-moko.patch;patch=1"
+           file://ftdi_eeprom-0.2-moko.patch"
 S = "${WORKDIR}/ftdi_eeprom-${PV}"
 
 inherit autotools
diff --git a/recipes/libftdi/libftdi_0.13.bb b/recipes/libftdi/libftdi_0.13.bb
index 74438670f5..56be4c0907 100644
--- a/recipes/libftdi/libftdi_0.13.bb
+++ b/recipes/libftdi/libftdi_0.13.bb
@@ -8,7 +8,7 @@ SECTION = "libs"
 DEPENDS = "virtual/libusb0"
 
 SRC_URI = "http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-${PV}.tar.gz \
-	   file://autotools.patch;patch=1 \
+	   file://autotools.patch \
 	  "
 
 inherit autotools binconfig pkgconfig
diff --git a/recipes/libftdi/libftdi_0.9.bb b/recipes/libftdi/libftdi_0.9.bb
index 3c481de388..1874bcea9b 100644
--- a/recipes/libftdi/libftdi_0.9.bb
+++ b/recipes/libftdi/libftdi_0.9.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "virtual/libusb0"
 
 SRC_URI = "http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-${PV}.tar.gz \
-           file://doxygen-configure.patch;patch=1"
+           file://doxygen-configure.patch"
 S = "${WORKDIR}/libftdi-${PV}"
 
 inherit autotools
diff --git a/recipes/libgcrypt/libgcrypt.inc b/recipes/libgcrypt/libgcrypt.inc
index 77dd1d9132..f29dc8da34 100644
--- a/recipes/libgcrypt/libgcrypt.inc
+++ b/recipes/libgcrypt/libgcrypt.inc
@@ -5,8 +5,8 @@ LICENSE = "GPL LGPL FDL"
 DEPENDS = "libgpg-error"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
-           file://add-pkgconfig-support.patch;patch=1 \
-           file://mips-h-constraint.patch;patch=1"
+           file://add-pkgconfig-support.patch \
+           file://mips-h-constraint.patch"
 
 inherit autotools binconfig pkgconfig lib_package
 
diff --git a/recipes/libgee/libgee-native_git.bb b/recipes/libgee/libgee-native_git.bb
deleted file mode 100644
index e90f99e2f0..0000000000
--- a/recipes/libgee/libgee-native_git.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require libgee_git.bb
-inherit native
diff --git a/recipes/libgee/libgee_git.bb b/recipes/libgee/libgee_git.bb
index c6324c7428..83d156d649 100644
--- a/recipes/libgee/libgee_git.bb
+++ b/recipes/libgee/libgee_git.bb
@@ -3,8 +3,9 @@ and classes for commonly used data structures."
 HOMEPAGE = "http://live.gnome.org/Libgee"
 SECTION = "libs"
 DEPENDS = "glib-2.0"
+DEPENDS_virtclass-native = "glib-2.0-native"
 LICENSE = "LGPL"
-SRCREV = "a86abd4240622ec377bbc5773850a4593e13f7eb"
+SRCREV = "9a3d48187d87b0ed151a339a9b05f6f4eefb0922"
 PV = "0.5.0+gitr${SRCPV}"
 PE = "1"
 
@@ -13,6 +14,6 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/git"
 
-inherit autotools_stage pkgconfig vala
+inherit autotools vala
 
-FILES_${PN}-dev += "${datadir}/gir-1.0"
+BBCLASSEXTEND = "native"
diff --git a/recipes/libglade/libglade_2.0.1.bb b/recipes/libglade/libglade_2.0.1.bb
index 0983eb0d74..5971e5312c 100644
--- a/recipes/libglade/libglade_2.0.1.bb
+++ b/recipes/libglade/libglade_2.0.1.bb
@@ -4,7 +4,7 @@ PR = "r1"
 DEPENDS += "libxml2"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-${PV}.tar.bz2 \
-           file://glade-cruft.patch;patch=1;pnum=0 \
+           file://glade-cruft.patch;striplevel=0 \
            file://gtk-2.0.m4"
 
 do_configure_prepend() {
diff --git a/recipes/libglade/libglade_2.4.0.bb b/recipes/libglade/libglade_2.4.0.bb
index cddd6727b2..60759eb613 100644
--- a/recipes/libglade/libglade_2.4.0.bb
+++ b/recipes/libglade/libglade_2.4.0.bb
@@ -4,7 +4,7 @@ PR = "r3"
 
 inherit gnome
 
-SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
+SRC_URI += "file://glade-cruft.patch file://no-xml2.patch"
 
 EXTRA_OECONF += "--without-libxml2"
 
diff --git a/recipes/libglade/libglade_2.4.2.bb b/recipes/libglade/libglade_2.4.2.bb
index 51161e33c9..6a7268b06c 100644
--- a/recipes/libglade/libglade_2.4.2.bb
+++ b/recipes/libglade/libglade_2.4.2.bb
@@ -4,7 +4,7 @@ PR = "r1"
 
 inherit gnome
 
-SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
+SRC_URI += "file://glade-cruft.patch file://no-xml2.patch"
 
 EXTRA_OECONF += "--without-libxml2"
 
diff --git a/recipes/libglade/libglade_2.5.1.bb b/recipes/libglade/libglade_2.5.1.bb
index b32122c98e..40534622a8 100644
--- a/recipes/libglade/libglade_2.5.1.bb
+++ b/recipes/libglade/libglade_2.5.1.bb
@@ -4,8 +4,8 @@ PR = "r2"
 
 inherit gnome
 
-SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1 \
-	    file://no-deprecation.patch;patch=1"
+SRC_URI += "file://glade-cruft.patch file://no-xml2.patch \
+	    file://no-deprecation.patch"
 
 EXTRA_OECONF += "--without-libxml2"
 
diff --git a/recipes/libglade/libglade_2.6.2.bb b/recipes/libglade/libglade_2.6.2.bb
index fee03880c4..3e097ff5d9 100644
--- a/recipes/libglade/libglade_2.6.2.bb
+++ b/recipes/libglade/libglade_2.6.2.bb
@@ -4,7 +4,7 @@ PR = "r2"
 
 inherit gnome
 
-SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
+SRC_URI += "file://glade-cruft.patch file://no-xml2.patch"
 
 EXTRA_OECONF += "--without-libxml2"
 
diff --git a/recipes/libglade/libglade_2.6.4.bb b/recipes/libglade/libglade_2.6.4.bb
index bb3f3ae4ff..01f66c0d85 100644
--- a/recipes/libglade/libglade_2.6.4.bb
+++ b/recipes/libglade/libglade_2.6.4.bb
@@ -2,7 +2,7 @@ require libglade.inc
 
 inherit gnome
 
-SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
+SRC_URI += "file://glade-cruft.patch file://no-xml2.patch"
 
 EXTRA_OECONF += "--without-libxml2"
 
diff --git a/recipes/libgmime/gmime_2.4.10.bb b/recipes/libgmime/gmime_2.4.10.bb
index a7dd4e4190..a70609de66 100644
--- a/recipes/libgmime/gmime_2.4.10.bb
+++ b/recipes/libgmime/gmime_2.4.10.bb
@@ -8,7 +8,7 @@ inherit gnome autotools_stage lib_package binconfig
 
 SRC_URI += " \
            file://iconv-detect.h \
-	   file://nodolt.patch;patch=1"
+	   file://nodolt.patch"
 
 EXTRA_OECONF += "--disable-mono"
 
diff --git a/recipes/libgmime/libgmime_2.1.7.bb b/recipes/libgmime/libgmime_2.1.7.bb
index 863a3dd74b..ee0d283a3e 100644
--- a/recipes/libgmime/libgmime_2.1.7.bb
+++ b/recipes/libgmime/libgmime_2.1.7.bb
@@ -8,8 +8,8 @@ inherit autotools pkgconfig gnome
 
 PR = "r1"
 SRC_URI = "http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-${PV}.tar.gz \
-	   file://skip-iconv-detect.patch;patch=1 \
-	   file://configure-ldflags-cross.patch;patch=1"
+	   file://skip-iconv-detect.patch \
+	   file://configure-ldflags-cross.patch"
 
 S = "${WORKDIR}/gmime-${PV}"
 
diff --git a/recipes/libgmime/libgmime_2.2.23.bb b/recipes/libgmime/libgmime_2.2.23.bb
index 5a2ea37ebd..2e2db3d144 100644
--- a/recipes/libgmime/libgmime_2.2.23.bb
+++ b/recipes/libgmime/libgmime_2.2.23.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 zlib"
 SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.2/gmime-${PV}.tar.bz2 \
-           file://configure-cross.patch;patch=1 \
+           file://configure-cross.patch \
            file://iconv-detect.h"
 EXTRA_OECONF += "--disable-mono"
 S = "${WORKDIR}/gmime-${PV}"
diff --git a/recipes/libgpepimc/libgpepimc_0.2.bb b/recipes/libgpepimc/libgpepimc_0.2.bb
index 509056aa2b..f7887db43b 100644
--- a/recipes/libgpepimc/libgpepimc_0.2.bb
+++ b/recipes/libgpepimc/libgpepimc_0.2.bb
@@ -6,7 +6,7 @@ DEPENDS = "libgpewidget libdisplaymigration gtk+ sqlite"
 
 inherit pkgconfig gpe
 
-SRC_URI += "file://libgpepimc_pc.patch;patch=1"
+SRC_URI += "file://libgpepimc_pc.patch"
 
 headers = "pim-categories.h pim-categories-ui.h"
 
diff --git a/recipes/libgpepimc/libgpepimc_0.9.bb b/recipes/libgpepimc/libgpepimc_0.9.bb
index 26cb8ef1be..0ca28320ba 100644
--- a/recipes/libgpepimc/libgpepimc_0.9.bb
+++ b/recipes/libgpepimc/libgpepimc_0.9.bb
@@ -1,7 +1,7 @@
 require libgpepimc.inc
 PR = "r1"
 
-SRC_URI += " file://get-category-by-name.patch;patch=1"
+SRC_URI += " file://get-category-by-name.patch"
 
 SRC_URI[md5sum] = "0d22564e0a897b3be2eb9d2fc71fbd65"
 SRC_URI[sha256sum] = "8954f7179d2172f8d561d42209e25027a1eece832e35986d9637c404c1a3add0"
diff --git a/recipes/libgpewidget/libgpewidget_0.114.bb b/recipes/libgpewidget/libgpewidget_0.114.bb
index 27ab43345f..810bdb6e0a 100644
--- a/recipes/libgpewidget/libgpewidget_0.114.bb
+++ b/recipes/libgpewidget/libgpewidget_0.114.bb
@@ -9,7 +9,7 @@ GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpe pkgconfig autotools
 
-SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
+SRC_URI += "file://pkgconfig.patch;striplevel=0"
 
 EXTRA_OECONF = "--enable-cairo"
 
diff --git a/recipes/libgpewidget/libgpewidget_0.115.bb b/recipes/libgpewidget/libgpewidget_0.115.bb
index 5f489b5822..d60cc0f391 100644
--- a/recipes/libgpewidget/libgpewidget_0.115.bb
+++ b/recipes/libgpewidget/libgpewidget_0.115.bb
@@ -8,7 +8,7 @@ GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpe pkgconfig autotools
 
-SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
+SRC_URI += "file://pkgconfig.patch;striplevel=0"
 
 EXTRA_OECONF = "--enable-cairo"
 
diff --git a/recipes/libgpewidget/libgpewidget_0.117.bb b/recipes/libgpewidget/libgpewidget_0.117.bb
index 67d07b56f6..104843ca54 100644
--- a/recipes/libgpewidget/libgpewidget_0.117.bb
+++ b/recipes/libgpewidget/libgpewidget_0.117.bb
@@ -8,7 +8,7 @@ PR          = "r0"
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpe pkgconfig autotools
 
-SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
+SRC_URI += "file://pkgconfig.patch;striplevel=0"
 
 PACKAGES =+ "libgpewidget-bin"
 FILES_libgpewidget-bin = "${bindir}/*"
diff --git a/recipes/libgpg-error/libgpg-error.inc b/recipes/libgpg-error/libgpg-error.inc
index 30b1952745..cfe09afc25 100644
--- a/recipes/libgpg-error/libgpg-error.inc
+++ b/recipes/libgpg-error/libgpg-error.inc
@@ -7,7 +7,7 @@ DEPENDS += "virtual/libiconv"
 DEPENDS_virtclass-native = ""
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \
-	   file://pkgconfig.patch;patch=1"
+	   file://pkgconfig.patch"
 
 INC_PR = "r7"
 
diff --git a/recipes/libgpg-error/libgpg-error_0.7.bb b/recipes/libgpg-error/libgpg-error_0.7.bb
index 5bca87387c..947d4f2478 100644
--- a/recipes/libgpg-error/libgpg-error_0.7.bb
+++ b/recipes/libgpg-error/libgpg-error_0.7.bb
@@ -3,7 +3,7 @@ require libgpg-error.inc
 PR = "${INC_PR}.1"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.gz \
-	   file://pkgconfig.patch;patch=1"
+	   file://pkgconfig.patch"
 
 SRC_URI[md5sum] = "5340fa28c365049c995996e8dc0f880c"
 SRC_URI[sha256sum] = "e8eb2c3a844a080144cbb994118e5110b08bc0f608f8c3f2f1977211167bda76"
diff --git a/recipes/libgsm/libgsm_1.0.10.bb b/recipes/libgsm/libgsm_1.0.10.bb
index 23fbbf1397..f16d457d8d 100644
--- a/recipes/libgsm/libgsm_1.0.10.bb
+++ b/recipes/libgsm/libgsm_1.0.10.bb
@@ -9,7 +9,7 @@ PR = "r2"
 inherit pkgconfig gpe
 
 SRC_URI = "http://www.netsw.org/audio/convert/gsm-${PV}.tar.gz \
-           file://libgsm_patch;patch=1;pnum=0"
+           file://libgsm_patch;apply=yes;striplevel=0"
 
 S = "${WORKDIR}/gsm-1.0-pl10/"
 
diff --git a/recipes/libgsm/libgsm_1.0.12.bb b/recipes/libgsm/libgsm_1.0.12.bb
index 60d9ecf530..a0b5e76568 100644
--- a/recipes/libgsm/libgsm_1.0.12.bb
+++ b/recipes/libgsm/libgsm_1.0.12.bb
@@ -7,11 +7,11 @@ LICENSE = "libgsm"
 PR = "r1"
 
 SRC_URI = "http://user.cs.tu-berlin.de/~jutta/gsm/gsm-${PV}.tar.gz \
-	   file://01_makefile.patch;patch=1 \
-           file://02_cplusplus.patch;patch=1 \
-           file://03_config.patch;patch=1 \
-           file://04_includes.patch;patch=1 \
-           file://05_compiler_warnings.patch;patch=1 \
+	   file://01_makefile.patch \
+           file://02_cplusplus.patch \
+           file://03_config.patch \
+           file://04_includes.patch \
+           file://05_compiler_warnings.patch \
 	  "
 
 S = "${WORKDIR}/gsm-1.0-pl12/"
diff --git a/recipes/libgtkstylus/libgtkstylus_0.3.bb b/recipes/libgtkstylus/libgtkstylus_0.3.bb
index 2d669ca132..04333bcc3d 100644
--- a/recipes/libgtkstylus/libgtkstylus_0.3.bb
+++ b/recipes/libgtkstylus/libgtkstylus_0.3.bb
@@ -7,7 +7,7 @@ PR = "r6"
 inherit autotools
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
-	file://makefile.patch;patch=1 \
+	file://makefile.patch \
 	file://gtkstylus.sh"
 
 do_install_append() {
diff --git a/recipes/libical/libical_0.27.bb b/recipes/libical/libical_0.27.bb
index a6174e212c..1c3cdc7ac5 100644
--- a/recipes/libical/libical_0.27.bb
+++ b/recipes/libical/libical_0.27.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL / MPL"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${P}.tar.gz \
-           file://pthread-link.patch;patch=1"
+           file://pthread-link.patch"
 
 
 inherit autotools
diff --git a/recipes/libiconv/libiconv.inc b/recipes/libiconv/libiconv.inc
index c8bc290a25..6bb85efd25 100644
--- a/recipes/libiconv/libiconv.inc
+++ b/recipes/libiconv/libiconv.inc
@@ -6,12 +6,12 @@ PRIORITY = "optional"
 NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz \
-	   file://autotools.patch;patch=1 \
-	   file://preload.patch;patch=1"
+	   file://autotools.patch \
+	   file://preload.patch"
 
 S = "${WORKDIR}/libiconv-${PV}"
 
-inherit autotools
+inherit autotools gettext
 
 EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable --disable-rpath"
 
diff --git a/recipes/libiconv/libiconv_1.11.bb b/recipes/libiconv/libiconv_1.11.bb
index 1817f08e1b..e6ad3ca593 100644
--- a/recipes/libiconv/libiconv_1.11.bb
+++ b/recipes/libiconv/libiconv_1.11.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
 PROVIDES = "virtual/libiconv"
-PR = "r4"
+PR = "r5"
 LICENSE = "LGPL"
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz"
 
diff --git a/recipes/libiconv/libiconv_1.12.bb b/recipes/libiconv/libiconv_1.12.bb
index ebf5f7dad0..a38248e355 100644
--- a/recipes/libiconv/libiconv_1.12.bb
+++ b/recipes/libiconv/libiconv_1.12.bb
@@ -2,7 +2,7 @@ require libiconv.inc
 LICENSE = "GPLv3 LGPLv2"
 
 PROVIDES = "virtual/libiconv"
-PR = "r1"
+PR = "r2"
 
 #gettext.class cant be inherit here so use this hack
 DEPENDS = "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
diff --git a/recipes/liblockfile/liblockfile_1.06.bb b/recipes/liblockfile/liblockfile_1.06.bb
index 9a35ec50dc..0235dbd5a1 100644
--- a/recipes/liblockfile/liblockfile_1.06.bb
+++ b/recipes/liblockfile/liblockfile_1.06.bb
@@ -4,10 +4,10 @@ LICENSE = "LGPL"
 PR ="r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_${PV}.tar.gz \
-	   file://install.patch;patch=1 \
-	   file://configure.patch;patch=1 \
-	   file://ldflags.patch;patch=1 \
-	   file://glibc-2.4.patch;patch=1"
+	   file://install.patch \
+	   file://configure.patch \
+	   file://ldflags.patch \
+	   file://glibc-2.4.patch"
 
 inherit autotools
 
diff --git a/recipes/libmad/libmad_0.15.1b.bb b/recipes/libmad/libmad_0.15.1b.bb
index 33fd301a59..bab40d08d9 100644
--- a/recipes/libmad/libmad_0.15.1b.bb
+++ b/recipes/libmad/libmad_0.15.1b.bb
@@ -6,13 +6,13 @@ LICENSE = "GPL"
 PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
-           file://add-pkgconfig.patch;patch=1 \
-	   file://mad.diff;patch=1 \
-	   file://mad-mips-h-constraint.patch;patch=1"
+           file://add-pkgconfig.patch \
+	   file://mad.diff \
+	   file://mad-mips-h-constraint.patch"
 
 S = "${WORKDIR}/libmad-${PV}"
 
-SRC_URI_append_avr32 = " file://libmad-0.15.1b-avr32-optimization.patch;patch=1"
+SRC_URI_append_avr32 = " file://libmad-0.15.1b-avr32-optimization.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/libmatchbox/libmatchbox_1.9.bb b/recipes/libmatchbox/libmatchbox_1.9.bb
index 5eb5effccf..b49aabcaf4 100644
--- a/recipes/libmatchbox/libmatchbox_1.9.bb
+++ b/recipes/libmatchbox/libmatchbox_1.9.bb
@@ -3,9 +3,9 @@ PR = "r6"
 
 SRC_URI = "\
   http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
-  file://16bppfixes.patch;patch=1 \
-  file://configure_fixes.patch;patch=1 \
-  file://reset-sigchld.patch;patch=1 \
+  file://16bppfixes.patch \
+  file://configure_fixes.patch \
+  file://reset-sigchld.patch \
   file://check.m4\
 "
 
diff --git a/recipes/libmatthew/libmatthew_0.7.1.bb b/recipes/libmatthew/libmatthew_0.7.1.bb
index 6ddc8f440b..266a0d4748 100644
--- a/recipes/libmatthew/libmatthew_0.7.1.bb
+++ b/recipes/libmatthew/libmatthew_0.7.1.bb
@@ -3,7 +3,7 @@ require libmatthew.inc
 PR = "r0"
 
 SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz \
-           file://Makefile-0.7.patch;patch=1"
+           file://Makefile-0.7.patch"
 
 
 
diff --git a/recipes/libmatthew/libmatthew_0.7.bb b/recipes/libmatthew/libmatthew_0.7.bb
index 37eba9dff6..03a7149042 100644
--- a/recipes/libmatthew/libmatthew_0.7.bb
+++ b/recipes/libmatthew/libmatthew_0.7.bb
@@ -3,7 +3,7 @@ require libmatthew.inc
 PR = "r1"
 
 SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz \
-           file://Makefile-0.7.patch;patch=1"
+           file://Makefile-0.7.patch"
 
 SRC_URI[md5sum] = "da052ee0f71b66e52c175c1f6626c596"
 SRC_URI[sha256sum] = "aaec468db4302bc7698c4168a261f8ea4dfdfd2bc69ff743c056c55cd6308a12"
diff --git a/recipes/libmikmod/libmikmod_3.1.12.bb b/recipes/libmikmod/libmikmod_3.1.12.bb
index 743a04f119..fdc87ce888 100644
--- a/recipes/libmikmod/libmikmod_3.1.12.bb
+++ b/recipes/libmikmod/libmikmod_3.1.12.bb
@@ -6,9 +6,9 @@ PR = "r3"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \
-  file://m4.patch;patch=1 \
-  file://autofoo.patch;patch=1 \
-  file://ldflags.patch;patch=1 \
+  file://m4.patch \
+  file://autofoo.patch \
+  file://ldflags.patch \
 "
 
 inherit autotools binconfig
diff --git a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
index e0f50c0219..61cbdbcf2c 100644
--- a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
+++ b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
@@ -11,8 +11,8 @@ TARGET_CC_ARCH += "${LDFLAGS}"
 
 SRC_URI = "\
   http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz \
-  file://m4.patch;patch=1 \
-  file://autofoo.patch;patch=1 \
+  file://m4.patch \
+  file://autofoo.patch \
 "
 
 inherit autotools binconfig
diff --git a/recipes/libmimedir/libmimedir_0.3.1.bb b/recipes/libmimedir/libmimedir_0.3.1.bb
index ea4d063aee..3ea46e52d1 100644
--- a/recipes/libmimedir/libmimedir_0.3.1.bb
+++ b/recipes/libmimedir/libmimedir_0.3.1.bb
@@ -11,7 +11,7 @@ PR = "r4"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://www.rittau.org/mimedir/${P}.tar.gz \
-	   file://mimedir-duration.diff;patch=1"
+	   file://mimedir-duration.diff"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/libmimedir/libmimedir_0.4.2.bb b/recipes/libmimedir/libmimedir_0.4.2.bb
index 6364246214..d1f62d78ef 100644
--- a/recipes/libmimedir/libmimedir_0.4.2.bb
+++ b/recipes/libmimedir/libmimedir_0.4.2.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCal
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-DEPENDS = "intltool-native"
-PR = "r0"
+DEPENDS = "intltool-native glib-2.0"
+PR = "r1"
 
 inherit autotools pkgconfig gpe
 
diff --git a/recipes/libmng/libmng_1.0.8.bb b/recipes/libmng/libmng_1.0.8.bb
index ab0ed2d7d2..c7aeafa3ee 100644
--- a/recipes/libmng/libmng_1.0.8.bb
+++ b/recipes/libmng/libmng_1.0.8.bb
@@ -5,7 +5,7 @@ LICENSE = "libmng"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libmng/libmng-${PV}.tar.gz \
-           file://ldflags.patch;patch=1"
+           file://ldflags.patch"
 
 inherit pkgconfig
 
diff --git a/recipes/libmrss/libmrss_0.17.2.bb b/recipes/libmrss/libmrss_0.17.2.bb
index 8da89ccb93..050a52d99e 100644
--- a/recipes/libmrss/libmrss_0.17.2.bb
+++ b/recipes/libmrss/libmrss_0.17.2.bb
@@ -2,7 +2,7 @@ require libmrss.inc
 
 PR = "${INC_PR}.2"
 
-SRC_URI += "file://better-parse-url-r0.patch;patch=1"
+SRC_URI += "file://better-parse-url-r0.patch"
 
 
 SRC_URI[md5sum] = "54935c6cff42df2f1daada267b701392"
diff --git a/recipes/libnet/libnet_1.0.2a.bb b/recipes/libnet/libnet_1.0.2a.bb
index 2f07fd45cb..053feb23ab 100644
--- a/recipes/libnet/libnet_1.0.2a.bb
+++ b/recipes/libnet/libnet_1.0.2a.bb
@@ -11,9 +11,9 @@ PROVIDES = "libnet-1.0"
 
 #SRC_URI = "http://www.packetfactory.net/libnet/dist/deprecated/libnet-${PV}.tar.gz \
 SRC_URI = "${DEBIAN_MIRROR}/main/libn/libnet0/libnet0_${PV}.orig.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://configure.uclibc.patch;patch=1 \
-	   file://configure_x86-64-host.patch;patch=1 \
+	   file://configure.patch \
+	   file://configure.uclibc.patch \
+	   file://configure_x86-64-host.patch \
 	   "
 S = "${WORKDIR}/libnet-${PV}.orig"
 
diff --git a/recipes/libnet/libnet_1.1.2.1.bb b/recipes/libnet/libnet_1.1.2.1.bb
index 1e9bfccd87..b09f56eda6 100644
--- a/recipes/libnet/libnet_1.1.2.1.bb
+++ b/recipes/libnet/libnet_1.1.2.1.bb
@@ -9,9 +9,9 @@ PROVIDES = "libnet-1.1"
 PR = "r4"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/libn/libnet/libnet_${PV}.orig.tar.gz \
-           file://support-uclibc.patch;patch=1 \
-           file://fix-endianess-test.patch;patch=1 \
-           file://new-autotools.patch;patch=1"
+           file://support-uclibc.patch \
+           file://fix-endianess-test.patch \
+           file://new-autotools.patch"
 
 S = "${WORKDIR}/libnet"
 
diff --git a/recipes/libnids/libnids_1.18.bb b/recipes/libnids/libnids_1.18.bb
index f2cbc5348d..4813baacbc 100644
--- a/recipes/libnids/libnids_1.18.bb
+++ b/recipes/libnids/libnids_1.18.bb
@@ -8,7 +8,7 @@ PR = "r1"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/libnids/libnids-${PV}.tar.gz \
-  file://configure.patch;patch=1"
+  file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/libnids/libnids_1.24.bb b/recipes/libnids/libnids_1.24.bb
index 09702a94d1..749b1e9f0f 100644
--- a/recipes/libnids/libnids_1.24.bb
+++ b/recipes/libnids/libnids_1.24.bb
@@ -8,7 +8,7 @@ PR = "r0"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/libnids/libnids-${PV}.tar.gz;name=libnids \
-  file://configure.patch;patch=1"
+  file://configure.patch"
 SRC_URI[libnids.md5sum] = "72d37c79c85615ffe158aa524d649610"
 SRC_URI[libnids.sha256sum] = "314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359"
 
diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl2_git.bb
index 3e1751757b..08c1b630c1 100644
--- a/recipes/libnl/libnl2_git.bb
+++ b/recipes/libnl/libnl2_git.bb
@@ -13,7 +13,7 @@ includedir = ${prefix}/include/libnl2
 
 SRC_URI = "\
   git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git \
-  file://fix-pc-file.patch;patch=1 \
+  file://fix-pc-file.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes/libnl/libnl_1.1.bb b/recipes/libnl/libnl_1.1.bb
index 62a0b1ba38..0659d933eb 100644
--- a/recipes/libnl/libnl_1.1.bb
+++ b/recipes/libnl/libnl_1.1.bb
@@ -14,10 +14,10 @@ CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1'
 
 SRC_URI = "\
   http://people.suug.ch/~tgr/libnl/files/libnl-${PV}.tar.gz \
-  file://local-includes.patch;patch=1 \
-  file://fix-includes.patch;patch=1 \
-  file://respect-ldflags.patch;patch=1 \
-  file://netlink-local-fix.patch;patch=1 \
+  file://local-includes.patch \
+  file://fix-includes.patch \
+  file://respect-ldflags.patch \
+  file://netlink-local-fix.patch \
 "
 
 
diff --git a/recipes/libnxml/libnxml.inc b/recipes/libnxml/libnxml.inc
index 7a777dab1a..af2ee87725 100644
--- a/recipes/libnxml/libnxml.inc
+++ b/recipes/libnxml/libnxml.inc
@@ -4,12 +4,8 @@ LICENSE = "LGPL"
 
 DEPENDS = "curl"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 inherit autotools pkgconfig
 
 SRC_URI = "http://www.autistici.org/bakunin/libnxml/libnxml-${PV}.tar.gz"
-
-do_stage() {
-    autotools_stage_all
-}
diff --git a/recipes/libogg/libogg_1.1.bb b/recipes/libogg/libogg_1.1.bb
index 4bc53500e6..edc586e08d 100644
--- a/recipes/libogg/libogg_1.1.bb
+++ b/recipes/libogg/libogg_1.1.bb
@@ -2,7 +2,7 @@ require libogg.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://m4.patch;patch=1"
+SRC_URI += "file://m4.patch"
 
 
 SRC_URI[md5sum] = "461d7097bf47864b872085a94ff94e10"
diff --git a/recipes/liboil/liboil_0.3.11.bb b/recipes/liboil/liboil_0.3.11.bb
index 43fe79ab56..8d6047c797 100644
--- a/recipes/liboil/liboil_0.3.11.bb
+++ b/recipes/liboil/liboil_0.3.11.bb
@@ -6,7 +6,7 @@ PR ="r2"
 DEPENDS = "glib-2.0"
 
 SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
-           file://ppc-detect-fpu.patch;patch=1"
+           file://ppc-detect-fpu.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/liboil/liboil_0.3.15.bb b/recipes/liboil/liboil_0.3.15.bb
index 03fb68b2df..70dc5e235e 100644
--- a/recipes/liboil/liboil_0.3.15.bb
+++ b/recipes/liboil/liboil_0.3.15.bb
@@ -6,8 +6,8 @@ PR = "r4"
 DEPENDS = "glib-2.0"
 
 SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
-	   file://autotools.patch;patch=1 \
-	   file://arm-vfp.patch;patch=1 \
+	   file://autotools.patch \
+	   file://arm-vfp.patch \
           "
 
 inherit autotools pkgconfig
diff --git a/recipes/libopie/libopie2_1.2.2.bb b/recipes/libopie/libopie2_1.2.2.bb
index 8409e4c523..21bf6a2859 100644
--- a/recipes/libopie/libopie2_1.2.2.bb
+++ b/recipes/libopie/libopie2_1.2.2.bb
@@ -3,7 +3,7 @@ PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
-           file://odevice.h-jornada-fixup.patch;patch=1 \
-	   file://odevice_jornada.cpp-fixup.patch;patch=1"
+           file://odevice.h-jornada-fixup.patch \
+	   file://odevice_jornada.cpp-fixup.patch"
 
-SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
+SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch"
diff --git a/recipes/libopie/libopie2_1.2.3.bb b/recipes/libopie/libopie2_1.2.3.bb
index d0f9e9e17a..42f57847a3 100644
--- a/recipes/libopie/libopie2_1.2.3.bb
+++ b/recipes/libopie/libopie2_1.2.3.bb
@@ -4,10 +4,10 @@ PR = "r6"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
-           file://gcc-syntax-fix.patch;patch=1 \
-           file://h4000_and_default_rot.patch;patch=1 \
-           file://ipaq_rotate_fix.patch;patch=1 \
-           file://spitz_rotate_fix.patch;patch=1 \
-           file://c7x0_w100_disable.patch;patch=1"
+           file://gcc-syntax-fix.patch \
+           file://h4000_and_default_rot.patch \
+           file://ipaq_rotate_fix.patch \
+           file://spitz_rotate_fix.patch \
+           file://c7x0_w100_disable.patch"
 
-SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
+SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch"
diff --git a/recipes/libopie/libopie2_1.2.4.bb b/recipes/libopie/libopie2_1.2.4.bb
index d66cf3fea5..24ed88425f 100644
--- a/recipes/libopie/libopie2_1.2.4.bb
+++ b/recipes/libopie/libopie2_1.2.4.bb
@@ -4,8 +4,8 @@ PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
-           file://libopie2-tosa.patch;patch=1 \
-           file://c7x0_w100_disable.patch;patch=1 \
-           file://rotate_fix.patch;patch=1"
+           file://libopie2-tosa.patch \
+           file://c7x0_w100_disable.patch \
+           file://rotate_fix.patch"
 
-SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
+SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch"
diff --git a/recipes/libopie/libopie2_cvs.bb b/recipes/libopie/libopie2_cvs.bb
index 427f83b786..7f9edc3568 100644
--- a/recipes/libopie/libopie2_cvs.bb
+++ b/recipes/libopie/libopie2_cvs.bb
@@ -9,7 +9,7 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
            file://include.pro"
 
 # FIXME remove this!
-SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
+SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch"
 
 do_stage_append() {
         # special case for uic-created header files
diff --git a/recipes/libopieobex/libopieobex0_1.2.3.bb b/recipes/libopieobex/libopieobex0_1.2.3.bb
index 047dcee6e6..5670c67576 100644
--- a/recipes/libopieobex/libopieobex0_1.2.3.bb
+++ b/recipes/libopieobex/libopieobex0_1.2.3.bb
@@ -3,4 +3,4 @@ PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           file://disable-bt-check.patch;patch=1"
+           file://disable-bt-check.patch"
diff --git a/recipes/libopieobex/libopieobex0_1.2.4.bb b/recipes/libopieobex/libopieobex0_1.2.4.bb
index 5e02c8860d..570276bf63 100644
--- a/recipes/libopieobex/libopieobex0_1.2.4.bb
+++ b/recipes/libopieobex/libopieobex0_1.2.4.bb
@@ -3,4 +3,4 @@ PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           file://disable-bt-check.patch;patch=1"
+           file://disable-bt-check.patch"
diff --git a/recipes/libopieobex/libopieobex0_cvs.bb b/recipes/libopieobex/libopieobex0_cvs.bb
index 50c36686a9..e120a259e4 100644
--- a/recipes/libopieobex/libopieobex0_cvs.bb
+++ b/recipes/libopieobex/libopieobex0_cvs.bb
@@ -4,4 +4,4 @@ PR = "r7"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
            ${HANDHELDS_CVS};module=opie/pics \
-           file://disable-bt-check.patch;patch=1"
+           file://disable-bt-check.patch"
diff --git a/recipes/libpcap/libpcap.inc b/recipes/libpcap/libpcap.inc
index 140a8a03ae..ce6bbd6358 100644
--- a/recipes/libpcap/libpcap.inc
+++ b/recipes/libpcap/libpcap.inc
@@ -8,7 +8,7 @@ PR = "r3"
 
 # Don't forget to edit shared.patch to have the correct version number inside
 SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \
-           file://shared.patch;patch=1"
+           file://shared.patch"
 
 inherit autotools
 
diff --git a/recipes/libpcap/libpcap_0.9.8.bb b/recipes/libpcap/libpcap_0.9.8.bb
index 110edbe545..ea95301607 100644
--- a/recipes/libpcap/libpcap_0.9.8.bb
+++ b/recipes/libpcap/libpcap_0.9.8.bb
@@ -2,7 +2,7 @@ require libpcap.inc
 
 PR = "r3"
 
-SRC_URI += "file://aclocal.patch;patch=1"
+SRC_URI += "file://aclocal.patch"
 
 SRC_URI[md5sum] = "5208f24d0328ee7c20b52c43eaa9aa0e"
 SRC_URI[sha256sum] = "c4158398de4411627b14f52626e4cef39443f4d5c1b9bce8c07f8526d18362f9"
diff --git a/recipes/libpcap/libpcap_1.0.0.bb b/recipes/libpcap/libpcap_1.0.0.bb
index 3a7c2d43f8..cbe38e8fde 100644
--- a/recipes/libpcap/libpcap_1.0.0.bb
+++ b/recipes/libpcap/libpcap_1.0.0.bb
@@ -2,10 +2,10 @@ require libpcap.inc
 
 PR = "r6"
 SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz"
-SRC_URI += "file://aclocal.patch;patch=1"
-SRC_URI += "file://ieee80215-arphrd.patch;patch=1"
-SRC_URI += "file://ldflags.patch;patch=1"
-SRC_URI += "file://0001-Fix-some-problems-that-show-up-in-autoconf-2.64-and-.patch;patch=1"
+SRC_URI += "file://aclocal.patch"
+SRC_URI += "file://ieee80215-arphrd.patch"
+SRC_URI += "file://ldflags.patch"
+SRC_URI += "file://0001-Fix-some-problems-that-show-up-in-autoconf-2.64-and-.patch"
 
 do_configure_prepend() {
 	cat ${S}/aclocal.m4 >>${S}/acinclude.m4
diff --git a/recipes/libpcre/libpcre_7.6.bb b/recipes/libpcre/libpcre_7.6.bb
index a182df6af4..b0eff17dc2 100644
--- a/recipes/libpcre/libpcre_7.6.bb
+++ b/recipes/libpcre/libpcre_7.6.bb
@@ -5,10 +5,10 @@ provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r6"
+PR = "r7"
 LICENSE = "BSD"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
-           file://pcre-cross.patch;patch=1"
+           file://pcre-cross.patch"
 S = "${WORKDIR}/pcre-${PV}"
 
 PROVIDES = "pcre"
@@ -38,11 +38,11 @@ do_compile () {
 	oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC} -L${S}/lib"
 }
 
-do_stage () {
-        autotools_stage_all
-        install -d ${STAGING_BINDIR}
-        install -m 0755 ${D}${bindir}/pcre-config ${STAGING_BINDIR}/
+do_install_append () {
+    install -d ${STAGING_BINDIR}
+    install -m 0755 ${D}${bindir}/pcre-config ${STAGING_BINDIR}/
 }
+
 python populate_packages_prepend () {
 	pcre_libdir = bb.data.expand('${libdir}', d)
 	pcre_libdir_dbg = bb.data.expand('${libdir}/.debug', d)
diff --git a/recipes/libpng/libpng_1.2.37.bb b/recipes/libpng/libpng_1.2.37.bb
index 752b6e68ab..950ebb4e59 100644
--- a/recipes/libpng/libpng_1.2.37.bb
+++ b/recipes/libpng/libpng_1.2.37.bb
@@ -2,7 +2,7 @@ require libpng.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://makefile_fix.patch;patch=1"
+SRC_URI += "file://makefile_fix.patch"
 
 SRC_URI[tarball.md5sum] = "6d1ee0888dbb711214943cb19c294b49"
 SRC_URI[tarball.sha256sum] = "682960b55527b54bada90e959c2d42679444a1db43677c77eb645a29645f86d1"
diff --git a/recipes/libpng/libpng_1.2.40.bb b/recipes/libpng/libpng_1.2.40.bb
index 8854170277..80d87bc08c 100644
--- a/recipes/libpng/libpng_1.2.40.bb
+++ b/recipes/libpng/libpng_1.2.40.bb
@@ -2,7 +2,7 @@ require libpng.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://makefile_fix.patch;patch=1"
+SRC_URI += "file://makefile_fix.patch"
 
 SRC_URI[tarball.md5sum] = "29bbd1c3cbe54b04bfc2bda43067ccb5"
 SRC_URI[tarball.sha256sum] = "a6197352ad5b79a9a1ce0dd59f5e737cfbf909e0f3c5f64631cf0d93549e4e40"
diff --git a/recipes/libpng/libpng_1.2.41.bb b/recipes/libpng/libpng_1.2.41.bb
index c61a84e815..23899150ad 100644
--- a/recipes/libpng/libpng_1.2.41.bb
+++ b/recipes/libpng/libpng_1.2.41.bb
@@ -2,7 +2,7 @@ require libpng.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://makefile_fix.patch;patch=1"
+SRC_URI += "file://makefile_fix.patch"
 
 SRC_URI[tarball.md5sum] = "2faa7f8d81e6a35beb991cb75edbf056"
 SRC_URI[tarball.sha256sum] = "a172c5afe4668a31eb090d14be7fc2811a9fec8568a785badd30280f47a27e00"
diff --git a/recipes/libpng/libpng_1.2.42.bb b/recipes/libpng/libpng_1.2.42.bb
index cd5b5c4336..d37f7e3df2 100644
--- a/recipes/libpng/libpng_1.2.42.bb
+++ b/recipes/libpng/libpng_1.2.42.bb
@@ -2,7 +2,7 @@ require libpng.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://makefile_fix.patch;patch=1"
+SRC_URI += "file://makefile_fix.patch"
 
 SRC_URI[tarball.md5sum] = "9a5cbe9798927fdf528f3186a8840ebe"
 SRC_URI[tarball.sha256sum] = "a044c4632a236bbf99527da81977577929a173c1f7f68a70a81ea2ea7cffa6a7"
diff --git a/recipes/libqpe/libqpe-opie_1.2.2.bb b/recipes/libqpe/libqpe-opie_1.2.2.bb
index b209780ff7..8cb2ce9bbd 100644
--- a/recipes/libqpe/libqpe-opie_1.2.2.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.2.bb
@@ -4,5 +4,5 @@ PR = "${INC_PR}.0"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
-	file://save-windows-pos-dynamic.patch;patch=1 \
-	file://fix-titleheight.patch;patch=1"
+	file://save-windows-pos-dynamic.patch \
+	file://fix-titleheight.patch"
diff --git a/recipes/libqpe/libqpe-opie_1.2.3.bb b/recipes/libqpe/libqpe-opie_1.2.3.bb
index 1a74e3a156..2b50fca6e7 100644
--- a/recipes/libqpe/libqpe-opie_1.2.3.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.3.bb
@@ -4,9 +4,9 @@ PR = "${INC_PR}.0"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
-           file://fix-titleheight.patch;patch=1 \
-           file://unbreak-logging.patch;patch=1 \
-           file://citytime-path.patch;patch=1 \
-           file://fix-sd-card-path.patch;patch=1 \
+           file://fix-titleheight.patch \
+           file://unbreak-logging.patch \
+           file://citytime-path.patch \
+           file://fix-sd-card-path.patch \
           "
 
diff --git a/recipes/libqpe/libqpe-opie_1.2.4.bb b/recipes/libqpe/libqpe-opie_1.2.4.bb
index bb154d013f..a1373d32d0 100644
--- a/recipes/libqpe/libqpe-opie_1.2.4.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.4.bb
@@ -4,10 +4,10 @@ PR = "${INC_PR}.1"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
-           file://fix-titleheight.patch;patch=1 \
-           file://unbreak-logging.patch;patch=1 \
-           file://citytime-path-2.patch;patch=1 \
-           file://no-include-pro.patch;patch=1 \
-           file://unhide_lnkproperties_destructor.patch;patch=1 \
+           file://fix-titleheight.patch \
+           file://unbreak-logging.patch \
+           file://citytime-path-2.patch \
+           file://no-include-pro.patch \
+           file://unhide_lnkproperties_destructor.patch \
           "
 
diff --git a/recipes/libqpe/libqpe-opie_cvs.bb b/recipes/libqpe/libqpe-opie_cvs.bb
index 16b6414759..6ba11ce6f4 100644
--- a/recipes/libqpe/libqpe-opie_cvs.bb
+++ b/recipes/libqpe/libqpe-opie_cvs.bb
@@ -10,8 +10,8 @@ PV = "${OPIE_CVS_PV}"
 PR = "${INC_PR}.0"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
-           file://fix-titleheight.patch;patch=1 \
-           file://unbreak-logging.patch;patch=1 \
-           file://citytime-path-2.patch;patch=1 \
-           file://no-include-pro.patch;patch=1 \
+           file://fix-titleheight.patch \
+           file://unbreak-logging.patch \
+           file://citytime-path-2.patch \
+           file://no-include-pro.patch \
           "
diff --git a/recipes/librcf/librcf_0.4.bb b/recipes/librcf/librcf_0.4.bb
index 2bb6c1e1a9..ce174bf07a 100644
--- a/recipes/librcf/librcf_0.4.bb
+++ b/recipes/librcf/librcf_0.4.bb
@@ -3,13 +3,13 @@ SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "unknown"
 DEPENDS="zlib openssl boost-asio"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 
 # the SOURCE_URI requires authentication via web browser and cookie (gasp)
 # all we can do right now is download the file and save it under sources/
 SRC_URI = "http://www.mediaassistent.se/jarl/files/RCF-04.zip \
-	file://rcf-0.4-g++-4.1.diff;patch=1 \
-	file://rcf-0.4-openembedded.diff;patch=1"
+	file://rcf-0.4-g++-4.1.diff \
+	file://rcf-0.4-openembedded.diff"
 S = "${WORKDIR}/RCF-${PV}"
 
 CPPFLAGS_prepend = "-I../../include "
diff --git a/recipes/librfid/librfid_svn.bb b/recipes/librfid/librfid_svn.bb
index cfa9659fa8..ef8faa2063 100644
--- a/recipes/librfid/librfid_svn.bb
+++ b/recipes/librfid/librfid_svn.bb
@@ -10,18 +10,18 @@ PV = "0.2.0+svnr${SRCPV}"
 PR = "r5"
 
 SRC_URI = "svn://svn.gnumonks.org/trunk;module=${SRCNAME};proto=http \
-           file://010-rc632-definitions-fix.patch;patch=1 \
-           file://011-rc632-define-fixes-followups.patch;patch=1 \
-           file://012-rc632-error-reg-ro-2.patch;patch=1 \
-           file://013-zero-UID.patch;patch=1 \
-           file://015-no_segfault.patch;patch=1 \
-           file://soos01-set_clear_bits.patch;patch=1 \
-           file://soos02-check-errors.patch;patch=1 \
-           file://soos03-no_hang-openpcd.patch;patch=1 \
+           file://010-rc632-definitions-fix.patch \
+           file://011-rc632-define-fixes-followups.patch \
+           file://012-rc632-error-reg-ro-2.patch \
+           file://013-zero-UID.patch \
+           file://015-no_segfault.patch \
+           file://soos01-set_clear_bits.patch \
+           file://soos02-check-errors.patch \
+           file://soos03-no_hang-openpcd.patch \
            file://librfid.rules \
           "
 
-SRC_URI_append_boc01 = "file://spidev.patch;patch=1"
+SRC_URI_append_boc01 = "file://spidev.patch"
 PACKAGE_ARCH_boc01 = "boc01"
 EXTRA_OECONF_boc01 += "--enable-spidev"
 
diff --git a/recipes/libsamplerate/libsamplerate0_0.1.7.bb b/recipes/libsamplerate/libsamplerate0_0.1.7.bb
index 92f27cc9d8..737e934503 100644
--- a/recipes/libsamplerate/libsamplerate0_0.1.7.bb
+++ b/recipes/libsamplerate/libsamplerate0_0.1.7.bb
@@ -5,8 +5,8 @@ LICENSE = "GPL libsamplerate"
 PR = "r1"
 
 SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz \
-           file://libsamplerate-0.1.7-macro-quoting.patch;patch=1;pnum=0 \
-           file://libsamplerate-0.1.7-tests.patch;patch=1 "
+           file://libsamplerate-0.1.7-macro-quoting.patch;striplevel=0 \
+           file://libsamplerate-0.1.7-tests.patch "
 S = "${WORKDIR}/libsamplerate-${PV}"
 
 inherit autotools pkgconfig
diff --git a/recipes/libsdl/libsdl-directfb_1.2.11.bb b/recipes/libsdl/libsdl-directfb_1.2.11.bb
index 1e7a0a8373..172e2b11a1 100644
--- a/recipes/libsdl/libsdl-directfb_1.2.11.bb
+++ b/recipes/libsdl/libsdl-directfb_1.2.11.bb
@@ -9,11 +9,11 @@ PR = "${INC_PR}.0"
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
   file://acinclude.m4 \
-  file://configure_tweak.patch;patch=1 \
-  file://pagesize.patch;patch=1 \
-  file://kernel-asm-page.patch;patch=1 \
-  file://sdl-cdfix.patch;patch=1 \
-  file://fixmfour.patch;patch=1 \
+  file://configure_tweak.patch \
+  file://pagesize.patch \
+  file://kernel-asm-page.patch \
+  file://sdl-cdfix.patch \
+  file://fixmfour.patch \
 "
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
diff --git a/recipes/libsdl/libsdl-directfb_1.2.9.bb b/recipes/libsdl/libsdl-directfb_1.2.9.bb
index 5fe6eb473a..d847774f72 100644
--- a/recipes/libsdl/libsdl-directfb_1.2.9.bb
+++ b/recipes/libsdl/libsdl-directfb_1.2.9.bb
@@ -6,9 +6,9 @@ DEFAULT_PREFERENCE = "-1"
 PR = "${INC_PR}.0"
 
 SRC_URI += "\
-  file://explicit-extern-C.patch;patch=1 \
+  file://explicit-extern-C.patch \
   file://acinclude.m4 \
-  file://directfb_obsolete_calls.patch;patch=1 \
+  file://directfb_obsolete_calls.patch \
 "
 
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb -I${STAGING_INCDIR}/directfb-internal"
diff --git a/recipes/libsdl/libsdl-image.inc b/recipes/libsdl/libsdl-image.inc
index 014dca4382..4379fe09a9 100644
--- a/recipes/libsdl/libsdl-image.inc
+++ b/recipes/libsdl/libsdl-image.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "zlib libpng jpeg virtual/libsdl"
 LICENSE = "LGPL"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz"
 
@@ -14,8 +14,3 @@ inherit autotools
 
 export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
-do_stage() {
-	oe_libinstall -so libSDL_image ${STAGING_LIBDIR}
-	ln -sf libSDL_image.so ${STAGING_LIBDIR}/libSDL_image-1.2.so
-	install -m 0644 SDL_image.h ${STAGING_INCDIR}/SDL/SDL_image.h
-}
diff --git a/recipes/libsdl/libsdl-image_1.2.3.bb b/recipes/libsdl/libsdl-image_1.2.3.bb
index 98d4904d51..9f93e1707a 100644
--- a/recipes/libsdl/libsdl-image_1.2.3.bb
+++ b/recipes/libsdl/libsdl-image_1.2.3.bb
@@ -3,7 +3,7 @@ require libsdl-image.inc
 PR = "${INC_PR}.2"
 
 SRC_URI += "\
-  file://autotools.patch;patch=1 \
+  file://autotools.patch \
 "
 
 inherit autotools
diff --git a/recipes/libsdl/libsdl-mixer_1.2.11.bb b/recipes/libsdl/libsdl-mixer_1.2.11.bb
index 74dc986805..2217ef2485 100644
--- a/recipes/libsdl/libsdl-mixer_1.2.11.bb
+++ b/recipes/libsdl/libsdl-mixer_1.2.11.bb
@@ -7,7 +7,7 @@ LICENSE = "LGPL"
 PR = "r2"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \
-           file://fix-flac-madness.diff;patch=1"
+           file://fix-flac-madness.diff"
 
 S = "${WORKDIR}/SDL_mixer-${PV}"
 
diff --git a/recipes/libsdl/libsdl-native_1.2.11.bb b/recipes/libsdl/libsdl-native_1.2.11.bb
index 120a37b922..2a3eed23b7 100644
--- a/recipes/libsdl/libsdl-native_1.2.11.bb
+++ b/recipes/libsdl/libsdl-native_1.2.11.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.1"
 
 SRC_URI_append = "\
 	   file://acinclude.m4 \
-	   file://kernel-asm-page.patch;patch=1 "
+	   file://kernel-asm-page.patch "
 
 do_configure_prepend() {
 	rm -f ${S}/acinclude.m4
diff --git a/recipes/libsdl/libsdl-net_1.2.7.bb b/recipes/libsdl/libsdl-net_1.2.7.bb
index b087f6b589..d4183deca6 100644
--- a/recipes/libsdl/libsdl-net_1.2.7.bb
+++ b/recipes/libsdl/libsdl-net_1.2.7.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 PR = "r1"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz \
-	   file://libtool2.patch;patch=1 \
+	   file://libtool2.patch \
 	  "
 
 S = "${WORKDIR}/SDL_net-${PV}"
diff --git a/recipes/libsdl/libsdl-qpe_1.2.9.bb b/recipes/libsdl/libsdl-qpe_1.2.9.bb
index 38f1669d11..a9e3883f6d 100644
--- a/recipes/libsdl/libsdl-qpe_1.2.9.bb
+++ b/recipes/libsdl/libsdl-qpe_1.2.9.bb
@@ -6,17 +6,17 @@ SECTION = "opie/libs"
 DEPENDS = "virtual/libqpe1 libopie2"
 
 SRC_URI += "\
-  file://agawa-piro-mickey-1.2.9.patch;patch=1 \
-  file://pygame-1.2.9.patch;patch=1 \
-  file://mouse-1.2.9.patch;patch=1 \
-  file://kill-stdc++-1.2.9.patch;patch=1 \
-  file://ipaq-1.2.9.patch;patch=1 \
-  file://SDL-Akita-1.2.9.patch;patch=1 \
-  file://fixlibs-1.2.9.patch;patch=1 \
-  file://explicit-extern-C.patch;patch=1 \
-  file://no-PAGE_SIZE.patch;patch=1 \
-  file://fix_Makefile.am.patch;patch=1 \
-  file://fix_configure.in.patch;patch=1 \
+  file://agawa-piro-mickey-1.2.9.patch \
+  file://pygame-1.2.9.patch \
+  file://mouse-1.2.9.patch \
+  file://kill-stdc++-1.2.9.patch \
+  file://ipaq-1.2.9.patch \
+  file://SDL-Akita-1.2.9.patch \
+  file://fixlibs-1.2.9.patch \
+  file://explicit-extern-C.patch \
+  file://no-PAGE_SIZE.patch \
+  file://fix_Makefile.am.patch \
+  file://fix_configure.in.patch \
 "
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
diff --git a/recipes/libsdl/libsdl-ttf_2.0.3.bb b/recipes/libsdl/libsdl-ttf_2.0.3.bb
index 3a8dac30e2..c011f6ab37 100644
--- a/recipes/libsdl/libsdl-ttf_2.0.3.bb
+++ b/recipes/libsdl/libsdl-ttf_2.0.3.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 PR = "r1"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
-           file://new-freetype-includes.patch;patch=1"
+           file://new-freetype-includes.patch"
 S = "${WORKDIR}/SDL_ttf-${PV}"
 
 inherit autotools
diff --git a/recipes/libsdl/libsdl-x11_1.2.11.bb b/recipes/libsdl/libsdl-x11_1.2.11.bb
index e9399ff33e..afa9d58ca1 100644
--- a/recipes/libsdl/libsdl-x11_1.2.11.bb
+++ b/recipes/libsdl/libsdl-x11_1.2.11.bb
@@ -8,12 +8,12 @@ PR = "${INC_PR}.0"
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
   file://acinclude.m4 \
-  file://configure_tweak.patch;patch=1 \
-  file://pagesize.patch;patch=1 \
-  file://kernel-asm-page.patch;patch=1 \
-  file://sdl-cdfix.patch;patch=1 \
-  file://fixmfour.patch;patch=1 \
-  file://libsdl-1.2.11-pagesize.patch;patch=1 \
+  file://configure_tweak.patch \
+  file://pagesize.patch \
+  file://kernel-asm-page.patch \
+  file://sdl-cdfix.patch \
+  file://fixmfour.patch \
+  file://libsdl-1.2.11-pagesize.patch \
 "
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
diff --git a/recipes/libsdl/libsdl.inc b/recipes/libsdl/libsdl.inc
index 51a4b22d4f..9f748e1953 100644
--- a/recipes/libsdl/libsdl.inc
+++ b/recipes/libsdl/libsdl.inc
@@ -10,9 +10,9 @@ INC_PR = "r10"
 
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-  file://extra-keys.patch;patch=1 \
-  file://pagesize.patch;patch=1 \
-  file://remove_path.patch;patch=1 \
+  file://extra-keys.patch \
+  file://pagesize.patch \
+  file://remove_path.patch \
   file://acinclude.m4"
 S = "${WORKDIR}/SDL-${PV}"
 
diff --git a/recipes/libsexy/libsexy.inc b/recipes/libsexy/libsexy.inc
index 27816c0800..b6eb92cfc6 100644
--- a/recipes/libsexy/libsexy.inc
+++ b/recipes/libsexy/libsexy.inc
@@ -6,7 +6,7 @@ SECTION = "x11/libs"
 DEPENDS = "gtk+ enchant libxml2"
 
 SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz \
-           file://libsexy-pkgconfig-fixes.patch;patch=1"
+           file://libsexy-pkgconfig-fixes.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/libshout/libshout.inc b/recipes/libshout/libshout.inc
index 3037eb0f46..ed8577f3d6 100644
--- a/recipes/libshout/libshout.inc
+++ b/recipes/libshout/libshout.inc
@@ -4,7 +4,7 @@ DEPENDS = "speex libtheora libvorbis libogg"
 LICENSE = "LGPL"
 
 SRC_URI = "http://downloads.us.xiph.org/releases/libshout/libshout-${PV}.tar.gz \
-           file://no-host-includes.ac;patch=1 "
+           file://no-host-includes.ac;apply=yes "
 
 inherit autotools
 
diff --git a/recipes/libsidplay/libsidplay_1.36.59.bb b/recipes/libsidplay/libsidplay_1.36.59.bb
index ebba204c62..b7007f9f6d 100644
--- a/recipes/libsidplay/libsidplay_1.36.59.bb
+++ b/recipes/libsidplay/libsidplay_1.36.59.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 SRC_URI = "\
   ftp://ftp.uni-frankfurt.de/pub/Mirrors2/gentoo.org/distfiles/libsidplay-1.36.59.tgz;name=archive \
-  http://ftp.debian.org/debian/pool/main/libs/libsidplay/libsidplay_1.36.59-5.diff.gz;patch=1;name=patch \
+  http://ftp.debian.org/debian/pool/main/libs/libsidplay/libsidplay_1.36.59-5.diff.gz;name=patch \
 "
 
 inherit autotools_stage
diff --git a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
index 9734a59e33..2c32f14cbf 100644
--- a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
+++ b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
@@ -4,8 +4,8 @@ PRIORITY = "optional"
 PR = "r1"
 LICENSE = "GPL LGPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/libsigc/libsigc++-${PV}.tar.gz \
-	   file://autofoo.patch;patch=1 \
-	   file://pkgconfig.patch;patch=1"
+	   file://autofoo.patch \
+	   file://pkgconfig.patch"
 S = "${WORKDIR}/libsigc++-${PV}"
 
 inherit autotools pkgconfig
diff --git a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
index 9aaf0594eb..c68105b17e 100644
--- a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
+++ b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
@@ -5,8 +5,8 @@ LICENSE = "GPL LGPL"
 PR = "r0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1 \
-           file://disable-tests.patch;patch=1"
+	   file://autofoo.patch \
+           file://disable-tests.patch"
 S = "${WORKDIR}/libsigc++-${PV}"
 
 inherit autotools pkgconfig
diff --git a/recipes/libsigc++-2.0/libsigc++-2.0_2.0.17.bb b/recipes/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
index ede1d9cef4..474b2fd95f 100644
--- a/recipes/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
+++ b/recipes/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 PR = "r1"
 LICENSE = "GPL LGPL"
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-${PV}.tar.gz \
-           file://define_sigc_api.patch;patch=1 "
+           file://define_sigc_api.patch "
 S = "${WORKDIR}/libsigc++-${PV}"
 
 inherit autotools pkgconfig
diff --git a/recipes/libsigc++-2.0/libsigc++-2.0_2.0.6.bb b/recipes/libsigc++-2.0/libsigc++-2.0_2.0.6.bb
index 5a1d1ab000..47fe0005b3 100644
--- a/recipes/libsigc++-2.0/libsigc++-2.0_2.0.6.bb
+++ b/recipes/libsigc++-2.0/libsigc++-2.0_2.0.6.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 PR = "r1"
 LICENSE = "GPL LGPL"
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-${PV}.tar.gz \
-	   file://define_sigc_api.patch;patch=1"
+	   file://define_sigc_api.patch"
 S = "${WORKDIR}/libsigc++-${PV}"
 
 inherit autotools pkgconfig
diff --git a/recipes/libsigcx/libsigcx0_0.6.4.bb b/recipes/libsigcx/libsigcx0_0.6.4.bb
index 60d82f25af..6bdb4d7a3a 100644
--- a/recipes/libsigcx/libsigcx0_0.6.4.bb
+++ b/recipes/libsigcx/libsigcx0_0.6.4.bb
@@ -6,12 +6,12 @@ DEPENDS = "libsigc++-1.2"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libsigcx/libsigcx-${PV}.tar.gz \
-  file://libsigcx-0.6.4-add-missing-autogen-sh-swb.patch;patch=1 \
-  file://libsigcx-0.6.4-build-swb.patch;patch=1 \
-  file://libsigcx-0.6.4-fix-ac-try-run-swb.patch;patch=1 \
-  file://libsigcx-200505061-fix-dist-swb.patch;patch=1 \
-  file://libsigcx-0.6.4-pack-predeclare-swb.patch;patch=1 \
-  file://autotool-regen.patch;patch=1"
+  file://libsigcx-0.6.4-add-missing-autogen-sh-swb.patch \
+  file://libsigcx-0.6.4-build-swb.patch \
+  file://libsigcx-0.6.4-fix-ac-try-run-swb.patch \
+  file://libsigcx-200505061-fix-dist-swb.patch \
+  file://libsigcx-0.6.4-pack-predeclare-swb.patch \
+  file://autotool-regen.patch"
 S = "${WORKDIR}/libsigcx-${PV}"
 
 inherit autotools pkgconfig
diff --git a/recipes/libsndfile/libsndfile1_1.0.17.bb b/recipes/libsndfile/libsndfile1_1.0.17.bb
index 64aa8f02da..cd8a802503 100644
--- a/recipes/libsndfile/libsndfile1_1.0.17.bb
+++ b/recipes/libsndfile/libsndfile1_1.0.17.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 PR = "r2"
 
 SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \
-           file://configure-fix.patch;patch=1"
+           file://configure-fix.patch"
 
 S = "${WORKDIR}/libsndfile-${PV}"
 
diff --git a/recipes/libspiff/libspiff_0.8.2.bb b/recipes/libspiff/libspiff_0.8.2.bb
index 0805f50206..b0117cb9c8 100644
--- a/recipes/libspiff/libspiff_0.8.2.bb
+++ b/recipes/libspiff/libspiff_0.8.2.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 DEPENDS = "expat liburiparser"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libspiff/libspiff-${PV}.tar.bz2 \
-           file://autofoo.patch;patch=1"
+           file://autofoo.patch"
 S = "${WORKDIR}/libspiff-${PV}"
 
 inherit autotools pkgconfig lib_package
diff --git a/recipes/libssh/libssh_0.2.bb b/recipes/libssh/libssh_0.2.bb
index db606eba5a..deaae7b1d7 100644
--- a/recipes/libssh/libssh_0.2.bb
+++ b/recipes/libssh/libssh_0.2.bb
@@ -9,7 +9,7 @@ DEPENDS = "openssl"
 
 SRC_URI = "\
   http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz \
-  file://libssh_libdir_fix.patch;patch=1 \
+  file://libssh_libdir_fix.patch \
 "
 inherit autotools
 
diff --git a/recipes/libstroke/libstroke_0.5.1.bb b/recipes/libstroke/libstroke_0.5.1.bb
index 82514330d1..d4256f53d6 100644
--- a/recipes/libstroke/libstroke_0.5.1.bb
+++ b/recipes/libstroke/libstroke_0.5.1.bb
@@ -6,12 +6,12 @@ PRIORITY = "optional"
 DEPENDS = "virtual/libx11"
 
 SRC_URI = "http://www.etla.net/libstroke/${P}.tar.gz \
-	file://configure.in.patch;patch=1 \
-	file://libstroke-Makefile.am.patch;patch=1 \
-	file://tests-Makefile.am.patch;patch=1 \
+	file://configure.in.patch \
+	file://libstroke-Makefile.am.patch \
+	file://tests-Makefile.am.patch \
 	"
-#	file://Makefile.am.patch;patch=1 \
-#	file://libgstroke-Makefile.am.patch;patch=1 \
+#	file://Makefile.am.patch \
+#	file://libgstroke-Makefile.am.patch \
 
 inherit autotools pkgconfig
 
diff --git a/recipes/libsynthesis/libsynthesis_git.bb b/recipes/libsynthesis/libsynthesis_git.bb
index 6cd80e74aa..a72219c364 100644
--- a/recipes/libsynthesis/libsynthesis_git.bb
+++ b/recipes/libsynthesis/libsynthesis_git.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "Synthesis SyncML Engine"
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
 LICENSE = "LGPLv2.1"
 SRCREV = "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
-PV = "0.0+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+git${SRCREV}"
 PR = "r1"
 
 DEPENDS = "libpcre"
diff --git a/recipes/libtheora/libtheora_1.0.bb b/recipes/libtheora/libtheora_1.0.bb
index 8a88df3e89..33722916c7 100644
--- a/recipes/libtheora/libtheora_1.0.bb
+++ b/recipes/libtheora/libtheora_1.0.bb
@@ -2,7 +2,7 @@ require libtheora.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://libtheora-1.0-no-docs.patch;patch=1"
+SRC_URI += "file://libtheora-1.0-no-docs.patch"
 
 
 SRC_URI[md5sum] = "c963937053f45a7878954bed37ceb182"
diff --git a/recipes/libtheora/libtheora_1.1.1.bb b/recipes/libtheora/libtheora_1.1.1.bb
index 8c199eb5b5..07e621b878 100644
--- a/recipes/libtheora/libtheora_1.1.1.bb
+++ b/recipes/libtheora/libtheora_1.1.1.bb
@@ -2,7 +2,7 @@ require libtheora.inc
 
 PR = "${INC_PR}.0"
  
-SRC_URI += "file://no-docs.patch;patch=1"
+SRC_URI += "file://no-docs.patch"
 
 
 SRC_URI[md5sum] = "292ab65cedd5021d6b7ddd117e07cd8e"
diff --git a/recipes/libtiff/tiff_3.7.2.bb b/recipes/libtiff/tiff_3.7.2.bb
index 5b7bdb7586..9887df24c8 100644
--- a/recipes/libtiff/tiff_3.7.2.bb
+++ b/recipes/libtiff/tiff_3.7.2.bb
@@ -5,7 +5,7 @@ DEPENDS = "zlib jpeg lzo"
 PR = "r4"
 
 SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz \
-	  file://configure.patch;patch=1"
+	  file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/libtiff/tiff_3.9.2.bb b/recipes/libtiff/tiff_3.9.2.bb
index 63e268b0c9..a7240f9cda 100644
--- a/recipes/libtiff/tiff_3.9.2.bb
+++ b/recipes/libtiff/tiff_3.9.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.remotesensing.org/libtiff/"
 DEPENDS = "zlib jpeg lzo"
 PV = "3.9.2+4.0.0beta5"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta5.tar.gz;name=tiff400beta5targz"
 SRC_URI[tiff400beta5targz.md5sum] = "a0a83604e38a299fae9f0b1a39c04870"
@@ -14,6 +14,8 @@ S = "${WORKDIR}/tiff-4.0.0beta5"
 
 inherit autotools
 
+EXTRA_OECONF = "--without-x"
+
 # requires a too recent, non-default autoconf
 do_configure() {
 	gnu-configize
diff --git a/recipes/libtool/libtool-cross_1.5.10.bb b/recipes/libtool/libtool-cross_1.5.10.bb
index 537cf6b122..78ebc45c75 100644
--- a/recipes/libtool/libtool-cross_1.5.10.bb
+++ b/recipes/libtool/libtool-cross_1.5.10.bb
@@ -2,14 +2,14 @@ require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
 PACKAGES = ""
-SRC_URI_append = " file://rpath-control.patch;patch=1 \
-                   file://libdir-la.patch;patch=1 \
-                   file://libdir-la2.patch;patch=1 \
-                   file://prefix.patch;patch=1 \
-                   file://tag.patch;patch=1 \
-                   file://install-path-check.patch;patch=1 \
-		   file://nmedit_fix.patch;patch=1 \
-		   file://nousrlib.patch;patch=1"
+SRC_URI_append = " file://rpath-control.patch \
+                   file://libdir-la.patch \
+                   file://libdir-la2.patch \
+                   file://prefix.patch \
+                   file://tag.patch \
+                   file://install-path-check.patch \
+		   file://nmedit_fix.patch \
+		   file://nousrlib.patch"
 
 S = "${WORKDIR}/libtool-${PV}"
 
diff --git a/recipes/libtool/libtool-cross_1.5.22.bb b/recipes/libtool/libtool-cross_1.5.22.bb
index 383261217c..03d664a088 100644
--- a/recipes/libtool/libtool-cross_1.5.22.bb
+++ b/recipes/libtool/libtool-cross_1.5.22.bb
@@ -4,12 +4,12 @@ require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
 PACKAGES = ""
-SRC_URI_append = " file://libdir-la.patch;patch=1 \
-                   file://prefix.patch;patch=1 \
-                   file://tag.patch;patch=1 \
-                   file://tag1.patch;patch=1 \
-#                   file://rpath.patch;patch=1 \
-                   file://install-path-check.patch;patch=1"
+SRC_URI_append = " file://libdir-la.patch \
+                   file://prefix.patch \
+                   file://tag.patch \
+                   file://tag1.patch \
+#                   file://rpath.patch \
+                   file://install-path-check.patch"
 S = "${WORKDIR}/libtool-${PV}"
 
 prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
diff --git a/recipes/libtool/libtool-cross_1.5.24.bb b/recipes/libtool/libtool-cross_1.5.24.bb
index b5c41cf9cd..c8f53ca282 100644
--- a/recipes/libtool/libtool-cross_1.5.24.bb
+++ b/recipes/libtool/libtool-cross_1.5.24.bb
@@ -2,11 +2,11 @@ require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
 PACKAGES = ""
-SRC_URI_append = " file://libdir-la.patch;patch=1 \
-                   file://prefix.patch;patch=1 \
-                   file://tag.patch;patch=1 \
-                   file://tag1.patch;patch=1 \
-                   file://install-path-check.patch;patch=1"
+SRC_URI_append = " file://libdir-la.patch \
+                   file://prefix.patch \
+                   file://tag.patch \
+                   file://tag1.patch \
+                   file://install-path-check.patch"
 S = "${WORKDIR}/libtool-${PV}"
 
 prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
diff --git a/recipes/libtool/libtool-cross_2.2.4.bb b/recipes/libtool/libtool-cross_2.2.4.bb
index 8aeae9a36c..6e6caf958d 100644
--- a/recipes/libtool/libtool-cross_2.2.4.bb
+++ b/recipes/libtool/libtool-cross_2.2.4.bb
@@ -2,15 +2,15 @@ require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 
 SRC_URI += "\
-  file://cross_compile.patch;patch=1 \
-  file://prefix.patch;patch=1 \
+  file://cross_compile.patch \
+  file://prefix.patch \
 "
 
 DEPENDS += "libtool-native"
 
 DOLT_PATCH = ""
-DOLT_PATCH_arm = " file://add_dolt.patch;patch=1"
-DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
+DOLT_PATCH_arm = " file://add_dolt.patch"
+DOLT_PATCH_i586 = " file://add_dolt.patch"
 
 #SRC_URI_append_linux = "${DOLT_PATCH}"
 #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
diff --git a/recipes/libtool/libtool-cross_2.2.6a.bb b/recipes/libtool/libtool-cross_2.2.6a.bb
index d3ea34a341..0303cbb349 100644
--- a/recipes/libtool/libtool-cross_2.2.6a.bb
+++ b/recipes/libtool/libtool-cross_2.2.6a.bb
@@ -2,15 +2,15 @@ require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 
 SRC_URI += "\
-  file://cross_compile.patch;patch=1 \
-  file://prefix.patch;patch=1 \
+  file://cross_compile.patch \
+  file://prefix.patch \
 "
 
 DEPENDS += "libtool-native"
 
 DOLT_PATCH = ""
-DOLT_PATCH_arm = " file://add_dolt.patch;patch=1"
-DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
+DOLT_PATCH_arm = " file://add_dolt.patch"
+DOLT_PATCH_i586 = " file://add_dolt.patch"
 
 #SRC_URI_append_linux = "${DOLT_PATCH}"
 #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
diff --git a/recipes/libtool/libtool-cross_2.2.6b.bb b/recipes/libtool/libtool-cross_2.2.6b.bb
index d3ea34a341..0303cbb349 100644
--- a/recipes/libtool/libtool-cross_2.2.6b.bb
+++ b/recipes/libtool/libtool-cross_2.2.6b.bb
@@ -2,15 +2,15 @@ require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 
 SRC_URI += "\
-  file://cross_compile.patch;patch=1 \
-  file://prefix.patch;patch=1 \
+  file://cross_compile.patch \
+  file://prefix.patch \
 "
 
 DEPENDS += "libtool-native"
 
 DOLT_PATCH = ""
-DOLT_PATCH_arm = " file://add_dolt.patch;patch=1"
-DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
+DOLT_PATCH_arm = " file://add_dolt.patch"
+DOLT_PATCH_i586 = " file://add_dolt.patch"
 
 #SRC_URI_append_linux = "${DOLT_PATCH}"
 #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
diff --git a/recipes/libtool/libtool-native_1.5.10.bb b/recipes/libtool/libtool-native_1.5.10.bb
index bbad8c70db..304189c3fc 100644
--- a/recipes/libtool/libtool-native_1.5.10.bb
+++ b/recipes/libtool/libtool-native_1.5.10.bb
@@ -1,12 +1,12 @@
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
-SRC_URI_append = " file://libdir-la.patch;patch=1 \
-                   file://libdir-la2.patch;patch=1 \
-                   file://prefix.patch;patch=1 \
-                   file://tag.patch;patch=1 \
-                   file://install-path-check.patch;patch=1 \
-		   file://nousrlib.patch;patch=1"
+SRC_URI_append = " file://libdir-la.patch \
+                   file://libdir-la2.patch \
+                   file://prefix.patch \
+                   file://tag.patch \
+                   file://install-path-check.patch \
+		   file://nousrlib.patch"
 
 S = "${WORKDIR}/libtool-${PV}"
 
diff --git a/recipes/libtool/libtool-native_1.5.22.bb b/recipes/libtool/libtool-native_1.5.22.bb
index 0593c2e0b6..dad2dc2a4d 100644
--- a/recipes/libtool/libtool-native_1.5.22.bb
+++ b/recipes/libtool/libtool-native_1.5.22.bb
@@ -3,11 +3,11 @@ DEFAULT_PREFERENCE = "-1"
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
-SRC_URI_append = " file://libdir-la.patch;patch=1 \
-                   file://prefix.patch;patch=1 \
-                   file://tag.patch;patch=1 \
-                   file://tag1.patch;patch=1 \
-                   file://install-path-check.patch;patch=1"
+SRC_URI_append = " file://libdir-la.patch \
+                   file://prefix.patch \
+                   file://tag.patch \
+                   file://tag1.patch \
+                   file://install-path-check.patch"
 S = "${WORKDIR}/libtool-${PV}"
 
 inherit native
diff --git a/recipes/libtool/libtool-native_1.5.24.bb b/recipes/libtool/libtool-native_1.5.24.bb
index b73d65ed7c..0e315e8b2b 100644
--- a/recipes/libtool/libtool-native_1.5.24.bb
+++ b/recipes/libtool/libtool-native_1.5.24.bb
@@ -3,11 +3,11 @@ SECTION = "devel"
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
-SRC_URI_append = " file://libdir-la.patch;patch=1 \
-                   file://prefix.patch;patch=1 \
-                   file://tag.patch;patch=1 \
-                   file://tag1.patch;patch=1 \
-                   file://install-path-check.patch;patch=1"
+SRC_URI_append = " file://libdir-la.patch \
+                   file://prefix.patch \
+                   file://tag.patch \
+                   file://tag1.patch \
+                   file://install-path-check.patch"
 S = "${WORKDIR}/libtool-${PV}"
 
 inherit native
diff --git a/recipes/libtool/libtool-native_2.2.4.bb b/recipes/libtool/libtool-native_2.2.4.bb
index 8abc31c34f..b241d0c8f6 100644
--- a/recipes/libtool/libtool-native_2.2.4.bb
+++ b/recipes/libtool/libtool-native_2.2.4.bb
@@ -2,8 +2,8 @@ require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 
 SRC_URI += "\
-  file://cross_compile.patch;patch=1 \
-  file://prefix.patch;patch=1 \
+  file://cross_compile.patch \
+  file://prefix.patch \
 "
 S = "${WORKDIR}/libtool-${PV}"
 
diff --git a/recipes/libtool/libtool-native_2.2.6a.bb b/recipes/libtool/libtool-native_2.2.6a.bb
index 082663a280..fb83cf2258 100644
--- a/recipes/libtool/libtool-native_2.2.6a.bb
+++ b/recipes/libtool/libtool-native_2.2.6a.bb
@@ -2,8 +2,8 @@ require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 
 SRC_URI += "\
-  file://cross_compile.patch;patch=1 \
-  file://prefix.patch;patch=1 \
+  file://cross_compile.patch \
+  file://prefix.patch \
 "
 
 inherit native
diff --git a/recipes/libtool/libtool-native_2.2.6b.bb b/recipes/libtool/libtool-native_2.2.6b.bb
index 082663a280..d5c7139d21 100644
--- a/recipes/libtool/libtool-native_2.2.6b.bb
+++ b/recipes/libtool/libtool-native_2.2.6b.bb
@@ -1,9 +1,9 @@
 require libtool_${PV}.bb
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += "\
-  file://cross_compile.patch;patch=1 \
-  file://prefix.patch;patch=1 \
+  file://cross_compile.patch \
+  file://prefix.patch \
 "
 
 inherit native
@@ -11,35 +11,34 @@ inherit native
 do_configure_prepend () {
 	# Remove any existing libtool m4 since old stale versions would break
 	# any upgrade
-	rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
-	rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
+	rm -f ${D}${datadir}/aclocal/libtool.m4
+	rm -f ${D}${datadir}/aclocal/lt*.m4
 }
 
-do_stage () {
-	install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
-	install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
-	oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
-	install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
-	install -d ${STAGING_INCDIR}/libltdl/
-	install -m 0644 libltdl/libltdl/*.h ${STAGING_INCDIR}/libltdl/
-	install -d ${STAGING_DATADIR}/libtool/config/ ${STAGING_DATADIR}/aclocal/
-	install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/
-	install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/
+do_install () {
+	install -d ${D}${bindir}/
+	install -d ${D}${includedir}/
+	install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool
+	install -m 0755 libtoolize ${D}${bindir}/libtoolize
+	oe_libinstall -a -so -C libltdl libltdl ${D}${libdir}
+	install -m 0644 libltdl/ltdl.h ${D}${includedir}/
+	install -d ${D}${includedir}/libltdl/
+	install -m 0644 libltdl/libltdl/*.h ${D}${includedir}/libltdl/
+	install -d ${D}${datadir}/libtool/config/ ${D}${datadir}/aclocal/
+	install -c ${S}/libltdl/config/config.guess ${D}${datadir}/libtool/
+	install -c ${S}/libltdl/config/config.sub ${D}${datadir}/libtool/
 	for i in config.guess config.sub compile depcomp general.m4sh getopt.m4sh install-sh ltmain.m4sh ltmain.sh mdate-sh missing mkstamp ; do \
-		install -c -m 0644 ${S}/libltdl/config/$i ${STAGING_DATADIR}/libtool/config/
+		install -c -m 0644 ${S}/libltdl/config/$i ${D}${datadir}/libtool/config/
 	done
-	install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/
-	install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/
-	install -c -m 0644 ${S}/libltdl/m4/ltoptions.m4 ${STAGING_DATADIR}/aclocal/
-	install -c -m 0644 ${S}/libltdl/m4/ltversion.m4 ${STAGING_DATADIR}/aclocal/
-	install -c -m 0644 ${S}/libltdl/m4/ltsugar.m4 ${STAGING_DATADIR}/aclocal/
-	install -c -m 0644 ${S}/libltdl/m4/lt~obsolete.m4 ${STAGING_DATADIR}/aclocal/
-	install -c -m 0644 ${S}/libltdl/m4/argz.m4 ${STAGING_DATADIR}/aclocal/
+	install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${D}${datadir}/aclocal/
+	install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${D}${datadir}/aclocal/
+	install -c -m 0644 ${S}/libltdl/m4/ltoptions.m4 ${D}${datadir}/aclocal/
+	install -c -m 0644 ${S}/libltdl/m4/ltversion.m4 ${D}${datadir}/aclocal/
+	install -c -m 0644 ${S}/libltdl/m4/ltsugar.m4 ${D}${datadir}/aclocal/
+	install -c -m 0644 ${S}/libltdl/m4/lt~obsolete.m4 ${D}${datadir}/aclocal/
+	install -c -m 0644 ${S}/libltdl/m4/argz.m4 ${D}${datadir}/aclocal/
 
-	install -d ${STAGING_DATADIR}/libtool/libltdl
-	cp -pfPr  ${S}/libltdl/* ${STAGING_DATADIR}/libtool/libltdl/
+	install -d ${D}${datadir}/libtool/libltdl
+	cp -pfPr  ${S}/libltdl/* ${D}${datadir}/libtool/libltdl/
 }
 
-do_install () {
-	:
-}
diff --git a/recipes/libtool/libtool-sdk_1.5.10.bb b/recipes/libtool/libtool-sdk_1.5.10.bb
index eb5039d5d0..10ed23dee6 100644
--- a/recipes/libtool/libtool-sdk_1.5.10.bb
+++ b/recipes/libtool/libtool-sdk_1.5.10.bb
@@ -1,14 +1,14 @@
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
-SRC_URI_append = " file://rpath-control.patch;patch=1 \
-                   file://libdir-la.patch;patch=1 \
-                   file://libdir-la2.patch;patch=1 \
-                   file://prefix.patch;patch=1 \
-                   file://tag.patch;patch=1 \
-                   file://install-path-check.patch;patch=1 \
-                   file://nousrlib.patch;patch=1 \
-                   file://add_sysroot_function.patch;patch=1 \
+SRC_URI_append = " file://rpath-control.patch \
+                   file://libdir-la.patch \
+                   file://libdir-la2.patch \
+                   file://prefix.patch \
+                   file://tag.patch \
+                   file://install-path-check.patch \
+                   file://nousrlib.patch \
+                   file://add_sysroot_function.patch \
                    "
 
 S = "${WORKDIR}/libtool-${PV}"
diff --git a/recipes/libtool/libtool-sdk_2.2.4.bb b/recipes/libtool/libtool-sdk_2.2.4.bb
index 95acc1d7e6..5191ce3c31 100644
--- a/recipes/libtool/libtool-sdk_2.2.4.bb
+++ b/recipes/libtool/libtool-sdk_2.2.4.bb
@@ -2,7 +2,7 @@ require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
 
-SRC_URI_append = " file://cross_compile.patch;patch=1"
+SRC_URI_append = " file://cross_compile.patch"
 
 S = "${WORKDIR}/libtool-${PV}"
 
diff --git a/recipes/libtool/libtool-sdk_2.2.6a.bb b/recipes/libtool/libtool-sdk_2.2.6a.bb
index 7e269ef381..f7d6cb58a6 100644
--- a/recipes/libtool/libtool-sdk_2.2.6a.bb
+++ b/recipes/libtool/libtool-sdk_2.2.6a.bb
@@ -1,7 +1,7 @@
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
-SRC_URI_append = " file://cross_compile.patch;patch=1"
+SRC_URI_append = " file://cross_compile.patch"
 
 inherit sdk
 
diff --git a/recipes/libtool/libtool-sdk_2.2.6b.bb b/recipes/libtool/libtool-sdk_2.2.6b.bb
index 7e269ef381..f7d6cb58a6 100644
--- a/recipes/libtool/libtool-sdk_2.2.6b.bb
+++ b/recipes/libtool/libtool-sdk_2.2.6b.bb
@@ -1,7 +1,7 @@
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
-SRC_URI_append = " file://cross_compile.patch;patch=1"
+SRC_URI_append = " file://cross_compile.patch"
 
 inherit sdk
 
diff --git a/recipes/libtool/libtool_1.5.10.bb b/recipes/libtool/libtool_1.5.10.bb
index 36cb6207a3..56475aefaa 100644
--- a/recipes/libtool/libtool_1.5.10.bb
+++ b/recipes/libtool/libtool_1.5.10.bb
@@ -2,9 +2,9 @@ require libtool.inc
 PR = "${INC_PR}.0"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
-           file://autotools.patch;patch=1 \
-	   file://uclibc.patch;patch=1 \
-	   file://3figures.patch;patch=1"
+           file://autotools.patch \
+	   file://uclibc.patch \
+	   file://3figures.patch"
 S = "${WORKDIR}/libtool-${PV}"
 
 PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
diff --git a/recipes/libtool/libtool_1.5.22.bb b/recipes/libtool/libtool_1.5.22.bb
index fc80dabd65..2278cecdd5 100644
--- a/recipes/libtool/libtool_1.5.22.bb
+++ b/recipes/libtool/libtool_1.5.22.bb
@@ -4,9 +4,9 @@ require libtool.inc
 PR = "${INC_PR}.0"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
-           file://autotools.patch;patch=1 \
-	   file://uclibc.patch;patch=1"
-#	   file://3figures.patch;patch=1"
+           file://autotools.patch \
+	   file://uclibc.patch"
+#	   file://3figures.patch"
 S = "${WORKDIR}/libtool-${PV}"
 
 PACKAGES = "${PN}-dbg libltdl libltdl-dev ${PN}"
diff --git a/recipes/libtool/libtool_1.5.24.bb b/recipes/libtool/libtool_1.5.24.bb
index 9fa8562870..6e3655a082 100644
--- a/recipes/libtool/libtool_1.5.24.bb
+++ b/recipes/libtool/libtool_1.5.24.bb
@@ -4,9 +4,9 @@ require libtool.inc
 PR = "${INC_PR}.0"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
-           file://autotools.patch;patch=1 \
-	   file://uclibc.patch;patch=1 \
-           file://never-ever-do-rpath.patch;patch=1" 
+           file://autotools.patch \
+	   file://uclibc.patch \
+           file://never-ever-do-rpath.patch" 
 
 S = "${WORKDIR}/libtool-${PV}"
 
diff --git a/recipes/libtool/libtool_1.5.6.bb b/recipes/libtool/libtool_1.5.6.bb
index f59ebca22d..3a97d9e28b 100644
--- a/recipes/libtool/libtool_1.5.6.bb
+++ b/recipes/libtool/libtool_1.5.6.bb
@@ -6,7 +6,7 @@ PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
-           file://autotools.patch;patch=1"
+           file://autotools.patch"
 S = "${WORKDIR}/libtool-${PV}"
 
 PACKAGES = "libltdl libltdl-dbg libltdl-dev ${PN} ${PN}-doc"
diff --git a/recipes/libtorrent/rtorrent_0.8.0.bb b/recipes/libtorrent/rtorrent_0.8.0.bb
index 96ddf35c5e..0f81bc31f3 100644
--- a/recipes/libtorrent/rtorrent_0.8.0.bb
+++ b/recipes/libtorrent/rtorrent_0.8.0.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "libtorrent curl ncurses gnutls libgpg-error"
 
 SRC_URI = "http://libtorrent.rakshasa.no/downloads/rtorrent-${PV}.tar.gz \
-           file://autoconf-cross-fix.patch;patch=1"
+           file://autoconf-cross-fix.patch"
 
 inherit autotools
 
diff --git a/recipes/libtorrent/rtorrent_0.8.3.bb b/recipes/libtorrent/rtorrent_0.8.3.bb
index ab1bfb3105..66d69afcf5 100644
--- a/recipes/libtorrent/rtorrent_0.8.3.bb
+++ b/recipes/libtorrent/rtorrent_0.8.3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "libtorrent curl ncurses gnutls libgpg-error"
 
 SRC_URI = "http://libtorrent.rakshasa.no/downloads/rtorrent-${PV}.tar.gz \
-           file://autoconf-cross-fix.patch;patch=1"
+           file://autoconf-cross-fix.patch"
 
 inherit autotools
 
diff --git a/recipes/libtorrent/rtorrent_0.8.4.bb b/recipes/libtorrent/rtorrent_0.8.4.bb
index 1a8a3b3477..8684b0ddc1 100644
--- a/recipes/libtorrent/rtorrent_0.8.4.bb
+++ b/recipes/libtorrent/rtorrent_0.8.4.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "libtorrent curl ncurses gnutls libgpg-error"
 
 SRC_URI = "http://libtorrent.rakshasa.no/downloads/rtorrent-${PV}.tar.gz \
-           file://autoconf-cross-fix.patch;patch=1"
+           file://autoconf-cross-fix.patch"
 
 PR = "r0"
 
diff --git a/recipes/liburiparser/liburiparser_0.5.1.bb b/recipes/liburiparser/liburiparser_0.5.1.bb
index 82bb0ebd5f..13311b4f4a 100644
--- a/recipes/liburiparser/liburiparser_0.5.1.bb
+++ b/recipes/liburiparser/liburiparser_0.5.1.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "BSD"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/uriparser/uriparser-${PV}.tar.bz2 \
-           file://autofoo.patch;patch=1"
+           file://autofoo.patch"
 S = "${WORKDIR}/uriparser-${PV}"
 
 inherit autotools pkgconfig
diff --git a/recipes/libusb/libusb-compat_0.1.2.bb b/recipes/libusb/libusb-compat_0.1.2.bb
index 9fa22bc17e..236af3c24e 100644
--- a/recipes/libusb/libusb-compat_0.1.2.bb
+++ b/recipes/libusb/libusb-compat_0.1.2.bb
@@ -9,7 +9,7 @@ PR = "r0"
 DEPENDS = "libusb1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/${P}.tar.bz2"
-SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1"
+SRC_URI_append_nylon = " file://gcc-3-compatibility.patch"
 
 inherit autotools_stage binconfig lib_package
 
diff --git a/recipes/libusb/libusb-compat_0.1.3.bb b/recipes/libusb/libusb-compat_0.1.3.bb
index 85a5561685..25893c4a74 100644
--- a/recipes/libusb/libusb-compat_0.1.3.bb
+++ b/recipes/libusb/libusb-compat_0.1.3.bb
@@ -12,7 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/${P}.tar.bz2;name=libusbcompat013tarbz2"
 SRC_URI[libusbcompat013tarbz2.md5sum] = "570ac2ea085b80d1f74ddc7c6a93c0eb"
 SRC_URI[libusbcompat013tarbz2.sha256sum] = "a590a03b6188030ee1ca1a0af55685fcde005ca807b963970f839be776031d94"
 
-SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1"
+SRC_URI_append_nylon = " file://gcc-3-compatibility.patch"
 
 inherit autotools_stage binconfig lib_package
 
diff --git a/recipes/libusb/libusb1_1.0.4.bb b/recipes/libusb/libusb1_1.0.4.bb
index 8d0eaa0d7f..3ff0ed3cdb 100644
--- a/recipes/libusb/libusb1_1.0.4.bb
+++ b/recipes/libusb/libusb1_1.0.4.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 SRC_URI = " \
            ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
-           file://libusb-shortok.patch;patch=1 \
+           file://libusb-shortok.patch \
           "
 S = "${WORKDIR}/libusb-${PV}"
 
diff --git a/recipes/libusb/libusb_0.1.12.bb b/recipes/libusb/libusb_0.1.12.bb
index 9b02ba4e75..0f224a665b 100644
--- a/recipes/libusb/libusb_0.1.12.bb
+++ b/recipes/libusb/libusb_0.1.12.bb
@@ -6,7 +6,7 @@ PROVIDES = "virtual/libusb0"
 PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
-	   file://configure_fix.patch;patch=1"
+	   file://configure_fix.patch"
 
 S = "${WORKDIR}/libusb-${PV}"
 
diff --git a/recipes/libvorbis/libvorbis_1.0.1.bb b/recipes/libvorbis/libvorbis_1.0.1.bb
index 8be8899f58..2e8e18ac81 100644
--- a/recipes/libvorbis/libvorbis_1.0.1.bb
+++ b/recipes/libvorbis/libvorbis_1.0.1.bb
@@ -4,7 +4,7 @@ require libvorbis.inc
 PR = "${INC_PR}.1"
 
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libvorbis-${PV}.tar.gz \
-file://m4.patch;patch=1"
+file://m4.patch"
 
 
 SRC_URI[md5sum] = "4d6726fd02ce02f6e24824e594b0949a"
diff --git a/recipes/libvorbis/libvorbis_1.2.0.bb b/recipes/libvorbis/libvorbis_1.2.0.bb
index 67bf779989..069b83f01a 100644
--- a/recipes/libvorbis/libvorbis_1.2.0.bb
+++ b/recipes/libvorbis/libvorbis_1.2.0.bb
@@ -4,10 +4,10 @@ require libvorbis.inc
 PR = "${INC_PR}.1"
 
 SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz \
-	   file://configure_powerpc-no-fixed-cpu.patch;patch=1 \
-	   file://r14598-CVE-2008-1420.patch;patch=1 \
-	   file://r14602-CVE-2008-1419.patch;patch=1 \
-	   file://r14602-CVE-2008-1423.patch;patch=1 \
+	   file://configure_powerpc-no-fixed-cpu.patch \
+	   file://r14598-CVE-2008-1420.patch \
+	   file://r14602-CVE-2008-1419.patch \
+	   file://r14602-CVE-2008-1423.patch \
 	  "
 
 
diff --git a/recipes/libvorbis/libvorbis_1.2.3.bb b/recipes/libvorbis/libvorbis_1.2.3.bb
index 4d16d646de..04e6c91bcf 100644
--- a/recipes/libvorbis/libvorbis_1.2.3.bb
+++ b/recipes/libvorbis/libvorbis_1.2.3.bb
@@ -4,12 +4,12 @@ require libvorbis.inc
 PR = "${INC_PR}.1"
 
 SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz \
-	   file://configure_powerpc-no-fixed-cpu.patch;patch=1 \
-	   file://patch-lib_backends.h;patch=1;pnum=0 \
-	   file://patch-lib_codebook.c;patch=1;pnum=0 \
-	   file://patch-lib_modes_residue_44.h;patch=1;pnum=0 \
-	   file://patch-lib_modes_residue_44u.h;patch=1;pnum=0 \
-	   file://patch-lib_res0.c;patch=1;pnum=0 \
+	   file://configure_powerpc-no-fixed-cpu.patch \
+	   file://patch-lib_backends.h;apply=yes;striplevel=0 \
+	   file://patch-lib_codebook.c;apply=yes;striplevel=0 \
+	   file://patch-lib_modes_residue_44.h;apply=yes;striplevel=0 \
+	   file://patch-lib_modes_residue_44u.h;apply=yes;striplevel=0 \
+	   file://patch-lib_res0.c;apply=yes;striplevel=0 \
 	  "
 
 # override should be handeld by pkgconfig now
diff --git a/recipes/libwmf/libwmf-native_0.2.8.4.bb b/recipes/libwmf/libwmf-native_0.2.8.4.bb
index 4b7c2259b6..0910955b7d 100644
--- a/recipes/libwmf/libwmf-native_0.2.8.4.bb
+++ b/recipes/libwmf/libwmf-native_0.2.8.4.bb
@@ -2,5 +2,5 @@ require libwmf_0.2.8.4.bb
 inherit native
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${PN}/${PV}/libwmf-${PV}.tar.gz;name=tarball \
-           file://libwmf-0.2.8.4-intoverflow.patch;patch=1                   \
-           file://libwmf-0.2.8.4-useafterfree.patch;patch=1"
+           file://libwmf-0.2.8.4-intoverflow.patch                   \
+           file://libwmf-0.2.8.4-useafterfree.patch"
diff --git a/recipes/libwmf/libwmf_0.2.8.4.bb b/recipes/libwmf/libwmf_0.2.8.4.bb
index 37e69e3a2b..889fcd45ed 100644
--- a/recipes/libwmf/libwmf_0.2.8.4.bb
+++ b/recipes/libwmf/libwmf_0.2.8.4.bb
@@ -1,8 +1,8 @@
 inherit autotools_stage
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${PN}/${PV}/${P}.tar.gz;name=tarball \
-           file://libwmf-0.2.8.4-intoverflow.patch;patch=1                   \
-           file://libwmf-0.2.8.4-useafterfree.patch;patch=1"
+           file://libwmf-0.2.8.4-intoverflow.patch                   \
+           file://libwmf-0.2.8.4-useafterfree.patch"
 SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0"
 SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8"
 
diff --git a/recipes/libxcomp/libxcomp_3.2.0-7.bb b/recipes/libxcomp/libxcomp_3.2.0-7.bb
index f30794e040..5cee197427 100644
--- a/recipes/libxcomp/libxcomp_3.2.0-7.bb
+++ b/recipes/libxcomp/libxcomp_3.2.0-7.bb
@@ -7,7 +7,7 @@ PR = "r0"
 DEPENDS = "virtual/libx11 zlib jpeg libpng"
 
 SRC_URI = "http://64.34.161.181/download/3.2.0/sources/nxcomp-${PV}.tar.gz \
-	   file://sa_restorer.patch;patch=1 \
+	   file://sa_restorer.patch \
 	  "
 
           
diff --git a/recipes/libxine/libxine_1.1.16.3.bb b/recipes/libxine/libxine_1.1.16.3.bb
index 70d5e1980d..68209bd31e 100644
--- a/recipes/libxine/libxine_1.1.16.3.bb
+++ b/recipes/libxine/libxine_1.1.16.3.bb
@@ -6,9 +6,9 @@ PR = "r1"
 FILESPATHPKG .= ":libxine-1.1.16"
 
 SRC_URI += " \
-    	file://libxine-arm-configure.patch;patch=1 \
-	file://iconv.patch;patch=1 \
-	file://ffmpeg_headers.patch;patch=1 \
+    	file://libxine-arm-configure.patch \
+	file://iconv.patch \
+	file://ffmpeg_headers.patch \
         "
 
 python populate_packages_prepend () {
diff --git a/recipes/libxine/libxine_1.1.16.bb b/recipes/libxine/libxine_1.1.16.bb
index 09c3beb6d6..5fb221db96 100644
--- a/recipes/libxine/libxine_1.1.16.bb
+++ b/recipes/libxine/libxine_1.1.16.bb
@@ -5,10 +5,10 @@ PR = "r0"
 
 
 SRC_URI += " \
-    	file://libxine-arm-configure.patch;patch=1 \
-	file://iconv.patch;patch=1 \
-	file://libpostproc.patch;patch=1 \
-	file://libavcodec.patch;patch=1 \
+    	file://libxine-arm-configure.patch \
+	file://iconv.patch \
+	file://libpostproc.patch \
+	file://libavcodec.patch \
         "
 
 python populate_packages_prepend () {
diff --git a/recipes/libxosd/libxosd_svn.bb b/recipes/libxosd/libxosd_svn.bb
index b760e24817..02a4069a39 100644
--- a/recipes/libxosd/libxosd_svn.bb
+++ b/recipes/libxosd/libxosd_svn.bb
@@ -7,8 +7,8 @@ PV = "2.2.15+svnr${SRCPV}"
 PR = "r5"
 
 SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \
-           file://autofoo.patch;patch=1 \
-           file://use-sane-default-font.patch;patch=1"
+           file://autofoo.patch \
+           file://use-sane-default-font.patch"
 
 S = "${WORKDIR}/current"
 
diff --git a/recipes/libxsettings-client/libxsettings-client_0.12.bb b/recipes/libxsettings-client/libxsettings-client_0.12.bb
index 9694c4d628..deb8dd8911 100644
--- a/recipes/libxsettings-client/libxsettings-client_0.12.bb
+++ b/recipes/libxsettings-client/libxsettings-client_0.12.bb
@@ -5,7 +5,7 @@ DEPENDS = "libgpewidget libxsettings virtual/libx11"
 
 inherit pkgconfig gpe
 
-SRC_URI += "file://make_pkgconfig_x11.patch;patch=1"
+SRC_URI += "file://make_pkgconfig_x11.patch"
 
 S = "${WORKDIR}/libxsettings-client0-0.12"
 
diff --git a/recipes/libxsettings-client/libxsettings-client_0.13.bb b/recipes/libxsettings-client/libxsettings-client_0.13.bb
index 3d78ffe92c..344341ce17 100644
--- a/recipes/libxsettings-client/libxsettings-client_0.13.bb
+++ b/recipes/libxsettings-client/libxsettings-client_0.13.bb
@@ -5,7 +5,7 @@ DEPENDS = "libgpewidget libxsettings virtual/libx11"
 
 inherit pkgconfig gpe
 
-SRC_URI += "file://make_pkgconfig_x11.patch;patch=1"
+SRC_URI += "file://make_pkgconfig_x11.patch"
 
 headers = "xsettings-client.h"
 do_stage () {
diff --git a/recipes/libxsettings-client/libxsettings-client_0.16.bb b/recipes/libxsettings-client/libxsettings-client_0.16.bb
index 06be2f940c..f2c51f5c39 100644
--- a/recipes/libxsettings-client/libxsettings-client_0.16.bb
+++ b/recipes/libxsettings-client/libxsettings-client_0.16.bb
@@ -1,6 +1,6 @@
 require libxsettings-client.inc
 
-SRC_URI += "        file://Makefile-am.patch;patch=1"
+SRC_URI += "        file://Makefile-am.patch"
 
 
 PR ="r2"
diff --git a/recipes/libxsettings-client/libxsettings-client_0.17.bb b/recipes/libxsettings-client/libxsettings-client_0.17.bb
index fc40837454..68374b53c0 100644
--- a/recipes/libxsettings-client/libxsettings-client_0.17.bb
+++ b/recipes/libxsettings-client/libxsettings-client_0.17.bb
@@ -3,7 +3,7 @@ require libxsettings-client.inc
 DEPENDS += "gtk-doc"
 PR ="r2"
 
-SRC_URI += "file://no-host-includes.patch;patch=1 "
+SRC_URI += "file://no-host-includes.patch "
 
 SRC_URI[md5sum] = "2c052bbe613d2d83abad391824b217ad"
 SRC_URI[sha256sum] = "900e9b131bd357a3e6bcc5fe9a94d42018d9cf52e85d1c772a7e69a7f99ea9ab"
diff --git a/recipes/libxsettings/libxsettings_svn.bb b/recipes/libxsettings/libxsettings_svn.bb
index dd1e7fcadf..f5ce0c06d6 100644
--- a/recipes/libxsettings/libxsettings_svn.bb
+++ b/recipes/libxsettings/libxsettings_svn.bb
@@ -9,7 +9,7 @@ PR = "r0"
 inherit gpe
 
 SRC_URI = "${GPE_SVN} \
-           file://libxsettings-svn-makefile-fix.patch;patch=1 \
+           file://libxsettings-svn-makefile-fix.patch \
            file://Makefile.dpkg_ipkg \
            file://Makefile.translation"
 
diff --git a/recipes/libxslt/libxslt_1.1.17.bb b/recipes/libxslt/libxslt_1.1.17.bb
index d52791fa30..da37170079 100644
--- a/recipes/libxslt/libxslt_1.1.17.bb
+++ b/recipes/libxslt/libxslt_1.1.17.bb
@@ -2,7 +2,7 @@ require libxslt.inc
 DEPENDS = "libxml2"
 PR = "${INC_PR}.0"
 
-SRC_URI += " file://destdir.patch;patch=1"
+SRC_URI += " file://destdir.patch"
 
 EXTRA_OECONF += " --without-plugins"
 
diff --git a/recipes/libxslt/libxslt_1.1.22.bb b/recipes/libxslt/libxslt_1.1.22.bb
index a93da16fc0..e25dd06f22 100644
--- a/recipes/libxslt/libxslt_1.1.22.bb
+++ b/recipes/libxslt/libxslt_1.1.22.bb
@@ -1,6 +1,6 @@
 require libxslt.inc
 PR = "${INC_PR}.0"
 
-SRC_URI += " file://pkgconfig_fix.patch;patch=1"
+SRC_URI += " file://pkgconfig_fix.patch"
 SRC_URI[archive.md5sum] = "d6a9a020a76a3db17848d769d6c9c8a9"
 SRC_URI[archive.sha256sum] = "4e1f39ee16596fd2a83d28d6c3b065f742254f3336f93ce8ed1cae48ecbe49da"
diff --git a/recipes/libzip/libzip_0.9.bb b/recipes/libzip/libzip_0.9.bb
index d91cae14d1..34b463ecd2 100644
--- a/recipes/libzip/libzip_0.9.bb
+++ b/recipes/libzip/libzip_0.9.bb
@@ -3,14 +3,11 @@ SECTION = "libs"
 HOMEPAGE = "http://www.nih.at/libzip"
 LICENSE = "BSD"
 DEPENDS = "zlib"
+PR = "r1"
 
 SRC_URI = "http://www.nih.at/${PN}/${PN}-${PV}.tar.bz2"
 
 inherit autotools
 
-do_stage() {
-	autotools_stage_all
-}
-
 SRC_URI[md5sum] = "56b9f11c1eee5eed189a20183d7e06b0"
 SRC_URI[sha256sum] = "23a8c3624122a3777bb4ac3be4a867fd0bed7f3aacb8f1d0b68fc459cfb035fc"
diff --git a/recipes/libzrtpcpp/libzrtpcpp_1.4.6.bb b/recipes/libzrtpcpp/libzrtpcpp_1.4.6.bb
new file mode 100644
index 0000000000..2d3d8d8b2e
--- /dev/null
+++ b/recipes/libzrtpcpp/libzrtpcpp_1.4.6.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "GNU ZRTP C++"
+HOMEPAGE = "http://www.gnutelephony.org/index.php/GNU_ZRTP"
+LICENSE = "GPL"
+DEPENDS = "ccrtp"
+
+SRC_URI = "http://www.gnutelephony.org/dist/tarballs/libzrtpcpp-${PV}.tar.gz"
+SRC_URI[md5sum] = "83157d4eba394d27b06b7ec753fe31de"
+SRC_URI[sha256sum] = "1ea5ce5a283095a7bf2fe491a8a7571ef21b3dbe6cf815d3df76e6de1e811dba"
+
+inherit pkgconfig autotools_stage
diff --git a/recipes/lighttpd/lighttpd.inc b/recipes/lighttpd/lighttpd.inc
index f3084ab08b..9c0c7c3afa 100644
--- a/recipes/lighttpd/lighttpd.inc
+++ b/recipes/lighttpd/lighttpd.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Web server"
 SECTION = "net"
 LICENSE = "BSD"
-DEPENDS = "libpcre"
+DEPENDS = "zlib libpcre"
 RDEPENDS_${PN} += " \
                lighttpd-module-access \
                lighttpd-module-accesslog \
diff --git a/recipes/lighttpd/lighttpd_1.4.18.bb b/recipes/lighttpd/lighttpd_1.4.18.bb
index 48dce7bf61..c9aac02964 100644
--- a/recipes/lighttpd/lighttpd_1.4.18.bb
+++ b/recipes/lighttpd/lighttpd_1.4.18.bb
@@ -2,9 +2,9 @@ require lighttpd.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://configure.in.patch;patch=1 \
-	    file://mod_redirect.c.patch;patch=1 \
-	    file://src-server.c.patch;patch=1 \
+SRC_URI += "file://configure.in.patch \
+	    file://mod_redirect.c.patch \
+	    file://src-server.c.patch \
            "
 
 
diff --git a/recipes/lilo-sh/lilo-sh_21.bb b/recipes/lilo-sh/lilo-sh_21.bb
index 9303aef482..ab8bf7ad92 100644
--- a/recipes/lilo-sh/lilo-sh_21.bb
+++ b/recipes/lilo-sh/lilo-sh_21.bb
@@ -15,16 +15,16 @@ LICENSE = "MIT"
 PR = "r1"
 
 SRC_URI = "http://twibble.org/dist/sh4/src/lilosh/lilo-21.tar.gz \
-           file://lilo-0.21-include.patch;patch=1 \
-           file://lilo-0.21-1.1.patch;patch=1 \
-           file://lilo.patch;patch=1 \
-           file://lilo.raid1;patch=1 \
-           file://lilo-0.21-loopdev.patch;patch=1 \
-           file://lilo-0.21-second.patch;patch=1;pnum=0 \
-           file://lilo-sh-linux.patch;patch=1 \
-           file://lilo-linkgear.patch;patch=1 \
-           file://lilo-noconfig-h.patch;patch=1 \
-	   file://lilo-replace-PAGE_SIZE.patch;patch=1 \
+           file://lilo-0.21-include.patch \
+           file://lilo-0.21-1.1.patch \
+           file://lilo.patch \
+           file://lilo.raid1;apply=yes \
+           file://lilo-0.21-loopdev.patch \
+           file://lilo-0.21-second.patch;striplevel=0 \
+           file://lilo-sh-linux.patch \
+           file://lilo-linkgear.patch \
+           file://lilo-noconfig-h.patch \
+	   file://lilo-replace-PAGE_SIZE.patch \
 	"
 
 S = "${WORKDIR}/lilo"
diff --git a/recipes/lineak/lineak_0.8.3.bb b/recipes/lineak/lineak_0.8.3.bb
index 718cbd5bb4..61b2a3d38e 100644
--- a/recipes/lineak/lineak_0.8.3.bb
+++ b/recipes/lineak/lineak_0.8.3.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libx11 libxext"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lineak/lineakd-${PV}.tar.gz \
-           file://add-zaurus-remote-support.patch;patch=1"
+           file://add-zaurus-remote-support.patch"
 S = "${WORKDIR}/lineakd-${PV}"
 
 inherit autotools
diff --git a/recipes/linebreak/liblinebreak_0.9.6.bb b/recipes/linebreak/liblinebreak_0.9.6.bb
index 43c21e9d71..5fd698a70b 100644
--- a/recipes/linebreak/liblinebreak_0.9.6.bb
+++ b/recipes/linebreak/liblinebreak_0.9.6.bb
@@ -5,7 +5,7 @@ LICENSE = "Unicode"
 PR = "r0"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblinebreak/liblinebreak_${PV}.orig.tar.gz \
-	file://liblinebreak-build-fix.patch;patch=1"
+	file://liblinebreak-build-fix.patch"
 
 do_compile() {
 	oe_runmake release
diff --git a/recipes/linknx/linknx.inc b/recipes/linknx/linknx.inc
index 1feb2b7c05..029589acbc 100644
--- a/recipes/linknx/linknx.inc
+++ b/recipes/linknx/linknx.inc
@@ -9,7 +9,7 @@ DEPENDS = " pthsem lua5.1 curl libesmtp"
 DEPENDS_append_linux-uclibc = " argp-standalone"
 DEPENDS_append_linux-uclibceabi = " argp-standalone"
 
-SRC_URI += "file://configure-libcurl.patch;patch=1 \
+SRC_URI += "file://configure-libcurl.patch \
             file://linknx.start "
 
 inherit autotools update-rc.d
diff --git a/recipes/linknx/linknx_0.0.1.26.bb b/recipes/linknx/linknx_0.0.1.26.bb
index 5fe2ef5b93..a195d0cd97 100644
--- a/recipes/linknx/linknx_0.0.1.26.bb
+++ b/recipes/linknx/linknx_0.0.1.26.bb
@@ -1,7 +1,7 @@
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/linknx/linknx-${PV}.tar.gz \
-           file://logger-initialisations.patch;patch=1 \
+           file://logger-initialisations.patch \
            "
 
 require linknx.inc
diff --git a/recipes/links/links.inc b/recipes/links/links.inc
index 2d299d3b57..c024985f4f 100644
--- a/recipes/links/links.inc
+++ b/recipes/links/links.inc
@@ -8,9 +8,9 @@ DEPENDS = "jpeg libpng flex openssl zlib"
 LPV = "${@bb.data.getVar("PV",d,1).split("+")[1]}"
 
 SRC_URI = "http://links.twibright.com/download/links-${LPV}.tar.bz2 \
-           file://ac-prog-cxx.patch;patch=1 \
-           file://cookies-save-0.96.patch;patch=1 \
-           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
+           file://ac-prog-cxx.patch \
+           file://cookies-save-0.96.patch \
+           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch"
 
 inherit autotools
 
diff --git a/recipes/linphone/linphone-hh_0.12.2.hh1.bb b/recipes/linphone/linphone-hh_0.12.2.hh1.bb
index 34491dfa06..44472a97b9 100644
--- a/recipes/linphone/linphone-hh_0.12.2.hh1.bb
+++ b/recipes/linphone/linphone-hh_0.12.2.hh1.bb
@@ -5,11 +5,11 @@ PR = "r4"
 DESCRIPTION = "SIP-based IP phone (GPE edition)"
 DEPENDS = "libosip gtk+ libogg alsa-lib"
 SRC_URI = "http://handhelds.org/packages/linphone/linphone-${PV}.tar.gz \
-	file://osipua-ipv6-lossage.patch;patch=1 \
-	file://gpe-cross-lossage.patch;patch=1 \
-	file://disable-gtk-doc.patch;patch=1 \
-	file://dotdesktop.patch;patch=1 \
-	file://segfault.patch;patch=1"
+	file://osipua-ipv6-lossage.patch \
+	file://gpe-cross-lossage.patch \
+	file://disable-gtk-doc.patch \
+	file://dotdesktop.patch \
+	file://segfault.patch"
 
 S = "${WORKDIR}/linphone-${PV}"
 
diff --git a/recipes/linphone/linphone_0.12.2.bb b/recipes/linphone/linphone_0.12.2.bb
index 2a7f1e45e5..725819f567 100644
--- a/recipes/linphone/linphone_0.12.2.bb
+++ b/recipes/linphone/linphone_0.12.2.bb
@@ -5,8 +5,8 @@ PR = "r2"
 DESCRIPTION = "SIP-based IP phone (GPE edition)"
 DEPENDS = "libosip gtk+ libogg libgnomeui"
 SRC_URI = "http://simon.morlat.free.fr/download/0.12.2/source/linphone-${PV}.tar.gz \
-	file://osip-lossage.patch;patch=1 \
-	file://disable-gtk-doc.patch;patch=1"
+	file://osip-lossage.patch \
+	file://disable-gtk-doc.patch"
 
 FILES_${PN} += "${datadir}/linphonec"
 
diff --git a/recipes/linphone/linphone_1.3.99.8.bb b/recipes/linphone/linphone_1.3.99.8.bb
index fc177b5e72..735cfc7a52 100644
--- a/recipes/linphone/linphone_1.3.99.8.bb
+++ b/recipes/linphone/linphone_1.3.99.8.bb
@@ -5,7 +5,7 @@ DEPENDS = "libosip2 speex libogg alsa-lib readline"
 PR = "r0"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/unstable/source/linphone-${PV}.tar.gz \
-           file://conf.patch;patch=1"
+           file://conf.patch"
 
 S = "${WORKDIR}/linphone-${PV}"
 
diff --git a/recipes/linphone/linphone_1.6.0.bb b/recipes/linphone/linphone_1.6.0.bb
index 40be00fed3..335cd29d2b 100644
--- a/recipes/linphone/linphone_1.6.0.bb
+++ b/recipes/linphone/linphone_1.6.0.bb
@@ -21,8 +21,8 @@ PROVIDES += "linphone linphonec liblinphone"
 PR = "r3"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz;name=archive \
-           http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1;name=patch \
-           file://linphone-speex.diff;patch=1"
+           http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;name=patch \
+           file://linphone-speex.diff"
 
 S = "${WORKDIR}/linphone-${PV}"
 
diff --git a/recipes/linphone/linphone_3.1.0.bb b/recipes/linphone/linphone_3.1.0.bb
index 937fffdace..50df732fa5 100644
--- a/recipes/linphone/linphone_3.1.0.bb
+++ b/recipes/linphone/linphone_3.1.0.bb
@@ -21,8 +21,8 @@ RDEPENDS_libmediastreamer = "speex libogg libasound libortp"
 PROVIDES += "linphone linphonec liblinphone"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/3.1.x/sources/linphone-${PV}.tar.gz \
-	file://b64_assert.patch;patch=1 \
-	file://preferences-segv.patch;patch=1 \
+	file://b64_assert.patch \
+	file://preferences-segv.patch \
 	"
 
 S = "${WORKDIR}/linphone-${PV}"
diff --git a/recipes/linux-atm/linux-atm_2.4.1.bb b/recipes/linux-atm/linux-atm_2.4.1.bb
index c3ae320830..60a9a26613 100644
--- a/recipes/linux-atm/linux-atm_2.4.1.bb
+++ b/recipes/linux-atm/linux-atm_2.4.1.bb
@@ -7,8 +7,8 @@ PR = "r1"
 LICENSE = "GPL LGPL"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/linux-atm/linux-atm-${PV}.tar.gz \
-           file://gcc-3.4-fix;patch=1 \
-           file://qgen-cross;patch=1"
+           file://gcc-3.4-fix;apply=yes \
+           file://qgen-cross;apply=yes"
 S = "${WORKDIR}/linux-atm-${PV}"
 
 inherit autotools pkgconfig flow-lossage
diff --git a/recipes/linux-ha/cluster-glue/kill-stack-protector.patch b/recipes/linux-ha/cluster-glue/kill-stack-protector.patch
new file mode 100644
index 0000000000..25a21f4f17
--- /dev/null
+++ b/recipes/linux-ha/cluster-glue/kill-stack-protector.patch
@@ -0,0 +1,12 @@
+Index: Reusable-Cluster-Components-glue-1.0.3/configure.ac
+===================================================================
+--- Reusable-Cluster-Components-glue-1.0.3.orig/configure.ac	2010-04-23 12:35:52.000000000 +0400
++++ Reusable-Cluster-Components-glue-1.0.3/configure.ac	2010-04-23 12:36:00.000000000 +0400
+@@ -1135,7 +1135,6 @@
+ 
+ 	# We had to eliminate -Wnested-externs because of libtool changes
+         EXTRA_FLAGS="-fgnu89-inline
+-		-fstack-protector-all
+ 		-Wall
+ 		-Waggregate-return
+ 		-Wbad-function-cast 
diff --git a/recipes/linux-ha/cluster-glue_1.0.3.bb b/recipes/linux-ha/cluster-glue_1.0.5.bb
index 774b83c09e..23fb5bb5f6 100644
--- a/recipes/linux-ha/cluster-glue_1.0.3.bb
+++ b/recipes/linux-ha/cluster-glue_1.0.5.bb
@@ -6,13 +6,16 @@ is not the cluster messaging layer (Heartbeat), nor the cluster resource manager
 LICENSE = "GPL"
 DEPENDS = "libxml2 libtool glib-2.0 bzip2 util-linux-ng"
 
+PR = "r0"
+
 SRC_URI = " \
 	http://hg.linux-ha.org/glue/archive/glue-${PV}.tar.bz2;name=tar \
-	file://glue-remove-getpid-check.patch;patch=1 \
+	file://glue-remove-getpid-check.patch \
 	file://volatiles \
 	"
-SRC_URI[tar.md5sum] = "f13746a8f3e8db1fa9c682d9db892573"
-SRC_URI[tar.sha256sum] = "fb1e4b75779849daf0f2c2c93668dd2a33d304307554f3d617b07f1957c61c9f"
+SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch"
+SRC_URI[tar.md5sum] = "09721e2d2ab3c3fa6696b4347e31721a"
+SRC_URI[tar.sha256sum] = "c437a04494850b79c094f7e84d396e917ec09d9a2fdfb7c11f3b420741ea91a2"
 
 inherit autotools_stage
 
diff --git a/recipes/linux-ha/cluster-resource-agents/disable-doc-build.patch b/recipes/linux-ha/cluster-resource-agents/disable-doc-build.patch
new file mode 100644
index 0000000000..bf02d975f6
--- /dev/null
+++ b/recipes/linux-ha/cluster-resource-agents/disable-doc-build.patch
@@ -0,0 +1,13 @@
+Index: Cluster-Resource-Agents-agents-1.0.2/Makefile.am
+===================================================================
+--- Cluster-Resource-Agents-agents-1.0.2.orig/Makefile.am	2010-04-23 13:10:00.000000000 +0400
++++ Cluster-Resource-Agents-agents-1.0.2/Makefile.am	2010-04-23 13:10:05.000000000 +0400
+@@ -19,7 +19,7 @@
+ MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure DRF/config-h.in \
+                         DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
+ 
+-SUBDIRS	= heartbeat tools ldirectord doc
++SUBDIRS	= heartbeat tools ldirectord
+ 
+ dist-clean-local:
+ 	rm -f autoconf automake autoheader $(TARFILE)
diff --git a/recipes/linux-ha/cluster-resource-agents/kill-stack-protector.patch b/recipes/linux-ha/cluster-resource-agents/kill-stack-protector.patch
new file mode 100644
index 0000000000..d6b02535a5
--- /dev/null
+++ b/recipes/linux-ha/cluster-resource-agents/kill-stack-protector.patch
@@ -0,0 +1,12 @@
+Index: Cluster-Resource-Agents-agents-1.0.2/configure.in
+===================================================================
+--- Cluster-Resource-Agents-agents-1.0.2.orig/configure.in	2010-04-23 12:38:41.000000000 +0400
++++ Cluster-Resource-Agents-agents-1.0.2/configure.in	2010-04-23 12:38:49.000000000 +0400
+@@ -642,7 +642,6 @@
+ 	# Also remove -Waggregate-return because we use one libnet
+ 	# call which returns a struct
+         EXTRA_FLAGS="-fgnu89-inline
+-		-fstack-protector-all
+ 		-Wall
+ 		-Wbad-function-cast 
+ 		-Wcast-qual 
diff --git a/recipes/linux-ha/cluster-resource-agents_1.0.2.bb b/recipes/linux-ha/cluster-resource-agents_1.0.3.bb
index 326f39c5d1..d1736ff2fa 100644
--- a/recipes/linux-ha/cluster-resource-agents_1.0.2.bb
+++ b/recipes/linux-ha/cluster-resource-agents_1.0.3.bb
@@ -2,14 +2,16 @@ DESCRIPTION = "OCF resource agents for use by compatible cluster managers"
 LICENSE = "GPL"
 DEPENDS = "cluster-glue"
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = " \
 	http://hg.linux-ha.org/agents/archive/agents-${PV}.tar.bz2;name=tar \
-	file://fix-header-defs-lookup.patch;patch=1 \
+	file://fix-header-defs-lookup.patch \
+	file://disable-doc-build.patch \
 	"
-SRC_URI[tar.md5sum] = "b536dea1b1f642bdc3607cb85ea0b89d"
-SRC_URI[tar.sha256sum] = "c5a1ea9a83c578672cd475ab4af5c2e40736669bae0eb70bb9bb6124074e5e5e"
+SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch"
+SRC_URI[tar.md5sum] = "fcaa2cfd83a28d1965200e11db2ddd41"
+SRC_URI[tar.sha256sum] = "09b58332e34cf128c8d53d5bb4b3f61e402c2e0c0c809f5abae53ca144ad101e"
 
 inherit autotools_stage
 
@@ -26,7 +28,7 @@ S = "${WORKDIR}/Cluster-Resource-Agents-agents-${PV}"
 # The code itself doesn't look that bad, so just disable -Werror
 EXTRA_OECONF_arm += "--disable-fatal-warnings"
 
-PACKAGES =+ "ldirectord ldirectord-doc"
+PACKAGES =+ "ldirectord ldirectord-doc ocft"
 
 FILES_ldirectord = " \
 	${sbindir}/ldirectord \
@@ -62,14 +64,19 @@ RDEPENDS_ldirectord += " \
 	"
 
 FILES_${PN} += " \
-	/usr/lib/heartbeat/findif \
-	/usr/lib/heartbeat/ocf-returncodes \
-	/usr/lib/heartbeat/ocf-shellfuncs \
-	/usr/lib/heartbeat/send_arp \
-	/usr/lib/heartbeat/sfex_daemon \
-	/usr/lib/heartbeat/tickle_tcp \
-	/usr/lib/ocf/resource.d/heartbeat/ \
-	/usr/share/resource-agents/ra-api-1.dtd \
+	${libdir}/heartbeat/findif \
+	${libdir}/heartbeat/ocf-returncodes \
+	${libdir}/heartbeat/ocf-shellfuncs \
+	${libdir}/heartbeat/send_arp \
+	${libdir}/heartbeat/sfex_daemon \
+	${libdir}/heartbeat/tickle_tcp \
+	${libdir}/ocf/resource.d/heartbeat/ \
+	${datadir}/resource-agents/ra-api-1.dtd \
+	"
+
+FILES_ocft += " \
+	${datadir}/resource-agents/ocft \
+	${sbindir}/ocft \
 	"
 
 FILES_${PN}-dbg += "/usr/lib/heartbeat/.debug/"
diff --git a/recipes/linux-hotplug/linux-hotplug_20040329.bb b/recipes/linux-hotplug/linux-hotplug_20040329.bb
index b7c9261e65..c857a54604 100644
--- a/recipes/linux-hotplug/linux-hotplug_20040329.bb
+++ b/recipes/linux-hotplug/linux-hotplug_20040329.bb
@@ -9,7 +9,7 @@ RREPLACES_${PN} = "hotplug"
 PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz \
-	   file://busybox.patch;patch=1 \
+	   file://busybox.patch \
            file://fix-net.agent \
            file://update-usb.usermap \
            file://logcheck-ignore \
diff --git a/recipes/linux-hotplug/linux-hotplug_20040920.bb b/recipes/linux-hotplug/linux-hotplug_20040920.bb
index 854d557cca..15338e6fa8 100644
--- a/recipes/linux-hotplug/linux-hotplug_20040920.bb
+++ b/recipes/linux-hotplug/linux-hotplug_20040920.bb
@@ -11,10 +11,10 @@ RSUGGESTS = "pciutils usbutils"
 PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
-	file://dash.patch;patch=1 \
-	file://userspecified_hcd.patch;patch=1 \
-	file://hotplug-net-agent-usb.patch;patch=1 \
-	file://usbrc-busybox.patch;patch=1 \
+	file://dash.patch \
+	file://userspecified_hcd.patch \
+	file://hotplug-net-agent-usb.patch \
+	file://usbrc-busybox.patch \
 	file://fix-net.agent \
 	file://update-usb.usermap \
 	file://logcheck-ignore \
@@ -25,12 +25,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20
 	file://usbd \
 	file://sysconfig-hotplug \
 	file://sysconfig-usb \
-	file://isapnp-exit.diff;patch=1 \
+	file://isapnp-exit.diff \
 	file://usb-storage \
 	file://soc.agent \
-	file://hotplug-binary-path.patch;patch=1"
+	file://hotplug-binary-path.patch"
 
-SRC_URI_append_openzaurus = " file://quiet-pci.patch;patch=1"
+SRC_URI_append_openzaurus = " file://quiet-pci.patch"
 
 S = "${WORKDIR}/hotplug-2004_09_20"
 
diff --git a/recipes/linux-input/linux-input_cvs.bb b/recipes/linux-input/linux-input_cvs.bb
index 0380099933..627ab1c526 100644
--- a/recipes/linux-input/linux-input_cvs.bb
+++ b/recipes/linux-input/linux-input_cvs.bb
@@ -4,8 +4,8 @@ PV = "0.0+cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@linuxconsole.cvs.sourceforge.net/cvsroot/linuxconsole;module=ruby \
 	file://serio.h \
-	file://makefile.patch;patch=1;pnum=0 \
-	file://snes232.patch;patch=1;pnum=0"
+	file://makefile.patch;striplevel=0 \
+	file://snes232.patch;striplevel=0"
 LICENSE = "GPL"
 
 S = "${WORKDIR}/ruby/utils"
diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.24/procinfo.h b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/procinfo.h
new file mode 100644
index 0000000000..8cdf828af8
--- /dev/null
+++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/procinfo.h
@@ -0,0 +1,24 @@
+/*
+ *  linux/include/asm-arm/procinfo.h
+ *
+ *  Copyright (C) 1996-1999 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __ASM_PROCINFO_H
+#define __ASM_PROCINFO_H
+
+#define HWCAP_SWP	1
+#define HWCAP_HALF	2
+#define HWCAP_THUMB	4
+#define HWCAP_26BIT	8	/* Play it safe */
+#define HWCAP_FAST_MULT	16
+#define HWCAP_FPA	32
+#define HWCAP_VFP	64
+#define HWCAP_EDSP	128
+#define HWCAP_JAVA	256
+#define HWCAP_IWMMXT	512
+#define HWCAP_CRUNCH	1024
+#endif
diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch
deleted file mode 100644
index b75487965a..0000000000
--- a/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is from 
-http://patchwork.kernel.org/patch/38102/
-It seems its still under discussion and it will involve glibc to get it fixed correctly.
-for now OE uses scsi headers from kernel and not from glibc.
-
--Khem
-
-Index: linux-2.6.31/include/scsi/scsi.h
-===================================================================
---- linux-2.6.31.orig/include/scsi/scsi.h	2010-03-11 19:44:49.134590561 -0800
-+++ linux-2.6.31/include/scsi/scsi.h	2010-03-11 19:45:12.744466326 -0800
-@@ -142,10 +142,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch
deleted file mode 100644
index b75487965a..0000000000
--- a/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is from 
-http://patchwork.kernel.org/patch/38102/
-It seems its still under discussion and it will involve glibc to get it fixed correctly.
-for now OE uses scsi headers from kernel and not from glibc.
-
--Khem
-
-Index: linux-2.6.31/include/scsi/scsi.h
-===================================================================
---- linux-2.6.31.orig/include/scsi/scsi.h	2010-03-11 19:44:49.134590561 -0800
-+++ linux-2.6.31/include/scsi/scsi.h	2010-03-11 19:45:12.744466326 -0800
-@@ -142,10 +142,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
index af1b86dfe5..0f925dda38 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
@@ -10,7 +10,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 PR = "r4"
 
 SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
-	file://keyboard.patch;patch=1"
+	file://keyboard.patch"
 
 S = "${WORKDIR}/linux-libc-headers-${PV}"
 
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.15.99.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
index fcf3e9eb11..3dafb32a08 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
@@ -16,13 +16,13 @@ INHIBIT_DEFAULT_DEPS = "1"
 PR = "r6"
 
 SRC_URI = "http://ewi546.ewi.utwente.nl/OE/eabi/linux-libc-headers-${PV}.tar.bz2 \
-	file://keyboard.patch;patch=1 \
-	file://asm-arch-irqs.patch;patch=1 \
-	file://linux-netdevice.patch;patch=1 \
-	file://linux-netfilter_ipv4.patch;patch=1 \
-	file://linux-rtc.patch;patch=1 \
-	file://linux-videodev2.patch;patch=1 \
-	file://3477-1.patch;patch=1"
+	file://keyboard.patch \
+	file://asm-arch-irqs.patch \
+	file://linux-netdevice.patch \
+	file://linux-netfilter_ipv4.patch \
+	file://linux-rtc.patch \
+	file://linux-videodev2.patch \
+	file://3477-1.patch"
 
 S = "${WORKDIR}/linux-libc-headers-${PV}"
 
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
index 70c24de9ab..d5494d418c 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
@@ -6,9 +6,9 @@ PR = "r1"
 
 SRC_URI = " \
 	${KERNELORG_MIRROR}/pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2 \
-	file://arm-procinfo-hwcap.patch;patch=1 \
-	file://arm-unistd-syscall.patch;patch=1 \
-	file://linux-err.patch;patch=1 \
+	file://arm-procinfo-hwcap.patch \
+	file://arm-unistd-syscall.patch \
+	file://linux-err.patch \
 "
 
 S = "${WORKDIR}/linux-2.6.19-rc1"
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb
index 8df5762725..8d88bf144c 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -5,7 +5,7 @@ DEPENDS += "unifdef-native"
 PR = "r4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
-           file://arm-syscall-define.patch;patch=1"
+           file://arm-syscall-define.patch"
 
 S = "${WORKDIR}/linux-2.6.18"
 
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.20.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.20.bb
index 4021bc4152..f048ea31ea 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.20.bb
@@ -6,7 +6,7 @@ PR = "r11"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h \
-           file://unifdef.patch;patch=1 \
+           file://unifdef.patch \
           "
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb
index 0ab9d4319d..742433ff2c 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb
@@ -6,8 +6,8 @@ PR = "r6"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h \
-           file://unifdef.patch;patch=1 \
-           file://arm-hwcap-add-new-entries.patch;patch=1"
+           file://unifdef.patch \
+           file://arm-hwcap-add-new-entries.patch"
 
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
new file mode 100644
index 0000000000..74876bf239
--- /dev/null
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
@@ -0,0 +1,52 @@
+require linux-libc-headers.inc
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS += "unifdef-native"
+PR = "r4"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+           file://procinfo.h \
+           file://unifdef.patch"
+
+S = "${WORKDIR}/linux-${PV}"
+
+set_arch() {
+	case ${TARGET_ARCH} in
+		alpha*)   ARCH=alpha ;;
+		arm*)     ARCH=arm ;;
+		cris*)    ARCH=cris ;;
+		hppa*)    ARCH=parisc ;;
+		i*86*)    ARCH=i386 ;;
+		ia64*)    ARCH=ia64 ;;
+		mips*)    ARCH=mips ;;
+		m68k*)    ARCH=m68k ;;
+		powerpc*) ARCH=powerpc ;;
+		s390*)    ARCH=s390 ;;
+		sh*)      ARCH=sh ;;
+		sparc64*) ARCH=sparc64 ;;
+		sparc*)   ARCH=sparc ;;
+		x86_64*)  ARCH=x86_64 ;;
+	        avr32*)   ARCH=avr32 ;;
+                bfin*)    ARCH=blackfin ;;
+	esac
+}
+
+do_configure() {
+	set_arch
+	oe_runmake allnoconfig ARCH=$ARCH
+}
+
+do_compile () {
+}
+
+do_install() {
+	set_arch
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
+}
+
+do_install_append_arm() {
+	cp ${WORKDIR}/procinfo.h ${D}${includedir}/asm/
+}
+
+SRC_URI[md5sum] = "3f23ad4b69d0a552042d1ed0f4399857"
+SRC_URI[sha256sum] = "413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3"
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb
index 3b815d103e..c4200e0dd6 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb
@@ -5,11 +5,11 @@ DEPENDS += "unifdef-native"
 PR = "r4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-	   file://reinstate-a.out.h.patch;patch=1 \
-	   file://fix-kernel-conditionalize-a.out.h.patch;patch=1 \
-	   file://netfilter-include-types_h-in-userspace.patch;patch=1 \
+	   file://reinstate-a.out.h.patch \
+	   file://fix-kernel-conditionalize-a.out.h.patch \
+	   file://netfilter-include-types_h-in-userspace.patch \
            file://procinfo.h \
-           file://unifdef.patch;patch=1"
+           file://unifdef.patch"
 
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.30.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.30.bb
index 4f48c5b604..0048f24ab0 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.30.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.30.bb
@@ -5,10 +5,10 @@ DEPENDS += "unifdef-native"
 PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-	   file://uio-header.patch;patch=1 \
+	   file://uio-header.patch \
 	  "
 # Not applied, see note in the patch:
-#	   file://asm-page.patch;patch=1 \
+#	   file://asm-page.patch \
 
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
index 2e4041f297..e3a27c50d0 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
@@ -2,13 +2,12 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
-           file://scsi-use-__u8.patch;patch=1 \
+           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch \
 	  "
 S = "${WORKDIR}/linux-${PV}"
 
@@ -44,6 +43,7 @@ do_compile () {
 do_install() {
 	set_arch
 	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
+	rm -f ${D}${exec_prefix}/include/scsi/scsi.h
 }
 
 SRC_URI[md5sum] = "84c077a37684e4cbfa67b18154390d8a"
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
index d82a749f0a..16304dffea 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
@@ -2,13 +2,12 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-	   file://export_sa_family_t.patch;patch=1 \
-           file://scsi-use-__u8.patch;patch=1 \
+	   file://export_sa_family_t.patch \
 	  "
 S = "${WORKDIR}/linux-${PV}"
 
@@ -44,6 +43,7 @@ do_compile () {
 do_install() {
 	set_arch
 	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
+	rm -f ${D}${exec_prefix}/include/scsi/scsi.h
 }
 
 SRC_URI[md5sum] = "260551284ac224c3a43c4adac7df4879"
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.7.0.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
index 224c1da3e2..b66e768bb1 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
@@ -6,8 +6,8 @@ PR = "r4"
 PACKAGES = ""
 
 SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
-	   file://sh-missing.patch;patch=1 \
-	   file://keyboard.patch;patch=1"
+	   file://sh-missing.patch \
+	   file://keyboard.patch"
 S = "${WORKDIR}/linux-libc-headers-${PV}"
 
 do_configure () {
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.8.1.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
index d8376ef05f..4893cab100 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
@@ -13,8 +13,8 @@ PR = "r8"
 PACKAGES = ""
 
 SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
-	file://mips-asm-atomic-system.diff;patch=1;pnum=0 \
-	file://keyboard.patch;patch=1"
+	file://mips-asm-atomic-system.diff;striplevel=0 \
+	file://keyboard.patch"
 
 S = "${WORKDIR}/linux-libc-headers-${PV}"
 
diff --git a/recipes/linux-uml/linux-uml_2.4.26.bb b/recipes/linux-uml/linux-uml_2.4.26.bb
index 9732ac879a..f2c38f1eff 100644
--- a/recipes/linux-uml/linux-uml_2.4.26.bb
+++ b/recipes/linux-uml/linux-uml_2.4.26.bb
@@ -5,7 +5,7 @@ UMLR = "2"
 PR = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2;name=kernel \
-           ${SOURCEFORGE_MIRROR}/user-mode-linux/uml-patch-${PV}-${UMLR}.bz2;patch=1;name=patch \
+           ${SOURCEFORGE_MIRROR}/user-mode-linux/uml-patch-${PV}-${UMLR}.bz2;apply=yes;name=patch \
            file://defconfig \
            file://aio_abi.h"
 S = "${WORKDIR}/linux-${PV}"
diff --git a/recipes/linux-uml/linux-uml_2.6.11-rc2-mm1.bb b/recipes/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
index 437dcbcfc2..6320d4841b 100644
--- a/recipes/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
+++ b/recipes/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
@@ -8,13 +8,13 @@ LV = "2.6.10"
 PR = "r4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${LV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KV}-${RCV}.bz2;patch=1;name=patch \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${KV}-${RCV}/${KV}-${RCV}-${MMV}/${KV}-${RCV}-${MMV}.gz;patch=1;name=akpmpatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KV}-${RCV}.bz2;apply=yes;name=patch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${KV}-${RCV}/${KV}-${RCV}-${MMV}/${KV}-${RCV}-${MMV}.gz;apply=yes;name=akpmpatch \
            file://defconfig"
-#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-core-on-panic;patch=1 \
-#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-pretend-to-be-i586;patch=1 \
-#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-general-protection-fault;patch=1 \
-#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-x11-fb;patch=1 \
+#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-core-on-panic;apply=yes \
+#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-pretend-to-be-i586;apply=yes \
+#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-general-protection-fault;apply=yes \
+#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-x11-fb;apply=yes \
 
 SRC_URI[kernel.md5sum] = "cffcd2919d9c8ef793ce1ac07a440eda"
 SRC_URI[kernel.sha256sum] = "21646736755faee214f489b7388e6c47f5bcf6c2df64298ed2597104fabb8f0e"
diff --git a/recipes/linux/LAB-kernel_2.6.13-hh2.bb b/recipes/linux/LAB-kernel_2.6.13-hh2.bb
index 8340043f82..c5bca16202 100644
--- a/recipes/linux/LAB-kernel_2.6.13-hh2.bb
+++ b/recipes/linux/LAB-kernel_2.6.13-hh2.bb
@@ -8,7 +8,7 @@ COMPATIBLE_MACHINE = "h2200"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-	   file://labrun.patch;patch=1 \
+	   file://labrun.patch \
            file://defconfig"
 
 S = "${WORKDIR}/kernel26"
diff --git a/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb b/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb
index 664289b207..97006b887c 100644
--- a/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb
+++ b/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb
@@ -7,9 +7,9 @@ PR = "r4"
 
 SRC_URI = "http://files.chumby.com/source/ironforge/build396/linux-2.6.16-chumby-1.2.tar.gz;name=kernel \
            http://files.chumby.com/source/ironforge/build396/align.pl;name=align \
-           file://chumby-override-cmdline.patch;patch=1 \
-           file://disable-fbchanging.patch;patch=1 \
-           file://Makefile-remove-hard-setting-CROSS_COMPILE.patch;patch=1 \
+           file://chumby-override-cmdline.patch \
+           file://disable-fbchanging.patch \
+           file://Makefile-remove-hard-setting-CROSS_COMPILE.patch \
            file://defconfig \
            "
 
diff --git a/recipes/linux/compulab-pxa270_2.6.16.bb b/recipes/linux/compulab-pxa270_2.6.16.bb
index 6917ec92b7..3f46f36e9e 100644
--- a/recipes/linux/compulab-pxa270_2.6.16.bb
+++ b/recipes/linux/compulab-pxa270_2.6.16.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Compulab PXA270 system"
 LICENSE = "GPLv2"
 PR = "r6"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 
 # Note, the compulab package contains a binary NAND driver that is not
 # EABI compatible
@@ -12,7 +12,7 @@ do_unpack[depends] += "unzip-native:do_populate_staging"
 # on the #oe IRC channel -- this recipe probably needs updated.
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2;name=kernel \
-           file://linux-2.6.16.patch;patch=1 \
+           file://linux-2.6.16.patch \
            file://defconfig \
 	   http://www.compulab.co.il/x270/download/x270-linux-drv.zip;name=x270patch"
 
diff --git a/recipes/linux/devkitidp-pxa255_2.6.19.bb b/recipes/linux/devkitidp-pxa255_2.6.19.bb
index df56f7bcaf..a747cfad2d 100644
--- a/recipes/linux/devkitidp-pxa255_2.6.19.bb
+++ b/recipes/linux/devkitidp-pxa255_2.6.19.bb
@@ -5,7 +5,7 @@ PR = "r4"
 DEPENDS = "u-boot"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
-	   file://linux-2.6.19_devkitidp1.patch;patch=1 \
+	   file://linux-2.6.19_devkitidp1.patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.19"
diff --git a/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
index fbf7518d1c..4e3c858140 100644
--- a/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
+++ b/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
@@ -6,9 +6,9 @@ PR = "r1"
 COMPATIBLE_MACHINE = "ep93xx"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2;name=kernel \
-	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc1.bz2;patch=1;name=rcpatch \
-	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.18-rc1-git9.bz2;patch=1;name=patch \
-	   http://www.wantstofly.org/~buytenh/ep93xx/derevo20.diff;pnum=1;patch=1;name=derevopatch \
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc1.bz2;apply=yes;name=rcpatch \
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.18-rc1-git9.bz2;apply=yes;name=patch \
+	   http://www.wantstofly.org/~buytenh/ep93xx/derevo20.diff;name=derevopatch \
            file://defconfig \
 		   "
 
diff --git a/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
index 7545e9300d..b17b5f7c2b 100644
--- a/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
+++ b/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
@@ -6,8 +6,8 @@ PR = "r1"
 COMPATIBLE_MACHINE = "ep93xx"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2;name=kernel \
-	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.20-rc7.bz2;patch=1;name=patch \
-           file://dynamic-phys-offset-2.6.20-rc7.diff;patch=1 \ 
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.20-rc7.bz2;apply=yes;name=patch \
+           file://dynamic-phys-offset-2.6.20-rc7.diff \ 
            file://defconfig \
 		   "
 
diff --git a/recipes/linux/gumstix-kernel_2.6.21.bb b/recipes/linux/gumstix-kernel_2.6.21.bb
index 4b21d92eec..8d89ab0114 100644
--- a/recipes/linux/gumstix-kernel_2.6.21.bb
+++ b/recipes/linux/gumstix-kernel_2.6.21.bb
@@ -5,52 +5,52 @@ S = "${WORKDIR}/linux-${PV}"
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
        file://defconfig \
        file://tsc2003.c \
-       file://tsc2003-config.diff;patch=1 \
-       file://pxa-regs-additions.patch;patch=1 \
-       file://header.patch;patch=1 \
-       file://arch-config.patch;patch=1 \
-       file://board-init.patch;patch=1 \
-       file://compact-flash.patch;patch=1 \
-       file://flash.patch;patch=1 \
-       file://pxa2xx_udc.patch;patch=1 \
-       file://bkpxa-pxa-cpu.patch;patch=1 \
-       file://bkpxa-pxa-cpufreq.patch;patch=1 \
-       file://proc-gpio.patch;patch=1 \
-       file://serial-ether-addr.patch;patch=1 \
-       file://cpufreq-better-freqs.patch;patch=1 \
-       file://ethernet-config.patch;patch=1 \
-       file://smc-ether-addr.patch;patch=1 \
-       file://cpufreq-ondemand-by-default.patch;patch=1 \
-       file://modular-init-bluetooth.patch;patch=1 \
-       file://modular-init-smc91x.patch;patch=1 \
-       file://modular-init-usb-gadget.patch;patch=1 \
-       file://bugfix-i2c-include.patch;patch=1 \
-       file://bugfix-mmc-clock.patch;patch=1 \
-       file://bugfix-pxa-cpufreq.patch;patch=1 \
-       file://bugfix-serial-interrupt.patch;patch=1 \
-       file://bugfix-serial-register-status.patch;patch=1 \
-       file://mach-types-fix.patch;patch=1 \
-       file://pcm-gcc-411-bugfix.patch;patch=1 \
-       file://ucb1400-ac97-audio.patch;patch=1 \
-       file://gumstix-asoc.patch;patch=1 \
-       file://disable-uncompress-message.patch;patch=1 \
-       file://serial-divisor.patch;patch=1 \
-       file://mmc-card-detect.patch;patch=1 \
-       file://misalignment-handling.patch;patch=1 \
-       file://compile-fix-pxa_cpufreq.patch;patch=1 \
-       file://pxafb-definition.patch;patch=1 \
-       file://270-usb-gadget-udc.patch;patch=1 \
-       file://gumstix-pxa270-usb-host.patch;patch=1 \
-       file://cpufreq-fixup.patch;patch=1 \
-       file://uImage-in-own-partition.patch;patch=1 \
-       file://pxa-regs-fixup.patch;patch=1 \
-       file://gumstix-fb-logo.patch;patch=1 \
-       file://gumstix-pxa270-mmc.patch;patch=1 \
-       file://pxafb-18bpp-mode.patch;patch=1 \
-       file://smc911x-fixup.patch;patch=1 \
-       file://smc91x-fail-if-no-chip.patch;patch=1 \
-       file://one-wire.patch;patch=1 \
-       ${@base_contains('MACHINE_FEATURES', 'rgb16','file://pxafb-backto16.patch;patch=1', '',d)} \
+       file://tsc2003-config.diff \
+       file://pxa-regs-additions.patch \
+       file://header.patch \
+       file://arch-config.patch \
+       file://board-init.patch \
+       file://compact-flash.patch \
+       file://flash.patch \
+       file://pxa2xx_udc.patch \
+       file://bkpxa-pxa-cpu.patch \
+       file://bkpxa-pxa-cpufreq.patch \
+       file://proc-gpio.patch \
+       file://serial-ether-addr.patch \
+       file://cpufreq-better-freqs.patch \
+       file://ethernet-config.patch \
+       file://smc-ether-addr.patch \
+       file://cpufreq-ondemand-by-default.patch \
+       file://modular-init-bluetooth.patch \
+       file://modular-init-smc91x.patch \
+       file://modular-init-usb-gadget.patch \
+       file://bugfix-i2c-include.patch \
+       file://bugfix-mmc-clock.patch \
+       file://bugfix-pxa-cpufreq.patch \
+       file://bugfix-serial-interrupt.patch \
+       file://bugfix-serial-register-status.patch \
+       file://mach-types-fix.patch \
+       file://pcm-gcc-411-bugfix.patch \
+       file://ucb1400-ac97-audio.patch \
+       file://gumstix-asoc.patch \
+       file://disable-uncompress-message.patch \
+       file://serial-divisor.patch \
+       file://mmc-card-detect.patch \
+       file://misalignment-handling.patch \
+       file://compile-fix-pxa_cpufreq.patch \
+       file://pxafb-definition.patch \
+       file://270-usb-gadget-udc.patch \
+       file://gumstix-pxa270-usb-host.patch \
+       file://cpufreq-fixup.patch \
+       file://uImage-in-own-partition.patch \
+       file://pxa-regs-fixup.patch \
+       file://gumstix-fb-logo.patch \
+       file://gumstix-pxa270-mmc.patch \
+       file://pxafb-18bpp-mode.patch \
+       file://smc911x-fixup.patch \
+       file://smc91x-fail-if-no-chip.patch \
+       file://one-wire.patch \
+       ${@base_contains('MACHINE_FEATURES', 'rgb16','file://pxafb-backto16.patch', '',d)} \
        "
 
 do_configure_prepend() {
diff --git a/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb b/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb
index 30ed719957..e32f35bf08 100644
--- a/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb
+++ b/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb
@@ -9,8 +9,8 @@ COMPATIBLE_MACHINE = "gumstix"
 
 # NOTE: pulled local linux-2.6.5-gnalm1, since it didn't apply cleanly
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.5.tar.bz2;name=kernel \
-           file://linux-2.6.5-gnalm1.patch;patch=1 \
-           http://gumstix.superlucidity.net/downloads/kernel/patches/linux-2.6.5-gnalm1-gum0.patch;patch=1;name=patch \
+           file://linux-2.6.5-gnalm1.patch \
+           http://gumstix.superlucidity.net/downloads/kernel/patches/linux-2.6.5-gnalm1-gum0.patch;name=patch \
            file://defconfig"
 S = "${WORKDIR}/linux-2.6.5"
 
diff --git a/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb b/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
index 0b76adba52..6c3f98c6d6 100644
--- a/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
+++ b/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
@@ -12,10 +12,10 @@ COMPATIBLE_MACHINE = '(h3900|h5000)'
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-${PACKAGE_ARCH} \
 	   file://ipaq-hal.init \
-           file://linux-2.4-usb-gadget.patch;patch=1 \
-           file://usb-gadget-ether-compat.patch;patch=1 \
-	   file://linux-2.4-no-short-loads.patch;patch=1 \
-	   file://linux-2.4-cpufreq.patch;patch=1"
+           file://linux-2.4-usb-gadget.patch \
+           file://usb-gadget-ether-compat.patch \
+	   file://linux-2.4-no-short-loads.patch \
+	   file://linux-2.4-cpufreq.patch"
 
 S = "${WORKDIR}/kernel"
 
diff --git a/recipes/linux/ipod_2.4.24-ipod0.bb b/recipes/linux/ipod_2.4.24-ipod0.bb
index f54106af02..1de263ab83 100644
--- a/recipes/linux/ipod_2.4.24-ipod0.bb
+++ b/recipes/linux/ipod_2.4.24-ipod0.bb
@@ -5,8 +5,8 @@ KV = "2.4.24"
 PV = "${KV}-ipod0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2;name=kernel \
-           http://www.uclinux.org/pub/uClinux/uClinux-2.4.x/uClinux-2.4.24-uc0.diff.gz;patch=1;name=uclinupatch \
-           ${SOURCEFORGE_MIRROR}/ipodlinux/uclinux-2.4.24-ipod0.patch.gz;patch=1;name=ipodpatch  "
+           http://www.uclinux.org/pub/uClinux/uClinux-2.4.x/uClinux-2.4.24-uc0.diff.gz;name=uclinupatch \
+           ${SOURCEFORGE_MIRROR}/ipodlinux/uclinux-2.4.24-ipod0.patch.gz;name=ipodpatch  "
 
 S = "${WORKDIR}/linux-${KV}"
 
diff --git a/recipes/linux/ixp4xx-kernel.inc b/recipes/linux/ixp4xx-kernel.inc
index aa58635770..ddcc81cdd1 100644
--- a/recipes/linux/ixp4xx-kernel.inc
+++ b/recipes/linux/ixp4xx-kernel.inc
@@ -92,7 +92,7 @@ python () {
         name.append(patch)
         pname = '-'.join(name)
         if patch[0:2] == "rc" or patch[0:3] == "pre":
-            patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/v%s/testing/patch-%s.bz2;patch=1;pname=%s;name=rcpatch" % (major, pname, pname))
+            patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/v%s/testing/patch-%s.bz2;apply=yes;pname=%s;name=rcpatch" % (major, pname, pname))
             kernel[-1] = str(int(kernel[-1]) - 1)
             if patch[0:2] == "rc" and pref == 10:
                 pref = 6
@@ -101,14 +101,14 @@ python () {
             else:
                 pref = 2
         elif patch[0:2] == "bk" or patch[0:3] == "git":
-            patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/v%s/snapshots/patch-%s.bz2;patch=1;pname=%s;name=gitpatch" % (major, pname, pname))
+            patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/v%s/snapshots/patch-%s.bz2;apply=yes;pname=%s;name=gitpatch" % (major, pname, pname))
             pref = 2
         elif patch[0:2] == "ac":
             patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-%s/%s/patch-%s;name=acpatch" % (major, base, pname))
             mmac = 2
             filepath[0:0] = [ filedir % (name[0] + "-ac") ]
         elif patch[0:2] == "mm":
-            patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/%s/%s/%s/%s.bz2;patch=1;pname=%s;name=mmpatch" % (major, base, pname, pname, pname))
+            patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/%s/%s/%s/%s.bz2;apply=yes;pname=%s;name=mmpatch" % (major, base, pname, pname, pname))
             mmac = 2
             filepath[0:0] = [ filedir % (name[0] + "-mm") ]
         else:
diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig
index 7279d8034a..9dbe866109 100644
--- a/recipes/linux/linux-2.6.24/hipox/defconfig
+++ b/recipes/linux/linux-2.6.24/hipox/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24.7
-# Thu Apr 15 15:43:38 2010
+# Wed May 26 09:12:55 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -767,8 +767,18 @@ CONFIG_USB_KC2190=y
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
+CONFIG_SLHC=m
 # CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
@@ -1410,7 +1420,7 @@ CONFIG_CRYPTO_MANAGER=y
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_SHA1 is not set
+CONFIG_CRYPTO_SHA1=m
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_WP512 is not set
diff --git a/recipes/linux/linux-2.6.32/at91/SRC_URI_append.inc b/recipes/linux/linux-2.6.32/at91/SRC_URI_append.inc
index ce18159162..b6ae8aa8a3 100644
--- a/recipes/linux/linux-2.6.32/at91/SRC_URI_append.inc
+++ b/recipes/linux/linux-2.6.32/at91/SRC_URI_append.inc
@@ -1,9 +1,6 @@
 # Automatically generated from gnome script: "SRC_URI_append_linux"
 
 SRC_URI_append += "\
-	file://recipes/linux/linux-2.6.32/patch-sets/linux-2.6.32-001-configurable-nand-partitions.patch;patch=1 \
-	file://recipes/linux/linux-2.6.32/patch-sets/linux-2.6.32-002-sam9g20-proper-reset.patch;patch=1 \
+	file:///linux-2.6.32-001-configurable-nand-partitions.patch \
+	file:///linux-2.6.32-002-sam9g20-proper-reset.patch \
 	"
-
-# no board directory=recipes/linux/linux-2.6.32/boards
-
diff --git a/recipes/linux/linux-2.6.33/qemuarm/defconfig b/recipes/linux/linux-2.6.33/qemuarm/defconfig
new file mode 100644
index 0000000000..8de94e32bc
--- /dev/null
+++ b/recipes/linux/linux-2.6.33/qemuarm/defconfig
@@ -0,0 +1,1805 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.33
+# Wed May 12 19:18:03 2010
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_COMPAT_BRK=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_SLOW_WORK is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+CONFIG_FREEZER=y
+
+#
+# System Type
+#
+CONFIG_MMU=y
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+CONFIG_ARCH_VERSATILE=y
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_STMP3XXX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5PC1XX is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_U8500 is not set
+
+#
+# Versatile platform type
+#
+CONFIG_ARCH_VERSATILE_PB=y
+CONFIG_MACH_VERSATILE_AB=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_LEGACY=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+CONFIG_ARM_L1_CACHE_SHIFT=5
+CONFIG_ARM_VIC=y
+CONFIG_ARM_VIC_NR=2
+CONFIG_ICST307=y
+CONFIG_COMMON_CLKDEV=y
+
+#
+# Bus support
+#
+CONFIG_ARM_AMBA=y
+CONFIG_PCI=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_HZ=100
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=999999
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_LEDS=y
+CONFIG_LEDS_CPU=y
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=128M console=ttyAMA0"
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+
+#
+# CPU Power Management
+#
+# CONFIG_CPU_IDLE is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_VFP=y
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_MISC=y
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_APM_EMULATION is not set
+# CONFIG_PM_RUNTIME is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_LRO=y
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_GEOMETRY is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_ARM_INTEGRATOR=y
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_PISMO is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+CONFIG_EEPROM_LEGACY=m
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_CB710_CORE is not set
+# CONFIG_IWMC3200TOP is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_FCOE is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_PMCRAID is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# The newer stack is recommended.
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=y
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_AX88796 is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+CONFIG_SMC91X=y
+# CONFIG_DM9000 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+CONFIG_8139CP=y
+# CONFIG_8139TOO is not set
+# CONFIG_R6040 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
+# CONFIG_ATL2 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_CNIC is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_JME is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+CONFIG_CHELSIO_T3_DEPENDS=y
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_ENIC is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_VXGE is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NIU is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_BNX2X is not set
+# CONFIG_QLGE is not set
+# CONFIG_SFC is not set
+# CONFIG_BE2NET is not set
+# CONFIG_TR is not set
+CONFIG_WLAN=y
+# CONFIG_ATMEL is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_HOSTAP is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_QT2160 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_AMBAKMI=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+CONFIG_SERIAL_NONSTANDARD=y
+# CONFIG_COMPUTONE is not set
+# CONFIG_ROCKETPORT is not set
+# CONFIG_CYCLADES is not set
+# CONFIG_DIGIEPCA is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_MOXA_SMARTIO is not set
+# CONFIG_ISI is not set
+# CONFIG_SYNCLINKMP is not set
+# CONFIG_SYNCLINK_GT is not set
+# CONFIG_N_HDLC is not set
+# CONFIG_RISCOM8 is not set
+# CONFIG_SPECIALIX is not set
+# CONFIG_STALDRV is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=16
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_VERSATILE is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_GPIOLIB is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7473 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_MFD_88PM8607 is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+CONFIG_VGA_ARB=y
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+CONFIG_FB_ARMCLCD=y
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+CONFIG_FONT_ACORN_8x8=y
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_LOGO is not set
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HIFIER is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+CONFIG_SND_ARM=y
+CONFIG_SND_ARMAACI=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_UWB is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_ARMMMCI=m
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_AT91 is not set
+# CONFIG_MMC_ATMELMCI is not set
+# CONFIG_MMC_TIFM_SD is not set
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_PL030 is not set
+CONFIG_RTC_DRV_PL031=y
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+# CONFIG_INOTIFY is not set
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=y
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=y
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=m
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_DETECTOR=y
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_PAGE_POISONING is not set
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+# CONFIG_BOOT_TRACER is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARM_UNWIND=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_LL=y
+# CONFIG_EARLY_PRINTK is not set
+# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_OC_ETM is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI2=m
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=m
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/recipes/linux/linux-2.6.33/qemumips/defconfig b/recipes/linux/linux-2.6.33/qemumips/defconfig
new file mode 100644
index 0000000000..9ce280ec4e
--- /dev/null
+++ b/recipes/linux/linux-2.6.33/qemumips/defconfig
@@ -0,0 +1,1772 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.31-omap1
+# Sat May 15 18:17:01 2010
+#
+CONFIG_MIPS=y
+
+#
+# Machine selection
+#
+CONFIG_ZONE_DMA=y
+# CONFIG_MACH_ALCHEMY is not set
+# CONFIG_AR7 is not set
+# CONFIG_BASLER_EXCITE is not set
+# CONFIG_BCM47XX is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_LASAT is not set
+# CONFIG_LEMOTE_FULONG is not set
+CONFIG_MIPS_MALTA=y
+# CONFIG_MIPS_SIM is not set
+# CONFIG_NEC_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_PMC_MSP is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MIKROTIK_RB532 is not set
+# CONFIG_WR_PPMC is not set
+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
+# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_SUPPORTS_OPROFILE=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_BOOT_RAW=y
+CONFIG_CEVT_R4K_LIB=y
+CONFIG_CEVT_R4K=y
+CONFIG_CSRC_R4K_LIB=y
+CONFIG_CSRC_R4K=y
+CONFIG_DMA_NONCOHERENT=y
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
+CONFIG_I8259=y
+CONFIG_MIPS_BONITO64=y
+CONFIG_MIPS_MSC=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_CPU_BIG_ENDIAN=y
+# CONFIG_CPU_LITTLE_ENDIAN is not set
+CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
+CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_IRQ_CPU=y
+CONFIG_IRQ_GIC=y
+CONFIG_MIPS_BOARDS_GEN=y
+CONFIG_PCI_GT64XXX_PCI0=y
+CONFIG_SWAP_IO_SPACE=y
+CONFIG_BOOT_ELF32=y
+CONFIG_MIPS_L1_CACHE_SHIFT=5
+
+#
+# CPU selection
+#
+# CONFIG_CPU_LOONGSON2 is not set
+# CONFIG_CPU_MIPS32_R1 is not set
+CONFIG_CPU_MIPS32_R2=y
+# CONFIG_CPU_MIPS64_R1 is not set
+# CONFIG_CPU_MIPS64_R2 is not set
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_VR41XX is not set
+# CONFIG_CPU_R4300 is not set
+# CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
+# CONFIG_CPU_R5000 is not set
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R5500 is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_NEVADA is not set
+# CONFIG_CPU_R8000 is not set
+# CONFIG_CPU_R10000 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_RM9000 is not set
+# CONFIG_CPU_SB1 is not set
+# CONFIG_CPU_CAVIUM_OCTEON is not set
+CONFIG_SYS_HAS_CPU_MIPS32_R1=y
+CONFIG_SYS_HAS_CPU_MIPS32_R2=y
+CONFIG_SYS_HAS_CPU_MIPS64_R1=y
+CONFIG_SYS_HAS_CPU_NEVADA=y
+CONFIG_SYS_HAS_CPU_RM7000=y
+CONFIG_CPU_MIPS32=y
+CONFIG_CPU_MIPSR2=y
+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
+CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
+CONFIG_HARDWARE_WATCHPOINTS=y
+
+#
+# Kernel type
+#
+CONFIG_32BIT=y
+# CONFIG_64BIT is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_32KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_BOARD_SCACHE=y
+CONFIG_MIPS_CPU_SCACHE=y
+CONFIG_CPU_HAS_PREFETCH=y
+# CONFIG_MIPS_MT_DISABLED is not set
+CONFIG_MIPS_MT_SMP=y
+# CONFIG_MIPS_MT_SMTC is not set
+CONFIG_MIPS_MT=y
+# CONFIG_SCHED_SMT is not set
+CONFIG_SYS_SUPPORTS_SCHED_SMT=y
+CONFIG_SYS_SUPPORTS_MULTITHREADING=y
+CONFIG_MIPS_MT_FPAFF=y
+# CONFIG_MIPS_VPE_LOADER is not set
+# CONFIG_MIPS_CMP is not set
+CONFIG_CPU_HAS_LLSC=y
+# CONFIG_CPU_HAS_SMARTMIPS is not set
+CONFIG_CPU_MIPSR2_IRQ_VI=y
+CONFIG_CPU_MIPSR2_IRQ_EI=y
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_IRQ_PER_CPU=y
+CONFIG_CPU_SUPPORTS_HIGHMEM=y
+CONFIG_SYS_SUPPORTS_SMARTMIPS=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_SMP=y
+CONFIG_SMP_UP=y
+CONFIG_SYS_SUPPORTS_MIPS_CMP=y
+CONFIG_SYS_SUPPORTS_SMP=y
+CONFIG_NR_CPUS_DEFAULT_2=y
+CONFIG_NR_CPUS=2
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_48 is not set
+CONFIG_HZ_100=y
+# CONFIG_HZ_128 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_1024 is not set
+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
+CONFIG_HZ=100
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_CLASSIC_RCU=y
+# CONFIG_TREE_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_PREEMPT_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_RELAY=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
+CONFIG_PID_NS=y
+# CONFIG_NET_NS is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+
+#
+# Performance Counters
+#
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_SLOW_WORK is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+# CONFIG_FREEZER is not set
+
+#
+# Bus options (PCI, PCMCIA, EISA, ISA, TC)
+#
+CONFIG_HW_HAS_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
+CONFIG_MMU=y
+CONFIG_I8253=y
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+CONFIG_TRAD_SIGNALS=y
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=y
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+CONFIG_NETFILTER_XT_TARGET_HL=m
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_IP_DCCP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_PHONET=m
+# CONFIG_IEEE802154 is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+# CONFIG_NET_SCH_MULTIQ is not set
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+# CONFIG_NET_SCH_DRR is not set
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=m
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_WIRELESS_OLD_REGULATORY=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_DEFAULT_PS is not set
+CONFIG_MAC80211_DEFAULT_PS_VALUE=0
+
+#
+# Rate control algorithm selection
+#
+CONFIG_MAC80211_RC_PID=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
+CONFIG_MAC80211_RC_DEFAULT="pid"
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG_MENU is not set
+# CONFIG_WIMAX is not set
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=m
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+CONFIG_MTD_OOPS=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
+# UBI - Unsorted block images
+#
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+CONFIG_IDE=y
+
+#
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
+#
+CONFIG_IDE_XFER_MODE=y
+CONFIG_IDE_ATAPI=y
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
+CONFIG_BLK_DEV_IDECD=y
+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_PLATFORM is not set
+CONFIG_BLK_DEV_IDEDMA_SFF=y
+
+#
+# PCI IDE chipsets support
+#
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+CONFIG_BLK_DEV_PIIX=y
+# CONFIG_BLK_DEV_IT8172 is not set
+CONFIG_BLK_DEV_IT8213=m
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+CONFIG_BLK_DEV_TC86C001=m
+CONFIG_BLK_DEV_IDEDMA=y
+
+#
+# SCSI device support
+#
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=m
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+# CONFIG_SCSI_FC_TGT_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_FCOE is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_ATA is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_RAID6_PQ=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+# CONFIG_DM_LOG_USERSPACE is not set
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+# CONFIG_DM_MULTIPATH_QL is not set
+# CONFIG_DM_MULTIPATH_ST is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# See the help texts for more information.
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+CONFIG_MDIO_BITBANG=m
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_AX88796=m
+# CONFIG_AX88796_93CX6 is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=y
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+CONFIG_TC35815=m
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_R6040 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_KS8842 is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
+# CONFIG_ATL2 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_CNIC is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_JME is not set
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+# CONFIG_CHELSIO_T1 is not set
+CONFIG_CHELSIO_T3_DEPENDS=y
+CONFIG_CHELSIO_T3=m
+# CONFIG_ENIC is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_VXGE is not set
+# CONFIG_MYRI10GE is not set
+CONFIG_NETXEN_NIC=m
+# CONFIG_NIU is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_BNX2X is not set
+# CONFIG_QLGE is not set
+# CONFIG_SFC is not set
+# CONFIG_BE2NET is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+CONFIG_WLAN_PRE80211=y
+CONFIG_STRIP=m
+CONFIG_WLAN_80211=y
+CONFIG_LIBERTAS=m
+# CONFIG_LIBERTAS_DEBUG is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PRISM54=m
+# CONFIG_RTL8180 is not set
+# CONFIG_ADM8211 is not set
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_MWL8K is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH9K is not set
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_IWLWIFI is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_RT2X00 is not set
+CONFIG_HERMES=m
+# CONFIG_HERMES_CACHE_FW_ON_INIT is not set
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_UWB is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+# CONFIG_UIO_PDRV is not set
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_SMX is not set
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_SERCOS3 is not set
+
+#
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_QUOTA=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_PRINT_QUOTA_WARNING=y
+CONFIG_QUOTA_TREE=y
+# CONFIG_QFMT_V1 is not set
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS_FS=y
+# CONFIG_AUTOFS4_FS is not set
+CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_CMDLINE=""
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+CONFIG_CRC16=m
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/recipes/linux/linux-2.6.33/qemuppc/defconfig b/recipes/linux/linux-2.6.33/qemuppc/defconfig
new file mode 100644
index 0000000000..d7c028f745
--- /dev/null
+++ b/recipes/linux/linux-2.6.33/qemuppc/defconfig
@@ -0,0 +1,1084 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.33
+# Thu May 13 22:13:02 2010
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_PPC_BOOK3S_32=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_BOOK3S=y
+CONFIG_6xx=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_PPC_HAVE_PMU_SUPPORT=y
+# CONFIG_SMP is not set
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_NR_IRQS=512
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+# CONFIG_PPC_UDBG_16550 is not set
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DTC=y
+# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EMBEDDED is not set
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERF_COUNTERS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_COMPAT_BRK=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_SLOW_WORK is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+# CONFIG_MODULES is not set
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_FREEZER is not set
+
+#
+# Platform support
+#
+# CONFIG_PPC_CHRP is not set
+# CONFIG_MPC5121_ADS is not set
+# CONFIG_MPC5121_GENERIC is not set
+# CONFIG_PPC_MPC52xx is not set
+CONFIG_PPC_PMAC=y
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_AMIGAONE is not set
+CONFIG_PPC_NATIVE=y
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+# CONFIG_IPIC is not set
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+CONFIG_PPC_MPC106=y
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_PPC601_SYNC_FIX=y
+# CONFIG_TAU is not set
+# CONFIG_FSL_ULI1575 is not set
+# CONFIG_SIMPLE_GPIO is not set
+
+#
+# Kernel options
+#
+CONFIG_HIGHMEM=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_IOMMU_HELPER is not set
+# CONFIG_SWIOTLB is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_SPARSE_IRQ is not set
+CONFIG_MAX_ACTIVE_REGIONS=32
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_MIGRATION is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_EXTRA_TARGETS=""
+CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_SUSPEND is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_PM_RUNTIME is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_LEGACY is not set
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
+CONFIG_PCCARD=y
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=y
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+# CONFIG_PD6729 is not set
+# CONFIG_I82092 is not set
+CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+CONFIG_ADVANCED_OPTIONS=y
+# CONFIG_LOWMEM_SIZE_BOOL is not set
+CONFIG_LOWMEM_SIZE=0x30000000
+# CONFIG_PAGE_OFFSET_BOOL is not set
+CONFIG_PAGE_OFFSET=0xc0000000
+# CONFIG_KERNEL_START_BOOL is not set
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+# CONFIG_TASK_SIZE_BOOL is not set
+CONFIG_TASK_SIZE=0xc0000000
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+CONFIG_INET_LRO=y
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_WIRELESS is not set
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
+# CONFIG_STANDALONE is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+# CONFIG_MTD is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_MAC_FLOPPY is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+CONFIG_IDE=y
+
+#
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
+#
+CONFIG_IDE_XFER_MODE=y
+CONFIG_IDE_TIMINGS=y
+CONFIG_IDE_ATAPI=y
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_DELKIN is not set
+CONFIG_BLK_DEV_IDECD=y
+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_BLK_DEV_PLATFORM is not set
+CONFIG_BLK_DEV_IDEDMA_SFF=y
+
+#
+# PCI IDE chipsets support
+#
+CONFIG_BLK_DEV_IDEPCI=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+CONFIG_BLK_DEV_CMD64X=y
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8172 is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+CONFIG_BLK_DEV_IDE_PMAC=y
+# CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST is not set
+CONFIG_BLK_DEV_IDEDMA=y
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# The newer stack is recommended.
+#
+# CONFIG_FIREWIRE is not set
+CONFIG_IEEE1394=y
+CONFIG_IEEE1394_OHCI1394=y
+
+#
+# PCILynx controller requires I2C
+#
+
+#
+# SBP-2 support (for storage devices) requires SCSI
+#
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
+CONFIG_IEEE1394_ETH1394=y
+CONFIG_IEEE1394_RAWIO=y
+CONFIG_IEEE1394_VIDEO1394=y
+CONFIG_IEEE1394_DV1394=y
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_I2O is not set
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_ADB=y
+CONFIG_ADB_CUDA=y
+CONFIG_ADB_PMU=y
+# CONFIG_ADB_PMU_LED is not set
+# CONFIG_PMAC_APM_EMU is not set
+# CONFIG_PMAC_MEDIABAY is not set
+# CONFIG_INPUT_ADBHID is not set
+# CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_WINDFARM is not set
+# CONFIG_ANSLCD is not set
+# CONFIG_PMAC_RACKMETER is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_MACE=y
+# CONFIG_MACE_AAUI_PORT is not set
+CONFIG_BMAC=y
+CONFIG_HAPPYMEAL=y
+CONFIG_SUNGEM=y
+CONFIG_CASSINI=y
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=y
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+CONFIG_NE2K_PCI=y
+CONFIG_8139CP=y
+CONFIG_8139TOO=y
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_R6040 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
+# CONFIG_ATL2 is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+# CONFIG_WLAN is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_NET_PCMCIA is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_XILINX_XPS_PS2 is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_DEVKMEM is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_PMACZILOG=y
+CONFIG_SERIAL_PMACZILOG_TTYS=y
+CONFIG_SERIAL_PMACZILOG_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_HVC_UDBG is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_IPWIRELESS is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_GPIOLIB is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=y
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+# CONFIG_SSB_B43_PCI_BRIDGE is not set
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+CONFIG_VGA_ARB=y
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_UWB is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_NLS is not set
+# CONFIG_DLM is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+CONFIG_NLATTR=y
+CONFIG_GENERIC_ATOMIC64=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_PPC_DISABLE_WERROR is not set
+CONFIG_PPC_WERROR=y
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_IRQSTACKS is not set
+CONFIG_BOOTX_TEXT=y
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/recipes/linux/linux-2.6.33/qemush4/defconfig b/recipes/linux/linux-2.6.33/qemush4/defconfig
new file mode 100644
index 0000000000..2cc3e9bf2c
--- /dev/null
+++ b/recipes/linux/linux-2.6.33/qemush4/defconfig
@@ -0,0 +1,1558 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.33
+# Sat May 15 16:20:27 2010
+#
+CONFIG_SUPERH=y
+CONFIG_SUPERH32=y
+# CONFIG_SUPERH64 is not set
+CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_IRQ_PER_CPU=y
+# CONFIG_GENERIC_GPIO is not set
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_SYS_SUPPORTS_PCI=y
+CONFIG_SYS_SUPPORTS_TMU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_IO_TRAPPED=y
+CONFIG_DMA_NONCOHERENT=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERF_COUNTERS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_COMPAT_BRK=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_SLOW_WORK is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+# CONFIG_MODULES is not set
+CONFIG_BLOCK=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_FREEZER is not set
+
+#
+# System type
+#
+CONFIG_CPU_SH4=y
+# CONFIG_CPU_SUBTYPE_SH7619 is not set
+# CONFIG_CPU_SUBTYPE_SH7201 is not set
+# CONFIG_CPU_SUBTYPE_SH7203 is not set
+# CONFIG_CPU_SUBTYPE_SH7206 is not set
+# CONFIG_CPU_SUBTYPE_SH7263 is not set
+# CONFIG_CPU_SUBTYPE_MXG is not set
+# CONFIG_CPU_SUBTYPE_SH7705 is not set
+# CONFIG_CPU_SUBTYPE_SH7706 is not set
+# CONFIG_CPU_SUBTYPE_SH7707 is not set
+# CONFIG_CPU_SUBTYPE_SH7708 is not set
+# CONFIG_CPU_SUBTYPE_SH7709 is not set
+# CONFIG_CPU_SUBTYPE_SH7710 is not set
+# CONFIG_CPU_SUBTYPE_SH7712 is not set
+# CONFIG_CPU_SUBTYPE_SH7720 is not set
+# CONFIG_CPU_SUBTYPE_SH7721 is not set
+# CONFIG_CPU_SUBTYPE_SH7750 is not set
+# CONFIG_CPU_SUBTYPE_SH7091 is not set
+# CONFIG_CPU_SUBTYPE_SH7750R is not set
+# CONFIG_CPU_SUBTYPE_SH7750S is not set
+# CONFIG_CPU_SUBTYPE_SH7751 is not set
+CONFIG_CPU_SUBTYPE_SH7751R=y
+# CONFIG_CPU_SUBTYPE_SH7760 is not set
+# CONFIG_CPU_SUBTYPE_SH4_202 is not set
+# CONFIG_CPU_SUBTYPE_SH7723 is not set
+# CONFIG_CPU_SUBTYPE_SH7724 is not set
+# CONFIG_CPU_SUBTYPE_SH7757 is not set
+# CONFIG_CPU_SUBTYPE_SH7763 is not set
+# CONFIG_CPU_SUBTYPE_SH7770 is not set
+# CONFIG_CPU_SUBTYPE_SH7780 is not set
+# CONFIG_CPU_SUBTYPE_SH7785 is not set
+# CONFIG_CPU_SUBTYPE_SH7786 is not set
+# CONFIG_CPU_SUBTYPE_SHX3 is not set
+# CONFIG_CPU_SUBTYPE_SH7343 is not set
+# CONFIG_CPU_SUBTYPE_SH7722 is not set
+# CONFIG_CPU_SUBTYPE_SH7366 is not set
+
+#
+# Memory management options
+#
+CONFIG_QUICKLIST=y
+CONFIG_MMU=y
+CONFIG_PAGE_OFFSET=0x80000000
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_MEMORY_START=0x0c000000
+CONFIG_MEMORY_SIZE=0x04000000
+CONFIG_29BIT=y
+CONFIG_VSYSCALL=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_MAX_ACTIVE_REGIONS=1
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+
+#
+# Cache configuration
+#
+CONFIG_CACHE_WRITEBACK=y
+# CONFIG_CACHE_WRITETHROUGH is not set
+# CONFIG_CACHE_OFF is not set
+
+#
+# Processor features
+#
+CONFIG_CPU_LITTLE_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_SH_FPU=y
+# CONFIG_SH_STORE_QUEUES is not set
+CONFIG_CPU_HAS_INTEVT=y
+CONFIG_CPU_HAS_SR_RB=y
+CONFIG_CPU_HAS_FPU=y
+
+#
+# Board support
+#
+# CONFIG_SH_7751_SYSTEMH is not set
+# CONFIG_SH_SECUREEDGE5410 is not set
+CONFIG_SH_RTS7751R2D=y
+# CONFIG_SH_LANDISK is not set
+# CONFIG_SH_TITAN is not set
+# CONFIG_SH_LBOX_RE2 is not set
+
+#
+# RTS7751R2D Board Revision
+#
+CONFIG_RTS7751R2D_PLUS=y
+# CONFIG_RTS7751R2D_1 is not set
+
+#
+# Timer and clock configuration
+#
+CONFIG_SH_TIMER_TMU=y
+CONFIG_SH_PCLK_FREQ=60000000
+CONFIG_SH_CLK_CPG=y
+CONFIG_SH_CLK_CPG_LEGACY=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# DMA support
+#
+# CONFIG_SH_DMA is not set
+
+#
+# Companion Chips
+#
+
+#
+# Additional SuperH Device Drivers
+#
+CONFIG_HEARTBEAT=y
+# CONFIG_PUSH_SWITCH is not set
+
+#
+# Kernel features
+#
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_SECCOMP is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_GUSA=y
+# CONFIG_GUSA_RB is not set
+# CONFIG_SPARSE_IRQ is not set
+
+#
+# Boot options
+#
+CONFIG_ZERO_PAGE_OFFSET=0x00010000
+CONFIG_BOOT_LINK_OFFSET=0x00800000
+CONFIG_ENTRY_OFFSET=0x00001000
+# CONFIG_CMDLINE_OVERWRITE is not set
+# CONFIG_CMDLINE_EXTEND is not set
+
+#
+# Bus options
+#
+CONFIG_PCI=y
+# CONFIG_PCIEPORTBUS is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCCARD is not set
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_FAKE is not set
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options (EXPERIMENTAL)
+#
+# CONFIG_PM is not set
+# CONFIG_CPU_IDLE is not set
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_CB710_CORE is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_FCOE is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_PMCRAID is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_VERBOSE_ERROR is not set
+CONFIG_SATA_PMP=y
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SIL24 is not set
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+CONFIG_PATA_PLATFORM=y
+# CONFIG_PATA_SCH is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# The newer stack is recommended.
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_AX88796 is not set
+# CONFIG_STNIC is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_SMC91X is not set
+# CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+CONFIG_8139CP=y
+CONFIG_8139TOO=y
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_R6040 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
+# CONFIG_ATL2 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_CNIC is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_JME is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+CONFIG_CHELSIO_T3_DEPENDS=y
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_ENIC is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_VXGE is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NIU is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_BNX2X is not set
+# CONFIG_QLGE is not set
+# CONFIG_SFC is not set
+# CONFIG_BE2NET is not set
+# CONFIG_TR is not set
+# CONFIG_WLAN is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=2
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_I2C is not set
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_BITBANG=y
+# CONFIG_SPI_SH_MSIOF is not set
+CONFIG_SPI_SH_SCI=y
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+CONFIG_MFD_SM501=y
+# CONFIG_MFD_SH_MOBILE_SDHI is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_AB4500_CORE is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGA_ARB is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_SH_MOBILE_LCDC is not set
+CONFIG_FB_SM501=y
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+# CONFIG_LOGO_SUPERH_MONO is not set
+# CONFIG_LOGO_SUPERH_VGA16 is not set
+CONFIG_LOGO_SUPERH_CLUT224=y
+CONFIG_SOUND=y
+# CONFIG_SOUND_OSS_CORE is not set
+# CONFIG_SND is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=y
+CONFIG_HID_APPLE=y
+CONFIG_HID_BELKIN=y
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+CONFIG_HID_CYPRESS=y
+# CONFIG_HID_DRAGONRISE is not set
+CONFIG_HID_EZKEY=y
+# CONFIG_HID_KYE is not set
+CONFIG_HID_GYRATION=y
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_KENSINGTON is not set
+CONFIG_HID_LOGITECH=y
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
+# CONFIG_HID_NTRIG is not set
+CONFIG_HID_PANTHERLORD=y
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_HID_PETALYNX=y
+CONFIG_HID_SAMSUNG=y
+CONFIG_HID_SONY=y
+CONFIG_HID_SUNPLUS=y
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_ZEROPLUS is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_XHCI_HCD is not set
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+CONFIG_USB_LIBUSUAL=y
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_VST is not set
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_UWB is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+CONFIG_RTC_DRV_R9701=y
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_SH is not set
+# CONFIG_RTC_DRV_GENERIC is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=y
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_CODEPAGE_932=y
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_STACKTRACE=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_SH_STANDARD_BIOS is not set
+# CONFIG_DWARF_UNWINDER is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC_T10DIF=y
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+CONFIG_NLATTR=y
+CONFIG_GENERIC_ATOMIC64=y
diff --git a/recipes/linux/linux-2.6.33/qemux86/defconfig b/recipes/linux/linux-2.6.33/qemux86/defconfig
new file mode 100644
index 0000000000..41edb3d3a8
--- /dev/null
+++ b/recipes/linux/linux-2.6.33/qemux86/defconfig
@@ -0,0 +1,2556 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.33
+# Sat May 15 19:01:48 2010
+#
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+# CONFIG_X86_64 is not set
+CONFIG_X86=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME_VSYSCALL is not set
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_ZONE_DMA32 is not set
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_X86_32_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_32_LAZY_GS=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_TREE=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+CONFIG_EVENT_PROFILE=y
+CONFIG_PERF_COUNTERS=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_COMPAT_BRK=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_IBS is not set
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_SLOW_WORK_DEBUG is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+# CONFIG_SPARSE_IRQ is not set
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_BIGSMP is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_MRST is not set
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_32_NON_STANDARD is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+# CONFIG_MEMTEST is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+# CONFIG_GENERIC_CPU is not set
+CONFIG_X86_GENERIC=y
+CONFIG_X86_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_DEBUGCTLMSR=y
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+# CONFIG_X86_DS is not set
+# CONFIG_HPET_TIMER is not set
+CONFIG_DMI=y
+# CONFIG_IOMMU_HELPER is not set
+# CONFIG_IOMMU_API is not set
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_ANCIENT_MCE is not set
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_VM86=y
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+# CONFIG_X86_REBOOTFIXUPS is not set
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_X86_PAE is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW_64K=y
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+# CONFIG_X86_PAT is not set
+# CONFIG_EFI is not set
+CONFIG_SECCOMP=y
+# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+CONFIG_PHYSICAL_START=0x100000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_HOTPLUG_CPU=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
+
+#
+# Power management and ACPI options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
+# CONFIG_PM_RUNTIME is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS is not set
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_SYSFS_POWER=y
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BUTTON=y
+# CONFIG_ACPI_VIDEO is not set
+CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_DOCK is not set
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_HOTPLUG_CPU=y
+# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_PCI_SLOT is not set
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=y
+# CONFIG_ACPI_SBS is not set
+# CONFIG_SFI is not set
+# CONFIG_APM is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOOLPC is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_STUB is not set
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_ISA_DMA_API=y
+CONFIG_ISA=y
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+# CONFIG_OLPC is not set
+CONFIG_K8_NB=y
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=m
+CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+CONFIG_NF_CT_PROTO_GRE=m
+# CONFIG_NF_CT_PROTO_SCTP is not set
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+# CONFIG_NF_CONNTRACK_SANE is not set
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+# CONFIG_NETFILTER_TPROXY is not set
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+# CONFIG_IP6_NF_QUEUE is not set
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+# CONFIG_BRIDGE_EBT_IP6 is not set
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+# CONFIG_BRIDGE_EBT_ULOG is not set
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+CONFIG_NET_CLS_ROUTE=y
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+# CONFIG_KINGSUN_DONGLE is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
+# CONFIG_KS959_DONGLE is not set
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
+# CONFIG_NSC_FIR is not set
+# CONFIG_WINBOND_FIR is not set
+# CONFIG_TOSHIBA_FIR is not set
+# CONFIG_SMC_IRCC_FIR is not set
+# CONFIG_ALI_FIR is not set
+# CONFIG_VLSI_FIR is not set
+# CONFIG_VIA_FIR is not set
+# CONFIG_MCS_FIR is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BT_HCIBTUSB is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_LL is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+# CONFIG_BT_MRVL is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+CONFIG_LIB80211=m
+# CONFIG_LIB80211_DEBUG is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+# CONFIG_MTD is not set
+CONFIG_PARPORT=y
+CONFIG_PARPORT_PC=y
+# CONFIG_PARPORT_SERIAL is not set
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+# CONFIG_PARPORT_GSC is not set
+# CONFIG_PARPORT_AX88796 is not set
+# CONFIG_PARPORT_1284 is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+# CONFIG_ISAPNP is not set
+# CONFIG_PNPBIOS is not set
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=y
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=65536
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_CS5535_MFGPT is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_CB710_CORE is not set
+CONFIG_HAVE_IDE=y
+CONFIG_IDE=y
+
+#
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
+#
+CONFIG_IDE_XFER_MODE=y
+CONFIG_IDE_TIMINGS=y
+CONFIG_IDE_ATAPI=y
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
+CONFIG_BLK_DEV_IDECD=y
+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEACPI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_PLATFORM is not set
+CONFIG_BLK_DEV_CMD640=y
+# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+CONFIG_BLK_DEV_IDEDMA_SFF=y
+
+#
+# PCI IDE chipsets support
+#
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_RZ1000=y
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_CS5536 is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+CONFIG_BLK_DEV_PIIX=y
+# CONFIG_BLK_DEV_IT8172 is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+#
+# Other IDE chipsets support
+#
+
+#
+# Note: most of these also require special kernel boot parameters
+#
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_QD65XX is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
+CONFIG_BLK_DEV_IDEDMA=y
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_MVSAS is not set
+CONFIG_SCSI_DPT_I2O=m
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_VMWARE_PVSCSI is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_FCOE is not set
+# CONFIG_FCOE_FNIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_PMCRAID is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_ATA is not set
+CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+# CONFIG_DM_LOG_USERSPACE is not set
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+# CONFIG_DM_MULTIPATH_QL is not set
+# CONFIG_DM_MULTIPATH_ST is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# The newer stack is recommended.
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_VETH is not set
+# CONFIG_NET_SB1000 is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+CONFIG_NET_VENDOR_3COM=y
+# CONFIG_EL1 is not set
+# CONFIG_EL2 is not set
+# CONFIG_ELPLUS is not set
+# CONFIG_EL16 is not set
+# CONFIG_EL3 is not set
+# CONFIG_3C515 is not set
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_LANCE=m
+CONFIG_NET_VENDOR_SMC=y
+CONFIG_WD80x3=m
+CONFIG_ULTRA=m
+CONFIG_SMC9194=m
+# CONFIG_ETHOC is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+# CONFIG_DNET is not set
+CONFIG_NET_TULIP=y
+# CONFIG_DE2104X is not set
+CONFIG_TULIP=m
+CONFIG_TULIP_MWI=y
+CONFIG_TULIP_MMIO=y
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_AT1700=m
+CONFIG_DEPCA=m
+CONFIG_HP100=m
+CONFIG_NET_ISA=y
+# CONFIG_E2100 is not set
+# CONFIG_EWRK3 is not set
+# CONFIG_EEXPRESS is not set
+# CONFIG_EEXPRESS_PRO is not set
+# CONFIG_HPLAN_PLUS is not set
+# CONFIG_HPLAN is not set
+# CONFIG_LP486E is not set
+# CONFIG_ETH16I is not set
+CONFIG_NE2000=y
+# CONFIG_ZNET is not set
+# CONFIG_SEEQ8005 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_AC3200=m
+CONFIG_APRICOT=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+CONFIG_FORCEDETH_NAPI=y
+CONFIG_CS89x0=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=y
+CONFIG_8139CP=y
+CONFIG_8139TOO=y
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_R6040 is not set
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+# CONFIG_SMSC9420 is not set
+CONFIG_SUNDANCE=m
+CONFIG_SUNDANCE_MMIO=y
+CONFIG_TLAN=m
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851_MLL is not set
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_SC92031=m
+# CONFIG_NET_POCKET is not set
+# CONFIG_ATL2 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+CONFIG_ACENIC_OMIT_TIGON_I=y
+CONFIG_DL2K=m
+CONFIG_E1000=m
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_R8169_VLAN=y
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+# CONFIG_CNIC is not set
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_JME is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+CONFIG_CHELSIO_T3_DEPENDS=y
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_ENIC is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGB is not set
+CONFIG_S2IO=m
+# CONFIG_VXGE is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NIU is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_BNX2X is not set
+# CONFIG_QLGE is not set
+# CONFIG_SFC is not set
+# CONFIG_BE2NET is not set
+# CONFIG_TR is not set
+# CONFIG_WLAN is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=m
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_QT2160 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TABLET=y
+# CONFIG_TABLET_USB_ACECAD is not set
+# CONFIG_TABLET_USB_AIPTEK is not set
+# CONFIG_TABLET_USB_GTCO is not set
+# CONFIG_TABLET_USB_KBTAB is not set
+CONFIG_TABLET_USB_WACOM=y
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_PCSPKR is not set
+# CONFIG_INPUT_APANEL is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_WINBOND_CIR is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_PRINTER=y
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
+# CONFIG_MWAVE is not set
+# CONFIG_PC8736x_GPIO is not set
+# CONFIG_NSC_GPIO is not set
+# CONFIG_CS5535_GPIO is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HPET is not set
+# CONFIG_HANGCHECK_TIMER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_COMPAT is not set
+# CONFIG_I2C_CHARDEV is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# ACPI drivers
+#
+# CONFIG_I2C_SCMI is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_SCx200_ACB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_GPIOLIB is not set
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+# CONFIG_SSB_B43_PCI_BRIDGE is not set
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+# CONFIG_VGA_ARB is not set
+CONFIG_DRM=m
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_I810 is not set
+# CONFIG_DRM_I830 is not set
+# CONFIG_DRM_I915 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_VIA is not set
+# CONFIG_DRM_SAVAGE is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+CONFIG_FB_UVESA=m
+# CONFIG_FB_VESA is not set
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_INTEL is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_PLATFORM is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_GENERIC=m
+# CONFIG_BACKLIGHT_PROGEAR is not set
+# CONFIG_BACKLIGHT_MBP_NVIDIA is not set
+# CONFIG_BACKLIGHT_SAHARA is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_SEQUENCER=y
+# CONFIG_SND_SEQ_DUMMY is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=y
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_ISA=y
+# CONFIG_SND_ADLIB is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_DT019X is not set
+# CONFIG_SND_ES968 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_SC6000 is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+# CONFIG_SND_MIRO is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_MSND_PINNACLE is not set
+# CONFIG_SND_MSND_CLASSIC is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HIFIER is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+CONFIG_SND_INTEL8X0=y
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SIS7019 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# Special HID drivers
+#
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_ZEROPLUS is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_MON=y
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_XHCI_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+# CONFIG_USB_SERIAL_CP210X is not set
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+# CONFIG_USB_SERIAL_IUU is not set
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+# CONFIG_USB_SERIAL_OPTION is not set
+CONFIG_USB_SERIAL_OMNINET=m
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+# CONFIG_USB_BERRY_CHARGE is not set
+CONFIG_USB_LED=m
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_VST is not set
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_UWB is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_ALIX2 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_CLEVO_MAIL is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_INTEL_SS4200 is not set
+
+#
+# LED Triggers
+#
+# CONFIG_LEDS_TRIGGERS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_ACER_WMI is not set
+# CONFIG_ASUS_LAPTOP is not set
+# CONFIG_FUJITSU_LAPTOP is not set
+# CONFIG_TC1100_WMI is not set
+# CONFIG_MSI_LAPTOP is not set
+# CONFIG_PANASONIC_LAPTOP is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_THINKPAD_ACPI is not set
+# CONFIG_INTEL_MENLOW is not set
+# CONFIG_ACPI_WMI is not set
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_TOPSTAR_LAPTOP is not set
+# CONFIG_ACPI_TOSHIBA is not set
+# CONFIG_TOSHIBA_BT_RFKILL is not set
+# CONFIG_ACPI_CMPC is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+CONFIG_FIRMWARE_MEMMAP=y
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+CONFIG_DMIID=y
+# CONFIG_ISCSI_IBFT_FIND is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_CRAMFS=m
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=y
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="cp437"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=y
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_STACKTRACE=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_4KSTACKS is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_OPTIMIZE_INLINING is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI2=m
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=m
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH2=m
+CONFIG_CRYPTO_RNG2=m
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=m
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_WORKQUEUE=m
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=m
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_GHASH is not set
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_AES_586 is not set
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+# CONFIG_CRYPTO_TWOFISH_586 is not set
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_ZLIB is not set
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
+CONFIG_HAVE_KVM=y
+CONFIG_VIRTUALIZATION=y
+# CONFIG_KVM is not set
+# CONFIG_LGUEST is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=m
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33/ARM-Add-support-for-LZMA-compressed-kernel-images.patch b/recipes/linux/linux-2.6.34/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
index 42905c552e..6f5e00aa8e 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
+++ b/recipes/linux/linux-2.6.34/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
@@ -2,14 +2,14 @@ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
 index 350921d..34163da 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -20,6 +20,7 @@ config ARM
+@@ -21,6 +21,7 @@
  	select HAVE_GENERIC_DMA_COHERENT
  	select HAVE_KERNEL_GZIP
  	select HAVE_KERNEL_LZO
 +	select HAVE_KERNEL_LZMA
+ 	select HAVE_PERF_EVENTS
+ 	select PERF_USE_VMALLOC
  	help
- 	  The ARM series is a line of low-power-consumption RISC chip designs
- 	  licensed by ARM Ltd and targeted at embedded applications and
 diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
 index 2d4d88b..3906432 100644
 --- a/arch/arm/boot/compressed/Makefile
@@ -24,9 +24,9 @@ index 2d4d88b..3906432 100644
  		 piggy.$(suffix_y) piggy.$(suffix_y).o \
 diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
 index 7e0fe4d..4e35a10 100644
---- a/arch/arm/boot/compressed/misc.c
-+++ b/arch/arm/boot/compressed/misc.c
-@@ -252,6 +252,10 @@
+--- a/arch/arm/boot/compressed/decompress.c
++++ b/arch/arm/boot/compressed/decompress.c
+@@ -40,6 +40,10 @@
  #include "../../../../lib/decompress_unlzo.c"
  #endif
  
@@ -34,9 +34,9 @@ index 7e0fe4d..4e35a10 100644
 +#include "../../../../lib/decompress_unlzma.c"
 +#endif
 +
- #ifndef arch_error
- #define arch_error(x)
- #endif
+ void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
+ {
+ 	decompress(input, len, NULL, NULL, output, NULL, error);
 diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
 new file mode 100644
 index 0000000..d7e69cf
diff --git a/recipes/linux/linux-2.6.34/spitz/defconfig b/recipes/linux/linux-2.6.34/spitz/defconfig
new file mode 100644
index 0000000000..6b7d13213e
--- /dev/null
+++ b/recipes/linux/linux-2.6.34/spitz/defconfig
@@ -0,0 +1,2242 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.34
+# Mon May 17 09:31:07 2010
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+# CONFIG_SLUB is not set
+CONFIG_SLOB=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_SLOW_WORK_DEBUG is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+# CONFIG_LBDAF is not set
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+CONFIG_FREEZER=y
+
+#
+# System Type
+#
+CONFIG_MMU=y
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_STMP3XXX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_NUC93X is not set
+# CONFIG_ARCH_PNX4008 is not set
+CONFIG_ARCH_PXA=y
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P6440 is not set
+# CONFIG_ARCH_S5P6442 is not set
+# CONFIG_ARCH_S5PC1XX is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Intel PXA2xx/PXA3xx Implementations
+#
+
+#
+# Intel/Marvell Dev Platforms (sorted by hardware release time)
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_MACH_ZYLONITE300 is not set
+# CONFIG_MACH_ZYLONITE320 is not set
+# CONFIG_MACH_LITTLETON is not set
+# CONFIG_MACH_TAVOREVB is not set
+# CONFIG_MACH_SAAR is not set
+
+#
+# Third Party Dev Platforms (sorted by vendor name)
+#
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_ARCH_VIPER is not set
+# CONFIG_MACH_ARCOM_ZEUS is not set
+# CONFIG_MACH_BALLOON3 is not set
+# CONFIG_MACH_CSB726 is not set
+# CONFIG_MACH_ARMCORE is not set
+# CONFIG_MACH_EM_X270 is not set
+# CONFIG_MACH_EXEDA is not set
+# CONFIG_MACH_CM_X300 is not set
+# CONFIG_MACH_CAPC7117 is not set
+# CONFIG_ARCH_GUMSTIX is not set
+# CONFIG_MACH_INTELMOTE2 is not set
+# CONFIG_MACH_STARGATE2 is not set
+# CONFIG_MACH_XCEP is not set
+# CONFIG_TRIZEPS_PXA is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
+# CONFIG_MACH_PCM027 is not set
+# CONFIG_MACH_COLIBRI is not set
+# CONFIG_MACH_COLIBRI300 is not set
+# CONFIG_MACH_COLIBRI320 is not set
+
+#
+# End-user Products (sorted by vendor name)
+#
+# CONFIG_MACH_H4700 is not set
+# CONFIG_MACH_H5000 is not set
+# CONFIG_MACH_HIMALAYA is not set
+# CONFIG_MACH_MAGICIAN is not set
+# CONFIG_MACH_MIOA701 is not set
+# CONFIG_PXA_EZX is not set
+# CONFIG_MACH_MP900C is not set
+# CONFIG_ARCH_PXA_PALM is not set
+# CONFIG_MACH_RAUMFELD_RC is not set
+# CONFIG_MACH_RAUMFELD_CONNECTOR is not set
+# CONFIG_MACH_RAUMFELD_SPEAKER is not set
+CONFIG_PXA_SHARPSL=y
+CONFIG_SHARPSL_PM=y
+CONFIG_SHARPSL_PM_MAX1111=y
+# CONFIG_MACH_POODLE is not set
+# CONFIG_MACH_CORGI is not set
+# CONFIG_MACH_SHEPHERD is not set
+# CONFIG_MACH_HUSKY is not set
+# CONFIG_MACH_AKITA is not set
+CONFIG_MACH_SPITZ=y
+# CONFIG_MACH_BORZOI is not set
+# CONFIG_MACH_TOSA is not set
+# CONFIG_MACH_ICONTROL is not set
+# CONFIG_ARCH_PXA_ESERIES is not set
+CONFIG_PXA27x=y
+CONFIG_PXA_SHARP_Cxx00=y
+CONFIG_PXA_SSP=y
+CONFIG_PLAT_PXA=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_PABRT_LEGACY=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+CONFIG_ARM_L1_CACHE_SHIFT=5
+CONFIG_IWMMXT=y
+CONFIG_XSCALE_PMU=y
+CONFIG_CPU_HAS_PMU=y
+CONFIG_SHARP_PARAM=y
+CONFIG_SHARP_SCOOP=y
+CONFIG_COMMON_CLKDEV=y
+
+#
+# Bus support
+#
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCCARD=y
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+# CONFIG_PCMCIA_IOCTL is not set
+
+#
+# PC-card bridges
+#
+CONFIG_PCMCIA_SOC_COMMON=y
+CONFIG_PCMCIA_PXA2XX=y
+# CONFIG_PCMCIA_DEBUG is not set
+
+#
+# Kernel Features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_HZ=100
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=999999
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE=" debug "
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
+
+#
+# CPU Power Management
+#
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=m
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_APM_EMULATION=y
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_OPS=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+CONFIG_NF_CONNTRACK=m
+# CONFIG_NF_CT_ACCT is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+CONFIG_NF_CONNTRACK_SIP=m
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_CT is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+CONFIG_NETFILTER_XT_TARGET_HL=m
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+CONFIG_NETFILTER_XT_MATCH_HL=m
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+# CONFIG_KINGSUN_DONGLE is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
+# CONFIG_KS959_DONGLE is not set
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
+CONFIG_PXA_FICP=m
+# CONFIG_MCS_FIR is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_LL is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+# CONFIG_BT_MRVL is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_DEFAULT_PS is not set
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_RC_PID is not set
+# CONFIG_MAC80211_RC_MINSTREL is not set
+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
+CONFIG_MAC80211_RC_DEFAULT=""
+# CONFIG_MAC80211_MESH is not set
+# CONFIG_MAC80211_LEDS is not set
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+CONFIG_MTD_ROM=y
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=y
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_H1900 is not set
+# CONFIG_MTD_NAND_GPIO is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_NAND_SHARPSL=y
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
+# UBI - Unsorted block images
+#
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MG_DISK is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_IWMC3200TOP is not set
+CONFIG_HAVE_IDE=y
+CONFIG_IDE=y
+
+#
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
+CONFIG_BLK_DEV_IDECS=y
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_SATA_PMP=y
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_MV is not set
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PLATFORM is not set
+CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
+# CONFIG_BLK_DEV_DM is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_VETH is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=m
+# CONFIG_AX88796 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+# CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_DNET is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_B44 is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+CONFIG_WLAN=y
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_ATMEL is not set
+# CONFIG_AT76C50X_USB is not set
+CONFIG_AIRO_CS=m
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_ATH_COMMON is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_CS=m
+# CONFIG_IWM is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_HERMES is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_WL12XX is not set
+# CONFIG_ZD1211RW is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_CDC_EEM is not set
+CONFIG_USB_NET_DM9601=m
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+CONFIG_USB_NET_ZAURUS=m
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_IPHETH is not set
+CONFIG_USB_SIERRA_NET=m
+CONFIG_NET_PCMCIA=y
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+CONFIG_PCMCIA_PCNET=m
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_AXNET is not set
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+CONFIG_INPUT_APMPOWER=y
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_QT2160 is not set
+# CONFIG_KEYBOARD_CORGI is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_MATRIX=y
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_PXA27x is not set
+CONFIG_KEYBOARD_SPITZ=y
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=y
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_CORGI is not set
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+CONFIG_SERIAL_PXA=y
+CONFIG_SERIAL_PXA_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_TIMBERDALE is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_R3964 is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_IPWIRELESS is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+# CONFIG_I2C_CHARDEV is not set
+CONFIG_I2C_HELPER_AUTO=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_PXA=y
+# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_PXA2XX=y
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+
+#
+# Memory mapped GPIO expanders:
+#
+# CONFIG_GPIO_IT8761E is not set
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_ADP5588 is not set
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+CONFIG_POWER_SUPPLY_DEBUG=y
+CONFIG_PDA_POWER=y
+CONFIG_APM_POWER=y
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LM95241 is not set
+CONFIG_SENSORS_MAX1111=y
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_AB4500_CORE is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_PXA=y
+CONFIG_FB_PXA_OVERLAY=y
+CONFIG_FB_PXA_SMARTPANEL=y
+CONFIG_FB_PXA_PARAMETERS=y
+# CONFIG_FB_MBX is not set
+# CONFIG_FB_W100 is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_CORGI=y
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LCD_PLATFORM is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=y
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=y
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_LOGO is not set
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+# CONFIG_SND_SEQ_DUMMY is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_SEQUENCER_OSS is not set
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_RAWMIDI_SEQ=m
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_ARM=y
+CONFIG_SND_PXA2XX_PCM=m
+CONFIG_SND_PXA2XX_LIB=m
+CONFIG_SND_PXA2XX_LIB_AC97=y
+CONFIG_SND_PXA2XX_AC97=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_CAIAQ is not set
+CONFIG_SND_PCMCIA=y
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_PXA2XX_SOC=m
+CONFIG_SND_PXA2XX_SOC_I2S=m
+CONFIG_SND_PXA2XX_SOC_SPITZ=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+# CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_WM8750=m
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+
+#
+# Special HID drivers
+#
+# CONFIG_HID_3M_PCT is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MOSART is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_STANTUM is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_ZEROPLUS is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=m
+CONFIG_USB_DEBUG=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+CONFIG_USB_OTG_WHITELIST=y
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_MON=m
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+# CONFIG_USB_SERIAL_CP210X is not set
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+# CONFIG_USB_SERIAL_IUU is not set
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+# CONFIG_USB_SERIAL_OPTION is not set
+CONFIG_USB_SERIAL_OMNINET=m
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_GADGET_DEBUG_FS=y
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+CONFIG_USB_GADGET_PXA27X=y
+CONFIG_USB_PXA27X=m
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+CONFIG_USB_ZERO=m
+# CONFIG_USB_AUDIO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_CDC_COMPOSITE=m
+# CONFIG_USB_G_NOKIA is not set
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_USB_ULPI=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_UNSAFE_RESUME=y
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_PXA=y
+# CONFIG_MMC_SDHCI is not set
+CONFIG_MMC_SPI=y
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_GPIO is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_XATTR is not set
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+# CONFIG_LOGFS is not set
+CONFIG_CRAMFS=m
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
+# CONFIG_CEPH_FS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="cp437"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=y
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_RCU_CPU_STALL_DETECTOR=y
+# CONFIG_LKDTM is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_RING_BUFFER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_ARM_UNWIND=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_OC_ETM is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI2=m
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=m
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH2=m
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=m
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=m
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_WORKQUEUE=m
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=m
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_GHASH is not set
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_ZLIB is not set
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=m
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
+CONFIG_GENERIC_ATOMIC64=y
diff --git a/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb b/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
index 2056fc92fd..b3557d52e3 100644
--- a/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
+++ b/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
@@ -5,15 +5,15 @@ LICENSE = "GPLv2"
 COMPATIBLE_MACHINE = "amsdelta"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2;name=kernel \
-	http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2;patch=1;name=omap2patch \
-	http://the.earth.li/pub/e3/2.6.16/00-ams-delta-backlight.diff;patch=1;name=amspatch1 \
-	http://the.earth.li/pub/e3/2.6.16/01-ams-delta-lcd.diff;patch=1;name=amspatch2 \
-	http://the.earth.li/pub/e3/2.6.16/02-ams-delta-keypad.diff;patch=1;name=amspatch3 \
-	http://the.earth.li/pub/e3/2.6.16/03-ams-delta-modem.diff;patch=1;name=amspatch4 \
-	http://the.earth.li/pub/e3/2.6.16/04-omapfb-12bpp-support.diff;patch=1;name=amspatch5 \
-	http://the.earth.li/pub/e3/2.6.16/05-ams-delta-nand.diff;patch=1;name=amspatch6 \
-	http://the.earth.li/pub/e3/2.6.16/06-ams-delta-keyboard.diff;patch=1;name=amspatch7 \
-	http://the.earth.li/pub/e3/2.6.16/08-ams-delta-sound.diff;patch=1;name=amspatch8 \
+	http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2;apply=yes;name=omap2patch \
+	http://the.earth.li/pub/e3/2.6.16/00-ams-delta-backlight.diff;name=amspatch1 \
+	http://the.earth.li/pub/e3/2.6.16/01-ams-delta-lcd.diff;name=amspatch2 \
+	http://the.earth.li/pub/e3/2.6.16/02-ams-delta-keypad.diff;name=amspatch3 \
+	http://the.earth.li/pub/e3/2.6.16/03-ams-delta-modem.diff;name=amspatch4 \
+	http://the.earth.li/pub/e3/2.6.16/04-omapfb-12bpp-support.diff;name=amspatch5 \
+	http://the.earth.li/pub/e3/2.6.16/05-ams-delta-nand.diff;name=amspatch6 \
+	http://the.earth.li/pub/e3/2.6.16/06-ams-delta-keyboard.diff;name=amspatch7 \
+	http://the.earth.li/pub/e3/2.6.16/08-ams-delta-sound.diff;name=amspatch8 \
 	file://defconfig"
 S = "${WORKDIR}/linux-2.6.16"
 
diff --git a/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb b/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb
index fa77dbd108..a59806d7e6 100644
--- a/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb
+++ b/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb
@@ -7,10 +7,10 @@ KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2;name=kernel \
-           ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.25-vrs1.bz2;patch=1;name=patch1 \
-           http://www.simtec.co.uk/products/SWLINUX/files/patch-2.4.25-vrs1-bast1.bz2;patch=1;name=patch2 \
+           ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.25-vrs1.bz2;apply=yes;name=patch1 \
+           http://www.simtec.co.uk/products/SWLINUX/files/patch-2.4.25-vrs1-bast1.bz2;apply=yes;name=patch2 \
            file://defconfig \
-           file://mkdep.patch;patch=1 \
+           file://mkdep.patch \
            file://defconfig"
 S = "${WORKDIR}/linux-${KV}"
 
diff --git a/recipes/linux/linux-bd-neon-2.6_2.6.22.bb b/recipes/linux/linux-bd-neon-2.6_2.6.22.bb
index 03c0bc8acc..1e3f671859 100644
--- a/recipes/linux/linux-bd-neon-2.6_2.6.22.bb
+++ b/recipes/linux/linux-bd-neon-2.6_2.6.22.bb
@@ -8,8 +8,8 @@ DEPENDS += "u-boot-utils-native"
 PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2;name=kernel \
-           http://www.boundarydevices.com/boundary-2.6.22-2007-07-22.patch.bz2;patch=1;name=patch \
-           file://neon-jffs2-config.patch;patch=1"
+           http://www.boundarydevices.com/boundary-2.6.22-2007-07-22.patch.bz2;name=patch \
+           file://neon-jffs2-config.patch"
 
 S = "${WORKDIR}/linux-2.6.22"
 
diff --git a/recipes/linux/linux-bug_2.6.27.2.bb b/recipes/linux/linux-bug_2.6.27.2.bb
index e8d2c1710c..469a6e3978 100644
--- a/recipes/linux/linux-bug_2.6.27.2.bb
+++ b/recipes/linux/linux-bug_2.6.27.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux kernel for bug"
 
-PV_append = "+svnr${SRCPV}"
+PV_append = "+svnr${SRCREV}"
 KV = "2.6.27.2"
 PR = "r32"
 
diff --git a/recipes/linux/linux-colinux_2.4.28.bb b/recipes/linux/linux-colinux_2.4.28.bb
index 9b53ad1a1c..f7ceab2dbc 100644
--- a/recipes/linux/linux-colinux_2.4.28.bb
+++ b/recipes/linux/linux-colinux_2.4.28.bb
@@ -7,12 +7,12 @@ COMPATIBLE_MACHINE = "colinux"
 
 #http://internap.dl.sourceforge.net/sourceforge/colinux/coLinux-0.6.1.tar.gz
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
-	   file://colinux-${COLV}.patch;patch=1 \
-	   file://nofpu.patch;patch=1 \
-	   file://shortloadbytes.patch;patch=1 \
-	   file://gcc-registerparanoia.patch;patch=1 \
-	   file://linux-2.4.24-attribute-used.patch;patch=1 \
-	   file://gcc340-fixes-v2.4.26-try3.patch;patch=1 \
+	   file://colinux-${COLV}.patch \
+	   file://nofpu.patch \
+	   file://shortloadbytes.patch \
+	   file://gcc-registerparanoia.patch \
+	   file://linux-2.4.24-attribute-used.patch \
+	   file://gcc340-fixes-v2.4.26-try3.patch \
            file://defconfig"
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/recipes/linux/linux-colinux_2.6.10.bb b/recipes/linux/linux-colinux_2.6.10.bb
index 1deb8e829c..d86f3e2d7f 100644
--- a/recipes/linux/linux-colinux_2.6.10.bb
+++ b/recipes/linux/linux-colinux_2.6.10.bb
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "colinux"
 
 #http://internap.dl.sourceforge.net/sourceforge/colinux/coLinux-${COLV}.tar.gz
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-	   file://colinux-${COLV}.patch;patch=1 \
+	   file://colinux-${COLV}.patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig
index 553c18e106..b3120502fa 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig
+++ b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig
@@ -258,9 +258,7 @@ CONFIG_DAVINCI_MUX=y
 # CONFIG_DAVINCI_MUX_DEBUG is not set
 # CONFIG_DAVINCI_MUX_WARNINGS is not set
 CONFIG_DAVINCI_RESET_CLOCKS=y
-CONFIG_DAVINCI_MCBSP=y
-# CONFIG_DAVINCI_MCBSP0 is not set
-CONFIG_DAVINCI_MCBSP1=y
+# CONFIG_DAVINCI_MCBSP is not set
 
 #
 # Processor Type
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats
index c3fb62a389..4836640025 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats
+++ b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats
@@ -259,9 +259,7 @@ CONFIG_DAVINCI_MUX=y
 # CONFIG_DAVINCI_MUX_DEBUG is not set
 # CONFIG_DAVINCI_MUX_WARNINGS is not set
 CONFIG_DAVINCI_RESET_CLOCKS=y
-CONFIG_DAVINCI_MCBSP=y
-# CONFIG_DAVINCI_MCBSP0 is not set
-CONFIG_DAVINCI_MCBSP1=y
+# CONFIG_DAVINCI_MCBSP is not set
 
 #
 # Processor Type
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap
index ef2e835eba..0597147d84 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap
+++ b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap
@@ -258,9 +258,7 @@ CONFIG_DAVINCI_MUX=y
 # CONFIG_DAVINCI_MUX_DEBUG is not set
 # CONFIG_DAVINCI_MUX_WARNINGS is not set
 CONFIG_DAVINCI_RESET_CLOCKS=y
-CONFIG_DAVINCI_MCBSP=y
-# CONFIG_DAVINCI_MCBSP0 is not set
-CONFIG_DAVINCI_MCBSP1=y
+# CONFIG_DAVINCI_MCBSP is not set
 
 #
 # Processor Type
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis
index fcb520aefc..5f40d99c37 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis
+++ b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis
@@ -258,9 +258,7 @@ CONFIG_DAVINCI_MUX=y
 # CONFIG_DAVINCI_MUX_DEBUG is not set
 # CONFIG_DAVINCI_MUX_WARNINGS is not set
 CONFIG_DAVINCI_RESET_CLOCKS=y
-CONFIG_DAVINCI_MCBSP=y
-# CONFIG_DAVINCI_MCBSP0 is not set
-CONFIG_DAVINCI_MCBSP1=y
+# CONFIG_DAVINCI_MCBSP is not set
 
 #
 # Processor Type
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig b/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
index f409ece946..8462139df5 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
+++ b/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
@@ -259,9 +259,7 @@ CONFIG_DAVINCI_MUX=y
 # CONFIG_DAVINCI_MUX_DEBUG is not set
 # CONFIG_DAVINCI_MUX_WARNINGS is not set
 CONFIG_DAVINCI_RESET_CLOCKS=y
-CONFIG_DAVINCI_MCBSP=y
-# CONFIG_DAVINCI_MCBSP0 is not set
-CONFIG_DAVINCI_MCBSP1=y
+# CONFIG_DAVINCI_MCBSP is not set
 
 #
 # Processor Type
diff --git a/recipes/linux/linux-davinci/hawkboard/patch-2.6.33rc4-psp-to-hawkboard.patch b/recipes/linux/linux-davinci/hawkboard/patch-2.6.33rc4-psp-to-hawkboard.patch
index c4ecf4dcf6..bd986a58fb 100644
--- a/recipes/linux/linux-davinci/hawkboard/patch-2.6.33rc4-psp-to-hawkboard.patch
+++ b/recipes/linux/linux-davinci/hawkboard/patch-2.6.33rc4-psp-to-hawkboard.patch
@@ -1,6 +1,6 @@
-From e05dda2d92995969f9268ae8e19a949344e54b21 Mon Sep 17 00:00:00 2001
+From a9847b4b964b65b8a3f041550c4a15342d151b88 Mon Sep 17 00:00:00 2001
 From: Roger Monk <r-monk@ti.com>
-Date: Wed, 24 Feb 2010 17:50:56 +0000
+Date: Wed, 19 May 2010 13:43:53 +0100
 Subject: [PATCH] Hawkboard Support:  Add Hawkboard (DA850/OMAPL138 based) Board Support
 
    * Hawkboard(.org) (http://www.hawkboard.org) Board Support
@@ -39,14 +39,14 @@ Signed-off-by: Roger Monk <r-monk@ti.com>
  arch/arm/mach-davinci/Makefile                     |    1 +
  arch/arm/mach-davinci/board-da850-hawk.c           |  657 +++++++
  arch/arm/mach-davinci/da850.c                      |    2 +-
- arch/arm/mach-davinci/devices-da8xx.c              |    6 +
+ arch/arm/mach-davinci/devices-da8xx.c              |    8 +
  arch/arm/mach-davinci/include/mach/da8xx.h         |    2 +
  arch/arm/mach-davinci/include/mach/debug-macro.S   |    3 +-
  drivers/media/video/Kconfig                        |    4 +-
  drivers/video/da8xx-fb.c                           |   14 +
  sound/soc/davinci/Kconfig                          |    6 +-
  sound/soc/davinci/davinci-evm.c                    |    5 +-
- 12 files changed, 2565 insertions(+), 9 deletions(-)
+ 12 files changed, 2567 insertions(+), 9 deletions(-)
  create mode 100644 arch/arm/configs/da850_omapl138_hawkboard_defconfig
  create mode 100644 arch/arm/mach-davinci/board-da850-hawk.c
 
@@ -1955,7 +1955,7 @@ index f4e55de..ad0e75e 100644
  obj-$(CONFIG_CPU_FREQ)			+= cpufreq.o
 diff --git a/arch/arm/mach-davinci/board-da850-hawk.c b/arch/arm/mach-davinci/board-da850-hawk.c
 new file mode 100644
-index 0000000..2963836
+index 0000000..87ed017
 --- /dev/null
 +++ b/arch/arm/mach-davinci/board-da850-hawk.c
 @@ -0,0 +1,657 @@
@@ -2630,7 +2630,7 @@ index cfecd3c..a32c636 100755
  };
  
 diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
-index 2cea325..96f2235 100755
+index 0842590..97a4611 100755
 --- a/arch/arm/mach-davinci/devices-da8xx.c
 +++ b/arch/arm/mach-davinci/devices-da8xx.c
 @@ -560,6 +560,12 @@ struct da8xx_lcdc_platform_data sharp_lk043t1dg01_pdata = {
@@ -2646,8 +2646,20 @@ index 2cea325..96f2235 100755
  #if !defined(CONFIG_FB_DA8XX) && !defined(CONFIG_FB_DA8XX_MODULE)
  static struct da8xx_clcd_platform_data da8xx_evm_clcd_pdata = {
  	.version = CONFIG_SPACE_1,
+@@ -664,9 +670,11 @@ int da8xx_register_rtc(void)
+ {
+ 	int ret;
+ 
++#ifdef CONFIG_RTC_DRV_OMAP
+ 	/* Unlock the rtc's registers */
+ 	__raw_writel(0x83e70b13, IO_ADDRESS(DA8XX_RTC_BASE + 0x6c));
+ 	__raw_writel(0x95a4f1e0, IO_ADDRESS(DA8XX_RTC_BASE + 0x70));
++#endif
+ 
+ 	ret = platform_device_register(&da8xx_rtc_device);
+ 	if (!ret)
 diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
-index d684431..3288273 100755
+index f76433f..c39b5b0 100755
 --- a/arch/arm/mach-davinci/include/mach/da8xx.h
 +++ b/arch/arm/mach-davinci/include/mach/da8xx.h
 @@ -168,6 +168,8 @@ extern struct platform_device da8xx_serial_device;
@@ -2692,7 +2704,7 @@ index d0db690..ea91489 100644
  	  To compile this driver as a module, choose M here: the
  	  module will be called vpif_capture.
 diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
-index e984388..67e3c3a 100644
+index faa1fd3..d416923 100644
 --- a/drivers/video/da8xx-fb.c
 +++ b/drivers/video/da8xx-fb.c
 @@ -196,6 +196,20 @@ static struct da8xx_panel known_lcd_panels[] = {
diff --git a/recipes/linux/linux-davinci_2.6.25.bb b/recipes/linux/linux-davinci_2.6.25.bb
index ef4c919e0e..919aee3f15 100644
--- a/recipes/linux/linux-davinci_2.6.25.bb
+++ b/recipes/linux/linux-davinci_2.6.25.bb
@@ -8,9 +8,9 @@ PV = "2.6.25"
 COMPATIBLE_MACHINE = "(davinci-dvevm|davinci-sffsdr)"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \
-           file://8250_davinci.patch;patch=1 \
+           file://8250_davinci.patch \
            file://defconfig"
 
-SRC_URI_append_davinci-sffsdr = " file://sffsdr.patch;patch=1"
+SRC_URI_append_davinci-sffsdr = " file://sffsdr.patch"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-davinci_2.6.28.bb b/recipes/linux/linux-davinci_2.6.28.bb
index 79abccfef7..be3ad81576 100644
--- a/recipes/linux/linux-davinci_2.6.28.bb
+++ b/recipes/linux/linux-davinci_2.6.28.bb
@@ -13,18 +13,18 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.g
            file://defconfig"
 
 SRC_URI_append_davinci-sffsdr = " \
-           file://0001-USB-musb-cppi-bugfixes.patch;patch=1 \
-           file://0002-ARM-Mark-unsupported-syscalls-as-IGNORE.patch;patch=1 \
-           file://0003-Add-macros-for-enabling-a-UART.patch;patch=1 \
-           file://0004-Davinci-Enable-MAC-address-to-be-specified-on-kerne.patch;patch=1 \
-           file://0005-Add-DAS-Mini-DAS-and-AFE-USB-machine-types.patch;patch=1 \
-           file://0006-ALSA-ASoC-DaVinci-Fix-SFFSDR-compilation-error.patch;patch=1 \
-           file://0007-ALSA-ASoC-Davinci-Fix-SFFSDR-FPGA-module-codec-FS.patch;patch=1 \
-           file://0008-ALSA-ASoC-Davinci-Fix-incorrect-machine-type-for.patch;patch=1 \
-           file://0009-sound-ASoC-Fix-DaVinci-module-unload-error.patch;patch=1 \
-           file://0010-Add-generic-FPGA-bitstream-loader-driver.patch;patch=1 \
-           file://0011-Add-lyrvpss-example-driver-for-the-SFFSDR-board.patch;patch=1 \
-           file://0012-Update-SFFSDR-to-support-FPGA-and-lyrvpss-drivers.patch;patch=1 \
+           file://0001-USB-musb-cppi-bugfixes.patch \
+           file://0002-ARM-Mark-unsupported-syscalls-as-IGNORE.patch \
+           file://0003-Add-macros-for-enabling-a-UART.patch \
+           file://0004-Davinci-Enable-MAC-address-to-be-specified-on-kerne.patch \
+           file://0005-Add-DAS-Mini-DAS-and-AFE-USB-machine-types.patch \
+           file://0006-ALSA-ASoC-DaVinci-Fix-SFFSDR-compilation-error.patch \
+           file://0007-ALSA-ASoC-Davinci-Fix-SFFSDR-FPGA-module-codec-FS.patch \
+           file://0008-ALSA-ASoC-Davinci-Fix-incorrect-machine-type-for.patch \
+           file://0009-sound-ASoC-Fix-DaVinci-module-unload-error.patch \
+           file://0010-Add-generic-FPGA-bitstream-loader-driver.patch \
+           file://0011-Add-lyrvpss-example-driver-for-the-SFFSDR-board.patch \
+           file://0012-Update-SFFSDR-to-support-FPGA-and-lyrvpss-drivers.patch \
           "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-davinci_2.6.30.bb b/recipes/linux/linux-davinci_2.6.30.bb
index 679f6819a7..601792b29b 100644
--- a/recipes/linux/linux-davinci_2.6.30.bb
+++ b/recipes/linux/linux-davinci_2.6.30.bb
@@ -10,26 +10,25 @@ DEFAULT_PREFERENCE = "1"
 SRCREV = "5212151f26e688416faac9f6f33ddd958f7de96c"
 
 # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
-PV = "2.6.30-${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "2.6.30-${PR}+gitr${SRCREV}"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \
            file://defconfig"
 
 # Need checking
 SRC_URI_append_davinci-sffsdr = " \
-           file://0001-USB-musb-cppi-bugfixes.patch;patch=1 \
-           file://0002-ARM-Mark-unsupported-syscalls-as-IGNORE.patch;patch=1 \
-           file://0003-Add-macros-for-enabling-a-UART.patch;patch=1 \
-           file://0004-Davinci-Enable-MAC-address-to-be-specified-on-kerne.patch;patch=1 \
-           file://0005-Add-DAS-Mini-DAS-and-AFE-USB-machine-types.patch;patch=1 \
-           file://0006-ALSA-ASoC-DaVinci-Fix-SFFSDR-compilation-error.patch;patch=1 \
-           file://0007-ALSA-ASoC-Davinci-Fix-SFFSDR-FPGA-module-codec-FS.patch;patch=1 \
-           file://0008-ALSA-ASoC-Davinci-Fix-incorrect-machine-type-for.patch;patch=1 \
-           file://0009-sound-ASoC-Fix-DaVinci-module-unload-error.patch;patch=1 \
-           file://0010-Add-generic-FPGA-bitstream-loader-driver.patch;patch=1 \
-           file://0011-Add-lyrvpss-example-driver-for-the-SFFSDR-board.patch;patch=1 \
-           file://0012-Update-SFFSDR-to-support-FPGA-and-lyrvpss-drivers.patch;patch=1 \
+           file://0001-USB-musb-cppi-bugfixes.patch \
+           file://0002-ARM-Mark-unsupported-syscalls-as-IGNORE.patch \
+           file://0003-Add-macros-for-enabling-a-UART.patch \
+           file://0004-Davinci-Enable-MAC-address-to-be-specified-on-kerne.patch \
+           file://0005-Add-DAS-Mini-DAS-and-AFE-USB-machine-types.patch \
+           file://0006-ALSA-ASoC-DaVinci-Fix-SFFSDR-compilation-error.patch \
+           file://0007-ALSA-ASoC-Davinci-Fix-SFFSDR-FPGA-module-codec-FS.patch \
+           file://0008-ALSA-ASoC-Davinci-Fix-incorrect-machine-type-for.patch \
+           file://0009-sound-ASoC-Fix-DaVinci-module-unload-error.patch \
+           file://0010-Add-generic-FPGA-bitstream-loader-driver.patch \
+           file://0011-Add-lyrvpss-example-driver-for-the-SFFSDR-board.patch \
+           file://0012-Update-SFFSDR-to-support-FPGA-and-lyrvpss-drivers.patch \
           "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
index 2a27f0ee8e..01259d9edb 100644
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -15,10 +15,9 @@ S = "${WORKDIR}/git"
 # DaVinci DM3xx/DM6xxx
 # dm355-evm/dm365-evm/dm6446-evm/dm6467-evm/dm6467t-evm Davinci PSP 03.01.00/03.02.00 (build r30)
 # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
-PE = "1"
 
 ARAGO_DM_REV = "e87a8397d2830db11ce1518bd2abc4e8815763f1"
-ARAGO_DM_PV  = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCPV}"
+ARAGO_DM_PV  = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}"
 ARAGO_DM_BR  = "r32"
 ARAGO_DM_URI = "git://arago-project.org/git/projects/linux-davinci.git;protocol=git;branch=${BRANCH} "
 
@@ -45,9 +44,9 @@ SRC_URI_append_dm6467  = ${ARAGO_DM_URI}
 
 # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
 
-# OMAPL tracking master branch
+# OMAPL tracking master branch - PSP 3.20.00.12
 
-ARAGO_L1_REV = "76fcecb83d562608bcebba44774f92b6c62d3593"
+ARAGO_L1_REV = "2acf935c01b9adb50164d421c40cdc5862b9e143"
 ARAGO_L1_BR  = "master"
 ARAGO_L1_PV  = "2.6.32+2.6.33-rc4-${PR}+gitr${SRCREV}"
 ARAGO_L1_URI = "git://arago-project.org/git/projects/linux-omapl1.git;protocol=git;branch=${BRANCH} "
@@ -72,7 +71,7 @@ SRC_URI_append_da850-omapl138-evm = "file://logo_linux_clut224.ppm \
                                      "
 
 SRC_URI_append_hawkboard          = "file://logo_linux_clut224.ppm \
-                                     file://patch-2.6.33rc4-psp-to-hawkboard.patch;patch=1 "
+                                     file://patch-2.6.33rc4-psp-to-hawkboard.patch "
 
 do_configure_prepend_dm355-leopard() {
 	sed -i s:2138:1381:g ${S}/arch/arm/tools/mach-types
diff --git a/recipes/linux/linux-ea3250_2.6.27.8.bb b/recipes/linux/linux-ea3250_2.6.27.8.bb
index 272227be3e..a3fff9f46b 100644
--- a/recipes/linux/linux-ea3250_2.6.27.8.bb
+++ b/recipes/linux/linux-ea3250_2.6.27.8.bb
@@ -11,16 +11,16 @@ PR = "r0"
 # that they will stay there indefinitely.
 #  - Joost
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.27.8.tar.bz2;name=kernel \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx.patch;patch=1;name=patch1 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-update1.patch;patch=1;name=patch2 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update2.patch;patch=1;name=patch3 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update3.patch;patch=1;name=patch4 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_armtskit_update2.patch;patch=1;name=patch5 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_ea3250.patch;patch=1;name=patch6 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update4.patch;patch=1;name=patch7 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update5.patch;patch=1;name=patch8 \
-	file://kernel-arm-2.6.27.8-lpc32xx_update5_fix.patch;patch=1 \
-	file://lpc32xx-spwm.patch;patch=1 \
+	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx.patch;name=patch1 \
+	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-update1.patch;name=patch2 \
+	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update2.patch;name=patch3 \
+	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update3.patch;name=patch4 \
+	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_armtskit_update2.patch;name=patch5 \
+	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_ea3250.patch;name=patch6 \
+	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update4.patch;name=patch7 \
+	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update5.patch;name=patch8 \
+	file://kernel-arm-2.6.27.8-lpc32xx_update5_fix.patch \
+	file://lpc32xx-spwm.patch \
 	file://defconfig"
 
 # Source directory
diff --git a/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb
index f14f505a15..5473055b22 100644
--- a/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb
+++ b/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb
@@ -6,12 +6,12 @@ PR = "r3"
 COMPATIBLE_MACHINE = "efika"
 
 SRC_URI = "http://www.efika.de/download/linux-2.6.19-rc6_efika.tgz;name=kernel \
-           file://0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \
-           file://0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt;patch=1 \
+           file://0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;apply=yes \
+           file://0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt;apply=yes \
            file://defconfig \
 		   "
-#	http://www.246tnt.com/files/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \
-#           http://lkml.org/lkml/2006/11/29/335;patch=1 \
+#	http://www.246tnt.com/files/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;apply=yes \
+#           http://lkml.org/lkml/2006/11/29/335;apply=yes \
 
 S = "${WORKDIR}/linux-2.6.19-rc6_efika"
 
diff --git a/recipes/linux/linux-efika_2.6.20.20.bb b/recipes/linux/linux-efika_2.6.20.20.bb
index 972677b072..f3aaba3dad 100644
--- a/recipes/linux/linux-efika_2.6.20.20.bb
+++ b/recipes/linux/linux-efika_2.6.20.20.bb
@@ -8,42 +8,42 @@ COMPATIBLE_MACHINE = "efika"
 FILESPATH = "${FILE_DIRNAME}/linux-efika-${PV}:${FILE_DIRNAME}/linux-efika-2.6.20"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2;name=kernel \
-           file://0001-powerpc-serial-Dispose-irq-mapping-when-done-in-mpc52xx_serial.c.txt;p=1;patch=1 \
-           file://0003-powerpc-Add-device-tree-fixups-for-the-EFIKA.txt;p=1;patch=1 \
-           file://0004-powerpc-Use-common-52xx-of_platform-probe-code-for-EFIKA.txt;p=1;patch=1 \
-           file://0005-powerpc-Restore-proper-link-order-in-platform.txt;p=1;patch=1 \
-           file://0006-Rework-the-OHCI-quirk-mecanism-as-suggested-by-David.txt;p=1;patch=1 \
-           file://0007-Implement-support-for-split-endian-OHCI.txt;p=1;patch=1 \
-           file://0008-ohci-Rework-bus-glue-integration-to-allow-several-at-once.txt;p=1;patch=1 \
-           file://0009-ohci-Add-support-for-OHCI-controller-on-the-of_platform-bus.txt;p=1;patch=1 \
-           file://0010-libata-Add-support-for-the-MPC52xx-ATA-controller.txt;p=1;patch=1 \
-           file://0011-ohci-Whitespace-and-typo-fix-in-ohci-ppc-of.c.txt;p=1;patch=1 \
-           file://0012-ata-Fix-pata_mpc52xx.c-compatible-list.txt;p=1;patch=1 \
-           file://0013-powerpc-serial-Fix-mpc52xx_uart.c-compatible-list.txt;p=1;patch=1 \
-           file://0014-powerpc-Small-cleanup-of-EFIKA-platform.txt;p=1;patch=1 \
-           file://0015-powerpc-Add-a-unified-uevent-handler-for-bus-based-on-of_device.txt;p=1;patch=1 \
-           file://0016-macintosh-Use-the-new-of_device-common-uevent-handler.txt;p=1;patch=1 \
-           file://0017-powerpc-Add-uevent-handler-for-of_platform_bus.txt;p=1;patch=1 \
-           file://0018-powerpc-Add-uevent-handler-for-ibmebus.txt;p=1;patch=1 \
-           file://0019-MPC5200-Bestcomm-platform-driver.txt;p=1;patch=1 \
-           file://0020-Fec-MPC5200-eth-driver.txt;p=1;patch=1 \
-           file://0021-POWERPC-Copy-bestcomm-support-files-into-arch-powerpc.txt;p=1;patch=1 \
-           file://0022-MPC52xx-PCI-now-working-on-lite5200.-ugly-but-working.txt;p=1;patch=1 \
-           file://0023-POWERPC-Make-FEC-work-on-the-lite5200.txt;p=1;patch=1 \
-           file://0024-Add-missing-function-prototype.txt;p=1;patch=1 \
-           file://0025-POWERPC-Misc-EFIKA-fixups-for-rtas-chrp.txt;p=1;patch=1 \
-           file://0026-POWERPC-Cleanup-mpc52xx-PCI-support.txt;p=1;patch=1 \
-           file://0027-POWERPC-Change-name-of-mpc52xx-pci-support-file-in-Makefile.txt;p=1;patch=1 \
-           file://0028-POWERPC-Change-link-order-so-mpc52xx-fec-always-shows-up-as-eth0.txt;p=1;patch=1 \
-           file://0029-POWERPC-Fixup-pr_print-format-for-mpc52xx-pci-support.txt;p=1;patch=1 \
-           file://0030-POWERPC-Add-mpc52xx-lite5200-PCI-support.txt;p=1;patch=1 \
-           file://0031-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;p=1;patch=1 \
-           file://0032-POWERPC-EFIKA-Adds-missing-interrupts-from-bestcomm-node.txt;p=1;patch=1 \
-           file://0033-EFIKA-fullduplex-prpl_aln.txt;p=1;patch=1 \
-           file://v4l.diff;p=1;patch=1 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.20.bz2;p=1;patch=1;name=stablepatch \
-           http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.20.20-v22.patch;p=1;patch=1;name=shedpatch \
-           file://weaken-div64_32-symbol.patch;patch=1 \
+           file://0001-powerpc-serial-Dispose-irq-mapping-when-done-in-mpc52xx_serial.c.txt;p=1;apply=yes \
+           file://0003-powerpc-Add-device-tree-fixups-for-the-EFIKA.txt;p=1;apply=yes \
+           file://0004-powerpc-Use-common-52xx-of_platform-probe-code-for-EFIKA.txt;p=1;apply=yes \
+           file://0005-powerpc-Restore-proper-link-order-in-platform.txt;p=1;apply=yes \
+           file://0006-Rework-the-OHCI-quirk-mecanism-as-suggested-by-David.txt;p=1;apply=yes \
+           file://0007-Implement-support-for-split-endian-OHCI.txt;p=1;apply=yes \
+           file://0008-ohci-Rework-bus-glue-integration-to-allow-several-at-once.txt;p=1;apply=yes \
+           file://0009-ohci-Add-support-for-OHCI-controller-on-the-of_platform-bus.txt;p=1;apply=yes \
+           file://0010-libata-Add-support-for-the-MPC52xx-ATA-controller.txt;p=1;apply=yes \
+           file://0011-ohci-Whitespace-and-typo-fix-in-ohci-ppc-of.c.txt;p=1;apply=yes \
+           file://0012-ata-Fix-pata_mpc52xx.c-compatible-list.txt;p=1;apply=yes \
+           file://0013-powerpc-serial-Fix-mpc52xx_uart.c-compatible-list.txt;p=1;apply=yes \
+           file://0014-powerpc-Small-cleanup-of-EFIKA-platform.txt;p=1;apply=yes \
+           file://0015-powerpc-Add-a-unified-uevent-handler-for-bus-based-on-of_device.txt;p=1;apply=yes \
+           file://0016-macintosh-Use-the-new-of_device-common-uevent-handler.txt;p=1;apply=yes \
+           file://0017-powerpc-Add-uevent-handler-for-of_platform_bus.txt;p=1;apply=yes \
+           file://0018-powerpc-Add-uevent-handler-for-ibmebus.txt;p=1;apply=yes \
+           file://0019-MPC5200-Bestcomm-platform-driver.txt;p=1;apply=yes \
+           file://0020-Fec-MPC5200-eth-driver.txt;p=1;apply=yes \
+           file://0021-POWERPC-Copy-bestcomm-support-files-into-arch-powerpc.txt;p=1;apply=yes \
+           file://0022-MPC52xx-PCI-now-working-on-lite5200.-ugly-but-working.txt;p=1;apply=yes \
+           file://0023-POWERPC-Make-FEC-work-on-the-lite5200.txt;p=1;apply=yes \
+           file://0024-Add-missing-function-prototype.txt;p=1;apply=yes \
+           file://0025-POWERPC-Misc-EFIKA-fixups-for-rtas-chrp.txt;p=1;apply=yes \
+           file://0026-POWERPC-Cleanup-mpc52xx-PCI-support.txt;p=1;apply=yes \
+           file://0027-POWERPC-Change-name-of-mpc52xx-pci-support-file-in-Makefile.txt;p=1;apply=yes \
+           file://0028-POWERPC-Change-link-order-so-mpc52xx-fec-always-shows-up-as-eth0.txt;p=1;apply=yes \
+           file://0029-POWERPC-Fixup-pr_print-format-for-mpc52xx-pci-support.txt;p=1;apply=yes \
+           file://0030-POWERPC-Add-mpc52xx-lite5200-PCI-support.txt;p=1;apply=yes \
+           file://0031-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;p=1;apply=yes \
+           file://0032-POWERPC-EFIKA-Adds-missing-interrupts-from-bestcomm-node.txt;p=1;apply=yes \
+           file://0033-EFIKA-fullduplex-prpl_aln.txt;p=1;apply=yes \
+           file://v4l.diff;p=1 \
+           http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.20.bz2;p=1;apply=yes;name=stablepatch \
+           http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.20.20-v22.patch;p=1;name=shedpatch \
+           file://weaken-div64_32-symbol.patch \
            file://defconfig \
 		   "
 
diff --git a/recipes/linux/linux-efika_2.6.20.bb b/recipes/linux/linux-efika_2.6.20.bb
index 2ef13fd778..9bbd76e202 100644
--- a/recipes/linux/linux-efika_2.6.20.bb
+++ b/recipes/linux/linux-efika_2.6.20.bb
@@ -6,39 +6,39 @@ PR = "r2"
 COMPATIBLE_MACHINE = "efika"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           file://0001-powerpc-serial-Dispose-irq-mapping-when-done-in-mpc52xx_serial.c.txt;p=1;patch=1 \
-           file://0003-powerpc-Add-device-tree-fixups-for-the-EFIKA.txt;p=1;patch=1 \
-           file://0004-powerpc-Use-common-52xx-of_platform-probe-code-for-EFIKA.txt;p=1;patch=1 \
-           file://0005-powerpc-Restore-proper-link-order-in-platform.txt;p=1;patch=1 \
-           file://0006-Rework-the-OHCI-quirk-mecanism-as-suggested-by-David.txt;p=1;patch=1 \
-           file://0007-Implement-support-for-split-endian-OHCI.txt;p=1;patch=1 \
-           file://0008-ohci-Rework-bus-glue-integration-to-allow-several-at-once.txt;p=1;patch=1 \
-           file://0009-ohci-Add-support-for-OHCI-controller-on-the-of_platform-bus.txt;p=1;patch=1 \
-           file://0010-libata-Add-support-for-the-MPC52xx-ATA-controller.txt;p=1;patch=1 \
-           file://0011-ohci-Whitespace-and-typo-fix-in-ohci-ppc-of.c.txt;p=1;patch=1 \
-           file://0012-ata-Fix-pata_mpc52xx.c-compatible-list.txt;p=1;patch=1 \
-           file://0013-powerpc-serial-Fix-mpc52xx_uart.c-compatible-list.txt;p=1;patch=1 \
-           file://0014-powerpc-Small-cleanup-of-EFIKA-platform.txt;p=1;patch=1 \
-           file://0015-powerpc-Add-a-unified-uevent-handler-for-bus-based-on-of_device.txt;p=1;patch=1 \
-           file://0016-macintosh-Use-the-new-of_device-common-uevent-handler.txt;p=1;patch=1 \
-           file://0017-powerpc-Add-uevent-handler-for-of_platform_bus.txt;p=1;patch=1 \
-           file://0018-powerpc-Add-uevent-handler-for-ibmebus.txt;p=1;patch=1 \
-           file://0019-MPC5200-Bestcomm-platform-driver.txt;p=1;patch=1 \
-           file://0020-Fec-MPC5200-eth-driver.txt;p=1;patch=1 \
-           file://0021-POWERPC-Copy-bestcomm-support-files-into-arch-powerpc.txt;p=1;patch=1 \
-           file://0022-MPC52xx-PCI-now-working-on-lite5200.-ugly-but-working.txt;p=1;patch=1 \
-           file://0023-POWERPC-Make-FEC-work-on-the-lite5200.txt;p=1;patch=1 \
-           file://0024-Add-missing-function-prototype.txt;p=1;patch=1 \
-           file://0025-POWERPC-Misc-EFIKA-fixups-for-rtas-chrp.txt;p=1;patch=1 \
-           file://0026-POWERPC-Cleanup-mpc52xx-PCI-support.txt;p=1;patch=1 \
-           file://0027-POWERPC-Change-name-of-mpc52xx-pci-support-file-in-Makefile.txt;p=1;patch=1 \
-           file://0028-POWERPC-Change-link-order-so-mpc52xx-fec-always-shows-up-as-eth0.txt;p=1;patch=1 \
-           file://0029-POWERPC-Fixup-pr_print-format-for-mpc52xx-pci-support.txt;p=1;patch=1 \
-           file://0030-POWERPC-Add-mpc52xx-lite5200-PCI-support.txt;p=1;patch=1 \
-           file://0031-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;p=1;patch=1 \
-           file://0032-POWERPC-EFIKA-Adds-missing-interrupts-from-bestcomm-node.txt;p=1;patch=1 \
-           file://0033-EFIKA-fullduplex-prpl_aln.txt;p=1;patch=1 \
-           file://v4l.diff;p=1;patch=1 \
+           file://0001-powerpc-serial-Dispose-irq-mapping-when-done-in-mpc52xx_serial.c.txt;p=1;apply=yes \
+           file://0003-powerpc-Add-device-tree-fixups-for-the-EFIKA.txt;p=1;apply=yes \
+           file://0004-powerpc-Use-common-52xx-of_platform-probe-code-for-EFIKA.txt;p=1;apply=yes \
+           file://0005-powerpc-Restore-proper-link-order-in-platform.txt;p=1;apply=yes \
+           file://0006-Rework-the-OHCI-quirk-mecanism-as-suggested-by-David.txt;p=1;apply=yes \
+           file://0007-Implement-support-for-split-endian-OHCI.txt;p=1;apply=yes \
+           file://0008-ohci-Rework-bus-glue-integration-to-allow-several-at-once.txt;p=1;apply=yes \
+           file://0009-ohci-Add-support-for-OHCI-controller-on-the-of_platform-bus.txt;p=1;apply=yes \
+           file://0010-libata-Add-support-for-the-MPC52xx-ATA-controller.txt;p=1;apply=yes \
+           file://0011-ohci-Whitespace-and-typo-fix-in-ohci-ppc-of.c.txt;p=1;apply=yes \
+           file://0012-ata-Fix-pata_mpc52xx.c-compatible-list.txt;p=1;apply=yes \
+           file://0013-powerpc-serial-Fix-mpc52xx_uart.c-compatible-list.txt;p=1;apply=yes \
+           file://0014-powerpc-Small-cleanup-of-EFIKA-platform.txt;p=1;apply=yes \
+           file://0015-powerpc-Add-a-unified-uevent-handler-for-bus-based-on-of_device.txt;p=1;apply=yes \
+           file://0016-macintosh-Use-the-new-of_device-common-uevent-handler.txt;p=1;apply=yes \
+           file://0017-powerpc-Add-uevent-handler-for-of_platform_bus.txt;p=1;apply=yes \
+           file://0018-powerpc-Add-uevent-handler-for-ibmebus.txt;p=1;apply=yes \
+           file://0019-MPC5200-Bestcomm-platform-driver.txt;p=1;apply=yes \
+           file://0020-Fec-MPC5200-eth-driver.txt;p=1;apply=yes \
+           file://0021-POWERPC-Copy-bestcomm-support-files-into-arch-powerpc.txt;p=1;apply=yes \
+           file://0022-MPC52xx-PCI-now-working-on-lite5200.-ugly-but-working.txt;p=1;apply=yes \
+           file://0023-POWERPC-Make-FEC-work-on-the-lite5200.txt;p=1;apply=yes \
+           file://0024-Add-missing-function-prototype.txt;p=1;apply=yes \
+           file://0025-POWERPC-Misc-EFIKA-fixups-for-rtas-chrp.txt;p=1;apply=yes \
+           file://0026-POWERPC-Cleanup-mpc52xx-PCI-support.txt;p=1;apply=yes \
+           file://0027-POWERPC-Change-name-of-mpc52xx-pci-support-file-in-Makefile.txt;p=1;apply=yes \
+           file://0028-POWERPC-Change-link-order-so-mpc52xx-fec-always-shows-up-as-eth0.txt;p=1;apply=yes \
+           file://0029-POWERPC-Fixup-pr_print-format-for-mpc52xx-pci-support.txt;p=1;apply=yes \
+           file://0030-POWERPC-Add-mpc52xx-lite5200-PCI-support.txt;p=1;apply=yes \
+           file://0031-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;p=1;apply=yes \
+           file://0032-POWERPC-EFIKA-Adds-missing-interrupts-from-bestcomm-node.txt;p=1;apply=yes \
+           file://0033-EFIKA-fullduplex-prpl_aln.txt;p=1;apply=yes \
+           file://v4l.diff;p=1 \
 
            file://defconfig \
 		   "
diff --git a/recipes/linux/linux-epia_2.6.11.bb b/recipes/linux/linux-epia_2.6.11.bb
index e19622077d..90a11448e4 100644
--- a/recipes/linux/linux-epia_2.6.11.bb
+++ b/recipes/linux/linux-epia_2.6.11.bb
@@ -6,7 +6,7 @@ PR = "r0"
 KERNEL_CCSUFFIX = "-3.3.4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-	   http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;patch=1;name=patch \
+	   http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;apply=yes;name=patch \
            file://epia_defconfig"
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux/linux-epia_2.6.12.bb b/recipes/linux/linux-epia_2.6.12.bb
index eedfa22c3e..fb3efffce3 100644
--- a/recipes/linux/linux-epia_2.6.12.bb
+++ b/recipes/linux/linux-epia_2.6.12.bb
@@ -6,7 +6,7 @@ PR = "r0"
 KERNEL_CCSUFFIX = "-3.3.4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-	   http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;patch=1;name=patch \
+	   http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;apply=yes;name=patch \
            file://epia_defconfig"
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux/linux-epia_2.6.19.2.bb b/recipes/linux/linux-epia_2.6.19.2.bb
index f3e82eccf1..77bfe52264 100644
--- a/recipes/linux/linux-epia_2.6.19.2.bb
+++ b/recipes/linux/linux-epia_2.6.19.2.bb
@@ -7,7 +7,7 @@ KERNEL_CCSUFFIX = "-3.3.4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://epia_defconfig \
-	   file://linux-2.6-limits.patch;patch=1"
+	   file://linux-2.6-limits.patch"
 S = "${WORKDIR}/linux-${PV}"
 
 COMPATIBLE_HOST = 'i.86.*-linux'
diff --git a/recipes/linux/linux-epia_2.6.8.1.bb b/recipes/linux/linux-epia_2.6.8.1.bb
index fd59dca972..163bd1ffa2 100644
--- a/recipes/linux/linux-epia_2.6.8.1.bb
+++ b/recipes/linux/linux-epia_2.6.8.1.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2"
 PR = "r15"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-	   http://www.epiawiki.org/files/epia_kernel/patch-2.6.8.1-epia1.bz2;patch=1;name=patch1 \
-	   http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;patch=1;name=patch2 \
+	   http://www.epiawiki.org/files/epia_kernel/patch-2.6.8.1-epia1.bz2;apply=yes;name=patch1 \
+	   http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;apply=yes;name=patch2 \
            file://epia_defconfig"
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux/linux-eten_2.6.28-rc4+git.bb b/recipes/linux/linux-eten_2.6.28-rc4+git.bb
index 99fbb5fba4..a5333e17a8 100644
--- a/recipes/linux/linux-eten_2.6.28-rc4+git.bb
+++ b/recipes/linux/linux-eten_2.6.28-rc4+git.bb
@@ -10,8 +10,7 @@ KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 # See http://wiki.openembedded.net/index.php/Versioning_Policy
 SRCREV = "ab2d414f4f13816af0ec0401b608133ca946624a"
-PV = "2.6.27+${KERNEL_RELEASE}+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "2.6.27+${KERNEL_RELEASE}+${PR}+gitr${SRCREV}"
 PR = "r2"
 
 SRC_URI = "\
diff --git a/recipes/linux/linux-geodegx_2.4.24.bb b/recipes/linux/linux-geodegx_2.4.24.bb
index 590a44d7b1..8976953f44 100644
--- a/recipes/linux/linux-geodegx_2.4.24.bb
+++ b/recipes/linux/linux-geodegx_2.4.24.bb
@@ -10,8 +10,8 @@ LICENSE = "GPLv2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2;name=kernel \
 	http://www.amd.com/files/connectivitysolutions/geode/Patches_Linux_${KV}_1.00.tar.gz;name=patch \
-	file://${WORKDIR}/Patches_Linux_${KV}_1.00/linux-${KV}-geode.patch;patch=1 \
-	file://linux-2.4.24-gcc340-fixes.patch;patch=1 \
+	file://${WORKDIR}/Patches_Linux_${KV}_1.00/linux-${KV}-geode.patch \
+	file://linux-2.4.24-gcc340-fixes.patch \
 	file://defconfig"
 
 S = "${WORKDIR}/linux-${KV}"
diff --git a/recipes/linux/linux-geodelx_2.6.11.bb b/recipes/linux/linux-geodelx_2.6.11.bb
index ae58c2cfed..90e5cc967d 100644
--- a/recipes/linux/linux-geodelx_2.6.11.bb
+++ b/recipes/linux/linux-geodelx_2.6.11.bb
@@ -21,7 +21,7 @@ inherit kernel
 ARCH = "i386"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2;name=kernel \
-	http://www.amd.com/files/connectivitysolutions/geode/geode_lx/${AMD_DRIVER_LABEL}.patch;patch=1;name=patch \
+	http://www.amd.com/files/connectivitysolutions/geode/geode_lx/${AMD_DRIVER_LABEL}.patch;name=patch \
 	file://defconfig"
 
 do_configure_prepend() {
diff --git a/recipes/linux/linux-gumstix_2.6.15.bb b/recipes/linux/linux-gumstix_2.6.15.bb
index 9eae507a75..bc8b5e47b4 100644
--- a/recipes/linux/linux-gumstix_2.6.15.bb
+++ b/recipes/linux/linux-gumstix_2.6.15.bb
@@ -10,49 +10,49 @@ COMPATIBLE_MACHINE = "gumstix"
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
 		   cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd;date=20060223 \
            file://defconfig-gumstix \
-		   file://arch-config.patch;patch=1 \
-		   file://board-init.patch;patch=1 \
-		   file://compact-flash.patch;patch=1 \
-		   file://defconfig.patch;patch=1 \
-		   file://flash.patch;patch=1 \
-		   file://header.patch;patch=1 \
-		   file://kconfig-arch-cleanup.patch;patch=1 \
-		   file://pxa255-gpio-count-bugfix.patch;patch=1 \
-		   file://pxa2xx_udc.patch;patch=1 \
-		   file://bkpxa-pxa-cpu.patch;patch=1 \
-		   file://bkpxa-pxa-cpufreq.patch;patch=1 \
-		   file://bkpxa-pxa-ac97.patch;patch=1 \
-		   file://rmk-2022-2-rtctime-sa110-pxa255-driver.patch;patch=1 \
-		   file://proc-gpio.patch;patch=1 \
-		   file://serial-ether-addr.patch;patch=1 \
-		   file://cpufreq-better-freqs.patch;patch=1 \
-		   file://ethernet-config.patch;patch=1 \
-		   file://smc-ether-addr.patch;patch=1 \
-		   file://audio.patch;patch=1 \
-		   file://cpufreq-ondemand-by-default.patch;patch=1 \
-		   file://modular-init-bluetooth.patch;patch=1 \
-		   file://modular-init-smc91x.patch;patch=1 \
-		   file://modular-init-usb-gadget.patch;patch=1 \
-		   file://bugfix-i2c-include.patch;patch=1 \
-		   file://bugfix-mmc-clock.patch;patch=1 \
-		   file://bugfix-mtd-onenand.patch;patch=1 \
-		   file://bugfix-pxa-audio.patch;patch=1 \
-		   file://bugfix-pxa-cpufreq.patch;patch=1 \
-		   file://bugfix-pxa-serial-mctrl.patch;patch=1 \
-		   file://bugfix-rndis.patch;patch=1 \
-		   file://bugfix-serial-interrupt.patch;patch=1 \
-		   file://bugfix-serial-register-status.patch;patch=1 \
-		   file://mach-types-fix.patch;patch=1 \
-		   file://mmc-version4.patch;patch=1 \
-		   file://kernel-osx.patch;patch=1 \
-		   file://ucb1400-touchscreen.patch;patch=1 \
-		   file://add_input_randomness_export.patch;patch=1 \
-		   file://kobject_get_path_export.patch;patch=1 \
-		   file://ucb1400-ac97-audio.patch;patch=1 \
-		   file://i2c-gpl-module-fix.patch;patch=1  \
-		   file://disable-uncompress-message.patch;patch=1 \
-		   file://gumstix-mmc.patch;patch=1 \
-		   file://rmk_pxa_mmc_timeout.patch;patch=1"
+		   file://arch-config.patch \
+		   file://board-init.patch \
+		   file://compact-flash.patch \
+		   file://defconfig.patch \
+		   file://flash.patch \
+		   file://header.patch \
+		   file://kconfig-arch-cleanup.patch \
+		   file://pxa255-gpio-count-bugfix.patch \
+		   file://pxa2xx_udc.patch \
+		   file://bkpxa-pxa-cpu.patch \
+		   file://bkpxa-pxa-cpufreq.patch \
+		   file://bkpxa-pxa-ac97.patch \
+		   file://rmk-2022-2-rtctime-sa110-pxa255-driver.patch \
+		   file://proc-gpio.patch \
+		   file://serial-ether-addr.patch \
+		   file://cpufreq-better-freqs.patch \
+		   file://ethernet-config.patch \
+		   file://smc-ether-addr.patch \
+		   file://audio.patch \
+		   file://cpufreq-ondemand-by-default.patch \
+		   file://modular-init-bluetooth.patch \
+		   file://modular-init-smc91x.patch \
+		   file://modular-init-usb-gadget.patch \
+		   file://bugfix-i2c-include.patch \
+		   file://bugfix-mmc-clock.patch \
+		   file://bugfix-mtd-onenand.patch \
+		   file://bugfix-pxa-audio.patch \
+		   file://bugfix-pxa-cpufreq.patch \
+		   file://bugfix-pxa-serial-mctrl.patch \
+		   file://bugfix-rndis.patch \
+		   file://bugfix-serial-interrupt.patch \
+		   file://bugfix-serial-register-status.patch \
+		   file://mach-types-fix.patch \
+		   file://mmc-version4.patch \
+		   file://kernel-osx.patch \
+		   file://ucb1400-touchscreen.patch \
+		   file://add_input_randomness_export.patch \
+		   file://kobject_get_path_export.patch \
+		   file://ucb1400-ac97-audio.patch \
+		   file://i2c-gpl-module-fix.patch  \
+		   file://disable-uncompress-message.patch \
+		   file://gumstix-mmc.patch \
+		   file://rmk_pxa_mmc_timeout.patch"
 
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb b/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb
index 078c40addf..518e5bb852 100644
--- a/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb
+++ b/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb
@@ -6,8 +6,8 @@ COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "h1940"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.11-bk1.gz;patch=1;name=bkpatch \
-           http://rtpnet.nerim.net/ipaq/2.6.11-bk1/2.6.11-bk1-h1940.patch;patch=1;name=patch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.11-bk1.gz;apply=yes;name=bkpatch \
+           http://rtpnet.nerim.net/ipaq/2.6.11-bk1/2.6.11-bk1-h1940.patch;name=patch \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.11"
diff --git a/recipes/linux/linux-h1940_2.6.14-h1940.bb b/recipes/linux/linux-h1940_2.6.14-h1940.bb
index a2fb285e9d..1138c8f1a7 100644
--- a/recipes/linux/linux-h1940_2.6.14-h1940.bb
+++ b/recipes/linux/linux-h1940_2.6.14-h1940.bb
@@ -6,8 +6,8 @@ COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "h1940"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2;name=kernel \
-	   http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1;name=patch1 \
-           http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch;patch=1;name=patch2 \
+	   http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;name=patch1 \
+           http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch;name=patch2 \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.14"
diff --git a/recipes/linux/linux-h1940_2.6.17-h1940.bb b/recipes/linux/linux-h1940_2.6.17-h1940.bb
index 679c5c44bf..1a68781bb8 100644
--- a/recipes/linux/linux-h1940_2.6.17-h1940.bb
+++ b/recipes/linux/linux-h1940_2.6.17-h1940.bb
@@ -8,16 +8,16 @@ COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "h1940"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2;name=kernel \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/v2.6.17-gitcurrent.patch;patch=1;name=patch1 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/full.patch;patch=1;name=patch2 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/serial_sparse.patch;patch=1;name=patch3 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/h1940_leds.patch;patch=1;name=patch4 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/bluetooth.patch;patch=1;name=patch5 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/h1940_batt.patch;patch=1;name=patch6 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/mtd_partition.patch;patch=1;name=patch7 \
-           http://anymore.nl/ipaq/usbgadget_fixups.patch;patch=1;name=patch8 \
-           http://anymore.nl/ipaq/udc_usb_gadget_register_driver_fix.patch;patch=1;name=patch9 \
-           http://anymore.nl/ipaq/udc_unbind.patch;patch=1;name=patch10 \
+           http://rtp-net.org/ipaq/patches/2.6.17-1/v2.6.17-gitcurrent.patch;name=patch1 \
+           http://rtp-net.org/ipaq/patches/2.6.17-1/full.patch;name=patch2 \
+           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/serial_sparse.patch;name=patch3 \
+           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/h1940_leds.patch;name=patch4 \
+           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/bluetooth.patch;name=patch5 \
+           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/h1940_batt.patch;name=patch6 \
+           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/mtd_partition.patch;name=patch7 \
+           http://anymore.nl/ipaq/usbgadget_fixups.patch;name=patch8 \
+           http://anymore.nl/ipaq/udc_usb_gadget_register_driver_fix.patch;name=patch9 \
+           http://anymore.nl/ipaq/udc_unbind.patch;name=patch10 \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.17"
diff --git a/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb b/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb
index 73fb97fccb..6c232924f4 100644
--- a/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb
+++ b/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb
@@ -3,8 +3,8 @@ SECTION = "kernel"
 LICENSE = "GPLv2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.12/linux-2.6.12-rc5.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/old/patch-2.6.12-rc5-omap2.bz2;patch=1;name=patch \
-           file://h6300_omap1_2612rc5.patch;patch=1 \
+           http://www.muru.com/linux/omap/patches/old/patch-2.6.12-rc5-omap2.bz2;apply=yes;name=patch \
+           file://h6300_omap1_2612rc5.patch \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.12-rc5"
diff --git a/recipes/linux/linux-h6300-omap1_2.6.14.3.bb b/recipes/linux/linux-h6300-omap1_2.6.14.3.bb
index 710bcb1c30..0832aa6442 100644
--- a/recipes/linux/linux-h6300-omap1_2.6.14.3.bb
+++ b/recipes/linux/linux-h6300-omap1_2.6.14.3.bb
@@ -3,8 +3,8 @@ SECTION = "kernel"
 LICENSE = "GPLv2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/old/patch-2.6.14-omap2.bz2;patch=1;name=patch \
-           file://patch-linux-2614-omap2-to-2614_3-omap1-h6300;patch=1 \
+           http://www.muru.com/linux/omap/patches/old/patch-2.6.14-omap2.bz2;apply=yes;name=patch \
+           file://patch-linux-2614-omap2-to-2614_3-omap1-h6300;apply=yes \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.14"
diff --git a/recipes/linux/linux-h6300-omap1_2.6.16.16.bb b/recipes/linux/linux-h6300-omap1_2.6.16.16.bb
index 9af2165aac..b8f9964d0d 100644
--- a/recipes/linux/linux-h6300-omap1_2.6.16.16.bb
+++ b/recipes/linux/linux-h6300-omap1_2.6.16.16.bb
@@ -3,9 +3,9 @@ SECTION = "kernel"
 LICENSE = "GPLv2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2;name=kernel \
-	   http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2;patch=1;name=patch \
-           file://linux-2.6.16.16.patch;patch=1 \
-           file://linux-h6300-omap2-2.6.16.16.patch;patch=1 \
+	   http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2;apply=yes;name=patch \
+           file://linux-2.6.16.16.patch \
+           file://linux-h6300-omap2-2.6.16.16.patch \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.16"
diff --git a/recipes/linux/linux-handhelds-2.6.inc b/recipes/linux/linux-handhelds-2.6.inc
index 4a3ed7d23e..7c5949e813 100644
--- a/recipes/linux/linux-handhelds-2.6.inc
+++ b/recipes/linux/linux-handhelds-2.6.inc
@@ -7,8 +7,8 @@ COMPATIBLE_MACHINE ?= "(asus620|asus730|aximx50|aximx50v|eseries|h1910|h2200|h36
 
 # SRC_URI *must* be overriden in includer, but this is a good reference
 SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://24-hostap_cs_id.diff;patch=1 \
-           file://hrw-pcmcia-ids-r2.patch;patch=1 \
+           file://24-hostap_cs_id.diff \
+           file://hrw-pcmcia-ids-r2.patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/kernel26"
diff --git a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index 15ed085b06..1cb5a869f9 100644
--- a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -10,14 +10,14 @@ DEFAULT_PREFERENCE = "-1"
 FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch;patch=1 \
-           http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;patch=1;name=rppatch35 \
-           file://gcc4x-limits.patch;patch=1 \
-           file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \
+           file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch \
+           http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;name=rppatch35 \
+           file://gcc4x-limits.patch \
+           file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch \
 	   file://defconfig"
 
 require linux-handhelds-2.6.inc
 
-#           ${RPSRC}/export_atags-r0a.patch;patch=1;status=pending;name=rppatch35 \
+#           ${RPSRC}/export_atags-r0a.patch;status=pending;name=rppatch35 \
 SRC_URI[rppatch35.md5sum] = "8ab51e8ff728f4155db64b9bb6ea6d71"
 SRC_URI[rppatch35.sha256sum] = "75d4c6ddbfc5e4fff7690a3308e2574f89a0e2709fb91caccb29067a9dad251a"
diff --git a/recipes/linux/linux-handhelds-2.6_cvs.bb b/recipes/linux/linux-handhelds-2.6_cvs.bb
index 4ccf6f9ec3..d317f1d7a1 100644
--- a/recipes/linux/linux-handhelds-2.6_cvs.bb
+++ b/recipes/linux/linux-handhelds-2.6_cvs.bb
@@ -16,10 +16,10 @@ K_MICRO = "21"
 HHV     = "20"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \
-           file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch;patch=1 \
-           http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;patch=1;name=patch \
-           file://gcc4x-limits.patch;patch=1 \
-           file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \
+           file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch \
+           http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;name=patch \
+           file://gcc4x-limits.patch \
+           file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch \
            file://defconfig"
 
 require linux-handhelds-2.6.inc
diff --git a/recipes/linux/linux-igep2_2.6.28.10-0.bb b/recipes/linux/linux-igep2_2.6.28.10-0.bb
index c397b7f5cc..092f6c158b 100644
--- a/recipes/linux/linux-igep2_2.6.28.10-0.bb
+++ b/recipes/linux/linux-igep2_2.6.28.10-0.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://downloads.myigep.com/sources/kernel/linux-omap-2.6.28.10-igep0
 	   file://defconfig"
 
 SRC_URI_append = " \
-	file://twl-asoc-fix-record.diff;patch=1 \
+	file://twl-asoc-fix-record.diff \
 "
 
 S = "${WORKDIR}/linux-omap-2.6.28.10-igep0020b-0"
diff --git a/recipes/linux/linux-ixp4xx.inc b/recipes/linux/linux-ixp4xx.inc
index f00c4c43b9..f877672bd3 100644
--- a/recipes/linux/linux-ixp4xx.inc
+++ b/recipes/linux/linux-ixp4xx.inc
@@ -1,7 +1,7 @@
 # linux-ixp4xx.inc
 #
 DESCRIPTION = "Linux 2.6.x kernel for IXP4xx devices"
-SRCREV = "1089"
+SRCREV = "1090"
 
 COMPATIBLE_HOST = 'arm.*-linux.*'
 COMPATIBLE_MACHINE = '(ixp4xx|nslu2|syhl1)'
diff --git a/recipes/linux/linux-ixp4xx_2.6.21.7.bb b/recipes/linux/linux-ixp4xx_2.6.21.7.bb
index f60e8c8c06..f54dfcb8a3 100644
--- a/recipes/linux/linux-ixp4xx_2.6.21.7.bb
+++ b/recipes/linux/linux-ixp4xx_2.6.21.7.bb
@@ -8,7 +8,7 @@ PV = "${KERNEL_RELEASE}+svnr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1;name=patch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;apply=yes;name=patch \
 	   svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \
 	   file://defconfig-${KERNEL_RELEASE}"
 
diff --git a/recipes/linux/linux-ixp4xx_2.6.23.14.bb b/recipes/linux/linux-ixp4xx_2.6.23.14.bb
index e9aae0ad25..05834768f9 100644
--- a/recipes/linux/linux-ixp4xx_2.6.23.14.bb
+++ b/recipes/linux/linux-ixp4xx_2.6.23.14.bb
@@ -11,7 +11,7 @@ PV = "${KERNEL_RELEASE}+svnr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1;name=patch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;apply=yes;name=patch \
 	   svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \
 	   file://defconfig-${KERNEL_RELEASE}"
 
diff --git a/recipes/linux/linux-ixp4xx_2.6.24.7.bb b/recipes/linux/linux-ixp4xx_2.6.24.7.bb
index 177425b2ea..a65c42feed 100644
--- a/recipes/linux/linux-ixp4xx_2.6.24.7.bb
+++ b/recipes/linux/linux-ixp4xx_2.6.24.7.bb
@@ -11,7 +11,7 @@ PV = "${KERNEL_RELEASE}+svnr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2;name=kernel \
-	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1;name=stablepatch \
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;apply=yes;name=stablepatch \
 	   svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \
 	   file://defconfig-${KERNEL_RELEASE}"
 
diff --git a/recipes/linux/linux-ixp4xx_2.6.27.8.bb b/recipes/linux/linux-ixp4xx_2.6.27.8.bb
index 106a88439c..46abc78766 100644
--- a/recipes/linux/linux-ixp4xx_2.6.27.8.bb
+++ b/recipes/linux/linux-ixp4xx_2.6.27.8.bb
@@ -13,9 +13,9 @@ PV = "${KERNEL_RELEASE}+svnr${SRCPV}"
 PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2;name=kernel \
-	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1;name=stablepatch \
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;apply=yes;name=stablepatch \
 	   svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \
-	   file://fix-install.patch;patch=1 \
+	   file://fix-install.patch \
 	   file://defconfig-${KERNEL_RELEASE}"
 
 S = "${WORKDIR}/linux-${VANILLA_VERSION}"
diff --git a/recipes/linux/linux-ixp4xx_2.6.29.bb b/recipes/linux/linux-ixp4xx_2.6.29.bb
index 9a9479dd36..1a8c6d018b 100644
--- a/recipes/linux/linux-ixp4xx_2.6.29.bb
+++ b/recipes/linux/linux-ixp4xx_2.6.29.bb
@@ -14,7 +14,7 @@ PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
 	   svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \
-	   file://fix-install.patch;patch=1 \
+	   file://fix-install.patch \
 	   file://defconfig-${KERNEL_RELEASE}"
 
 S = "${WORKDIR}/linux-${VANILLA_VERSION}"
diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb
index dddc36cdf8..8e68e571d4 100644
--- a/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb
+++ b/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb
@@ -6,13 +6,13 @@ COMPATIBLE_MACHINE = "jornada6xx"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            file://defconfig_jlime \
-	   file://LinuxSH-2.6.17.patch;patch=0 \
-	   file://alsa_hp6xx_2.6.17.patch;patch=0 \
-	   file://rtc-2.6.17.patch;patch=0 \
-	   file://unexpected-int-fix.patch;patch=0 \
-	   file://keymap-fix.patch;patch=0 \
-	   file://io.h-fix.patch;patch=0 \
-	   file://keyboard-fix-deadkeys.patch;patch=0"
+	   file://LinuxSH-2.6.17.patch \
+	   file://alsa_hp6xx_2.6.17.patch \
+	   file://rtc-2.6.17.patch \
+	   file://unexpected-int-fix.patch \
+	   file://keymap-fix.patch \
+	   file://io.h-fix.patch \
+	   file://keyboard-fix-deadkeys.patch"
 
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
index c932df901f..c8f50d6cc0 100644
--- a/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
+++ b/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
@@ -7,8 +7,8 @@ COMPATIBLE_HOST = "sh.*-linux"
 #COMPATIBLE_MACHINE = "jornada6xx"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.21-rc5 \
-           file://git-20070405-2.patch;patch=1 \
-           file://hp6xx-IRQ3.patch;patch=1 \
+           file://git-20070405-2.patch \
+           file://hp6xx-IRQ3.patch \
 	   file://defconfig"
 	   
 
diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb
index 31d6627bbb..f94b1c9869 100644
--- a/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb
+++ b/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb
@@ -8,19 +8,19 @@ COMPATIBLE_MACHINE = "jornada7xx"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \
            file://defconf_jlime \
-	   file://AsmArm-ArchSa1100-Jornada720.patch;patch=0 \
-	   file://Cpu-Sa1110-Jornada720.patch;patch=0 \
-	   file://Kconfig-Arch-Jornada720.patch;patch=0 \
-	   file://Kconfig-Keyboard-Jornada720.patch;patch=0 \
-	   file://Kconfig-Touchscreen-Jornada720.patch;patch=0 \
-	   file://Kconfig-Video-Jornada720.patch;patch=0 \
-	   file://Mach-Sa1100-Jornada720.patch;patch=0 \
-	   file://Makefile-Keyboard-Jornada720.patch;patch=0 \
-	   file://Makefile-Touchscreen-Jornada720.patch;patch=0 \
-	   file://Makefile-Video-Jornada720.patch;patch=0 \
-	   file://Newfile-Epson1356fb.patch;patch=0 \
-	   file://Newfile-Jornada720_kbd.patch;patch=0 \
-	   file://Newfile-Jornada720_ts.patch;patch=0"
+	   file://AsmArm-ArchSa1100-Jornada720.patch \
+	   file://Cpu-Sa1110-Jornada720.patch \
+	   file://Kconfig-Arch-Jornada720.patch \
+	   file://Kconfig-Keyboard-Jornada720.patch \
+	   file://Kconfig-Touchscreen-Jornada720.patch \
+	   file://Kconfig-Video-Jornada720.patch \
+	   file://Mach-Sa1100-Jornada720.patch \
+	   file://Makefile-Keyboard-Jornada720.patch \
+	   file://Makefile-Touchscreen-Jornada720.patch \
+	   file://Makefile-Video-Jornada720.patch \
+	   file://Newfile-Epson1356fb.patch \
+	   file://Newfile-Jornada720_kbd.patch \
+	   file://Newfile-Jornada720_ts.patch"
 
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb
index d5c0528e61..40b936dea2 100644
--- a/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb
+++ b/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb
@@ -8,7 +8,7 @@ COMPATIBLE_MACHINE = "jornada7xx"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz \
            file://defconf_jlime \
-	   file://linux-2.6.18-jornada7xx.patch;patch=0"
+	   file://linux-2.6.18-jornada7xx.patch"
 
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
index 02ff86422a..4078fcba9e 100644
--- a/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
+++ b/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
@@ -7,8 +7,8 @@ COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "jornada7xx"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.19/patch-2.6.19-rc6.bz2;patch=1;name=patch \
-	   file://jornada7xx.patch;patch=0 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.19/patch-2.6.19-rc6.bz2;apply=yes;name=patch \
+	   file://jornada7xx.patch \
            file://defconf_jlime "
 
 S = "${WORKDIR}/linux-2.6.18"
diff --git a/recipes/linux/linux-kirkwood_2.6.29.5.bb b/recipes/linux/linux-kirkwood_2.6.29.5.bb
index 0a304b3f99..47c2998d3f 100644
--- a/recipes/linux/linux-kirkwood_2.6.29.5.bb
+++ b/recipes/linux/linux-kirkwood_2.6.29.5.bb
@@ -7,15 +7,14 @@ require linux.inc
 
 # Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc
 PV = "2.6.29.5"
-PR_append = "+gitr${SRCPV}"
-PE = "1"
-#PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCPV}"
+PR_append = "+gitr${SRCREV}"
+#PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}"
 
 SRCREV = "70deca35020a5dc3bd3c228bd46852cab77a7f6b"
 SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \
-           file://fw.patch;patch=1 \
-           file://0001--ARM-Kirkwood-CPU-idle-driver.patch;patch=1 \
-           file://0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch;patch=1 \
+           file://fw.patch \
+           file://0001--ARM-Kirkwood-CPU-idle-driver.patch \
+           file://0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch \
            file://defconfig \
                "
 
diff --git a/recipes/linux/linux-kirkwood_2.6.30.5.bb b/recipes/linux/linux-kirkwood_2.6.30.5.bb
index 699d973a72..5498341a32 100644
--- a/recipes/linux/linux-kirkwood_2.6.30.5.bb
+++ b/recipes/linux/linux-kirkwood_2.6.30.5.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.30 \
            file://defconfig"
 
 SRCREV_openrd-base = "8cb424312d88810bb62edbeef42a510725ceb482"
-SRC_URI_append_openrd-base = " file://newer-arm-mach-types.patch;patch=1 "
+SRC_URI_append_openrd-base = " file://newer-arm-mach-types.patch "
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/linux/linux-kirkwood_2.6.31.bb b/recipes/linux/linux-kirkwood_2.6.31.bb
index 56d0116bcc..690b214cbf 100644
--- a/recipes/linux/linux-kirkwood_2.6.31.bb
+++ b/recipes/linux/linux-kirkwood_2.6.31.bb
@@ -20,15 +20,15 @@ SRCREV = "8cb424312d88810bb62edbeef42a510725ceb482"
 SRC_URI = "git://git.marvell.com/orion.git;protocol=git \
            file://defconfig"
 
-SRC_URI_append_openrd-base = " file://openrd-base-enable-pcie.patch;patch=1 \
-                               file://cpuidle-reenable-interrupts.patch;patch=1 \
-                               file://0001-Squashfs-move-zlib-decompression-wrapper-code-into.patch;patch=1 \
-                               file://0002-Squashfs-Factor-out-remaining-zlib-dependencies-int.patch;patch=1 \
-                               file://0003-Squashfs-add-a-decompressor-framework.patch;patch=1 \
-                               file://0004-Squashfs-add-decompressor-entries-for-lzma-and-lzo.patch;patch=1 \
-                               file://0005-Squashfs-add-an-extra-parameter-to-the-decompressor.patch;patch=1 \
-                               file://0006-Squashfs-add-LZMA-compression.patch;patch=1 \
-                               file://0007-Squashfs-Make-unlzma-available-to-non-initramfs-ini.patch;patch=1 \
+SRC_URI_append_openrd-base = " file://openrd-base-enable-pcie.patch \
+                               file://cpuidle-reenable-interrupts.patch \
+                               file://0001-Squashfs-move-zlib-decompression-wrapper-code-into.patch \
+                               file://0002-Squashfs-Factor-out-remaining-zlib-dependencies-int.patch \
+                               file://0003-Squashfs-add-a-decompressor-framework.patch \
+                               file://0004-Squashfs-add-decompressor-entries-for-lzma-and-lzo.patch \
+                               file://0005-Squashfs-add-an-extra-parameter-to-the-decompressor.patch \
+                               file://0006-Squashfs-add-LZMA-compression.patch \
+                               file://0007-Squashfs-Make-unlzma-available-to-non-initramfs-ini.patch \
                              "
 # update machine types list for ARM architecture, only for machines that need it
 do_arm_mach_types() {
diff --git a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb
index 893e349aca..7cdc60084a 100644
--- a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb
+++ b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb
@@ -15,15 +15,15 @@ SRC_URI = "git://repo.or.cz/linux-2.6/linux-2.6-openrd.git;protocol=git \
            file://defconfig"
 
 SRC_URI_append_openrd-base += " \
-	 file://openrd-base/openrd-base-enable-pcie.patch;patch=1 \
-	 file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;patch=1 \
+	 file://openrd-base/openrd-base-enable-pcie.patch \
+	 file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch \
 	"
 
 SRC_URI_append_openrd-client += " \
-	 file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch;patch=1 \
-	 file://0002-OpenRD-Client-Volari-Z11-driver-added.patch;patch=1 \
-	 file://0003-ARM-Kirkwood-Sound-Sound-driver-added.patch;patch=1 \
-	 file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;patch=1 \
+	 file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch \
+	 file://0002-OpenRD-Client-Volari-Z11-driver-added.patch \
+	 file://0003-ARM-Kirkwood-Sound-Sound-driver-added.patch \
+	 file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch \
 	"
 
 # update machine types list for ARM architecture, only for machines that need it
diff --git a/recipes/linux/linux-kirkwood_2.6.33-rc5.bb b/recipes/linux/linux-kirkwood_2.6.33-rc5.bb
index cae7554077..cd77560e4d 100644
--- a/recipes/linux/linux-kirkwood_2.6.33-rc5.bb
+++ b/recipes/linux/linux-kirkwood_2.6.33-rc5.bb
@@ -15,14 +15,14 @@ SRC_URI = "git://repo.or.cz/linux-2.6/linux-2.6-openrd.git;protocol=git \
            file://defconfig"
 
 SRC_URI_append_openrd-base += " \
-	 file://0004-ARM-Kirkwood-OpenRD-base-SD-UART1-selection.patch;patch=1 \
+	 file://0004-ARM-Kirkwood-OpenRD-base-SD-UART1-selection.patch \
 	"
 
 SRC_URI_append_openrd-client += " \
-	 file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch;patch=1 \
-	 file://0002-OpenRD-Client-Volari-Z11-driver-added.patch;patch=1 \
-	 file://0003-ARM-Kirkwood-Sound-Sound-driver-added.patch;patch=1 \
-	 file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;patch=1 \
+	 file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch \
+	 file://0002-OpenRD-Client-Volari-Z11-driver-added.patch \
+	 file://0003-ARM-Kirkwood-Sound-Sound-driver-added.patch \
+	 file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch \
 	"
 
 # update machine types list for ARM architecture, only for machines that need it
diff --git a/recipes/linux/linux-ks8695_2.6.16.bb b/recipes/linux/linux-ks8695_2.6.16.bb
index 8f39bfa0d1..1f31f2eefc 100644
--- a/recipes/linux/linux-ks8695_2.6.16.bb
+++ b/recipes/linux/linux-ks8695_2.6.16.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2"
 PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           file://ks8695-headers-r0.patch;patch=1 \
-           file://ks8695-base-r0.patch;patch=1 \
+           file://ks8695-headers-r0.patch \
+           file://ks8695-base-r0.patch \
            file://defconfig-ks8695"
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/recipes/linux/linux-leviathan/defconfig b/recipes/linux/linux-leviathan/defconfig
index 77838c38df..4ad5d6b4ca 100644
--- a/recipes/linux/linux-leviathan/defconfig
+++ b/recipes/linux/linux-leviathan/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Mon Apr 12 19:28:58 2010
+# Fri Apr 16 00:42:36 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -954,6 +954,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_MK712 is not set
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI_MT_EXTENSION=y
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI_MT_PROTOCOL is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
@@ -1606,7 +1608,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
+CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
diff --git a/recipes/linux/linux-leviathan_git.bb b/recipes/linux/linux-leviathan_git.bb
index 3220d661cd..7ee49a6b56 100644
--- a/recipes/linux/linux-leviathan_git.bb
+++ b/recipes/linux/linux-leviathan_git.bb
@@ -2,15 +2,13 @@ require linux.inc
 DEPENDS += "android-image-utils-native"
 
 PV = "2.6.32+${PR}+gitr${SRCREV}"
-PR = "r16"
+PR = "r17"
 
 COMPATIBLE_MACHINE = "htcdream"
-CMDLINE = "console=tty1 no_console_suspend=1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M"
+CMDLINE = "console=tty1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M"
 
-#CMDLINE = "console=tty1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M earlysuspend.debug_mask=3"
-#SRCREV_LAST_GOOD = "e94465547ea4b765024ff08c36afffb5664f3121"
-
-SRCREV = "2402bb32e564fb3b802c4a23d4a3f1fd0faa8d17"
+SRCREV_LAST_GOOD = "2402bb32e564fb3b802c4a23d4a3f1fd0faa8d17"
+SRCREV = "636fa4daf243826ef6cebb64dd0509f3b079fcb5"
 
 SRC_URI = "\
   git://gitorious.org/htc-msm-2-6-32/leviathan-incoming.git;protocol=git;branch=msm-gnuconform \
diff --git a/recipes/linux/linux-linkstationppc_2.6.28.4.bb b/recipes/linux/linux-linkstationppc_2.6.28.4.bb
index 005ddf748b..3a0c40dd42 100644
--- a/recipes/linux/linux-linkstationppc_2.6.28.4.bb
+++ b/recipes/linux/linux-linkstationppc_2.6.28.4.bb
@@ -7,8 +7,8 @@ DEPENDS = "dtc-native u-boot-mkimage-native"
 COMPATIBLE_MACHINE = "(lsppchd|lsppchg)"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.gz;patch=1;name=patch \
-           file://fw-and-powerpc-install.patch;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.gz;apply=yes;name=patch \
+           file://fw-and-powerpc-install.patch \
            file://defconfig \
                "
 S = "${WORKDIR}/linux-2.6.28"
diff --git a/recipes/linux/linux-magicbox_2.6.18.6.bb b/recipes/linux/linux-magicbox_2.6.18.6.bb
index 248f50200a..32953341c0 100644
--- a/recipes/linux/linux-magicbox_2.6.18.6.bb
+++ b/recipes/linux/linux-magicbox_2.6.18.6.bb
@@ -9,14 +9,14 @@ COMPATIBLE_MACHINE = "magicbox"
 KERNEL_CCSUFFIX = "-3.4.4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-          file://000-fix-makefile.patch;patch=1 \
-          file://001-magicbox-board-2.6.18.patch;patch=1 \
-          file://002-magicbox-mtd-map-2.6.18.patch;patch=1 \
-          file://010-load-ramdisk-even-if-rootdev-equals-ramdisk.patch;patch=1 \
-          file://magicbox2-ide-cf_2.6.18.patch;patch=1 \
-          file://squashfs3.1-patch;patch=1 \
-          file://squashfs-lzma-support.patch;patch=1 \
-          file://kernel-2.6.18-layer7-2.6.patch;patch=1 \
+          file://000-fix-makefile.patch \
+          file://001-magicbox-board-2.6.18.patch \
+          file://002-magicbox-mtd-map-2.6.18.patch \
+          file://010-load-ramdisk-even-if-rootdev-equals-ramdisk.patch \
+          file://magicbox2-ide-cf_2.6.18.patch \
+          file://squashfs3.1-patch;apply=yes \
+          file://squashfs-lzma-support.patch \
+          file://kernel-2.6.18-layer7-2.6.patch \
           file://config-2.6.18-magicbox2\
 "
 
diff --git a/recipes/linux/linux-magicbox_2.6.19.2.bb b/recipes/linux/linux-magicbox_2.6.19.2.bb
index 5647dbd1e5..683defd805 100644
--- a/recipes/linux/linux-magicbox_2.6.19.2.bb
+++ b/recipes/linux/linux-magicbox_2.6.19.2.bb
@@ -9,46 +9,46 @@ DEPENDS = "u-boot"
 COMPATIBLE_MACHINE = "magicbox"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-          file://001-squashfs.patch;patch=1 \                      
-          file://002-lzma_decompress.patch;patch=1 \  
-          file://003-squashfs_lzma.patch;patch=1 \  
-          file://004-extra_optimization.patch;patch=1 \
-          file://006-gcc4_inline_fix.patch;patch=1 \
-          file://007-samsung_flash.patch;patch=1 \
-          file://009-revert_intel_flash_breakage.patch;patch=1 \
-          file://010-disable_old_squashfs_compatibility.patch;patch=1 \
-          file://011-mips_boot.patch;patch=1 \ 
-          file://012-mips_cpu_tlb.patch;patch=1 \  
-          file://050-mtdpart_redboot_partition_truncate.patch;patch=1 \  
-          file://060-rootfs_split.patch;patch=1 \
-          file://100-netfilter_layer7_2.8.patch;patch=1 \
-          file://101-netfilter_layer7_pktmatch.patch;patch=1 \  
-          file://110-ipp2p_0.8.1rc1.patch;patch=1 \
-          file://120-openswan-2.4.0.kernel-2.6-natt.patch;patch=1 \
-          file://130-netfilter-ipset.patch;patch=1 \
-          file://140-netfilter_time.patch;patch=1 \
-          file://150-netfilter_imq.patch;patch=1 \        
-          file://160-netfilter_route.patch;patch=1 \
-          file://170-netfilter_chaostables.patch;patch=1 \       
-          file://200-sched_esfq.patch;patch=1 \
-          file://201-multiple_default_gateways.patch;patch=1 \
-          file://202-mips-freestanding.patch;patch=1 \
-          file://204-jffs2_eofdetect.patch;patch=1 \
-          file://207-powerpc_asm_segment_h.patch;patch=1 \
-          file://210-d80211_compat.patch;patch=1 \
-          file://211-no_block2mtd_readahead.patch;patch=1 \
-          file://212-block2mtd_erase_scan.patch;patch=1 \
-          file://510-Yaffs.patch;patch=1 \
-          file://600-x86_lzma.patch;patch=1 \
-          file://700-airprime.patch;patch=1 \
-          file://900-headers_type_and_time.patch;patch=1 \
-          file://901-asm_bitops_include.patch;patch=1 \
-          file://902-darwin_scripts_include.patch;patch=1 \
-          file://903-stddef_include.patch;patch=1 \
-          file://904-ls_time_locale.patch;patch=1 \
-          file://001-magicbox_support.patch;patch=1 \
-          file://002-flash_map.patch;patch=1 \
-          file://100-cf_slot.patch;patch=1 \
+          file://001-squashfs.patch \                      
+          file://002-lzma_decompress.patch \  
+          file://003-squashfs_lzma.patch \  
+          file://004-extra_optimization.patch \
+          file://006-gcc4_inline_fix.patch \
+          file://007-samsung_flash.patch \
+          file://009-revert_intel_flash_breakage.patch \
+          file://010-disable_old_squashfs_compatibility.patch \
+          file://011-mips_boot.patch \ 
+          file://012-mips_cpu_tlb.patch \  
+          file://050-mtdpart_redboot_partition_truncate.patch \  
+          file://060-rootfs_split.patch \
+          file://100-netfilter_layer7_2.8.patch \
+          file://101-netfilter_layer7_pktmatch.patch \  
+          file://110-ipp2p_0.8.1rc1.patch \
+          file://120-openswan-2.4.0.kernel-2.6-natt.patch \
+          file://130-netfilter-ipset.patch \
+          file://140-netfilter_time.patch \
+          file://150-netfilter_imq.patch \        
+          file://160-netfilter_route.patch \
+          file://170-netfilter_chaostables.patch \       
+          file://200-sched_esfq.patch \
+          file://201-multiple_default_gateways.patch \
+          file://202-mips-freestanding.patch \
+          file://204-jffs2_eofdetect.patch \
+          file://207-powerpc_asm_segment_h.patch \
+          file://210-d80211_compat.patch \
+          file://211-no_block2mtd_readahead.patch \
+          file://212-block2mtd_erase_scan.patch \
+          file://510-Yaffs.patch \
+          file://600-x86_lzma.patch \
+          file://700-airprime.patch \
+          file://900-headers_type_and_time.patch \
+          file://901-asm_bitops_include.patch \
+          file://902-darwin_scripts_include.patch \
+          file://903-stddef_include.patch \
+          file://904-ls_time_locale.patch \
+          file://001-magicbox_support.patch \
+          file://002-flash_map.patch \
+          file://100-cf_slot.patch \
 
           file://config-magicbox2\
 "
diff --git a/recipes/linux/linux-mainstone_2.6.25.bb b/recipes/linux/linux-mainstone_2.6.25.bb
index 85210ec1a5..a5293ebbbf 100644
--- a/recipes/linux/linux-mainstone_2.6.25.bb
+++ b/recipes/linux/linux-mainstone_2.6.25.bb
@@ -6,9 +6,9 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.25/patch-2.6.25-rc4.bz2;patch=1;name=patch \
-           file://mainstone-keypad.patch;patch=1 \
-	   file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.25/patch-2.6.25-rc4.bz2;apply=yes;name=patch \
+           file://mainstone-keypad.patch \
+	   file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.24"
diff --git a/recipes/linux/linux-msm7_git.bb b/recipes/linux/linux-msm7_git.bb
index 1e3ee8ec2a..45247fd604 100644
--- a/recipes/linux/linux-msm7_git.bb
+++ b/recipes/linux/linux-msm7_git.bb
@@ -1,10 +1,9 @@
 require linux.inc
 
-PV = "2.6.25+${PR}+gitr${SRCPV}"
-PE = "1"
-PV_htcraphael = "2.6.27+${PR}+gitr${SRCPV}"
-PV_htcdiamond = "2.6.27+${PR}+gitr${SRCPV}"
-PV_htcdream = "2.6.29+${PR}+gitr${SRCPV}"
+PV = "2.6.25+${PR}+gitr${SRCREV}"
+PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}"
+PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}"
+PV_htcdream = "2.6.29+${PR}+gitr${SRCREV}"
 PR = "r13"
 
 COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone|htcdream"
diff --git a/recipes/linux/linux-mtx-1_2.4.27.bb b/recipes/linux/linux-mtx-1_2.4.27.bb
index 3ed0b22569..3927520b92 100644
--- a/recipes/linux/linux-mtx-1_2.4.27.bb
+++ b/recipes/linux/linux-mtx-1_2.4.27.bb
@@ -9,39 +9,39 @@ PROVIDES = "virtual/kernel"
 RDEPENDS = "mtd-utils"
 
 SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_27 \
-	file://01-mtd-2004-01-27.diff;patch=1 \
-	file://02-mtd-mtx-1-map.diff;patch=1 \
-	file://03-mtd-erase-compiler-bug.diff;patch=1 \
-	file://04-mtx-1-board-reset.diff;patch=1 \
-	file://05-mtx-1-pci-irq.diff;patch=1 \
-	file://06-zboot-2.4.26.patch;patch=1 \
-	file://07-zboot-zimage-flash-bin.diff;patch=1 \
-	file://08-usb-nonpci-2.4.24.patch;patch=1 \
-	file://09-au1000-eth-vlan.diff;patch=1 \
-	file://10-iw-max-spy-32.diff;patch=1 \
-	file://11-mtd-proc-partition-rw.diff;patch=1 \
-	file://12-openswan-2.2.0-nat-t.diff;patch=1 \
-	file://13-openswan-2.2.0.patch;patch=1 \
-	file://14-au1000-eth-link-beat.diff;patch=1 \
-	file://16-i2c.patch;patch=1 \
-	file://17-lmsensors.2.8.8.patch;patch=1 \
-	file://18-i2c-au1x00gpio.patch;patch=1 \
-	file://19-kernel-make-depend.diff;patch=1 \
-	file://20-au1x00_ethernet_tx_stats.diff;patch=1 \
-	file://21-mtx-1-watchdog.diff;patch=1 \
-	file://23-mtx-1_watchdog_autotrigger.patch;patch=1 \
-	file://24-mtx-1_sysbtn.patch;patch=1 \
-	file://25-mtx-sio2.diff;patch=1 \
-	file://26-usbd-amd-pb1x00-kit-23may2003-update.diff;patch=1 \
-	file://27-usbd-amd-pb1x00-kit-23may2003-usbd.diff;patch=1 \
-	file://29-au1000-pci-config-clear-errors.diff;patch=1 \
-	file://32-usbserial-stalled-hack.diff;patch=1 \
-	file://33-usbserial-bulk_in_size-4096.diff;patch=1 \
-	file://42-usb-ohci-fixes.patch;patch=1 \
-	file://43-usbserial-27-32-backport.diff;patch=1 \
-	file://45-acm-tty-and-sb2.patch;patch=1 \
-	file://48-pptp.patch;patch=1 \
-	file://49-bash4-configure.patch;patch=1 \
+	file://01-mtd-2004-01-27.diff \
+	file://02-mtd-mtx-1-map.diff \
+	file://03-mtd-erase-compiler-bug.diff \
+	file://04-mtx-1-board-reset.diff \
+	file://05-mtx-1-pci-irq.diff \
+	file://06-zboot-2.4.26.patch \
+	file://07-zboot-zimage-flash-bin.diff \
+	file://08-usb-nonpci-2.4.24.patch \
+	file://09-au1000-eth-vlan.diff \
+	file://10-iw-max-spy-32.diff \
+	file://11-mtd-proc-partition-rw.diff \
+	file://12-openswan-2.2.0-nat-t.diff \
+	file://13-openswan-2.2.0.patch \
+	file://14-au1000-eth-link-beat.diff \
+	file://16-i2c.patch \
+	file://17-lmsensors.2.8.8.patch \
+	file://18-i2c-au1x00gpio.patch \
+	file://19-kernel-make-depend.diff \
+	file://20-au1x00_ethernet_tx_stats.diff \
+	file://21-mtx-1-watchdog.diff \
+	file://23-mtx-1_watchdog_autotrigger.patch \
+	file://24-mtx-1_sysbtn.patch \
+	file://25-mtx-sio2.diff \
+	file://26-usbd-amd-pb1x00-kit-23may2003-update.diff \
+	file://27-usbd-amd-pb1x00-kit-23may2003-usbd.diff \
+	file://29-au1000-pci-config-clear-errors.diff \
+	file://32-usbserial-stalled-hack.diff \
+	file://33-usbserial-bulk_in_size-4096.diff \
+	file://42-usb-ohci-fixes.patch \
+	file://43-usbserial-27-32-backport.diff \
+	file://45-acm-tty-and-sb2.patch \
+	file://48-pptp.patch \
+	file://49-bash4-configure.patch \
 	file://defconfig-mtx-1"
 
 S = "${WORKDIR}/linux"
diff --git a/recipes/linux/linux-mtx-1u_2.4.27.bb b/recipes/linux/linux-mtx-1u_2.4.27.bb
index 00132f54cd..70412abf95 100644
--- a/recipes/linux/linux-mtx-1u_2.4.27.bb
+++ b/recipes/linux/linux-mtx-1u_2.4.27.bb
@@ -5,14 +5,14 @@ COMPATIBLE_MACHINE = "mtx-1u"
 PR = "r11"
 
 SRC_URI += "\
-	file://22-umts.diff;patch=1 \
-	file://28-idsel-cardbus.diff;patch=1 \
-	file://30-mtx-1-sysled.diff;patch=1 \
-	file://31-mtx-1u-led-init.diff;patch=1 \
-	file://32-usbserial-stalled-hack.diff;patch=1 \
-	file://33-usbserial-bulk_in_size-4096.diff;patch=1 \
-	file://39-mppe-mpc.patch;patch=1 \
-	file://40-option-hsdpa.patch;patch=1"
+	file://22-umts.diff \
+	file://28-idsel-cardbus.diff \
+	file://30-mtx-1-sysled.diff \
+	file://31-mtx-1u-led-init.diff \
+	file://32-usbserial-stalled-hack.diff \
+	file://33-usbserial-bulk_in_size-4096.diff \
+	file://39-mppe-mpc.patch \
+	file://40-option-hsdpa.patch"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-mtx-1-${PV}"
 
diff --git a/recipes/linux/linux-mtx-2_2.4.27.bb b/recipes/linux/linux-mtx-2_2.4.27.bb
index 4a0c87ecdb..90a0dff9d1 100644
--- a/recipes/linux/linux-mtx-2_2.4.27.bb
+++ b/recipes/linux/linux-mtx-2_2.4.27.bb
@@ -9,41 +9,41 @@ PROVIDES = "virtual/kernel"
 RDEPENDS = "mtd-utils"
 
 SRC_URI += "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_27 \
-	file://00-mtx-2.diff;patch=1 \
-	file://01-mtd-mtx-2.diff;patch=1 \
-	file://03-mtd-erase-compiler-bug.diff;patch=1 \
-	file://04-mtd-yamonenv-readwrite.diff;patch=1 \
-	file://05-mtx-2-pci-irq.diff;patch=1 \
-	file://06-zboot-2.4.26.patch;patch=1 \
-	file://07-zboot-zimage-flash-bin.diff;patch=1 \
-	file://08-usb-nonpci-2.4.24.patch;patch=1 \
-	file://10-iw-max-spy-32.diff;patch=1 \
-	file://11-mtd-proc-partition-rw.diff;patch=1 \
-	file://12-openswan-2.2.0-nat-t.diff;patch=1 \
-	file://13-openswan-2.2.0.patch;patch=1 \
-	file://16-i2c.patch;patch=1 \
-	file://17-lmsensors.2.8.8.patch;patch=1 \
-	file://18-i2c-au1x00gpio.patch;patch=1 \
-	file://19-kernel-make-depend.diff;patch=1 \
-	file://22-umts.diff;patch=1 \
-	file://27-idsel-cardbus.diff;patch=1 \
-	file://28-surfbox2-idsel.diff;patch=1 \
-	file://29-au1000-pci-config-clear-errors.diff;patch=1 \
-	file://32-usbserial-stalled-hack.diff;patch=1 \
-	file://33-usbserial-bulk_in_size-4096.diff;patch=1 \
-	file://35-sb2-slic.patch;patch=1 \
-	file://36-sb2-lcd.patch;patch=1 \
-	file://37-sb2-sysbtn.patch;patch=1 \
-	file://39-mppe-mpc.patch;patch=1 \
-	file://40-option-hsdpa.patch;patch=1 \
-	file://42-usb-ohci-fixes.patch;patch=1 \
-	file://43-usbserial-27-32-backport.diff;patch=1 \
-	file://44-dbdma-and-au1550_psc.diff;patch=1 \
-	file://45-acm-tty-and-sb2.patch;patch=1 \
-	file://46-otg.patch;patch=1 \
-	file://47-au1000_eth.patch;patch=1 \
-	file://48-pptp.patch;patch=1 \
-	file://49-bash4-configure.patch;patch=1 \
+	file://00-mtx-2.diff \
+	file://01-mtd-mtx-2.diff \
+	file://03-mtd-erase-compiler-bug.diff \
+	file://04-mtd-yamonenv-readwrite.diff \
+	file://05-mtx-2-pci-irq.diff \
+	file://06-zboot-2.4.26.patch \
+	file://07-zboot-zimage-flash-bin.diff \
+	file://08-usb-nonpci-2.4.24.patch \
+	file://10-iw-max-spy-32.diff \
+	file://11-mtd-proc-partition-rw.diff \
+	file://12-openswan-2.2.0-nat-t.diff \
+	file://13-openswan-2.2.0.patch \
+	file://16-i2c.patch \
+	file://17-lmsensors.2.8.8.patch \
+	file://18-i2c-au1x00gpio.patch \
+	file://19-kernel-make-depend.diff \
+	file://22-umts.diff \
+	file://27-idsel-cardbus.diff \
+	file://28-surfbox2-idsel.diff \
+	file://29-au1000-pci-config-clear-errors.diff \
+	file://32-usbserial-stalled-hack.diff \
+	file://33-usbserial-bulk_in_size-4096.diff \
+	file://35-sb2-slic.patch \
+	file://36-sb2-lcd.patch \
+	file://37-sb2-sysbtn.patch \
+	file://39-mppe-mpc.patch \
+	file://40-option-hsdpa.patch \
+	file://42-usb-ohci-fixes.patch \
+	file://43-usbserial-27-32-backport.diff \
+	file://44-dbdma-and-au1550_psc.diff \
+	file://45-acm-tty-and-sb2.patch \
+	file://46-otg.patch \
+	file://47-au1000_eth.patch \
+	file://48-pptp.patch \
+	file://49-bash4-configure.patch \
 	file://defconfig-mtx-2"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-mtx-2-${PV}"
diff --git a/recipes/linux/linux-mtx-3_2.6.15.4.bb b/recipes/linux/linux-mtx-3_2.6.15.4.bb
index 63995afe1f..772e573351 100644
--- a/recipes/linux/linux-mtx-3_2.6.15.4.bb
+++ b/recipes/linux/linux-mtx-3_2.6.15.4.bb
@@ -12,8 +12,8 @@ DEPENDS = "u-boot"
 RDEPENDS = "mtd-utils"
 
 SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2;name=kernel \
-	file://00-mtx-3.diff;patch=1 \
-	file://01-verbose-and-fatal-mkuboot.diff;patch=1 \
+	file://00-mtx-3.diff \
+	file://01-verbose-and-fatal-mkuboot.diff \
 	file://defconfig-mtx-3"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-mtx-3-${KV}"
diff --git a/recipes/linux/linux-n1200_2.6.27-rc9+git.bb b/recipes/linux/linux-n1200_2.6.27-rc9+git.bb
index f9565067e4..d6751d0173 100644
--- a/recipes/linux/linux-n1200_2.6.27-rc9+git.bb
+++ b/recipes/linux/linux-n1200_2.6.27-rc9+git.bb
@@ -6,7 +6,7 @@ DEPENDS = "u-boot-mkimage-native"
 COMPATIBLE_MACHINE = "n1200"
 
 SRC_URI = "http://downloads.thecus.nas-central.org/N1200/Kernels/linux-2.6.27-foonas-git.tar.gz \
-           file://fw-install.patch;patch=1 \
+           file://fw-install.patch \
            file://defconfig"
 S = "${WORKDIR}/linux-2.6.27-foonas-git"
 
diff --git a/recipes/linux/linux-navman_2.6.18.bb b/recipes/linux/linux-navman_2.6.18.bb
index d582e83585..14bd10f11f 100644
--- a/recipes/linux/linux-navman_2.6.18.bb
+++ b/recipes/linux/linux-navman_2.6.18.bb
@@ -9,7 +9,7 @@ PR = "r0"
 COMPATIBLE_MACHINE = "navman-icn330"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2;name=kernel \
-           http://www.duff.dk/navman/navman-2.6.18.patch;patch=1;name=patch \
+           http://www.duff.dk/navman/navman-2.6.18.patch;name=patch \
            file://defconfig \
 		   "
 
diff --git a/recipes/linux/linux-neuros_2.6.15.bb b/recipes/linux/linux-neuros_2.6.15.bb
index c5453ec3b3..2c3c514e65 100644
--- a/recipes/linux/linux-neuros_2.6.15.bb
+++ b/recipes/linux/linux-neuros_2.6.15.bb
@@ -2,16 +2,15 @@
 
 PV = "2.6.15-torfu"
 PR = "r5"
-PE = "2"
 
 COMPATIBLE_MACHINE = "(neuros-osd)"
 
 #http://svn.neurostechnology.com/listing.php?repname=neuros-bsp&path=/branches/pqiu_rls_3.33-1.72_071207/kernels/linux-2.6.15/&rev=0&sc=0
 
 SRC_URI = "svn://svn.neurostechnology.com/svn/neuros-bsp/branches/torfu/kernels;module=linux-2.6.15;proto=svn;rev= \
-	file://g0-20080113.patch;patch=1\
+	file://g0-20080113.patch\
 	file://bsp_config.h \
-	file://mtune-gcc4-fix.patch;patch=1 \ 
+	file://mtune-gcc4-fix.patch \ 
 	file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.15"
diff --git a/recipes/linux/linux-neuros_git.bb b/recipes/linux/linux-neuros_git.bb
index 449868bf9f..9228ec24c8 100644
--- a/recipes/linux/linux-neuros_git.bb
+++ b/recipes/linux/linux-neuros_git.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "Linux kernel for Neuros OSD devices"
 
 SRCREV = "465f0ba12501e1c4e048f0a3ca8182404aeb66fc"
 
-PV = "2.6.30+2.6.31rc5-${PR}+gitr${SRCPV}"
-PE = "2"
+PV = "2.6.30+2.6.31rc5-${PR}+gitr${SRCREV}"
+PE = "1"
 
 COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
 
diff --git a/recipes/linux/linux-nokia800_2.6.18-osso40.bb b/recipes/linux/linux-nokia800_2.6.18-osso40.bb
index 38f2ee3c8e..4a3c3c7bc7 100644
--- a/recipes/linux/linux-nokia800_2.6.18-osso40.bb
+++ b/recipes/linux/linux-nokia800_2.6.18-osso40.bb
@@ -3,17 +3,17 @@ require linux-nokia800.inc
 PR = "r5"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz;name=kernel \
-           http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;patch=1;name=ossopatch \
-           ${RPSRC}/lzo_kernel-r0.patch;patch=1;name=rppatch25 \
-           ${RPSRC}/lzo_jffs2-r0.patch;patch=1;name=rppatch26 \
-           ${RPSRC}/lzo_crypto-r0b.patch;patch=1;name=rppatch27 \
-           ${RPSRC}/lzo_jffs2_lzomode-r0.patch;patch=1;name=rppatch28 \
-           ${RPSRC}/lzo_jffs2_sysfs-r0.patch;patch=1;name=rppatch29 \
-           file://fix_oprofile.patch;patch=1 \
-           file://linux-2.6-limits.patch;patch=1 \
+           http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;name=ossopatch \
+           ${RPSRC}/lzo_kernel-r0.patch;name=rppatch25 \
+           ${RPSRC}/lzo_jffs2-r0.patch;name=rppatch26 \
+           ${RPSRC}/lzo_crypto-r0b.patch;name=rppatch27 \
+           ${RPSRC}/lzo_jffs2_lzomode-r0.patch;name=rppatch28 \
+           ${RPSRC}/lzo_jffs2_sysfs-r0.patch;name=rppatch29 \
+           file://fix_oprofile.patch \
+           file://linux-2.6-limits.patch \
 	   file://defconfig"
 
-SRC_URI_append_nokia770 = " file://nokia770_nand_fix.patch;patch=1"
+SRC_URI_append_nokia770 = " file://nokia770_nand_fix.patch"
 
 S = "${WORKDIR}/linux-g"
 
diff --git a/recipes/linux/linux-nokia800_2.6.21-osso71.bb b/recipes/linux/linux-nokia800_2.6.21-osso71.bb
index da167c30a5..cf8afa6e96 100644
--- a/recipes/linux/linux-nokia800_2.6.21-osso71.bb
+++ b/recipes/linux/linux-nokia800_2.6.21-osso71.bb
@@ -4,11 +4,11 @@ PR = "r5"
 DEFAULT_PREFERENCE_nokia770 = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2;name=kernel \
-	   http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz;patch=1;name=ossopatch \
-           ${RPSRC}/input_power-r7.patch;patch=1;name=rppatch24 \
-	   file://suspend-button.patch;patch=1 \
-           file://linux-2.6-limits.patch;patch=1 \
-           file://1300-fix-gcc-4.3-false-modulo-optimization.patch.patch;patch=1 \
+	   http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz;name=ossopatch \
+           ${RPSRC}/input_power-r7.patch;name=rppatch24 \
+	   file://suspend-button.patch \
+           file://linux-2.6-limits.patch \
+           file://1300-fix-gcc-4.3-false-modulo-optimization.patch.patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.21"
diff --git a/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb b/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb
index 669364d0b7..c9f64d9a08 100644
--- a/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb
+++ b/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "Linux kernel for OMAP processors"
 LICENSE = "GPLv2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2;patch=1;name=patch \
-           file://schedstats-arm.patch;patch=1 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2;apply=yes;name=patch \
+           file://schedstats-arm.patch \
            file://defconfig"
 S = "${WORKDIR}/linux-2.6.9"
 
diff --git a/recipes/linux/linux-omap-archos_2.6.22.1-omap1.bb b/recipes/linux/linux-omap-archos_2.6.22.1-omap1.bb
index 19700eec19..1b50e2306f 100644
--- a/recipes/linux/linux-omap-archos_2.6.22.1-omap1.bb
+++ b/recipes/linux/linux-omap-archos_2.6.22.1-omap1.bb
@@ -8,8 +8,8 @@ COMPATIBLE_MACHINE = "archos5"
 PV = "2.6.22.1-omap1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;patch=1;name=patch \
-           file://patch-archos-2.6.22-omap1.bz2;patch=1 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;apply=yes;name=patch \
+           file://patch-archos-2.6.22-omap1.bz2;apply=yes \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.22"
diff --git a/recipes/linux/linux-omap-archos_2.6.27.10-omap1.bb b/recipes/linux/linux-omap-archos_2.6.27.10-omap1.bb
index 7b6f93f0f5..54d3c27c38 100644
--- a/recipes/linux/linux-omap-archos_2.6.27.10-omap1.bb
+++ b/recipes/linux/linux-omap-archos_2.6.27.10-omap1.bb
@@ -9,8 +9,8 @@ COMPATIBLE_MACHINE = "archos5it"
 PV = "2.6.27.10-omap1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/patch-2.6.27-omap1.bz2;patch=1;name=patch \
-           file://patch-archos-2.6.27-omap1.bz2;patch=1 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.27-omap1.bz2;apply=yes;name=patch \
+           file://patch-archos-2.6.27-omap1.bz2;apply=yes \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.27"
diff --git a/recipes/linux/linux-omap-multi-psp_2.6.32.bb b/recipes/linux/linux-omap-multi-psp_2.6.32.bb
index e1d662c7bf..de75d69956 100644
--- a/recipes/linux/linux-omap-multi-psp_2.6.32.bb
+++ b/recipes/linux/linux-omap-multi-psp_2.6.32.bb
@@ -13,17 +13,17 @@ SRCREV = "06733a907b777f7dca21b2d44e36b6c4afbe01fe"
 MACHINE_KERNEL_PR_append = "+gitr${SRCREV}"
 
 SRC_URI += "git://arago-project.org/git/people/sriram/ti-psp-omap.git;protocol=git;branch=master \
-           file://0005-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board.patch;patch=1 \
-           file://0006-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch;patch=1 \
-           file://0007-ASoC-enable-audio-capture-by-default-for-twl4030.patch;patch=1 \
-           file://0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch;patch=1 \
-           file://dss2/0015-OMAP-DSS-Add-DSS2-support-for-Beagle.patch;patch=1 \
-           file://dss2/0016-video-add-timings-for-hd720.patch;patch=1 \
-           file://holes.patch;patch=1 \
-           file://no-mmc-spew.patch;patch=1 \
-           file://beagleboard/0001-beagleboard-omap3_-foo-_rate_table-omap35x_-foo.patch;patch=1 \
-           file://beagleboard/0001-board-omap3beagle-prepare-for-DM3730-based-Beaglebo.patch;patch=1 \
-           file://0001-board-omap3touchbook-make-it-build-against-TI-linux.patch;patch=1 \
+           file://0005-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board.patch \
+           file://0006-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch \
+           file://0007-ASoC-enable-audio-capture-by-default-for-twl4030.patch \
+           file://0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch \
+           file://dss2/0015-OMAP-DSS-Add-DSS2-support-for-Beagle.patch \
+           file://dss2/0016-video-add-timings-for-hd720.patch \
+           file://holes.patch \
+           file://no-mmc-spew.patch \
+           file://beagleboard/0001-beagleboard-omap3_-foo-_rate_table-omap35x_-foo.patch \
+           file://beagleboard/0001-board-omap3beagle-prepare-for-DM3730-based-Beaglebo.patch \
+           file://0001-board-omap3touchbook-make-it-build-against-TI-linux.patch \
            file://defconfig"
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
diff --git a/recipes/linux/linux-omap-pm_2.6.28.bb b/recipes/linux/linux-omap-pm_2.6.28.bb
index 4111abb845..f5134de91b 100644
--- a/recipes/linux/linux-omap-pm_2.6.28.bb
+++ b/recipes/linux/linux-omap-pm_2.6.28.bb
@@ -7,48 +7,47 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
 
 SRCREV = "fe30e75b8c0b91b259fcea781b859e594ba21ae9"
 
-PV = "2.6.28-pm3+gitr${SRCPV}"
-PE = "1"
+PV = "2.6.28-pm3+gitr${SRCREV}"
 PR = "r7"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git;protocol=git;branch=pm-2.6.28 \
 	   file://defconfig"
 
 SRC_URI_append = " \
-           file://fixup-evm-cpufreq.diff;patch=1 \
-           file://no-empty-flash-warnings.patch;patch=1 \
-           file://no-cortex-deadlock.patch;patch=1 \
-           file://read_die_ids.patch;patch=1 \
-           file://fix-install.patch;patch=1 \
-           file://musb-support-high-bandwidth.patch.eml;patch=1 \
-           file://mru-fix-timings.diff;patch=1 \
-           file://mru-fix-display-panning.diff;patch=1 \
-           file://mru-improve-pixclock-config.diff;patch=1 \
-           file://mru-make-video-timings-selectable.diff;patch=1 \
-           file://mru-enable-overlay-optimalization.diff;patch=1 \
-           file://dvb-fix-dma.diff;patch=1 \
-           file://0001-Removed-resolution-check-that-prevents-scaling-when.patch;patch=1 \
-           file://0001-Implement-downsampling-with-debugs.patch;patch=1 \
-           file://twl-asoc-fix-record.diff;patch=1 \
-           file://tick-schedc-suppress-needless-timer-reprogramming.patch;patch=1 \
-           file://0001-DSS-New-display-subsystem-driver-for-OMAP2-3.patch;patch=1 \
-           file://0002-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch;patch=1 \
-           file://0003-DSS-Add-generic-DVI-panel.patch;patch=1 \
-           file://0004-DSS-support-for-Beagle-Board.patch;patch=1 \
-           file://0005-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch;patch=1 \
-           file://0007-DSS-Support-for-OMAP3-EVM-board.patch;patch=1 \
-           file://0008-DSS-Hacked-N810-support.patch;patch=1 \
-           file://0009-DSS-OMAPFB-allocate-fbmem-only-for-fb0-or-if-spes.patch;patch=1 \
-           file://0010-DSS-OMAPFB-remove-extra-omapfb_setup_overlay-call.patch;patch=1 \
-           file://0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch;patch=1 \
-           file://0014-DSS-fix-clk_get_usecount.patch;patch=1 \
-           file://0001-ASoC-Add-support-for-OMAP3-EVM.patch;patch=1 \
-           file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch;patch=1 \
-           file://dss2.diff;patch=1 \
-           file://register-all-OPPs.diff;patch=1 \
-           file://add-cpufreq-for-omap3evm.diff;patch=1 \
-           file://usbttyfix.patch;patch=1 \
-           file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \
+           file://fixup-evm-cpufreq.diff \
+           file://no-empty-flash-warnings.patch \
+           file://no-cortex-deadlock.patch \
+           file://read_die_ids.patch \
+           file://fix-install.patch \
+           file://musb-support-high-bandwidth.patch.eml;apply=yes \
+           file://mru-fix-timings.diff \
+           file://mru-fix-display-panning.diff \
+           file://mru-improve-pixclock-config.diff \
+           file://mru-make-video-timings-selectable.diff \
+           file://mru-enable-overlay-optimalization.diff \
+           file://dvb-fix-dma.diff \
+           file://0001-Removed-resolution-check-that-prevents-scaling-when.patch \
+           file://0001-Implement-downsampling-with-debugs.patch \
+           file://twl-asoc-fix-record.diff \
+           file://tick-schedc-suppress-needless-timer-reprogramming.patch \
+           file://0001-DSS-New-display-subsystem-driver-for-OMAP2-3.patch \
+           file://0002-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch \
+           file://0003-DSS-Add-generic-DVI-panel.patch \
+           file://0004-DSS-support-for-Beagle-Board.patch \
+           file://0005-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch \
+           file://0007-DSS-Support-for-OMAP3-EVM-board.patch \
+           file://0008-DSS-Hacked-N810-support.patch \
+           file://0009-DSS-OMAPFB-allocate-fbmem-only-for-fb0-or-if-spes.patch \
+           file://0010-DSS-OMAPFB-remove-extra-omapfb_setup_overlay-call.patch \
+           file://0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch \
+           file://0014-DSS-fix-clk_get_usecount.patch \
+           file://0001-ASoC-Add-support-for-OMAP3-EVM.patch \
+           file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch \
+           file://dss2.diff \
+           file://register-all-OPPs.diff \
+           file://add-cpufreq-for-omap3evm.diff \
+           file://usbttyfix.patch \
+           file://0124-leds-gpio-broken-with-current-git.patch \
 "
 
 
@@ -56,7 +55,7 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
 			     "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;patch=1 \
+	file://evm-mcspi-ts.diff \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-omap-pm_2.6.29.bb b/recipes/linux/linux-omap-pm_2.6.29.bb
index 1f719b7c0e..a309e884c0 100644
--- a/recipes/linux/linux-omap-pm_2.6.29.bb
+++ b/recipes/linux/linux-omap-pm_2.6.29.bb
@@ -8,200 +8,199 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
 SRCREV = "e63cf0710a4fb639d91d3e8b05aa485fbfa381b3"
 
 PV = "2.6.29"
-PE = "1"
 MACHINE_KERNEL_PR_append = "-pm2+gitr${SRCREV}"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git;protocol=git;branch=pm-2.6.29 \
 	   file://defconfig"
 
 SRC_URI_append = " \
-           file://no-empty-flash-warnings.patch;patch=1 \
-           file://no-cortex-deadlock.patch;patch=1 \
-           file://read_die_ids.patch;patch=1 \
-           file://fix-install.patch;patch=1 \
-           file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \
-           file://ehci.patch;patch=1 \
-           file://dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch;patch=1 \
-           file://dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch;patch=1 \
-           file://dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch;patch=1 \
-           file://dss2/0004-DSS2-OMAP-framebuffer-driver.patch;patch=1 \
-           file://dss2/0005-DSS2-Add-panel-drivers.patch;patch=1 \
-           file://dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch;patch=1 \
-           file://dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch;patch=1 \
-           file://dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch;patch=1 \
-           file://dss2/0009-DSS2-Add-acx565akm-panel.patch;patch=1 \
-           file://dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch;patch=1 \
-           file://dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch;patch=1 \
-           file://dss2/0012-DSS2-Fix-DMA-rotation.patch;patch=1 \
-           file://dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch;patch=1 \
-           file://dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch;patch=1 \
-           file://dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch;patch=1 \
-           file://dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch;patch=1 \
-           file://dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch;patch=1 \
-           file://dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch;patch=1 \
-           file://dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch;patch=1 \
-           file://dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch;patch=1 \
-           file://dss2/0021-DSS2-Add-venc-register-dump.patch;patch=1 \
-           file://dss2/0022-DSS2-FB-remove-unused-var-warning.patch;patch=1 \
-           file://dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch;patch=1 \
-           file://dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch;patch=1 \
-           file://dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch;patch=1 \
-           file://dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch;patch=1 \
-           file://dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch;patch=1 \
-           file://dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch;patch=1 \
-           file://dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch;patch=1 \
-           file://dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch;patch=1 \
-           file://dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch;patch=1 \
-           file://dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch;patch=1 \
-           file://dss2/0033-DSS2-Prefer-3-tap-filter.patch;patch=1 \
-           file://dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch;patch=1 \
-           file://dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch;patch=1 \
-           file://dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch;patch=1 \
-           file://dss2/0037-DSS2-Added-support-for-querying-color-keying.patch;patch=1 \
-           file://dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch;patch=1 \
-           file://dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch;patch=1 \
-           file://dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch;patch=1 \
-           file://dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch;patch=1 \
-           file://dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch;patch=1 \
-           file://dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch;patch=1 \
-           file://dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch;patch=1 \
-           file://dss2/0045-DSS2-Fixed-line-endings-from-to.patch;patch=1 \
-           file://dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch;patch=1 \
-           file://dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch;patch=1 \
-           file://dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch;patch=1 \
-           file://dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch;patch=1 \
-           file://dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch;patch=1 \
-           file://dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch;patch=1 \
-           file://dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch;patch=1 \
-           file://dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch;patch=1 \
-           file://dss2/0054-DSS2-DSI-more-error-handling.patch;patch=1 \
-           file://dss2/0055-DSS2-Added-global-alpha-support.patch;patch=1 \
-           file://dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch;patch=1 \
-           file://dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch;patch=1 \
-           file://dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch;patch=1 \
-           file://dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch;patch=1 \
-           file://dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch;patch=1 \
-           file://dss2/0061-DSS2-VRFB-save-restore-context.patch;patch=1 \
-           file://dss2/0062-DSS2-VRAM-Fix-indentation.patch;patch=1 \
-           file://dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch;patch=1 \
-           file://dss2/0064-VRFB-fix-debug-messages.patch;patch=1 \
-           file://dss2/0065-VRFB-add-suspend-resume-functionality.patch;patch=1 \
-           file://dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch;patch=1 \
-           file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch;patch=1 \
-           file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch;patch=1 \
-           file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch;patch=1 \
-           file://dss2/0070-DSS2-fix-irq1.diff;patch=1 \
-           file://dss2/0071-DSS2-fix-irq2.diff;patch=1 \
-           file://dss2/merge-fixups.diff;patch=1 \
-           file://overo-cpufreq.diff;patch=1 \
-           file://register-all-OPPs.diff;patch=1 \
-           file://isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch;patch=1 \
-           file://isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch;patch=1 \
-           file://isp/v4l/0003-V4L-Int-if-Dummy-slave.patch;patch=1 \
-           file://isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch;patch=1 \
-           file://isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch;patch=1 \
-           file://isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch;patch=1 \
-           file://isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch;patch=1 \
-           file://isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch;patch=1 \
-           file://isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch;patch=1 \
-           file://isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch;patch=1 \
-           file://isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch;patch=1 \
-           file://isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch;patch=1 \
-           file://isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch;patch=1 \
-           file://isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch;patch=1 \
-           file://isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch;patch=1 \
-           file://isp/omap3camera/0003-omap3isp-Add-userspace-header.patch;patch=1 \
-           file://isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch;patch=1 \
-           file://isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch;patch=1 \
-           file://isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch;patch=1 \
-           file://isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch;patch=1 \
-           file://isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch;patch=1 \
-           file://isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch;patch=1 \
-           file://isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch;patch=1 \
-           file://isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch;patch=1 \
-           file://isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch;patch=1 \
-           file://modedb-hd720.patch;patch=1 \
-           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
-           file://vfp/02-vfp-ptrace.patch;patch=1 \
-           file://vfp/03-vfp-corruption.patch;patch=1 \
-           file://vfp/04-vfp-threads.patch;patch=1 \
-           file://vfp/05-vfp-signal-handlers.patch;patch=1 \
-           file://arch-has-holes.diff;patch=1 \
-           file://musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch;patch=1 \
-           file://musb/0002-USB-composite-avoid-inconsistent-lock-state.patch;patch=1 \
-           file://musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch;patch=1 \
-           file://musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch;patch=1 \
-           file://musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch;patch=1 \
-           file://musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch;patch=1 \
-           file://musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch;patch=1 \
-           file://musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch;patch=1 \
-           file://musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch;patch=1 \
-           file://musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch;patch=1 \
-           file://musb/0011-musb-fix-isochronous-TXDMA-take-2.patch;patch=1 \
-           file://musb/0012-musb-fix-possible-panic-while-resuming.patch;patch=1 \
-           file://musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch;patch=1 \
-           file://musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch;patch=1 \
-           file://musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch;patch=1 \
-           file://musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch;patch=1 \
-           file://musb/0017-musb_host-refactor-URB-giveback.patch;patch=1 \
-           file://musb/0018-musb-split-out-CPPI-interrupt-handler.patch;patch=1 \
-           file://musb/0019-musb_host-simplify-check-for-active-URB.patch;patch=1 \
-           file://musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch;patch=1 \
-           file://musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch;patch=1 \
-           file://musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch;patch=1 \
-           file://musb/0023-musb-add-high-bandwidth-ISO-support.patch;patch=1 \
-           file://musb/0024-USB-otg-adding-nop-usb-transceiver.patch;patch=1 \
-           file://musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch;patch=1 \
-           file://musb/0026-musb-proper-hookup-to-transceiver-drivers.patch;patch=1 \
-           file://musb/0027-musb-otg-timer-cleanup.patch;patch=1 \
-           file://musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch;patch=1 \
-           file://musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch;patch=1 \
-           file://cache/l1cache-shift.patch;patch=1 \
-           file://cache/copy-page-tweak.patch;patch=1 \
+           file://no-empty-flash-warnings.patch \
+           file://no-cortex-deadlock.patch \
+           file://read_die_ids.patch \
+           file://fix-install.patch \
+           file://0124-leds-gpio-broken-with-current-git.patch \
+           file://ehci.patch \
+           file://dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch \
+           file://dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch \
+           file://dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch \
+           file://dss2/0004-DSS2-OMAP-framebuffer-driver.patch \
+           file://dss2/0005-DSS2-Add-panel-drivers.patch \
+           file://dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch \
+           file://dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch \
+           file://dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch \
+           file://dss2/0009-DSS2-Add-acx565akm-panel.patch \
+           file://dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch \
+           file://dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch \
+           file://dss2/0012-DSS2-Fix-DMA-rotation.patch \
+           file://dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch \
+           file://dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch \
+           file://dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch \
+           file://dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch \
+           file://dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch \
+           file://dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch \
+           file://dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch \
+           file://dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch \
+           file://dss2/0021-DSS2-Add-venc-register-dump.patch \
+           file://dss2/0022-DSS2-FB-remove-unused-var-warning.patch \
+           file://dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch \
+           file://dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch \
+           file://dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch \
+           file://dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch \
+           file://dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch \
+           file://dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch \
+           file://dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch \
+           file://dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch \
+           file://dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch \
+           file://dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch \
+           file://dss2/0033-DSS2-Prefer-3-tap-filter.patch \
+           file://dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch \
+           file://dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch \
+           file://dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch \
+           file://dss2/0037-DSS2-Added-support-for-querying-color-keying.patch \
+           file://dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch \
+           file://dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch \
+           file://dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch \
+           file://dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch \
+           file://dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch \
+           file://dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch \
+           file://dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch \
+           file://dss2/0045-DSS2-Fixed-line-endings-from-to.patch \
+           file://dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch \
+           file://dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch \
+           file://dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch \
+           file://dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch \
+           file://dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch \
+           file://dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch \
+           file://dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch \
+           file://dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch \
+           file://dss2/0054-DSS2-DSI-more-error-handling.patch \
+           file://dss2/0055-DSS2-Added-global-alpha-support.patch \
+           file://dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch \
+           file://dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch \
+           file://dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch \
+           file://dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch \
+           file://dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch \
+           file://dss2/0061-DSS2-VRFB-save-restore-context.patch \
+           file://dss2/0062-DSS2-VRAM-Fix-indentation.patch \
+           file://dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch \
+           file://dss2/0064-VRFB-fix-debug-messages.patch \
+           file://dss2/0065-VRFB-add-suspend-resume-functionality.patch \
+           file://dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch \
+           file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch \
+           file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch \
+           file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch \
+           file://dss2/0070-DSS2-fix-irq1.diff \
+           file://dss2/0071-DSS2-fix-irq2.diff \
+           file://dss2/merge-fixups.diff \
+           file://overo-cpufreq.diff \
+           file://register-all-OPPs.diff \
+           file://isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch \
+           file://isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch \
+           file://isp/v4l/0003-V4L-Int-if-Dummy-slave.patch \
+           file://isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch \
+           file://isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch \
+           file://isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch \
+           file://isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch \
+           file://isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch \
+           file://isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch \
+           file://isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch \
+           file://isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch \
+           file://isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch \
+           file://isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch \
+           file://isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch \
+           file://isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch \
+           file://isp/omap3camera/0003-omap3isp-Add-userspace-header.patch \
+           file://isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch \
+           file://isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch \
+           file://isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch \
+           file://isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch \
+           file://isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch \
+           file://isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch \
+           file://isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch \
+           file://isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch \
+           file://isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch \
+           file://modedb-hd720.patch \
+           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch \
+           file://vfp/02-vfp-ptrace.patch \
+           file://vfp/03-vfp-corruption.patch \
+           file://vfp/04-vfp-threads.patch \
+           file://vfp/05-vfp-signal-handlers.patch \
+           file://arch-has-holes.diff \
+           file://musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch \
+           file://musb/0002-USB-composite-avoid-inconsistent-lock-state.patch \
+           file://musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch \
+           file://musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch \
+           file://musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch \
+           file://musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch \
+           file://musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch \
+           file://musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch \
+           file://musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch \
+           file://musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch \
+           file://musb/0011-musb-fix-isochronous-TXDMA-take-2.patch \
+           file://musb/0012-musb-fix-possible-panic-while-resuming.patch \
+           file://musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch \
+           file://musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch \
+           file://musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch \
+           file://musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch \
+           file://musb/0017-musb_host-refactor-URB-giveback.patch \
+           file://musb/0018-musb-split-out-CPPI-interrupt-handler.patch \
+           file://musb/0019-musb_host-simplify-check-for-active-URB.patch \
+           file://musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch \
+           file://musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch \
+           file://musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch \
+           file://musb/0023-musb-add-high-bandwidth-ISO-support.patch \
+           file://musb/0024-USB-otg-adding-nop-usb-transceiver.patch \
+           file://musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch \
+           file://musb/0026-musb-proper-hookup-to-transceiver-drivers.patch \
+           file://musb/0027-musb-otg-timer-cleanup.patch \
+           file://musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch \
+           file://musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch \
+           file://cache/l1cache-shift.patch \
+           file://cache/copy-page-tweak.patch \
 "
 
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
-                               file://tincantools-puppy.diff;patch=1 \
-                               file://tincantools-zippy.diff;patch=1 \
+                               file://tincantools-puppy.diff \
+                               file://tincantools-zippy.diff \
 "
 
 SRC_URI_append_omap3-touchbook = " file://logo_linux_clut224.ppm \
-                                           file://../beagleboard/beagle-asoc.patch;patch=1 \
-           file://accelerometer-mma7455l.patch;patch=1 \
-           file://accelerometer-touchscreen-mux-spi.patch;patch=1 \
-           file://touchscreen-ads7846-export-settings.patch;patch=1 \
-           file://touchscreen-ads7846-rotation-fixed.patch;patch=1 \
-           file://dspbridge.patch;patch=1 \
-           file://battery2-bq27200-no-error-message.patch;patch=1 \
-           file://sound-headphone-detection.patch;patch=1 \
-           file://dss2-fix-XY-coordinates-when-rotating.patch;patch=1 \
-           file://battery1-tps65950-charging-management-1.patch;patch=1 \
-           file://dss2-fix-scaling-when-rotating.patch;patch=1 \
-           file://dss2-export-status.patch;patch=1 \
-           file://usb-otg-pc-connection.patch;patch=1 \
-           file://battery1-tps65950-charging-management-2.patch;patch=1 \
-           file://battery1-tps65950-charging-management-3.patch;patch=1 \
-           file://memory-move-malloc-end.patch;patch=1 \
-           file://aufs-1.patch;patch=1 \
-           file://aufs-2.patch;patch=1 \
-           file://aufs-3.patch;patch=1 \
-           file://aufs-squashfs-mount-to-avoid-initramfs.patch;patch=1 \
-           file://screen-backlight-accessible-by-user.patch;patch=1 \
-           file://dss2-blank-rotate-accessible-by-user.patch;patch=1 \
-           file://boot-no-power-message.patch;patch=1 \
-           file://usb-lower-current-consumption-upon-insertion.patch;patch=1 \
-           file://battery2-bq27200-gpio-charged.patch;patch=1 \
-           file://keyboard-special-keys.patch;patch=1 \
-           file://dss2-fix-rotation-offsets.patch;patch=1 \
-           file://touchbook-config.patch;patch=1 \
+                                           file://../beagleboard/beagle-asoc.patch \
+           file://accelerometer-mma7455l.patch \
+           file://accelerometer-touchscreen-mux-spi.patch \
+           file://touchscreen-ads7846-export-settings.patch \
+           file://touchscreen-ads7846-rotation-fixed.patch \
+           file://dspbridge.patch \
+           file://battery2-bq27200-no-error-message.patch \
+           file://sound-headphone-detection.patch \
+           file://dss2-fix-XY-coordinates-when-rotating.patch \
+           file://battery1-tps65950-charging-management-1.patch \
+           file://dss2-fix-scaling-when-rotating.patch \
+           file://dss2-export-status.patch \
+           file://usb-otg-pc-connection.patch \
+           file://battery1-tps65950-charging-management-2.patch \
+           file://battery1-tps65950-charging-management-3.patch \
+           file://memory-move-malloc-end.patch \
+           file://aufs-1.patch \
+           file://aufs-2.patch \
+           file://aufs-3.patch \
+           file://aufs-squashfs-mount-to-avoid-initramfs.patch \
+           file://screen-backlight-accessible-by-user.patch \
+           file://dss2-blank-rotate-accessible-by-user.patch \
+           file://boot-no-power-message.patch \
+           file://usb-lower-current-consumption-upon-insertion.patch \
+           file://battery2-bq27200-gpio-charged.patch \
+           file://keyboard-special-keys.patch \
+           file://dss2-fix-rotation-offsets.patch \
+           file://touchbook-config.patch \
            file://board-omap3touchbook.c \
-#           file://boot-trace-for-optimization.patch;patch=1 \
-           file://touchbook-sound.diff;patch=1 \
+#           file://boot-trace-for-optimization.patch \
+           file://touchbook-sound.diff \
 "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;patch=1 \
+	file://evm-mcspi-ts.diff \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-omap-pm_git.bb b/recipes/linux/linux-omap-pm_git.bb
index 354956953c..28689dc2f8 100644
--- a/recipes/linux/linux-omap-pm_git.bb
+++ b/recipes/linux/linux-omap-pm_git.bb
@@ -9,8 +9,7 @@ DEFAULT_PREFERENCE = "-1"
 
 SRCREV = "7c5cb7862d32cb344be7831d466535d5255e35ac"
 
-PV = "2.6.30+2.6.31rc1-pm1+gitr${SRCPV}"
-PE = "1"
+PV = "2.6.30+2.6.31rc1-pm1+gitr${SRCREV}"
 
 FILESPATHPKG_prepend = "linux-omap-pm-2.6.31:"
 
@@ -18,167 +17,167 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.g
 	   file://defconfig"
 
 SRC_URI_append = " \
-           file://no-empty-flash-warnings.patch;patch=1 \
-           file://no-cortex-deadlock.patch;patch=1 \
-           file://read_die_ids.patch;patch=1 \
-           file://fix-install.patch;patch=1 \
-           file://fix-musb-oops.diff;patch=1 \
-           file://fix-mtd.diff;patch=1 \
-           file://ehci.patch;patch=1 \
-           file://dss2/0001-OMAPFB-move-omapfb.h-to-include-linux.patch;patch=1 \
-           file://dss2/0002-DSS2-OMAP2-3-Display-Subsystem-driver.patch;patch=1 \
-           file://dss2/0003-DSS2-OMAP-framebuffer-driver.patch;patch=1 \
-           file://dss2/0004-DSS2-Add-panel-drivers.patch;patch=1 \
-           file://dss2/0005-DSS2-HACK-Add-DSS2-support-for-N800.patch;patch=1 \
-           file://dss2/0006-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch;patch=1 \
-           file://dss2/0007-DSS2-Add-function-to-display-object-to-get-the-back.patch;patch=1 \
-           file://dss2/0008-DSS2-Add-acx565akm-panel.patch;patch=1 \
-           file://dss2/0009-DSS2-Small-VRFB-context-allocation-bug-fixed.patch;patch=1 \
-           file://dss2/0010-DSS2-Allocated-memory-for-Color-Look-up-table.patch;patch=1 \
-           file://dss2/0011-DSS2-Fix-DMA-rotation.patch;patch=1 \
-           file://dss2/0012-DSS2-Verify-that-overlay-paddr-0.patch;patch=1 \
-           file://dss2/0013-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch;patch=1 \
-           file://dss2/0014-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch;patch=1 \
-           file://dss2/0015-DSS2-DSI-improve-packet-len-calculation.patch;patch=1 \
-           file://dss2/0016-DSS2-Disable-video-planes-on-sync-lost-error.patch;patch=1 \
-           file://dss2/0017-DSS2-check-for-ovl-paddr-only-when-enabling.patch;patch=1 \
-           file://dss2/0018-DSS2-Check-fclk-limits-when-configuring-video-plane.patch;patch=1 \
-           file://dss2/0019-DSS2-Check-scaling-limits-against-proper-values.patch;patch=1 \
-           file://dss2/0020-DSS2-Add-venc-register-dump.patch;patch=1 \
-           file://dss2/0021-DSS2-FB-remove-unused-var-warning.patch;patch=1 \
-           file://dss2/0022-DSS2-pass-the-default-FB-color-format-through-board.patch;patch=1 \
-           file://dss2/0023-DSS2-Beagle-Use-gpio_set_value.patch;patch=1 \
-           file://dss2/0024-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch;patch=1 \
-           file://dss2/0025-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch;patch=1 \
-           file://dss2/0026-DSS2-VRFB-rotation-and-mirroring-implemented.patch;patch=1 \
-           file://dss2/0027-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch;patch=1 \
-           file://dss2/0028-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch;patch=1 \
-           file://dss2/0029-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch;patch=1 \
-           file://dss2/0030-DSS2-do-bootmem-reserve-for-exclusive-access.patch;patch=1 \
-           file://dss2/0031-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch;patch=1 \
-           file://dss2/0032-DSS2-Prefer-3-tap-filter.patch;patch=1 \
-           file://dss2/0033-DSS2-VRAM-improve-omap_vram_add_region.patch;patch=1 \
-           file://dss2/0034-DSS2-Added-the-function-pointer-for-getting-default.patch;patch=1 \
-           file://dss2/0035-DSS2-Added-support-for-setting-and-querying-alpha-b.patch;patch=1 \
-           file://dss2/0036-DSS2-Added-support-for-querying-color-keying.patch;patch=1 \
-           file://dss2/0037-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch;patch=1 \
-           file://dss2/0038-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch;patch=1 \
-           file://dss2/0039-DSS2-Provided-proper-exclusion-for-destination-colo.patch;patch=1 \
-           file://dss2/0040-DSS2-Disable-vertical-offset-with-fieldmode.patch;patch=1 \
-           file://dss2/0041-DSS2-Don-t-enable-fieldmode-automatically.patch;patch=1 \
-           file://dss2/0042-DSS2-Swap-field-0-and-field-1-registers.patch;patch=1 \
-           file://dss2/0043-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch;patch=1 \
-           file://dss2/0044-DSS2-Fixed-line-endings-from-to.patch;patch=1 \
-           file://dss2/0045-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch;patch=1 \
-           file://dss2/0046-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch;patch=1 \
-           file://dss2/0047-DSS2-VRAM-clear-allocated-area-with-DMA.patch;patch=1 \
-           file://dss2/0048-DSS2-OMAPFB-remove-fb-clearing-code.patch;patch=1 \
-           file://dss2/0049-DSS2-VRAM-use-debugfs-not-procfs.patch;patch=1 \
-           file://dss2/0050-DSS2-VRAM-fix-section-mismatch-warning.patch;patch=1 \
-           file://dss2/0051-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch;patch=1 \
-           file://dss2/0052-DSS2-DSI-more-error-handling.patch;patch=1 \
-           file://dss2/0053-DSS2-Added-global-alpha-support.patch;patch=1 \
-           file://dss2/0054-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch;patch=1 \
-           file://dss2/0055-DSS2-Documentation-update-for-new-sysfs-entries-in.patch;patch=1 \
-           file://dss2/0056-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch;patch=1 \
-           file://dss2/0057-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch;patch=1 \
-           file://dss2/0058-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch;patch=1 \
-           file://dss2/0059-DSS2-VRFB-save-restore-context.patch;patch=1 \
-           file://dss2/0060-DSS2-VRAM-Fix-indentation.patch;patch=1 \
-           file://dss2/0061-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch;patch=1 \
-           file://dss2/0062-VRFB-fix-debug-messages.patch;patch=1 \
-           file://dss2/0063-VRFB-add-suspend-resume-functionality.patch;patch=1 \
-           file://dss2/0064-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch;patch=1 \
-           file://dss2/0065-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch;patch=1 \
-           file://dss2/0066-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch;patch=1 \
-           file://dss2/0067-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch;patch=1 \
-           file://dss2/0068-DSS2-DSI-Improve-perf-measurement-output.patch;patch=1 \
-           file://dss2/0069-DSS2-DSI-Add-support-for-external-TE-signal.patch;patch=1 \
-           file://dss2/0070-DSS2-DSI-Fix-LP-clock.patch;patch=1 \
-           file://dss2/0071-DSS2-Do-not-swap-xres-yres-or-change-rotation-in-ch.patch;patch=1 \
-           file://dss2/0072-DSS2-Allow-independent-rotation-for-each-plane.patch;patch=1 \
-           file://dss2/0073-DSS2-DISPC-fix-irq-handling-locking.patch;patch=1 \
-           file://dss2/0074-DSS2-DISPC-clear-irqstatus-for-newly-enabled-irqs.patch;patch=1 \
-           file://dss2/0075-DSS2-Add-WSS-support.patch;patch=1 \
-           file://dss2/0076-DSS2-Fix-PAL-NTSC-timings.patch;patch=1 \
-           file://dss2/0077-DSS2-Add-venc-debugfs-file.patch;patch=1 \
-           file://dss2/0078-DSS2-Enable-replication-logic-feature.patch;patch=1 \
-           file://dss2/0079-DSS2-support-for-querying-the-supported-overlay-col.patch;patch=1 \
-           file://dss2/0080-DSS2-fix-uninitialized-var-in-OMAPFB_GET_CAPS-IOCTL.patch;patch=1 \
-           file://dss2/0081-DSS2-Reset-WSS-data-only-when-changing-TV-standard.patch;patch=1 \
-           file://dss2/0082-DSS2-DSI-implement-timeout-for-DSI-transfer.patch;patch=1 \
-           file://dss2/0083-DSS2-DSI-reset-perf-frame-counter-when-starting-au.patch;patch=1 \
-           file://dss2/0084-DSS2-DSI-Implement-DSI-bus-lock.patch;patch=1 \
-           file://dss2/0085-DSS2-OMAPFB-omapfb_get_ovl_colormode-to-static.patch;patch=1 \
-           file://dss2/0086-DSS2-VRFB-make-vrfb_hw_context-static.patch;patch=1 \
-           file://dss2/0087-DSS2-new-device-driver-model.patch;patch=1 \
-           file://dss2/0088-DSS2-Board-file-changes-for-new-device-model.patch;patch=1 \
-           file://dss2/0089-DSS2-Panel-driver-changes-for-new-device-model.patch;patch=1 \
-           file://dss2/0090-DSS2-VENC-venc-uses-regulator-framework.patch;patch=1 \
-           file://dss2/0091-DSS2-DSI-Use-regulator-framework.patch;patch=1 \
-           file://dss2/0092-DSS2-SDP-regulators-for-VDAC-DSI.patch;patch=1 \
-           file://dss2/0093-DSS2-Sharp-panel-use-regulator-fw.patch;patch=1 \
-           file://dss2/0094-DSS2-Beagle-regulators-for-VDAC-DSI.patch;patch=1 \
-           file://dss2/0095-DSS2-Fix-checkpatch-complaints.patch;patch=1 \
-           file://dss2/0096-DSS2-Overo-add-vdac-dsi-regulators-fix-panel-name.patch;patch=1 \
-           file://dss2/0097-DSS2-implement-overlay_manager_info.patch;patch=1 \
-           file://dss2/0098-DSS2-use-sysfs_streq-to-compare-display-names.patch;patch=1 \
-           file://dss2/0099-DSS2-Implement-function-to-verify-lcd-timings.patch;patch=1 \
-           file://dss2/0100-DSS2-Remove-non-existing-dsi-power-funcs-from-dss.h.patch;patch=1 \
-           file://dss2/0101-DSS2-move-to_dss_driver-and-to_dss_device-to-pu.patch;patch=1 \
-           file://dss2/0102-DSS2-CLK-change-omapfb-omapdss-in-clock-framewo.patch;patch=1 \
-           file://dss2/0103-DSS2-Use-clkdev.patch;patch=1 \
-           file://dss2/0104-DSS2-Fix-documentation.patch;patch=1 \
-           file://dss2/0105-DSS2-OMAPFB-first-set-TE-then-update-mode.patch;patch=1 \
-           file://dss2/0106-DSS2-OMAPFB-Disable-forced-display-update-on-fb-cl.patch;patch=1 \
-           file://dss2/0107-DSS2-DSI-use-INIT_COMPLETION-not-init_completion.patch;patch=1 \
-           file://dss2/0108-DSS2-DSI-Rewrite-of-the-DSI-update-and-cmd-queue.patch;patch=1 \
-           file://dss2/0109-DSS2-let-init_display-return-an-error-code.patch;patch=1 \
-           file://dss2/0110-DSS2-isolate-the-SDI-pads-when-SDI-is-disabled.patch;patch=1 \
-           file://dss2/0111-DSS2-Fix-bottom-field-initial-starting-line.patch;patch=1 \
-           file://dss2/0112-DSS2-Correctly-determine-if-an-interlaced-display-i.patch;patch=1 \
-           file://dss2/0113-DSS2-Fix-omapfb-framebuffer-name.patch;patch=1 \
-           file://dss2/0114-DSS2-Overo-update-defconfig-to-lighter-one.patch;patch=1 \
-           file://dss2/0115-DSS2-SDI-make-sdi_pads-static.patch;patch=1 \
-           file://dss2/0116-DSS2-Fix-default_color-sysfs-output.patch;patch=1 \
-           file://dss2/0117-DSS2-Locking-for-VRFB.patch;patch=1 \
-           file://dss2/0118-DSS2-DISPC-fix-locking-issue-with-irq-handling.patch;patch=1 \
-           file://dss2/0119-DSS2-OMAPFB-remove-unneeded-locks.patch;patch=1 \
-           file://dss2/0120-DSS2-DISPC-configuration-management.patch;patch=1 \
-           file://dss2/0121-DSS2-VRFB-clean-up-BUG-calls.patch;patch=1 \
-           file://dss2/0122-DSS2-OMAPFB-don-t-fail-even-if-default-display-doe.patch;patch=1 \
-           file://dss2/0123-DSS2-DSI-Fix-external-TE-wait.patch;patch=1 \
-           file://dss2/0124-DSS2-DSI-Increase-framedone-timeout-to-1s.patch;patch=1 \
-           file://dss2/0125-DSS2-VRAM-Add-function-to-get-free-vram-info.patch;patch=1 \
-           file://dss2/0126-DSS2-OMAPFB-implement-OMAPFB_GET_VRAM_INFO-ioctl.patch;patch=1 \
-           file://dss2/0127-DSS2-DSI-increase-dsi-thread-priority.patch;patch=1 \
-           file://dss2/0128-DSS2-DSI-check-bus_lock-in-send_bta.patch;patch=1 \
-           file://dss2/0129-DSS2-DSI-export-dsi_vc_send_bta_sync.patch;patch=1 \
-           file://dss2/0130-DSS2-DSI-clear-BTA-irq-before-enabling-it.patch;patch=1 \
-           file://dss2/0131-DSS2-DSI-check-dsi_set_te-return-value.patch;patch=1 \
-           file://dss2/0132-DSS2-DSI-use-only-1-VC.-Fixes-to-TE.patch;patch=1 \
-           file://dss2/0133-DSS2-VRAM-Remove-unused-defines.patch;patch=1 \
-           file://dss2/0134-DSS2-VENC-Add-invert_polarity-flag.patch;patch=1 \
-           file://dss2/0135-DSS2-VRAM-Add-defines-for-VRAM-types.patch;patch=1 \
-           file://dss2/0136-DSS2-VRAM-separate-VRAM-setup-from-the-old-fb-vram.patch;patch=1 \
-           file://dss2/0137-DSS2-VRFB-Update-license-information.patch;patch=1 \
-           file://dss2/0138-DSS2-VRAM-Update-license-information.patch;patch=1 \
-           file://dss2/0139-DSS2-VRFB-use-pr_-instead-of-printk.patch;patch=1 \
-           file://dss2/0140-DSS2-VRAM-Change-CONFIG_OMAP2_DSS_VRAM_SIZE-name.patch;patch=1 \
-           file://dss2/0141-DSS2-VRAM-add-CONFIG_OMAP2_VRAM-flag.patch;patch=1 \
-           file://dss2/0142-DSS2-VRFB-Add-CONFIG_OMAP2_VRFB-flag.patch;patch=1 \
-           file://dss2/0143-DSS2-VRFB-VRAM-fix-checkpatch-warnings.patch;patch=1 \
-           file://dss2/0144-DSS2-fixes-to-dss_omap_3430sdp_defconfig-to-make-it.patch;patch=1 \
-           file://dss2/0145-DSS2-BEAGLE-get-DSS2-working-again-on-beagle.patch;patch=1 \
-           file://dss2/0146-DSS2-change-include-asm-.-to-linux-.-in-oma.patch;patch=1 \
+           file://no-empty-flash-warnings.patch \
+           file://no-cortex-deadlock.patch \
+           file://read_die_ids.patch \
+           file://fix-install.patch \
+           file://fix-musb-oops.diff \
+           file://fix-mtd.diff \
+           file://ehci.patch \
+           file://dss2/0001-OMAPFB-move-omapfb.h-to-include-linux.patch \
+           file://dss2/0002-DSS2-OMAP2-3-Display-Subsystem-driver.patch \
+           file://dss2/0003-DSS2-OMAP-framebuffer-driver.patch \
+           file://dss2/0004-DSS2-Add-panel-drivers.patch \
+           file://dss2/0005-DSS2-HACK-Add-DSS2-support-for-N800.patch \
+           file://dss2/0006-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch \
+           file://dss2/0007-DSS2-Add-function-to-display-object-to-get-the-back.patch \
+           file://dss2/0008-DSS2-Add-acx565akm-panel.patch \
+           file://dss2/0009-DSS2-Small-VRFB-context-allocation-bug-fixed.patch \
+           file://dss2/0010-DSS2-Allocated-memory-for-Color-Look-up-table.patch \
+           file://dss2/0011-DSS2-Fix-DMA-rotation.patch \
+           file://dss2/0012-DSS2-Verify-that-overlay-paddr-0.patch \
+           file://dss2/0013-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch \
+           file://dss2/0014-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch \
+           file://dss2/0015-DSS2-DSI-improve-packet-len-calculation.patch \
+           file://dss2/0016-DSS2-Disable-video-planes-on-sync-lost-error.patch \
+           file://dss2/0017-DSS2-check-for-ovl-paddr-only-when-enabling.patch \
+           file://dss2/0018-DSS2-Check-fclk-limits-when-configuring-video-plane.patch \
+           file://dss2/0019-DSS2-Check-scaling-limits-against-proper-values.patch \
+           file://dss2/0020-DSS2-Add-venc-register-dump.patch \
+           file://dss2/0021-DSS2-FB-remove-unused-var-warning.patch \
+           file://dss2/0022-DSS2-pass-the-default-FB-color-format-through-board.patch \
+           file://dss2/0023-DSS2-Beagle-Use-gpio_set_value.patch \
+           file://dss2/0024-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch \
+           file://dss2/0025-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch \
+           file://dss2/0026-DSS2-VRFB-rotation-and-mirroring-implemented.patch \
+           file://dss2/0027-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch \
+           file://dss2/0028-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch \
+           file://dss2/0029-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch \
+           file://dss2/0030-DSS2-do-bootmem-reserve-for-exclusive-access.patch \
+           file://dss2/0031-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch \
+           file://dss2/0032-DSS2-Prefer-3-tap-filter.patch \
+           file://dss2/0033-DSS2-VRAM-improve-omap_vram_add_region.patch \
+           file://dss2/0034-DSS2-Added-the-function-pointer-for-getting-default.patch \
+           file://dss2/0035-DSS2-Added-support-for-setting-and-querying-alpha-b.patch \
+           file://dss2/0036-DSS2-Added-support-for-querying-color-keying.patch \
+           file://dss2/0037-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch \
+           file://dss2/0038-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch \
+           file://dss2/0039-DSS2-Provided-proper-exclusion-for-destination-colo.patch \
+           file://dss2/0040-DSS2-Disable-vertical-offset-with-fieldmode.patch \
+           file://dss2/0041-DSS2-Don-t-enable-fieldmode-automatically.patch \
+           file://dss2/0042-DSS2-Swap-field-0-and-field-1-registers.patch \
+           file://dss2/0043-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch \
+           file://dss2/0044-DSS2-Fixed-line-endings-from-to.patch \
+           file://dss2/0045-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch \
+           file://dss2/0046-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch \
+           file://dss2/0047-DSS2-VRAM-clear-allocated-area-with-DMA.patch \
+           file://dss2/0048-DSS2-OMAPFB-remove-fb-clearing-code.patch \
+           file://dss2/0049-DSS2-VRAM-use-debugfs-not-procfs.patch \
+           file://dss2/0050-DSS2-VRAM-fix-section-mismatch-warning.patch \
+           file://dss2/0051-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch \
+           file://dss2/0052-DSS2-DSI-more-error-handling.patch \
+           file://dss2/0053-DSS2-Added-global-alpha-support.patch \
+           file://dss2/0054-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch \
+           file://dss2/0055-DSS2-Documentation-update-for-new-sysfs-entries-in.patch \
+           file://dss2/0056-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch \
+           file://dss2/0057-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch \
+           file://dss2/0058-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch \
+           file://dss2/0059-DSS2-VRFB-save-restore-context.patch \
+           file://dss2/0060-DSS2-VRAM-Fix-indentation.patch \
+           file://dss2/0061-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch \
+           file://dss2/0062-VRFB-fix-debug-messages.patch \
+           file://dss2/0063-VRFB-add-suspend-resume-functionality.patch \
+           file://dss2/0064-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch \
+           file://dss2/0065-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch \
+           file://dss2/0066-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch \
+           file://dss2/0067-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch \
+           file://dss2/0068-DSS2-DSI-Improve-perf-measurement-output.patch \
+           file://dss2/0069-DSS2-DSI-Add-support-for-external-TE-signal.patch \
+           file://dss2/0070-DSS2-DSI-Fix-LP-clock.patch \
+           file://dss2/0071-DSS2-Do-not-swap-xres-yres-or-change-rotation-in-ch.patch \
+           file://dss2/0072-DSS2-Allow-independent-rotation-for-each-plane.patch \
+           file://dss2/0073-DSS2-DISPC-fix-irq-handling-locking.patch \
+           file://dss2/0074-DSS2-DISPC-clear-irqstatus-for-newly-enabled-irqs.patch \
+           file://dss2/0075-DSS2-Add-WSS-support.patch \
+           file://dss2/0076-DSS2-Fix-PAL-NTSC-timings.patch \
+           file://dss2/0077-DSS2-Add-venc-debugfs-file.patch \
+           file://dss2/0078-DSS2-Enable-replication-logic-feature.patch \
+           file://dss2/0079-DSS2-support-for-querying-the-supported-overlay-col.patch \
+           file://dss2/0080-DSS2-fix-uninitialized-var-in-OMAPFB_GET_CAPS-IOCTL.patch \
+           file://dss2/0081-DSS2-Reset-WSS-data-only-when-changing-TV-standard.patch \
+           file://dss2/0082-DSS2-DSI-implement-timeout-for-DSI-transfer.patch \
+           file://dss2/0083-DSS2-DSI-reset-perf-frame-counter-when-starting-au.patch \
+           file://dss2/0084-DSS2-DSI-Implement-DSI-bus-lock.patch \
+           file://dss2/0085-DSS2-OMAPFB-omapfb_get_ovl_colormode-to-static.patch \
+           file://dss2/0086-DSS2-VRFB-make-vrfb_hw_context-static.patch \
+           file://dss2/0087-DSS2-new-device-driver-model.patch \
+           file://dss2/0088-DSS2-Board-file-changes-for-new-device-model.patch \
+           file://dss2/0089-DSS2-Panel-driver-changes-for-new-device-model.patch \
+           file://dss2/0090-DSS2-VENC-venc-uses-regulator-framework.patch \
+           file://dss2/0091-DSS2-DSI-Use-regulator-framework.patch \
+           file://dss2/0092-DSS2-SDP-regulators-for-VDAC-DSI.patch \
+           file://dss2/0093-DSS2-Sharp-panel-use-regulator-fw.patch \
+           file://dss2/0094-DSS2-Beagle-regulators-for-VDAC-DSI.patch \
+           file://dss2/0095-DSS2-Fix-checkpatch-complaints.patch \
+           file://dss2/0096-DSS2-Overo-add-vdac-dsi-regulators-fix-panel-name.patch \
+           file://dss2/0097-DSS2-implement-overlay_manager_info.patch \
+           file://dss2/0098-DSS2-use-sysfs_streq-to-compare-display-names.patch \
+           file://dss2/0099-DSS2-Implement-function-to-verify-lcd-timings.patch \
+           file://dss2/0100-DSS2-Remove-non-existing-dsi-power-funcs-from-dss.h.patch \
+           file://dss2/0101-DSS2-move-to_dss_driver-and-to_dss_device-to-pu.patch \
+           file://dss2/0102-DSS2-CLK-change-omapfb-omapdss-in-clock-framewo.patch \
+           file://dss2/0103-DSS2-Use-clkdev.patch \
+           file://dss2/0104-DSS2-Fix-documentation.patch \
+           file://dss2/0105-DSS2-OMAPFB-first-set-TE-then-update-mode.patch \
+           file://dss2/0106-DSS2-OMAPFB-Disable-forced-display-update-on-fb-cl.patch \
+           file://dss2/0107-DSS2-DSI-use-INIT_COMPLETION-not-init_completion.patch \
+           file://dss2/0108-DSS2-DSI-Rewrite-of-the-DSI-update-and-cmd-queue.patch \
+           file://dss2/0109-DSS2-let-init_display-return-an-error-code.patch \
+           file://dss2/0110-DSS2-isolate-the-SDI-pads-when-SDI-is-disabled.patch \
+           file://dss2/0111-DSS2-Fix-bottom-field-initial-starting-line.patch \
+           file://dss2/0112-DSS2-Correctly-determine-if-an-interlaced-display-i.patch \
+           file://dss2/0113-DSS2-Fix-omapfb-framebuffer-name.patch \
+           file://dss2/0114-DSS2-Overo-update-defconfig-to-lighter-one.patch \
+           file://dss2/0115-DSS2-SDI-make-sdi_pads-static.patch \
+           file://dss2/0116-DSS2-Fix-default_color-sysfs-output.patch \
+           file://dss2/0117-DSS2-Locking-for-VRFB.patch \
+           file://dss2/0118-DSS2-DISPC-fix-locking-issue-with-irq-handling.patch \
+           file://dss2/0119-DSS2-OMAPFB-remove-unneeded-locks.patch \
+           file://dss2/0120-DSS2-DISPC-configuration-management.patch \
+           file://dss2/0121-DSS2-VRFB-clean-up-BUG-calls.patch \
+           file://dss2/0122-DSS2-OMAPFB-don-t-fail-even-if-default-display-doe.patch \
+           file://dss2/0123-DSS2-DSI-Fix-external-TE-wait.patch \
+           file://dss2/0124-DSS2-DSI-Increase-framedone-timeout-to-1s.patch \
+           file://dss2/0125-DSS2-VRAM-Add-function-to-get-free-vram-info.patch \
+           file://dss2/0126-DSS2-OMAPFB-implement-OMAPFB_GET_VRAM_INFO-ioctl.patch \
+           file://dss2/0127-DSS2-DSI-increase-dsi-thread-priority.patch \
+           file://dss2/0128-DSS2-DSI-check-bus_lock-in-send_bta.patch \
+           file://dss2/0129-DSS2-DSI-export-dsi_vc_send_bta_sync.patch \
+           file://dss2/0130-DSS2-DSI-clear-BTA-irq-before-enabling-it.patch \
+           file://dss2/0131-DSS2-DSI-check-dsi_set_te-return-value.patch \
+           file://dss2/0132-DSS2-DSI-use-only-1-VC.-Fixes-to-TE.patch \
+           file://dss2/0133-DSS2-VRAM-Remove-unused-defines.patch \
+           file://dss2/0134-DSS2-VENC-Add-invert_polarity-flag.patch \
+           file://dss2/0135-DSS2-VRAM-Add-defines-for-VRAM-types.patch \
+           file://dss2/0136-DSS2-VRAM-separate-VRAM-setup-from-the-old-fb-vram.patch \
+           file://dss2/0137-DSS2-VRFB-Update-license-information.patch \
+           file://dss2/0138-DSS2-VRAM-Update-license-information.patch \
+           file://dss2/0139-DSS2-VRFB-use-pr_-instead-of-printk.patch \
+           file://dss2/0140-DSS2-VRAM-Change-CONFIG_OMAP2_DSS_VRAM_SIZE-name.patch \
+           file://dss2/0141-DSS2-VRAM-add-CONFIG_OMAP2_VRAM-flag.patch \
+           file://dss2/0142-DSS2-VRFB-Add-CONFIG_OMAP2_VRFB-flag.patch \
+           file://dss2/0143-DSS2-VRFB-VRAM-fix-checkpatch-warnings.patch \
+           file://dss2/0144-DSS2-fixes-to-dss_omap_3430sdp_defconfig-to-make-it.patch \
+           file://dss2/0145-DSS2-BEAGLE-get-DSS2-working-again-on-beagle.patch \
+           file://dss2/0146-DSS2-change-include-asm-.-to-linux-.-in-oma.patch \
 "
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
-           file://beagle-writable-uboot.diff;patch=1 \
+           file://beagle-writable-uboot.diff \
 			     "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;patch=1 \
+	file://evm-mcspi-ts.diff \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch b/recipes/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch
new file mode 100644
index 0000000000..c406af1a15
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch
@@ -0,0 +1,67 @@
+From 03e3ae2685bbd9586d520b0dd081593b814240b3 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 30 Apr 2010 11:12:24 +0200
+Subject: [PATCH 01/43] Revert "omap3: beagle: Fix compile-time errors"
+
+This commit clashes with the other beagle patches we apply on top
+
+This reverts commit da5b291cba631d303cb137fa6a620c494d828197.
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |   34 ++----------------------------
+ 1 files changed, 3 insertions(+), 31 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index c5da58e..330fb25 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -56,22 +56,6 @@
+ 
+ #define NAND_BLOCK_SIZE		SZ_128K
+ 
+-#ifdef CONFIG_PM
+-static struct omap_opp * _omap35x_mpu_rate_table	= omap35x_mpu_rate_table;
+-static struct omap_opp * _omap37x_mpu_rate_table	= omap37x_mpu_rate_table;
+-static struct omap_opp * _omap35x_dsp_rate_table	= omap35x_dsp_rate_table;
+-static struct omap_opp * _omap37x_dsp_rate_table	= omap37x_dsp_rate_table;
+-static struct omap_opp * _omap35x_l3_rate_table		= omap35x_l3_rate_table;
+-static struct omap_opp * _omap37x_l3_rate_table		= omap37x_l3_rate_table;
+-#else	/* CONFIG_PM */
+-static struct omap_opp * _omap35x_mpu_rate_table	= NULL;
+-static struct omap_opp * _omap37x_mpu_rate_table	= NULL;
+-static struct omap_opp * _omap35x_dsp_rate_table	= NULL;
+-static struct omap_opp * _omap37x_dsp_rate_table	= NULL;
+-static struct omap_opp * _omap35x_l3_rate_table		= NULL;
+-static struct omap_opp * _omap37x_l3_rate_table		= NULL;
+-#endif	/* CONFIG_PM */
+-
+ static struct mtd_partition omap3beagle_nand_partitions[] = {
+ 	/* All the partition sizes are listed in terms of NAND block size */
+ 	{
+@@ -377,21 +361,9 @@ static void __init omap3_beagle_init_irq(void)
+ {
+ 	omap_board_config = omap3_beagle_config;
+ 	omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
+-
+-	if (cpu_is_omap3630()) {
+-		omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
+-						mt46h32m32lf6_sdrc_params,
+-						_omap37x_mpu_rate_table,
+-						_omap37x_dsp_rate_table,
+-						_omap37x_l3_rate_table);
+-	} else {
+-		omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
+-						mt46h32m32lf6_sdrc_params,
+-						_omap35x_mpu_rate_table,
+-						_omap35x_dsp_rate_table,
+-						_omap35x_l3_rate_table);
+-	}
+-
++	omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
++			     mt46h32m32lf6_sdrc_params, omap3_mpu_rate_table,
++			     omap3_dsp_rate_table, omap3_l3_rate_table);
+ 	omap_init_irq();
+ #ifdef CONFIG_OMAP_32K_TIMER
+ 	omap2_gp_clockevent_set_gptimer(12);
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0001-board-omap3touchbook-make-it-build-against-TI-linux-.patch b/recipes/linux/linux-omap-psp-2.6.32/0002-board-omap3touchbook-make-it-build-against-TI-linux-.patch
index 3cbaeded3e..f016e0edce 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0001-board-omap3touchbook-make-it-build-against-TI-linux-.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0002-board-omap3touchbook-make-it-build-against-TI-linux-.patch
@@ -1,7 +1,7 @@
-From f4bd057e5703a21865005e2e9e3eab13bb19ff59 Mon Sep 17 00:00:00 2001
+From ad2b9548c700dc424209e543d10ab14c848895a5 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <k-kooi@ti.com>
 Date: Sat, 30 Jan 2010 15:49:15 +0100
-Subject: [PATCH 01/42] board-omap3touchbook: make it build against TI linux-omap 2.6.32-PSP
+Subject: [PATCH 02/43] board-omap3touchbook: make it build against TI linux-omap 2.6.32-PSP
 
 ---
  arch/arm/mach-omap2/board-omap3touchbook.c |   11 +++++++++--
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0002-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch b/recipes/linux/linux-omap-psp-2.6.32/0003-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch
index 28a7574324..0e7a8b2943 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0002-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0003-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch
@@ -1,7 +1,7 @@
-From 2139a8d4e64132463be4f8293f66639bf5a45ebb Mon Sep 17 00:00:00 2001
+From 95d7fc0cb0c4367c378ed640d6bb49ab6dc100dc Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <sakoman@gmail.com>
 Date: Tue, 15 Dec 2009 15:34:29 -0800
-Subject: [PATCH 02/42] ARM: OMAP: add support for TCT Zippy to Beagle board file
+Subject: [PATCH 03/43] ARM: OMAP: add support for TCT Zippy to Beagle board file
 
 Signed-off-by: Steve Sakoman <sakoman@gmail.com>
 ---
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0003-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch b/recipes/linux/linux-omap-psp-2.6.32/0004-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch
index 71867cec98..f2ed1914f9 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0003-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0004-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch
@@ -1,7 +1,7 @@
-From 336ca8edb0c011f06662e39555c3c5e6ded15183 Mon Sep 17 00:00:00 2001
+From 7ca7040b3382fabbaa37dfda2c80cc4433b16d2e Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 17 Dec 2009 12:40:24 -0800
-Subject: [PATCH 03/42] ARM: OMAP: Make beagle u-boot partition writable
+Subject: [PATCH 04/43] ARM: OMAP: Make beagle u-boot partition writable
 
 ---
  arch/arm/mach-omap2/board-omap3beagle.c |    1 -
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0005-beagleboard-omap3_-foo-_rate_table-omap35x_-foo-_rat.patch b/recipes/linux/linux-omap-psp-2.6.32/0005-beagleboard-omap3_-foo-_rate_table-omap35x_-foo-_rat.patch
deleted file mode 100644
index 3bfeddcad3..0000000000
--- a/recipes/linux/linux-omap-psp-2.6.32/0005-beagleboard-omap3_-foo-_rate_table-omap35x_-foo-_rat.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9cd3eb084a39c039fd17048f071116c866903855 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <k-kooi@ti.com>
-Date: Wed, 27 Jan 2010 21:57:13 +0100
-Subject: [PATCH 05/42] beagleboard: omap3_<foo>_rate_table -> omap35x_<foo>_rate_table
-
----
- arch/arm/mach-omap2/board-omap3beagle.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 3b7f6ec..1caaa01 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -502,8 +502,8 @@ static struct platform_device keys_gpio = {
- static void __init omap3_beagle_init_irq(void)
- {
- 	omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
--			     mt46h32m32lf6_sdrc_params, omap3_mpu_rate_table,
--			     omap3_dsp_rate_table, omap3_l3_rate_table);
-+			     mt46h32m32lf6_sdrc_params, omap35x_mpu_rate_table,
-+			     omap35x_dsp_rate_table, omap35x_l3_rate_table);
- 	omap_init_irq();
- #ifdef CONFIG_OMAP_32K_TIMER
- 	omap2_gp_clockevent_set_gptimer(12);
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0004-board-omap3-beagle-add-DSS2-support.patch b/recipes/linux/linux-omap-psp-2.6.32/0005-board-omap3-beagle-add-DSS2-support.patch
index 1e0c26057f..e9a1715c97 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0004-board-omap3-beagle-add-DSS2-support.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0005-board-omap3-beagle-add-DSS2-support.patch
@@ -1,7 +1,7 @@
-From e54e58bc621621fbb4700a52af16253ace86995b Mon Sep 17 00:00:00 2001
+From 8a3d9bff79f71a2733607e409f820e79142592d5 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Wed, 10 Feb 2010 15:07:36 +0100
-Subject: [PATCH 04/42] board-omap3-beagle: add DSS2 support
+Subject: [PATCH 05/43] board-omap3-beagle: add DSS2 support
 
 ---
  arch/arm/mach-omap2/board-omap3beagle.c |  130 ++++++++++++++++++++++++-------
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0006-board-omap3beagle-prepare-for-DM3730-based-Beagleboa.patch b/recipes/linux/linux-omap-psp-2.6.32/0006-board-omap3beagle-prepare-for-DM3730-based-Beagleboa.patch
index dece1522c2..0a483cd44f 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0006-board-omap3beagle-prepare-for-DM3730-based-Beagleboa.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0006-board-omap3beagle-prepare-for-DM3730-based-Beagleboa.patch
@@ -1,16 +1,17 @@
-From cb5c43f259e7204cfb4cb4de39cc6182bda57222 Mon Sep 17 00:00:00 2001
+From 9f69d9bbab1d24da77864b48dbc5d8d4db9f4cdf Mon Sep 17 00:00:00 2001
 From: Koen Kooi <k-kooi@ti.com>
-Date: Mon, 8 Feb 2010 16:30:59 +0100
-Subject: [PATCH 06/42] board-omap3beagle: prepare for DM3730 based BeagleboardXM
+Date: Wed, 27 Jan 2010 21:57:13 +0100
+Subject: [PATCH 06/43] board-omap3beagle: prepare for DM3730 based BeagleboardXM
 
 * OPP changes copy/pasted from board-omap3evm.c
 	* EHCI changes copy/pasted from Steve Kipisz' 2.6.33rcX work
+	* turn on power to camera on boot and add some comments
 ---
- arch/arm/mach-omap2/board-omap3beagle.c |   57 ++++++++++++++++++++++++++----
- 1 files changed, 49 insertions(+), 8 deletions(-)
+ arch/arm/mach-omap2/board-omap3beagle.c |   62 +++++++++++++++++++++++++++----
+ 1 files changed, 54 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 1caaa01..accf80d 100644
+index 3b7f6ec..429dacb 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -53,6 +53,23 @@
@@ -37,16 +38,21 @@ index 1caaa01..accf80d 100644
  #define GPMC_CS0_BASE  0x60
  #define GPMC_CS_SIZE   0x30
  
-@@ -303,12 +320,23 @@ static int beagle_twl_gpio_setup(struct device *dev,
+@@ -303,12 +320,28 @@ static int beagle_twl_gpio_setup(struct device *dev,
  	 * power switch and overcurrent detect
  	 */
  
 -	gpio_request(gpio + 1, "EHCI_nOC");
 -	gpio_direction_input(gpio + 1);
 +	if (cpu_is_omap3630()) {
++		/* Power on DVI, Serial and PWR led */ 
 + 		gpio_request(gpio + 1, "nDVI_PWR_EN");
 +		gpio_direction_output(gpio + 1, 0);	
 +
++		/* Power on camera interface */
++		gpio_request(gpio + 2, "CAM_EN");
++		gpio_direction_output(gpio + 2, 1);
++
 +		/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
 +		gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
 +		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
@@ -66,13 +72,13 @@ index 1caaa01..accf80d 100644
  
  	/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
  	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
-@@ -501,9 +529,22 @@ static struct platform_device keys_gpio = {
+@@ -501,9 +534,22 @@ static struct platform_device keys_gpio = {
  
  static void __init omap3_beagle_init_irq(void)
  {
 -	omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
--			     mt46h32m32lf6_sdrc_params, omap35x_mpu_rate_table,
--			     omap35x_dsp_rate_table, omap35x_l3_rate_table);
+-			     mt46h32m32lf6_sdrc_params, omap3_mpu_rate_table,
+-			     omap3_dsp_rate_table, omap3_l3_rate_table);
 +        if (cpu_is_omap3630())
 +        {
 +                omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0007-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch b/recipes/linux/linux-omap-psp-2.6.32/0007-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch
new file mode 100644
index 0000000000..184ce18948
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.32/0007-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch
@@ -0,0 +1,172 @@
+From 32fb278553a4cd6126c1791d70aa33df12f73d90 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Mon, 3 May 2010 14:41:29 +0200
+Subject: [PATCH 07/43] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot
+
+And add support for zippy2
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |   88 +++++++++++++++++++++++++++----
+ 1 files changed, 78 insertions(+), 10 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 429dacb..ac96551 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -75,6 +75,8 @@ static struct omap_opp * _omap37x_l3_rate_table         = NULL;
+ 
+ #define NAND_BLOCK_SIZE		SZ_128K
+ 
++char expansionboard_name[16];
++
+ #if defined(CONFIG_ENC28J60) || defined(CONFIG_ENC28J60_MODULE)
+ 
+ #include <plat/mcspi.h>
+@@ -87,7 +89,7 @@ static struct omap2_mcspi_device_config enc28j60_spi_chip_info = {
+ 	.single_channel	= 1,	/* 0: slave, 1: master */
+ };
+ 
+-static struct spi_board_info omap3beagle_spi_board_info[] __initdata = {
++static struct spi_board_info omap3beagle_zippy_spi_board_info[] __initdata = {
+ 	{
+ 		.modalias		= "enc28j60",
+ 		.bus_num		= 4,
+@@ -102,21 +104,62 @@ static void __init omap3beagle_enc28j60_init(void)
+ 	if ((gpio_request(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, "ENC28J60_IRQ") == 0) &&
+ 	    (gpio_direction_input(OMAP3BEAGLE_GPIO_ENC28J60_IRQ) == 0)) {
+ 		gpio_export(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, 0);
+-		omap3beagle_spi_board_info[0].irq	= OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_ENC28J60_IRQ);
+-		set_irq_type(omap3beagle_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
++		omap3beagle_zippy_spi_board_info[0].irq	= OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_ENC28J60_IRQ);
++		set_irq_type(omap3beagle_zippy_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
+ 	} else {
+ 		printk(KERN_ERR "could not obtain gpio for ENC28J60_IRQ\n");
+ 		return;
+ 	}
+ 
+-	spi_register_board_info(omap3beagle_spi_board_info,
+-			ARRAY_SIZE(omap3beagle_spi_board_info));
++	spi_register_board_info(omap3beagle_zippy_spi_board_info,
++			ARRAY_SIZE(omap3beagle_zippy_spi_board_info));
+ }
+ 
+ #else
+ static inline void __init omap3beagle_enc28j60_init(void) { return; }
+ #endif
+ 
++#if defined(CONFIG_KS8851) || defined(CONFIG_KS8851_MODULE)
++
++#include <plat/mcspi.h>
++#include <linux/spi/spi.h>
++
++#define OMAP3BEAGLE_GPIO_KS8851_IRQ 157
++
++static struct omap2_mcspi_device_config ks8851_spi_chip_info = {
++	.turbo_mode	= 0,
++	.single_channel	= 1,	/* 0: slave, 1: master */
++};
++
++static struct spi_board_info omap3beagle_zippy2_spi_board_info[] __initdata = {
++	{
++		.modalias		= "ks8851",
++		.bus_num		= 4,
++		.chip_select		= 0,
++		.max_speed_hz		= 36000000,
++		.controller_data	= &ks8851_spi_chip_info,
++	},
++};
++
++static void __init omap3beagle_ks8851_init(void)
++{
++	if ((gpio_request(OMAP3BEAGLE_GPIO_KS8851_IRQ, "KS8851_IRQ") == 0) &&
++	    (gpio_direction_input(OMAP3BEAGLE_GPIO_KS8851_IRQ) == 0)) {
++		gpio_export(OMAP3BEAGLE_GPIO_KS8851_IRQ, 0);
++		omap3beagle_zippy2_spi_board_info[0].irq	= OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_KS8851_IRQ);
++		set_irq_type(omap3beagle_zippy2_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
++	} else {
++		printk(KERN_ERR "could not obtain gpio for KS8851_IRQ\n");
++		return;
++	}
++	
++	spi_register_board_info(omap3beagle_zippy2_spi_board_info,
++							ARRAY_SIZE(omap3beagle_zippy2_spi_board_info));
++}
++
++#else
++static inline void __init omap3beagle_ks8851_init(void) { return; }
++#endif
+ 
+ static struct mtd_partition omap3beagle_nand_partitions[] = {
+ 	/* All the partition sizes are listed in terms of NAND block size */
+@@ -281,8 +324,6 @@ static struct twl4030_hsmmc_info mmc[] = {
+ 	{
+ 		.mmc		= 2,
+ 		.wires		= 4,
+-		.gpio_wp	= 141,
+-		.gpio_cd	= 162,
+ 		.transceiver	= true,
+ 		.ocr_mask	= 0x00100000,	/* 3.3V */
+ 	},
+@@ -601,7 +642,7 @@ static void __init omap3beagle_flash_init(void)
+ 	}
+ }
+ 
+-static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
++static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = {
+ 
+ 	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
+ 	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
+@@ -621,6 +662,15 @@ static struct omap_board_mux board_mux[] __initdata = {
+ #define board_mux	NULL
+ #endif
+ 
++static int __init expansionboard_setup(char *str)
++{
++	if (!str)
++		return -EINVAL;
++	strncpy(expansionboard_name, str, 16);
++	printk(KERN_INFO "Beagle expansionboard: %s\n", expansionboard_name);
++	return 0;
++}
++
+ static void __init omap3_beagle_init(void)
+ {
+ 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
+@@ -634,8 +684,24 @@ static void __init omap3_beagle_init(void)
+ 	/* REVISIT leave DVI powered down until it's needed ... */
+ 	gpio_direction_output(170, true);
+ 
+-	omap3beagle_enc28j60_init();
+-
++	if(!strcmp(expansionboard_name, "zippy")) 
++	{
++		printk(KERN_INFO "Beagle expansionboard: initializing enc28j60\n");
++		omap3beagle_enc28j60_init();
++		printk(KERN_INFO "Beagle expansionboard: assigning GPIO 141 and 162 to MMC1\n");
++		mmc[1].gpio_wp = 141;
++		mmc[1].gpio_cd = 162;
++	}
++	
++	if(!strcmp(expansionboard_name, "zippy2")) 
++	{
++		printk(KERN_INFO "Beagle expansionboard: initializing ks_8851\n");
++		omap3beagle_ks8851_init();
++		printk(KERN_INFO "Beagle expansionboard: assigning GPIO 141 and 162 to MMC1\n");
++		mmc[1].gpio_wp = 141;
++		mmc[1].gpio_cd = 162;
++	}
++	
+ 	usb_musb_init();
+ 	usb_ehci_init(&ehci_pdata);
+ 	omap3beagle_flash_init();
+@@ -652,6 +718,8 @@ static void __init omap3_beagle_map_io(void)
+ 	omap2_map_common_io();
+ }
+ 
++early_param("buddy", expansionboard_setup);
++
+ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
+ 	/* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */
+ 	.phys_io	= 0x48000000,
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0007-mt9t111-first-stab-at-merging-sensor-driver-based-on.patch b/recipes/linux/linux-omap-psp-2.6.32/0007-mt9t111-first-stab-at-merging-sensor-driver-based-on.patch
deleted file mode 100644
index 298cf482d9..0000000000
--- a/recipes/linux/linux-omap-psp-2.6.32/0007-mt9t111-first-stab-at-merging-sensor-driver-based-on.patch
+++ /dev/null
@@ -1,2394 +0,0 @@
-From 2170c42abf50a27b9aa9ed253b25312380bdc84f Mon Sep 17 00:00:00 2001
-From: Koen Kooi <k-kooi@ti.com>
-Date: Tue, 9 Feb 2010 17:16:13 +0100
-Subject: [PATCH 07/42] mt9t111: first stab at merging sensor driver based on a patch by Leopard Imaging
-
----
- drivers/media/video/Kconfig       |    8 +
- drivers/media/video/Makefile      |    1 +
- drivers/media/video/mt9t111.c     |  883 ++++++++++++++++++++++++
- drivers/media/video/mt9t111_reg.h | 1364 +++++++++++++++++++++++++++++++++++++
- include/media/mt9t111.h           |   79 +++
- 5 files changed, 2335 insertions(+), 0 deletions(-)
- create mode 100644 drivers/media/video/mt9t111.c
- create mode 100644 drivers/media/video/mt9t111_reg.h
- create mode 100644 include/media/mt9t111.h
-
-diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
-index 41e39a7..f67ed46 100644
---- a/drivers/media/video/Kconfig
-+++ b/drivers/media/video/Kconfig
-@@ -344,6 +344,14 @@ config VIDEO_MT9P012
- 	  MT9P012 camera.  It is currently working with the TI OMAP3
- 	  camera controller.
- 
-+config VIDEO_MT9T111
-+	tristate "Micron MT9T111 raw sensor driver (3MP)"
-+	depends on I2C && VIDEO_V4L2
-+	---help---
-+	  This is a Video4Linux2 sensor-level driver for the Micron
-+	  MT9T111 camera.  It is currently working with the TI OMAP3
-+	  camera controller.
-+
- config VIDEO_DW9710
- 	tristate "Lens driver for DW9710"
- 	depends on I2C && VIDEO_V4L2
-diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
-index 88e8ec1..31688bf 100644
---- a/drivers/media/video/Makefile
-+++ b/drivers/media/video/Makefile
-@@ -127,6 +127,7 @@ obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
- obj-y				+= isp/
- obj-$(CONFIG_VIDEO_OMAP3)	+= omap34xxcam.o
- obj-$(CONFIG_VIDEO_MT9P012)     += mt9p012.o
-+obj-$(CONFIG_VIDEO_MT9T111)     += mt9t111.o
- obj-$(CONFIG_VIDEO_DW9710)	+= dw9710.o
- obj-$(CONFIG_VIDEO_TPS61059)    += tps61059.o
- obj-$(CONFIG_VIDEO_OV3640)	+= ov3640.o
-diff --git a/drivers/media/video/mt9t111.c b/drivers/media/video/mt9t111.c
-new file mode 100644
-index 0000000..ecc5115
---- /dev/null
-+++ b/drivers/media/video/mt9t111.c
-@@ -0,0 +1,883 @@
-+/*
-+ * drivers/media/video/mt9t111.c
-+ *
-+ * mt9t111 sensor driver
-+ *
-+ * Copyright (C) 2009 Leopard Imaging
-+ *
-+ * This file is licensed under the terms of the GNU General Public License
-+ * version 2. This program is licensed "as is" without any warranty of any
-+ * kind, whether express or implied.
-+ */
-+
-+#include <linux/i2c.h>
-+#include <linux/delay.h>
-+#include <media/v4l2-int-device.h>
-+
-+#include <media/mt9t111.h>
-+#include "mt9t111_reg.h"
-+
-+#define USE_RAW // YCbCr mode does not work yet
-+//#define COLOR_BAR // Create a Color bar test pattern, Blue, Green, Red, Grey
-+
-+#define SENSOR_DETECTED		1
-+#define SENSOR_NOT_DETECTED	0
-+
-+static void mt9t111_loaddefault(struct i2c_client *client);
-+
-+/* 
-+* as a place holder for further development
-+*/
-+static void debug_dummy(char *in_msg)
-+{
-+	
-+}
-+
-+/* list of image formats supported by mt9t111 sensor */
-+const static struct v4l2_fmtdesc mt9t111_formats[] = {
-+#ifdef USE_RAW
-+	{
-+		.description    = "RAW ",
-+		.pixelformat    = V4L2_PIX_FMT_SGRBG10,
-+	},
-+#else
-+	{
-+		.description    = "YUV 422 ",
-+		.pixelformat    = V4L2_PIX_FMT_YUYV,
-+	},
-+#endif
-+};
-+
-+#define NUM_CAPTURE_FORMATS ARRAY_SIZE(mt9t111_formats)
-+
-+/*
-+ * Array of image sizes supported by MT9T111.  These must be ordered from
-+ * smallest image size to largest.
-+ */
-+const static struct capture_size mt9t111_sizes[] = {
-+	{  640, 480 },	
-+//	{ 2048, 1536}		
-+};
-+
-+#define NUM_CAPTURE_SIZE ARRAY_SIZE(mt9t111_sizes)
-+
-+
-+const struct v4l2_fract mt9t111_frameintervals[] = {
-+	{  .numerator = 1, .denominator = 10 }
-+};
-+
-+#define NUM_CAPTURE_FRAMEINTERVALS ARRAY_SIZE(mt9t111_frameintervals)
-+
-+/**
-+ * struct mt9t111_sensor - main structure for storage of sensor information
-+ * @pdata: access functions and data for platform level information
-+ * @v4l2_int_device: V4L2 device structure structure
-+ * @i2c_client: iic client device structure
-+ * @pix: V4L2 pixel format information structure
-+ * @timeperframe: time per frame expressed as V4L fraction
-+ * @scaler:
-+ * @ver: mt9t111 chip version
-+ * @fps: frames per second value
-+ */
-+struct mt9t111_sensor {
-+	const struct mt9t111_platform_data *pdata;
-+	struct v4l2_int_device *v4l2_int_device;
-+	struct i2c_client *i2c_client;
-+	struct v4l2_pix_format pix;
-+	struct v4l2_fract timeperframe;
-+	int scaler;
-+	int ver;
-+	int fps;
-+	int state;
-+};
-+
-+static struct mt9t111_sensor mt9t111 = {
-+	.timeperframe = {
-+		.numerator = 1,
-+		.denominator = 10,
-+	},
-+	.state = SENSOR_NOT_DETECTED,
-+};
-+
-+/**
-+ * mt9t111_read_reg - Read a value from a register in an mt9t111 sensor device
-+ * @client: i2c driver client structure
-+ * @data_length: length of data to be read
-+ * @reg: register address / offset
-+ * @val: stores the value that gets read
-+ *
-+ * Read a value from a register in an mt9t111 sensor device.
-+ * The value is returned in 'val'.
-+ * Returns zero if successful, or non-zero otherwise.
-+ */
-+static int
-+mt9t111_read_reg(struct i2c_client *client, u16 reg, u16 *val)
-+{
-+	struct i2c_msg msg[1];
-+	u8 data[4];
-+	int err;
-+
-+	msg->addr = client->addr;
-+	msg->flags = 0;
-+	msg->len = 2;
-+	msg->buf = data;	
-+	data[0] = (reg & 0xff00) >> 8;
-+	data[1] = (reg & 0x00ff);
-+	err = i2c_transfer(client->adapter, msg, 1);
-+	if (err >= 0) {			
-+		msg->flags = I2C_M_RD;			
-+		msg->len = 2;	/* 2 byte read */			
-+		err = i2c_transfer(client->adapter, msg, 1);			
-+		if (err >= 0) {				
-+			*val = ((data[0] & 0x00ff) << 8)    
-+				| (data[1] & 0x00ff);	
-+			return 0;
-+		}
-+	}
-+	return err;
-+}
-+
-+/**
-+ * mt9t111_write_reg - Write a value to a register in an mt9t111 sensor device
-+ * @client: i2c driver client structure
-+ * @data_length: length of data to be read
-+ * @reg: register address / offset
-+ * @val: value to be written to specified register
-+ *
-+ * Write a value to a register in an mt9t111 sensor device.
-+ * Returns zero if successful, or non-zero otherwise.
-+ */
-+static int
-+mt9t111_write_reg(struct i2c_client *client, u16 reg, u16 val)
-+{
-+	struct i2c_msg msg[1];
-+	u8 data[20];
-+	int err;
-+
-+	msg->addr = client->addr;
-+	msg->flags = 0;
-+	msg->len = 4;
-+	msg->buf = data;
-+	data[0] = (u8)((reg & 0xff00) >> 8);
-+	data[1] = (u8)(reg & 0x00ff);	
-+	data[2] = (u8)((val & 0xff00) >> 8);
-+	data[3] = (u8)(val & 0x00ff);
-+	err = i2c_transfer(client->adapter, msg, 1);
-+
-+	return err;
-+}
-+
-+/**
-+ * mt9t111_write_regs - Write registers to an mt9t111 sensor device
-+ * @client: i2c driver client structure
-+ * @reg_in: pointer to registers to write
-+ * @cnt: the number of registers 
-+ *
-+ * Write registers .
-+ * Returns zero if successful, or non-zero otherwise.
-+ */
-+static int
-+mt9t111_write_regs(struct i2c_client *client, mt9t111_regs *reg_in, int cnt)
-+{
-+	int err = 0;
-+	int i;
-+	mt9t111_regs *reg = reg_in;
-+	
-+	for (i=0;i<cnt;i++) {
-+		if (reg->delay_time == 0) {
-+			err |= mt9t111_write_reg(client, reg->addr, reg->data);
-+		} else if (reg->addr != 0 || reg->data != 0) {
-+			err |= mt9t111_write_reg(client, reg->addr, reg->data);
-+			mdelay(reg->delay_time);
-+		} else 
-+			mdelay(reg->delay_time);
-+			
-+		if (err < 0) {
-+			dev_warn(&client->dev, "write reg error, addr = 0x%x, data = 0x%x \n", \
-+				reg->addr, reg->data);
-+			return err;
-+		}
-+		reg++;
-+	}
-+	return err;
-+}
-+
-+/**
-+ * mt9t111_detect - Detect if an mt9t111 is present, and if so which revision
-+ * @client: pointer to the i2c client driver structure
-+ *
-+ * Detect if an mt9t111 is present
-+ * Returns a negative error number if no device is detected, or the
-+ * non-negative value of the version ID register if a device is detected.
-+ */
-+static int
-+mt9t111_detect(struct i2c_client *client)
-+{
-+	u16 val;
-+
-+	/* chip ID is at address 0 */
-+	if (mt9t111_read_reg(client, MT9T111_CHIP_ID, &val) < 0)
-+		return -ENODEV;
-+	dev_info(&client->dev, "model id detected 0x%x\n", val);
-+	
-+	if (val != MT9T111_CHIP_ID_VALUE) {
-+		dev_warn(&client->dev, "model id mismatch received 0x%x expecting 0x%x\n",
-+			val, MT9T111_CHIP_ID_VALUE);
-+
-+		return -ENODEV;
-+	}
-+
-+	return 0;
-+
-+}
-+
-+/**
-+ * mt9t111_configure - Configure the mt9t111 for the specified image mode
-+ * @s: pointer to standard V4L2 device structure
-+ *
-+ * Configure the mt9t111 for a specified image size, pixel format, and frame
-+ * period.  xclk is the frequency (in Hz) of the xclk input to the mt9t111.
-+ * fper is the frame period (in seconds) expressed as a fraction.
-+ * Returns zero if successful, or non-zero otherwise.
-+ * The actual frame period is returned in fper.
-+ */
-+static int mt9t111_configure(struct v4l2_int_device *s)
-+{
-+	debug_dummy("debug_dummy -- to set imager mode");
-+
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_enum_framesizes - V4L2 sensor if handler for vidioc_int_enum_framesizes
-+ * @s: pointer to standard V4L2 device structure
-+ * @frms: pointer to standard V4L2 framesizes enumeration structure
-+ *
-+ * Returns possible framesizes depending on choosen pixel format
-+ **/
-+static int ioctl_enum_framesizes(struct v4l2_int_device *s,
-+					struct v4l2_frmsizeenum *frms)
-+{
-+	int ifmt;
-+
-+	for (ifmt = 0; ifmt < NUM_CAPTURE_FORMATS; ifmt++) {
-+		if (frms->pixel_format == mt9t111_formats[ifmt].pixelformat)
-+			break;
-+	}
-+	/* Is requested pixelformat not found on sensor? */
-+	if (ifmt == NUM_CAPTURE_FORMATS)
-+		return -EINVAL;
-+
-+	/* Do we already reached all discrete framesizes? */
-+	if (frms->index >= NUM_CAPTURE_SIZE)
-+		return -EINVAL;
-+
-+	frms->type = V4L2_FRMSIZE_TYPE_DISCRETE;
-+	frms->discrete.width = mt9t111_sizes[frms->index].width;
-+	frms->discrete.height = mt9t111_sizes[frms->index].height;
-+
-+	return 0;
-+
-+}
-+
-+static int ioctl_enum_frameintervals(struct v4l2_int_device *s,
-+					struct v4l2_frmivalenum *frmi)
-+{
-+	int ifmt;
-+
-+printk(KERN_INFO "entering ioctl_enum_frameintervals\n");
-+printk(KERN_INFO "index = %d, pixel_format = 0x%x, width = %d, height = %d\n",
-+			frmi->index, frmi->pixel_format, frmi->width, frmi->height);
-+printk(KERN_INFO "mt9t111 format = 0x%x\n",	mt9t111_formats[0].pixelformat);
-+
-+	if (frmi->index >= NUM_CAPTURE_FRAMEINTERVALS)
-+		return -EINVAL;
-+	
-+	for (ifmt = 0; ifmt < NUM_CAPTURE_FORMATS; ifmt++) {
-+		if (frmi->pixel_format == mt9t111_formats[ifmt].pixelformat)
-+			break;
-+	}
-+	/* Is requested pixelformat not found on sensor? */
-+	if (ifmt == NUM_CAPTURE_FORMATS)
-+		return -EINVAL;
-+
-+	frmi->type = V4L2_FRMSIZE_TYPE_DISCRETE;
-+	frmi->discrete.numerator =
-+				mt9t111_frameintervals[frmi->index].numerator;
-+	frmi->discrete.denominator =
-+				mt9t111_frameintervals[frmi->index].denominator;
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_init - V4L2 sensor interface handler for VIDIOC_INT_INIT
-+ * @s: pointer to standard V4L2 device structure
-+ *
-+ * Initialize the sensor device (call mt9t111_configure())
-+ */
-+static int ioctl_init(struct v4l2_int_device *s)
-+{
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_dev_exit - V4L2 sensor interface handler for vidioc_int_dev_exit_num
-+ * @s: pointer to standard V4L2 device structure
-+ *
-+ * Delinitialise the dev. at slave detach.  The complement of ioctl_dev_init.
-+ */
-+static int ioctl_dev_exit(struct v4l2_int_device *s)
-+{
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_dev_init - V4L2 sensor interface handler for vidioc_int_dev_init_num
-+ * @s: pointer to standard V4L2 device structure
-+ *
-+ * Initialise the device when slave attaches to the master.  Returns 0 if
-+ * mt9t111 device could be found, otherwise returns appropriate error.
-+ */
-+static int ioctl_dev_init(struct v4l2_int_device *s)
-+{
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_s_power - V4L2 sensor interface handler for vidioc_int_s_power_num
-+ * @s: pointer to standard V4L2 device structure
-+ * @on: power state to which device is to be set
-+ *
-+ * Sets devices power state to requrested state, if possible.
-+ */
-+static int ioctl_s_power(struct v4l2_int_device *s, enum v4l2_power on)
-+{
-+	struct mt9t111_sensor *sensor = s->priv;
-+	struct i2c_client *c = sensor->i2c_client;
-+	int rval;
-+
-+	if ((on == V4L2_POWER_STANDBY) && (sensor->state == SENSOR_DETECTED))
-+		debug_dummy("debug_dummy -- put to standby\n");
-+
-+	if (on != V4L2_POWER_ON)
-+		debug_dummy("debug_dummy -- stop master clock\n");
-+	else
-+		debug_dummy("debug_dummy -- enable clock\n");;
-+
-+	rval = sensor->pdata->power_set(on);
-+	if (rval < 0) {
-+		dev_err(&c->dev, "Unable to set the power state: " "mt9t111"
-+								" sensor\n");
-+		//sensor->pdata->set_xclk(0);
-+		return rval;
-+	}
-+
-+	if ((on == V4L2_POWER_ON) && (sensor->state == SENSOR_DETECTED))
-+		mt9t111_configure(s);
-+
-+	if ((on == V4L2_POWER_ON) && (sensor->state == SENSOR_NOT_DETECTED)) {
-+		rval = mt9t111_detect(c);
-+		if (rval < 0) {
-+			dev_err(&c->dev, "Unable to detect " "mt9t111"
-+								" sensor\n");
-+			sensor->state = SENSOR_NOT_DETECTED;
-+			return rval;
-+		}
-+		mt9t111_loaddefault(c);
-+		sensor->state = SENSOR_DETECTED;
-+		sensor->ver = rval;
-+		pr_info("mt9t111" " chip version 0x%02x detected\n",
-+								sensor->ver);
-+	}
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_g_priv - V4L2 sensor interface handler for vidioc_int_g_priv_num
-+ * @s: pointer to standard V4L2 device structure
-+ * @p: void pointer to hold sensor's private data address
-+ *
-+ * Returns device's (sensor's) private data area address in p parameter
-+ */
-+static int ioctl_g_priv(struct v4l2_int_device *s, void *p)
-+{
-+	struct mt9t111_sensor *sensor = s->priv;
-+
-+	return sensor->pdata->priv_data_set(p);
-+}
-+
-+/**
-+ * ioctl_s_parm - V4L2 sensor interface handler for VIDIOC_S_PARM ioctl
-+ * @s: pointer to standard V4L2 device structure
-+ * @a: pointer to standard V4L2 VIDIOC_S_PARM ioctl structure
-+ *
-+ * Configures the sensor to use the input parameters, if possible.  If
-+ * not possible, reverts to the old parameters and returns the
-+ * appropriate error code.
-+ */
-+static int ioctl_s_parm(struct v4l2_int_device *s,
-+			     struct v4l2_streamparm *a)
-+{
-+	//TODO: set paramters
-+	debug_dummy("debug_dummy -- VIDIOC_S_PARM ");
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_g_parm - V4L2 sensor interface handler for VIDIOC_G_PARM ioctl
-+ * @s: pointer to standard V4L2 device structure
-+ * @a: pointer to standard V4L2 VIDIOC_G_PARM ioctl structure
-+ *
-+ * Returns the sensor's video CAPTURE parameters.
-+ */
-+static int ioctl_g_parm(struct v4l2_int_device *s,
-+			     struct v4l2_streamparm *a)
-+{
-+	struct mt9t111_sensor *sensor = s->priv;
-+	struct v4l2_captureparm *cparm = &a->parm.capture;
-+
-+	if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-+		return -EINVAL;
-+
-+	memset(a, 0, sizeof(*a));
-+	a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+
-+	cparm->capability = V4L2_CAP_TIMEPERFRAME;
-+	cparm->timeperframe = sensor->timeperframe;
-+
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_g_fmt_cap - V4L2 sensor interface handler for ioctl_g_fmt_cap
-+ * @s: pointer to standard V4L2 device structure
-+ * @f: pointer to standard V4L2 v4l2_format structure
-+ *
-+ * Returns the sensor's current pixel format in the v4l2_format
-+ * parameter.
-+ */
-+static int ioctl_g_fmt_cap(struct v4l2_int_device *s,
-+				struct v4l2_format *f)
-+{
-+	struct mt9t111_sensor *sensor = s->priv;
-+	f->fmt.pix = sensor->pix;
-+
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_try_fmt_cap - Implement the CAPTURE buffer VIDIOC_TRY_FMT ioctl
-+ * @s: pointer to standard V4L2 device structure
-+ * @f: pointer to standard V4L2 VIDIOC_TRY_FMT ioctl structure
-+ *
-+ * Implement the VIDIOC_TRY_FMT ioctl for the CAPTURE buffer type.  This
-+ * ioctl is used to negotiate the image capture size and pixel format
-+ * without actually making it take effect.
-+ */
-+static int ioctl_try_fmt_cap(struct v4l2_int_device *s,
-+			     struct v4l2_format *f)
-+{
-+	struct v4l2_pix_format *pix = &f->fmt.pix;
-+	struct mt9t111_sensor *sensor = s->priv;
-+	struct v4l2_pix_format *pix2 = &sensor->pix;
-+
-+	pix->width = 640;
-+	pix->height = 480;
-+#ifdef USE_RAW	
-+	pix->pixelformat = V4L2_PIX_FMT_SGRBG10;
-+	pix->bytesperline = pix->width; 
-+	pix->colorspace =  V4L2_COLORSPACE_SRGB;
-+#else
-+	pix->pixelformat = V4L2_PIX_FMT_YUYV;
-+	pix->bytesperline = pix->width * 2;  
-+	pix->colorspace = V4L2_COLORSPACE_JPEG;
-+#endif
-+	pix->field = V4L2_FIELD_NONE;
-+
-+	pix->sizeimage = pix->bytesperline * pix->height;
-+	pix->priv = 0;
-+	*pix2 = *pix;
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_s_fmt_cap - V4L2 sensor interface handler for VIDIOC_S_FMT ioctl
-+ * @s: pointer to standard V4L2 device structure
-+ * @f: pointer to standard V4L2 VIDIOC_S_FMT ioctl structure
-+ *
-+ * If the requested format is supported, configures the HW to use that
-+ * format, returns error code if format not supported or HW can't be
-+ * correctly configured.
-+ */
-+static int ioctl_s_fmt_cap(struct v4l2_int_device *s,
-+				struct v4l2_format *f)
-+{
-+	struct mt9t111_sensor *sensor = s->priv;
-+	struct v4l2_pix_format *pix = &f->fmt.pix;
-+	int rval;
-+
-+	rval = ioctl_try_fmt_cap(s, f);
-+	if (!rval)
-+		sensor->pix = *pix;
-+
-+	return rval;
-+}
-+
-+/**
-+ * ioctl_enum_fmt_cap - Implement the CAPTURE buffer VIDIOC_ENUM_FMT ioctl
-+ * @s: pointer to standard V4L2 device structure
-+ * @fmt: standard V4L2 VIDIOC_ENUM_FMT ioctl structure
-+ *
-+ * Implement the VIDIOC_ENUM_FMT ioctl for the CAPTURE buffer type.
-+ */
-+static int ioctl_enum_fmt_cap(struct v4l2_int_device *s,
-+				   struct v4l2_fmtdesc *fmt)
-+{
-+	int index = fmt->index;
-+	enum v4l2_buf_type type = fmt->type;
-+
-+	memset(fmt, 0, sizeof(*fmt));
-+	fmt->index = index;
-+	fmt->type = type;
-+
-+	switch (fmt->type) {
-+	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-+		if (index >= NUM_CAPTURE_FORMATS)
-+			return -EINVAL;
-+	break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	fmt->flags = mt9t111_formats[index].flags;
-+	strlcpy(fmt->description, mt9t111_formats[index].description,
-+					sizeof(fmt->description));
-+	fmt->pixelformat = mt9t111_formats[index].pixelformat;
-+
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_s_ctrl - V4L2 sensor interface handler for VIDIOC_S_CTRL ioctl
-+ * @s: pointer to standard V4L2 device structure
-+ * @vc: standard V4L2 VIDIOC_S_CTRL ioctl structure
-+ *
-+ * If the requested control is supported, sets the control's current
-+ * value in HW (and updates the video_control[] array).  Otherwise,
-+ * returns -EINVAL if the control is not supported.
-+ */
-+static int ioctl_s_ctrl(struct v4l2_int_device *s,
-+			     struct v4l2_control *vc)
-+{
-+	debug_dummy("debug_dummy -- s ctrl\n");
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_g_ctrl - V4L2 sensor interface handler for VIDIOC_G_CTRL ioctl
-+ * @s: pointer to standard V4L2 device structure
-+ * @vc: standard V4L2 VIDIOC_G_CTRL ioctl structure
-+ *
-+ * If the requested control is supported, returns the control's current
-+ * value from the video_control[] array.  Otherwise, returns -EINVAL
-+ * if the control is not supported.
-+ */
-+static int ioctl_g_ctrl(struct v4l2_int_device *s,
-+			     struct v4l2_control *vc)
-+{
-+	debug_dummy("debug_dummy -- g ctrl\n");	
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_queryctrl - V4L2 sensor interface handler for VIDIOC_QUERYCTRL ioctl
-+ * @s: pointer to standard V4L2 device structure
-+ * @qc: standard V4L2 VIDIOC_QUERYCTRL ioctl structure
-+ *
-+ * If the requested control is supported, returns the control information
-+ * from the video_control[] array.  Otherwise, returns -EINVAL if the
-+ * control is not supported.
-+ */
-+static int ioctl_queryctrl(struct v4l2_int_device *s,
-+				struct v4l2_queryctrl *qc)
-+{
-+	debug_dummy("debug_dummy -- query ctrl\n");	
-+	return-EINVAL;
-+}
-+
-+/**
-+ * ioctl_s_routing - V4L2 decoder interface handler for VIDIOC_S_INPUT ioctl
-+ * @s: pointer to standard V4L2 device structure
-+ * @index: number of the input
-+ *
-+ * If index is valid, selects the requested input. Otherwise, returns -EINVAL if
-+ * the input is not supported or there is no active signal present in the
-+ * selected input.
-+ */
-+static int ioctl_s_routing(struct v4l2_int_device *s,
-+				struct v4l2_routing *route)
-+{
-+	return 0;
-+}
-+
-+/**
-+ * ioctl_g_ifparm - V4L2 decoder interface handler for vidioc_int_g_ifparm_num
-+ * @s: pointer to standard V4L2 device structure
-+ * @p: pointer to standard V4L2 vidioc_int_g_ifparm_num ioctl structure
-+ *
-+ * Gets slave interface parameters.
-+ * Calculates the required xclk value to support the requested
-+ * clock parameters in p. This value is returned in the p
-+ * parameter.
-+ */
-+static int ioctl_g_ifparm(struct v4l2_int_device *s, struct v4l2_ifparm *p)
-+{
-+	struct mt9t111_sensor *sensor = s->priv;
-+	int rval;
-+
-+	if (p == NULL)
-+		return -EINVAL;
-+
-+	if (NULL == sensor->pdata->ifparm)
-+		return -EINVAL;
-+
-+	rval = sensor->pdata->ifparm(p);
-+	if (rval) {
-+		v4l_err(sensor->i2c_client, "g_ifparm.Err[%d]\n", rval);
-+		return rval;
-+	}
-+
-+	p->u.ycbcr.clock_curr = 40*1000000; // temporal value
-+
-+	return 0;
-+}
-+
-+
-+static struct v4l2_int_ioctl_desc mt9t111_ioctl_desc[] = {
-+	{ .num = vidioc_int_enum_framesizes_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_enum_framesizes },
-+	{ .num = vidioc_int_enum_frameintervals_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_enum_frameintervals },
-+	{ .num = vidioc_int_dev_init_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_dev_init },
-+	{ .num = vidioc_int_dev_exit_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_dev_exit },
-+	{ .num = vidioc_int_s_power_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_s_power },
-+	{ .num = vidioc_int_g_priv_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_g_priv },
-+  	{vidioc_int_g_ifparm_num, 
-+  	  .func = (v4l2_int_ioctl_func*) ioctl_g_ifparm},
-+	{ .num = vidioc_int_init_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_init },
-+	{ .num = vidioc_int_enum_fmt_cap_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_enum_fmt_cap },
-+	{ .num = vidioc_int_try_fmt_cap_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_try_fmt_cap },
-+	{ .num = vidioc_int_g_fmt_cap_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_g_fmt_cap },
-+	{ .num = vidioc_int_s_fmt_cap_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_s_fmt_cap },
-+	{ .num = vidioc_int_g_parm_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_g_parm },
-+	{ .num = vidioc_int_s_parm_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_s_parm },
-+	{ .num = vidioc_int_queryctrl_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_queryctrl },
-+	{ .num = vidioc_int_g_ctrl_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_g_ctrl },
-+	{ .num = vidioc_int_s_ctrl_num,
-+	  .func = (v4l2_int_ioctl_func *)ioctl_s_ctrl },
-+	{.num = vidioc_int_s_video_routing_num,
-+		.func = (v4l2_int_ioctl_func *) ioctl_s_routing},	  
-+};
-+
-+static void mt9t111_refresh(struct i2c_client *client){	
-+	int i;	
-+	unsigned short value;		
-+	// MCU_ADDRESS [SEQ_CMD] -- refresh	
-+	mt9t111_write_reg(client, 0x098E,	    0x8400);	
-+	mt9t111_write_reg(client, 0x0990,	    0x0006);	
-+	for (i=0;i<100;i++){		
-+		mt9t111_write_reg(client, 0x098E, 0x8400);			
-+		mt9t111_read_reg(client,0x0990,&value);				
-+		if ( value == 0)			
-+			break;		
-+		mdelay(5);	
-+	}
-+}
-+
-+#ifdef COLOR_BAR
-+static void mt9t111_color_bar(struct i2c_client *client)
-+{
-+	mt9t111_write_reg(client, 0x3210, 0x01B0); // disable lens correction
-+
-+	mt9t111_write_reg(client, 0x098E, 0x6003);
-+	mt9t111_write_reg(client, 0x0990, 0x0100);
-+	mt9t111_write_reg(client, 0x098E, 0x6025);
-+	mt9t111_write_reg(client, 0x0990, 0x0003);
-+}
-+#endif
-+
-+static void mt9t111_bayer_format(struct i2c_client *client)
-+{
-+	mt9t111_write_regs(client, bayer_pattern_regs, sizeof(bayer_pattern_regs)/sizeof(mt9t111_regs));
-+}
-+
-+static void mt9t111_enable_pll(struct i2c_client *client)
-+{
-+	int i;
-+	unsigned short value; 
-+
-+	mt9t111_write_regs(client, pll_regs1, sizeof(pll_regs1)/sizeof(mt9t111_regs));
-+	for (i=0;i<100;i++){
-+		mt9t111_read_reg(client,0x0014,&value);
-+		if (( value & 0x8000) != 0)
-+			break;
-+		mdelay(2);
-+	}
-+	mt9t111_write_regs(client, pll_regs2, sizeof(pll_regs2)/sizeof(mt9t111_regs));
-+}
-+
-+
-+static void mt9t111_loaddefault(struct i2c_client *client)
-+{
-+	mt9t111_write_reg(client, 0x001A, 0x0219);
-+	mt9t111_write_reg(client, 0x001A, 0x0218);
-+
-+	mt9t111_enable_pll(client);
-+	mt9t111_write_regs(client, def_regs1, sizeof(def_regs1)/sizeof(mt9t111_regs));
-+	mt9t111_write_regs(client, patch_rev6, sizeof(patch_rev6)/sizeof(mt9t111_regs));
-+	mt9t111_write_regs(client, def_regs2, sizeof(def_regs2)/sizeof(mt9t111_regs));
-+
-+#ifdef USE_RAW
-+	mt9t111_bayer_format(client);
-+#endif
-+
-+#ifdef COLOR_BAR
-+	mt9t111_color_bar(client);
-+#endif
-+
-+	mt9t111_refresh(client);
-+}
-+
-+static struct v4l2_int_slave mt9t111_slave = {
-+	.ioctls = mt9t111_ioctl_desc,
-+	.num_ioctls = ARRAY_SIZE(mt9t111_ioctl_desc),
-+};
-+
-+static struct v4l2_int_device mt9t111_int_device = {
-+	.module = THIS_MODULE,
-+	.name = "mt9t111",
-+	.priv = &mt9t111,
-+	.type = v4l2_int_type_slave,
-+	.u = {
-+		.slave = &mt9t111_slave,
-+	},
-+};
-+
-+/**
-+ * mt9t111_probe - sensor driver i2c probe handler
-+ * @client: i2c driver client device structure
-+ *
-+ * Register sensor as an i2c client device and V4L2
-+ * device.
-+ */
-+static int
-+mt9t111_probe(struct i2c_client *client, const struct i2c_device_id *id)
-+{
-+	struct mt9t111_sensor *sensor = &mt9t111;
-+	int err;
-+
-+	if (i2c_get_clientdata(client))
-+		return -EBUSY;
-+
-+	sensor->pdata = client->dev.platform_data;
-+
-+	if (!sensor->pdata) {
-+		dev_err(&client->dev, "no platform data?\n");
-+		return -ENODEV;
-+	}
-+
-+	sensor->v4l2_int_device = &mt9t111_int_device;
-+	sensor->i2c_client = client;
-+
-+	i2c_set_clientdata(client, sensor);
-+
-+	sensor->pix.width = 640;
-+	sensor->pix.height = 480;
-+#ifdef USE_RAW	
-+	sensor->pix.pixelformat = V4L2_PIX_FMT_SGRBG10;
-+#else
-+	sensor->pix.pixelformat = V4L2_PIX_FMT_YUYV;
-+#endif
-+	err = v4l2_int_device_register(sensor->v4l2_int_device);
-+	if (err)
-+		i2c_set_clientdata(client, NULL);
-+	return err;
-+}
-+
-+/**
-+ * mt9t111_remove - sensor driver i2c remove handler
-+ * @client: i2c driver client device structure
-+ *
-+ * Unregister sensor as an i2c client device and V4L2
-+ * device.  Complement of mt9t111_probe().
-+ */
-+static int __exit
-+mt9t111_remove(struct i2c_client *client)
-+{
-+	struct mt9t111_sensor *sensor = i2c_get_clientdata(client);
-+
-+	if (!client->adapter)
-+		return -ENODEV;	/* our client isn't attached */
-+
-+	v4l2_int_device_unregister(sensor->v4l2_int_device);
-+	i2c_set_clientdata(client, NULL);
-+
-+	return 0;
-+}
-+
-+static const struct i2c_device_id mt9t111_id[] = {
-+	{ "mt9t111", 0 },
-+	{ },
-+};
-+MODULE_DEVICE_TABLE(i2c, mt9t111_id);
-+
-+static struct i2c_driver mt9t111sensor_i2c_driver = {
-+	.driver = {
-+		.name = "mt9t111",
-+		.owner = THIS_MODULE,
-+	},
-+	.probe = mt9t111_probe,
-+	.remove = __exit_p(mt9t111_remove),
-+	.id_table = mt9t111_id,
-+};
-+
-+/**
-+ * mt9t111sensor_init - sensor driver module_init handler
-+ *
-+ * Registers driver as an i2c client driver.  Returns 0 on success,
-+ * error code otherwise.
-+ */
-+static int __init mt9t111sensor_init(void)
-+{
-+printk(KERN_INFO "entering mt9t111sensor_init\n");
-+	return i2c_add_driver(&mt9t111sensor_i2c_driver);
-+}
-+module_init(mt9t111sensor_init);
-+
-+/**
-+ * mt9t111sensor_cleanup - sensor driver module_exit handler
-+ *
-+ * Unregisters/deletes driver as an i2c client driver.
-+ * Complement of mt9t111sensor_init.
-+ */
-+static void __exit mt9t111sensor_cleanup(void)
-+{
-+	i2c_del_driver(&mt9t111sensor_i2c_driver);
-+}
-+module_exit(mt9t111sensor_cleanup);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("mt9t111 camera sensor driver");
-diff --git a/drivers/media/video/mt9t111_reg.h b/drivers/media/video/mt9t111_reg.h
-new file mode 100644
-index 0000000..e012eeb
---- /dev/null
-+++ b/drivers/media/video/mt9t111_reg.h
-@@ -0,0 +1,1364 @@
-+/*
-+ * drivers/media/video/mt9t111_reg.h
-+ *
-+ * mt9t111 sensor driver header file
-+ *
-+ * Copyright (C) 2009 Leopard Imaging
-+ *
-+ * This file is licensed under the terms of the GNU General Public License
-+ * version 2. This program is licensed "as is" without any warranty of any
-+ * kind, whether express or implied.
-+ */
-+
-+#ifndef MT9T111_REG_H
-+#define MT9T111_REG_H
-+
-+/* register addr */
-+#define MT9T111_CHIP_ID 		(0x0000)
-+
-+/* register value */
-+#define MT9T111_CHIP_ID_VALUE	(0x2680)
-+
-+typedef struct {
-+	u16 delay_time;
-+	u16 addr;
-+	u16 data;
-+} mt9t111_regs;
-+
-+mt9t111_regs patch_rev6[] ={
-+	{0, 0x0982, 0x0},
-+	{0, 0x098A, 0xCE7},
-+	{0, 0x0990, 0x3C3C},
-+	{0, 0x0992, 0x3C3C},
-+	{0, 0x0994, 0x3C5F},
-+	{0, 0x0996, 0x4F30},
-+	{0, 0x0998, 0xED08},
-+	{0, 0x099a, 0xBD61},
-+	{0, 0x099c, 0xD5CE},
-+	{0, 0x099e, 0x4CD},
-+	{0, 0x098A, 0xCF7},
-+	{0, 0x0990, 0x1F17},
-+	{0, 0x0992, 0x211},
-+	{0, 0x0994, 0xCC33},
-+	{0, 0x0996, 0x2E30},
-+	{0, 0x0998, 0xED02},
-+	{0, 0x099a, 0xCCFF},
-+	{0, 0x099c, 0xFDED},
-+	{0, 0x099e, 0xCC},
-+	{0, 0x098A, 0xD07},
-+	{0, 0x0990, 0x2},
-+	{0, 0x0992, 0xBD70},
-+	{0, 0x0994, 0x6D18},
-+	{0, 0x0996, 0xDE1F},
-+	{0, 0x0998, 0x181F},
-+	{0, 0x099a, 0x8E01},
-+	{0, 0x099c, 0x10CC},
-+	{0, 0x099e, 0x3C52},
-+	{0, 0x098A, 0xD17},
-+	{0, 0x0990, 0x30ED},
-+	{0, 0x0992, 0x18},
-+	{0, 0x0994, 0xECA0},
-+	{0, 0x0996, 0xC4FD},
-+	{0, 0x0998, 0xBD70},
-+	{0, 0x099a, 0x2120},
-+	{0, 0x099c, 0x1ECC},
-+	{0, 0x099e, 0x3C52},
-+	{0, 0x098A, 0xD27},
-+	{0, 0x0990, 0x30ED},
-+	{0, 0x0992, 0xDE},
-+	{0, 0x0994, 0x1FEC},
-+	{0, 0x0996, 0xA0BD},
-+	{0, 0x0998, 0x7021},
-+	{0, 0x099a, 0xCC3C},
-+	{0, 0x099c, 0x5230},
-+	{0, 0x099e, 0xED02},
-+	{0, 0x098A, 0xD37},
-+	{0, 0x0990, 0xCCFF},
-+	{0, 0x0992, 0xFCED},
-+	{0, 0x0994, 0xCC},
-+	{0, 0x0996, 0x2},
-+	{0, 0x0998, 0xBD70},
-+	{0, 0x099a, 0x6DFC},
-+	{0, 0x099c, 0x4E1},
-+	{0, 0x099e, 0x1A83},
-+	{0, 0x098A, 0xD47},
-+	{0, 0x0990, 0x1},
-+	{0, 0x0992, 0x2720},
-+	{0, 0x0994, 0x1A83},
-+	{0, 0x0996, 0x4},
-+	{0, 0x0998, 0x271E},
-+	{0, 0x099a, 0x1A83},
-+	{0, 0x099c, 0x8},
-+	{0, 0x099e, 0x271C},
-+	{0, 0x098A, 0xD57},
-+	{0, 0x0990, 0x1A83},
-+	{0, 0x0992, 0x10},
-+	{0, 0x0994, 0x271A},
-+	{0, 0x0996, 0x1A83},
-+	{0, 0x0998, 0x20},
-+	{0, 0x099a, 0x2718},
-+	{0, 0x099c, 0x1A83},
-+	{0, 0x099e, 0x40},
-+	{0, 0x098A, 0xD67},
-+	{0, 0x0990, 0x2716},
-+	{0, 0x0992, 0x2019},
-+	{0, 0x0994, 0xC61E},
-+	{0, 0x0996, 0x2012},
-+	{0, 0x0998, 0xC622},
-+	{0, 0x099a, 0x200E},
-+	{0, 0x099c, 0xC621},
-+	{0, 0x099e, 0x200A},
-+	{0, 0x098A, 0xD77},
-+	{0, 0x0990, 0xC620},
-+	{0, 0x0992, 0x2006},
-+	{0, 0x0994, 0xC62A},
-+	{0, 0x0996, 0x2002},
-+	{0, 0x0998, 0xC62B},
-+	{0, 0x099a, 0x30ED},
-+	{0, 0x099c, 0x8CC},
-+	{0, 0x099e, 0x3400},
-+	{0, 0x098A, 0xD87},
-+	{0, 0x0990, 0x30ED},
-+	{0, 0x0992, 0x34},
-+	{0, 0x0994, 0xBD6F},
-+	{0, 0x0996, 0xD184},
-+	{0, 0x0998, 0x330},
-+	{0, 0x099a, 0xED07},
-+	{0, 0x099c, 0xA60A},
-+	{0, 0x099e, 0x4848},
-+	{0, 0x098A, 0xD97},
-+	{0, 0x0990, 0x5FED},
-+	{0, 0x0992, 0x5EA},
-+	{0, 0x0994, 0x8AA},
-+	{0, 0x0996, 0x731},
-+	{0, 0x0998, 0xBD70},
-+	{0, 0x099a, 0x2130},
-+	{0, 0x099c, 0xC60A},
-+	{0, 0x099e, 0x3A35},
-+	{0, 0x098A, 0xDA7},
-+	{0, 0x0990, 0x3937},
-+	{0, 0x0992, 0x3C3C},
-+	{0, 0x0994, 0x3C34},
-+	{0, 0x0996, 0xDE2F},
-+	{0, 0x0998, 0xEE0E},
-+	{0, 0x099a, 0xAD00},
-+	{0, 0x099c, 0x7D13},
-+	{0, 0x099e, 0xEF27},
-+	{0, 0x098A, 0xDB7},
-+	{0, 0x0990, 0x7CCE},
-+	{0, 0x0992, 0x13E0},
-+	{0, 0x0994, 0x1E05},
-+	{0, 0x0996, 0x1060},
-+	{0, 0x0998, 0xE60E},
-+	{0, 0x099a, 0x4FC3},
-+	{0, 0x099c, 0x13F0},
-+	{0, 0x099e, 0x8FE6},
-+	{0, 0x098A, 0xDC7},
-+	{0, 0x0990, 0x30},
-+	{0, 0x0992, 0xE107},
-+	{0, 0x0994, 0x2216},
-+	{0, 0x0996, 0xF613},
-+	{0, 0x0998, 0xEE4F},
-+	{0, 0x099a, 0xC313},
-+	{0, 0x099c, 0xF38F},
-+	{0, 0x099e, 0xE600},
-+	{0, 0x098A, 0xDD7},
-+	{0, 0x0990, 0x30E1},
-+	{0, 0x0992, 0x725},
-+	{0, 0x0994, 0x7F6},
-+	{0, 0x0996, 0x13EE},
-+	{0, 0x0998, 0xC103},
-+	{0, 0x099a, 0x253C},
-+	{0, 0x099c, 0x7F13},
-+	{0, 0x099e, 0xEEF6},
-+	{0, 0x098A, 0xDE7},
-+	{0, 0x0990, 0x13EF},
-+	{0, 0x0992, 0xE706},
-+	{0, 0x0994, 0xCC13},
-+	{0, 0x0996, 0xF0ED},
-+	{0, 0x0998, 0x4CC},
-+	{0, 0x099a, 0x13F3},
-+	{0, 0x099c, 0x200F},
-+	{0, 0x099e, 0x7C13},
-+	{0, 0x098A, 0xDF7},
-+	{0, 0x0990, 0xEEEC},
-+	{0, 0x0992, 0x4C3},
-+	{0, 0x0994, 0x1},
-+	{0, 0x0996, 0xED04},
-+	{0, 0x0998, 0xEC02},
-+	{0, 0x099a, 0xC300},
-+	{0, 0x099c, 0x1ED},
-+	{0, 0x099e, 0x2F6},
-+	{0, 0x098A, 0xE07},
-+	{0, 0x0990, 0x13EE},
-+	{0, 0x0992, 0xE106},
-+	{0, 0x0994, 0x2412},
-+	{0, 0x0996, 0xEE04},
-+	{0, 0x0998, 0xE600},
-+	{0, 0x099a, 0x30E1},
-+	{0, 0x099c, 0x722},
-+	{0, 0x099e, 0xDFEE},
-+	{0, 0x098A, 0xE17},
-+	{0, 0x0990, 0x2E6},
-+	{0, 0x0992, 0x30},
-+	{0, 0x0994, 0xE107},
-+	{0, 0x0996, 0x25D6},
-+	{0, 0x0998, 0xDE49},
-+	{0, 0x099a, 0xEE08},
-+	{0, 0x099c, 0xAD00},
-+	{0, 0x099e, 0xCC13},
-+	{0, 0x098A, 0xE27},
-+	{0, 0x0990, 0xF630},
-+	{0, 0x0992, 0xED00},
-+	{0, 0x0994, 0xDE2F},
-+	{0, 0x0996, 0xEE10},
-+	{0, 0x0998, 0xCC13},
-+	{0, 0x099a, 0xFAAD},
-+	{0, 0x099c, 0x38},
-+	{0, 0x099e, 0x3838},
-+	{0, 0x098A, 0xE37},
-+	{0, 0x0990, 0x3839},
-+	{0, 0x098A, 0x1000},
-+	{0, 0x0990, 0xCC10},
-+	{0, 0x0992, 0x9BD},
-+	{0, 0x0994, 0x4224},
-+	{0, 0x0996, 0x7E10},
-+	{0, 0x0998, 0x9C6},
-+	{0, 0x099a, 0x1F7},
-+	{0, 0x099c, 0x18A},
-+	{0, 0x099e, 0xC606},
-+	{0, 0x098A, 0x1010},
-+	{0, 0x0990, 0xF701},
-+	{0, 0x0992, 0x8BDE},
-+	{0, 0x0994, 0x3F18},
-+	{0, 0x0996, 0xCE0B},
-+	{0, 0x0998, 0xF1CC},
-+	{0, 0x099a, 0x11},
-+	{0, 0x099c, 0xBDD7},
-+	{0, 0x099e, 0xCC},
-+	{0, 0x098A, 0x1020},
-+	{0, 0x0990, 0xBF1},
-+	{0, 0x0992, 0xDD3F},
-+	{0, 0x0994, 0xDE35},
-+	{0, 0x0996, 0x18CE},
-+	{0, 0x0998, 0xC03},
-+	{0, 0x099a, 0xCC00},
-+	{0, 0x099c, 0x3FBD},
-+	{0, 0x099e, 0xD700},
-+	{0, 0x098A, 0x1030},
-+	{0, 0x0990, 0xCC0C},
-+	{0, 0x0992, 0x3DD},
-+	{0, 0x0994, 0x35DE},
-+	{0, 0x0996, 0x4718},
-+	{0, 0x0998, 0xCE0C},
-+	{0, 0x099a, 0x43CC},
-+	{0, 0x099c, 0x15},
-+	{0, 0x099e, 0xBDD7},
-+	{0, 0x098A, 0x1040},
-+	{0, 0x0990, 0xCC},
-+	{0, 0x0992, 0xC43},
-+	{0, 0x0994, 0xDD47},
-+	{0, 0x0996, 0xFE00},
-+	{0, 0x0998, 0x3318},
-+	{0, 0x099a, 0xCE0C},
-+	{0, 0x099c, 0x59CC},
-+	{0, 0x099e, 0x9},
-+	{0, 0x098A, 0x1050},
-+	{0, 0x0990, 0xBDD7},
-+	{0, 0x0992, 0xCC},
-+	{0, 0x0994, 0xC59},
-+	{0, 0x0996, 0xFD00},
-+	{0, 0x0998, 0x33DE},
-+	{0, 0x099a, 0x4118},
-+	{0, 0x099c, 0xCE0C},
-+	{0, 0x099e, 0x63CC},
-+	{0, 0x098A, 0x1060},
-+	{0, 0x0990, 0xD},
-+	{0, 0x0992, 0xBDD7},
-+	{0, 0x0994, 0xCC},
-+	{0, 0x0996, 0xC63},
-+	{0, 0x0998, 0xDD41},
-+	{0, 0x099a, 0xFE00},
-+	{0, 0x099c, 0x3118},
-+	{0, 0x099e, 0xCE0C},
-+	{0, 0x098A, 0x1070},
-+	{0, 0x0990, 0x71CC},
-+	{0, 0x0992, 0x29},
-+	{0, 0x0994, 0xBDD7},
-+	{0, 0x0996, 0xCC},
-+	{0, 0x0998, 0xC71},
-+	{0, 0x099a, 0xFD00},
-+	{0, 0x099c, 0x31DE},
-+	{0, 0x099e, 0x3918},
-+	{0, 0x098A, 0x1080},
-+	{0, 0x0990, 0xCE0C},
-+	{0, 0x0992, 0x9BCC},
-+	{0, 0x0994, 0x23},
-+	{0, 0x0996, 0xBDD7},
-+	{0, 0x0998, 0xCC},
-+	{0, 0x099a, 0xC9B},
-+	{0, 0x099c, 0xDD39},
-+	{0, 0x099e, 0xDE49},
-+	{0, 0x098A, 0x1090},
-+	{0, 0x0990, 0x18CE},
-+	{0, 0x0992, 0xCBF},
-+	{0, 0x0994, 0xCC00},
-+	{0, 0x0996, 0xDBD},
-+	{0, 0x0998, 0xD700},
-+	{0, 0x099a, 0xCC0C},
-+	{0, 0x099c, 0xBFDD},
-+	{0, 0x099e, 0x49CC},
-+	{0, 0x098A, 0x10A0},
-+	{0, 0x0990, 0x1162},
-+	{0, 0x0992, 0xFD0B},
-+	{0, 0x0994, 0xFDCC},
-+	{0, 0x0996, 0xCE7},
-+	{0, 0x0998, 0xFD0C},
-+	{0, 0x099a, 0x1FCC},
-+	{0, 0x099c, 0x1245},
-+	{0, 0x099e, 0xFD0C},
-+	{0, 0x098A, 0x10B0},
-+	{0, 0x0990, 0x51CC},
-+	{0, 0x0992, 0x110B},
-+	{0, 0x0994, 0xFD0C},
-+	{0, 0x0996, 0x5BCC},
-+	{0, 0x0998, 0x1108},
-+	{0, 0x099a, 0xFD0C},
-+	{0, 0x099c, 0x65CC},
-+	{0, 0x099e, 0x10D0},
-+	{0, 0x098A, 0x10C0},
-+	{0, 0x0990, 0xFD0C},
-+	{0, 0x0992, 0x7BCC},
-+	{0, 0x0994, 0x12DE},
-+	{0, 0x0996, 0xFD0C},
-+	{0, 0x0998, 0xA7CC},
-+	{0, 0x099a, 0xDA8},
-+	{0, 0x099c, 0xFD0C},
-+	{0, 0x099e, 0xCB39},
-+	{0, 0x098A, 0x10D0},
-+	{0, 0x0990, 0x37DE},
-+	{0, 0x0992, 0x1DEC},
-+	{0, 0x0994, 0xC5F},
-+	{0, 0x0996, 0x8402},
-+	{0, 0x0998, 0x4416},
-+	{0, 0x099a, 0x4FF7},
-+	{0, 0x099c, 0xCCD},
-+	{0, 0x099e, 0xE60B},
-+	{0, 0x098A, 0x10E0},
-+	{0, 0x0990, 0xC407},
-+	{0, 0x0992, 0xF70C},
-+	{0, 0x0994, 0xCE7F},
-+	{0, 0x0996, 0x30C4},
-+	{0, 0x0998, 0xEC25},
-+	{0, 0x099a, 0xFD30},
-+	{0, 0x099c, 0xC5FC},
-+	{0, 0x099e, 0x6D6},
-+	{0, 0x098A, 0x10F0},
-+	{0, 0x0990, 0xFD30},
-+	{0, 0x0992, 0xC701},
-+	{0, 0x0994, 0xFC30},
-+	{0, 0x0996, 0xC0FD},
-+	{0, 0x0998, 0xBED},
-+	{0, 0x099a, 0xFC30},
-+	{0, 0x099c, 0xC2FD},
-+	{0, 0x099e, 0xBEF},
-+	{0, 0x098A, 0x1100},
-+	{0, 0x0990, 0x30E6},
-+	{0, 0x0992, 0xBD},
-+	{0, 0x0994, 0x5203},
-+	{0, 0x0996, 0x3139},
-+	{0, 0x0998, 0x7E9E},
-+	{0, 0x099a, 0x143C},
-+	{0, 0x099c, 0x3C3C},
-+	{0, 0x099e, 0x2101},
-+	{0, 0x098A, 0x1110},
-+	{0, 0x0990, 0xCC00},
-+	{0, 0x0992, 0x18BD},
-+	{0, 0x0994, 0x6FD1},
-+	{0, 0x0996, 0xC504},
-+	{0, 0x0998, 0x26F5},
-+	{0, 0x099a, 0xDC25},
-+	{0, 0x099c, 0x30ED},
-+	{0, 0x099e, 0x420},
-+	{0, 0x098A, 0x1120},
-+	{0, 0x0990, 0x12EE},
-+	{0, 0x0992, 0x43C},
-+	{0, 0x0994, 0x1838},
-+	{0, 0x0996, 0xE621},
-+	{0, 0x0998, 0x18E7},
-+	{0, 0x099a, 0xBE30},
-+	{0, 0x099c, 0xEE04},
-+	{0, 0x099e, 0xEC1D},
-+	{0, 0x098A, 0x1130},
-+	{0, 0x0990, 0x30ED},
-+	{0, 0x0992, 0x4EC},
-+	{0, 0x0994, 0x426},
-+	{0, 0x0996, 0xEACC},
-+	{0, 0x0998, 0x1A},
-+	{0, 0x099a, 0xED02},
-+	{0, 0x099c, 0xCCFB},
-+	{0, 0x099e, 0xFFED},
-+	{0, 0x098A, 0x1140},
-+	{0, 0x0990, 0xCC},
-+	{0, 0x0992, 0x400},
-+	{0, 0x0994, 0xBD70},
-+	{0, 0x0996, 0x6DCC},
-+	{0, 0x0998, 0x1A},
-+	{0, 0x099a, 0x30ED},
-+	{0, 0x099c, 0x2CC},
-+	{0, 0x099e, 0xFBFF},
-+	{0, 0x098A, 0x1150},
-+	{0, 0x0990, 0xED00},
-+	{0, 0x0992, 0x5F4F},
-+	{0, 0x0994, 0xBD70},
-+	{0, 0x0996, 0x6D5F},
-+	{0, 0x0998, 0xBD5B},
-+	{0, 0x099a, 0x17BD},
-+	{0, 0x099c, 0x558B},
-+	{0, 0x099e, 0x3838},
-+	{0, 0x098A, 0x1160},
-+	{0, 0x0990, 0x3839},
-+	{0, 0x0992, 0x3C3C},
-+	{0, 0x0994, 0xC640},
-+	{0, 0x0996, 0xF730},
-+	{0, 0x0998, 0xC4FC},
-+	{0, 0x099a, 0xBED},
-+	{0, 0x099c, 0xFD30},
-+	{0, 0x099e, 0xC0FC},
-+	{0, 0x098A, 0x1170},
-+	{0, 0x0990, 0xBEF},
-+	{0, 0x0992, 0xFD30},
-+	{0, 0x0994, 0xC2DE},
-+	{0, 0x0996, 0x1DEC},
-+	{0, 0x0998, 0x25FD},
-+	{0, 0x099a, 0x30C5},
-+	{0, 0x099c, 0x101},
-+	{0, 0x099e, 0x1FC},
-+	{0, 0x098A, 0x1180},
-+	{0, 0x0990, 0x30C2},
-+	{0, 0x0992, 0xFD06},
-+	{0, 0x0994, 0xD6EC},
-+	{0, 0x0996, 0xC5F},
-+	{0, 0x0998, 0x8402},
-+	{0, 0x099a, 0x4416},
-+	{0, 0x099c, 0x4F30},
-+	{0, 0x099e, 0xE703},
-+	{0, 0x098A, 0x1190},
-+	{0, 0x0990, 0xF10C},
-+	{0, 0x0992, 0xCD27},
-+	{0, 0x0994, 0x15F1},
-+	{0, 0x0996, 0xCCD},
-+	{0, 0x0998, 0x2309},
-+	{0, 0x099a, 0xFC06},
-+	{0, 0x099c, 0xD604},
-+	{0, 0x099e, 0xFD06},
-+	{0, 0x098A, 0x11A0},
-+	{0, 0x0990, 0xD620},
-+	{0, 0x0992, 0x7FC},
-+	{0, 0x0994, 0x6D6},
-+	{0, 0x0996, 0x5FD},
-+	{0, 0x0998, 0x6D6},
-+	{0, 0x099a, 0xDE1D},
-+	{0, 0x099c, 0xE60B},
-+	{0, 0x099e, 0xC407},
-+	{0, 0x098A, 0x11B0},
-+	{0, 0x0990, 0x30E7},
-+	{0, 0x0992, 0x2F1},
-+	{0, 0x0994, 0xCCE},
-+	{0, 0x0996, 0x272C},
-+	{0, 0x0998, 0x7D0C},
-+	{0, 0x099a, 0xCE27},
-+	{0, 0x099c, 0x275D},
-+	{0, 0x099e, 0x2724},
-+	{0, 0x098A, 0x11C0},
-+	{0, 0x0990, 0x7F30},
-+	{0, 0x0992, 0xC4FC},
-+	{0, 0x0994, 0x6D6},
-+	{0, 0x0996, 0xFD30},
-+	{0, 0x0998, 0xC5F6},
-+	{0, 0x099a, 0xCCE},
-+	{0, 0x099c, 0x4FFD},
-+	{0, 0x099e, 0x30C7},
-+	{0, 0x098A, 0x11D0},
-+	{0, 0x0990, 0xC640},
-+	{0, 0x0992, 0xF730},
-+	{0, 0x0994, 0xC4E6},
-+	{0, 0x0996, 0x24F},
-+	{0, 0x0998, 0xFD30},
-+	{0, 0x099a, 0xC501},
-+	{0, 0x099c, 0x101},
-+	{0, 0x099e, 0xFC30},
-+	{0, 0x098A, 0x11E0},
-+	{0, 0x0990, 0xC2FD},
-+	{0, 0x0992, 0x6D6},
-+	{0, 0x0994, 0x7D06},
-+	{0, 0x0996, 0xCB27},
-+	{0, 0x0998, 0x2EC6},
-+	{0, 0x099a, 0x40F7},
-+	{0, 0x099c, 0x30C4},
-+	{0, 0x099e, 0xFC06},
-+	{0, 0x098A, 0x11F0},
-+	{0, 0x0990, 0xC104},
-+	{0, 0x0992, 0xF306},
-+	{0, 0x0994, 0xD6ED},
-+	{0, 0x0996, 0x5F},
-+	{0, 0x0998, 0x6D00},
-+	{0, 0x099a, 0x2A01},
-+	{0, 0x099c, 0x5317},
-+	{0, 0x099e, 0xFD30},
-+	{0, 0x098A, 0x1200},
-+	{0, 0x0990, 0xC0EC},
-+	{0, 0x0992, 0xFD},
-+	{0, 0x0994, 0x30C2},
-+	{0, 0x0996, 0xFC06},
-+	{0, 0x0998, 0xC1FD},
-+	{0, 0x099a, 0x30C5},
-+	{0, 0x099c, 0x101},
-+	{0, 0x099e, 0x1FC},
-+	{0, 0x098A, 0x1210},
-+	{0, 0x0990, 0x30C2},
-+	{0, 0x0992, 0xFD06},
-+	{0, 0x0994, 0xC720},
-+	{0, 0x0996, 0x227F},
-+	{0, 0x0998, 0x30C4},
-+	{0, 0x099a, 0xDE1D},
-+	{0, 0x099c, 0xEC25},
-+	{0, 0x099e, 0xFD30},
-+	{0, 0x098A, 0x1220},
-+	{0, 0x0990, 0xC5FC},
-+	{0, 0x0992, 0x6D6},
-+	{0, 0x0994, 0xFD30},
-+	{0, 0x0996, 0xC701},
-+	{0, 0x0998, 0xFC30},
-+	{0, 0x099a, 0xC0FD},
-+	{0, 0x099c, 0x6D0},
-+	{0, 0x099e, 0xFC30},
-+	{0, 0x098A, 0x1230},
-+	{0, 0x0990, 0xC2FD},
-+	{0, 0x0992, 0x6D2},
-+	{0, 0x0994, 0xEC25},
-+	{0, 0x0996, 0xFD06},
-+	{0, 0x0998, 0xC3BD},
-+	{0, 0x099a, 0x953C},
-+	{0, 0x099c, 0xDE3F},
-+	{0, 0x099e, 0xEE10},
-+	{0, 0x098A, 0x1240},
-+	{0, 0x0990, 0xAD00},
-+	{0, 0x0992, 0x3838},
-+	{0, 0x0994, 0x3930},
-+	{0, 0x0996, 0x8FC3},
-+	{0, 0x0998, 0xFFE9},
-+	{0, 0x099a, 0x8F35},
-+	{0, 0x099c, 0xBDAD},
-+	{0, 0x099e, 0x1530},
-+	{0, 0x098A, 0x1250},
-+	{0, 0x0990, 0x6F16},
-+	{0, 0x0992, 0x18DE},
-+	{0, 0x0994, 0x1918},
-+	{0, 0x0996, 0x8FC3},
-+	{0, 0x0998, 0x14B},
-+	{0, 0x099a, 0x188F},
-+	{0, 0x099c, 0x18EC},
-+	{0, 0x099e, 0xFD},
-+	{0, 0x098A, 0x1260},
-+	{0, 0x0990, 0x50E},
-+	{0, 0x0992, 0x18EC},
-+	{0, 0x0994, 0x2FD},
-+	{0, 0x0996, 0x510},
-+	{0, 0x0998, 0xE616},
-+	{0, 0x099a, 0x4FED},
-+	{0, 0x099c, 0x418},
-+	{0, 0x099e, 0x8FC3},
-+	{0, 0x098A, 0x1270},
-+	{0, 0x0990, 0xFFCB},
-+	{0, 0x0992, 0xE304},
-+	{0, 0x0994, 0x8FE6},
-+	{0, 0x0996, 0xF7},
-+	{0, 0x0998, 0x514},
-+	{0, 0x099a, 0x18DE},
-+	{0, 0x099c, 0x1930},
-+	{0, 0x099e, 0xE616},
-+	{0, 0x098A, 0x1280},
-+	{0, 0x0990, 0x4FED},
-+	{0, 0x0992, 0x418},
-+	{0, 0x0994, 0x8FC3},
-+	{0, 0x0996, 0x119},
-+	{0, 0x0998, 0xE304},
-+	{0, 0x099a, 0x8FE6},
-+	{0, 0x099c, 0xF7},
-+	{0, 0x099e, 0x515},
-+	{0, 0x098A, 0x1290},
-+	{0, 0x0990, 0xFC05},
-+	{0, 0x0992, 0x5BFD},
-+	{0, 0x0994, 0x512},
-+	{0, 0x0996, 0xDE37},
-+	{0, 0x0998, 0xEE08},
-+	{0, 0x099a, 0xAD00},
-+	{0, 0x099c, 0x30E6},
-+	{0, 0x099e, 0x164F},
-+	{0, 0x098A, 0x12A0},
-+	{0, 0x0990, 0x5ED},
-+	{0, 0x0992, 0x48F},
-+	{0, 0x0994, 0xC300},
-+	{0, 0x0996, 0x630},
-+	{0, 0x0998, 0xE304},
-+	{0, 0x099a, 0x8FF6},
-+	{0, 0x099c, 0x516},
-+	{0, 0x099e, 0x4FED},
-+	{0, 0x098A, 0x12B0},
-+	{0, 0x0990, 0x30},
-+	{0, 0x0992, 0x6C16},
-+	{0, 0x0994, 0xE616},
-+	{0, 0x0996, 0xC103},
-+	{0, 0x0998, 0x2598},
-+	{0, 0x099a, 0xCC32},
-+	{0, 0x099c, 0x8EED},
-+	{0, 0x099e, 0xEC},
-+	{0, 0x098A, 0x12C0},
-+	{0, 0x0990, 0x6BD},
-+	{0, 0x0992, 0x7021},
-+	{0, 0x0994, 0xCC32},
-+	{0, 0x0996, 0x6C30},
-+	{0, 0x0998, 0xED02},
-+	{0, 0x099a, 0xCCF8},
-+	{0, 0x099c, 0xED},
-+	{0, 0x099e, 0xA6},
-+	{0, 0x098A, 0x12D0},
-+	{0, 0x0990, 0x9E3},
-+	{0, 0x0992, 0xA84},
-+	{0, 0x0994, 0x7BD},
-+	{0, 0x0996, 0x706D},
-+	{0, 0x0998, 0x30C6},
-+	{0, 0x099a, 0x173A},
-+	{0, 0x099c, 0x3539},
-+	{0, 0x099e, 0x3CBD},
-+	{0, 0x098A, 0x12E0},
-+	{0, 0x0990, 0x776D},
-+	{0, 0x0992, 0xCC32},
-+	{0, 0x0994, 0x5C30},
-+	{0, 0x0996, 0xED00},
-+	{0, 0x0998, 0xFC13},
-+	{0, 0x099a, 0x8683},
-+	{0, 0x099c, 0x1},
-+	{0, 0x099e, 0xBD70},
-+	{0, 0x098A, 0x12F0},
-+	{0, 0x0990, 0x21CC},
-+	{0, 0x0992, 0x325E},
-+	{0, 0x0994, 0x30ED},
-+	{0, 0x0996, 0xFC},
-+	{0, 0x0998, 0x1388},
-+	{0, 0x099a, 0x8300},
-+	{0, 0x099c, 0x1BD},
-+	{0, 0x099e, 0x7021},
-+	{0, 0x098A, 0x1300},
-+	{0, 0x0990, 0x3839},
-+	{0, 0x098E, 0x0010},
-+	{0, 0x0990, 0x1000},
-+	{0, 0x098E, 0x0003},
-+	{100, 0x0990, 0x0004}
-+};
-+
-+mt9t111_regs def_regs1[] ={
-+	{0, 0x001A, 0x0218},
-+	{0, 0x001E, 0x0777},
-+	{0, 0x3084, 0x2409},
-+	{0, 0x3092, 0x0A49},
-+	{0, 0x3094, 0x4949},
-+	{0, 0x3096, 0x4950},
-+	{0, 0x0018, 0x402D},
-+	{100, 0x0018, 0x402C},
-+	{0, 0x098E, 0x6800},
-+	{0, 0x0990, 0x0280},
-+	{0, 0x098E, 0x6802},
-+	{0, 0x0990, 0x01E0},
-+	{0, 0x098E, 0xE88E},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0x68A0},
-+	{0, 0x0990, 0x082D},
-+	{0, 0x098E, 0x4802},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0x4804},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0x4806},
-+	{0, 0x0990, 0x060D},
-+	{0, 0x098E, 0x4808},
-+	{0, 0x0990, 0x080D},
-+	{0, 0x098E, 0x480A},
-+	{0, 0x0990, 0x0111},
-+	{0, 0x098E, 0x480C},
-+	{0, 0x0990, 0x046C},
-+	{0, 0x098E, 0x480F},
-+	{0, 0x0990, 0x00CC},
-+	{0, 0x098E, 0x4811},
-+	{0, 0x0990, 0x0381},
-+	{0, 0x098E, 0x4813},
-+	{0, 0x0990, 0x024F},
-+	{0, 0x098E, 0x481D},
-+	{0, 0x0990, 0x05AE},
-+	{0, 0x098E, 0x481F},
-+	{0, 0x0990, 0x05D0},
-+	{0, 0x098E, 0x4825},
-+	{0, 0x0990, 0x07AC},
-+	{0, 0x098E, 0x6C00},
-+	{0, 0x0990, 0x0800},
-+	{0, 0x098E, 0x6C02},
-+	{0, 0x0990, 0x0600},
-+	{0, 0x098E, 0xEC8E},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0x6CA0},
-+	{0, 0x0990, 0x082D},
-+	{0, 0x098E, 0x484A},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0x484C},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0x484E},
-+	{0, 0x0990, 0x060D},
-+	{0, 0x098E, 0x4850},
-+	{0, 0x0990, 0x080D},
-+	{0, 0x098E, 0x4852},
-+	{0, 0x0990, 0x0111},
-+	{0, 0x098E, 0x4854},
-+	{0, 0x0990, 0x146C},
-+	{0, 0x098E, 0x4857},
-+	{0, 0x0990, 0x00CC},
-+	{0, 0x098E, 0x4859},
-+	{0, 0x0990, 0x0381},
-+	{0, 0x098E, 0x485B},
-+	{0, 0x0990, 0x024F},
-+	{0, 0x098E, 0x4865},
-+	{0, 0x0990, 0x05AE},
-+	{0, 0x098E, 0x4867},
-+	{0, 0x0990, 0x05D0},
-+	{0, 0x098E, 0x486D},
-+	{0, 0x0990, 0x07AC},
-+	{0, 0x098E, 0xC8A5},
-+	{0, 0x0990, 0x001D},
-+	{0, 0x098E, 0xC8A6},
-+	{0, 0x0990, 0x0020},
-+	{0, 0x098E, 0xC8A7},
-+	{0, 0x0990, 0x0023},
-+	{0, 0x098E, 0xC8A8},
-+	{0, 0x0990, 0x0026},
-+	{0, 0x098E, 0xC844},
-+	{0, 0x0990, 0x0091},
-+	{0, 0x098E, 0xC92F},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xC845},
-+	{0, 0x0990, 0x0079},
-+	{0, 0x098E, 0xC92D},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xC88C},
-+	{0, 0x0990, 0x0091},
-+	{0, 0x098E, 0xC930},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xC88D},
-+	{0, 0x0990, 0x0079},
-+	{0, 0x098E, 0xC92E},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xA002},
-+	{0, 0x0990, 0x0010},
-+	{0, 0x098E, 0xA009},
-+	{0, 0x0990, 0x0002},
-+	{0, 0x098E, 0xA00A},
-+	{0, 0x0990, 0x0003},
-+	{0, 0x098E, 0xA00C},
-+	{0, 0x0990, 0x000A},
-+	{0, 0x098E, 0x4846},
-+	{0, 0x0990, 0x0014},
-+	{0, 0x098E, 0x68AA},
-+	{0, 0x0990, 0x0278},
-+	{0, 0x098E, 0x488E},
-+	{0, 0x0990, 0x0014},
-+	{0, 0x098E, 0x6CAA},
-+	{0, 0x0990, 0x0218},
-+	{0, 0x098E, 0x8400},
-+	{0, 0x0990, 0x0006},
-+	{0, 0x098E, 0x8400},
-+	{0, 0x0990, 0x0005},
-+	{0, 0x3C20, 0x0001},
-+	{0, 0x364A, 0x7D2F},
-+	{0, 0x364C, 0x79EB},
-+	{0, 0x364E, 0x18D2},
-+	{0, 0x3650, 0x9F8F},
-+	{0, 0x3652, 0xA7D2},
-+	{0, 0x368A, 0x460C},
-+	{0, 0x368C, 0x14F0},
-+	{0, 0x368E, 0x946F},
-+	{0, 0x3690, 0xC471},
-+	{0, 0x3692, 0x04B1},
-+	{0, 0x36CA, 0x0433},
-+	{0, 0x36CC, 0x680D},
-+	{0, 0x36CE, 0xEEF3},
-+	{0, 0x36D0, 0x4850},
-+	{0, 0x36D2, 0xF233},
-+	{0, 0x370A, 0xB2AF},
-+	{0, 0x370C, 0x2CF0},
-+	{0, 0x370E, 0x3F10},
-+	{0, 0x3710, 0xC673},
-+	{0, 0x3712, 0xA972},
-+	{0, 0x374A, 0x0590},
-+	{0, 0x374C, 0xAFB3},
-+	{0, 0x374E, 0x93D7},
-+	{0, 0x3750, 0x8D12},
-+	{0, 0x3752, 0x2539},
-+	{0, 0x3640, 0x0350},
-+	{0, 0x3642, 0x322C},
-+	{0, 0x3644, 0x77D1},
-+	{0, 0x3646, 0xA26F},
-+	{0, 0x3648, 0xC872},
-+	{0, 0x3680, 0x0C4C},
-+	{0, 0x3682, 0x9510},
-+	{0, 0x3684, 0x110E},
-+	{0, 0x3686, 0x4331},
-+	{0, 0x3688, 0xC1CF},
-+	{0, 0x36C0, 0x6152},
-+	{0, 0x36C2, 0x038E},
-+	{0, 0x36C4, 0x9AF4},
-+	{0, 0x36C6, 0xE12F},
-+	{0, 0x36C8, 0x09F3},
-+	{0, 0x3700, 0xC5AF},
-+	{0, 0x3702, 0xCA90},
-+	{0, 0x3704, 0x5D0F},
-+	{0, 0x3706, 0x3293},
-+	{0, 0x3708, 0x2B92},
-+	{0, 0x3740, 0xC590},
-+	{0, 0x3742, 0x8133},
-+	{0, 0x3744, 0xE0F6},
-+	{0, 0x3746, 0x0254},
-+	{0, 0x3748, 0x10B9},
-+	{0, 0x3654, 0x7F8F},
-+	{0, 0x3656, 0x6F6C},
-+	{0, 0x3658, 0x5971},
-+	{0, 0x365A, 0x9A0F},
-+	{0, 0x365C, 0xA1B2},
-+	{0, 0x3694, 0xB00C},
-+	{0, 0x3696, 0xEBCF},
-+	{0, 0x3698, 0x06AD},
-+	{0, 0x369A, 0x4D31},
-+	{0, 0x369C, 0x2A4E},
-+	{0, 0x36D4, 0x4752},
-+	{0, 0x36D6, 0x724D},
-+	{0, 0x36D8, 0xAD34},
-+	{0, 0x36DA, 0x1350},
-+	{0, 0x36DC, 0x4E94},
-+	{0, 0x3714, 0xA06E},
-+	{0, 0x3716, 0x9152},
-+	{0, 0x3718, 0x1F53},
-+	{0, 0x371A, 0x3933},
-+	{0, 0x371C, 0xBA94},
-+	{0, 0x3754, 0x1233},
-+	{0, 0x3756, 0xA032},
-+	{0, 0x3758, 0xE936},
-+	{0, 0x375A, 0xBE34},
-+	{0, 0x375C, 0x02D9},
-+	{0, 0x365E, 0x7DEF},
-+	{0, 0x3660, 0x434B},
-+	{0, 0x3662, 0x69F1},
-+	{0, 0x3664, 0x8A0F},
-+	{0, 0x3666, 0xBDB2},
-+	{0, 0x369E, 0x290D},
-+	{0, 0x36A0, 0x42CF},
-+	{0, 0x36A2, 0xDC6D},
-+	{0, 0x36A4, 0x91B1},
-+	{0, 0x36A6, 0x9DE9},
-+	{0, 0x36DE, 0x70B2},
-+	{0, 0x36E0, 0x02AC},
-+	{0, 0x36E2, 0x9714},
-+	{0, 0x36E4, 0xF3CF},
-+	{0, 0x36E6, 0x6BD1},
-+	{0, 0x371E, 0xE42E},
-+	{0, 0x3720, 0x1D32},
-+	{0, 0x3722, 0xCC31},
-+	{0, 0x3724, 0xAE94},
-+	{0, 0x3726, 0x6413},
-+	{0, 0x375E, 0xE290},
-+	{0, 0x3760, 0x8F53},
-+	{0, 0x3762, 0xF936},
-+	{0, 0x3764, 0x4614},
-+	{0, 0x3766, 0x1B59},
-+	{0, 0x3784, 0x0404},
-+	{0, 0x3782, 0x0304},
-+	{0, 0x3210, 0x01B8},
-+	{0, 0x098E, 0xC913},
-+	{0, 0x0990, 0x000A},
-+	{0, 0x098E, 0x686B},
-+	{0, 0x0990, 0x05DC},
-+	{0, 0x098E, 0x686D},
-+	{0, 0x0990, 0x0BB8},
-+	{0, 0x098E, 0x6C6B},
-+	{0, 0x0990, 0x05DC},
-+	{0, 0x098E, 0x6C6D},
-+	{0, 0x0990, 0x0BB8},
-+	{0, 0x098E, 0x3439},
-+	{0, 0x0990, 0x05DC},
-+	{0, 0x098E, 0x343B},
-+	{0, 0x0990, 0x0BB8},
-+	{0, 0x098E, 0x4926},
-+	{0, 0x0990, 0x0001},
-+	{0, 0x098E, 0x4928},
-+	{0, 0x0990, 0x0002},
-+	{0, 0x098E, 0x492A},
-+	{0, 0x0990, 0x0656},
-+	{0, 0x098E, 0x4D26},
-+	{0, 0x0990, 0x0001},
-+	{0, 0x098E, 0x4D28},
-+	{0, 0x0990, 0x0002},
-+	{0, 0x098E, 0x4D2A},
-+	{0, 0x0990, 0x0656},
-+	{0, 0x33F4, 0x040B},
-+	{0, 0x098E, 0xC916},
-+	{0, 0x0990, 0x0014},
-+	{0, 0x098E, 0xC919},
-+	{0, 0x0990, 0x0028},
-+	{0, 0x098E, 0xC917},
-+	{0, 0x0990, 0x0004},
-+	{0, 0x098E, 0xC918},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xC91A},
-+	{0, 0x0990, 0x0001},
-+	{0, 0x098E, 0xC91B},
-+	{0, 0x0990, 0x0009},
-+	{0, 0x326C, 0x0C00},
-+	{0, 0x098E, 0x494B},
-+	{0, 0x0990, 0x0042},
-+	{0, 0x098E, 0x494D},
-+	{0, 0x0990, 0x012C},
-+	{0, 0x098E, 0xC91E},
-+	{0, 0x0990, 0x0012},
-+	{0, 0x098E, 0xC91F},
-+	{0, 0x0990, 0x000A},
-+	{0, 0x098E, 0xC920},
-+	{0, 0x0990, 0x0012},
-+	{0, 0x098E, 0xC921},
-+	{0, 0x0990, 0x000A},
-+	{0, 0x098E, 0xC922},
-+	{0, 0x0990, 0x0026},
-+	{0, 0x098E, 0xC923},
-+	{0, 0x0990, 0x001E},
-+	{0, 0x098E, 0xC924},
-+	{0, 0x0990, 0x0026},
-+	{0, 0x098E, 0xC925},
-+	{0, 0x0990, 0x0026},
-+	{0, 0x098E, 0xBC02},
-+	{0, 0x0990, 0x0003},
-+	{0, 0x098E, 0xBC05},
-+	{0, 0x0990, 0x000E},
-+	{0, 0x098E, 0xC950},
-+	{0, 0x0990, 0x0064},
-+	{0, 0x098E, 0xC94F},
-+	{0, 0x0990, 0x0038},
-+	{0, 0x098E, 0xC952},
-+	{0, 0x0990, 0x0064},
-+	{0, 0x098E, 0xC951},
-+	{0, 0x0990, 0x0051},
-+	{0, 0x098E, 0xC954},
-+	{0, 0x0990, 0x0010},
-+	{0, 0x098E, 0xC953},
-+	{0, 0x0990, 0x0020},
-+	{0, 0x098E, 0xC956},
-+	{0, 0x0990, 0x0010},
-+	{0, 0x098E, 0xC955},
-+	{0, 0x0990, 0x0020},
-+	{0, 0x098E, 0xC958},
-+	{0, 0x0990, 0x0020},
-+	{0, 0x098E, 0xC957},
-+	{0, 0x0990, 0x0014},
-+	{0, 0x098E, 0xC95A},
-+	{0, 0x0990, 0x001D},
-+	{0, 0x098E, 0xC959},
-+	{0, 0x0990, 0x0020},
-+	{0, 0x098E, 0xC95C},
-+	{0, 0x0990, 0x000C},
-+	{0, 0x098E, 0xC95B},
-+	{0, 0x0990, 0x0008},
-+	{0, 0x098E, 0xC95E},
-+	{0, 0x0990, 0x000C},
-+	{0, 0x098E, 0xC95D},
-+	{0, 0x0990, 0x0008},
-+	{0, 0x098E, 0xC95F},
-+	{0, 0x0990, 0x0064},
-+	{0, 0x098E, 0x48DC},
-+	{0, 0x0990, 0x004D},
-+	{0, 0x098E, 0x48DE},
-+	{0, 0x0990, 0x0096},
-+	{0, 0x098E, 0x48E0},
-+	{0, 0x0990, 0x001D},
-+	{0, 0x098E, 0x48E2},
-+	{0, 0x0990, 0x004D},
-+	{0, 0x098E, 0x48E4},
-+	{0, 0x0990, 0x0096},
-+	{0, 0x098E, 0x48E6},
-+	{0, 0x0990, 0x001D},
-+	{0, 0x098E, 0x48E8},
-+	{0, 0x0990, 0x004D},
-+	{0, 0x098E, 0x48EA},
-+	{0, 0x0990, 0x0096},
-+	{0, 0x098E, 0x48EC},
-+	{0, 0x0990, 0x001D},
-+	{0, 0x098E, 0xDC2A},
-+	{0, 0x0990, 0x000B},
-+	{0, 0x098E, 0xDC2B},
-+	{0, 0x0990, 0x0017},
-+	{0, 0x098E, 0xBC0B},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xBC0C},
-+	{0, 0x0990, 0x001B},
-+	{0, 0x098E, 0xBC0D},
-+	{0, 0x0990, 0x002A},
-+	{0, 0x098E, 0xBC0E},
-+	{0, 0x0990, 0x003E},
-+	{0, 0x098E, 0xBC0F},
-+	{0, 0x0990, 0x005A},
-+	{0, 0x098E, 0xBC10},
-+	{0, 0x0990, 0x0070},
-+	{0, 0x098E, 0xBC11},
-+	{0, 0x0990, 0x0081},
-+	{0, 0x098E, 0xBC12},
-+	{0, 0x0990, 0x0090},
-+	{0, 0x098E, 0xBC13},
-+	{0, 0x0990, 0x009E},
-+	{0, 0x098E, 0xBC14},
-+	{0, 0x0990, 0x00AB},
-+	{0, 0x098E, 0xBC15},
-+	{0, 0x0990, 0x00B6},
-+	{0, 0x098E, 0xBC16},
-+	{0, 0x0990, 0x00C1},
-+	{0, 0x098E, 0xBC17},
-+	{0, 0x0990, 0x00CB},
-+	{0, 0x098E, 0xBC18},
-+	{0, 0x0990, 0x00D5},
-+	{0, 0x098E, 0xBC19},
-+	{0, 0x0990, 0x00DE},
-+	{0, 0x098E, 0xBC1A},
-+	{0, 0x0990, 0x00E7},
-+	{0, 0x098E, 0xBC1B},
-+	{0, 0x0990, 0x00EF},
-+	{0, 0x098E, 0xBC1C},
-+	{0, 0x0990, 0x00F7},
-+	{0, 0x098E, 0xBC1D},
-+	{0, 0x0990, 0x00FF},
-+	{0, 0x098E, 0xBC1E},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xBC1F},
-+	{0, 0x0990, 0x001B},
-+	{0, 0x098E, 0xBC20},
-+	{0, 0x0990, 0x002A},
-+	{0, 0x098E, 0xBC21},
-+	{0, 0x0990, 0x003E},
-+	{0, 0x098E, 0xBC22},
-+	{0, 0x0990, 0x005A},
-+	{0, 0x098E, 0xBC23},
-+	{0, 0x0990, 0x0070},
-+	{0, 0x098E, 0xBC24},
-+	{0, 0x0990, 0x0081},
-+	{0, 0x098E, 0xBC25},
-+	{0, 0x0990, 0x0090},
-+	{0, 0x098E, 0xBC26},
-+	{0, 0x0990, 0x009E},
-+	{0, 0x098E, 0xBC27},
-+	{0, 0x0990, 0x00AB},
-+	{0, 0x098E, 0xBC28},
-+	{0, 0x0990, 0x00B6},
-+	{0, 0x098E, 0xBC29},
-+	{0, 0x0990, 0x00C1},
-+	{0, 0x098E, 0xBC2A},
-+	{0, 0x0990, 0x00CB},
-+	{0, 0x098E, 0xBC2B},
-+	{0, 0x0990, 0x00D5},
-+	{0, 0x098E, 0xBC2C},
-+	{0, 0x0990, 0x00DE},
-+	{0, 0x098E, 0xBC2D},
-+	{0, 0x0990, 0x00E7},
-+	{0, 0x098E, 0xBC2E},
-+	{0, 0x0990, 0x00EF},
-+	{0, 0x098E, 0xBC2F},
-+	{0, 0x0990, 0x00F7},
-+	{0, 0x098E, 0xBC30},
-+	{0, 0x0990, 0x00FF},
-+	{0, 0x098E, 0xBC31},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xBC32},
-+	{0, 0x0990, 0x000D},
-+	{0, 0x098E, 0xBC33},
-+	{0, 0x0990, 0x0019},
-+	{0, 0x098E, 0xBC34},
-+	{0, 0x0990, 0x0030},
-+	{0, 0x098E, 0xBC35},
-+	{0, 0x0990, 0x0056},
-+	{0, 0x098E, 0xBC36},
-+	{0, 0x0990, 0x0070},
-+	{0, 0x098E, 0xBC37},
-+	{0, 0x0990, 0x0081},
-+	{0, 0x098E, 0xBC38},
-+	{0, 0x0990, 0x0090},
-+	{0, 0x098E, 0xBC39},
-+	{0, 0x0990, 0x009E},
-+	{0, 0x098E, 0xBC3A},
-+	{0, 0x0990, 0x00AB},
-+	{0, 0x098E, 0xBC3B},
-+	{0, 0x0990, 0x00B6},
-+	{0, 0x098E, 0xBC3C},
-+	{0, 0x0990, 0x00C1},
-+	{0, 0x098E, 0xBC3D},
-+	{0, 0x0990, 0x00CB},
-+	{0, 0x098E, 0xBC3E},
-+	{0, 0x0990, 0x00D5},
-+	{0, 0x098E, 0xBC3F},
-+	{0, 0x0990, 0x00DE},
-+	{0, 0x098E, 0xBC40},
-+	{0, 0x0990, 0x00E7},
-+	{0, 0x098E, 0xBC41},
-+	{0, 0x0990, 0x00EF},
-+	{0, 0x098E, 0xBC42},
-+	{0, 0x0990, 0x00F7},
-+	{0, 0x098E, 0xBC43},
-+	{0, 0x0990, 0x00FF},
-+	{0, 0x098E, 0x6865},
-+	{0, 0x0990, 0x00E0},
-+	{0, 0x098E, 0x6867},
-+	{0, 0x0990, 0x00F4},
-+	{0, 0x098E, 0x8400},
-+	{0, 0x0990, 0x0006},
-+	{0, 0x098E, 0xBC4A},
-+	{0, 0x0990, 0x007F},
-+	{0, 0x098E, 0xBC4B},
-+	{0, 0x0990, 0x007F},
-+	{0, 0x098E, 0xBC4C},
-+	{0, 0x0990, 0x007F},
-+	{0, 0x3542, 0x0010},
-+	{0, 0x3544, 0x0030},
-+	{0, 0x3546, 0x0040},
-+	{0, 0x3548, 0x0080},
-+	{0, 0x354A, 0x0100},
-+	{0, 0x354C, 0x0200},
-+	{0, 0x354E, 0x0300},
-+	{0, 0x3550, 0x0010},
-+	{0, 0x3552, 0x0030},
-+	{0, 0x3554, 0x0040},
-+	{0, 0x3556, 0x0080},
-+	{0, 0x3558, 0x012C},
-+	{0, 0x355A, 0x0320},
-+	{0, 0x355C, 0x03E8},
-+	{0, 0x3560, 0x0040},
-+	{0, 0x3562, 0x0020},
-+	{0, 0x3564, 0x0040},
-+	{0, 0x3566, 0x0010},
-+	{0, 0x3568, 0x0008},
-+	{0, 0x356A, 0x0004},
-+	{0, 0x356C, 0x0004},
-+	{0, 0x356E, 0x0004},
-+	{0, 0x098E, 0x3C4D},
-+	{0, 0x0990, 0x0DAC},
-+	{0, 0x098E, 0x3C4F},
-+	{0, 0x0990, 0x148A},
-+	{0, 0x098E, 0xC911},
-+	{0, 0x0990, 0x00C8},
-+	{0, 0x098E, 0xC8F4},
-+	{0, 0x0990, 0x0004},
-+	{0, 0x098E, 0xC8F5},
-+	{0, 0x0990, 0x0002},
-+	{0, 0x098E, 0x48F6},
-+	{0, 0x0990, 0x3B4D},
-+	{0, 0x098E, 0x48F8},
-+	{0, 0x0990, 0x6380},
-+	{0, 0x098E, 0x48FA},
-+	{0, 0x0990, 0x9B18},
-+	{0, 0x098E, 0x48FC},
-+	{0, 0x0990, 0x5D51},
-+	{0, 0x098E, 0x48FE},
-+	{0, 0x0990, 0xEDE8},
-+	{0, 0x098E, 0x4900},
-+	{0, 0x0990, 0xE515},
-+	{0, 0x098E, 0x4902},
-+	{0, 0x0990, 0xBFF4},
-+	{0, 0x098E, 0x4904},
-+	{0, 0x0990, 0x001E},
-+	{0, 0x098E, 0x4906},
-+	{0, 0x0990, 0x0026},
-+	{0, 0x098E, 0x4908},
-+	{0, 0x0990, 0x0033},
-+	{0, 0x098E, 0xE84A},
-+	{0, 0x0990, 0x0083},
-+	{0, 0x098E, 0xE84D},
-+	{0, 0x0990, 0x0083},
-+	{0, 0x098E, 0xE84C},
-+	{0, 0x0990, 0x0080},
-+	{0, 0x098E, 0xE84F},
-+	{0, 0x0990, 0x0080},
-+	{0, 0x098E, 0x8400},
-+	{0, 0x0990, 0x0006},
-+	{0, 0x098E, 0x48B0},
-+	{0, 0x0990, 0x0180},
-+	{0, 0x098E, 0x48B2},
-+	{0, 0x0990, 0xFF7A},
-+	{0, 0x098E, 0x48B4},
-+	{0, 0x0990, 0x0018},
-+	{0, 0x098E, 0x48B6},
-+	{0, 0x0990, 0xFFCA},
-+	{0, 0x098E, 0x48B8},
-+	{0, 0x0990, 0x017C},
-+	{0, 0x098E, 0x48BA},
-+	{0, 0x0990, 0xFFCC},
-+	{0, 0x098E, 0x48BC},
-+	{0, 0x0990, 0x000C},
-+	{0, 0x098E, 0x48BE},
-+	{0, 0x0990, 0xFF1F},
-+	{0, 0x098E, 0x48C0},
-+	{0, 0x0990, 0x01E8},
-+	{0, 0x098E, 0x48C2},
-+	{0, 0x0990, 0x0020},
-+	{0, 0x098E, 0x48C4},
-+	{0, 0x0990, 0x0044},
-+	{0, 0x098E, 0x48C6},
-+	{0, 0x0990, 0x0079},
-+	{0, 0x098E, 0x48C8},
-+	{0, 0x0990, 0xFFAD},
-+	{0, 0x098E, 0x48CA},
-+	{0, 0x0990, 0xFFE2},
-+	{0, 0x098E, 0x48CC},
-+	{0, 0x0990, 0x0033},
-+	{0, 0x098E, 0x48CE},
-+	{0, 0x0990, 0x002A},
-+	{0, 0x098E, 0x48D0},
-+	{0, 0x0990, 0xFFAA},
-+	{0, 0x098E, 0x48D2},
-+	{0, 0x0990, 0x0017},
-+	{0, 0x098E, 0x48D4},
-+	{0, 0x0990, 0x004B},
-+	{0, 0x098E, 0x48D6},
-+	{0, 0x0990, 0xFFA5},
-+	{0, 0x098E, 0x48D8},
-+	{0, 0x0990, 0x0015},
-+	{0, 0x098E, 0x48DA},
-+	{0, 0x0990, 0xFFE2},
-+	{0, 0x35A2, 0x0014},
-+	{0, 0x098E, 0xC949},
-+	{0, 0x0990, 0x0024},
-+	{0, 0x35A4, 0x0596},
-+	{0, 0x098E, 0xC94A},
-+	{0, 0x0990, 0x0062},
-+	{0, 0x098E, 0xC948},
-+	{0, 0x0990, 0x0006},
-+	{0, 0x098E, 0xC914},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xC915},
-+	{0, 0x0990, 0x00FF},
-+	{0, 0x098E, 0xE86F},
-+	{0, 0x0990, 0x0060},
-+	{0, 0x098E, 0xE870},
-+	{0, 0x0990, 0x003C},
-+	{0, 0x098E, 0xEC6F},
-+	{0, 0x0990, 0x0060},
-+	{0, 0x098E, 0xEC70},
-+	{0, 0x0990, 0x003C},
-+	{0, 0x098E, 0xE883},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xEC83},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0x8400},
-+	{0, 0x0990, 0x0006},
-+	{0, 0x098E, 0xE885},
-+	{0, 0x0990, 0x001E},
-+	{0, 0x098E, 0xE886},
-+	{0, 0x0990, 0x00D8},
-+	{0, 0x098E, 0xEC85},
-+	{0, 0x0990, 0x001E},
-+	{0, 0x098E, 0xEC86},
-+	{0, 0x0990, 0x00D8},
-+	{0, 0x098E, 0xE884},
-+	{0, 0x0990, 0x005C},
-+	{0, 0x098E, 0xEC84},
-+	{0, 0x0990, 0x005C},
-+	{0, 0x098E, 0x490A},
-+	{0, 0x0990, 0x0666},
-+	{0, 0x098E, 0x490C},
-+	{0, 0x0990, 0x0140},
-+	{0, 0x098E, 0x6857},
-+	{0, 0x0990, 0x0014},
-+	{0, 0x098E, 0x685C},
-+	{0, 0x0990, 0x0005},
-+	{0, 0x098E, 0x490E},
-+	{0, 0x0990, 0x00A4},
-+	{0, 0x098E, 0xB43D},
-+	{0, 0x0990, 0x0031},
-+	{0, 0x098E, 0xB43E},
-+	{0, 0x0990, 0x001B},
-+	{0, 0x098E, 0xB43F},
-+	{0, 0x0990, 0x0028},
-+	{0, 0x098E, 0xB440},
-+	{0, 0x0990, 0x0003},
-+	{0, 0x098E, 0xB441},
-+	{0, 0x0990, 0x00CD},
-+	{0, 0x098E, 0xB442},
-+	{0, 0x0990, 0x0064},
-+	{0, 0x098E, 0xB443},
-+	{0, 0x0990, 0x000F},
-+	{0, 0x098E, 0xB444},
-+	{0, 0x0990, 0x0007},
-+	{0, 0x098E, 0x300D},
-+	{0, 0x0990, 0x000F},
-+	{0, 0x098E, 0x3017},
-+	{0, 0x0990, 0x0F0F},
-+	{0, 0x098E, 0x8400},
-+	{0, 0x0990, 0x0006},
-+	{0, 0x098E, 0xE81F},
-+	{0, 0x0990, 0x0020},
-+	{0, 0x098E, 0x68A0},
-+	{0, 0x0990, 0x082E},
-+	{0, 0x098E, 0x6CA0},
-+	{0, 0x0990, 0x082E},
-+	{0, 0x098E, 0x70A0},
-+	{0, 0x0990, 0x082E},
-+	{0, 0x098E, 0x74A0},
-+	{0, 0x0990, 0x082E},
-+	{0, 0x3C52, 0x082E},
-+	{0, 0x098E, 0x488E},
-+	{0, 0x0990, 0x0020},
-+	{0, 0x098E, 0xECAC},
-+	{0, 0x0990, 0x0000}
-+};
-+
-+mt9t111_regs def_regs2[] = {
-+	{100, 0x0018, 0x0028},
-+	{0, 0x316C, 0x350F},
-+	{0, 0x098E, 0x6817},
-+	{0, 0x0990, 0x000C},
-+	{0, 0x0034, 0x0000}
-+};
-+
-+mt9t111_regs pll_regs1[] = {
-+	{0, 0x0014, 0x2425},
-+	{0, 0x0014, 0x2425},
-+	{0, 0x0014, 0x2145},
-+	{0, 0x0010, 0x0219},
-+	{0, 0x0012, 0x0090},
-+	{0, 0x002A, 0x79DD},
-+	{0, 0x0014, 0x2545},
-+	{0, 0x0014, 0x2547},
-+	{0, 0x0014, 0x3447},
-+	{0, 0x0014, 0x3047}
-+};
-+
-+mt9t111_regs pll_regs2[] = {
-+	{0, 0x0014, 0x3046},
-+	{0, 0x0022, 0x01E0},
-+	{0, 0x001E, 0x0707},
-+	{0, 0x3B84, 0x011D}	
-+};
-+
-+mt9t111_regs bayer_pattern_regs[] = {
-+	{0, 0x098E, 0x6807},
-+	{0, 0x0990, 0x0100},
-+	{0, 0x098E, 0x6809},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xE88E},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0x6C07},
-+	{0, 0x0990, 0x0100},
-+	{0, 0x098E, 0x6C09},
-+	{0, 0x0990, 0x0000},
-+	{0, 0x098E, 0xEC8E},
-+	{0, 0x0990, 0x0000}
-+};
-+
-+#endif
-diff --git a/include/media/mt9t111.h b/include/media/mt9t111.h
-new file mode 100644
-index 0000000..7acbeed
---- /dev/null
-+++ b/include/media/mt9t111.h
-@@ -0,0 +1,79 @@
-+/*
-+ * include/media/mt9t111.h
-+ *
-+ * mt9t111 sensor driver
-+ *
-+ * Copyright (C) 2009 Leopard Imaging
-+ *
-+ * This file is licensed under the terms of the GNU General Public License
-+ * version 2. This program is licensed "as is" without any warranty of any
-+ * kind, whether express or implied.
-+ */
-+
-+#ifndef	MT9T111_H
-+#define	MT9T111_H
-+
-+/*********************************
-+ * Defines and Macros and globals
-+ ********************************/
-+
-+#ifdef	TRUE
-+#undef	TRUE
-+#endif
-+
-+#ifdef	FALSE
-+#undef	FALSE
-+#endif
-+
-+#define	TRUE 	1
-+#define	FALSE	0
-+
-+#ifdef DEBUG
-+#undef DEBUG
-+#endif
-+
-+#ifndef TYPES
-+#define TYPES
-+#endif
-+
-+#define MT9T111_I2C_REGISTERED			(1)
-+#define MT9T111_I2C_UNREGISTERED		(0)
-+
-+/*i2c adress for MT9T111*/
-+#define MT9T111_I2C_ADDR  		(0x78 >>1)
-+
-+#define MT9T111_CLK_MAX 	(75000000) /* 75MHz */
-+#define MT9T111_CLK_MIN	(6000000)  /* 6Mhz */
-+
-+#define MT9T111_I2C_CONFIG		(1)
-+#define I2C_ONE_BYTE_TRANSFER		(1)
-+#define I2C_TWO_BYTE_TRANSFER		(2)
-+#define I2C_THREE_BYTE_TRANSFER		(3)
-+#define I2C_FOUR_BYTE_TRANSFER		(4)
-+#define I2C_TXRX_DATA_MASK		(0x00FF)
-+#define I2C_TXRX_DATA_MASK_UPPER	(0xFF00)
-+#define I2C_TXRX_DATA_SHIFT		(8)
-+
-+struct mt9t111_platform_data {
-+	char *master;
-+	int (*power_set) (enum v4l2_power on);
-+	int (*ifparm) (struct v4l2_ifparm *p);
-+	int (*priv_data_set) (void *);
-+	/* Interface control params */
-+	bool clk_polarity;
-+	bool hs_polarity;
-+	bool vs_polarity;
-+};
-+
-+/**
-+ * struct capture_size - image capture size information
-+ * @width: image width in pixels
-+ * @height: image height in pixels
-+ */
-+struct capture_size {
-+	unsigned long width;
-+	unsigned long height;
-+};
-+
-+#endif				/*for  ifndef MT9T111 */
-+
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0008-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch b/recipes/linux/linux-omap-psp-2.6.32/0008-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch
new file mode 100644
index 0000000000..be8110e4f1
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.32/0008-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch
@@ -0,0 +1,57 @@
+From dec5927ff1ccda36cc982509c9a9e92ff9d49af7 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Mon, 3 May 2010 21:38:34 +0200
+Subject: [PATCH 08/43] ARM: OMAP: beagleboard: pre-export GPIOs to userspace when using a Tincantools trainerboard
+
+This really needs a for loop, patches welcome
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |   33 ++++++++++++++++++++++++++++++-
+ 1 files changed, 32 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index ac96551..c9af202 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -701,7 +701,38 @@ static void __init omap3_beagle_init(void)
+ 		mmc[1].gpio_wp = 141;
+ 		mmc[1].gpio_cd = 162;
+ 	}
+-	
++
++	if(!strcmp(expansionboard_name, "trainer"))
++	{
++		printk(KERN_INFO "Beagle expansionboard: exporting GPIOs 130-141,162 to userspace\n");
++		gpio_request(130, "sysfs");
++		gpio_export(130, 1);
++		gpio_request(131, "sysfs");
++		gpio_export(131, 1);
++		gpio_request(132, "sysfs");
++		gpio_export(132, 1);
++		gpio_request(133, "sysfs");
++		gpio_export(133, 1);
++		gpio_request(134, "sysfs");
++		gpio_export(134, 1);
++		gpio_request(135, "sysfs");
++		gpio_export(135, 1);
++		gpio_request(136, "sysfs");
++		gpio_export(136, 1);
++		gpio_request(137, "sysfs");
++		gpio_export(137, 1);
++		gpio_request(138, "sysfs");
++		gpio_export(138, 1);
++		gpio_request(139, "sysfs");
++		gpio_export(139, 1);
++		gpio_request(140, "sysfs");
++		gpio_export(140, 1);
++		gpio_request(141, "sysfs");
++		gpio_export(141, 1);
++		gpio_request(162, "sysfs");
++		gpio_export(162, 1);
++	}
++
+ 	usb_musb_init();
+ 	usb_ehci_init(&ehci_pdata);
+ 	omap3beagle_flash_init();
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0008-board-omap3beagle-ugly-copy-paste-job-to-get-mt9p111.patch b/recipes/linux/linux-omap-psp-2.6.32/0008-board-omap3beagle-ugly-copy-paste-job-to-get-mt9p111.patch
deleted file mode 100644
index 5e5bc86e1f..0000000000
--- a/recipes/linux/linux-omap-psp-2.6.32/0008-board-omap3beagle-ugly-copy-paste-job-to-get-mt9p111.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 44c4fcfa0af82b3656e9a629a667ecf3a8fe3434 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <k-kooi@ti.com>
-Date: Tue, 9 Feb 2010 20:53:56 +0100
-Subject: [PATCH 08/42] board-omap3beagle: ugly copy/paste job to get mt9p111 sensor data in (only compile tested)
-
----
- arch/arm/mach-omap2/board-omap3beagle.c |  169 +++++++++++++++++++++++++++++++
- 1 files changed, 169 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index accf80d..e63bec6 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -25,6 +25,12 @@
- #include <linux/input.h>
- #include <linux/gpio_keys.h>
- 
-+#include <media/v4l2-int-device.h>
-+#include <media/mt9t111.h>
-+
-+/* Include V4L2 ISP-Camera driver related header file */
-+#include <../drivers/media/video/omap34xxcam.h>
-+
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/nand.h>
-@@ -441,6 +447,157 @@ static struct twl4030_platform_data beagle_twldata = {
- 	.vpll2		= &beagle_vpll2,
- };
- 
-+
-+#if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE)
-+static struct isp_interface_config mt9t111_if_config = {
-+	.ccdc_par_ser		= ISP_PARLL, 
-+	.dataline_shift		= 0x0,
-+	.hsvs_syncdetect	= ISPCTRL_SYNC_DETECT_VSRISE,
-+	.strobe			= 0x0,
-+	.prestrobe		= 0x0,
-+	.shutter		= 0x0,
-+	.u.par.par_bridge	= 0x1,
-+	.u.par.par_clk_pol	= 0x0,
-+};
-+
-+static struct v4l2_ifparm mt9t111_ifparm_s = {
-+#if 1
-+	.if_type = V4L2_IF_TYPE_RAW, 
-+	.u 	 = {
-+		.raw = {  
-+			.frame_start_on_rising_vs = 1,
-+			.bt_sync_correct	= 0,
-+			.swap			= 0,
-+			.latch_clk_inv		= 0,
-+			.nobt_hs_inv		= 0,	/* active high */
-+			.nobt_vs_inv		= 0,	/* active high */
-+			.clock_min		= MT9T111_CLK_MIN,
-+			.clock_max		= MT9T111_CLK_MAX,
-+		},
-+	},
-+#else		
-+	.if_type = V4L2_IF_TYPE_YCbCr, 
-+	.u 	 = {
-+		.ycbcr = {  
-+			.frame_start_on_rising_vs = 1,
-+			.bt_sync_correct	= 0,
-+			.swap			= 0,
-+			.latch_clk_inv		= 0,
-+			.nobt_hs_inv		= 0,	/* active high */
-+			.nobt_vs_inv		= 0,	/* active high */
-+			.clock_min		= MT9T111_CLK_MIN,
-+			.clock_max		= MT9T111_CLK_MAX,
-+		},
-+	},
-+#endif
-+};
-+
-+/**
-+ * @brief mt9t111_ifparm - Returns the mt9t111 interface parameters
-+ *
-+ * @param p - pointer to v4l2_ifparm structure
-+ *
-+ * @return result of operation - 0 is success
-+ */
-+static int mt9t111_ifparm(struct v4l2_ifparm *p)
-+{
-+	if (p == NULL)
-+		return -EINVAL;
-+
-+	*p = mt9t111_ifparm_s;
-+	return 0;
-+}
-+
-+#if defined(CONFIG_VIDEO_OMAP3_CAM) || defined(CONFIG_VIDEO_OMAP3_CAM_MODULE)
-+static struct omap34xxcam_hw_config mt9t111_decoder_hwc = {
-+	.dev_index		= 0,
-+	.dev_minor		= 0,
-+	.dev_type		= OMAP34XXCAM_SLAVE_SENSOR,
-+	.u.sensor.xclk		= OMAP34XXCAM_XCLK_NONE,
-+	.u.sensor.sensor_isp	= 1,
-+};
-+#endif
-+
-+/**
-+ * @brief mt9t111_set_prv_data - Returns mt9t111 omap34xx driver private data
-+ *
-+ * @param priv - pointer to omap34xxcam_hw_config structure
-+ *
-+ * @return result of operation - 0 is success
-+ */
-+static int mt9t111_set_prv_data(void *priv)
-+{
-+#if defined(CONFIG_VIDEO_OMAP3_CAM) || defined(CONFIG_VIDEO_OMAP3_CAM_MODULE)
-+	struct omap34xxcam_hw_config *hwc = priv;
-+
-+	if (priv == NULL)
-+		return -EINVAL;
-+
-+	hwc->u.sensor.sensor_isp = mt9t111_decoder_hwc.u.sensor.sensor_isp;
-+	hwc->u.sensor.xclk = mt9t111_decoder_hwc.u.sensor.xclk;
-+	hwc->dev_index = mt9t111_decoder_hwc.dev_index;
-+	hwc->dev_minor = mt9t111_decoder_hwc.dev_minor;
-+	hwc->dev_type = mt9t111_decoder_hwc.dev_type;
-+	return 0;
-+#else
-+	return -EINVAL;
-+#endif
-+}
-+
-+/**
-+ * @brief mt9t111_power_set - Power-on or power-off TVP5146 device
-+ *
-+ * @param power - enum, Power on/off, resume/standby
-+ *
-+ * @return result of operation - 0 is success
-+ */
-+static int mt9t111_power_set(enum v4l2_power power)
-+{
-+	switch (power) {
-+	case V4L2_POWER_OFF:
-+		/* Disable mux for TVP5146 decoder data path */
-+//		if (omap3evmdc_set_mux(MUX_CAMERA_SENSOR, DISABLE_MUX))
-+//			return -ENODEV;
-+		break;
-+
-+	case V4L2_POWER_STANDBY:
-+		break;
-+
-+	case V4L2_POWER_ON:
-+		/* Enable mux for expension camera data path */
-+//		if (omap3evmdc_set_mux(MUX_CAMERA_SENSOR, ENABLE_MUX))
-+//			return -ENODEV;
-+
-+#if defined(CONFIG_VIDEO_OMAP3_CAM) || defined(CONFIG_VIDEO_OMAP3_CAM_MODULE)
-+		isp_configure_interface(&mt9t111_if_config);
-+#endif
-+		break;
-+
-+	default:
-+		return -ENODEV;
-+		break;
-+	}
-+	return 0;
-+}
-+
-+static struct mt9t111_platform_data mt9t111_pdata = {
-+	.master		= "omap34xxcam",
-+	.power_set	= mt9t111_power_set,
-+	.priv_data_set	= mt9t111_set_prv_data,
-+	.ifparm		= mt9t111_ifparm,
-+	/* Some interface dependent params */
-+	.clk_polarity	= 0, /* data clocked out on falling edge */
-+	.hs_polarity	= 1, /* 0 - Active low, 1- Active high */
-+	.vs_polarity	= 1, /* 0 - Active low, 1- Active high */
-+};
-+
-+static struct i2c_board_info __initdata mt9t111_i2c_board_info = {
-+	I2C_BOARD_INFO("mt9t111", MT9T111_I2C_ADDR),
-+	.platform_data	= &mt9t111_pdata,
-+};
-+
-+#endif				/* #ifdef CONFIG_VIDEO_MT9T111 */
-+
- static struct i2c_board_info __initdata beagle_i2c1_boardinfo[] = {
- 	{
- 		I2C_BOARD_INFO("twl4030", 0x48),
-@@ -618,6 +775,8 @@ static struct omap_board_mux board_mux[] __initdata = {
- 
- static void __init omap3_beagle_init(void)
- {
-+	int err;
-+
- 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
- 	omap3_beagle_i2c_init();
- 	platform_add_devices(omap3_beagle_devices,
-@@ -640,7 +799,17 @@ static void __init omap3_beagle_init(void)
- 	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
- 
- 	beagle_display_init();
-+
-+	// Revisit: hardcodes i2c bus 2
-+#if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE)
-+       err = i2c_register_board_info(2, &mt9t111_i2c_board_info, 1);
-+       if (err) {
-+               printk("beagle: MT9T111 I2C Board Registration failed \n");
-+               return err;
-+       }
-+#endif
- }
-+
- static void __init omap3_beagle_map_io(void)
- {
- 	omap2_set_globals_343x();
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0009-ARM-OMAP-beagleboard-initialize-ds1307-and-eeprom-on.patch b/recipes/linux/linux-omap-psp-2.6.32/0009-ARM-OMAP-beagleboard-initialize-ds1307-and-eeprom-on.patch
new file mode 100644
index 0000000000..fe9383a145
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.32/0009-ARM-OMAP-beagleboard-initialize-ds1307-and-eeprom-on.patch
@@ -0,0 +1,76 @@
+From 7305c83476fe90a1368f647b7a5e5eba924b6f55 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Mon, 3 May 2010 22:31:34 +0200
+Subject: [PATCH 09/43] ARM: OMAP: beagleboard: initialize ds1307 and eeprom only for zippy and zippy2
+
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |   39 +++++++++++++++++++++++++++---
+ 1 files changed, 35 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index c9af202..b3c8cb7 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -496,24 +496,55 @@ static struct i2c_board_info __initdata beagle_i2c1_boardinfo[] = {
+ 	},
+ };
+ 
++	
++#if defined(CONFIG_EEPROM_AT24) || defined(CONFIG_EEPROM_AT24_MODULE)
++#include <linux/i2c/at24.h>
++
++static struct at24_platform_data m24c01 = {
++	        .byte_len       = SZ_1K / 8,
++	        .page_size      = 16,
++};
++
+ #if defined(CONFIG_RTC_DRV_DS1307) || \
+ 	defined(CONFIG_RTC_DRV_DS1307_MODULE)
+ 
+-static struct i2c_board_info __initdata beagle_i2c2_boardinfo[] = {
++static struct i2c_board_info __initdata beagle_zippy_i2c2_boardinfo[] = {
+ 	{
+ 		I2C_BOARD_INFO("ds1307", 0x68),
+ 	},
++	{
++		I2C_BOARD_INFO("24c01", 0x50),
++		.platform_data	= &m24c01,
++	},
+ };
+ #else
+-static struct i2c_board_info __initdata beagle_i2c2_boardinfo[] = {};
++static struct i2c_board_info __initdata beagle_zippy_i2c2_boardinfo[] = {
++	{
++		I2C_BOARD_INFO("24c01", 0x50),
++		.platform_data  = &m24c01,
++	},
++};
++#endif
++#else
++static struct i2c_board_info __initdata beagle_zippy_i2c2_boardinfo[] = {};
+ #endif
+ 
++static struct i2c_board_info __initdata beagle_i2c2_boardinfo[] = {};
++
+ static int __init omap3_beagle_i2c_init(void)
+ {
+ 	omap_register_i2c_bus(1, 2600, beagle_i2c1_boardinfo,
+ 			ARRAY_SIZE(beagle_i2c1_boardinfo));
+-	omap_register_i2c_bus(2, 400,  beagle_i2c2_boardinfo,
+-			ARRAY_SIZE(beagle_i2c2_boardinfo));
++	if(!strcmp(expansionboard_name, "zippy") || !strcmp(expansionboard_name, "zippy2")) 
++	{
++		printk(KERN_INFO "Beagle expansionboard: registering i2c2 bus for zippy/zippy2\n");
++		omap_register_i2c_bus(2, 400,  beagle_zippy_i2c2_boardinfo,
++				ARRAY_SIZE(beagle_zippy_i2c2_boardinfo));
++	} else
++	{
++		omap_register_i2c_bus(2, 400,  beagle_i2c2_boardinfo,
++				ARRAY_SIZE(beagle_i2c2_boardinfo));
++	}
+ 	/* Bus 3 is attached to the DVI port where devices like the pico DLP
+ 	 * projector don't work reliably with 400kHz */
+ 	omap_register_i2c_bus(3, 100, NULL, 0);
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0009-board-omap3beagle-turn-on-power-to-camera-on-boot-an.patch b/recipes/linux/linux-omap-psp-2.6.32/0009-board-omap3beagle-turn-on-power-to-camera-on-boot-an.patch
deleted file mode 100644
index 3bb4124d25..0000000000
--- a/recipes/linux/linux-omap-psp-2.6.32/0009-board-omap3beagle-turn-on-power-to-camera-on-boot-an.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6f6264e5980b822b5853d2f6a7584aa5e3431cfd Mon Sep 17 00:00:00 2001
-From: Koen Kooi <k-kooi@ti.com>
-Date: Thu, 11 Feb 2010 20:23:01 +0100
-Subject: [PATCH 09/42] board-omap3beagle: turn on power to camera on boot and add some comments
-
----
- arch/arm/mach-omap2/board-omap3beagle.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index e63bec6..91d835a 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -327,9 +327,14 @@ static int beagle_twl_gpio_setup(struct device *dev,
- 	 */
- 
- 	if (cpu_is_omap3630()) {
-+		/* Power on DVI, Serial and PWR led */ 
-  		gpio_request(gpio + 1, "nDVI_PWR_EN");
- 		gpio_direction_output(gpio + 1, 0);	
- 
-+		/* Power on camera interface */
-+		gpio_request(gpio + 2, "CAM_EN");
-+		gpio_direction_output(gpio + 2, 1);
-+
- 		/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
- 		gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
- 		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0010-ARM-OMAP-update-beagleboard-defconfig.patch b/recipes/linux/linux-omap-psp-2.6.32/0010-ARM-OMAP-update-beagleboard-defconfig.patch
new file mode 100644
index 0000000000..977d000217
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.32/0010-ARM-OMAP-update-beagleboard-defconfig.patch
@@ -0,0 +1,3323 @@
+From 98b6d38691e00f56a6428768eb042a8f42c2fe41 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 27 Apr 2010 10:51:15 +0200
+Subject: [PATCH 10/43] ARM: OMAP: update beagleboard defconfig
+
+---
+ arch/arm/configs/omap3_beagle_defconfig | 2514 +++++++++++++++++++++++++------
+ 1 files changed, 2088 insertions(+), 426 deletions(-)
+
+diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig
+index 9cfae37..adb4f8c 100644
+--- a/arch/arm/configs/omap3_beagle_defconfig
++++ b/arch/arm/configs/omap3_beagle_defconfig
+@@ -1,15 +1,13 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.27-rc8
+-# Wed Oct  1 17:14:22 2008
++# Linux kernel version: 2.6.32
++# Mon Apr 26 16:59:04 2010
+ #
+ CONFIG_ARM=y
+ CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+ CONFIG_GENERIC_GPIO=y
+ CONFIG_GENERIC_TIME=y
+ CONFIG_GENERIC_CLOCKEVENTS=y
+-CONFIG_MMU=y
+-# CONFIG_NO_IOPORT is not set
+ CONFIG_GENERIC_HARDIRQS=y
+ CONFIG_STACKTRACE_SUPPORT=y
+ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+@@ -18,134 +16,183 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+ CONFIG_HARDIRQS_SW_RESEND=y
+ CONFIG_GENERIC_IRQ_PROBE=y
+ CONFIG_RWSEM_GENERIC_SPINLOCK=y
+-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
++CONFIG_ARCH_HAS_CPUFREQ=y
+ CONFIG_GENERIC_HWEIGHT=y
+ CONFIG_GENERIC_CALIBRATE_DELAY=y
+-CONFIG_ARCH_SUPPORTS_AOUT=y
+-CONFIG_ZONE_DMA=y
+ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
++CONFIG_OPROFILE_ARMV7=y
+ CONFIG_VECTORS_BASE=0xffff0000
+ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
++CONFIG_CONSTRUCTORS=y
+ 
+ #
+ # General setup
+ #
+ CONFIG_EXPERIMENTAL=y
+ CONFIG_BROKEN_ON_SMP=y
++CONFIG_LOCK_KERNEL=y
+ CONFIG_INIT_ENV_ARG_LIMIT=32
+ CONFIG_LOCALVERSION=""
+-CONFIG_LOCALVERSION_AUTO=y
++# CONFIG_LOCALVERSION_AUTO is not set
+ CONFIG_SWAP=y
+ CONFIG_SYSVIPC=y
+ CONFIG_SYSVIPC_SYSCTL=y
+ # CONFIG_POSIX_MQUEUE is not set
+ CONFIG_BSD_PROCESS_ACCT=y
+ # CONFIG_BSD_PROCESS_ACCT_V3 is not set
+-# CONFIG_TASKSTATS is not set
++CONFIG_TASKSTATS=y
++CONFIG_TASK_DELAY_ACCT=y
++CONFIG_TASK_XACCT=y
++CONFIG_TASK_IO_ACCOUNTING=y
+ # CONFIG_AUDIT is not set
+-# CONFIG_IKCONFIG is not set
+-CONFIG_LOG_BUF_SHIFT=14
+-# CONFIG_CGROUPS is not set
++
++#
++# RCU Subsystem
++#
++CONFIG_TREE_RCU=y
++# CONFIG_TREE_PREEMPT_RCU is not set
++# CONFIG_TINY_RCU is not set
++# CONFIG_RCU_TRACE is not set
++CONFIG_RCU_FANOUT=32
++# CONFIG_RCU_FANOUT_EXACT is not set
++# CONFIG_TREE_RCU_TRACE is not set
++CONFIG_IKCONFIG=y
++CONFIG_IKCONFIG_PROC=y
++CONFIG_LOG_BUF_SHIFT=16
+ CONFIG_GROUP_SCHED=y
+ CONFIG_FAIR_GROUP_SCHED=y
+ # CONFIG_RT_GROUP_SCHED is not set
+ CONFIG_USER_SCHED=y
+ # CONFIG_CGROUP_SCHED is not set
+-# CONFIG_SYSFS_DEPRECATED=y is not set
+-# CONFIG_SYSFS_DEPRECATED_V2=y is not set
++# CONFIG_CGROUPS is not set
++# CONFIG_SYSFS_DEPRECATED_V2 is not set
+ # CONFIG_RELAY is not set
+ # CONFIG_NAMESPACES is not set
+ CONFIG_BLK_DEV_INITRD=y
+ CONFIG_INITRAMFS_SOURCE=""
++CONFIG_RD_GZIP=y
++# CONFIG_RD_BZIP2 is not set
++# CONFIG_RD_LZMA is not set
+ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+ CONFIG_SYSCTL=y
++CONFIG_ANON_INODES=y
+ CONFIG_EMBEDDED=y
+ CONFIG_UID16=y
+ # CONFIG_SYSCTL_SYSCALL is not set
+ CONFIG_KALLSYMS=y
+ # CONFIG_KALLSYMS_ALL is not set
+-CONFIG_KALLSYMS_EXTRA_PASS=y
++# CONFIG_KALLSYMS_EXTRA_PASS is not set
+ CONFIG_HOTPLUG=y
+ CONFIG_PRINTK=y
+ CONFIG_BUG=y
+-CONFIG_ELF_CORE=y
+-CONFIG_COMPAT_BRK=y
++# CONFIG_ELF_CORE is not set
+ CONFIG_BASE_FULL=y
+ CONFIG_FUTEX=y
+-CONFIG_ANON_INODES=y
+ CONFIG_EPOLL=y
+ CONFIG_SIGNALFD=y
+ CONFIG_TIMERFD=y
+ CONFIG_EVENTFD=y
+ CONFIG_SHMEM=y
++CONFIG_AIO=y
++
++#
++# Kernel Performance Events And Counters
++#
+ CONFIG_VM_EVENT_COUNTERS=y
++# CONFIG_COMPAT_BRK is not set
+ CONFIG_SLAB=y
+ # CONFIG_SLUB is not set
+ # CONFIG_SLOB is not set
+-# CONFIG_PROFILING is not set
+-# CONFIG_MARKERS is not set
++CONFIG_PROFILING=y
++CONFIG_TRACEPOINTS=y
++CONFIG_OPROFILE=y
+ CONFIG_HAVE_OPROFILE=y
+ # CONFIG_KPROBES is not set
+-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
+-# CONFIG_HAVE_IOREMAP_PROT is not set
+ CONFIG_HAVE_KPROBES=y
+ CONFIG_HAVE_KRETPROBES=y
+-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
+-# CONFIG_HAVE_DMA_ATTRS is not set
+-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+ CONFIG_HAVE_CLK=y
+-CONFIG_PROC_PAGE_MONITOR=y
++
++#
++# GCOV-based kernel profiling
++#
++# CONFIG_GCOV_KERNEL is not set
++CONFIG_SLOW_WORK=y
++# CONFIG_SLOW_WORK_DEBUG is not set
+ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+ CONFIG_SLABINFO=y
+ CONFIG_RT_MUTEXES=y
+-# CONFIG_TINY_SHMEM is not set
+ CONFIG_BASE_SMALL=0
+ CONFIG_MODULES=y
+-# CONFIG_MODULE_FORCE_LOAD is not set
++CONFIG_MODULE_FORCE_LOAD=y
+ CONFIG_MODULE_UNLOAD=y
+-# CONFIG_MODULE_FORCE_UNLOAD is not set
++CONFIG_MODULE_FORCE_UNLOAD=y
+ CONFIG_MODVERSIONS=y
+ CONFIG_MODULE_SRCVERSION_ALL=y
+-CONFIG_KMOD=y
+ CONFIG_BLOCK=y
+-# CONFIG_LBD is not set
+-# CONFIG_BLK_DEV_IO_TRACE is not set
+-# CONFIG_LSF is not set
+-# CONFIG_BLK_DEV_BSG is not set
++CONFIG_LBDAF=y
++CONFIG_BLK_DEV_BSG=y
+ # CONFIG_BLK_DEV_INTEGRITY is not set
+ 
+ #
+ # IO Schedulers
+ #
+ CONFIG_IOSCHED_NOOP=y
+-CONFIG_IOSCHED_AS=y
+ CONFIG_IOSCHED_DEADLINE=y
+ CONFIG_IOSCHED_CFQ=y
+-CONFIG_DEFAULT_AS=y
+ # CONFIG_DEFAULT_DEADLINE is not set
+-# CONFIG_DEFAULT_CFQ is not set
++CONFIG_DEFAULT_CFQ=y
+ # CONFIG_DEFAULT_NOOP is not set
+-CONFIG_DEFAULT_IOSCHED="anticipatory"
+-CONFIG_CLASSIC_RCU=y
++CONFIG_DEFAULT_IOSCHED="cfq"
++# CONFIG_INLINE_SPIN_TRYLOCK is not set
++# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
++# CONFIG_INLINE_SPIN_LOCK is not set
++# CONFIG_INLINE_SPIN_LOCK_BH is not set
++# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
++# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
++# CONFIG_INLINE_SPIN_UNLOCK is not set
++# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
++# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
++# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
++# CONFIG_INLINE_READ_TRYLOCK is not set
++# CONFIG_INLINE_READ_LOCK is not set
++# CONFIG_INLINE_READ_LOCK_BH is not set
++# CONFIG_INLINE_READ_LOCK_IRQ is not set
++# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
++# CONFIG_INLINE_READ_UNLOCK is not set
++# CONFIG_INLINE_READ_UNLOCK_BH is not set
++# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
++# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
++# CONFIG_INLINE_WRITE_TRYLOCK is not set
++# CONFIG_INLINE_WRITE_LOCK is not set
++# CONFIG_INLINE_WRITE_LOCK_BH is not set
++# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
++# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
++# CONFIG_INLINE_WRITE_UNLOCK is not set
++# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
++# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
++# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
++# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+ CONFIG_FREEZER=y
+ 
+ #
+ # System Type
+ #
++CONFIG_MMU=y
+ # CONFIG_ARCH_AAEC2000 is not set
+ # CONFIG_ARCH_INTEGRATOR is not set
+ # CONFIG_ARCH_REALVIEW is not set
+ # CONFIG_ARCH_VERSATILE is not set
+ # CONFIG_ARCH_AT91 is not set
+-# CONFIG_ARCH_CLPS7500 is not set
+ # CONFIG_ARCH_CLPS711X is not set
++# CONFIG_ARCH_GEMINI is not set
+ # CONFIG_ARCH_EBSA110 is not set
+ # CONFIG_ARCH_EP93XX is not set
+ # CONFIG_ARCH_FOOTBRIDGE is not set
++# CONFIG_ARCH_MXC is not set
++# CONFIG_ARCH_STMP3XXX is not set
+ # CONFIG_ARCH_NETX is not set
+ # CONFIG_ARCH_H720X is not set
+-# CONFIG_ARCH_IMX is not set
++# CONFIG_ARCH_NOMADIK is not set
+ # CONFIG_ARCH_IOP13XX is not set
+ # CONFIG_ARCH_IOP32X is not set
+ # CONFIG_ARCH_IOP33X is not set
+@@ -153,23 +200,30 @@ CONFIG_FREEZER=y
+ # CONFIG_ARCH_IXP2000 is not set
+ # CONFIG_ARCH_IXP4XX is not set
+ # CONFIG_ARCH_L7200 is not set
++# CONFIG_ARCH_DOVE is not set
+ # CONFIG_ARCH_KIRKWOOD is not set
+-# CONFIG_ARCH_KS8695 is not set
+-# CONFIG_ARCH_NS9XXX is not set
+ # CONFIG_ARCH_LOKI is not set
+ # CONFIG_ARCH_MV78XX0 is not set
+-# CONFIG_ARCH_MXC is not set
+ # CONFIG_ARCH_ORION5X is not set
++# CONFIG_ARCH_MMP is not set
++# CONFIG_ARCH_KS8695 is not set
++# CONFIG_ARCH_NS9XXX is not set
++# CONFIG_ARCH_W90X900 is not set
+ # CONFIG_ARCH_PNX4008 is not set
+ # CONFIG_ARCH_PXA is not set
++# CONFIG_ARCH_MSM is not set
+ # CONFIG_ARCH_RPC is not set
+ # CONFIG_ARCH_SA1100 is not set
+ # CONFIG_ARCH_S3C2410 is not set
++# CONFIG_ARCH_S3C64XX is not set
++# CONFIG_ARCH_S5PC1XX is not set
+ # CONFIG_ARCH_SHARK is not set
+ # CONFIG_ARCH_LH7A40X is not set
++# CONFIG_ARCH_U300 is not set
+ # CONFIG_ARCH_DAVINCI is not set
+ CONFIG_ARCH_OMAP=y
+-# CONFIG_ARCH_MSM7X00A is not set
++# CONFIG_ARCH_BCMRING is not set
++# CONFIG_ARCH_U8500 is not set
+ 
+ #
+ # TI OMAP Implementations
+@@ -178,37 +232,55 @@ CONFIG_ARCH_OMAP_OTG=y
+ # CONFIG_ARCH_OMAP1 is not set
+ # CONFIG_ARCH_OMAP2 is not set
+ CONFIG_ARCH_OMAP3=y
++# CONFIG_ARCH_OMAP4 is not set
+ 
+ #
+ # OMAP Feature Selections
+ #
+-# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set
+-# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set
+-# CONFIG_OMAP_RESET_CLOCKS is not set
++CONFIG_OMAP_SMARTREFLEX=y
++# CONFIG_OMAP_SMARTREFLEX_TESTING is not set
++CONFIG_OMAP_RESET_CLOCKS=y
+ # CONFIG_OMAP_MUX is not set
+-# CONFIG_OMAP_MCBSP is not set
++CONFIG_OMAP_MCBSP=y
++CONFIG_OMAP_MBOX_FWK=m
++CONFIG_OMAP_IOMMU=y
+ # CONFIG_OMAP_MPU_TIMER is not set
+ CONFIG_OMAP_32K_TIMER=y
++# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
++# CONFIG_OMAP3_DEBOBS is not set
+ CONFIG_OMAP_32K_TIMER_HZ=128
+ CONFIG_OMAP_DM_TIMER=y
+ # CONFIG_OMAP_LL_DEBUG_UART1 is not set
+ # CONFIG_OMAP_LL_DEBUG_UART2 is not set
+ CONFIG_OMAP_LL_DEBUG_UART3=y
++# CONFIG_OMAP_LL_DEBUG_NONE is not set
++# CONFIG_OMAP_PM_NONE is not set
++# CONFIG_OMAP_PM_NOOP is not set
++CONFIG_OMAP_PM_SRF=y
+ CONFIG_ARCH_OMAP34XX=y
+ CONFIG_ARCH_OMAP3430=y
++CONFIG_OMAP_PACKAGE_CBB=y
+ 
+ #
+ # OMAP Board Type
+ #
+ CONFIG_MACH_OMAP3_BEAGLE=y
+-
+-#
+-# Boot options
+-#
+-
+-#
+-# Power management
+-#
++# CONFIG_MACH_OMAP_LDP is not set
++# CONFIG_MACH_OVERO is not set
++CONFIG_MACH_OMAP3EVM=y
++CONFIG_PMIC_TWL4030=y
++# CONFIG_MACH_OMAP3517EVM is not set
++# CONFIG_MACH_OMAP3_PANDORA is not set
++# CONFIG_MACH_OMAP3_TOUCHBOOK is not set
++# CONFIG_MACH_OMAP_3430SDP is not set
++# CONFIG_MACH_NOKIA_RX51 is not set
++# CONFIG_MACH_OMAP_ZOOM2 is not set
++# CONFIG_MACH_OMAP_ZOOM3 is not set
++# CONFIG_MACH_CM_T35 is not set
++# CONFIG_MACH_IGEP0020 is not set
++# CONFIG_MACH_OMAP_3630SDP is not set
++# CONFIG_OMAP3_EMU is not set
++# CONFIG_OMAP3_SDRC_AC_TIMING is not set
+ 
+ #
+ # Processor Type
+@@ -218,7 +290,7 @@ CONFIG_CPU_32v6K=y
+ CONFIG_CPU_V7=y
+ CONFIG_CPU_32v7=y
+ CONFIG_CPU_ABRT_EV7=y
+-CONFIG_CPU_PABRT_IFAR=y
++CONFIG_CPU_PABRT_V7=y
+ CONFIG_CPU_CACHE_V7=y
+ CONFIG_CPU_CACHE_VIPT=y
+ CONFIG_CPU_COPY_V6=y
+@@ -231,12 +303,17 @@ CONFIG_CPU_CP15_MMU=y
+ # Processor Features
+ #
+ CONFIG_ARM_THUMB=y
+-# CONFIG_ARM_THUMBEE is not set
++CONFIG_ARM_THUMBEE=y
+ # CONFIG_CPU_ICACHE_DISABLE is not set
+ # CONFIG_CPU_DCACHE_DISABLE is not set
+ # CONFIG_CPU_BPREDICT_DISABLE is not set
+ CONFIG_HAS_TLS_REG=y
+-# CONFIG_OUTER_CACHE is not set
++CONFIG_ARM_L1_CACHE_SHIFT=6
++CONFIG_USER_L2_PLE=y
++CONFIG_USER_PMON=y
++# CONFIG_ARM_ERRATA_430973 is not set
++# CONFIG_ARM_ERRATA_458693 is not set
++# CONFIG_ARM_ERRATA_460075 is not set
+ CONFIG_COMMON_CLKDEV=y
+ 
+ #
+@@ -257,42 +334,63 @@ CONFIG_VMSPLIT_3G=y
+ # CONFIG_VMSPLIT_2G is not set
+ # CONFIG_VMSPLIT_1G is not set
+ CONFIG_PAGE_OFFSET=0xC0000000
+-# CONFIG_PREEMPT is not set
++# CONFIG_PREEMPT_NONE is not set
++# CONFIG_PREEMPT_VOLUNTARY is not set
++CONFIG_PREEMPT=y
+ CONFIG_HZ=128
++# CONFIG_THUMB2_KERNEL is not set
+ CONFIG_AEABI=y
+-CONFIG_OABI_COMPAT=y
+-CONFIG_ARCH_FLATMEM_HAS_HOLES=y
+-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
++# CONFIG_OABI_COMPAT is not set
++CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
++# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
++# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
++# CONFIG_HIGHMEM is not set
+ CONFIG_SELECT_MEMORY_MODEL=y
+ CONFIG_FLATMEM_MANUAL=y
+ # CONFIG_DISCONTIGMEM_MANUAL is not set
+ # CONFIG_SPARSEMEM_MANUAL is not set
+ CONFIG_FLATMEM=y
+ CONFIG_FLAT_NODE_MEM_MAP=y
+-# CONFIG_SPARSEMEM_STATIC is not set
+-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+ CONFIG_PAGEFLAGS_EXTENDED=y
+ CONFIG_SPLIT_PTLOCK_CPUS=4
+-# CONFIG_RESOURCES_64BIT is not set
+-CONFIG_ZONE_DMA_FLAG=1
+-CONFIG_BOUNCE=y
++# CONFIG_PHYS_ADDR_T_64BIT is not set
++CONFIG_ZONE_DMA_FLAG=0
+ CONFIG_VIRT_TO_BUS=y
+-# CONFIG_LEDS is not set
++# CONFIG_KSM is not set
++CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
++CONFIG_LEDS=y
+ CONFIG_ALIGNMENT_TRAP=y
++# CONFIG_UACCESS_WITH_MEMCPY is not set
++CONFIG_CPU_V7_SYSFS=y
+ 
+ #
+ # Boot options
+ #
+ CONFIG_ZBOOT_ROM_TEXT=0x0
+ CONFIG_ZBOOT_ROM_BSS=0x0
+-CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8"
++CONFIG_CMDLINE=" debug "
+ # CONFIG_XIP_KERNEL is not set
+-# CONFIG_KEXEC is not set
++CONFIG_KEXEC=y
++CONFIG_ATAGS_PROC=y
+ 
+ #
+ # CPU Power Management
+ #
+-# CONFIG_CPU_FREQ is not set
++CONFIG_CPU_FREQ=y
++CONFIG_CPU_FREQ_TABLE=y
++CONFIG_CPU_FREQ_DEBUG=y
++CONFIG_CPU_FREQ_STAT=y
++CONFIG_CPU_FREQ_STAT_DETAILS=y
++CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
++# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
++# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
++# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
++# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
++CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
++CONFIG_CPU_FREQ_GOV_POWERSAVE=y
++CONFIG_CPU_FREQ_GOV_USERSPACE=y
++CONFIG_CPU_FREQ_GOV_ONDEMAND=y
++CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+ # CONFIG_CPU_IDLE is not set
+ 
+ #
+@@ -302,29 +400,30 @@ CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.16
+ #
+ # At least one emulation must be selected
+ #
+-CONFIG_FPE_NWFPE=y
+-# CONFIG_FPE_NWFPE_XP is not set
+-# CONFIG_FPE_FASTFPE is not set
+ CONFIG_VFP=y
+ CONFIG_VFPv3=y
+-# CONFIG_NEON is not set
++CONFIG_NEON=y
+ 
+ #
+ # Userspace binary formats
+ #
+ CONFIG_BINFMT_ELF=y
+-# CONFIG_BINFMT_AOUT is not set
++CONFIG_HAVE_AOUT=y
++CONFIG_BINFMT_AOUT=m
+ CONFIG_BINFMT_MISC=y
+ 
+ #
+ # Power management options
+ #
+ CONFIG_PM=y
+-# CONFIG_PM_DEBUG is not set
++CONFIG_PM_DEBUG=y
++# CONFIG_PM_VERBOSE is not set
++CONFIG_CAN_PM_TRACE=y
+ CONFIG_PM_SLEEP=y
+ CONFIG_SUSPEND=y
+ CONFIG_SUSPEND_FREEZER=y
+ # CONFIG_APM_EMULATION is not set
++CONFIG_PM_RUNTIME=y
+ CONFIG_ARCH_SUSPEND_POSSIBLE=y
+ CONFIG_NET=y
+ 
+@@ -332,13 +431,14 @@ CONFIG_NET=y
+ # Networking options
+ #
+ CONFIG_PACKET=y
+-# CONFIG_PACKET_MMAP is not set
++CONFIG_PACKET_MMAP=y
+ CONFIG_UNIX=y
+ CONFIG_XFRM=y
+ # CONFIG_XFRM_USER is not set
+ # CONFIG_XFRM_SUB_POLICY is not set
+ # CONFIG_XFRM_MIGRATE is not set
+ # CONFIG_XFRM_STATISTICS is not set
++CONFIG_XFRM_IPCOMP=m
+ CONFIG_NET_KEY=y
+ # CONFIG_NET_KEY_MIGRATE is not set
+ CONFIG_INET=y
+@@ -349,63 +449,462 @@ CONFIG_IP_PNP=y
+ CONFIG_IP_PNP_DHCP=y
+ CONFIG_IP_PNP_BOOTP=y
+ CONFIG_IP_PNP_RARP=y
+-# CONFIG_NET_IPIP is not set
+-# CONFIG_NET_IPGRE is not set
++CONFIG_NET_IPIP=m
++CONFIG_NET_IPGRE=m
+ # CONFIG_ARPD is not set
+ # CONFIG_SYN_COOKIES is not set
+-# CONFIG_INET_AH is not set
+-# CONFIG_INET_ESP is not set
+-# CONFIG_INET_IPCOMP is not set
+-# CONFIG_INET_XFRM_TUNNEL is not set
+-# CONFIG_INET_TUNNEL is not set
++CONFIG_INET_AH=m
++CONFIG_INET_ESP=m
++CONFIG_INET_IPCOMP=m
++CONFIG_INET_XFRM_TUNNEL=m
++CONFIG_INET_TUNNEL=m
+ CONFIG_INET_XFRM_MODE_TRANSPORT=y
+ CONFIG_INET_XFRM_MODE_TUNNEL=y
+ CONFIG_INET_XFRM_MODE_BEET=y
+-# CONFIG_INET_LRO is not set
+-CONFIG_INET_DIAG=y
+-CONFIG_INET_TCP_DIAG=y
+-# CONFIG_TCP_CONG_ADVANCED is not set
++CONFIG_INET_LRO=y
++CONFIG_INET_DIAG=m
++CONFIG_INET_TCP_DIAG=m
++CONFIG_TCP_CONG_ADVANCED=y
++CONFIG_TCP_CONG_BIC=m
+ CONFIG_TCP_CONG_CUBIC=y
++CONFIG_TCP_CONG_WESTWOOD=m
++CONFIG_TCP_CONG_HTCP=m
++CONFIG_TCP_CONG_HSTCP=m
++CONFIG_TCP_CONG_HYBLA=m
++CONFIG_TCP_CONG_VEGAS=m
++CONFIG_TCP_CONG_SCALABLE=m
++CONFIG_TCP_CONG_LP=m
++CONFIG_TCP_CONG_VENO=m
++CONFIG_TCP_CONG_YEAH=m
++CONFIG_TCP_CONG_ILLINOIS=m
++# CONFIG_DEFAULT_BIC is not set
++CONFIG_DEFAULT_CUBIC=y
++# CONFIG_DEFAULT_HTCP is not set
++# CONFIG_DEFAULT_VEGAS is not set
++# CONFIG_DEFAULT_WESTWOOD is not set
++# CONFIG_DEFAULT_RENO is not set
+ CONFIG_DEFAULT_TCP_CONG="cubic"
+ # CONFIG_TCP_MD5SIG is not set
+-# CONFIG_IPV6 is not set
++CONFIG_IPV6=m
++# CONFIG_IPV6_PRIVACY is not set
++# CONFIG_IPV6_ROUTER_PREF is not set
++# CONFIG_IPV6_OPTIMISTIC_DAD is not set
++CONFIG_INET6_AH=m
++CONFIG_INET6_ESP=m
++CONFIG_INET6_IPCOMP=m
++CONFIG_IPV6_MIP6=m
++CONFIG_INET6_XFRM_TUNNEL=m
++CONFIG_INET6_TUNNEL=m
++CONFIG_INET6_XFRM_MODE_TRANSPORT=m
++CONFIG_INET6_XFRM_MODE_TUNNEL=m
++CONFIG_INET6_XFRM_MODE_BEET=m
++CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
++CONFIG_IPV6_SIT=m
++# CONFIG_IPV6_SIT_6RD is not set
++CONFIG_IPV6_NDISC_NODETYPE=y
++CONFIG_IPV6_TUNNEL=m
++CONFIG_IPV6_MULTIPLE_TABLES=y
++CONFIG_IPV6_SUBTREES=y
++CONFIG_IPV6_MROUTE=y
++# CONFIG_IPV6_PIMSM_V2 is not set
+ # CONFIG_NETWORK_SECMARK is not set
+-# CONFIG_NETFILTER is not set
+-# CONFIG_IP_DCCP is not set
+-# CONFIG_IP_SCTP is not set
+-# CONFIG_TIPC is not set
+-# CONFIG_ATM is not set
+-# CONFIG_BRIDGE is not set
+-# CONFIG_VLAN_8021Q is not set
++CONFIG_NETFILTER=y
++# CONFIG_NETFILTER_DEBUG is not set
++CONFIG_NETFILTER_ADVANCED=y
++CONFIG_BRIDGE_NETFILTER=y
++
++#
++# Core Netfilter Configuration
++#
++CONFIG_NETFILTER_NETLINK=m
++CONFIG_NETFILTER_NETLINK_QUEUE=m
++CONFIG_NETFILTER_NETLINK_LOG=m
++CONFIG_NF_CONNTRACK=m
++CONFIG_NF_CT_ACCT=y
++CONFIG_NF_CONNTRACK_MARK=y
++CONFIG_NF_CONNTRACK_EVENTS=y
++CONFIG_NF_CT_PROTO_DCCP=m
++CONFIG_NF_CT_PROTO_GRE=m
++CONFIG_NF_CT_PROTO_SCTP=m
++CONFIG_NF_CT_PROTO_UDPLITE=m
++CONFIG_NF_CONNTRACK_AMANDA=m
++CONFIG_NF_CONNTRACK_FTP=m
++CONFIG_NF_CONNTRACK_H323=m
++CONFIG_NF_CONNTRACK_IRC=m
++CONFIG_NF_CONNTRACK_NETBIOS_NS=m
++CONFIG_NF_CONNTRACK_PPTP=m
++CONFIG_NF_CONNTRACK_SANE=m
++CONFIG_NF_CONNTRACK_SIP=m
++CONFIG_NF_CONNTRACK_TFTP=m
++CONFIG_NF_CT_NETLINK=m
++# CONFIG_NETFILTER_TPROXY is not set
++CONFIG_NETFILTER_XTABLES=m
++CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
++CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
++# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
++CONFIG_NETFILTER_XT_TARGET_HL=m
++# CONFIG_NETFILTER_XT_TARGET_LED is not set
++CONFIG_NETFILTER_XT_TARGET_MARK=m
++CONFIG_NETFILTER_XT_TARGET_NFLOG=m
++CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
++# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
++CONFIG_NETFILTER_XT_TARGET_RATEEST=m
++# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
++CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
++# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
++# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
++CONFIG_NETFILTER_XT_MATCH_COMMENT=m
++CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
++CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
++CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
++CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
++CONFIG_NETFILTER_XT_MATCH_DCCP=m
++CONFIG_NETFILTER_XT_MATCH_DSCP=m
++CONFIG_NETFILTER_XT_MATCH_ESP=m
++CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
++CONFIG_NETFILTER_XT_MATCH_HELPER=m
++CONFIG_NETFILTER_XT_MATCH_HL=m
++CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
++CONFIG_NETFILTER_XT_MATCH_LENGTH=m
++CONFIG_NETFILTER_XT_MATCH_LIMIT=m
++CONFIG_NETFILTER_XT_MATCH_MAC=m
++CONFIG_NETFILTER_XT_MATCH_MARK=m
++CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
++CONFIG_NETFILTER_XT_MATCH_OWNER=m
++CONFIG_NETFILTER_XT_MATCH_POLICY=m
++# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
++CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
++CONFIG_NETFILTER_XT_MATCH_QUOTA=m
++CONFIG_NETFILTER_XT_MATCH_RATEEST=m
++CONFIG_NETFILTER_XT_MATCH_REALM=m
++CONFIG_NETFILTER_XT_MATCH_RECENT=m
++# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
++CONFIG_NETFILTER_XT_MATCH_SCTP=m
++CONFIG_NETFILTER_XT_MATCH_STATE=m
++CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
++CONFIG_NETFILTER_XT_MATCH_STRING=m
++CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
++CONFIG_NETFILTER_XT_MATCH_TIME=m
++CONFIG_NETFILTER_XT_MATCH_U32=m
++# CONFIG_NETFILTER_XT_MATCH_OSF is not set
++CONFIG_IP_VS=m
++CONFIG_IP_VS_IPV6=y
++CONFIG_IP_VS_DEBUG=y
++CONFIG_IP_VS_TAB_BITS=12
++
++#
++# IPVS transport protocol load balancing support
++#
++CONFIG_IP_VS_PROTO_TCP=y
++CONFIG_IP_VS_PROTO_UDP=y
++CONFIG_IP_VS_PROTO_AH_ESP=y
++CONFIG_IP_VS_PROTO_ESP=y
++CONFIG_IP_VS_PROTO_AH=y
++
++#
++# IPVS scheduler
++#
++CONFIG_IP_VS_RR=m
++CONFIG_IP_VS_WRR=m
++CONFIG_IP_VS_LC=m
++CONFIG_IP_VS_WLC=m
++CONFIG_IP_VS_LBLC=m
++CONFIG_IP_VS_LBLCR=m
++CONFIG_IP_VS_DH=m
++CONFIG_IP_VS_SH=m
++CONFIG_IP_VS_SED=m
++CONFIG_IP_VS_NQ=m
++
++#
++# IPVS application helper
++#
++CONFIG_IP_VS_FTP=m
++
++#
++# IP: Netfilter Configuration
++#
++CONFIG_NF_DEFRAG_IPV4=m
++CONFIG_NF_CONNTRACK_IPV4=m
++CONFIG_NF_CONNTRACK_PROC_COMPAT=y
++CONFIG_IP_NF_QUEUE=m
++CONFIG_IP_NF_IPTABLES=m
++CONFIG_IP_NF_MATCH_ADDRTYPE=m
++CONFIG_IP_NF_MATCH_AH=m
++CONFIG_IP_NF_MATCH_ECN=m
++CONFIG_IP_NF_MATCH_TTL=m
++CONFIG_IP_NF_FILTER=m
++CONFIG_IP_NF_TARGET_REJECT=m
++CONFIG_IP_NF_TARGET_LOG=m
++CONFIG_IP_NF_TARGET_ULOG=m
++CONFIG_NF_NAT=m
++CONFIG_NF_NAT_NEEDED=y
++CONFIG_IP_NF_TARGET_MASQUERADE=m
++CONFIG_IP_NF_TARGET_NETMAP=m
++CONFIG_IP_NF_TARGET_REDIRECT=m
++CONFIG_NF_NAT_SNMP_BASIC=m
++CONFIG_NF_NAT_PROTO_DCCP=m
++CONFIG_NF_NAT_PROTO_GRE=m
++CONFIG_NF_NAT_PROTO_UDPLITE=m
++CONFIG_NF_NAT_PROTO_SCTP=m
++CONFIG_NF_NAT_FTP=m
++CONFIG_NF_NAT_IRC=m
++CONFIG_NF_NAT_TFTP=m
++CONFIG_NF_NAT_AMANDA=m
++CONFIG_NF_NAT_PPTP=m
++CONFIG_NF_NAT_H323=m
++CONFIG_NF_NAT_SIP=m
++CONFIG_IP_NF_MANGLE=m
++CONFIG_IP_NF_TARGET_CLUSTERIP=m
++CONFIG_IP_NF_TARGET_ECN=m
++CONFIG_IP_NF_TARGET_TTL=m
++CONFIG_IP_NF_RAW=m
++CONFIG_IP_NF_ARPTABLES=m
++CONFIG_IP_NF_ARPFILTER=m
++CONFIG_IP_NF_ARP_MANGLE=m
++
++#
++# IPv6: Netfilter Configuration
++#
++CONFIG_NF_CONNTRACK_IPV6=m
++CONFIG_IP6_NF_QUEUE=m
++CONFIG_IP6_NF_IPTABLES=m
++CONFIG_IP6_NF_MATCH_AH=m
++CONFIG_IP6_NF_MATCH_EUI64=m
++CONFIG_IP6_NF_MATCH_FRAG=m
++CONFIG_IP6_NF_MATCH_OPTS=m
++CONFIG_IP6_NF_MATCH_HL=m
++CONFIG_IP6_NF_MATCH_IPV6HEADER=m
++CONFIG_IP6_NF_MATCH_MH=m
++CONFIG_IP6_NF_MATCH_RT=m
++CONFIG_IP6_NF_TARGET_HL=m
++CONFIG_IP6_NF_TARGET_LOG=m
++CONFIG_IP6_NF_FILTER=m
++CONFIG_IP6_NF_TARGET_REJECT=m
++CONFIG_IP6_NF_MANGLE=m
++CONFIG_IP6_NF_RAW=m
++# CONFIG_BRIDGE_NF_EBTABLES is not set
++CONFIG_IP_DCCP=m
++CONFIG_INET_DCCP_DIAG=m
++
++#
++# DCCP CCIDs Configuration (EXPERIMENTAL)
++#
++# CONFIG_IP_DCCP_CCID2_DEBUG is not set
++CONFIG_IP_DCCP_CCID3=y
++# CONFIG_IP_DCCP_CCID3_DEBUG is not set
++CONFIG_IP_DCCP_CCID3_RTO=100
++CONFIG_IP_DCCP_TFRC_LIB=y
++
++#
++# DCCP Kernel Hacking
++#
++# CONFIG_IP_DCCP_DEBUG is not set
++CONFIG_IP_SCTP=m
++# CONFIG_SCTP_DBG_MSG is not set
++# CONFIG_SCTP_DBG_OBJCNT is not set
++# CONFIG_SCTP_HMAC_NONE is not set
++# CONFIG_SCTP_HMAC_SHA1 is not set
++CONFIG_SCTP_HMAC_MD5=y
++# CONFIG_RDS is not set
++CONFIG_TIPC=m
++# CONFIG_TIPC_ADVANCED is not set
++# CONFIG_TIPC_DEBUG is not set
++CONFIG_ATM=m
++CONFIG_ATM_CLIP=m
++# CONFIG_ATM_CLIP_NO_ICMP is not set
++CONFIG_ATM_LANE=m
++CONFIG_ATM_MPOA=m
++CONFIG_ATM_BR2684=m
++# CONFIG_ATM_BR2684_IPFILTER is not set
++CONFIG_STP=m
++CONFIG_GARP=m
++CONFIG_BRIDGE=m
++# CONFIG_NET_DSA is not set
++CONFIG_VLAN_8021Q=m
++CONFIG_VLAN_8021Q_GVRP=y
+ # CONFIG_DECNET is not set
++CONFIG_LLC=m
+ # CONFIG_LLC2 is not set
+ # CONFIG_IPX is not set
+ # CONFIG_ATALK is not set
+ # CONFIG_X25 is not set
+ # CONFIG_LAPB is not set
+ # CONFIG_ECONET is not set
+-# CONFIG_WAN_ROUTER is not set
+-# CONFIG_NET_SCHED is not set
++CONFIG_WAN_ROUTER=m
++# CONFIG_PHONET is not set
++# CONFIG_IEEE802154 is not set
++CONFIG_NET_SCHED=y
++
++#
++# Queueing/Scheduling
++#
++CONFIG_NET_SCH_CBQ=m
++CONFIG_NET_SCH_HTB=m
++CONFIG_NET_SCH_HFSC=m
++CONFIG_NET_SCH_ATM=m
++CONFIG_NET_SCH_PRIO=m
++CONFIG_NET_SCH_MULTIQ=m
++CONFIG_NET_SCH_RED=m
++CONFIG_NET_SCH_SFQ=m
++CONFIG_NET_SCH_TEQL=m
++CONFIG_NET_SCH_TBF=m
++CONFIG_NET_SCH_GRED=m
++CONFIG_NET_SCH_DSMARK=m
++CONFIG_NET_SCH_NETEM=m
++CONFIG_NET_SCH_DRR=m
++
++#
++# Classification
++#
++CONFIG_NET_CLS=y
++CONFIG_NET_CLS_BASIC=m
++CONFIG_NET_CLS_TCINDEX=m
++CONFIG_NET_CLS_ROUTE4=m
++CONFIG_NET_CLS_ROUTE=y
++CONFIG_NET_CLS_FW=m
++CONFIG_NET_CLS_U32=m
++CONFIG_CLS_U32_PERF=y
++CONFIG_CLS_U32_MARK=y
++CONFIG_NET_CLS_RSVP=m
++CONFIG_NET_CLS_RSVP6=m
++CONFIG_NET_CLS_FLOW=m
++# CONFIG_NET_EMATCH is not set
++# CONFIG_NET_CLS_ACT is not set
++CONFIG_NET_CLS_IND=y
++CONFIG_NET_SCH_FIFO=y
++# CONFIG_DCB is not set
+ 
+ #
+ # Network testing
+ #
+ # CONFIG_NET_PKTGEN is not set
++# CONFIG_NET_DROP_MONITOR is not set
+ # CONFIG_HAMRADIO is not set
+-# CONFIG_CAN is not set
+-# CONFIG_IRDA is not set
+-# CONFIG_BT is not set
+-# CONFIG_AF_RXRPC is not set
+-
+-#
+-# Wireless
+-#
+-# CONFIG_CFG80211 is not set
+-# CONFIG_WIRELESS_EXT is not set
+-# CONFIG_MAC80211 is not set
+-# CONFIG_IEEE80211 is not set
+-# CONFIG_RFKILL is not set
+-# CONFIG_NET_9P is not set
++CONFIG_CAN=m
++CONFIG_CAN_RAW=m
++CONFIG_CAN_BCM=m
++
++#
++# CAN Device Drivers
++#
++CONFIG_CAN_VCAN=m
++# CONFIG_CAN_DEV is not set
++# CONFIG_CAN_DEBUG_DEVICES is not set
++CONFIG_IRDA=m
++
++#
++# IrDA protocols
++#
++CONFIG_IRLAN=m
++CONFIG_IRNET=m
++CONFIG_IRCOMM=m
++CONFIG_IRDA_ULTRA=y
++
++#
++# IrDA options
++#
++CONFIG_IRDA_CACHE_LAST_LSAP=y
++CONFIG_IRDA_FAST_RR=y
++CONFIG_IRDA_DEBUG=y
++
++#
++# Infrared-port device drivers
++#
++
++#
++# SIR device drivers
++#
++CONFIG_IRTTY_SIR=m
++
++#
++# Dongle support
++#
++CONFIG_DONGLE=y
++CONFIG_ESI_DONGLE=m
++CONFIG_ACTISYS_DONGLE=m
++CONFIG_TEKRAM_DONGLE=m
++CONFIG_TOIM3232_DONGLE=m
++CONFIG_LITELINK_DONGLE=m
++CONFIG_MA600_DONGLE=m
++CONFIG_GIRBIL_DONGLE=m
++CONFIG_MCP2120_DONGLE=m
++CONFIG_OLD_BELKIN_DONGLE=m
++# CONFIG_ACT200L_DONGLE is not set
++CONFIG_KINGSUN_DONGLE=m
++CONFIG_KSDAZZLE_DONGLE=m
++CONFIG_KS959_DONGLE=m
++
++#
++# FIR device drivers
++#
++CONFIG_USB_IRDA=m
++CONFIG_SIGMATEL_FIR=m
++CONFIG_MCS_FIR=m
++CONFIG_BT=m
++CONFIG_BT_L2CAP=m
++CONFIG_BT_SCO=m
++CONFIG_BT_RFCOMM=m
++CONFIG_BT_RFCOMM_TTY=y
++CONFIG_BT_BNEP=m
++CONFIG_BT_BNEP_MC_FILTER=y
++CONFIG_BT_BNEP_PROTO_FILTER=y
++CONFIG_BT_HIDP=m
++
++#
++# Bluetooth device drivers
++#
++CONFIG_BT_HCIBTUSB=m
++CONFIG_BT_HCIBTSDIO=m
++CONFIG_BT_HCIUART=m
++CONFIG_BT_HCIUART_H4=y
++CONFIG_BT_HCIUART_BCSP=y
++CONFIG_BT_HCIUART_LL=y
++CONFIG_BT_HCIBCM203X=m
++CONFIG_BT_HCIBPA10X=m
++CONFIG_BT_HCIBFUSB=m
++# CONFIG_BT_HCIVHCI is not set
++# CONFIG_BT_MRVL is not set
++CONFIG_AF_RXRPC=m
++# CONFIG_AF_RXRPC_DEBUG is not set
++# CONFIG_RXKAD is not set
++CONFIG_FIB_RULES=y
++CONFIG_WIRELESS=y
++CONFIG_WIRELESS_EXT=y
++CONFIG_WEXT_CORE=y
++CONFIG_WEXT_PROC=y
++CONFIG_WEXT_SPY=y
++CONFIG_WEXT_PRIV=y
++CONFIG_CFG80211=m
++# CONFIG_NL80211_TESTMODE is not set
++# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
++# CONFIG_CFG80211_REG_DEBUG is not set
++CONFIG_CFG80211_DEFAULT_PS=y
++# CONFIG_CFG80211_DEBUGFS is not set
++CONFIG_WIRELESS_OLD_REGULATORY=y
++CONFIG_CFG80211_WEXT=y
++CONFIG_WIRELESS_EXT_SYSFS=y
++CONFIG_LIB80211=y
++CONFIG_LIB80211_CRYPT_WEP=m
++CONFIG_LIB80211_CRYPT_CCMP=m
++CONFIG_LIB80211_CRYPT_TKIP=m
++# CONFIG_LIB80211_DEBUG is not set
++CONFIG_MAC80211=m
++CONFIG_MAC80211_RC_PID=y
++# CONFIG_MAC80211_RC_MINSTREL is not set
++CONFIG_MAC80211_RC_DEFAULT_PID=y
++# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
++CONFIG_MAC80211_RC_DEFAULT="pid"
++# CONFIG_MAC80211_MESH is not set
++CONFIG_MAC80211_LEDS=y
++# CONFIG_MAC80211_DEBUGFS is not set
++# CONFIG_MAC80211_DEBUG_MENU is not set
++CONFIG_WIMAX=m
++CONFIG_WIMAX_DEBUG_LEVEL=8
++CONFIG_RFKILL=m
++CONFIG_RFKILL_LEDS=y
++CONFIG_RFKILL_INPUT=y
++CONFIG_NET_9P=m
++# CONFIG_NET_9P_DEBUG is not set
+ 
+ #
+ # Device Drivers
+@@ -414,17 +913,22 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
+ #
+ # Generic Driver Options
+ #
+-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
++CONFIG_UEVENT_HELPER_PATH=""
++CONFIG_DEVTMPFS=y
++CONFIG_DEVTMPFS_MOUNT=y
+ CONFIG_STANDALONE=y
+ CONFIG_PREVENT_FIRMWARE_BUILD=y
+-# CONFIG_FW_LOADER is not set
++CONFIG_FW_LOADER=y
++CONFIG_FIRMWARE_IN_KERNEL=y
++CONFIG_EXTRA_FIRMWARE=""
+ # CONFIG_DEBUG_DRIVER is not set
+ # CONFIG_DEBUG_DEVRES is not set
+ # CONFIG_SYS_HYPERVISOR is not set
+ # CONFIG_CONNECTOR is not set
+ CONFIG_MTD=y
+ # CONFIG_MTD_DEBUG is not set
+-# CONFIG_MTD_CONCAT is not set
++# CONFIG_MTD_TESTS is not set
++CONFIG_MTD_CONCAT=y
+ CONFIG_MTD_PARTITIONS=y
+ # CONFIG_MTD_REDBOOT_PARTS is not set
+ # CONFIG_MTD_CMDLINE_PARTS is not set
+@@ -472,6 +976,9 @@ CONFIG_MTD_CFI_I2=y
+ #
+ # Self-contained MTD device drivers
+ #
++# CONFIG_MTD_DATAFLASH is not set
++# CONFIG_MTD_M25P80 is not set
++# CONFIG_MTD_SST25L is not set
+ # CONFIG_MTD_SLRAM is not set
+ # CONFIG_MTD_PHRAM is not set
+ # CONFIG_MTD_MTDRAM is not set
+@@ -487,38 +994,82 @@ CONFIG_MTD_NAND=y
+ # CONFIG_MTD_NAND_VERIFY_WRITE is not set
+ # CONFIG_MTD_NAND_ECC_SMC is not set
+ # CONFIG_MTD_NAND_MUSEUM_IDS is not set
++# CONFIG_MTD_NAND_GPIO is not set
++CONFIG_MTD_NAND_OMAP2=y
++CONFIG_MTD_NAND_OMAP_PREFETCH=y
++# CONFIG_MTD_NAND_OMAP_PREFETCH_DMA is not set
+ CONFIG_MTD_NAND_IDS=y
+ # CONFIG_MTD_NAND_DISKONCHIP is not set
+ # CONFIG_MTD_NAND_NANDSIM is not set
+-# CONFIG_MTD_NAND_PLATFORM is not set
++CONFIG_MTD_NAND_PLATFORM=y
+ # CONFIG_MTD_ALAUDA is not set
+ # CONFIG_MTD_ONENAND is not set
+ 
+ #
++# LPDDR flash memory drivers
++#
++# CONFIG_MTD_LPDDR is not set
++
++#
+ # UBI - Unsorted block images
+ #
+-# CONFIG_MTD_UBI is not set
++CONFIG_MTD_UBI=y
++CONFIG_MTD_UBI_WL_THRESHOLD=4096
++CONFIG_MTD_UBI_BEB_RESERVE=1
++# CONFIG_MTD_UBI_GLUEBI is not set
++
++#
++# UBI debugging options
++#
++# CONFIG_MTD_UBI_DEBUG is not set
+ # CONFIG_PARPORT is not set
+ CONFIG_BLK_DEV=y
+ # CONFIG_BLK_DEV_COW_COMMON is not set
+ CONFIG_BLK_DEV_LOOP=y
+-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
++CONFIG_BLK_DEV_CRYPTOLOOP=m
++
++#
++# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
++#
+ # CONFIG_BLK_DEV_NBD is not set
+ # CONFIG_BLK_DEV_UB is not set
+ CONFIG_BLK_DEV_RAM=y
+ CONFIG_BLK_DEV_RAM_COUNT=16
+ CONFIG_BLK_DEV_RAM_SIZE=16384
+ # CONFIG_BLK_DEV_XIP is not set
+-# CONFIG_CDROM_PKTCDVD is not set
++CONFIG_CDROM_PKTCDVD=m
++CONFIG_CDROM_PKTCDVD_BUFFERS=8
++# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+ # CONFIG_ATA_OVER_ETH is not set
+-# CONFIG_MISC_DEVICES is not set
++# CONFIG_MG_DISK is not set
++CONFIG_MISC_DEVICES=y
++# CONFIG_AD525X_DPOT is not set
++# CONFIG_ICS932S401 is not set
++# CONFIG_ENCLOSURE_SERVICES is not set
++CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
++# CONFIG_ISL29003 is not set
++# CONFIG_DS1682 is not set
++# CONFIG_TI_DAC7512 is not set
++# CONFIG_C2PORT is not set
++
++#
++# EEPROM support
++#
++# CONFIG_EEPROM_AT24 is not set
++# CONFIG_EEPROM_AT25 is not set
++# CONFIG_EEPROM_LEGACY is not set
++# CONFIG_EEPROM_MAX6875 is not set
++CONFIG_EEPROM_93CX6=y
++CONFIG_IWMC3200TOP=m
++# CONFIG_IWMC3200TOP_DEBUG is not set
++# CONFIG_IWMC3200TOP_DEBUGFS is not set
+ CONFIG_HAVE_IDE=y
+ # CONFIG_IDE is not set
+ 
+ #
+ # SCSI device support
+ #
+-# CONFIG_RAID_ATTRS is not set
++CONFIG_RAID_ATTRS=m
+ CONFIG_SCSI=y
+ CONFIG_SCSI_DMA=y
+ # CONFIG_SCSI_TGT is not set
+@@ -531,14 +1082,11 @@ CONFIG_SCSI_PROC_FS=y
+ CONFIG_BLK_DEV_SD=y
+ # CONFIG_CHR_DEV_ST is not set
+ # CONFIG_CHR_DEV_OSST is not set
+-# CONFIG_BLK_DEV_SR is not set
+-# CONFIG_CHR_DEV_SG is not set
+-# CONFIG_CHR_DEV_SCH is not set
+-
+-#
+-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+-#
+-# CONFIG_SCSI_MULTI_LUN is not set
++CONFIG_BLK_DEV_SR=y
++CONFIG_BLK_DEV_SR_VENDOR=y
++CONFIG_CHR_DEV_SG=y
++CONFIG_CHR_DEV_SCH=m
++CONFIG_SCSI_MULTI_LUN=y
+ # CONFIG_SCSI_CONSTANTS is not set
+ # CONFIG_SCSI_LOGGING is not set
+ # CONFIG_SCSI_SCAN_ASYNC is not set
+@@ -549,78 +1097,277 @@ CONFIG_SCSI_WAIT_SCAN=m
+ #
+ # CONFIG_SCSI_SPI_ATTRS is not set
+ # CONFIG_SCSI_FC_ATTRS is not set
+-# CONFIG_SCSI_ISCSI_ATTRS is not set
++CONFIG_SCSI_ISCSI_ATTRS=m
++# CONFIG_SCSI_SAS_ATTRS is not set
+ # CONFIG_SCSI_SAS_LIBSAS is not set
+ # CONFIG_SCSI_SRP_ATTRS is not set
+ CONFIG_SCSI_LOWLEVEL=y
+-# CONFIG_ISCSI_TCP is not set
++CONFIG_ISCSI_TCP=m
++# CONFIG_LIBFC is not set
++# CONFIG_LIBFCOE is not set
+ # CONFIG_SCSI_DEBUG is not set
+ # CONFIG_SCSI_DH is not set
++# CONFIG_SCSI_OSD_INITIATOR is not set
+ # CONFIG_ATA is not set
+-# CONFIG_MD is not set
++CONFIG_MD=y
++CONFIG_BLK_DEV_MD=m
++CONFIG_MD_LINEAR=m
++CONFIG_MD_RAID0=m
++CONFIG_MD_RAID1=m
++CONFIG_MD_RAID10=m
++CONFIG_MD_RAID456=m
++CONFIG_MD_RAID6_PQ=m
++# CONFIG_ASYNC_RAID6_TEST is not set
++CONFIG_MD_MULTIPATH=m
++CONFIG_MD_FAULTY=m
++CONFIG_BLK_DEV_DM=m
++# CONFIG_DM_DEBUG is not set
++CONFIG_DM_CRYPT=m
++CONFIG_DM_SNAPSHOT=m
++CONFIG_DM_MIRROR=m
++# CONFIG_DM_LOG_USERSPACE is not set
++CONFIG_DM_ZERO=m
++CONFIG_DM_MULTIPATH=m
++# CONFIG_DM_MULTIPATH_QL is not set
++# CONFIG_DM_MULTIPATH_ST is not set
++CONFIG_DM_DELAY=m
++# CONFIG_DM_UEVENT is not set
+ CONFIG_NETDEVICES=y
+-# CONFIG_DUMMY is not set
+-# CONFIG_BONDING is not set
+-# CONFIG_MACVLAN is not set
+-# CONFIG_EQUALIZER is not set
+-# CONFIG_TUN is not set
+-# CONFIG_VETH is not set
+-# CONFIG_NET_ETHERNET is not set
++CONFIG_DUMMY=m
++CONFIG_BONDING=m
++CONFIG_MACVLAN=m
++CONFIG_EQUALIZER=m
++CONFIG_TUN=m
++CONFIG_VETH=m
++CONFIG_PHYLIB=y
++
++#
++# MII PHY device drivers
++#
++# CONFIG_MARVELL_PHY is not set
++# CONFIG_DAVICOM_PHY is not set
++# CONFIG_QSEMI_PHY is not set
++# CONFIG_LXT_PHY is not set
++# CONFIG_CICADA_PHY is not set
++# CONFIG_VITESSE_PHY is not set
++# CONFIG_SMSC_PHY is not set
++# CONFIG_BROADCOM_PHY is not set
++# CONFIG_ICPLUS_PHY is not set
++# CONFIG_REALTEK_PHY is not set
++# CONFIG_NATIONAL_PHY is not set
++# CONFIG_STE10XP is not set
++# CONFIG_LSI_ET1011C_PHY is not set
++# CONFIG_FIXED_PHY is not set
++# CONFIG_MDIO_BITBANG is not set
++CONFIG_NET_ETHERNET=y
++CONFIG_MII=y
++# CONFIG_AX88796 is not set
++# CONFIG_SMC91X is not set
++# CONFIG_TI_DAVINCI_EMAC is not set
++# CONFIG_DM9000 is not set
++CONFIG_ENC28J60=y
++# CONFIG_ENC28J60_WRITEVERIFY is not set
++# CONFIG_ETHOC is not set
++CONFIG_SMC911X=y
++CONFIG_SMSC911X=y
++# CONFIG_DNET is not set
++# CONFIG_IBM_NEW_EMAC_ZMII is not set
++# CONFIG_IBM_NEW_EMAC_RGMII is not set
++# CONFIG_IBM_NEW_EMAC_TAH is not set
++# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
++# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
++# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
++# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
++# CONFIG_B44 is not set
++# CONFIG_KS8842 is not set
++CONFIG_KS8851=y
++# CONFIG_KS8851_MLL is not set
+ # CONFIG_NETDEV_1000 is not set
+ # CONFIG_NETDEV_10000 is not set
+-
+-#
+-# Wireless LAN
+-#
+-# CONFIG_WLAN_PRE80211 is not set
+-# CONFIG_WLAN_80211 is not set
+-# CONFIG_IWLWIFI_LEDS is not set
++CONFIG_WLAN=y
++# CONFIG_LIBERTAS_THINFIRM is not set
++CONFIG_AT76C50X_USB=m
++CONFIG_USB_ZD1201=m
++CONFIG_USB_NET_RNDIS_WLAN=m
++CONFIG_RTL8187=m
++CONFIG_RTL8187_LEDS=y
++# CONFIG_MAC80211_HWSIM is not set
++# CONFIG_ATH_COMMON is not set
++CONFIG_B43=m
++# CONFIG_B43_SDIO is not set
++CONFIG_B43_PHY_LP=y
++CONFIG_B43_LEDS=y
++CONFIG_B43_HWRNG=y
++# CONFIG_B43_DEBUG is not set
++# CONFIG_B43LEGACY is not set
++CONFIG_HOSTAP=m
++CONFIG_HOSTAP_FIRMWARE=y
++CONFIG_HOSTAP_FIRMWARE_NVRAM=y
++# CONFIG_IWM is not set
++CONFIG_LIBERTAS=m
++CONFIG_LIBERTAS_USB=m
++# CONFIG_LIBERTAS_SDIO is not set
++# CONFIG_LIBERTAS_SPI is not set
++# CONFIG_LIBERTAS_DEBUG is not set
++CONFIG_P54_COMMON=m
++CONFIG_P54_USB=m
++# CONFIG_P54_SPI is not set
++CONFIG_P54_LEDS=y
++CONFIG_RT2X00=m
++CONFIG_RT2500USB=m
++CONFIG_RT73USB=m
++# CONFIG_RT2800USB is not set
++CONFIG_RT2X00_LIB_USB=m
++CONFIG_RT2X00_LIB=m
++CONFIG_RT2X00_LIB_FIRMWARE=y
++CONFIG_RT2X00_LIB_CRYPTO=y
++CONFIG_RT2X00_LIB_LEDS=y
++# CONFIG_RT2X00_DEBUG is not set
++CONFIG_WL12XX=m
++CONFIG_WL1251=m
++CONFIG_WL1251_SPI=m
++CONFIG_WL1251_SDIO=m
++CONFIG_WL1271=m
++CONFIG_ZD1211RW=m
++# CONFIG_ZD1211RW_DEBUG is not set
++
++#
++# WiMAX Wireless Broadband devices
++#
++CONFIG_WIMAX_I2400M=m
++CONFIG_WIMAX_I2400M_USB=m
++CONFIG_WIMAX_I2400M_SDIO=m
++CONFIG_WIMAX_IWMC3200_SDIO=y
++CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+ 
+ #
+ # USB Network Adapters
+ #
+-# CONFIG_USB_CATC is not set
+-# CONFIG_USB_KAWETH is not set
+-# CONFIG_USB_PEGASUS is not set
+-# CONFIG_USB_RTL8150 is not set
+-# CONFIG_USB_USBNET is not set
++CONFIG_USB_CATC=y
++CONFIG_USB_KAWETH=y
++CONFIG_USB_PEGASUS=y
++CONFIG_USB_RTL8150=y
++CONFIG_USB_USBNET=y
++CONFIG_USB_NET_AX8817X=y
++CONFIG_USB_NET_CDCETHER=y
++CONFIG_USB_NET_CDC_EEM=y
++CONFIG_USB_NET_DM9601=y
++CONFIG_USB_NET_SMSC95XX=y
++CONFIG_USB_NET_GL620A=y
++CONFIG_USB_NET_NET1080=y
++CONFIG_USB_NET_PLUSB=y
++CONFIG_USB_NET_MCS7830=y
++CONFIG_USB_NET_RNDIS_HOST=y
++CONFIG_USB_NET_CDC_SUBSET=y
++CONFIG_USB_ALI_M5632=y
++CONFIG_USB_AN2720=y
++CONFIG_USB_BELKIN=y
++CONFIG_USB_ARMLINUX=y
++CONFIG_USB_EPSON2888=y
++CONFIG_USB_KC2190=y
++CONFIG_USB_NET_ZAURUS=y
++CONFIG_USB_HSO=m
++CONFIG_USB_NET_INT51X1=m
+ # CONFIG_WAN is not set
+-# CONFIG_PPP is not set
++CONFIG_ATM_DRIVERS=y
++# CONFIG_ATM_DUMMY is not set
++# CONFIG_ATM_TCP is not set
++CONFIG_PPP=m
++CONFIG_PPP_MULTILINK=y
++CONFIG_PPP_FILTER=y
++CONFIG_PPP_ASYNC=m
++CONFIG_PPP_SYNC_TTY=m
++CONFIG_PPP_DEFLATE=m
++CONFIG_PPP_BSDCOMP=m
++CONFIG_PPP_MPPE=m
++CONFIG_PPPOE=m
++# CONFIG_PPPOATM is not set
++CONFIG_PPPOL2TP=m
+ # CONFIG_SLIP is not set
+-# CONFIG_NETCONSOLE is not set
+-# CONFIG_NETPOLL is not set
+-# CONFIG_NET_POLL_CONTROLLER is not set
++CONFIG_SLHC=m
++CONFIG_NETCONSOLE=m
++CONFIG_NETCONSOLE_DYNAMIC=y
++CONFIG_NETPOLL=y
++CONFIG_NETPOLL_TRAP=y
++CONFIG_NET_POLL_CONTROLLER=y
+ # CONFIG_ISDN is not set
++# CONFIG_PHONE is not set
+ 
+ #
+ # Input device support
+ #
+ CONFIG_INPUT=y
+-# CONFIG_INPUT_FF_MEMLESS is not set
+-# CONFIG_INPUT_POLLDEV is not set
++CONFIG_INPUT_FF_MEMLESS=y
++CONFIG_INPUT_POLLDEV=y
++# CONFIG_INPUT_SPARSEKMAP is not set
+ 
+ #
+ # Userland interfaces
+ #
+-# CONFIG_INPUT_MOUSEDEV is not set
++CONFIG_INPUT_MOUSEDEV=y
++CONFIG_INPUT_MOUSEDEV_PSAUX=y
++CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+ # CONFIG_INPUT_JOYDEV is not set
+-# CONFIG_INPUT_EVDEV is not set
++CONFIG_INPUT_EVDEV=y
+ # CONFIG_INPUT_EVBUG is not set
+ 
+ #
+ # Input Device Drivers
+ #
+-# CONFIG_INPUT_KEYBOARD is not set
+-# CONFIG_INPUT_MOUSE is not set
++CONFIG_INPUT_KEYBOARD=y
++# CONFIG_KEYBOARD_ADP5588 is not set
++# CONFIG_KEYBOARD_ATKBD is not set
++# CONFIG_QT2160 is not set
++# CONFIG_KEYBOARD_LKKBD is not set
++CONFIG_KEYBOARD_GPIO=y
++# CONFIG_KEYBOARD_TCA6416 is not set
++# CONFIG_KEYBOARD_MATRIX is not set
++# CONFIG_KEYBOARD_LM8323 is not set
++# CONFIG_KEYBOARD_MAX7359 is not set
++# CONFIG_KEYBOARD_NEWTON is not set
++# CONFIG_KEYBOARD_OPENCORES is not set
++# CONFIG_KEYBOARD_STOWAWAY is not set
++# CONFIG_KEYBOARD_SUNKBD is not set
++# CONFIG_KEYBOARD_TWL4030 is not set
++# CONFIG_KEYBOARD_XTKBD is not set
++CONFIG_INPUT_MOUSE=y
++CONFIG_MOUSE_PS2=y
++CONFIG_MOUSE_PS2_ALPS=y
++CONFIG_MOUSE_PS2_LOGIPS2PP=y
++CONFIG_MOUSE_PS2_SYNAPTICS=y
++CONFIG_MOUSE_PS2_TRACKPOINT=y
++# CONFIG_MOUSE_PS2_ELANTECH is not set
++# CONFIG_MOUSE_PS2_SENTELIC is not set
++# CONFIG_MOUSE_PS2_TOUCHKIT is not set
++# CONFIG_MOUSE_SERIAL is not set
++# CONFIG_MOUSE_APPLETOUCH is not set
++# CONFIG_MOUSE_BCM5974 is not set
++# CONFIG_MOUSE_VSXXXAA is not set
++# CONFIG_MOUSE_GPIO is not set
++# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+ # CONFIG_INPUT_JOYSTICK is not set
+ # CONFIG_INPUT_TABLET is not set
+ # CONFIG_INPUT_TOUCHSCREEN is not set
+-# CONFIG_INPUT_MISC is not set
++CONFIG_INPUT_MISC=y
++# CONFIG_INPUT_ATI_REMOTE is not set
++# CONFIG_INPUT_ATI_REMOTE2 is not set
++# CONFIG_INPUT_KEYSPAN_REMOTE is not set
++# CONFIG_INPUT_POWERMATE is not set
++# CONFIG_INPUT_YEALINK is not set
++# CONFIG_INPUT_CM109 is not set
++CONFIG_INPUT_TWL4030_PWRBUTTON=y
++CONFIG_INPUT_UINPUT=y
++# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+ 
+ #
+ # Hardware I/O ports
+ #
+-# CONFIG_SERIO is not set
++CONFIG_SERIO=y
++CONFIG_SERIO_SERPORT=y
++CONFIG_SERIO_LIBPS2=y
++# CONFIG_SERIO_RAW is not set
++# CONFIG_SERIO_ALTERA_PS2 is not set
+ # CONFIG_GAMEPORT is not set
+ 
+ #
+@@ -630,7 +1377,7 @@ CONFIG_VT=y
+ CONFIG_CONSOLE_TRANSLATIONS=y
+ CONFIG_VT_CONSOLE=y
+ CONFIG_HW_CONSOLE=y
+-# CONFIG_VT_HW_CONSOLE_BINDING is not set
++CONFIG_VT_HW_CONSOLE_BINDING=y
+ CONFIG_DEVKMEM=y
+ # CONFIG_SERIAL_NONSTANDARD is not set
+ 
+@@ -650,18 +1397,21 @@ CONFIG_SERIAL_8250_RSA=y
+ #
+ # Non-8250 serial port support
+ #
++# CONFIG_SERIAL_MAX3100 is not set
+ CONFIG_SERIAL_CORE=y
+ CONFIG_SERIAL_CORE_CONSOLE=y
+ CONFIG_UNIX98_PTYS=y
++# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+ # CONFIG_LEGACY_PTYS is not set
+ # CONFIG_IPMI_HANDLER is not set
+ CONFIG_HW_RANDOM=y
+-# CONFIG_NVRAM is not set
++# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+ # CONFIG_R3964 is not set
+ # CONFIG_RAW_DRIVER is not set
+ # CONFIG_TCG_TPM is not set
+ CONFIG_I2C=y
+ CONFIG_I2C_BOARDINFO=y
++CONFIG_I2C_COMPAT=y
+ CONFIG_I2C_CHARDEV=y
+ CONFIG_I2C_HELPER_AUTO=y
+ 
+@@ -672,6 +1422,7 @@ CONFIG_I2C_HELPER_AUTO=y
+ #
+ # I2C system bus drivers (mostly embedded / system-on-chip)
+ #
++# CONFIG_I2C_DESIGNWARE is not set
+ # CONFIG_I2C_GPIO is not set
+ # CONFIG_I2C_OCORES is not set
+ CONFIG_I2C_OMAP=y
+@@ -693,26 +1444,41 @@ CONFIG_I2C_OMAP=y
+ #
+ # Miscellaneous I2C Chip support
+ #
+-# CONFIG_DS1682 is not set
+-# CONFIG_EEPROM_AT24 is not set
+-# CONFIG_EEPROM_LEGACY is not set
+-# CONFIG_SENSORS_PCF8574 is not set
+-# CONFIG_PCF8575 is not set
+-# CONFIG_SENSORS_PCA9539 is not set
+-# CONFIG_SENSORS_PCF8591 is not set
+-# CONFIG_ISP1301_OMAP is not set
+-# CONFIG_TPS65010 is not set
+-# CONFIG_SENSORS_MAX6875 is not set
+ # CONFIG_SENSORS_TSL2550 is not set
+ # CONFIG_I2C_DEBUG_CORE is not set
+ # CONFIG_I2C_DEBUG_ALGO is not set
+ # CONFIG_I2C_DEBUG_BUS is not set
+ # CONFIG_I2C_DEBUG_CHIP is not set
+-# CONFIG_SPI is not set
++CONFIG_SPI=y
++# CONFIG_SPI_DEBUG is not set
++CONFIG_SPI_MASTER=y
++
++#
++# SPI Master Controller Drivers
++#
++# CONFIG_SPI_BITBANG is not set
++# CONFIG_SPI_GPIO is not set
++CONFIG_SPI_OMAP24XX=y
++# CONFIG_SPI_XILINX is not set
++
++#
++# SPI Protocol Masters
++#
++CONFIG_SPI_SPIDEV=y
++# CONFIG_SPI_TLE62X0 is not set
++
++#
++# PPS support
++#
++# CONFIG_PPS is not set
+ CONFIG_ARCH_REQUIRE_GPIOLIB=y
+ CONFIG_GPIOLIB=y
+ # CONFIG_DEBUG_GPIO is not set
+-# CONFIG_GPIO_SYSFS is not set
++CONFIG_GPIO_SYSFS=y
++
++#
++# Memory mapped GPIO expanders:
++#
+ 
+ #
+ # I2C GPIO expanders:
+@@ -729,49 +1495,469 @@ CONFIG_GPIO_TWL4030=y
+ #
+ # SPI GPIO expanders:
+ #
++# CONFIG_GPIO_MAX7301 is not set
++# CONFIG_GPIO_MCP23S08 is not set
++# CONFIG_GPIO_MC33880 is not set
++
++#
++# AC97 GPIO expanders:
++#
+ # CONFIG_W1 is not set
+-# CONFIG_POWER_SUPPLY is not set
+-# CONFIG_HWMON is not set
+-# CONFIG_THERMAL is not set
+-# CONFIG_THERMAL_HWMON is not set
+-# CONFIG_WATCHDOG is not set
++CONFIG_POWER_SUPPLY=m
++# CONFIG_POWER_SUPPLY_DEBUG is not set
++# CONFIG_PDA_POWER is not set
++# CONFIG_BATTERY_DS2760 is not set
++# CONFIG_BATTERY_DS2782 is not set
++# CONFIG_BATTERY_BQ27x00 is not set
++# CONFIG_BATTERY_MAX17040 is not set
++CONFIG_HWMON=y
++# CONFIG_HWMON_VID is not set
++# CONFIG_HWMON_DEBUG_CHIP is not set
++
++#
++# Native drivers
++#
++# CONFIG_SENSORS_AD7414 is not set
++# CONFIG_SENSORS_AD7418 is not set
++# CONFIG_SENSORS_ADCXX is not set
++# CONFIG_SENSORS_ADM1021 is not set
++# CONFIG_SENSORS_ADM1025 is not set
++# CONFIG_SENSORS_ADM1026 is not set
++# CONFIG_SENSORS_ADM1029 is not set
++# CONFIG_SENSORS_ADM1031 is not set
++# CONFIG_SENSORS_ADM9240 is not set
++# CONFIG_SENSORS_ADT7462 is not set
++# CONFIG_SENSORS_ADT7470 is not set
++# CONFIG_SENSORS_ADT7473 is not set
++# CONFIG_SENSORS_ADT7475 is not set
++# CONFIG_SENSORS_ATXP1 is not set
++# CONFIG_SENSORS_DS1621 is not set
++# CONFIG_SENSORS_F71805F is not set
++# CONFIG_SENSORS_F71882FG is not set
++# CONFIG_SENSORS_F75375S is not set
++# CONFIG_SENSORS_G760A is not set
++# CONFIG_SENSORS_GL518SM is not set
++# CONFIG_SENSORS_GL520SM is not set
++# CONFIG_SENSORS_IT87 is not set
++# CONFIG_SENSORS_LM63 is not set
++# CONFIG_SENSORS_LM70 is not set
++# CONFIG_SENSORS_LM73 is not set
++# CONFIG_SENSORS_LM75 is not set
++# CONFIG_SENSORS_LM77 is not set
++# CONFIG_SENSORS_LM78 is not set
++# CONFIG_SENSORS_LM80 is not set
++# CONFIG_SENSORS_LM83 is not set
++# CONFIG_SENSORS_LM85 is not set
++# CONFIG_SENSORS_LM87 is not set
++# CONFIG_SENSORS_LM90 is not set
++# CONFIG_SENSORS_LM92 is not set
++# CONFIG_SENSORS_LM93 is not set
++# CONFIG_SENSORS_LTC4215 is not set
++# CONFIG_SENSORS_LTC4245 is not set
++# CONFIG_SENSORS_LM95241 is not set
++# CONFIG_SENSORS_MAX1111 is not set
++# CONFIG_SENSORS_MAX1619 is not set
++# CONFIG_SENSORS_MAX6650 is not set
++# CONFIG_SENSORS_PC87360 is not set
++# CONFIG_SENSORS_PC87427 is not set
++# CONFIG_SENSORS_PCF8591 is not set
++# CONFIG_SENSORS_SHT15 is not set
++# CONFIG_SENSORS_DME1737 is not set
++# CONFIG_SENSORS_SMSC47M1 is not set
++# CONFIG_SENSORS_SMSC47M192 is not set
++# CONFIG_SENSORS_SMSC47B397 is not set
++# CONFIG_SENSORS_ADS7828 is not set
++# CONFIG_SENSORS_THMC50 is not set
++# CONFIG_SENSORS_TMP401 is not set
++# CONFIG_SENSORS_TMP421 is not set
++# CONFIG_SENSORS_VT1211 is not set
++# CONFIG_SENSORS_W83781D is not set
++# CONFIG_SENSORS_W83791D is not set
++# CONFIG_SENSORS_W83792D is not set
++# CONFIG_SENSORS_W83793 is not set
++# CONFIG_SENSORS_W83L785TS is not set
++# CONFIG_SENSORS_W83L786NG is not set
++# CONFIG_SENSORS_W83627HF is not set
++# CONFIG_SENSORS_W83627EHF is not set
++# CONFIG_SENSORS_LIS3_SPI is not set
++CONFIG_THERMAL=y
++CONFIG_THERMAL_HWMON=y
++CONFIG_WATCHDOG=y
++CONFIG_WATCHDOG_NOWAYOUT=y
++
++#
++# Watchdog Device Drivers
++#
++# CONFIG_SOFT_WATCHDOG is not set
++CONFIG_OMAP_WATCHDOG=y
++# CONFIG_TWL4030_WATCHDOG is not set
++
++#
++# USB-based Watchdog Cards
++#
++# CONFIG_USBPCWATCHDOG is not set
++CONFIG_SSB_POSSIBLE=y
+ 
+ #
+ # Sonics Silicon Backplane
+ #
+-CONFIG_SSB_POSSIBLE=y
+-# CONFIG_SSB is not set
++CONFIG_SSB=y
++CONFIG_SSB_SDIOHOST_POSSIBLE=y
++# CONFIG_SSB_SDIOHOST is not set
++# CONFIG_SSB_SILENT is not set
++# CONFIG_SSB_DEBUG is not set
+ 
+ #
+ # Multifunction device drivers
+ #
+-# CONFIG_MFD_CORE is not set
++CONFIG_MFD_CORE=y
+ # CONFIG_MFD_SM501 is not set
++# CONFIG_MFD_ASIC3 is not set
+ # CONFIG_HTC_EGPIO is not set
+ # CONFIG_HTC_PASIC3 is not set
++# CONFIG_TPS65010 is not set
+ CONFIG_TWL4030_CORE=y
+-# CONFIG_UCB1400_CORE is not set
++CONFIG_TWL4030_POWER=y
++CONFIG_TWL4030_CODEC=y
++# CONFIG_TWL4030_MADC is not set
+ # CONFIG_MFD_TMIO is not set
+ # CONFIG_MFD_T7L66XB is not set
+ # CONFIG_MFD_TC6387XB is not set
+ # CONFIG_MFD_TC6393XB is not set
+-
+-#
+-# Multimedia devices
+-#
++# CONFIG_PMIC_DA903X is not set
++# CONFIG_PMIC_ADP5520 is not set
++# CONFIG_MFD_WM8400 is not set
++# CONFIG_MFD_WM831X is not set
++# CONFIG_MFD_WM8350_I2C is not set
++# CONFIG_MFD_PCF50633 is not set
++# CONFIG_MFD_MC13783 is not set
++# CONFIG_AB3100_CORE is not set
++# CONFIG_EZX_PCAP is not set
++# CONFIG_MFD_88PM8607 is not set
++# CONFIG_AB4500_CORE is not set
++CONFIG_REGULATOR=y
++# CONFIG_REGULATOR_DEBUG is not set
++# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
++# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
++# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
++# CONFIG_REGULATOR_BQ24022 is not set
++# CONFIG_REGULATOR_MAX1586 is not set
++CONFIG_REGULATOR_TWL4030=y
++# CONFIG_REGULATOR_LP3971 is not set
++# CONFIG_REGULATOR_TPS65023 is not set
++# CONFIG_REGULATOR_TPS6507X is not set
++CONFIG_MEDIA_SUPPORT=y
+ 
+ #
+ # Multimedia core support
+ #
+-# CONFIG_VIDEO_DEV is not set
+-# CONFIG_DVB_CORE is not set
+-# CONFIG_VIDEO_MEDIA is not set
++CONFIG_VIDEO_DEV=y
++CONFIG_VIDEO_V4L2_COMMON=y
++CONFIG_VIDEO_ALLOW_V4L1=y
++CONFIG_VIDEO_V4L1_COMPAT=y
++CONFIG_DVB_CORE=m
++CONFIG_VIDEO_MEDIA=m
+ 
+ #
+ # Multimedia drivers
+ #
+-CONFIG_DAB=y
+-# CONFIG_USB_DABUSB is not set
++CONFIG_MEDIA_ATTACH=y
++CONFIG_MEDIA_TUNER=m
++CONFIG_MEDIA_TUNER_CUSTOMISE=y
++CONFIG_MEDIA_TUNER_SIMPLE=m
++CONFIG_MEDIA_TUNER_TDA8290=m
++CONFIG_MEDIA_TUNER_TDA827X=m
++CONFIG_MEDIA_TUNER_TDA18271=m
++CONFIG_MEDIA_TUNER_TDA9887=m
++CONFIG_MEDIA_TUNER_TEA5761=m
++CONFIG_MEDIA_TUNER_TEA5767=m
++CONFIG_MEDIA_TUNER_MT20XX=m
++CONFIG_MEDIA_TUNER_MT2060=m
++CONFIG_MEDIA_TUNER_MT2266=m
++CONFIG_MEDIA_TUNER_MT2131=m
++CONFIG_MEDIA_TUNER_QT1010=m
++CONFIG_MEDIA_TUNER_XC2028=m
++CONFIG_MEDIA_TUNER_XC5000=m
++CONFIG_MEDIA_TUNER_MXL5005S=m
++CONFIG_MEDIA_TUNER_MXL5007T=m
++CONFIG_MEDIA_TUNER_MC44S803=m
++CONFIG_MEDIA_TUNER_MAX2165=m
++CONFIG_VIDEO_V4L2=y
++CONFIG_VIDEO_V4L1=y
++CONFIG_VIDEOBUF_GEN=y
++CONFIG_VIDEOBUF_DMA_SG=y
++CONFIG_VIDEOBUF_VMALLOC=m
++CONFIG_VIDEOBUF_DMA_CONTIG=y
++CONFIG_VIDEOBUF_DVB=m
++CONFIG_VIDEO_IR=m
++CONFIG_VIDEO_TVEEPROM=m
++CONFIG_VIDEO_TUNER=m
++CONFIG_VIDEO_CAPTURE_DRIVERS=y
++# CONFIG_VIDEO_ADV_DEBUG is not set
++# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
++# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
++CONFIG_VIDEO_IR_I2C=m
++
++#
++# Encoders/decoders and other helper chips
++#
++
++#
++# Audio decoders
++#
++# CONFIG_VIDEO_TVAUDIO is not set
++# CONFIG_VIDEO_TDA7432 is not set
++# CONFIG_VIDEO_TDA9840 is not set
++# CONFIG_VIDEO_TDA9875 is not set
++# CONFIG_VIDEO_TEA6415C is not set
++# CONFIG_VIDEO_TEA6420 is not set
++CONFIG_VIDEO_MSP3400=m
++# CONFIG_VIDEO_CS5345 is not set
++CONFIG_VIDEO_CS53L32A=m
++# CONFIG_VIDEO_M52790 is not set
++# CONFIG_VIDEO_TLV320AIC23B is not set
++CONFIG_VIDEO_WM8775=m
++# CONFIG_VIDEO_WM8739 is not set
++# CONFIG_VIDEO_VP27SMPX is not set
++
++#
++# RDS decoders
++#
++# CONFIG_VIDEO_SAA6588 is not set
++
++#
++# Video decoders
++#
++# CONFIG_VIDEO_ADV7180 is not set
++# CONFIG_VIDEO_BT819 is not set
++# CONFIG_VIDEO_BT856 is not set
++# CONFIG_VIDEO_BT866 is not set
++# CONFIG_VIDEO_KS0127 is not set
++# CONFIG_VIDEO_OV7670 is not set
++CONFIG_VIDEO_MT9V011=m
++# CONFIG_VIDEO_TCM825X is not set
++CONFIG_VIDEO_MT9P012=m
++# CONFIG_VIDEO_MT9T111 is not set
++# CONFIG_VIDEO_DW9710 is not set
++# CONFIG_VIDEO_OV3640 is not set
++# CONFIG_VIDEO_IMX046 is not set
++# CONFIG_VIDEO_LV8093 is not set
++# CONFIG_VIDEO_SAA7110 is not set
++CONFIG_VIDEO_SAA711X=m
++# CONFIG_VIDEO_SAA717X is not set
++# CONFIG_VIDEO_SAA7191 is not set
++# CONFIG_VIDEO_TVP514X is not set
++# CONFIG_VIDEO_TVP5150 is not set
++# CONFIG_VIDEO_VPX3220 is not set
++
++#
++# Video and audio decoders
++#
++CONFIG_VIDEO_CX25840=m
++
++#
++# MPEG video encoders
++#
++CONFIG_VIDEO_CX2341X=m
++
++#
++# Video encoders
++#
++# CONFIG_VIDEO_SAA7127 is not set
++# CONFIG_VIDEO_SAA7185 is not set
++# CONFIG_VIDEO_ADV7170 is not set
++# CONFIG_VIDEO_ADV7175 is not set
++# CONFIG_VIDEO_THS7303 is not set
++# CONFIG_VIDEO_ADV7343 is not set
++
++#
++# Video improvement chips
++#
++# CONFIG_VIDEO_UPD64031A is not set
++# CONFIG_VIDEO_UPD64083 is not set
++CONFIG_VIDEO_VIVI=m
++# CONFIG_VIDEO_CPIA is not set
++# CONFIG_VIDEO_CPIA2 is not set
++# CONFIG_VIDEO_SAA5246A is not set
++# CONFIG_VIDEO_SAA5249 is not set
++# CONFIG_VIDEO_AU0828 is not set
++CONFIG_TI_MEDIA=y
++CONFIG_VIDEO_VPSS_SYSTEM=y
++CONFIG_VIDEO_VPFE_CAPTURE=y
++# CONFIG_VIDEO_DM6446_CCDC is not set
++# CONFIG_VIDEO_DM355_CCDC is not set
++CONFIG_VIDEO_OMAP2_VOUT=y
++CONFIG_VIDEO_OMAP3=y
++CONFIG_VIDEO_OMAP3_ISP=y
++CONFIG_VIDEO_OMAP34XX_ISP_PREVIEWER=y
++CONFIG_VIDEO_OMAP34XX_ISP_RESIZER=y
++# CONFIG_SOC_CAMERA is not set
++CONFIG_V4L_USB_DRIVERS=y
++CONFIG_USB_VIDEO_CLASS=m
++CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
++CONFIG_USB_GSPCA=m
++CONFIG_USB_M5602=m
++CONFIG_USB_STV06XX=m
++# CONFIG_USB_GL860 is not set
++CONFIG_USB_GSPCA_CONEX=m
++CONFIG_USB_GSPCA_ETOMS=m
++CONFIG_USB_GSPCA_FINEPIX=m
++# CONFIG_USB_GSPCA_JEILINJ is not set
++CONFIG_USB_GSPCA_MARS=m
++# CONFIG_USB_GSPCA_MR97310A is not set
++CONFIG_USB_GSPCA_OV519=m
++CONFIG_USB_GSPCA_OV534=m
++CONFIG_USB_GSPCA_PAC207=m
++# CONFIG_USB_GSPCA_PAC7302 is not set
++CONFIG_USB_GSPCA_PAC7311=m
++# CONFIG_USB_GSPCA_SN9C20X is not set
++CONFIG_USB_GSPCA_SONIXB=m
++CONFIG_USB_GSPCA_SONIXJ=m
++CONFIG_USB_GSPCA_SPCA500=m
++CONFIG_USB_GSPCA_SPCA501=m
++CONFIG_USB_GSPCA_SPCA505=m
++CONFIG_USB_GSPCA_SPCA506=m
++CONFIG_USB_GSPCA_SPCA508=m
++CONFIG_USB_GSPCA_SPCA561=m
++# CONFIG_USB_GSPCA_SQ905 is not set
++# CONFIG_USB_GSPCA_SQ905C is not set
++CONFIG_USB_GSPCA_STK014=m
++# CONFIG_USB_GSPCA_STV0680 is not set
++CONFIG_USB_GSPCA_SUNPLUS=m
++CONFIG_USB_GSPCA_T613=m
++CONFIG_USB_GSPCA_TV8532=m
++CONFIG_USB_GSPCA_VC032X=m
++CONFIG_USB_GSPCA_ZC3XX=m
++CONFIG_VIDEO_PVRUSB2=m
++CONFIG_VIDEO_PVRUSB2_SYSFS=y
++CONFIG_VIDEO_PVRUSB2_DVB=y
++# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
++CONFIG_VIDEO_HDPVR=m
++CONFIG_VIDEO_EM28XX=m
++CONFIG_VIDEO_EM28XX_ALSA=m
++CONFIG_VIDEO_EM28XX_DVB=m
++CONFIG_VIDEO_CX231XX=m
++# CONFIG_VIDEO_CX231XX_ALSA is not set
++CONFIG_VIDEO_CX231XX_DVB=m
++CONFIG_VIDEO_USBVISION=m
++CONFIG_VIDEO_USBVIDEO=m
++CONFIG_USB_VICAM=m
++CONFIG_USB_IBMCAM=m
++CONFIG_USB_KONICAWC=m
++CONFIG_USB_QUICKCAM_MESSENGER=m
++CONFIG_USB_ET61X251=m
++CONFIG_VIDEO_OVCAMCHIP=m
++CONFIG_USB_W9968CF=m
++CONFIG_USB_OV511=m
++CONFIG_USB_SE401=m
++CONFIG_USB_SN9C102=m
++CONFIG_USB_STV680=m
++CONFIG_USB_ZC0301=m
++CONFIG_USB_PWC=m
++# CONFIG_USB_PWC_DEBUG is not set
++CONFIG_USB_PWC_INPUT_EVDEV=y
++CONFIG_USB_ZR364XX=m
++CONFIG_USB_STKWEBCAM=m
++CONFIG_USB_S2255=m
++CONFIG_RADIO_ADAPTERS=y
++# CONFIG_I2C_SI4713 is not set
++# CONFIG_RADIO_SI4713 is not set
++# CONFIG_USB_DSBR is not set
++# CONFIG_RADIO_SI470X is not set
++# CONFIG_USB_MR800 is not set
++# CONFIG_RADIO_TEA5764 is not set
++# CONFIG_RADIO_TEF6862 is not set
++CONFIG_DVB_MAX_ADAPTERS=8
++CONFIG_DVB_DYNAMIC_MINORS=y
++CONFIG_DVB_CAPTURE_DRIVERS=y
++# CONFIG_TTPCI_EEPROM is not set
++
++#
++# Supported USB Adapters
++#
++CONFIG_DVB_USB=m
++# CONFIG_DVB_USB_DEBUG is not set
++CONFIG_DVB_USB_A800=m
++CONFIG_DVB_USB_DIBUSB_MB=m
++# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
++CONFIG_DVB_USB_DIBUSB_MC=m
++CONFIG_DVB_USB_DIB0700=m
++CONFIG_DVB_USB_UMT_010=m
++CONFIG_DVB_USB_CXUSB=m
++CONFIG_DVB_USB_M920X=m
++CONFIG_DVB_USB_GL861=m
++CONFIG_DVB_USB_AU6610=m
++CONFIG_DVB_USB_DIGITV=m
++CONFIG_DVB_USB_VP7045=m
++CONFIG_DVB_USB_VP702X=m
++CONFIG_DVB_USB_GP8PSK=m
++CONFIG_DVB_USB_NOVA_T_USB2=m
++CONFIG_DVB_USB_TTUSB2=m
++CONFIG_DVB_USB_DTT200U=m
++CONFIG_DVB_USB_OPERA1=m
++CONFIG_DVB_USB_AF9005=m
++CONFIG_DVB_USB_AF9005_REMOTE=m
++CONFIG_DVB_USB_DW2102=m
++CONFIG_DVB_USB_CINERGY_T2=m
++CONFIG_DVB_USB_ANYSEE=m
++CONFIG_DVB_USB_DTV5100=m
++CONFIG_DVB_USB_AF9015=m
++# CONFIG_DVB_USB_CE6230 is not set
++# CONFIG_DVB_USB_FRIIO is not set
++# CONFIG_DVB_USB_EC168 is not set
++# CONFIG_SMS_SIANO_MDTV is not set
++
++#
++# Supported FlexCopII (B2C2) Adapters
++#
++CONFIG_DVB_B2C2_FLEXCOP=m
++CONFIG_DVB_B2C2_FLEXCOP_USB=m
++# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
++
++#
++# Supported DVB Frontends
++#
++# CONFIG_DVB_FE_CUSTOMISE is not set
++CONFIG_DVB_CX24123=m
++CONFIG_DVB_MT312=m
++CONFIG_DVB_ZL10039=m
++CONFIG_DVB_S5H1420=m
++CONFIG_DVB_STV0288=m
++CONFIG_DVB_STB6000=m
++CONFIG_DVB_STV0299=m
++CONFIG_DVB_TDA10086=m
++CONFIG_DVB_TUNER_ITD1000=m
++CONFIG_DVB_TUNER_CX24113=m
++CONFIG_DVB_TDA826X=m
++CONFIG_DVB_CX24116=m
++CONFIG_DVB_SI21XX=m
++CONFIG_DVB_CX22702=m
++CONFIG_DVB_TDA1004X=m
++CONFIG_DVB_NXT6000=m
++CONFIG_DVB_MT352=m
++CONFIG_DVB_ZL10353=m
++CONFIG_DVB_DIB3000MB=m
++CONFIG_DVB_DIB3000MC=m
++CONFIG_DVB_DIB7000M=m
++CONFIG_DVB_DIB7000P=m
++CONFIG_DVB_TDA10048=m
++CONFIG_DVB_AF9013=m
++CONFIG_DVB_TDA10021=m
++CONFIG_DVB_TDA10023=m
++CONFIG_DVB_STV0297=m
++CONFIG_DVB_NXT200X=m
++CONFIG_DVB_BCM3510=m
++CONFIG_DVB_LGDT330X=m
++CONFIG_DVB_LGDT3305=m
++CONFIG_DVB_S5H1409=m
++CONFIG_DVB_S5H1411=m
++CONFIG_DVB_DIB8000=m
++CONFIG_DVB_PLL=m
++CONFIG_DVB_TUNER_DIB0070=m
++CONFIG_DVB_LNBP21=m
++CONFIG_DVB_ISL6421=m
++CONFIG_DVB_LGS8GL5=m
++# CONFIG_DAB is not set
+ 
+ #
+ # Graphics support
+@@ -781,6 +1967,7 @@ CONFIG_DAB=y
+ CONFIG_FB=y
+ # CONFIG_FIRMWARE_EDID is not set
+ # CONFIG_FB_DDC is not set
++# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+ CONFIG_FB_CFB_FILLRECT=y
+ CONFIG_FB_CFB_COPYAREA=y
+ CONFIG_FB_CFB_IMAGEBLIT=y
+@@ -793,24 +1980,57 @@ CONFIG_FB_CFB_IMAGEBLIT=y
+ # CONFIG_FB_SVGALIB is not set
+ # CONFIG_FB_MACMODES is not set
+ # CONFIG_FB_BACKLIGHT is not set
+-# CONFIG_FB_MODE_HELPERS is not set
++CONFIG_FB_MODE_HELPERS=y
+ # CONFIG_FB_TILEBLITTING is not set
+ 
+ #
+ # Frame buffer hardware drivers
+ #
+ # CONFIG_FB_S1D13XXX is not set
++# CONFIG_FB_TMIO is not set
+ # CONFIG_FB_VIRTUAL is not set
+-CONFIG_FB_OMAP=y
+-# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
++# CONFIG_FB_METRONOME is not set
++# CONFIG_FB_MB862XX is not set
++# CONFIG_FB_BROADSHEET is not set
+ # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
+-CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
++CONFIG_OMAP2_VRAM=y
++CONFIG_OMAP2_VRFB=y
++CONFIG_OMAP2_DSS=y
++CONFIG_OMAP2_VRAM_SIZE=14
++CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
++# CONFIG_OMAP2_DSS_RFBI is not set
++CONFIG_OMAP2_DSS_VENC=y
++CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO=y
++# CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE is not set
++# CONFIG_OMAP2_DSS_SDI is not set
++CONFIG_OMAP2_DSS_DSI=y
++CONFIG_OMAP2_DSS_USE_DSI_PLL=y
++# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
++CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
++CONFIG_FB_OMAP2=y
++CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
++# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set
++CONFIG_FB_OMAP2_NUM_FBS=3
++
++#
++# OMAP2/3 Display Device Drivers
++#
++CONFIG_PANEL_GENERIC=y
++# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
++# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set
++CONFIG_PANEL_SHARP_LS037V7DW01=y
++# CONFIG_PANEL_SHARP_LQ043T1DG01 is not set
++# CONFIG_PANEL_TAAL is not set
+ # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+ 
+ #
+ # Display device support
+ #
+-# CONFIG_DISPLAY_SUPPORT is not set
++CONFIG_DISPLAY_SUPPORT=y
++
++#
++# Display hardware drivers
++#
+ 
+ #
+ # Console display driver support
+@@ -820,31 +2040,113 @@ CONFIG_DUMMY_CONSOLE=y
+ CONFIG_FRAMEBUFFER_CONSOLE=y
+ # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+-CONFIG_FONTS=y
++# CONFIG_FONTS is not set
+ CONFIG_FONT_8x8=y
+ CONFIG_FONT_8x16=y
+-# CONFIG_FONT_6x11 is not set
+-# CONFIG_FONT_7x14 is not set
+-# CONFIG_FONT_PEARL_8x8 is not set
+-# CONFIG_FONT_ACORN_8x8 is not set
+-# CONFIG_FONT_MINI_4x6 is not set
+-# CONFIG_FONT_SUN8x16 is not set
+-# CONFIG_FONT_SUN12x22 is not set
+-# CONFIG_FONT_10x18 is not set
+-# CONFIG_LOGO is not set
+-
+-#
+-# Sound
+-#
+-# CONFIG_SOUND is not set
+-# CONFIG_HID_SUPPORT is not set
++CONFIG_LOGO=y
++# CONFIG_LOGO_LINUX_MONO is not set
++# CONFIG_LOGO_LINUX_VGA16 is not set
++CONFIG_LOGO_LINUX_CLUT224=y
++CONFIG_SOUND=y
++CONFIG_SOUND_OSS_CORE=y
++CONFIG_SOUND_OSS_CORE_PRECLAIM=y
++CONFIG_SND=y
++CONFIG_SND_TIMER=y
++CONFIG_SND_PCM=y
++CONFIG_SND_HWDEP=y
++CONFIG_SND_RAWMIDI=y
++CONFIG_SND_JACK=y
++CONFIG_SND_SEQUENCER=m
++# CONFIG_SND_SEQ_DUMMY is not set
++CONFIG_SND_OSSEMUL=y
++CONFIG_SND_MIXER_OSS=y
++CONFIG_SND_PCM_OSS=y
++CONFIG_SND_PCM_OSS_PLUGINS=y
++CONFIG_SND_SEQUENCER_OSS=y
++CONFIG_SND_HRTIMER=m
++CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
++# CONFIG_SND_DYNAMIC_MINORS is not set
++CONFIG_SND_SUPPORT_OLD_API=y
++CONFIG_SND_VERBOSE_PROCFS=y
++# CONFIG_SND_VERBOSE_PRINTK is not set
++# CONFIG_SND_DEBUG is not set
++CONFIG_SND_RAWMIDI_SEQ=m
++# CONFIG_SND_OPL3_LIB_SEQ is not set
++# CONFIG_SND_OPL4_LIB_SEQ is not set
++# CONFIG_SND_SBAWE_SEQ is not set
++# CONFIG_SND_EMU10K1_SEQ is not set
++CONFIG_SND_DRIVERS=y
++# CONFIG_SND_DUMMY is not set
++# CONFIG_SND_VIRMIDI is not set
++# CONFIG_SND_MTPAV is not set
++# CONFIG_SND_SERIAL_U16550 is not set
++# CONFIG_SND_MPU401 is not set
++# CONFIG_SND_ARM is not set
++CONFIG_SND_SPI=y
++CONFIG_SND_USB=y
++CONFIG_SND_USB_AUDIO=y
++CONFIG_SND_USB_CAIAQ=m
++CONFIG_SND_USB_CAIAQ_INPUT=y
++CONFIG_SND_SOC=y
++CONFIG_SND_OMAP_SOC=y
++CONFIG_SND_OMAP_SOC_MCBSP=y
++# CONFIG_SND_OMAP_SOC_OMAP3EVM is not set
++CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
++CONFIG_SND_SOC_I2C_AND_SPI=y
++# CONFIG_SND_SOC_ALL_CODECS is not set
++CONFIG_SND_SOC_TWL4030=y
++# CONFIG_SOUND_PRIME is not set
++CONFIG_HID_SUPPORT=y
++CONFIG_HID=y
++# CONFIG_HIDRAW is not set
++
++#
++# USB Input Devices
++#
++CONFIG_USB_HID=y
++# CONFIG_HID_PID is not set
++# CONFIG_USB_HIDDEV is not set
++
++#
++# Special HID drivers
++#
++CONFIG_HID_A4TECH=y
++CONFIG_HID_APPLE=y
++CONFIG_HID_BELKIN=y
++CONFIG_HID_CHERRY=y
++CONFIG_HID_CHICONY=y
++CONFIG_HID_CYPRESS=y
++# CONFIG_HID_DRAGONRISE is not set
++CONFIG_HID_EZKEY=y
++# CONFIG_HID_KYE is not set
++CONFIG_HID_GYRATION=y
++# CONFIG_HID_TWINHAN is not set
++# CONFIG_HID_KENSINGTON is not set
++CONFIG_HID_LOGITECH=y
++# CONFIG_LOGITECH_FF is not set
++# CONFIG_LOGIRUMBLEPAD2_FF is not set
++CONFIG_HID_MICROSOFT=y
++CONFIG_HID_MONTEREY=y
++CONFIG_HID_NTRIG=y
++CONFIG_HID_PANTHERLORD=y
++# CONFIG_PANTHERLORD_FF is not set
++CONFIG_HID_PETALYNX=y
++CONFIG_HID_SAMSUNG=y
++CONFIG_HID_SONY=y
++CONFIG_HID_SUNPLUS=y
++# CONFIG_HID_GREENASIA is not set
++# CONFIG_HID_SMARTJOYPLUS is not set
++CONFIG_HID_TOPSEED=y
++# CONFIG_HID_THRUSTMASTER is not set
++# CONFIG_HID_WACOM is not set
++# CONFIG_HID_ZEROPLUS is not set
+ CONFIG_USB_SUPPORT=y
+ CONFIG_USB_ARCH_HAS_HCD=y
+ CONFIG_USB_ARCH_HAS_OHCI=y
+ CONFIG_USB_ARCH_HAS_EHCI=y
+ CONFIG_USB=y
+ # CONFIG_USB_DEBUG is not set
+-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
++CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+ 
+ #
+ # Miscellaneous USB options
+@@ -857,18 +2159,25 @@ CONFIG_USB_OTG=y
+ # CONFIG_USB_OTG_WHITELIST is not set
+ # CONFIG_USB_OTG_BLACKLIST_HUB is not set
+ CONFIG_USB_MON=y
++# CONFIG_USB_WUSB is not set
++# CONFIG_USB_WUSB_CBAF is not set
+ 
+ #
+ # USB Host Controller Drivers
+ #
+-CONFIG_USB_EHCI_HCD=y
+-CONFIG_USB_EHCI_ROOT_HUB_TT=y
+ # CONFIG_USB_C67X00_HCD is not set
++CONFIG_USB_EHCI_HCD=y
++# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
++CONFIG_USB_EHCI_TT_NEWSCHED=y
++# CONFIG_USB_OXU210HP_HCD is not set
+ # CONFIG_USB_ISP116X_HCD is not set
+ # CONFIG_USB_ISP1760_HCD is not set
++# CONFIG_USB_ISP1362_HCD is not set
+ # CONFIG_USB_OHCI_HCD is not set
++# CONFIG_USB_U132_HCD is not set
+ # CONFIG_USB_SL811_HCD is not set
+ # CONFIG_USB_R8A66597_HCD is not set
++# CONFIG_USB_HWA_HCD is not set
+ CONFIG_USB_MUSB_HDRC=y
+ CONFIG_USB_MUSB_SOC=y
+ 
+@@ -882,24 +2191,39 @@ CONFIG_USB_GADGET_MUSB_HDRC=y
+ CONFIG_USB_MUSB_HDRC_HCD=y
+ # CONFIG_MUSB_PIO_ONLY is not set
+ CONFIG_USB_INVENTRA_DMA=y
++CONFIG_MUSB_USE_SYSTEM_DMA_RX=y
+ # CONFIG_USB_TI_CPPI_DMA is not set
++# CONFIG_USB_TI_CPPI41_DMA is not set
+ # CONFIG_USB_MUSB_DEBUG is not set
+ 
+ #
+ # USB Device Class drivers
+ #
+-# CONFIG_USB_ACM is not set
+-# CONFIG_USB_PRINTER is not set
+-# CONFIG_USB_WDM is not set
++CONFIG_USB_ACM=m
++CONFIG_USB_PRINTER=m
++CONFIG_USB_WDM=m
++CONFIG_USB_TMC=m
+ 
+ #
+-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
++# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+ #
+ 
+ #
+-# may also be needed; see USB_STORAGE Help for more information
++# also be needed; see USB_STORAGE Help for more info
+ #
+-# CONFIG_USB_STORAGE is not set
++CONFIG_USB_STORAGE=y
++# CONFIG_USB_STORAGE_DEBUG is not set
++# CONFIG_USB_STORAGE_DATAFAB is not set
++# CONFIG_USB_STORAGE_FREECOM is not set
++# CONFIG_USB_STORAGE_ISD200 is not set
++# CONFIG_USB_STORAGE_USBAT is not set
++# CONFIG_USB_STORAGE_SDDR09 is not set
++# CONFIG_USB_STORAGE_SDDR55 is not set
++# CONFIG_USB_STORAGE_JUMPSHOT is not set
++# CONFIG_USB_STORAGE_ALAUDA is not set
++# CONFIG_USB_STORAGE_ONETOUCH is not set
++# CONFIG_USB_STORAGE_KARMA is not set
++# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+ # CONFIG_USB_LIBUSUAL is not set
+ 
+ #
+@@ -911,92 +2235,200 @@ CONFIG_USB_INVENTRA_DMA=y
+ #
+ # USB port drivers
+ #
+-# CONFIG_USB_SERIAL is not set
++CONFIG_USB_SERIAL=m
++CONFIG_USB_EZUSB=y
++CONFIG_USB_SERIAL_GENERIC=y
++CONFIG_USB_SERIAL_AIRCABLE=m
++CONFIG_USB_SERIAL_ARK3116=m
++CONFIG_USB_SERIAL_BELKIN=m
++CONFIG_USB_SERIAL_CH341=m
++CONFIG_USB_SERIAL_WHITEHEAT=m
++CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
++# CONFIG_USB_SERIAL_CP210X is not set
++CONFIG_USB_SERIAL_CYPRESS_M8=m
++CONFIG_USB_SERIAL_EMPEG=m
++CONFIG_USB_SERIAL_FTDI_SIO=m
++CONFIG_USB_SERIAL_FUNSOFT=m
++CONFIG_USB_SERIAL_VISOR=m
++CONFIG_USB_SERIAL_IPAQ=m
++CONFIG_USB_SERIAL_IR=m
++CONFIG_USB_SERIAL_EDGEPORT=m
++CONFIG_USB_SERIAL_EDGEPORT_TI=m
++CONFIG_USB_SERIAL_GARMIN=m
++CONFIG_USB_SERIAL_IPW=m
++CONFIG_USB_SERIAL_IUU=m
++CONFIG_USB_SERIAL_KEYSPAN_PDA=m
++CONFIG_USB_SERIAL_KEYSPAN=m
++CONFIG_USB_SERIAL_KEYSPAN_MPR=y
++CONFIG_USB_SERIAL_KEYSPAN_USA28=y
++CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
++CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
++CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
++CONFIG_USB_SERIAL_KEYSPAN_USA19=y
++CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
++CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
++CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
++CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
++CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
++CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
++CONFIG_USB_SERIAL_KLSI=m
++CONFIG_USB_SERIAL_KOBIL_SCT=m
++CONFIG_USB_SERIAL_MCT_U232=m
++CONFIG_USB_SERIAL_MOS7720=m
++CONFIG_USB_SERIAL_MOS7840=m
++CONFIG_USB_SERIAL_MOTOROLA=m
++CONFIG_USB_SERIAL_NAVMAN=m
++CONFIG_USB_SERIAL_PL2303=m
++CONFIG_USB_SERIAL_OTI6858=m
++# CONFIG_USB_SERIAL_QUALCOMM is not set
++CONFIG_USB_SERIAL_SPCP8X5=m
++CONFIG_USB_SERIAL_HP4X=m
++CONFIG_USB_SERIAL_SAFE=m
++# CONFIG_USB_SERIAL_SAFE_PADDED is not set
++CONFIG_USB_SERIAL_SIEMENS_MPI=m
++CONFIG_USB_SERIAL_SIERRAWIRELESS=m
++# CONFIG_USB_SERIAL_SYMBOL is not set
++CONFIG_USB_SERIAL_TI=m
++CONFIG_USB_SERIAL_CYBERJACK=m
++CONFIG_USB_SERIAL_XIRCOM=m
++CONFIG_USB_SERIAL_OPTION=m
++CONFIG_USB_SERIAL_OMNINET=m
++CONFIG_USB_SERIAL_OPTICON=m
++CONFIG_USB_SERIAL_DEBUG=m
+ 
+ #
+ # USB Miscellaneous drivers
+ #
+-# CONFIG_USB_EMI62 is not set
+-# CONFIG_USB_EMI26 is not set
++CONFIG_USB_EMI62=m
++CONFIG_USB_EMI26=m
+ # CONFIG_USB_ADUTUX is not set
++# CONFIG_USB_SEVSEG is not set
+ # CONFIG_USB_RIO500 is not set
+-# CONFIG_USB_LEGOTOWER is not set
+-# CONFIG_USB_LCD is not set
+-# CONFIG_USB_BERRY_CHARGE is not set
+-# CONFIG_USB_LED is not set
+-# CONFIG_USB_CYPRESS_CY7C63 is not set
+-# CONFIG_USB_CYTHERM is not set
+-# CONFIG_USB_PHIDGET is not set
+-# CONFIG_USB_IDMOUSE is not set
+-# CONFIG_USB_FTDI_ELAN is not set
++CONFIG_USB_LEGOTOWER=m
++CONFIG_USB_LCD=m
++CONFIG_USB_BERRY_CHARGE=m
++CONFIG_USB_LED=m
++CONFIG_USB_CYPRESS_CY7C63=m
++CONFIG_USB_CYTHERM=m
++CONFIG_USB_IDMOUSE=m
++CONFIG_USB_FTDI_ELAN=m
+ # CONFIG_USB_APPLEDISPLAY is not set
+-# CONFIG_USB_LD is not set
+-# CONFIG_USB_TRANCEVIBRATOR is not set
++CONFIG_USB_SISUSBVGA=m
++CONFIG_USB_SISUSBVGA_CON=y
++CONFIG_USB_LD=m
++CONFIG_USB_TRANCEVIBRATOR=m
+ # CONFIG_USB_IOWARRIOR is not set
+-# CONFIG_USB_TEST is not set
++CONFIG_USB_TEST=m
+ # CONFIG_USB_ISIGHTFW is not set
++CONFIG_USB_VST=m
++CONFIG_USB_ATM=m
++CONFIG_USB_SPEEDTOUCH=m
++CONFIG_USB_CXACRU=m
++CONFIG_USB_UEAGLEATM=m
++CONFIG_USB_XUSBATM=m
+ CONFIG_USB_GADGET=y
+ # CONFIG_USB_GADGET_DEBUG is not set
+ # CONFIG_USB_GADGET_DEBUG_FILES is not set
++CONFIG_USB_GADGET_DEBUG_FS=y
++CONFIG_USB_GADGET_VBUS_DRAW=2
+ CONFIG_USB_GADGET_SELECTED=y
+-# CONFIG_USB_GADGET_AMD5536UDC is not set
++# CONFIG_USB_GADGET_AT91 is not set
+ # CONFIG_USB_GADGET_ATMEL_USBA is not set
+ # CONFIG_USB_GADGET_FSL_USB2 is not set
+-# CONFIG_USB_GADGET_NET2280 is not set
+-# CONFIG_USB_GADGET_PXA25X is not set
+-# CONFIG_USB_GADGET_M66592 is not set
+-# CONFIG_USB_M66592 is not set
+-# CONFIG_USB_GADGET_PXA27X is not set
+-# CONFIG_USB_GADGET_GOKU is not set
+ # CONFIG_USB_GADGET_LH7A40X is not set
+ # CONFIG_USB_GADGET_OMAP is not set
++# CONFIG_USB_GADGET_PXA25X is not set
++# CONFIG_USB_GADGET_R8A66597 is not set
++# CONFIG_USB_GADGET_PXA27X is not set
++# CONFIG_USB_GADGET_S3C_HSOTG is not set
++# CONFIG_USB_GADGET_IMX is not set
+ # CONFIG_USB_GADGET_S3C2410 is not set
+-# CONFIG_USB_GADGET_AT91 is not set
++# CONFIG_USB_GADGET_M66592 is not set
++# CONFIG_USB_GADGET_AMD5536UDC is not set
++# CONFIG_USB_GADGET_FSL_QE is not set
++# CONFIG_USB_GADGET_CI13XXX is not set
++# CONFIG_USB_GADGET_NET2280 is not set
++# CONFIG_USB_GADGET_GOKU is not set
++# CONFIG_USB_GADGET_LANGWELL is not set
+ # CONFIG_USB_GADGET_DUMMY_HCD is not set
+ CONFIG_USB_GADGET_DUALSPEED=y
+-# CONFIG_USB_ZERO is not set
++CONFIG_USB_ZERO=m
++CONFIG_USB_ZERO_HNPTEST=y
++# CONFIG_USB_AUDIO is not set
+ CONFIG_USB_ETH=m
+ CONFIG_USB_ETH_RNDIS=y
+-# CONFIG_USB_GADGETFS is not set
+-# CONFIG_USB_FILE_STORAGE is not set
+-# CONFIG_USB_G_SERIAL is not set
+-# CONFIG_USB_MIDI_GADGET is not set
+-# CONFIG_USB_G_PRINTER is not set
+-# CONFIG_USB_CDC_COMPOSITE is not set
++# CONFIG_USB_ETH_EEM is not set
++CONFIG_USB_GADGETFS=m
++CONFIG_USB_FILE_STORAGE=m
++# CONFIG_USB_FILE_STORAGE_TEST is not set
++# CONFIG_USB_MASS_STORAGE is not set
++CONFIG_USB_G_SERIAL=m
++CONFIG_USB_MIDI_GADGET=m
++CONFIG_USB_G_PRINTER=m
++CONFIG_USB_CDC_COMPOSITE=m
++# CONFIG_USB_G_MULTI is not set
+ 
+ #
+ # OTG and related infrastructure
+ #
+ CONFIG_USB_OTG_UTILS=y
+-# CONFIG_USB_GPIO_VBUS is not set
++CONFIG_USB_GPIO_VBUS=y
++# CONFIG_ISP1301_OMAP is not set
++# CONFIG_USB_ULPI is not set
+ CONFIG_TWL4030_USB=y
+-# CONFIG_NOP_USB_XCEIV is not set
++CONFIG_NOP_USB_XCEIV=y
+ CONFIG_MMC=y
+ # CONFIG_MMC_DEBUG is not set
+-# CONFIG_MMC_UNSAFE_RESUME is not set
++CONFIG_MMC_UNSAFE_RESUME=y
+ 
+ #
+-# MMC/SD Card Drivers
++# MMC/SD/SDIO Card Drivers
+ #
+ CONFIG_MMC_BLOCK=y
+ CONFIG_MMC_BLOCK_BOUNCE=y
+-# CONFIG_SDIO_UART is not set
++CONFIG_SDIO_UART=y
+ # CONFIG_MMC_TEST is not set
+ 
+ #
+-# MMC/SD Host Controller Drivers
++# MMC/SD/SDIO Host Controller Drivers
+ #
+ # CONFIG_MMC_SDHCI is not set
+ # CONFIG_MMC_OMAP is not set
+ CONFIG_MMC_OMAP_HS=y
++# CONFIG_MMC_AT91 is not set
++# CONFIG_MMC_ATMELMCI is not set
++CONFIG_MMC_SPI=m
+ # CONFIG_MEMSTICK is not set
++CONFIG_NEW_LEDS=y
++CONFIG_LEDS_CLASS=y
++
++#
++# LED drivers
++#
++# CONFIG_LEDS_PCA9532 is not set
++CONFIG_LEDS_GPIO=y
++CONFIG_LEDS_GPIO_PLATFORM=y
++# CONFIG_LEDS_LP3944 is not set
++# CONFIG_LEDS_PCA955X is not set
++# CONFIG_LEDS_DAC124S085 is not set
++# CONFIG_LEDS_BD2802 is not set
++
++#
++# LED Triggers
++#
++CONFIG_LEDS_TRIGGERS=y
++CONFIG_LEDS_TRIGGER_TIMER=m
++CONFIG_LEDS_TRIGGER_HEARTBEAT=y
++CONFIG_LEDS_TRIGGER_BACKLIGHT=m
++# CONFIG_LEDS_TRIGGER_GPIO is not set
++CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
++
++#
++# iptables trigger is under Netfilter config (LED target)
++#
+ # CONFIG_ACCESSIBILITY is not set
+-# CONFIG_NEW_LEDS is not set
+ CONFIG_RTC_LIB=y
+-CONFIG_RTC_CLASS=y
+-CONFIG_RTC_HCTOSYS=y
+-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+-# CONFIG_RTC_DEBUG is not set
++CONFIG_RTC_CLASS=m
+ 
+ #
+ # RTC interfaces
+@@ -1020,73 +2452,178 @@ CONFIG_RTC_INTF_DEV=y
+ # CONFIG_RTC_DRV_PCF8563 is not set
+ # CONFIG_RTC_DRV_PCF8583 is not set
+ # CONFIG_RTC_DRV_M41T80 is not set
++CONFIG_RTC_DRV_TWL4030=m
+ # CONFIG_RTC_DRV_S35390A is not set
+ # CONFIG_RTC_DRV_FM3130 is not set
++# CONFIG_RTC_DRV_RX8581 is not set
++# CONFIG_RTC_DRV_RX8025 is not set
+ 
+ #
+ # SPI RTC drivers
+ #
++# CONFIG_RTC_DRV_M41T94 is not set
++# CONFIG_RTC_DRV_DS1305 is not set
++# CONFIG_RTC_DRV_DS1390 is not set
++# CONFIG_RTC_DRV_MAX6902 is not set
++# CONFIG_RTC_DRV_R9701 is not set
++# CONFIG_RTC_DRV_RS5C348 is not set
++# CONFIG_RTC_DRV_DS3234 is not set
++# CONFIG_RTC_DRV_PCF2123 is not set
+ 
+ #
+ # Platform RTC drivers
+ #
+ # CONFIG_RTC_DRV_CMOS is not set
++# CONFIG_RTC_DRV_DS1286 is not set
+ # CONFIG_RTC_DRV_DS1511 is not set
+ # CONFIG_RTC_DRV_DS1553 is not set
+ # CONFIG_RTC_DRV_DS1742 is not set
+ # CONFIG_RTC_DRV_STK17TA8 is not set
+ # CONFIG_RTC_DRV_M48T86 is not set
++# CONFIG_RTC_DRV_M48T35 is not set
+ # CONFIG_RTC_DRV_M48T59 is not set
++# CONFIG_RTC_DRV_MSM6242 is not set
++# CONFIG_RTC_DRV_BQ4802 is not set
++# CONFIG_RTC_DRV_RP5C01 is not set
+ # CONFIG_RTC_DRV_V3020 is not set
+ 
+ #
+ # on-CPU RTC drivers
+ #
+ # CONFIG_DMADEVICES is not set
++# CONFIG_AUXDISPLAY is not set
++CONFIG_UIO=m
++CONFIG_UIO_PDRV=m
++CONFIG_UIO_PDRV_GENIRQ=m
++# CONFIG_UIO_SMX is not set
++# CONFIG_UIO_SERCOS3 is not set
+ 
+ #
+-# Voltage and Current regulators
++# TI VLYNQ
+ #
+-CONFIG_REGULATOR=y
+-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+-# CONFIG_REGULATOR_BQ24022 is not set
+-CONFIG_REGULATOR_TWL4030=y
+-# CONFIG_UIO is not set
++CONFIG_STAGING=y
++# CONFIG_STAGING_EXCLUDE_BUILD is not set
++# CONFIG_USB_IP_COMMON is not set
++CONFIG_W35UND=m
++# CONFIG_PRISM2_USB is not set
++CONFIG_ECHO=m
++CONFIG_OTUS=m
++# CONFIG_COMEDI is not set
++# CONFIG_ASUS_OLED is not set
++# CONFIG_INPUT_MIMIO is not set
++# CONFIG_TRANZPORT is not set
++
++#
++# Qualcomm MSM Camera And Video
++#
++
++#
++# Camera Sensor Selection
++#
++# CONFIG_INPUT_GPIO is not set
++# CONFIG_DST is not set
++# CONFIG_POHMELFS is not set
++# CONFIG_PLAN9AUTH is not set
++# CONFIG_LINE6_USB is not set
++# CONFIG_USB_SERIAL_QUATECH2 is not set
++# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
++# CONFIG_VT6656 is not set
++# CONFIG_FB_UDL is not set
++
++#
++# RAR Register Driver
++#
++# CONFIG_RAR_REGISTER is not set
++# CONFIG_IIO is not set
++# CONFIG_RAMZSWAP is not set
++# CONFIG_BATMAN_ADV is not set
++# CONFIG_STRIP is not set
++
++#
++# CBUS support
++#
++# CONFIG_CBUS is not set
+ 
+ #
+ # File systems
+ #
++CONFIG_FS_JOURNAL_INFO=y
+ CONFIG_EXT2_FS=y
+ # CONFIG_EXT2_FS_XATTR is not set
+ # CONFIG_EXT2_FS_XIP is not set
+ CONFIG_EXT3_FS=y
++# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+ # CONFIG_EXT3_FS_XATTR is not set
+-# CONFIG_EXT4DEV_FS is not set
++CONFIG_EXT4_FS=y
++CONFIG_EXT4_FS_XATTR=y
++# CONFIG_EXT4_FS_POSIX_ACL is not set
++# CONFIG_EXT4_FS_SECURITY is not set
++# CONFIG_EXT4_DEBUG is not set
+ CONFIG_JBD=y
+-# CONFIG_REISERFS_FS is not set
+-# CONFIG_JFS_FS is not set
+-# CONFIG_FS_POSIX_ACL is not set
+-# CONFIG_XFS_FS is not set
+-# CONFIG_OCFS2_FS is not set
++# CONFIG_JBD_DEBUG is not set
++CONFIG_JBD2=y
++# CONFIG_JBD2_DEBUG is not set
++CONFIG_FS_MBCACHE=y
++CONFIG_REISERFS_FS=m
++# CONFIG_REISERFS_CHECK is not set
++CONFIG_REISERFS_PROC_INFO=y
++CONFIG_REISERFS_FS_XATTR=y
++# CONFIG_REISERFS_FS_POSIX_ACL is not set
++# CONFIG_REISERFS_FS_SECURITY is not set
++CONFIG_JFS_FS=m
++# CONFIG_JFS_POSIX_ACL is not set
++# CONFIG_JFS_SECURITY is not set
++# CONFIG_JFS_DEBUG is not set
++# CONFIG_JFS_STATISTICS is not set
++CONFIG_FS_POSIX_ACL=y
++CONFIG_XFS_FS=m
++# CONFIG_XFS_QUOTA is not set
++# CONFIG_XFS_POSIX_ACL is not set
++# CONFIG_XFS_RT is not set
++# CONFIG_XFS_DEBUG is not set
++CONFIG_GFS2_FS=m
++# CONFIG_GFS2_FS_LOCKING_DLM is not set
++CONFIG_OCFS2_FS=m
++CONFIG_OCFS2_FS_O2CB=m
++CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
++CONFIG_OCFS2_FS_STATS=y
++CONFIG_OCFS2_DEBUG_MASKLOG=y
++# CONFIG_OCFS2_DEBUG_FS is not set
++# CONFIG_OCFS2_FS_POSIX_ACL is not set
++CONFIG_BTRFS_FS=m
++# CONFIG_BTRFS_FS_POSIX_ACL is not set
++# CONFIG_NILFS2_FS is not set
++CONFIG_FILE_LOCKING=y
++CONFIG_FSNOTIFY=y
+ CONFIG_DNOTIFY=y
+ CONFIG_INOTIFY=y
+ CONFIG_INOTIFY_USER=y
+ CONFIG_QUOTA=y
+ # CONFIG_QUOTA_NETLINK_INTERFACE is not set
+ CONFIG_PRINT_QUOTA_WARNING=y
++CONFIG_QUOTA_TREE=y
+ # CONFIG_QFMT_V1 is not set
+ CONFIG_QFMT_V2=y
+ CONFIG_QUOTACTL=y
+ # CONFIG_AUTOFS_FS is not set
+-# CONFIG_AUTOFS4_FS is not set
+-# CONFIG_FUSE_FS is not set
++CONFIG_AUTOFS4_FS=m
++CONFIG_FUSE_FS=m
++# CONFIG_CUSE is not set
++CONFIG_GENERIC_ACL=y
++
++#
++# Caches
++#
++# CONFIG_FSCACHE is not set
+ 
+ #
+ # CD-ROM/DVD Filesystems
+ #
+-# CONFIG_ISO9660_FS is not set
+-# CONFIG_UDF_FS is not set
++CONFIG_ISO9660_FS=m
++CONFIG_JOLIET=y
++CONFIG_ZISOFS=y
++CONFIG_UDF_FS=m
++CONFIG_UDF_NLS=y
+ 
+ #
+ # DOS/FAT/NT Filesystems
+@@ -1096,68 +2633,118 @@ CONFIG_MSDOS_FS=y
+ CONFIG_VFAT_FS=y
+ CONFIG_FAT_DEFAULT_CODEPAGE=437
+ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+-# CONFIG_NTFS_FS is not set
++CONFIG_NTFS_FS=m
++# CONFIG_NTFS_DEBUG is not set
++CONFIG_NTFS_RW=y
+ 
+ #
+ # Pseudo filesystems
+ #
+ CONFIG_PROC_FS=y
+ CONFIG_PROC_SYSCTL=y
++CONFIG_PROC_PAGE_MONITOR=y
+ CONFIG_SYSFS=y
+ CONFIG_TMPFS=y
+-# CONFIG_TMPFS_POSIX_ACL is not set
++CONFIG_TMPFS_POSIX_ACL=y
+ # CONFIG_HUGETLB_PAGE is not set
+-# CONFIG_CONFIGFS_FS is not set
+-
+-#
+-# Miscellaneous filesystems
+-#
+-# CONFIG_ADFS_FS is not set
+-# CONFIG_AFFS_FS is not set
+-# CONFIG_HFS_FS is not set
+-# CONFIG_HFSPLUS_FS is not set
+-# CONFIG_BEFS_FS is not set
+-# CONFIG_BFS_FS is not set
+-# CONFIG_EFS_FS is not set
++CONFIG_CONFIGFS_FS=m
++CONFIG_MISC_FILESYSTEMS=y
++CONFIG_ADFS_FS=m
++# CONFIG_ADFS_FS_RW is not set
++CONFIG_AFFS_FS=m
++# CONFIG_ECRYPT_FS is not set
++CONFIG_HFS_FS=m
++CONFIG_HFSPLUS_FS=m
++CONFIG_BEFS_FS=m
++# CONFIG_BEFS_DEBUG is not set
++CONFIG_BFS_FS=m
++CONFIG_EFS_FS=m
+ CONFIG_JFFS2_FS=y
+ CONFIG_JFFS2_FS_DEBUG=0
+ CONFIG_JFFS2_FS_WRITEBUFFER=y
+ # CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+-# CONFIG_JFFS2_SUMMARY is not set
+-# CONFIG_JFFS2_FS_XATTR is not set
+-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
++CONFIG_JFFS2_SUMMARY=y
++CONFIG_JFFS2_FS_XATTR=y
++CONFIG_JFFS2_FS_POSIX_ACL=y
++CONFIG_JFFS2_FS_SECURITY=y
++CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+ CONFIG_JFFS2_ZLIB=y
+-# CONFIG_JFFS2_LZO is not set
++CONFIG_JFFS2_LZO=y
+ CONFIG_JFFS2_RTIME=y
+-# CONFIG_JFFS2_RUBIN is not set
+-# CONFIG_CRAMFS is not set
+-# CONFIG_VXFS_FS is not set
+-# CONFIG_MINIX_FS is not set
+-# CONFIG_OMFS_FS is not set
+-# CONFIG_HPFS_FS is not set
+-# CONFIG_QNX4FS_FS is not set
+-# CONFIG_ROMFS_FS is not set
+-# CONFIG_SYSV_FS is not set
+-# CONFIG_UFS_FS is not set
++CONFIG_JFFS2_RUBIN=y
++# CONFIG_JFFS2_CMODE_NONE is not set
++# CONFIG_JFFS2_CMODE_PRIORITY is not set
++# CONFIG_JFFS2_CMODE_SIZE is not set
++CONFIG_JFFS2_CMODE_FAVOURLZO=y
++CONFIG_UBIFS_FS=y
++CONFIG_UBIFS_FS_XATTR=y
++CONFIG_UBIFS_FS_ADVANCED_COMPR=y
++CONFIG_UBIFS_FS_LZO=y
++CONFIG_UBIFS_FS_ZLIB=y
++# CONFIG_UBIFS_FS_DEBUG is not set
++CONFIG_CRAMFS=m
++CONFIG_SQUASHFS=y
++# CONFIG_SQUASHFS_EMBEDDED is not set
++CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
++CONFIG_VXFS_FS=m
++CONFIG_MINIX_FS=m
++CONFIG_OMFS_FS=m
++CONFIG_HPFS_FS=m
++CONFIG_QNX4FS_FS=m
++CONFIG_ROMFS_FS=m
++CONFIG_ROMFS_BACKED_BY_BLOCK=y
++# CONFIG_ROMFS_BACKED_BY_MTD is not set
++# CONFIG_ROMFS_BACKED_BY_BOTH is not set
++CONFIG_ROMFS_ON_BLOCK=y
++CONFIG_SYSV_FS=m
++CONFIG_UFS_FS=m
++# CONFIG_UFS_FS_WRITE is not set
++# CONFIG_UFS_DEBUG is not set
+ CONFIG_NETWORK_FILESYSTEMS=y
+ CONFIG_NFS_FS=y
+ CONFIG_NFS_V3=y
+ # CONFIG_NFS_V3_ACL is not set
+ CONFIG_NFS_V4=y
++# CONFIG_NFS_V4_1 is not set
+ CONFIG_ROOT_NFS=y
+-# CONFIG_NFSD is not set
++CONFIG_NFSD=m
++CONFIG_NFSD_V2_ACL=y
++CONFIG_NFSD_V3=y
++CONFIG_NFSD_V3_ACL=y
++CONFIG_NFSD_V4=y
+ CONFIG_LOCKD=y
+ CONFIG_LOCKD_V4=y
++CONFIG_EXPORTFS=m
++CONFIG_NFS_ACL_SUPPORT=m
+ CONFIG_NFS_COMMON=y
+ CONFIG_SUNRPC=y
+ CONFIG_SUNRPC_GSS=y
+ CONFIG_RPCSEC_GSS_KRB5=y
+ # CONFIG_RPCSEC_GSS_SPKM3 is not set
+-# CONFIG_SMB_FS is not set
+-# CONFIG_CIFS is not set
+-# CONFIG_NCP_FS is not set
+-# CONFIG_CODA_FS is not set
+-# CONFIG_AFS_FS is not set
++CONFIG_SMB_FS=m
++# CONFIG_SMB_NLS_DEFAULT is not set
++CONFIG_CIFS=m
++CONFIG_CIFS_STATS=y
++CONFIG_CIFS_STATS2=y
++# CONFIG_CIFS_WEAK_PW_HASH is not set
++# CONFIG_CIFS_UPCALL is not set
++# CONFIG_CIFS_XATTR is not set
++# CONFIG_CIFS_DEBUG2 is not set
++# CONFIG_CIFS_DFS_UPCALL is not set
++CONFIG_CIFS_EXPERIMENTAL=y
++CONFIG_NCP_FS=m
++# CONFIG_NCPFS_PACKET_SIGNING is not set
++# CONFIG_NCPFS_IOCTL_LOCKING is not set
++# CONFIG_NCPFS_STRONG is not set
++# CONFIG_NCPFS_NFS_NS is not set
++# CONFIG_NCPFS_OS2_NS is not set
++# CONFIG_NCPFS_SMALLDOS is not set
++# CONFIG_NCPFS_NLS is not set
++# CONFIG_NCPFS_EXTRAS is not set
++CONFIG_CODA_FS=m
++CONFIG_AFS_FS=m
++# CONFIG_AFS_DEBUG is not set
++CONFIG_9P_FS=m
+ 
+ #
+ # Partition Types
+@@ -1167,82 +2754,90 @@ CONFIG_PARTITION_ADVANCED=y
+ # CONFIG_OSF_PARTITION is not set
+ # CONFIG_AMIGA_PARTITION is not set
+ # CONFIG_ATARI_PARTITION is not set
+-# CONFIG_MAC_PARTITION is not set
++CONFIG_MAC_PARTITION=y
+ CONFIG_MSDOS_PARTITION=y
+-# CONFIG_BSD_DISKLABEL is not set
+-# CONFIG_MINIX_SUBPARTITION is not set
+-# CONFIG_SOLARIS_X86_PARTITION is not set
++CONFIG_BSD_DISKLABEL=y
++CONFIG_MINIX_SUBPARTITION=y
++CONFIG_SOLARIS_X86_PARTITION=y
+ # CONFIG_UNIXWARE_DISKLABEL is not set
+-# CONFIG_LDM_PARTITION is not set
++CONFIG_LDM_PARTITION=y
++CONFIG_LDM_DEBUG=y
+ # CONFIG_SGI_PARTITION is not set
+ # CONFIG_ULTRIX_PARTITION is not set
+ # CONFIG_SUN_PARTITION is not set
+ # CONFIG_KARMA_PARTITION is not set
+-# CONFIG_EFI_PARTITION is not set
++CONFIG_EFI_PARTITION=y
+ # CONFIG_SYSV68_PARTITION is not set
+ CONFIG_NLS=y
+ CONFIG_NLS_DEFAULT="iso8859-1"
+ CONFIG_NLS_CODEPAGE_437=y
+-# CONFIG_NLS_CODEPAGE_737 is not set
+-# CONFIG_NLS_CODEPAGE_775 is not set
+-# CONFIG_NLS_CODEPAGE_850 is not set
+-# CONFIG_NLS_CODEPAGE_852 is not set
+-# CONFIG_NLS_CODEPAGE_855 is not set
+-# CONFIG_NLS_CODEPAGE_857 is not set
+-# CONFIG_NLS_CODEPAGE_860 is not set
+-# CONFIG_NLS_CODEPAGE_861 is not set
+-# CONFIG_NLS_CODEPAGE_862 is not set
+-# CONFIG_NLS_CODEPAGE_863 is not set
+-# CONFIG_NLS_CODEPAGE_864 is not set
+-# CONFIG_NLS_CODEPAGE_865 is not set
+-# CONFIG_NLS_CODEPAGE_866 is not set
+-# CONFIG_NLS_CODEPAGE_869 is not set
+-# CONFIG_NLS_CODEPAGE_936 is not set
+-# CONFIG_NLS_CODEPAGE_950 is not set
+-# CONFIG_NLS_CODEPAGE_932 is not set
+-# CONFIG_NLS_CODEPAGE_949 is not set
+-# CONFIG_NLS_CODEPAGE_874 is not set
+-# CONFIG_NLS_ISO8859_8 is not set
+-# CONFIG_NLS_CODEPAGE_1250 is not set
+-# CONFIG_NLS_CODEPAGE_1251 is not set
+-# CONFIG_NLS_ASCII is not set
++CONFIG_NLS_CODEPAGE_737=m
++CONFIG_NLS_CODEPAGE_775=m
++CONFIG_NLS_CODEPAGE_850=m
++CONFIG_NLS_CODEPAGE_852=m
++CONFIG_NLS_CODEPAGE_855=m
++CONFIG_NLS_CODEPAGE_857=m
++CONFIG_NLS_CODEPAGE_860=m
++CONFIG_NLS_CODEPAGE_861=m
++CONFIG_NLS_CODEPAGE_862=m
++CONFIG_NLS_CODEPAGE_863=m
++CONFIG_NLS_CODEPAGE_864=m
++CONFIG_NLS_CODEPAGE_865=m
++CONFIG_NLS_CODEPAGE_866=m
++CONFIG_NLS_CODEPAGE_869=m
++CONFIG_NLS_CODEPAGE_936=m
++CONFIG_NLS_CODEPAGE_950=m
++CONFIG_NLS_CODEPAGE_932=m
++CONFIG_NLS_CODEPAGE_949=m
++CONFIG_NLS_CODEPAGE_874=m
++CONFIG_NLS_ISO8859_8=m
++CONFIG_NLS_CODEPAGE_1250=m
++CONFIG_NLS_CODEPAGE_1251=m
++CONFIG_NLS_ASCII=m
+ CONFIG_NLS_ISO8859_1=y
+-# CONFIG_NLS_ISO8859_2 is not set
+-# CONFIG_NLS_ISO8859_3 is not set
+-# CONFIG_NLS_ISO8859_4 is not set
+-# CONFIG_NLS_ISO8859_5 is not set
+-# CONFIG_NLS_ISO8859_6 is not set
+-# CONFIG_NLS_ISO8859_7 is not set
+-# CONFIG_NLS_ISO8859_9 is not set
+-# CONFIG_NLS_ISO8859_13 is not set
+-# CONFIG_NLS_ISO8859_14 is not set
+-# CONFIG_NLS_ISO8859_15 is not set
+-# CONFIG_NLS_KOI8_R is not set
+-# CONFIG_NLS_KOI8_U is not set
+-# CONFIG_NLS_UTF8 is not set
+-# CONFIG_DLM is not set
++CONFIG_NLS_ISO8859_2=m
++CONFIG_NLS_ISO8859_3=m
++CONFIG_NLS_ISO8859_4=m
++CONFIG_NLS_ISO8859_5=m
++CONFIG_NLS_ISO8859_6=m
++CONFIG_NLS_ISO8859_7=m
++CONFIG_NLS_ISO8859_9=m
++CONFIG_NLS_ISO8859_13=m
++CONFIG_NLS_ISO8859_14=m
++CONFIG_NLS_ISO8859_15=m
++CONFIG_NLS_KOI8_R=m
++CONFIG_NLS_KOI8_U=m
++CONFIG_NLS_UTF8=y
++CONFIG_DLM=m
++# CONFIG_DLM_DEBUG is not set
+ 
+ #
+ # Kernel hacking
+ #
+-# CONFIG_PRINTK_TIME is not set
++CONFIG_PRINTK_TIME=y
+ CONFIG_ENABLE_WARN_DEPRECATED=y
+ CONFIG_ENABLE_MUST_CHECK=y
+ CONFIG_FRAME_WARN=1024
+ CONFIG_MAGIC_SYSRQ=y
++# CONFIG_STRIP_ASM_SYMS is not set
+ # CONFIG_UNUSED_SYMBOLS is not set
+-# CONFIG_DEBUG_FS is not set
++CONFIG_DEBUG_FS=y
+ # CONFIG_HEADERS_CHECK is not set
+ CONFIG_DEBUG_KERNEL=y
+ # CONFIG_DEBUG_SHIRQ is not set
+ CONFIG_DETECT_SOFTLOCKUP=y
+ # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
++CONFIG_DETECT_HUNG_TASK=y
++# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
++CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+ CONFIG_SCHED_DEBUG=y
+-# CONFIG_SCHEDSTATS is not set
+-# CONFIG_TIMER_STATS is not set
++CONFIG_SCHEDSTATS=y
++CONFIG_TIMER_STATS=y
+ # CONFIG_DEBUG_OBJECTS is not set
+ # CONFIG_DEBUG_SLAB is not set
++# CONFIG_DEBUG_KMEMLEAK is not set
++CONFIG_DEBUG_PREEMPT=y
+ # CONFIG_DEBUG_RT_MUTEXES is not set
+ # CONFIG_RT_MUTEX_TESTER is not set
+ # CONFIG_DEBUG_SPINLOCK is not set
+@@ -1252,137 +2847,204 @@ CONFIG_DEBUG_MUTEXES=y
+ # CONFIG_LOCK_STAT is not set
+ # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+ # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
++CONFIG_STACKTRACE=y
+ # CONFIG_DEBUG_KOBJECT is not set
+ # CONFIG_DEBUG_BUGVERBOSE is not set
+-CONFIG_DEBUG_INFO=y
++# CONFIG_DEBUG_INFO is not set
+ # CONFIG_DEBUG_VM is not set
+ # CONFIG_DEBUG_WRITECOUNT is not set
+ # CONFIG_DEBUG_MEMORY_INIT is not set
+ # CONFIG_DEBUG_LIST is not set
+ # CONFIG_DEBUG_SG is not set
+-CONFIG_FRAME_POINTER=y
++# CONFIG_DEBUG_NOTIFIERS is not set
++# CONFIG_DEBUG_CREDENTIALS is not set
+ # CONFIG_BOOT_PRINTK_DELAY is not set
+ # CONFIG_RCU_TORTURE_TEST is not set
++# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+ # CONFIG_BACKTRACE_SELF_TEST is not set
++# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
++# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+ # CONFIG_FAULT_INJECTION is not set
+ # CONFIG_LATENCYTOP is not set
+-CONFIG_HAVE_FTRACE=y
+-CONFIG_HAVE_DYNAMIC_FTRACE=y
+-# CONFIG_FTRACE is not set
++# CONFIG_SYSCTL_SYSCALL_CHECK is not set
++# CONFIG_PAGE_POISONING is not set
++CONFIG_NOP_TRACER=y
++CONFIG_HAVE_FUNCTION_TRACER=y
++CONFIG_RING_BUFFER=y
++CONFIG_EVENT_TRACING=y
++CONFIG_CONTEXT_SWITCH_TRACER=y
++CONFIG_RING_BUFFER_ALLOW_SWAP=y
++CONFIG_TRACING=y
++CONFIG_TRACING_SUPPORT=y
++CONFIG_FTRACE=y
++# CONFIG_FUNCTION_TRACER is not set
+ # CONFIG_IRQSOFF_TRACER is not set
++# CONFIG_PREEMPT_TRACER is not set
+ # CONFIG_SCHED_TRACER is not set
+-# CONFIG_CONTEXT_SWITCH_TRACER is not set
++# CONFIG_ENABLE_DEFAULT_TRACERS is not set
++# CONFIG_BOOT_TRACER is not set
++CONFIG_BRANCH_PROFILE_NONE=y
++# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
++# CONFIG_PROFILE_ALL_BRANCHES is not set
++# CONFIG_STACK_TRACER is not set
++# CONFIG_KMEMTRACE is not set
++# CONFIG_WORKQUEUE_TRACER is not set
++# CONFIG_BLK_DEV_IO_TRACE is not set
++# CONFIG_RING_BUFFER_BENCHMARK is not set
++# CONFIG_DYNAMIC_DEBUG is not set
+ # CONFIG_SAMPLES is not set
+ CONFIG_HAVE_ARCH_KGDB=y
+ # CONFIG_KGDB is not set
++CONFIG_ARM_UNWIND=y
+ # CONFIG_DEBUG_USER is not set
+ # CONFIG_DEBUG_ERRORS is not set
+ # CONFIG_DEBUG_STACK_USAGE is not set
+ # CONFIG_DEBUG_LL is not set
++# CONFIG_OC_ETM is not set
+ 
+ #
+ # Security options
+ #
+-# CONFIG_KEYS is not set
++CONFIG_KEYS=y
++# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+ # CONFIG_SECURITY is not set
+-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
++# CONFIG_SECURITYFS is not set
++# CONFIG_DEFAULT_SECURITY_SELINUX is not set
++# CONFIG_DEFAULT_SECURITY_SMACK is not set
++# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
++CONFIG_DEFAULT_SECURITY_DAC=y
++CONFIG_DEFAULT_SECURITY=""
++CONFIG_XOR_BLOCKS=m
++CONFIG_ASYNC_CORE=m
++CONFIG_ASYNC_MEMCPY=m
++CONFIG_ASYNC_XOR=m
++CONFIG_ASYNC_PQ=m
++CONFIG_ASYNC_RAID6_RECOV=m
+ CONFIG_CRYPTO=y
+ 
+ #
+ # Crypto core or helper
+ #
++CONFIG_CRYPTO_FIPS=y
+ CONFIG_CRYPTO_ALGAPI=y
++CONFIG_CRYPTO_ALGAPI2=y
++CONFIG_CRYPTO_AEAD=m
++CONFIG_CRYPTO_AEAD2=y
+ CONFIG_CRYPTO_BLKCIPHER=y
++CONFIG_CRYPTO_BLKCIPHER2=y
++CONFIG_CRYPTO_HASH=y
++CONFIG_CRYPTO_HASH2=y
++CONFIG_CRYPTO_RNG=m
++CONFIG_CRYPTO_RNG2=y
++CONFIG_CRYPTO_PCOMP=y
+ CONFIG_CRYPTO_MANAGER=y
+-# CONFIG_CRYPTO_GF128MUL is not set
+-# CONFIG_CRYPTO_NULL is not set
+-# CONFIG_CRYPTO_CRYPTD is not set
+-# CONFIG_CRYPTO_AUTHENC is not set
+-# CONFIG_CRYPTO_TEST is not set
++CONFIG_CRYPTO_MANAGER2=y
++CONFIG_CRYPTO_GF128MUL=m
++CONFIG_CRYPTO_NULL=m
++CONFIG_CRYPTO_WORKQUEUE=y
++CONFIG_CRYPTO_CRYPTD=m
++CONFIG_CRYPTO_AUTHENC=m
++CONFIG_CRYPTO_TEST=m
+ 
+ #
+ # Authenticated Encryption with Associated Data
+ #
+-# CONFIG_CRYPTO_CCM is not set
+-# CONFIG_CRYPTO_GCM is not set
+-# CONFIG_CRYPTO_SEQIV is not set
++CONFIG_CRYPTO_CCM=m
++CONFIG_CRYPTO_GCM=m
++CONFIG_CRYPTO_SEQIV=m
+ 
+ #
+ # Block modes
+ #
+ CONFIG_CRYPTO_CBC=y
+-# CONFIG_CRYPTO_CTR is not set
+-# CONFIG_CRYPTO_CTS is not set
+-CONFIG_CRYPTO_ECB=m
+-# CONFIG_CRYPTO_LRW is not set
++CONFIG_CRYPTO_CTR=m
++CONFIG_CRYPTO_CTS=m
++CONFIG_CRYPTO_ECB=y
++CONFIG_CRYPTO_LRW=m
+ CONFIG_CRYPTO_PCBC=m
+-# CONFIG_CRYPTO_XTS is not set
++CONFIG_CRYPTO_XTS=m
+ 
+ #
+ # Hash modes
+ #
+-# CONFIG_CRYPTO_HMAC is not set
+-# CONFIG_CRYPTO_XCBC is not set
++CONFIG_CRYPTO_HMAC=m
++CONFIG_CRYPTO_XCBC=m
++# CONFIG_CRYPTO_VMAC is not set
+ 
+ #
+ # Digest
+ #
+-# CONFIG_CRYPTO_CRC32C is not set
+-# CONFIG_CRYPTO_MD4 is not set
++CONFIG_CRYPTO_CRC32C=y
++CONFIG_CRYPTO_GHASH=m
++CONFIG_CRYPTO_MD4=m
+ CONFIG_CRYPTO_MD5=y
+-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+-# CONFIG_CRYPTO_RMD128 is not set
+-# CONFIG_CRYPTO_RMD160 is not set
+-# CONFIG_CRYPTO_RMD256 is not set
+-# CONFIG_CRYPTO_RMD320 is not set
+-# CONFIG_CRYPTO_SHA1 is not set
+-# CONFIG_CRYPTO_SHA256 is not set
+-# CONFIG_CRYPTO_SHA512 is not set
+-# CONFIG_CRYPTO_TGR192 is not set
+-# CONFIG_CRYPTO_WP512 is not set
++CONFIG_CRYPTO_MICHAEL_MIC=y
++CONFIG_CRYPTO_RMD128=m
++CONFIG_CRYPTO_RMD160=m
++CONFIG_CRYPTO_RMD256=m
++CONFIG_CRYPTO_RMD320=m
++CONFIG_CRYPTO_SHA1=m
++CONFIG_CRYPTO_SHA256=m
++CONFIG_CRYPTO_SHA512=m
++CONFIG_CRYPTO_TGR192=m
++CONFIG_CRYPTO_WP512=m
+ 
+ #
+ # Ciphers
+ #
+-# CONFIG_CRYPTO_AES is not set
+-# CONFIG_CRYPTO_ANUBIS is not set
+-# CONFIG_CRYPTO_ARC4 is not set
+-# CONFIG_CRYPTO_BLOWFISH is not set
+-# CONFIG_CRYPTO_CAMELLIA is not set
+-# CONFIG_CRYPTO_CAST5 is not set
+-# CONFIG_CRYPTO_CAST6 is not set
++CONFIG_CRYPTO_AES=y
++CONFIG_CRYPTO_ANUBIS=m
++CONFIG_CRYPTO_ARC4=y
++CONFIG_CRYPTO_BLOWFISH=m
++CONFIG_CRYPTO_CAMELLIA=m
++CONFIG_CRYPTO_CAST5=m
++CONFIG_CRYPTO_CAST6=m
+ CONFIG_CRYPTO_DES=y
+-# CONFIG_CRYPTO_FCRYPT is not set
+-# CONFIG_CRYPTO_KHAZAD is not set
+-# CONFIG_CRYPTO_SALSA20 is not set
+-# CONFIG_CRYPTO_SEED is not set
+-# CONFIG_CRYPTO_SERPENT is not set
+-# CONFIG_CRYPTO_TEA is not set
+-# CONFIG_CRYPTO_TWOFISH is not set
++CONFIG_CRYPTO_FCRYPT=m
++CONFIG_CRYPTO_KHAZAD=m
++CONFIG_CRYPTO_SALSA20=m
++CONFIG_CRYPTO_SEED=m
++CONFIG_CRYPTO_SERPENT=m
++CONFIG_CRYPTO_TEA=m
++CONFIG_CRYPTO_TWOFISH=m
++CONFIG_CRYPTO_TWOFISH_COMMON=m
+ 
+ #
+ # Compression
+ #
+-# CONFIG_CRYPTO_DEFLATE is not set
+-# CONFIG_CRYPTO_LZO is not set
++CONFIG_CRYPTO_DEFLATE=y
++# CONFIG_CRYPTO_ZLIB is not set
++CONFIG_CRYPTO_LZO=y
++
++#
++# Random Number Generation
++#
++CONFIG_CRYPTO_ANSI_CPRNG=m
+ CONFIG_CRYPTO_HW=y
++CONFIG_BINARY_PRINTF=y
+ 
+ #
+ # Library routines
+ #
+ CONFIG_BITREVERSE=y
+-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
++CONFIG_GENERIC_FIND_LAST_BIT=y
+ CONFIG_CRC_CCITT=y
+-# CONFIG_CRC16 is not set
+-# CONFIG_CRC_T10DIF is not set
+-# CONFIG_CRC_ITU_T is not set
++CONFIG_CRC16=y
++CONFIG_CRC_T10DIF=y
++CONFIG_CRC_ITU_T=y
+ CONFIG_CRC32=y
+-# CONFIG_CRC7 is not set
++CONFIG_CRC7=y
+ CONFIG_LIBCRC32C=y
+ CONFIG_ZLIB_INFLATE=y
+ CONFIG_ZLIB_DEFLATE=y
+-CONFIG_PLIST=y
++CONFIG_LZO_COMPRESS=y
++CONFIG_LZO_DECOMPRESS=y
++CONFIG_DECOMPRESS_GZIP=y
++CONFIG_TEXTSEARCH=y
++CONFIG_TEXTSEARCH_KMP=m
++CONFIG_TEXTSEARCH_BM=m
++CONFIG_TEXTSEARCH_FSM=m
+ CONFIG_HAS_IOMEM=y
+ CONFIG_HAS_IOPORT=y
+ CONFIG_HAS_DMA=y
++CONFIG_NLATTR=y
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0010-board-omap3beagle-update-omap34xxcam-to-more-recent-.patch b/recipes/linux/linux-omap-psp-2.6.32/0010-board-omap3beagle-update-omap34xxcam-to-more-recent-.patch
deleted file mode 100644
index 99a1f99afc..0000000000
--- a/recipes/linux/linux-omap-psp-2.6.32/0010-board-omap3beagle-update-omap34xxcam-to-more-recent-.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 035bb20e5f119fab09686b30d9d57979462bbca6 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <k-kooi@ti.com>
-Date: Thu, 11 Feb 2010 22:59:19 +0100
-Subject: [PATCH 10/42] board-omap3beagle: update omap34xxcam to more recent v4l-int-device-api
-
----
- arch/arm/mach-omap2/board-omap3beagle.c |   20 +++++++++++---------
- 1 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 91d835a..d09a676 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -461,6 +461,7 @@ static struct isp_interface_config mt9t111_if_config = {
- 	.strobe			= 0x0,
- 	.prestrobe		= 0x0,
- 	.shutter		= 0x0,
-+	.wait_hs_vs		= 2,
- 	.u.par.par_bridge	= 0x1,
- 	.u.par.par_clk_pol	= 0x0,
- };
-@@ -513,14 +514,13 @@ static int mt9t111_ifparm(struct v4l2_ifparm *p)
- 	return 0;
- }
- 
--#if defined(CONFIG_VIDEO_OMAP3_CAM) || defined(CONFIG_VIDEO_OMAP3_CAM_MODULE)
-+#if defined(CONFIG_VIDEO_OMAP3)
- static struct omap34xxcam_hw_config mt9t111_decoder_hwc = {
- 	.dev_index		= 0,
- 	.dev_minor		= 0,
- 	.dev_type		= OMAP34XXCAM_SLAVE_SENSOR,
--	.u.sensor.xclk		= OMAP34XXCAM_XCLK_NONE,
- 	.u.sensor.sensor_isp	= 1,
--};
-+        .u.sensor.capture_mem   = PAGE_ALIGN(2048*1536*2*4),};
- #endif
- 
- /**
-@@ -530,16 +530,16 @@ static struct omap34xxcam_hw_config mt9t111_decoder_hwc = {
-  *
-  * @return result of operation - 0 is success
-  */
--static int mt9t111_set_prv_data(void *priv)
-+static int mt9t111_set_prv_data(struct v4l2_int_device *s, void *priv)
- {
--#if defined(CONFIG_VIDEO_OMAP3_CAM) || defined(CONFIG_VIDEO_OMAP3_CAM_MODULE)
-+#if defined(CONFIG_VIDEO_OMAP3)
- 	struct omap34xxcam_hw_config *hwc = priv;
- 
- 	if (priv == NULL)
- 		return -EINVAL;
- 
- 	hwc->u.sensor.sensor_isp = mt9t111_decoder_hwc.u.sensor.sensor_isp;
--	hwc->u.sensor.xclk = mt9t111_decoder_hwc.u.sensor.xclk;
-+	hwc->u.sensor.capture_mem = mt9t111_decoder_hwc.u.sensor.capture_mem;
- 	hwc->dev_index = mt9t111_decoder_hwc.dev_index;
- 	hwc->dev_minor = mt9t111_decoder_hwc.dev_minor;
- 	hwc->dev_type = mt9t111_decoder_hwc.dev_type;
-@@ -556,8 +556,10 @@ static int mt9t111_set_prv_data(void *priv)
-  *
-  * @return result of operation - 0 is success
-  */
--static int mt9t111_power_set(enum v4l2_power power)
-+static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power)
- {
-+	struct omap34xxcam_videodev *vdev = s->u.slave->master->priv;
-+
- 	switch (power) {
- 	case V4L2_POWER_OFF:
- 		/* Disable mux for TVP5146 decoder data path */
-@@ -573,8 +575,8 @@ static int mt9t111_power_set(enum v4l2_power power)
- //		if (omap3evmdc_set_mux(MUX_CAMERA_SENSOR, ENABLE_MUX))
- //			return -ENODEV;
- 
--#if defined(CONFIG_VIDEO_OMAP3_CAM) || defined(CONFIG_VIDEO_OMAP3_CAM_MODULE)
--		isp_configure_interface(&mt9t111_if_config);
-+#if defined(CONFIG_VIDEO_OMAP3)
-+		isp_configure_interface(vdev->cam->isp, &mt9t111_if_config);
- #endif
- 		break;
- 
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0011-ASoC-enable-audio-capture-by-default-for-twl4030.patch b/recipes/linux/linux-omap-psp-2.6.32/0011-ASoC-enable-audio-capture-by-default-for-twl4030.patch
index 40a51c0851..d5038dcce9 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0011-ASoC-enable-audio-capture-by-default-for-twl4030.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0011-ASoC-enable-audio-capture-by-default-for-twl4030.patch
@@ -1,7 +1,7 @@
-From d9be2e8e3592ba85c04966ece2a5b9de0db0b4a4 Mon Sep 17 00:00:00 2001
+From a27b4854330f9f7430c757bd5b4476fb85bae6c6 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 17 Dec 2009 12:45:20 -0800
-Subject: [PATCH 11/42] ASoC: enable audio capture by default for twl4030
+Subject: [PATCH 11/43] ASoC: enable audio capture by default for twl4030
 
 ---
  sound/soc/codecs/twl4030.c |    4 ++--
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0012-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch b/recipes/linux/linux-omap-psp-2.6.32/0012-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch
index 0637d5b7bd..325cb366c2 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0012-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0012-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch
@@ -1,7 +1,7 @@
-From 180b861858043d6fda4eada1eec16f1340179258 Mon Sep 17 00:00:00 2001
+From 6ea180bb9b73b36b5b3ff47fdd1d3d0194ee03c1 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 31 Dec 2009 07:05:02 -0800
-Subject: [PATCH 12/42] MTD: NAND: omap2: proper fix for subpage read ECC errors
+Subject: [PATCH 12/43] MTD: NAND: omap2: proper fix for subpage read ECC errors
 
 ---
  drivers/mtd/nand/omap2.c |   11 +++++++----
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0013-OMAP3630-DSS2-Enable-Pre-Multiplied-Alpha-Support.patch b/recipes/linux/linux-omap-psp-2.6.32/0013-OMAP3630-DSS2-Enable-Pre-Multiplied-Alpha-Support.patch
index f415c5b079..329076b0bf 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0013-OMAP3630-DSS2-Enable-Pre-Multiplied-Alpha-Support.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0013-OMAP3630-DSS2-Enable-Pre-Multiplied-Alpha-Support.patch
@@ -1,7 +1,7 @@
-From 4a8af93ef5fc14877be52716794db928ce7de34a Mon Sep 17 00:00:00 2001
+From 83006da4037e890d5c4eec9f5fe0e8d0ea4af44b Mon Sep 17 00:00:00 2001
 From: Sudeep Basavaraj <sudeep.basavaraj@ti.com>
 Date: Tue, 5 Jan 2010 18:58:18 +0530
-Subject: [PATCH 13/42] OMAP3630:DSS2:Enable Pre-Multiplied Alpha Support
+Subject: [PATCH 13/43] OMAP3630:DSS2:Enable Pre-Multiplied Alpha Support
 
 Enables dss to process color formats with pre-mulitplied alpha values.
 With this we can have alpha values defined for each pixel
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch b/recipes/linux/linux-omap-psp-2.6.32/0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch
index 4e71495293..f8c939264d 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch
@@ -1,7 +1,7 @@
-From a5b124082b2c7b96ccf58db7eb2137a759332471 Mon Sep 17 00:00:00 2001
+From da46218c8e601d44ab125bd7dc27af93a8b21e5b Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 19 Jan 2010 21:19:15 -0800
-Subject: [PATCH 14/42] DSS2: add bootarg for selecting svideo or composite for tv output
+Subject: [PATCH 14/43] DSS2: add bootarg for selecting svideo or composite for tv output
 
 also add pal-16 and ntsc-16 omapfb.mode settings for 16bpp
 ---
@@ -10,7 +10,7 @@ also add pal-16 and ntsc-16 omapfb.mode settings for 16bpp
  2 files changed, 31 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
-index 749a5a0..14aa721 100644
+index 1127e85..53fa54e 100644
 --- a/drivers/video/omap2/dss/venc.c
 +++ b/drivers/video/omap2/dss/venc.c
 @@ -87,6 +87,11 @@
@@ -25,7 +25,7 @@ index 749a5a0..14aa721 100644
  struct venc_config {
  	u32 f_control;
  	u32 vidout_ctrl;
-@@ -409,6 +414,23 @@ static int venc_panel_probe(struct omap_dss_device *dssdev)
+@@ -430,6 +435,23 @@ static int venc_panel_probe(struct omap_dss_device *dssdev)
  {
  	dssdev->panel.timings = omap_dss_pal_timings;
  
@@ -50,10 +50,10 @@ index 749a5a0..14aa721 100644
  }
  
 diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
-index 340ab51..c2c9663 100644
+index ef29983..015831b 100644
 --- a/drivers/video/omap2/omapfb/omapfb-main.c
 +++ b/drivers/video/omap2/omapfb/omapfb-main.c
-@@ -1988,7 +1988,15 @@ static int omapfb_mode_to_timings(const char *mode_str,
+@@ -1961,7 +1961,15 @@ static int omapfb_mode_to_timings(const char *mode_str,
  	int r;
  
  #ifdef CONFIG_OMAP2_DSS_VENC
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0015-ISP-add-some-more-from-Leopard-imaging-patch.patch b/recipes/linux/linux-omap-psp-2.6.32/0015-ISP-add-some-more-from-Leopard-imaging-patch.patch
index 62333a35f0..92041048fb 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0015-ISP-add-some-more-from-Leopard-imaging-patch.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0015-ISP-add-some-more-from-Leopard-imaging-patch.patch
@@ -1,7 +1,7 @@
-From 876c73557fcf9f31b4d8c23b163fd7675164033d Mon Sep 17 00:00:00 2001
+From 77eaef7dfa42ecf2fbf66e95bc1e4642bf52c989 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <k-kooi@ti.com>
 Date: Thu, 11 Feb 2010 21:34:00 +0100
-Subject: [PATCH 15/42] ISP: add some more from Leopard imaging patch
+Subject: [PATCH 15/43] ISP: add some more from Leopard imaging patch
 
 ---
  drivers/media/video/isp/isppreview.c |   16 ++++++++-
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0016-ARM-OMAP-Overo-Add-support-for-second-ethernet-port.patch b/recipes/linux/linux-omap-psp-2.6.32/0016-ARM-OMAP-Overo-Add-support-for-second-ethernet-port.patch
index 16d37e0c99..ea032e2985 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0016-ARM-OMAP-Overo-Add-support-for-second-ethernet-port.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0016-ARM-OMAP-Overo-Add-support-for-second-ethernet-port.patch
@@ -1,7 +1,7 @@
-From d28b6bd38dd25494d088a0de1a25e7154e11dab4 Mon Sep 17 00:00:00 2001
+From 0f494c3545ebbc375a7241ede3aa0db33295bebe Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <sakoman@gmail.com>
 Date: Tue, 15 Dec 2009 14:59:42 -0800
-Subject: [PATCH 16/42] ARM: OMAP: Overo: Add support for second ethernet port
+Subject: [PATCH 16/43] ARM: OMAP: Overo: Add support for second ethernet port
 
 Signed-off-by: Steve Sakoman <sakoman@gmail.com>
 ---
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0017-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch b/recipes/linux/linux-omap-psp-2.6.32/0017-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch
index 3296d703eb..57253a9bb3 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0017-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0017-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch
@@ -1,7 +1,7 @@
-From 68ba8c73c3b889e05f7664a35d89ee22776ff5fe Mon Sep 17 00:00:00 2001
+From e6b2441d2d92a62cf30dfde9451bdaebf6a2cee0 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <sakoman@gmail.com>
 Date: Tue, 15 Dec 2009 15:17:44 -0800
-Subject: [PATCH 17/42] drivers: net: smsc911x: return ENODEV if device is not found
+Subject: [PATCH 17/43] drivers: net: smsc911x: return ENODEV if device is not found
 
 Signed-off-by: Steve Sakoman <sakoman@gmail.com>
 ---
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch b/recipes/linux/linux-omap-psp-2.6.32/0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch
index cc0f2f0e16..a90245abd3 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch
@@ -1,7 +1,7 @@
-From ea0fbdecf6d630d93ce03e64fb70c4740ed08f56 Mon Sep 17 00:00:00 2001
+From 551a2a661a3b55820560a30fb19c6df10086b91f Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <sakoman@gmail.com>
 Date: Tue, 15 Dec 2009 15:24:10 -0800
-Subject: [PATCH 18/42] drivers: input: touchscreen: ads7846: return ENODEV if device is not found
+Subject: [PATCH 18/43] drivers: input: touchscreen: ads7846: return ENODEV if device is not found
 
 Signed-off-by: Steve Sakoman <sakoman@gmail.com>
 ---
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0019-drivers-mfd-add-twl4030-madc-driver.patch b/recipes/linux/linux-omap-psp-2.6.32/0019-drivers-mfd-add-twl4030-madc-driver.patch
index b6b7a3b208..09c62a7478 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0019-drivers-mfd-add-twl4030-madc-driver.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0019-drivers-mfd-add-twl4030-madc-driver.patch
@@ -1,7 +1,7 @@
-From 06188f0f2fbdfb68844585eefe68dc5b0b49499a Mon Sep 17 00:00:00 2001
+From c9ff40a9288c0cbac9d10b14ae05db1bdba71a53 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 17 Dec 2009 14:19:34 -0800
-Subject: [PATCH 19/42] drivers: mfd: add twl4030 madc driver
+Subject: [PATCH 19/43] drivers: mfd: add twl4030 madc driver
 
 ---
  drivers/mfd/Kconfig        |   21 ++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0020-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch b/recipes/linux/linux-omap-psp-2.6.32/0020-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch
index d2ab973833..c92d46ab81 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0020-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0020-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch
@@ -1,7 +1,7 @@
-From c5e422625ca688666e11e34184199bc9925db2e6 Mon Sep 17 00:00:00 2001
+From 9b4c740531916992ba11be300250d51e2e2a1638 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 17 Dec 2009 15:54:58 -0800
-Subject: [PATCH 20/42] ARM: OMAP: Add missing twl4030 madc header file
+Subject: [PATCH 20/43] ARM: OMAP: Add missing twl4030 madc header file
 
 ---
  include/linux/i2c/twl4030-madc.h |  130 ++++++++++++++++++++++++++++++++++++++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0021-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch b/recipes/linux/linux-omap-psp-2.6.32/0021-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch
index 4eee0607b2..98a1b65d6e 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0021-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0021-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch
@@ -1,7 +1,7 @@
-From 301b3b310aafd2ce4d6daa64eabf32729885ba7d Mon Sep 17 00:00:00 2001
+From 9957678090f6e4bee24dca76b668b4daec02d88c Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 17 Dec 2009 14:27:15 -0800
-Subject: [PATCH 21/42] ARM: OMAP: Add twl4030 madc support to Overo
+Subject: [PATCH 21/43] ARM: OMAP: Add twl4030 madc support to Overo
 
 ---
  arch/arm/mach-omap2/board-overo.c |    5 +++++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0022-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch b/recipes/linux/linux-omap-psp-2.6.32/0022-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch
index a7708150d1..b77ebf1e18 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0022-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0022-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch
@@ -1,17 +1,17 @@
-From 6b5bbbc27f497023e7897c9a8d378a8050644be9 Mon Sep 17 00:00:00 2001
+From 1e7a9e815e97782f4aa69b27822fe1664faf7fd4 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 17 Dec 2009 14:32:36 -0800
-Subject: [PATCH 22/42] ARM: OMAP: Add twl4030 madc support to Beagle
+Subject: [PATCH 22/43] ARM: OMAP: Add twl4030 madc support to Beagle
 
 ---
  arch/arm/mach-omap2/board-omap3beagle.c |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index d09a676..4b7ed8a 100644
+index b3c8cb7..dd830b1 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -438,6 +438,10 @@ static struct twl4030_codec_data beagle_codec_data = {
+@@ -473,6 +473,10 @@ static struct twl4030_codec_data beagle_codec_data = {
  	.audio = &beagle_audio_data,
  };
  
@@ -22,7 +22,7 @@ index d09a676..4b7ed8a 100644
  static struct twl4030_platform_data beagle_twldata = {
  	.irq_base	= TWL4030_IRQ_BASE,
  	.irq_end	= TWL4030_IRQ_END,
-@@ -446,6 +450,7 @@ static struct twl4030_platform_data beagle_twldata = {
+@@ -481,6 +485,7 @@ static struct twl4030_platform_data beagle_twldata = {
  	.usb		= &beagle_usb_data,
  	.gpio		= &beagle_gpio_data,
  	.codec		= &beagle_codec_data,
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0023-netdev-rt73usb-add-vendor-device-ID-for-Ceiva-Wirele.patch b/recipes/linux/linux-omap-psp-2.6.32/0023-netdev-rt73usb-add-vendor-device-ID-for-Ceiva-Wirele.patch
index f1504f4153..bb6bd7598b 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0023-netdev-rt73usb-add-vendor-device-ID-for-Ceiva-Wirele.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0023-netdev-rt73usb-add-vendor-device-ID-for-Ceiva-Wirele.patch
@@ -1,7 +1,7 @@
-From b0247dd9c5004da683efeab8466f4ea2e2b133aa Mon Sep 17 00:00:00 2001
+From b7fda334f7a394647422f58b91b4890dc72b1c30 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 19 Jan 2010 20:00:46 -0800
-Subject: [PATCH 23/42] netdev: rt73usb - add vendor/device ID for Ceiva Wireless PartNo 81726-00702
+Subject: [PATCH 23/43] netdev: rt73usb - add vendor/device ID for Ceiva Wireless PartNo 81726-00702
 
 ---
  drivers/net/wireless/rt2x00/rt73usb.c |    2 ++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0024-mmc-don-t-display-single-block-read-console-messages.patch b/recipes/linux/linux-omap-psp-2.6.32/0024-mmc-don-t-display-single-block-read-console-messages.patch
index 15be999f1c..20b6ca7be8 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0024-mmc-don-t-display-single-block-read-console-messages.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0024-mmc-don-t-display-single-block-read-console-messages.patch
@@ -1,7 +1,7 @@
-From 0fa55ca392a4ffdf6a89075683dff00191656e6f Mon Sep 17 00:00:00 2001
+From 7f87d1531cfdbf4fcd59bc8502e45d3aea8c8eba Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Mon, 4 Jan 2010 19:20:25 -0800
-Subject: [PATCH 24/42] mmc: don't display single block read console messages
+Subject: [PATCH 24/43] mmc: don't display single block read console messages
 
 mmc: don't display single block read console messages
 ---
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0025-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch b/recipes/linux/linux-omap-psp-2.6.32/0025-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch
index 521948392c..2272cb3312 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0025-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0025-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch
@@ -1,7 +1,7 @@
-From e700d77899105c0c81b639256225cd2ce986ce07 Mon Sep 17 00:00:00 2001
+From f715b7b9f49e4a65ba5370cb36ce6f2c7830d1bc Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Sun, 24 Jan 2010 09:33:56 -0800
-Subject: [PATCH 25/42] ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test
+Subject: [PATCH 25/43] ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test
 
 otherwise it is not executed on systems that use non-twl regulators
 ---
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0026-board-overo-add-PM-code-and-sync-with-http-www.sakom.patch b/recipes/linux/linux-omap-psp-2.6.32/0026-board-overo-add-PM-code-and-sync-with-http-www.sakom.patch
index 6869ba696c..8977495a67 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0026-board-overo-add-PM-code-and-sync-with-http-www.sakom.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0026-board-overo-add-PM-code-and-sync-with-http-www.sakom.patch
@@ -1,7 +1,7 @@
-From c90f11536d0c5e509dd542e356b2698fc90ed1b9 Mon Sep 17 00:00:00 2001
+From caa6d93d406fa836c8af84268f0ed7391434f1ee Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Sun, 14 Feb 2010 12:52:02 +0100
-Subject: [PATCH 26/42] board-overo: add PM code and sync with http://www.sakoman.com/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=shortlog;h=refs/heads/omap3-2.6.32
+Subject: [PATCH 26/43] board-overo: add PM code and sync with http://www.sakoman.com/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=shortlog;h=refs/heads/omap3-2.6.32
 
 ---
  arch/arm/mach-omap2/board-overo.c |  274 ++++++++++++++++++++++++++++++++-----
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0027-twl4030-madc-adjust-for-twl4030-twl-api-changes.patch b/recipes/linux/linux-omap-psp-2.6.32/0027-twl4030-madc-adjust-for-twl4030-twl-api-changes.patch
index 93358e9e19..0c494751cf 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0027-twl4030-madc-adjust-for-twl4030-twl-api-changes.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0027-twl4030-madc-adjust-for-twl4030-twl-api-changes.patch
@@ -1,7 +1,7 @@
-From bd6157d8970cda63db9986ceadb16f3e8f4c22ef Mon Sep 17 00:00:00 2001
+From f308badab37377503a387db2c0153c0a9c71ff7f Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Mon, 15 Feb 2010 14:20:51 +0100
-Subject: [PATCH 27/42] twl4030-madc: adjust for twl4030 -> twl api changes
+Subject: [PATCH 27/43] twl4030-madc: adjust for twl4030 -> twl api changes
 
 ---
  drivers/mfd/twl4030-madc.c |   18 +++++++++---------
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0028-OMAP-DSS2-Re-add-support-for-Samsung-lte430wq-f0c-pa.patch b/recipes/linux/linux-omap-psp-2.6.32/0028-OMAP-DSS2-Re-add-support-for-Samsung-lte430wq-f0c-pa.patch
index 7d97013b8d..1905833e24 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0028-OMAP-DSS2-Re-add-support-for-Samsung-lte430wq-f0c-pa.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0028-OMAP-DSS2-Re-add-support-for-Samsung-lte430wq-f0c-pa.patch
@@ -1,7 +1,7 @@
-From 7bf370db8ac5fa45290c3116c9f02271d9b40f2f Mon Sep 17 00:00:00 2001
+From 821a796dba3b5f1745d3ff990b14995bd691a8e3 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Mon, 15 Feb 2010 14:38:00 +0100
-Subject: [PATCH 28/42] OMAP: DSS2: (Re)add support for Samsung lte430wq-f0c panel
+Subject: [PATCH 28/43] OMAP: DSS2: (Re)add support for Samsung lte430wq-f0c panel
 
 ---
  drivers/video/omap2/displays/Kconfig               |    6 +
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0029-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-panel.patch b/recipes/linux/linux-omap-psp-2.6.32/0029-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-panel.patch
index 6dfafb6e7d..97aa09ceda 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0029-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-panel.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0029-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-panel.patch
@@ -1,7 +1,7 @@
-From f3743c3c16d3528d888e4315194c9eca9ba95b04 Mon Sep 17 00:00:00 2001
+From d65c7d454ff43f8955f23f324a24adf7e2d4edff Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 17 Dec 2009 15:05:30 -0800
-Subject: [PATCH 29/42] OMAP: DSS2: Add support for LG Philips LB035Q02 panel
+Subject: [PATCH 29/43] OMAP: DSS2: Add support for LG Philips LB035Q02 panel
 
 ---
  drivers/video/omap2/displays/Kconfig               |    6 +
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0030-Fix-for-bus-width-which-improves-SD-card-s-peformanc.patch b/recipes/linux/linux-omap-psp-2.6.32/0030-Fix-for-bus-width-which-improves-SD-card-s-peformanc.patch
index c91adc1658..5e842cfa6b 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0030-Fix-for-bus-width-which-improves-SD-card-s-peformanc.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0030-Fix-for-bus-width-which-improves-SD-card-s-peformanc.patch
@@ -1,7 +1,7 @@
-From 02cffb32ff4c48c1e23be720aae84a7f3496d2cc Mon Sep 17 00:00:00 2001
+From c6c2fc6a66a56256bb2fe015fb07b062666ee246 Mon Sep 17 00:00:00 2001
 From: Kishore Kadiyala <kishore.kadiyala@ti.com>
 Date: Wed, 17 Feb 2010 19:34:47 +0530
-Subject: [PATCH 30/42] Fix for bus width which improves SD card's peformance.
+Subject: [PATCH 30/43] Fix for bus width which improves SD card's peformance.
 
 This patch fixes bus width which improves peformance for SD cards.
 OMAP-MMC controller's can support maximum bus width of '8'.
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0031-ARM-VFP-add-support-to-sync-the-VFP-state-of-the-cur.patch b/recipes/linux/linux-omap-psp-2.6.32/0031-ARM-VFP-add-support-to-sync-the-VFP-state-of-the-cur.patch
index 8bebc455ca..11a418400d 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0031-ARM-VFP-add-support-to-sync-the-VFP-state-of-the-cur.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0031-ARM-VFP-add-support-to-sync-the-VFP-state-of-the-cur.patch
@@ -1,7 +1,7 @@
-From 06408a83f74dde1c827749912fa53c7118f84822 Mon Sep 17 00:00:00 2001
+From d3c14324b23c6cef8452a9a6037b6ec2a6f07d6e Mon Sep 17 00:00:00 2001
 From: Imre Deak <imre.deak@nokia.com>
 Date: Thu, 4 Feb 2010 21:38:02 +0200
-Subject: [PATCH 31/42] ARM: VFP: add support to sync the VFP state of the current thread
+Subject: [PATCH 31/43] ARM: VFP: add support to sync the VFP state of the current thread
 
 ARM: VFP: add support to sync the VFP state of the current thread
 
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0032-ARM-VFP-preserve-the-HW-context-when-calling-signal-.patch b/recipes/linux/linux-omap-psp-2.6.32/0032-ARM-VFP-preserve-the-HW-context-when-calling-signal-.patch
index 7aaf626397..8426ce3086 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0032-ARM-VFP-preserve-the-HW-context-when-calling-signal-.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0032-ARM-VFP-preserve-the-HW-context-when-calling-signal-.patch
@@ -1,7 +1,7 @@
-From 11cceffa4e4c2e6971fde3ec8a978d267d5e9805 Mon Sep 17 00:00:00 2001
+From 59c9e3b77e82affd2ab0233af06a47473f991996 Mon Sep 17 00:00:00 2001
 From: Imre Deak <imre.deak@nokia.com>
 Date: Thu, 4 Feb 2010 21:38:30 +0200
-Subject: [PATCH 32/42] ARM: VFP: preserve the HW context when calling signal handlers
+Subject: [PATCH 32/43] ARM: VFP: preserve the HW context when calling signal handlers
 
 ARM: VFP: preserve the HW context when calling signal handlers
 
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0033-Switch-SGX-clocks-to-200MHz-on-DM37xx-OMAP36xx.patch b/recipes/linux/linux-omap-psp-2.6.32/0033-Switch-SGX-clocks-to-200MHz-on-DM37xx-OMAP36xx.patch
index 1d09dc11ba..972976d27f 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0033-Switch-SGX-clocks-to-200MHz-on-DM37xx-OMAP36xx.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0033-Switch-SGX-clocks-to-200MHz-on-DM37xx-OMAP36xx.patch
@@ -1,7 +1,7 @@
-From 87cc235a5e1a32cc3e68f3911641ff65493b1dc3 Mon Sep 17 00:00:00 2001
+From b9e50cb8ee8ad92d71b65bd71700be1894f9e543 Mon Sep 17 00:00:00 2001
 From: Prabindh Sundareson <prabu@ti.com>
 Date: Wed, 3 Mar 2010 15:45:35 +0100
-Subject: [PATCH 33/42] Switch SGX clocks to 200MHz on DM37xx/OMAP36xx
+Subject: [PATCH 33/43] Switch SGX clocks to 200MHz on DM37xx/OMAP36xx
 
 ---
  arch/arm/mach-omap2/clock34xx_data.c |    4 ++--
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0034-modedb.c-add-proper-720p60-mode.patch b/recipes/linux/linux-omap-psp-2.6.32/0034-modedb.c-add-proper-720p60-mode.patch
index a79279a9f7..1d49fcd475 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0034-modedb.c-add-proper-720p60-mode.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0034-modedb.c-add-proper-720p60-mode.patch
@@ -1,7 +1,7 @@
-From ad627c1708d8b68f6e9ca96f28ec8862ef02f760 Mon Sep 17 00:00:00 2001
+From fd8be8ca22b19d58202ef84cc27d0f14d2f59e2a Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Mon, 8 Mar 2010 14:38:31 +0100
-Subject: [PATCH 34/42] modedb.c: add proper 720p60 mode
+Subject: [PATCH 34/43] modedb.c: add proper 720p60 mode
 
 ---
  drivers/video/modedb.c |    4 ++++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0035-RTC-add-support-for-backup-battery-recharge.patch b/recipes/linux/linux-omap-psp-2.6.32/0035-RTC-add-support-for-backup-battery-recharge.patch
index 0e37352eef..ba689c459c 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0035-RTC-add-support-for-backup-battery-recharge.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0035-RTC-add-support-for-backup-battery-recharge.patch
@@ -1,7 +1,7 @@
-From 269749cdba3dcaf29eef58e73da0a9e032da63ca Mon Sep 17 00:00:00 2001
+From 02203232a3230c06a1bc939c92aac7e910c5d578 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 4 Feb 2010 12:26:22 -0800
-Subject: [PATCH 35/42] RTC: add support for backup battery recharge
+Subject: [PATCH 35/43] RTC: add support for backup battery recharge
 
 ---
  drivers/rtc/rtc-twl.c |   25 +++++++++++++++++++++++++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0036-ARM-Add-prompt-for-CONFIG_ALIGNMENT_TRAP.patch b/recipes/linux/linux-omap-psp-2.6.32/0036-ARM-Add-prompt-for-CONFIG_ALIGNMENT_TRAP.patch
index 3b884deb06..dcf4ac6f12 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0036-ARM-Add-prompt-for-CONFIG_ALIGNMENT_TRAP.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0036-ARM-Add-prompt-for-CONFIG_ALIGNMENT_TRAP.patch
@@ -1,7 +1,7 @@
-From 50343d07aaf7c8bfbd02d06261512c99ce430788 Mon Sep 17 00:00:00 2001
+From 1bd440f727d2ce1a9673489b776e38e1b4dd0521 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Mon, 13 Oct 2008 20:32:16 +0100
-Subject: [PATCH 36/42] ARM: Add prompt for CONFIG_ALIGNMENT_TRAP
+Subject: [PATCH 36/43] ARM: Add prompt for CONFIG_ALIGNMENT_TRAP
 
 This adds a prompt text for CONFIG_ALIGNMENT_TRAP, thus making it
 visible in make *config.
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0037-ARM-Print-warning-on-alignment-trap-in-kernel-mode.patch b/recipes/linux/linux-omap-psp-2.6.32/0037-ARM-Print-warning-on-alignment-trap-in-kernel-mode.patch
index 9f4c1f68db..713ab4600f 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0037-ARM-Print-warning-on-alignment-trap-in-kernel-mode.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0037-ARM-Print-warning-on-alignment-trap-in-kernel-mode.patch
@@ -1,7 +1,7 @@
-From 9a23874151abb055225b8f019665e873bc7c5b5a Mon Sep 17 00:00:00 2001
+From f1f418ef2fd457872e4ca7da1789bcfd8f97bca8 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Sat, 28 Mar 2009 13:21:55 +0000
-Subject: [PATCH 37/42] ARM: Print warning on alignment trap in kernel mode
+Subject: [PATCH 37/43] ARM: Print warning on alignment trap in kernel mode
 
 Signed-off-by: Mans Rullgard <mans@mansr.com>
 ---
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0038-ARM-Expose-some-CPU-control-registers-via-sysfs.patch b/recipes/linux/linux-omap-psp-2.6.32/0038-ARM-Expose-some-CPU-control-registers-via-sysfs.patch
index 0d2c1c63d7..e5670fc155 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0038-ARM-Expose-some-CPU-control-registers-via-sysfs.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0038-ARM-Expose-some-CPU-control-registers-via-sysfs.patch
@@ -1,7 +1,7 @@
-From 9b88c174cfa0f861fcddd11c2e41b007ff243bd3 Mon Sep 17 00:00:00 2001
+From bbc04eff26fcd9ecb75069a62a84fa49d83811b8 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Tue, 10 Nov 2009 00:39:21 +0000
-Subject: [PATCH 38/42] ARM: Expose some CPU control registers via sysfs
+Subject: [PATCH 38/43] ARM: Expose some CPU control registers via sysfs
 
 This creates sysfs files under /sys/devices/system/cpu/cpuN
 exposing the values of the control register, auxiliary control
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0039-ARM-Add-option-to-allow-userspace-PLE-access.patch b/recipes/linux/linux-omap-psp-2.6.32/0039-ARM-Add-option-to-allow-userspace-PLE-access.patch
index a3af530ab8..e97d9d5117 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0039-ARM-Add-option-to-allow-userspace-PLE-access.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0039-ARM-Add-option-to-allow-userspace-PLE-access.patch
@@ -1,7 +1,7 @@
-From 85392359bd3a2002b72d65d1637598c2f1e398b3 Mon Sep 17 00:00:00 2001
+From 7ba11a1ce9a6dc90dd17aeff30127217fa604ecf Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Tue, 10 Nov 2009 00:41:54 +0000
-Subject: [PATCH 39/42] ARM: Add option to allow userspace PLE access
+Subject: [PATCH 39/43] ARM: Add option to allow userspace PLE access
 
 This adds a Kconfig option to allow userspace to access the L2 preload
 engine (PLE) found in Cortex-A8.
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0040-ARM-Add-option-to-allow-userspace-access-to-performa.patch b/recipes/linux/linux-omap-psp-2.6.32/0040-ARM-Add-option-to-allow-userspace-access-to-performa.patch
index 7fcb5fe082..41a303662e 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0040-ARM-Add-option-to-allow-userspace-access-to-performa.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0040-ARM-Add-option-to-allow-userspace-access-to-performa.patch
@@ -1,7 +1,7 @@
-From c6faecfc5916cce9ff104982e7b3ab4b990400bf Mon Sep 17 00:00:00 2001
+From 7a20711022052ffe2a563f83e8645712919234ba Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Tue, 10 Nov 2009 00:52:56 +0000
-Subject: [PATCH 40/42] ARM: Add option to allow userspace access to performance counters
+Subject: [PATCH 40/43] ARM: Add option to allow userspace access to performance counters
 
 This adds an option to allow userspace access to the performance monitor
 registers of the Cortex-A8.
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0041-ARM-Expose-some-PMON-registers-through-sysfs.patch b/recipes/linux/linux-omap-psp-2.6.32/0041-ARM-Expose-some-PMON-registers-through-sysfs.patch
index d16323f4aa..51c9a049c5 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0041-ARM-Expose-some-PMON-registers-through-sysfs.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0041-ARM-Expose-some-PMON-registers-through-sysfs.patch
@@ -1,7 +1,7 @@
-From ff5abcc2c35de124962f07dff1263b94402cbacc Mon Sep 17 00:00:00 2001
+From b8ceea553dcf1d4657e3cb792ead9bdf03ab64e8 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Sat, 28 Mar 2009 13:05:02 +0000
-Subject: [PATCH 41/42] ARM: Expose some PMON registers through sysfs
+Subject: [PATCH 41/43] ARM: Expose some PMON registers through sysfs
 
 ---
  arch/arm/kernel/sysfs_v7.c |   11 +++++++++++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0042-musb-allow-host-io-without-gadget-module.patch b/recipes/linux/linux-omap-psp-2.6.32/0042-musb-allow-host-io-without-gadget-module.patch
index 5e6a0e2f1c..a8540c4ce5 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0042-musb-allow-host-io-without-gadget-module.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0042-musb-allow-host-io-without-gadget-module.patch
@@ -1,4 +1,4 @@
-From 856e80e1411ff5fad939545b0b7d2c50676ce5c9 Mon Sep 17 00:00:00 2001
+From f769159cae4d1ae42589d180ac8a376ac3ad687f Mon Sep 17 00:00:00 2001
 From: Ajay Kumar Gupta <ajay.gupta@ti.com>
 Date: Wed, 14 Apr 2010 16:08:37 +0530
 Subject: [PATCH 42/43] musb: allow host io without gadget module
@@ -10,7 +10,7 @@ Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
  2 files changed, 9 insertions(+), 31 deletions(-)
 
 diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
-index 2c1400f..a80e9f9 100644
+index 98874c5..a448fa6 100644
 --- a/drivers/usb/musb/musb_core.c
 +++ b/drivers/usb/musb/musb_core.c
 @@ -2101,10 +2101,12 @@ bad_config:
@@ -42,10 +42,10 @@ index 2c1400f..a80e9f9 100644
  		musb->xceiv->default_a = 0;
  		musb->xceiv->state = OTG_STATE_B_IDLE;
 diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
-index 1c3610b..d75db21 100644
+index c0e2efc..e0a6015 100644
 --- a/drivers/usb/musb/musb_gadget.c
 +++ b/drivers/usb/musb/musb_gadget.c
-@@ -1752,24 +1752,6 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
+@@ -1765,24 +1765,6 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
  		otg_set_peripheral(musb->xceiv, &musb->g);
  
  		spin_unlock_irqrestore(&musb->lock, flags);
@@ -70,7 +70,7 @@ index 1c3610b..d75db21 100644
  	}
  
  	return retval;
-@@ -1865,14 +1847,6 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
+@@ -1878,14 +1860,6 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
  		retval = -EINVAL;
  	spin_unlock_irqrestore(&musb->lock, flags);
  
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0043-MTD-silence-ecc-errors-on-mtdblock0.patch b/recipes/linux/linux-omap-psp-2.6.32/0043-MTD-silence-ecc-errors-on-mtdblock0.patch
new file mode 100644
index 0000000000..9fb0ec9687
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.32/0043-MTD-silence-ecc-errors-on-mtdblock0.patch
@@ -0,0 +1,59 @@
+From 9bd77da63888873c8ebb0c6a70835f2c432a0337 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Mon, 26 Apr 2010 11:17:26 -0700
+Subject: [PATCH 43/43] MTD: silence ecc errors on mtdblock0
+
+mtdblock0 is the x-load partition, which uses hw ecc
+this confuses linux, which uses sw ecc
+this patch silences ecc error messages when linux peeks into mtdblock0
+* not for upstream submission *
+---
+ block/blk-core.c            |    3 ++-
+ drivers/mtd/nand/nand_ecc.c |    2 +-
+ fs/buffer.c                 |    3 ++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/block/blk-core.c b/block/blk-core.c
+index 718897e..c526fde 100644
+--- a/block/blk-core.c
++++ b/block/blk-core.c
+@@ -1970,7 +1970,8 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
+ 		req->errors = 0;
+ 
+ 	if (error && (blk_fs_request(req) && !(req->cmd_flags & REQ_QUIET))) {
+-		printk(KERN_ERR "end_request: I/O error, dev %s, sector %llu\n",
++		if (req->rq_disk && (strcmp(req->rq_disk->disk_name, "mtdblock0") != 0))
++			printk(KERN_ERR "end_request: I/O error, dev %s, sector %llu\n",
+ 				req->rq_disk ? req->rq_disk->disk_name : "?",
+ 				(unsigned long long)blk_rq_pos(req));
+ 	}
+diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
+index 92320a6..2b86b6d 100644
+--- a/drivers/mtd/nand/nand_ecc.c
++++ b/drivers/mtd/nand/nand_ecc.c
+@@ -492,7 +492,7 @@ int __nand_correct_data(unsigned char *buf,
+ 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
+ 		return 1;	/* error in ecc data; no action needed */
+ 
+-	printk(KERN_ERR "uncorrectable error : ");
++//	printk(KERN_ERR "uncorrectable error : ");
+ 	return -1;
+ }
+ EXPORT_SYMBOL(__nand_correct_data);
+diff --git a/fs/buffer.c b/fs/buffer.c
+index 6fa5302..27b3103 100644
+--- a/fs/buffer.c
++++ b/fs/buffer.c
+@@ -114,7 +114,8 @@ static int quiet_error(struct buffer_head *bh)
+ static void buffer_io_error(struct buffer_head *bh)
+ {
+ 	char b[BDEVNAME_SIZE];
+-	printk(KERN_ERR "Buffer I/O error on device %s, logical block %Lu\n",
++	if (strcmp(bdevname(bh->b_bdev, b), "mtdblock0") != 0)
++		printk(KERN_ERR "Buffer I/O error on device %s, logical block %Lu\n",
+ 			bdevname(bh->b_bdev, b),
+ 			(unsigned long long)bh->b_blocknr);
+ }
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0044-ARM-OMAP-beagle-every-known-beagle-except-revB-uses-.patch b/recipes/linux/linux-omap-psp-2.6.32/0044-ARM-OMAP-beagle-every-known-beagle-except-revB-uses-.patch
new file mode 100644
index 0000000000..79a3992d3c
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.32/0044-ARM-OMAP-beagle-every-known-beagle-except-revB-uses-.patch
@@ -0,0 +1,34 @@
+From 16ac58809c76a870e03ae298cef55e0c337423ea Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Thu, 13 May 2010 21:43:08 +0200
+Subject: [PATCH 44/44] ARM: OMAP: beagle: every known beagle (except revB) uses 2 chipselects so don't use NULL for the second chipselect timings
+
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index dd830b1..078e026 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -614,7 +614,7 @@ static void __init omap3_beagle_init_irq(void)
+         if (cpu_is_omap3630())
+         {
+                 omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
+-                                        NULL,
++                                        mt46h32m32lf6_sdrc_params,
+                                         _omap37x_mpu_rate_table,
+                                         _omap37x_dsp_rate_table,
+                                         _omap37x_l3_rate_table);
+@@ -622,7 +622,7 @@ static void __init omap3_beagle_init_irq(void)
+         else
+         {
+                 omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
+-                                        NULL,
++                                        mt46h32m32lf6_sdrc_params,
+                                         _omap35x_mpu_rate_table,
+                                         _omap35x_dsp_rate_table,
+                                         _omap35x_l3_rate_table);
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig
index ca0ca42f66..679d917e16 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig
@@ -58,7 +58,7 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_TREE_RCU_TRACE is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_BUF_SHIFT=16
 CONFIG_GROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_RT_GROUP_SCHED is not set
@@ -267,7 +267,7 @@ CONFIG_OMAP_PACKAGE_CBB=y
 CONFIG_MACH_OMAP3_BEAGLE=y
 # CONFIG_MACH_OMAP_LDP is not set
 # CONFIG_MACH_OVERO is not set
-CONFIG_MACH_OMAP3EVM=y
+CONFIG_MACH_OMAP3EVM=n
 CONFIG_PMIC_TWL4030=y
 # CONFIG_MACH_OMAP3517EVM is not set
 # CONFIG_MACH_OMAP3_PANDORA is not set
@@ -381,7 +381,7 @@ CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_DEBUG=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
@@ -1055,7 +1055,7 @@ CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
 #
 # EEPROM support
 #
-# CONFIG_EEPROM_AT24 is not set
+CONFIG_EEPROM_AT24=m
 # CONFIG_EEPROM_AT25 is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
@@ -2330,7 +2330,7 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_DEBUG_FS=y
-CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_VBUS_DRAW=480
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_ATMEL_USBA is not set
@@ -2442,7 +2442,7 @@ CONFIG_RTC_INTF_DEV=y
 #
 # I2C RTC drivers
 #
-# CONFIG_RTC_DRV_DS1307 is not set
+CONFIG_RTC_DRV_DS1307=m
 # CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0001-ARM-OMAP-add-spi-platform-devices.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0001-ARM-OMAP-add-spi-platform-devices.patch
index 70d9b0044a..8988fd8210 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0001-ARM-OMAP-add-spi-platform-devices.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0001-ARM-OMAP-add-spi-platform-devices.patch
@@ -1,7 +1,7 @@
-From 512af40b0efa98d9a7a5596fe6b19600d89a58dd Mon Sep 17 00:00:00 2001
+From 0031d3fb2d067f4c46e434f5f5c6c14cef2a83a3 Mon Sep 17 00:00:00 2001
 From: Tim Yamin <plasm@roo.me.uk>
 Date: Sat, 11 Apr 2009 13:05:21 -0700
-Subject: [PATCH 01/16] ARM: OMAP: add spi platform devices
+Subject: [PATCH 01/17] ARM: OMAP: add spi platform devices
 
 ---
  arch/arm/mach-omap2/devices.c |   32 ++++++++++++++++++++++++++++++++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0002-MMA7455L-accelerometer-driver.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0002-MMA7455L-accelerometer-driver.patch
index c6cf13c2cc..f9c7702e9e 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0002-MMA7455L-accelerometer-driver.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0002-MMA7455L-accelerometer-driver.patch
@@ -1,7 +1,7 @@
-From f02cd8da4f4dc269b83128e2c42ab664e6619ef8 Mon Sep 17 00:00:00 2001
+From 0c804b06c04a14da575d592c89408537c21fb26b Mon Sep 17 00:00:00 2001
 From: Tim Yamin <plasm@roo.me.uk>
 Date: Tue, 23 Mar 2010 09:52:10 +0100
-Subject: [PATCH 02/16] MMA7455L accelerometer driver
+Subject: [PATCH 02/17] MMA7455L accelerometer driver
 
 ---
  drivers/input/misc/Kconfig    |    9 +
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0003-bq27x00_battery-remove-error-message-output.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0003-bq27x00_battery-remove-error-message-output.patch
index bd1a50b35f..f8b307ee9d 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0003-bq27x00_battery-remove-error-message-output.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0003-bq27x00_battery-remove-error-message-output.patch
@@ -1,7 +1,7 @@
-From df5573b7c2ed7b0e31be60bddc6b9bc928e78bfe Mon Sep 17 00:00:00 2001
+From 6837800d92947d25e263bf041ebe7db4e804af68 Mon Sep 17 00:00:00 2001
 From: Gregoire Gentil <gregoire@gentil.com>
 Date: Fri, 12 Mar 2010 11:41:17 +0100
-Subject: [PATCH 03/16] bq27x00_battery: remove error message output
+Subject: [PATCH 03/17] bq27x00_battery: remove error message output
 
 ---
  drivers/power/bq27x00_battery.c |    5 -----
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0004-bq27x00_battery-add-charged-gpio.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0004-bq27x00_battery-add-charged-gpio.patch
index 6f871ce649..759525f283 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0004-bq27x00_battery-add-charged-gpio.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0004-bq27x00_battery-add-charged-gpio.patch
@@ -1,7 +1,7 @@
-From e1869b08e330d50fd0b57cf0f9ee86eb24d83ec3 Mon Sep 17 00:00:00 2001
+From 829d500667448b7ea9465615261a988adc3aa645 Mon Sep 17 00:00:00 2001
 From: Gregoire Gentil <gregoire@gentil.com>
 Date: Fri, 12 Mar 2010 11:42:45 +0100
-Subject: [PATCH 04/16] bq27x00_battery: add charged gpio
+Subject: [PATCH 04/17] bq27x00_battery: add charged gpio
 
 ---
  drivers/power/bq27x00_battery.c |   21 +++++++++++++++++++++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0005-adf7846-add-more-debugging.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0005-adf7846-add-more-debugging.patch
index a9903ea942..f15e0a2e50 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0005-adf7846-add-more-debugging.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0005-adf7846-add-more-debugging.patch
@@ -1,7 +1,7 @@
-From 0b859f934499c20b71b7c40fe356ab1c53bf7ade Mon Sep 17 00:00:00 2001
+From e00ae0c0fa35b4b67bbc905581c2c7bde0e29901 Mon Sep 17 00:00:00 2001
 From: Gregoire Gentil <gregoire@gentil.com>
 Date: Fri, 12 Mar 2010 13:50:38 +0100
-Subject: [PATCH 05/16] adf7846: add more debugging
+Subject: [PATCH 05/17] adf7846: add more debugging
 
 ---
  drivers/input/touchscreen/ads7846.c |   73 +++++++++++++++++++++++++++++++++++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0006-ads7846-read-max-mix-x-y-from-pdata.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0006-ads7846-read-max-mix-x-y-from-pdata.patch
index fff70be27c..63a4ebbf7c 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0006-ads7846-read-max-mix-x-y-from-pdata.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0006-ads7846-read-max-mix-x-y-from-pdata.patch
@@ -1,7 +1,7 @@
-From 8ccf65bc56ba2f71a4420754969b522fd86945a2 Mon Sep 17 00:00:00 2001
+From 5f227b8aa6083437e2907ca621159228a4a24d9a Mon Sep 17 00:00:00 2001
 From: Gregoire Gentil <gregoire@gentil.com>
 Date: Fri, 12 Mar 2010 13:50:45 +0100
-Subject: [PATCH 06/16] ads7846: read max/mix x/y from pdata
+Subject: [PATCH 06/17] ads7846: read max/mix x/y from pdata
 
 ---
  drivers/input/touchscreen/ads7846.c |    5 +++--
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0007-ads7846-add-settling-delay-to-pdata.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0007-ads7846-add-settling-delay-to-pdata.patch
index 5994529edd..a69c7836b9 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0007-ads7846-add-settling-delay-to-pdata.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0007-ads7846-add-settling-delay-to-pdata.patch
@@ -1,7 +1,7 @@
-From 68e4eb5c9690531fa04cc9e0621854b03369d78b Mon Sep 17 00:00:00 2001
+From 7330c695afad64eef62c525cb8e54913265a3b39 Mon Sep 17 00:00:00 2001
 From: Gregoire Gentil <gregoire@gentil.com>
 Date: Fri, 12 Mar 2010 13:50:52 +0100
-Subject: [PATCH 07/16] ads7846: add settling delay to pdata
+Subject: [PATCH 07/17] ads7846: add settling delay to pdata
 
 ---
  drivers/input/touchscreen/ads7846.c |   22 ++++++++++++++++++++++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0008-DSS2-OMAPFB-Translate-X-Y-coordinates-for-the-video-.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0008-DSS2-OMAPFB-Translate-X-Y-coordinates-for-the-video-.patch
index db1d7a63ea..5d6ff3fbc2 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0008-DSS2-OMAPFB-Translate-X-Y-coordinates-for-the-video-.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0008-DSS2-OMAPFB-Translate-X-Y-coordinates-for-the-video-.patch
@@ -1,7 +1,7 @@
-From b5fbb6c23770e496250e5cbdaad7b7b6120b86af Mon Sep 17 00:00:00 2001
+From 07396a332c4f3d6ed4ff498cb08d0338c98dc612 Mon Sep 17 00:00:00 2001
 From: Tim Yamin <plasm@roo.me.uk>
 Date: Mon, 20 Apr 2009 20:29:11 -0700
-Subject: [PATCH 08/16] DSS2: OMAPFB: Translate X/Y coordinates for the video planes when rotating.
+Subject: [PATCH 08/17] DSS2: OMAPFB: Translate X/Y coordinates for the video planes when rotating.
 
 When rotating the video planes, translate the X/Y coordinates such that
 a [0,0] from userspace always maps to the correct upper left corner of
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0010-DSS2-Fix-scaling-checks-when-rotation-is-90-or-270-d.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0009-DSS2-Fix-scaling-checks-when-rotation-is-90-or-270-d.patch
index 58d084e3cf..5130598422 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0010-DSS2-Fix-scaling-checks-when-rotation-is-90-or-270-d.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0009-DSS2-Fix-scaling-checks-when-rotation-is-90-or-270-d.patch
@@ -1,7 +1,7 @@
-From 7986ce08b1f7ed40c815620853fe76ce3deeb7c5 Mon Sep 17 00:00:00 2001
+From fc2e9ddb93cb026ed10900d794dd1db11191dc24 Mon Sep 17 00:00:00 2001
 From: Tim Yamin <plasm@roo.me.uk>
 Date: Fri, 12 Mar 2010 13:57:38 +0100
-Subject: [PATCH 10/16] DSS2: Fix scaling checks when rotation is 90 or 270 degrees.
+Subject: [PATCH 09/17] DSS2: Fix scaling checks when rotation is 90 or 270 degrees.
 
 ---
  drivers/video/omap2/dss/dispc.c |   25 +++++++++++++++++++------
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0009-DSS2-fix-rotation-offsets.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0009-DSS2-fix-rotation-offsets.patch
deleted file mode 100644
index 89d5285688..0000000000
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0009-DSS2-fix-rotation-offsets.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 15ef52dc7a6d92e50ed9437ca6ca4bdcbd62faa6 Mon Sep 17 00:00:00 2001
-From: Gregoire Gentil <gregoire@gentil.com>
-Date: Wed, 31 Mar 2010 11:32:23 +0200
-Subject: [PATCH 09/16] DSS2: fix rotation offsets
-
----
- drivers/video/omap2/omapfb/omapfb-main.c |   34 +++++++++++++++++++++++++----
- 1 files changed, 29 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
-index c2c9663..1b116b6 100644
---- a/drivers/video/omap2/omapfb/omapfb-main.c
-+++ b/drivers/video/omap2/omapfb/omapfb-main.c
-@@ -859,12 +859,14 @@ static int omapfb_setup_overlay(struct fb_info *fbi, struct omap_overlay *ovl,
- 	u32 data_start_p;
- 	void __iomem *data_start_v;
- 	struct omap_overlay_info info;
--	int xres, yres;
-+	int xres, yres, xoff, yoff;
- 	int screen_width;
- 	int mirror;
- 	int rotation = var->rotate;
- 	int i;
- 
-+	xoff = var->xoffset;
-+	yoff = var->yoffset;
- 	for (i = 0; i < ofbi->num_overlays; i++) {
- 		if (ovl != ofbi->overlays[i])
- 			continue;
-@@ -893,10 +895,32 @@ static int omapfb_setup_overlay(struct fb_info *fbi, struct omap_overlay *ovl,
- 		data_start_v = omapfb_get_region_vaddr(ofbi, 0);
- 	}
- 
--	if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
--		offset = calc_rotation_offset_vrfb(var, fix, 0);
--	else
--		offset = calc_rotation_offset_dma(var, fix, rotation);
-+    if (ofbi->rotation == FB_ROTATE_CW || ofbi->rotation == FB_ROTATE_UD) {
-+		if (var->yres < var->yres_virtual) {
-+			if (var->yoffset)
-+				yoff = 0;
-+			else
-+				yoff = var->yres_virtual - var->yres;
-+		}
-+	}
-+
-+	if (ofbi->rotation == FB_ROTATE_CCW || ofbi->rotation == FB_ROTATE_UD) {
-+		if (var->xres < var->xres_virtual) {
-+			if (var->xoffset)
-+				xoff = 0;
-+			else
-+				xoff = var->xres_virtual - var->xres;
-+		}
-+	}
-+
-+	if (ofbi->rotation == FB_ROTATE_CW || ofbi->rotation == FB_ROTATE_CCW) {
-+		offset = ((xoff * fix->line_length) >> 1) +
-+				((yoff * var->bits_per_pixel) >> 2);
-+	} else
-+	{
-+		offset = yoff * fix->line_length +
-+				((xoff * var->bits_per_pixel) >> 3);
-+	}
- 
- 	data_start_p += offset;
- 	data_start_v += offset;
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0011-add-touchbook-hid-driver.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0010-add-touchbook-hid-driver.patch
index 7dca1ddeda..aa3b359c65 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0011-add-touchbook-hid-driver.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0010-add-touchbook-hid-driver.patch
@@ -1,7 +1,7 @@
-From 935a7f21581403bd791729ae1cc1b49b10561fa6 Mon Sep 17 00:00:00 2001
+From 0f651f19bf9cfecbb76d6f0b251e3d8395f306b8 Mon Sep 17 00:00:00 2001
 From: Gregoire Gentil <gregoire@gentil.com>
 Date: Fri, 12 Mar 2010 14:39:07 +0100
-Subject: [PATCH 11/16] add touchbook hid driver
+Subject: [PATCH 10/17] add touchbook hid driver
 
 ---
  drivers/hid/Kconfig    |    7 ++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0012-Make-backlight-controls-accessible-to-users.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0011-Make-backlight-controls-accessible-to-users.patch
index 5f3e2336fe..c6d3678751 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0012-Make-backlight-controls-accessible-to-users.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0011-Make-backlight-controls-accessible-to-users.patch
@@ -1,7 +1,7 @@
-From 94ea406045ee596951204736fd5bdf454c574343 Mon Sep 17 00:00:00 2001
+From b46a494e0c02450e412db221d75446671b6ef511 Mon Sep 17 00:00:00 2001
 From: Gregoire Gentil <gregroire@gentil.com>
 Date: Fri, 12 Mar 2010 14:41:05 +0100
-Subject: [PATCH 12/16] Make backlight controls accessible to users
+Subject: [PATCH 11/17] Make backlight controls accessible to users
 
 ---
  drivers/video/backlight/backlight.c |    2 +-
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0013-ads7846-don-t-error-out-when-there-s-no-pendown-gpio.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0012-ads7846-don-t-error-out-when-there-s-no-pendown-gpio.patch
index b6da0dc5fb..24fb913221 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0013-ads7846-don-t-error-out-when-there-s-no-pendown-gpio.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0012-ads7846-don-t-error-out-when-there-s-no-pendown-gpio.patch
@@ -1,7 +1,7 @@
-From 55eb032a9f3d9c2a46a0e4621e6704a00ba2ab46 Mon Sep 17 00:00:00 2001
+From 4c3ef06a333cf1f873a9a8de05af90959a5d1e68 Mon Sep 17 00:00:00 2001
 From: Gregoire Gentil <gregoire@gentil.com>
 Date: Fri, 12 Mar 2010 15:04:58 +0100
-Subject: [PATCH 13/16] ads7846: don't error out when there's no pendown gpio
+Subject: [PATCH 12/17] ads7846: don't error out when there's no pendown gpio
 
 ---
  drivers/input/touchscreen/ads7846.c |    7 -------
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0014-ASoC-add-driver-for-omap3-touchbook.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0013-ASoC-add-driver-for-omap3-touchbook.patch
index 4e39423869..2da7354e11 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0014-ASoC-add-driver-for-omap3-touchbook.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0013-ASoC-add-driver-for-omap3-touchbook.patch
@@ -1,13 +1,13 @@
-From 0abfaf3d50f7df7b7dd9462d1822e856bf306bf5 Mon Sep 17 00:00:00 2001
+From 96ce6261efe4c194d9188e0f352803bcd92f1c59 Mon Sep 17 00:00:00 2001
 From: Gregoire Gentil <gregoire@gentil.com>
 Date: Wed, 31 Mar 2010 11:14:04 +0200
-Subject: [PATCH 14/16] ASoC: add driver for omap3-touchbook
+Subject: [PATCH 13/17] ASoC: add driver for omap3-touchbook
 
 ---
  sound/soc/omap/Kconfig          |    8 +
  sound/soc/omap/Makefile         |    2 +
- sound/soc/omap/omap3touchbook.c |  281 +++++++++++++++++++++++++++++++++++++++
- 3 files changed, 291 insertions(+), 0 deletions(-)
+ sound/soc/omap/omap3touchbook.c |  291 +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 301 insertions(+), 0 deletions(-)
  create mode 100644 sound/soc/omap/omap3touchbook.c
 
 diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
@@ -50,10 +50,10 @@ index 19283e5..e3f172f 100644
  obj-$(CONFIG_SND_OMAP_SOC_IGEP0020) += snd-soc-igep0020.o
 diff --git a/sound/soc/omap/omap3touchbook.c b/sound/soc/omap/omap3touchbook.c
 new file mode 100644
-index 0000000..27924e0
+index 0000000..c5e6eaa
 --- /dev/null
 +++ b/sound/soc/omap/omap3touchbook.c
-@@ -0,0 +1,281 @@
+@@ -0,0 +1,291 @@
 +/*
 + * omap3touchbook.c  --  SoC audio for Touch Book
 + *
@@ -160,6 +160,14 @@ index 0000000..27924e0
 +/* Headset jack detection DAPM pins */
 +static struct snd_soc_jack_pin hs_jack_pins[] = {
 +	{
++		.pin = "Headset Stereo",
++		.mask = SND_JACK_HEADPHONE,
++	},
++	{
++		.pin = "Headset Mic",
++		.mask = SND_JACK_HEADPHONE,
++	},
++	{
 +		.pin = "External Speakers",
 +		.mask = SND_JACK_HEADPHONE,
 +		.invert = 1,
@@ -180,7 +188,7 @@ index 0000000..27924e0
 +static const struct snd_soc_dapm_widget omap3touchbook_twl4030_dapm_widgets[] = {
 +	SND_SOC_DAPM_SPK("External Speakers", NULL),
 +	SND_SOC_DAPM_HP("Headset Stereo", NULL),
-+	SND_SOC_DAPM_MIC("Headset Micro", NULL),
++	SND_SOC_DAPM_MIC("Headset Mic", NULL),
 +	SND_SOC_DAPM_LINE("Line In", NULL),
 +};
 +
@@ -193,12 +201,13 @@ index 0000000..27924e0
 +	{"Headset Stereo", NULL, "HSOL"},
 +	{"Headset Stereo", NULL, "HSOR"},
 +
-+	/* Headset Micro: MAINMICL */
-+	{"Headset Micro", NULL, "MAINMIC"},
++	/* Micro: HSMIC */
++	{"HSMIC", NULL, "Headset Mic Bias"},
++	{"Headset Mic Bias", NULL, "Headset Mic"},
 +
 +	/* Line In: AUXL, AUXR */
-+	{"Line In", NULL, "AUXL"},
-+	{"Line In", NULL, "AUXR"},
++	{"AUXL", NULL, "Line In"},
++	{"AUXR", NULL, "Line In"},
 +};
 +
 +static int omap3touchbook_twl4030_init(struct snd_soc_codec *codec)
@@ -217,11 +226,12 @@ index 0000000..27924e0
 +	/* omap3touchbook connected pins */
 +	snd_soc_dapm_enable_pin(codec, "External Speakers");
 +	snd_soc_dapm_enable_pin(codec, "Headset Stereo");
-+	snd_soc_dapm_enable_pin(codec, "Headset Micro");
++	snd_soc_dapm_enable_pin(codec, "Headset Mic");
 +	snd_soc_dapm_enable_pin(codec, "Line In");
 +
-+	/* TWL4030 not connected pins */
++	/* omap3touchbook not connected pins */
 +	snd_soc_dapm_nc_pin(codec, "CARKITMIC");
++	snd_soc_dapm_nc_pin(codec, "MAINMIC");
 +	snd_soc_dapm_nc_pin(codec, "SUBMIC");
 +	snd_soc_dapm_nc_pin(codec, "DIGIMIC0");
 +	snd_soc_dapm_nc_pin(codec, "DIGIMIC1");
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0015-backlight-add-PWM-support.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0014-backlight-add-PWM-support.patch
index 373ab7a443..d517f072b6 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0015-backlight-add-PWM-support.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0014-backlight-add-PWM-support.patch
@@ -1,7 +1,7 @@
-From d24e10c10e57875a65451f46025623f0f77cefbe Mon Sep 17 00:00:00 2001
+From cc8cb0d0731c7a0517653e65c754051a69f34c3e Mon Sep 17 00:00:00 2001
 From: Gregoire Gentil <gregoire@gentil.com>
 Date: Wed, 31 Mar 2010 11:14:04 +0200
-Subject: [PATCH 15/16] backlight: add PWM support
+Subject: [PATCH 14/17] backlight: add PWM support
 
 ---
  drivers/video/backlight/backlight.c |   81 +++++++++++++++++++++++++++++++++++
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0015-Forward-port-TWL4030-BCI-driver-from-2.6.29-to-2.6.3.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0015-Forward-port-TWL4030-BCI-driver-from-2.6.29-to-2.6.3.patch
new file mode 100644
index 0000000000..562c459e1e
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0015-Forward-port-TWL4030-BCI-driver-from-2.6.29-to-2.6.3.patch
@@ -0,0 +1,1367 @@
+From c3a08f3d696866508ef2b5e2fd065b8295b3e1a8 Mon Sep 17 00:00:00 2001
+From: Tim Yamin <plasm@roo.me.uk>
+Date: Sun, 9 May 2010 10:14:23 +0200
+Subject: [PATCH 15/17] Forward port TWL4030 BCI driver from 2.6.29 to 2.6.31 with AI enhancements.
+
+Signed-off-by: Tim Yamin <plasm@roo.me.uk>
+---
+ drivers/power/Kconfig               |    7 +
+ drivers/power/Makefile              |    1 +
+ drivers/power/twl4030_bci_battery.c | 1307 +++++++++++++++++++++++++++++++++++
+ include/linux/i2c/twl.h             |    1 +
+ 4 files changed, 1316 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/power/twl4030_bci_battery.c
+
+diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
+index d4b3d67..8345b3f 100644
+--- a/drivers/power/Kconfig
++++ b/drivers/power/Kconfig
+@@ -124,4 +124,11 @@ config CHARGER_PCF50633
+ 	help
+ 	 Say Y to include support for NXP PCF50633 Main Battery Charger.
+ 
++config TWL4030_BCI_BATTERY
++	tristate "OMAP TWL4030 BCI Battery driver"
++	depends on TWL4030_CORE && TWL4030_MADC
++	help
++	  Support for OMAP TWL4030 BCI Battery driver.
++	  This driver can give support for TWL4030 Battery Charge Interface.
++
+ endif # POWER_SUPPLY
+diff --git a/drivers/power/Makefile b/drivers/power/Makefile
+index 573597c..7801da7 100644
+--- a/drivers/power/Makefile
++++ b/drivers/power/Makefile
+@@ -31,3 +31,4 @@ obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o
+ obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
+ obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o
+ obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
++obj-$(CONFIG_TWL4030_BCI_BATTERY)	+= twl4030_bci_battery.o
+diff --git a/drivers/power/twl4030_bci_battery.c b/drivers/power/twl4030_bci_battery.c
+new file mode 100644
+index 0000000..0876fc3
+--- /dev/null
++++ b/drivers/power/twl4030_bci_battery.c
+@@ -0,0 +1,1307 @@
++/*
++ * linux/drivers/power/twl4030_bci_battery.c
++ *
++ * OMAP2430/3430 BCI battery driver for Linux
++ *
++ * Copyright (C) 2008 Texas Instruments, Inc.
++ * Author: Texas Instruments, Inc.
++ *
++ * Copyright (C) 2010 Always Innovating
++ * Author: Tim Yamin <plasm@roo.me.uk>
++ *
++ * This package is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
++ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++ */
++
++/* Boot with automatic charge */
++#define CHARGE_MODE 1
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/device.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/i2c/twl.h>
++#include <linux/power_supply.h>
++#include <linux/i2c/twl4030-madc.h>
++
++#define T2_BATTERY_VOLT		0x04
++#define T2_BATTERY_TEMP		0x06
++#define T2_BATTERY_CUR		0x08
++
++/* charger constants */
++#define NO_PW_CONN		0
++#define AC_PW_CONN		0x01
++#define USB_PW_CONN		0x02
++
++/* TWL4030_MODULE_USB */
++#define REG_POWER_CTRL		0x0AC
++#define OTG_EN			0x020
++#define REG_PHY_CLK_CTRL	0x0FE
++#define REG_PHY_CLK_CTRL_STS	0x0FF
++#define PHY_DPLL_CLK		0x01
++
++#define REG_BCICTL1		0x023
++#define REG_BCICTL2		0x024
++#define CGAIN			0x020
++#define ITHEN			0x010
++#define ITHSENS			0x007
++
++/* Boot BCI flag bits */
++#define BCIAUTOWEN		0x020
++#define CONFIG_DONE		0x010
++#define CVENAC			0x004
++#define BCIAUTOUSB		0x002
++#define BCIAUTOAC		0x001
++#define BCIMSTAT_MASK		0x03F
++
++/* Boot BCI register */
++#define REG_BOOT_BCI		0x007
++#define REG_CTRL1		0x00
++#define REG_SW1SELECT_MSB	0x07
++#define SW1_CH9_SEL		0x02
++#define REG_CTRL_SW1		0x012
++#define SW1_TRIGGER		0x020
++#define EOC_SW1			0x002
++#define REG_GPCH9		0x049
++#define REG_STS_HW_CONDITIONS	0x0F
++#define STS_VBUS		0x080
++#define STS_CHG			0x02
++#define REG_BCIMSTATEC		0x02
++#define REG_BCIMFSTS4		0x010
++#define REG_BCIMFSTS2		0x00E
++#define REG_BCIMFSTS3		0x00F
++#define REG_BCIMFSTS1		0x001
++#define USBFASTMCHG		0x004
++#define BATSTSPCHG		0x004
++#define BATSTSMCHG		0x040
++#define VBATOV4			0x020
++#define VBATOV3			0x010
++#define VBATOV2			0x008
++#define VBATOV1			0x004
++#define REG_BB_CFG		0x012
++#define BBCHEN			0x010
++
++/* GPBR */
++#define REG_GPBR1		0x0c
++#define MADC_HFCLK_EN		0x80
++#define DEFAULT_MADC_CLK_EN	0x10
++
++/* Power supply charge interrupt */
++#define REG_PWR_ISR1		0x00
++#define REG_PWR_IMR1		0x01
++#define REG_PWR_EDR1		0x05
++#define REG_PWR_SIH_CTRL	0x007
++
++#define USB_PRES		0x004
++#define CHG_PRES		0x002
++
++#define USB_PRES_RISING		0x020
++#define USB_PRES_FALLING	0x010
++#define CHG_PRES_RISING		0x008
++#define CHG_PRES_FALLING	0x004
++#define AC_STATEC		0x20
++#define COR			0x004
++
++/* interrupt status registers */
++#define REG_BCIISR1A		0x0
++#define REG_BCIISR2A		0x01
++
++/* Interrupt flags bits BCIISR1 */
++#define BATSTS_ISR1		0x080
++#define VBATLVL_ISR1		0x001
++
++/* Interrupt mask registers for int1*/
++#define REG_BCIIMR1A		0x002
++#define REG_BCIIMR2A		0x003
++
++ /* Interrupt masks for BCIIMR1 */
++#define BATSTS_IMR1		0x080
++#define VBATLVL_IMR1		0x001
++
++/* Interrupt edge detection register */
++#define REG_BCIEDR1		0x00A
++#define REG_BCIEDR2		0x00B
++#define REG_BCIEDR3		0x00C
++
++/* BCIEDR2 */
++#define	BATSTS_EDRRISIN		0x080
++#define BATSTS_EDRFALLING	0x040
++
++/* BCIEDR3 */
++#define	VBATLVL_EDRRISIN	0x02
++
++/* BCIIREF1 */
++#define REG_BCIIREF1		0x027
++#define REG_BCIIREF2		0x028
++
++/* BCIMFTH1 */
++#define REG_BCIMFTH1		0x016
++
++/* Key */
++#define KEY_IIREF		0xE7
++#define KEY_FTH1		0xD2
++#define REG_BCIMFKEY		0x011
++
++/* Step size and prescaler ratio */
++#define TEMP_STEP_SIZE		147
++#define TEMP_PSR_R		100
++
++#define VOLT_STEP_SIZE		588
++#define VOLT_PSR_R		100
++
++#define CURR_STEP_SIZE		147
++#define CURR_PSR_R1		44
++#define CURR_PSR_R2		80
++
++#define BK_VOLT_STEP_SIZE	441
++#define BK_VOLT_PSR_R		100
++
++#define ENABLE		1
++#define DISABLE		1
++
++struct twl4030_bci_device_info {
++	struct device		*dev;
++
++	unsigned long		update_time;
++	int			voltage_uV;
++	int			bk_voltage_uV;
++	int			current_uA;
++	int			temp_C;
++	int			charge_rsoc;
++	int			charge_status;
++
++	struct power_supply	bat;
++	struct power_supply	bk_bat;
++	struct delayed_work	twl4030_bci_monitor_work;
++	struct delayed_work	twl4030_bk_bci_monitor_work;
++
++	struct twl4030_bci_platform_data *pdata;
++};
++
++static int usb_charger_flag;
++static int LVL_1, LVL_2, LVL_3, LVL_4;
++
++static int read_bci_val(u8 reg_1);
++static inline int clear_n_set(u8 mod_no, u8 clear, u8 set, u8 reg);
++static int twl4030charger_presence(void);
++
++/*
++ * Report and clear the charger presence event.
++ */
++static inline int twl4030charger_presence_evt(void)
++{
++	int ret;
++	u8 chg_sts, set = 0, clear = 0;
++
++	/* read charger power supply status */
++	ret = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &chg_sts,
++		REG_STS_HW_CONDITIONS);
++	if (ret)
++		return IRQ_NONE;
++
++	if (chg_sts & STS_CHG) { /* If the AC charger have been connected */
++		/* configuring falling edge detection for CHG_PRES */
++		set = CHG_PRES_FALLING;
++		clear = CHG_PRES_RISING;
++	} else { /* If the AC charger have been disconnected */
++		/* configuring rising edge detection for CHG_PRES */
++		set = CHG_PRES_RISING;
++		clear = CHG_PRES_FALLING;
++	}
++
++	/* Update the interrupt edge detection register */
++	clear_n_set(TWL4030_MODULE_INT, clear, set, REG_PWR_EDR1);
++
++	return 0;
++}
++
++/*
++ * Interrupt service routine
++ *
++ * Attends to TWL 4030 power module interruptions events, specifically
++ * USB_PRES (USB charger presence) CHG_PRES (AC charger presence) events
++ *
++ */
++static irqreturn_t twl4030charger_interrupt(int irq, void *_di)
++{
++	struct twl4030_bci_device_info *di = _di;
++
++#ifdef CONFIG_LOCKDEP
++	/* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which
++	 * we don't want and can't tolerate.  Although it might be
++	 * friendlier not to borrow this thread context...
++	 */
++	local_irq_enable();
++#endif
++
++	twl4030charger_presence_evt();
++	power_supply_changed(&di->bat);
++
++	return IRQ_HANDLED;
++}
++
++/*
++ * This function handles the twl4030 battery presence interrupt
++ */
++static int twl4030battery_presence_evt(void)
++{
++	int ret;
++	u8 batstsmchg, batstspchg;
++
++	/* check for the battery presence in main charge*/
++	ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE,
++			&batstsmchg, REG_BCIMFSTS3);
++	if (ret)
++		return ret;
++
++	/* check for the battery presence in precharge */
++	ret = twl_i2c_read_u8(TWL4030_MODULE_PRECHARGE,
++			&batstspchg, REG_BCIMFSTS1);
++	if (ret)
++		return ret;
++
++	/*
++	 * REVISIT: Physically inserting/removing the batt
++	 * does not seem to generate an int on 3430ES2 SDP.
++	 */
++	if ((batstspchg & BATSTSPCHG) || (batstsmchg & BATSTSMCHG)) {
++		/* In case of the battery insertion event */
++		ret = clear_n_set(TWL4030_MODULE_INTERRUPTS, BATSTS_EDRRISIN,
++			BATSTS_EDRFALLING, REG_BCIEDR2);
++		if (ret)
++			return ret;
++	} else {
++		/* In case of the battery removal event */
++		ret = clear_n_set(TWL4030_MODULE_INTERRUPTS, BATSTS_EDRFALLING,
++			BATSTS_EDRRISIN, REG_BCIEDR2);
++		if (ret)
++			return ret;
++	}
++
++	return 0;
++}
++
++/*
++ * This function handles the twl4030 battery voltage level interrupt.
++ */
++static int twl4030battery_level_evt(void)
++{
++	int ret;
++	u8 mfst;
++
++	/* checking for threshold event */
++	ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE,
++			&mfst, REG_BCIMFSTS2);
++	if (ret)
++		return ret;
++
++	/* REVISIT could use a bitmap */
++	if (mfst & VBATOV4) {
++		LVL_4 = 1;
++		LVL_3 = 0;
++		LVL_2 = 0;
++		LVL_1 = 0;
++	} else if (mfst & VBATOV3) {
++		LVL_4 = 0;
++		LVL_3 = 1;
++		LVL_2 = 0;
++		LVL_1 = 0;
++	} else if (mfst & VBATOV2) {
++		LVL_4 = 0;
++		LVL_3 = 0;
++		LVL_2 = 1;
++		LVL_1 = 0;
++	} else {
++		LVL_4 = 0;
++		LVL_3 = 0;
++		LVL_2 = 0;
++		LVL_1 = 1;
++	}
++
++	return 0;
++}
++
++/*
++ * Interrupt service routine
++ *
++ * Attends to BCI interruptions events,
++ * specifically BATSTS (battery connection and removal)
++ * VBATOV (main battery voltage threshold) events
++ *
++ */
++static irqreturn_t twl4030battery_interrupt(int irq, void *_di)
++{
++	u8 isr1a_val, isr2a_val, clear_2a, clear_1a;
++	int ret;
++
++#ifdef CONFIG_LOCKDEP
++	/* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which
++	 * we don't want and can't tolerate.  Although it might be
++	 * friendlier not to borrow this thread context...
++	 */
++	local_irq_enable();
++#endif
++
++	ret = twl_i2c_read_u8(TWL4030_MODULE_INTERRUPTS, &isr1a_val,
++				REG_BCIISR1A);
++	if (ret)
++		return IRQ_NONE;
++
++	ret = twl_i2c_read_u8(TWL4030_MODULE_INTERRUPTS, &isr2a_val,
++				REG_BCIISR2A);
++	if (ret)
++		return IRQ_NONE;
++
++	clear_2a = (isr2a_val & VBATLVL_ISR1) ? (VBATLVL_ISR1) : 0;
++	clear_1a = (isr1a_val & BATSTS_ISR1) ? (BATSTS_ISR1) : 0;
++
++	/* cleaning BCI interrupt status flags */
++	ret = twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS,
++			clear_1a , REG_BCIISR1A);
++	if (ret)
++		return IRQ_NONE;
++
++	ret = twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS,
++			clear_2a , REG_BCIISR2A);
++	if (ret)
++		return IRQ_NONE;
++
++	/* battery connetion or removal event */
++	if (isr1a_val & BATSTS_ISR1)
++		twl4030battery_presence_evt();
++	/* battery voltage threshold event*/
++	else if (isr2a_val & VBATLVL_ISR1)
++		twl4030battery_level_evt();
++	else
++		return IRQ_NONE;
++
++	return IRQ_HANDLED;
++}
++
++/*
++ * Enable/Disable hardware battery level event notifications.
++ */
++static int twl4030battery_hw_level_en(int enable)
++{
++	int ret;
++
++	if (enable) {
++		/* unmask VBATOV interrupt for INT1 */
++		ret = clear_n_set(TWL4030_MODULE_INTERRUPTS, VBATLVL_IMR1,
++			0, REG_BCIIMR2A);
++		if (ret)
++			return ret;
++
++		/* configuring interrupt edge detection for VBATOv */
++		ret = clear_n_set(TWL4030_MODULE_INTERRUPTS, 0,
++			VBATLVL_EDRRISIN, REG_BCIEDR3);
++		if (ret)
++			return ret;
++	} else {
++		/* mask VBATOV interrupt for INT1 */
++		ret = clear_n_set(TWL4030_MODULE_INTERRUPTS, 0,
++			VBATLVL_IMR1, REG_BCIIMR2A);
++		if (ret)
++			return ret;
++	}
++
++	return 0;
++}
++
++/*
++ * Enable/disable hardware battery presence event notifications.
++ */
++static int twl4030battery_hw_presence_en(int enable)
++{
++	int ret;
++
++	if (enable) {
++		/* unmask BATSTS interrupt for INT1 */
++		ret = clear_n_set(TWL4030_MODULE_INTERRUPTS, BATSTS_IMR1,
++			0, REG_BCIIMR1A);
++		if (ret)
++			return ret;
++
++		/* configuring interrupt edge for BATSTS */
++		ret = clear_n_set(TWL4030_MODULE_INTERRUPTS, 0,
++			BATSTS_EDRRISIN | BATSTS_EDRFALLING, REG_BCIEDR2);
++		if (ret)
++			return ret;
++	} else {
++		/* mask BATSTS interrupt for INT1 */
++		ret = clear_n_set(TWL4030_MODULE_INTERRUPTS, 0,
++			BATSTS_IMR1, REG_BCIIMR1A);
++		if (ret)
++			return ret;
++	}
++
++	return 0;
++}
++
++/*
++ * Enable/Disable AC Charge funtionality.
++ */
++static int twl4030charger_ac_en(int enable, int automatic)
++{
++	int ret;
++
++	if (enable) {
++		/* forcing the field BCIAUTOAC (BOOT_BCI[0) to 1 */
++		if(!automatic) {
++			ret = clear_n_set(TWL4030_MODULE_PM_MASTER, BCIAUTOAC | CVENAC,
++				(CONFIG_DONE | BCIAUTOWEN),
++				REG_BOOT_BCI);
++		} else {
++			ret = clear_n_set(TWL4030_MODULE_PM_MASTER, 0,
++				(CONFIG_DONE | BCIAUTOWEN | BCIAUTOAC | CVENAC),
++				REG_BOOT_BCI);
++		}
++		if (ret)
++			return ret;
++	} else {
++		/* forcing the field BCIAUTOAC (BOOT_BCI[0) to 0*/
++		ret = clear_n_set(TWL4030_MODULE_PM_MASTER, BCIAUTOAC,
++			(CONFIG_DONE | BCIAUTOWEN),
++			REG_BOOT_BCI);
++		if (ret)
++			return ret;
++	}
++
++	return 0;
++}
++
++/*
++ * Enable/Disable USB Charge funtionality.
++ */
++int twl4030charger_usb_en(int enable)
++{
++	u8 value;
++	int ret;
++	unsigned long timeout;
++
++	if (enable) {
++		/* Check for USB charger conneted */
++		ret = twl4030charger_presence();
++		if (ret < 0)
++			return ret;
++
++		if (!(ret & USB_PW_CONN))
++			return -ENXIO;
++
++		/* forcing the field BCIAUTOUSB (BOOT_BCI[1]) to 1 */
++		ret = clear_n_set(TWL4030_MODULE_PM_MASTER, 0,
++			(CONFIG_DONE | BCIAUTOWEN | BCIAUTOUSB),
++			REG_BOOT_BCI);
++		if (ret)
++			return ret;
++
++		ret = clear_n_set(TWL4030_MODULE_USB, 0, PHY_DPLL_CLK,
++			REG_PHY_CLK_CTRL);
++		if (ret)
++			return ret;
++
++		value = 0;
++		timeout = jiffies + msecs_to_jiffies(50);
++
++		while ((!(value & PHY_DPLL_CLK)) &&
++			time_before(jiffies, timeout)) {
++			udelay(10);
++			ret = twl_i2c_read_u8(TWL4030_MODULE_USB, &value,
++				REG_PHY_CLK_CTRL_STS);
++			if (ret)
++				return ret;
++		}
++
++		/* OTG_EN (POWER_CTRL[5]) to 1 */
++		ret = clear_n_set(TWL4030_MODULE_USB, 0, OTG_EN,
++			REG_POWER_CTRL);
++		if (ret)
++			return ret;
++
++		mdelay(50);
++
++		/* forcing USBFASTMCHG(BCIMFSTS4[2]) to 1 */
++		ret = clear_n_set(TWL4030_MODULE_MAIN_CHARGE, 0,
++			USBFASTMCHG, REG_BCIMFSTS4);
++		if (ret)
++			return ret;
++	} else {
++		twl4030charger_presence();
++		ret = clear_n_set(TWL4030_MODULE_PM_MASTER, BCIAUTOUSB,
++			(CONFIG_DONE | BCIAUTOWEN), REG_BOOT_BCI);
++		if (ret)
++			return ret;
++	}
++
++	return 0;
++}
++
++/*
++ * Return battery temperature
++ * Or < 0 on failure.
++ */
++static int twl4030battery_temperature(struct twl4030_bci_device_info *di)
++{
++	u8 val;
++	int temp, curr, volt, res, ret;
++
++	/* Is a temperature table specified? */
++	if (!di->pdata->tblsize)
++		return 0;
++
++	/* Getting and calculating the thermistor voltage */
++	ret = read_bci_val(T2_BATTERY_TEMP);
++	if (ret < 0)
++		return ret;
++
++	volt = (ret * TEMP_STEP_SIZE) / TEMP_PSR_R;
++
++	/* Getting and calculating the supply current in micro ampers */
++	ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &val,
++		 REG_BCICTL2);
++	if (ret)
++		return 0;
++
++	curr = ((val & ITHSENS) + 1) * 10;
++
++	/* Getting and calculating the thermistor resistance in ohms*/
++	res = volt * 1000 / curr;
++
++	/*calculating temperature*/
++	for (temp = 58; temp >= 0; temp--) {
++		int actual = di->pdata->battery_tmp_tbl[temp];
++		if ((actual - res) >= 0)
++			break;
++	}
++
++	/* Negative temperature */
++	if (temp < 3) {
++		if (temp == 2)
++			temp = -1;
++		else if (temp == 1)
++			temp = -2;
++		else
++			temp = -3;
++	}
++
++	return temp + 1;
++}
++
++/*
++ * Return battery voltage
++ * Or < 0 on failure.
++ */
++static int twl4030battery_voltage(void)
++{
++	int volt = read_bci_val(T2_BATTERY_VOLT);
++	return (volt * VOLT_STEP_SIZE) / VOLT_PSR_R;
++}
++
++/*
++ * Get latest battery voltage (using MADC)
++ *
++ * When the BCI is not charging, the BCI voltage registers are not
++ * updated and are 'frozen' but the data can be read through the
++ * MADC.
++ */
++static int twl4030battery_voltage_madc(void)
++{
++	struct twl4030_madc_request req;
++
++	req.channels = (1 << 12);
++	req.do_avg = 0;
++	req.method = TWL4030_MADC_SW1;
++	req.active = 0;
++	req.func_cb = NULL;
++	twl4030_madc_conversion(&req);
++
++	return (((int) req.rbuf[12]) * VOLT_STEP_SIZE) / VOLT_PSR_R;
++}
++
++/*
++ * Return the battery current
++ * Or < 0 on failure.
++ */
++static int twl4030battery_current(void)
++{
++	int ret, curr = read_bci_val(T2_BATTERY_CUR);
++	u8 val;
++
++	ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &val,
++		REG_BCICTL1);
++	if (ret)
++		return ret;
++
++	if (val & CGAIN) /* slope of 0.44 mV/mA */
++		return (curr * CURR_STEP_SIZE) / CURR_PSR_R1;
++	else /* slope of 0.88 mV/mA */
++		return (curr * CURR_STEP_SIZE) / CURR_PSR_R2;
++}
++
++/*
++ * Return the battery backup voltage
++ * Or < 0 on failure.
++ */
++static int twl4030backupbatt_voltage(void)
++{
++	struct twl4030_madc_request req;
++	int temp;
++
++	req.channels = (1 << 9);
++	req.do_avg = 0;
++	req.method = TWL4030_MADC_SW1;
++	req.active = 0;
++	req.func_cb = NULL;
++	twl4030_madc_conversion(&req);
++	temp = (u16)req.rbuf[9];
++
++	return  (temp * BK_VOLT_STEP_SIZE) / BK_VOLT_PSR_R;
++}
++
++/*
++ * Returns an integer value, that means,
++ * NO_PW_CONN  no power supply is connected
++ * AC_PW_CONN  if the AC power supply is connected
++ * USB_PW_CONN  if the USB power supply is connected
++ * AC_PW_CONN + USB_PW_CONN if USB and AC power supplies are both connected
++ *
++ * Or < 0 on failure.
++ */
++static int twl4030charger_presence(void)
++{
++	int ret;
++	u8 hwsts;
++
++	ret = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &hwsts,
++		REG_STS_HW_CONDITIONS);
++	if (ret) {
++		pr_err("twl4030_bci: error reading STS_HW_CONDITIONS\n");
++		return ret;
++	}
++
++	ret = (hwsts & STS_CHG) ? AC_PW_CONN : NO_PW_CONN;
++	ret += (hwsts & STS_VBUS) ? USB_PW_CONN : NO_PW_CONN;
++
++	if (ret & USB_PW_CONN)
++		usb_charger_flag = 1;
++	else
++		usb_charger_flag = 0;
++
++	return ret;
++
++}
++
++/*
++ * Returns the main charge FSM status
++ * Or < 0 on failure.
++ */
++static int twl4030bci_status(void)
++{
++	int ret;
++	u8 status;
++
++	ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE,
++		&status, REG_BCIMSTATEC);
++	if (ret) {
++		pr_err("twl4030_bci: error reading BCIMSTATEC\n");
++		return ret;
++	}
++
++#ifdef DEBUG
++	printk("BCI DEBUG: BCIMSTATEC Charge state is 0x%x\n", status);
++#endif
++	return (int) (status & BCIMSTAT_MASK);
++}
++
++static int read_bci_val(u8 reg)
++{
++	int ret, temp;
++	u8 val;
++
++	/* reading MSB */
++	ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &val,
++		reg + 1);
++	if (ret)
++		return ret;
++
++	temp = ((int)(val & 0x03)) << 8;
++
++	/* reading LSB */
++	ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &val,
++		reg);
++	if (ret)
++		return ret;
++
++	return temp | val;
++}
++
++/*
++ * Settup the twl4030 BCI module to enable backup
++ * battery charging.
++ */
++static int twl4030backupbatt_voltage_setup(void)
++{
++	int ret;
++
++	/* Starting backup batery charge */
++	ret = clear_n_set(TWL4030_MODULE_PM_RECEIVER, 0, BBCHEN,
++		REG_BB_CFG);
++	if (ret)
++		return ret;
++
++	return 0;
++}
++
++/*
++ * Settup the twl4030 BCI module to measure battery
++ * temperature
++ */
++static int twl4030battery_temp_setup(void)
++{
++#ifdef DEBUG
++	u8 i;
++#endif
++	u8 ret;
++
++	/* Enabling thermistor current */
++	ret = clear_n_set(TWL4030_MODULE_MAIN_CHARGE, 0, 0x1B,
++		REG_BCICTL1);
++	if (ret)
++		return ret;
++
++#ifdef DEBUG
++	twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &ret, REG_BOOT_BCI);
++	printk("BCI DEBUG: BOOT_BCI Value is 0x%x\n", ret);
++
++	twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &ret, REG_STS_HW_CONDITIONS);
++	printk("BCI DEBUG: STS_HW_CONDITIONS Value is 0x%x\n", ret);
++
++	twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &ret, REG_BCICTL1);
++	printk("BCI DEBUG: BCICTL1 Value is 0x%x\n", ret);
++
++	twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &ret, REG_BCICTL2);
++	printk("BCI DEBUG: BCICTL2 Value is 0x%x\n", ret);
++
++	twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &ret, 0x0);
++	printk("BCI DEBUG: BCIMDEN Value is 0x%x\n", ret);
++
++	twl_i2c_read_u8(TWL4030_MODULE_INTBR, &ret, REG_GPBR1);
++	printk("BCI DEBUG: GPBR1 Value is 0x%x\n", ret);
++
++	for(i = 0x0; i <= 0x32; i++)
++	{
++		twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &ret, i);
++		printk("BCI DEBUG: BCI 0x%x Value is 0x%x\n", i, ret);
++	}
++#endif
++
++	return 0;
++}
++
++/*
++ * Sets and clears bits on an given register on a given module
++ */
++static inline int clear_n_set(u8 mod_no, u8 clear, u8 set, u8 reg)
++{
++	int ret;
++	u8 val = 0;
++
++	/* Gets the initial register value */
++	ret = twl_i2c_read_u8(mod_no, &val, reg);
++	if (ret)
++		return ret;
++	/* Clearing all those bits to clear */
++	val &= ~(clear);
++
++	/* Setting all those bits to set */
++	val |= set;
++
++	/* Update the register */
++	ret = twl_i2c_write_u8(mod_no, val, reg);
++	if (ret)
++		return ret;
++
++	return 0;
++}
++
++static enum power_supply_property twl4030_bci_battery_props[] = {
++	POWER_SUPPLY_PROP_STATUS,
++	POWER_SUPPLY_PROP_ONLINE,
++	POWER_SUPPLY_PROP_VOLTAGE_NOW,
++	POWER_SUPPLY_PROP_CURRENT_NOW,
++	POWER_SUPPLY_PROP_CAPACITY,
++	POWER_SUPPLY_PROP_TEMP,
++};
++
++static enum power_supply_property twl4030_bk_bci_battery_props[] = {
++	POWER_SUPPLY_PROP_VOLTAGE_NOW,
++};
++
++static void
++twl4030_bk_bci_battery_read_status(struct twl4030_bci_device_info *di)
++{
++	di->bk_voltage_uV = twl4030backupbatt_voltage();
++}
++
++static void twl4030_bk_bci_battery_work(struct work_struct *work)
++{
++	struct twl4030_bci_device_info *di = container_of(work,
++		struct twl4030_bci_device_info,
++		twl4030_bk_bci_monitor_work.work);
++
++	if(!di->pdata->no_backup_battery)
++		twl4030_bk_bci_battery_read_status(di);
++	schedule_delayed_work(&di->twl4030_bk_bci_monitor_work, 500);
++}
++
++static void twl4030_bci_battery_read_status(struct twl4030_bci_device_info *di)
++{
++	if(di->charge_status != POWER_SUPPLY_STATUS_DISCHARGING) {
++		di->temp_C = twl4030battery_temperature(di);
++		di->voltage_uV = twl4030battery_voltage();
++		di->current_uA = twl4030battery_current();
++	}
++}
++
++static void
++twl4030_bci_battery_update_status(struct twl4030_bci_device_info *di)
++{
++	if (power_supply_am_i_supplied(&di->bat))
++		di->charge_status = POWER_SUPPLY_STATUS_CHARGING;
++	else
++		di->charge_status = POWER_SUPPLY_STATUS_DISCHARGING;
++	twl4030_bci_battery_read_status(di);
++}
++
++static void twl4030_bci_battery_work(struct work_struct *work)
++{
++	struct twl4030_bci_device_info *di = container_of(work,
++		struct twl4030_bci_device_info, twl4030_bci_monitor_work.work);
++
++	twl4030_bci_battery_update_status(di);
++	schedule_delayed_work(&di->twl4030_bci_monitor_work, 100);
++}
++
++
++#define to_twl4030_bci_device_info(x) container_of((x), \
++			struct twl4030_bci_device_info, bat);
++
++static void twl4030_bci_battery_external_power_changed(struct power_supply *psy)
++{
++	struct twl4030_bci_device_info *di = to_twl4030_bci_device_info(psy);
++
++	cancel_delayed_work(&di->twl4030_bci_monitor_work);
++	schedule_delayed_work(&di->twl4030_bci_monitor_work, 0);
++}
++
++#define to_twl4030_bk_bci_device_info(x) container_of((x), \
++		struct twl4030_bci_device_info, bk_bat);
++
++static ssize_t
++show_charge_current(struct device *dev, struct device_attribute *attr, char *buf)
++{
++	u8  ctl;
++	int ret = read_bci_val(REG_BCIIREF1) & 0x1FF;
++	twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &ctl, REG_BCICTL1);
++
++	if (ctl & CGAIN)
++		ret |= 0x200;
++
++#ifdef DEBUG
++	/* Dump debug */
++	twl4030battery_temp_setup();
++#endif
++
++	return sprintf(buf, "%d\n", ret);
++}
++
++static ssize_t
++set_charge_current(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
++{
++	unsigned long newCurrent;
++	int ret;
++
++	ret = strict_strtoul(buf, 10, &newCurrent);
++	if (ret)
++		return -EINVAL;
++
++	ret = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, KEY_IIREF, REG_BCIMFKEY);
++	if (ret)
++		return ret;
++
++	ret = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, newCurrent & 0xff, REG_BCIIREF1);
++	if (ret)
++		return ret;
++
++	ret = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, KEY_IIREF, REG_BCIMFKEY);
++	if (ret)
++		return ret;
++
++	ret = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, (newCurrent >> 8) & 0x1, REG_BCIIREF2);
++	if (ret)
++		return ret;
++
++	/* Set software-controlled charge */
++	twl4030charger_ac_en(ENABLE, 0);
++
++	/* Set CGAIN = 0 or 1 */
++	if(newCurrent > 511) {
++		u8 tmp;
++
++		/* Set CGAIN = 1 -- need to wait until automatic charge turns off */
++		while(!ret) {
++			clear_n_set(TWL4030_MODULE_MAIN_CHARGE, 0, CGAIN | 0x1B, REG_BCICTL1);
++			twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &tmp, REG_BCICTL1);
++
++			ret = tmp & CGAIN;
++			if(!ret)
++				mdelay(50);
++		}
++	} else {
++		u8 tmp;
++
++		/* Set CGAIN = 0 -- need to wait until automatic charge turns off */
++		while(!ret) {
++			clear_n_set(TWL4030_MODULE_MAIN_CHARGE, CGAIN, 0x1B, REG_BCICTL1);
++			twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &tmp, REG_BCICTL1);
++
++			ret = !(tmp & CGAIN);
++			if(!ret)
++				mdelay(50);
++		}
++	}
++
++	/* Set automatic charge (CGAIN = 0/1 persists) */
++	twl4030charger_ac_en(ENABLE, 1);
++
++	return count;
++}
++
++static ssize_t
++show_voltage(struct device *dev, struct device_attribute *attr, char *buf)
++{
++	return sprintf(buf, "%d\n", twl4030battery_voltage_madc());
++}
++
++static DEVICE_ATTR(charge_current, S_IRUGO | S_IWUGO, show_charge_current, set_charge_current);
++static DEVICE_ATTR(voltage_now_madc, S_IRUGO, show_voltage, NULL);
++
++static int twl4030_bk_bci_battery_get_property(struct power_supply *psy,
++					enum power_supply_property psp,
++					union power_supply_propval *val)
++{
++	struct twl4030_bci_device_info *di = to_twl4030_bk_bci_device_info(psy);
++
++	switch (psp) {
++	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
++		val->intval = di->bk_voltage_uV;
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++static int twl4030_bci_battery_get_property(struct power_supply *psy,
++					enum power_supply_property psp,
++					union power_supply_propval *val)
++{
++	struct twl4030_bci_device_info *di;
++	int status = 0;
++
++	di = to_twl4030_bci_device_info(psy);
++
++	switch (psp) {
++	case POWER_SUPPLY_PROP_STATUS:
++		val->intval = di->charge_status;
++		return 0;
++	default:
++		break;
++	}
++
++	switch (psp) {
++	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
++	{
++		/* Get latest data from MADC -- not done periodically by
++		   worker as this is more expensive, so only do it when we
++		   are actually asked for the data... */
++		if(di->charge_status == POWER_SUPPLY_STATUS_DISCHARGING)
++			val->intval = twl4030battery_voltage_madc();
++		else
++			val->intval = di->voltage_uV;
++
++		break;
++	}
++	case POWER_SUPPLY_PROP_CURRENT_NOW:
++		/* FIXME: Get from MADC */
++		if(di->charge_status == POWER_SUPPLY_STATUS_DISCHARGING)
++			val->intval = 0;
++		else
++			val->intval = di->current_uA;
++		break;
++	case POWER_SUPPLY_PROP_TEMP:
++		val->intval = di->temp_C;
++		break;
++	case POWER_SUPPLY_PROP_ONLINE:
++		status = twl4030bci_status();
++		if ((status & AC_STATEC) == AC_STATEC)
++			val->intval = POWER_SUPPLY_TYPE_MAINS;
++		else if (usb_charger_flag)
++			val->intval = POWER_SUPPLY_TYPE_USB;
++		else
++			val->intval = 0;
++		break;
++	case POWER_SUPPLY_PROP_CAPACITY:
++		/* Get latest data from MADC -- not done periodically by
++		   worker as this is more expensive, so only do it when we
++		   are actually asked for the data... */
++		if(di->charge_status == POWER_SUPPLY_STATUS_DISCHARGING)
++			di->voltage_uV = twl4030battery_voltage_madc();
++
++		/*
++		 * need to get the correct percentage value per the
++		 * battery characteristics. Approx values for now.
++		 */
++		if (di->voltage_uV < 2894 || LVL_1) {
++			val->intval = 5;
++			LVL_1 = 0;
++		} else if ((di->voltage_uV < 3451 && di->voltage_uV > 2894)
++			|| LVL_2) {
++			val->intval = 20;
++			LVL_2 = 0;
++		} else if ((di->voltage_uV < 3902 && di->voltage_uV > 3451)
++			|| LVL_3) {
++			val->intval = 50;
++			LVL_3 = 0;
++		} else if ((di->voltage_uV < 3949 && di->voltage_uV > 3902)
++			|| LVL_4) {
++			val->intval = 75;
++			LVL_4 = 0;
++		} else if (di->voltage_uV > 3949)
++			val->intval = 90;
++		break;
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++static char *twl4030_bci_supplied_to[] = {
++	"twl4030_bci_battery",
++};
++
++static int __init twl4030_bci_battery_probe(struct platform_device *pdev)
++{
++	struct twl4030_bci_platform_data *pdata = pdev->dev.platform_data;
++	struct twl4030_bci_device_info *di;
++	int irq;
++	int ret;
++
++	di = kzalloc(sizeof(*di), GFP_KERNEL);
++	if (!di)
++		return -ENOMEM;
++
++	di->dev = &pdev->dev;
++	di->bat.name = "twl4030_bci_battery";
++	di->bat.supplied_to = twl4030_bci_supplied_to;
++	di->bat.num_supplicants = ARRAY_SIZE(twl4030_bci_supplied_to);
++	di->bat.type = POWER_SUPPLY_TYPE_BATTERY;
++	di->bat.properties = twl4030_bci_battery_props;
++	di->bat.num_properties = ARRAY_SIZE(twl4030_bci_battery_props);
++	di->bat.get_property = twl4030_bci_battery_get_property;
++	di->bat.external_power_changed =
++			twl4030_bci_battery_external_power_changed;
++
++	di->charge_status = POWER_SUPPLY_STATUS_UNKNOWN;
++
++	di->bk_bat.name = "twl4030_bci_bk_battery";
++	di->bk_bat.type = POWER_SUPPLY_TYPE_BATTERY;
++	di->bk_bat.properties = twl4030_bk_bci_battery_props;
++	di->bk_bat.num_properties = ARRAY_SIZE(twl4030_bk_bci_battery_props);
++	di->bk_bat.get_property = twl4030_bk_bci_battery_get_property;
++	di->bk_bat.external_power_changed = NULL;
++	di->pdata = pdata;
++
++	/* Set up clocks */
++	twl_i2c_write_u8(TWL4030_MODULE_INTBR, MADC_HFCLK_EN | DEFAULT_MADC_CLK_EN, REG_GPBR1);
++
++	twl4030charger_ac_en(ENABLE, CHARGE_MODE);
++	twl4030charger_usb_en(ENABLE);
++	twl4030battery_hw_level_en(ENABLE);
++	twl4030battery_hw_presence_en(ENABLE);
++
++	platform_set_drvdata(pdev, di);
++
++	/* settings for temperature sensing */
++	ret = twl4030battery_temp_setup();
++	if (ret)
++		goto temp_setup_fail;
++
++	/* enabling GPCH09 for read back battery voltage */
++	if(!di->pdata->no_backup_battery)
++	{
++		ret = twl4030backupbatt_voltage_setup();
++		if (ret)
++			goto voltage_setup_fail;
++	}
++
++	/* REVISIT do we need to request both IRQs ?? */
++
++	/* request BCI interruption */
++	irq = platform_get_irq(pdev, 1);
++	ret = request_irq(irq, twl4030battery_interrupt,
++		0, pdev->name, NULL);
++	if (ret) {
++		dev_dbg(&pdev->dev, "could not request irq %d, status %d\n",
++			irq, ret);
++		goto batt_irq_fail;
++	}
++
++	/* request Power interruption */
++	irq = platform_get_irq(pdev, 0);
++	ret = request_irq(irq, twl4030charger_interrupt,
++		0, pdev->name, di);
++
++	if (ret) {
++		dev_dbg(&pdev->dev, "could not request irq %d, status %d\n",
++			irq, ret);
++		goto chg_irq_fail;
++	}
++
++	ret = power_supply_register(&pdev->dev, &di->bat);
++	if (ret) {
++		dev_dbg(&pdev->dev, "failed to register main battery\n");
++		goto batt_failed;
++	}
++
++	INIT_DELAYED_WORK_DEFERRABLE(&di->twl4030_bci_monitor_work,
++				twl4030_bci_battery_work);
++	schedule_delayed_work(&di->twl4030_bci_monitor_work, 0);
++
++	if(!pdata->no_backup_battery)
++	{
++		ret = power_supply_register(&pdev->dev, &di->bk_bat);
++		if (ret) {
++			dev_dbg(&pdev->dev, "failed to register backup battery\n");
++			goto bk_batt_failed;
++		}
++	}
++
++	ret = device_create_file(di->bat.dev, &dev_attr_voltage_now_madc);
++	ret = device_create_file(di->bat.dev, &dev_attr_charge_current);
++	if (ret) {
++		dev_err(&pdev->dev, "failed to create sysfs entries\n");
++		goto bk_batt_failed;
++	}
++
++	INIT_DELAYED_WORK_DEFERRABLE(&di->twl4030_bk_bci_monitor_work,
++				twl4030_bk_bci_battery_work);
++	schedule_delayed_work(&di->twl4030_bk_bci_monitor_work, 500);
++
++	set_charge_current (NULL, NULL, "1023", 4);
++	return 0;
++
++bk_batt_failed:
++	if(!pdata->no_backup_battery)
++		power_supply_unregister(&di->bat);
++batt_failed:
++	free_irq(irq, di);
++chg_irq_fail:
++	irq = platform_get_irq(pdev, 1);
++	free_irq(irq, NULL);
++batt_irq_fail:
++voltage_setup_fail:
++temp_setup_fail:
++	twl4030charger_ac_en(DISABLE, CHARGE_MODE);
++	twl4030charger_usb_en(DISABLE);
++	twl4030battery_hw_level_en(DISABLE);
++	twl4030battery_hw_presence_en(DISABLE);
++	kfree(di);
++
++	return ret;
++}
++
++static int __exit twl4030_bci_battery_remove(struct platform_device *pdev)
++{
++	struct twl4030_bci_device_info *di = platform_get_drvdata(pdev);
++	int irq;
++
++	twl4030charger_ac_en(DISABLE, CHARGE_MODE);
++	twl4030charger_usb_en(DISABLE);
++	twl4030battery_hw_level_en(DISABLE);
++	twl4030battery_hw_presence_en(DISABLE);
++
++	irq = platform_get_irq(pdev, 0);
++	free_irq(irq, di);
++
++	irq = platform_get_irq(pdev, 1);
++	free_irq(irq, NULL);
++
++	flush_scheduled_work();
++	power_supply_unregister(&di->bat);
++	power_supply_unregister(&di->bk_bat);
++	platform_set_drvdata(pdev, NULL);
++	kfree(di);
++
++	return 0;
++}
++
++#ifdef CONFIG_PM
++static int twl4030_bci_battery_suspend(struct platform_device *pdev,
++	pm_message_t state)
++{
++	struct twl4030_bci_device_info *di = platform_get_drvdata(pdev);
++
++	di->charge_status = POWER_SUPPLY_STATUS_UNKNOWN;
++	cancel_delayed_work(&di->twl4030_bci_monitor_work);
++	cancel_delayed_work(&di->twl4030_bk_bci_monitor_work);
++	return 0;
++}
++
++static int twl4030_bci_battery_resume(struct platform_device *pdev)
++{
++	struct twl4030_bci_device_info *di = platform_get_drvdata(pdev);
++
++	schedule_delayed_work(&di->twl4030_bci_monitor_work, 0);
++	schedule_delayed_work(&di->twl4030_bk_bci_monitor_work, 50);
++	return 0;
++}
++#else
++#define twl4030_bci_battery_suspend	NULL
++#define twl4030_bci_battery_resume	NULL
++#endif /* CONFIG_PM */
++
++static struct platform_driver twl4030_bci_battery_driver = {
++	.probe		= twl4030_bci_battery_probe,
++	.remove		= __exit_p(twl4030_bci_battery_remove),
++	.suspend	= twl4030_bci_battery_suspend,
++	.resume		= twl4030_bci_battery_resume,
++	.driver		= {
++		.name	= "twl4030_bci",
++	},
++};
++
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:twl4030_bci");
++MODULE_AUTHOR("Texas Instruments Inc");
++
++static int __init twl4030_battery_init(void)
++{
++	return platform_driver_register(&twl4030_bci_battery_driver);
++}
++module_init(twl4030_battery_init);
++
++static void __exit twl4030_battery_exit(void)
++{
++	platform_driver_unregister(&twl4030_bci_battery_driver);
++}
++module_exit(twl4030_battery_exit);
++
+diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
+index d975c5b..a3470ce 100644
+--- a/include/linux/i2c/twl.h
++++ b/include/linux/i2c/twl.h
+@@ -442,6 +442,7 @@ struct twl4030_clock_init_data {
+ struct twl4030_bci_platform_data {
+ 	int *battery_tmp_tbl;
+ 	unsigned int tblsize;
++	bool no_backup_battery;
+ };
+ 
+ /* TWL4030_GPIO_MAX (18) GPIOs, with interrupts */
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0016-ARM-OMAP-omap3-touchbook-update-boardfile.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0016-ARM-OMAP-omap3-touchbook-update-boardfile.patch
index 5c1fa3f962..0dc58abfc8 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0016-ARM-OMAP-omap3-touchbook-update-boardfile.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0016-ARM-OMAP-omap3-touchbook-update-boardfile.patch
@@ -1,14 +1,14 @@
-From d0e8e774fdc82320822246fae3167302730bd7e8 Mon Sep 17 00:00:00 2001
+From 67a87638586acaf7907f94d2f0d3b09190c23880 Mon Sep 17 00:00:00 2001
 From: Gregoire Gentil <gregoire@gentil.com>
 Date: Fri, 12 Mar 2010 11:49:16 +0100
-Subject: [PATCH 16/16] ARM: OMAP: omap3-touchbook: update boardfile
+Subject: [PATCH 16/17] ARM: OMAP: omap3-touchbook: update boardfile
 
 ---
- arch/arm/mach-omap2/board-omap3touchbook.c |  408 +++++++++++++++++++++-------
- 1 files changed, 313 insertions(+), 95 deletions(-)
+ arch/arm/mach-omap2/board-omap3touchbook.c |  417 +++++++++++++++++++++-------
+ 1 files changed, 322 insertions(+), 95 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
-index fc3e03c..ec7830e 100644
+index fc3e03c..c22a3e3 100644
 --- a/arch/arm/mach-omap2/board-omap3touchbook.c
 +++ b/arch/arm/mach-omap2/board-omap3touchbook.c
 @@ -1,7 +1,7 @@
@@ -213,10 +213,15 @@ index fc3e03c..ec7830e 100644
  /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
  static struct regulator_init_data touchbook_vmmc1 = {
  	.constraints = {
-@@ -283,6 +369,10 @@ static struct twl4030_codec_data touchbook_codec_data = {
+@@ -283,6 +369,15 @@ static struct twl4030_codec_data touchbook_codec_data = {
  	.audio = &touchbook_audio_data,
  };
  
++static struct twl4030_bci_platform_data touchbook_bci_data = {
++	.tblsize		= 0,
++	.no_backup_battery	= 1,
++};
++
 +static struct twl4030_madc_platform_data touchbook_madc_data = {
 +	.irq_line	= 1,
 +};
@@ -224,7 +229,7 @@ index fc3e03c..ec7830e 100644
  static struct twl4030_platform_data touchbook_twldata = {
  	.irq_base	= TWL4030_IRQ_BASE,
  	.irq_end	= TWL4030_IRQ_END,
-@@ -291,6 +381,7 @@ static struct twl4030_platform_data touchbook_twldata = {
+@@ -291,10 +386,15 @@ static struct twl4030_platform_data touchbook_twldata = {
  	.usb		= &touchbook_usb_data,
  	.gpio		= &touchbook_gpio_data,
  	.codec		= &touchbook_codec_data,
@@ -232,7 +237,15 @@ index fc3e03c..ec7830e 100644
  	.vmmc1		= &touchbook_vmmc1,
  	.vsim		= &touchbook_vsim,
  	.vdac		= &touchbook_vdac,
-@@ -310,10 +401,18 @@ static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = {
+ 	.vpll2		= &touchbook_vpll2,
++
++	/* TouchBook BCI */
++	.bci		= &touchbook_bci_data,
++	.madc		= &touchbook_madc_data,
+ };
+ 
+ static struct i2c_board_info __initdata touchbook_i2c_boardinfo[] = {
+@@ -310,10 +410,18 @@ static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = {
  	{
  		I2C_BOARD_INFO("bq27200", 0x55),
  	},
@@ -251,7 +264,7 @@ index fc3e03c..ec7830e 100644
  	/* Standard TouchBook bus */
  	omap_register_i2c_bus(1, 2600, touchbook_i2c_boardinfo,
  			ARRAY_SIZE(touchbook_i2c_boardinfo));
-@@ -322,53 +421,16 @@ static int __init omap3_touchbook_i2c_init(void)
+@@ -322,53 +430,16 @@ static int __init omap3_touchbook_i2c_init(void)
  	omap_register_i2c_bus(3, 100, touchBook_i2c_boardinfo,
  			ARRAY_SIZE(touchBook_i2c_boardinfo));
  
@@ -311,7 +324,7 @@ index fc3e03c..ec7830e 100644
  static struct gpio_led gpio_leds[] = {
  	{
  		.name			= "touchbook::usr0",
-@@ -412,6 +474,7 @@ static struct gpio_keys_button gpio_buttons[] = {
+@@ -412,6 +483,7 @@ static struct gpio_keys_button gpio_buttons[] = {
  		.gpio			= 183,
  		.desc			= "power",
  		.wakeup			= 1,
@@ -319,7 +332,7 @@ index fc3e03c..ec7830e 100644
  	},
  };
  
-@@ -428,23 +491,8 @@ static struct platform_device keys_gpio = {
+@@ -428,23 +500,8 @@ static struct platform_device keys_gpio = {
  	},
  };
  
@@ -343,7 +356,7 @@ index fc3e03c..ec7830e 100644
  	omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
  			     mt46h32m32lf6_sdrc_params, omap35x_mpu_rate_table,
  			     omap35x_dsp_rate_table, omap35x_l3_rate_table);
-@@ -456,9 +504,9 @@ static void __init omap3_touchbook_init_irq(void)
+@@ -456,9 +513,9 @@ static void __init omap3_touchbook_init_irq(void)
  }
  
  static struct platform_device *omap3_touchbook_devices[] __initdata = {
@@ -354,7 +367,7 @@ index fc3e03c..ec7830e 100644
  };
  
  static void __init omap3touchbook_flash_init(void)
-@@ -500,7 +548,7 @@ static void __init omap3touchbook_flash_init(void)
+@@ -500,7 +557,7 @@ static void __init omap3touchbook_flash_init(void)
  	}
  }
  
@@ -363,7 +376,7 @@ index fc3e03c..ec7830e 100644
  
  	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
  	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
-@@ -512,6 +560,170 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+@@ -512,6 +569,170 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
  	.reset_gpio_port[2]  = -EINVAL
  };
  
@@ -534,7 +547,7 @@ index fc3e03c..ec7830e 100644
  static void omap3_touchbook_poweroff(void)
  {
  	int r;
-@@ -525,33 +737,26 @@ static void omap3_touchbook_poweroff(void)
+@@ -525,33 +746,26 @@ static void omap3_touchbook_poweroff(void)
  	gpio_direction_output(TB_KILL_POWER_GPIO, 0);
  }
  
@@ -575,7 +588,7 @@ index fc3e03c..ec7830e 100644
  	usb_musb_init();
  	usb_ehci_init(&ehci_pdata);
  	omap3touchbook_flash_init();
-@@ -559,6 +764,17 @@ static void __init omap3_touchbook_init(void)
+@@ -559,6 +773,17 @@ static void __init omap3_touchbook_init(void)
  	/* Ensure SDRC pins are mux'd for self-refresh */
  	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
  	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
@@ -593,7 +606,7 @@ index fc3e03c..ec7830e 100644
  }
  
  static void __init omap3_touchbook_map_io(void)
-@@ -567,6 +783,8 @@ static void __init omap3_touchbook_map_io(void)
+@@ -567,6 +792,8 @@ static void __init omap3_touchbook_map_io(void)
  	omap2_map_common_io();
  }
  
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0017-ARM-OMAP-add-800MHz-OPP-and-remove-125MHz-one.patch b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0017-ARM-OMAP-add-800MHz-OPP-and-remove-125MHz-one.patch
new file mode 100644
index 0000000000..8a06ead440
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0017-ARM-OMAP-add-800MHz-OPP-and-remove-125MHz-one.patch
@@ -0,0 +1,48 @@
+From 1f36c057ab83a5c5e8162094fb52022edd5ba9b8 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 4 May 2010 09:01:21 +0200
+Subject: [PATCH 17/17] ARM: OMAP: add 800MHz OPP and remove 125MHz one
+
+---
+ arch/arm/mach-omap2/pm34xx.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
+index d1cc528..42fbcdd 100644
+--- a/arch/arm/mach-omap2/pm34xx.c
++++ b/arch/arm/mach-omap2/pm34xx.c
+@@ -120,7 +120,7 @@ static struct prm_setup_vc prm_setup = {
+ struct omap_opp omap35x_mpu_rate_table[] = {
+ 	{0, 0, 0},
+ 	/*OPP1*/
+-	{S125M, VDD1_OPP1, 0x1E},
++//	{S125M, VDD1_OPP1, 0x1E},
+ 	/*OPP2*/
+ 	{S250M, VDD1_OPP2, 0x26},
+ 	/*OPP3*/
+@@ -131,12 +131,13 @@ struct omap_opp omap35x_mpu_rate_table[] = {
+ 	{S600M, VDD1_OPP5, 0x3C},
+ 	/*OPP6*/
+ 	{S720M, VDD1_OPP6, 0x3C},
++	{S800M, VDD1_OPP6, 0x3F},
+ };
+ 
+ struct omap_opp omap35x_dsp_rate_table[] = {
+ 	{0, 0, 0},
+ 	/*OPP1*/
+-	{S90M, VDD1_OPP1, 0x1E},
++//	{S90M, VDD1_OPP1, 0x1E},
+ 	/*OPP2*/
+ 	{S180M, VDD1_OPP2, 0x26},
+ 	/*OPP3*/
+@@ -147,6 +148,7 @@ struct omap_opp omap35x_dsp_rate_table[] = {
+ 	{S430M, VDD1_OPP5, 0x3C},
+ 	/*OPP5*/
+ 	{S520M, VDD1_OPP6, 0x3C},
++	{S600M, VDD1_OPP6, 0x3F},
+ };
+ 
+ struct omap_opp omap35x_l3_rate_table[] = {
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig
index 991279b605..6f2b7bd989 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig
+++ b/recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Wed Mar 31 11:43:52 2010
+# Mon May 10 12:50:28 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -306,6 +306,8 @@ CONFIG_ARM_THUMBEE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_HAS_TLS_REG=y
 CONFIG_ARM_L1_CACHE_SHIFT=6
+# CONFIG_USER_L2_PLE is not set
+# CONFIG_USER_PMON is not set
 CONFIG_ARM_ERRATA_430973=y
 # CONFIG_ARM_ERRATA_458693 is not set
 # CONFIG_ARM_ERRATA_460075 is not set
@@ -356,6 +358,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_LEDS=y
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
+CONFIG_CPU_V7_SYSFS=y
 
 #
 # Boot options
@@ -375,9 +378,9 @@ CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
@@ -1486,6 +1489,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_BQ27x00=y
 # CONFIG_BATTERY_MAX17040 is not set
+CONFIG_TWL4030_BCI_BATTERY=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1595,7 +1599,7 @@ CONFIG_MFD_CORE=y
 CONFIG_TWL4030_CORE=y
 # CONFIG_TWL4030_POWER is not set
 CONFIG_TWL4030_CODEC=y
-# CONFIG_TWL4030_MADC is not set
+CONFIG_TWL4030_MADC=y
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
@@ -1712,7 +1716,6 @@ CONFIG_VIDEO_KS0127=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_TCM825X=m
 CONFIG_VIDEO_MT9P012=m
-# CONFIG_VIDEO_MT9T111 is not set
 CONFIG_VIDEO_DW9710=m
 # CONFIG_VIDEO_OV3640 is not set
 CONFIG_VIDEO_IMX046=m
diff --git a/recipes/linux/linux-omap-psp_2.6.29.bb b/recipes/linux/linux-omap-psp_2.6.29.bb
index 2a2754eb13..7422372368 100644
--- a/recipes/linux/linux-omap-psp_2.6.29.bb
+++ b/recipes/linux/linux-omap-psp_2.6.29.bb
@@ -11,20 +11,20 @@ SRCREV = "9abb6eb717acbca192ab251a056e3a66b2b47884"
 PR_append = "+gitr${SRCREV}"
 
 SRC_URI = "git://arago-project.org/git/people/sriram/ti-psp-omap.git;protocol=git;branch=int_030000_build3 \
-           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
+           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch \
            file://defconfig"
 
 S = "${WORKDIR}/git"
 
 SRC_URI_append_am3517-evm = " \
-        file://shiva-bits.diff;patch=1 \
-        file://shiva-ehci.diff;patch=1 \
+        file://shiva-bits.diff \
+        file://shiva-ehci.diff \
 "
 
 SRC_URI_append_omap3evm = " \
-	file://fix-twl-merge-damage.diff;patch=1 \
-	file://fix-section-mismatch.diff;patch=1 \
-	file://no-3517-hack.diff;patch=1 \
+	file://fix-twl-merge-damage.diff \
+	file://fix-section-mismatch.diff \
+	file://no-3517-hack.diff \
 "
 
 do_install_append() {
diff --git a/recipes/linux/linux-omap-psp_2.6.31.bb b/recipes/linux/linux-omap-psp_2.6.31.bb
index 1e931e19e5..5c1fb6ea82 100644
--- a/recipes/linux/linux-omap-psp_2.6.31.bb
+++ b/recipes/linux/linux-omap-psp_2.6.31.bb
@@ -12,7 +12,7 @@ PV = "2.6.30+2.6.31rc7"
 PR_append = "+gitr${SRCREV}"
 
 SRC_URI = "git://arago-project.org/git/people/sriram/ti-psp-omap.git;protocol=git;branch=staging \
-           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
+           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch \
            file://defconfig"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb
index d157399e48..f2351a367d 100644
--- a/recipes/linux/linux-omap-psp_2.6.32.bb
+++ b/recipes/linux/linux-omap-psp_2.6.32.bb
@@ -5,77 +5,80 @@ KERNEL_IMAGETYPE = "uImage"
 
 COMPATIBLE_MACHINE = "beagleboard|omap3evm|am3517-evm|dm3730-am3715-evm|omap3-touchbook|overo"
 
-# This is the v2.6.32_OMAPPSP_03.00.00.05 branch
-SRCREV = "7b8926aa626991fa087b00f6bbc1fb6b0e8269b0"
+# This is the v2.6.32_OMAPPSP_03.00.01.06 branch
+SRCREV = "627293ad28604b22612f9a4a318f64cfab241e22"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
 MACHINE_KERNEL_PR_append = "+gitr${SRCREV}"
 
 SRC_URI = "git://arago-project.org/git/people/sriram/ti-psp-omap.git;protocol=git;branch=master \
-           file://0001-board-omap3touchbook-make-it-build-against-TI-linux-.patch;patch=1 \
-           file://0002-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch;patch=1 \
-           file://0003-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch;patch=1 \
-           file://0004-board-omap3-beagle-add-DSS2-support.patch;patch=1 \
-           file://0005-beagleboard-omap3_-foo-_rate_table-omap35x_-foo-_rat.patch;patch=1 \
-           file://0006-board-omap3beagle-prepare-for-DM3730-based-Beagleboa.patch;patch=1 \
-           file://0007-mt9t111-first-stab-at-merging-sensor-driver-based-on.patch;patch=1 \
-           file://0008-board-omap3beagle-ugly-copy-paste-job-to-get-mt9p111.patch;patch=1 \
-           file://0009-board-omap3beagle-turn-on-power-to-camera-on-boot-an.patch;patch=1 \
-           file://0010-board-omap3beagle-update-omap34xxcam-to-more-recent-.patch;patch=1 \
-           file://0011-ASoC-enable-audio-capture-by-default-for-twl4030.patch;patch=1 \
-           file://0012-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch;patch=1 \
-           file://0013-OMAP3630-DSS2-Enable-Pre-Multiplied-Alpha-Support.patch;patch=1 \
-           file://0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch;patch=1 \
-           file://0015-ISP-add-some-more-from-Leopard-imaging-patch.patch;patch=1 \
-           file://0016-ARM-OMAP-Overo-Add-support-for-second-ethernet-port.patch;patch=1 \
-           file://0017-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch;patch=1 \
-           file://0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch;patch=1 \
-           file://0019-drivers-mfd-add-twl4030-madc-driver.patch;patch=1 \
-           file://0020-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch;patch=1 \
-           file://0021-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch;patch=1 \
-           file://0022-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch;patch=1 \
-           file://0023-netdev-rt73usb-add-vendor-device-ID-for-Ceiva-Wirele.patch;patch=1 \
-           file://0024-mmc-don-t-display-single-block-read-console-messages.patch;patch=1 \
-           file://0025-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch;patch=1 \
-           file://0026-board-overo-add-PM-code-and-sync-with-http-www.sakom.patch;patch=1 \
-           file://0027-twl4030-madc-adjust-for-twl4030-twl-api-changes.patch;patch=1 \
-           file://0028-OMAP-DSS2-Re-add-support-for-Samsung-lte430wq-f0c-pa.patch;patch=1 \
-           file://0029-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-panel.patch;patch=1 \
-           file://0030-Fix-for-bus-width-which-improves-SD-card-s-peformanc.patch;patch=1 \
-           file://0031-ARM-VFP-add-support-to-sync-the-VFP-state-of-the-cur.patch;patch=1 \
-           file://0032-ARM-VFP-preserve-the-HW-context-when-calling-signal-.patch;patch=1 \
-           file://0033-Switch-SGX-clocks-to-200MHz-on-DM37xx-OMAP36xx.patch;patch=1 \
-           file://0034-modedb.c-add-proper-720p60-mode.patch;patch=1 \
-           file://0035-RTC-add-support-for-backup-battery-recharge.patch;patch=1 \
-           file://0036-ARM-Add-prompt-for-CONFIG_ALIGNMENT_TRAP.patch;patch=1 \
-           file://0037-ARM-Print-warning-on-alignment-trap-in-kernel-mode.patch;patch=1 \
-           file://0038-ARM-Expose-some-CPU-control-registers-via-sysfs.patch;patch=1 \
-           file://0039-ARM-Add-option-to-allow-userspace-PLE-access.patch;patch=1 \
-           file://0040-ARM-Add-option-to-allow-userspace-access-to-performa.patch;patch=1 \
-           file://0041-ARM-Expose-some-PMON-registers-through-sysfs.patch;patch=1 \
-           file://0042-musb-allow-host-io-without-gadget-module.patch;patch=1 \
+           file://0001-Revert-omap3-beagle-Fix-compile-time-errors.patch \
+           file://0002-board-omap3touchbook-make-it-build-against-TI-linux-.patch \
+           file://0003-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch \
+           file://0004-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch \
+           file://0005-board-omap3-beagle-add-DSS2-support.patch \
+           file://0006-board-omap3beagle-prepare-for-DM3730-based-Beagleboa.patch \
+           file://0007-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch \
+           file://0008-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch \
+           file://0009-ARM-OMAP-beagleboard-initialize-ds1307-and-eeprom-on.patch \
+           file://0010-ARM-OMAP-update-beagleboard-defconfig.patch \
+           file://0011-ASoC-enable-audio-capture-by-default-for-twl4030.patch \
+           file://0012-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch \
+           file://0013-OMAP3630-DSS2-Enable-Pre-Multiplied-Alpha-Support.patch \
+           file://0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch \
+           file://0015-ISP-add-some-more-from-Leopard-imaging-patch.patch \
+           file://0016-ARM-OMAP-Overo-Add-support-for-second-ethernet-port.patch \
+           file://0017-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch \
+           file://0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch \
+           file://0019-drivers-mfd-add-twl4030-madc-driver.patch \
+           file://0020-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch \
+           file://0021-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch \
+           file://0022-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch \
+           file://0023-netdev-rt73usb-add-vendor-device-ID-for-Ceiva-Wirele.patch \
+           file://0024-mmc-don-t-display-single-block-read-console-messages.patch \
+           file://0025-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch \
+           file://0026-board-overo-add-PM-code-and-sync-with-http-www.sakom.patch \
+           file://0027-twl4030-madc-adjust-for-twl4030-twl-api-changes.patch \
+           file://0028-OMAP-DSS2-Re-add-support-for-Samsung-lte430wq-f0c-pa.patch \
+           file://0029-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-panel.patch \
+           file://0030-Fix-for-bus-width-which-improves-SD-card-s-peformanc.patch \
+           file://0031-ARM-VFP-add-support-to-sync-the-VFP-state-of-the-cur.patch \
+           file://0032-ARM-VFP-preserve-the-HW-context-when-calling-signal-.patch \
+           file://0033-Switch-SGX-clocks-to-200MHz-on-DM37xx-OMAP36xx.patch \
+           file://0034-modedb.c-add-proper-720p60-mode.patch \
+           file://0035-RTC-add-support-for-backup-battery-recharge.patch \
+           file://0036-ARM-Add-prompt-for-CONFIG_ALIGNMENT_TRAP.patch \
+           file://0037-ARM-Print-warning-on-alignment-trap-in-kernel-mode.patch \
+           file://0038-ARM-Expose-some-CPU-control-registers-via-sysfs.patch \
+           file://0039-ARM-Add-option-to-allow-userspace-PLE-access.patch \
+           file://0040-ARM-Add-option-to-allow-userspace-access-to-performa.patch \
+           file://0041-ARM-Expose-some-PMON-registers-through-sysfs.patch \
+           file://0042-musb-allow-host-io-without-gadget-module.patch \
+           file://0043-MTD-silence-ecc-errors-on-mtdblock0.patch \
+           file://0044-ARM-OMAP-beagle-every-known-beagle-except-revB-uses-.patch \
            file://defconfig"
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
 "
 
 SRC_URI_append_omap3-touchbook = " \
-                                  file://0001-ARM-OMAP-add-spi-platform-devices.patch;patch=1 \
-                                  file://0002-MMA7455L-accelerometer-driver.patch;patch=1 \
-                                  file://0003-bq27x00_battery-remove-error-message-output.patch;patch=1 \
-                                  file://0004-bq27x00_battery-add-charged-gpio.patch;patch=1 \
-                                  file://0005-adf7846-add-more-debugging.patch;patch=1 \
-                                  file://0006-ads7846-read-max-mix-x-y-from-pdata.patch;patch=1 \
-                                  file://0007-ads7846-add-settling-delay-to-pdata.patch;patch=1 \
-                                  file://0008-DSS2-OMAPFB-Translate-X-Y-coordinates-for-the-video-.patch;patch=1 \
-                                  file://0009-DSS2-fix-rotation-offsets.patch;patch=1 \
-                                  file://0010-DSS2-Fix-scaling-checks-when-rotation-is-90-or-270-d.patch;patch=1 \
-                                  file://0011-add-touchbook-hid-driver.patch;patch=1 \
-                                  file://0012-Make-backlight-controls-accessible-to-users.patch;patch=1 \
-                                  file://0013-ads7846-don-t-error-out-when-there-s-no-pendown-gpio.patch;patch=1 \
-                                  file://0014-ASoC-add-driver-for-omap3-touchbook.patch;patch=1 \
-                                  file://0015-backlight-add-PWM-support.patch;patch=1 \
-                                  file://0016-ARM-OMAP-omap3-touchbook-update-boardfile.patch;patch=1 \
+                                  file://0001-ARM-OMAP-add-spi-platform-devices.patch \
+                                  file://0002-MMA7455L-accelerometer-driver.patch \
+                                  file://0003-bq27x00_battery-remove-error-message-output.patch \
+                                  file://0004-bq27x00_battery-add-charged-gpio.patch \
+                                  file://0005-adf7846-add-more-debugging.patch \
+                                  file://0006-ads7846-read-max-mix-x-y-from-pdata.patch \
+                                  file://0007-ads7846-add-settling-delay-to-pdata.patch \
+                                  file://0008-DSS2-OMAPFB-Translate-X-Y-coordinates-for-the-video-.patch \
+                                  file://0009-DSS2-Fix-scaling-checks-when-rotation-is-90-or-270-d.patch \
+                                  file://0010-add-touchbook-hid-driver.patch \
+                                  file://0011-Make-backlight-controls-accessible-to-users.patch \
+                                  file://0012-ads7846-don-t-error-out-when-there-s-no-pendown-gpio.patch \
+                                  file://0013-ASoC-add-driver-for-omap3-touchbook.patch \
+                                  file://0014-backlight-add-PWM-support.patch \
+                                  file://0015-Forward-port-TWL4030-BCI-driver-from-2.6.29-to-2.6.3.patch \
+                                  file://0016-ARM-OMAP-omap3-touchbook-update-boardfile.patch \
+#                                 file://0017-ARM-OMAP-add-800MHz-OPP-and-remove-125MHz-one.patch \
 "
 
 addtask quiltfixup before do_patch after do_unpack
diff --git a/recipes/linux/linux-omap-zoomsync-2.6.32/0042-musb-allow-host-io-without-gadget-module.patch b/recipes/linux/linux-omap-zoomsync-2.6.32/0042-musb-allow-host-io-without-gadget-module.patch
new file mode 100644
index 0000000000..5e6a0e2f1c
--- /dev/null
+++ b/recipes/linux/linux-omap-zoomsync-2.6.32/0042-musb-allow-host-io-without-gadget-module.patch
@@ -0,0 +1,90 @@
+From 856e80e1411ff5fad939545b0b7d2c50676ce5c9 Mon Sep 17 00:00:00 2001
+From: Ajay Kumar Gupta <ajay.gupta@ti.com>
+Date: Wed, 14 Apr 2010 16:08:37 +0530
+Subject: [PATCH 42/43] musb: allow host io without gadget module
+
+Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
+---
+ drivers/usb/musb/musb_core.c   |   14 +++++++++-----
+ drivers/usb/musb/musb_gadget.c |   26 --------------------------
+ 2 files changed, 9 insertions(+), 31 deletions(-)
+
+diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
+index 2c1400f..a80e9f9 100644
+--- a/drivers/usb/musb/musb_core.c
++++ b/drivers/usb/musb/musb_core.c
+@@ -2101,10 +2101,12 @@ bad_config:
+ 	 * (We expect the ID pin to be forcibly grounded!!)
+ 	 * Otherwise, wait till the gadget driver hooks up.
+ 	 */
+-	if (!is_otg_enabled(musb) && is_host_enabled(musb)) {
+-		MUSB_HST_MODE(musb);
+-		musb->xceiv->default_a = 1;
+-		musb->xceiv->state = OTG_STATE_A_IDLE;
++	if (is_host_enabled(musb)) {
++		if (!is_otg_enabled(musb)) {
++			MUSB_HST_MODE(musb);
++			musb->xceiv->default_a = 1;
++			musb->xceiv->state = OTG_STATE_A_IDLE;
++		}
+ 
+ 		status = usb_add_hcd(musb_to_hcd(musb), -1, 0);
+ 
+@@ -2115,7 +2117,9 @@ bad_config:
+ 					& MUSB_DEVCTL_BDEVICE
+ 				? 'B' : 'A'));
+ 
+-	} else /* peripheral is enabled */ {
++	}
++	/* peripheral is enabled */
++	if (is_peripheral_enabled(musb)) {
+ 		MUSB_DEV_MODE(musb);
+ 		musb->xceiv->default_a = 0;
+ 		musb->xceiv->state = OTG_STATE_B_IDLE;
+diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
+index 1c3610b..d75db21 100644
+--- a/drivers/usb/musb/musb_gadget.c
++++ b/drivers/usb/musb/musb_gadget.c
+@@ -1752,24 +1752,6 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
+ 		otg_set_peripheral(musb->xceiv, &musb->g);
+ 
+ 		spin_unlock_irqrestore(&musb->lock, flags);
+-
+-		if (is_otg_enabled(musb)) {
+-			DBG(3, "OTG startup...\n");
+-
+-			/* REVISIT:  funcall to other code, which also
+-			 * handles power budgeting ... this way also
+-			 * ensures HdrcStart is indirectly called.
+-			 */
+-			retval = usb_add_hcd(musb_to_hcd(musb), -1, 0);
+-			if (retval < 0) {
+-				DBG(1, "add_hcd failed, %d\n", retval);
+-				spin_lock_irqsave(&musb->lock, flags);
+-				otg_set_peripheral(musb->xceiv, NULL);
+-				musb->gadget_driver = NULL;
+-				musb->g.dev.driver = NULL;
+-				spin_unlock_irqrestore(&musb->lock, flags);
+-			}
+-		}
+ 	}
+ 
+ 	return retval;
+@@ -1865,14 +1847,6 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
+ 		retval = -EINVAL;
+ 	spin_unlock_irqrestore(&musb->lock, flags);
+ 
+-	if (is_otg_enabled(musb) && retval == 0) {
+-		usb_remove_hcd(musb_to_hcd(musb));
+-		/* FIXME we need to be able to register another
+-		 * gadget driver here and have everything work;
+-		 * that currently misbehaves.
+-		 */
+-	}
+-
+ 	return retval;
+ }
+ EXPORT_SYMBOL(usb_gadget_unregister_driver);
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-zoomsync_2.6.32.bb b/recipes/linux/linux-omap-zoomsync_2.6.32.bb
index b869a8881c..2ac81ef0f0 100644
--- a/recipes/linux/linux-omap-zoomsync_2.6.32.bb
+++ b/recipes/linux/linux-omap-zoomsync_2.6.32.bb
@@ -14,7 +14,7 @@ SRCREV_omapzoom2 = "015cbaf1035cd9a61d33a27de2a22902555db3c5"
 
 SRCREV_omapzoom36x = "2e3c681c6228de2a3f8fbb0cfbc940e7ea825a09"
 
-OEV = "oe6"
+OEV = "oe7"
 PE = "1"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
@@ -25,14 +25,16 @@ PR_append = "+gitr${SRCREV}"
 
 
 SRC_URI_omapzoom2 = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;branch=master;protocol=git \
-       file://rev.patch;patch=1 \
-	   file://logo_linux_clut224.ppm \
-	   file://defconfig"
+       file://0042-musb-allow-host-io-without-gadget-module.patch \
+       file://rev.patch \
+       file://logo_linux_clut224.ppm \
+       file://defconfig"
 
 SRC_URI_omapzoom36x = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;branch=L23.I3.3;protocol=git \
-       file://rev.patch;patch=1 \
-	   file://logo_linux_clut224.ppm \
-	   file://defconfig"
+       file://0042-musb-allow-host-io-without-gadget-module.patch \
+       file://rev.patch \
+       file://logo_linux_clut224.ppm \
+       file://defconfig"
 
 SRC_URI_append = " \
 "
diff --git a/recipes/linux/linux-omap1_2.6.12-rc2.bb b/recipes/linux/linux-omap1_2.6.12-rc2.bb
index d646269411..5e9286d89a 100644
--- a/recipes/linux/linux-omap1_2.6.12-rc2.bb
+++ b/recipes/linux/linux-omap1_2.6.12-rc2.bb
@@ -5,7 +5,7 @@ PR = "r4"
 COMPATIBLE_MACHINE = "omap5912osk"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.12/linux-2.6.12-rc2.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/old/patch-2.6.12-rc2-omap1.bz2;patch=1;name=patch \
+           http://www.muru.com/linux/omap/patches/old/patch-2.6.12-rc2-omap1.bz2;apply=yes;name=patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.12-rc2"
diff --git a/recipes/linux/linux-omap1_2.6.18+git.bb b/recipes/linux/linux-omap1_2.6.18+git.bb
index 7fac38a77b..b01b48d854 100644
--- a/recipes/linux/linux-omap1_2.6.18+git.bb
+++ b/recipes/linux/linux-omap1_2.6.18+git.bb
@@ -5,7 +5,7 @@ PR = "r2"
 COMPATIBLE_MACHINE = "omap5912osk"
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=http;tag=c6051183c597b6a0fa73cdb59aac852c6148c5b6 \
-           file://another-ide-cs-ids.patch;patch=1 \
+           file://another-ide-cs-ids.patch \
            file://defconfig"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-omap1_2.6.18-omap1.bb b/recipes/linux/linux-omap1_2.6.18-omap1.bb
index b7c12cf0c3..5e2457720a 100644
--- a/recipes/linux/linux-omap1_2.6.18-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.18-omap1.bb
@@ -3,8 +3,8 @@ require linux-omap.inc
 COMPATIBLE_MACHINE = "omap5912osk"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/patch-2.6.18-omap1.bz2;patch=1;name=patch \
-           file://another-ide-cs-ids.patch;patch=1 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.18-omap1.bz2;apply=yes;name=patch \
+           file://another-ide-cs-ids.patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.18"
diff --git a/recipes/linux/linux-omap1_2.6.19-omap1.bb b/recipes/linux/linux-omap1_2.6.19-omap1.bb
index 611346b0f2..9d1b475ef7 100644
--- a/recipes/linux/linux-omap1_2.6.19-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.19-omap1.bb
@@ -3,9 +3,9 @@ require linux-omap.inc
 COMPATIBLE_MACHINE = "omap5912osk"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/patch-2.6.19-omap1.bz2;patch=1;name=patch \
-           file://another-ide-cs-ids.patch;patch=1 \
-           file://i2c-fix.patch;patch=1 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.19-omap1.bz2;apply=yes;name=patch \
+           file://another-ide-cs-ids.patch \
+           file://i2c-fix.patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.19"
diff --git a/recipes/linux/linux-omap1_2.6.20-omap1.bb b/recipes/linux/linux-omap1_2.6.20-omap1.bb
index 0a3bd049c6..f1a2d1bede 100644
--- a/recipes/linux/linux-omap1_2.6.20-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.20-omap1.bb
@@ -3,7 +3,7 @@ require linux-omap.inc
 COMPATIBLE_MACHINE = "omap5912osk"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/patch-2.6.20-omap1.bz2;patch=1;name=patch \
+           http://www.muru.com/linux/omap/patches/patch-2.6.20-omap1.bz2;apply=yes;name=patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.20"
diff --git a/recipes/linux/linux-omap1_2.6.22-omap1.bb b/recipes/linux/linux-omap1_2.6.22-omap1.bb
index cfeb3fb375..b3fd805274 100644
--- a/recipes/linux/linux-omap1_2.6.22-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.22-omap1.bb
@@ -3,7 +3,7 @@ require linux-omap.inc
 COMPATIBLE_MACHINE = "omap5912osk"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;patch=1;name=patch \
+           http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;apply=yes;name=patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.22"
diff --git a/recipes/linux/linux-omap1_2.6.23-omap1.bb b/recipes/linux/linux-omap1_2.6.23-omap1.bb
index 7980013a5b..24d9e38b71 100644
--- a/recipes/linux/linux-omap1_2.6.23-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.23-omap1.bb
@@ -3,8 +3,8 @@ require linux-omap.inc
 COMPATIBLE_MACHINE = "omap5912osk"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/patch-2.6.23-omap1.bz2;patch=1;name=patch \
-           file://binutils-buildid-arm.patch;patch=1 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.23-omap1.bz2;apply=yes;name=patch \
+           file://binutils-buildid-arm.patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.23"
diff --git a/recipes/linux/linux-omap1_2.6.24-omap1.bb b/recipes/linux/linux-omap1_2.6.24-omap1.bb
index 557dfcfd67..4c3dc8a638 100644
--- a/recipes/linux/linux-omap1_2.6.24-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.24-omap1.bb
@@ -3,9 +3,9 @@ require linux-omap.inc
 COMPATIBLE_MACHINE = "omap5912osk"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/patch-2.6.24-omap1.bz2;patch=1;name=patch \
-           file://binutils-buildid-arm.patch;patch=1 \
-           file://timespec_add_ns_avoid_udivdi3.patch;patch=1 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.24-omap1.bz2;apply=yes;name=patch \
+           file://binutils-buildid-arm.patch \
+           file://timespec_add_ns_avoid_udivdi3.patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.24"
diff --git a/recipes/linux/linux-omap1_2.6.25-omap1.bb b/recipes/linux/linux-omap1_2.6.25-omap1.bb
index 9c7dfb2384..060ff5c013 100644
--- a/recipes/linux/linux-omap1_2.6.25-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.25-omap1.bb
@@ -3,8 +3,8 @@ require linux-omap.inc
 COMPATIBLE_MACHINE = "omap5912osk"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/patch-2.6.25-omap1.bz2;patch=1;name=patch \
-	   file://gcc43-arm-fix-inline-asm-constraints-for-preload.patch;patch=1 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.25-omap1.bz2;apply=yes;name=patch \
+	   file://gcc43-arm-fix-inline-asm-constraints-for-preload.patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.25"
diff --git a/recipes/linux/linux-omap2_git.bb b/recipes/linux/linux-omap2_git.bb
index 4111387cf1..cb427e3671 100644
--- a/recipes/linux/linux-omap2_git.bb
+++ b/recipes/linux/linux-omap2_git.bb
@@ -5,64 +5,64 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA
 SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848"
 
 PV = "2.6.26"
-#PV = "2.6.26+2.6.27-rc1+${PR}+gitr${SRCPV}"
+#PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}"
 PR = "r64"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
 
-SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
-           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
-	   file://0001-omap3-cpuidle.patch;patch=1 \ 
-           file://0002-omap3-cpuidle.patch;patch=1 \
-           file://timer-suppression.patch;patch=1 \
-           file://ASoC-TWL4030-codec-driver.patch;patch=1 \
-           file://ASoC-machine-driver-for-OMAP3-EVM.patch;patch=1 \
-           file://ASoC-machine-driver-for_OMAP3-Beagle.patch;patch=1 \
-           file://16bpp.patch;patch=1 \
-           file://no-empty-flash-warnings.patch;patch=1 \
+SRC_URI_append_beagleboard = " file://no-harry-potter.diff \
+           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch \
+	   file://0001-omap3-cpuidle.patch \ 
+           file://0002-omap3-cpuidle.patch \
+           file://timer-suppression.patch \
+           file://ASoC-TWL4030-codec-driver.patch \
+           file://ASoC-machine-driver-for-OMAP3-EVM.patch \
+           file://ASoC-machine-driver-for_OMAP3-Beagle.patch \
+           file://16bpp.patch \
+           file://no-empty-flash-warnings.patch \
            file://logo_linux_clut224.ppm \
-           file://oprofile-0.9.3.armv7.diff;patch=1 \
-           file://01-fix-timing-print.diff;patch=1 \
-           file://03-enable-overlay-opt.diff;patch=1 \
-           file://04-use-pcd.diff;patch=1 \
-           file://05-fix-display-panning.diff;patch=1 \
-           file://06-ensure-fclk.diff;patch=1 \
-           file://07-set-burst-size.diff;patch=1 \
-           file://cache-display-fix.patch;patch=1 \
-           file://mru-clocks1.diff;patch=1 \
-           file://mru-clocks2.diff;patch=1 \
-           file://mru-clocks3.diff;patch=1 \	
-           file://4bitmmc.diff;patch=1 \
-           file://no-cortex-deadlock.patch;patch=1 \
-           file://01-make_tick_gptimer_configurable;patch=1 \
-           file://read_die_ids.patch;patch=1 \
-           file://omap23-pm-noop.eml;patch=1 \
-           file://01-omappm-srf.eml;patch=1 \
-           file://02-omappm-mpu-latency-modeling.eml;patch=1 \
-           file://03-omappm-omap3srf.eml;patch=1 \
-           file://04-omappm-srf-noop.eml;patch=1 \
-           file://05-omappm-virtualclocks.eml;patch=1 \
-           file://06-omappm-opp-resource-modeling.eml;patch=1 \
-           file://07-omappm-srf-updates.eml;patch=1 \
-           file://08-omappm-voltagescaling.eml;patch=1 \
-           file://09-omappm-vdd2-scaling.eml;patch=1 \
-           file://10-omappm-off-mode.eml;patch=1 \
-           file://01-postrate-notifier.eml;patch=1 \
-           file://02-postrate-notifier.eml;patch=1 \
-           file://01-omap3-cpufreq.eml;patch=1 \
-           file://01-beagle-cpufreq.diff;patch=1 \
-           file://musb-dmafix.patch;patch=1 \ 
+           file://oprofile-0.9.3.armv7.diff \
+           file://01-fix-timing-print.diff \
+           file://03-enable-overlay-opt.diff \
+           file://04-use-pcd.diff \
+           file://05-fix-display-panning.diff \
+           file://06-ensure-fclk.diff \
+           file://07-set-burst-size.diff \
+           file://cache-display-fix.patch \
+           file://mru-clocks1.diff \
+           file://mru-clocks2.diff \
+           file://mru-clocks3.diff \	
+           file://4bitmmc.diff \
+           file://no-cortex-deadlock.patch \
+           file://01-make_tick_gptimer_configurable;apply=yes \
+           file://read_die_ids.patch \
+           file://omap23-pm-noop.eml;apply=yes \
+           file://01-omappm-srf.eml;apply=yes \
+           file://02-omappm-mpu-latency-modeling.eml;apply=yes \
+           file://03-omappm-omap3srf.eml;apply=yes \
+           file://04-omappm-srf-noop.eml;apply=yes \
+           file://05-omappm-virtualclocks.eml;apply=yes \
+           file://06-omappm-opp-resource-modeling.eml;apply=yes \
+           file://07-omappm-srf-updates.eml;apply=yes \
+           file://08-omappm-voltagescaling.eml;apply=yes \
+           file://09-omappm-vdd2-scaling.eml;apply=yes \
+           file://10-omappm-off-mode.eml;apply=yes \
+           file://01-postrate-notifier.eml;apply=yes \
+           file://02-postrate-notifier.eml;apply=yes \
+           file://01-omap3-cpufreq.eml;apply=yes \
+           file://01-beagle-cpufreq.diff \
+           file://musb-dmafix.patch \ 
 "
 
-SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \
-           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
-           file://0001-omap3-cpuidle.patch;patch=1 \
-           file://0002-omap3-cpuidle.patch;patch=1 \
-           file://timer-suppression.patch;patch=1 \
-           file://soc.patch;patch=1 \
-           file://no-empty-flash-warnings.patch;patch=1 \
-           file://touchscreen.patch;patch=1 \
+SRC_URI_append_omap3evm = " file://no-harry-potter.diff \
+           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch \
+           file://0001-omap3-cpuidle.patch \
+           file://0002-omap3-cpuidle.patch \
+           file://timer-suppression.patch \
+           file://soc.patch \
+           file://no-empty-flash-warnings.patch \
+           file://touchscreen.patch \
 "
 
 
diff --git a/recipes/linux/linux-omap_2.6.26.bb b/recipes/linux/linux-omap_2.6.26.bb
index d967f8aeed..0c8dcd9520 100644
--- a/recipes/linux/linux-omap_2.6.26.bb
+++ b/recipes/linux/linux-omap_2.6.26.bb
@@ -8,58 +8,58 @@ PR = "r65"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
 
-SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
-           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
-	   file://0001-omap3-cpuidle.patch;patch=1 \ 
-           file://0002-omap3-cpuidle.patch;patch=1 \
-           file://timer-suppression.patch;patch=1 \
-           file://ASoC-TWL4030-codec-driver.patch;patch=1 \
-           file://ASoC-machine-driver-for-OMAP3-EVM.patch;patch=1 \
-           file://ASoC-machine-driver-for_OMAP3-Beagle.patch;patch=1 \
-           file://16bpp.patch;patch=1 \
-           file://no-empty-flash-warnings.patch;patch=1 \
+SRC_URI_append_beagleboard = " file://no-harry-potter.diff \
+           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch \
+	   file://0001-omap3-cpuidle.patch \ 
+           file://0002-omap3-cpuidle.patch \
+           file://timer-suppression.patch \
+           file://ASoC-TWL4030-codec-driver.patch \
+           file://ASoC-machine-driver-for-OMAP3-EVM.patch \
+           file://ASoC-machine-driver-for_OMAP3-Beagle.patch \
+           file://16bpp.patch \
+           file://no-empty-flash-warnings.patch \
            file://logo_linux_clut224.ppm \
-           file://oprofile-0.9.3.armv7.diff;patch=1 \
-           file://01-fix-timing-print.diff;patch=1 \
-           file://03-enable-overlay-opt.diff;patch=1 \
-           file://04-use-pcd.diff;patch=1 \
-           file://05-fix-display-panning.diff;patch=1 \
-           file://06-ensure-fclk.diff;patch=1 \
-           file://07-set-burst-size.diff;patch=1 \
-           file://cache-display-fix.patch;patch=1 \
-           file://mru-clocks1.diff;patch=1 \
-           file://mru-clocks2.diff;patch=1 \
-           file://mru-clocks3.diff;patch=1 \	
-           file://4bitmmc.diff;patch=1 \
-           file://no-cortex-deadlock.patch;patch=1 \
-           file://01-make_tick_gptimer_configurable;patch=1 \
-           file://read_die_ids.patch;patch=1 \
-           file://omap23-pm-noop.eml;patch=1 \
-           file://01-omappm-srf.eml;patch=1 \
-           file://02-omappm-mpu-latency-modeling.eml;patch=1 \
-           file://03-omappm-omap3srf.eml;patch=1 \
-           file://04-omappm-srf-noop.eml;patch=1 \
-           file://05-omappm-virtualclocks.eml;patch=1 \
-           file://06-omappm-opp-resource-modeling.eml;patch=1 \
-           file://07-omappm-srf-updates.eml;patch=1 \
-           file://08-omappm-voltagescaling.eml;patch=1 \
-           file://09-omappm-vdd2-scaling.eml;patch=1 \
-           file://10-omappm-off-mode.eml;patch=1 \
-           file://01-postrate-notifier.eml;patch=1 \
-           file://02-postrate-notifier.eml;patch=1 \
-           file://01-omap3-cpufreq.eml;patch=1 \
-           file://01-beagle-cpufreq.diff;patch=1 \
-           file://musb-dmafix.patch;patch=1 \ 
+           file://oprofile-0.9.3.armv7.diff \
+           file://01-fix-timing-print.diff \
+           file://03-enable-overlay-opt.diff \
+           file://04-use-pcd.diff \
+           file://05-fix-display-panning.diff \
+           file://06-ensure-fclk.diff \
+           file://07-set-burst-size.diff \
+           file://cache-display-fix.patch \
+           file://mru-clocks1.diff \
+           file://mru-clocks2.diff \
+           file://mru-clocks3.diff \	
+           file://4bitmmc.diff \
+           file://no-cortex-deadlock.patch \
+           file://01-make_tick_gptimer_configurable;apply=yes \
+           file://read_die_ids.patch \
+           file://omap23-pm-noop.eml;apply=yes \
+           file://01-omappm-srf.eml;apply=yes \
+           file://02-omappm-mpu-latency-modeling.eml;apply=yes \
+           file://03-omappm-omap3srf.eml;apply=yes \
+           file://04-omappm-srf-noop.eml;apply=yes \
+           file://05-omappm-virtualclocks.eml;apply=yes \
+           file://06-omappm-opp-resource-modeling.eml;apply=yes \
+           file://07-omappm-srf-updates.eml;apply=yes \
+           file://08-omappm-voltagescaling.eml;apply=yes \
+           file://09-omappm-vdd2-scaling.eml;apply=yes \
+           file://10-omappm-off-mode.eml;apply=yes \
+           file://01-postrate-notifier.eml;apply=yes \
+           file://02-postrate-notifier.eml;apply=yes \
+           file://01-omap3-cpufreq.eml;apply=yes \
+           file://01-beagle-cpufreq.diff \
+           file://musb-dmafix.patch \ 
 "
 
-SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \
-           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
-           file://0001-omap3-cpuidle.patch;patch=1 \
-           file://0002-omap3-cpuidle.patch;patch=1 \
-           file://timer-suppression.patch;patch=1 \
-           file://soc.patch;patch=1 \
-           file://no-empty-flash-warnings.patch;patch=1 \
-           file://touchscreen.patch;patch=1 \
+SRC_URI_append_omap3evm = " file://no-harry-potter.diff \
+           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch \
+           file://0001-omap3-cpuidle.patch \
+           file://0002-omap3-cpuidle.patch \
+           file://timer-suppression.patch \
+           file://soc.patch \
+           file://no-empty-flash-warnings.patch \
+           file://touchscreen.patch \
 "
 
 
diff --git a/recipes/linux/linux-omap_2.6.27.bb b/recipes/linux/linux-omap_2.6.27.bb
index c5c01acace..fdf0fdd69f 100644
--- a/recipes/linux/linux-omap_2.6.27.bb
+++ b/recipes/linux/linux-omap_2.6.27.bb
@@ -12,35 +12,35 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.g
 	   file://defconfig"
 
 SRC_URI_append = " \
-           file://no-empty-flash-warnings.patch;patch=1 \
-           file://oprofile-0.9.3.armv7.diff;patch=1 \
-           file://no-cortex-deadlock.patch;patch=1 \
-           file://read_die_ids.patch;patch=1 \
-           file://fix-install.patch;patch=1 \
-           file://musb-dma-iso-in.eml;patch=1 \
-           file://musb-support-high-bandwidth.patch.eml;patch=1 \
-           file://mru-fix-timings.diff;patch=1 \
-           file://mru-fix-display-panning.diff;patch=1 \
-           file://mru-make-dpll4-m4-ck-programmable.diff;patch=1 \
-           file://mru-add-clk-get-parent.diff;patch=1 \
-           file://mru-improve-pixclock-config.diff;patch=1 \
-           file://mru-make-video-timings-selectable.diff;patch=1 \
-           file://mru-enable-overlay-optimalization.diff;patch=1 \
-           file://musb-fix-ISO-in-unlink.diff;patch=1 \
-           file://musb-fix-multiple-bulk-transfers.diff;patch=1 \
-           file://musb-fix-endpoints.diff;patch=1 \
-           file://dvb-fix-dma.diff;patch=1 \
-           file://0001-Removed-resolution-check-that-prevents-scaling-when.patch;patch=1 \
-           file://0001-Implement-downsampling-with-debugs.patch;patch=1 \
-#           file://openvz/0001-arm-introduce-MAP_EXECPRIO-define.patch;patch=1 \
-#           file://openvz/0002-arm-export-arm-version-of-show_mem.patch;patch=1 \
-#           file://openvz/0003-arm-wire-OpenVZ-syscalls.patch;patch=1 \
-#           file://openvz/0004-arm-add-openvz-and-bc-Kconfigs.patch;patch=1 \
-#           file://openvz/openvz-2.6.27.diff;patch=1 \
-           file://sitecomwl168-support.diff;patch=1 \
-           file://nand.patch;patch=1 \
-           file://musb-rxtx.patch;patch=1 \
-           file://add-gwc.diff;patch=1 \
+           file://no-empty-flash-warnings.patch \
+           file://oprofile-0.9.3.armv7.diff \
+           file://no-cortex-deadlock.patch \
+           file://read_die_ids.patch \
+           file://fix-install.patch \
+           file://musb-dma-iso-in.eml;apply=yes \
+           file://musb-support-high-bandwidth.patch.eml;apply=yes \
+           file://mru-fix-timings.diff \
+           file://mru-fix-display-panning.diff \
+           file://mru-make-dpll4-m4-ck-programmable.diff \
+           file://mru-add-clk-get-parent.diff \
+           file://mru-improve-pixclock-config.diff \
+           file://mru-make-video-timings-selectable.diff \
+           file://mru-enable-overlay-optimalization.diff \
+           file://musb-fix-ISO-in-unlink.diff \
+           file://musb-fix-multiple-bulk-transfers.diff \
+           file://musb-fix-endpoints.diff \
+           file://dvb-fix-dma.diff \
+           file://0001-Removed-resolution-check-that-prevents-scaling-when.patch \
+           file://0001-Implement-downsampling-with-debugs.patch \
+#           file://openvz/0001-arm-introduce-MAP_EXECPRIO-define.patch \
+#           file://openvz/0002-arm-export-arm-version-of-show_mem.patch \
+#           file://openvz/0003-arm-wire-OpenVZ-syscalls.patch \
+#           file://openvz/0004-arm-add-openvz-and-bc-Kconfigs.patch \
+#           file://openvz/openvz-2.6.27.diff \
+           file://sitecomwl168-support.diff \
+           file://nand.patch \
+           file://musb-rxtx.patch \
+           file://add-gwc.diff \
 "
 
 
@@ -48,7 +48,7 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
 			     "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;patch=1 \
+	file://evm-mcspi-ts.diff \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-omap_2.6.28.bb b/recipes/linux/linux-omap_2.6.28.bb
index 6475f49ad5..622a38d5a8 100644
--- a/recipes/linux/linux-omap_2.6.28.bb
+++ b/recipes/linux/linux-omap_2.6.28.bb
@@ -15,56 +15,56 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.g
 	   file://defconfig"
 
 SRC_URI_append = " \
-           file://no-empty-flash-warnings.patch;patch=1 \
-           file://no-cortex-deadlock.patch;patch=1 \
-           file://read_die_ids.patch;patch=1 \
-           file://fix-install.patch;patch=1 \
-           file://musb-support-high-bandwidth.patch.eml;patch=1 \
-           file://mru-fix-timings.diff;patch=1 \
-           file://mru-fix-display-panning.diff;patch=1 \
-           file://mru-improve-pixclock-config.diff;patch=1 \
-           file://mru-make-video-timings-selectable.diff;patch=1 \
-           file://mru-enable-overlay-optimalization.diff;patch=1 \
-           file://dvb-fix-dma.diff;patch=1 \
-           file://0001-Removed-resolution-check-that-prevents-scaling-when.patch;patch=1 \
-           file://0001-Implement-downsampling-with-debugs.patch;patch=1 \
-           file://twl-asoc-fix-record.diff;patch=1 \
-           file://tick-schedc-suppress-needless-timer-reprogramming.patch;patch=1 \
-           file://0001-DSS-New-display-subsystem-driver-for-OMAP2-3.patch;patch=1 \
-           file://0002-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch;patch=1 \
-           file://0003-DSS-Add-generic-DVI-panel.patch;patch=1 \
-           file://0004-DSS-support-for-Beagle-Board.patch;patch=1 \
-           file://0005-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch;patch=1 \
-           file://0006-DSS-Support-for-OMAP3-SDP-board.patch;patch=1 \
-           file://0007-DSS-Support-for-OMAP3-EVM-board.patch;patch=1 \
-           file://0008-DSS-Hacked-N810-support.patch;patch=1 \
-           file://0009-DSS-OMAPFB-allocate-fbmem-only-for-fb0-or-if-spes.patch;patch=1 \
-           file://0010-DSS-OMAPFB-remove-extra-omapfb_setup_overlay-call.patch;patch=1 \
-           file://0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch;patch=1 \
-           file://0012-DSS-Add-comments-to-FAKE_VSYNC-to-make-things-more.patch;patch=1 \
-           file://0013-DSS-OMAPFB-remove-extra-spaces.patch;patch=1 \
-           file://0014-DSS-fix-clk_get_usecount.patch;patch=1 \
-           file://0001-ASoC-Add-support-for-OMAP3-EVM.patch;patch=1 \
-           file://0001-board-omap3beagle-set-i2c-3-to-100kHz.patch;patch=1 \
-           file://add-resizer-driver.patch;patch=1 \
-           file://usbttyfix.patch;patch=1 \
-           file://ioremap-fix.patch;patch=1 \
-           file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \
-           file://mmctiming.patch;patch=1 \
-           file://modedb-hd720.patch;patch=1 \
+           file://no-empty-flash-warnings.patch \
+           file://no-cortex-deadlock.patch \
+           file://read_die_ids.patch \
+           file://fix-install.patch \
+           file://musb-support-high-bandwidth.patch.eml;apply=yes \
+           file://mru-fix-timings.diff \
+           file://mru-fix-display-panning.diff \
+           file://mru-improve-pixclock-config.diff \
+           file://mru-make-video-timings-selectable.diff \
+           file://mru-enable-overlay-optimalization.diff \
+           file://dvb-fix-dma.diff \
+           file://0001-Removed-resolution-check-that-prevents-scaling-when.patch \
+           file://0001-Implement-downsampling-with-debugs.patch \
+           file://twl-asoc-fix-record.diff \
+           file://tick-schedc-suppress-needless-timer-reprogramming.patch \
+           file://0001-DSS-New-display-subsystem-driver-for-OMAP2-3.patch \
+           file://0002-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch \
+           file://0003-DSS-Add-generic-DVI-panel.patch \
+           file://0004-DSS-support-for-Beagle-Board.patch \
+           file://0005-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch \
+           file://0006-DSS-Support-for-OMAP3-SDP-board.patch \
+           file://0007-DSS-Support-for-OMAP3-EVM-board.patch \
+           file://0008-DSS-Hacked-N810-support.patch \
+           file://0009-DSS-OMAPFB-allocate-fbmem-only-for-fb0-or-if-spes.patch \
+           file://0010-DSS-OMAPFB-remove-extra-omapfb_setup_overlay-call.patch \
+           file://0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch \
+           file://0012-DSS-Add-comments-to-FAKE_VSYNC-to-make-things-more.patch \
+           file://0013-DSS-OMAPFB-remove-extra-spaces.patch \
+           file://0014-DSS-fix-clk_get_usecount.patch \
+           file://0001-ASoC-Add-support-for-OMAP3-EVM.patch \
+           file://0001-board-omap3beagle-set-i2c-3-to-100kHz.patch \
+           file://add-resizer-driver.patch \
+           file://usbttyfix.patch \
+           file://ioremap-fix.patch \
+           file://0124-leds-gpio-broken-with-current-git.patch \
+           file://mmctiming.patch \
+           file://modedb-hd720.patch \
 "
 
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
-           file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch;patch=1 \
+           file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch \
 			     "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;patch=1 \
+	file://evm-mcspi-ts.diff \
 "
 
 SRC_URI_append_overo = " \
-	file://overo-ehci.patch;patch=1 \
+	file://overo-ehci.patch \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb
index 1396be33c5..a87fb25f74 100644
--- a/recipes/linux/linux-omap_2.6.29.bb
+++ b/recipes/linux/linux-omap_2.6.29.bb
@@ -21,203 +21,203 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.g
 	   file://defconfig"
 
 SRC_URI_append = " \
-           file://no-empty-flash-warnings.patch;patch=1 \
-           file://no-cortex-deadlock.patch;patch=1 \
-           file://read_die_ids.patch;patch=1 \
-           file://fix-install.patch;patch=1 \
-           file://dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch;patch=1 \
-           file://dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch;patch=1 \
-           file://dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch;patch=1 \
-           file://dss2/0004-DSS2-OMAP-framebuffer-driver.patch;patch=1 \
-           file://dss2/0005-DSS2-Add-panel-drivers.patch;patch=1 \
-           file://dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch;patch=1 \
-           file://dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch;patch=1 \
-           file://dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch;patch=1 \
-           file://dss2/0009-DSS2-Add-acx565akm-panel.patch;patch=1 \
-           file://dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch;patch=1 \
-           file://dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch;patch=1 \
-           file://dss2/0012-DSS2-Fix-DMA-rotation.patch;patch=1 \
-           file://dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch;patch=1 \
-           file://dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch;patch=1 \
-           file://dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch;patch=1 \
-           file://dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch;patch=1 \
-           file://dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch;patch=1 \
-           file://dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch;patch=1 \
-           file://dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch;patch=1 \
-           file://dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch;patch=1 \
-           file://dss2/0021-DSS2-Add-venc-register-dump.patch;patch=1 \
-           file://dss2/0022-DSS2-FB-remove-unused-var-warning.patch;patch=1 \
-           file://dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch;patch=1 \
-           file://dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch;patch=1 \
-           file://dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch;patch=1 \
-           file://dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch;patch=1 \
-           file://dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch;patch=1 \
-           file://dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch;patch=1 \
-           file://dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch;patch=1 \
-           file://dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch;patch=1 \
-           file://dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch;patch=1 \
-           file://dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch;patch=1 \
-           file://dss2/0033-DSS2-Prefer-3-tap-filter.patch;patch=1 \
-           file://dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch;patch=1 \
-           file://dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch;patch=1 \
-           file://dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch;patch=1 \
-           file://dss2/0037-DSS2-Added-support-for-querying-color-keying.patch;patch=1 \
-           file://dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch;patch=1 \
-           file://dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch;patch=1 \
-           file://dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch;patch=1 \
-           file://dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch;patch=1 \
-           file://dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch;patch=1 \
-           file://dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch;patch=1 \
-           file://dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch;patch=1 \
-           file://dss2/0045-DSS2-Fixed-line-endings-from-to.patch;patch=1 \
-           file://dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch;patch=1 \
-           file://dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch;patch=1 \
-           file://dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch;patch=1 \
-           file://dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch;patch=1 \
-           file://dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch;patch=1 \
-           file://dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch;patch=1 \
-           file://dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch;patch=1 \
-           file://dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch;patch=1 \
-           file://dss2/0054-DSS2-DSI-more-error-handling.patch;patch=1 \
-           file://dss2/0055-DSS2-Added-global-alpha-support.patch;patch=1 \
-           file://dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch;patch=1 \
-           file://dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch;patch=1 \
-           file://dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch;patch=1 \
-           file://dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch;patch=1 \
-           file://dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch;patch=1 \
-           file://dss2/0061-DSS2-VRFB-save-restore-context.patch;patch=1 \
-           file://dss2/0062-DSS2-VRAM-Fix-indentation.patch;patch=1 \
-           file://dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch;patch=1 \
-           file://dss2/0064-VRFB-fix-debug-messages.patch;patch=1 \
-           file://dss2/0065-VRFB-add-suspend-resume-functionality.patch;patch=1 \
-           file://dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch;patch=1 \
-           file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch;patch=1 \
-           file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch;patch=1 \
-           file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch;patch=1 \
-           file://dss2/0070-DSS2-fix-irq1.diff;patch=1 \
-           file://dss2/0071-DSS2-fix-irq2.diff;patch=1 \
-           file://0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch;patch=1 \
-           file://fix-unaligned-access.diff;patch=1 \
-           file://make-alignment-visible.diff;patch=1 \
-           file://mmctiming.patch;patch=1 \
-           file://ehci.patch;patch=1 \
-           file://fix-audio-capture.patch;patch=1 \
-           file://ads7846-detection.patch;patch=1 \
-           file://musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch;patch=1 \
-           file://musb/0002-USB-composite-avoid-inconsistent-lock-state.patch;patch=1 \
-           file://musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch;patch=1 \
-           file://musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch;patch=1 \
-           file://musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch;patch=1 \
-           file://musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch;patch=1 \
-           file://musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch;patch=1 \
-           file://musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch;patch=1 \
-           file://musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch;patch=1 \
-           file://musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch;patch=1 \
-           file://musb/0011-musb-fix-isochronous-TXDMA-take-2.patch;patch=1 \
-           file://musb/0012-musb-fix-possible-panic-while-resuming.patch;patch=1 \
-           file://musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch;patch=1 \
-           file://musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch;patch=1 \
-           file://musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch;patch=1 \
-           file://musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch;patch=1 \
-           file://musb/0017-musb_host-refactor-URB-giveback.patch;patch=1 \
-           file://musb/0018-musb-split-out-CPPI-interrupt-handler.patch;patch=1 \
-           file://musb/0019-musb_host-simplify-check-for-active-URB.patch;patch=1 \
-           file://musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch;patch=1 \
-           file://musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch;patch=1 \
-           file://musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch;patch=1 \
-           file://musb/0023-musb-add-high-bandwidth-ISO-support.patch;patch=1 \
-           file://musb/0024-USB-otg-adding-nop-usb-transceiver.patch;patch=1 \
-           file://musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch;patch=1 \
-           file://musb/0026-musb-proper-hookup-to-transceiver-drivers.patch;patch=1 \
-           file://musb/0027-musb-otg-timer-cleanup.patch;patch=1 \
-           file://musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch;patch=1 \
-           file://musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch;patch=1 \
-           file://musb/0030-musb-fifo.patch;patch=1 \
-           file://isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch;patch=1 \
-           file://isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch;patch=1 \
-           file://isp/v4l/0003-V4L-Int-if-Dummy-slave.patch;patch=1 \
-           file://isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch;patch=1 \
-           file://isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch;patch=1 \
-           file://isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch;patch=1 \
-           file://isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch;patch=1 \
-           file://isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch;patch=1 \
-           file://isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch;patch=1 \
-           file://isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch;patch=1 \
-           file://isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch;patch=1 \
-           file://isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch;patch=1 \
-           file://isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch;patch=1 \
-           file://isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch;patch=1 \
-           file://isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch;patch=1 \
-           file://isp/omap3camera/0003-omap3isp-Add-userspace-header.patch;patch=1 \
-           file://isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch;patch=1 \
-           file://isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch;patch=1 \
-           file://isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch;patch=1 \
-           file://isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch;patch=1 \
-           file://isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch;patch=1 \
-           file://isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch;patch=1 \
-           file://isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch;patch=1 \
-           file://isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch;patch=1 \
-           file://isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch;patch=1 \
-           file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \
-           file://modedb-hd720.patch;patch=1 \
-           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
-           file://vfp/02-vfp-ptrace.patch;patch=1 \
-           file://vfp/03-vfp-corruption.patch;patch=1 \
-           file://vfp/04-vfp-threads.patch;patch=1 \
-           file://vfp/05-vfp-signal-handlers.patch;patch=1 \
-           file://arch-has-holes.diff;patch=1 \
-           file://cache/l1cache-shift.patch;patch=1 \
-           file://cache/copy-page-tweak.patch;patch=1 \
-           file://2.6.29_relocation_1.patch;patch=1 \
-           file://2.6.29_relocation_2.patch;patch=1 \
-           file://smsc/smsc911x-1.patch;patch=1 \
-           file://smsc/smsc911x-2.patch;patch=1 \
-           file://smsc/smsc911x-3.patch;patch=1 \
-           file://smsc/smsc911x-4.patch;patch=1 \
+           file://no-empty-flash-warnings.patch \
+           file://no-cortex-deadlock.patch \
+           file://read_die_ids.patch \
+           file://fix-install.patch \
+           file://dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch \
+           file://dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch \
+           file://dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch \
+           file://dss2/0004-DSS2-OMAP-framebuffer-driver.patch \
+           file://dss2/0005-DSS2-Add-panel-drivers.patch \
+           file://dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch \
+           file://dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch \
+           file://dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch \
+           file://dss2/0009-DSS2-Add-acx565akm-panel.patch \
+           file://dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch \
+           file://dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch \
+           file://dss2/0012-DSS2-Fix-DMA-rotation.patch \
+           file://dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch \
+           file://dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch \
+           file://dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch \
+           file://dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch \
+           file://dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch \
+           file://dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch \
+           file://dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch \
+           file://dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch \
+           file://dss2/0021-DSS2-Add-venc-register-dump.patch \
+           file://dss2/0022-DSS2-FB-remove-unused-var-warning.patch \
+           file://dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch \
+           file://dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch \
+           file://dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch \
+           file://dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch \
+           file://dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch \
+           file://dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch \
+           file://dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch \
+           file://dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch \
+           file://dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch \
+           file://dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch \
+           file://dss2/0033-DSS2-Prefer-3-tap-filter.patch \
+           file://dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch \
+           file://dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch \
+           file://dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch \
+           file://dss2/0037-DSS2-Added-support-for-querying-color-keying.patch \
+           file://dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch \
+           file://dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch \
+           file://dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch \
+           file://dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch \
+           file://dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch \
+           file://dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch \
+           file://dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch \
+           file://dss2/0045-DSS2-Fixed-line-endings-from-to.patch \
+           file://dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch \
+           file://dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch \
+           file://dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch \
+           file://dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch \
+           file://dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch \
+           file://dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch \
+           file://dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch \
+           file://dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch \
+           file://dss2/0054-DSS2-DSI-more-error-handling.patch \
+           file://dss2/0055-DSS2-Added-global-alpha-support.patch \
+           file://dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch \
+           file://dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch \
+           file://dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch \
+           file://dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch \
+           file://dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch \
+           file://dss2/0061-DSS2-VRFB-save-restore-context.patch \
+           file://dss2/0062-DSS2-VRAM-Fix-indentation.patch \
+           file://dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch \
+           file://dss2/0064-VRFB-fix-debug-messages.patch \
+           file://dss2/0065-VRFB-add-suspend-resume-functionality.patch \
+           file://dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch \
+           file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch \
+           file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch \
+           file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch \
+           file://dss2/0070-DSS2-fix-irq1.diff \
+           file://dss2/0071-DSS2-fix-irq2.diff \
+           file://0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch \
+           file://fix-unaligned-access.diff \
+           file://make-alignment-visible.diff \
+           file://mmctiming.patch \
+           file://ehci.patch \
+           file://fix-audio-capture.patch \
+           file://ads7846-detection.patch \
+           file://musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch \
+           file://musb/0002-USB-composite-avoid-inconsistent-lock-state.patch \
+           file://musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch \
+           file://musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch \
+           file://musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch \
+           file://musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch \
+           file://musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch \
+           file://musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch \
+           file://musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch \
+           file://musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch \
+           file://musb/0011-musb-fix-isochronous-TXDMA-take-2.patch \
+           file://musb/0012-musb-fix-possible-panic-while-resuming.patch \
+           file://musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch \
+           file://musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch \
+           file://musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch \
+           file://musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch \
+           file://musb/0017-musb_host-refactor-URB-giveback.patch \
+           file://musb/0018-musb-split-out-CPPI-interrupt-handler.patch \
+           file://musb/0019-musb_host-simplify-check-for-active-URB.patch \
+           file://musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch \
+           file://musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch \
+           file://musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch \
+           file://musb/0023-musb-add-high-bandwidth-ISO-support.patch \
+           file://musb/0024-USB-otg-adding-nop-usb-transceiver.patch \
+           file://musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch \
+           file://musb/0026-musb-proper-hookup-to-transceiver-drivers.patch \
+           file://musb/0027-musb-otg-timer-cleanup.patch \
+           file://musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch \
+           file://musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch \
+           file://musb/0030-musb-fifo.patch \
+           file://isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch \
+           file://isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch \
+           file://isp/v4l/0003-V4L-Int-if-Dummy-slave.patch \
+           file://isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch \
+           file://isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch \
+           file://isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch \
+           file://isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch \
+           file://isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch \
+           file://isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch \
+           file://isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch \
+           file://isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch \
+           file://isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch \
+           file://isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch \
+           file://isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch \
+           file://isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch \
+           file://isp/omap3camera/0003-omap3isp-Add-userspace-header.patch \
+           file://isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch \
+           file://isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch \
+           file://isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch \
+           file://isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch \
+           file://isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch \
+           file://isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch \
+           file://isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch \
+           file://isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch \
+           file://isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch \
+           file://0124-leds-gpio-broken-with-current-git.patch \
+           file://modedb-hd720.patch \
+           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch \
+           file://vfp/02-vfp-ptrace.patch \
+           file://vfp/03-vfp-corruption.patch \
+           file://vfp/04-vfp-threads.patch \
+           file://vfp/05-vfp-signal-handlers.patch \
+           file://arch-has-holes.diff \
+           file://cache/l1cache-shift.patch \
+           file://cache/copy-page-tweak.patch \
+           file://2.6.29_relocation_1.patch \
+           file://2.6.29_relocation_2.patch \
+           file://smsc/smsc911x-1.patch \
+           file://smsc/smsc911x-2.patch \
+           file://smsc/smsc911x-3.patch \
+           file://smsc/smsc911x-4.patch \
 "
 
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
-			                   file://beagle-asoc.patch;patch=1 \
-                               file://tincantools-puppy.diff;patch=1 \
-                               file://tincantools-zippy.diff;patch=1 \
-			       file://beaglebug/beaglebug-full.patch;patch=1 \
+			                   file://beagle-asoc.patch \
+                               file://tincantools-puppy.diff \
+                               file://tincantools-zippy.diff \
+			       file://beaglebug/beaglebug-full.patch \
 "
 
 SRC_URI_append_omap3-touchbook = " file://logo_linux_clut224.ppm \
-			                   file://../beagleboard/beagle-asoc.patch;patch=1 \
-           file://accelerometer-mma7455l.patch;patch=1 \
-           file://accelerometer-touchscreen-mux-spi.patch;patch=1 \
-           file://touchscreen-ads7846-export-settings.patch;patch=1 \
-           file://touchscreen-ads7846-rotation-support.patch;patch=1 \
-           file://dspbridge.patch;patch=1 \
-           file://battery2-bq27200-no-error-message.patch;patch=1 \
-           file://sound-headphone-detection.patch;patch=1 \
-           file://dss2-fix-XY-coordinates-when-rotating.patch;patch=1 \
-           file://battery1-tps65950-charging-management-1.patch;patch=1 \
-           file://dss2-fix-scaling-when-rotating.patch;patch=1 \
-           file://dss2-export-status.patch;patch=1 \
-           file://usb-otg-pc-connection.patch;patch=1 \
-           file://battery1-tps65950-charging-management-2.patch;patch=1 \
-           file://memory-move-malloc-end.patch;patch=1 \
-           file://aufs-1.patch;patch=1 \
-           file://aufs-2.patch;patch=1 \
-           file://aufs-3.patch;patch=1 \
-           file://aufs-squashfs-mount-to-avoid-initramfs.patch;patch=1 \
-           file://screen-backlight-accessible-by-user.patch;patch=1 \
-           file://dss2-blank-rotate-accessible-by-user.patch;patch=1 \
-           file://boot-no-power-message.patch;patch=1 \
-           file://usb-lower-current-consumption-upon-insertion.patch;patch=1 \
-           file://battery2-bq27200-gpio-charged.patch;patch=1 \
-           file://keyboard-special-keys.patch;patch=1 \
-           file://dss2-fix-rotation-offsets.patch;patch=1 \
-           file://touchbook-config.patch;patch=1 \
+			                   file://../beagleboard/beagle-asoc.patch \
+           file://accelerometer-mma7455l.patch \
+           file://accelerometer-touchscreen-mux-spi.patch \
+           file://touchscreen-ads7846-export-settings.patch \
+           file://touchscreen-ads7846-rotation-support.patch \
+           file://dspbridge.patch \
+           file://battery2-bq27200-no-error-message.patch \
+           file://sound-headphone-detection.patch \
+           file://dss2-fix-XY-coordinates-when-rotating.patch \
+           file://battery1-tps65950-charging-management-1.patch \
+           file://dss2-fix-scaling-when-rotating.patch \
+           file://dss2-export-status.patch \
+           file://usb-otg-pc-connection.patch \
+           file://battery1-tps65950-charging-management-2.patch \
+           file://memory-move-malloc-end.patch \
+           file://aufs-1.patch \
+           file://aufs-2.patch \
+           file://aufs-3.patch \
+           file://aufs-squashfs-mount-to-avoid-initramfs.patch \
+           file://screen-backlight-accessible-by-user.patch \
+           file://dss2-blank-rotate-accessible-by-user.patch \
+           file://boot-no-power-message.patch \
+           file://usb-lower-current-consumption-upon-insertion.patch \
+           file://battery2-bq27200-gpio-charged.patch \
+           file://keyboard-special-keys.patch \
+           file://dss2-fix-rotation-offsets.patch \
+           file://touchbook-config.patch \
            file://board-omap3touchbook.c \
-#           file://boot-trace-for-optimization.patch;patch=1 \
+#           file://boot-trace-for-optimization.patch \
 "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;patch=1 \
+	file://evm-mcspi-ts.diff \
 "
 
 
diff --git a/recipes/linux/linux-omap_2.6.31.bb b/recipes/linux/linux-omap_2.6.31.bb
index 8985075984..2fc2add43a 100644
--- a/recipes/linux/linux-omap_2.6.31.bb
+++ b/recipes/linux/linux-omap_2.6.31.bb
@@ -12,54 +12,53 @@ DEFAULT_PREFERENCE_omap5912osk = "1"
 SRCREV = "945044d157dd63c6af0f2ed40a5346382af94eb4"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
-#PV = "2.6.30+2.6.31-rc8+gitr${SRCPV}"
-PE = "1"
+#PV = "2.6.30+2.6.31-rc8+gitr${SRCREV}"
 PV = "2.6.31"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
 
 SRC_URI_append = " \
-                  file://ehci.patch;patch=1 \
-                  file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
-                  file://cache/l1cache-shift.patch;patch=1 \
-                  file://cache/copy-page-tweak.patch;patch=1 \
-                  file://dss2/0001-OMAP2-Add-funcs-for-writing-SMS_ROT_-registers.patch;patch=1 \
-                  file://dss2/0002-OMAP-OMAPFB-split-omapfb.h.patch;patch=1 \
-                  file://dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch;patch=1 \
-                  file://dss2/0004-OMAP-Add-VRAM-manager.patch;patch=1 \
-                  file://dss2/0005-OMAP-Add-support-for-VRFB-rotation-engine.patch;patch=1 \
-                  file://dss2/0006-OMAP-DSS2-Documentation-for-DSS2.patch;patch=1 \
-                  file://dss2/0007-OMAP-DSS2-Display-Subsystem-Driver-core.patch;patch=1 \
-                  file://dss2/0008-OMAP-DSS2-Add-more-core-files.patch;patch=1 \
-                  file://dss2/0009-OMAP-DSS2-DISPC.patch;patch=1 \
-                  file://dss2/0010-OMAP-DSS2-DPI-driver.patch;patch=1 \
-                  file://dss2/0011-OMAP-DSS2-Video-encoder-driver.patch;patch=1 \
-                  file://dss2/0012-OMAP-DSS2-RFBI-driver.patch;patch=1 \
-                  file://dss2/0013-OMAP-DSS2-SDI-driver.patch;patch=1 \
-                  file://dss2/0014-OMAP-DSS2-DSI-driver.patch;patch=1 \
-                  file://dss2/0015-OMAP-DSS2-omapfb-driver.patch;patch=1 \
-                  file://dss2/0016-OMAP-DSS2-Add-DPI-panel-drivers.patch;patch=1 \
-                  file://dss2/0017-OMAP-DSS2-Taal-DSI-command-mode-panel-driver.patch;patch=1 \
-                  file://dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch;patch=1 \
-                  file://dss2/0002-V4L2-Added-New-V4L2-CIDs-for-omap-devices-V4L2-IOCT.patch;patch=1 \
-                  file://dss2/0003-V4L2-Updated-v4l2_common-for-new-V4L2-CIDs.patch;patch=1 \
-                  file://dss2/0004-OMAP2-3-V4L2-Add-support-for-OMAP2-3-V4L2-driver-on.patch;patch=1 \
-                  file://expansion-boards/tincantools-zippy.patch;patch=1 \
-                  file://madc/madc-driver.patch;patch=1 \
-                  file://madc/madc.patch;patch=1 \
-                  file://arch-has-holes.diff;patch=1 \
-                  file://usb/0001-musb-fix-put_device-call-sequence.patch;patch=1 \
-                  file://usb/0008-omap3-Add-CHIP_GE_OMAP3430ES3-for-HSUSB.patch;patch=1 \
-                  file://usb/0011-musb-fix-musb-gadget_driver-NULL-bug.patch;patch=1 \
-                  file://usb/0012-musb-Add-back-old-musb-procfs-file.patch;patch=1 \
-                  file://usb/0013-musb-Remove-USB_SUSPEND-auto-select-with-OTG.patch;patch=1 \
-                  file://usb/0014-musb-disable-PING-on-status-phase-of-control-transf.patch;patch=1 \
-                  file://usb/0015-musb-Add-context-save-and-restore-support.patch;patch=1 \
-                  file://usb/0016-usb-update-defconfig.patch;patch=1 \
-                  file://usb/0001-ARM-OMAP-Fix-beagleboard-EHCI-setup.patch;patch=1 \
-                  file://modedb-hd720.patch;patch=1 \
-                  file://dss2/beagle-dss2-support.patch;patch=1 \
+                  file://ehci.patch \
+                  file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch \
+                  file://cache/l1cache-shift.patch \
+                  file://cache/copy-page-tweak.patch \
+                  file://dss2/0001-OMAP2-Add-funcs-for-writing-SMS_ROT_-registers.patch \
+                  file://dss2/0002-OMAP-OMAPFB-split-omapfb.h.patch \
+                  file://dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch \
+                  file://dss2/0004-OMAP-Add-VRAM-manager.patch \
+                  file://dss2/0005-OMAP-Add-support-for-VRFB-rotation-engine.patch \
+                  file://dss2/0006-OMAP-DSS2-Documentation-for-DSS2.patch \
+                  file://dss2/0007-OMAP-DSS2-Display-Subsystem-Driver-core.patch \
+                  file://dss2/0008-OMAP-DSS2-Add-more-core-files.patch \
+                  file://dss2/0009-OMAP-DSS2-DISPC.patch \
+                  file://dss2/0010-OMAP-DSS2-DPI-driver.patch \
+                  file://dss2/0011-OMAP-DSS2-Video-encoder-driver.patch \
+                  file://dss2/0012-OMAP-DSS2-RFBI-driver.patch \
+                  file://dss2/0013-OMAP-DSS2-SDI-driver.patch \
+                  file://dss2/0014-OMAP-DSS2-DSI-driver.patch \
+                  file://dss2/0015-OMAP-DSS2-omapfb-driver.patch \
+                  file://dss2/0016-OMAP-DSS2-Add-DPI-panel-drivers.patch \
+                  file://dss2/0017-OMAP-DSS2-Taal-DSI-command-mode-panel-driver.patch \
+                  file://dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch \
+                  file://dss2/0002-V4L2-Added-New-V4L2-CIDs-for-omap-devices-V4L2-IOCT.patch \
+                  file://dss2/0003-V4L2-Updated-v4l2_common-for-new-V4L2-CIDs.patch \
+                  file://dss2/0004-OMAP2-3-V4L2-Add-support-for-OMAP2-3-V4L2-driver-on.patch \
+                  file://expansion-boards/tincantools-zippy.patch \
+                  file://madc/madc-driver.patch \
+                  file://madc/madc.patch \
+                  file://arch-has-holes.diff \
+                  file://usb/0001-musb-fix-put_device-call-sequence.patch \
+                  file://usb/0008-omap3-Add-CHIP_GE_OMAP3430ES3-for-HSUSB.patch \
+                  file://usb/0011-musb-fix-musb-gadget_driver-NULL-bug.patch \
+                  file://usb/0012-musb-Add-back-old-musb-procfs-file.patch \
+                  file://usb/0013-musb-Remove-USB_SUSPEND-auto-select-with-OTG.patch \
+                  file://usb/0014-musb-disable-PING-on-status-phase-of-control-transf.patch \
+                  file://usb/0015-musb-Add-context-save-and-restore-support.patch \
+                  file://usb/0016-usb-update-defconfig.patch \
+                  file://usb/0001-ARM-OMAP-Fix-beagleboard-EHCI-setup.patch \
+                  file://modedb-hd720.patch \
+                  file://dss2/beagle-dss2-support.patch \
 "
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
diff --git a/recipes/linux/linux-omap_2.6.32.bb b/recipes/linux/linux-omap_2.6.32.bb
index b0203d8068..348ec96fcb 100644
--- a/recipes/linux/linux-omap_2.6.32.bb
+++ b/recipes/linux/linux-omap_2.6.32.bb
@@ -17,31 +17,31 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.g
 	   file://defconfig"
 
 SRC_URI_append = " \
-file://usb/ehci.patch;patch=1 \
-file://usb/ehci-omap.c-mach-to-plat.diff;patch=1 \
-file://cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch;patch=1 \
-file://cm-t35/0001-OMAP-DSS2-add-Toppoly-TDO35S-panel.patch;patch=1 \
-file://cm-t35/0002-omap3-cm-t35-add-DSS2-display-support.patch;patch=1 \
-file://cm-t35/0003-omap3-cm-t35-update-defconfig-for-DSS2.patch;patch=1 \
-file://cm-t35/0004-omap3-cm-t35-add-cm-t35-mux-configs.patch;patch=1 \
-file://cm-t35/0006-omap3-cm-t35-update-defconfig.patch;patch=1 \
-file://cm-t35/0001-backlight-tdo24m-ensure-chip-select-changes-between-.patch;patch=1 \
-file://0001-ARM-OMAP-Overo-Add-support-for-second-ethernet-po.patch;patch=1 \
-file://0003-drivers-net-smsc911x-return-ENODEV-if-device-is-n.patch;patch=1 \
-file://0004-drivers-input-touchscreen-ads7846-return-ENODEV.patch;patch=1 \
-file://0005-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board.patch;patch=1 \
-file://0006-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch;patch=1 \
-file://0007-ASoC-enable-audio-capture-by-default-for-twl4030.patch;patch=1 \
-file://0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch;patch=1 \
-file://madc/0009-drivers-mfd-add-twl4030-madc-driver.patch;patch=1 \
-file://madc/0010-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch;patch=1 \
-file://madc/0011-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch;patch=1 \
-file://madc/0013-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch;patch=1 \
-file://dss2/0012-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-pane.patch;patch=1 \
-file://dss2/0014-OMAP-DSS-Add-DSS2-support-for-Overo.patch;patch=1 \
-file://dss2/0015-OMAP-DSS-Add-DSS2-support-for-Beagle.patch;patch=1 \
-file://dss2/0016-video-add-timings-for-hd720.patch;patch=1 \
-file://holes.patch;patch=1 \
+file://usb/ehci.patch \
+file://usb/ehci-omap.c-mach-to-plat.diff \
+file://cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch \
+file://cm-t35/0001-OMAP-DSS2-add-Toppoly-TDO35S-panel.patch \
+file://cm-t35/0002-omap3-cm-t35-add-DSS2-display-support.patch \
+file://cm-t35/0003-omap3-cm-t35-update-defconfig-for-DSS2.patch \
+file://cm-t35/0004-omap3-cm-t35-add-cm-t35-mux-configs.patch \
+file://cm-t35/0006-omap3-cm-t35-update-defconfig.patch \
+file://cm-t35/0001-backlight-tdo24m-ensure-chip-select-changes-between-.patch \
+file://0001-ARM-OMAP-Overo-Add-support-for-second-ethernet-po.patch \
+file://0003-drivers-net-smsc911x-return-ENODEV-if-device-is-n.patch \
+file://0004-drivers-input-touchscreen-ads7846-return-ENODEV.patch \
+file://0005-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board.patch \
+file://0006-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch \
+file://0007-ASoC-enable-audio-capture-by-default-for-twl4030.patch \
+file://0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch \
+file://madc/0009-drivers-mfd-add-twl4030-madc-driver.patch \
+file://madc/0010-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch \
+file://madc/0011-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch \
+file://madc/0013-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch \
+file://dss2/0012-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-pane.patch \
+file://dss2/0014-OMAP-DSS-Add-DSS2-support-for-Overo.patch \
+file://dss2/0015-OMAP-DSS-Add-DSS2-support-for-Beagle.patch \
+file://dss2/0016-video-add-timings-for-hd720.patch \
+file://holes.patch \
 "
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
diff --git a/recipes/linux/linux-omap_git.bb b/recipes/linux/linux-omap_git.bb
index 7ae5e0b4bf..e74e8cf754 100644
--- a/recipes/linux/linux-omap_git.bb
+++ b/recipes/linux/linux-omap_git.bb
@@ -12,55 +12,55 @@ SRCREV = "945044d157dd63c6af0f2ed40a5346382af94eb4"
 FILESPATHPKG_prepend = "linux-omap-2.6.31:"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
-#PV = "2.6.30+2.6.31-rc8+gitr${SRCPV}"
+#PV = "2.6.30+2.6.31-rc8+gitr${SRCREV}"
 PV = "2.6.31"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
 
 SRC_URI_append = " \
-                  file://ehci.patch;patch=1 \
-                  file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
-                  file://cache/l1cache-shift.patch;patch=1 \
-                  file://cache/copy-page-tweak.patch;patch=1 \
-                  file://dss2/0001-OMAP2-Add-funcs-for-writing-SMS_ROT_-registers.patch;patch=1 \
-                  file://dss2/0002-OMAP-OMAPFB-split-omapfb.h.patch;patch=1 \
-                  file://dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch;patch=1 \
-                  file://dss2/0004-OMAP-Add-VRAM-manager.patch;patch=1 \
-                  file://dss2/0005-OMAP-Add-support-for-VRFB-rotation-engine.patch;patch=1 \
-                  file://dss2/0006-OMAP-DSS2-Documentation-for-DSS2.patch;patch=1 \
-                  file://dss2/0007-OMAP-DSS2-Display-Subsystem-Driver-core.patch;patch=1 \
-                  file://dss2/0008-OMAP-DSS2-Add-more-core-files.patch;patch=1 \
-                  file://dss2/0009-OMAP-DSS2-DISPC.patch;patch=1 \
-                  file://dss2/0010-OMAP-DSS2-DPI-driver.patch;patch=1 \
-                  file://dss2/0011-OMAP-DSS2-Video-encoder-driver.patch;patch=1 \
-                  file://dss2/0012-OMAP-DSS2-RFBI-driver.patch;patch=1 \
-                  file://dss2/0013-OMAP-DSS2-SDI-driver.patch;patch=1 \
-                  file://dss2/0014-OMAP-DSS2-DSI-driver.patch;patch=1 \
-                  file://dss2/0015-OMAP-DSS2-omapfb-driver.patch;patch=1 \
-                  file://dss2/0016-OMAP-DSS2-Add-DPI-panel-drivers.patch;patch=1 \
-                  file://dss2/0017-OMAP-DSS2-Taal-DSI-command-mode-panel-driver.patch;patch=1 \
-                  file://dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch;patch=1 \
-                  file://dss2/0002-V4L2-Added-New-V4L2-CIDs-for-omap-devices-V4L2-IOCT.patch;patch=1 \
-                  file://dss2/0003-V4L2-Updated-v4l2_common-for-new-V4L2-CIDs.patch;patch=1 \
-                  file://dss2/0004-OMAP2-3-V4L2-Add-support-for-OMAP2-3-V4L2-driver-on.patch;patch=1 \
-                  file://expansion-boards/tincantools-zippy.patch;patch=1 \
-                  file://madc/madc-driver.patch;patch=1 \
-                  file://madc/madc.patch;patch=1 \
-                  file://arch-has-holes.diff;patch=1 \
-                  file://usb/0001-musb-fix-put_device-call-sequence.patch;patch=1 \
-                  file://usb/0008-omap3-Add-CHIP_GE_OMAP3430ES3-for-HSUSB.patch;patch=1 \
-                  file://usb/0011-musb-fix-musb-gadget_driver-NULL-bug.patch;patch=1 \
-                  file://usb/0012-musb-Add-back-old-musb-procfs-file.patch;patch=1 \
-                  file://usb/0013-musb-Remove-USB_SUSPEND-auto-select-with-OTG.patch;patch=1 \
-                  file://usb/0014-musb-disable-PING-on-status-phase-of-control-transf.patch;patch=1 \
-                  file://usb/0015-musb-Add-context-save-and-restore-support.patch;patch=1 \
-                  file://usb/0016-usb-update-defconfig.patch;patch=1 \
-                  file://usb/0001-ARM-OMAP-Fix-beagleboard-EHCI-setup.patch;patch=1 \
-                  file://modedb-hd720.patch;patch=1 \
-                  file://dss2/beagle-dss2-support.patch;patch=1 \
-                  file://fix-serial.eml;patch=1 \
-                  file://fix-omap4.diff;patch=1 \
+                  file://ehci.patch \
+                  file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch \
+                  file://cache/l1cache-shift.patch \
+                  file://cache/copy-page-tweak.patch \
+                  file://dss2/0001-OMAP2-Add-funcs-for-writing-SMS_ROT_-registers.patch \
+                  file://dss2/0002-OMAP-OMAPFB-split-omapfb.h.patch \
+                  file://dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch \
+                  file://dss2/0004-OMAP-Add-VRAM-manager.patch \
+                  file://dss2/0005-OMAP-Add-support-for-VRFB-rotation-engine.patch \
+                  file://dss2/0006-OMAP-DSS2-Documentation-for-DSS2.patch \
+                  file://dss2/0007-OMAP-DSS2-Display-Subsystem-Driver-core.patch \
+                  file://dss2/0008-OMAP-DSS2-Add-more-core-files.patch \
+                  file://dss2/0009-OMAP-DSS2-DISPC.patch \
+                  file://dss2/0010-OMAP-DSS2-DPI-driver.patch \
+                  file://dss2/0011-OMAP-DSS2-Video-encoder-driver.patch \
+                  file://dss2/0012-OMAP-DSS2-RFBI-driver.patch \
+                  file://dss2/0013-OMAP-DSS2-SDI-driver.patch \
+                  file://dss2/0014-OMAP-DSS2-DSI-driver.patch \
+                  file://dss2/0015-OMAP-DSS2-omapfb-driver.patch \
+                  file://dss2/0016-OMAP-DSS2-Add-DPI-panel-drivers.patch \
+                  file://dss2/0017-OMAP-DSS2-Taal-DSI-command-mode-panel-driver.patch \
+                  file://dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch \
+                  file://dss2/0002-V4L2-Added-New-V4L2-CIDs-for-omap-devices-V4L2-IOCT.patch \
+                  file://dss2/0003-V4L2-Updated-v4l2_common-for-new-V4L2-CIDs.patch \
+                  file://dss2/0004-OMAP2-3-V4L2-Add-support-for-OMAP2-3-V4L2-driver-on.patch \
+                  file://expansion-boards/tincantools-zippy.patch \
+                  file://madc/madc-driver.patch \
+                  file://madc/madc.patch \
+                  file://arch-has-holes.diff \
+                  file://usb/0001-musb-fix-put_device-call-sequence.patch \
+                  file://usb/0008-omap3-Add-CHIP_GE_OMAP3430ES3-for-HSUSB.patch \
+                  file://usb/0011-musb-fix-musb-gadget_driver-NULL-bug.patch \
+                  file://usb/0012-musb-Add-back-old-musb-procfs-file.patch \
+                  file://usb/0013-musb-Remove-USB_SUSPEND-auto-select-with-OTG.patch \
+                  file://usb/0014-musb-disable-PING-on-status-phase-of-control-transf.patch \
+                  file://usb/0015-musb-Add-context-save-and-restore-support.patch \
+                  file://usb/0016-usb-update-defconfig.patch \
+                  file://usb/0001-ARM-OMAP-Fix-beagleboard-EHCI-setup.patch \
+                  file://modedb-hd720.patch \
+                  file://dss2/beagle-dss2-support.patch \
+                  file://fix-serial.eml;apply=yes \
+                  file://fix-omap4.diff \
 "
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
diff --git a/recipes/linux/linux-omapzoom_git.bb b/recipes/linux/linux-omapzoom_git.bb
index ad5d996495..60d4e8e062 100644
--- a/recipes/linux/linux-omapzoom_git.bb
+++ b/recipes/linux/linux-omapzoom_git.bb
@@ -7,9 +7,8 @@ COMPATIBLE_MACHINE = "omapzoom"
 
 SRCREV = "26d16dad66b1d3955d8958938f9de5f2e0fce7fb"
 
-#PV = "2.6.27+2.6.28-rc8+${PR}+gitr${SRCPV}"
-PE = "1"
-PV = "2.6.27.10-${PR}+gitr${SRCPV}"
+#PV = "2.6.27+2.6.28-rc8+${PR}+gitr${SRCREV}"
+PV = "2.6.27.10-${PR}+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "git://git.omapzoom.org/repo/omapkernel.git;protocol=git \
diff --git a/recipes/linux/linux-openmoko-2.6.24_git.bb b/recipes/linux/linux-openmoko-2.6.24_git.bb
index 5ba4aceb14..877c5637e8 100644
--- a/recipes/linux/linux-openmoko-2.6.24_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.24_git.bb
@@ -1,28 +1,25 @@
 require linux.inc
 require linux-openmoko.inc
 
-DESCRIPTION = "The Linux kernel for the Openmoko devices GTA01 (Neo1973) and GTA02 (Neo FreeRunner)"
-
 KERNEL_RELEASE = "2.6.24"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 SRCREV = "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 OEV = "oe5"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
-PE = "1"
 PR = "r1"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
   \
-  file://0001-squashfs-with-lzma.patch;patch=1 \
-  file://0002-squashfs-initrd.patch;patch=1 \
-  file://0003-squashfs-force-O2.patch;patch=1 \
-  file://0004-squashfs-Kconfig.patch;patch=1 \
-  file://0005-squashfs-Makefile.patch;patch=1 \
+  file://0001-squashfs-with-lzma.patch \
+  file://0002-squashfs-initrd.patch \
+  file://0003-squashfs-force-O2.patch \
+  file://0004-squashfs-Kconfig.patch \
+  file://0005-squashfs-Makefile.patch \
   \
-  file://openwrt-ledtrig-netdev.patch;patch=1 \
-  file://gta01-fix-battery-class-name.patch;patch=1 \
+  file://openwrt-ledtrig-netdev.patch \
+  file://gta01-fix-battery-class-name.patch \
   \
   file://defconfig-oe \
 "
diff --git a/recipes/linux/linux-openmoko-2.6.28_git.bb b/recipes/linux/linux-openmoko-2.6.28_git.bb
index d9e33bafcd..ae5b3e5369 100644
--- a/recipes/linux/linux-openmoko-2.6.28_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.28_git.bb
@@ -1,20 +1,17 @@
 require linux.inc
 require linux-openmoko.inc
 
-DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones"
-
 KERNEL_RELEASE = "2.6.28"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 SRCREV = "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
 OEV = "oe2"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
-PE = "1"
 PR = "r0"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
-  file://defconfig-oe.patch \
+  file://defconfig-oe.patch;apply=no \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes/linux/linux-openmoko-shr-devel/0007-Enable-UBI-UBIFS.patch b/recipes/linux/linux-openmoko-2.6.29/0007-Enable-UBI-UBIFS.patch
index dd40bc81fe..dd40bc81fe 100644
--- a/recipes/linux/linux-openmoko-shr-devel/0007-Enable-UBI-UBIFS.patch
+++ b/recipes/linux/linux-openmoko-2.6.29/0007-Enable-UBI-UBIFS.patch
diff --git a/recipes/linux/linux-openmoko-shr-devel/fix-install.patch b/recipes/linux/linux-openmoko-2.6.29/fix-install.patch
index b14ca7d740..b14ca7d740 100644
--- a/recipes/linux/linux-openmoko-shr-devel/fix-install.patch
+++ b/recipes/linux/linux-openmoko-2.6.29/fix-install.patch
diff --git a/recipes/linux/linux-openmoko-shr-devel_git.bb b/recipes/linux/linux-openmoko-2.6.29_git.bb
index ec859328ac..a7140ee70c 100644
--- a/recipes/linux/linux-openmoko-shr-devel_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.29_git.bb
@@ -1,20 +1,18 @@
 require linux.inc
 require linux-openmoko.inc
 
-DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Smartphones"
-
 KERNEL_RELEASE = "2.6.29"
 KERNEL_VERSION = "2.6.29-rc3"
 
-SRCREV = "a15608f241a40b41fed5bffe511355c2067c4e88"
+SRCREV = "973a41fce60e5f6edfcf0eaf94056a57eee65e16"
 OMV = "oe11"
 PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCPV}"
 PR = "r8"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
-  file://fix-install.patch;patch=1 \
-  file://0007-Enable-UBI-UBIFS.patch;patch=1 \
+  file://fix-install.patch \
+  file://0007-Enable-UBI-UBIFS.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes/linux/linux-openmoko-2.6.31/0001-gta02_defconfig-Enable-GLAMO_DRM.patch b/recipes/linux/linux-openmoko-2.6.31/0001-gta02_defconfig-Enable-GLAMO_DRM.patch
deleted file mode 100644
index 94fced1741..0000000000
--- a/recipes/linux/linux-openmoko-2.6.31/0001-gta02_defconfig-Enable-GLAMO_DRM.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6cc1ca971b357db4760a40729728c05e403857d7 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Thu, 19 Nov 2009 11:39:51 +0100
-Subject: [PATCH] gta02_defconfig: Enable GLAMO_DRM
-
----
- arch/arm/configs/gta02_defconfig |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig
-index 0f53baf..1cce709 100644
---- a/arch/arm/configs/gta02_defconfig
-+++ b/arch/arm/configs/gta02_defconfig
-@@ -1000,14 +1000,19 @@ CONFIG_PCF50633_GPIO=y
- # CONFIG_EZX_PCAP is not set
- # CONFIG_MFD_PCF50606 is not set
- CONFIG_MFD_GLAMO=y
--CONFIG_MFD_GLAMO_FB=y
-+# CONFIG_MFD_GLAMO_FB is not set
- CONFIG_MFD_GLAMO_GPIO=y
- CONFIG_MFD_GLAMO_MCI=y
-+CONFIG_MFD_GLAMO_DRM=y
- # CONFIG_MEDIA_SUPPORT is not set
- 
- #
- # Graphics support
- #
-+CONFIG_DRM=y
-+# CONFIG_DRM_MGA is not set
-+# CONFIG_DRM_VIA is not set
-+# CONFIG_DRM_SAVAGE is not set
- # CONFIG_VGASTATE is not set
- CONFIG_VIDEO_OUTPUT_CONTROL=y
- CONFIG_FB=y
--- 
-1.6.5.3
-
diff --git a/recipes/linux/linux-openmoko-2.6.31/0004-Add-JBT6k74-hook-for-use-by-KMS.patch b/recipes/linux/linux-openmoko-2.6.31/0004-Add-JBT6k74-hook-for-use-by-KMS.patch
deleted file mode 100644
index a223f5b7a9..0000000000
--- a/recipes/linux/linux-openmoko-2.6.31/0004-Add-JBT6k74-hook-for-use-by-KMS.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 6035b76b940c71e30824921271e8c3da8047f869 Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Sat, 21 Nov 2009 21:42:16 +0100
-Subject: [PATCH 4/4] Add JBT6k74 hook for use by KMS
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
----
- drivers/video/backlight/jbt6k74.c |   18 ++++++++++++++++++
- 1 files changed, 18 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/video/backlight/jbt6k74.c b/drivers/video/backlight/jbt6k74.c
-index b1aacb7..b9d02f2 100644
---- a/drivers/video/backlight/jbt6k74.c
-+++ b/drivers/video/backlight/jbt6k74.c
-@@ -688,6 +688,22 @@ static int jbt6k74_get_power(struct lcd_device *ld)
- 	}
- }
- 
-+/* This is utterly, totally horrible.  I'm REALLY sorry... */
-+struct jbt_info *jbt_global;
-+void jbt6k74_action(int val)
-+{
-+	if ( !jbt_global ) {
-+		printk(KERN_CRIT "JBT not initialised!!!\n");
-+		return;
-+	}
-+	if ( val == 0 ) {
-+		jbt6k74_enter_power_mode(jbt_global, JBT_POWER_MODE_SLEEP);
-+	} else {
-+		jbt6k74_enter_power_mode(jbt_global, JBT_POWER_MODE_NORMAL);
-+	}
-+}
-+EXPORT_SYMBOL_GPL(jbt6k74_action);
-+
- struct lcd_ops jbt6k74_lcd_ops = {
- 	.set_power = jbt6k74_set_power,
- 	.get_power = jbt6k74_get_power,
-@@ -718,6 +734,8 @@ static int __devinit jbt_probe(struct spi_device *spi)
- 	if (!jbt)
- 		return -ENOMEM;
- 
-+	jbt_global = jbt;
-+
- 	jbt->spi = spi;
- 
- 	jbt->lcd_dev = lcd_device_register("jbt6k74-lcd", &spi->dev, jbt,
--- 
-1.6.5.3
-
diff --git a/recipes/linux/linux-openmoko-2.6.31/0004-gta02_defconfig-Enable-UBI-support.patch b/recipes/linux/linux-openmoko-2.6.31/0004-gta02_defconfig-Enable-UBI-support.patch
deleted file mode 100644
index 4ab88d3672..0000000000
--- a/recipes/linux/linux-openmoko-2.6.31/0004-gta02_defconfig-Enable-UBI-support.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 513b35171de9efbbc0699bff5f2e5a324d2cd8ef Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 8 Nov 2009 11:22:13 +0100
-Subject: [PATCH 4/5] gta02_defconfig: Enable UBI support
-
----
- arch/arm/configs/gta02_defconfig |   22 +++++++++++++++++++---
- 1 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig
-index b0a6d72..3f1b60b 100644
---- a/arch/arm/configs/gta02_defconfig
-+++ b/arch/arm/configs/gta02_defconfig
-@@ -648,7 +648,15 @@ CONFIG_MTD_NAND_S3C2410=y
- #
- # UBI - Unsorted block images
- #
--# CONFIG_MTD_UBI is not set
-+CONFIG_MTD_UBI=y
-+CONFIG_MTD_UBI_WL_THRESHOLD=4096
-+CONFIG_MTD_UBI_BEB_RESERVE=1
-+CONFIG_MTD_UBI_GLUEBI=y
-+
-+#
-+# UBI debugging options
-+#
-+# CONFIG_MTD_UBI_DEBUG is not set
- # CONFIG_PARPORT is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
-@@ -1478,6 +1486,12 @@ CONFIG_JFFS2_ZLIB=y
- # CONFIG_JFFS2_LZO is not set
- CONFIG_JFFS2_RTIME=y
- # CONFIG_JFFS2_RUBIN is not set
-+CONFIG_UBIFS_FS=y
-+# CONFIG_UBIFS_FS_XATTR is not set
-+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-+CONFIG_UBIFS_FS_LZO=y
-+CONFIG_UBIFS_FS_ZLIB=y
-+# CONFIG_UBIFS_FS_DEBUG is not set
- # CONFIG_CRAMFS is not set
- # CONFIG_SQUASHFS is not set
- # CONFIG_VXFS_FS is not set
-@@ -1670,9 +1684,9 @@ CONFIG_CRYPTO_MD5=y
- #
- # Compression
- #
--# CONFIG_CRYPTO_DEFLATE is not set
-+CONFIG_CRYPTO_DEFLATE=y
- CONFIG_CRYPTO_ZLIB=y
--# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_LZO=y
- 
- #
- # Random Number Generation
-@@ -1695,6 +1709,8 @@ CONFIG_CRC7=y
- # CONFIG_LIBCRC32C is not set
- CONFIG_ZLIB_INFLATE=y
- CONFIG_ZLIB_DEFLATE=y
-+CONFIG_LZO_COMPRESS=y
-+CONFIG_LZO_DECOMPRESS=y
- CONFIG_DECOMPRESS_GZIP=y
- CONFIG_DECOMPRESS_BZIP2=y
- CONFIG_DECOMPRESS_LZMA=y
--- 
-1.6.5.2
-
diff --git a/recipes/linux/linux-openmoko-2.6.31/0005-gta02_defconfig-Enable-UBI-debug.patch b/recipes/linux/linux-openmoko-2.6.31/0005-gta02_defconfig-Enable-UBI-debug.patch
deleted file mode 100644
index 9aecf64086..0000000000
--- a/recipes/linux/linux-openmoko-2.6.31/0005-gta02_defconfig-Enable-UBI-debug.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 5ae14aa9c5eea7178a8de28515b45d600ecb7a13 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 8 Nov 2009 11:24:01 +0100
-Subject: [PATCH 5/5] gta02_defconfig: Enable UBI debug
-
----
- arch/arm/configs/gta02_defconfig |   23 +++++++++++++++++++++--
- 1 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig
-index 3f1b60b..0f53baf 100644
---- a/arch/arm/configs/gta02_defconfig
-+++ b/arch/arm/configs/gta02_defconfig
-@@ -76,6 +76,7 @@ CONFIG_ANON_INODES=y
- CONFIG_UID16=y
- CONFIG_SYSCTL_SYSCALL=y
- CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
- # CONFIG_KALLSYMS_EXTRA_PASS is not set
- CONFIG_HOTPLUG=y
- CONFIG_PRINTK=y
-@@ -110,6 +111,7 @@ CONFIG_HAVE_CLK=y
- #
- # GCOV-based kernel profiling
- #
-+# CONFIG_GCOV_KERNEL is not set
- # CONFIG_SLOW_WORK is not set
- CONFIG_HAVE_GENERIC_DMA_COHERENT=y
- CONFIG_SLABINFO=y
-@@ -656,7 +658,21 @@ CONFIG_MTD_UBI_GLUEBI=y
- #
- # UBI debugging options
- #
--# CONFIG_MTD_UBI_DEBUG is not set
-+CONFIG_MTD_UBI_DEBUG=y
-+# CONFIG_MTD_UBI_DEBUG_MSG is not set
-+# CONFIG_MTD_UBI_DEBUG_PARANOID is not set
-+CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
-+
-+#
-+# Additional UBI debugging messages
-+#
-+# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
- # CONFIG_PARPORT is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
-@@ -1238,6 +1254,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
- # CONFIG_USB_VST is not set
- CONFIG_USB_GADGET=y
- # CONFIG_USB_GADGET_DEBUG_FILES is not set
-+# CONFIG_USB_GADGET_DEBUG_FS is not set
- CONFIG_USB_GADGET_VBUS_DRAW=500
- CONFIG_USB_GADGET_SELECTED=y
- # CONFIG_USB_GADGET_AT91 is not set
-@@ -1419,6 +1436,7 @@ CONFIG_EXT3_FS=y
- # CONFIG_EXT3_FS_XATTR is not set
- # CONFIG_EXT4_FS is not set
- CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
- # CONFIG_REISERFS_FS is not set
- # CONFIG_JFS_FS is not set
- # CONFIG_FS_POSIX_ACL is not set
-@@ -1577,7 +1595,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
- CONFIG_FRAME_WARN=1024
- # CONFIG_MAGIC_SYSRQ is not set
- # CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
-+CONFIG_DEBUG_FS=y
- # CONFIG_HEADERS_CHECK is not set
- # CONFIG_DEBUG_KERNEL is not set
- CONFIG_DEBUG_BUGVERBOSE=y
-@@ -1589,6 +1607,7 @@ CONFIG_FRAME_POINTER=y
- CONFIG_HAVE_FUNCTION_TRACER=y
- CONFIG_TRACING_SUPPORT=y
- # CONFIG_FTRACE is not set
-+# CONFIG_DYNAMIC_DEBUG is not set
- # CONFIG_SAMPLES is not set
- CONFIG_HAVE_ARCH_KGDB=y
- # CONFIG_ARM_UNWIND is not set
--- 
-1.6.5.2
-
diff --git a/recipes/linux/linux-openmoko-2.6.31/0006-gta02-defconfig-enable-NFS-and-INOTIFY_USER.patch b/recipes/linux/linux-openmoko-2.6.31/0006-gta02-defconfig-enable-NFS-and-INOTIFY_USER.patch
deleted file mode 100644
index 31d2b6569b..0000000000
--- a/recipes/linux/linux-openmoko-2.6.31/0006-gta02-defconfig-enable-NFS-and-INOTIFY_USER.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 20aa0022f765e702f76fe1cae429b1d58faa9ec4 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sat, 28 Nov 2009 19:24:49 +0100
-Subject: [PATCH] gta02-defconfig: enable NFS and INOTIFY_USER
-
----
- arch/arm/configs/gta02_defconfig |   48 ++++++++++++++++++++++++++++++-------
- 1 files changed, 39 insertions(+), 9 deletions(-)
-
-diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig
-index 1cce709..acf225e 100644
---- a/arch/arm/configs/gta02_defconfig
-+++ b/arch/arm/configs/gta02_defconfig
-@@ -860,7 +860,7 @@ CONFIG_I2C_CHARDEV=y
- #
- # I2C Algorithms
- #
--# CONFIG_I2C_ALGOBIT is not set
-+CONFIG_I2C_ALGOBIT=y
- # CONFIG_I2C_ALGOPCF is not set
- # CONFIG_I2C_ALGOPCA is not set
- 
-@@ -953,6 +953,7 @@ CONFIG_POWER_SUPPLY=y
- CONFIG_CHARGER_PCF50633=y
- CONFIG_BATTERY_BQ27000_HDQ=y
- CONFIG_HDQ_GPIO_BITBANG=y
-+# CONFIG_BATTERY_PLATFORM is not set
- # CONFIG_HWMON is not set
- # CONFIG_THERMAL is not set
- # CONFIG_THERMAL_HWMON is not set
-@@ -1444,15 +1445,15 @@ CONFIG_JBD=y
- # CONFIG_JBD_DEBUG is not set
- # CONFIG_REISERFS_FS is not set
- # CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
-+CONFIG_FS_POSIX_ACL=y
- # CONFIG_XFS_FS is not set
- # CONFIG_OCFS2_FS is not set
- # CONFIG_BTRFS_FS is not set
- CONFIG_FILE_LOCKING=y
--# CONFIG_FSNOTIFY is not set
-+CONFIG_FSNOTIFY=y
- # CONFIG_DNOTIFY is not set
- CONFIG_INOTIFY=y
--# CONFIG_INOTIFY_USER is not set
-+CONFIG_INOTIFY_USER=y
- # CONFIG_QUOTA is not set
- # CONFIG_AUTOFS_FS is not set
- # CONFIG_AUTOFS4_FS is not set
-@@ -1526,7 +1527,31 @@ CONFIG_UBIFS_FS_ZLIB=y
- # CONFIG_SYSV_FS is not set
- # CONFIG_UFS_FS is not set
- # CONFIG_NILFS2_FS is not set
--# CONFIG_NETWORK_FILESYSTEMS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=m
-+CONFIG_NFS_V3=y
-+CONFIG_NFS_V3_ACL=y
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_V4_1 is not set
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V2_ACL=y
-+CONFIG_NFSD_V3=y
-+CONFIG_NFSD_V3_ACL=y
-+CONFIG_NFSD_V4=y
-+CONFIG_LOCKD=m
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_ACL_SUPPORT=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=m
-+CONFIG_SUNRPC_GSS=m
-+CONFIG_RPCSEC_GSS_KRB5=m
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
- 
- #
- # Partition Types
-@@ -1634,13 +1659,18 @@ CONFIG_CRYPTO=y
- # CONFIG_CRYPTO_FIPS is not set
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_ALGAPI2=y
-+CONFIG_CRYPTO_AEAD2=y
-+CONFIG_CRYPTO_BLKCIPHER=m
-+CONFIG_CRYPTO_BLKCIPHER2=y
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_HASH2=y
-+CONFIG_CRYPTO_RNG2=y
- CONFIG_CRYPTO_PCOMP=y
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_MANAGER2 is not set
-+CONFIG_CRYPTO_MANAGER=m
-+CONFIG_CRYPTO_MANAGER2=y
- # CONFIG_CRYPTO_GF128MUL is not set
- # CONFIG_CRYPTO_NULL is not set
-+CONFIG_CRYPTO_WORKQUEUE=y
- # CONFIG_CRYPTO_CRYPTD is not set
- # CONFIG_CRYPTO_AUTHENC is not set
- # CONFIG_CRYPTO_TEST is not set
-@@ -1655,7 +1685,7 @@ CONFIG_CRYPTO_PCOMP=y
- #
- # Block modes
- #
--# CONFIG_CRYPTO_CBC is not set
-+CONFIG_CRYPTO_CBC=m
- # CONFIG_CRYPTO_CTR is not set
- # CONFIG_CRYPTO_CTS is not set
- # CONFIG_CRYPTO_ECB is not set
-@@ -1696,7 +1726,7 @@ CONFIG_CRYPTO_MD5=y
- # CONFIG_CRYPTO_CAMELLIA is not set
- # CONFIG_CRYPTO_CAST5 is not set
- # CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_DES is not set
-+CONFIG_CRYPTO_DES=m
- # CONFIG_CRYPTO_FCRYPT is not set
- # CONFIG_CRYPTO_KHAZAD is not set
- # CONFIG_CRYPTO_SALSA20 is not set
--- 
-1.6.5.3
-
diff --git a/recipes/linux/linux-openmoko-2.6.31/0007-gta02_defconfig-disable-LEDS_GTA02_VIBRATOR.patch b/recipes/linux/linux-openmoko-2.6.31/0007-gta02_defconfig-disable-LEDS_GTA02_VIBRATOR.patch
deleted file mode 100644
index a6fa77daf4..0000000000
--- a/recipes/linux/linux-openmoko-2.6.31/0007-gta02_defconfig-disable-LEDS_GTA02_VIBRATOR.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f0acf76b4f0f16f0e5934daaccbfbec67b875bdd Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 17 Jan 2010 19:08:17 +0100
-Subject: [PATCH] gta02_defconfig: disable LEDS_GTA02_VIBRATOR
-
----
- arch/arm/configs/gta02_defconfig |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig
-index acf225e..fec7b03 100644
---- a/arch/arm/configs/gta02_defconfig
-+++ b/arch/arm/configs/gta02_defconfig
-@@ -1338,7 +1338,7 @@ CONFIG_LEDS_GPIO_PLATFORM=y
- # CONFIG_LEDS_DAC124S085 is not set
- # CONFIG_LEDS_PWM is not set
- # CONFIG_LEDS_BD2802 is not set
--CONFIG_LEDS_GTA02_VIBRATOR=y
-+# CONFIG_LEDS_GTA02_VIBRATOR is not set
- 
- #
- # LED Triggers
--- 
-1.6.6
-
diff --git a/recipes/linux/linux-openmoko-2.6.31_git.bb b/recipes/linux/linux-openmoko-2.6.31_git.bb
deleted file mode 100644
index c11e41bfe0..0000000000
--- a/recipes/linux/linux-openmoko-2.6.31_git.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require linux.inc
-require linux-openmoko.inc
-
-DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Smartphones"
-
-KERNEL_RELEASE = "2.6.31"
-KERNEL_VERSION = "${KERNEL_RELEASE}"
-
-SRCREV = "dd32737aa524e09c1d141a0e735dd58674552244"
-OEV = "oe1"
-PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
-PR = "r6"
-
-SRC_URI = "\
-  git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-2.6.31 \
-# build fix
-  file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch;patch=1 \
-# patches from Weiss's gdrm-2.6.31 branch
-  file://0001-DRM-for-platform-devices.patch;patch=1 \
-  file://0002-Glamo-DRM-and-KMS-driver.patch;patch=1 \
-  file://0003-Work-on-Glamo-core-for-DRM.patch;patch=1 \
-  file://0004-Add-JBT6k74-hook-for-use-by-KMS.patch;patch=1 \
-# enable UBI+DRM+NFS+INOTIFY_USER
-  file://0004-gta02_defconfig-Enable-UBI-support.patch;patch=1 \
-  file://0005-gta02_defconfig-Enable-UBI-debug.patch;patch=1 \
-  file://0001-gta02_defconfig-Enable-GLAMO_DRM.patch;patch=1 \
-  file://0006-gta02-defconfig-enable-NFS-and-INOTIFY_USER.patch;patch=1 \
-  file://0007-gta02_defconfig-disable-LEDS_GTA02_VIBRATOR.patch;patch=1 \
-"
-
-S = "${WORKDIR}/git"
-
-CONFIG_NAME_om-gta01 = "gta01_defconfig"
-CONFIG_NAME_om-gta02 = "gta02_defconfig"
-
-do_configure_prepend() { 
-	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
-}
diff --git a/recipes/linux/linux-openmoko-2.6.32/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch b/recipes/linux/linux-openmoko-2.6.32/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch
index c6a16ab4d5..52fe6262cc 100644
--- a/recipes/linux/linux-openmoko-2.6.32/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch
+++ b/recipes/linux/linux-openmoko-2.6.32/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch
@@ -1,7 +1,7 @@
-From b3b22a8f23e6b49d21bbfe70f278a0d79419e3df Mon Sep 17 00:00:00 2001
+From 16722526979959805c493deabaac8cf9ba2f8ef6 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 7 Nov 2009 20:33:06 +0100
-Subject: [PATCH 1/9] wm8753: fix build with gcc-4.4.2, which works ok with 4.1.2
+Subject: [PATCH 01/14] wm8753: fix build with gcc-4.4.2, which works ok with 4.1.2
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
@@ -24,5 +24,5 @@ index 5ad677c..e148406 100644
  	K = Kpart & 0xFFFFFFFF;
  
 -- 
-1.6.6.1
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.32/0017-accels.patch.patch b/recipes/linux/linux-openmoko-2.6.32/0002-accels.patch.patch
index 16f379d055..9644473eda 100644
--- a/recipes/linux/linux-openmoko-2.6.32/0017-accels.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.32/0002-accels.patch.patch
@@ -1,7 +1,7 @@
-From a08be3ba79daf13baca6de98249c8784ede31297 Mon Sep 17 00:00:00 2001
+From b96dbc75c274014171a53da13686bd90d239c023 Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:15:40 +0200
-Subject: [PATCH 17/22] accels.patch
+Subject: [PATCH 02/14] accels.patch
 
 adds support for accelerometers. You will need include/linux/lis302dl.h and
 drivers/input/misc/lis302dl.c from andy-tracking. The patch needs
@@ -39,7 +39,7 @@ index 980a099..0ff8949 100644
  
  
 diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
-index b580b1b..8e3cc91 100644
+index 7965cad..0675181 100644
 --- a/arch/arm/mach-s3c2442/mach-gta02.c
 +++ b/arch/arm/mach-s3c2442/mach-gta02.c
 @@ -63,6 +63,7 @@
@@ -73,7 +73,7 @@ index b580b1b..8e3cc91 100644
  struct pcf50633 *gta02_pcf;
  
  /*
-@@ -776,6 +793,60 @@ const struct jbt6k74_platform_data jbt6k74_pdata = {
+@@ -775,6 +792,60 @@ const struct jbt6k74_platform_data jbt6k74_pdata = {
  	.gpio_reset = GTA02_GPIO_GLAMO(4),
  };
  
@@ -134,7 +134,7 @@ index b580b1b..8e3cc91 100644
  static struct spi_board_info gta02_spi_board_info[] = {
  	{
  		.modalias	= "jbt6k74",
-@@ -786,6 +857,81 @@ static struct spi_board_info gta02_spi_board_info[] = {
+@@ -785,6 +856,81 @@ static struct spi_board_info gta02_spi_board_info[] = {
  		.bus_num	= 2,
  		.chip_select = 0
  	},
@@ -216,7 +216,7 @@ index b580b1b..8e3cc91 100644
  };
  
  /* BQ27000 Battery */
-@@ -1136,6 +1282,7 @@ static struct platform_device *gta02_devices[] __initdata = {
+@@ -1135,6 +1281,7 @@ static struct platform_device *gta02_devices[] __initdata = {
  static struct platform_device *gta02_devices_pmu_children[] = {
  	&s3c_device_ts,
  	&gta02_glamo_dev,
@@ -224,7 +224,7 @@ index b580b1b..8e3cc91 100644
  	&s3c_device_timer[2],
  	&gta02_hdq_device,
  	&gta02_gps_userspace_consumer
-@@ -1362,6 +1509,16 @@ static void __init gta02_machine_init(void)
+@@ -1361,6 +1508,16 @@ static void __init gta02_machine_init(void)
  	/* Set the panic callback to make AUX LED blink at ~5Hz. */
  	panic_blink = gta02_panic_blink;
  
@@ -1755,5 +1755,5 @@ index eed4254..f92de01 100644
  /* start or stop queue processing */
  extern int spi_bitbang_start(struct spi_bitbang *spi);
 -- 
-1.7.0.4
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.32/0018-usbhost.patch.patch b/recipes/linux/linux-openmoko-2.6.32/0003-usbhost.patch.patch
index 16ed3746fd..80b05eac18 100644
--- a/recipes/linux/linux-openmoko-2.6.32/0018-usbhost.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.32/0003-usbhost.patch.patch
@@ -1,7 +1,7 @@
-From d71534de6ab5e132d0798df30408042c229cbb62 Mon Sep 17 00:00:00 2001
+From 1000aee5e65dc824e02aafe2a70ad5b3f0d44d2d Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:17:28 +0200
-Subject: [PATCH 18/22] usbhost.patch
+Subject: [PATCH 03/14] usbhost.patch
 
 adds support for usb host mode and adds usb host pm sysfs node. I just copied
 and modified how modem is powered up and backported changes in ohci-s3c2410.c.
@@ -32,7 +32,7 @@ index 6247ca0..3e7145c 100644
  # Machine support
  
 diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
-index 8e3cc91..f1d4d51 100644
+index 0675181..779d6df 100644
 --- a/arch/arm/mach-s3c2442/mach-gta02.c
 +++ b/arch/arm/mach-s3c2442/mach-gta02.c
 @@ -322,6 +322,10 @@ static struct platform_device gta02_pm_gsm_dev = {
@@ -106,7 +106,7 @@ index 8e3cc91..f1d4d51 100644
  static struct regulator_bulk_data gta02_gps_consumer_supply = {
  	.supply = "GPS",
  };
-@@ -1332,12 +1368,17 @@ static struct platform_device* gta02_glamo_gpio_children[] = {
+@@ -1331,12 +1367,17 @@ static struct platform_device* gta02_glamo_gpio_children[] = {
  
  static struct platform_device* gta02_pcf50633_gpio_children[] = {
  	&gta02_gsm_supply_device,
@@ -124,7 +124,7 @@ index 8e3cc91..f1d4d51 100644
  static struct platform_device* gta02_hdq_children[] = {
  	&bq27000_battery_device,
  };
-@@ -1364,14 +1405,19 @@ static struct gta02_device_children gta02_device_children[] = {
+@@ -1363,14 +1404,19 @@ static struct gta02_device_children gta02_device_children[] = {
  	},
  	{
  		.dev_name = "pcf50633-gpio",
@@ -229,5 +229,5 @@ index a68af2d..02bd7b0 100644
  	s3c2410_stop_hc(dev);
  	iounmap(hcd->regs);
 -- 
-1.7.0.4
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.32/0019-ar6000_delay.patch.patch b/recipes/linux/linux-openmoko-2.6.32/0004-ar6000_delay.patch.patch
index 54200d558f..104a8c8951 100644
--- a/recipes/linux/linux-openmoko-2.6.32/0019-ar6000_delay.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.32/0004-ar6000_delay.patch.patch
@@ -1,7 +1,7 @@
-From cf93a0f8d2d61a2e13590c261dee4c4d74412db7 Mon Sep 17 00:00:00 2001
+From c9580261d79d8d1664fbd2da52dcd2148da9ef14 Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:18:02 +0200
-Subject: [PATCH 19/22] ar6000_delay.patch
+Subject: [PATCH 04/14] ar6000_delay.patch
 
 patch from https://docs.openmoko.org/trac/ticket/2327 - wifi is working good
 (100% until now) for me with this patch.
@@ -207,5 +207,5 @@ index 386d96e..90178d0 100644
  	if (ret == A_OK)
  		return 0;
 -- 
-1.7.0.4
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.32/0005-Add-JBT6k74-hook-for-use-by-KMS.patch b/recipes/linux/linux-openmoko-2.6.32/0005-Add-JBT6k74-hook-for-use-by-KMS.patch
deleted file mode 100644
index 744004e7b1..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0005-Add-JBT6k74-hook-for-use-by-KMS.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 972c0a58e9e238c266adc77c88dcd8de6f123742 Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Sat, 21 Nov 2009 21:42:16 +0100
-Subject: [PATCH 5/9] Add JBT6k74 hook for use by KMS
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
----
- drivers/video/backlight/jbt6k74.c |   18 ++++++++++++++++++
- 1 files changed, 18 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/video/backlight/jbt6k74.c b/drivers/video/backlight/jbt6k74.c
-index 8450904..95ca4cf 100644
---- a/drivers/video/backlight/jbt6k74.c
-+++ b/drivers/video/backlight/jbt6k74.c
-@@ -698,6 +698,22 @@ static int jbt6k74_get_power(struct lcd_device *ld)
- 	}
- }
- 
-+/* This is utterly, totally horrible.  I'm REALLY sorry... */
-+struct jbt_info *jbt_global;
-+void jbt6k74_action(int val)
-+{
-+	if ( !jbt_global ) {
-+		printk(KERN_CRIT "JBT not initialised!!!\n");
-+		return;
-+	}
-+	if ( val == 0 ) {
-+		jbt6k74_enter_power_mode(jbt_global, JBT_POWER_MODE_SLEEP);
-+	} else {
-+		jbt6k74_enter_power_mode(jbt_global, JBT_POWER_MODE_NORMAL);
-+	}
-+}
-+EXPORT_SYMBOL_GPL(jbt6k74_action);
-+
- struct lcd_ops jbt6k74_lcd_ops = {
- 	.set_power = jbt6k74_set_power,
- 	.get_power = jbt6k74_get_power,
-@@ -728,6 +744,8 @@ static int __devinit jbt_probe(struct spi_device *spi)
- 	if (!jbt)
- 		return -ENOMEM;
- 
-+	jbt_global = jbt;
-+
- 	jbt->spi = spi;
- 
- 	jbt->lcd_dev = lcd_device_register("jbt6k74-lcd", &spi->dev, jbt,
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0020-save_regs.patch.patch b/recipes/linux/linux-openmoko-2.6.32/0005-save_regs.patch.patch
index 8fc2cea326..7873f850e4 100644
--- a/recipes/linux/linux-openmoko-2.6.32/0020-save_regs.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.32/0005-save_regs.patch.patch
@@ -1,7 +1,7 @@
-From a9d6c115089a0a34fbca89c539de50148a2cf34e Mon Sep 17 00:00:00 2001
+From f143dfe95e9b48aebc8fad111086a25c915bf479 Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:22:23 +0200
-Subject: [PATCH 20/22] save_regs.patch
+Subject: [PATCH 05/14] save_regs.patch
 
 With this patch wifi can survive suspend.
 ---
@@ -136,5 +136,5 @@ index e4898e9..b49d674 100644
  extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
  extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
 -- 
-1.7.0.4
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.32/0006-glamo-drm-use-dev_set_drvdata-instead-of-setting-dri.patch b/recipes/linux/linux-openmoko-2.6.32/0006-glamo-drm-use-dev_set_drvdata-instead-of-setting-dri.patch
deleted file mode 100644
index f685608253..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0006-glamo-drm-use-dev_set_drvdata-instead-of-setting-dri.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From be2d944c2b29b19b4cee7c64b00bd75cf7209724 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 22 Dec 2009 16:11:27 +0100
-Subject: [PATCH 6/9] glamo-drm: use dev_set_drvdata instead of setting driver_data directly
-
-* driver_data is private since 2.6.32
-  http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b4028437876866aba4747a655ede00f892089e14
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- drivers/mfd/glamo/glamo-drm-drv.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
-index f30097e..1907a47 100644
---- a/drivers/mfd/glamo/glamo-drm-drv.c
-+++ b/drivers/mfd/glamo/glamo-drm-drv.c
-@@ -347,7 +347,7 @@ out_release_regs:
- 	release_mem_region(gdrm->reg->start, resource_size(gdrm->reg));
- out_free:
- 	kfree(gdrm);
--	pdev->dev.driver_data = NULL;
-+	dev_set_drvdata(&pdev->dev, NULL);
- 	return rc;
- }
- 
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0006-gta02-defconfigs-enable-LEDS_S3C24XX-and-dummy-batte.patch b/recipes/linux/linux-openmoko-2.6.32/0006-gta02-defconfigs-enable-LEDS_S3C24XX-and-dummy-batte.patch
new file mode 100644
index 0000000000..103c06c886
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32/0006-gta02-defconfigs-enable-LEDS_S3C24XX-and-dummy-batte.patch
@@ -0,0 +1,66 @@
+From 7e4a1fee4f08ef7ccedd4706b4890afc71f37dc4 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 17 May 2010 12:41:06 +0200
+Subject: [PATCH 06/14] gta02 defconfigs, enable LEDS_S3C24XX and dummy battery driver
+
+---
+ arch/arm/configs/gta02_defconfig     |    2 +-
+ arch/arm/configs/gta02_drm_defconfig |   10 +++++-----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig
+index 73d26ba..55832ac 100644
+--- a/arch/arm/configs/gta02_defconfig
++++ b/arch/arm/configs/gta02_defconfig
+@@ -1635,7 +1635,7 @@ CONFIG_LEDS_CLASS=y
+ #
+ # LED drivers
+ #
+-# CONFIG_LEDS_S3C24XX is not set
++CONFIG_LEDS_S3C24XX=y
+ # CONFIG_LEDS_PCA9532 is not set
+ CONFIG_LEDS_GPIO=y
+ CONFIG_LEDS_GPIO_PLATFORM=y
+diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig
+index 05aa130..62c1ee4 100644
+--- a/arch/arm/configs/gta02_drm_defconfig
++++ b/arch/arm/configs/gta02_drm_defconfig
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.32.11
+-# Sun Apr 11 14:20:07 2010
++# Linux kernel version: 2.6.32.13
++# Mon May 17 14:13:35 2010
+ #
+ CONFIG_ARM=y
+ CONFIG_HAVE_PWM=y
+@@ -1233,7 +1233,7 @@ CONFIG_POWER_SUPPLY=y
+ CONFIG_CHARGER_PCF50633=y
+ CONFIG_BATTERY_BQ27000_HDQ=y
+ CONFIG_HDQ_GPIO_BITBANG=y
+-# CONFIG_BATTERY_PLATFORM is not set
++CONFIG_BATTERY_PLATFORM=y
+ # CONFIG_HWMON is not set
+ # CONFIG_THERMAL is not set
+ CONFIG_WATCHDOG=y
+@@ -1681,14 +1681,14 @@ CONFIG_LEDS_CLASS=y
+ #
+ # LED drivers
+ #
+-# CONFIG_LEDS_S3C24XX is not set
++CONFIG_LEDS_S3C24XX=y
+ # CONFIG_LEDS_PCA9532 is not set
+ CONFIG_LEDS_GPIO=y
+ CONFIG_LEDS_GPIO_PLATFORM=y
+ # CONFIG_LEDS_LP3944 is not set
+ # CONFIG_LEDS_PCA955X is not set
+ # CONFIG_LEDS_DAC124S085 is not set
+-# CONFIG_LEDS_PWM is not set
++CONFIG_LEDS_PWM=y
+ # CONFIG_LEDS_BD2802 is not set
+ 
+ #
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.32/0002-DRM-for-platform-devices.patch b/recipes/linux/linux-openmoko-2.6.32/0007-DRM-for-platform-devices.patch
index 4e47a088d0..e16379fecf 100644
--- a/recipes/linux/linux-openmoko-2.6.32/0002-DRM-for-platform-devices.patch
+++ b/recipes/linux/linux-openmoko-2.6.32/0007-DRM-for-platform-devices.patch
@@ -1,7 +1,7 @@
-From 660570997a5c998aaecc94798b6ea8d60b0da053 Mon Sep 17 00:00:00 2001
+From d05d2c82e2ec110720c5c714ad18d60ef676aa1d Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Tue, 20 Oct 2009 15:52:30 +0200
-Subject: [PATCH 2/9] DRM for platform devices
+Subject: [PATCH 07/14] DRM for platform devices
 
 This modifies the DRM core in a small number of places to allow platform
 devices to be used for direct rendering, alongside PCI devices.
@@ -454,5 +454,5 @@ index 7ad3faa..1d9a229 100644
  extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
  		       struct drm_driver *driver);
 -- 
-1.6.6.1
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.32/0007-glamo-drm-select-DRM_KMS_HELPER-for-crtc-functions.patch b/recipes/linux/linux-openmoko-2.6.32/0007-glamo-drm-select-DRM_KMS_HELPER-for-crtc-functions.patch
deleted file mode 100644
index 68751942a9..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0007-glamo-drm-select-DRM_KMS_HELPER-for-crtc-functions.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8bb128ce2474ef10c71ea681fa01e574c1ec3114 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 22 Dec 2009 16:32:57 +0100
-Subject: [PATCH 7/9] glamo-drm: select DRM_KMS_HELPER for crtc functions
-
----
- drivers/mfd/glamo/Kconfig |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
-index 214c70e..a12ebf6 100644
---- a/drivers/mfd/glamo/Kconfig
-+++ b/drivers/mfd/glamo/Kconfig
-@@ -47,6 +47,7 @@ config MFD_GLAMO_DRM
- 	select FB_CFB_FILLRECT
- 	select FB_CFB_COPYAREA
- 	select FB_CFB_IMAGEBLIT
-+	select DRM_KMS_HELPER
- 	help
- 	  Direct Rendering Manager interface for the S-Media Glamo chip, as
- 	  used in Openmoko FreeRunner (GTA02).
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0003-Glamo-DRM-and-KMS-driver.patch b/recipes/linux/linux-openmoko-2.6.32/0008-Glamo-DRM-and-KMS-driver.patch
index 6c1cc415d9..cb680f1ed5 100644
--- a/recipes/linux/linux-openmoko-2.6.32/0003-Glamo-DRM-and-KMS-driver.patch
+++ b/recipes/linux/linux-openmoko-2.6.32/0008-Glamo-DRM-and-KMS-driver.patch
@@ -1,30 +1,31 @@
-From eff70b6d14cc372944bbeda0dd0afe8599327f96 Mon Sep 17 00:00:00 2001
+From ee4092984dd817e3889a48c0b51c173e96c71913 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Tue, 20 Oct 2009 16:14:55 +0200
-Subject: [PATCH 3/9] Glamo DRM and KMS driver
+Subject: [PATCH 08/14] Glamo DRM and KMS driver
 
-This adds the Glamo DRM and KMS driver, but not the modifications needed
+This adds the Glamo DRM and KMS driver, but note that modifications are needed
 elsewhere to support it.
 
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- drivers/mfd/glamo/Kconfig             |   15 +
+ drivers/mfd/glamo/Kconfig             |   16 +
  drivers/mfd/glamo/Makefile            |    5 +-
- drivers/mfd/glamo/glamo-buffer.c      |  372 ++++++++++++++
- drivers/mfd/glamo/glamo-buffer.h      |   60 +++
- drivers/mfd/glamo/glamo-cmdq.c        |  528 ++++++++++++++++++++
+ drivers/mfd/glamo/glamo-buffer.c      |  374 +++++++++++++
+ drivers/mfd/glamo/glamo-buffer.h      |   60 ++
+ drivers/mfd/glamo/glamo-cmdq.c        |  555 +++++++++++++++++++
  drivers/mfd/glamo/glamo-cmdq.h        |   49 ++
- drivers/mfd/glamo/glamo-display.c     |  869 +++++++++++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-display.h     |   39 ++
- drivers/mfd/glamo/glamo-drm-drv.c     |  444 +++++++++++++++++
- drivers/mfd/glamo/glamo-drm-private.h |  156 ++++++
- drivers/mfd/glamo/glamo-fence.c       |  330 +++++++++++++
+ drivers/mfd/glamo/glamo-display.c     |  975 +++++++++++++++++++++++++++++++++
+ drivers/mfd/glamo/glamo-display.h     |   41 ++
+ drivers/mfd/glamo/glamo-drm-drv.c     |  423 ++++++++++++++
+ drivers/mfd/glamo/glamo-drm-private.h |  166 ++++++
+ drivers/mfd/glamo/glamo-fence.c       |  330 +++++++++++
  drivers/mfd/glamo/glamo-fence.h       |   34 ++
- drivers/mfd/glamo/glamo-kms-fb.c      |  540 ++++++++++++++++++++
+ drivers/mfd/glamo/glamo-kms-fb.c      |  493 +++++++++++++++++
  drivers/mfd/glamo/glamo-kms-fb.h      |   41 ++
  include/drm/Kbuild                    |    1 +
- include/drm/glamo_drm.h               |  153 ++++++
- 16 files changed, 3635 insertions(+), 1 deletions(-)
+ include/drm/glamo_drm.h               |  153 +++++
+ 16 files changed, 3715 insertions(+), 1 deletions(-)
  create mode 100644 drivers/mfd/glamo/glamo-buffer.c
  create mode 100644 drivers/mfd/glamo/glamo-buffer.h
  create mode 100644 drivers/mfd/glamo/glamo-cmdq.c
@@ -40,10 +41,10 @@ Signed-off-by: Thomas White <taw@bitwiz.org.uk>
  create mode 100644 include/drm/glamo_drm.h
 
 diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
-index 3aa4831..214c70e 100644
+index 3aa4831..a12ebf6 100644
 --- a/drivers/mfd/glamo/Kconfig
 +++ b/drivers/mfd/glamo/Kconfig
-@@ -40,3 +40,18 @@ config MFD_GLAMO_MCI
+@@ -40,3 +40,19 @@ config MFD_GLAMO_MCI
  	  neo1973 GTA-02.
  
  	  If unsure, say N.
@@ -54,6 +55,7 @@ index 3aa4831..214c70e 100644
 +	select FB_CFB_FILLRECT
 +	select FB_CFB_COPYAREA
 +	select FB_CFB_IMAGEBLIT
++	select DRM_KMS_HELPER
 +	help
 +	  Direct Rendering Manager interface for the S-Media Glamo chip, as
 +	  used in Openmoko FreeRunner (GTA02).
@@ -83,10 +85,10 @@ index ebf26f7..d5ebf8f 100644
 +                    glamo-display.o glamo-kms-fb.o glamo-fence.o
 diff --git a/drivers/mfd/glamo/glamo-buffer.c b/drivers/mfd/glamo/glamo-buffer.c
 new file mode 100644
-index 0000000..45500d3
+index 0000000..82ea0c0
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-buffer.c
-@@ -0,0 +1,372 @@
+@@ -0,0 +1,374 @@
 +/*
 + * SMedia Glamo 336x/337x memory management
 + *
@@ -334,6 +336,8 @@ index 0000000..45500d3
 +	if (!gobj->mmap_offset) {
 +		ret = glamo_gem_create_mmap_offset(obj);
 +		if (ret) {
++			printk(KERN_CRIT "Couldn't create mmap offset\n");
++			drm_gem_object_unreference(obj);
 +			mutex_unlock(&dev->struct_mutex);
 +			return ret;
 +		}
@@ -527,10 +531,10 @@ index 0000000..41f18fd
 +#endif /* __GLAMO_BUFFER_H */
 diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c
 new file mode 100644
-index 0000000..caedc27
+index 0000000..442963c
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-cmdq.c
-@@ -0,0 +1,528 @@
+@@ -0,0 +1,555 @@
 +/*
 + * SMedia Glamo 336x/337x command queue handling
 + *
@@ -592,6 +596,9 @@ index 0000000..caedc27
 +#include "glamo-regs.h"
 +
 +
++#define GLAMO_CMDQ_SIZE (128 * 1024)    /* 128k ring buffer */
++
++
 +static inline void reg_write(struct glamodrm_handle *gdrm,
 +                             u_int16_t reg, u_int16_t val)
 +{
@@ -969,7 +976,7 @@ index 0000000..caedc27
 +	burst[0] = 1<<15 | cbuf->base;
 +	burst[1] = data_size / 2;  /* -> 2-byte words */
 +	if ( burst[1] & 0x01 ) {
-+		printk(KERN_CRIT "Burst not aligned!\n");
++		printk(KERN_WARNING "[glamo-drm] Burst not aligned!\n");
 +		goto cleanup;
 +	}
 +
@@ -988,7 +995,7 @@ index 0000000..caedc27
 +}
 +
 +
-+int glamo_cmdq_init(struct glamodrm_handle *gdrm)
++int glamo_cmdq_setup(struct glamodrm_handle *gdrm)
 +{
 +	unsigned int i;
 +
@@ -1008,9 +1015,9 @@ index 0000000..caedc27
 +
 +	/* Set up command queue location */
 +	reg_write(gdrm, GLAMO_REG_CMDQ_BASE_ADDRL,
-+					GLAMO_OFFSET_CMDQ & 0xffff);
++					gdrm->cmdq_offs & 0xffff);
 +	reg_write(gdrm, GLAMO_REG_CMDQ_BASE_ADDRH,
-+					(GLAMO_OFFSET_CMDQ >> 16) & 0x7f);
++					(gdrm->cmdq_offs >> 16) & 0x7f);
 +
 +	/* Length of command queue in 1k blocks, minus one */
 +	reg_write(gdrm, GLAMO_REG_CMDQ_LEN, (GLAMO_CMDQ_SIZE >> 10)-1);
@@ -1025,6 +1032,30 @@ index 0000000..caedc27
 +}
 +
 +
++int glamo_cmdq_init(struct glamodrm_handle *gdrm)
++{
++	struct drm_gem_object *obj;
++	struct drm_glamo_gem_object *gobj;
++	int ret = 0;
++
++	obj = glamo_gem_object_alloc(dev, GLAMO_CMDQ_SIZE, 4);
++	if ( !obj ) {
++		printk(KERN_ERR "[glamo-drm] Failed to allocate CmdQ\n");
++		ret = -ENOMEM;
++		goto out;
++	}
++	gobj = fbo->driver_private;
++	gdrm->cmdq_offs = GLAMO_OFFSET_FB + gobj->block->start;
++	gdrm->cmdq_base = ioremap(gdrm->vram->start + offs, GLAMO_CMDQ_SIZE);
++
++	/* Set up registers */
++	glamo_cmdq_setup(gdrm);
++
++out:
++	return ret;
++}
++
++
 +int glamo_cmdq_shutdown(struct glamodrm_handle *gdrm)
 +{
 +	return 0;
@@ -1039,7 +1070,7 @@ index 0000000..caedc27
 +
 +void glamo_cmdq_resume(struct glamodrm_handle *gdrm)
 +{
-+	glamo_cmdq_init(gdrm);
++	glamo_cmdq_setup(gdrm);
 +}
 +
 +
@@ -1116,10 +1147,10 @@ index 0000000..510d195
 +#endif /* __GLAMO_CMDQ_H */
 diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
 new file mode 100644
-index 0000000..34a665a
+index 0000000..75ad734
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-display.c
-@@ -0,0 +1,869 @@
+@@ -0,0 +1,975 @@
 +/*
 + * SMedia Glamo 336x/337x display
 + *
@@ -1174,19 +1205,18 @@ index 0000000..34a665a
 + *
 + */
 +
-+#define DEBUG 1
-+
 +#include <drm/drmP.h>
 +#include <drm/glamo_drm.h>
 +#include <drm/drm_crtc_helper.h>
 +#include <drm/drm_crtc.h>
++#include <linux/glamofb.h>
++#include <linux/jbt6k74.h>
 +
 +#include "glamo-core.h"
 +#include "glamo-drm-private.h"
 +#include "glamo-regs.h"
 +#include "glamo-kms-fb.h"
 +#include "glamo-display.h"
-+#include <linux/glamofb.h>
 +
 +
 +#define GLAMO_LCD_WIDTH_MASK 0x03FF
@@ -1361,14 +1391,6 @@ index 0000000..34a665a
 +}
 +
 +
-+extern void jbt6k74_action(int val);
-+
-+/* Power on/off */
-+static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode)
-+{
-+}
-+
-+
 +static bool glamo_crtc_mode_fixup(struct drm_crtc *crtc,
 +                                  struct drm_display_mode *mode,
 +                                  struct drm_display_mode *adjusted_mode)
@@ -1397,6 +1419,12 @@ index 0000000..34a665a
 +	gcrtc = to_glamo_crtc(crtc);
 +	gdrm = gcrtc->gdrm;	/* Here it is! */
 +
++	if ( !gcrtc->pixel_clock_on ) {
++		printk(KERN_WARNING "[glamo-drm] Display is off - "
++		                    "enabling it before setting base.\n");
++		glamo_lcd_power(gdrm, 1);
++	}
++
 +	gfb = to_glamo_framebuffer(crtc->fb);
 +	obj = gfb->obj;
 +	gobj = obj->driver_private;
@@ -1423,63 +1451,176 @@ index 0000000..34a665a
 +	struct glamodrm_handle *gdrm;
 +	struct glamo_crtc *gcrtc;
 +	int retr_start, retr_end, disp_start, disp_end;
++	int rot;
 +
 +	/* Dig out our handle */
 +	gcrtc = to_glamo_crtc(crtc);
 +	gdrm = gcrtc->gdrm;	/* Here it is! */
 +
++	if ( !gcrtc->pixel_clock_on ) {
++		printk(KERN_WARNING "[glamo-drm] Display is off - "
++		                    "enabling it before setting mode.\n");
++		glamo_lcd_power(gdrm, 1);
++		msleep(500);
++	}
++
++	/* Rotate? */
++	if ( (mode->hdisplay == 640) && (mode->vdisplay == 480) ) {
++		rot = GLAMO_LCD_ROT_MODE_90;
++	} else if ( (mode->hdisplay == 480) && (mode->vdisplay == 640) ) {
++		rot = GLAMO_LCD_ROT_MODE_0;
++	} else if ( (mode->hdisplay == 320) && (mode->vdisplay == 240) ) {
++		rot = GLAMO_LCD_ROT_MODE_90;
++	} else if ( (mode->hdisplay == 240) && (mode->vdisplay == 320) ) {
++		rot = GLAMO_LCD_ROT_MODE_0;
++	} else {
++		printk(KERN_WARNING "[glamo-drm] Couldn't choose rotation.\n");
++		rot = GLAMO_LCD_ROT_MODE_0;
++	}
++
 +	glamo_lcd_cmd_mode(gdrm, 1);
 +
-+	glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, mode->clock);
-+	gdrm->saved_clock = mode->clock;
++	/* Set dimensions */
++	if ( rot == GLAMO_LCD_ROT_MODE_0 ) {
++
++		glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD,
++		                     mode->clock);
++
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH,
++			             GLAMO_LCD_WIDTH_MASK, mode->hdisplay);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT,
++			             GLAMO_LCD_HEIGHT_MASK, mode->vdisplay);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH,
++			             GLAMO_LCD_PITCH_MASK, mode->hdisplay*2);
++
++		/* Set rotation */
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH,
++				     GLAMO_LCD_ROT_MODE_MASK, rot);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_MODE1,
++				     GLAMO_LCD_MODE1_ROTATE_EN,
++				     (rot != GLAMO_LCD_ROT_MODE_0) ?
++				       GLAMO_LCD_MODE1_ROTATE_EN : 0);
++
++		/* Convert "X modeline timings" into "Glamo timings" */
++		retr_start = 0;
++		retr_end = retr_start + mode->hsync_end - mode->hsync_start;
++		disp_start = mode->htotal - mode->hsync_start;
++		disp_end = disp_start + mode->hdisplay;
++
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL,
++				     GLAMO_LCD_HV_TOTAL_MASK, mode->htotal);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START,
++				     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END,
++				     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START,
++				     GLAMO_LCD_HV_RETR_DISP_START_MASK, disp_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END,
++				     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
++
++		/* The same in the vertical direction */
++		retr_start = 0;
++		retr_end = retr_start + mode->vsync_end - mode->vsync_start;
++		disp_start = mode->vtotal - mode->vsync_start;
++		disp_end = disp_start + mode->vdisplay;
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL,
++				     GLAMO_LCD_HV_TOTAL_MASK, mode->vtotal);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START,
++				     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END,
++				     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START,
++				     GLAMO_LCD_HV_RETR_DISP_START_MASK,
++				     disp_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END,
++				     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
++
++	} else {
++
++		glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD,
++		                     mode->clock/2);
++
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH,
++			             GLAMO_LCD_WIDTH_MASK, mode->vdisplay);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT,
++			             GLAMO_LCD_HEIGHT_MASK, mode->hdisplay);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH,
++			             GLAMO_LCD_PITCH_MASK, mode->hdisplay*2);
++
++		/* Set rotation */
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH,
++				     GLAMO_LCD_ROT_MODE_MASK, rot);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_MODE1,
++				     GLAMO_LCD_MODE1_ROTATE_EN,
++				     (rot != GLAMO_LCD_ROT_MODE_0) ?
++				       GLAMO_LCD_MODE1_ROTATE_EN : 0);
++
++		/* Apply "vertical" numbers to the horizontal registers */
++		retr_start = 0;
++		retr_end = retr_start + mode->vsync_end - mode->vsync_start;
++		disp_start = mode->vtotal - mode->vsync_start;
++		disp_end = disp_start + mode->vdisplay;
++
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL,
++				     GLAMO_LCD_HV_TOTAL_MASK, mode->vtotal);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START,
++				     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END,
++				     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START,
++				     GLAMO_LCD_HV_RETR_DISP_START_MASK,
++				     disp_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END,
++				     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
++
++		/* Apply "horizontal" numbers to the vertical registers */
++		retr_start = 0;
++		retr_end = retr_start + mode->hsync_end - mode->hsync_start;
++		disp_start = mode->htotal - mode->hsync_start;
++		disp_end = disp_start + mode->hdisplay;
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL,
++				     GLAMO_LCD_HV_TOTAL_MASK, mode->htotal);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START,
++				     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END,
++				     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START,
++				     GLAMO_LCD_HV_RETR_DISP_START_MASK,
++				     disp_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END,
++				     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
++
++	}
 +
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH,
-+	                     GLAMO_LCD_WIDTH_MASK, mode->hdisplay);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT,
-+	                     GLAMO_LCD_HEIGHT_MASK, mode->vdisplay);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH,
-+	                     GLAMO_LCD_PITCH_MASK, mode->hdisplay*2);
-+
-+	/* Convert "X modeline timings" into "Glamo timings" */
-+	retr_start = 0;
-+	retr_end = retr_start + mode->hsync_end - mode->hsync_start;
-+	disp_start = mode->htotal - mode->hsync_start;
-+	disp_end = disp_start + mode->hdisplay;
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL,
-+	                     GLAMO_LCD_HV_TOTAL_MASK, mode->htotal);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START,
-+	                     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END,
-+	                     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START,
-+	                     GLAMO_LCD_HV_RETR_DISP_START_MASK, disp_start);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END,
-+	                     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
-+
-+	/* The same in the vertical direction */
-+	retr_start = 0;
-+	retr_end = retr_start + mode->vsync_end - mode->vsync_start;
-+	disp_start = mode->vtotal - mode->vsync_start;
-+	disp_end = disp_start + mode->vdisplay;
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL,
-+	                     GLAMO_LCD_HV_TOTAL_MASK, mode->vtotal);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START,
-+	                     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END,
-+	                     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START,
-+	                     GLAMO_LCD_HV_RETR_DISP_START_MASK, disp_start);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END,
-+	                     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
++	gdrm->saved_clock = mode->clock;
 +
 +	glamo_lcd_cmd_mode(gdrm, 0);
 +
 +	glamo_crtc_mode_set_base(crtc, 0, 0, old_fb);
 +
++	if ( mode->hdisplay == 240 ) {
++		jbt6k74_finish_resolutionchange(JBT_RESOLUTION_QVGA);
++	} else {
++		jbt6k74_finish_resolutionchange(JBT_RESOLUTION_VGA);
++	}
++
++	gcrtc->current_mode = *mode;
++	gcrtc->current_mode_set = 1;
++	gcrtc->current_fb = old_fb;
++
 +	return 0;
 +}
 +
 +
++/* This is not the right place to switch power on/off, because the helper
++ * stuff ends up calling this before/after setting the mode.  We can't
++ * set modes with the display off (although backlight off would be OK) */
++static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode)
++{
++	/* do nothing */
++}
++
++
 +static void glamo_crtc_prepare(struct drm_crtc *crtc)
 +{
 +}
@@ -1537,43 +1678,53 @@ index 0000000..34a665a
 +
 +static int glamo_connector_get_modes(struct drm_connector *connector)
 +{
-+	struct drm_display_mode *mode;
 +	struct glamo_fb_platform_data *fb_info;
 +	struct glamo_output *goutput = to_glamo_output(connector);
 +	struct glamodrm_handle *gdrm = goutput->gdrm;
++	int i;
 +
 +	/* Dig out the record which will tell us about the hardware */
 +	fb_info = gdrm->glamo_core->pdata->fb_data;
 +
-+	mode = drm_mode_create(connector->dev);
-+	if (!mode)
-+		return 0;
-+	/* Fill in 'mode' here */
-+	mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED;
++	for ( i=0; i<fb_info->num_modes; i++ ) {
++
++		struct drm_display_mode *mode;
++
++		mode = drm_mode_create(connector->dev);
++		if ( !mode ) continue;
++
++		mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED;
++
++		/* Convert framebuffer timings into KMS timings.
++		 * First:  ps -> kHz */
++		mode->clock = 1000000000UL / fb_info->modes[i].pixclock;
++		mode->clock *= 1000; /* then kHz -> Hz */
++		mode->hdisplay = fb_info->modes[i].xres;
++		mode->hsync_start = fb_info->modes[i].right_margin
++		                     + mode->hdisplay;
++		mode->hsync_end = mode->hsync_start
++		                     + fb_info->modes[i].hsync_len;
++		mode->htotal = mode->hsync_end + fb_info->modes[i].left_margin;
++		mode->hskew = 0;
 +
-+	/* Convert framebuffer timings into KMS timings */
-+	mode->clock = 1000000000UL / fb_info->modes[0].pixclock; /* ps -> kHz */
-+	mode->clock *= 1000; /* kHz -> Hz */
-+	mode->hdisplay = fb_info->modes[0].xres;
-+	mode->hsync_start = fb_info->modes[0].right_margin + mode->hdisplay;
-+	mode->hsync_end = mode->hsync_start + fb_info->modes[0].hsync_len;
-+	mode->htotal = mode->hsync_end + fb_info->modes[0].left_margin;
-+	mode->hskew = 0;
++		mode->vdisplay = fb_info->modes[i].yres;
++		mode->vsync_start = fb_info->modes[i].lower_margin
++		                     + mode->vdisplay;
++		mode->vsync_end = mode->vsync_start
++		                   + fb_info->modes[i].vsync_len;
++		mode->vtotal = mode->vsync_end + fb_info->modes[i].upper_margin;
++		mode->vscan = 0;
 +
-+	mode->vdisplay = fb_info->modes[0].yres;
-+	mode->vsync_start = fb_info->modes[0].lower_margin + mode->vdisplay;
-+	mode->vsync_end = mode->vsync_start + fb_info->modes[0].vsync_len;
-+	mode->vtotal = mode->vsync_end + fb_info->modes[0].upper_margin;
-+	mode->vscan = 0;
++		/* Physical size */
++		mode->width_mm = fb_info->width;
++		mode->height_mm = fb_info->height;
 +
-+	/* Physical size */
-+	mode->width_mm = fb_info->width;
-+	mode->height_mm = fb_info->height;
++		drm_mode_set_name(mode);
++		drm_mode_probed_add(connector, mode);
 +
-+	drm_mode_set_name(mode);
-+	drm_mode_probed_add(connector, mode);
++	}
 +
-+	return 1;	/* one mode, for now */
++	return fb_info->num_modes;
 +}
 +
 +
@@ -1612,6 +1763,7 @@ index 0000000..34a665a
 +                                 struct drm_display_mode *mode,
 +                                 struct drm_display_mode *adjusted_mode)
 +{
++	if ( mode->clock == 0 ) return false;
 +	return true;
 +}
 +
@@ -1835,8 +1987,8 @@ index 0000000..34a665a
 +	drm_mode_config_init(dev);
 +
 +	dev->mode_config.min_width = 240;
-+	dev->mode_config.min_height = 320;
-+	dev->mode_config.max_width = 480;
++	dev->mode_config.min_height = 240;
++	dev->mode_config.max_width = 640;
 +	dev->mode_config.max_height = 640;
 +
 +	dev->mode_config.funcs = (void *)&glamo_mode_funcs;
@@ -1847,6 +1999,8 @@ index 0000000..34a665a
 +	                   + sizeof(struct drm_connector *), GFP_KERNEL);
 +	if (glamo_crtc == NULL) return 1;
 +	glamo_crtc->gdrm = gdrm;
++	gdrm->crtc = (struct drm_crtc *)glamo_crtc;
++	glamo_crtc->pixel_clock_on = 1;
 +	glamo_crtc->blank_mode = DRM_MODE_DPMS_OFF;
 +	drm_crtc_init(dev, &glamo_crtc->base, &glamo_crtc_funcs);
 +	drm_crtc_helper_add(&glamo_crtc->base, &glamo_crtc_helper_funcs);
@@ -1864,7 +2018,7 @@ index 0000000..34a665a
 +
 +	/* Initialise the connector */
 +	drm_connector_init(dev, connector, &glamo_connector_funcs,
-+	                   DRM_MODE_CONNECTOR_Unknown);
++	                   DRM_MODE_CONNECTOR_LVDS);
 +	drm_sysfs_connector_add(connector);
 +	connector->interlace_allowed = 0;
 +	connector->doublescan_allowed = 0;
@@ -1928,73 +2082,56 @@ index 0000000..34a665a
 +}
 +
 +
++void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode)
++{
++	struct drm_crtc *crtc = gdrm->crtc;
++	struct glamo_crtc *gcrtc = to_glamo_crtc(crtc);
++
++	if ( mode ) {
++		glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD);
++		gcrtc->pixel_clock_on = 1;
++		jbt6k74_setpower(JBT_POWER_MODE_NORMAL);
++		if ( gcrtc->current_mode_set ) {
++			glamo_crtc_mode_set(crtc, &gcrtc->current_mode,
++			                    &gcrtc->current_mode, 0, 0,
++			                    gcrtc->current_fb);
++		}
++	} else {
++		jbt6k74_setpower(JBT_POWER_MODE_OFF);
++		glamo_engine_suspend(gdrm->glamo_core, GLAMO_ENGINE_LCD);
++		gcrtc->pixel_clock_on = 0;
++	}
++}
++
++
 +void glamo_display_suspend(struct glamodrm_handle *gdrm)
 +{
-+	gdrm->saved_width = reg_read_lcd(gdrm, GLAMO_REG_LCD_WIDTH);
-+	gdrm->saved_height = reg_read_lcd(gdrm, GLAMO_REG_LCD_HEIGHT);
-+	gdrm->saved_pitch = reg_read_lcd(gdrm, GLAMO_REG_LCD_PITCH);
-+	gdrm->saved_htotal = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL);
-+	gdrm->saved_hrtrst = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START);
-+	gdrm->saved_hrtren = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END);
-+	gdrm->saved_hdspst = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START);
-+	gdrm->saved_hdspen = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END);
-+	gdrm->saved_vtotal = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL);
-+	gdrm->saved_vrtrst = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START);
-+	gdrm->saved_vrtren = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END);
-+	gdrm->saved_vdspst = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START);
-+	gdrm->saved_vdspen = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END);
++	/* do nothing */
 +}
 +
 +
 +void glamo_display_resume(struct glamodrm_handle *gdrm)
 +{
++	struct drm_crtc *crtc = gdrm->crtc;
++	struct glamo_crtc *gcrtc = to_glamo_crtc(crtc);
++
 +	glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD);
 +	glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_LCD);
 +	glamo_run_lcd_script(gdrm, lcd_init_script,
 +	                           ARRAY_SIZE(lcd_init_script));
 +
-+	/* Restore timings */
-+	glamo_lcd_cmd_mode(gdrm, 1);
-+	glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD,
-+	                     gdrm->saved_clock);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH, GLAMO_LCD_WIDTH_MASK,
-+	                     gdrm->saved_width);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT, GLAMO_LCD_HEIGHT_MASK,
-+	                     gdrm->saved_height);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH, GLAMO_LCD_PITCH_MASK,
-+	                     gdrm->saved_pitch);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL,
-+	                     GLAMO_LCD_HV_TOTAL_MASK, gdrm->saved_htotal);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START,
-+	                     GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_hrtrst);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END,
-+	                     GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_hrtren);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START,
-+	                     GLAMO_LCD_HV_RETR_DISP_START_MASK,
-+	                     gdrm->saved_hdspst);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END,
-+	                     GLAMO_LCD_HV_RETR_DISP_END_MASK,
-+	                     gdrm->saved_hdspen);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL,
-+	                     GLAMO_LCD_HV_TOTAL_MASK, gdrm->saved_vtotal);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START,
-+	                     GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_vrtrst);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END,
-+	                     GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_vrtren);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START,
-+	                     GLAMO_LCD_HV_RETR_DISP_START_MASK,
-+	                     gdrm->saved_vdspst);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END,
-+	                     GLAMO_LCD_HV_RETR_DISP_END_MASK,
-+	                     gdrm->saved_vdspen);
-+	glamo_lcd_cmd_mode(gdrm, 0);
++	if ( gcrtc->current_mode_set ) {
++		glamo_crtc_mode_set(crtc, &gcrtc->current_mode,
++		                    &gcrtc->current_mode, 0, 0,
++		                    gcrtc->current_fb);
++	}
 +}
 diff --git a/drivers/mfd/glamo/glamo-display.h b/drivers/mfd/glamo/glamo-display.h
 new file mode 100644
-index 0000000..d6f21bc
+index 0000000..728bba5
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-display.h
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,41 @@
 +/* Smedia Glamo 336x/337x Display
 + *
 + * Copyright (c) 2008-2009 Thomas White <taw@bitwiz.org.uk>
@@ -2033,13 +2170,15 @@ index 0000000..d6f21bc
 +extern void glamo_display_suspend(struct glamodrm_handle *gdrm);
 +extern void glamo_display_resume(struct glamodrm_handle *gdrm);
 +
++extern void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode);
++
 +#endif /* __GLAMO_DISPLAY_H */
 diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
 new file mode 100644
-index 0000000..f30097e
+index 0000000..774eaff
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-drm-drv.c
-@@ -0,0 +1,444 @@
+@@ -0,0 +1,423 @@
 +/* Smedia Glamo 336x/337x Graphics Driver
 + *
 + * Copyright (C) 2009 Openmoko, Inc. Jorge Luis Zapata <turran@openmoko.com>
@@ -2195,6 +2334,8 @@ index 0000000..f30097e
 +
 +static struct vm_operations_struct glamodrm_gem_vm_ops = {
 +	.fault = glamodrm_gem_fault,
++	.open = drm_gem_vm_open,
++	.close = drm_gem_vm_close,
 +};
 +
 +static struct drm_driver glamodrm_drm_driver = {
@@ -2271,29 +2412,6 @@ index 0000000..f30097e
 +		goto out_release_regs;
 +	}
 +
-+	/* Find the command queue itself */
-+	gdrm->cmdq = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-+	                                          "glamo-command-queue");
-+	if ( !gdrm->cmdq ) {
-+		dev_err(&pdev->dev, "Unable to find command queue.\n");
-+		rc = -ENOENT;
-+		goto out_unmap_regs;
-+	}
-+	gdrm->cmdq = request_mem_region(gdrm->cmdq->start,
-+	                                resource_size(gdrm->cmdq), pdev->name);
-+	if ( !gdrm->cmdq ) {
-+		dev_err(&pdev->dev, "failed to request command queue region\n");
-+		rc = -ENOENT;
-+		goto out_unmap_regs;
-+	}
-+	gdrm->cmdq_base = ioremap_nocache(gdrm->cmdq->start,
-+	                                  resource_size(gdrm->cmdq));
-+	if ( !gdrm->cmdq_base ) {
-+		dev_err(&pdev->dev, "failed to ioremap() command queue\n");
-+		rc = -ENOENT;
-+		goto out_release_cmdq;
-+	}
-+
 +	/* Find the VRAM */
 +	gdrm->vram = platform_get_resource_byname(pdev, IORESOURCE_MEM,
 +	                                          "glamo-fb-mem");
@@ -2389,7 +2507,7 @@ index 0000000..f30097e
 +	release_mem_region(gdrm->reg->start, resource_size(gdrm->reg));
 +out_free:
 +	kfree(gdrm);
-+	pdev->dev.driver_data = NULL;
++	dev_set_drvdata(&pdev->dev, NULL);
 +	return rc;
 +}
 +
@@ -2486,10 +2604,10 @@ index 0000000..f30097e
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h
 new file mode 100644
-index 0000000..7949a2e
+index 0000000..75f2757
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-drm-private.h
-@@ -0,0 +1,156 @@
+@@ -0,0 +1,166 @@
 +/* Smedia Glamo 336x/337x DRM private bits
 + *
 + * Copyright (C) 2008-2009 Thomas White <taw@bitwiz.org.uk>
@@ -2553,8 +2671,8 @@ index 0000000..7949a2e
 +	struct resource *vram;
 +
 +	/* Command queue region */
-+	struct resource *cmdq;
 +	char __iomem *cmdq_base;
++	unsigned long cmdq_offs;
 +
 +	/* LCD controller registers */
 +	struct resource *lcd_regs;
@@ -2598,6 +2716,9 @@ index 0000000..7949a2e
 +
 +	/* A scratch block */
 +	struct drm_mm_node *scratch;
++
++	/* We only have one */
++	struct drm_crtc *crtc;
 +};
 +
 +
@@ -2610,11 +2731,18 @@ index 0000000..7949a2e
 +
 +
 +struct glamo_crtc {
++
 +	struct drm_crtc base;
 +	struct glamodrm_handle *gdrm;
 +	/* a mode_set for fbdev users on this crtc */
 +	struct drm_mode_set mode_set;
 +	int blank_mode;
++
++	int pixel_clock_on;
++
++	int current_mode_set;
++	struct drm_display_mode current_mode;
++	struct drm_framebuffer *current_fb;
 +};
 +
 +
@@ -3024,10 +3152,10 @@ index 0000000..deda995
 +#endif /* __GLAMO_FENCE_H */
 diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c
 new file mode 100644
-index 0000000..61cd605
+index 0000000..d76dd24
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-kms-fb.c
-@@ -0,0 +1,540 @@
+@@ -0,0 +1,493 @@
 +/*
 + * SMedia Glamo 336x/337x KMS Framebuffer
 + *
@@ -3207,37 +3335,35 @@ index 0000000..61cd605
 +	struct drm_device *dev = par->dev;
 +	struct fb_var_screeninfo *var = &info->var;
 +	int i;
++	struct drm_crtc *crtc;
++	int ret;
 +
 +	DRM_DEBUG("%d %d\n", var->xres, var->pixclock);
 +
 +	if (var->pixclock != -1) {
++		DRM_ERROR("Warning: userspace gave me a pixel clock value (%i)"
++		          "- I'm ignoring it.\n", var->pixclock);
++	}
 +
-+		DRM_ERROR("PIXEL CLOCK SET\n");
-+		return -EINVAL;
-+	} else {
-+		struct drm_crtc *crtc;
-+		int ret;
-+
-+		list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-+			struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc);
++	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
++		struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc);
 +
-+			for (i = 0; i < par->crtc_count; i++)
-+				if (crtc->base.id == par->crtc_ids[i])
-+					break;
++		for (i = 0; i < par->crtc_count; i++)
++			if (crtc->base.id == par->crtc_ids[i])
++				break;
 +
-+			if (i == par->crtc_count)
-+				continue;
++		if (i == par->crtc_count)
++			continue;
 +
-+			if (crtc->fb == glamo_crtc->mode_set.fb) {
-+				mutex_lock(&dev->mode_config.mutex);
-+				ret = crtc->funcs->set_config(&glamo_crtc->mode_set);
-+				mutex_unlock(&dev->mode_config.mutex);
-+				if (ret)
-+					return ret;
-+			}
++		if (crtc->fb == glamo_crtc->mode_set.fb) {
++			mutex_lock(&dev->mode_config.mutex);
++			ret = crtc->funcs->set_config(&glamo_crtc->mode_set);
++			mutex_unlock(&dev->mode_config.mutex);
++			if (ret)
++				return ret;
 +		}
-+		return 0;
 +	}
++	return 0;
 +}
 +
 +static int glamofb_pan_display(struct fb_var_screeninfo *var,
@@ -3283,64 +3409,20 @@ index 0000000..61cd605
 +{
 +	struct glamofb_par *par = info->par;
 +	struct drm_device *dev = par->dev;
-+	struct drm_crtc *crtc;
-+	struct drm_encoder *encoder;
-+	int i;
-+
-+	/*
-+	 * For each CRTC in this fb, find all associated encoders
-+	 * and turn them off, then turn off the CRTC.
-+	 */
-+	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-+		struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-+
-+		for (i = 0; i < par->crtc_count; i++)
-+			if (crtc->base.id == par->crtc_ids[i])
-+				break;
++	struct glamodrm_handle *gdrm = dev->dev_private;
 +
-+		crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
++	gdrm = dev->dev_private;
 +
-+		/* Found a CRTC on this fb, now find encoders */
-+		list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-+			if (encoder->crtc == crtc) {
-+				struct drm_encoder_helper_funcs *encoder_funcs;
-+				encoder_funcs = encoder->helper_private;
-+				encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
-+			}
-+		}
-+	}
++	glamo_lcd_power(gdrm, 1);
 +}
 +
 +static void glamofb_off(struct fb_info *info, int dpms_mode)
 +{
 +	struct glamofb_par *par = info->par;
 +	struct drm_device *dev = par->dev;
-+	struct drm_crtc *crtc;
-+	struct drm_encoder *encoder;
-+	int i;
-+
-+	/*
-+	 * For each CRTC in this fb, find all associated encoders
-+	 * and turn them off, then turn off the CRTC.
-+	 */
-+	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-+		struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-+
-+		for (i = 0; i < par->crtc_count; i++)
-+			if (crtc->base.id == par->crtc_ids[i])
-+				break;
++	struct glamodrm_handle *gdrm = dev->dev_private;
 +
-+		/* Found a CRTC on this fb, now find encoders */
-+		list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-+			if (encoder->crtc == crtc) {
-+				struct drm_encoder_helper_funcs *encoder_funcs;
-+				encoder_funcs = encoder->helper_private;
-+				encoder_funcs->dpms(encoder, dpms_mode);
-+			}
-+		}
-+		if (dpms_mode == DRM_MODE_DPMS_OFF)
-+			crtc_funcs->dpms(crtc, dpms_mode);
-+	}
++	glamo_lcd_power(gdrm, 0);
 +}
 +
 +static int glamofb_blank(int blank, struct fb_info *info)
@@ -3459,9 +3541,6 @@ index 0000000..61cd605
 +	info->fbops = &glamofb_ops;
 +
 +	info->fix.line_length = fb->pitch;
-+	info->fix.smem_start = dev->mode_config.fb_base
-+	                        + (unsigned long) gdrm->vram->start;
-+	info->fix.smem_len = size;
 +
 +	info->flags = FBINFO_DEFAULT;
 +
@@ -3473,6 +3552,8 @@ index 0000000..61cd605
 +		ret = -ENOSPC;
 +		goto out_unref;
 +	}
++	info->fix.smem_start = (unsigned long)gdrm->vram->start + offs;
++	info->fix.smem_len = size;
 +	info->screen_size = size;
 +
 +	info->pseudo_palette = fb->pseudo_palette;
@@ -3784,5 +3865,5 @@ index 0000000..4c194dc
 +
 +#endif
 -- 
-1.6.6.1
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.32/0009-A-couple-of-GEM-refcounting-fixes.patch b/recipes/linux/linux-openmoko-2.6.32/0009-A-couple-of-GEM-refcounting-fixes.patch
deleted file mode 100644
index 7fb2fa8762..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0009-A-couple-of-GEM-refcounting-fixes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 75e660e406cd4941f253ddbdeaa45f59d107a014 Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Sun, 7 Feb 2010 13:27:20 +0100
-Subject: [PATCH 9/9] A couple of GEM refcounting fixes
-
-This allows GEM objects to be freed properly, which wasn't working before.
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
----
- drivers/mfd/glamo/glamo-buffer.c  |    2 ++
- drivers/mfd/glamo/glamo-drm-drv.c |    2 ++
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-buffer.c b/drivers/mfd/glamo/glamo-buffer.c
-index 45500d3..82ea0c0 100644
---- a/drivers/mfd/glamo/glamo-buffer.c
-+++ b/drivers/mfd/glamo/glamo-buffer.c
-@@ -245,6 +245,8 @@ int glamo_ioctl_gem_mmap(struct drm_device *dev, void *data,
- 	if (!gobj->mmap_offset) {
- 		ret = glamo_gem_create_mmap_offset(obj);
- 		if (ret) {
-+			printk(KERN_CRIT "Couldn't create mmap offset\n");
-+			drm_gem_object_unreference(obj);
- 			mutex_unlock(&dev->struct_mutex);
- 			return ret;
- 		}
-diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
-index 1907a47..e7220d5 100644
---- a/drivers/mfd/glamo/glamo-drm-drv.c
-+++ b/drivers/mfd/glamo/glamo-drm-drv.c
-@@ -153,6 +153,8 @@ static int glamodrm_unload(struct drm_device *dev)
- 
- static struct vm_operations_struct glamodrm_gem_vm_ops = {
- 	.fault = glamodrm_gem_fault,
-+	.open = drm_gem_vm_open,
-+	.close = drm_gem_vm_close,
- };
- 
- static struct drm_driver glamodrm_drm_driver = {
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0004-Work-on-Glamo-core-for-DRM.patch b/recipes/linux/linux-openmoko-2.6.32/0009-Work-on-Glamo-core-for-DRM.patch
index 2bddd1758a..79b0ea4e0f 100644
--- a/recipes/linux/linux-openmoko-2.6.32/0004-Work-on-Glamo-core-for-DRM.patch
+++ b/recipes/linux/linux-openmoko-2.6.32/0009-Work-on-Glamo-core-for-DRM.patch
@@ -1,24 +1,24 @@
-From eb0614d6a8a879bd3ac69050b3f5b012ef562b9e Mon Sep 17 00:00:00 2001
+From 8cdc10f17ecd42c9f71f7f4a657d979ab20f9e26 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Tue, 17 Nov 2009 23:45:29 +0100
-Subject: [PATCH 4/9] Work on Glamo-core for DRM
+Subject: [PATCH 09/14] Work on Glamo-core for DRM
 
 This adds modifications to the core of the Glamo driver to expose functionality
 to support DRM and KMS.
 
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
 ---
- drivers/mfd/glamo/glamo-core.c |   33 +++++++++++++++++++++++++++------
- drivers/mfd/glamo/glamo-core.h |   35 +++++++++++++++++++++++++----------
+ drivers/mfd/glamo/glamo-core.c |   27 +++++++++++++++++++++------
+ drivers/mfd/glamo/glamo-core.h |   32 ++++++++++++++++++++++----------
  drivers/mfd/glamo/glamo-regs.h |   24 ++++++++++++++++++++++++
  include/linux/mfd/glamo.h      |    7 ++-----
- 4 files changed, 78 insertions(+), 21 deletions(-)
+ 4 files changed, 69 insertions(+), 21 deletions(-)
 
 diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 82a906a..a614d44 100644
+index 82a906a..74da668 100644
 --- a/drivers/mfd/glamo/glamo-core.c
 +++ b/drivers/mfd/glamo/glamo-core.c
-@@ -221,10 +221,31 @@ static struct resource glamo_fb_resources[] = {
+@@ -221,10 +221,25 @@ static struct resource glamo_fb_resources[] = {
  		.flags	= IORESOURCE_MEM,
  	}, {
  		.name	= "glamo-fb-mem",
@@ -34,12 +34,6 @@ index 82a906a..a614d44 100644
 +		.end    = GLAMO_REGOFS_RISC - 1,
 +		.flags  = IORESOURCE_MEM,
 +	}, {
-+		.name	= "glamo-command-queue",
-+		.start  = GLAMO_MEM_BASE + GLAMO_OFFSET_CMDQ,
-+		.end    = GLAMO_MEM_BASE + GLAMO_OFFSET_CMDQ +
-+			  GLAMO_CMDQ_SIZE - 1,
-+		.flags  = IORESOURCE_MEM,
-+	}, {
 +		.name	= "glamo-2d-regs",
 +		.start  = GLAMO_REGOFS_2D,
 +		.end    = GLAMO_REGOFS_3D- 1,
@@ -53,7 +47,7 @@ index 82a906a..a614d44 100644
  };
  
  static struct resource glamo_mmc_resources[] = {
-@@ -235,9 +256,9 @@ static struct resource glamo_mmc_resources[] = {
+@@ -235,9 +250,9 @@ static struct resource glamo_mmc_resources[] = {
  		.flags	= IORESOURCE_MEM
  	}, {
  		.name	= "glamo-mmc-mem",
@@ -67,10 +61,10 @@ index 82a906a..a614d44 100644
  	}, {
  		.start	= GLAMO_IRQ_MMC,
 diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index 17017b0..d21bdc4 100644
+index 17017b0..0adba96 100644
 --- a/drivers/mfd/glamo/glamo-core.h
 +++ b/drivers/mfd/glamo/glamo-core.h
-@@ -3,18 +3,33 @@
+@@ -3,18 +3,30 @@
  
  #include <linux/mfd/glamo.h>
  
@@ -80,12 +74,10 @@ index 17017b0..d21bdc4 100644
 +/* Arbitrarily determined amount for the hardware cursor */
 +#define GLAMO_CURSOR_SIZE (4096)
 +#define GLAMO_MMC_BUFFER_SIZE (64 * 1024) /* 64k MMC buffer */
-+#define GLAMO_CMDQ_SIZE (128 * 1024)    /* 128k ring buffer */
 +/* Remaining memory will be used for 2D and 3D graphics */
 +#define GLAMO_FB_SIZE (GLAMO_INTERNAL_RAM_SIZE     \
 +			 - GLAMO_CURSOR_SIZE       \
-+			 - GLAMO_MMC_BUFFER_SIZE   \
-+			 - GLAMO_CMDQ_SIZE)
++			 - GLAMO_MMC_BUFFER_SIZE)
 +/* A 640x480, 16bpp, double-buffered framebuffer */
 +#if (GLAMO_FB_SIZE < (640 * 480 * 4))	/* == 0x12c000 */
 +#error Not enough Glamo VRAM for framebuffer!
@@ -110,7 +102,6 @@ index 17017b0..d21bdc4 100644
 +#define GLAMO_OFFSET_FB		(0x000000)
 +#define GLAMO_OFFSET_CURSOR	(GLAMO_OFFSET_FB + GLAMO_FB_SIZE)
 +#define GLAMO_OFFSET_MMC	(GLAMO_OFFSET_CURSOR + GLAMO_CURSOR_SIZE)
-+#define GLAMO_OFFSET_CMDQ	(GLAMO_OFFSET_MMC + GLAMO_MMC_BUFFER_SIZE)
  
  enum glamo_pll {
      GLAMO_PLL1,
@@ -167,5 +158,5 @@ index 529d4f0..ea91a06 100644
 +
  #endif
 -- 
-1.6.6.1
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.32/0010-JBT6k74-work-for-KMS.patch b/recipes/linux/linux-openmoko-2.6.32/0010-JBT6k74-work-for-KMS.patch
new file mode 100644
index 0000000000..2105ab60aa
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32/0010-JBT6k74-work-for-KMS.patch
@@ -0,0 +1,540 @@
+From 5788c7777a6fa63dc56093277ae14c4dac4ee6cb Mon Sep 17 00:00:00 2001
+From: Thomas White <taw@bitwiz.org.uk>
+Date: Sat, 21 Nov 2009 21:42:16 +0100
+Subject: [PATCH 10/14] JBT6k74 work for KMS
+
+This simplifies the JBT6k74 driver, and adds hooks for the Glamo driver to cooperate
+more closely with it.
+
+Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+---
+ drivers/video/backlight/jbt6k74.c |  252 ++++++++++++++++++------------------
+ include/linux/jbt6k74.h           |   17 +++-
+ 2 files changed, 142 insertions(+), 127 deletions(-)
+
+diff --git a/drivers/video/backlight/jbt6k74.c b/drivers/video/backlight/jbt6k74.c
+index 8450904..91651e7 100644
+--- a/drivers/video/backlight/jbt6k74.c
++++ b/drivers/video/backlight/jbt6k74.c
+@@ -101,20 +101,10 @@ enum jbt_register {
+ 	JBT_REG_HCLOCK_QVGA		= 0xed,
+ };
+ 
+-enum jbt_resolution {
+-	JBT_RESOLUTION_VGA,
+-	JBT_RESOLUTION_QVGA,
+-};
+-
+-enum jbt_power_mode {
+-	JBT_POWER_MODE_DEEP_STANDBY,
+-	JBT_POWER_MODE_SLEEP,
+-	JBT_POWER_MODE_NORMAL,
+-};
+ 
+ static const char *jbt_power_mode_names[] = {
+-	[JBT_POWER_MODE_DEEP_STANDBY]	= "deep-standby",
+-	[JBT_POWER_MODE_SLEEP]		= "sleep",
++	[JBT_POWER_MODE_OFF]		= "off",
++	[JBT_POWER_MODE_STANDBY]	= "standby",
+ 	[JBT_POWER_MODE_NORMAL]		= "normal",
+ };
+ 
+@@ -123,6 +113,7 @@ static const char *jbt_resolution_names[] = {
+ 	[JBT_RESOLUTION_QVGA] = "qvga",
+ };
+ 
++
+ struct jbt_info {
+ 	struct mutex lock;		/* protects this structure */
+ 	enum jbt_resolution resolution;
+@@ -141,6 +132,8 @@ struct jbt_info {
+ 	uint16_t reg_cache[0xEE];
+ };
+ 
++struct jbt_info *jbt_global;
++
+ #define JBT_COMMAND	0x000
+ #define JBT_DATA	0x100
+ 
+@@ -156,6 +149,8 @@ static int jbt_reg_write_nodata(struct jbt_info *jbt, uint8_t reg)
+ 	else
+ 		dev_err(&jbt->spi->dev, "Write failed: %d\n", ret);
+ 
++	mdelay(1);
++
+ 	return ret;
+ }
+ 
+@@ -173,6 +168,8 @@ static int jbt_reg_write(struct jbt_info *jbt, uint8_t reg, uint8_t data)
+ 	else
+ 		dev_err(&jbt->spi->dev, "Write failed: %d\n", ret);
+ 
++	mdelay(1);
++
+ 	return ret;
+ }
+ 
+@@ -191,6 +188,8 @@ static int jbt_reg_write16(struct jbt_info *jbt, uint8_t reg, uint16_t data)
+ 	else
+ 		dev_err(&jbt->spi->dev, "Write failed: %d\n", ret);
+ 
++	mdelay(1);
++
+ 	return ret;
+ }
+ 
+@@ -218,7 +217,7 @@ static int jbt_init_regs(struct jbt_info *jbt)
+ 	 * to avoid red / blue flicker
+ 	 */
+ 	ret |= jbt_reg_write(jbt, JBT_REG_ASW_SLEW, 0x00 | (1 << 5));
+-	ret |= jbt_reg_write(jbt, JBT_REG_DUMMY_DISPLAY, 0x00);
++	ret |= jbt_reg_write(jbt, JBT_REG_DUMMY_DISPLAY, 0xff);
+ 
+ 	ret |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_A, 0x11);
+ 	ret |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_B, 0x11);
+@@ -260,14 +259,18 @@ static int jbt_init_regs(struct jbt_info *jbt)
+ 	return ret ? -EIO : 0;
+ }
+ 
+-static int jbt_standby_to_sleep(struct jbt_info *jbt)
++
++static int jbt_off_to_normal(struct jbt_info *jbt)
+ {
+ 	int ret;
++
+ 	struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data;
+ 
+ 	gpio_set_value_cansleep(pdata->gpio_reset, 1);
+ 	ret = regulator_bulk_enable(ARRAY_SIZE(jbt->supplies), jbt->supplies);
+ 
++	mdelay(120);
++
+ 	/* three times command zero */
+ 	ret |= jbt_reg_write_nodata(jbt, 0x00);
+ 	mdelay(1);
+@@ -279,18 +282,11 @@ static int jbt_standby_to_sleep(struct jbt_info *jbt)
+ 	/* deep standby out */
+ 	ret |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x11);
+ 	mdelay(1);
+-	ret = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x28);
++	ret |= jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x28);
+ 
+ 	/* (re)initialize register set */
+ 	ret |= jbt_init_regs(jbt);
+ 
+-	return ret ? -EIO : 0;
+-}
+-
+-static int jbt_sleep_to_normal(struct jbt_info *jbt)
+-{
+-	int ret;
+-
+ 	/* Make sure we are 120 ms after SLEEP_OUT */
+ 	if (time_before(jiffies, jbt->next_sleep))
+ 		mdelay(jiffies_to_msecs(jbt->next_sleep - jiffies));
+@@ -320,6 +316,7 @@ static int jbt_sleep_to_normal(struct jbt_info *jbt)
+ 
+ 	/* Sleep mode off */
+ 	ret |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
++
+ 	jbt->next_sleep = jiffies + msecs_to_jiffies(120);
+ 
+ 	/* Allow the booster and display controller to restart stably */
+@@ -328,45 +325,68 @@ static int jbt_sleep_to_normal(struct jbt_info *jbt)
+ 	return ret ? -EIO : 0;
+ }
+ 
+-static int jbt_normal_to_sleep(struct jbt_info *jbt)
++static int jbt_normal_to_off(struct jbt_info *jbt)
+ {
+ 	int ret;
++	struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data;
+ 
+-	/* Make sure we are 120 ms after SLEEP_OUT */
+-	while (time_before(jiffies, jbt->next_sleep))
+-		cpu_relax();
++	/* Pull the plug! */
++	ret = regulator_bulk_disable(ARRAY_SIZE(jbt->supplies),
++	                             jbt->supplies);
+ 
++	if (!ret)
++		gpio_set_value_cansleep(pdata->gpio_reset, 0);
++
++	return ret ? -EIO : 0;
++}
++
++
++static int jbt_normal_to_standby(struct jbt_info *jbt)
++{
++	int ret;
++
++	if ( jbt->power_mode != JBT_POWER_MODE_NORMAL ) return 0;
++
++	/* Make sure we are 120 ms after SLEEP_{IN,OUT} */
++	while (time_before(jiffies, jbt->next_sleep)) cpu_relax();
++
++	/* Sleep mode on */
+ 	ret = jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
+ 	ret |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0x8000 | 1 << 3);
++
+ 	ret |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_IN);
+-	jbt->next_sleep = jiffies + msecs_to_jiffies(120);
++	jbt->next_sleep = jiffies + msecs_to_jiffies(150);
+ 
+-	/* Allow the internal circuits to stop automatically */
+-	mdelay(5);
++	jbt->power_mode = JBT_POWER_MODE_STANDBY;
+ 
+ 	return ret ? -EIO : 0;
+ }
+ 
+-static int jbt_sleep_to_standby(struct jbt_info *jbt)
++
++static int jbt_standby_to_normal(struct jbt_info *jbt)
+ {
+ 	int ret;
+-	struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data;
+ 
+-	ret = jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x00);
++	if ( jbt->power_mode != JBT_POWER_MODE_STANDBY ) return 0;
+ 
+-	if (!ret)
+-		ret = regulator_bulk_disable(ARRAY_SIZE(jbt->supplies), jbt->supplies);
++	/* Make sure we are 120 ms after SLEEP_{IN,OUT} */
++	while (time_before(jiffies, jbt->next_sleep)) cpu_relax();
+ 
+-	if (!ret)
+-		gpio_set_value_cansleep(pdata->gpio_reset, 0);
++	ret = jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
++	jbt->next_sleep = jiffies + msecs_to_jiffies(150);
+ 
+-	return ret;
++	ret |= jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_ON);
++	ret |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0xdff9);
++
++	jbt->power_mode = JBT_POWER_MODE_NORMAL;
++
++	return ret ? -EIO : 0;
+ }
+ 
++
+ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
+ 					enum jbt_power_mode new_mode)
+ {
+-	struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data;
+ 	int ret = -EINVAL;
+ 
+ 	dev_dbg(&jbt->spi->dev, "entering (old_state=%s, new_state=%s)\n",
+@@ -375,49 +395,17 @@ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
+ 
+ 	mutex_lock(&jbt->lock);
+ 
+-	if (jbt->suspended) {
+-		switch (new_mode) {
+-		case JBT_POWER_MODE_DEEP_STANDBY:
+-		case JBT_POWER_MODE_SLEEP:
+-		case JBT_POWER_MODE_NORMAL:
+-			ret = 0;
+-			jbt->suspend_mode = new_mode;
+-			break;
+-		default:
+-			break;
+-		}
+-	} else if (new_mode == JBT_POWER_MODE_NORMAL &&
+-			pdata->enable_pixel_clock) {
+-		pdata->enable_pixel_clock(&jbt->spi->dev, 1);
+-	}
+-
+ 	switch (jbt->power_mode) {
+-	case JBT_POWER_MODE_DEEP_STANDBY:
++	case JBT_POWER_MODE_OFF:
+ 		switch (new_mode) {
+-		case JBT_POWER_MODE_DEEP_STANDBY:
++		case JBT_POWER_MODE_OFF:
+ 			ret = 0;
+ 			break;
+-		case JBT_POWER_MODE_SLEEP:
+-			ret = jbt_standby_to_sleep(jbt);
+-			break;
+ 		case JBT_POWER_MODE_NORMAL:
+-			/* first transition into sleep */
+-			ret = jbt_standby_to_sleep(jbt);
+-			/* then transition into normal */
+-			ret |= jbt_sleep_to_normal(jbt);
++			ret = jbt_off_to_normal(jbt);
+ 			break;
+-		}
+-		break;
+-	case JBT_POWER_MODE_SLEEP:
+-		switch (new_mode) {
+-		case JBT_POWER_MODE_SLEEP:
+-			ret = 0;
+-			break;
+-		case JBT_POWER_MODE_DEEP_STANDBY:
+-			ret = jbt_sleep_to_standby(jbt);
+-			break;
+-		case JBT_POWER_MODE_NORMAL:
+-			ret = jbt_sleep_to_normal(jbt);
++		case JBT_POWER_MODE_STANDBY:
++			ret = -EINVAL;
+ 			break;
+ 		}
+ 		break;
+@@ -426,25 +414,23 @@ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
+ 		case JBT_POWER_MODE_NORMAL:
+ 			ret = 0;
+ 			break;
+-		case JBT_POWER_MODE_DEEP_STANDBY:
+-			/* first transition into sleep */
+-			ret = jbt_normal_to_sleep(jbt);
+-			/* then transition into deep standby */
+-			ret |= jbt_sleep_to_standby(jbt);
++		case JBT_POWER_MODE_OFF:
++			ret = jbt_normal_to_off(jbt);
+ 			break;
+-		case JBT_POWER_MODE_SLEEP:
+-			ret = jbt_normal_to_sleep(jbt);
++		case JBT_POWER_MODE_STANDBY:
++			ret = -EINVAL;
+ 			break;
+ 		}
++		break;
++	case JBT_POWER_MODE_STANDBY:
++		ret = -EINVAL;
++		break;
+ 	}
+ 
+ 	if (ret == 0) {
+ 		jbt->power_mode = new_mode;
+-		if (new_mode != JBT_POWER_MODE_NORMAL &&
+-			pdata->enable_pixel_clock)
+-			pdata->enable_pixel_clock(&jbt->spi->dev, 0);
+ 	} else {
+-		dev_err(&jbt->spi->dev, "Failed enter state '%s': %d\n",
++		dev_err(&jbt->spi->dev, "Failed to enter state '%s': %d\n",
+ 				jbt_power_mode_names[new_mode], ret);
+ 	}
+ 
+@@ -456,28 +442,46 @@ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
+ static int jbt6k74_set_resolution(struct jbt_info *jbt,
+ 					enum jbt_resolution new_resolution)
+ {
++	int old_resolution;
+ 	int ret = 0;
+-	enum jbt_resolution old_resolution;
++
++	if ( !jbt ) return -1;
+ 
+ 	mutex_lock(&jbt->lock);
+ 
+-	if (jbt->resolution == new_resolution)
+-		goto out_unlock;
++	if ( jbt->resolution == new_resolution ) goto out_unlock;
++	if ( jbt->power_mode == JBT_POWER_MODE_OFF ) goto out_unlock;
+ 
+ 	old_resolution = jbt->resolution;
+ 	jbt->resolution = new_resolution;
+ 
+-	if (jbt->power_mode == JBT_POWER_MODE_NORMAL) {
++	if ( jbt->power_mode == JBT_POWER_MODE_NORMAL ) {
++
++		ret = jbt_normal_to_standby(jbt);
++
++		mdelay(25);
+ 
+-		/* first transition into sleep */
+-		ret = jbt_normal_to_sleep(jbt);
+-		ret |= jbt_sleep_to_normal(jbt);
++		if (jbt->resolution == JBT_RESOLUTION_VGA) {
++			/* Quad mode off */
++			ret |= jbt_reg_write(jbt, JBT_REG_QUAD_RATE, 0x00);
++			ret = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x80);
++		} else {
++			/* Quad mode on */
++			ret |= jbt_reg_write(jbt, JBT_REG_QUAD_RATE, 0x22);
++			ret = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x81);
++		}
++
++		mdelay(25);
++
++		ret |= jbt_standby_to_normal(jbt);
+ 
+ 		if (ret) {
+ 			jbt->resolution = old_resolution;
+-			dev_err(&jbt->spi->dev, "Failed to set resolution '%s')\n",
++			dev_err(&jbt->spi->dev,
++			        "Failed to set resolution '%s')\n",
+ 				jbt_resolution_names[new_resolution]);
+ 		}
++
+ 	}
+ 
+ out_unlock:
+@@ -589,7 +593,7 @@ static ssize_t reset_write(struct device *dev, struct device_attribute *attr,
+ 
+ 	mutex_unlock(&jbt->lock);
+ 
+-	jbt->power_mode = JBT_POWER_MODE_DEEP_STANDBY;
++	jbt->power_mode = JBT_POWER_MODE_OFF;
+ 	jbt6k74_enter_power_mode(jbt, old_power_mode);
+ 
+ 	return count;
+@@ -616,27 +620,6 @@ static struct attribute_group jbt_attr_group = {
+ 	.attrs	= jbt_sysfs_entries,
+ };
+ 
+-/* FIXME: This in an ugly hack to delay display blanking.
+-  When the jbt is in sleep mode it displays an all white screen and thus one
+-  will a see a short flash.
+-  By delaying the blanking we will give the backlight a chance to turn off and
+-  thus avoid getting the flash */
+-static void jbt_blank_worker(struct work_struct *work)
+-{
+-	struct jbt_info *jbt  = container_of(work, struct jbt_info,
+-						blank_work.work);
+-
+-	switch (jbt->blank_mode) {
+-	case FB_BLANK_NORMAL:
+-		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_SLEEP);
+-		break;
+-	case FB_BLANK_POWERDOWN:
+-		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_DEEP_STANDBY);
+-		break;
+-	default:
+-		break;
+-	}
+-}
+ 
+ static int jbt6k74_set_mode(struct lcd_device *ld, struct fb_videomode *m)
+ {
+@@ -649,7 +632,7 @@ static int jbt6k74_set_mode(struct lcd_device *ld, struct fb_videomode *m)
+ 		ret = jbt6k74_set_resolution(jbt, JBT_RESOLUTION_VGA);
+ 	} else {
+ 		dev_err(&jbt->spi->dev, "Unknown resolution.\n");
+-		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_SLEEP);
++		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
+ 	}
+ 
+ 	return ret;
+@@ -671,11 +654,11 @@ static int jbt6k74_set_power(struct lcd_device *ld, int power)
+ 		break;
+ 	case FB_BLANK_NORMAL:
+ 		dev_dbg(&jbt->spi->dev, "blank\n");
+-		ret = schedule_delayed_work(&jbt->blank_work, HZ);
++		ret = jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
+ 		break;
+ 	case FB_BLANK_POWERDOWN:
+ 		dev_dbg(&jbt->spi->dev, "powerdown\n");
+-		ret = schedule_delayed_work(&jbt->blank_work, HZ);
++		ret = jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
+ 		break;
+ 	default:
+ 		break;
+@@ -691,10 +674,10 @@ static int jbt6k74_get_power(struct lcd_device *ld)
+ 	switch (jbt->power_mode) {
+ 	case JBT_POWER_MODE_NORMAL:
+ 		return FB_BLANK_UNBLANK;
+-	case JBT_POWER_MODE_SLEEP:
++	case JBT_POWER_MODE_OFF:
+ 		return FB_BLANK_NORMAL;
+ 	default:
+-		return JBT_POWER_MODE_DEEP_STANDBY;
++		return JBT_POWER_MODE_OFF;
+ 	}
+ }
+ 
+@@ -728,6 +711,8 @@ static int __devinit jbt_probe(struct spi_device *spi)
+ 	if (!jbt)
+ 		return -ENOMEM;
+ 
++	jbt_global = jbt;
++
+ 	jbt->spi = spi;
+ 
+ 	jbt->lcd_dev = lcd_device_register("jbt6k74-lcd", &spi->dev, jbt,
+@@ -738,11 +723,9 @@ static int __devinit jbt_probe(struct spi_device *spi)
+ 		goto err_free_drvdata;
+ 	}
+ 
+-	INIT_DELAYED_WORK(&jbt->blank_work, jbt_blank_worker);
+-
+ 	jbt->resolution = JBT_RESOLUTION_VGA;
+-	jbt->power_mode = JBT_POWER_MODE_DEEP_STANDBY;
+ 	jbt->next_sleep = jiffies + msecs_to_jiffies(120);
++	jbt->power_mode = JBT_POWER_MODE_OFF;
+ 	mutex_init(&jbt->lock);
+ 
+ 	dev_set_drvdata(&spi->dev, jbt);
+@@ -831,6 +814,24 @@ static int __devexit jbt_remove(struct spi_device *spi)
+ 	return 0;
+ }
+ 
++/* Begin horrible layering violations in the interest of making stuff work */
++
++int jbt6k74_finish_resolutionchange(enum jbt_resolution new_resolution)
++{
++	if ( !jbt_global ) return 0;
++	return jbt6k74_set_resolution(jbt_global, new_resolution);
++}
++EXPORT_SYMBOL_GPL(jbt6k74_finish_resolutionchange);
++
++void jbt6k74_setpower(enum jbt_power_mode new_power)
++{
++	if ( !jbt_global ) return;
++	jbt6k74_enter_power_mode(jbt_global, new_power);
++}
++EXPORT_SYMBOL_GPL(jbt6k74_setpower);
++
++/* End horrible layering violations */
++
+ #ifdef CONFIG_PM
+ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
+ {
+@@ -838,8 +839,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
+ 
+ 	jbt->suspend_mode = jbt->power_mode;
+ 
+-	jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_DEEP_STANDBY);
+-	jbt->suspended = 1;
++	jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
+ 
+ 	dev_info(&spi->dev, "suspended\n");
+ 
+diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h
+index 75488c4..2010bdc 100644
+--- a/include/linux/jbt6k74.h
++++ b/include/linux/jbt6k74.h
+@@ -3,6 +3,22 @@
+ 
+ #include <linux/spi/spi.h>
+ 
++enum jbt_resolution {
++	JBT_RESOLUTION_VGA,
++	JBT_RESOLUTION_QVGA,
++};
++
++enum jbt_power_mode {
++	JBT_POWER_MODE_OFF,
++	JBT_POWER_MODE_STANDBY,
++	JBT_POWER_MODE_NORMAL,
++};
++
++extern void jbt6k74_setpower(enum jbt_power_mode new_power);
++extern int jbt6k74_prepare_resolutionchange(enum jbt_resolution new_resolution);
++extern int jbt6k74_finish_resolutionchange(enum jbt_resolution new_resolution);
++
++
+ /*
+  *  struct jbt6k74_platform_data - Platform data for jbt6k74 driver
+  *  @probe_completed: Callback to be called when the driver has been
+@@ -13,7 +29,6 @@
+  */
+ struct jbt6k74_platform_data {
+ 	void (*probe_completed)(struct device *dev);
+-	void (*enable_pixel_clock)(struct device *dev, int enable);
+ 
+ 	int gpio_reset;
+ };
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.32/0010-Simplify-the-JBT6k74-driver.patch b/recipes/linux/linux-openmoko-2.6.32/0010-Simplify-the-JBT6k74-driver.patch
deleted file mode 100644
index ca0c2af15b..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0010-Simplify-the-JBT6k74-driver.patch
+++ /dev/null
@@ -1,667 +0,0 @@
-From cb84d543b9465a8ea48b504b1dfb745c6682a50e Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Sun, 28 Feb 2010 15:20:57 +0100
-Subject: [PATCH 1/2] Simplify the JBT6k74 driver
-
-Simplify the JBT6k74 driver
-
-We don't need all the native sleep states - they just complicate things.  Instead, just
-use the LDO "power switch" to send it firmly to sleep and wake it up in a virgin state
-each time.
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
----
- drivers/mfd/glamo/glamo-display.c     |  116 ++++++++++++------------
- drivers/mfd/glamo/glamo-display.h     |    2 +
- drivers/mfd/glamo/glamo-drm-private.h |   10 ++
- drivers/mfd/glamo/glamo-kms-fb.c      |   54 ++----------
- drivers/video/backlight/jbt6k74.c     |  160 ++++++++-------------------------
- include/linux/jbt6k74.h               |    1 -
- 6 files changed, 115 insertions(+), 228 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
-index 34a665a..a384c8b 100644
---- a/drivers/mfd/glamo/glamo-display.c
-+++ b/drivers/mfd/glamo/glamo-display.c
-@@ -239,14 +239,6 @@ static int glamo_run_lcd_script(struct glamodrm_handle *gdrm,
- }
- 
- 
--extern void jbt6k74_action(int val);
--
--/* Power on/off */
--static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode)
--{
--}
--
--
- static bool glamo_crtc_mode_fixup(struct drm_crtc *crtc,
-                                   struct drm_display_mode *mode,
-                                   struct drm_display_mode *adjusted_mode)
-@@ -275,6 +267,12 @@ static int glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
- 	gcrtc = to_glamo_crtc(crtc);
- 	gdrm = gcrtc->gdrm;	/* Here it is! */
- 
-+	if ( !gcrtc->pixel_clock_on ) {
-+		printk(KERN_WARNING "[glamo-drm] Refusing to set base while "
-+		                    "pixel clock is off.\n");
-+		return -EBUSY;
-+	}
-+
- 	gfb = to_glamo_framebuffer(crtc->fb);
- 	obj = gfb->obj;
- 	gobj = obj->driver_private;
-@@ -306,6 +304,12 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc,
- 	gcrtc = to_glamo_crtc(crtc);
- 	gdrm = gcrtc->gdrm;	/* Here it is! */
- 
-+	if ( !gcrtc->pixel_clock_on ) {
-+		printk(KERN_WARNING "[glamo-drm] Refusing to set mode while "
-+		                    "pixel clock is off.\n");
-+		return -EBUSY;
-+	}
-+
- 	glamo_lcd_cmd_mode(gdrm, 1);
- 
- 	glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, mode->clock);
-@@ -354,10 +358,47 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc,
- 
- 	glamo_crtc_mode_set_base(crtc, 0, 0, old_fb);
- 
-+	gcrtc->current_mode = *mode;
-+	gcrtc->current_mode_set = 1;
-+	gcrtc->current_fb = old_fb;
-+
- 	return 0;
- }
- 
- 
-+extern void jbt6k74_action(int val);
-+
-+/* This is not the right place to switch power on/off, because the helper
-+ * stuff ends up calling this before/after setting the mode.  We can't
-+ * set modes with the display off (although backlight off would be OK) */
-+static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode)
-+{
-+	/* do nothing */
-+}
-+
-+
-+void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode)
-+{
-+	struct drm_crtc *crtc = gdrm->crtc;
-+	struct glamo_crtc *gcrtc = to_glamo_crtc(crtc);
-+
-+	if ( mode ) {
-+		glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD);
-+		gcrtc->pixel_clock_on = 1;
-+		jbt6k74_action(1);
-+		if ( gcrtc->current_mode_set ) {
-+			glamo_crtc_mode_set(crtc, &gcrtc->current_mode,
-+			                    &gcrtc->current_mode, 0, 0,
-+			                    gcrtc->current_fb);
-+		}
-+	} else {
-+		jbt6k74_action(0);
-+		glamo_engine_suspend(gdrm->glamo_core, GLAMO_ENGINE_LCD);
-+		gcrtc->pixel_clock_on = 0;
-+	}
-+}
-+
-+
- static void glamo_crtc_prepare(struct drm_crtc *crtc)
- {
- }
-@@ -725,6 +766,8 @@ int glamo_display_init(struct drm_device *dev)
- 	                   + sizeof(struct drm_connector *), GFP_KERNEL);
- 	if (glamo_crtc == NULL) return 1;
- 	glamo_crtc->gdrm = gdrm;
-+	gdrm->crtc = (struct drm_crtc *)glamo_crtc;
-+	glamo_crtc->pixel_clock_on = 1;
- 	glamo_crtc->blank_mode = DRM_MODE_DPMS_OFF;
- 	drm_crtc_init(dev, &glamo_crtc->base, &glamo_crtc_funcs);
- 	drm_crtc_helper_add(&glamo_crtc->base, &glamo_crtc_helper_funcs);
-@@ -808,62 +851,23 @@ int glamo_display_init(struct drm_device *dev)
- 
- void glamo_display_suspend(struct glamodrm_handle *gdrm)
- {
--	gdrm->saved_width = reg_read_lcd(gdrm, GLAMO_REG_LCD_WIDTH);
--	gdrm->saved_height = reg_read_lcd(gdrm, GLAMO_REG_LCD_HEIGHT);
--	gdrm->saved_pitch = reg_read_lcd(gdrm, GLAMO_REG_LCD_PITCH);
--	gdrm->saved_htotal = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL);
--	gdrm->saved_hrtrst = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START);
--	gdrm->saved_hrtren = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END);
--	gdrm->saved_hdspst = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START);
--	gdrm->saved_hdspen = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END);
--	gdrm->saved_vtotal = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL);
--	gdrm->saved_vrtrst = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START);
--	gdrm->saved_vrtren = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END);
--	gdrm->saved_vdspst = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START);
--	gdrm->saved_vdspen = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END);
-+	/* do nothing */
- }
- 
- 
- void glamo_display_resume(struct glamodrm_handle *gdrm)
- {
-+	struct drm_crtc *crtc = gdrm->crtc;
-+	struct glamo_crtc *gcrtc = to_glamo_crtc(crtc);
-+
- 	glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD);
- 	glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_LCD);
- 	glamo_run_lcd_script(gdrm, lcd_init_script,
- 	                           ARRAY_SIZE(lcd_init_script));
- 
--	/* Restore timings */
--	glamo_lcd_cmd_mode(gdrm, 1);
--	glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD,
--	                     gdrm->saved_clock);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH, GLAMO_LCD_WIDTH_MASK,
--	                     gdrm->saved_width);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT, GLAMO_LCD_HEIGHT_MASK,
--	                     gdrm->saved_height);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH, GLAMO_LCD_PITCH_MASK,
--	                     gdrm->saved_pitch);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL,
--	                     GLAMO_LCD_HV_TOTAL_MASK, gdrm->saved_htotal);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START,
--	                     GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_hrtrst);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END,
--	                     GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_hrtren);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START,
--	                     GLAMO_LCD_HV_RETR_DISP_START_MASK,
--	                     gdrm->saved_hdspst);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END,
--	                     GLAMO_LCD_HV_RETR_DISP_END_MASK,
--	                     gdrm->saved_hdspen);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL,
--	                     GLAMO_LCD_HV_TOTAL_MASK, gdrm->saved_vtotal);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START,
--	                     GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_vrtrst);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END,
--	                     GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_vrtren);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START,
--	                     GLAMO_LCD_HV_RETR_DISP_START_MASK,
--	                     gdrm->saved_vdspst);
--	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END,
--	                     GLAMO_LCD_HV_RETR_DISP_END_MASK,
--	                     gdrm->saved_vdspen);
--	glamo_lcd_cmd_mode(gdrm, 0);
-+	if ( gcrtc->current_mode_set ) {
-+		glamo_crtc_mode_set(crtc, &gcrtc->current_mode,
-+		                    &gcrtc->current_mode, 0, 0,
-+		                    gcrtc->current_fb);
-+	}
- }
-diff --git a/drivers/mfd/glamo/glamo-display.h b/drivers/mfd/glamo/glamo-display.h
-index d6f21bc..728bba5 100644
---- a/drivers/mfd/glamo/glamo-display.h
-+++ b/drivers/mfd/glamo/glamo-display.h
-@@ -36,4 +36,6 @@ extern int glamo_framebuffer_create(struct drm_device *dev,
- extern void glamo_display_suspend(struct glamodrm_handle *gdrm);
- extern void glamo_display_resume(struct glamodrm_handle *gdrm);
- 
-+extern void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode);
-+
- #endif /* __GLAMO_DISPLAY_H */
-diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h
-index 7949a2e..4e24019 100644
---- a/drivers/mfd/glamo/glamo-drm-private.h
-+++ b/drivers/mfd/glamo/glamo-drm-private.h
-@@ -106,6 +106,9 @@ struct glamodrm_handle {
- 
- 	/* A scratch block */
- 	struct drm_mm_node *scratch;
-+
-+	/* We only have one */
-+	struct drm_crtc *crtc;
- };
- 
- 
-@@ -118,11 +121,18 @@ struct drm_glamo_gem_object {
- 
- 
- struct glamo_crtc {
-+
- 	struct drm_crtc base;
- 	struct glamodrm_handle *gdrm;
- 	/* a mode_set for fbdev users on this crtc */
- 	struct drm_mode_set mode_set;
- 	int blank_mode;
-+
-+	int pixel_clock_on;
-+
-+	int current_mode_set;
-+	struct drm_display_mode current_mode;
-+	struct drm_framebuffer *current_fb;
- };
- 
- 
-diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c
-index 61cd605..57680ed 100644
---- a/drivers/mfd/glamo/glamo-kms-fb.c
-+++ b/drivers/mfd/glamo/glamo-kms-fb.c
-@@ -253,64 +253,24 @@ static void glamofb_on(struct fb_info *info)
- {
- 	struct glamofb_par *par = info->par;
- 	struct drm_device *dev = par->dev;
--	struct drm_crtc *crtc;
--	struct drm_encoder *encoder;
--	int i;
-+	struct glamodrm_handle *gdrm = dev->dev_private;
- 
--	/*
--	 * For each CRTC in this fb, find all associated encoders
--	 * and turn them off, then turn off the CRTC.
--	 */
--	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
--		struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-+	printk(KERN_CRIT "Turning on display...\n");
- 
--		for (i = 0; i < par->crtc_count; i++)
--			if (crtc->base.id == par->crtc_ids[i])
--				break;
--
--		crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-+	gdrm = dev->dev_private;
- 
--		/* Found a CRTC on this fb, now find encoders */
--		list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
--			if (encoder->crtc == crtc) {
--				struct drm_encoder_helper_funcs *encoder_funcs;
--				encoder_funcs = encoder->helper_private;
--				encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
--			}
--		}
--	}
-+	glamo_lcd_power(gdrm, 1);
- }
- 
- static void glamofb_off(struct fb_info *info, int dpms_mode)
- {
- 	struct glamofb_par *par = info->par;
- 	struct drm_device *dev = par->dev;
--	struct drm_crtc *crtc;
--	struct drm_encoder *encoder;
--	int i;
-+	struct glamodrm_handle *gdrm = dev->dev_private;
- 
--	/*
--	 * For each CRTC in this fb, find all associated encoders
--	 * and turn them off, then turn off the CRTC.
--	 */
--	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
--		struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
--
--		for (i = 0; i < par->crtc_count; i++)
--			if (crtc->base.id == par->crtc_ids[i])
--				break;
-+	printk(KERN_CRIT "Turning off display...\n");
- 
--		/* Found a CRTC on this fb, now find encoders */
--		list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
--			if (encoder->crtc == crtc) {
--				struct drm_encoder_helper_funcs *encoder_funcs;
--				encoder_funcs = encoder->helper_private;
--				encoder_funcs->dpms(encoder, dpms_mode);
--			}
--		}
--		if (dpms_mode == DRM_MODE_DPMS_OFF)
--			crtc_funcs->dpms(crtc, dpms_mode);
--	}
-+	glamo_lcd_power(gdrm, 0);
- }
- 
- static int glamofb_blank(int blank, struct fb_info *info)
-diff --git a/drivers/video/backlight/jbt6k74.c b/drivers/video/backlight/jbt6k74.c
-index 95ca4cf..9554cb3 100644
---- a/drivers/video/backlight/jbt6k74.c
-+++ b/drivers/video/backlight/jbt6k74.c
-@@ -107,14 +107,12 @@ enum jbt_resolution {
- };
- 
- enum jbt_power_mode {
--	JBT_POWER_MODE_DEEP_STANDBY,
--	JBT_POWER_MODE_SLEEP,
-+	JBT_POWER_MODE_OFF,
- 	JBT_POWER_MODE_NORMAL,
- };
- 
- static const char *jbt_power_mode_names[] = {
--	[JBT_POWER_MODE_DEEP_STANDBY]	= "deep-standby",
--	[JBT_POWER_MODE_SLEEP]		= "sleep",
-+	[JBT_POWER_MODE_OFF]		= "off",
- 	[JBT_POWER_MODE_NORMAL]		= "normal",
- };
- 
-@@ -260,14 +258,18 @@ static int jbt_init_regs(struct jbt_info *jbt)
- 	return ret ? -EIO : 0;
- }
- 
--static int jbt_standby_to_sleep(struct jbt_info *jbt)
-+
-+static int jbt_off_to_normal(struct jbt_info *jbt)
- {
- 	int ret;
-+
- 	struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data;
- 
- 	gpio_set_value_cansleep(pdata->gpio_reset, 1);
- 	ret = regulator_bulk_enable(ARRAY_SIZE(jbt->supplies), jbt->supplies);
- 
-+	mdelay(30);
-+
- 	/* three times command zero */
- 	ret |= jbt_reg_write_nodata(jbt, 0x00);
- 	mdelay(1);
-@@ -279,18 +281,11 @@ static int jbt_standby_to_sleep(struct jbt_info *jbt)
- 	/* deep standby out */
- 	ret |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x11);
- 	mdelay(1);
--	ret = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x28);
-+	ret |= jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x28);
- 
- 	/* (re)initialize register set */
- 	ret |= jbt_init_regs(jbt);
- 
--	return ret ? -EIO : 0;
--}
--
--static int jbt_sleep_to_normal(struct jbt_info *jbt)
--{
--	int ret;
--
- 	/* Make sure we are 120 ms after SLEEP_OUT */
- 	if (time_before(jiffies, jbt->next_sleep))
- 		mdelay(jiffies_to_msecs(jbt->next_sleep - jiffies));
-@@ -320,53 +315,34 @@ static int jbt_sleep_to_normal(struct jbt_info *jbt)
- 
- 	/* Sleep mode off */
- 	ret |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
--	jbt->next_sleep = jiffies + msecs_to_jiffies(120);
- 
--	/* Allow the booster and display controller to restart stably */
--	mdelay(5);
--
--	return ret ? -EIO : 0;
--}
--
--static int jbt_normal_to_sleep(struct jbt_info *jbt)
--{
--	int ret;
--
--	/* Make sure we are 120 ms after SLEEP_OUT */
--	while (time_before(jiffies, jbt->next_sleep))
--		cpu_relax();
--
--	ret = jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
--	ret |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0x8000 | 1 << 3);
--	ret |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_IN);
- 	jbt->next_sleep = jiffies + msecs_to_jiffies(120);
- 
--	/* Allow the internal circuits to stop automatically */
-+	/* Allow the booster and display controller to restart stably */
- 	mdelay(5);
- 
- 	return ret ? -EIO : 0;
- }
- 
--static int jbt_sleep_to_standby(struct jbt_info *jbt)
-+static int jbt_normal_to_off(struct jbt_info *jbt)
- {
- 	int ret;
- 	struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data;
- 
--	ret = jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x00);
--
--	if (!ret)
--		ret = regulator_bulk_disable(ARRAY_SIZE(jbt->supplies), jbt->supplies);
-+	/* Pull the plug! */
-+	ret = regulator_bulk_disable(ARRAY_SIZE(jbt->supplies),
-+	                             jbt->supplies);
- 
- 	if (!ret)
- 		gpio_set_value_cansleep(pdata->gpio_reset, 0);
- 
--	return ret;
-+	return ret ? -EIO : 0;
- }
- 
-+
- static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
- 					enum jbt_power_mode new_mode)
- {
--	struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data;
- 	int ret = -EINVAL;
- 
- 	dev_dbg(&jbt->spi->dev, "entering (old_state=%s, new_state=%s)\n",
-@@ -375,49 +351,14 @@ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
- 
- 	mutex_lock(&jbt->lock);
- 
--	if (jbt->suspended) {
--		switch (new_mode) {
--		case JBT_POWER_MODE_DEEP_STANDBY:
--		case JBT_POWER_MODE_SLEEP:
--		case JBT_POWER_MODE_NORMAL:
--			ret = 0;
--			jbt->suspend_mode = new_mode;
--			break;
--		default:
--			break;
--		}
--	} else if (new_mode == JBT_POWER_MODE_NORMAL &&
--			pdata->enable_pixel_clock) {
--		pdata->enable_pixel_clock(&jbt->spi->dev, 1);
--	}
--
- 	switch (jbt->power_mode) {
--	case JBT_POWER_MODE_DEEP_STANDBY:
--		switch (new_mode) {
--		case JBT_POWER_MODE_DEEP_STANDBY:
--			ret = 0;
--			break;
--		case JBT_POWER_MODE_SLEEP:
--			ret = jbt_standby_to_sleep(jbt);
--			break;
--		case JBT_POWER_MODE_NORMAL:
--			/* first transition into sleep */
--			ret = jbt_standby_to_sleep(jbt);
--			/* then transition into normal */
--			ret |= jbt_sleep_to_normal(jbt);
--			break;
--		}
--		break;
--	case JBT_POWER_MODE_SLEEP:
-+	case JBT_POWER_MODE_OFF:
- 		switch (new_mode) {
--		case JBT_POWER_MODE_SLEEP:
-+		case JBT_POWER_MODE_OFF:
- 			ret = 0;
- 			break;
--		case JBT_POWER_MODE_DEEP_STANDBY:
--			ret = jbt_sleep_to_standby(jbt);
--			break;
- 		case JBT_POWER_MODE_NORMAL:
--			ret = jbt_sleep_to_normal(jbt);
-+			ret = jbt_off_to_normal(jbt);
- 			break;
- 		}
- 		break;
-@@ -426,25 +367,16 @@ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
- 		case JBT_POWER_MODE_NORMAL:
- 			ret = 0;
- 			break;
--		case JBT_POWER_MODE_DEEP_STANDBY:
--			/* first transition into sleep */
--			ret = jbt_normal_to_sleep(jbt);
--			/* then transition into deep standby */
--			ret |= jbt_sleep_to_standby(jbt);
--			break;
--		case JBT_POWER_MODE_SLEEP:
--			ret = jbt_normal_to_sleep(jbt);
-+		case JBT_POWER_MODE_OFF:
-+			ret = jbt_normal_to_off(jbt);
- 			break;
- 		}
- 	}
- 
- 	if (ret == 0) {
- 		jbt->power_mode = new_mode;
--		if (new_mode != JBT_POWER_MODE_NORMAL &&
--			pdata->enable_pixel_clock)
--			pdata->enable_pixel_clock(&jbt->spi->dev, 0);
- 	} else {
--		dev_err(&jbt->spi->dev, "Failed enter state '%s': %d\n",
-+		dev_err(&jbt->spi->dev, "Failed to enter state '%s': %d\n",
- 				jbt_power_mode_names[new_mode], ret);
- 	}
- 
-@@ -470,8 +402,8 @@ static int jbt6k74_set_resolution(struct jbt_info *jbt,
- 	if (jbt->power_mode == JBT_POWER_MODE_NORMAL) {
- 
- 		/* first transition into sleep */
--		ret = jbt_normal_to_sleep(jbt);
--		ret |= jbt_sleep_to_normal(jbt);
-+		ret = jbt_normal_to_off(jbt);
-+		ret |= jbt_off_to_normal(jbt);
- 
- 		if (ret) {
- 			jbt->resolution = old_resolution;
-@@ -589,7 +521,7 @@ static ssize_t reset_write(struct device *dev, struct device_attribute *attr,
- 
- 	mutex_unlock(&jbt->lock);
- 
--	jbt->power_mode = JBT_POWER_MODE_DEEP_STANDBY;
-+	jbt->power_mode = JBT_POWER_MODE_OFF;
- 	jbt6k74_enter_power_mode(jbt, old_power_mode);
- 
- 	return count;
-@@ -616,27 +548,6 @@ static struct attribute_group jbt_attr_group = {
- 	.attrs	= jbt_sysfs_entries,
- };
- 
--/* FIXME: This in an ugly hack to delay display blanking.
--  When the jbt is in sleep mode it displays an all white screen and thus one
--  will a see a short flash.
--  By delaying the blanking we will give the backlight a chance to turn off and
--  thus avoid getting the flash */
--static void jbt_blank_worker(struct work_struct *work)
--{
--	struct jbt_info *jbt  = container_of(work, struct jbt_info,
--						blank_work.work);
--
--	switch (jbt->blank_mode) {
--	case FB_BLANK_NORMAL:
--		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_SLEEP);
--		break;
--	case FB_BLANK_POWERDOWN:
--		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_DEEP_STANDBY);
--		break;
--	default:
--		break;
--	}
--}
- 
- static int jbt6k74_set_mode(struct lcd_device *ld, struct fb_videomode *m)
- {
-@@ -649,7 +560,7 @@ static int jbt6k74_set_mode(struct lcd_device *ld, struct fb_videomode *m)
- 		ret = jbt6k74_set_resolution(jbt, JBT_RESOLUTION_VGA);
- 	} else {
- 		dev_err(&jbt->spi->dev, "Unknown resolution.\n");
--		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_SLEEP);
-+		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
- 	}
- 
- 	return ret;
-@@ -671,11 +582,11 @@ static int jbt6k74_set_power(struct lcd_device *ld, int power)
- 		break;
- 	case FB_BLANK_NORMAL:
- 		dev_dbg(&jbt->spi->dev, "blank\n");
--		ret = schedule_delayed_work(&jbt->blank_work, HZ);
-+		ret = jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
- 		break;
- 	case FB_BLANK_POWERDOWN:
- 		dev_dbg(&jbt->spi->dev, "powerdown\n");
--		ret = schedule_delayed_work(&jbt->blank_work, HZ);
-+		ret = jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
- 		break;
- 	default:
- 		break;
-@@ -691,10 +602,10 @@ static int jbt6k74_get_power(struct lcd_device *ld)
- 	switch (jbt->power_mode) {
- 	case JBT_POWER_MODE_NORMAL:
- 		return FB_BLANK_UNBLANK;
--	case JBT_POWER_MODE_SLEEP:
-+	case JBT_POWER_MODE_OFF:
- 		return FB_BLANK_NORMAL;
- 	default:
--		return JBT_POWER_MODE_DEEP_STANDBY;
-+		return JBT_POWER_MODE_OFF;
- 	}
- }
- 
-@@ -707,7 +618,7 @@ void jbt6k74_action(int val)
- 		return;
- 	}
- 	if ( val == 0 ) {
--		jbt6k74_enter_power_mode(jbt_global, JBT_POWER_MODE_SLEEP);
-+		jbt6k74_enter_power_mode(jbt_global, JBT_POWER_MODE_OFF);
- 	} else {
- 		jbt6k74_enter_power_mode(jbt_global, JBT_POWER_MODE_NORMAL);
- 	}
-@@ -756,11 +667,9 @@ static int __devinit jbt_probe(struct spi_device *spi)
- 		goto err_free_drvdata;
- 	}
- 
--	INIT_DELAYED_WORK(&jbt->blank_work, jbt_blank_worker);
--
- 	jbt->resolution = JBT_RESOLUTION_VGA;
--	jbt->power_mode = JBT_POWER_MODE_DEEP_STANDBY;
- 	jbt->next_sleep = jiffies + msecs_to_jiffies(120);
-+	jbt->power_mode = JBT_POWER_MODE_OFF;
- 	mutex_init(&jbt->lock);
- 
- 	dev_set_drvdata(&spi->dev, jbt);
-@@ -856,9 +765,10 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
- 
- 	jbt->suspend_mode = jbt->power_mode;
- 
--	jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_DEEP_STANDBY);
--	jbt->suspended = 1;
-+	printk(KERN_CRIT "[jbt] powering off for suspend\n");
-+	jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
- 
-+	printk(KERN_CRIT "[jbt] done\n");
- 	dev_info(&spi->dev, "suspended\n");
- 
- 	return 0;
-@@ -869,11 +779,13 @@ int jbt6k74_resume(struct spi_device *spi)
- 	struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
- 	dev_info(&spi->dev, "starting resume: %d\n", jbt->suspend_mode);
- 
-+	printk(KERN_CRIT "[jbt] powering on for resume\n");
- 	mdelay(20);
- 
- 	jbt->suspended = 0;
- 	jbt6k74_enter_power_mode(jbt, jbt->suspend_mode);
- 
-+	printk(KERN_CRIT "[jbt] done\n");
- 	dev_info(&spi->dev, "resumed: %d\n", jbt->suspend_mode);
- 
- 	return 0;
-diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h
-index 75488c4..4cf760c 100644
---- a/include/linux/jbt6k74.h
-+++ b/include/linux/jbt6k74.h
-@@ -13,7 +13,6 @@
-  */
- struct jbt6k74_platform_data {
- 	void (*probe_completed)(struct device *dev);
--	void (*enable_pixel_clock)(struct device *dev, int enable);
- 
- 	int gpio_reset;
- };
--- 
-1.7.0
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0011-Don-t-choke-if-userspace-provides-a-pixel-clock-valu.patch b/recipes/linux/linux-openmoko-2.6.32/0011-Don-t-choke-if-userspace-provides-a-pixel-clock-valu.patch
deleted file mode 100644
index 0d47c1263f..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0011-Don-t-choke-if-userspace-provides-a-pixel-clock-valu.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 73abadc5bbbc94f4ca67effc5f5c3174c2a3ac48 Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Sun, 28 Feb 2010 15:40:13 +0100
-Subject: [PATCH 2/2] Don't choke if userspace provides a pixel clock value
-
-Don't choke if userspace provides a pixel clock value
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
----
- drivers/mfd/glamo/glamo-kms-fb.c |   46 ++++++++++++++++++-------------------
- 1 files changed, 22 insertions(+), 24 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c
-index 57680ed..6d4b9ea 100644
---- a/drivers/mfd/glamo/glamo-kms-fb.c
-+++ b/drivers/mfd/glamo/glamo-kms-fb.c
-@@ -177,37 +177,35 @@ static int glamofb_set_par(struct fb_info *info)
- 	struct drm_device *dev = par->dev;
- 	struct fb_var_screeninfo *var = &info->var;
- 	int i;
-+	struct drm_crtc *crtc;
-+	int ret;
- 
- 	DRM_DEBUG("%d %d\n", var->xres, var->pixclock);
- 
- 	if (var->pixclock != -1) {
-+		DRM_ERROR("Warning: userspace gave me a pixel clock value (%i)"
-+		          "- I'm ignoring it.\n", var->pixclock);
-+	}
- 
--		DRM_ERROR("PIXEL CLOCK SET\n");
--		return -EINVAL;
--	} else {
--		struct drm_crtc *crtc;
--		int ret;
--
--		list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
--			struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc);
--
--			for (i = 0; i < par->crtc_count; i++)
--				if (crtc->base.id == par->crtc_ids[i])
--					break;
--
--			if (i == par->crtc_count)
--				continue;
--
--			if (crtc->fb == glamo_crtc->mode_set.fb) {
--				mutex_lock(&dev->mode_config.mutex);
--				ret = crtc->funcs->set_config(&glamo_crtc->mode_set);
--				mutex_unlock(&dev->mode_config.mutex);
--				if (ret)
--					return ret;
--			}
-+	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-+		struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc);
-+
-+		for (i = 0; i < par->crtc_count; i++)
-+			if (crtc->base.id == par->crtc_ids[i])
-+				break;
-+
-+		if (i == par->crtc_count)
-+			continue;
-+
-+		if (crtc->fb == glamo_crtc->mode_set.fb) {
-+			mutex_lock(&dev->mode_config.mutex);
-+			ret = crtc->funcs->set_config(&glamo_crtc->mode_set);
-+			mutex_unlock(&dev->mode_config.mutex);
-+			if (ret)
-+				return ret;
- 		}
--		return 0;
- 	}
-+	return 0;
- }
- 
- static int glamofb_pan_display(struct fb_var_screeninfo *var,
--- 
-1.7.0
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0008-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch b/recipes/linux/linux-openmoko-2.6.32/0011-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch
index f5da51ed95..0f5af99025 100644
--- a/recipes/linux/linux-openmoko-2.6.32/0008-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch
+++ b/recipes/linux/linux-openmoko-2.6.32/0011-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch
@@ -1,7 +1,7 @@
-From f6debba05c9f6d0337324dc0eaa8e892d2d3142b Mon Sep 17 00:00:00 2001
+From d5f07ab010afe531312874872904fe1a0348ee2b Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Thu, 4 Feb 2010 00:07:25 +0100
-Subject: [PATCH 8/9] Fix crash when reading Glamo registers via sysfs
+Subject: [PATCH 11/14] Fix crash when reading Glamo registers via sysfs
 
 glamo-core didn't ioremap() some areas, so don't try to read them.
 
@@ -11,7 +11,7 @@ Signed-off-by: Thomas White <taw@bitwiz.org.uk>
  1 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index a614d44..faaf269 100644
+index 74da668..33a7a59 100644
 --- a/drivers/mfd/glamo/glamo-core.c
 +++ b/drivers/mfd/glamo/glamo-core.c
 @@ -90,14 +90,14 @@ static const struct reg_range reg_range[] = {
@@ -34,5 +34,5 @@ index a614d44..faaf269 100644
  };
  
 -- 
-1.6.6.1
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.32/0012-Fix-dynamic-command-queue-allocation.patch b/recipes/linux/linux-openmoko-2.6.32/0012-Fix-dynamic-command-queue-allocation.patch
new file mode 100644
index 0000000000..68e170a588
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32/0012-Fix-dynamic-command-queue-allocation.patch
@@ -0,0 +1,131 @@
+From 3b328bfd4aef3ffc9b0192ca512fbc899148e8f5 Mon Sep 17 00:00:00 2001
+From: Thomas White <taw@bitwiz.org.uk>
+Date: Thu, 6 May 2010 05:40:15 -0700
+Subject: [PATCH 12/14] Fix dynamic command queue allocation
+
+(Not tested...)
+
+Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+---
+ drivers/mfd/glamo/glamo-cmdq.c    |   10 +++++++---
+ drivers/mfd/glamo/glamo-cmdq.h    |    2 +-
+ drivers/mfd/glamo/glamo-drm-drv.c |   17 +++++++----------
+ 3 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c
+index 442963c..28c5268 100644
+--- a/drivers/mfd/glamo/glamo-cmdq.c
++++ b/drivers/mfd/glamo/glamo-cmdq.c
+@@ -57,6 +57,7 @@
+ #include "glamo-core.h"
+ #include "glamo-drm-private.h"
+ #include "glamo-regs.h"
++#include "glamo-buffer.h"
+ 
+ 
+ #define GLAMO_CMDQ_SIZE (128 * 1024)    /* 128k ring buffer */
+@@ -495,10 +496,11 @@ int glamo_cmdq_setup(struct glamodrm_handle *gdrm)
+ }
+ 
+ 
+-int glamo_cmdq_init(struct glamodrm_handle *gdrm)
++int glamo_cmdq_init(struct drm_device *dev)
+ {
+ 	struct drm_gem_object *obj;
+ 	struct drm_glamo_gem_object *gobj;
++	struct glamodrm_handle *gdrm = dev->dev_private;
+ 	int ret = 0;
+ 
+ 	obj = glamo_gem_object_alloc(dev, GLAMO_CMDQ_SIZE, 4);
+@@ -507,9 +509,10 @@ int glamo_cmdq_init(struct glamodrm_handle *gdrm)
+ 		ret = -ENOMEM;
+ 		goto out;
+ 	}
+-	gobj = fbo->driver_private;
++	gobj = obj->driver_private;
+ 	gdrm->cmdq_offs = GLAMO_OFFSET_FB + gobj->block->start;
+-	gdrm->cmdq_base = ioremap(gdrm->vram->start + offs, GLAMO_CMDQ_SIZE);
++	gdrm->cmdq_base = ioremap(gdrm->vram->start + gdrm->cmdq_offs,
++	                          GLAMO_CMDQ_SIZE);
+ 
+ 	/* Set up registers */
+ 	glamo_cmdq_setup(gdrm);
+@@ -521,6 +524,7 @@ out:
+ 
+ int glamo_cmdq_shutdown(struct glamodrm_handle *gdrm)
+ {
++	iounmap(gdrm->cmdq_base);
+ 	return 0;
+ }
+ 
+diff --git a/drivers/mfd/glamo/glamo-cmdq.h b/drivers/mfd/glamo/glamo-cmdq.h
+index 510d195..6d7f184 100644
+--- a/drivers/mfd/glamo/glamo-cmdq.h
++++ b/drivers/mfd/glamo/glamo-cmdq.h
+@@ -38,7 +38,7 @@ extern int glamo_ioctl_cmdburst(struct drm_device *dev, void *data,
+ extern void glamo_cmdq_blank(struct glamodrm_handle *gdrm,
+                              struct drm_gem_object *obj);
+ 
+-extern int glamo_cmdq_init(struct glamodrm_handle *gdrm);
++extern int glamo_cmdq_init(struct drm_device *de);
+ extern int glamo_cmdq_shutdown(struct glamodrm_handle *gdrm);
+ extern void glamo_cmdq_suspend(struct glamodrm_handle *gdrm);
+ extern void glamo_cmdq_resume(struct glamodrm_handle *gdrm);
+diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
+index 774eaff..ee648c1 100644
+--- a/drivers/mfd/glamo/glamo-drm-drv.c
++++ b/drivers/mfd/glamo/glamo-drm-drv.c
+@@ -128,7 +128,7 @@ static int glamodrm_load(struct drm_device *dev, unsigned long flags)
+ 	gdrm = dev->dev_private;
+ 
+ 	glamo_buffer_init(gdrm);
+-	glamo_cmdq_init(gdrm);
++	glamo_cmdq_init(dev);
+ 	glamo_fence_init(gdrm);
+ 	glamo_display_init(dev);
+ 
+@@ -237,14 +237,14 @@ static int glamodrm_probe(struct platform_device *pdev)
+ 	if ( !gdrm->vram ) {
+ 		dev_err(&pdev->dev, "Unable to find VRAM.\n");
+ 		rc = -ENOENT;
+-		goto out_unmap_cmdq;
++		goto out_unmap_regs;
+ 	}
+ 	gdrm->vram = request_mem_region(gdrm->vram->start,
+ 	                                resource_size(gdrm->vram), pdev->name);
+ 	if ( !gdrm->vram ) {
+ 		dev_err(&pdev->dev, "failed to request VRAM region\n");
+ 		rc = -ENOENT;
+-		goto out_unmap_cmdq;
++		goto out_unmap_regs;
+ 	}
+ 
+ 	/* Find the LCD controller */
+@@ -316,10 +316,6 @@ out_release_lcd:
+ 	                   resource_size(gdrm->lcd_regs));
+ out_release_vram:
+ 	release_mem_region(gdrm->vram->start, resource_size(gdrm->vram));
+-out_unmap_cmdq:
+-	iounmap(gdrm->cmdq_base);
+-out_release_cmdq:
+-	release_mem_region(gdrm->cmdq->start, resource_size(gdrm->cmdq));
+ out_unmap_regs:
+ 	iounmap(gdrm->reg_base);
+ out_release_regs:
+@@ -349,9 +345,10 @@ static int glamodrm_remove(struct platform_device *pdev)
+ 	/* Release VRAM */
+ 	release_mem_region(gdrm->vram->start, resource_size(gdrm->vram));
+ 
+-	/* Release command queue */
+-	iounmap(gdrm->cmdq_base);
+-	release_mem_region(gdrm->cmdq->start, resource_size(gdrm->cmdq));
++	/* Release LCD registers */
++	iounmap(gdrm->lcd_base);
++	release_mem_region(gdrm->lcd_regs->start,
++	                   resource_size(gdrm->lcd_regs));
+ 
+ 	/* Release 2D engine  */
+ 	iounmap(gdrm->twod_base);
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.32/0012-Report-all-FB-modes-given-by-the-lower-levels.patch b/recipes/linux/linux-openmoko-2.6.32/0012-Report-all-FB-modes-given-by-the-lower-levels.patch
deleted file mode 100644
index ac19dbd5d2..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0012-Report-all-FB-modes-given-by-the-lower-levels.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From f8448d2b08c1e2cfd0faba0e3f3c4c58e4ecaa9f Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Mon, 1 Mar 2010 22:02:26 +0100
-Subject: [PATCH 12/13] Report all FB modes given by the lower levels
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- drivers/mfd/glamo/glamo-display.c |   70 +++++++++++++++++++++----------------
- 1 files changed, 40 insertions(+), 30 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
-index a384c8b..bc3a2ea 100644
---- a/drivers/mfd/glamo/glamo-display.c
-+++ b/drivers/mfd/glamo/glamo-display.c
-@@ -456,43 +456,53 @@ static void glamo_connector_destroy(struct drm_connector *connector)
- 
- static int glamo_connector_get_modes(struct drm_connector *connector)
- {
--	struct drm_display_mode *mode;
- 	struct glamo_fb_platform_data *fb_info;
- 	struct glamo_output *goutput = to_glamo_output(connector);
- 	struct glamodrm_handle *gdrm = goutput->gdrm;
-+	int i;
- 
- 	/* Dig out the record which will tell us about the hardware */
- 	fb_info = gdrm->glamo_core->pdata->fb_data;
- 
--	mode = drm_mode_create(connector->dev);
--	if (!mode)
--		return 0;
--	/* Fill in 'mode' here */
--	mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED;
--
--	/* Convert framebuffer timings into KMS timings */
--	mode->clock = 1000000000UL / fb_info->modes[0].pixclock; /* ps -> kHz */
--	mode->clock *= 1000; /* kHz -> Hz */
--	mode->hdisplay = fb_info->modes[0].xres;
--	mode->hsync_start = fb_info->modes[0].right_margin + mode->hdisplay;
--	mode->hsync_end = mode->hsync_start + fb_info->modes[0].hsync_len;
--	mode->htotal = mode->hsync_end + fb_info->modes[0].left_margin;
--	mode->hskew = 0;
--
--	mode->vdisplay = fb_info->modes[0].yres;
--	mode->vsync_start = fb_info->modes[0].lower_margin + mode->vdisplay;
--	mode->vsync_end = mode->vsync_start + fb_info->modes[0].vsync_len;
--	mode->vtotal = mode->vsync_end + fb_info->modes[0].upper_margin;
--	mode->vscan = 0;
--
--	/* Physical size */
--	mode->width_mm = fb_info->width;
--	mode->height_mm = fb_info->height;
--
--	drm_mode_set_name(mode);
--	drm_mode_probed_add(connector, mode);
--
--	return 1;	/* one mode, for now */
-+	for ( i=0; i<fb_info->num_modes; i++ ) {
-+
-+		struct drm_display_mode *mode;
-+
-+		mode = drm_mode_create(connector->dev);
-+		if ( !mode ) continue;
-+
-+		mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED;
-+
-+		/* Convert framebuffer timings into KMS timings.
-+		 * First:  ps -> kHz */
-+		mode->clock = 1000000000UL / fb_info->modes[i].pixclock;
-+		mode->clock *= 1000; /* then kHz -> Hz */
-+		mode->hdisplay = fb_info->modes[i].xres;
-+		mode->hsync_start = fb_info->modes[i].right_margin
-+		                     + mode->hdisplay;
-+		mode->hsync_end = mode->hsync_start
-+		                     + fb_info->modes[i].hsync_len;
-+		mode->htotal = mode->hsync_end + fb_info->modes[i].left_margin;
-+		mode->hskew = 0;
-+
-+		mode->vdisplay = fb_info->modes[i].yres;
-+		mode->vsync_start = fb_info->modes[i].lower_margin
-+		                     + mode->vdisplay;
-+		mode->vsync_end = mode->vsync_start
-+		                   + fb_info->modes[i].vsync_len;
-+		mode->vtotal = mode->vsync_end + fb_info->modes[i].upper_margin;
-+		mode->vscan = 0;
-+
-+		/* Physical size */
-+		mode->width_mm = fb_info->width;
-+		mode->height_mm = fb_info->height;
-+
-+		drm_mode_set_name(mode);
-+		drm_mode_probed_add(connector, mode);
-+
-+	}
-+
-+	return fb_info->num_modes;
- }
- 
- 
--- 
-1.7.0
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0013-Change-connector-type-to-LVDS.patch b/recipes/linux/linux-openmoko-2.6.32/0013-Change-connector-type-to-LVDS.patch
deleted file mode 100644
index 1b8c653607..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0013-Change-connector-type-to-LVDS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3f1154d1b763f981791ad54987e61d31bde43ec7 Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Mon, 1 Mar 2010 22:07:57 +0100
-Subject: [PATCH 13/13] Change connector type to LVDS
-
-Not certain that this exactly describes what it is, and too lazy to check, but for sure
-it's a better description than "Unknown".
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
----
- drivers/mfd/glamo/glamo-display.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
-index bc3a2ea..5f04697 100644
---- a/drivers/mfd/glamo/glamo-display.c
-+++ b/drivers/mfd/glamo/glamo-display.c
-@@ -795,7 +795,7 @@ int glamo_display_init(struct drm_device *dev)
- 
- 	/* Initialise the connector */
- 	drm_connector_init(dev, connector, &glamo_connector_funcs,
--	                   DRM_MODE_CONNECTOR_Unknown);
-+	                   DRM_MODE_CONNECTOR_LVDS);
- 	drm_sysfs_connector_add(connector);
- 	connector->interlace_allowed = 0;
- 	connector->doublescan_allowed = 0;
--- 
-1.7.0
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0013-Debug-statements-for-testing.patch b/recipes/linux/linux-openmoko-2.6.32/0013-Debug-statements-for-testing.patch
new file mode 100644
index 0000000000..cc58d1629e
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32/0013-Debug-statements-for-testing.patch
@@ -0,0 +1,78 @@
+From fa66cc905714c94bca6580c9adf7b57fa3b1da02 Mon Sep 17 00:00:00 2001
+From: Thomas White <taw@bitwiz.org.uk>
+Date: Thu, 6 May 2010 05:40:33 -0700
+Subject: [PATCH 13/14] Debug statements for testing
+
+Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+---
+ drivers/mfd/glamo/glamo-display.c |    7 +++++++
+ drivers/video/backlight/jbt6k74.c |    4 +++-
+ 2 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
+index 75ad734..57292ff 100644
+--- a/drivers/mfd/glamo/glamo-display.c
++++ b/drivers/mfd/glamo/glamo-display.c
+@@ -257,6 +257,8 @@ static int glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
+ 	u32 addr;
+ 	u16 addr_low, addr_high;
+ 
++	printk(KERN_CRIT "Setting base!\n");
++
+ 	if (!crtc->fb) {
+ 		DRM_DEBUG("No FB bound\n");
+ 		return -EINVAL;
+@@ -311,6 +313,8 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc,
+ 		msleep(500);
+ 	}
+ 
++	printk(KERN_CRIT "Setting mode!\n");
++
+ 	/* Rotate? */
+ 	if ( (mode->hdisplay == 640) && (mode->vdisplay == 480) ) {
+ 		rot = GLAMO_LCD_ROT_MODE_90;
+@@ -935,15 +939,18 @@ void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode)
+ 	struct glamo_crtc *gcrtc = to_glamo_crtc(crtc);
+ 
+ 	if ( mode ) {
++		printk(KERN_CRIT "Power on sequence\n");
+ 		glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD);
+ 		gcrtc->pixel_clock_on = 1;
+ 		jbt6k74_setpower(JBT_POWER_MODE_NORMAL);
+ 		if ( gcrtc->current_mode_set ) {
++			printk(KERN_CRIT "Setting previous mode\n");
+ 			glamo_crtc_mode_set(crtc, &gcrtc->current_mode,
+ 			                    &gcrtc->current_mode, 0, 0,
+ 			                    gcrtc->current_fb);
+ 		}
+ 	} else {
++		printk(KERN_CRIT "Power off sequence\n");
+ 		jbt6k74_setpower(JBT_POWER_MODE_OFF);
+ 		glamo_engine_suspend(gdrm->glamo_core, GLAMO_ENGINE_LCD);
+ 		gcrtc->pixel_clock_on = 0;
+diff --git a/drivers/video/backlight/jbt6k74.c b/drivers/video/backlight/jbt6k74.c
+index 91651e7..56a3e3a 100644
+--- a/drivers/video/backlight/jbt6k74.c
++++ b/drivers/video/backlight/jbt6k74.c
+@@ -389,7 +389,7 @@ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
+ {
+ 	int ret = -EINVAL;
+ 
+-	dev_dbg(&jbt->spi->dev, "entering (old_state=%s, new_state=%s)\n",
++	printk(KERN_CRIT "entering (old_state=%s, new_state=%s)\n",
+ 			jbt_power_mode_names[jbt->power_mode],
+ 			jbt_power_mode_names[new_mode]);
+ 
+@@ -825,7 +825,9 @@ EXPORT_SYMBOL_GPL(jbt6k74_finish_resolutionchange);
+ 
+ void jbt6k74_setpower(enum jbt_power_mode new_power)
+ {
++	printk(KERN_CRIT "About to set power..\n");
+ 	if ( !jbt_global ) return;
++	printk(KERN_CRIT "Setting JBT power.. %i\n", new_power);
+ 	jbt6k74_enter_power_mode(jbt_global, new_power);
+ }
+ EXPORT_SYMBOL_GPL(jbt6k74_setpower);
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.32/0014-Clean-up-JBT-hooks-and-allow-resolution-switching.patch b/recipes/linux/linux-openmoko-2.6.32/0014-Clean-up-JBT-hooks-and-allow-resolution-switching.patch
deleted file mode 100644
index 287214b677..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0014-Clean-up-JBT-hooks-and-allow-resolution-switching.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From 644aab63501ebff3e819fd25d23c63da6b6e1cf5 Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Mon, 8 Mar 2010 23:51:09 +0100
-Subject: [PATCH 14/15] Clean up JBT hooks, and allow resolution switching
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
----
- arch/arm/mach-s3c2442/mach-gta02.c |    2 +-
- drivers/mfd/glamo/glamo-display.c  |   17 ++++++----
- drivers/video/backlight/jbt6k74.c  |   57 +++++++++++++++++++----------------
- include/linux/jbt6k74.h            |   14 +++++++++
- 4 files changed, 56 insertions(+), 34 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
-index a969037..b580b1b 100644
---- a/arch/arm/mach-s3c2442/mach-gta02.c
-+++ b/arch/arm/mach-s3c2442/mach-gta02.c
-@@ -229,7 +229,7 @@ static struct fb_videomode gta02_glamo_modes[] = {
- 		.name = "240x320",
- 		.xres = 240,
- 		.yres = 320,
--		.pixclock	= 40816,
-+		.pixclock	= 100000,
- 		.left_margin	= 8,
- 		.right_margin	= 16,
- 		.upper_margin	= 2,
-diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
-index 5f04697..e56cdb4 100644
---- a/drivers/mfd/glamo/glamo-display.c
-+++ b/drivers/mfd/glamo/glamo-display.c
-@@ -52,19 +52,18 @@
-  *
-  */
- 
--#define DEBUG 1
--
- #include <drm/drmP.h>
- #include <drm/glamo_drm.h>
- #include <drm/drm_crtc_helper.h>
- #include <drm/drm_crtc.h>
-+#include <linux/glamofb.h>
-+#include <linux/jbt6k74.h>
- 
- #include "glamo-core.h"
- #include "glamo-drm-private.h"
- #include "glamo-regs.h"
- #include "glamo-kms-fb.h"
- #include "glamo-display.h"
--#include <linux/glamofb.h>
- 
- 
- #define GLAMO_LCD_WIDTH_MASK 0x03FF
-@@ -356,6 +355,12 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc,
- 
- 	glamo_lcd_cmd_mode(gdrm, 0);
- 
-+	if ( mode->hdisplay == 240 ) {
-+		jbt6k74_setresolution(JBT_RESOLUTION_QVGA);
-+	} else {
-+		jbt6k74_setresolution(JBT_RESOLUTION_VGA);
-+	}
-+
- 	glamo_crtc_mode_set_base(crtc, 0, 0, old_fb);
- 
- 	gcrtc->current_mode = *mode;
-@@ -366,8 +371,6 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc,
- }
- 
- 
--extern void jbt6k74_action(int val);
--
- /* This is not the right place to switch power on/off, because the helper
-  * stuff ends up calling this before/after setting the mode.  We can't
-  * set modes with the display off (although backlight off would be OK) */
-@@ -385,14 +388,14 @@ void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode)
- 	if ( mode ) {
- 		glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD);
- 		gcrtc->pixel_clock_on = 1;
--		jbt6k74_action(1);
-+		jbt6k74_setpower(JBT_POWER_MODE_NORMAL);
- 		if ( gcrtc->current_mode_set ) {
- 			glamo_crtc_mode_set(crtc, &gcrtc->current_mode,
- 			                    &gcrtc->current_mode, 0, 0,
- 			                    gcrtc->current_fb);
- 		}
- 	} else {
--		jbt6k74_action(0);
-+		jbt6k74_setpower(JBT_POWER_MODE_OFF);
- 		glamo_engine_suspend(gdrm->glamo_core, GLAMO_ENGINE_LCD);
- 		gcrtc->pixel_clock_on = 0;
- 	}
-diff --git a/drivers/video/backlight/jbt6k74.c b/drivers/video/backlight/jbt6k74.c
-index 9554cb3..40c31f6 100644
---- a/drivers/video/backlight/jbt6k74.c
-+++ b/drivers/video/backlight/jbt6k74.c
-@@ -101,15 +101,6 @@ enum jbt_register {
- 	JBT_REG_HCLOCK_QVGA		= 0xed,
- };
- 
--enum jbt_resolution {
--	JBT_RESOLUTION_VGA,
--	JBT_RESOLUTION_QVGA,
--};
--
--enum jbt_power_mode {
--	JBT_POWER_MODE_OFF,
--	JBT_POWER_MODE_NORMAL,
--};
- 
- static const char *jbt_power_mode_names[] = {
- 	[JBT_POWER_MODE_OFF]		= "off",
-@@ -121,6 +112,7 @@ static const char *jbt_resolution_names[] = {
- 	[JBT_RESOLUTION_QVGA] = "qvga",
- };
- 
-+
- struct jbt_info {
- 	struct mutex lock;		/* protects this structure */
- 	enum jbt_resolution resolution;
-@@ -139,6 +131,8 @@ struct jbt_info {
- 	uint16_t reg_cache[0xEE];
- };
- 
-+struct jbt_info *jbt_global;
-+
- #define JBT_COMMAND	0x000
- #define JBT_DATA	0x100
- 
-@@ -401,8 +395,9 @@ static int jbt6k74_set_resolution(struct jbt_info *jbt,
- 
- 	if (jbt->power_mode == JBT_POWER_MODE_NORMAL) {
- 
--		/* first transition into sleep */
-+		/* "Reboot" the LCM */
- 		ret = jbt_normal_to_off(jbt);
-+		mdelay(1000);
- 		ret |= jbt_off_to_normal(jbt);
- 
- 		if (ret) {
-@@ -609,22 +604,6 @@ static int jbt6k74_get_power(struct lcd_device *ld)
- 	}
- }
- 
--/* This is utterly, totally horrible.  I'm REALLY sorry... */
--struct jbt_info *jbt_global;
--void jbt6k74_action(int val)
--{
--	if ( !jbt_global ) {
--		printk(KERN_CRIT "JBT not initialised!!!\n");
--		return;
--	}
--	if ( val == 0 ) {
--		jbt6k74_enter_power_mode(jbt_global, JBT_POWER_MODE_OFF);
--	} else {
--		jbt6k74_enter_power_mode(jbt_global, JBT_POWER_MODE_NORMAL);
--	}
--}
--EXPORT_SYMBOL_GPL(jbt6k74_action);
--
- struct lcd_ops jbt6k74_lcd_ops = {
- 	.set_power = jbt6k74_set_power,
- 	.get_power = jbt6k74_get_power,
-@@ -758,6 +737,32 @@ static int __devexit jbt_remove(struct spi_device *spi)
- 	return 0;
- }
- 
-+/* Begin horrible layering violations (in the interest of making stuff work) */
-+
-+int jbt6k74_setresolution(enum jbt_resolution new_resolution)
-+{
-+	if ( !jbt_global ) {
-+		printk(KERN_CRIT "JBT not initialised!!!\n");
-+		return -1;
-+	}
-+	jbt6k74_set_resolution(jbt_global, new_resolution);
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(jbt6k74_setresolution);
-+
-+/* This is utterly, totally horrible.  I'm REALLY sorry... */
-+void jbt6k74_setpower(enum jbt_power_mode new_power)
-+{
-+	if ( !jbt_global ) {
-+		printk(KERN_CRIT "JBT not initialised!!!\n");
-+		return;
-+	}
-+	jbt6k74_enter_power_mode(jbt_global, new_power);
-+}
-+EXPORT_SYMBOL_GPL(jbt6k74_setpower);
-+
-+/* End horrible layering violations */
-+
- #ifdef CONFIG_PM
- static int jbt_suspend(struct spi_device *spi, pm_message_t state)
- {
-diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h
-index 4cf760c..f430e5a 100644
---- a/include/linux/jbt6k74.h
-+++ b/include/linux/jbt6k74.h
-@@ -3,6 +3,20 @@
- 
- #include <linux/spi/spi.h>
- 
-+enum jbt_resolution {
-+	JBT_RESOLUTION_VGA,
-+	JBT_RESOLUTION_QVGA,
-+};
-+
-+enum jbt_power_mode {
-+	JBT_POWER_MODE_OFF,
-+	JBT_POWER_MODE_NORMAL,
-+};
-+
-+extern void jbt6k74_setpower(enum jbt_power_mode new_power);
-+extern int jbt6k74_setresolution(enum jbt_resolution new_resolution);
-+
-+
- /*
-  *  struct jbt6k74_platform_data - Platform data for jbt6k74 driver
-  *  @probe_completed: Callback to be called when the driver has been
--- 
-1.7.0.2
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0014-Fix-claim-of-2D-register-resource.patch b/recipes/linux/linux-openmoko-2.6.32/0014-Fix-claim-of-2D-register-resource.patch
new file mode 100644
index 0000000000..8dbdb70ce2
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32/0014-Fix-claim-of-2D-register-resource.patch
@@ -0,0 +1,27 @@
+From 8c753fc51c4954b88bacba68ee0591fb673de8fc Mon Sep 17 00:00:00 2001
+From: Thomas White <taw@bitwiz.org.uk>
+Date: Thu, 6 May 2010 08:37:04 -0700
+Subject: [PATCH 14/14] Fix claim of 2D register resource
+
+Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+---
+ drivers/mfd/glamo/glamo-drm-drv.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
+index ee648c1..4f982ad 100644
+--- a/drivers/mfd/glamo/glamo-drm-drv.c
++++ b/drivers/mfd/glamo/glamo-drm-drv.c
+@@ -272,7 +272,8 @@ static int glamodrm_probe(struct platform_device *pdev)
+ 	}
+ 
+ 	/* Find the 2D engine */
+-	gdrm->twod_regs = platform_get_resource(pdev, IORESOURCE_MEM, 4);
++	gdrm->twod_regs = platform_get_resource_byname(pdev, IORESOURCE_MEM,
++	                                               "glamo-2d-regs");
+ 	if ( !gdrm->twod_regs ) {
+ 		dev_err(&pdev->dev, "Unable to find 2D registers.\n");
+ 		rc = -ENOENT;
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.32/0015-ar6000-send-userspace-an-event-on-disconnection.patch b/recipes/linux/linux-openmoko-2.6.32/0015-ar6000-send-userspace-an-event-on-disconnection.patch
deleted file mode 100644
index fb0ede68e7..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0015-ar6000-send-userspace-an-event-on-disconnection.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 505ed5ebe6b5a296c83881e91fa7e8dd0ef021aa Mon Sep 17 00:00:00 2001
-From: Paul Fertser <fercerpav@gmail.com>
-Date: Sun, 21 Feb 2010 12:52:58 +0300
-Subject: [PATCH 15/15] ar6000: send userspace an event on disconnection
-
-Without this userspace gets confused and might fail to obtain a DHCP
-lease, bring the interface up etc etc.
-
-This place is definetely not the best or most intuitive to add this code
-but when added to the real disconnect callback it messes wpa_supplicant
-completely because hardware signals disconnection right after it was
-asked to associate (and signals association the next moment).
-
-The particular problem this patch solves is lack of DISCONNECTED event
-during suspend/resume; because of it "wpa_cli -a" doesn't relaunch its
-script and the interface is not brought up automatically after resume.
-
-Signed-off-by: Paul Fertser <fercerpav@gmail.com>
----
- drivers/ar6000/ar6000/ar6000_drv.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/ar6000/ar6000/ar6000_drv.c b/drivers/ar6000/ar6000/ar6000_drv.c
-index 90533ab..4e0ae72 100644
---- a/drivers/ar6000/ar6000/ar6000_drv.c
-+++ b/drivers/ar6000/ar6000/ar6000_drv.c
-@@ -934,6 +934,12 @@ static void
- ar6000_unavail_ev(void *Instance)
- {
-     AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance;
-+    union iwreq_data wrqu;
-+
-+    A_MEMZERO(&wrqu, sizeof(wrqu));
-+    wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-+    wireless_send_event(ar->arNetDev, SIOCGIWAP, &wrqu, NULL);
-+
-         /* NULL out it's entry in the global list */
-     ar6000_devices[ar->arDeviceIndex] = NULL;
-     ar6000_destroy(ar->arNetDev, 1);
--- 
-1.7.0.2
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0016-Enable-display-before-trying-to-set-mode-or-base.patch b/recipes/linux/linux-openmoko-2.6.32/0016-Enable-display-before-trying-to-set-mode-or-base.patch
deleted file mode 100644
index 4e7a8abe10..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0016-Enable-display-before-trying-to-set-mode-or-base.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 986df52e3e02a1cdbf43eafccd483f0f86c696bd Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Sun, 21 Mar 2010 20:55:18 +0100
-Subject: [PATCH 16/16] Enable display before trying to set mode or base
-
-This makes it possible to change mode when the screen is switched off.
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
----
- drivers/mfd/glamo/glamo-display.c |   56 ++++++++++++++++++------------------
- 1 files changed, 28 insertions(+), 28 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
-index e56cdb4..24a1a31 100644
---- a/drivers/mfd/glamo/glamo-display.c
-+++ b/drivers/mfd/glamo/glamo-display.c
-@@ -267,9 +267,9 @@ static int glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
- 	gdrm = gcrtc->gdrm;	/* Here it is! */
- 
- 	if ( !gcrtc->pixel_clock_on ) {
--		printk(KERN_WARNING "[glamo-drm] Refusing to set base while "
--		                    "pixel clock is off.\n");
--		return -EBUSY;
-+		printk(KERN_WARNING "[glamo-drm] Display is off - "
-+		                    "enabling it before setting base.\n");
-+		glamo_lcd_power(gdrm, 1);
- 	}
- 
- 	gfb = to_glamo_framebuffer(crtc->fb);
-@@ -304,9 +304,9 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc,
- 	gdrm = gcrtc->gdrm;	/* Here it is! */
- 
- 	if ( !gcrtc->pixel_clock_on ) {
--		printk(KERN_WARNING "[glamo-drm] Refusing to set mode while "
--		                    "pixel clock is off.\n");
--		return -EBUSY;
-+		printk(KERN_WARNING "[glamo-drm] Display is off - "
-+		                    "enabling it before setting mode.\n");
-+		glamo_lcd_power(gdrm, 1);
- 	}
- 
- 	glamo_lcd_cmd_mode(gdrm, 1);
-@@ -380,28 +380,6 @@ static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode)
- }
- 
- 
--void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode)
--{
--	struct drm_crtc *crtc = gdrm->crtc;
--	struct glamo_crtc *gcrtc = to_glamo_crtc(crtc);
--
--	if ( mode ) {
--		glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD);
--		gcrtc->pixel_clock_on = 1;
--		jbt6k74_setpower(JBT_POWER_MODE_NORMAL);
--		if ( gcrtc->current_mode_set ) {
--			glamo_crtc_mode_set(crtc, &gcrtc->current_mode,
--			                    &gcrtc->current_mode, 0, 0,
--			                    gcrtc->current_fb);
--		}
--	} else {
--		jbt6k74_setpower(JBT_POWER_MODE_OFF);
--		glamo_engine_suspend(gdrm->glamo_core, GLAMO_ENGINE_LCD);
--		gcrtc->pixel_clock_on = 0;
--	}
--}
--
--
- static void glamo_crtc_prepare(struct drm_crtc *crtc)
- {
- }
-@@ -862,6 +840,28 @@ int glamo_display_init(struct drm_device *dev)
- }
- 
- 
-+void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode)
-+{
-+	struct drm_crtc *crtc = gdrm->crtc;
-+	struct glamo_crtc *gcrtc = to_glamo_crtc(crtc);
-+
-+	if ( mode ) {
-+		glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD);
-+		gcrtc->pixel_clock_on = 1;
-+		jbt6k74_setpower(JBT_POWER_MODE_NORMAL);
-+		if ( gcrtc->current_mode_set ) {
-+			glamo_crtc_mode_set(crtc, &gcrtc->current_mode,
-+			                    &gcrtc->current_mode, 0, 0,
-+			                    gcrtc->current_fb);
-+		}
-+	} else {
-+		jbt6k74_setpower(JBT_POWER_MODE_OFF);
-+		glamo_engine_suspend(gdrm->glamo_core, GLAMO_ENGINE_LCD);
-+		gcrtc->pixel_clock_on = 0;
-+	}
-+}
-+
-+
- void glamo_display_suspend(struct glamodrm_handle *gdrm)
- {
- 	/* do nothing */
--- 
-1.7.0.2
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0021-gta02_defconfig.patch b/recipes/linux/linux-openmoko-2.6.32/0021-gta02_defconfig.patch
deleted file mode 100644
index 5c78c31e90..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0021-gta02_defconfig.patch
+++ /dev/null
@@ -1,2143 +0,0 @@
-From a081bd86a59ed4520551f490534ceece886d087e Mon Sep 17 00:00:00 2001
-From: Radek Polak <psonek2@seznam.cz>
-Date: Fri, 9 Apr 2010 09:24:43 +0200
-Subject: [PATCH 21/22] gta02_defconfig
-
-config used for qtmoko-v20. It has all freerunner hardware built in - so that
-you can boot and your phone hardware is working even without /lib/modules. I
-have (hopefully) all drivers from 2.6.29 as modules (usb keyboards etc).
----
- arch/arm/configs/gta02_defconfig | 2121 ++++++++++++++++++++++++++++++++++++++
- 1 files changed, 2121 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/configs/gta02_defconfig
-
-diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig
-new file mode 100644
-index 0000000..73d26ba
---- /dev/null
-+++ b/arch/arm/configs/gta02_defconfig
-@@ -0,0 +1,2121 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.32
-+# Wed Apr  7 23:27:29 2010
-+#
-+CONFIG_ARM=y
-+CONFIG_HAVE_PWM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+CONFIG_ARCH_HAS_CPUFREQ=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_FIQ=y
-+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+CONFIG_CONSTRUCTORS=y
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION="v20"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+
-+#
-+# RCU Subsystem
-+#
-+CONFIG_TREE_RCU=y
-+# CONFIG_TREE_PREEMPT_RCU is not set
-+# CONFIG_RCU_TRACE is not set
-+CONFIG_RCU_FANOUT=32
-+# CONFIG_RCU_FANOUT_EXACT is not set
-+# CONFIG_TREE_RCU_TRACE is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=18
-+# CONFIG_GROUP_SCHED is not set
-+# CONFIG_CGROUPS is not set
-+# CONFIG_SYSFS_DEPRECATED_V2 is not set
-+# CONFIG_RELAY is not set
-+CONFIG_NAMESPACES=y
-+# CONFIG_UTS_NS is not set
-+# CONFIG_IPC_NS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_NET_NS is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_RD_GZIP=y
-+CONFIG_RD_BZIP2=y
-+CONFIG_RD_LZMA=y
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_AIO=y
-+
-+#
-+# Kernel Performance Events And Counters
-+#
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_HAVE_CLK=y
-+
-+#
-+# GCOV-based kernel profiling
-+#
-+CONFIG_SLOW_WORK=y
-+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+# CONFIG_MODULE_FORCE_LOAD is not set
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBDAF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+# CONFIG_BLK_DEV_INTEGRITY is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+CONFIG_FREEZER=y
-+
-+#
-+# System Type
-+#
-+CONFIG_MMU=y
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_GEMINI is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_STMP3XXX is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_NOMADIK is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KIRKWOOD is not set
-+# CONFIG_ARCH_LOKI is not set
-+# CONFIG_ARCH_MV78XX0 is not set
-+# CONFIG_ARCH_ORION5X is not set
-+# CONFIG_ARCH_MMP is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_W90X900 is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_MSM is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_S3C64XX is not set
-+# CONFIG_ARCH_S5PC1XX is not set
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_U300 is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+# CONFIG_ARCH_BCMRING is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C24XX_PWM=y
-+CONFIG_S3C24XX_GPIO_EXTRA=64
-+CONFIG_S3C24XX_GPIO_EXTRA64=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_S3C24XX_ADC=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
-+
-+#
-+# Power management
-+#
-+# CONFIG_S3C2410_PM_DEBUG is not set
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=2
-+CONFIG_S3C_GPIO_SPACE=0
-+CONFIG_S3C_DMA=y
-+CONFIG_S3C_DEV_USB_HOST=y
-+CONFIG_S3C_DEV_NAND=y
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_TCT_HAMMER is not set
-+# CONFIG_MACH_VR1000 is not set
-+# CONFIG_MACH_QT2410 is not set
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_JIVE is not set
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+# CONFIG_ARCH_S3C2440 is not set
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+# CONFIG_MACH_AT2440EVB is not set
-+# CONFIG_MACH_MINI2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_MACH_NEO1973_GTA02=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_PABRT_LEGACY=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+CONFIG_ARM_L1_CACHE_SHIFT=5
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+CONFIG_VMSPLIT_3G=y
-+# CONFIG_VMSPLIT_2G is not set
-+# CONFIG_VMSPLIT_1G is not set
-+CONFIG_PAGE_OFFSET=0xC0000000
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+# CONFIG_OABI_COMPAT is not set
-+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-+# CONFIG_HIGHMEM is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+CONFIG_PAGEFLAGS_EXTENDED=y
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_PHYS_ADDR_T_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=0
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_HAVE_MLOCK=y
-+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-+# CONFIG_KSM is not set
-+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-+CONFIG_ALIGNMENT_TRAP=y
-+# CONFIG_UACCESS_WITH_MEMCPY is not set
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+# CONFIG_KEXEC is not set
-+
-+#
-+# CPU Power Management
-+#
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPU_IDLE=y
-+CONFIG_CPU_IDLE_GOV_LADDER=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-+CONFIG_HAVE_AOUT=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+# CONFIG_PM_DEBUG is not set
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND=y
-+CONFIG_SUSPEND_FREEZER=y
-+# CONFIG_APM_EMULATION is not set
-+# CONFIG_PM_RUNTIME is not set
-+CONFIG_ARCH_SUSPEND_POSSIBLE=y
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_XFRM_IPCOMP=m
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE is not set
-+CONFIG_IP_PNP=y
-+# CONFIG_IP_PNP_DHCP is not set
-+# CONFIG_IP_PNP_BOOTP is not set
-+# CONFIG_IP_PNP_RARP is not set
-+CONFIG_NET_IPIP=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+CONFIG_IP_MROUTE=y
-+# CONFIG_IP_PIMSM_V1 is not set
-+# CONFIG_IP_PIMSM_V2 is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+CONFIG_TCP_CONG_ADVANCED=y
-+# CONFIG_TCP_CONG_BIC is not set
-+# CONFIG_TCP_CONG_CUBIC is not set
-+CONFIG_TCP_CONG_WESTWOOD=y
-+# CONFIG_TCP_CONG_HTCP is not set
-+# CONFIG_TCP_CONG_HSTCP is not set
-+# CONFIG_TCP_CONG_HYBLA is not set
-+# CONFIG_TCP_CONG_VEGAS is not set
-+# CONFIG_TCP_CONG_SCALABLE is not set
-+# CONFIG_TCP_CONG_LP is not set
-+# CONFIG_TCP_CONG_VENO is not set
-+# CONFIG_TCP_CONG_YEAH is not set
-+# CONFIG_TCP_CONG_ILLINOIS is not set
-+# CONFIG_DEFAULT_BIC is not set
-+# CONFIG_DEFAULT_CUBIC is not set
-+# CONFIG_DEFAULT_HTCP is not set
-+# CONFIG_DEFAULT_VEGAS is not set
-+CONFIG_DEFAULT_WESTWOOD=y
-+# CONFIG_DEFAULT_RENO is not set
-+CONFIG_DEFAULT_TCP_CONG="westwood"
-+CONFIG_TCP_MD5SIG=y
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_NETFILTER_ADVANCED=y
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+# CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+# CONFIG_NETFILTER_TPROXY is not set
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_HL=m
-+# CONFIG_NETFILTER_XT_TARGET_LED is not set
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_HL=m
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_RECENT=m
-+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+CONFIG_NETFILTER_XT_MATCH_TIME=m
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-+# CONFIG_IP_VS is not set
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_DEFRAG_IPV4=m
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_NF_NAT_NEEDED=y
-+CONFIG_IP_NF_TARGET_MASQUERADE=m
-+CONFIG_IP_NF_TARGET_NETMAP=m
-+CONFIG_IP_NF_TARGET_REDIRECT=m
-+CONFIG_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_RAW=m
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_MATCH_FRAG=m
-+CONFIG_IP6_NF_MATCH_OPTS=m
-+CONFIG_IP6_NF_MATCH_HL=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_RT=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+# CONFIG_IP6_NF_RAW is not set
-+CONFIG_BRIDGE_NF_EBTABLES=m
-+CONFIG_BRIDGE_EBT_BROUTE=m
-+CONFIG_BRIDGE_EBT_T_FILTER=m
-+CONFIG_BRIDGE_EBT_T_NAT=m
-+CONFIG_BRIDGE_EBT_802_3=m
-+CONFIG_BRIDGE_EBT_AMONG=m
-+CONFIG_BRIDGE_EBT_ARP=m
-+CONFIG_BRIDGE_EBT_IP=m
-+# CONFIG_BRIDGE_EBT_IP6 is not set
-+CONFIG_BRIDGE_EBT_LIMIT=m
-+CONFIG_BRIDGE_EBT_MARK=m
-+CONFIG_BRIDGE_EBT_PKTTYPE=m
-+CONFIG_BRIDGE_EBT_STP=m
-+CONFIG_BRIDGE_EBT_VLAN=m
-+CONFIG_BRIDGE_EBT_ARPREPLY=m
-+CONFIG_BRIDGE_EBT_DNAT=m
-+CONFIG_BRIDGE_EBT_MARK_T=m
-+CONFIG_BRIDGE_EBT_REDIRECT=m
-+CONFIG_BRIDGE_EBT_SNAT=m
-+CONFIG_BRIDGE_EBT_LOG=m
-+CONFIG_BRIDGE_EBT_ULOG=m
-+# CONFIG_BRIDGE_EBT_NFLOG is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_RDS is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_STP=y
-+CONFIG_BRIDGE=y
-+# CONFIG_NET_DSA is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=y
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_PHONET is not set
-+# CONFIG_IEEE802154 is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_MULTIQ is not set
-+CONFIG_NET_SCH_RED=m
-+CONFIG_NET_SCH_SFQ=m
-+CONFIG_NET_SCH_TEQL=m
-+CONFIG_NET_SCH_TBF=m
-+CONFIG_NET_SCH_GRED=m
-+CONFIG_NET_SCH_DSMARK=m
-+CONFIG_NET_SCH_NETEM=m
-+# CONFIG_NET_SCH_DRR is not set
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+CONFIG_NET_CLS_TCINDEX=m
-+CONFIG_NET_CLS_ROUTE4=m
-+CONFIG_NET_CLS_ROUTE=y
-+CONFIG_NET_CLS_FW=m
-+CONFIG_NET_CLS_U32=m
-+CONFIG_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_CLS_FLOW is not set
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+# CONFIG_DCB is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+CONFIG_BT=y
-+CONFIG_BT_L2CAP=y
-+CONFIG_BT_SCO=y
-+CONFIG_BT_RFCOMM=y
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=y
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=y
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIBTUSB=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_BT_MRVL is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+CONFIG_WIRELESS=y
-+# CONFIG_CFG80211 is not set
-+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-+CONFIG_WIRELESS_OLD_REGULATORY=y
-+CONFIG_WIRELESS_EXT=y
-+CONFIG_WIRELESS_EXT_SYSFS=y
-+# CONFIG_LIB80211 is not set
-+
-+#
-+# CFG80211 needs to be enabled for MAC80211
-+#
-+# CONFIG_WIMAX is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_FIRMWARE_IN_KERNEL is not set
-+CONFIG_EXTRA_FIRMWARE=""
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_TESTS is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+# CONFIG_MTD_AR7_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+CONFIG_MTD_ROM=y
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+# CONFIG_MTD_PHYSMAP_COMPAT is not set
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SST25L is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+# CONFIG_MTD_NAND_GPIO is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# LPDDR flash memory drivers
-+#
-+# CONFIG_MTD_LPDDR is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_MG_DISK is not set
-+# CONFIG_MISC_DEVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_LIBFC is not set
-+# CONFIG_LIBFCOE is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_DH is not set
-+# CONFIG_SCSI_OSD_INITIATOR is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_NET_ETHERNET is not set
-+CONFIG_MII=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+CONFIG_WLAN=y
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# Enable WiMAX (Networking options) to see the WiMAX drivers
-+#
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+CONFIG_PPP=m
-+CONFIG_PPP_MULTILINK=y
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+CONFIG_INPUT_JOYDEV=m
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ADP5588 is not set
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# CONFIG_QT2160 is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+CONFIG_KEYBOARD_GPIO=y
-+# CONFIG_KEYBOARD_MATRIX is not set
-+# CONFIG_KEYBOARD_LM8323 is not set
-+# CONFIG_KEYBOARD_MAX7359 is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_OPENCORES is not set
-+CONFIG_KEYBOARD_STOWAWAY=m
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+CONFIG_TOUCHSCREEN_FILTER=y
-+CONFIG_TOUCHSCREEN_FILTER_GROUP=y
-+CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y
-+CONFIG_TOUCHSCREEN_FILTER_MEAN=y
-+CONFIG_TOUCHSCREEN_FILTER_LINEAR=y
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_AD7877 is not set
-+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-+# CONFIG_TOUCHSCREEN_AD7879 is not set
-+# CONFIG_TOUCHSCREEN_EETI is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-+# CONFIG_TOUCHSCREEN_MCS5000 is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_INEXIO is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-+# CONFIG_TOUCHSCREEN_TSC2007 is not set
-+# CONFIG_TOUCHSCREEN_W90X900 is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+# CONFIG_INPUT_CM109 is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_PCF50633_PMU=y
-+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_CONSOLE_TRANSLATIONS=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_DEVKMEM is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_SAMSUNG=y
-+CONFIG_SERIAL_SAMSUNG_UARTS=3
-+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-+CONFIG_SERIAL_S3C2440=y
-+# CONFIG_SERIAL_MAX3100 is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+# CONFIG_I2C_COMPAT is not set
-+CONFIG_I2C_CHARDEV=y
-+# CONFIG_I2C_HELPER_AUTO is not set
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+
-+#
-+# I2C system bus drivers (mostly embedded / system-on-chip)
-+#
-+# CONFIG_I2C_DESIGNWARE is not set
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+
-+#
-+# External I2C/SMBus adapter drivers
-+#
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Other I2C/SMBus bus drivers
-+#
-+# CONFIG_I2C_PCA_PLATFORM is not set
-+# CONFIG_I2C_STUB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+CONFIG_SPI=y
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_GPIO=y
-+CONFIG_SPI_S3C24XX=y
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+
-+#
-+# PPS support
-+#
-+# CONFIG_PPS is not set
-+CONFIG_ARCH_REQUIRE_GPIOLIB=y
-+CONFIG_GPIOLIB=y
-+CONFIG_GPIO_SYSFS=y
-+
-+#
-+# Memory mapped GPIO expanders:
-+#
-+
-+#
-+# I2C GPIO expanders:
-+#
-+# CONFIG_GPIO_MAX732X is not set
-+# CONFIG_GPIO_PCA953X is not set
-+# CONFIG_GPIO_PCF857X is not set
-+CONFIG_GPIO_PCF50633=y
-+
-+#
-+# PCI GPIO expanders:
-+#
-+
-+#
-+# SPI GPIO expanders:
-+#
-+# CONFIG_GPIO_MAX7301 is not set
-+# CONFIG_GPIO_MCP23S08 is not set
-+# CONFIG_GPIO_MC33880 is not set
-+
-+#
-+# AC97 GPIO expanders:
-+#
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+# CONFIG_POWER_SUPPLY_DEBUG is not set
-+# CONFIG_PDA_POWER is not set
-+# CONFIG_BATTERY_DS2760 is not set
-+# CONFIG_BATTERY_DS2782 is not set
-+# CONFIG_BATTERY_BQ27x00 is not set
-+# CONFIG_BATTERY_MAX17040 is not set
-+CONFIG_CHARGER_PCF50633=y
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_HDQ_GPIO_BITBANG=y
-+CONFIG_BATTERY_PLATFORM=y
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=y
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+CONFIG_SSB_POSSIBLE=y
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+CONFIG_MFD_CORE=y
-+# CONFIG_MFD_SM501 is not set
-+# CONFIG_MFD_ASIC3 is not set
-+# CONFIG_HTC_EGPIO is not set
-+# CONFIG_HTC_PASIC3 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_TWL4030_CORE is not set
-+# CONFIG_MFD_TMIO is not set
-+# CONFIG_MFD_T7L66XB is not set
-+# CONFIG_MFD_TC6387XB is not set
-+# CONFIG_MFD_TC6393XB is not set
-+# CONFIG_PMIC_DA903X is not set
-+# CONFIG_MFD_WM8400 is not set
-+# CONFIG_MFD_WM831X is not set
-+# CONFIG_MFD_WM8350_I2C is not set
-+CONFIG_MFD_PCF50633=y
-+# CONFIG_MFD_MC13783 is not set
-+CONFIG_PCF50633_ADC=y
-+# CONFIG_AB3100_CORE is not set
-+# CONFIG_EZX_PCAP is not set
-+CONFIG_MFD_GLAMO=y
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_GPIO=y
-+CONFIG_MFD_GLAMO_MCI=y
-+CONFIG_REGULATOR=y
-+# CONFIG_REGULATOR_DEBUG is not set
-+CONFIG_REGULATOR_FIXED_VOLTAGE=y
-+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-+CONFIG_REGULATOR_USERSPACE_CONSUMER=y
-+# CONFIG_REGULATOR_BQ24022 is not set
-+# CONFIG_REGULATOR_MAX1586 is not set
-+CONFIG_REGULATOR_PCF50633=y
-+# CONFIG_REGULATOR_LP3971 is not set
-+# CONFIG_REGULATOR_TPS65023 is not set
-+# CONFIG_REGULATOR_TPS6507X is not set
-+# CONFIG_MEDIA_SUPPORT is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_FOREIGN_ENDIAN is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+# CONFIG_FB_TMIO is not set
-+# CONFIG_FB_S3C2410 is not set
-+# CONFIG_FB_VIRTUAL is not set
-+# CONFIG_FB_METRONOME is not set
-+# CONFIG_FB_MB862XX is not set
-+# CONFIG_FB_BROADSHEET is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+# CONFIG_LCD_LMS283GF05 is not set
-+# CONFIG_LCD_LTV350QV is not set
-+# CONFIG_LCD_ILI9320 is not set
-+# CONFIG_LCD_TDO24M is not set
-+# CONFIG_LCD_VGG2432A4 is not set
-+# CONFIG_LCD_PLATFORM is not set
-+CONFIG_LCD_JBT6K74=y
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_GENERIC is not set
-+# CONFIG_BACKLIGHT_PWM is not set
-+CONFIG_BACKLIGHT_PCF50633=y
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 is not set
-+# CONFIG_FONT_PEARL_8x8 is not set
-+# CONFIG_FONT_ACORN_8x8 is not set
-+# CONFIG_FONT_MINI_4x6 is not set
-+# CONFIG_FONT_SUN8x16 is not set
-+# CONFIG_FONT_SUN12x22 is not set
-+# CONFIG_FONT_10x18 is not set
-+CONFIG_LOGO=y
-+# CONFIG_LOGO_LINUX_MONO is not set
-+# CONFIG_LOGO_LINUX_VGA16 is not set
-+# CONFIG_LOGO_LINUX_CLUT224 is not set
-+CONFIG_SOUND=y
-+CONFIG_SOUND_OSS_CORE=y
-+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-+CONFIG_SND=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+CONFIG_SND_JACK=y
-+CONFIG_SND_SEQUENCER=y
-+CONFIG_SND_SEQ_DUMMY=y
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=y
-+CONFIG_SND_PCM_OSS=y
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+CONFIG_SND_SEQUENCER_OSS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+# CONFIG_SND_SUPPORT_OLD_API is not set
-+# CONFIG_SND_VERBOSE_PROCFS is not set
-+# CONFIG_SND_VERBOSE_PRINTK is not set
-+# CONFIG_SND_DEBUG is not set
-+# CONFIG_SND_RAWMIDI_SEQ is not set
-+# CONFIG_SND_OPL3_LIB_SEQ is not set
-+# CONFIG_SND_OPL4_LIB_SEQ is not set
-+# CONFIG_SND_SBAWE_SEQ is not set
-+# CONFIG_SND_EMU10K1_SEQ is not set
-+# CONFIG_SND_DRIVERS is not set
-+# CONFIG_SND_ARM is not set
-+# CONFIG_SND_SPI is not set
-+# CONFIG_SND_USB is not set
-+CONFIG_SND_SOC=y
-+CONFIG_SND_S3C24XX_SOC=y
-+CONFIG_SND_S3C24XX_SOC_I2S=y
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-+# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
-+# CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
-+# CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23 is not set
-+# CONFIG_SND_S3C24XX_SOC_SIMTEC_HERMES is not set
-+CONFIG_SND_SOC_I2C_AND_SPI=y
-+# CONFIG_SND_SOC_ALL_CODECS is not set
-+CONFIG_SND_SOC_WM8753=y
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_HID_PID is not set
-+# CONFIG_USB_HIDDEV is not set
-+
-+#
-+# Special HID drivers
-+#
-+CONFIG_HID_A4TECH=y
-+CONFIG_HID_APPLE=y
-+CONFIG_HID_BELKIN=y
-+CONFIG_HID_CHERRY=y
-+CONFIG_HID_CHICONY=y
-+CONFIG_HID_CYPRESS=y
-+CONFIG_HID_DRAGONRISE=y
-+# CONFIG_DRAGONRISE_FF is not set
-+CONFIG_HID_EZKEY=y
-+CONFIG_HID_KYE=y
-+CONFIG_HID_GYRATION=y
-+CONFIG_HID_TWINHAN=y
-+CONFIG_HID_KENSINGTON=y
-+CONFIG_HID_LOGITECH=y
-+# CONFIG_LOGITECH_FF is not set
-+# CONFIG_LOGIRUMBLEPAD2_FF is not set
-+CONFIG_HID_MICROSOFT=y
-+CONFIG_HID_MONTEREY=y
-+CONFIG_HID_NTRIG=y
-+CONFIG_HID_PANTHERLORD=y
-+# CONFIG_PANTHERLORD_FF is not set
-+CONFIG_HID_PETALYNX=y
-+CONFIG_HID_SAMSUNG=y
-+CONFIG_HID_SONY=y
-+CONFIG_HID_SUNPLUS=y
-+CONFIG_HID_GREENASIA=y
-+# CONFIG_GREENASIA_FF is not set
-+CONFIG_HID_SMARTJOYPLUS=y
-+# CONFIG_SMARTJOYPLUS_FF is not set
-+CONFIG_HID_TOPSEED=y
-+CONFIG_HID_THRUSTMASTER=y
-+# CONFIG_THRUSTMASTER_FF is not set
-+CONFIG_HID_WACOM=y
-+CONFIG_HID_ZEROPLUS=y
-+# CONFIG_ZEROPLUS_FF is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-+
-+#
-+# Miscellaneous USB options
-+#
-+# CONFIG_USB_DEVICEFS is not set
-+# CONFIG_USB_DEVICE_CLASS is not set
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+# CONFIG_USB_OTG is not set
-+# CONFIG_USB_MON is not set
-+# CONFIG_USB_WUSB is not set
-+# CONFIG_USB_WUSB_CBAF is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_C67X00_HCD is not set
-+# CONFIG_USB_OXU210HP_HCD is not set
-+# CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_ISP1760_HCD is not set
-+# CONFIG_USB_ISP1362_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+# CONFIG_USB_HWA_HCD is not set
-+# CONFIG_USB_MUSB_HDRC is not set
-+# CONFIG_USB_GADGET_MUSB_HDRC is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+# CONFIG_USB_WDM is not set
-+CONFIG_USB_TMC=m
-+
-+#
-+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-+#
-+
-+#
-+# also be needed; see USB_STORAGE Help for more info
-+#
-+CONFIG_USB_STORAGE=m
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+CONFIG_USB_STORAGE_DATAFAB=m
-+CONFIG_USB_STORAGE_FREECOM=m
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+CONFIG_USB_STORAGE_USBAT=m
-+CONFIG_USB_STORAGE_SDDR09=m
-+CONFIG_USB_STORAGE_SDDR55=m
-+CONFIG_USB_STORAGE_JUMPSHOT=m
-+CONFIG_USB_STORAGE_ALAUDA=m
-+# CONFIG_USB_STORAGE_ONETOUCH is not set
-+CONFIG_USB_STORAGE_KARMA=m
-+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+
-+#
-+# USB port drivers
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_EZUSB=y
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+# CONFIG_USB_SERIAL_CP210X is not set
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=m
-+CONFIG_USB_SERIAL_VISOR=m
-+CONFIG_USB_SERIAL_IPAQ=m
-+CONFIG_USB_SERIAL_IR=m
-+CONFIG_USB_SERIAL_EDGEPORT=m
-+CONFIG_USB_SERIAL_EDGEPORT_TI=m
-+CONFIG_USB_SERIAL_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+# CONFIG_USB_SERIAL_IUU is not set
-+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-+CONFIG_USB_SERIAL_KEYSPAN=m
-+CONFIG_USB_SERIAL_KLSI=m
-+CONFIG_USB_SERIAL_KOBIL_SCT=m
-+CONFIG_USB_SERIAL_MCT_U232=m
-+CONFIG_USB_SERIAL_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+# CONFIG_USB_SERIAL_MOTOROLA is not set
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+# CONFIG_USB_SERIAL_QUALCOMM is not set
-+# CONFIG_USB_SERIAL_SPCP8X5 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+# CONFIG_USB_SERIAL_SYMBOL is not set
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_OPTICON is not set
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_SEVSEG is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_ISIGHTFW is not set
-+# CONFIG_USB_VST is not set
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_VBUS_DRAW=500
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+# CONFIG_USB_GADGET_PXA25X is not set
-+# CONFIG_USB_GADGET_R8A66597 is not set
-+# CONFIG_USB_GADGET_PXA27X is not set
-+# CONFIG_USB_GADGET_S3C_HSOTG is not set
-+# CONFIG_USB_GADGET_IMX is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_FSL_QE is not set
-+# CONFIG_USB_GADGET_CI13XXX is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LANGWELL is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+# CONFIG_USB_AUDIO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_ETH_EEM is not set
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+# CONFIG_USB_G_PRINTER is not set
-+# CONFIG_USB_CDC_COMPOSITE is not set
-+
-+#
-+# OTG and related infrastructure
-+#
-+# CONFIG_USB_GPIO_VBUS is not set
-+# CONFIG_NOP_USB_XCEIV is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD/SDIO Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+# CONFIG_SDIO_UART is not set
-+# CONFIG_MMC_TEST is not set
-+
-+#
-+# MMC/SD/SDIO Host Controller Drivers
-+#
-+# CONFIG_MMC_SDHCI is not set
-+# CONFIG_MMC_AT91 is not set
-+# CONFIG_MMC_ATMELMCI is not set
-+# CONFIG_MMC_SPI is not set
-+CONFIG_MMC_S3C=y
-+# CONFIG_MMC_S3C_HW_SDIO_IRQ is not set
-+CONFIG_MMC_S3C_PIO=y
-+# CONFIG_MMC_S3C_DMA is not set
-+# CONFIG_MMC_S3C_PIODMA is not set
-+# CONFIG_MEMSTICK is not set
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+# CONFIG_LEDS_S3C24XX is not set
-+# CONFIG_LEDS_PCA9532 is not set
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_GPIO_PLATFORM=y
-+# CONFIG_LEDS_LP3944 is not set
-+# CONFIG_LEDS_PCA955X is not set
-+# CONFIG_LEDS_DAC124S085 is not set
-+# CONFIG_LEDS_PWM is not set
-+# CONFIG_LEDS_BD2802 is not set
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-+# CONFIG_LEDS_TRIGGER_GPIO is not set
-+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-+
-+#
-+# iptables trigger is under Netfilter config (LED target)
-+#
-+# CONFIG_ACCESSIBILITY is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+# CONFIG_RTC_DRV_FM3130 is not set
-+# CONFIG_RTC_DRV_RX8581 is not set
-+# CONFIG_RTC_DRV_RX8025 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_M41T94 is not set
-+# CONFIG_RTC_DRV_DS1305 is not set
-+# CONFIG_RTC_DRV_DS1390 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_DS3234 is not set
-+# CONFIG_RTC_DRV_PCF2123 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1286 is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T35 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_BQ4802 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+CONFIG_RTC_DRV_PCF50633=y
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=y
-+# CONFIG_DMADEVICES is not set
-+# CONFIG_AUXDISPLAY is not set
-+# CONFIG_UIO is not set
-+
-+#
-+# TI VLYNQ
-+#
-+CONFIG_STAGING=y
-+# CONFIG_STAGING_EXCLUDE_BUILD is not set
-+# CONFIG_USB_IP_COMMON is not set
-+# CONFIG_PRISM2_USB is not set
-+# CONFIG_ECHO is not set
-+# CONFIG_COMEDI is not set
-+# CONFIG_ASUS_OLED is not set
-+# CONFIG_INPUT_MIMIO is not set
-+# CONFIG_TRANZPORT is not set
-+
-+#
-+# Android
-+#
-+
-+#
-+# Qualcomm MSM Camera And Video
-+#
-+
-+#
-+# Camera Sensor Selection
-+#
-+# CONFIG_INPUT_GPIO is not set
-+# CONFIG_DST is not set
-+# CONFIG_POHMELFS is not set
-+# CONFIG_PLAN9AUTH is not set
-+# CONFIG_LINE6_USB is not set
-+# CONFIG_USB_SERIAL_QUATECH2 is not set
-+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-+# CONFIG_VT6656 is not set
-+# CONFIG_FB_UDL is not set
-+
-+#
-+# RAR Register Driver
-+#
-+# CONFIG_RAR_REGISTER is not set
-+# CONFIG_IIO is not set
-+CONFIG_AR6000_WLAN=y
-+# CONFIG_AR6000_WLAN_DEBUG is not set
-+# CONFIG_AR6000_WLAN_RESET is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4_FS is not set
-+CONFIG_JBD=y
-+CONFIG_REISERFS_FS=m
-+# CONFIG_REISERFS_CHECK is not set
-+# CONFIG_REISERFS_PROC_INFO is not set
-+# CONFIG_REISERFS_FS_XATTR is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_BTRFS_FS is not set
-+# CONFIG_NILFS2_FS is not set
-+CONFIG_FILE_LOCKING=y
-+CONFIG_FSNOTIFY=y
-+# CONFIG_DNOTIFY is not set
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+CONFIG_CUSE=m
-+
-+#
-+# Caches
-+#
-+# CONFIG_FSCACHE is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+# CONFIG_MSDOS_FS is not set
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+CONFIG_MISC_FILESYSTEMS=y
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+# CONFIG_CRAMFS is not set
-+CONFIG_SQUASHFS=m
-+# CONFIG_SQUASHFS_EMBEDDED is not set
-+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_OMFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=m
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3=y
-+# CONFIG_NFSD_V3_ACL is not set
-+# CONFIG_NFSD_V4 is not set
-+CONFIG_LOCKD=m
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=m
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+# CONFIG_CIFS_WEAK_PW_HASH is not set
-+# CONFIG_CIFS_XATTR is not set
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=m
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+CONFIG_NLS_CODEPAGE_866=m
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+CONFIG_NLS_CODEPAGE_1251=m
-+# CONFIG_NLS_ASCII is not set
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=m
-+# CONFIG_DLM is not set
-+
-+#
-+# Kernel hacking
-+#
-+CONFIG_PRINTK_TIME=y
-+# CONFIG_ENABLE_WARN_DEPRECATED is not set
-+# CONFIG_ENABLE_MUST_CHECK is not set
-+CONFIG_FRAME_WARN=1024
-+# CONFIG_MAGIC_SYSRQ is not set
-+CONFIG_STRIP_ASM_SYMS=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_MEMORY_INIT=y
-+CONFIG_FRAME_POINTER=y
-+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-+# CONFIG_LATENCYTOP is not set
-+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-+CONFIG_HAVE_FUNCTION_TRACER=y
-+CONFIG_TRACING_SUPPORT=y
-+# CONFIG_FTRACE is not set
-+# CONFIG_SAMPLES is not set
-+CONFIG_HAVE_ARCH_KGDB=y
-+# CONFIG_ARM_UNWIND is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_S3C_UART=2
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITYFS is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_ALGAPI2=y
-+CONFIG_CRYPTO_AEAD=m
-+CONFIG_CRYPTO_AEAD2=y
-+CONFIG_CRYPTO_BLKCIPHER=m
-+CONFIG_CRYPTO_BLKCIPHER2=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_HASH2=y
-+CONFIG_CRYPTO_RNG2=y
-+CONFIG_CRYPTO_PCOMP=y
-+CONFIG_CRYPTO_MANAGER=m
-+CONFIG_CRYPTO_MANAGER2=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_WORKQUEUE=y
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_SEQIV is not set
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=m
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_CTS is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_XTS is not set
-+
-+#
-+# Hash modes
-+#
-+CONFIG_CRYPTO_HMAC=m
-+CONFIG_CRYPTO_XCBC=m
-+# CONFIG_CRYPTO_VMAC is not set
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
-+# CONFIG_CRYPTO_GHASH is not set
-+CONFIG_CRYPTO_MD4=m
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+# CONFIG_CRYPTO_RMD128 is not set
-+# CONFIG_CRYPTO_RMD160 is not set
-+# CONFIG_CRYPTO_RMD256 is not set
-+# CONFIG_CRYPTO_RMD320 is not set
-+CONFIG_CRYPTO_SHA1=m
-+CONFIG_CRYPTO_SHA256=m
-+CONFIG_CRYPTO_SHA512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
-+# CONFIG_CRYPTO_AES is not set
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_DES=m
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_KHAZAD=m
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_ZLIB=y
-+# CONFIG_CRYPTO_LZO is not set
-+
-+#
-+# Random Number Generation
-+#
-+# CONFIG_CRYPTO_ANSI_CPRNG is not set
-+# CONFIG_CRYPTO_HW is not set
-+# CONFIG_BINARY_PRINTF is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_GENERIC_FIND_LAST_BIT=y
-+CONFIG_CRC_CCITT=y
-+CONFIG_CRC16=y
-+CONFIG_CRC_T10DIF=y
-+CONFIG_CRC_ITU_T=y
-+CONFIG_CRC32=y
-+CONFIG_CRC7=y
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_DECOMPRESS_GZIP=y
-+CONFIG_DECOMPRESS_BZIP2=y
-+CONFIG_DECOMPRESS_LZMA=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
-+CONFIG_NLATTR=y
--- 
-1.7.0.4
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0022-gta02_drm_defconfig.patch b/recipes/linux/linux-openmoko-2.6.32/0022-gta02_drm_defconfig.patch
deleted file mode 100644
index e722077f78..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0022-gta02_drm_defconfig.patch
+++ /dev/null
@@ -1,2169 +0,0 @@
-From 91e56b8866d0cced4f17251eb509bd212dbd00f4 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 9 Apr 2010 09:25:52 +0200
-Subject: [PATCH] gta02_drm_defconfig
-
-config used in SHR-U, KMS enabled
----
- arch/arm/configs/gta02_drm_defconfig | 2149 ++++++++++++++++++++++++++++++++++
- 1 files changed, 2149 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/configs/gta02_drm_defconfig
-
-diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig
-new file mode 100644
-index 0000000..05aa130
---- /dev/null
-+++ b/arch/arm/configs/gta02_drm_defconfig
-@@ -0,0 +1,2149 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.32.11
-+# Sun Apr 11 14:20:07 2010
-+#
-+CONFIG_ARM=y
-+CONFIG_HAVE_PWM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+CONFIG_ARCH_HAS_CPUFREQ=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_FIQ=y
-+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+CONFIG_CONSTRUCTORS=y
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+
-+#
-+# RCU Subsystem
-+#
-+CONFIG_TREE_RCU=y
-+# CONFIG_TREE_PREEMPT_RCU is not set
-+# CONFIG_RCU_TRACE is not set
-+CONFIG_RCU_FANOUT=32
-+# CONFIG_RCU_FANOUT_EXACT is not set
-+# CONFIG_TREE_RCU_TRACE is not set
-+CONFIG_IKCONFIG=m
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=18
-+# CONFIG_GROUP_SCHED is not set
-+# CONFIG_CGROUPS is not set
-+# CONFIG_SYSFS_DEPRECATED_V2 is not set
-+# CONFIG_RELAY is not set
-+CONFIG_NAMESPACES=y
-+# CONFIG_UTS_NS is not set
-+# CONFIG_IPC_NS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_NET_NS is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_RD_GZIP=y
-+CONFIG_RD_BZIP2=y
-+CONFIG_RD_LZMA=y
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_AIO=y
-+
-+#
-+# Kernel Performance Events And Counters
-+#
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_HAVE_CLK=y
-+
-+#
-+# GCOV-based kernel profiling
-+#
-+# CONFIG_GCOV_KERNEL is not set
-+CONFIG_SLOW_WORK=y
-+# CONFIG_SLOW_WORK_DEBUG is not set
-+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+# CONFIG_MODULE_FORCE_LOAD is not set
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBDAF is not set
-+CONFIG_BLK_DEV_BSG=y
-+# CONFIG_BLK_DEV_INTEGRITY is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+CONFIG_FREEZER=y
-+
-+#
-+# System Type
-+#
-+CONFIG_MMU=y
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_GEMINI is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_STMP3XXX is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_NOMADIK is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KIRKWOOD is not set
-+# CONFIG_ARCH_LOKI is not set
-+# CONFIG_ARCH_MV78XX0 is not set
-+# CONFIG_ARCH_ORION5X is not set
-+# CONFIG_ARCH_MMP is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_W90X900 is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_MSM is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_S3C64XX is not set
-+# CONFIG_ARCH_S5PC1XX is not set
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_U300 is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+# CONFIG_ARCH_BCMRING is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C24XX_PWM=y
-+CONFIG_S3C24XX_GPIO_EXTRA=64
-+CONFIG_S3C24XX_GPIO_EXTRA64=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_S3C24XX_ADC=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_S3C_BOOT_WATCHDOG=y
-+CONFIG_S3C_BOOT_ERROR_RESET=y
-+CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
-+
-+#
-+# Power management
-+#
-+# CONFIG_S3C2410_PM_DEBUG is not set
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=2
-+CONFIG_S3C_GPIO_SPACE=0
-+CONFIG_S3C_DMA=y
-+CONFIG_S3C_DEV_USB_HOST=y
-+CONFIG_S3C_DEV_NAND=y
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_TCT_HAMMER is not set
-+# CONFIG_MACH_VR1000 is not set
-+# CONFIG_MACH_QT2410 is not set
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_JIVE is not set
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+# CONFIG_ARCH_S3C2440 is not set
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+# CONFIG_MACH_AT2440EVB is not set
-+# CONFIG_MACH_MINI2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_MACH_NEO1973_GTA02=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_PABRT_LEGACY=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+CONFIG_ARM_L1_CACHE_SHIFT=5
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+CONFIG_VMSPLIT_3G=y
-+# CONFIG_VMSPLIT_2G is not set
-+# CONFIG_VMSPLIT_1G is not set
-+CONFIG_PAGE_OFFSET=0xC0000000
-+# CONFIG_PREEMPT_NONE is not set
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+CONFIG_PREEMPT=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+# CONFIG_OABI_COMPAT is not set
-+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-+# CONFIG_HIGHMEM is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+CONFIG_PAGEFLAGS_EXTENDED=y
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_PHYS_ADDR_T_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=0
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_HAVE_MLOCK=y
-+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-+# CONFIG_KSM is not set
-+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-+CONFIG_ALIGNMENT_TRAP=y
-+# CONFIG_UACCESS_WITH_MEMCPY is not set
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list quiet "
-+# CONFIG_XIP_KERNEL is not set
-+# CONFIG_KEXEC is not set
-+
-+#
-+# CPU Power Management
-+#
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPU_IDLE=y
-+CONFIG_CPU_IDLE_GOV_LADDER=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-+CONFIG_HAVE_AOUT=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+# CONFIG_PM_DEBUG is not set
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND=y
-+CONFIG_SUSPEND_FREEZER=y
-+# CONFIG_APM_EMULATION is not set
-+# CONFIG_PM_RUNTIME is not set
-+CONFIG_ARCH_SUSPEND_POSSIBLE=y
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_XFRM_IPCOMP=m
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE is not set
-+CONFIG_IP_PNP=y
-+# CONFIG_IP_PNP_DHCP is not set
-+# CONFIG_IP_PNP_BOOTP is not set
-+# CONFIG_IP_PNP_RARP is not set
-+CONFIG_NET_IPIP=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+CONFIG_IP_MROUTE=y
-+# CONFIG_IP_PIMSM_V1 is not set
-+# CONFIG_IP_PIMSM_V2 is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+CONFIG_TCP_CONG_ADVANCED=y
-+# CONFIG_TCP_CONG_BIC is not set
-+# CONFIG_TCP_CONG_CUBIC is not set
-+CONFIG_TCP_CONG_WESTWOOD=y
-+# CONFIG_TCP_CONG_HTCP is not set
-+# CONFIG_TCP_CONG_HSTCP is not set
-+# CONFIG_TCP_CONG_HYBLA is not set
-+# CONFIG_TCP_CONG_VEGAS is not set
-+# CONFIG_TCP_CONG_SCALABLE is not set
-+# CONFIG_TCP_CONG_LP is not set
-+# CONFIG_TCP_CONG_VENO is not set
-+# CONFIG_TCP_CONG_YEAH is not set
-+# CONFIG_TCP_CONG_ILLINOIS is not set
-+# CONFIG_DEFAULT_BIC is not set
-+# CONFIG_DEFAULT_CUBIC is not set
-+# CONFIG_DEFAULT_HTCP is not set
-+# CONFIG_DEFAULT_VEGAS is not set
-+CONFIG_DEFAULT_WESTWOOD=y
-+# CONFIG_DEFAULT_RENO is not set
-+CONFIG_DEFAULT_TCP_CONG="westwood"
-+CONFIG_TCP_MD5SIG=y
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_NETFILTER_ADVANCED=y
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+# CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+# CONFIG_NETFILTER_TPROXY is not set
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_HL=m
-+# CONFIG_NETFILTER_XT_TARGET_LED is not set
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_HL=m
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_RECENT=m
-+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+CONFIG_NETFILTER_XT_MATCH_TIME=m
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-+# CONFIG_IP_VS is not set
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_DEFRAG_IPV4=m
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_NF_NAT_NEEDED=y
-+CONFIG_IP_NF_TARGET_MASQUERADE=m
-+CONFIG_IP_NF_TARGET_NETMAP=m
-+CONFIG_IP_NF_TARGET_REDIRECT=m
-+CONFIG_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_RAW=m
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_MATCH_FRAG=m
-+CONFIG_IP6_NF_MATCH_OPTS=m
-+CONFIG_IP6_NF_MATCH_HL=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_RT=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+# CONFIG_IP6_NF_RAW is not set
-+CONFIG_BRIDGE_NF_EBTABLES=m
-+CONFIG_BRIDGE_EBT_BROUTE=m
-+CONFIG_BRIDGE_EBT_T_FILTER=m
-+CONFIG_BRIDGE_EBT_T_NAT=m
-+CONFIG_BRIDGE_EBT_802_3=m
-+CONFIG_BRIDGE_EBT_AMONG=m
-+CONFIG_BRIDGE_EBT_ARP=m
-+CONFIG_BRIDGE_EBT_IP=m
-+# CONFIG_BRIDGE_EBT_IP6 is not set
-+CONFIG_BRIDGE_EBT_LIMIT=m
-+CONFIG_BRIDGE_EBT_MARK=m
-+CONFIG_BRIDGE_EBT_PKTTYPE=m
-+CONFIG_BRIDGE_EBT_STP=m
-+CONFIG_BRIDGE_EBT_VLAN=m
-+CONFIG_BRIDGE_EBT_ARPREPLY=m
-+CONFIG_BRIDGE_EBT_DNAT=m
-+CONFIG_BRIDGE_EBT_MARK_T=m
-+CONFIG_BRIDGE_EBT_REDIRECT=m
-+CONFIG_BRIDGE_EBT_SNAT=m
-+CONFIG_BRIDGE_EBT_LOG=m
-+CONFIG_BRIDGE_EBT_ULOG=m
-+# CONFIG_BRIDGE_EBT_NFLOG is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_RDS is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_STP=y
-+CONFIG_BRIDGE=y
-+# CONFIG_NET_DSA is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=y
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_PHONET is not set
-+# CONFIG_IEEE802154 is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_MULTIQ is not set
-+CONFIG_NET_SCH_RED=m
-+CONFIG_NET_SCH_SFQ=m
-+CONFIG_NET_SCH_TEQL=m
-+CONFIG_NET_SCH_TBF=m
-+CONFIG_NET_SCH_GRED=m
-+CONFIG_NET_SCH_DSMARK=m
-+CONFIG_NET_SCH_NETEM=m
-+# CONFIG_NET_SCH_DRR is not set
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+CONFIG_NET_CLS_TCINDEX=m
-+CONFIG_NET_CLS_ROUTE4=m
-+CONFIG_NET_CLS_ROUTE=y
-+CONFIG_NET_CLS_FW=m
-+CONFIG_NET_CLS_U32=m
-+CONFIG_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_CLS_FLOW is not set
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+# CONFIG_DCB is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+CONFIG_BT=y
-+CONFIG_BT_L2CAP=y
-+CONFIG_BT_SCO=y
-+CONFIG_BT_RFCOMM=y
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=y
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=y
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIBTUSB=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_BT_MRVL is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+CONFIG_WIRELESS=y
-+# CONFIG_CFG80211 is not set
-+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-+CONFIG_WIRELESS_OLD_REGULATORY=y
-+CONFIG_WIRELESS_EXT=y
-+CONFIG_WIRELESS_EXT_SYSFS=y
-+# CONFIG_LIB80211 is not set
-+
-+#
-+# CFG80211 needs to be enabled for MAC80211
-+#
-+# CONFIG_WIMAX is not set
-+CONFIG_RFKILL=y
-+CONFIG_RFKILL_LEDS=y
-+CONFIG_RFKILL_INPUT=y
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH=""
-+CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_FIRMWARE_IN_KERNEL is not set
-+CONFIG_EXTRA_FIRMWARE=""
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_TESTS is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+# CONFIG_MTD_AR7_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+CONFIG_MTD_ROM=y
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+# CONFIG_MTD_PHYSMAP_COMPAT is not set
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SST25L is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+# CONFIG_MTD_NAND_GPIO is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# LPDDR flash memory drivers
-+#
-+# CONFIG_MTD_LPDDR is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+CONFIG_MTD_UBI=y
-+CONFIG_MTD_UBI_WL_THRESHOLD=4096
-+CONFIG_MTD_UBI_BEB_RESERVE=1
-+CONFIG_MTD_UBI_GLUEBI=y
-+
-+#
-+# UBI debugging options
-+#
-+CONFIG_MTD_UBI_DEBUG=y
-+# CONFIG_MTD_UBI_DEBUG_MSG is not set
-+# CONFIG_MTD_UBI_DEBUG_PARANOID is not set
-+CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
-+
-+#
-+# Additional UBI debugging messages
-+#
-+# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_MG_DISK is not set
-+# CONFIG_MISC_DEVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_LIBFC is not set
-+# CONFIG_LIBFCOE is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_DH is not set
-+# CONFIG_SCSI_OSD_INITIATOR is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_NET_ETHERNET is not set
-+CONFIG_MII=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+CONFIG_WLAN=y
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# Enable WiMAX (Networking options) to see the WiMAX drivers
-+#
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=m
-+# CONFIG_USB_NET_AX8817X is not set
-+CONFIG_USB_NET_CDCETHER=m
-+# CONFIG_USB_NET_CDC_EEM is not set
-+# CONFIG_USB_NET_DM9601 is not set
-+# CONFIG_USB_NET_SMSC95XX is not set
-+# CONFIG_USB_NET_GL620A is not set
-+CONFIG_USB_NET_NET1080=m
-+# CONFIG_USB_NET_PLUSB is not set
-+# CONFIG_USB_NET_MCS7830 is not set
-+# CONFIG_USB_NET_RNDIS_HOST is not set
-+CONFIG_USB_NET_CDC_SUBSET=m
-+# CONFIG_USB_ALI_M5632 is not set
-+# CONFIG_USB_AN2720 is not set
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+# CONFIG_USB_EPSON2888 is not set
-+# CONFIG_USB_KC2190 is not set
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_USB_HSO is not set
-+# CONFIG_USB_NET_INT51X1 is not set
-+# CONFIG_WAN is not set
-+CONFIG_PPP=m
-+CONFIG_PPP_MULTILINK=y
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+CONFIG_INPUT_JOYDEV=m
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ADP5588 is not set
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# CONFIG_QT2160 is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+CONFIG_KEYBOARD_GPIO=y
-+# CONFIG_KEYBOARD_MATRIX is not set
-+# CONFIG_KEYBOARD_LM8323 is not set
-+# CONFIG_KEYBOARD_MAX7359 is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_OPENCORES is not set
-+CONFIG_KEYBOARD_STOWAWAY=m
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+CONFIG_TOUCHSCREEN_FILTER=y
-+CONFIG_TOUCHSCREEN_FILTER_GROUP=y
-+CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y
-+CONFIG_TOUCHSCREEN_FILTER_MEAN=y
-+CONFIG_TOUCHSCREEN_FILTER_LINEAR=y
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_AD7877 is not set
-+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-+# CONFIG_TOUCHSCREEN_AD7879 is not set
-+# CONFIG_TOUCHSCREEN_EETI is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-+# CONFIG_TOUCHSCREEN_MCS5000 is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_INEXIO is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-+# CONFIG_TOUCHSCREEN_TSC2007 is not set
-+# CONFIG_TOUCHSCREEN_W90X900 is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+# CONFIG_INPUT_CM109 is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_PCF50633_PMU=y
-+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_CONSOLE_TRANSLATIONS=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_DEVKMEM is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_SAMSUNG=y
-+CONFIG_SERIAL_SAMSUNG_UARTS=3
-+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-+CONFIG_SERIAL_S3C2440=y
-+# CONFIG_SERIAL_MAX3100 is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_COMPAT=y
-+CONFIG_I2C_CHARDEV=y
-+# CONFIG_I2C_HELPER_AUTO is not set
-+
-+#
-+# I2C Algorithms
-+#
-+CONFIG_I2C_ALGOBIT=y
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+
-+#
-+# I2C system bus drivers (mostly embedded / system-on-chip)
-+#
-+# CONFIG_I2C_DESIGNWARE is not set
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+
-+#
-+# External I2C/SMBus adapter drivers
-+#
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Other I2C/SMBus bus drivers
-+#
-+# CONFIG_I2C_PCA_PLATFORM is not set
-+# CONFIG_I2C_STUB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+CONFIG_SPI=y
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_GPIO=y
-+CONFIG_SPI_S3C24XX=y
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+
-+#
-+# PPS support
-+#
-+# CONFIG_PPS is not set
-+CONFIG_ARCH_REQUIRE_GPIOLIB=y
-+CONFIG_GPIOLIB=y
-+CONFIG_GPIO_SYSFS=y
-+
-+#
-+# Memory mapped GPIO expanders:
-+#
-+
-+#
-+# I2C GPIO expanders:
-+#
-+# CONFIG_GPIO_MAX732X is not set
-+# CONFIG_GPIO_PCA953X is not set
-+# CONFIG_GPIO_PCF857X is not set
-+CONFIG_GPIO_PCF50633=y
-+
-+#
-+# PCI GPIO expanders:
-+#
-+
-+#
-+# SPI GPIO expanders:
-+#
-+# CONFIG_GPIO_MAX7301 is not set
-+# CONFIG_GPIO_MCP23S08 is not set
-+# CONFIG_GPIO_MC33880 is not set
-+
-+#
-+# AC97 GPIO expanders:
-+#
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+# CONFIG_POWER_SUPPLY_DEBUG is not set
-+# CONFIG_PDA_POWER is not set
-+# CONFIG_BATTERY_DS2760 is not set
-+# CONFIG_BATTERY_DS2782 is not set
-+# CONFIG_BATTERY_BQ27x00 is not set
-+# CONFIG_BATTERY_MAX17040 is not set
-+CONFIG_CHARGER_PCF50633=y
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_HDQ_GPIO_BITBANG=y
-+# CONFIG_BATTERY_PLATFORM is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+CONFIG_WATCHDOG_NOWAYOUT=y
-+
-+#
-+# Watchdog Device Drivers
-+#
-+CONFIG_SOFT_WATCHDOG=y
-+CONFIG_S3C2410_WATCHDOG=y
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+CONFIG_SSB_POSSIBLE=y
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+CONFIG_MFD_CORE=y
-+# CONFIG_MFD_SM501 is not set
-+# CONFIG_MFD_ASIC3 is not set
-+# CONFIG_HTC_EGPIO is not set
-+# CONFIG_HTC_PASIC3 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_TWL4030_CORE is not set
-+# CONFIG_MFD_TMIO is not set
-+# CONFIG_MFD_T7L66XB is not set
-+# CONFIG_MFD_TC6387XB is not set
-+# CONFIG_MFD_TC6393XB is not set
-+# CONFIG_PMIC_DA903X is not set
-+# CONFIG_MFD_WM8400 is not set
-+# CONFIG_MFD_WM831X is not set
-+# CONFIG_MFD_WM8350_I2C is not set
-+CONFIG_MFD_PCF50633=y
-+# CONFIG_MFD_MC13783 is not set
-+CONFIG_PCF50633_ADC=y
-+# CONFIG_AB3100_CORE is not set
-+# CONFIG_EZX_PCAP is not set
-+CONFIG_MFD_GLAMO=y
-+# CONFIG_MFD_GLAMO_FB is not set
-+CONFIG_MFD_GLAMO_GPIO=y
-+CONFIG_MFD_GLAMO_MCI=y
-+CONFIG_MFD_GLAMO_DRM=y
-+CONFIG_REGULATOR=y
-+# CONFIG_REGULATOR_DEBUG is not set
-+CONFIG_REGULATOR_FIXED_VOLTAGE=y
-+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-+# CONFIG_REGULATOR_BQ24022 is not set
-+# CONFIG_REGULATOR_MAX1586 is not set
-+CONFIG_REGULATOR_PCF50633=y
-+# CONFIG_REGULATOR_LP3971 is not set
-+# CONFIG_REGULATOR_TPS65023 is not set
-+# CONFIG_REGULATOR_TPS6507X is not set
-+# CONFIG_MEDIA_SUPPORT is not set
-+
-+#
-+# Graphics support
-+#
-+CONFIG_DRM=y
-+CONFIG_DRM_KMS_HELPER=y
-+# CONFIG_DRM_MGA is not set
-+# CONFIG_DRM_VIA is not set
-+# CONFIG_DRM_SAVAGE is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_FOREIGN_ENDIAN is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+# CONFIG_FB_TMIO is not set
-+# CONFIG_FB_S3C2410 is not set
-+# CONFIG_FB_VIRTUAL is not set
-+# CONFIG_FB_METRONOME is not set
-+# CONFIG_FB_MB862XX is not set
-+# CONFIG_FB_BROADSHEET is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+# CONFIG_LCD_LMS283GF05 is not set
-+# CONFIG_LCD_LTV350QV is not set
-+# CONFIG_LCD_ILI9320 is not set
-+# CONFIG_LCD_TDO24M is not set
-+# CONFIG_LCD_VGG2432A4 is not set
-+# CONFIG_LCD_PLATFORM is not set
-+CONFIG_LCD_JBT6K74=y
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_GENERIC is not set
-+CONFIG_BACKLIGHT_PWM=y
-+CONFIG_BACKLIGHT_PCF50633=y
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+# CONFIG_FONTS is not set
-+CONFIG_FONT_8x8=y
-+CONFIG_FONT_8x16=y
-+# CONFIG_LOGO is not set
-+CONFIG_SOUND=y
-+CONFIG_SOUND_OSS_CORE=y
-+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-+CONFIG_SND=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+CONFIG_SND_JACK=y
-+CONFIG_SND_SEQUENCER=y
-+CONFIG_SND_SEQ_DUMMY=y
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=y
-+CONFIG_SND_PCM_OSS=y
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+CONFIG_SND_SEQUENCER_OSS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+# CONFIG_SND_SUPPORT_OLD_API is not set
-+# CONFIG_SND_VERBOSE_PROCFS is not set
-+# CONFIG_SND_VERBOSE_PRINTK is not set
-+# CONFIG_SND_DEBUG is not set
-+# CONFIG_SND_RAWMIDI_SEQ is not set
-+# CONFIG_SND_OPL3_LIB_SEQ is not set
-+# CONFIG_SND_OPL4_LIB_SEQ is not set
-+# CONFIG_SND_SBAWE_SEQ is not set
-+# CONFIG_SND_EMU10K1_SEQ is not set
-+# CONFIG_SND_DRIVERS is not set
-+# CONFIG_SND_ARM is not set
-+# CONFIG_SND_SPI is not set
-+# CONFIG_SND_USB is not set
-+CONFIG_SND_SOC=y
-+CONFIG_SND_S3C24XX_SOC=y
-+CONFIG_SND_S3C24XX_SOC_I2S=y
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-+# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
-+# CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
-+# CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23 is not set
-+# CONFIG_SND_S3C24XX_SOC_SIMTEC_HERMES is not set
-+CONFIG_SND_SOC_I2C_AND_SPI=y
-+# CONFIG_SND_SOC_ALL_CODECS is not set
-+CONFIG_SND_SOC_WM8753=y
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_HID_PID is not set
-+# CONFIG_USB_HIDDEV is not set
-+
-+#
-+# Special HID drivers
-+#
-+CONFIG_HID_A4TECH=y
-+CONFIG_HID_APPLE=y
-+CONFIG_HID_BELKIN=y
-+CONFIG_HID_CHERRY=y
-+CONFIG_HID_CHICONY=y
-+CONFIG_HID_CYPRESS=y
-+CONFIG_HID_DRAGONRISE=y
-+# CONFIG_DRAGONRISE_FF is not set
-+CONFIG_HID_EZKEY=y
-+CONFIG_HID_KYE=y
-+CONFIG_HID_GYRATION=y
-+CONFIG_HID_TWINHAN=y
-+CONFIG_HID_KENSINGTON=y
-+CONFIG_HID_LOGITECH=y
-+# CONFIG_LOGITECH_FF is not set
-+# CONFIG_LOGIRUMBLEPAD2_FF is not set
-+CONFIG_HID_MICROSOFT=y
-+CONFIG_HID_MONTEREY=y
-+CONFIG_HID_NTRIG=y
-+CONFIG_HID_PANTHERLORD=y
-+# CONFIG_PANTHERLORD_FF is not set
-+CONFIG_HID_PETALYNX=y
-+CONFIG_HID_SAMSUNG=y
-+CONFIG_HID_SONY=y
-+CONFIG_HID_SUNPLUS=y
-+CONFIG_HID_GREENASIA=y
-+# CONFIG_GREENASIA_FF is not set
-+CONFIG_HID_SMARTJOYPLUS=y
-+# CONFIG_SMARTJOYPLUS_FF is not set
-+CONFIG_HID_TOPSEED=y
-+CONFIG_HID_THRUSTMASTER=y
-+# CONFIG_THRUSTMASTER_FF is not set
-+CONFIG_HID_WACOM=y
-+CONFIG_HID_ZEROPLUS=y
-+# CONFIG_ZEROPLUS_FF is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-+
-+#
-+# Miscellaneous USB options
-+#
-+# CONFIG_USB_DEVICEFS is not set
-+# CONFIG_USB_DEVICE_CLASS is not set
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+# CONFIG_USB_OTG is not set
-+# CONFIG_USB_MON is not set
-+# CONFIG_USB_WUSB is not set
-+# CONFIG_USB_WUSB_CBAF is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_C67X00_HCD is not set
-+# CONFIG_USB_OXU210HP_HCD is not set
-+# CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_ISP1760_HCD is not set
-+# CONFIG_USB_ISP1362_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+# CONFIG_USB_HWA_HCD is not set
-+# CONFIG_USB_MUSB_HDRC is not set
-+# CONFIG_USB_GADGET_MUSB_HDRC is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+# CONFIG_USB_WDM is not set
-+CONFIG_USB_TMC=m
-+
-+#
-+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-+#
-+
-+#
-+# also be needed; see USB_STORAGE Help for more info
-+#
-+CONFIG_USB_STORAGE=m
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+CONFIG_USB_STORAGE_DATAFAB=m
-+CONFIG_USB_STORAGE_FREECOM=m
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+CONFIG_USB_STORAGE_USBAT=m
-+CONFIG_USB_STORAGE_SDDR09=m
-+CONFIG_USB_STORAGE_SDDR55=m
-+CONFIG_USB_STORAGE_JUMPSHOT=m
-+CONFIG_USB_STORAGE_ALAUDA=m
-+# CONFIG_USB_STORAGE_ONETOUCH is not set
-+CONFIG_USB_STORAGE_KARMA=m
-+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+
-+#
-+# USB port drivers
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_EZUSB=y
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+# CONFIG_USB_SERIAL_CP210X is not set
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=m
-+CONFIG_USB_SERIAL_VISOR=m
-+CONFIG_USB_SERIAL_IPAQ=m
-+CONFIG_USB_SERIAL_IR=m
-+CONFIG_USB_SERIAL_EDGEPORT=m
-+CONFIG_USB_SERIAL_EDGEPORT_TI=m
-+CONFIG_USB_SERIAL_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+# CONFIG_USB_SERIAL_IUU is not set
-+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-+CONFIG_USB_SERIAL_KEYSPAN=m
-+CONFIG_USB_SERIAL_KLSI=m
-+CONFIG_USB_SERIAL_KOBIL_SCT=m
-+CONFIG_USB_SERIAL_MCT_U232=m
-+CONFIG_USB_SERIAL_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+# CONFIG_USB_SERIAL_MOTOROLA is not set
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+# CONFIG_USB_SERIAL_QUALCOMM is not set
-+# CONFIG_USB_SERIAL_SPCP8X5 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+# CONFIG_USB_SERIAL_SYMBOL is not set
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_OPTICON is not set
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_SEVSEG is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_ISIGHTFW is not set
-+# CONFIG_USB_VST is not set
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+# CONFIG_USB_GADGET_DEBUG_FS is not set
-+CONFIG_USB_GADGET_VBUS_DRAW=500
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+# CONFIG_USB_GADGET_PXA25X is not set
-+# CONFIG_USB_GADGET_R8A66597 is not set
-+# CONFIG_USB_GADGET_PXA27X is not set
-+# CONFIG_USB_GADGET_S3C_HSOTG is not set
-+# CONFIG_USB_GADGET_IMX is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_FSL_QE is not set
-+# CONFIG_USB_GADGET_CI13XXX is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LANGWELL is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+# CONFIG_USB_AUDIO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_ETH_EEM is not set
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+# CONFIG_USB_G_PRINTER is not set
-+# CONFIG_USB_CDC_COMPOSITE is not set
-+
-+#
-+# OTG and related infrastructure
-+#
-+# CONFIG_USB_GPIO_VBUS is not set
-+# CONFIG_NOP_USB_XCEIV is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD/SDIO Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+# CONFIG_SDIO_UART is not set
-+# CONFIG_MMC_TEST is not set
-+
-+#
-+# MMC/SD/SDIO Host Controller Drivers
-+#
-+# CONFIG_MMC_SDHCI is not set
-+# CONFIG_MMC_AT91 is not set
-+# CONFIG_MMC_ATMELMCI is not set
-+# CONFIG_MMC_SPI is not set
-+CONFIG_MMC_S3C=y
-+# CONFIG_MMC_S3C_HW_SDIO_IRQ is not set
-+CONFIG_MMC_S3C_PIO=y
-+# CONFIG_MMC_S3C_DMA is not set
-+# CONFIG_MMC_S3C_PIODMA is not set
-+# CONFIG_MEMSTICK is not set
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+# CONFIG_LEDS_S3C24XX is not set
-+# CONFIG_LEDS_PCA9532 is not set
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_GPIO_PLATFORM=y
-+# CONFIG_LEDS_LP3944 is not set
-+# CONFIG_LEDS_PCA955X is not set
-+# CONFIG_LEDS_DAC124S085 is not set
-+# CONFIG_LEDS_PWM is not set
-+# CONFIG_LEDS_BD2802 is not set
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-+# CONFIG_LEDS_TRIGGER_GPIO is not set
-+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-+
-+#
-+# iptables trigger is under Netfilter config (LED target)
-+#
-+# CONFIG_ACCESSIBILITY is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+# CONFIG_RTC_DRV_FM3130 is not set
-+# CONFIG_RTC_DRV_RX8581 is not set
-+# CONFIG_RTC_DRV_RX8025 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_M41T94 is not set
-+# CONFIG_RTC_DRV_DS1305 is not set
-+# CONFIG_RTC_DRV_DS1390 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_DS3234 is not set
-+# CONFIG_RTC_DRV_PCF2123 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1286 is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T35 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_BQ4802 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+CONFIG_RTC_DRV_PCF50633=y
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=y
-+# CONFIG_DMADEVICES is not set
-+# CONFIG_AUXDISPLAY is not set
-+# CONFIG_UIO is not set
-+
-+#
-+# TI VLYNQ
-+#
-+# CONFIG_STAGING is not set
-+CONFIG_AR6000_WLAN=y
-+# CONFIG_AR6000_WLAN_DEBUG is not set
-+# CONFIG_AR6000_WLAN_RESET is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+CONFIG_REISERFS_FS=m
-+# CONFIG_REISERFS_CHECK is not set
-+# CONFIG_REISERFS_PROC_INFO is not set
-+# CONFIG_REISERFS_FS_XATTR is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_BTRFS_FS is not set
-+# CONFIG_NILFS2_FS is not set
-+CONFIG_FILE_LOCKING=y
-+CONFIG_FSNOTIFY=y
-+# CONFIG_DNOTIFY is not set
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+CONFIG_CUSE=m
-+CONFIG_GENERIC_ACL=y
-+
-+#
-+# Caches
-+#
-+# CONFIG_FSCACHE is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=m
-+# CONFIG_MSDOS_FS is not set
-+CONFIG_VFAT_FS=m
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+CONFIG_TMPFS_POSIX_ACL=y
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+CONFIG_MISC_FILESYSTEMS=y
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_UBIFS_FS=y
-+CONFIG_UBIFS_FS_XATTR=y
-+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-+CONFIG_UBIFS_FS_LZO=y
-+CONFIG_UBIFS_FS_ZLIB=y
-+CONFIG_UBIFS_FS_DEBUG=y
-+CONFIG_UBIFS_FS_DEBUG_MSG_LVL=0
-+CONFIG_UBIFS_FS_DEBUG_CHKS=y
-+# CONFIG_CRAMFS is not set
-+CONFIG_SQUASHFS=m
-+# CONFIG_SQUASHFS_EMBEDDED is not set
-+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_OMFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=m
-+CONFIG_NFS_V3=y
-+CONFIG_NFS_V3_ACL=y
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_V4_1 is not set
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V2_ACL=y
-+CONFIG_NFSD_V3=y
-+CONFIG_NFSD_V3_ACL=y
-+CONFIG_NFSD_V4=y
-+CONFIG_LOCKD=m
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_ACL_SUPPORT=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=m
-+CONFIG_SUNRPC_GSS=m
-+CONFIG_RPCSEC_GSS_KRB5=m
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+# CONFIG_CIFS_WEAK_PW_HASH is not set
-+# CONFIG_CIFS_XATTR is not set
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=m
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+CONFIG_NLS_CODEPAGE_866=m
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+CONFIG_NLS_CODEPAGE_1250=m
-+CONFIG_NLS_CODEPAGE_1251=m
-+CONFIG_NLS_ASCII=m
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_2=m
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=m
-+# CONFIG_DLM is not set
-+
-+#
-+# Kernel hacking
-+#
-+CONFIG_PRINTK_TIME=y
-+# CONFIG_ENABLE_WARN_DEPRECATED is not set
-+# CONFIG_ENABLE_MUST_CHECK is not set
-+CONFIG_FRAME_WARN=1024
-+# CONFIG_MAGIC_SYSRQ is not set
-+CONFIG_STRIP_ASM_SYMS=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_MEMORY_INIT=y
-+CONFIG_FRAME_POINTER=y
-+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-+# CONFIG_LATENCYTOP is not set
-+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-+CONFIG_HAVE_FUNCTION_TRACER=y
-+CONFIG_TRACING_SUPPORT=y
-+# CONFIG_FTRACE is not set
-+# CONFIG_DYNAMIC_DEBUG is not set
-+# CONFIG_SAMPLES is not set
-+CONFIG_HAVE_ARCH_KGDB=y
-+# CONFIG_ARM_UNWIND is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_S3C_UART=2
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITYFS is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_ALGAPI2=y
-+CONFIG_CRYPTO_AEAD=m
-+CONFIG_CRYPTO_AEAD2=y
-+CONFIG_CRYPTO_BLKCIPHER=m
-+CONFIG_CRYPTO_BLKCIPHER2=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_HASH2=y
-+CONFIG_CRYPTO_RNG2=y
-+CONFIG_CRYPTO_PCOMP=y
-+CONFIG_CRYPTO_MANAGER=m
-+CONFIG_CRYPTO_MANAGER2=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_WORKQUEUE=y
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_SEQIV is not set
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=m
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_CTS is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_XTS is not set
-+
-+#
-+# Hash modes
-+#
-+CONFIG_CRYPTO_HMAC=m
-+CONFIG_CRYPTO_XCBC=m
-+# CONFIG_CRYPTO_VMAC is not set
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
-+# CONFIG_CRYPTO_GHASH is not set
-+CONFIG_CRYPTO_MD4=m
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+# CONFIG_CRYPTO_RMD128 is not set
-+# CONFIG_CRYPTO_RMD160 is not set
-+# CONFIG_CRYPTO_RMD256 is not set
-+# CONFIG_CRYPTO_RMD320 is not set
-+CONFIG_CRYPTO_SHA1=m
-+CONFIG_CRYPTO_SHA256=m
-+CONFIG_CRYPTO_SHA512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
-+# CONFIG_CRYPTO_AES is not set
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_DES=m
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_KHAZAD=m
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
-+CONFIG_CRYPTO_DEFLATE=y
-+CONFIG_CRYPTO_ZLIB=y
-+CONFIG_CRYPTO_LZO=y
-+
-+#
-+# Random Number Generation
-+#
-+# CONFIG_CRYPTO_ANSI_CPRNG is not set
-+# CONFIG_CRYPTO_HW is not set
-+# CONFIG_BINARY_PRINTF is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_GENERIC_FIND_LAST_BIT=y
-+CONFIG_CRC_CCITT=y
-+CONFIG_CRC16=y
-+CONFIG_CRC_T10DIF=y
-+CONFIG_CRC_ITU_T=y
-+CONFIG_CRC32=y
-+CONFIG_CRC7=y
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_LZO_COMPRESS=y
-+CONFIG_LZO_DECOMPRESS=y
-+CONFIG_DECOMPRESS_GZIP=y
-+CONFIG_DECOMPRESS_BZIP2=y
-+CONFIG_DECOMPRESS_LZMA=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
-+CONFIG_NLATTR=y
--- 
-1.7.0.4
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0023-Re-enable-Glamo-fence-IRQ-if-it-sticks.patch b/recipes/linux/linux-openmoko-2.6.32/0023-Re-enable-Glamo-fence-IRQ-if-it-sticks.patch
deleted file mode 100644
index a24350f8c6..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0023-Re-enable-Glamo-fence-IRQ-if-it-sticks.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 348d0334015689a22c9dbd8dd0291360c960a764 Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Tue, 13 Apr 2010 22:18:41 +0200
-Subject: [PATCH 23/24] Re-enable Glamo fence IRQ if it sticks
-
-Also fix a formatting typo.
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
----
- drivers/mfd/glamo/glamo-fence.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fence.c b/drivers/mfd/glamo/glamo-fence.c
-index 9119675..ba3ed88 100644
---- a/drivers/mfd/glamo/glamo-fence.c
-+++ b/drivers/mfd/glamo/glamo-fence.c
-@@ -98,7 +98,7 @@ static void glamo_fence_emit(struct glamo_fence *fence)
- 
- static void glamo_fence_enable(struct glamodrm_handle *gdrm)
- {
--	enable_irq( GLAMO_IRQ_2D);
-+	enable_irq(GLAMO_IRQ_2D);
- }
- 
- 
-@@ -168,6 +168,7 @@ static void glamo_fence_debodge(struct glamodrm_handle *gdrm)
- 
- 	glamo_cmdq_wait(gdrm, GLAMO_ENGINE_ALL);
- 	glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_2D);
-+	glamo_fence_enable(gdrm);
- 
- 	read_lock(&gdrm->fence_list_lock);
- 	list_for_each(tmp, &gdrm->fence_list) {
--- 
-1.7.0.4
-
diff --git a/recipes/linux/linux-openmoko-2.6.32/0024-Fix-KMS-framebuffer-physical-address.patch b/recipes/linux/linux-openmoko-2.6.32/0024-Fix-KMS-framebuffer-physical-address.patch
deleted file mode 100644
index 3ce4d59042..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/0024-Fix-KMS-framebuffer-physical-address.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1b83b6d7f2e1bf5473cd17a742737a1cfe450509 Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Fri, 20 Nov 2009 22:06:30 +0100
-Subject: [PATCH 24/24] Fix KMS framebuffer physical address
-
-This allows "/dev/fb0" to work correctly with mmap().
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
----
- drivers/mfd/glamo/glamo-kms-fb.c |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c
-index 6d4b9ea..04de83b 100644
---- a/drivers/mfd/glamo/glamo-kms-fb.c
-+++ b/drivers/mfd/glamo/glamo-kms-fb.c
-@@ -387,9 +387,6 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
- 	info->fbops = &glamofb_ops;
- 
- 	info->fix.line_length = fb->pitch;
--	info->fix.smem_start = dev->mode_config.fb_base
--	                        + (unsigned long) gdrm->vram->start;
--	info->fix.smem_len = size;
- 
- 	info->flags = FBINFO_DEFAULT;
- 
-@@ -401,6 +398,8 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
- 		ret = -ENOSPC;
- 		goto out_unref;
- 	}
-+	info->fix.smem_start = (unsigned long)gdrm->vram->start + offs;
-+	info->fix.smem_len = size;
- 	info->screen_size = size;
- 
- 	info->pseudo_palette = fb->pseudo_palette;
--- 
-1.7.0.4
-
diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb
index 99c6c4398f..499c4a085e 100644
--- a/recipes/linux/linux-openmoko-2.6.32_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.32_git.bb
@@ -1,50 +1,39 @@
 require linux.inc
 require linux-openmoko.inc
 
-DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones"
+KERNEL_RELEASE="2.6.32.13"
 
-KERNEL_RELEASE="2.6.32.11"
-
-SRCREV = "14be1091928fcce66812a85129768fb253b36420"
-OEV = "oe1"
+SRCREV = "a9254be10ac2294ea20165a87c09ea6afcf66d94"
+OEV = "oe2"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
-PR = "r8"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.32 \
-  file://0001-Revert-s3cmci-initialize-default-platform-data-no_wp.patch;patch=1 \
+  file://0001-Revert-s3cmci-initialize-default-platform-data-no_wp.patch \
 # latest stable patch for ubi fix 943e167cb3e8fb191894bde8a4a75db78531a7c8
-  ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1;name=stablepatch \
+  ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;apply=yes;name=stablepatch \
 # build fix
-  file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch;patch=1 \
-# patches from Weiss's gdrm-2.6.32 branch
-  file://0002-DRM-for-platform-devices.patch;patch=1 \
-  file://0003-Glamo-DRM-and-KMS-driver.patch;patch=1 \
-  file://0004-Work-on-Glamo-core-for-DRM.patch;patch=1 \
-  file://0005-Add-JBT6k74-hook-for-use-by-KMS.patch;patch=1 \
-  file://0006-glamo-drm-use-dev_set_drvdata-instead-of-setting-dri.patch;patch=1 \
-  file://0007-glamo-drm-select-DRM_KMS_HELPER-for-crtc-functions.patch;patch=1 \
-  file://0008-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch;patch=1 \
-  file://0009-A-couple-of-GEM-refcounting-fixes.patch;patch=1 \
-  file://0010-Simplify-the-JBT6k74-driver.patch;patch=1 \
-  file://0011-Don-t-choke-if-userspace-provides-a-pixel-clock-valu.patch;patch=1 \
-  file://0012-Report-all-FB-modes-given-by-the-lower-levels.patch;patch=1 \
-  file://0013-Change-connector-type-to-LVDS.patch;patch=1 \
-  file://0014-Clean-up-JBT-hooks-and-allow-resolution-switching.patch;patch=1 \
-  file://0015-ar6000-send-userspace-an-event-on-disconnection.patch;patch=1 \
-  file://0016-Enable-display-before-trying-to-set-mode-or-base.patch;patch=1 \
-  file://0017-accels.patch.patch;patch=1 \
-  file://0018-usbhost.patch.patch;patch=1 \
-  file://0019-ar6000_delay.patch.patch;patch=1 \
-  file://0020-save_regs.patch.patch;patch=1 \
-  file://0021-gta02_defconfig.patch;patch=1 \
-  file://0022-gta02_drm_defconfig.patch;patch=1 \
-  file://0023-Re-enable-Glamo-fence-IRQ-if-it-sticks.patch;patch=1 \
-  file://0024-Fix-KMS-framebuffer-physical-address.patch;patch=1 \
+  file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch \
+# patches from Radek Polak used in qtmoko
+  file://0002-accels.patch.patch \
+  file://0003-usbhost.patch.patch \
+  file://0004-ar6000_delay.patch.patch \
+  file://0005-save_regs.patch.patch \
+# defconfig updates
+  file://0006-gta02-defconfigs-enable-LEDS_S3C24XX-and-dummy-batte.patch \
+# patches from Weiss's gdrm-for-merging branch
+  file://0007-DRM-for-platform-devices.patch \
+  file://0008-Glamo-DRM-and-KMS-driver.patch \
+  file://0009-Work-on-Glamo-core-for-DRM.patch \
+  file://0010-JBT6k74-work-for-KMS.patch \
+  file://0011-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch \
+  file://0012-Fix-dynamic-command-queue-allocation.patch \
+  file://0013-Debug-statements-for-testing.patch \
+  file://0014-Fix-claim-of-2D-register-resource.patch \
 "
 
-SRC_URI[stablepatch.md5sum] = "855c248334a71ef5ca3d8cb89d51334f"
-SRC_URI[stablepatch.sha256sum] = "edb26ff62b2f95b0d6e5c434d777af2815600a990f1c7c5d2c7faad9b4e4bc2b"
+SRC_URI[stablepatch.md5sum] = "ba6abb1ffee513a1d4f831599ddae490"
+SRC_URI[stablepatch.sha256sum] = "baf6dff5d1c478e65decf2e8b704c60e546ea37c4de59ee8eb6af9dd3d63f145"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/linux/linux-openmoko-2.6.31/0001-DRM-for-platform-devices.patch b/recipes/linux/linux-openmoko-2.6.34/0001-DRM-for-platform-devices.patch
index 2c9b611165..56197a263f 100644
--- a/recipes/linux/linux-openmoko-2.6.31/0001-DRM-for-platform-devices.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0001-DRM-for-platform-devices.patch
@@ -1,7 +1,7 @@
-From da270cf61e67d912b38e314719511efc4c2ea085 Mon Sep 17 00:00:00 2001
+From 69d87612a1b545e6d4cf9fc93117be86f871f7d2 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
-Date: Tue, 20 Oct 2009 15:52:30 +0200
-Subject: [PATCH 1/4] DRM for platform devices
+Date: Sat, 22 May 2010 18:59:58 +0200
+Subject: [PATCH 01/13] DRM for platform devices
 
 This modifies the DRM core in a small number of places to allow platform
 devices to be used for direct rendering, alongside PCI devices.
@@ -19,7 +19,7 @@ Signed-off-by: Thomas White <taw@bitwiz.org.uk>
  8 files changed, 224 insertions(+), 47 deletions(-)
 
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 39b393d..cef3d2c 100644
+index 305c590..7244cef 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
 @@ -6,7 +6,7 @@
@@ -32,10 +32,10 @@ index 39b393d..cef3d2c 100644
  	select I2C_ALGOBIT
  	help
 diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
-index 6246e3f..b9f15bf 100644
+index f7ba82e..30ce982 100644
 --- a/drivers/gpu/drm/drm_bufs.c
 +++ b/drivers/gpu/drm/drm_bufs.c
-@@ -188,7 +188,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
+@@ -189,7 +189,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
  	switch (map->type) {
  	case _DRM_REGISTERS:
  	case _DRM_FRAME_BUFFER:
@@ -45,10 +45,10 @@ index 6246e3f..b9f15bf 100644
  		    map->offset < virt_to_phys(high_memory)) {
  			kfree(map);
 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index b39d7bf..a7861e8 100644
+index 4a66201..769d12b 100644
 --- a/drivers/gpu/drm/drm_drv.c
 +++ b/drivers/gpu/drm/drm_drv.c
-@@ -247,6 +247,7 @@ int drm_lastclose(struct drm_device * dev)
+@@ -250,6 +250,7 @@ int drm_lastclose(struct drm_device * dev)
   */
  int drm_init(struct drm_driver *driver)
  {
@@ -56,7 +56,7 @@ index b39d7bf..a7861e8 100644
  	struct pci_dev *pdev = NULL;
  	const struct pci_device_id *pid;
  	int i;
-@@ -280,11 +281,37 @@ int drm_init(struct drm_driver *driver)
+@@ -283,11 +284,37 @@ int drm_init(struct drm_driver *driver)
  			drm_get_dev(pdev, pid, driver);
  		}
  	}
@@ -285,10 +285,10 @@ index 9b9ff46..133ef29 100644
  	return 0;
  }
 diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
-index 55bb8a8..a7069ad 100644
+index a0c365f..7e7eba6 100644
 --- a/drivers/gpu/drm/drm_stub.c
 +++ b/drivers/gpu/drm/drm_stub.c
-@@ -230,8 +230,10 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
+@@ -246,8 +246,10 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
  	idr_init(&dev->drw_idr);
  
  	dev->pdev = pdev;
@@ -301,7 +301,7 @@ index 55bb8a8..a7069ad 100644
  
  #ifdef __alpha__
  	dev->hose = pdev->sysdata;
-@@ -449,6 +451,76 @@ err_g1:
+@@ -465,6 +467,76 @@ err_g1:
  EXPORT_SYMBOL(drm_get_dev);
  
  /**
@@ -325,7 +325,7 @@ index 55bb8a8..a7069ad 100644
 +	int ret;
 +	DRM_DEBUG("\n");
 +
-+	dev = kmalloc(sizeof(*dev), GFP_KERNEL);
++	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
 +	if (!dev)
 +		return -ENOMEM;
 +	dev->dev_private = priv;
@@ -379,10 +379,10 @@ index 55bb8a8..a7069ad 100644
   *
   * \param sec_minor - structure to be released
 diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
-index f7a615b..fea2b71 100644
+index 25bbd30..947e731 100644
 --- a/drivers/gpu/drm/drm_sysfs.c
 +++ b/drivers/gpu/drm/drm_sysfs.c
-@@ -482,7 +482,11 @@ int drm_sysfs_device_add(struct drm_minor *minor)
+@@ -488,7 +488,11 @@ int drm_sysfs_device_add(struct drm_minor *minor)
  	int err;
  	char *minor_str;
  
@@ -396,18 +396,18 @@ index f7a615b..fea2b71 100644
  	minor->kdev.release = drm_sysfs_device_release;
  	minor->kdev.devt = minor->device;
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 45b67d9..66253f9 100644
+index 2f3b3a0..43894ec 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
-@@ -55,6 +55,7 @@
- #include <linux/mm.h>
+@@ -56,6 +56,7 @@
  #include <linux/cdev.h>
  #include <linux/mutex.h>
+ #include <linux/slab.h>
 +#include <linux/platform_device.h>
  #if defined(__alpha__) || defined(__powerpc__)
  #include <asm/pgtable.h>	/* For pte_wrprotect */
  #endif
-@@ -113,6 +114,7 @@ extern void drm_ut_debug_printk(unsigned int request_level,
+@@ -144,6 +145,7 @@ extern void drm_ut_debug_printk(unsigned int request_level,
  #define DRIVER_IRQ_VBL2    0x800
  #define DRIVER_GEM         0x1000
  #define DRIVER_MODESET     0x2000
@@ -415,7 +415,7 @@ index 45b67d9..66253f9 100644
  
  /***********************************************************************/
  /** \name Begin the DRM... */
-@@ -981,6 +983,7 @@ struct drm_device {
+@@ -1014,6 +1016,7 @@ struct drm_device {
  	wait_queue_head_t buf_writers;	/**< Processes waiting to ctx switch */
  
  	struct drm_agp_head *agp;	/**< AGP data */
@@ -423,7 +423,7 @@ index 45b67d9..66253f9 100644
  
  	struct pci_dev *pdev;		/**< PCI device structure */
  	int pci_vendor;			/**< PCI vendor id */
-@@ -1091,12 +1094,20 @@ static inline int drm_mtrr_del(int handle, unsigned long offset,
+@@ -1124,12 +1127,20 @@ static inline int drm_mtrr_del(int handle, unsigned long offset,
  }
  #endif
  
@@ -442,9 +442,9 @@ index 45b67d9..66253f9 100644
 +			     struct platform_device *pdev,
 +			     void *dev_private);
  extern void drm_exit(struct drm_driver *driver);
- extern int drm_ioctl(struct inode *inode, struct file *filp,
- 		     unsigned int cmd, unsigned long arg);
-@@ -1314,6 +1325,8 @@ extern int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
+ extern long drm_ioctl(struct file *filp,
+ 		      unsigned int cmd, unsigned long arg);
+@@ -1350,6 +1361,8 @@ extern int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
  				struct drm_file *file_priv);
  struct drm_master *drm_master_create(struct drm_minor *minor);
  extern struct drm_master *drm_master_get(struct drm_master *master);
@@ -454,5 +454,5 @@ index 45b67d9..66253f9 100644
  extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
  		       struct drm_driver *driver);
 -- 
-1.6.5.3
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0001-accels.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0001-accels.patch.patch
new file mode 100644
index 0000000000..1b6964aee9
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0001-accels.patch.patch
@@ -0,0 +1,1759 @@
+From b4c5d1702abcaef7d8af5d3dc8934b2184ba6be0 Mon Sep 17 00:00:00 2001
+From: Radek Polak <psonek2@seznam.cz>
+Date: Fri, 9 Apr 2010 09:15:40 +0200
+Subject: [PATCH 1/4] accels.patch
+
+adds support for accelerometers. You will need include/linux/lis302dl.h and
+drivers/input/misc/lis302dl.c from andy-tracking. The patch needs
+spi_bitbang_transfer_sync() and bitbang_work() to be ported correctly (some
+fixes from original 2.6.32 are missing).
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ arch/arm/mach-s3c2410/include/mach/spi-gpio.h |    3 +-
+ arch/arm/mach-s3c2440/mach-gta02.c            |  157 ++++
+ drivers/input/misc/Kconfig                    |    9 +
+ drivers/input/misc/Makefile                   |    1 +
+ drivers/input/misc/lis302dl.c                 |  952 +++++++++++++++++++++++++
+ drivers/spi/spi_bitbang.c                     |  231 ++++---
+ drivers/spi/spi_s3c24xx_gpio.c                |    7 +-
+ include/linux/lis302dl.h                      |  152 ++++
+ include/linux/spi/spi.h                       |   30 +
+ include/linux/spi/spi_bitbang.h               |    5 +
+ 10 files changed, 1433 insertions(+), 114 deletions(-)
+ create mode 100644 drivers/input/misc/lis302dl.c
+ create mode 100644 include/linux/lis302dl.h
+
+diff --git a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
+index dcef228..8eedc9c 100644
+--- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
++++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
+@@ -21,7 +21,8 @@ struct s3c2410_spigpio_info {
+ 	int			 num_chipselect;
+ 	int			 bus_num;
+ 
+-	void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs);
++	int			 non_blocking_transfer;
++	void (*chip_select)(struct s3c2410_spigpio_info *spi, int csid, int cs);
+ };
+ 
+ 
+diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
+index e8ac76b..795b9f4 100644
+--- a/arch/arm/mach-s3c2440/mach-gta02.c
++++ b/arch/arm/mach-s3c2440/mach-gta02.c
+@@ -62,6 +62,7 @@
+ 
+ #include <linux/input.h>
+ #include <linux/gpio_keys.h>
++#include <linux/lis302dl.h>
+ 
+ #include <linux/leds.h>
+ #include <linux/leds_pwm.h>
+@@ -111,6 +112,22 @@
+ #include <linux/glamofb.h>
+ #include <linux/mfd/glamo.h>
+ 
++#define S3C2410_GPIONO(bank,offset) ((bank) + (offset))
++
++#define S3C2410_GPIO_BANKD   (32*3)
++#define S3C2410_GPIO_BANKG   (32*6)
++
++#define S3C2410_GPG5          S3C2410_GPIONO(S3C2410_GPIO_BANKG, 5)
++#define S3C2410_GPG6          S3C2410_GPIONO(S3C2410_GPIO_BANKG, 6)
++#define S3C2410_GPG7          S3C2410_GPIONO(S3C2410_GPIO_BANKG, 7)
++#define S3C2410_GPD12         S3C2410_GPIONO(S3C2410_GPIO_BANKD, 12)
++#define S3C2410_GPD13         S3C2410_GPIONO(S3C2410_GPIO_BANKD, 13)
++
++#define        BITBANG_CS_ACTIVE       1       /* normally nCS, active low */
++#define        BITBANG_CS_INACTIVE     0
++
++#define S3C_SYSTEM_REV_ATAG GTA02v6_SYSTEM_REV
++
+ static struct pcf50633 *gta02_pcf;
+ 
+ /*
+@@ -322,6 +339,60 @@ const static struct jbt6k74_platform_data jbt6k74_pdata = {
+ 	.gpio_reset = GTA02_GPIO_GLAMO(4),
+ };
+ 
++/*----------- SPI: Accelerometers attached to SPI of s3c244x ----------------- */
++
++void gta02_lis302dl_suspend_io(struct lis302dl_info *lis, int resume)
++{
++	struct lis302dl_platform_data *pdata = lis->pdata;
++
++	if (!resume) {
++		 /*
++		 * we don't want to power them with a high level
++		 * because GSENSOR_3V3 is not up during suspend
++		 */
++		s3c2410_gpio_setpin(pdata->pin_chip_select, 0);
++		s3c2410_gpio_setpin(pdata->pin_clk, 0);
++		s3c2410_gpio_setpin(pdata->pin_mosi, 0);
++		/* misnomer: it is a pullDOWN in 2442 */
++		s3c2410_gpio_pullup(pdata->pin_miso, 1);
++		return;
++	}
++
++	/* back to normal */
++	s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
++	s3c2410_gpio_setpin(pdata->pin_clk, 1);
++	/* misnomer: it is a pullDOWN in 2442 */
++	s3c2410_gpio_pullup(pdata->pin_miso, 0);
++
++	s3c2410_gpio_cfgpin(pdata->pin_chip_select, S3C2410_GPIO_OUTPUT);
++	s3c2410_gpio_cfgpin(pdata->pin_clk, S3C2410_GPIO_OUTPUT);
++	s3c2410_gpio_cfgpin(pdata->pin_mosi, S3C2410_GPIO_OUTPUT);
++	s3c2410_gpio_cfgpin(pdata->pin_miso, S3C2410_GPIO_INPUT);
++
++}
++
++struct lis302dl_platform_data lis302_pdata_top = {
++		.name		= "lis302-1 (top)",
++		.pin_chip_select= S3C2410_GPD12,
++		.pin_clk	= S3C2410_GPG7,
++		.pin_mosi	= S3C2410_GPG6,
++		.pin_miso	= S3C2410_GPG5,
++		.interrupt	= GTA02_IRQ_GSENSOR_1,
++		.open_drain	= 1, /* altered at runtime by PCB rev */
++		.lis302dl_suspend_io = gta02_lis302dl_suspend_io,
++};
++
++struct lis302dl_platform_data lis302_pdata_bottom = {
++		.name		= "lis302-2 (bottom)",
++		.pin_chip_select= S3C2410_GPD13,
++		.pin_clk	= S3C2410_GPG7,
++		.pin_mosi	= S3C2410_GPG6,
++		.pin_miso	= S3C2410_GPG5,
++		.interrupt	= GTA02_IRQ_GSENSOR_2,
++		.open_drain	= 1, /* altered at runtime by PCB rev */
++		.lis302dl_suspend_io = gta02_lis302dl_suspend_io,
++};
++
+ static struct spi_board_info gta02_spi_board_info[] = {
+ 	{
+ 		.modalias	= "jbt6k74",
+@@ -332,6 +403,81 @@ static struct spi_board_info gta02_spi_board_info[] = {
+ 		.bus_num	= 2,
+ 		.chip_select = 0
+ 	},
++	{
++		.modalias	= "lis302dl",
++		/* platform_data */
++		.platform_data	= &lis302_pdata_top,
++		/* controller_data */
++		/* irq */
++		.max_speed_hz	= 100 * 1000,
++		.bus_num	= 3,
++		.chip_select	= 0,
++	},
++	{
++		.modalias	= "lis302dl",
++		/* platform_data */
++		.platform_data	= &lis302_pdata_bottom,
++		/* controller_data */
++		/* irq */
++		.max_speed_hz	= 100 * 1000,
++		.bus_num	= 3,
++		.chip_select	= 1,
++	},
++};
++
++static void gta02_lis302_chip_select(struct s3c2410_spigpio_info *info, int csid, int cs)
++{
++
++	/*
++	 * Huh... "quirk"... CS on this device is not really "CS" like you can
++	 * expect.
++	 *
++	 * When it is 0 it selects SPI interface mode.
++	 * When it is 1 it selects I2C interface mode.
++	 *
++	 * Because we have 2 devices on one interface we have to make sure
++	 * that the "disabled" device (actually in I2C mode) don't think we're
++	 * talking to it.
++	 *
++	 * When we talk to the "enabled" device, the "disabled" device sees
++	 * the clocks as I2C clocks, creating havoc.
++	 *
++	 * I2C sees MOSI going LOW while CLK HIGH as a START action, thus we
++	 * must ensure this is never issued.
++	 */
++
++	int cs_gpio, other_cs_gpio;
++
++	cs_gpio = csid ? S3C2410_GPD13 : S3C2410_GPD12;
++	other_cs_gpio = (1 - csid) ? S3C2410_GPD13 : S3C2410_GPD12;
++
++
++	if (cs == BITBANG_CS_ACTIVE) {
++		s3c2410_gpio_setpin(other_cs_gpio, 1);
++		s3c2410_gpio_setpin(cs_gpio, 1);
++		s3c2410_gpio_setpin(info->pin_clk, 1);
++		s3c2410_gpio_setpin(cs_gpio, 0);
++	} else {
++		s3c2410_gpio_setpin(cs_gpio, 1);
++		s3c2410_gpio_setpin(other_cs_gpio, 1);
++	}
++}
++
++static struct s3c2410_spigpio_info gta02_spigpio_cfg = {
++	.pin_clk	= S3C2410_GPG7,
++	.pin_mosi	= S3C2410_GPG6,
++	.pin_miso	= S3C2410_GPG5,
++	.bus_num	= 3,
++	.num_chipselect	= 2,
++	.chip_select	= gta02_lis302_chip_select,
++	.non_blocking_transfer = 1,
++};
++
++static struct platform_device gta02_spi_gpio_dev = {
++	.name		= "spi_s3c24xx_gpio",
++	.dev = {
++		.platform_data = &gta02_spigpio_cfg,
++	},
+ };
+  
+ static struct resource gta02_glamo_resources[] = {
+@@ -1091,6 +1237,7 @@ static struct platform_device *gta02_devices[] __initdata = {
+ 	&gta02_pm_bt_dev,
+ 	&gta02_pm_wlan_dev,
+ 	&gta02_glamo_dev,
++	&gta02_spi_gpio_dev,
+ 	&s3c_device_adc,
+ 	&s3c_device_ts,
+ };
+@@ -1302,6 +1449,16 @@ static void __init gta02_machine_init(void)
+ 	/* Set the panic callback to make AUX LED blink at ~5Hz. */
+ 	panic_blink = gta02_panic_blink;
+ 
++	switch (S3C_SYSTEM_REV_ATAG) {
++		case GTA02v6_SYSTEM_REV:
++		/* we need push-pull interrupt from motion sensors */
++		lis302_pdata_top.open_drain = 0;
++		lis302_pdata_bottom.open_drain = 0;
++		break;
++	default:
++		break;
++	}
++
+ 	bus_register_notifier(&platform_bus_type, &gta02_device_register_notifier);
+ 	bus_register_notifier(&spi_bus_type, &gta02_device_register_notifier);
+ 
+diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
+index 23140a3..d8d0932 100644
+--- a/drivers/input/misc/Kconfig
++++ b/drivers/input/misc/Kconfig
+@@ -340,4 +340,13 @@ config INPUT_PCAP
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called pcap_keys.
+ 
++config INPUT_LIS302DL
++	tristate "STmicro LIS302DL 3-axis accelerometer"
++	depends on SPI_MASTER
++	help
++	  SPI driver for the STmicro LIS302DL 3-axis accelerometer.
++
++	  The userspece interface is a 3-axis (X/Y/Z) relative movement
++	  Linux input device, reporting REL_[XYZ] events.
++
+ endif
+diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
+index 7e95a5d..5b810db 100644
+--- a/drivers/input/misc/Makefile
++++ b/drivers/input/misc/Makefile
+@@ -32,4 +32,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR)		+= winbond-cir.o
+ obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
+ obj-$(CONFIG_INPUT_WM831X_ON)		+= wm831x-on.o
+ obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
++obj-$(CONFIG_INPUT_LIS302DL)		+= lis302dl.o
+ 
+diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
+new file mode 100644
+index 0000000..d345bfb
+--- /dev/null
++++ b/drivers/input/misc/lis302dl.c
+@@ -0,0 +1,952 @@
++/* Linux kernel driver for the ST LIS302D 3-axis accelerometer
++ *
++ * Copyright (C) 2007-2008 by Openmoko, Inc.
++ * Author: Harald Welte <laforge@openmoko.org>
++ *         converted to private bitbang by:
++ *         Andy Green <andy@openmoko.com>
++ *         ability to set acceleration threshold added by:
++ *         Simon Kagstrom <simon.kagstrom@gmail.com>
++ * All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ * TODO
++ * 	* statistics for overflow events
++ * 	* configuration interface (sysfs) for
++ * 		* enable/disable x/y/z axis data ready
++ * 		* enable/disable resume from freee fall / click
++ * 		* free fall / click parameters
++ * 		* high pass filter parameters
++ */
++#include <linux/kernel.h>
++#include <linux/types.h>
++#include <linux/module.h>
++#include <linux/device.h>
++#include <linux/platform_device.h>
++#include <linux/delay.h>
++#include <linux/irq.h>
++#include <linux/interrupt.h>
++#include <linux/sysfs.h>
++#include <linux/spi/spi.h>
++
++#include <linux/lis302dl.h>
++
++/* Utility functions */
++static u8 __reg_read(struct lis302dl_info *lis, u8 reg)
++{
++	struct spi_message msg;
++	struct spi_transfer t;
++	u8 data[2] = {0xc0 | reg};
++	int rc;
++
++	spi_message_init(&msg);
++	memset(&t, 0, sizeof t);
++	t.len = 2;
++	spi_message_add_tail(&t, &msg);
++	t.tx_buf = &data[0];
++	t.rx_buf = &data[0];
++
++	/* Should complete without blocking */
++	rc = spi_non_blocking_transfer(lis->spi, &msg);
++	if (rc < 0) {
++		dev_err(lis->dev, "Error reading register\n");
++		return rc;
++	}
++
++	return data[1];
++}
++
++static void __reg_write(struct lis302dl_info *lis, u8 reg, u8 val)
++{	
++	struct spi_message msg;
++	struct spi_transfer t;
++	u8 data[2] = {reg, val};
++
++	spi_message_init(&msg);
++	memset(&t, 0, sizeof t);
++	t.len = 2;
++	spi_message_add_tail(&t, &msg);
++	t.tx_buf = &data[0];
++	t.rx_buf = &data[0];
++
++	/* Completes without blocking */
++	if (spi_non_blocking_transfer(lis->spi, &msg) < 0)
++		dev_err(lis->dev, "Error writing register\n");
++}
++
++static void __reg_set_bit_mask(struct lis302dl_info *lis, u8 reg, u8 mask,
++		u8 val)
++{
++	u_int8_t tmp;
++
++	val &= mask;
++
++	tmp = __reg_read(lis, reg);
++	tmp &= ~mask;
++	tmp |= val;
++	__reg_write(lis, reg, tmp);
++}
++
++static int __ms_to_duration(struct lis302dl_info *lis, int ms)
++{
++	/* If we have 400 ms sampling rate, the stepping is 2.5 ms,
++	 * on 100 ms the stepping is 10ms */
++	if (lis->flags & LIS302DL_F_DR)
++		return min((ms * 10) / 25, 637);
++
++	return min(ms / 10, 2550);
++}
++
++static int __duration_to_ms(struct lis302dl_info *lis, int duration)
++{
++	if (lis->flags & LIS302DL_F_DR)
++		return (duration * 25) / 10;
++
++	return duration * 10;
++}
++
++static u8 __mg_to_threshold(struct lis302dl_info *lis, int mg)
++{
++	/* If FS is set each bit is 71mg, otherwise 18mg. The THS register
++	 * has 7 bits for the threshold value */
++	if (lis->flags & LIS302DL_F_FS)
++		return min(mg / 71, 127);
++
++	return min(mg / 18, 127);
++}
++
++static int __threshold_to_mg(struct lis302dl_info *lis, u8 threshold)
++{
++	if (lis->flags & LIS302DL_F_FS)
++		return threshold * 71;
++
++	return threshold * 18;
++}
++
++/* interrupt handling related */
++
++enum lis302dl_intmode {
++	LIS302DL_INTMODE_GND		= 0x00,
++	LIS302DL_INTMODE_FF_WU_1	= 0x01,
++	LIS302DL_INTMODE_FF_WU_2	= 0x02,
++	LIS302DL_INTMODE_FF_WU_12	= 0x03,
++	LIS302DL_INTMODE_DATA_READY	= 0x04,
++	LIS302DL_INTMODE_CLICK		= 0x07,
++};
++
++static void __lis302dl_int_mode(struct device *dev, int int_pin,
++			      enum lis302dl_intmode mode)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++
++	switch (int_pin) {
++	case 1:
++		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x07, mode);
++		break;
++	case 2:
++		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x38, mode << 3);
++		break;
++	default:
++		BUG();
++	}
++}
++
++static void __enable_wakeup(struct lis302dl_info *lis)
++{
++	__reg_write(lis, LIS302DL_REG_CTRL1, 0);
++
++	/* First zero to get to a known state */
++	__reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, LIS302DL_FFWUCFG_XHIE |
++			LIS302DL_FFWUCFG_YHIE | LIS302DL_FFWUCFG_ZHIE |
++			LIS302DL_FFWUCFG_LIR);
++	__reg_write(lis, LIS302DL_REG_FF_WU_THS_1,
++			__mg_to_threshold(lis, lis->wakeup.threshold));
++	__reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1,
++			__ms_to_duration(lis, lis->wakeup.duration));
++
++	/* Route the interrupt for wakeup */
++	__lis302dl_int_mode(lis->dev, 1,
++			LIS302DL_INTMODE_FF_WU_1);
++
++	__reg_read(lis, LIS302DL_REG_HP_FILTER_RESET);
++	__reg_read(lis, LIS302DL_REG_OUT_X);
++	__reg_read(lis, LIS302DL_REG_OUT_Y);
++	__reg_read(lis, LIS302DL_REG_OUT_Z);
++	__reg_read(lis, LIS302DL_REG_STATUS);
++	__reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
++	__reg_read(lis, LIS302DL_REG_FF_WU_SRC_2);
++	__reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD | 7);
++}
++
++static void __enable_data_collection(struct lis302dl_info *lis)
++{
++	u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
++			 LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
++
++	/* make sure we're powered up and generate data ready */
++	__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
++
++	/* If the threshold is zero, let the device generated an interrupt
++	 * on each datum */
++	if (lis->threshold == 0) {
++		__reg_write(lis, LIS302DL_REG_CTRL2, 0);
++		__lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_DATA_READY);
++		__lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_DATA_READY);
++	} else {
++		__reg_write(lis, LIS302DL_REG_CTRL2,
++				LIS302DL_CTRL2_HPFF1);
++		__reg_write(lis, LIS302DL_REG_FF_WU_THS_1,
++				__mg_to_threshold(lis, lis->threshold));
++		__reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1,
++				__ms_to_duration(lis, lis->duration));
++
++		/* Clear the HP filter "starting point" */
++		__reg_read(lis, LIS302DL_REG_HP_FILTER_RESET);
++		__reg_write(lis, LIS302DL_REG_FF_WU_CFG_1,
++				LIS302DL_FFWUCFG_XHIE | LIS302DL_FFWUCFG_YHIE |
++				LIS302DL_FFWUCFG_ZHIE | LIS302DL_FFWUCFG_LIR);
++		__lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_FF_WU_12);
++		__lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_FF_WU_12);
++	}
++}
++
++#if 0
++static void _report_btn_single(struct input_dev *inp, int btn)
++{
++	input_report_key(inp, btn, 1);
++	input_sync(inp);
++	input_report_key(inp, btn, 0);
++}
++
++static void _report_btn_double(struct input_dev *inp, int btn)
++{
++	input_report_key(inp, btn, 1);
++	input_sync(inp);
++	input_report_key(inp, btn, 0);
++	input_sync(inp);
++	input_report_key(inp, btn, 1);
++	input_sync(inp);
++	input_report_key(inp, btn, 0);
++}
++#endif
++
++
++static void lis302dl_bitbang_read_sample(struct lis302dl_info *lis)
++{
++	u8 data[(LIS302DL_REG_OUT_Z - LIS302DL_REG_STATUS) + 2] = {0xC0 | LIS302DL_REG_STATUS};
++	u8 *read = data + 1;
++	unsigned long flags;
++	int mg_per_sample = __threshold_to_mg(lis, 1);
++	struct spi_message msg;
++	struct spi_transfer t;
++
++	spi_message_init(&msg);
++	memset(&t, 0, sizeof t);
++	t.len = sizeof(data);
++	spi_message_add_tail(&t, &msg);
++	t.tx_buf = &data[0];
++	t.rx_buf = &data[0];
++
++	/* grab the set of register containing status and XYZ data */
++
++	local_irq_save(flags);
++
++	/* Should complete without blocking */
++	if (spi_non_blocking_transfer(lis->spi, &msg) < 0) 
++		dev_err(lis->dev, "Error reading registers\n");
++
++	local_irq_restore(flags);
++
++	/*
++	 * at the minute the test below fails 50% of the time due to
++	 * a problem with level interrupts causing ISRs to get called twice.
++	 * This is a workaround for that, but actually this test is still
++	 * valid and the information can be used for overrrun stats.
++	 */
++
++	/* has any kind of overrun been observed by the lis302dl? */
++	if (read[0] & (LIS302DL_STATUS_XOR |
++		       LIS302DL_STATUS_YOR |
++		       LIS302DL_STATUS_ZOR))
++		lis->overruns++;
++
++	/* we have a valid sample set? */
++	if (read[0] & LIS302DL_STATUS_XYZDA) {
++		input_report_abs(lis->input_dev, ABS_X, mg_per_sample *
++			    (s8)read[LIS302DL_REG_OUT_X - LIS302DL_REG_STATUS]);
++		input_report_abs(lis->input_dev, ABS_Y, mg_per_sample *
++			    (s8)read[LIS302DL_REG_OUT_Y - LIS302DL_REG_STATUS]);
++		input_report_abs(lis->input_dev, ABS_Z, mg_per_sample *
++			    (s8)read[LIS302DL_REG_OUT_Z - LIS302DL_REG_STATUS]);
++
++		input_sync(lis->input_dev);
++	}
++
++	if (lis->threshold)
++		/* acknowledge the wakeup source */
++		__reg_read(lis,	LIS302DL_REG_FF_WU_SRC_1);
++}
++
++static irqreturn_t lis302dl_interrupt(int irq, void *_lis)
++{
++	struct lis302dl_info *lis = _lis;
++
++	lis302dl_bitbang_read_sample(lis);
++	return IRQ_HANDLED;
++}
++
++/* sysfs */
++
++static ssize_t show_overruns(struct device *dev, struct device_attribute *attr,
++			 char *buf)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++
++	return sprintf(buf, "%u\n", lis->overruns);
++}
++
++static DEVICE_ATTR(overruns, S_IRUGO, show_overruns, NULL);
++
++static ssize_t show_rate(struct device *dev, struct device_attribute *attr,
++			 char *buf)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++	u8 ctrl1;
++	unsigned long flags;
++
++	local_irq_save(flags);
++	ctrl1 = __reg_read(lis, LIS302DL_REG_CTRL1);
++	local_irq_restore(flags);
++
++	return sprintf(buf, "%d\n", ctrl1 & LIS302DL_CTRL1_DR ? 400 : 100);
++}
++
++static ssize_t set_rate(struct device *dev, struct device_attribute *attr,
++			const char *buf, size_t count)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++	unsigned long flags;
++
++	local_irq_save(flags);
++
++	if (!strcmp(buf, "400\n")) {
++		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR,
++				 LIS302DL_CTRL1_DR);
++		lis->flags |= LIS302DL_F_DR;
++	} else {
++		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR,
++				0);
++		lis->flags &= ~LIS302DL_F_DR;
++	}
++	local_irq_restore(flags);
++
++	return count;
++}
++
++static DEVICE_ATTR(sample_rate, S_IRUGO | S_IWUSR, show_rate, set_rate);
++
++static ssize_t show_scale(struct device *dev, struct device_attribute *attr,
++			  char *buf)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++	u_int8_t ctrl1;
++	unsigned long flags;
++
++	local_irq_save(flags);
++	ctrl1 = __reg_read(lis, LIS302DL_REG_CTRL1);
++	local_irq_restore(flags);
++
++	return sprintf(buf, "%s\n", ctrl1 & LIS302DL_CTRL1_FS ? "9.2" : "2.3");
++}
++
++static ssize_t set_scale(struct device *dev, struct device_attribute *attr,
++			 const char *buf, size_t count)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++	unsigned long flags;
++
++	local_irq_save(flags);
++
++	if (!strcmp(buf, "9.2\n")) {
++		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS,
++				 LIS302DL_CTRL1_FS);
++		lis->flags |= LIS302DL_F_FS;
++	} else {
++		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS,
++				0);
++		lis->flags &= ~LIS302DL_F_FS;
++	}
++
++	if (lis->flags & LIS302DL_F_INPUT_OPEN)
++		__enable_data_collection(lis);
++
++	local_irq_restore(flags);
++
++	return count;
++}
++
++static DEVICE_ATTR(full_scale, S_IRUGO | S_IWUSR, show_scale, set_scale);
++
++static ssize_t show_threshold(struct device *dev, struct device_attribute *attr,
++		 char *buf)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++
++	/* Display the device view of the threshold setting */
++	return sprintf(buf, "%d\n", __threshold_to_mg(lis,
++			__mg_to_threshold(lis, lis->threshold)));
++}
++
++static ssize_t set_threshold(struct device *dev, struct device_attribute *attr,
++		 const char *buf, size_t count)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++	unsigned int val;
++
++	if (sscanf(buf, "%u\n", &val) != 1)
++		return -EINVAL;
++	/* 8g is the maximum if FS is 1 */
++	if (val > 8000)
++		return -ERANGE;
++
++	/* Set the threshold and write it out if the device is used */
++	lis->threshold = val;
++
++	if (lis->flags & LIS302DL_F_INPUT_OPEN) {
++		unsigned long flags;
++
++		local_irq_save(flags);
++		__enable_data_collection(lis);
++		local_irq_restore(flags);
++	}
++
++	return count;
++}
++
++static DEVICE_ATTR(threshold, S_IRUGO | S_IWUSR, show_threshold, set_threshold);
++
++static ssize_t show_duration(struct device *dev, struct device_attribute *attr,
++		 char *buf)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++
++	return sprintf(buf, "%d\n", __duration_to_ms(lis,
++			__ms_to_duration(lis, lis->duration)));
++}
++
++static ssize_t set_duration(struct device *dev, struct device_attribute *attr,
++		 const char *buf, size_t count)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++	unsigned int val;
++
++	if (sscanf(buf, "%u\n", &val) != 1)
++		return -EINVAL;
++	if (val > 2550)
++		return -ERANGE;
++
++	lis->duration = val;
++	if (lis->flags & LIS302DL_F_INPUT_OPEN)
++		__reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1,
++				__ms_to_duration(lis, lis->duration));
++
++	return count;
++}
++
++static DEVICE_ATTR(duration, S_IRUGO | S_IWUSR, show_duration, set_duration);
++
++static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
++								      char *buf)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++	int n = 0;
++	u8 reg[0x40];
++	char *end = buf;
++	unsigned long flags;
++
++	local_irq_save(flags);
++
++	for (n = 0; n < sizeof(reg); n++)
++		reg[n] = __reg_read(lis, n);
++
++	local_irq_restore(flags);
++
++	for (n = 0; n < sizeof(reg); n += 16) {
++		hex_dump_to_buffer(reg + n, 16, 16, 1, end, 128, 0);
++		end += strlen(end);
++		*end++ = '\n';
++		*end++ = '\0';
++	}
++
++	return end - buf;
++}
++static DEVICE_ATTR(dump, S_IRUGO, lis302dl_dump, NULL);
++
++/* Configure freefall/wakeup interrupts */
++static ssize_t set_wakeup_threshold(struct device *dev,
++		struct device_attribute *attr, const char *buf, size_t count)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++	unsigned int threshold;
++
++	if (sscanf(buf, "%u\n", &threshold) != 1)
++		return -EINVAL;
++
++	if (threshold > 8000)
++		return -ERANGE;
++
++	/* Zero turns the feature off */
++	if (threshold == 0) {
++		if (lis->flags & LIS302DL_F_IRQ_WAKE) {
++			disable_irq_wake(lis->pdata->interrupt);
++			lis->flags &= ~LIS302DL_F_IRQ_WAKE;
++		}
++
++		return count;
++	}
++
++	lis->wakeup.threshold = threshold;
++
++	if (!(lis->flags & LIS302DL_F_IRQ_WAKE)) {
++		enable_irq_wake(lis->pdata->interrupt);
++		lis->flags |= LIS302DL_F_IRQ_WAKE;
++	}
++
++	return count;
++}
++
++static ssize_t show_wakeup_threshold(struct device *dev,
++		struct device_attribute *attr, char *buf)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++
++	/* All events off? */
++	if (lis->wakeup.threshold == 0)
++		return sprintf(buf, "off\n");
++
++	return sprintf(buf, "%u\n", lis->wakeup.threshold);
++}
++
++static DEVICE_ATTR(wakeup_threshold, S_IRUGO | S_IWUSR, show_wakeup_threshold,
++		set_wakeup_threshold);
++
++static ssize_t set_wakeup_duration(struct device *dev,
++		struct device_attribute *attr, const char *buf, size_t count)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++	unsigned int duration;
++
++	if (sscanf(buf, "%u\n", &duration) != 1)
++		return -EINVAL;
++
++	if (duration > 2550)
++		return -ERANGE;
++
++	lis->wakeup.duration = duration;
++
++	return count;
++}
++
++static ssize_t show_wakeup_duration(struct device *dev,
++		struct device_attribute *attr, char *buf)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(dev);
++
++	return sprintf(buf, "%u\n", lis->wakeup.duration);
++}
++
++static DEVICE_ATTR(wakeup_duration, S_IRUGO | S_IWUSR, show_wakeup_duration,
++		set_wakeup_duration);
++
++static struct attribute *lis302dl_sysfs_entries[] = {
++	&dev_attr_sample_rate.attr,
++	&dev_attr_full_scale.attr,
++	&dev_attr_threshold.attr,
++	&dev_attr_duration.attr,
++	&dev_attr_dump.attr,
++	&dev_attr_wakeup_threshold.attr,
++	&dev_attr_wakeup_duration.attr,
++	&dev_attr_overruns.attr,
++	NULL
++};
++
++static struct attribute_group lis302dl_attr_group = {
++	.name	= NULL,
++	.attrs	= lis302dl_sysfs_entries,
++};
++
++/* input device handling and driver core interaction */
++
++static int lis302dl_input_open(struct input_dev *inp)
++{
++	struct lis302dl_info *lis = input_get_drvdata(inp);
++	unsigned long flags;
++
++	local_irq_save(flags);
++
++	__enable_data_collection(lis);
++	lis->flags |= LIS302DL_F_INPUT_OPEN;
++
++	local_irq_restore(flags);
++
++	return 0;
++}
++
++static void lis302dl_input_close(struct input_dev *inp)
++{
++	struct lis302dl_info *lis = input_get_drvdata(inp);
++	u_int8_t ctrl1 = LIS302DL_CTRL1_Xen | LIS302DL_CTRL1_Yen |
++			 LIS302DL_CTRL1_Zen;
++	unsigned long flags;
++
++	local_irq_save(flags);
++
++	/* since the input core already serializes access and makes sure we
++	 * only see close() for the close of the last user, we can safely
++	 * disable the data ready events */
++	__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, 0x00);
++	lis->flags &= ~LIS302DL_F_INPUT_OPEN;
++
++	/* however, don't power down the whole device if still needed */
++	if (!(lis->flags & LIS302DL_F_WUP_FF ||
++	      lis->flags & LIS302DL_F_WUP_CLICK)) {
++		__reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
++				 0x00);
++	}
++	local_irq_restore(flags);
++}
++
++/* get the device to reload its coefficients from EEPROM and wait for it
++ * to complete
++ */
++
++static int __lis302dl_reset_device(struct lis302dl_info *lis)
++{
++	int timeout = 10;
++
++	__reg_write(lis, LIS302DL_REG_CTRL2,
++			LIS302DL_CTRL2_BOOT | LIS302DL_CTRL2_FDS);
++
++	while ((__reg_read(lis, LIS302DL_REG_CTRL2)
++			& LIS302DL_CTRL2_BOOT) && (timeout--))
++		mdelay(1);
++
++	return !!(timeout < 0);
++}
++
++static int __devinit lis302dl_probe(struct spi_device *spi)
++{
++	int rc;
++	struct lis302dl_info *lis;
++	u_int8_t wai;
++	unsigned long flags;
++	struct lis302dl_platform_data *pdata = spi->dev.platform_data;
++
++	spi->mode = SPI_MODE_3;
++	rc = spi_setup(spi);
++	if (rc < 0) {
++		dev_err(&spi->dev, "spi_setup failed\n");
++		return rc;
++	}
++
++	lis = kzalloc(sizeof(*lis), GFP_KERNEL);
++	if (!lis)
++		return -ENOMEM;
++
++	lis->dev = &spi->dev;
++	lis->spi = spi;
++
++	dev_set_drvdata(lis->dev, lis);
++
++	lis->pdata = pdata;
++
++	rc = sysfs_create_group(&lis->dev->kobj, &lis302dl_attr_group);
++	if (rc) {
++		dev_err(lis->dev, "error creating sysfs group\n");
++		goto bail_free_lis;
++	}
++
++	/* initialize input layer details */
++	lis->input_dev = input_allocate_device();
++	if (!lis->input_dev) {
++		dev_err(lis->dev, "Unable to allocate input device\n");
++		goto bail_sysfs;
++	}
++
++	input_set_drvdata(lis->input_dev, lis);
++	lis->input_dev->name = pdata->name;
++	 /* SPI Bus not defined as a valid bus for input subsystem*/
++	lis->input_dev->id.bustype = BUS_I2C; /* lie about it */
++	lis->input_dev->open = lis302dl_input_open;
++	lis->input_dev->close = lis302dl_input_close;
++
++	rc = input_register_device(lis->input_dev);
++	if (rc) {
++		dev_err(lis->dev, "error %d registering input device\n", rc);
++		goto bail_inp_dev;
++	}
++
++	local_irq_save(flags);
++	/* Configure our IO */
++	(lis->pdata->lis302dl_suspend_io)(lis, 1);
++
++	wai = __reg_read(lis, LIS302DL_REG_WHO_AM_I);
++	if (wai != LIS302DL_WHO_AM_I_MAGIC) {
++		dev_err(lis->dev, "unknown who_am_i signature 0x%02x\n", wai);
++		dev_set_drvdata(lis->dev, NULL);
++		rc = -ENODEV;
++		local_irq_restore(flags);
++		goto bail_inp_reg;
++	}
++
++	set_bit(EV_ABS, lis->input_dev->evbit);
++	input_set_abs_params(lis->input_dev, ABS_X, 0, 0, 0, 0);
++	input_set_abs_params(lis->input_dev, ABS_Y, 0, 0, 0, 0);
++	input_set_abs_params(lis->input_dev, ABS_Z, 0, 0, 0, 0);
++	
++
++	lis->threshold = 0;
++	lis->duration = 0;
++	memset(&lis->wakeup, 0, sizeof(lis->wakeup));
++
++	if (__lis302dl_reset_device(lis))
++		dev_err(lis->dev, "device BOOT reload failed\n");
++
++	/* force us powered */
++	__reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD |
++			LIS302DL_CTRL1_Xen |
++			LIS302DL_CTRL1_Yen |
++			LIS302DL_CTRL1_Zen);
++	mdelay(1);
++
++	__reg_write(lis, LIS302DL_REG_CTRL2, 0);
++	__reg_write(lis, LIS302DL_REG_CTRL3,
++			LIS302DL_CTRL3_PP_OD | LIS302DL_CTRL3_IHL);
++	__reg_write(lis, LIS302DL_REG_FF_WU_THS_1, 0x0);
++	__reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0x00);
++	__reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, 0x0);
++
++	/* start off in powered down mode; we power up when someone opens us */
++	__reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_Xen |
++			LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen);
++
++	if (pdata->open_drain)
++		/* switch interrupt to open collector, active-low */
++		__reg_write(lis, LIS302DL_REG_CTRL3,
++				LIS302DL_CTRL3_PP_OD | LIS302DL_CTRL3_IHL);
++	else
++		/* push-pull, active-low */
++		__reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_IHL);
++
++	__lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_GND);
++	__lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_GND);
++
++	__reg_read(lis, LIS302DL_REG_STATUS);
++	__reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
++	__reg_read(lis, LIS302DL_REG_FF_WU_SRC_2);
++	__reg_read(lis, LIS302DL_REG_CLICK_SRC);
++	local_irq_restore(flags);
++
++	dev_info(lis->dev, "Found %s\n", pdata->name);
++
++	lis->pdata = pdata;
++
++	set_irq_handler(lis->pdata->interrupt, handle_level_irq);
++
++	rc = request_irq(lis->pdata->interrupt, lis302dl_interrupt,
++			 IRQF_TRIGGER_LOW, "lis302dl", lis);
++	
++	if (rc < 0) {
++		dev_err(lis->dev, "error requesting IRQ %d\n",
++			lis->pdata->interrupt);
++		goto bail_inp_reg;
++	}
++	return 0;
++
++bail_inp_reg:
++	input_unregister_device(lis->input_dev);
++bail_inp_dev:
++	input_free_device(lis->input_dev);
++bail_sysfs:
++	sysfs_remove_group(&lis->dev->kobj, &lis302dl_attr_group);
++bail_free_lis:
++	kfree(lis);
++	return rc;
++}
++
++static int __devexit lis302dl_remove(struct spi_device *spi)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
++	unsigned long flags;
++
++	/* Disable interrupts */
++	if (lis->flags & LIS302DL_F_IRQ_WAKE)
++		disable_irq_wake(lis->pdata->interrupt);
++	free_irq(lis->pdata->interrupt, lis);
++
++	/* Reset and power down the device */
++	local_irq_save(flags);
++	__reg_write(lis, LIS302DL_REG_CTRL3, 0x00);
++	__reg_write(lis, LIS302DL_REG_CTRL2, 0x00);
++	__reg_write(lis, LIS302DL_REG_CTRL1, 0x00);
++	local_irq_restore(flags);
++
++	/* Cleanup resources */
++	sysfs_remove_group(&spi->dev.kobj, &lis302dl_attr_group);
++	input_unregister_device(lis->input_dev);
++	if (lis->input_dev)
++		input_free_device(lis->input_dev);
++	dev_set_drvdata(lis->dev, NULL);
++	kfree(lis);
++
++	return 0;
++}
++
++#ifdef CONFIG_PM
++
++static u8 regs_to_save[] = {
++	LIS302DL_REG_CTRL2,
++	LIS302DL_REG_CTRL3,
++	LIS302DL_REG_FF_WU_CFG_1,
++	LIS302DL_REG_FF_WU_THS_1,
++	LIS302DL_REG_FF_WU_DURATION_1,
++	LIS302DL_REG_FF_WU_CFG_2,
++	LIS302DL_REG_FF_WU_THS_2,
++	LIS302DL_REG_FF_WU_DURATION_2,
++	LIS302DL_REG_CLICK_CFG,
++	LIS302DL_REG_CLICK_THSY_X,
++	LIS302DL_REG_CLICK_THSZ,
++	LIS302DL_REG_CLICK_TIME_LIMIT,
++	LIS302DL_REG_CLICK_LATENCY,
++	LIS302DL_REG_CLICK_WINDOW,
++	LIS302DL_REG_CTRL1,
++};
++
++static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
++	unsigned long flags;
++	u_int8_t tmp;
++	int n;
++
++	/* determine if we want to wake up from the accel. */
++	if (lis->flags & LIS302DL_F_WUP_CLICK)
++		return 0;
++
++	disable_irq(lis->pdata->interrupt);
++	local_irq_save(flags);
++
++	/*
++	 * When we share SPI over multiple sensors, there is a race here
++	 * that one or more sensors will lose.  In that case, the shared
++	 * SPI bus GPIO will be in sleep mode and partially pulled down.  So
++	 * we explicitly put our IO into "wake" mode here before the final
++	 * traffic to the sensor.
++	 */
++	(lis->pdata->lis302dl_suspend_io)(lis, 1);
++
++	/* save registers */
++	for (n = 0; n < ARRAY_SIZE(regs_to_save); n++)
++		lis->regs[regs_to_save[n]] =
++			__reg_read(lis, regs_to_save[n]);
++
++	/* power down or enable wakeup */
++
++	if (lis->wakeup.threshold == 0) {
++		tmp = __reg_read(lis, LIS302DL_REG_CTRL1);
++		tmp &= ~LIS302DL_CTRL1_PD;
++		__reg_write(lis, LIS302DL_REG_CTRL1, tmp);
++	} else
++		__enable_wakeup(lis);
++
++	/* place our IO to the device in sleep-compatible states */
++	(lis->pdata->lis302dl_suspend_io)(lis, 0);
++
++	local_irq_restore(flags);
++
++	return 0;
++}
++
++static int lis302dl_resume(struct spi_device *spi)
++{
++	struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
++	unsigned long flags;
++	int n;
++
++	if (lis->flags & LIS302DL_F_WUP_CLICK)
++		return 0;
++
++	local_irq_save(flags);
++
++	/* get our IO to the device back in operational states */
++	(lis->pdata->lis302dl_suspend_io)(lis, 1);
++
++	/* resume from powerdown first! */
++	__reg_write(lis, LIS302DL_REG_CTRL1,
++			LIS302DL_CTRL1_PD |
++			LIS302DL_CTRL1_Xen |
++			LIS302DL_CTRL1_Yen |
++			LIS302DL_CTRL1_Zen);
++	mdelay(1);
++
++	if (__lis302dl_reset_device(lis))
++		dev_err(&spi->dev, "device BOOT reload failed\n");
++
++	/* restore registers after resume */
++	for (n = 0; n < ARRAY_SIZE(regs_to_save); n++)
++		__reg_write(lis, regs_to_save[n], lis->regs[regs_to_save[n]]);
++
++	/* if someone had us open, reset the non-wake threshold stuff */
++	if (lis->flags & LIS302DL_F_INPUT_OPEN)
++		__enable_data_collection(lis);
++
++	local_irq_restore(flags);
++	enable_irq(lis->pdata->interrupt);
++
++	return 0;
++}
++#else
++#define lis302dl_suspend	NULL
++#define lis302dl_resume		NULL
++#endif
++
++static struct spi_driver lis302dl_spi_driver = {
++	.driver = {
++		.name = "lis302dl",
++		.owner = THIS_MODULE,
++	},
++
++	.probe 	= lis302dl_probe,	
++	.remove	= __devexit_p(lis302dl_remove),
++	.suspend = lis302dl_suspend,
++	.resume	 = lis302dl_resume,
++};
++
++static int __devinit lis302dl_init(void)
++{
++	return spi_register_driver(&lis302dl_spi_driver);
++}
++
++static void __exit lis302dl_exit(void)
++{
++	spi_unregister_driver(&lis302dl_spi_driver);
++}
++
++MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
++MODULE_LICENSE("GPL");
++
++module_init(lis302dl_init);
++module_exit(lis302dl_exit);
+diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
+index 5265330..24c61a6 100644
+--- a/drivers/spi/spi_bitbang.c
++++ b/drivers/spi/spi_bitbang.c
+@@ -254,134 +254,139 @@ static int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t)
+  * Drivers can provide word-at-a-time i/o primitives, or provide
+  * transfer-at-a-time ones to leverage dma or fifo hardware.
+  */
+-static void bitbang_work(struct work_struct *work)
++/* Synchronous non blocking transfer */
++int
++spi_bitbang_transfer_sync(struct spi_device *spi, struct spi_message *m)
+ {
+-	struct spi_bitbang	*bitbang =
+-		container_of(work, struct spi_bitbang, work);
+-	unsigned long		flags;
+-	int			do_setup = -1;
+-	int			(*setup_transfer)(struct spi_device *,
+-					struct spi_transfer *);
++	struct spi_bitbang *bitbang = spi_master_get_devdata(spi->master);
++	struct spi_transfer *t;
++	unsigned long flags;
++	int cs_change = 1;
++	int status;
++	int nsecs;
++	int (*setup_transfer)(struct spi_device *, struct spi_transfer *);
++
++	/* FIXME this is made-up ... the correct value is known to
++	 * word-at-a-time bitbang code, and presumably chipselect()
++	 * should enforce these requirements too?
++	 */
++	nsecs = 100;
++	cs_change = 1;
++	status = 0;
++	setup_transfer = NULL;
++
++	local_irq_save(flags);
++	list_for_each_entry (t, &m->transfers, transfer_list) {
++		/* override or restore speed and wordsize */
++		if (t->speed_hz || t->bits_per_word) {
++			setup_transfer = bitbang->setup_transfer;
++			if (!setup_transfer) {
++				status = -ENOPROTOOPT;
++				break;
++			}
++		}
++		if (setup_transfer) {
++			status = setup_transfer(spi, t);
++			if (status < 0)
++				break;
++		}
+ 
+-	setup_transfer = bitbang->setup_transfer;
++		/* set up default clock polarity, and activate chip;
++		 * this implicitly updates clock and spi modes as
++		 * previously recorded for this device via setup().
++		 * (and also deselects any other chip that might be
++		 * selected ...)
++		 */
+ 
+-	spin_lock_irqsave(&bitbang->lock, flags);
+-	bitbang->busy = 1;
+-	while (!list_empty(&bitbang->queue)) {
+-		struct spi_message	*m;
+-		struct spi_device	*spi;
+-		unsigned		nsecs;
+-		struct spi_transfer	*t = NULL;
+-		unsigned		tmp;
+-		unsigned		cs_change;
+-		int			status;
++		if (cs_change) {
++			bitbang->chipselect(spi, BITBANG_CS_ACTIVE);
++			ndelay(nsecs);
++		}
+ 
+-		m = container_of(bitbang->queue.next, struct spi_message,
+-				queue);
+-		list_del_init(&m->queue);
+-		spin_unlock_irqrestore(&bitbang->lock, flags);
++		cs_change = t->cs_change;
++		if (!t->tx_buf && !t->rx_buf && t->len) {
++			status = -EINVAL;
++			break;
++		}
+ 
+-		/* FIXME this is made-up ... the correct value is known to
+-		 * word-at-a-time bitbang code, and presumably chipselect()
+-		 * should enforce these requirements too?
++		/* transfer data.  the lower level code handles any
++		 * new dma mappings it needs. our caller always gave
++		 * us dma-safe buffers.
+ 		 */
+-		nsecs = 100;
++		if (t->len) {
++			/* REVISIT dma API still needs a designated
++			 * DMA_ADDR_INVALID; ~0 might be better.
++			 */
++			if (!m->is_dma_mapped)
++				t->rx_dma = t->tx_dma = 0;
++			status = bitbang->txrx_bufs(spi, t);
++		}
+ 
+-		spi = m->spi;
+-		tmp = 0;
+-		cs_change = 1;
++		if (status > 0)
++			m->actual_length += status;
++		if (status != t->len) {
++			/* always report some kind of error */
++			if (status >= 0)
++				status = -EREMOTEIO;
++			break;
++		}
+ 		status = 0;
++			/* protocol tweaks before next transfer */
++		if (t->delay_usecs)
++			udelay(t->delay_usecs);
++			if (!cs_change)
++			continue;
++		if (t->transfer_list.next == &m->transfers)
++			break;
++			/* sometimes a short mid-message deselect of the chip
++		 * may be needed to terminate a mode or command
++		 */
++		ndelay(nsecs);
++		bitbang->chipselect(spi, BITBANG_CS_INACTIVE);
++		ndelay(nsecs);
++	}
+ 
+-		list_for_each_entry (t, &m->transfers, transfer_list) {
+-
+-			/* override speed or wordsize? */
+-			if (t->speed_hz || t->bits_per_word)
+-				do_setup = 1;
+-
+-			/* init (-1) or override (1) transfer params */
+-			if (do_setup != 0) {
+-				if (!setup_transfer) {
+-					status = -ENOPROTOOPT;
+-					break;
+-				}
+-				status = setup_transfer(spi, t);
+-				if (status < 0)
+-					break;
+-			}
++	m->status = status;
++	if (m->complete)
++		m->complete(m->context);
+ 
+-			/* set up default clock polarity, and activate chip;
+-			 * this implicitly updates clock and spi modes as
+-			 * previously recorded for this device via setup().
+-			 * (and also deselects any other chip that might be
+-			 * selected ...)
+-			 */
+-			if (cs_change) {
+-				bitbang->chipselect(spi, BITBANG_CS_ACTIVE);
+-				ndelay(nsecs);
+-			}
+-			cs_change = t->cs_change;
+-			if (!t->tx_buf && !t->rx_buf && t->len) {
+-				status = -EINVAL;
+-				break;
+-			}
++	/* restore speed and wordsize */
++	if (setup_transfer)
++		setup_transfer(spi, NULL);
+ 
+-			/* transfer data.  the lower level code handles any
+-			 * new dma mappings it needs. our caller always gave
+-			 * us dma-safe buffers.
+-			 */
+-			if (t->len) {
+-				/* REVISIT dma API still needs a designated
+-				 * DMA_ADDR_INVALID; ~0 might be better.
+-				 */
+-				if (!m->is_dma_mapped)
+-					t->rx_dma = t->tx_dma = 0;
+-				status = bitbang->txrx_bufs(spi, t);
+-			}
+-			if (status > 0)
+-				m->actual_length += status;
+-			if (status != t->len) {
+-				/* always report some kind of error */
+-				if (status >= 0)
+-					status = -EREMOTEIO;
+-				break;
+-			}
+-			status = 0;
+-
+-			/* protocol tweaks before next transfer */
+-			if (t->delay_usecs)
+-				udelay(t->delay_usecs);
++	/* normally deactivate chipselect ... unless no error and
++	 * cs_change has hinted that the next message will probably
++	 * be for this chip too.
++	 */
++	if (!(status == 0 && cs_change)) {
++		ndelay(nsecs);
++		bitbang->chipselect(spi, BITBANG_CS_INACTIVE);
++		ndelay(nsecs);
++	}
+ 
+-			if (!cs_change)
+-				continue;
+-			if (t->transfer_list.next == &m->transfers)
+-				break;
++	local_irq_restore(flags);
+ 
+-			/* sometimes a short mid-message deselect of the chip
+-			 * may be needed to terminate a mode or command
+-			 */
+-			ndelay(nsecs);
+-			bitbang->chipselect(spi, BITBANG_CS_INACTIVE);
+-			ndelay(nsecs);
+-		}
++	return status;
++}
++EXPORT_SYMBOL_GPL(spi_bitbang_transfer_sync);
+ 
+-		m->status = status;
+-		m->complete(m->context);
++static void bitbang_work(struct work_struct *work)
++{
++	struct spi_bitbang	*bitbang =
++		container_of(work, struct spi_bitbang, work);
++	unsigned long		flags;
+ 
+-		/* restore speed and wordsize if it was overridden */
+-		if (do_setup == 1)
+-			setup_transfer(spi, NULL);
+-		do_setup = 0;
++	spin_lock_irqsave(&bitbang->lock, flags);
++	bitbang->busy = 1;
++	while (!list_empty(&bitbang->queue)) {
++		struct spi_message	*m;
+ 
+-		/* normally deactivate chipselect ... unless no error and
+-		 * cs_change has hinted that the next message will probably
+-		 * be for this chip too.
+-		 */
+-		if (!(status == 0 && cs_change)) {
+-			ndelay(nsecs);
+-			bitbang->chipselect(spi, BITBANG_CS_INACTIVE);
+-			ndelay(nsecs);
+-		}
++		m = container_of(bitbang->queue.next, struct spi_message,
++				queue);
++		list_del_init(&m->queue);
+ 
++		spin_unlock_irqrestore(&bitbang->lock, flags);
++		spi_bitbang_transfer_sync(m->spi, m);
+ 		spin_lock_irqsave(&bitbang->lock, flags);
+ 	}
+ 	bitbang->busy = 0;
+@@ -456,6 +461,10 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)
+ 
+ 	if (!bitbang->master->transfer)
+ 		bitbang->master->transfer = spi_bitbang_transfer;
++
++	if (!bitbang->master->transfer_sync && bitbang->non_blocking_transfer)
++		bitbang->master->transfer_sync = spi_bitbang_transfer_sync;
++
+ 	if (!bitbang->txrx_bufs) {
+ 		bitbang->use_dma = 0;
+ 		bitbang->txrx_bufs = spi_bitbang_bufs;
+diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
+index bbf9371..5685b78 100644
+--- a/drivers/spi/spi_s3c24xx_gpio.c
++++ b/drivers/spi/spi_s3c24xx_gpio.c
+@@ -92,7 +92,7 @@ static void s3c2410_spigpio_chipselect(struct spi_device *dev, int value)
+ 	struct s3c2410_spigpio *sg = spidev_to_sg(dev);
+ 
+ 	if (sg->info && sg->info->chip_select)
+-		(sg->info->chip_select)(sg->info, value);
++		(sg->info->chip_select)(sg->info, dev->chip_select, value);
+ }
+ 
+ static int s3c2410_spigpio_probe(struct platform_device *dev)
+@@ -113,14 +113,17 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
+ 
+ 	platform_set_drvdata(dev, sp);
+ 
+-	/* copy in the plkatform data */
++	/* copy in the platform data */
+ 	info = sp->info = dev->dev.platform_data;
+ 
++	master->num_chipselect = info->num_chipselect;
++
+ 	/* setup spi bitbang adaptor */
+ 	sp->bitbang.master = spi_master_get(master);
+ 	sp->bitbang.master->bus_num = info->bus_num;
+ 	sp->bitbang.master->num_chipselect = info->num_chipselect;
+ 	sp->bitbang.chipselect = s3c2410_spigpio_chipselect;
++	sp->bitbang.non_blocking_transfer = info->non_blocking_transfer;
+ 
+ 	sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0;
+ 	sp->bitbang.txrx_word[SPI_MODE_1] = s3c2410_spigpio_txrx_mode1;
+diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
+new file mode 100644
+index 0000000..0c1fc30
+--- /dev/null
++++ b/include/linux/lis302dl.h
+@@ -0,0 +1,152 @@
++#ifndef _LINUX_LIS302DL_H
++#define _LINUX_LIS302DL_H
++
++#include <linux/types.h>
++#include <linux/spi/spi.h>
++#include <linux/input.h>
++#include <linux/workqueue.h>
++
++struct lis302dl_info;
++
++struct lis302dl_platform_data {
++	char *name;
++	unsigned long pin_chip_select;
++	unsigned long pin_clk;
++	unsigned long pin_mosi;
++	unsigned long pin_miso;
++	int open_drain;
++	int interrupt;
++	void (*lis302dl_suspend_io)(struct lis302dl_info *, int resuming);
++};
++
++struct lis302dl_info {
++	struct lis302dl_platform_data *pdata;
++	struct device *dev;
++	struct input_dev *input_dev;
++	unsigned int flags;
++	unsigned int threshold;
++	unsigned int duration;
++	u32 overruns;
++	struct {
++		unsigned int threshold; /* mg */
++		unsigned int duration;  /* ms */
++	} wakeup;
++
++	struct spi_device *spi;
++	u_int8_t regs[0x40];
++};
++
++enum lis302dl_reg {
++	LIS302DL_REG_WHO_AM_I		= 0x0f,
++	LIS302DL_REG_CTRL1		= 0x20,
++	LIS302DL_REG_CTRL2		= 0x21,
++	LIS302DL_REG_CTRL3		= 0x22,
++	LIS302DL_REG_HP_FILTER_RESET	= 0x23,
++	LIS302DL_REG_STATUS		= 0x27,
++	LIS302DL_REG_OUT_X		= 0x29,
++	LIS302DL_REG_OUT_Y		= 0x2b,
++	LIS302DL_REG_OUT_Z		= 0x2d,
++	LIS302DL_REG_FF_WU_CFG_1	= 0x30,
++	LIS302DL_REG_FF_WU_SRC_1	= 0x31,
++	LIS302DL_REG_FF_WU_THS_1	= 0x32,
++	LIS302DL_REG_FF_WU_DURATION_1	= 0x33,
++	LIS302DL_REG_FF_WU_CFG_2	= 0x34,
++	LIS302DL_REG_FF_WU_SRC_2	= 0x35,
++	LIS302DL_REG_FF_WU_THS_2	= 0x36,
++	LIS302DL_REG_FF_WU_DURATION_2	= 0x37,
++	LIS302DL_REG_CLICK_CFG		= 0x38,
++	LIS302DL_REG_CLICK_SRC		= 0x39,
++	LIS302DL_REG_CLICK_THSY_X	= 0x3b,
++	LIS302DL_REG_CLICK_THSZ		= 0x3c,
++	LIS302DL_REG_CLICK_TIME_LIMIT	= 0x3d,
++	LIS302DL_REG_CLICK_LATENCY	= 0x3e,
++	LIS302DL_REG_CLICK_WINDOW	= 0x3f,
++};
++
++enum lis302dl_reg_ctrl1 {
++	LIS302DL_CTRL1_Xen		= 0x01,
++	LIS302DL_CTRL1_Yen		= 0x02,
++	LIS302DL_CTRL1_Zen		= 0x04,
++	LIS302DL_CTRL1_STM		= 0x08,
++	LIS302DL_CTRL1_STP		= 0x10,
++	LIS302DL_CTRL1_FS		= 0x20,
++	LIS302DL_CTRL1_PD		= 0x40,
++	LIS302DL_CTRL1_DR		= 0x80,
++};
++
++enum lis302dl_reg_ctrl2 {
++	LIS302DL_CTRL2_HPC1		= 0x01,
++	LIS302DL_CTRL2_HPC2		= 0x02,
++	LIS302DL_CTRL2_HPFF1		= 0x04,
++	LIS302DL_CTRL2_HPFF2		= 0x08,
++	LIS302DL_CTRL2_FDS		= 0x10,
++	LIS302DL_CTRL2_BOOT		= 0x40,
++	LIS302DL_CTRL2_SIM		= 0x80,
++};
++enum lis302dl_reg_ctrl3 {
++	LIS302DL_CTRL3_PP_OD		= 0x40,
++	LIS302DL_CTRL3_IHL		= 0x80,
++};
++
++enum lis302dl_reg_status {
++	LIS302DL_STATUS_XDA		= 0x01,
++	LIS302DL_STATUS_YDA		= 0x02,
++	LIS302DL_STATUS_ZDA		= 0x04,
++	LIS302DL_STATUS_XYZDA		= 0x08,
++	LIS302DL_STATUS_XOR		= 0x10,
++	LIS302DL_STATUS_YOR		= 0x20,
++	LIS302DL_STATUS_ZOR		= 0x40,
++	LIS302DL_STATUS_XYZOR		= 0x80,
++};
++
++/* Wakeup/freefall interrupt defs */
++enum lis302dl_reg_ffwucfg {
++	LIS302DL_FFWUCFG_XLIE		= 0x01,
++	LIS302DL_FFWUCFG_XHIE		= 0x02,
++	LIS302DL_FFWUCFG_YLIE		= 0x04,
++	LIS302DL_FFWUCFG_YHIE		= 0x08,
++	LIS302DL_FFWUCFG_ZLIE		= 0x10,
++	LIS302DL_FFWUCFG_ZHIE		= 0x20,
++	LIS302DL_FFWUCFG_LIR		= 0x40,
++	LIS302DL_FFWUCFG_AOI		= 0x80,
++};
++
++enum lis302dl_reg_ffwuths {
++	LIS302DL_FFWUTHS_DCRM		= 0x80,
++};
++
++enum lis302dl_reg_ffwusrc {
++	LIS302DL_FFWUSRC_XL		= 0x01,
++	LIS302DL_FFWUSRC_XH		= 0x02,
++	LIS302DL_FFWUSRC_YL		= 0x04,
++	LIS302DL_FFWUSRC_YH		= 0x08,
++	LIS302DL_FFWUSRC_ZL		= 0x10,
++	LIS302DL_FFWUSRC_ZH		= 0x20,
++	LIS302DL_FFWUSRC_IA		= 0x40,
++};
++
++enum lis302dl_reg_cloik_src {
++	LIS302DL_CLICKSRC_SINGLE_X	= 0x01,
++	LIS302DL_CLICKSRC_DOUBLE_X	= 0x02,
++	LIS302DL_CLICKSRC_SINGLE_Y	= 0x04,
++	LIS302DL_CLICKSRC_DOUBLE_Y	= 0x08,
++	LIS302DL_CLICKSRC_SINGLE_Z	= 0x10,
++	LIS302DL_CLICKSRC_DOUBLE_Z	= 0x20,
++	LIS302DL_CLICKSRC_IA		= 0x40,
++};
++
++#define LIS302DL_WHO_AM_I_MAGIC		0x3b
++
++#define LIS302DL_F_WUP_FF_1		0x0001	/* wake up from free fall */
++#define LIS302DL_F_WUP_FF_2		0x0002
++#define LIS302DL_F_WUP_FF		0x0003
++#define LIS302DL_F_WUP_CLICK	0x0004
++#define LIS302DL_F_POWER		0x0010
++#define LIS302DL_F_FS			0x0020 	/* ADC full scale */
++#define LIS302DL_F_INPUT_OPEN 	0x0040  /* Set if input device is opened */
++#define LIS302DL_F_IRQ_WAKE 	0x0080  /* IRQ is setup in wake mode */
++#define LIS302DL_F_DR			0x0100 	/* Data rate, 400Hz/100Hz */
++
++
++#endif /* _LINUX_LIS302DL_H */
++
+diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
+index af56071..83ad05d 100644
+--- a/include/linux/spi/spi.h
++++ b/include/linux/spi/spi.h
+@@ -292,6 +292,13 @@ struct spi_master {
+ 	int			(*transfer)(struct spi_device *spi,
+ 						struct spi_message *mesg);
+ 
++	/*
++	 * Synchronous non blocking transfer function. Should guarantee
++	 * data availability when it returns
++	 */
++	int			(*transfer_sync)(struct spi_device *spi,
++						struct spi_message *mesg);
++
+ 	/* called on release() to free memory provided by spi_master */
+ 	void			(*cleanup)(struct spi_device *spi);
+ };
+@@ -543,6 +550,29 @@ static inline void spi_message_free(struct spi_message *m)
+ extern int spi_setup(struct spi_device *spi);
+ extern int spi_async(struct spi_device *spi, struct spi_message *message);
+ 
++/**
++ * spi_non_blocking_transfer - Synchronous, non blocking transfer
++ * @spi: device with which data will be exchanged
++ * @message: describes the data transfers with optional completion handlers
++ * Context: any (irqs may be blocked, etc)
++ *
++ * Data is guaranteed to be written or read when this function returns.
++ *
++ * Note : This may not be supported by all spi masters.
++ */
++
++static inline int
++spi_non_blocking_transfer(struct spi_device *spi, struct spi_message *message)
++{
++	if (unlikely(!spi->master->transfer_sync)) {
++		dev_err(&spi->master->dev,
++				"non-blocking transfers not supported\n");
++		return -EIO;
++	}
++
++	return spi->master->transfer_sync(spi, message);
++}
++
+ /*---------------------------------------------------------------------------*/
+ 
+ /* All these synchronous SPI transfer routines are utilities layered
+diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h
+index 3274c50..6dc9b8b 100644
+--- a/include/linux/spi/spi_bitbang.h
++++ b/include/linux/spi/spi_bitbang.h
+@@ -31,6 +31,9 @@ struct spi_bitbang {
+ 	u8			use_dma;
+ 	u8			flags;		/* extra spi->mode support */
+ 
++	/* Support for synchronous non blocking transfers */
++	int 			non_blocking_transfer;
++
+ 	struct spi_master	*master;
+ 
+ 	/* setup_transfer() changes clock and/or wordsize to match settings
+@@ -62,6 +65,8 @@ extern void spi_bitbang_cleanup(struct spi_device *spi);
+ extern int spi_bitbang_transfer(struct spi_device *spi, struct spi_message *m);
+ extern int spi_bitbang_setup_transfer(struct spi_device *spi,
+ 				      struct spi_transfer *t);
++extern int spi_bitbang_transfer_sync(struct spi_device *spi,
++				      struct spi_message *m);
+ 
+ /* start or stop queue processing */
+ extern int spi_bitbang_start(struct spi_bitbang *spi);
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.31/0002-Glamo-DRM-and-KMS-driver.patch b/recipes/linux/linux-openmoko-2.6.34/0002-Glamo-DRM-and-KMS-driver.patch
index 4a837e9b08..14dca73ab2 100644
--- a/recipes/linux/linux-openmoko-2.6.31/0002-Glamo-DRM-and-KMS-driver.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0002-Glamo-DRM-and-KMS-driver.patch
@@ -1,31 +1,31 @@
-From 01435b6f8fba2031e6941756a6a4e42be553f4a0 Mon Sep 17 00:00:00 2001
+From 4fe52e62cc86fc303cbc0f9a3c5081e38f95b950 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
-Date: Tue, 20 Oct 2009 16:14:55 +0200
-Subject: [PATCH 2/4] Glamo DRM and KMS driver
+Date: Sat, 22 May 2010 19:01:00 +0200
+Subject: [PATCH 02/13] Glamo DRM and KMS driver
 
-This adds the Glamo DRM and KMS driver, but not the modifications needed
+This adds the Glamo DRM and KMS driver, but note that modifications are needed
 elsewhere to support it.
 
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- drivers/gpu/drm/drm_stub.c            |    2 +-
- drivers/mfd/glamo/Kconfig             |   15 +
+ drivers/mfd/glamo/Kconfig             |   16 +
  drivers/mfd/glamo/Makefile            |    5 +-
- drivers/mfd/glamo/glamo-buffer.c      |  372 ++++++++++++++
- drivers/mfd/glamo/glamo-buffer.h      |   60 +++
- drivers/mfd/glamo/glamo-cmdq.c        |  528 ++++++++++++++++++++
+ drivers/mfd/glamo/glamo-buffer.c      |  374 +++++++++++++
+ drivers/mfd/glamo/glamo-buffer.h      |   60 ++
+ drivers/mfd/glamo/glamo-cmdq.c        |  555 +++++++++++++++++++
  drivers/mfd/glamo/glamo-cmdq.h        |   49 ++
- drivers/mfd/glamo/glamo-display.c     |  875 +++++++++++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-display.h     |   39 ++
- drivers/mfd/glamo/glamo-drm-drv.c     |  453 +++++++++++++++++
- drivers/mfd/glamo/glamo-drm-private.h |  156 ++++++
- drivers/mfd/glamo/glamo-fence.c       |  329 +++++++++++++
- drivers/mfd/glamo/glamo-fence.h       |   36 ++
- drivers/mfd/glamo/glamo-kms-fb.c      |  540 ++++++++++++++++++++
+ drivers/mfd/glamo/glamo-display.c     |  975 +++++++++++++++++++++++++++++++++
+ drivers/mfd/glamo/glamo-display.h     |   41 ++
+ drivers/mfd/glamo/glamo-drm-drv.c     |  423 ++++++++++++++
+ drivers/mfd/glamo/glamo-drm-private.h |  166 ++++++
+ drivers/mfd/glamo/glamo-fence.c       |  330 +++++++++++
+ drivers/mfd/glamo/glamo-fence.h       |   34 ++
+ drivers/mfd/glamo/glamo-kms-fb.c      |  493 +++++++++++++++++
  drivers/mfd/glamo/glamo-kms-fb.h      |   41 ++
  include/drm/Kbuild                    |    1 +
- include/drm/glamo_drm.h               |  153 ++++++
- 17 files changed, 3652 insertions(+), 2 deletions(-)
+ include/drm/glamo_drm.h               |  153 +++++
+ 16 files changed, 3715 insertions(+), 1 deletions(-)
  create mode 100644 drivers/mfd/glamo/glamo-buffer.c
  create mode 100644 drivers/mfd/glamo/glamo-buffer.h
  create mode 100644 drivers/mfd/glamo/glamo-cmdq.c
@@ -40,24 +40,11 @@ Signed-off-by: Thomas White <taw@bitwiz.org.uk>
  create mode 100644 drivers/mfd/glamo/glamo-kms-fb.h
  create mode 100644 include/drm/glamo_drm.h
 
-diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
-index a7069ad..5e3d65a 100644
---- a/drivers/gpu/drm/drm_stub.c
-+++ b/drivers/gpu/drm/drm_stub.c
-@@ -471,7 +471,7 @@ int drm_get_platform_dev(struct platform_device *pdev,
- 	int ret;
- 	DRM_DEBUG("\n");
- 
--	dev = kmalloc(sizeof(*dev), GFP_KERNEL);
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
- 	if (!dev)
- 		return -ENOMEM;
- 	dev->dev_private = priv;
 diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
-index 8c93bcb..375e5db 100644
+index 3aa4831..a12ebf6 100644
 --- a/drivers/mfd/glamo/Kconfig
 +++ b/drivers/mfd/glamo/Kconfig
-@@ -39,3 +39,18 @@ config MFD_GLAMO_MCI
+@@ -40,3 +40,19 @@ config MFD_GLAMO_MCI
  	  neo1973 GTA-02.
  
  	  If unsure, say N.
@@ -68,6 +55,7 @@ index 8c93bcb..375e5db 100644
 +	select FB_CFB_FILLRECT
 +	select FB_CFB_COPYAREA
 +	select FB_CFB_IMAGEBLIT
++	select DRM_KMS_HELPER
 +	help
 +	  Direct Rendering Manager interface for the S-Media Glamo chip, as
 +	  used in Openmoko FreeRunner (GTA02).
@@ -97,10 +85,10 @@ index ebf26f7..d5ebf8f 100644
 +                    glamo-display.o glamo-kms-fb.o glamo-fence.o
 diff --git a/drivers/mfd/glamo/glamo-buffer.c b/drivers/mfd/glamo/glamo-buffer.c
 new file mode 100644
-index 0000000..45500d3
+index 0000000..82ea0c0
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-buffer.c
-@@ -0,0 +1,372 @@
+@@ -0,0 +1,374 @@
 +/*
 + * SMedia Glamo 336x/337x memory management
 + *
@@ -348,6 +336,8 @@ index 0000000..45500d3
 +	if (!gobj->mmap_offset) {
 +		ret = glamo_gem_create_mmap_offset(obj);
 +		if (ret) {
++			printk(KERN_CRIT "Couldn't create mmap offset\n");
++			drm_gem_object_unreference(obj);
 +			mutex_unlock(&dev->struct_mutex);
 +			return ret;
 +		}
@@ -541,10 +531,10 @@ index 0000000..41f18fd
 +#endif /* __GLAMO_BUFFER_H */
 diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c
 new file mode 100644
-index 0000000..caedc27
+index 0000000..442963c
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-cmdq.c
-@@ -0,0 +1,528 @@
+@@ -0,0 +1,555 @@
 +/*
 + * SMedia Glamo 336x/337x command queue handling
 + *
@@ -606,6 +596,9 @@ index 0000000..caedc27
 +#include "glamo-regs.h"
 +
 +
++#define GLAMO_CMDQ_SIZE (128 * 1024)    /* 128k ring buffer */
++
++
 +static inline void reg_write(struct glamodrm_handle *gdrm,
 +                             u_int16_t reg, u_int16_t val)
 +{
@@ -983,7 +976,7 @@ index 0000000..caedc27
 +	burst[0] = 1<<15 | cbuf->base;
 +	burst[1] = data_size / 2;  /* -> 2-byte words */
 +	if ( burst[1] & 0x01 ) {
-+		printk(KERN_CRIT "Burst not aligned!\n");
++		printk(KERN_WARNING "[glamo-drm] Burst not aligned!\n");
 +		goto cleanup;
 +	}
 +
@@ -1002,7 +995,7 @@ index 0000000..caedc27
 +}
 +
 +
-+int glamo_cmdq_init(struct glamodrm_handle *gdrm)
++int glamo_cmdq_setup(struct glamodrm_handle *gdrm)
 +{
 +	unsigned int i;
 +
@@ -1022,9 +1015,9 @@ index 0000000..caedc27
 +
 +	/* Set up command queue location */
 +	reg_write(gdrm, GLAMO_REG_CMDQ_BASE_ADDRL,
-+					GLAMO_OFFSET_CMDQ & 0xffff);
++					gdrm->cmdq_offs & 0xffff);
 +	reg_write(gdrm, GLAMO_REG_CMDQ_BASE_ADDRH,
-+					(GLAMO_OFFSET_CMDQ >> 16) & 0x7f);
++					(gdrm->cmdq_offs >> 16) & 0x7f);
 +
 +	/* Length of command queue in 1k blocks, minus one */
 +	reg_write(gdrm, GLAMO_REG_CMDQ_LEN, (GLAMO_CMDQ_SIZE >> 10)-1);
@@ -1039,6 +1032,30 @@ index 0000000..caedc27
 +}
 +
 +
++int glamo_cmdq_init(struct glamodrm_handle *gdrm)
++{
++	struct drm_gem_object *obj;
++	struct drm_glamo_gem_object *gobj;
++	int ret = 0;
++
++	obj = glamo_gem_object_alloc(dev, GLAMO_CMDQ_SIZE, 4);
++	if ( !obj ) {
++		printk(KERN_ERR "[glamo-drm] Failed to allocate CmdQ\n");
++		ret = -ENOMEM;
++		goto out;
++	}
++	gobj = fbo->driver_private;
++	gdrm->cmdq_offs = GLAMO_OFFSET_FB + gobj->block->start;
++	gdrm->cmdq_base = ioremap(gdrm->vram->start + offs, GLAMO_CMDQ_SIZE);
++
++	/* Set up registers */
++	glamo_cmdq_setup(gdrm);
++
++out:
++	return ret;
++}
++
++
 +int glamo_cmdq_shutdown(struct glamodrm_handle *gdrm)
 +{
 +	return 0;
@@ -1053,7 +1070,7 @@ index 0000000..caedc27
 +
 +void glamo_cmdq_resume(struct glamodrm_handle *gdrm)
 +{
-+	glamo_cmdq_init(gdrm);
++	glamo_cmdq_setup(gdrm);
 +}
 +
 +
@@ -1130,10 +1147,10 @@ index 0000000..510d195
 +#endif /* __GLAMO_CMDQ_H */
 diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
 new file mode 100644
-index 0000000..93aa917
+index 0000000..75ad734
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-display.c
-@@ -0,0 +1,875 @@
+@@ -0,0 +1,975 @@
 +/*
 + * SMedia Glamo 336x/337x display
 + *
@@ -1188,19 +1205,18 @@ index 0000000..93aa917
 + *
 + */
 +
-+#define DEBUG 1
-+
 +#include <drm/drmP.h>
 +#include <drm/glamo_drm.h>
 +#include <drm/drm_crtc_helper.h>
 +#include <drm/drm_crtc.h>
++#include <linux/glamofb.h>
++#include <linux/jbt6k74.h>
 +
 +#include "glamo-core.h"
 +#include "glamo-drm-private.h"
 +#include "glamo-regs.h"
 +#include "glamo-kms-fb.h"
 +#include "glamo-display.h"
-+#include <linux/glamofb.h>
 +
 +
 +#define GLAMO_LCD_WIDTH_MASK 0x03FF
@@ -1375,14 +1391,6 @@ index 0000000..93aa917
 +}
 +
 +
-+extern void jbt6k74_action(int val);
-+
-+/* Power on/off */
-+static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode)
-+{
-+}
-+
-+
 +static bool glamo_crtc_mode_fixup(struct drm_crtc *crtc,
 +                                  struct drm_display_mode *mode,
 +                                  struct drm_display_mode *adjusted_mode)
@@ -1411,6 +1419,12 @@ index 0000000..93aa917
 +	gcrtc = to_glamo_crtc(crtc);
 +	gdrm = gcrtc->gdrm;	/* Here it is! */
 +
++	if ( !gcrtc->pixel_clock_on ) {
++		printk(KERN_WARNING "[glamo-drm] Display is off - "
++		                    "enabling it before setting base.\n");
++		glamo_lcd_power(gdrm, 1);
++	}
++
 +	gfb = to_glamo_framebuffer(crtc->fb);
 +	obj = gfb->obj;
 +	gobj = obj->driver_private;
@@ -1437,63 +1451,176 @@ index 0000000..93aa917
 +	struct glamodrm_handle *gdrm;
 +	struct glamo_crtc *gcrtc;
 +	int retr_start, retr_end, disp_start, disp_end;
++	int rot;
 +
 +	/* Dig out our handle */
 +	gcrtc = to_glamo_crtc(crtc);
 +	gdrm = gcrtc->gdrm;	/* Here it is! */
 +
++	if ( !gcrtc->pixel_clock_on ) {
++		printk(KERN_WARNING "[glamo-drm] Display is off - "
++		                    "enabling it before setting mode.\n");
++		glamo_lcd_power(gdrm, 1);
++		msleep(500);
++	}
++
++	/* Rotate? */
++	if ( (mode->hdisplay == 640) && (mode->vdisplay == 480) ) {
++		rot = GLAMO_LCD_ROT_MODE_90;
++	} else if ( (mode->hdisplay == 480) && (mode->vdisplay == 640) ) {
++		rot = GLAMO_LCD_ROT_MODE_0;
++	} else if ( (mode->hdisplay == 320) && (mode->vdisplay == 240) ) {
++		rot = GLAMO_LCD_ROT_MODE_90;
++	} else if ( (mode->hdisplay == 240) && (mode->vdisplay == 320) ) {
++		rot = GLAMO_LCD_ROT_MODE_0;
++	} else {
++		printk(KERN_WARNING "[glamo-drm] Couldn't choose rotation.\n");
++		rot = GLAMO_LCD_ROT_MODE_0;
++	}
++
 +	glamo_lcd_cmd_mode(gdrm, 1);
 +
-+	glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, mode->clock);
-+	gdrm->saved_clock = mode->clock;
++	/* Set dimensions */
++	if ( rot == GLAMO_LCD_ROT_MODE_0 ) {
++
++		glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD,
++		                     mode->clock);
++
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH,
++			             GLAMO_LCD_WIDTH_MASK, mode->hdisplay);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT,
++			             GLAMO_LCD_HEIGHT_MASK, mode->vdisplay);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH,
++			             GLAMO_LCD_PITCH_MASK, mode->hdisplay*2);
++
++		/* Set rotation */
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH,
++				     GLAMO_LCD_ROT_MODE_MASK, rot);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_MODE1,
++				     GLAMO_LCD_MODE1_ROTATE_EN,
++				     (rot != GLAMO_LCD_ROT_MODE_0) ?
++				       GLAMO_LCD_MODE1_ROTATE_EN : 0);
++
++		/* Convert "X modeline timings" into "Glamo timings" */
++		retr_start = 0;
++		retr_end = retr_start + mode->hsync_end - mode->hsync_start;
++		disp_start = mode->htotal - mode->hsync_start;
++		disp_end = disp_start + mode->hdisplay;
++
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL,
++				     GLAMO_LCD_HV_TOTAL_MASK, mode->htotal);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START,
++				     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END,
++				     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START,
++				     GLAMO_LCD_HV_RETR_DISP_START_MASK, disp_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END,
++				     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
++
++		/* The same in the vertical direction */
++		retr_start = 0;
++		retr_end = retr_start + mode->vsync_end - mode->vsync_start;
++		disp_start = mode->vtotal - mode->vsync_start;
++		disp_end = disp_start + mode->vdisplay;
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL,
++				     GLAMO_LCD_HV_TOTAL_MASK, mode->vtotal);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START,
++				     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END,
++				     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START,
++				     GLAMO_LCD_HV_RETR_DISP_START_MASK,
++				     disp_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END,
++				     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
++
++	} else {
 +
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH,
-+	                     GLAMO_LCD_WIDTH_MASK, mode->hdisplay);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT,
-+	                     GLAMO_LCD_HEIGHT_MASK, mode->vdisplay);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH,
-+	                     GLAMO_LCD_PITCH_MASK, mode->hdisplay*2);
-+
-+	/* Convert "X modeline timings" into "Glamo timings" */
-+	retr_start = 0;
-+	retr_end = retr_start + mode->hsync_end - mode->hsync_start;
-+	disp_start = mode->htotal - mode->hsync_start;
-+	disp_end = disp_start + mode->hdisplay;
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL,
-+	                     GLAMO_LCD_HV_TOTAL_MASK, mode->htotal);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START,
-+	                     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END,
-+	                     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START,
-+	                     GLAMO_LCD_HV_RETR_DISP_START_MASK, disp_start);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END,
-+	                     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
-+
-+	/* The same in the vertical direction */
-+	retr_start = 0;
-+	retr_end = retr_start + mode->vsync_end - mode->vsync_start;
-+	disp_start = mode->vtotal - mode->vsync_start;
-+	disp_end = disp_start + mode->vdisplay;
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL,
-+	                     GLAMO_LCD_HV_TOTAL_MASK, mode->vtotal);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START,
-+	                     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END,
-+	                     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START,
-+	                     GLAMO_LCD_HV_RETR_DISP_START_MASK, disp_start);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END,
-+	                     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
++		glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD,
++		                     mode->clock/2);
++
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH,
++			             GLAMO_LCD_WIDTH_MASK, mode->vdisplay);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT,
++			             GLAMO_LCD_HEIGHT_MASK, mode->hdisplay);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH,
++			             GLAMO_LCD_PITCH_MASK, mode->hdisplay*2);
++
++		/* Set rotation */
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH,
++				     GLAMO_LCD_ROT_MODE_MASK, rot);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_MODE1,
++				     GLAMO_LCD_MODE1_ROTATE_EN,
++				     (rot != GLAMO_LCD_ROT_MODE_0) ?
++				       GLAMO_LCD_MODE1_ROTATE_EN : 0);
++
++		/* Apply "vertical" numbers to the horizontal registers */
++		retr_start = 0;
++		retr_end = retr_start + mode->vsync_end - mode->vsync_start;
++		disp_start = mode->vtotal - mode->vsync_start;
++		disp_end = disp_start + mode->vdisplay;
++
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL,
++				     GLAMO_LCD_HV_TOTAL_MASK, mode->vtotal);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START,
++				     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END,
++				     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START,
++				     GLAMO_LCD_HV_RETR_DISP_START_MASK,
++				     disp_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END,
++				     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
++
++		/* Apply "horizontal" numbers to the vertical registers */
++		retr_start = 0;
++		retr_end = retr_start + mode->hsync_end - mode->hsync_start;
++		disp_start = mode->htotal - mode->hsync_start;
++		disp_end = disp_start + mode->hdisplay;
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL,
++				     GLAMO_LCD_HV_TOTAL_MASK, mode->htotal);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START,
++				     GLAMO_LCD_HV_RETR_START_MASK, retr_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END,
++				     GLAMO_LCD_HV_RETR_END_MASK, retr_end);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START,
++				     GLAMO_LCD_HV_RETR_DISP_START_MASK,
++				     disp_start);
++		reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END,
++				     GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end);
++
++	}
++
++	gdrm->saved_clock = mode->clock;
 +
 +	glamo_lcd_cmd_mode(gdrm, 0);
 +
 +	glamo_crtc_mode_set_base(crtc, 0, 0, old_fb);
 +
++	if ( mode->hdisplay == 240 ) {
++		jbt6k74_finish_resolutionchange(JBT_RESOLUTION_QVGA);
++	} else {
++		jbt6k74_finish_resolutionchange(JBT_RESOLUTION_VGA);
++	}
++
++	gcrtc->current_mode = *mode;
++	gcrtc->current_mode_set = 1;
++	gcrtc->current_fb = old_fb;
++
 +	return 0;
 +}
 +
 +
++/* This is not the right place to switch power on/off, because the helper
++ * stuff ends up calling this before/after setting the mode.  We can't
++ * set modes with the display off (although backlight off would be OK) */
++static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode)
++{
++	/* do nothing */
++}
++
++
 +static void glamo_crtc_prepare(struct drm_crtc *crtc)
 +{
 +}
@@ -1551,43 +1678,53 @@ index 0000000..93aa917
 +
 +static int glamo_connector_get_modes(struct drm_connector *connector)
 +{
-+	struct drm_display_mode *mode;
 +	struct glamo_fb_platform_data *fb_info;
 +	struct glamo_output *goutput = to_glamo_output(connector);
 +	struct glamodrm_handle *gdrm = goutput->gdrm;
++	int i;
 +
 +	/* Dig out the record which will tell us about the hardware */
 +	fb_info = gdrm->glamo_core->pdata->fb_data;
 +
-+	mode = drm_mode_create(connector->dev);
-+	if (!mode)
-+		return 0;
-+	/* Fill in 'mode' here */
-+	mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED;
++	for ( i=0; i<fb_info->num_modes; i++ ) {
 +
-+	/* Convert framebuffer timings into KMS timings */
-+	mode->clock = 1000000000UL / fb_info->modes[0].pixclock; /* ps -> kHz */
-+	mode->clock *= 1000; /* kHz -> Hz */
-+	mode->hdisplay = fb_info->modes[0].xres;
-+	mode->hsync_start = fb_info->modes[0].right_margin + mode->hdisplay;
-+	mode->hsync_end = mode->hsync_start + fb_info->modes[0].hsync_len;
-+	mode->htotal = mode->hsync_end + fb_info->modes[0].left_margin;
-+	mode->hskew = 0;
++		struct drm_display_mode *mode;
 +
-+	mode->vdisplay = fb_info->modes[0].yres;
-+	mode->vsync_start = fb_info->modes[0].lower_margin + mode->vdisplay;
-+	mode->vsync_end = mode->vsync_start + fb_info->modes[0].vsync_len;
-+	mode->vtotal = mode->vsync_end + fb_info->modes[0].upper_margin;
-+	mode->vscan = 0;
++		mode = drm_mode_create(connector->dev);
++		if ( !mode ) continue;
 +
-+	/* Physical size */
-+	mode->width_mm = fb_info->width;
-+	mode->height_mm = fb_info->height;
++		mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED;
 +
-+	drm_mode_set_name(mode);
-+	drm_mode_probed_add(connector, mode);
++		/* Convert framebuffer timings into KMS timings.
++		 * First:  ps -> kHz */
++		mode->clock = 1000000000UL / fb_info->modes[i].pixclock;
++		mode->clock *= 1000; /* then kHz -> Hz */
++		mode->hdisplay = fb_info->modes[i].xres;
++		mode->hsync_start = fb_info->modes[i].right_margin
++		                     + mode->hdisplay;
++		mode->hsync_end = mode->hsync_start
++		                     + fb_info->modes[i].hsync_len;
++		mode->htotal = mode->hsync_end + fb_info->modes[i].left_margin;
++		mode->hskew = 0;
 +
-+	return 1;	/* one mode, for now */
++		mode->vdisplay = fb_info->modes[i].yres;
++		mode->vsync_start = fb_info->modes[i].lower_margin
++		                     + mode->vdisplay;
++		mode->vsync_end = mode->vsync_start
++		                   + fb_info->modes[i].vsync_len;
++		mode->vtotal = mode->vsync_end + fb_info->modes[i].upper_margin;
++		mode->vscan = 0;
++
++		/* Physical size */
++		mode->width_mm = fb_info->width;
++		mode->height_mm = fb_info->height;
++
++		drm_mode_set_name(mode);
++		drm_mode_probed_add(connector, mode);
++
++	}
++
++	return fb_info->num_modes;
 +}
 +
 +
@@ -1626,6 +1763,7 @@ index 0000000..93aa917
 +                                 struct drm_display_mode *mode,
 +                                 struct drm_display_mode *adjusted_mode)
 +{
++	if ( mode->clock == 0 ) return false;
 +	return true;
 +}
 +
@@ -1849,8 +1987,8 @@ index 0000000..93aa917
 +	drm_mode_config_init(dev);
 +
 +	dev->mode_config.min_width = 240;
-+	dev->mode_config.min_height = 320;
-+	dev->mode_config.max_width = 480;
++	dev->mode_config.min_height = 240;
++	dev->mode_config.max_width = 640;
 +	dev->mode_config.max_height = 640;
 +
 +	dev->mode_config.funcs = (void *)&glamo_mode_funcs;
@@ -1861,6 +1999,8 @@ index 0000000..93aa917
 +	                   + sizeof(struct drm_connector *), GFP_KERNEL);
 +	if (glamo_crtc == NULL) return 1;
 +	glamo_crtc->gdrm = gdrm;
++	gdrm->crtc = (struct drm_crtc *)glamo_crtc;
++	glamo_crtc->pixel_clock_on = 1;
 +	glamo_crtc->blank_mode = DRM_MODE_DPMS_OFF;
 +	drm_crtc_init(dev, &glamo_crtc->base, &glamo_crtc_funcs);
 +	drm_crtc_helper_add(&glamo_crtc->base, &glamo_crtc_helper_funcs);
@@ -1878,7 +2018,7 @@ index 0000000..93aa917
 +
 +	/* Initialise the connector */
 +	drm_connector_init(dev, connector, &glamo_connector_funcs,
-+	                   DRM_MODE_CONNECTOR_Unknown);
++	                   DRM_MODE_CONNECTOR_LVDS);
 +	drm_sysfs_connector_add(connector);
 +	connector->interlace_allowed = 0;
 +	connector->doublescan_allowed = 0;
@@ -1942,79 +2082,56 @@ index 0000000..93aa917
 +}
 +
 +
++void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode)
++{
++	struct drm_crtc *crtc = gdrm->crtc;
++	struct glamo_crtc *gcrtc = to_glamo_crtc(crtc);
++
++	if ( mode ) {
++		glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD);
++		gcrtc->pixel_clock_on = 1;
++		jbt6k74_setpower(JBT_POWER_MODE_NORMAL);
++		if ( gcrtc->current_mode_set ) {
++			glamo_crtc_mode_set(crtc, &gcrtc->current_mode,
++			                    &gcrtc->current_mode, 0, 0,
++			                    gcrtc->current_fb);
++		}
++	} else {
++		jbt6k74_setpower(JBT_POWER_MODE_OFF);
++		glamo_engine_suspend(gdrm->glamo_core, GLAMO_ENGINE_LCD);
++		gcrtc->pixel_clock_on = 0;
++	}
++}
++
++
 +void glamo_display_suspend(struct glamodrm_handle *gdrm)
 +{
-+	gdrm->saved_width = reg_read_lcd(gdrm, GLAMO_REG_LCD_WIDTH);
-+	gdrm->saved_height = reg_read_lcd(gdrm, GLAMO_REG_LCD_HEIGHT);
-+	gdrm->saved_pitch = reg_read_lcd(gdrm, GLAMO_REG_LCD_PITCH);
-+	gdrm->saved_htotal = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL);
-+	gdrm->saved_hrtrst = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START);
-+	gdrm->saved_hrtren = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END);
-+	gdrm->saved_hdspst = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START);
-+	gdrm->saved_hdspen = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END);
-+	gdrm->saved_vtotal = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL);
-+	gdrm->saved_vrtrst = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START);
-+	gdrm->saved_vrtren = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END);
-+	gdrm->saved_vdspst = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START);
-+	gdrm->saved_vdspen = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END);
++	/* do nothing */
 +}
 +
 +
 +void glamo_display_resume(struct glamodrm_handle *gdrm)
 +{
++	struct drm_crtc *crtc = gdrm->crtc;
++	struct glamo_crtc *gcrtc = to_glamo_crtc(crtc);
++
 +	glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD);
 +	glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_LCD);
 +	glamo_run_lcd_script(gdrm, lcd_init_script,
 +	                           ARRAY_SIZE(lcd_init_script));
 +
-+	/* Enable pixel clock */
-+	glamo_engine_clkreg_set(gdrm->glamo_core,
-+	                        GLAMO_ENGINE_LCD,
-+	                        GLAMO_CLOCK_LCD_EN_DCLK,
-+	                        GLAMO_CLOCK_LCD_EN_DCLK);
-+
-+	/* Restore timings */
-+	glamo_lcd_cmd_mode(gdrm, 1);
-+	glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD,
-+	                     gdrm->saved_clock);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH, GLAMO_LCD_WIDTH_MASK,
-+	                     gdrm->saved_width);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT, GLAMO_LCD_HEIGHT_MASK,
-+	                     gdrm->saved_height);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH, GLAMO_LCD_PITCH_MASK,
-+	                     gdrm->saved_pitch);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL,
-+	                     GLAMO_LCD_HV_TOTAL_MASK, gdrm->saved_htotal);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START,
-+	                     GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_hrtrst);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END,
-+	                     GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_hrtren);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START,
-+	                     GLAMO_LCD_HV_RETR_DISP_START_MASK,
-+	                     gdrm->saved_hdspst);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END,
-+	                     GLAMO_LCD_HV_RETR_DISP_END_MASK,
-+	                     gdrm->saved_hdspen);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL,
-+	                     GLAMO_LCD_HV_TOTAL_MASK, gdrm->saved_vtotal);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START,
-+	                     GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_vrtrst);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END,
-+	                     GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_vrtren);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START,
-+	                     GLAMO_LCD_HV_RETR_DISP_START_MASK,
-+	                     gdrm->saved_vdspst);
-+	reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END,
-+	                     GLAMO_LCD_HV_RETR_DISP_END_MASK,
-+	                     gdrm->saved_vdspen);
-+	glamo_lcd_cmd_mode(gdrm, 0);
++	if ( gcrtc->current_mode_set ) {
++		glamo_crtc_mode_set(crtc, &gcrtc->current_mode,
++		                    &gcrtc->current_mode, 0, 0,
++		                    gcrtc->current_fb);
++	}
 +}
 diff --git a/drivers/mfd/glamo/glamo-display.h b/drivers/mfd/glamo/glamo-display.h
 new file mode 100644
-index 0000000..d6f21bc
+index 0000000..728bba5
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-display.h
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,41 @@
 +/* Smedia Glamo 336x/337x Display
 + *
 + * Copyright (c) 2008-2009 Thomas White <taw@bitwiz.org.uk>
@@ -2053,13 +2170,15 @@ index 0000000..d6f21bc
 +extern void glamo_display_suspend(struct glamodrm_handle *gdrm);
 +extern void glamo_display_resume(struct glamodrm_handle *gdrm);
 +
++extern void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode);
++
 +#endif /* __GLAMO_DISPLAY_H */
 diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
 new file mode 100644
-index 0000000..81215f4
+index 0000000..774eaff
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-drm-drv.c
-@@ -0,0 +1,453 @@
+@@ -0,0 +1,423 @@
 +/* Smedia Glamo 336x/337x Graphics Driver
 + *
 + * Copyright (C) 2009 Openmoko, Inc. Jorge Luis Zapata <turran@openmoko.com>
@@ -2215,6 +2334,8 @@ index 0000000..81215f4
 +
 +static struct vm_operations_struct glamodrm_gem_vm_ops = {
 +	.fault = glamodrm_gem_fault,
++	.open = drm_gem_vm_open,
++	.close = drm_gem_vm_close,
 +};
 +
 +static struct drm_driver glamodrm_drm_driver = {
@@ -2291,29 +2412,6 @@ index 0000000..81215f4
 +		goto out_release_regs;
 +	}
 +
-+	/* Find the command queue itself */
-+	gdrm->cmdq = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-+	                                          "glamo-command-queue");
-+	if ( !gdrm->cmdq ) {
-+		dev_err(&pdev->dev, "Unable to find command queue.\n");
-+		rc = -ENOENT;
-+		goto out_unmap_regs;
-+	}
-+	gdrm->cmdq = request_mem_region(gdrm->cmdq->start,
-+	                                resource_size(gdrm->cmdq), pdev->name);
-+	if ( !gdrm->cmdq ) {
-+		dev_err(&pdev->dev, "failed to request command queue region\n");
-+		rc = -ENOENT;
-+		goto out_unmap_regs;
-+	}
-+	gdrm->cmdq_base = ioremap_nocache(gdrm->cmdq->start,
-+	                                  resource_size(gdrm->cmdq));
-+	if ( !gdrm->cmdq_base ) {
-+		dev_err(&pdev->dev, "failed to ioremap() command queue\n");
-+		rc = -ENOENT;
-+		goto out_release_cmdq;
-+	}
-+
 +	/* Find the VRAM */
 +	gdrm->vram = platform_get_resource_byname(pdev, IORESOURCE_MEM,
 +	                                          "glamo-fb-mem");
@@ -2379,12 +2477,6 @@ index 0000000..81215f4
 +
 +	/* Hook up IRQ handle for fence processing */
 +	gdrm->twod_irq = platform_get_irq_byname(pdev, "glamo-2d-irq");
-+	rc = request_irq(gdrm->twod_irq, glamo_fence_irq_handler,
-+	                 IRQF_SHARED, pdev->name, gdrm);
-+	if ( rc ) {
-+		dev_err(&pdev->dev, "failed to register irq.\n");
-+		goto out_unmap_2d;
-+	}
 +
 +	gdrm->vram_size = GLAMO_FB_SIZE;
 +	printk(KERN_INFO "[glamo-drm] %lli bytes of VRAM\n",
@@ -2395,8 +2487,6 @@ index 0000000..81215f4
 +
 +	return 0;
 +
-+out_unmap_2d:
-+	iounmap(gdrm->twod_base);
 +out_release_2d:
 +	release_mem_region(gdrm->twod_regs->start,
 +	                   resource_size(gdrm->twod_regs));
@@ -2417,7 +2507,7 @@ index 0000000..81215f4
 +	release_mem_region(gdrm->reg->start, resource_size(gdrm->reg));
 +out_free:
 +	kfree(gdrm);
-+	pdev->dev.driver_data = NULL;
++	dev_set_drvdata(&pdev->dev, NULL);
 +	return rc;
 +}
 +
@@ -2445,7 +2535,6 @@ index 0000000..81215f4
 +	release_mem_region(gdrm->cmdq->start, resource_size(gdrm->cmdq));
 +
 +	/* Release 2D engine  */
-+	free_irq(gdrm->twod_irq, gdrm);
 +	iounmap(gdrm->twod_base);
 +	release_mem_region(gdrm->twod_regs->start,
 +	                   resource_size(gdrm->twod_regs));
@@ -2515,10 +2604,10 @@ index 0000000..81215f4
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h
 new file mode 100644
-index 0000000..7949a2e
+index 0000000..75f2757
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-drm-private.h
-@@ -0,0 +1,156 @@
+@@ -0,0 +1,166 @@
 +/* Smedia Glamo 336x/337x DRM private bits
 + *
 + * Copyright (C) 2008-2009 Thomas White <taw@bitwiz.org.uk>
@@ -2582,8 +2671,8 @@ index 0000000..7949a2e
 +	struct resource *vram;
 +
 +	/* Command queue region */
-+	struct resource *cmdq;
 +	char __iomem *cmdq_base;
++	unsigned long cmdq_offs;
 +
 +	/* LCD controller registers */
 +	struct resource *lcd_regs;
@@ -2627,6 +2716,9 @@ index 0000000..7949a2e
 +
 +	/* A scratch block */
 +	struct drm_mm_node *scratch;
++
++	/* We only have one */
++	struct drm_crtc *crtc;
 +};
 +
 +
@@ -2639,11 +2731,18 @@ index 0000000..7949a2e
 +
 +
 +struct glamo_crtc {
++
 +	struct drm_crtc base;
 +	struct glamodrm_handle *gdrm;
 +	/* a mode_set for fbdev users on this crtc */
 +	struct drm_mode_set mode_set;
 +	int blank_mode;
++
++	int pixel_clock_on;
++
++	int current_mode_set;
++	struct drm_display_mode current_mode;
++	struct drm_framebuffer *current_fb;
 +};
 +
 +
@@ -2677,10 +2776,10 @@ index 0000000..7949a2e
 +#endif /* __GLAMO_DRMPRIV_H */
 diff --git a/drivers/mfd/glamo/glamo-fence.c b/drivers/mfd/glamo/glamo-fence.c
 new file mode 100644
-index 0000000..ab77241
+index 0000000..9119675
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-fence.c
-@@ -0,0 +1,329 @@
+@@ -0,0 +1,330 @@
 +/*
 + * SMedia Glamo 336x/337x fence objects
 + *
@@ -2781,7 +2880,7 @@ index 0000000..ab77241
 +
 +static void glamo_fence_enable(struct glamodrm_handle *gdrm)
 +{
-+	glamo_enable_irq(gdrm->glamo_core, GLAMO_IRQ_2D);
++	enable_irq( GLAMO_IRQ_2D);
 +}
 +
 +
@@ -2833,18 +2932,11 @@ index 0000000..ab77241
 +}
 +
 +
-+irqreturn_t glamo_fence_irq_handler(unsigned int irq, void *data)
++static irqreturn_t glamo_fence_irq_handler(int irq, void *data)
 +{
 +	struct glamodrm_handle *gdrm = data;
-+
-+	if (!gdrm) {
-+		printk(KERN_ERR "[glamo-drm] 2D IRQ called with no data\n");
-+		return IRQ_NONE;
-+	}
-+	glamo_clear_irq(gdrm->glamo_core, GLAMO_IRQ_2D);
-+
++	if (!gdrm) return IRQ_NONE;
 +	tasklet_schedule(&gdrm->fence_tl);
-+
 +	return IRQ_HANDLED;
 +}
 +
@@ -2982,10 +3074,10 @@ index 0000000..ab77241
 +void glamo_fence_init(struct glamodrm_handle *gdrm)
 +{
 +	unsigned long irq_flags;
++	int r;
 +
 +	if ( gdrm->twod_irq == 0 ) {
-+		printk(KERN_ERR "[glamo-drm] Attempted to initialise fence"
-+		                " system before 2D IRQ registered\n");
++		printk(KERN_ERR "[glamo-drm] Don't know which IRQ to use!\n");
 +		return;
 +	}
 +
@@ -3001,21 +3093,29 @@ index 0000000..ab77241
 +
 +	tasklet_init(&gdrm->fence_tl, glamo_fence_tl, (unsigned long)gdrm);
 +
++	r = request_irq(gdrm->twod_irq, glamo_fence_irq_handler,
++	                IRQF_SHARED, "glamo-fence", gdrm);
++	if ( r ) {
++		printk(KERN_ERR "[glamo-drm] Failed to register irq.\n");
++		return;
++	}
++
 +	glamo_fence_enable(gdrm);
 +}
 +
 +
 +void glamo_fence_shutdown(struct glamodrm_handle *gdrm)
 +{
++	free_irq(gdrm->twod_irq, gdrm);
 +	wake_up_all(&gdrm->fence_queue);
 +	tasklet_kill(&gdrm->fence_tl);
 +}
 diff --git a/drivers/mfd/glamo/glamo-fence.h b/drivers/mfd/glamo/glamo-fence.h
 new file mode 100644
-index 0000000..948fae3
+index 0000000..deda995
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-fence.h
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,34 @@
 +/*
 + * SMedia Glamo 336x/337x fence objects
 + *
@@ -3043,8 +3143,6 @@ index 0000000..948fae3
 +
 +#include "glamo-drm-private.h"
 +
-+extern void glamo_fence_irq_handler(unsigned int irq, struct irq_desc *desc);
-+
 +extern void glamo_fence_init(struct glamodrm_handle *gdrm);
 +extern void glamo_fence_shutdown(struct glamodrm_handle *gdrm);
 +
@@ -3054,10 +3152,10 @@ index 0000000..948fae3
 +#endif /* __GLAMO_FENCE_H */
 diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c
 new file mode 100644
-index 0000000..61cd605
+index 0000000..d76dd24
 --- /dev/null
 +++ b/drivers/mfd/glamo/glamo-kms-fb.c
-@@ -0,0 +1,540 @@
+@@ -0,0 +1,493 @@
 +/*
 + * SMedia Glamo 336x/337x KMS Framebuffer
 + *
@@ -3237,37 +3335,35 @@ index 0000000..61cd605
 +	struct drm_device *dev = par->dev;
 +	struct fb_var_screeninfo *var = &info->var;
 +	int i;
++	struct drm_crtc *crtc;
++	int ret;
 +
 +	DRM_DEBUG("%d %d\n", var->xres, var->pixclock);
 +
 +	if (var->pixclock != -1) {
++		DRM_ERROR("Warning: userspace gave me a pixel clock value (%i)"
++		          "- I'm ignoring it.\n", var->pixclock);
++	}
 +
-+		DRM_ERROR("PIXEL CLOCK SET\n");
-+		return -EINVAL;
-+	} else {
-+		struct drm_crtc *crtc;
-+		int ret;
-+
-+		list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-+			struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc);
++	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
++		struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc);
 +
-+			for (i = 0; i < par->crtc_count; i++)
-+				if (crtc->base.id == par->crtc_ids[i])
-+					break;
++		for (i = 0; i < par->crtc_count; i++)
++			if (crtc->base.id == par->crtc_ids[i])
++				break;
 +
-+			if (i == par->crtc_count)
-+				continue;
++		if (i == par->crtc_count)
++			continue;
 +
-+			if (crtc->fb == glamo_crtc->mode_set.fb) {
-+				mutex_lock(&dev->mode_config.mutex);
-+				ret = crtc->funcs->set_config(&glamo_crtc->mode_set);
-+				mutex_unlock(&dev->mode_config.mutex);
-+				if (ret)
-+					return ret;
-+			}
++		if (crtc->fb == glamo_crtc->mode_set.fb) {
++			mutex_lock(&dev->mode_config.mutex);
++			ret = crtc->funcs->set_config(&glamo_crtc->mode_set);
++			mutex_unlock(&dev->mode_config.mutex);
++			if (ret)
++				return ret;
 +		}
-+		return 0;
 +	}
++	return 0;
 +}
 +
 +static int glamofb_pan_display(struct fb_var_screeninfo *var,
@@ -3313,64 +3409,20 @@ index 0000000..61cd605
 +{
 +	struct glamofb_par *par = info->par;
 +	struct drm_device *dev = par->dev;
-+	struct drm_crtc *crtc;
-+	struct drm_encoder *encoder;
-+	int i;
-+
-+	/*
-+	 * For each CRTC in this fb, find all associated encoders
-+	 * and turn them off, then turn off the CRTC.
-+	 */
-+	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-+		struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-+
-+		for (i = 0; i < par->crtc_count; i++)
-+			if (crtc->base.id == par->crtc_ids[i])
-+				break;
++	struct glamodrm_handle *gdrm = dev->dev_private;
 +
-+		crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
++	gdrm = dev->dev_private;
 +
-+		/* Found a CRTC on this fb, now find encoders */
-+		list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-+			if (encoder->crtc == crtc) {
-+				struct drm_encoder_helper_funcs *encoder_funcs;
-+				encoder_funcs = encoder->helper_private;
-+				encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
-+			}
-+		}
-+	}
++	glamo_lcd_power(gdrm, 1);
 +}
 +
 +static void glamofb_off(struct fb_info *info, int dpms_mode)
 +{
 +	struct glamofb_par *par = info->par;
 +	struct drm_device *dev = par->dev;
-+	struct drm_crtc *crtc;
-+	struct drm_encoder *encoder;
-+	int i;
-+
-+	/*
-+	 * For each CRTC in this fb, find all associated encoders
-+	 * and turn them off, then turn off the CRTC.
-+	 */
-+	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-+		struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-+
-+		for (i = 0; i < par->crtc_count; i++)
-+			if (crtc->base.id == par->crtc_ids[i])
-+				break;
++	struct glamodrm_handle *gdrm = dev->dev_private;
 +
-+		/* Found a CRTC on this fb, now find encoders */
-+		list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-+			if (encoder->crtc == crtc) {
-+				struct drm_encoder_helper_funcs *encoder_funcs;
-+				encoder_funcs = encoder->helper_private;
-+				encoder_funcs->dpms(encoder, dpms_mode);
-+			}
-+		}
-+		if (dpms_mode == DRM_MODE_DPMS_OFF)
-+			crtc_funcs->dpms(crtc, dpms_mode);
-+	}
++	glamo_lcd_power(gdrm, 0);
 +}
 +
 +static int glamofb_blank(int blank, struct fb_info *info)
@@ -3489,9 +3541,6 @@ index 0000000..61cd605
 +	info->fbops = &glamofb_ops;
 +
 +	info->fix.line_length = fb->pitch;
-+	info->fix.smem_start = dev->mode_config.fb_base
-+	                        + (unsigned long) gdrm->vram->start;
-+	info->fix.smem_len = size;
 +
 +	info->flags = FBINFO_DEFAULT;
 +
@@ -3503,6 +3552,8 @@ index 0000000..61cd605
 +		ret = -ENOSPC;
 +		goto out_unref;
 +	}
++	info->fix.smem_start = (unsigned long)gdrm->vram->start + offs;
++	info->fix.smem_len = size;
 +	info->screen_size = size;
 +
 +	info->pseudo_palette = fb->pseudo_palette;
@@ -3646,13 +3697,13 @@ index 0000000..1960e76
 +
 +#endif /* __GLAMO_KMS_FB_H */
 diff --git a/include/drm/Kbuild b/include/drm/Kbuild
-index b940fdf..48b7b55 100644
+index bd3a1c2..a8f06eb 100644
 --- a/include/drm/Kbuild
 +++ b/include/drm/Kbuild
-@@ -8,3 +8,4 @@ unifdef-y += radeon_drm.h
- unifdef-y += sis_drm.h
- unifdef-y += savage_drm.h
+@@ -10,3 +10,4 @@ unifdef-y += savage_drm.h
+ unifdef-y += vmwgfx_drm.h
  unifdef-y += via_drm.h
+ unifdef-y += nouveau_drm.h
 +unifdef-y += glamo_drm.h
 diff --git a/include/drm/glamo_drm.h b/include/drm/glamo_drm.h
 new file mode 100644
@@ -3814,5 +3865,5 @@ index 0000000..4c194dc
 +
 +#endif
 -- 
-1.6.5.3
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0002-usbhost.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0002-usbhost.patch.patch
new file mode 100644
index 0000000000..ace16502c8
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0002-usbhost.patch.patch
@@ -0,0 +1,414 @@
+From cbc005e5e709407bae373d006d06a4cf51fd3062 Mon Sep 17 00:00:00 2001
+From: Radek Polak <psonek2@seznam.cz>
+Date: Fri, 9 Apr 2010 09:17:28 +0200
+Subject: [PATCH 2/4] usbhost.patch
+
+adds support for usb host mode and adds usb host pm sysfs node. I just copied
+and modified how modem is powered up and backported changes in ohci-s3c2410.c.
+No idea if this is the right approach, but it works - my usb keyboard is now
+working after:
+
+echo 1 > /sys/devices/platform/s3c2440-i2c/i2c-0/0-0073/pcf50633-gpio/reg-
+fixed-voltage.2/gta02-pm-usbhost.0/power_on
+echo host > /sys/devices/platform/s3c2410-ohci/usb_mode
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ arch/arm/mach-s3c2440/Makefile           |    1 +
+ arch/arm/mach-s3c2440/gta02-pm-usbhost.c |  174 ++++++++++++++++++++++++++++++
+ arch/arm/mach-s3c2440/mach-gta02.c       |   48 ++++++++-
+ drivers/usb/host/ohci-s3c2410.c          |   48 ++++++++
+ 4 files changed, 270 insertions(+), 1 deletions(-)
+ create mode 100644 arch/arm/mach-s3c2440/gta02-pm-usbhost.c
+
+diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
+index 6ce800d..450cff9 100644
+--- a/arch/arm/mach-s3c2440/Makefile
++++ b/arch/arm/mach-s3c2440/Makefile
+@@ -37,6 +37,7 @@ obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o \
+ 	gta02-pm-bt.o \
+ 	gta02-pm-gps.o \
+ 	gta02-pm-gsm.o \
++	gta02-pm-usbhost.o \
+ 	gta02-pm-wlan.o \
+ 	gta02-fiq.o \
+ 
+diff --git a/arch/arm/mach-s3c2440/gta02-pm-usbhost.c b/arch/arm/mach-s3c2440/gta02-pm-usbhost.c
+new file mode 100644
+index 0000000..233340a
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/gta02-pm-usbhost.c
+@@ -0,0 +1,174 @@
++/*
++ * USBHOST Management code for the Openmoko Freerunner GSM Phone
++ *
++ * (C) 2007 by Openmoko Inc.
++ * Author: Harald Welte <laforge@openmoko.org>
++ * All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/platform_device.h>
++#include <linux/console.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++#include <linux/err.h>
++#include <linux/regulator/consumer.h>
++
++#include <mach/gpio.h>
++#include <asm/mach-types.h>
++
++#include <mach/hardware.h>
++
++#include <mach/gta02.h>
++#include <mach/regs-gpio.h>
++#include <mach/regs-gpioj.h>
++
++static struct regulator *gta02_usbhost_regulator;
++
++static ssize_t usbhost_read(struct device *dev, struct device_attribute *attr,
++			char *buf)
++{
++	if (!strcmp(attr->attr.name, "power_on")) {
++		if (regulator_is_enabled(gta02_usbhost_regulator))
++			goto out_1;
++	}
++
++	return strlcpy(buf, "0\n", 3);
++out_1:
++	return strlcpy(buf, "1\n", 3);
++}
++
++static void usbhost_on_off(struct device *dev, int on)
++{
++
++	on = !!on;
++
++	if (on == regulator_is_enabled(gta02_usbhost_regulator))
++		return;
++
++	if (!on) {
++		regulator_disable(gta02_usbhost_regulator);
++		return;
++	}
++
++	regulator_enable(gta02_usbhost_regulator);
++}
++
++static ssize_t usbhost_write(struct device *dev, struct device_attribute *attr,
++			 const char *buf, size_t count)
++{
++	unsigned long on = simple_strtoul(buf, NULL, 10);
++
++	if (!strcmp(attr->attr.name, "power_on")) {
++		usbhost_on_off(dev, on);
++
++		return count;
++	}
++
++	return count;
++}
++
++static DEVICE_ATTR(power_on, 0644, usbhost_read, usbhost_write);
++
++#ifdef CONFIG_PM
++
++static int gta02_usbhost_suspend(struct device *dev)
++{
++	return 0;
++}
++
++static int gta02_usbhost_suspend_late(struct device *dev)
++{
++	return 0;
++}
++
++static int gta02_usbhost_resume(struct device *dev)
++{
++	return 0;
++}
++
++static struct dev_pm_ops gta02_usbhost_pm_ops = {
++	.suspend	= gta02_usbhost_suspend,
++	.suspend_noirq	= gta02_usbhost_suspend_late,
++	.resume		= gta02_usbhost_resume,
++};
++
++#define GTA02_USBHOST_PM_OPS (&gta02_usbhost_pm_ops)
++
++#else
++#define GTA02_USBHOST_PM_OPS NULL
++#endif /* CONFIG_PM */
++
++static struct attribute *gta02_usbhost_sysfs_entries[] = {
++	&dev_attr_power_on.attr,
++	NULL
++};
++
++static struct attribute_group gta02_usbhost_attr_group = {
++	.name	= NULL,
++	.attrs	= gta02_usbhost_sysfs_entries,
++};
++
++static int __init gta02_usbhost_probe(struct platform_device *pdev)
++{
++	int ret;
++
++	gta02_usbhost_regulator = regulator_get_exclusive(&pdev->dev, "USBHOST");
++
++	if (IS_ERR(gta02_usbhost_regulator)) {
++		ret = PTR_ERR(gta02_usbhost_regulator);
++		dev_err(&pdev->dev, "Failed to get regulator: %d\n", ret);
++		return ret;
++	}
++
++	ret = sysfs_create_group(&pdev->dev.kobj, &gta02_usbhost_attr_group);
++	if (ret) {
++		dev_err(&pdev->dev, "Failed to create sysfs entries: %d\n", ret);
++		return ret;
++	}
++
++	return 0;
++}
++
++static int gta02_usbhost_remove(struct platform_device *pdev)
++{
++	usbhost_on_off(&pdev->dev, 0);
++
++	sysfs_remove_group(&pdev->dev.kobj, &gta02_usbhost_attr_group);
++	regulator_put(gta02_usbhost_regulator);
++
++	return 0;
++}
++
++static struct platform_driver gta02_usbhost_driver = {
++	.probe		= gta02_usbhost_probe,
++	.remove		= gta02_usbhost_remove,
++	.driver		= {
++		.name	= "gta02-pm-usbhost",
++		.pm	= GTA02_USBHOST_PM_OPS,
++	},
++};
++
++static int __devinit gta02_usbhost_init(void)
++{
++	return platform_driver_register(&gta02_usbhost_driver);
++}
++module_init(gta02_usbhost_init);
++
++static void gta02_usbhost_exit(void)
++{
++	platform_driver_unregister(&gta02_usbhost_driver);
++}
++module_exit(gta02_usbhost_exit);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
++MODULE_DESCRIPTION("Openmoko Freerunner USBHOST Power Management");
+diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
+index 795b9f4..e7d0b82 100644
+--- a/arch/arm/mach-s3c2440/mach-gta02.c
++++ b/arch/arm/mach-s3c2440/mach-gta02.c
+@@ -202,6 +202,10 @@ static struct platform_device gta02_pm_gsm_dev = {
+ 	.name = "gta02-pm-gsm",
+ };
+ 
++static struct platform_device gta02_pm_usbhost_dev = {
++	.name = "gta02-pm-usbhost",
++};
++
+ static struct platform_device gta02_pm_wlan_dev = {
+ 	.name = "gta02-pm-wlan",
+ };
+@@ -211,6 +215,11 @@ static struct regulator_consumer_supply gsm_supply_consumer = {
+ 	.supply = "GSM",
+ };
+ 
++static struct regulator_consumer_supply usbhost_supply_consumer = {
++	.dev = &gta02_pm_usbhost_dev.dev,
++	.supply = "USBHOST",
++};
++
+ static struct regulator_init_data gsm_supply_init_data = {
+ 	.constraints = {
+ 		.min_uV = 3700000,
+@@ -222,6 +231,17 @@ static struct regulator_init_data gsm_supply_init_data = {
+ 	.consumer_supplies = &gsm_supply_consumer,
+ };
+ 
++static struct regulator_init_data usbhost_supply_init_data = {
++	.constraints = {
++		.min_uV = 3700000,
++		.max_uV = 3700000,
++		.valid_modes_mask = REGULATOR_MODE_NORMAL,
++		.valid_ops_mask = REGULATOR_CHANGE_STATUS,
++	},
++	.num_consumer_supplies = 1,
++	.consumer_supplies = &usbhost_supply_consumer,
++};
++
+ static struct fixed_voltage_config gsm_supply_config = {
+ 	.supply_name = "GSM",
+ 	.microvolts = 3700000,
+@@ -230,6 +250,14 @@ static struct fixed_voltage_config gsm_supply_config = {
+ 	.init_data = &gsm_supply_init_data,
+ };
+ 
++static struct fixed_voltage_config usbhost_supply_config = {
++	.supply_name = "USBHOST",
++	.microvolts = 3700000,
++	.gpio = GTA02_GPIO_PCF(PCF50633_GPO),
++	.enable_high = 1,
++	.init_data = &usbhost_supply_init_data,
++};
++
+ static struct platform_device gta02_gsm_supply_device = {
+ 	.name = "reg-fixed-voltage",
+ 	.id = 1,
+@@ -238,6 +266,14 @@ static struct platform_device gta02_gsm_supply_device = {
+ 	},
+ };
+ 
++static struct platform_device gta02_usbhost_supply_device = {
++	.name = "reg-fixed-voltage",
++	.id = 2,
++	.dev = {
++		.platform_data = &usbhost_supply_config,
++	},
++};
++
+ /*
+  * we crank down SD Card clock dynamically when GPS is powered
+  */
+@@ -1287,12 +1323,17 @@ struct gta02_device_children {
+ 
+ static struct platform_device* gta02_pcf50633_gpio_children[] = {
+ 	&gta02_gsm_supply_device,
++	&gta02_usbhost_supply_device,
+ };
+ 
+ static struct platform_device* gta02_gsm_supply_children[] = {
+ 	&gta02_pm_gsm_dev,
+ };
+ 
++static struct platform_device* gta02_usbhost_supply_children[] = {
++	&gta02_pm_usbhost_dev,
++};
++
+ static struct platform_device* gta02_hdq_children[] = {
+ 	&bq27000_battery_device,
+ };
+@@ -1301,7 +1342,7 @@ static struct platform_device* gta02_hdq_children[] = {
+ static struct gta02_device_children gta02_device_children[] = {
+ 	{
+ 		.dev_name = "pcf50633-gpio",
+-		.num_children = 1,
++		.num_children = 2,
+ 		.children = gta02_pcf50633_gpio_children,
+ 	},
+ 	{
+@@ -1310,6 +1351,11 @@ static struct gta02_device_children gta02_device_children[] = {
+ 		.children = gta02_gsm_supply_children,
+ 	},
+ 	{
++		.dev_name = "reg-fixed-voltage.2",
++		.num_children = 1,
++		.children = gta02_usbhost_supply_children,
++	},
++	{
+ 		.dev_name = "spi2.0",
+ 		.probed_callback = gta02_jbt6k74_probe_completed,
+ 	},
+diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
+index a68af2d..02bd7b0 100644
+--- a/drivers/usb/host/ohci-s3c2410.c
++++ b/drivers/usb/host/ohci-s3c2410.c
+@@ -22,6 +22,10 @@
+ #include <linux/platform_device.h>
+ #include <linux/clk.h>
+ #include <plat/usb-control.h>
++#include <mach/hardware.h>
++#include <mach/gpio-fns.h>
++#include <mach/regs-gpio.h>
++#include <mach/gta02.h>
+ 
+ #define valid_port(idx) ((idx) == 1 || (idx) == 2)
+ 
+@@ -306,6 +310,42 @@ static void s3c2410_hcd_oc(struct s3c2410_hcd_info *info, int port_oc)
+ 	local_irq_restore(flags);
+ }
+ 
++/* switching of USB pads */
++static ssize_t show_usb_mode(struct device *dev, struct device_attribute *attr,
++			     char *buf)
++{
++	if (__raw_readl(S3C24XX_MISCCR) & S3C2410_MISCCR_USBHOST)
++		return sprintf(buf, "host\n");
++
++	return sprintf(buf, "device\n");
++}
++
++static ssize_t set_usb_mode(struct device *dev, struct device_attribute *attr,
++			    const char *buf, size_t count)
++{
++	if (!strncmp(buf, "host", 4)) {
++		printk("s3c2410: changing usb to host\n");
++		s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST,
++				      S3C2410_MISCCR_USBHOST);
++		/* FIXME:
++		 * - call machine-specific disable-pullup function i
++		 * - enable +Vbus (if hardware supports it)
++		 */
++		s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 0);
++	} else if (!strncmp(buf, "device", 6)) {
++		printk("s3c2410: changing usb to device\n");
++		s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST, 0);
++		s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 1);
++	} else {
++		printk("s3c2410: unknown mode\n");
++		return -EINVAL;
++	}
++
++	return count;
++}
++
++static DEVICE_ATTR(usb_mode, S_IRUGO | S_IWUSR, show_usb_mode, set_usb_mode);
++
+ /* may be called without controller electrically present */
+ /* may be called with controller, bus, and devices active */
+ 
+@@ -323,6 +363,7 @@ static void s3c2410_hcd_oc(struct s3c2410_hcd_info *info, int port_oc)
+ static void
+ usb_hcd_s3c2410_remove (struct usb_hcd *hcd, struct platform_device *dev)
+ {
++	device_remove_file(&dev->dev, &dev_attr_usb_mode);
+ 	usb_remove_hcd(hcd);
+ 	s3c2410_stop_hc(dev);
+ 	iounmap(hcd->regs);
+@@ -390,8 +431,15 @@ static int usb_hcd_s3c2410_probe (const struct hc_driver *driver,
+ 	if (retval != 0)
+ 		goto err_ioremap;
+ 
++	retval = device_create_file(&dev->dev, &dev_attr_usb_mode);
++	if (retval != 0)
++		goto err_hcd;
++
+ 	return 0;
+ 
++ err_hcd:
++	usb_remove_hcd(hcd);
++
+  err_ioremap:
+ 	s3c2410_stop_hc(dev);
+ 	iounmap(hcd->regs);
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.31/0003-Work-on-Glamo-core-for-DRM.patch b/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch
index 76223ed136..c9afc89c96 100644
--- a/recipes/linux/linux-openmoko-2.6.31/0003-Work-on-Glamo-core-for-DRM.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch
@@ -1,24 +1,24 @@
-From 50c9919c9bc7d3e1db72dcbdd62d73efad409720 Mon Sep 17 00:00:00 2001
+From 0c38c5d7bcce1b62534e76419ee04eea0fe50128 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Tue, 17 Nov 2009 23:45:29 +0100
-Subject: [PATCH 3/4] Work on Glamo-core for DRM
+Subject: [PATCH 03/13] Work on Glamo-core for DRM
 
 This adds modifications to the core of the Glamo driver to expose functionality
 to support DRM and KMS.
 
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
 ---
- drivers/mfd/glamo/glamo-core.c |   85 +++++++++++++++++++++++++++++++++++++---
- drivers/mfd/glamo/glamo-core.h |   45 ++++++++++++++++-----
- drivers/mfd/glamo/glamo-regs.h |   24 +++++++++++
- include/linux/mfd/glamo.h      |    7 +--
- 4 files changed, 140 insertions(+), 21 deletions(-)
+ drivers/mfd/glamo/glamo-core.c |   27 +++++++++++++++++++++------
+ drivers/mfd/glamo/glamo-core.h |   32 ++++++++++++++++++++++----------
+ drivers/mfd/glamo/glamo-regs.h |   24 ++++++++++++++++++++++++
+ include/linux/mfd/glamo.h      |    7 ++-----
+ 4 files changed, 69 insertions(+), 21 deletions(-)
 
 diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index e0e3940..32aeff1 100644
+index 23073fe..f894c91 100644
 --- a/drivers/mfd/glamo/glamo-core.c
 +++ b/drivers/mfd/glamo/glamo-core.c
-@@ -221,10 +221,31 @@ static struct resource glamo_fb_resources[] = {
+@@ -222,10 +222,25 @@ static struct resource glamo_fb_resources[] = {
  		.flags	= IORESOURCE_MEM,
  	}, {
  		.name	= "glamo-fb-mem",
@@ -34,12 +34,6 @@ index e0e3940..32aeff1 100644
 +		.end    = GLAMO_REGOFS_RISC - 1,
 +		.flags  = IORESOURCE_MEM,
 +	}, {
-+		.name	= "glamo-command-queue",
-+		.start  = GLAMO_MEM_BASE + GLAMO_OFFSET_CMDQ,
-+		.end    = GLAMO_MEM_BASE + GLAMO_OFFSET_CMDQ +
-+			  GLAMO_CMDQ_SIZE - 1,
-+		.flags  = IORESOURCE_MEM,
-+	}, {
 +		.name	= "glamo-2d-regs",
 +		.start  = GLAMO_REGOFS_2D,
 +		.end    = GLAMO_REGOFS_3D- 1,
@@ -53,7 +47,7 @@ index e0e3940..32aeff1 100644
  };
  
  static struct resource glamo_mmc_resources[] = {
-@@ -235,9 +256,9 @@ static struct resource glamo_mmc_resources[] = {
+@@ -236,9 +251,9 @@ static struct resource glamo_mmc_resources[] = {
  		.flags	= IORESOURCE_MEM
  	}, {
  		.name	= "glamo-mmc-mem",
@@ -66,77 +60,11 @@ index e0e3940..32aeff1 100644
  		.flags	= IORESOURCE_MEM
  	}, {
  		.start	= GLAMO_IRQ_MMC,
-@@ -354,6 +375,24 @@ static void glamo_irq_demux_handler(unsigned int irq, struct irq_desc *desc)
- sysfs
- */
- 
-+void glamo_clear_irq(struct glamo_core *glamo, unsigned int irq)
-+{
-+	/* set interrupt source */
-+	__reg_write(glamo, GLAMO_REG_IRQ_CLEAR, irq);
-+}
-+
-+
-+void glamo_enable_irq(struct glamo_core *glamo, unsigned int irq)
-+{
-+	u_int16_t tmp;
-+
-+	/* set bit in enable register */
-+	tmp = __reg_read(glamo, GLAMO_REG_IRQ_ENABLE);
-+	tmp |= irq;
-+	__reg_write(glamo, GLAMO_REG_IRQ_ENABLE, tmp);
-+}
-+
-+
- static ssize_t regs_write(struct device *dev, struct device_attribute *attr,
- 				const char *buf, size_t count)
- {
-@@ -579,6 +618,40 @@ int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
- }
- EXPORT_SYMBOL_GPL(glamo_engine_disable);
- 
-+
-+static const u_int16_t engine_clock_regs[__NUM_GLAMO_ENGINES] = {
-+	[GLAMO_ENGINE_LCD]	= GLAMO_REG_CLOCK_LCD,
-+	[GLAMO_ENGINE_MMC]	= GLAMO_REG_CLOCK_MMC,
-+	[GLAMO_ENGINE_ISP]	= GLAMO_REG_CLOCK_ISP,
-+	[GLAMO_ENGINE_JPEG]	= GLAMO_REG_CLOCK_JPEG,
-+	[GLAMO_ENGINE_3D]	= GLAMO_REG_CLOCK_3D,
-+	[GLAMO_ENGINE_2D]	= GLAMO_REG_CLOCK_2D,
-+	[GLAMO_ENGINE_MPEG_ENC] = GLAMO_REG_CLOCK_MPEG,
-+	[GLAMO_ENGINE_MPEG_DEC] = GLAMO_REG_CLOCK_MPEG,
-+};
-+
-+void glamo_engine_clkreg_set(struct glamo_core *glamo,
-+			     enum glamo_engine engine,
-+			     u_int16_t mask, u_int16_t val)
-+{
-+	reg_set_bit_mask(glamo, engine_clock_regs[engine], mask, val);
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_clkreg_set);
-+
-+u_int16_t glamo_engine_clkreg_get(struct glamo_core *glamo,
-+				  enum glamo_engine engine)
-+{
-+	u_int16_t val;
-+
-+	spin_lock(&glamo->lock);
-+	val = __reg_read(glamo, engine_clock_regs[engine]);
-+	spin_unlock(&glamo->lock);
-+
-+	return val;
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_clkreg_get);
-+
-+
- int __glamo_engine_suspend(struct glamo_core *glamo, enum glamo_engine engine)
- {
- 	int i;
 diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index e5b1a35..ea6caa3 100644
+index 17017b0..0adba96 100644
 --- a/drivers/mfd/glamo/glamo-core.h
 +++ b/drivers/mfd/glamo/glamo-core.h
-@@ -3,18 +3,33 @@
+@@ -3,18 +3,30 @@
  
  #include <linux/mfd/glamo.h>
  
@@ -146,12 +74,10 @@ index e5b1a35..ea6caa3 100644
 +/* Arbitrarily determined amount for the hardware cursor */
 +#define GLAMO_CURSOR_SIZE (4096)
 +#define GLAMO_MMC_BUFFER_SIZE (64 * 1024) /* 64k MMC buffer */
-+#define GLAMO_CMDQ_SIZE (128 * 1024)    /* 128k ring buffer */
 +/* Remaining memory will be used for 2D and 3D graphics */
 +#define GLAMO_FB_SIZE (GLAMO_INTERNAL_RAM_SIZE     \
 +			 - GLAMO_CURSOR_SIZE       \
-+			 - GLAMO_MMC_BUFFER_SIZE   \
-+			 - GLAMO_CMDQ_SIZE)
++			 - GLAMO_MMC_BUFFER_SIZE)
 +/* A 640x480, 16bpp, double-buffered framebuffer */
 +#if (GLAMO_FB_SIZE < (640 * 480 * 4))	/* == 0x12c000 */
 +#error Not enough Glamo VRAM for framebuffer!
@@ -176,25 +102,9 @@ index e5b1a35..ea6caa3 100644
 +#define GLAMO_OFFSET_FB		(0x000000)
 +#define GLAMO_OFFSET_CURSOR	(GLAMO_OFFSET_FB + GLAMO_FB_SIZE)
 +#define GLAMO_OFFSET_MMC	(GLAMO_OFFSET_CURSOR + GLAMO_CURSOR_SIZE)
-+#define GLAMO_OFFSET_CMDQ	(GLAMO_OFFSET_MMC + GLAMO_MMC_BUFFER_SIZE)
  
  enum glamo_pll {
      GLAMO_PLL1,
-@@ -57,4 +72,14 @@ void glamo_reg_read_batch(struct glamo_core *glamo, uint16_t reg,
- 				uint16_t count, uint16_t *values);
- void glamo_reg_write_batch(struct glamo_core *glamo, uint16_t reg,
- 				uint16_t count, uint16_t *values);
-+void glamo_engine_clkreg_set(struct glamo_core *glamo,
-+			     enum glamo_engine engine,
-+			     u_int16_t mask, u_int16_t val);
-+
-+extern void glamo_clear_irq(struct glamo_core *glamo, unsigned int irq);
-+extern void glamo_enable_irq(struct glamo_core *glamo, unsigned int irq);
-+
-+u_int16_t glamo_engine_clkreg_get(struct glamo_core *glamo,
-+				  enum glamo_engine engine);
-+
- #endif /* __GLAMO_CORE_H */
 diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
 index 59848e1..8b2fd47 100644
 --- a/drivers/mfd/glamo/glamo-regs.h
@@ -248,5 +158,5 @@ index 529d4f0..ea91a06 100644
 +
  #endif
 -- 
-1.6.5.3
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0003-ar6000_delay.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0003-ar6000_delay.patch.patch
new file mode 100644
index 0000000000..8241a1f7fa
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0003-ar6000_delay.patch.patch
@@ -0,0 +1,29 @@
+From 3287722e641d6e21cb0e2a8fa13058467a5319e3 Mon Sep 17 00:00:00 2001
+From: Radek Polak <psonek2@seznam.cz>
+Date: Fri, 9 Apr 2010 09:18:02 +0200
+Subject: [PATCH 3/4] ar6000_delay.patch
+
+patch from https://docs.openmoko.org/trac/ticket/2327 - wifi is working good
+(100% until now) for me with this patch.
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ drivers/ar6000/hif/hif2.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/ar6000/hif/hif2.c b/drivers/ar6000/hif/hif2.c
+index 386d96e..90178d0 100644
+--- a/drivers/ar6000/hif/hif2.c
++++ b/drivers/ar6000/hif/hif2.c
+@@ -517,6 +517,8 @@ static int ar6000_do_activate(struct hif_device *hif)
+ 		goto out_func_ready;
+ 	}
+ 
++	mdelay (10);
++
+ 	ret = htcCallbacks.deviceInsertedHandler(hif);
+ 	if (ret == A_OK)
+ 		return 0;
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.34/0004-JBT6k74-work-for-KMS.patch b/recipes/linux/linux-openmoko-2.6.34/0004-JBT6k74-work-for-KMS.patch
new file mode 100644
index 0000000000..692896f957
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0004-JBT6k74-work-for-KMS.patch
@@ -0,0 +1,540 @@
+From 2042106d96a13c2a15f1425fe9133257b1e0fbed Mon Sep 17 00:00:00 2001
+From: Thomas White <taw@bitwiz.org.uk>
+Date: Sat, 21 Nov 2009 21:42:16 +0100
+Subject: [PATCH 04/13] JBT6k74 work for KMS
+
+This simplifies the JBT6k74 driver, and adds hooks for the Glamo driver to cooperate
+more closely with it.
+
+Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+---
+ drivers/video/backlight/jbt6k74.c |  252 ++++++++++++++++++------------------
+ include/linux/jbt6k74.h           |   17 +++-
+ 2 files changed, 142 insertions(+), 127 deletions(-)
+
+diff --git a/drivers/video/backlight/jbt6k74.c b/drivers/video/backlight/jbt6k74.c
+index 8450904..91651e7 100644
+--- a/drivers/video/backlight/jbt6k74.c
++++ b/drivers/video/backlight/jbt6k74.c
+@@ -101,20 +101,10 @@ enum jbt_register {
+ 	JBT_REG_HCLOCK_QVGA		= 0xed,
+ };
+ 
+-enum jbt_resolution {
+-	JBT_RESOLUTION_VGA,
+-	JBT_RESOLUTION_QVGA,
+-};
+-
+-enum jbt_power_mode {
+-	JBT_POWER_MODE_DEEP_STANDBY,
+-	JBT_POWER_MODE_SLEEP,
+-	JBT_POWER_MODE_NORMAL,
+-};
+ 
+ static const char *jbt_power_mode_names[] = {
+-	[JBT_POWER_MODE_DEEP_STANDBY]	= "deep-standby",
+-	[JBT_POWER_MODE_SLEEP]		= "sleep",
++	[JBT_POWER_MODE_OFF]		= "off",
++	[JBT_POWER_MODE_STANDBY]	= "standby",
+ 	[JBT_POWER_MODE_NORMAL]		= "normal",
+ };
+ 
+@@ -123,6 +113,7 @@ static const char *jbt_resolution_names[] = {
+ 	[JBT_RESOLUTION_QVGA] = "qvga",
+ };
+ 
++
+ struct jbt_info {
+ 	struct mutex lock;		/* protects this structure */
+ 	enum jbt_resolution resolution;
+@@ -141,6 +132,8 @@ struct jbt_info {
+ 	uint16_t reg_cache[0xEE];
+ };
+ 
++struct jbt_info *jbt_global;
++
+ #define JBT_COMMAND	0x000
+ #define JBT_DATA	0x100
+ 
+@@ -156,6 +149,8 @@ static int jbt_reg_write_nodata(struct jbt_info *jbt, uint8_t reg)
+ 	else
+ 		dev_err(&jbt->spi->dev, "Write failed: %d\n", ret);
+ 
++	mdelay(1);
++
+ 	return ret;
+ }
+ 
+@@ -173,6 +168,8 @@ static int jbt_reg_write(struct jbt_info *jbt, uint8_t reg, uint8_t data)
+ 	else
+ 		dev_err(&jbt->spi->dev, "Write failed: %d\n", ret);
+ 
++	mdelay(1);
++
+ 	return ret;
+ }
+ 
+@@ -191,6 +188,8 @@ static int jbt_reg_write16(struct jbt_info *jbt, uint8_t reg, uint16_t data)
+ 	else
+ 		dev_err(&jbt->spi->dev, "Write failed: %d\n", ret);
+ 
++	mdelay(1);
++
+ 	return ret;
+ }
+ 
+@@ -218,7 +217,7 @@ static int jbt_init_regs(struct jbt_info *jbt)
+ 	 * to avoid red / blue flicker
+ 	 */
+ 	ret |= jbt_reg_write(jbt, JBT_REG_ASW_SLEW, 0x00 | (1 << 5));
+-	ret |= jbt_reg_write(jbt, JBT_REG_DUMMY_DISPLAY, 0x00);
++	ret |= jbt_reg_write(jbt, JBT_REG_DUMMY_DISPLAY, 0xff);
+ 
+ 	ret |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_A, 0x11);
+ 	ret |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_B, 0x11);
+@@ -260,14 +259,18 @@ static int jbt_init_regs(struct jbt_info *jbt)
+ 	return ret ? -EIO : 0;
+ }
+ 
+-static int jbt_standby_to_sleep(struct jbt_info *jbt)
++
++static int jbt_off_to_normal(struct jbt_info *jbt)
+ {
+ 	int ret;
++
+ 	struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data;
+ 
+ 	gpio_set_value_cansleep(pdata->gpio_reset, 1);
+ 	ret = regulator_bulk_enable(ARRAY_SIZE(jbt->supplies), jbt->supplies);
+ 
++	mdelay(120);
++
+ 	/* three times command zero */
+ 	ret |= jbt_reg_write_nodata(jbt, 0x00);
+ 	mdelay(1);
+@@ -279,18 +282,11 @@ static int jbt_standby_to_sleep(struct jbt_info *jbt)
+ 	/* deep standby out */
+ 	ret |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x11);
+ 	mdelay(1);
+-	ret = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x28);
++	ret |= jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x28);
+ 
+ 	/* (re)initialize register set */
+ 	ret |= jbt_init_regs(jbt);
+ 
+-	return ret ? -EIO : 0;
+-}
+-
+-static int jbt_sleep_to_normal(struct jbt_info *jbt)
+-{
+-	int ret;
+-
+ 	/* Make sure we are 120 ms after SLEEP_OUT */
+ 	if (time_before(jiffies, jbt->next_sleep))
+ 		mdelay(jiffies_to_msecs(jbt->next_sleep - jiffies));
+@@ -320,6 +316,7 @@ static int jbt_sleep_to_normal(struct jbt_info *jbt)
+ 
+ 	/* Sleep mode off */
+ 	ret |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
++
+ 	jbt->next_sleep = jiffies + msecs_to_jiffies(120);
+ 
+ 	/* Allow the booster and display controller to restart stably */
+@@ -328,45 +325,68 @@ static int jbt_sleep_to_normal(struct jbt_info *jbt)
+ 	return ret ? -EIO : 0;
+ }
+ 
+-static int jbt_normal_to_sleep(struct jbt_info *jbt)
++static int jbt_normal_to_off(struct jbt_info *jbt)
+ {
+ 	int ret;
++	struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data;
+ 
+-	/* Make sure we are 120 ms after SLEEP_OUT */
+-	while (time_before(jiffies, jbt->next_sleep))
+-		cpu_relax();
++	/* Pull the plug! */
++	ret = regulator_bulk_disable(ARRAY_SIZE(jbt->supplies),
++	                             jbt->supplies);
+ 
++	if (!ret)
++		gpio_set_value_cansleep(pdata->gpio_reset, 0);
++
++	return ret ? -EIO : 0;
++}
++
++
++static int jbt_normal_to_standby(struct jbt_info *jbt)
++{
++	int ret;
++
++	if ( jbt->power_mode != JBT_POWER_MODE_NORMAL ) return 0;
++
++	/* Make sure we are 120 ms after SLEEP_{IN,OUT} */
++	while (time_before(jiffies, jbt->next_sleep)) cpu_relax();
++
++	/* Sleep mode on */
+ 	ret = jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
+ 	ret |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0x8000 | 1 << 3);
++
+ 	ret |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_IN);
+-	jbt->next_sleep = jiffies + msecs_to_jiffies(120);
++	jbt->next_sleep = jiffies + msecs_to_jiffies(150);
+ 
+-	/* Allow the internal circuits to stop automatically */
+-	mdelay(5);
++	jbt->power_mode = JBT_POWER_MODE_STANDBY;
+ 
+ 	return ret ? -EIO : 0;
+ }
+ 
+-static int jbt_sleep_to_standby(struct jbt_info *jbt)
++
++static int jbt_standby_to_normal(struct jbt_info *jbt)
+ {
+ 	int ret;
+-	struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data;
+ 
+-	ret = jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x00);
++	if ( jbt->power_mode != JBT_POWER_MODE_STANDBY ) return 0;
+ 
+-	if (!ret)
+-		ret = regulator_bulk_disable(ARRAY_SIZE(jbt->supplies), jbt->supplies);
++	/* Make sure we are 120 ms after SLEEP_{IN,OUT} */
++	while (time_before(jiffies, jbt->next_sleep)) cpu_relax();
+ 
+-	if (!ret)
+-		gpio_set_value_cansleep(pdata->gpio_reset, 0);
++	ret = jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
++	jbt->next_sleep = jiffies + msecs_to_jiffies(150);
+ 
+-	return ret;
++	ret |= jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_ON);
++	ret |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0xdff9);
++
++	jbt->power_mode = JBT_POWER_MODE_NORMAL;
++
++	return ret ? -EIO : 0;
+ }
+ 
++
+ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
+ 					enum jbt_power_mode new_mode)
+ {
+-	struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data;
+ 	int ret = -EINVAL;
+ 
+ 	dev_dbg(&jbt->spi->dev, "entering (old_state=%s, new_state=%s)\n",
+@@ -375,49 +395,17 @@ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
+ 
+ 	mutex_lock(&jbt->lock);
+ 
+-	if (jbt->suspended) {
+-		switch (new_mode) {
+-		case JBT_POWER_MODE_DEEP_STANDBY:
+-		case JBT_POWER_MODE_SLEEP:
+-		case JBT_POWER_MODE_NORMAL:
+-			ret = 0;
+-			jbt->suspend_mode = new_mode;
+-			break;
+-		default:
+-			break;
+-		}
+-	} else if (new_mode == JBT_POWER_MODE_NORMAL &&
+-			pdata->enable_pixel_clock) {
+-		pdata->enable_pixel_clock(&jbt->spi->dev, 1);
+-	}
+-
+ 	switch (jbt->power_mode) {
+-	case JBT_POWER_MODE_DEEP_STANDBY:
++	case JBT_POWER_MODE_OFF:
+ 		switch (new_mode) {
+-		case JBT_POWER_MODE_DEEP_STANDBY:
++		case JBT_POWER_MODE_OFF:
+ 			ret = 0;
+ 			break;
+-		case JBT_POWER_MODE_SLEEP:
+-			ret = jbt_standby_to_sleep(jbt);
+-			break;
+ 		case JBT_POWER_MODE_NORMAL:
+-			/* first transition into sleep */
+-			ret = jbt_standby_to_sleep(jbt);
+-			/* then transition into normal */
+-			ret |= jbt_sleep_to_normal(jbt);
++			ret = jbt_off_to_normal(jbt);
+ 			break;
+-		}
+-		break;
+-	case JBT_POWER_MODE_SLEEP:
+-		switch (new_mode) {
+-		case JBT_POWER_MODE_SLEEP:
+-			ret = 0;
+-			break;
+-		case JBT_POWER_MODE_DEEP_STANDBY:
+-			ret = jbt_sleep_to_standby(jbt);
+-			break;
+-		case JBT_POWER_MODE_NORMAL:
+-			ret = jbt_sleep_to_normal(jbt);
++		case JBT_POWER_MODE_STANDBY:
++			ret = -EINVAL;
+ 			break;
+ 		}
+ 		break;
+@@ -426,25 +414,23 @@ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
+ 		case JBT_POWER_MODE_NORMAL:
+ 			ret = 0;
+ 			break;
+-		case JBT_POWER_MODE_DEEP_STANDBY:
+-			/* first transition into sleep */
+-			ret = jbt_normal_to_sleep(jbt);
+-			/* then transition into deep standby */
+-			ret |= jbt_sleep_to_standby(jbt);
++		case JBT_POWER_MODE_OFF:
++			ret = jbt_normal_to_off(jbt);
+ 			break;
+-		case JBT_POWER_MODE_SLEEP:
+-			ret = jbt_normal_to_sleep(jbt);
++		case JBT_POWER_MODE_STANDBY:
++			ret = -EINVAL;
+ 			break;
+ 		}
++		break;
++	case JBT_POWER_MODE_STANDBY:
++		ret = -EINVAL;
++		break;
+ 	}
+ 
+ 	if (ret == 0) {
+ 		jbt->power_mode = new_mode;
+-		if (new_mode != JBT_POWER_MODE_NORMAL &&
+-			pdata->enable_pixel_clock)
+-			pdata->enable_pixel_clock(&jbt->spi->dev, 0);
+ 	} else {
+-		dev_err(&jbt->spi->dev, "Failed enter state '%s': %d\n",
++		dev_err(&jbt->spi->dev, "Failed to enter state '%s': %d\n",
+ 				jbt_power_mode_names[new_mode], ret);
+ 	}
+ 
+@@ -456,28 +442,46 @@ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
+ static int jbt6k74_set_resolution(struct jbt_info *jbt,
+ 					enum jbt_resolution new_resolution)
+ {
++	int old_resolution;
+ 	int ret = 0;
+-	enum jbt_resolution old_resolution;
++
++	if ( !jbt ) return -1;
+ 
+ 	mutex_lock(&jbt->lock);
+ 
+-	if (jbt->resolution == new_resolution)
+-		goto out_unlock;
++	if ( jbt->resolution == new_resolution ) goto out_unlock;
++	if ( jbt->power_mode == JBT_POWER_MODE_OFF ) goto out_unlock;
+ 
+ 	old_resolution = jbt->resolution;
+ 	jbt->resolution = new_resolution;
+ 
+-	if (jbt->power_mode == JBT_POWER_MODE_NORMAL) {
++	if ( jbt->power_mode == JBT_POWER_MODE_NORMAL ) {
++
++		ret = jbt_normal_to_standby(jbt);
++
++		mdelay(25);
+ 
+-		/* first transition into sleep */
+-		ret = jbt_normal_to_sleep(jbt);
+-		ret |= jbt_sleep_to_normal(jbt);
++		if (jbt->resolution == JBT_RESOLUTION_VGA) {
++			/* Quad mode off */
++			ret |= jbt_reg_write(jbt, JBT_REG_QUAD_RATE, 0x00);
++			ret = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x80);
++		} else {
++			/* Quad mode on */
++			ret |= jbt_reg_write(jbt, JBT_REG_QUAD_RATE, 0x22);
++			ret = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x81);
++		}
++
++		mdelay(25);
++
++		ret |= jbt_standby_to_normal(jbt);
+ 
+ 		if (ret) {
+ 			jbt->resolution = old_resolution;
+-			dev_err(&jbt->spi->dev, "Failed to set resolution '%s')\n",
++			dev_err(&jbt->spi->dev,
++			        "Failed to set resolution '%s')\n",
+ 				jbt_resolution_names[new_resolution]);
+ 		}
++
+ 	}
+ 
+ out_unlock:
+@@ -589,7 +593,7 @@ static ssize_t reset_write(struct device *dev, struct device_attribute *attr,
+ 
+ 	mutex_unlock(&jbt->lock);
+ 
+-	jbt->power_mode = JBT_POWER_MODE_DEEP_STANDBY;
++	jbt->power_mode = JBT_POWER_MODE_OFF;
+ 	jbt6k74_enter_power_mode(jbt, old_power_mode);
+ 
+ 	return count;
+@@ -616,27 +620,6 @@ static struct attribute_group jbt_attr_group = {
+ 	.attrs	= jbt_sysfs_entries,
+ };
+ 
+-/* FIXME: This in an ugly hack to delay display blanking.
+-  When the jbt is in sleep mode it displays an all white screen and thus one
+-  will a see a short flash.
+-  By delaying the blanking we will give the backlight a chance to turn off and
+-  thus avoid getting the flash */
+-static void jbt_blank_worker(struct work_struct *work)
+-{
+-	struct jbt_info *jbt  = container_of(work, struct jbt_info,
+-						blank_work.work);
+-
+-	switch (jbt->blank_mode) {
+-	case FB_BLANK_NORMAL:
+-		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_SLEEP);
+-		break;
+-	case FB_BLANK_POWERDOWN:
+-		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_DEEP_STANDBY);
+-		break;
+-	default:
+-		break;
+-	}
+-}
+ 
+ static int jbt6k74_set_mode(struct lcd_device *ld, struct fb_videomode *m)
+ {
+@@ -649,7 +632,7 @@ static int jbt6k74_set_mode(struct lcd_device *ld, struct fb_videomode *m)
+ 		ret = jbt6k74_set_resolution(jbt, JBT_RESOLUTION_VGA);
+ 	} else {
+ 		dev_err(&jbt->spi->dev, "Unknown resolution.\n");
+-		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_SLEEP);
++		jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
+ 	}
+ 
+ 	return ret;
+@@ -671,11 +654,11 @@ static int jbt6k74_set_power(struct lcd_device *ld, int power)
+ 		break;
+ 	case FB_BLANK_NORMAL:
+ 		dev_dbg(&jbt->spi->dev, "blank\n");
+-		ret = schedule_delayed_work(&jbt->blank_work, HZ);
++		ret = jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
+ 		break;
+ 	case FB_BLANK_POWERDOWN:
+ 		dev_dbg(&jbt->spi->dev, "powerdown\n");
+-		ret = schedule_delayed_work(&jbt->blank_work, HZ);
++		ret = jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
+ 		break;
+ 	default:
+ 		break;
+@@ -691,10 +674,10 @@ static int jbt6k74_get_power(struct lcd_device *ld)
+ 	switch (jbt->power_mode) {
+ 	case JBT_POWER_MODE_NORMAL:
+ 		return FB_BLANK_UNBLANK;
+-	case JBT_POWER_MODE_SLEEP:
++	case JBT_POWER_MODE_OFF:
+ 		return FB_BLANK_NORMAL;
+ 	default:
+-		return JBT_POWER_MODE_DEEP_STANDBY;
++		return JBT_POWER_MODE_OFF;
+ 	}
+ }
+ 
+@@ -728,6 +711,8 @@ static int __devinit jbt_probe(struct spi_device *spi)
+ 	if (!jbt)
+ 		return -ENOMEM;
+ 
++	jbt_global = jbt;
++
+ 	jbt->spi = spi;
+ 
+ 	jbt->lcd_dev = lcd_device_register("jbt6k74-lcd", &spi->dev, jbt,
+@@ -738,11 +723,9 @@ static int __devinit jbt_probe(struct spi_device *spi)
+ 		goto err_free_drvdata;
+ 	}
+ 
+-	INIT_DELAYED_WORK(&jbt->blank_work, jbt_blank_worker);
+-
+ 	jbt->resolution = JBT_RESOLUTION_VGA;
+-	jbt->power_mode = JBT_POWER_MODE_DEEP_STANDBY;
+ 	jbt->next_sleep = jiffies + msecs_to_jiffies(120);
++	jbt->power_mode = JBT_POWER_MODE_OFF;
+ 	mutex_init(&jbt->lock);
+ 
+ 	dev_set_drvdata(&spi->dev, jbt);
+@@ -831,6 +814,24 @@ static int __devexit jbt_remove(struct spi_device *spi)
+ 	return 0;
+ }
+ 
++/* Begin horrible layering violations in the interest of making stuff work */
++
++int jbt6k74_finish_resolutionchange(enum jbt_resolution new_resolution)
++{
++	if ( !jbt_global ) return 0;
++	return jbt6k74_set_resolution(jbt_global, new_resolution);
++}
++EXPORT_SYMBOL_GPL(jbt6k74_finish_resolutionchange);
++
++void jbt6k74_setpower(enum jbt_power_mode new_power)
++{
++	if ( !jbt_global ) return;
++	jbt6k74_enter_power_mode(jbt_global, new_power);
++}
++EXPORT_SYMBOL_GPL(jbt6k74_setpower);
++
++/* End horrible layering violations */
++
+ #ifdef CONFIG_PM
+ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
+ {
+@@ -838,8 +839,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
+ 
+ 	jbt->suspend_mode = jbt->power_mode;
+ 
+-	jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_DEEP_STANDBY);
+-	jbt->suspended = 1;
++	jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF);
+ 
+ 	dev_info(&spi->dev, "suspended\n");
+ 
+diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h
+index 75488c4..2010bdc 100644
+--- a/include/linux/jbt6k74.h
++++ b/include/linux/jbt6k74.h
+@@ -3,6 +3,22 @@
+ 
+ #include <linux/spi/spi.h>
+ 
++enum jbt_resolution {
++	JBT_RESOLUTION_VGA,
++	JBT_RESOLUTION_QVGA,
++};
++
++enum jbt_power_mode {
++	JBT_POWER_MODE_OFF,
++	JBT_POWER_MODE_STANDBY,
++	JBT_POWER_MODE_NORMAL,
++};
++
++extern void jbt6k74_setpower(enum jbt_power_mode new_power);
++extern int jbt6k74_prepare_resolutionchange(enum jbt_resolution new_resolution);
++extern int jbt6k74_finish_resolutionchange(enum jbt_resolution new_resolution);
++
++
+ /*
+  *  struct jbt6k74_platform_data - Platform data for jbt6k74 driver
+  *  @probe_completed: Callback to be called when the driver has been
+@@ -13,7 +29,6 @@
+  */
+ struct jbt6k74_platform_data {
+ 	void (*probe_completed)(struct device *dev);
+-	void (*enable_pixel_clock)(struct device *dev, int enable);
+ 
+ 	int gpio_reset;
+ };
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.34/0004-save_regs.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0004-save_regs.patch.patch
new file mode 100644
index 0000000000..185d9a1b99
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0004-save_regs.patch.patch
@@ -0,0 +1,140 @@
+From b166d6d4fb0f5ed66b785e0c662db5fbd2f86e8c Mon Sep 17 00:00:00 2001
+From: Radek Polak <psonek2@seznam.cz>
+Date: Fri, 9 Apr 2010 09:22:23 +0200
+Subject: [PATCH 4/4] save_regs.patch
+
+With this patch wifi can survive suspend.
+---
+ drivers/mmc/core/core.c   |    3 +-
+ drivers/mmc/host/s3cmci.c |   46 +++++++++++++++++++++++++++++++++++++++++++-
+ drivers/mmc/host/s3cmci.h |    8 +++++++
+ include/linux/mmc/core.h  |    2 +
+ 4 files changed, 56 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
+index 3168ebd..8504458 100644
+--- a/drivers/mmc/core/core.c
++++ b/drivers/mmc/core/core.c
+@@ -75,10 +75,11 @@ static int mmc_schedule_delayed_work(struct delayed_work *work,
+ /*
+  * Internal function. Flush all scheduled work from the MMC work queue.
+  */
+-static void mmc_flush_scheduled_work(void)
++void mmc_flush_scheduled_work(void)
+ {
+ 	flush_workqueue(workqueue);
+ }
++EXPORT_SYMBOL_GPL(mmc_flush_scheduled_work);
+ 
+ /**
+  *	mmc_request_done - finish processing an MMC request
+diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
+index 2fdf768..5f3effc 100644
+--- a/drivers/mmc/host/s3cmci.c
++++ b/drivers/mmc/host/s3cmci.c
+@@ -1878,19 +1878,61 @@ MODULE_DEVICE_TABLE(platform, s3cmci_driver_ids);
+ 
+ #ifdef CONFIG_PM
+ 
++static int save_regs(struct mmc_host *mmc)
++{
++	struct s3cmci_host *host = mmc_priv(mmc);
++	unsigned long flags;
++	unsigned from;
++	u32 *to = host->saved;
++
++	mmc_flush_scheduled_work();
++
++	local_irq_save(flags);
++	for (from = S3C2410_SDICON; from != S3C2410_SDIIMSK+4; from += 4)
++		if (from != host->sdidata)
++			*to++ = readl(host->base + from);
++	BUG_ON(to-host->saved != ARRAY_SIZE(host->saved));
++	local_irq_restore(flags);
++
++	return 0;
++}
++
++static int restore_regs(struct mmc_host *mmc)
++{
++	struct s3cmci_host *host = mmc_priv(mmc);
++	unsigned long flags;
++	unsigned to;
++	u32 *from = host->saved;
++
++	/*
++	 * Before we begin with the necromancy, make sure we don't
++	 * inadvertently start something we'll regret microseconds later.
++	 */
++	from[S3C2410_SDICMDCON - S3C2410_SDICON] = 0;
++
++	local_irq_save(flags);
++	for (to = S3C2410_SDICON; to != S3C2410_SDIIMSK+4; to += 4)
++		if (to != host->sdidata)
++			writel(*from++, host->base + to);
++	BUG_ON(from-host->saved != ARRAY_SIZE(host->saved));
++	local_irq_restore(flags);
++
++	return 0;
++}
++
+ static int s3cmci_suspend(struct device *dev)
+ {
+ 	struct mmc_host *mmc = platform_get_drvdata(to_platform_device(dev));
+ 	struct pm_message event = { PM_EVENT_SUSPEND };
+ 
+-	return mmc_suspend_host(mmc, event);
++	return save_regs(mmc);
+ }
+ 
+ static int s3cmci_resume(struct device *dev)
+ {
+ 	struct mmc_host *mmc = platform_get_drvdata(to_platform_device(dev));
+ 
+-	return mmc_resume_host(mmc);
++	return restore_regs(mmc);
+ }
+ 
+ static const struct dev_pm_ops s3cmci_pm = {
+diff --git a/drivers/mmc/host/s3cmci.h b/drivers/mmc/host/s3cmci.h
+index c76b53d..551e715 100644
+--- a/drivers/mmc/host/s3cmci.h
++++ b/drivers/mmc/host/s3cmci.h
+@@ -8,6 +8,8 @@
+  * published by the Free Software Foundation.
+  */
+ 
++#include <mach/regs-sdi.h>
++
+ enum s3cmci_waitfor {
+ 	COMPLETION_NONE,
+ 	COMPLETION_FINALIZE,
+@@ -27,6 +29,12 @@ struct s3cmci_host {
+ 	int			irq;
+ 	int			irq_cd;
+ 	int			dma;
++       /*
++        * Here's where we save the registers during suspend. Note that we skip
++        * SDIDATA, which is at different positions on 2410 and 2440, so
++        * there's no "+1" in the array size.
++        */
++	u32                     saved[(S3C2410_SDIIMSK-S3C2410_SDICON)/4];
+ 
+ 	unsigned long		clk_rate;
+ 	unsigned long		clk_div;
+diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
+index e4898e9..b49d674 100644
+--- a/include/linux/mmc/core.h
++++ b/include/linux/mmc/core.h
+@@ -129,6 +129,8 @@ struct mmc_request {
+ struct mmc_host;
+ struct mmc_card;
+ 
++extern void mmc_flush_scheduled_work(void);
++
+ extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
+ extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
+ extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.34/0005-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch b/recipes/linux/linux-openmoko-2.6.34/0005-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch
new file mode 100644
index 0000000000..cf73609478
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0005-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch
@@ -0,0 +1,38 @@
+From 9cd5001fc2f4c817d5614b1ee5445d69af05d483 Mon Sep 17 00:00:00 2001
+From: Thomas White <taw@bitwiz.org.uk>
+Date: Thu, 4 Feb 2010 00:07:25 +0100
+Subject: [PATCH 05/13] Fix crash when reading Glamo registers via sysfs
+
+glamo-core didn't ioremap() some areas, so don't try to read them.
+
+Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+---
+ drivers/mfd/glamo/glamo-core.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
+index f894c91..a54106b 100644
+--- a/drivers/mfd/glamo/glamo-core.c
++++ b/drivers/mfd/glamo/glamo-core.c
+@@ -91,14 +91,14 @@ static const struct reg_range reg_range[] = {
+ /*	{ 0x0500, 0x300,	"ISP",		0 }, */
+ /*	{ 0x0800, 0x400,	"JPEG",		0 }, */
+ /*	{ 0x0c00, 0xcc,		"MPEG",		0 }, */
+-	{ 0x1100, 0xb2,		"LCD 1",	1 },
+-	{ 0x1200, 0x64,		"LCD 2",	1 },
+-	{ 0x1400, 0x42,		"MMC",		1 },
++	{ 0x1100, 0xb2,		"LCD 1",	0 },
++	{ 0x1200, 0x64,		"LCD 2",	0 },
++	{ 0x1400, 0x42,		"MMC",		0 },
+ /*	{ 0x1500, 0x080,	"MPU 0",	0 },
+ 	{ 0x1580, 0x080,	"MPU 1",	0 },
+ 	{ 0x1600, 0x080,	"Cmd Queue",	0 },
+ 	{ 0x1680, 0x080,	"RISC CPU",	0 },*/
+-	{ 0x1700, 0x400,	"2D Unit",	1 },
++	{ 0x1700, 0x400,	"2D Unit",	0 },
+ /*	{ 0x1b00, 0x900,	"3D Unit",	0 }, */
+ };
+ 
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.34/0006-Fix-dynamic-command-queue-allocation.patch b/recipes/linux/linux-openmoko-2.6.34/0006-Fix-dynamic-command-queue-allocation.patch
new file mode 100644
index 0000000000..ea570723d4
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0006-Fix-dynamic-command-queue-allocation.patch
@@ -0,0 +1,131 @@
+From 752dfe99a5e2b361f740f2f986de93f5682b1a8d Mon Sep 17 00:00:00 2001
+From: Thomas White <taw@bitwiz.org.uk>
+Date: Thu, 6 May 2010 05:40:15 -0700
+Subject: [PATCH 06/13] Fix dynamic command queue allocation
+
+(Not tested...)
+
+Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+---
+ drivers/mfd/glamo/glamo-cmdq.c    |   10 +++++++---
+ drivers/mfd/glamo/glamo-cmdq.h    |    2 +-
+ drivers/mfd/glamo/glamo-drm-drv.c |   17 +++++++----------
+ 3 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c
+index 442963c..28c5268 100644
+--- a/drivers/mfd/glamo/glamo-cmdq.c
++++ b/drivers/mfd/glamo/glamo-cmdq.c
+@@ -57,6 +57,7 @@
+ #include "glamo-core.h"
+ #include "glamo-drm-private.h"
+ #include "glamo-regs.h"
++#include "glamo-buffer.h"
+ 
+ 
+ #define GLAMO_CMDQ_SIZE (128 * 1024)    /* 128k ring buffer */
+@@ -495,10 +496,11 @@ int glamo_cmdq_setup(struct glamodrm_handle *gdrm)
+ }
+ 
+ 
+-int glamo_cmdq_init(struct glamodrm_handle *gdrm)
++int glamo_cmdq_init(struct drm_device *dev)
+ {
+ 	struct drm_gem_object *obj;
+ 	struct drm_glamo_gem_object *gobj;
++	struct glamodrm_handle *gdrm = dev->dev_private;
+ 	int ret = 0;
+ 
+ 	obj = glamo_gem_object_alloc(dev, GLAMO_CMDQ_SIZE, 4);
+@@ -507,9 +509,10 @@ int glamo_cmdq_init(struct glamodrm_handle *gdrm)
+ 		ret = -ENOMEM;
+ 		goto out;
+ 	}
+-	gobj = fbo->driver_private;
++	gobj = obj->driver_private;
+ 	gdrm->cmdq_offs = GLAMO_OFFSET_FB + gobj->block->start;
+-	gdrm->cmdq_base = ioremap(gdrm->vram->start + offs, GLAMO_CMDQ_SIZE);
++	gdrm->cmdq_base = ioremap(gdrm->vram->start + gdrm->cmdq_offs,
++	                          GLAMO_CMDQ_SIZE);
+ 
+ 	/* Set up registers */
+ 	glamo_cmdq_setup(gdrm);
+@@ -521,6 +524,7 @@ out:
+ 
+ int glamo_cmdq_shutdown(struct glamodrm_handle *gdrm)
+ {
++	iounmap(gdrm->cmdq_base);
+ 	return 0;
+ }
+ 
+diff --git a/drivers/mfd/glamo/glamo-cmdq.h b/drivers/mfd/glamo/glamo-cmdq.h
+index 510d195..6d7f184 100644
+--- a/drivers/mfd/glamo/glamo-cmdq.h
++++ b/drivers/mfd/glamo/glamo-cmdq.h
+@@ -38,7 +38,7 @@ extern int glamo_ioctl_cmdburst(struct drm_device *dev, void *data,
+ extern void glamo_cmdq_blank(struct glamodrm_handle *gdrm,
+                              struct drm_gem_object *obj);
+ 
+-extern int glamo_cmdq_init(struct glamodrm_handle *gdrm);
++extern int glamo_cmdq_init(struct drm_device *de);
+ extern int glamo_cmdq_shutdown(struct glamodrm_handle *gdrm);
+ extern void glamo_cmdq_suspend(struct glamodrm_handle *gdrm);
+ extern void glamo_cmdq_resume(struct glamodrm_handle *gdrm);
+diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
+index 774eaff..ee648c1 100644
+--- a/drivers/mfd/glamo/glamo-drm-drv.c
++++ b/drivers/mfd/glamo/glamo-drm-drv.c
+@@ -128,7 +128,7 @@ static int glamodrm_load(struct drm_device *dev, unsigned long flags)
+ 	gdrm = dev->dev_private;
+ 
+ 	glamo_buffer_init(gdrm);
+-	glamo_cmdq_init(gdrm);
++	glamo_cmdq_init(dev);
+ 	glamo_fence_init(gdrm);
+ 	glamo_display_init(dev);
+ 
+@@ -237,14 +237,14 @@ static int glamodrm_probe(struct platform_device *pdev)
+ 	if ( !gdrm->vram ) {
+ 		dev_err(&pdev->dev, "Unable to find VRAM.\n");
+ 		rc = -ENOENT;
+-		goto out_unmap_cmdq;
++		goto out_unmap_regs;
+ 	}
+ 	gdrm->vram = request_mem_region(gdrm->vram->start,
+ 	                                resource_size(gdrm->vram), pdev->name);
+ 	if ( !gdrm->vram ) {
+ 		dev_err(&pdev->dev, "failed to request VRAM region\n");
+ 		rc = -ENOENT;
+-		goto out_unmap_cmdq;
++		goto out_unmap_regs;
+ 	}
+ 
+ 	/* Find the LCD controller */
+@@ -316,10 +316,6 @@ out_release_lcd:
+ 	                   resource_size(gdrm->lcd_regs));
+ out_release_vram:
+ 	release_mem_region(gdrm->vram->start, resource_size(gdrm->vram));
+-out_unmap_cmdq:
+-	iounmap(gdrm->cmdq_base);
+-out_release_cmdq:
+-	release_mem_region(gdrm->cmdq->start, resource_size(gdrm->cmdq));
+ out_unmap_regs:
+ 	iounmap(gdrm->reg_base);
+ out_release_regs:
+@@ -349,9 +345,10 @@ static int glamodrm_remove(struct platform_device *pdev)
+ 	/* Release VRAM */
+ 	release_mem_region(gdrm->vram->start, resource_size(gdrm->vram));
+ 
+-	/* Release command queue */
+-	iounmap(gdrm->cmdq_base);
+-	release_mem_region(gdrm->cmdq->start, resource_size(gdrm->cmdq));
++	/* Release LCD registers */
++	iounmap(gdrm->lcd_base);
++	release_mem_region(gdrm->lcd_regs->start,
++	                   resource_size(gdrm->lcd_regs));
+ 
+ 	/* Release 2D engine  */
+ 	iounmap(gdrm->twod_base);
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.34/0007-Debug-statements-for-testing.patch b/recipes/linux/linux-openmoko-2.6.34/0007-Debug-statements-for-testing.patch
new file mode 100644
index 0000000000..1321d29491
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0007-Debug-statements-for-testing.patch
@@ -0,0 +1,78 @@
+From 6d0e40938fa71d6a3a1f3c9892251053bda3be6d Mon Sep 17 00:00:00 2001
+From: Thomas White <taw@bitwiz.org.uk>
+Date: Thu, 6 May 2010 05:40:33 -0700
+Subject: [PATCH 07/13] Debug statements for testing
+
+Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+---
+ drivers/mfd/glamo/glamo-display.c |    7 +++++++
+ drivers/video/backlight/jbt6k74.c |    4 +++-
+ 2 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
+index 75ad734..57292ff 100644
+--- a/drivers/mfd/glamo/glamo-display.c
++++ b/drivers/mfd/glamo/glamo-display.c
+@@ -257,6 +257,8 @@ static int glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
+ 	u32 addr;
+ 	u16 addr_low, addr_high;
+ 
++	printk(KERN_CRIT "Setting base!\n");
++
+ 	if (!crtc->fb) {
+ 		DRM_DEBUG("No FB bound\n");
+ 		return -EINVAL;
+@@ -311,6 +313,8 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc,
+ 		msleep(500);
+ 	}
+ 
++	printk(KERN_CRIT "Setting mode!\n");
++
+ 	/* Rotate? */
+ 	if ( (mode->hdisplay == 640) && (mode->vdisplay == 480) ) {
+ 		rot = GLAMO_LCD_ROT_MODE_90;
+@@ -935,15 +939,18 @@ void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode)
+ 	struct glamo_crtc *gcrtc = to_glamo_crtc(crtc);
+ 
+ 	if ( mode ) {
++		printk(KERN_CRIT "Power on sequence\n");
+ 		glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD);
+ 		gcrtc->pixel_clock_on = 1;
+ 		jbt6k74_setpower(JBT_POWER_MODE_NORMAL);
+ 		if ( gcrtc->current_mode_set ) {
++			printk(KERN_CRIT "Setting previous mode\n");
+ 			glamo_crtc_mode_set(crtc, &gcrtc->current_mode,
+ 			                    &gcrtc->current_mode, 0, 0,
+ 			                    gcrtc->current_fb);
+ 		}
+ 	} else {
++		printk(KERN_CRIT "Power off sequence\n");
+ 		jbt6k74_setpower(JBT_POWER_MODE_OFF);
+ 		glamo_engine_suspend(gdrm->glamo_core, GLAMO_ENGINE_LCD);
+ 		gcrtc->pixel_clock_on = 0;
+diff --git a/drivers/video/backlight/jbt6k74.c b/drivers/video/backlight/jbt6k74.c
+index 91651e7..56a3e3a 100644
+--- a/drivers/video/backlight/jbt6k74.c
++++ b/drivers/video/backlight/jbt6k74.c
+@@ -389,7 +389,7 @@ static int jbt6k74_enter_power_mode(struct jbt_info *jbt,
+ {
+ 	int ret = -EINVAL;
+ 
+-	dev_dbg(&jbt->spi->dev, "entering (old_state=%s, new_state=%s)\n",
++	printk(KERN_CRIT "entering (old_state=%s, new_state=%s)\n",
+ 			jbt_power_mode_names[jbt->power_mode],
+ 			jbt_power_mode_names[new_mode]);
+ 
+@@ -825,7 +825,9 @@ EXPORT_SYMBOL_GPL(jbt6k74_finish_resolutionchange);
+ 
+ void jbt6k74_setpower(enum jbt_power_mode new_power)
+ {
++	printk(KERN_CRIT "About to set power..\n");
+ 	if ( !jbt_global ) return;
++	printk(KERN_CRIT "Setting JBT power.. %i\n", new_power);
+ 	jbt6k74_enter_power_mode(jbt_global, new_power);
+ }
+ EXPORT_SYMBOL_GPL(jbt6k74_setpower);
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.34/0008-Fix-claim-of-2D-register-resource.patch b/recipes/linux/linux-openmoko-2.6.34/0008-Fix-claim-of-2D-register-resource.patch
new file mode 100644
index 0000000000..613f3a1d9a
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0008-Fix-claim-of-2D-register-resource.patch
@@ -0,0 +1,27 @@
+From 92118a72fdf779a20693cb7d01d1a12fc8e12ace Mon Sep 17 00:00:00 2001
+From: Thomas White <taw@bitwiz.org.uk>
+Date: Thu, 6 May 2010 08:37:04 -0700
+Subject: [PATCH 08/13] Fix claim of 2D register resource
+
+Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+---
+ drivers/mfd/glamo/glamo-drm-drv.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
+index ee648c1..4f982ad 100644
+--- a/drivers/mfd/glamo/glamo-drm-drv.c
++++ b/drivers/mfd/glamo/glamo-drm-drv.c
+@@ -272,7 +272,8 @@ static int glamodrm_probe(struct platform_device *pdev)
+ 	}
+ 
+ 	/* Find the 2D engine */
+-	gdrm->twod_regs = platform_get_resource(pdev, IORESOURCE_MEM, 4);
++	gdrm->twod_regs = platform_get_resource_byname(pdev, IORESOURCE_MEM,
++	                                               "glamo-2d-regs");
+ 	if ( !gdrm->twod_regs ) {
+ 		dev_err(&pdev->dev, "Unable to find 2D registers.\n");
+ 		rc = -ENOENT;
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.34/0009-Use-unlocked_ioctl-rather-than-ioctl.patch b/recipes/linux/linux-openmoko-2.6.34/0009-Use-unlocked_ioctl-rather-than-ioctl.patch
new file mode 100644
index 0000000000..5937cb9820
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0009-Use-unlocked_ioctl-rather-than-ioctl.patch
@@ -0,0 +1,28 @@
+From ea9d004f7b0d5c93610a2abdcbdf54af2a871c4b Mon Sep 17 00:00:00 2001
+From: Thomas White <taw@bitwiz.org.uk>
+Date: Mon, 24 May 2010 21:49:14 +0200
+Subject: [PATCH 09/13] Use unlocked_ioctl rather than ioctl
+
+The arguments changed between 2.6.32 and 2.6.34.
+
+Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+---
+ drivers/mfd/glamo/glamo-drm-drv.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
+index 4f982ad..75b5233 100644
+--- a/drivers/mfd/glamo/glamo-drm-drv.c
++++ b/drivers/mfd/glamo/glamo-drm-drv.c
+@@ -179,7 +179,7 @@ static struct drm_driver glamodrm_drm_driver = {
+ 		.owner = THIS_MODULE,
+ 		.open = drm_open,
+ 		.release = drm_release,
+-		.ioctl = drm_ioctl,
++		.unlocked_ioctl = drm_ioctl,
+ 		.mmap = drm_gem_mmap,
+ 		.poll = drm_poll,
+ 		.fasync = drm_fasync,
+-- 
+1.7.1
+
diff --git a/recipes/linux/linux-openmoko-2.6.31/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch b/recipes/linux/linux-openmoko-2.6.34/wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch
index c6b989f997..52fe6262cc 100644
--- a/recipes/linux/linux-openmoko-2.6.31/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch
@@ -1,17 +1,18 @@
-From 63b619f9466dc36648d082dc4e4fad714a343d80 Mon Sep 17 00:00:00 2001
+From 16722526979959805c493deabaac8cf9ba2f8ef6 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 7 Nov 2009 20:33:06 +0100
-Subject: [PATCH 1/5] wm8753: fix build with gcc-4.4.2, which works ok with 4.1.2
+Subject: [PATCH 01/14] wm8753: fix build with gcc-4.4.2, which works ok with 4.1.2
 
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  sound/soc/codecs/wm8753.c |    4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
-index d80d414..1e685b2 100644
+index 5ad677c..e148406 100644
 --- a/sound/soc/codecs/wm8753.c
 +++ b/sound/soc/codecs/wm8753.c
-@@ -709,7 +709,9 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target,
+@@ -710,7 +710,9 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target,
  	Nmod = target % source;
  	Kpart = FIXED_PLL_SIZE * (long long)Nmod;
  
@@ -23,5 +24,5 @@ index d80d414..1e685b2 100644
  	K = Kpart & 0xFFFFFFFF;
  
 -- 
-1.6.5.2
+1.7.1
 
diff --git a/recipes/linux/linux-openmoko-2.6.34_git.bb b/recipes/linux/linux-openmoko-2.6.34_git.bb
new file mode 100644
index 0000000000..22fa3970a3
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34_git.bb
@@ -0,0 +1,37 @@
+require linux.inc
+require linux-openmoko.inc
+
+KERNEL_RELEASE="2.6.34"
+
+SRCREV = "dd1225cc08c3375bf80289ac1965c724881b149a"
+OEV = "oe2"
+PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
+
+SRC_URI = "\
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.34 \
+# build fix
+  file://wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch \
+# patches from Thomas White's gdrm-for-merging branch
+  file://0001-DRM-for-platform-devices.patch \
+  file://0002-Glamo-DRM-and-KMS-driver.patch \
+  file://0003-Work-on-Glamo-core-for-DRM.patch \
+  file://0004-JBT6k74-work-for-KMS.patch \
+  file://0005-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch \
+  file://0006-Fix-dynamic-command-queue-allocation.patch \
+  file://0007-Debug-statements-for-testing.patch \
+  file://0008-Fix-claim-of-2D-register-resource.patch \
+  file://0009-Use-unlocked_ioctl-rather-than-ioctl.patch \
+# patches from Radek Polak used in qtmoko
+  file://0001-accels.patch.patch \
+  file://0002-usbhost.patch.patch \
+  file://0003-ar6000_delay.patch.patch \
+  file://0004-save_regs.patch.patch \
+"
+
+S = "${WORKDIR}/git"
+
+CONFIG_NAME_om-gta02 = "gta02_drm_defconfig"
+
+do_configure_prepend() {
+        install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
+}
diff --git a/recipes/linux/linux-openmoko-devel/defconfig-oe.patch b/recipes/linux/linux-openmoko-devel/defconfig-oe.patch
deleted file mode 100644
index 3f65387b78..0000000000
--- a/recipes/linux/linux-openmoko-devel/defconfig-oe.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gta02-packaging-defconfig	2009-01-12 13:09:33.000000000 +0000
-+++ defconfig-oe	2009-01-12 13:18:23.000000000 +0000
-@@ -337,9 +337,6 @@
- #
- # At least one emulation must be selected
- #
--CONFIG_FPE_NWFPE=y
--# CONFIG_FPE_NWFPE_XP is not set
--# CONFIG_FPE_FASTFPE is not set
- 
- #
- # Userspace binary formats
diff --git a/recipes/linux/linux-openmoko-devel_git.bb b/recipes/linux/linux-openmoko-devel_git.bb
deleted file mode 100644
index 8621a56c80..0000000000
--- a/recipes/linux/linux-openmoko-devel_git.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-require linux.inc
-require linux-openmoko.inc
-
-DEFAULT_PREFERENCE = "-1"
-
-KERNEL_RELEASE = "2.6.29"
-KERNEL_VERSION = "${KERNEL_RELEASE}"
-
-SRCREV = "a15608f241a40b41fed5bffe511355c2067c4e88"
-OEV = "oe1"
-PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
-PE = "1"
-PR = "r2"
-
-SRC_URI = "\
-  git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
-"
-S = "${WORKDIR}/git"
-
-CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
-CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig"
-
-do_configure_prepend() {
-	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
-	cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
-}
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0001-Add-drm-to-Makefile-version.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0001-Add-drm-to-Makefile-version.patch
deleted file mode 100644
index 99345f7d54..0000000000
--- a/recipes/linux/linux-openmoko-shr-drm-devel/0001-Add-drm-to-Makefile-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 153af7f8e784e03401dc103f16741397ce6ca914 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 8 Nov 2009 12:50:40 +0100
-Subject: [PATCH] Add -drm to Makefile version
-
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ebf0aa4..16b189f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 29
--EXTRAVERSION += -rc3
-+EXTRAVERSION += -rc3-drm
- NAME = Erotic Pickled Herring
- 
- # *DOCUMENTATION*
--- 
-1.6.5.2
-
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0004-gta02_drm_defconfig-start-from-gta02_packaging_defco.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0004-gta02_drm_defconfig-start-from-gta02_packaging_defco.patch
deleted file mode 100644
index adb3ce84e3..0000000000
--- a/recipes/linux/linux-openmoko-shr-drm-devel/0004-gta02_drm_defconfig-start-from-gta02_packaging_defco.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From ab6c9baa5cc8ae3a922ae4baef2550d399b41550 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 8 Nov 2009 10:48:28 +0100
-Subject: [PATCH 4/7] gta02_drm_defconfig: start from gta02_packaging_defconfig
-
----
- arch/arm/configs/gta02_drm_defconfig |   40 +++++++++++++--------------------
- 1 files changed, 16 insertions(+), 24 deletions(-)
-
-diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig
-index 5349014..e2dbbef 100644
---- a/arch/arm/configs/gta02_drm_defconfig
-+++ b/arch/arm/configs/gta02_drm_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.29-rc3
--# Thu Jul  2 20:40:33 2009
-+# Fri Oct  2 20:51:57 2009
- #
- CONFIG_ARM=y
- CONFIG_HAVE_PWM=y
-@@ -35,7 +35,7 @@ CONFIG_EXPERIMENTAL=y
- CONFIG_BROKEN_ON_SMP=y
- CONFIG_LOCK_KERNEL=y
- CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION="-mokodev"
- # CONFIG_LOCALVERSION_AUTO is not set
- CONFIG_SWAP=y
- CONFIG_SYSVIPC=y
-@@ -180,7 +180,7 @@ CONFIG_S3C24XX_PWM=y
- CONFIG_S3C24XX_GPIO_EXTRA=0
- CONFIG_S3C2410_DMA=y
- # CONFIG_S3C2410_DMA_DEBUG is not set
--# CONFIG_S3C24XX_ADC is not set
-+CONFIG_S3C24XX_ADC=y
- CONFIG_MACH_SMDK=y
- CONFIG_MACH_NEO1973=y
- CONFIG_PLAT_S3C=y
-@@ -1084,7 +1084,6 @@ CONFIG_I2C=y
- CONFIG_I2C_BOARDINFO=y
- CONFIG_I2C_CHARDEV=y
- CONFIG_I2C_HELPER_AUTO=y
--CONFIG_I2C_ALGOBIT=y
- 
- #
- # I2C Hardware Bus support
-@@ -1181,7 +1180,7 @@ CONFIG_APM_POWER=y
- CONFIG_CHARGER_PCF50633=y
- CONFIG_BATTERY_BQ27000_HDQ=y
- CONFIG_HDQ_GPIO_BITBANG=y
--# CONFIG_BATTERY_GTA01 is not set
-+CONFIG_BATTERY_GTA01=m
- CONFIG_HWMON=y
- # CONFIG_HWMON_VID is not set
- # CONFIG_SENSORS_AD7414 is not set
-@@ -1283,14 +1282,11 @@ CONFIG_PCF50633_ADC=y
- CONFIG_PCF50633_GPIO=y
- # CONFIG_MFD_PCF50606 is not set
- CONFIG_MFD_GLAMO=y
--
--#
--# SMedia Glamo 336x/337x engine drivers
--#
--# CONFIG_MFD_GLAMO_FB is not set
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_FB_XGLAMO_WORKAROUND=y
- CONFIG_MFD_GLAMO_SPI_GPIO=y
-+CONFIG_MFD_GLAMO_SPI_FB=y
- CONFIG_MFD_GLAMO_MCI=y
--CONFIG_MFD_GLAMO_DRM=y
- 
- #
- # Multimedia devices
-@@ -1312,7 +1308,6 @@ CONFIG_DAB=y
- #
- # Graphics support
- #
--CONFIG_DRM=y
- # CONFIG_VGASTATE is not set
- CONFIG_VIDEO_OUTPUT_CONTROL=y
- CONFIG_FB=y
-@@ -1790,17 +1785,14 @@ CONFIG_STAGING=y
- #
- # Android
- #
--CONFIG_ANDROID=y
--CONFIG_ANDROID_BINDER_IPC=y
--CONFIG_ANDROID_LOGGER=y
--CONFIG_ANDROID_RAM_CONSOLE=y
--CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
--# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set
--# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
--CONFIG_ANDROID_TIMED_GPIO=y
--CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-+# CONFIG_ANDROID is not set
-+# CONFIG_ANDROID_BINDER_IPC is not set
-+# CONFIG_ANDROID_LOGGER is not set
-+# CONFIG_ANDROID_RAM_CONSOLE is not set
-+# CONFIG_ANDROID_TIMED_GPIO is not set
-+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
- # CONFIG_ANDROID_WAKELOCK is not set
--CONFIG_ANDROID_PARANOID_NETWORK=y
-+# CONFIG_ANDROID_PARANOID_NETWORK is not set
- 
- #
- # File systems
-@@ -1958,7 +1950,7 @@ CONFIG_NLS_CODEPAGE_850=m
- # CONFIG_NLS_CODEPAGE_863 is not set
- # CONFIG_NLS_CODEPAGE_864 is not set
- # CONFIG_NLS_CODEPAGE_865 is not set
--# CONFIG_NLS_CODEPAGE_866 is not set
-+CONFIG_NLS_CODEPAGE_866=m
- # CONFIG_NLS_CODEPAGE_869 is not set
- CONFIG_NLS_CODEPAGE_936=m
- CONFIG_NLS_CODEPAGE_950=m
-@@ -1967,7 +1959,7 @@ CONFIG_NLS_CODEPAGE_950=m
- # CONFIG_NLS_CODEPAGE_874 is not set
- # CONFIG_NLS_ISO8859_8 is not set
- # CONFIG_NLS_CODEPAGE_1250 is not set
--# CONFIG_NLS_CODEPAGE_1251 is not set
-+CONFIG_NLS_CODEPAGE_1251=m
- # CONFIG_NLS_ASCII is not set
- CONFIG_NLS_ISO8859_1=y
- # CONFIG_NLS_ISO8859_2 is not set
--- 
-1.6.5.2
-
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0005-Enable-DRM-and-MFD_GLAMO_DRM.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0005-Enable-DRM-and-MFD_GLAMO_DRM.patch
deleted file mode 100644
index c9d56fa7ab..0000000000
--- a/recipes/linux/linux-openmoko-shr-drm-devel/0005-Enable-DRM-and-MFD_GLAMO_DRM.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8fe4cb1bee0c8af760d8911c248e0904e44fa0b3 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 8 Nov 2009 10:49:43 +0100
-Subject: [PATCH 5/7] Enable DRM and MFD_GLAMO_DRM
-
----
- arch/arm/configs/gta02_drm_defconfig |   12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig
-index e2dbbef..aac2832 100644
---- a/arch/arm/configs/gta02_drm_defconfig
-+++ b/arch/arm/configs/gta02_drm_defconfig
-@@ -35,7 +35,7 @@ CONFIG_EXPERIMENTAL=y
- CONFIG_BROKEN_ON_SMP=y
- CONFIG_LOCK_KERNEL=y
- CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION="-mokodev"
-+CONFIG_LOCALVERSION="-drm"
- # CONFIG_LOCALVERSION_AUTO is not set
- CONFIG_SWAP=y
- CONFIG_SYSVIPC=y
-@@ -1282,11 +1282,14 @@ CONFIG_PCF50633_ADC=y
- CONFIG_PCF50633_GPIO=y
- # CONFIG_MFD_PCF50606 is not set
- CONFIG_MFD_GLAMO=y
--CONFIG_MFD_GLAMO_FB=y
--CONFIG_MFD_GLAMO_FB_XGLAMO_WORKAROUND=y
-+
-+#
-+# SMedia Glamo 336x/337x engine drivers
-+#
-+# CONFIG_MFD_GLAMO_FB is not set
- CONFIG_MFD_GLAMO_SPI_GPIO=y
--CONFIG_MFD_GLAMO_SPI_FB=y
- CONFIG_MFD_GLAMO_MCI=y
-+CONFIG_MFD_GLAMO_DRM=y
- 
- #
- # Multimedia devices
-@@ -1308,6 +1311,7 @@ CONFIG_DAB=y
- #
- # Graphics support
- #
-+CONFIG_DRM=y
- # CONFIG_VGASTATE is not set
- CONFIG_VIDEO_OUTPUT_CONTROL=y
- CONFIG_FB=y
--- 
-1.6.5.2
-
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0006-Enable-I2C_ALGOBIT-from-make-oldconfig.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0006-Enable-I2C_ALGOBIT-from-make-oldconfig.patch
deleted file mode 100644
index 79305ce317..0000000000
--- a/recipes/linux/linux-openmoko-shr-drm-devel/0006-Enable-I2C_ALGOBIT-from-make-oldconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 315bd3c8c368cf8097e3b0aecd21907755b617e1 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 8 Nov 2009 10:54:55 +0100
-Subject: [PATCH 6/7] Enable I2C_ALGOBIT, from make oldconfig
-
----
- arch/arm/configs/gta02_drm_defconfig |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig
-index aac2832..e17ddc3 100644
---- a/arch/arm/configs/gta02_drm_defconfig
-+++ b/arch/arm/configs/gta02_drm_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.29-rc3
--# Fri Oct  2 20:51:57 2009
-+# Sun Nov  8 10:53:31 2009
- #
- CONFIG_ARM=y
- CONFIG_HAVE_PWM=y
-@@ -1084,6 +1084,7 @@ CONFIG_I2C=y
- CONFIG_I2C_BOARDINFO=y
- CONFIG_I2C_CHARDEV=y
- CONFIG_I2C_HELPER_AUTO=y
-+CONFIG_I2C_ALGOBIT=y
- 
- #
- # I2C Hardware Bus support
--- 
-1.6.5.2
-
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0007-Enable-UBI-UBIFS.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0007-Enable-UBI-UBIFS.patch
deleted file mode 100644
index b74e496b2b..0000000000
--- a/recipes/linux/linux-openmoko-shr-drm-devel/0007-Enable-UBI-UBIFS.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 8f907c17c068beb94264a4a6d40314658a0c1393 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 8 Nov 2009 10:58:28 +0100
-Subject: [PATCH 7/7] Enable UBI/UBIFS
-
----
- arch/arm/configs/gta02_drm_defconfig |   39 ++++++++++++++++++++++++++++++---
- 1 files changed, 35 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig
-index e17ddc3..7506963 100644
---- a/arch/arm/configs/gta02_drm_defconfig
-+++ b/arch/arm/configs/gta02_drm_defconfig
-@@ -806,7 +806,30 @@ CONFIG_MTD_NAND_S3C2410_HWECC=y
- #
- # UBI - Unsorted block images
- #
--# CONFIG_MTD_UBI is not set
-+CONFIG_MTD_UBI=y
-+CONFIG_MTD_UBI_WL_THRESHOLD=4096
-+CONFIG_MTD_UBI_BEB_RESERVE=1
-+CONFIG_MTD_UBI_GLUEBI=y
-+
-+#
-+# UBI debugging options
-+#
-+CONFIG_MTD_UBI_DEBUG=y
-+# CONFIG_MTD_UBI_DEBUG_MSG is not set
-+# CONFIG_MTD_UBI_DEBUG_PARANOID is not set
-+CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
-+# CONFIG_MTD_UBI_DEBUG_USERSPACE_IO is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
-+
-+#
-+# Additional UBI debugging messages
-+#
-+# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
- # CONFIG_PARPORT is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
-@@ -1877,6 +1900,12 @@ CONFIG_JFFS2_ZLIB=y
- # CONFIG_JFFS2_LZO is not set
- CONFIG_JFFS2_RTIME=y
- # CONFIG_JFFS2_RUBIN is not set
-+CONFIG_UBIFS_FS=y
-+# CONFIG_UBIFS_FS_XATTR is not set
-+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-+CONFIG_UBIFS_FS_LZO=y
-+CONFIG_UBIFS_FS_ZLIB=y
-+# CONFIG_UBIFS_FS_DEBUG is not set
- CONFIG_CRAMFS=y
- CONFIG_SQUASHFS=m
- # CONFIG_SQUASHFS_EMBEDDED is not set
-@@ -2151,8 +2180,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
- #
- # Compression
- #
--CONFIG_CRYPTO_DEFLATE=m
--# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_DEFLATE=y
-+CONFIG_CRYPTO_LZO=y
- 
- #
- # Random Number Generation
-@@ -2174,6 +2203,8 @@ CONFIG_CRC32=y
- CONFIG_LIBCRC32C=m
- CONFIG_ZLIB_INFLATE=y
- CONFIG_ZLIB_DEFLATE=y
-+CONFIG_LZO_COMPRESS=y
-+CONFIG_LZO_DECOMPRESS=y
- CONFIG_TEXTSEARCH=y
- CONFIG_TEXTSEARCH_KMP=m
- CONFIG_TEXTSEARCH_BM=m
--- 
-1.6.5.2
-
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/fix-install.patch b/recipes/linux/linux-openmoko-shr-drm-devel/fix-install.patch
deleted file mode 100644
index b14ca7d740..0000000000
--- a/recipes/linux/linux-openmoko-shr-drm-devel/fix-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Steve Sakoman <steve@sakoman.com>
-Date: Mon, 18 Aug 2008 16:07:31 +0000 (-0700)
-Subject: scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
-X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=f039944bdd491cde7327133e9976881d3133ae70
-
-scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
-
-This was causing build failures on some machines
----
-
-diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
-index 6bf8e87..fb20532 100644
---- a/scripts/Makefile.fwinst
-+++ b/scripts/Makefile.fwinst
-@@ -37,7 +37,7 @@
-        @true
-
- quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@)
--      cmd_install = $(INSTALL) -m0644 $< $@
-+      cmd_install = $(INSTALL) -m 0644 $< $@
-
- $(installed-fw-dirs):
-        $(call cmd,mkdir)
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
deleted file mode 100644
index da7c93d290..0000000000
--- a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-require linux.inc
-require linux-openmoko.inc
-
-DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Smartphones"
-
-DEFAULT_PREFERENCE = "-1"
-KERNEL_RELEASE = "2.6.29"
-KERNEL_VERSION = "2.6.29-rc3-drm"
-
-SRCREV = "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
-OMV = "oe15"
-PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCPV}"
-PR = "r5"
-
-SRC_URI = "\
-  git://git.openmoko.org/git/kernel.git;protocol=git;branch=drm-tracking \
-  file://fix-install.patch;patch=1 \
-  file://0001-Add-drm-to-Makefile-version.patch;patch=1 \
-  file://0004-gta02_drm_defconfig-start-from-gta02_packaging_defco.patch;patch=1 \
-  file://0005-Enable-DRM-and-MFD_GLAMO_DRM.patch;patch=1 \
-  file://0006-Enable-I2C_ALGOBIT-from-make-oldconfig.patch;patch=1 \
-  file://0007-Enable-UBI-UBIFS.patch;patch=1 \
-"
-S = "${WORKDIR}/git"
-
-CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
-CONFIG_NAME_om-gta02 = "gta02_drm_defconfig"
-
-do_configure_prepend() { 
-	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
-}
diff --git a/recipes/linux/linux-openmoko.inc b/recipes/linux/linux-openmoko.inc
index 99865c9818..c8c38d065e 100644
--- a/recipes/linux/linux-openmoko.inc
+++ b/recipes/linux/linux-openmoko.inc
@@ -7,6 +7,8 @@ UBOOT_ENTRYPOINT = "30008000"
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "om-gta01|om-gta02|om-3d7k"
 
+DESCRIPTION_${PN} = "Linux kernel for the Openmoko Neo GSM Smartphones"
+
 KERNEL_IMAGE_SYMLINK_NAME_om-gta01 = "uImage-GTA01.bin"
 KERNEL_IMAGE_SYMLINK_NAME_om-gta02 = "uImage-GTA02.bin"
 KERNEL_IMAGE_SYMLINK_NAME_om-3d7k  = "uImage-OM3D7K.bin"
diff --git a/recipes/linux/linux-orion_2.6.28.4.bb b/recipes/linux/linux-orion_2.6.28.4.bb
index eb7bcc87dd..33e1207123 100644
--- a/recipes/linux/linux-orion_2.6.28.4.bb
+++ b/recipes/linux/linux-orion_2.6.28.4.bb
@@ -7,21 +7,21 @@ COMPATIBLE_MACHINE = "(dns323|mv2120|kuropro|lspro|tsx09|ts409)"
 require linux.inc
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.gz;patch=1;name=stablepatch \
-           file://kuropro-foonas-mtd.patch;patch=1 \
-           file://fw-and-powerpc-install.patch;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.gz;apply=yes;name=stablepatch \
+           file://kuropro-foonas-mtd.patch \
+           file://fw-and-powerpc-install.patch \
            file://defconfig \
                "
 
 S = "${WORKDIR}/linux-2.6.28"
 
 # Fix the mach-type of orion devices - always passed 526
-SRC_URI_append_dns323 +=        "file://dns323.patch;patch=1"
-SRC_URI_append_mv2120 +=        "file://mv2120.patch;patch=1"
-SRC_URI_append_kuropro +=       "file://kuropro.patch;patch=1"
-SRC_URI_append_lspro +=         "file://lspro.patch;patch=1"
-SRC_URI_append_tsx09 +=         "file://tsx09.patch;patch=1"
-SRC_URI_append_ts409 +=         "file://ts409.patch;patch=1"
+SRC_URI_append_dns323 +=        "file://dns323.patch"
+SRC_URI_append_mv2120 +=        "file://mv2120.patch"
+SRC_URI_append_kuropro +=       "file://kuropro.patch"
+SRC_URI_append_lspro +=         "file://lspro.patch"
+SRC_URI_append_tsx09 +=         "file://tsx09.patch"
+SRC_URI_append_ts409 +=         "file://ts409.patch"
 
 KERNEL_IMAGETYPE ?= "uImage"
 
diff --git a/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb b/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb
index 178db3e476..fc1e974940 100644
--- a/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb
+++ b/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb
@@ -9,7 +9,7 @@ inherit kernel
 DEPENDS = ""
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2;name=kernel \
-           http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;patch=1;name=patch \
+           http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;apply=yes;name=patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.22"
diff --git a/recipes/linux/linux-palmpre_2.6.24.bb b/recipes/linux/linux-palmpre_2.6.24.bb
index b21eed375a..7e5494b62b 100644
--- a/recipes/linux/linux-palmpre_2.6.24.bb
+++ b/recipes/linux/linux-palmpre_2.6.24.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Linux kernel for Palm Pre. Original version of Palm, Inc."
 KERNEL_IMAGETYPE = "uImage"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           http://palm.cdnetworks.net/opensource/1.1.0/linux-2.6.24-patch.gz;patch=1;name=patch \
+           http://palm.cdnetworks.net/opensource/1.1.0/linux-2.6.24-patch.gz;apply=yes;name=patch \
            "
 
 S = "${WORKDIR}/linux-2.6.24"
diff --git a/recipes/linux/linux-powerpc-fsl_git.bb b/recipes/linux/linux-powerpc-fsl_git.bb
index 3497345d9e..02eab8e8a4 100644
--- a/recipes/linux/linux-powerpc-fsl_git.bb
+++ b/recipes/linux/linux-powerpc-fsl_git.bb
@@ -17,8 +17,8 @@ PR = "r6"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git;protocol=git \
 	   file://defconfig"
 
-SRC_URI_append_mpc8315e-rdb = " file://mpc8315erdb-add-msi-to-dts.patch;patch=1"
-SRC_URI_append_calamari = " file://mpc8536ds.dts.patch;patch=1"
+SRC_URI_append_mpc8315e-rdb = " file://mpc8315erdb-add-msi-to-dts.patch"
+SRC_URI_append_calamari = " file://mpc8536ds.dts.patch"
 
 COMPATIBLE_MACHINE = "(mpc8315e-rdb|calamari)"
 
diff --git a/recipes/linux/linux-qsd8/htcleo/defconfig b/recipes/linux/linux-qsd8/htcleo/defconfig
index 4b0dd57737..4d3141dae8 100644
--- a/recipes/linux/linux-qsd8/htcleo/defconfig
+++ b/recipes/linux/linux-qsd8/htcleo/defconfig
@@ -1,15 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29
-# Sun Jan 31 16:22:45 2010
+# Linux kernel version: 2.6.32.9
+# Thu May 13 15:20:29 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_MMU=y
-# CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -18,13 +16,13 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
 
 #
 # General setup
@@ -37,16 +35,20 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 # CONFIG_SYSVIPC is not set
+# CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
 
 #
 # RCU Subsystem
 #
-CONFIG_CLASSIC_RCU=y
-# CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=17
@@ -60,6 +62,7 @@ CONFIG_CGROUP_DEBUG=y
 # CONFIG_CGROUP_NS is not set
 CONFIG_CGROUP_FREEZER=y
 # CONFIG_CGROUP_DEVICE is not set
+# CONFIG_CPUSETS is not set
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_CGROUP_MEM_RES_CTLR is not set
@@ -68,6 +71,9 @@ CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -89,8 +95,12 @@ CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_AIO=y
 CONFIG_ASHMEM=y
+CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_COMPAT_BRK=y
 CONFIG_SLAB=y
@@ -101,6 +111,12 @@ CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_SLOW_WORK is not set
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -112,8 +128,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_LBDAF=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -121,31 +136,35 @@ CONFIG_BLOCK=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_AS is not set
 # CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_FREEZER=y
 
 #
 # System Type
 #
+CONFIG_MMU=y
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_STMP3XXX is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
@@ -154,33 +173,38 @@ CONFIG_FREEZER=y
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_LOKI is not set
 # CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
+CONFIG_ARCH_MSM=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5PC1XX is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_U300 is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
-CONFIG_ARCH_MSM=y
-# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_BCMRING is not set
 # CONFIG_ARCH_MSM7X00A is not set
 CONFIG_ARCH_QSD8X50=y
 CONFIG_ARCH_MSM_SCORPION=y
 CONFIG_MSM_MDP31=y
-CONFIG_MSM_AMSS_VERSION=6225
+CONFIG_MSM_AMSS_VERSION=1550
+CONFIG_MSM_AMSS_VERSION_WINCE=y
 # CONFIG_MSM_AMSS_VERSION_6210 is not set
 # CONFIG_MSM_AMSS_VERSION_6220 is not set
-CONFIG_MSM_AMSS_VERSION_6225=y
+# CONFIG_MSM_AMSS_VERSION_6225 is not set
 # CONFIG_MSM_AMSS_VERSION_6350 is not set
+CONFIG_MSM_AMSS_VERSION_1550=y
 CONFIG_MSM_DEBUG_UART_NONE=y
 # CONFIG_MSM_DEBUG_UART1 is not set
 # CONFIG_MSM_DEBUG_UART2 is not set
@@ -189,16 +213,17 @@ CONFIG_MSM_DEBUG_UART_NONE=y
 #
 # MSM Board Type
 #
-CONFIG_MACH_SWORDFISH=y
-# CONFIG_MACH_MAHIMAHI is not set
 CONFIG_MACH_HTCLEO=y
+# CONFIG_MACH_SWORDFISH is not set
+# CONFIG_MACH_MAHIMAHI is not set
+# CONFIG_MACH_QSD8X50_FFA is not set
 # CONFIG_HTC_HEADSET is not set
 # CONFIG_HTC_35MM_JACK is not set
-CONFIG_HTC_PWRSPLY=y
+# CONFIG_HTC_PWRSPLY is not set
 # CONFIG_HTC_PWRSINK is not set
 CONFIG_CACHE_FLUSH_RANGE_LIMIT=0x40000
-CONFIG_MSM7X00A_USE_GP_TIMER=y
-# CONFIG_MSM7X00A_USE_DG_TIMER is not set
+# CONFIG_MSM7X00A_USE_GP_TIMER is not set
+CONFIG_MSM7X00A_USE_DG_TIMER=y
 CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE_SUSPEND=y
 # CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE is not set
 # CONFIG_MSM7X00A_SLEEP_MODE_APPS_SLEEP is not set
@@ -218,10 +243,7 @@ CONFIG_MSM_IDLE_STATS_FIRST_BUCKET=62500
 CONFIG_MSM_IDLE_STATS_BUCKET_SHIFT=2
 CONFIG_MSM_IDLE_STATS_BUCKET_COUNT=10
 CONFIG_MSM_FIQ_SUPPORT=y
-CONFIG_MSM_SERIAL_DEBUGGER=y
-CONFIG_MSM_SERIAL_DEBUGGER_NO_SLEEP=y
-# CONFIG_MSM_SERIAL_DEBUGGER_WAKEUP_IRQ_ALWAYS_ON is not set
-# CONFIG_MSM_SERIAL_DEBUGGER_CONSOLE is not set
+# CONFIG_MSM_SERIAL_DEBUGGER is not set
 CONFIG_MSM_SMD=y
 CONFIG_MSM_ONCRPCROUTER=y
 CONFIG_MSM_RPCSERVERS=y
@@ -235,6 +257,7 @@ CONFIG_WIFI_CONTROL_FUNC=y
 CONFIG_HTC_FB_CONSOLE=y
 # CONFIG_HTC_FB_CONSOLE_DELAY is not set
 # CONFIG_HTC_FB_CONSOLE_BOOT is not set
+CONFIG_VERY_EARLY_CONSOLE=y
 
 #
 # Processor Type
@@ -244,7 +267,7 @@ CONFIG_CPU_32v6K=y
 CONFIG_CPU_V7=y
 CONFIG_CPU_32v7=y
 CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_PABRT_IFAR=y
+CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_CACHE_V7=y
 CONFIG_CPU_CACHE_VIPT=y
 CONFIG_CPU_COPY_V6=y
@@ -263,8 +286,10 @@ CONFIG_ARM_THUMBEE=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_HAS_TLS_REG=y
-# CONFIG_OUTER_CACHE is not set
 CONFIG_ARM_L1_CACHE_SHIFT=5
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
 
 #
 # Bus support
@@ -284,13 +309,18 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_2G is not set
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 CONFIG_HZ=100
+# CONFIG_THUMB2_KERNEL is not set
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
-CONFIG_ARCH_FLATMEM_HAS_HOLES=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
+CONFIG_VMALLOC_RESERVE=0x30000000
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -301,17 +331,21 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-CONFIG_UNEVICTABLE_LRU=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
 
 #
 # Boot options
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="mem=64M console=ttyMSM,115200n8"
+CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 
@@ -333,8 +367,6 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_MIN_TICKS=2
-CONFIG_CPU_FREQ_SAMPLING_LATENCY_MULTIPLIER=500
 # CONFIG_CPU_IDLE is not set
 
 #
@@ -346,7 +378,7 @@ CONFIG_CPU_FREQ_SAMPLING_LATENCY_MULTIPLIER=500
 #
 CONFIG_VFP=y
 CONFIG_VFPv3=y
-# CONFIG_NEON is not set
+CONFIG_NEON=y
 
 #
 # Userspace binary formats
@@ -360,9 +392,12 @@ CONFIG_HAVE_AOUT=y
 # Power management options
 #
 CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_VERBOSE is not set
+CONFIG_CAN_PM_TRACE=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_HAS_WAKELOCK=y
 CONFIG_HAS_EARLYSUSPEND=y
@@ -370,12 +405,143 @@ CONFIG_WAKELOCK=y
 CONFIG_WAKELOCK_STAT=y
 CONFIG_USER_WAKELOCK=y
 CONFIG_EARLYSUSPEND=y
-# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
+CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL=y
 # CONFIG_CONSOLE_EARLYSUSPEND is not set
-CONFIG_FB_EARLYSUSPEND=y
+# CONFIG_FB_EARLYSUSPEND is not set
 # CONFIG_APM_EMULATION is not set
+# CONFIG_PM_RUNTIME is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_NET is not set
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=y
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+CONFIG_INET_ESP=y
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+# CONFIG_IPV6_ROUTE_INFO is not set
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_IPV6_MIP6=y
+CONFIG_INET6_XFRM_TUNNEL=y
+CONFIG_INET6_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
+# CONFIG_IPV6_SUBTREES is not set
+# CONFIG_IPV6_MROUTE is not set
+CONFIG_ANDROID_PARANOID_NETWORK=y
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=y
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=y
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+CONFIG_BT_HIDP=y
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_BCSP is not set
+CONFIG_BT_HCIUART_LL=y
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+CONFIG_WIRELESS_OLD_REGULATORY=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
+# CONFIG_WIMAX is not set
+CONFIG_RFKILL=y
+# CONFIG_RFKILL_PM is not set
+CONFIG_RFKILL_LEDS=y
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -385,19 +551,22 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH=""
+# CONFIG_DEVTMPFS is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
@@ -406,9 +575,10 @@ CONFIG_MTD_CMDLINE_PARTS=y
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
@@ -444,11 +614,11 @@ CONFIG_MTD_CFI_I2=y
 #
 # Self-contained MTD device drivers
 #
-# CONFIG_MTD_MSM_NAND is not set
+CONFIG_MTD_MSM_NAND=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_BLOCK2MTD=m
 
 #
 # Disk-On-Chip Device Drivers
@@ -456,6 +626,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND is not set
 # CONFIG_MTD_ONENAND is not set
 
@@ -473,16 +644,21 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MG_DISK is not set
 CONFIG_MISC_DEVICES=y
 CONFIG_ANDROID_PMEM=y
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 CONFIG_KERNEL_DEBUGGER_CORE=y
+# CONFIG_ISL29003 is not set
 CONFIG_UID_STAT=y
+# CONFIG_WL127X_RFKILL is not set
 CONFIG_APANIC=y
-CONFIG_APANIC_PLABEL="crashdata"
+CONFIG_APANIC_PLABEL="kpanic"
 # CONFIG_C2PORT is not set
 
 #
@@ -490,6 +666,7 @@ CONFIG_APANIC_PLABEL="crashdata"
 #
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@@ -502,17 +679,49 @@ CONFIG_HAVE_IDE=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
-CONFIG_MD=y
-# CONFIG_BLK_DEV_MD is not set
-CONFIG_BLK_DEV_DM=y
-CONFIG_DM_DEBUG=y
-CONFIG_DM_CRYPT=y
-# CONFIG_DM_SNAPSHOT is not set
-# CONFIG_DM_MIRROR is not set
-# CONFIG_DM_ZERO is not set
-# CONFIG_DM_MULTIPATH is not set
-# CONFIG_DM_DELAY is not set
-CONFIG_DM_UEVENT=y
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=y
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_NET_ETHERNET is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+CONFIG_WLAN=y
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+CONFIG_BCM4329=m
+CONFIG_BCM4329_FW_PATH="/system/etc/firmware/fw_bcm4329.bin"
+CONFIG_BCM4329_NVRAM_PATH="/proc/calibration"
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=y
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=y
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=y
+CONFIG_PPP_BSDCOMP=y
+CONFIG_PPP_MPPE=y
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
+# CONFIG_SLIP is not set
+CONFIG_SLHC=y
+# CONFIG_NETCONSOLE is not set
+CONFIG_MSM_RMNET=y
+# CONFIG_MSM_RMNET_DEBUG is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
 
 #
 # Input device support
@@ -538,18 +747,22 @@ CONFIG_INPUT_KEYRESET=y
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_CYPRESS_TMG is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_ELAN_I2C_8232 is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
-CONFIG_TOUCHSCREEN_MSM=y
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y
+# CONFIG_TOUCHSCREEN_MSM is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
@@ -558,13 +771,14 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_ATI_REMOTE is not set
 # CONFIG_INPUT_ATI_REMOTE2 is not set
+CONFIG_INPUT_KEYCHORD=y
 # CONFIG_INPUT_KEYSPAN_REMOTE is not set
 # CONFIG_INPUT_POWERMATE is not set
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_GPIO=y
-CONFIG_INPUT_KEYCHORD=y
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 CONFIG_INPUT_CAPELLA_CM3602=y
 
 #
@@ -577,12 +791,12 @@ CONFIG_INPUT_CAPELLA_CM3602=y
 # Character devices
 #
 CONFIG_VT=y
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_DEVMEM is not set
-# CONFIG_DEVKMEM is not set
+CONFIG_DEVMEM=y
+CONFIG_DEVKMEM=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -608,6 +822,7 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_DCC_TTY is not set
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_COMPAT is not set
 # CONFIG_I2C_CHARDEV is not set
 CONFIG_I2C_HELPER_AUTO=y
 
@@ -639,49 +854,61 @@ CONFIG_I2C_MSM=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_SENSORS_AKM8976 is not set
 CONFIG_SENSORS_AKM8973=y
 # CONFIG_SENSORS_PCA963X is not set
 # CONFIG_SENSORS_MT9T013 is not set
-CONFIG_VP_A1026=y
+# CONFIG_VP_A1026 is not set
+CONFIG_DS2745=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
 # CONFIG_SPI is not set
-CONFIG_W1=y
 
 #
-# 1-wire Bus Masters
+# PPS support
 #
-CONFIG_W1_MASTER_DS2482=y
-# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_PPS is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_GPIO_SYSFS is not set
 
 #
-# 1-wire Slaves
+# Memory mapped GPIO expanders:
+#
+
 #
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-CONFIG_W1_SLAVE_DS2784=y
-# CONFIG_W1_SLAVE_BQ27000 is not set
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_W1 is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_BATTERY_DS2760 is not set
-CONFIG_BATTERY_DS2784=y
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_DS2784 is not set
 # CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
@@ -695,17 +922,30 @@ CONFIG_SSB_POSSIBLE=y
 #
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_TPS65010 is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_TC6393XB is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_PCF50633 is not set
-
-#
-# Multimedia devices
-#
+# CONFIG_AB3100_CORE is not set
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_DEBUG=y
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+CONFIG_MEDIA_SUPPORT=y
 
 #
 # Multimedia core support
@@ -714,6 +954,7 @@ CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_COMMON=y
 # CONFIG_VIDEO_ALLOW_V4L1 is not set
 CONFIG_VIDEO_V4L1_COMPAT=y
+# CONFIG_DVB_CORE is not set
 CONFIG_VIDEO_MEDIA=y
 
 #
@@ -721,23 +962,16 @@ CONFIG_VIDEO_MEDIA=y
 #
 # CONFIG_MEDIA_ATTACH is not set
 CONFIG_MEDIA_TUNER=y
-CONFIG_MEDIA_TUNER_CUSTOMIZE=y
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
+CONFIG_MEDIA_TUNER_MC44S803=y
 CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -762,6 +996,9 @@ CONFIG_MSM_CAMERA=y
 # CONFIG_MT9P012 is not set
 CONFIG_S5K3E2FX=y
 CONFIG_RADIO_ADAPTERS=y
+# CONFIG_I2C_SI4713 is not set
+# CONFIG_RADIO_SI4713 is not set
+# CONFIG_RADIO_SI470X is not set
 # CONFIG_RADIO_TEA5764 is not set
 CONFIG_DAB=y
 
@@ -792,13 +1029,16 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 #
 # Frame buffer hardware drivers
 #
+# CONFIG_FB_UVESA is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
 CONFIG_FB_MSM=y
 CONFIG_FB_MSM_LCDC=y
-# CONFIG_GPU_MSM_KGSL is not set
+CONFIG_GPU_MSM_KGSL=y
+CONFIG_MSM_KGSL_MMU=y
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
@@ -832,14 +1072,14 @@ CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_SOUND is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
 # CONFIG_HIDRAW is not set
 # CONFIG_HID_PID is not set
 
 #
 # Special HID drivers
 #
-CONFIG_HID_COMPAT=y
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_WACOM is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -847,39 +1087,67 @@ CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
-
-#
-# Enable Host or Gadget support to see Inventra options
-#
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
-#
-# CONFIG_USB_GADGET is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=500
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
+CONFIG_USB_GADGET_MSM_72K=y
+CONFIG_USB_MSM_72K=y
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_ETH is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_ANDROID=y
+# CONFIG_USB_ANDROID_ACM is not set
+CONFIG_USB_ANDROID_ADB=y
+CONFIG_USB_ANDROID_DIAG=y
+CONFIG_USB_ANDROID_MASS_STORAGE=y
+CONFIG_USB_ANDROID_RNDIS=y
+CONFIG_USB_ANDROID_RNDIS_WCEIS=y
+# CONFIG_USB_CDC_COMPOSITE is not set
 
 #
 # OTG and related infrastructure
 #
-
-#
-# USB Function Support
-#
-CONFIG_USB_FUNCTION=y
-CONFIG_USB_FUNCTION_MSM_HSUSB=y
-# CONFIG_USB_FUNCTION_NULL is not set
-# CONFIG_USB_FUNCTION_ZERO is not set
-# CONFIG_USB_FUNCTION_LOOPBACK is not set
-CONFIG_USB_FUNCTION_ADB=y
-# CONFIG_USB_FUNCTION_UMS is not set
-CONFIG_USB_FUNCTION_MASS_STORAGE=y
-CONFIG_USB_FUNCTION_DIAG=y
-# CONFIG_USB_FUNCTION_SERIAL is not set
-# CONFIG_USB_FUNCTION_ETHER is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
-CONFIG_MMC_PARANOID_SD_INIT=y
+# CONFIG_MMC_PARANOID_SD_INIT is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -894,10 +1162,10 @@ CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
 # MMC/SD/SDIO Host Controller Drivers
 #
 # CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_AT91 is not set
+# CONFIG_MMC_ATMELMCI is not set
 CONFIG_MMC_MSM7X00A=y
-# CONFIG_MMC_MSM7X00A_RESUME_IN_WQ is not set
 # CONFIG_MEMSTICK is not set
-# CONFIG_ACCESSIBILITY is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 
@@ -906,8 +1174,11 @@ CONFIG_LEDS_CLASS=y
 #
 # CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LP3944 is not set
 CONFIG_LEDS_CPLD=y
 # CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_BD2802 is not set
 
 #
 # LED Triggers
@@ -916,10 +1187,16 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
 CONFIG_LEDS_TRIGGER_SLEEP=y
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
+# CONFIG_ACCESSIBILITY is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -952,6 +1229,7 @@ CONFIG_RTC_INTF_ALARM_DEV=y
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
 
 #
 # SPI RTC drivers
@@ -976,19 +1254,17 @@ CONFIG_RTC_INTF_ALARM_DEV=y
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_MSM7X00A=y
+# CONFIG_RTC_DRV_MSM7X01A is not set
 # CONFIG_DMADEVICES is not set
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_DEBUG=y
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-CONFIG_REGULATOR_TPS65023=y
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
 CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
-# CONFIG_MEILHAUS is not set
 # CONFIG_ECHO is not set
-# CONFIG_COMEDI is not set
 
 #
 # Android
@@ -998,38 +1274,59 @@ CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_LOGGER=y
 CONFIG_ANDROID_RAM_CONSOLE=y
 CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION=y
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_DATA_SIZE=128
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE=16
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE=8
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
-# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
+CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT=y
+CONFIG_ANDROID_RAM_CONSOLE_EARLY_ADDR=0xF8010000
+CONFIG_ANDROID_RAM_CONSOLE_EARLY_SIZE=0x00040000
 CONFIG_ANDROID_TIMED_OUTPUT=y
 CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 
 #
+# Qualcomm MSM Camera And Video
+#
+# CONFIG_MSM_CAMERA_FLASH is not set
+
+#
+# Camera Sensor Selection
+#
+# CONFIG_DST is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_PLAN9AUTH is not set
+
+#
+# RAR Register Driver
+#
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_IIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT2_FS_XIP=y
 CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
 # CONFIG_EXT4_FS is not set
+CONFIG_FS_XIP=y
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-CONFIG_FILE_LOCKING=y
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_FILE_LOCKING is not set
+CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -1039,6 +1336,11 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_FUSE_FS is not set
 
 #
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
@@ -1073,7 +1375,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-CONFIG_YAFFS_FS=y
+CONFIG_YAFFS_FS=m
 CONFIG_YAFFS_YAFFS1=y
 # CONFIG_YAFFS_9BYTE_TAGS is not set
 # CONFIG_YAFFS_DOES_ECC is not set
@@ -1086,7 +1388,9 @@ CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
 # CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set
 # CONFIG_JFFS2_FS is not set
 # CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
@@ -1095,6 +1399,12 @@ CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
 
 #
 # Partition Types
@@ -1141,6 +1451,7 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
+# CONFIG_DLM is not set
 
 #
 # Kernel hacking
@@ -1150,6 +1461,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
@@ -1158,12 +1470,14 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 CONFIG_DEBUG_SLAB=y
 # CONFIG_DEBUG_SLAB_LEAK is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -1175,6 +1489,7 @@ CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_VM=y
@@ -1183,31 +1498,25 @@ CONFIG_DEBUG_VM=y
 # CONFIG_DEBUG_LIST is not set
 CONFIG_DEBUG_SG=y
 # CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
+# CONFIG_PAGE_POISONING is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
-
-#
-# Tracers
-#
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
+# CONFIG_ARM_UNWIND is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -1225,7 +1534,6 @@ CONFIG_CRYPTO=y
 #
 # Crypto core or helper
 #
-# CONFIG_CRYPTO_FIPS is not set
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
@@ -1235,10 +1543,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_TEST is not set
@@ -1266,11 +1576,13 @@ CONFIG_CRYPTO_ECB=y
 #
 CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
 
 #
 # Digest
 #
-# CONFIG_CRYPTO_CRC32C is not set
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_GHASH is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1308,6 +1620,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYPTO_LZO is not set
 
 #
@@ -1315,6 +1628,7 @@ CONFIG_CRYPTO_DEFLATE=y
 #
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_HW=y
+# CONFIG_BINARY_PRINTF is not set
 
 #
 # Library routines
@@ -1322,18 +1636,17 @@ CONFIG_CRYPTO_HW=y
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=y
-# CONFIG_CRC16 is not set
+CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-CONFIG_REED_SOLOMON=y
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_PLIST=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/recipes/linux/linux-qsd8_git.bb b/recipes/linux/linux-qsd8_git.bb
index d3648e6b1e..3277a1d576 100644
--- a/recipes/linux/linux-qsd8_git.bb
+++ b/recipes/linux/linux-qsd8_git.bb
@@ -1,13 +1,13 @@
 require linux.inc
 
-PV = "2.6.29+${PR}+gitr${SRCREV}"
-PR = "r13"
+PV = "2.6.32+${PR}+gitr${SRCREV}"
+PR = "r15"
 
 COMPATIBLE_MACHINE = "htcnexus|htcleo"
 
-SRCREV = "2d3ee40a2d334693c342ef10c5fde599854e91a9"
+SRCREV = "bc796399c0a19622b8aa1f705d841c9b4059550b"
 
-SRC_BRANCH = "htc-qsd8k-2.6.29"
+SRC_BRANCH = "htc-msm-2.6.32"
 
 SRC_URI = "\
   git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=${SRC_BRANCH};protocol=git \
diff --git a/recipes/linux/linux-replicant_git.bb b/recipes/linux/linux-replicant_git.bb
index 894e30882f..7919694dfc 100644
--- a/recipes/linux/linux-replicant_git.bb
+++ b/recipes/linux/linux-replicant_git.bb
@@ -1,10 +1,9 @@
 require linux.inc
 
-PV = "2.6.25+${PR}+gitr${SRCPV}"
-PE = "2"
-PV_htcraphael = "2.6.27+${PR}+gitr${SRCPV}"
-PV_htcdiamond = "2.6.27+${PR}+gitr${SRCPV}"
-PV_htcdream = "2.6.29+${PR}+gitr${SRCPV}"
+PV = "2.6.25+${PR}+gitr${SRCREV}"
+PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}"
+PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}"
+PV_htcdream = "2.6.29+${PR}+gitr${SRCREV}"
 PR = "r13"
 
 COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone|htcdream"
diff --git a/recipes/linux/linux-rp-2.6.26/defconfig-poodle b/recipes/linux/linux-rp-2.6.26/defconfig-poodle
index 9d5e340114..274789fe56 100644
--- a/recipes/linux/linux-rp-2.6.26/defconfig-poodle
+++ b/recipes/linux/linux-rp-2.6.26/defconfig-poodle
@@ -767,11 +767,7 @@ CONFIG_MII=m
 # CONFIG_WLAN_PRE80211 is not set
 CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_USB is not set
-CONFIG_LIBERTAS_CS=m
-# CONFIG_LIBERTAS_SDIO is not set
-# CONFIG_LIBERTAS_DEBUG is not set
+# CONFIG_LIBERTAS is not set
 CONFIG_HERMES=m
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
diff --git a/recipes/linux/linux-rp-2.6.26/poodle_pm-r7.patch b/recipes/linux/linux-rp-2.6.26/poodle_pm-r7.patch
new file mode 100644
index 0000000000..75ad6213f4
--- /dev/null
+++ b/recipes/linux/linux-rp-2.6.26/poodle_pm-r7.patch
@@ -0,0 +1,481 @@
+ arch/arm/common/locomo.c          |    6
+ arch/arm/common/sharpsl_pm.c      |    9
+ arch/arm/mach-pxa/Kconfig         |    1
+ arch/arm/mach-pxa/Makefile        |    2
+ arch/arm/mach-pxa/poodle_pm.c     |  355 ++++++++++++++++++++++++++++++++++++++
+ include/asm-arm/hardware/locomo.h |    5
+ 6 files changed, 377 insertions(+), 1 deletion(-)
+
+Index: linux-2.6.26/arch/arm/common/sharpsl_pm.c
+===================================================================
+--- linux-2.6.26.orig/arch/arm/common/sharpsl_pm.c	2008-08-05 22:15:07.000000000 -0700
++++ linux-2.6.26/arch/arm/common/sharpsl_pm.c	2008-08-05 22:15:11.000000000 -0700
+@@ -458,6 +458,10 @@
+ {
+	int temp, i, buff[5];
+
++	/* Some devices don't support this */
++	if (!sharpsl_pm.machinfo->charge_acin_high)
++		return 0;
++
+	for (i=0; i<5; i++) {
+		buff[i] = sharpsl_pm.machinfo->read_devdata(SHARPSL_ACIN_VOLT);
+		mdelay(SHARPSL_CHECK_BATTERY_WAIT_TIME_ACIN);
+@@ -598,6 +602,9 @@
+
+	dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check entered\n");
+
++	if (machine_is_poodle())
++		return 0;
++
+	/* Check AC-Adapter */
+	acin = sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN);
+
+@@ -664,6 +671,7 @@
+		dev_dbg(sharpsl_pm.dev, "Offline Charger: Step 1\n");
+
+		/* AC Check */
++		if (!machine_is_poodle())
+		if ((sharpsl_ac_check() < 0) || (sharpsl_check_battery_temp() < 0))
+			return sharpsl_off_charge_error();
+
+@@ -686,6 +694,7 @@
+
+		dev_dbg(sharpsl_pm.dev, "Offline Charger: Step 2\n");
+
++		if (!machine_is_poodle())
+		if ((sharpsl_check_battery_temp() < 0) || (sharpsl_check_battery_voltage() < 0))
+			return sharpsl_off_charge_error();
+
+Index: linux-2.6.26/arch/arm/mach-pxa/Kconfig
+===================================================================
+--- linux-2.6.26.orig/arch/arm/mach-pxa/Kconfig	2008-08-05 22:15:05.000000000 -0700
++++ linux-2.6.26/arch/arm/mach-pxa/Kconfig	2008-08-05 22:16:25.000000000 -0700
+@@ -210,6 +210,7 @@
+	bool "Enable Sharp SL-5600 (Poodle) Support"
+	depends on PXA_SHARPSL_25x
+	select SHARP_LOCOMO
++	select SHARPSL_PM
+	select PXA_SSP
+
+ config MACH_CORGI
+Index: linux-2.6.26/arch/arm/mach-pxa/Makefile
+===================================================================
+--- linux-2.6.26.orig/arch/arm/mach-pxa/Makefile	2008-08-05 22:15:05.000000000 -0700
++++ linux-2.6.26/arch/arm/mach-pxa/Makefile	2008-08-05 22:16:25.000000000 -0700
+@@ -30,7 +30,7 @@
+ obj-$(CONFIG_PXA_SHARP_C7xx)	+= corgi.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o corgi_pm.o
+ obj-$(CONFIG_PXA_SHARP_Cxx00)	+= spitz.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o spitz_pm.o
+ obj-$(CONFIG_MACH_AKITA)	+= akita-ioexp.o
+-obj-$(CONFIG_MACH_POODLE)	+= poodle.o corgi_ssp.o
++obj-$(CONFIG_MACH_POODLE)	+= poodle.o corgi_ssp.o sharpsl_pm.o poodle_pm.o
+ obj-$(CONFIG_MACH_HX2750)	+= hx2750.o hx2750_test.o
+ obj-$(CONFIG_MACH_PCM027)	+= pcm027.o
+ obj-$(CONFIG_MACH_PCM990_BASEBOARD)	+= pcm990-baseboard.o
+Index: linux-2.6.26/arch/arm/mach-pxa/poodle_pm.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.26/arch/arm/mach-pxa/poodle_pm.c	2008-08-05 22:21:31.000000000 -0700
+@@ -0,0 +1,356 @@
++/*
++ * Battery and Power Management code for the Sharp SL-5600
++ *
++ * Copyright (c) 2006 Richard Purdie
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/stat.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/delay.h>
++#include <linux/interrupt.h>
++#include <linux/platform_device.h>
++#include <linux/apm-emulation.h>
++#include <asm/irq.h>
++#include <asm/mach-types.h>
++#include <asm/hardware.h>
++#include <asm/hardware/scoop.h>
++#include <asm/hardware/locomo.h>
++
++#include <asm/arch/sharpsl.h>
++#include <asm/arch/poodle.h>
++#include <asm/arch/pxa-regs.h>
++#include <asm/arch/pxa2xx-gpio.h>
++#include "sharpsl.h"
++
++#if 0
++#define SHARPSL_CHARGE_ON_VOLT         0x99  /* 2.9V */
++#define SHARPSL_CHARGE_ON_TEMP         0xe0  /* 2.9V */
++#define SHARPSL_CHARGE_ON_ACIN_HIGH    0x9b  /* 6V */
++#define SHARPSL_CHARGE_ON_ACIN_LOW     0x34  /* 2V */
++#define SHARPSL_FATAL_ACIN_VOLT        182   /* 3.45V */
++#define SHARPSL_FATAL_NOACIN_VOLT      170   /* 3.40V */
++#endif
++
++#define SHARPSL_CHARGE_ON_VOLT			1187	// 2.9V
++#define SHARPSL_CHARGE_ON_TEMP			2441
++#define SHARPSL_FATAL_NOACIN_VOLT	1454    // 3.55V
++#define SHARPSL_FATAL_ACIN_VOLT	1474    // 3.60V
++
++
++#if 0
++#define SHARPSL_POWER_MODE_CHECK		1475
++#define SHARPSL_POODLE_FATAL_VOLT		1433
++#define SHARPSL_POODLE_FATAL_NOACIN_FLON_VOLT	1454    // 3.55V
++#define SHARPSL_POODLE_FATAL_NOACIN_FLOFF_VOLT	1433    // 3.50V
++#define SHARPSL_POODLE_FATAL_ACIN_FLON_VOLT	1474    // 3.60V
++#define SHARPSL_POODLE_FATAL_ACIN_FLOFF_VOLT	1454    // 3.55V
++#define SHARPSL_CHECK_BATTERY_WAIT_TIME_TEMP	5	// 50msec
++#define SHARPSL_CHECK_BATTERY_WAIT_TIME_VOLT	1	// 10msec
++#define SHARPSL_WAIT_DISCHARGE_ON		5	// 50msec
++#endif
++
++
++struct battery_thresh poodle_battery_levels_fl[] = {
++    {1582, 100},
++    {1527,  75},
++    {1482,  50},
++    {1458,  25},
++    {1404,   5},
++    {   0,   0},
++};
++
++struct battery_thresh poodle_battery_levels_nofl[] = {
++    {1589, 100},
++    {1536,  75},
++    {1490,  50},
++    {1466,  25},
++    {1413,   5},
++    {   0,   0},
++};
++
++struct battery_thresh poodle_battery_levels_acin_fl[] = {
++    {1601, 100},
++    {1536,  75},
++    {1503,  50},
++    {1482,  25},
++    {   0,   5},
++    {   0,   0},
++};
++
++struct battery_thresh poodle_battery_levels_acin_nofl[] = {
++    {1609, 100},
++    {1548,  75},
++    {1527,  50},
++    {1495,  25},
++    {   0,   5},
++    {   0,   0},
++};
++
++static void poodle_charger_init(void)
++{
++	pxa_gpio_mode(POODLE_GPIO_ADC_TEMP_ON | GPIO_OUT);
++	pxa_gpio_mode(POODLE_GPIO_CHRG_ON | GPIO_OUT);
++	pxa_gpio_mode(POODLE_GPIO_BYPASS_ON | GPIO_OUT);
++	pxa_gpio_mode(POODLE_GPIO_ON_KEY | GPIO_IN);
++	sharpsl_pm_pxa_init();
++}
++
++static void poodle_measure_temp(int on)
++{
++	if (on)
++		GPSR(POODLE_GPIO_ADC_TEMP_ON) = GPIO_bit(POODLE_GPIO_ADC_TEMP_ON);
++	else
++		GPCR(POODLE_GPIO_ADC_TEMP_ON) = GPIO_bit(POODLE_GPIO_ADC_TEMP_ON);
++}
++
++extern struct locomo_dev *frontlight_dev;
++
++static void poodle_charge(int on)
++{
++	if (on) {
++		GPSR(POODLE_GPIO_CHRG_ON) = GPIO_bit(POODLE_GPIO_CHRG_ON);
++		locomo_gpio_write(&poodle_locomo_device.dev, POODLE_LOCOMO_GPIO_JK_B, 1);
++	} else {
++		GPCR(POODLE_GPIO_CHRG_ON) = GPIO_bit(POODLE_GPIO_CHRG_ON);
++		locomo_gpio_write(&poodle_locomo_device.dev, POODLE_LOCOMO_GPIO_JK_B, 0);
++	}
++}
++
++static void poodle_discharge(int on)
++{
++	if (on)
++		GPSR(POODLE_GPIO_DISCHARGE_ON) = GPIO_bit(POODLE_GPIO_DISCHARGE_ON);
++	else
++		GPCR(POODLE_GPIO_DISCHARGE_ON) = GPIO_bit(POODLE_GPIO_DISCHARGE_ON);
++}
++
++static void poodle_presuspend(void)
++{
++	int i;
++	unsigned long wakeup_mask;
++
++	/* charging , so CHARGE_ON bit is HIGH during OFF. */
++	if (READ_GPIO_BIT(POODLE_GPIO_CHRG_ON))
++		PGSR1 |= GPIO_bit(POODLE_GPIO_CHRG_ON);
++	else
++		PGSR1 &= ~GPIO_bit(POODLE_GPIO_CHRG_ON);
++
++//	if (READ_GPIO_BIT(CORGI_GPIO_CHRG_UKN))
++//		PGSR1 |= GPIO_bit(CORGI_GPIO_CHRG_UKN);
++//	else
++//		PGSR1 &= ~GPIO_bit(CORGI_GPIO_CHRG_UKN);
++
++	/* Resume on keyboard power key */
++//	PGSR2 = (PGSR2 & ~CORGI_GPIO_ALL_STROBE_BIT) | CORGI_GPIO_STROBE_BIT(0);
++
++	wakeup_mask = GPIO_bit(POODLE_GPIO_ON_KEY) | GPIO_bit(POODLE_GPIO_WAKEUP);
++	wakeup_mask |= GPIO_bit(POODLE_GPIO_AC_IN) | GPIO_bit(POODLE_GPIO_CHRG_FULL);
++	wakeup_mask |= GPIO_bit(POODLE_GPIO_MAIN_BAT_LOW) | GPIO_bit(POODLE_GPIO_CF_CD);
++	wakeup_mask |= GPIO_bit(POODLE_GPIO_HP_IN) | GPIO_bit(POODLE_GPIO_GA_INT) | GPIO_bit(POODLE_GPIO_nSD_INT);
++
++
++//	if (!machine_is_corgi())
++//		GPDR0 &= ~(GPIO_bit(15) | GPIO_bit(8)); /* Float n_CS1 */
++
++	PWER = wakeup_mask | PWER_RTC;
++	PRER = wakeup_mask;
++	PFER = wakeup_mask;
++
++	for (i = 0; i <=15; i++) {
++		if (PRER & PFER & GPIO_bit(i)) {
++			if (GPLR0 & GPIO_bit(i) )
++				PRER &= ~GPIO_bit(i);
++			else
++				PFER &= ~GPIO_bit(i);
++		}
++	}
++}
++
++static void poodle_postsuspend(void)
++{
++//	if (!machine_is_corgi())
++//		GPDR0 |= GPIO_bit(15) | GPIO_bit(8); /* Un-Float n_CS1 */
++}
++
++/*
++ * Check what brought us out of the suspend.
++ * Return: 0 to sleep, otherwise wake
++ */
++static int poodle_should_wakeup(unsigned int resume_on_alarm)
++{
++	int is_resume = 0;
++
++	dev_dbg(sharpsl_pm.dev, "GPLR0 = %x,%x\n", GPLR0, PEDR);
++
++	if ((PEDR & GPIO_bit(POODLE_GPIO_AC_IN))) {
++		if (sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN)) {
++			/* charge on */
++			dev_dbg(sharpsl_pm.dev, "ac insert\n");
++			sharpsl_pm.flags |= SHARPSL_DO_OFFLINE_CHRG;
++		} else {
++			/* charge off */
++			dev_dbg(sharpsl_pm.dev, "ac remove\n");
++			sharpsl_pm_led(SHARPSL_LED_OFF);
++			sharpsl_pm.machinfo->charge(0);
++			sharpsl_pm.charge_mode = CHRG_OFF;
++		}
++	}
++
++	if ((PEDR & GPIO_bit(POODLE_GPIO_CHRG_FULL)))
++		dev_dbg(sharpsl_pm.dev, "Charge full interrupt\n");
++
++	if (PEDR & GPIO_bit(POODLE_GPIO_ON_KEY))
++		is_resume |= GPIO_bit(POODLE_GPIO_ON_KEY);
++
++	if (PEDR & GPIO_bit(POODLE_GPIO_WAKEUP))
++		is_resume |= GPIO_bit(POODLE_GPIO_WAKEUP);
++
++//	if ( (apm_wakeup_factor & GPIO_bit(GPIO_GA_INT)) && (LCM_KIC & 1) ) {
++//		LCM_KIC &= ~0x100;
++//		LCM_ICR &= ~0x100;
++//		is_resume |= GPIO_bit(GPIO_GA_INT);
++//	}
++
++	if (PEDR & GPIO_bit(POODLE_GPIO_CF_STSCHG))
++		is_resume |= GPIO_bit(POODLE_GPIO_CF_STSCHG);
++
++	if (PEDR & GPIO_bit(POODLE_GPIO_nSD_INT))
++		is_resume |= GPIO_bit(POODLE_GPIO_nSD_INT);
++
++	if (PEDR & GPIO_bit(POODLE_GPIO_HP_IN))
++		is_resume |= GPIO_bit(POODLE_GPIO_HP_IN);
++
++	if (resume_on_alarm && (PEDR & PWER_RTC))
++		is_resume |= PWER_RTC;
++
++	dev_dbg(sharpsl_pm.dev, "is_resume: %x\n",is_resume);
++	return is_resume;
++}
++
++static unsigned long poodle_charger_wakeup(void)
++{
++	return ~GPLR0 & ( GPIO_bit(POODLE_GPIO_AC_IN) | GPIO_bit(POODLE_GPIO_ON_KEY) | GPIO_bit(POODLE_GPIO_WAKEUP) );
++}
++
++#define MUX_CHL    6u
++#define BATT_CHL   2u
++
++/* ADS7846 Touch Screen Controller bit definitions */
++#define ADSCTRL_PD0		(1u << 0)	/* PD0 */
++#define ADSCTRL_PD1		(1u << 1)	/* PD1 */
++#define ADSCTRL_DFR		(1u << 2)	/* SER/DFR */
++#define ADSCTRL_MOD		(1u << 3)	/* Mode */
++#define ADSCTRL_ADR_SH	4	/* Address setting */
++#define ADSCTRL_STS		(1u << 7)	/* Start Bit */
++
++int poodle_pm_read_ads7846(int channel)
++{
++	int voltage;
++	int cmd = ADSCTRL_PD0 | ADSCTRL_PD1 | ADSCTRL_DFR |
++		(channel << ADSCTRL_ADR_SH) | ADSCTRL_STS;
++
++	corgi_ssp_ads7846_lock();
++
++	corgi_ssp_ads7846_put(cmd);
++	corgi_ssp_ads7846_get();
++
++	corgi_ssp_ads7846_put(cmd);
++	voltage = corgi_ssp_ads7846_get();
++
++	/* Power-Down Enable */
++	corgi_ssp_ads7846_put((1u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
++	corgi_ssp_ads7846_get();
++
++	corgi_ssp_ads7846_unlock();
++
++	return voltage;
++}
++
++unsigned long poodlepm_read_devdata(int type)
++{
++	switch(type) {
++	case SHARPSL_STATUS_ACIN:
++		return ((GPLR(POODLE_GPIO_AC_IN) & GPIO_bit(POODLE_GPIO_AC_IN)) != 0);
++	case SHARPSL_STATUS_LOCK:
++		return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_batlock);
++	case SHARPSL_STATUS_CHRGFULL:
++		return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_batfull);
++	case SHARPSL_STATUS_FATAL:
++		return READ_GPIO_BIT(sharpsl_pm.machinfo->gpio_fatal);
++//	case SHARPSL_ACIN_VOLT:
++//		return poodle_pm_read_ads7846(MAX1111_ACIN_VOLT);
++// FIXME
++	case SHARPSL_BATT_TEMP:
++		return poodle_pm_read_ads7846(MUX_CHL);
++	case SHARPSL_BATT_VOLT:
++	default:
++		return poodle_pm_read_ads7846(BATT_CHL);
++	}
++}
++
++static void poodle_limit_intensity(int limit)
++{
++}
++
++static struct sharpsl_charger_machinfo poodle_pm_machinfo = {
++	.init            = poodle_charger_init,
++	.exit            = sharpsl_pm_pxa_remove,
++	.gpio_batlock    = POODLE_GPIO_BAT_COVER,
++	.gpio_acin       = POODLE_GPIO_AC_IN,
++	.gpio_batfull    = POODLE_GPIO_CHRG_FULL,
++	.batfull_irq	  = 1,
++	.discharge       = poodle_discharge,
++	.charge          = poodle_charge,
++	.measure_temp    = poodle_measure_temp,
++	.presuspend      = poodle_presuspend,
++	.postsuspend     = poodle_postsuspend,
++	.read_devdata    = poodlepm_read_devdata,
++	.charger_wakeup  = poodle_charger_wakeup,
++	.should_wakeup   = poodle_should_wakeup,
++	.backlight_limit =  poodle_limit_intensity,
++	.charge_on_volt	  = SHARPSL_CHARGE_ON_VOLT,
++	.charge_on_temp	  = SHARPSL_CHARGE_ON_TEMP,
++	.fatal_acin_volt  = SHARPSL_FATAL_ACIN_VOLT,
++	.fatal_noacin_volt= SHARPSL_FATAL_NOACIN_VOLT,
++	.bat_levels       = 6,
++	.bat_levels_noac  = poodle_battery_levels_fl,
++	.bat_levels_acin  = poodle_battery_levels_nofl,
++	.status_high_acin = 1490,
++	.status_low_acin  = 1466,
++	.status_high_noac = 1482,
++	.status_low_noac  = 1458,
++};
++
++static struct platform_device *poodlepm_device;
++
++static int __devinit poodlepm_init(void)
++{
++	int ret;
++
++	poodlepm_device = platform_device_alloc("sharpsl-pm", -1);
++	if (!poodlepm_device)
++		return -ENOMEM;
++
++	poodlepm_device->dev.platform_data = &poodle_pm_machinfo;
++	ret = platform_device_add(poodlepm_device);
++
++	if (ret)
++		platform_device_put(poodlepm_device);
++
++	return ret;
++}
++
++static void poodlepm_exit(void)
++{
++	platform_device_unregister(poodlepm_device);
++}
++
++module_init(poodlepm_init);
++module_exit(poodlepm_exit);
+Index: linux-2.6.26/arch/arm/common/locomo.c
+===================================================================
+--- linux-2.6.26.orig/arch/arm/common/locomo.c	2008-07-13 14:51:29.000000000 -0700
++++ linux-2.6.26/arch/arm/common/locomo.c	2008-08-05 22:16:20.000000000 -0700
+@@ -600,6 +600,7 @@
+	spin_lock_irqsave(&lchip->lock, flags);
+
+	save->LCM_GPO     = locomo_readl(lchip->base + LOCOMO_GPO);	/* GPIO */
++	// FIXME - should save JK_B
+	locomo_writel(0x00, lchip->base + LOCOMO_GPO);
+	save->LCM_SPICT   = locomo_readl(lchip->base + LOCOMO_SPI + LOCOMO_SPICT);	/* SPI */
+	locomo_writel(0x40, lchip->base + LOCOMO_SPICT);
+@@ -1101,11 +1102,16 @@
+
+ static struct locomo *locomo_chip_driver(struct locomo_dev *ldev);
+
++struct locomo_dev *frontlight_dev;
++EXPORT_SYMBOL(frontlight_dev);
++
+ void locomo_frontlight_set(struct locomo_dev *dev, int duty, int vr, int bpwf)
+ {
+	unsigned long flags;
+	struct locomo *lchip = locomo_chip_driver(dev);
+
++	frontlight_dev = dev;
++
+	if (vr)
+		locomo_gpio_write(dev->dev.parent, LOCOMO_GPIO_FL_VR, 1);
+	else
+Index: linux-2.6.26/include/asm-arm/hardware/locomo.h
+===================================================================
+--- linux-2.6.26.orig/include/asm-arm/hardware/locomo.h	2008-07-13 14:51:29.000000000 -0700
++++ linux-2.6.26/include/asm-arm/hardware/locomo.h	2008-08-05 22:15:11.000000000 -0700
+@@ -100,6 +100,12 @@
+ #define LOCOMO_GPIO_CARD_DETECT LOCOMO_GPIO(13)
+ #define LOCOMO_GPIO_WRITE_PROT  LOCOMO_GPIO(14)
+ #define LOCOMO_GPIO_CARD_POWER  LOCOMO_GPIO(15)
++#define POODLE_LOCOMO_GPIO_AMP_ON      LOCOMO_GPIO(8)
++#define POODLE_LOCOMO_GPIO_MUTE_L      LOCOMO_GPIO(10)
++#define POODLE_LOCOMO_GPIO_MUTE_R      LOCOMO_GPIO(11)
++#define POODLE_LOCOMO_GPIO_232VCC_ON   LOCOMO_GPIO(12)
++#define POODLE_LOCOMO_GPIO_JK_B        LOCOMO_GPIO(13)
++
+
+ /* Start the definitions of the devices.  Each device has an initial
+  * base address and a series of offsets from that base address. */
diff --git a/recipes/linux/linux-rp-2.6.26/poodle_serial_vcc-r1.patch b/recipes/linux/linux-rp-2.6.26/poodle_serial_vcc-r1.patch
new file mode 100644
index 0000000000..853dce8ac2
--- /dev/null
+++ b/recipes/linux/linux-rp-2.6.26/poodle_serial_vcc-r1.patch
@@ -0,0 +1,30 @@
+
+Index: linux-2.6.26/arch/arm/common/locomo.c
+===================================================================
+--- linux-2.6.26.orig/arch/arm/common/locomo.c	2008-08-02 20:53:56.000000000 -0700
++++ linux-2.6.26/arch/arm/common/locomo.c	2008-08-04 16:50:29.000000000 -0700
+@@ -715,7 +715,7 @@
+	locomo_writel(0, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KIC);
+
+	/* GPIO */
+-	locomo_writel(0, lchip->base + LOCOMO_GPO);
++	locomo_writel(POODLE_LOCOMO_GPIO_232VCC_ON, lchip->base + LOCOMO_GPO);
+	locomo_writel((LOCOMO_GPIO(1) | LOCOMO_GPIO(2) | LOCOMO_GPIO(13) | LOCOMO_GPIO(14))
+			, lchip->base + LOCOMO_GPE);
+	locomo_writel((LOCOMO_GPIO(1) | LOCOMO_GPIO(2) | LOCOMO_GPIO(13) | LOCOMO_GPIO(14))
+Index: linux-2.6.26/drivers/serial/pxa.c
+===================================================================
+--- linux-2.6.26.orig/drivers/serial/pxa.c	2008-08-04 16:46:37.000000000 -0700
++++ linux-2.6.26/drivers/serial/pxa.c	2008-08-04 16:48:18.000000000 -0700
+@@ -296,9 +296,9 @@
+	unsigned char mcr = 0;
+
+	if (mctrl & TIOCM_RTS)
+-		mcr |= UART_MCR_RTS;
++		mcr &= ~UART_MCR_RTS;
+	if (mctrl & TIOCM_DTR)
+-		mcr |= UART_MCR_DTR;
++		mcr &= ~UART_MCR_DTR;
+	if (mctrl & TIOCM_OUT1)
+		mcr |= UART_MCR_OUT1;
+	if (mctrl & TIOCM_OUT2)
diff --git a/recipes/linux/linux-rp-2.6.26/poodle_ts.patch b/recipes/linux/linux-rp-2.6.26/poodle_ts.patch
new file mode 100644
index 0000000000..97c0a66400
--- /dev/null
+++ b/recipes/linux/linux-rp-2.6.26/poodle_ts.patch
@@ -0,0 +1,22 @@
+Index: linux-2.6.23/arch/arm/mach-pxa/poodle.c
+===================================================================
+--- linux-2.6.23.orig/arch/arm/mach-pxa/poodle.c	2008-01-25 12:10:10.000000000 -0800
++++ linux-2.6.23/arch/arm/mach-pxa/poodle.c	2008-01-25 12:11:58.000000000 -0800
+@@ -166,7 +166,7 @@
+	},
+ };
+
+-static unsigned long poodle_get_hsync_len(void)
++static unsigned long poodle_get_hsync_invperiod(void)
+ {
+	return 0;
+ }
+@@ -176,7 +176,7 @@
+ }
+
+ static struct corgits_machinfo  poodle_ts_machinfo = {
+-	.get_hsync_len   = poodle_get_hsync_len,
++	.get_hsync_invperiod   = poodle_get_hsync_invperiod,
+	.put_hsync       = poodle_null_hsync,
+	.wait_hsync      = poodle_null_hsync,
+ };
diff --git a/recipes/linux/linux-rp-2.6.26/pxafb.patch b/recipes/linux/linux-rp-2.6.26/pxafb.patch
new file mode 100644
index 0000000000..e98543b2e4
--- /dev/null
+++ b/recipes/linux/linux-rp-2.6.26/pxafb.patch
@@ -0,0 +1,13 @@
+Index: linux-2.6.23/drivers/video/pxafb.c
+===================================================================
+--- linux-2.6.23.orig/drivers/video/pxafb.c	2008-01-25 16:25:21.000000000 -0800
++++ linux-2.6.23/drivers/video/pxafb.c	2008-01-25 16:32:14.000000000 -0800
+@@ -1194,7 +1194,7 @@
+		if ((clkinfo->old == 13000))
+			break;
+
+-		pcd = get_pcd(fbi->fb.var.pixclock);
++		pcd = get_pcd(fbi,fbi->fb.var.pixclock);
+		lccr3 = fbi->reg_lccr3;
+		set_hsync_time(fbi, pcd);
+		fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) | LCCR3_PixClkDiv(pcd);
diff --git a/recipes/linux/linux-rp.checksums.inc b/recipes/linux/linux-rp.checksums.inc
index a655188a6d..3271c392f6 100644
--- a/recipes/linux/linux-rp.checksums.inc
+++ b/recipes/linux/linux-rp.checksums.inc
@@ -1,285 +1,285 @@
-#           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;patch=1;name=rppatch1 \
+#           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;name=rppatch1 \
 SRC_URI[rppatch1.md5sum] = "a8b75ef4190dfc0afcfa8789d3e4c64c"
 SRC_URI[rppatch1.sha256sum] = "3fed945b590db46a902fa434054b967dd1bf4af1ee5f5643e00d1d66a9d69543"
-#           ${RPSRC}/hx2750_base-r34.patch;patch=1;name=rppatch2 \
+#           ${RPSRC}/hx2750_base-r34.patch;name=rppatch2 \
 SRC_URI[rppatch2.md5sum] = "38e1ea5768cba4be72088a8a12d4b1af"
 SRC_URI[rppatch2.sha256sum] = "837b95b128815f3d6689d2ecfbdc9a28023bae5f45879513f3b4c2ad12f459ee"
-#           ${RPSRC}/hx2750_bl-r9.patch;patch=1;name=rppatch3 \
+#           ${RPSRC}/hx2750_bl-r9.patch;name=rppatch3 \
 SRC_URI[rppatch3.md5sum] = "ebb78f58e9c84c73b90e9cbdde5f89d6"
 SRC_URI[rppatch3.sha256sum] = "7578448fc2adbfc820158b2467dbb127ab012b3a97ad95366d8d1af002defbce"
-#           ${RPSRC}/hx2750_pcmcia-r3.patch;patch=1;name=rppatch4 \
+#           ${RPSRC}/hx2750_pcmcia-r3.patch;name=rppatch4 \
 SRC_URI[rppatch4.md5sum] = "896d3e29ab5715b7558b972fba626425"
 SRC_URI[rppatch4.sha256sum] = "29f21117a17f945783f2eee5d5c89e10959fed44ac423ad9809d6afc0db5996c"
-#           ${RPSRC}/pxa_keys-r9.patch;patch=1;name=rppatch5 \
+#           ${RPSRC}/pxa_keys-r9.patch;name=rppatch5 \
 SRC_URI[rppatch5.md5sum] = "c1358d4c210d1d701b5b0d96d8e73c12"
 SRC_URI[rppatch5.sha256sum] = "8697e76beb6ea44ce450e8cb9bed764803fe189eaea89e0aa72ebd1974bc52e4"
-#           ${RPSRC}/tsc2101-r19.patch;patch=1;name=rppatch6 \
+#           ${RPSRC}/tsc2101-r19.patch;name=rppatch6 \
 SRC_URI[rppatch6.md5sum] = "c70fa3e0184842e4f6822b7002eac33e"
 SRC_URI[rppatch6.sha256sum] = "7ca39d0df0a102114eabcd39df94ff271d81a71d9ef9f61915ac0a04031b68d1"
-#           ${RPSRC}/hx2750_test1-r8.patch;patch=1;name=rppatch7 \
+#           ${RPSRC}/hx2750_test1-r8.patch;name=rppatch7 \
 SRC_URI[rppatch7.md5sum] = "33eed5a26b2776508500532c07956dc4"
 SRC_URI[rppatch7.sha256sum] = "a93c7f0caa8e212a4515ce209918e250e80d2643317732d707d4f25649457545"
-#           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1;name=rppatch8 \
+#           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;name=rppatch8 \
 SRC_URI[rppatch8.md5sum] = "aeea5a2614fd8f9ae7d729d1ea1dddba"
 SRC_URI[rppatch8.sha256sum] = "1bd129c7a68537533c77267992eaf490ff64bcc3d01c6f4b51343b8f266ae99e"
-#           ${RPSRC}/pm_changes-r1.patch;patch=1;name=rppatch9 \
+#           ${RPSRC}/pm_changes-r1.patch;name=rppatch9 \
 SRC_URI[rppatch9.md5sum] = "e10058b52841d138630b69b954bea0b9"
 SRC_URI[rppatch9.sha256sum] = "779561c658ccb190f3a2cd7626e4a229834c5f9b093be8f7a06bbfaf12121b9c"
-#           ${RPSRC}/locomo_kbd_tweak-r2.patch;patch=1;name=rppatch10 \
+#           ${RPSRC}/locomo_kbd_tweak-r2.patch;name=rppatch10 \
 SRC_URI[rppatch10.md5sum] = "c51ae4d5fa800ec81660fdf5b776fae6"
 SRC_URI[rppatch10.sha256sum] = "af92b078cb52f9c58964d49b074a5d09de601435c8e84cec817b636fc53c8eeb"
-#           ${RPSRC}/pxa27x_overlay-r8.patch;patch=1;name=rppatch11 \
+#           ${RPSRC}/pxa27x_overlay-r8.patch;name=rppatch11 \
 SRC_URI[rppatch11.md5sum] = "94926c8dbea9035ca9e5b44d9dd68726"
 SRC_URI[rppatch11.sha256sum] = "8848bf269257316e845857d58023fec82e7e2ff5a8092915ec4a8b033429a5cc"
-#           ${RPSRC}/w100_extaccel-r2.patch;patch=1;name=rppatch12 \
+#           ${RPSRC}/w100_extaccel-r2.patch;name=rppatch12 \
 SRC_URI[rppatch12.md5sum] = "2c958056e0a82da4d85810ea51b9e07b"
 SRC_URI[rppatch12.sha256sum] = "c8e0cf191fb60b26eb5481c24d162c3675c72bc940c42393af2f0b62897de90f"
-#           ${RPSRC}/w100_extmem-r1.patch;patch=1;name=rppatch13 \
+#           ${RPSRC}/w100_extmem-r1.patch;name=rppatch13 \
 SRC_URI[rppatch13.md5sum] = "a17be90788c4ccd6ee8253659b9321f8"
 SRC_URI[rppatch13.sha256sum] = "56dfd5365848095793faa31ee1cf753c10891dd076944d3533b05c6547965134"
-#           ${RPSRC}/poodle_pm-r6.patch;patch=1;name=rppatch14 \
+#           ${RPSRC}/poodle_pm-r6.patch;name=rppatch14 \
 SRC_URI[rppatch14.md5sum] = "e897eb0dc64c2862091f97e20f580de6"
 SRC_URI[rppatch14.sha256sum] = "66283a36122d77a4118a1b2e48af92c03ae09b3e53fe7875e7fe3db1486a522c"
-#           ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1;name=rppatch15 \
+#           ${RPSRC}/poodle_lcd_hack-r0.patch;name=rppatch15 \
 SRC_URI[rppatch15.md5sum] = "05766128b2b0abdd01048e5e08430600"
 SRC_URI[rppatch15.sha256sum] = "5fcd54adf3c8e7e99078a585683926224b5b49a99e4e675694621c3e08e6aad0"
-#           ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1;name=rppatch16 \
+#           ${RPSRC}/poodle_asoc_fix-r1.patch;name=rppatch16 \
 SRC_URI[rppatch16.md5sum] = "7c766563674dec668baa5f650a14b7cd"
 SRC_URI[rppatch16.sha256sum] = "3f78e714248cdaa0b83f530a3b7f80da02446b179e86fbb043d57c3e05ae0d7e"
-#           ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable;name=rppatch17 \
+#           ${RPSRC}/logo_oh-r1.patch.bz2;status=unmergable;name=rppatch17 \
 SRC_URI[rppatch17.md5sum] = "959b91235cb2ebd45c5f3dc755c744fa"
 SRC_URI[rppatch17.sha256sum] = "d56a238d3378012c965f25c12b136bd380f9faf27a6b5f08e79c252a724129a5"
-#           ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable;name=rppatch18 \
+#           ${RPSRC}/pxa-linking-bug.patch;status=unmergable;name=rppatch18 \
 SRC_URI[rppatch18.md5sum] = "ce6d8a7a25cc1c9593417746bcf84ca0"
 SRC_URI[rppatch18.sha256sum] = "24aac1d158095007a10a47e38320a1618fab2d536f19caff94f4dd0ab29f306b"
-#           ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack;name=rppatch19 \
+#           ${RPSRC}/mmcsd_large_cards-r1.patch;status=hack;name=rppatch19 \
 SRC_URI[rppatch19.md5sum] = "9b69a1f5951ebd26d5b29ac326c5c414"
 SRC_URI[rppatch19.sha256sum] = "8de4e1a8696c2f47ed1b9009498b4f89ba9dd3fbda6083531ef40c35ce001996"
-#           ${RPSRC}/mmcsd_no_scr_check-r2.patch;patch=1;status=hack;name=rppatch20 \
+#           ${RPSRC}/mmcsd_no_scr_check-r2.patch;status=hack;name=rppatch20 \
 SRC_URI[rppatch20.md5sum] = "b60a6035a3e84ba68771fef999ccc96f"
 SRC_URI[rppatch20.sha256sum] = "fe3dcba12eab368a5c14e6c247886bcbaa3fafc662ea8de00fd579f956a21a71"
-#           ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack;name=rppatch21 \
+#           ${RPSRC}/integrator_rgb-r1.patch;status=hack;name=rppatch21 \
 SRC_URI[rppatch21.md5sum] = "15a09026135382c716a11633344ba3c4"
 SRC_URI[rppatch21.sha256sum] = "49521feb1a6e2bc9b355e93b3251e3c74ebe2327eb89c6e681347464e81e3664"
-#           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack;name=rppatch22 \
+#           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;status=hack;name=rppatch22 \
 SRC_URI[rppatch22.md5sum] = "b67218e773a236631b41a1718049bbc7"
 SRC_URI[rppatch22.sha256sum] = "f6ddc6636b2a8e4392dab43fdcfd9521e2d7f9022e56c39ecee66d50a94bdc98"
-#           ${RPSRC}/pxa27x_overlay-r5.patch;patch=1;name=rppatch23 \
+#           ${RPSRC}/pxa27x_overlay-r5.patch;name=rppatch23 \
 SRC_URI[rppatch23.md5sum] = "6aaf8527d5e7af634ec7067f731d4702"
 SRC_URI[rppatch23.sha256sum] = "436422924eede3d68758b84b2cd3b7fc0f204454fa9577b366acbd6c0c4c87e7"
-#           ${RPSRC}/input_power-r7.patch;patch=1;name=rppatch24 \
+#           ${RPSRC}/input_power-r7.patch;name=rppatch24 \
 SRC_URI[rppatch24.md5sum] = "25bbe0e1412dce7f36f54392872c673c"
 SRC_URI[rppatch24.sha256sum] = "8526befd5b233a5911ccc6b6db4bba29ca3156db2828c11b5c696aa2e506c621"
-#           ${RPSRC}/lzo_kernel-r0.patch;patch=1;name=rppatch25 \
+#           ${RPSRC}/lzo_kernel-r0.patch;name=rppatch25 \
 SRC_URI[rppatch25.md5sum] = "58f444edda4cc611236cfc2641905ca2"
 SRC_URI[rppatch25.sha256sum] = "932760a92ad3b7bad483a9587dddf7784f9084676cfe7fbb2352681165b594d7"
-#           ${RPSRC}/lzo_jffs2-r0.patch;patch=1;name=rppatch26 \
+#           ${RPSRC}/lzo_jffs2-r0.patch;name=rppatch26 \
 SRC_URI[rppatch26.md5sum] = "397be20b7a23c6d540bd6cb05ed782b6"
 SRC_URI[rppatch26.sha256sum] = "9fb2878799a6f80687bf5623a94cc96ba72272041f1a5f18fddf24831c4e3764"
-#           ${RPSRC}/lzo_crypto-r0b.patch;patch=1;name=rppatch27 \
+#           ${RPSRC}/lzo_crypto-r0b.patch;name=rppatch27 \
 SRC_URI[rppatch27.md5sum] = "7c4b0de088db249cd94ec0001c4d3edd"
 SRC_URI[rppatch27.sha256sum] = "f91accabee3408cc318affb01b1dd764cad555441a2c8ee23c598880f5825807"
-#           ${RPSRC}/lzo_jffs2_lzomode-r0.patch;patch=1;name=rppatch28 \
+#           ${RPSRC}/lzo_jffs2_lzomode-r0.patch;name=rppatch28 \
 SRC_URI[rppatch28.md5sum] = "07ad218dee6afd77cf25092f8f10672f"
 SRC_URI[rppatch28.sha256sum] = "ad0d651697da09d56645a53ece0b7037aae1ed0709ac3644bc15a6b0edc53668"
-#           ${RPSRC}/lzo_jffs2_sysfs-r0.patch;patch=1;name=rppatch29 \
+#           ${RPSRC}/lzo_jffs2_sysfs-r0.patch;name=rppatch29 \
 SRC_URI[rppatch29.md5sum] = "feb7a4252b3257e3a5b31fb60cfa8aff"
 SRC_URI[rppatch29.sha256sum] = "c21877e59bb25d2d4061511da4386dcddeb99db885afe4ed50bc8b6e7d93d0bd"
-#           ${RPSRC}/pxa25x_suspend_fixes-r0.patch;patch=1;status=merged;name=rppatch30
+#           ${RPSRC}/pxa25x_suspend_fixes-r0.patch;status=merged;name=rppatch30
 SRC_URI[rppatch30.md5sum] = "b74c402b56911c98bb11053119a82754"
 SRC_URI[rppatch30.sha256sum] = "06f17ed978e7cfda0e930a3d5916c6bb06b5587216ef77fb9d4cb5cd416f680d"
-#           ${RPSRC}/lzo_jffs2-r3.patch;patch=1;status=merged;name=rppatch31 \
+#           ${RPSRC}/lzo_jffs2-r3.patch;status=merged;name=rppatch31 \
 SRC_URI[rppatch31.md5sum] = "ef03ab6e24b5f365b7040213f0046e62"
 SRC_URI[rppatch31.sha256sum] = "c7a4c68192d54ff0d4c1b0dc87459b950f685125528d9c8d127e8996b6094c62"
-#           ${RPSRC}/lzo_jffs2_lzomode-r1.patch;patch=1;status=merged;name=rppatch32 \
+#           ${RPSRC}/lzo_jffs2_lzomode-r1.patch;status=merged;name=rppatch32 \
 SRC_URI[rppatch32.md5sum] = "ca58d9992106f5131539ff0d9a6b824b"
 SRC_URI[rppatch32.sha256sum] = "9e2e57632135cdcf9e72743b94d69d0cab002cccdb63f8e3e368f40bfa0b3af2"
-#           ${RPSRC}/spitzkbd_fix-r0.patch;patch=1;status=merged;name=rppatch33 \
+#           ${RPSRC}/spitzkbd_fix-r0.patch;status=merged;name=rppatch33 \
 SRC_URI[rppatch33.md5sum] = "d69c74ab8e2d7664a48a09773450dd27"
 SRC_URI[rppatch33.sha256sum] = "59e2b9b2244c169c6580cbfffaf5e2bd2f453753f879036487ec6ed116cf851b"
-#           ${RPSRC}/locomo_led_fix-r0.patch;patch=1;status=merged;rppatch34 \
+#           ${RPSRC}/locomo_led_fix-r0.patch;status=merged;rppatch34 \
 SRC_URI[rppatch34.md5sum] = "f80615d9020c2d56a4a41dfa93ba8429"
 SRC_URI[rppatch34.sha256sum] = "34202206b33ebab7c34be20bd41fc8249745011a355be690ba997aa8e7d77943"
-#           ${RPSRC}/export_atags-r0a.patch;patch=1;status=pending;name=rppatch35 \
+#           ${RPSRC}/export_atags-r0a.patch;status=pending;name=rppatch35 \
 SRC_URI[rppatch35.md5sum] = "8ab51e8ff728f4155db64b9bb6ea6d71"
 SRC_URI[rppatch35.sha256sum] = "75d4c6ddbfc5e4fff7690a3308e2574f89a0e2709fb91caccb29067a9dad251a"
-#           ${RPSRC}/lzo_crypto-r2.patch;patch=1;status=pending;name=rppatch36 \
+#           ${RPSRC}/lzo_crypto-r2.patch;status=pending;name=rppatch36 \
 SRC_URI[rppatch36.md5sum] = "29162001c88d9dbe0ccb25103a1aefb4"
 SRC_URI[rppatch36.sha256sum] = "0b68f2d73dc54404d29015455ba84021a925aa2cfb6f1fe75705fe2268b2e2e8"
-#           ${RPSRC}/hx2750_base-r29.patch;patch=1;name=rppatch37 \
+#           ${RPSRC}/hx2750_base-r29.patch;name=rppatch37 \
 SRC_URI[rppatch37.md5sum] = "362aa4d1318108a3515510ea1bbe31a1"
 SRC_URI[rppatch37.sha256sum] = "66b557a709a87a6d90c5a1d6d385b1bb5a725144b3f6a3c7c466c48702f4ad87"
-#           ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1;name=rppatch38 \
+#           ${RPSRC}/hx2750_pcmcia-r2.patch;name=rppatch38 \
 SRC_URI[rppatch38.md5sum] = "f61363f48e8fbc1086dd3a9c66385a32"
 SRC_URI[rppatch38.sha256sum] = "f3ab5ae2056960612886adce53ed46f4b5516744b1394f40c85cedbf0ec2e29e"
-#           ${RPSRC}/hx2750_make.patch;patch=1;name=rppatch39 \ 
+#           ${RPSRC}/hx2750_make.patch;name=rppatch39 \ 
 #           doesn't exist see http://patchwork.openembedded.org/patch/932/ it's file:// fixed in recipe
 #SRC_URI[rppatch39.md5sum] = ""
 #SRC_URI[rppatch39.sha256sum] = ""
-#           ${RPSRC}/pxa_keys-r7.patch;patch=1;name=rppatch40 \
+#           ${RPSRC}/pxa_keys-r7.patch;name=rppatch40 \
 SRC_URI[rppatch40.md5sum] = "6cb642dc01dc93a99fac3f4894a432c7"
 SRC_URI[rppatch40.sha256sum] = "f6dc5a05456a6d4abb9e8b80df70aefac6f8764d04e079aa4c4c5b45cd0ff9bc"
-#           ${RPSRC}/tsc2101-r16.patch;patch=1;name=rppatch41 \
+#           ${RPSRC}/tsc2101-r16.patch;name=rppatch41 \
 SRC_URI[rppatch41.md5sum] = "28d2b552a3d416c35119bc3f459c0c1a"
 SRC_URI[rppatch41.sha256sum] = "c2bed5d4ec064e0ac9c73c046e545dfad5ebfce3c84bdade1323a9f7a5265056"
-#           ${RPSRC}/hx2750_test1-r7.patch;patch=1;name=rppatch42 \
+#           ${RPSRC}/hx2750_test1-r7.patch;name=rppatch42 \
 SRC_URI[rppatch42.md5sum] = "1d102d122b9697b9bdbd209349af1645"
 SRC_URI[rppatch42.sha256sum] = "359a3839deeba78534bba50c3a2929736d823c3cdb7164a910226c4559ae97a2"
-#           ${RPSRC}/input_power-r9.patch;patch=1;name=rppatch43 \
+#           ${RPSRC}/input_power-r9.patch;name=rppatch43 \
 SRC_URI[rppatch43.md5sum] = "1bd8229ec73078c5d7025d28774bc866"
 SRC_URI[rppatch43.sha256sum] = "fb86683341f1d09471d9301c43e77c0c50cc1cc8e2462e282d50951ca017daa3"
-#           ${RPSRC}/pxa25x_cpufreq-r2.patch;patch=1;name=rppatch44 \
+#           ${RPSRC}/pxa25x_cpufreq-r2.patch;name=rppatch44 \
 SRC_URI[rppatch44.md5sum] = "c076ac1f2368d9e8399e64a3adf3a036"
 SRC_URI[rppatch44.sha256sum] = "34358aa53caaf393af550d9771f02f144eafabb7518e84d872427dc297e493b4"
-#           ${RPSRC}/usb_add_epalloc-r3.patch;patch=1;name=rppatch45 \
+#           ${RPSRC}/usb_add_epalloc-r3.patch;name=rppatch45 \
 SRC_URI[rppatch45.md5sum] = "7a9ff02fa652daa8fd518c1a6f95162c"
 SRC_URI[rppatch45.sha256sum] = "dbc5d6921136711f08c197284ec67dc77232559e2e31429f8a30a1a102bd07f7"
-#           ${RPSRC}/usb_pxa27x_udc-r6.patch;patch=1;name=rppatch46 \
+#           ${RPSRC}/usb_pxa27x_udc-r6.patch;name=rppatch46 \
 SRC_URI[rppatch46.md5sum] = "b70762567efcf7c2645268cce520497c"
 SRC_URI[rppatch46.sha256sum] = "7bd4d2230fa1ed83021382697335bb81410b0611937f5225aad6594f04a356ba"
-#           ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1;name=rppatch47 \
+#           ${RPSRC}/locomo_kbd_tweak-r1.patch;name=rppatch47 \
 SRC_URI[rppatch47.md5sum] = "6c0d60bcc357365af056baa812c45960"
 SRC_URI[rppatch47.sha256sum] = "830ef8c4b65ed34954afc2581447fd0a9afcf5f9de354772352c8da54dceb676"
-#           ${RPSRC}/pxa27x_overlay-r6.patch;patch=1;name=rppatch48 \
+#           ${RPSRC}/pxa27x_overlay-r6.patch;name=rppatch48 \
 SRC_URI[rppatch48.md5sum] = "929218c453c881fe5b3d94c65eb6fe7a"
 SRC_URI[rppatch48.sha256sum] = "f93eddd05d690599c85510372729c28e0d2f25619fb36aef22318bdf863b46a9"
-#           ${RPSRC}/poodle_pm-r4.patch;patch=1;name=rppatch49 \
+#           ${RPSRC}/poodle_pm-r4.patch;name=rppatch49 \
 SRC_URI[rppatch49.md5sum] = "cf3e0ca3f9e8e0cab03700fde9143617"
 SRC_URI[rppatch49.sha256sum] = "a5781c8a4c0c71224b23f1c4155609baeee0eca8ce7cd34c1c969a65d6c6bab2"
-#           ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack;name=rppatch50
+#           ${RPSRC}/mmcsd_no_scr_check-r1.patch;status=hack;name=rppatch50
 SRC_URI[rppatch50.md5sum] = "aeb3c62bf676952696b5dc9733d2dc0a"
 SRC_URI[rppatch50.sha256sum] = "f3207b70d719892faec1ea9719fe56c235c06ad9171f0101934fb11ecbe1d1e9"
-#           ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1;name=rppatch51
+#           ${RPSRC}/sharpsl_pm_debug-r0.patch;name=rppatch51
 SRC_URI[rppatch51.md5sum] = "bee4ef0d60bee81fd31e860686c9200a"
 SRC_URI[rppatch51.sha256sum] = "06833f2524e5dccca0ac356d62362b9dab6435762f9044bf32297a4992b495d9"
-#           ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1;name=rppatch52 \
+#           ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 SRC_URI[rppatch52.md5sum] = "3f26d6490abe7b2df9eae38dfb99f0c8"
 SRC_URI[rppatch52.sha256sum] = "44b50d7e9cc54d11d210b1f0fd4a16783868b61af02eaebf03d68b76f825e850"
-#           ${RPSRC}/poodle_serial_vcc-r0.patch;patch=1;name=rppatch53
+#           ${RPSRC}/poodle_serial_vcc-r0.patch;name=rppatch53
 SRC_URI[rppatch53.md5sum] = "6db3d4256756ae8d209a2d7623c6d71b"
 SRC_URI[rppatch53.sha256sum] = "796f210200129e478bcb0f9c40c09998f2c47b346d4c734d94756e84989fd8b3"
-#           ${RPSRC}/export_atags-r2.patch;patch=1;status=pending;name=rppatch54 \
+#           ${RPSRC}/export_atags-r2.patch;status=pending;name=rppatch54 \
 SRC_URI[rppatch54.md5sum] = "987956757c3707ba0e62ce2cd133011b"
 SRC_URI[rppatch54.sha256sum] = "7754930742d3c3cc2a05af38263ba58ba416b7359f8a0c598ae0f7377277d3b3"
-#           ${RPSRC}/corgi_rearrange_lcd-r0.patch;patch=1;status=pending;name=rppatch55 \
+#           ${RPSRC}/corgi_rearrange_lcd-r0.patch;status=pending;name=rppatch55 \
 SRC_URI[rppatch55.md5sum] = "c1bec44c92f5da5abad97137c73b1365"
 SRC_URI[rppatch55.sha256sum] = "d4dc8f0583e616e74ea41b103d5f6a29b6d079ce37eaf9f362825514c7082490"
-#           ${RPSRC}/allow_disable_deferrred-r0.patch;patch=1;name=rppatch56 \
+#           ${RPSRC}/allow_disable_deferrred-r0.patch;name=rppatch56 \
 SRC_URI[rppatch56.md5sum] = "1cc6aee6d128edf41775472764652435"
 SRC_URI[rppatch56.sha256sum] = "02657350458e7d82b8c926e1f027e408e1e2e8d9570f31e7b5f84472fe2e41c2"
-#           ${RPSRC}/hx2750_base-r33.patch;patch=1;name=rppatch57 \
+#           ${RPSRC}/hx2750_base-r33.patch;name=rppatch57 \
 SRC_URI[rppatch57.md5sum] = "e9ef4b8b78ab64cd7dbd0d41b05e932c"
 SRC_URI[rppatch57.sha256sum] = "ed4f25e0da55714c618c2721209a2d22a7296b5dc85af028d20aff6062a4a13b"
-#           ${RPSRC}/pxa_keys-r8.patch;patch=1;name=rppatch58 \
+#           ${RPSRC}/pxa_keys-r8.patch;name=rppatch58 \
 SRC_URI[rppatch58.md5sum] = "4f41fd3a0e031a26d3a2d354f5995ffd"
 SRC_URI[rppatch58.sha256sum] = "3959a45bb65f66a622d7752e41808604032f4ab66f736f96fee83e252d85df5a"
-#           ${RPSRC}/tsc2101-r18.patch;patch=1;name=rppatch59 \
+#           ${RPSRC}/tsc2101-r18.patch;name=rppatch59 \
 SRC_URI[rppatch59.md5sum] = "95e9a5dfc1852e2db3d1d9da6df439df"
 SRC_URI[rppatch59.sha256sum] = "83097559d413b57aa67da1de975e8fbb99d02a2b2166aad57d7b30881208ff1e"
-#           ${RPSRC}/input_power-r10.patch;patch=1;name=rppatch60 \
+#           ${RPSRC}/input_power-r10.patch;name=rppatch60 \
 SRC_URI[rppatch60.md5sum] = "6ddb822c5ee92a58b667795b41f31963"
 SRC_URI[rppatch60.sha256sum] = "d42ec6f70b00100aa8816740259e3d70686aeae8c05a4f76b67f76b84c79833c"
-#           ${RPSRC}/usb_add_epalloc-r4.patch;patch=1;name=rppatch61 \
+#           ${RPSRC}/usb_add_epalloc-r4.patch;name=rppatch61 \
 SRC_URI[rppatch61.sha256sum] = "6d2ae5d70609df7d2c2b518eca0624c4a59328b277ed114b9e5b57dd030e6e94"
 SRC_URI[rppatch62.md5sum] = "d4bbe2b9ef6b5879d72875896632d8b3"
-#           ${RPSRC}/usb_pxa27x_udc-r8.patch;patch=1;name=rppatch62 \
+#           ${RPSRC}/usb_pxa27x_udc-r8.patch;name=rppatch62 \
 SRC_URI[rppatch61.md5sum] = "042c5243ce0253341fe920a8a863e37b"
 SRC_URI[rppatch62.sha256sum] = "c4bf829816c3e53b0807bb12cfdc8b1f0e0c1eae14a5be2ffb1a59ad71bbb188"
-#           ${RPSRC}/locomo_kbd_tweak-r1a.patch;patch=1;name=rppatch63 \
+#           ${RPSRC}/locomo_kbd_tweak-r1a.patch;name=rppatch63 \
 SRC_URI[rppatch63.md5sum] = "f126bdd73fa79a770b8c0caa95c5bae8"
 SRC_URI[rppatch63.sha256sum] = "a80748d7438ffa589eaee6d4870c74cebc90cc5c8134d070c8f4090fe9bab58c"
-#           ${RPSRC}/poodle_pm-r5.patch;patch=1;name=rppatch64 \
+#           ${RPSRC}/poodle_pm-r5.patch;name=rppatch64 \
 SRC_URI[rppatch64.md5sum] = "3ed63ce3884d6cdd71b6d471e3c49407"
 SRC_URI[rppatch64.sha256sum] = "e87d44d5a77c591db83598295109c033708a458797247a31cfa20d54c52d7b41"
 
-#           ${CHSRC}/tmio-core-r4.patch;patch=1;name=chpatch1 \
+#           ${CHSRC}/tmio-core-r4.patch;name=chpatch1 \
 SRC_URI[chpatch1.md5sum] = "2e7f84f2620d9de8a2a924224f20ba99"
 SRC_URI[chpatch1.sha256sum] = "b9505729d2282ba5db99f60b211a12233b6f1cc0b6340681b1722002c97c86e6"
-#           ${CHSRC}/tmio-fb-r6.patch;patch=1;name=chpatch2 \
+#           ${CHSRC}/tmio-fb-r6.patch;name=chpatch2 \
 SRC_URI[chpatch2.md5sum] = "7e1df4684cccc0720daaeba1c741c5ee"
 SRC_URI[chpatch2.sha256sum] = "30d71710b35c091014f6f5d3bbb600783db852af98b12e8a0bbaced505a6ffa4"
 
-#        ${TKSRC}/mtd-sharp-flash-hack-r4.patch;patch=1;name=tkpatch1 \
+#        ${TKSRC}/mtd-sharp-flash-hack-r4.patch;name=tkpatch1 \
 SRC_URI[tkpatch1.md5sum] = "a8ad16ca9b91a72c0e1c01952af5693d"
 SRC_URI[tkpatch1.sha256sum] = "2037e99cb87c350b6a2b155c5c780e724d50b1233d6e30689fc2e1ea3468f55a"
-#        ${TKSRC}/mcp-sa11x0-r0.patch;patch=1;name=tkpatch2 \
+#        ${TKSRC}/mcp-sa11x0-r0.patch;name=tkpatch2 \
 SRC_URI[tkpatch2.md5sum] = "04468563b3b6942e72844904f1c34e9b"
 SRC_URI[tkpatch2.sha256sum] = "1112d3ea07f519ca7a45b6c82b43a9d368ba2d8a4a4244172b5e66f63eee6fb8"
-#        ${TKSRC}/locomo-r1.patch;patch=1;name=tkpatch3 \
+#        ${TKSRC}/locomo-r1.patch;name=tkpatch3 \
 SRC_URI[tkpatch3.md5sum] = "31c32cadae5a7469cf94bf8bae658515"
 SRC_URI[tkpatch3.sha256sum] = "788f1cc9c699c60408591eba0a057bfdf51cedef539b52fe8ddba39dd948aee6"
-#        ${TKSRC}/collie-kexec-r1.patch;patch=1;name=tkpatch4 \
+#        ${TKSRC}/collie-kexec-r1.patch;name=tkpatch4 \
 SRC_URI[tkpatch4.md5sum] = "ed96c1bddce4b7e40a40bad1d3cd63b5"
 SRC_URI[tkpatch4.sha256sum] = "c178b3a7460cfaeb58c11ef9641d72ee912818b2ecbf1c09edf628d9168c0971"
-#        ${TKSRC}/sharpsl_pm-4.patch;patch=1;name=tkpatch5 \
+#        ${TKSRC}/sharpsl_pm-4.patch;name=tkpatch5 \
 SRC_URI[tkpatch5.md5sum] = "39b7dd5a77cf267d104e57dbfbfb1789"
 SRC_URI[tkpatch5.sha256sum] = "a9880d7408e73c6c74ae975ed7fd20b2563459b68d6c4afdfc20f033c95b4d8b"
-#        ${TKSRC}/collie_pm-3.patch;patch=1;name=tkpatch6 \
+#        ${TKSRC}/collie_pm-3.patch;name=tkpatch6 \
 SRC_URI[tkpatch6.md5sum] = "812ee8bf3ea5739acb0ab2f732ecdc20"
 SRC_URI[tkpatch6.sha256sum] = "8bb75a2577c72b4ad95851e545aafc7b0b89c3c41f087aea76b28635786f11c7"
-#        ${TKSRC}/ucb1x00_suspend.patch;patch=1;name=tkpatch7 \
+#        ${TKSRC}/ucb1x00_suspend.patch;name=tkpatch7 \
 SRC_URI[tkpatch7.md5sum] = "8cf0f9e1158bf04cccb65a0926221888"
 SRC_URI[tkpatch7.sha256sum] = "502e6c62fd930639987e34fbb1aaeb7b1456e2743e0d6986faf0990257921435"
-#        ${TKSRC}/collie-ts.patch;patch=1;name=tkpatch8 \
+#        ${TKSRC}/collie-ts.patch;name=tkpatch8 \
 SRC_URI[tkpatch8.md5sum] = "a62bacafed0ca1d8384b848a1de49728"
 SRC_URI[tkpatch8.sha256sum] = "a3e0ad85beb1b3ae6e33978c540b2e83746e9c1e2766da2d59509d9c0345f218"
-#        ${TKSRC}/pcmcia_suspend.patch;patch=1;name=tkpatch9 \
+#        ${TKSRC}/pcmcia_suspend.patch;name=tkpatch9 \
 SRC_URI[tkpatch9.md5sum] = "52423f0766882809c5ace9ed4ccb2131"
 SRC_URI[tkpatch9.sha256sum] = "c701207f506e3975510a9abc07eaab59f3e7e1fb13b8045ff1fff33964f4be89"
-#        ${TKSRC}/locomo_spi-6.patch;patch=1;name=tkpatch10 \
+#        ${TKSRC}/locomo_spi-6.patch;name=tkpatch10 \
 SRC_URI[tkpatch10.md5sum] = "44bb0f9f1fb07efbbb41619a44ed04ce"
 SRC_URI[tkpatch10.sha256sum] = "50502256533d1fc62ac3f4a29a7e212835592bfbfd47f36b607c20e72297a63d"
-#        ${TKSRC}/config.patch;patch=1;name=tkpatch11 \
+#        ${TKSRC}/config.patch;name=tkpatch11 \
 SRC_URI[tkpatch11.md5sum] = "c8be31ffebdae0e007ea587a11994e75"
 SRC_URI[tkpatch11.sha256sum] = "64dfe89e56167bde80c6a18831b5a4259215c78c34ca16f4cb9fde10ffe54437"
-#        ${TKSRC}/mmc-spi.patch;patch=1;name=tkpatch12 \
+#        ${TKSRC}/mmc-spi.patch;name=tkpatch12 \
 SRC_URI[tkpatch12.md5sum] = "329fd64f8ccdb2731c54f6a1b8c6de14"
 SRC_URI[tkpatch12.sha256sum] = "27934de6da3f5ac94ed60ba4bfdd3acc2d93b01a2f932b576f87fb4508dcde6e"
-#        ${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1;name=tkpatch13 \
+#        ${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;name=tkpatch13 \
 SRC_URI[tkpatch13.md5sum] = "f0e143ed696bb064804cf0970718b414"
 SRC_URI[tkpatch13.sha256sum] = "7aad0d9df138fa99332a82ca69eb07504b04e9b0a3cdb405ce872ca3bd4f44ac"
-#        ${TKSRC}/sa1100_spinlock.patch;patch=1;name=tkpatch14 \
+#        ${TKSRC}/sa1100_spinlock.patch;name=tkpatch14 \
 SRC_URI[tkpatch14.md5sum] = "946368c1a4961ac0362436e967055f76"
 SRC_URI[tkpatch14.sha256sum] = "16554de4368956c1d3e1be4245d388bff4767390f2183bfe35b04327def508a5"
-#        ${TKSRC}/sa1100-dma.patch;patch=1;name=tkpatch15 \
+#        ${TKSRC}/sa1100-dma.patch;name=tkpatch15 \
 SRC_URI[tkpatch15.md5sum] = "4336cca098b577608813a7c1454f2edd"
 SRC_URI[tkpatch15.sha256sum] = "c532c14ffb9358d1e0dbb67fce113c6aec0dd9c77ad41875222d69979baac9e7"
-#        ${TKSRC}/sa1100_udc_g_ether-2.patch;patch=1;name=tkpatch16 \
+#        ${TKSRC}/sa1100_udc_g_ether-2.patch;name=tkpatch16 \
 # doesn't exist in checksums.ini and URL gives 403 (as all TKSRC patches now)
 #SRC_URI[tkpatch16.md5sum] = ""
 #SRC_URI[tkpatch16.sha256sum] = ""
-#        ${TKSRC}/locomokeyb-2.patch;patch=1;name=tkpatch17 \
+#        ${TKSRC}/locomokeyb-2.patch;name=tkpatch17 \
 #SRC_URI[tkpatch17.md5sum] = ""
 #SRC_URI[tkpatch17.sha256sum] = ""
 
-#          ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1;name=dopatch1 \
+#          ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;name=dopatch1 \
 SRC_URI[dopatch1.md5sum] = "84d17da518cc59ff5934e2057799e94f"
 SRC_URI[dopatch1.sha256sum] = "c14631a17c41a5ce5c3ab3eb47b0c2d2f713b8de5511936546560c8ab58835a9"
-#          ${DOSRC}/collie/collie-r0.patch;patch=1;name=dopatch2 \
+#          ${DOSRC}/collie/collie-r0.patch;name=dopatch2 \
 SRC_URI[dopatch2.md5sum] = "20e50bdfb930da387e627c08771428d9"
 SRC_URI[dopatch2.sha256sum] = "67fb8870e5447e810424eed879aa22119925a17658081677abce1d954a3147c4"
-#          ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1;name=dopatch3 \
+#          ${DOSRC}/collie/locomolcd-backlight-r0.patch;name=dopatch3 \
 SRC_URI[dopatch3.md5sum] = "613c514810d5a4ba73794510e4100b3f"
 SRC_URI[dopatch3.sha256sum] = "6cc20e2495ff8f32ff68f51a0822a2778f1f387b2a2788e804056864a0dd0ad5"
-#          ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1;name=dopatch4 \
+#          ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;name=dopatch4 \
 SRC_URI[dopatch4.md5sum] = "cfecf3d5705c167b41c95687becb6bd6"
 SRC_URI[dopatch4.sha256sum] = "6c3adeb61e3212676b8ab5f564fe30341590e944ecec58317d5fae9effdd4bfb"
-#          ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1;name=dopatch5 \
+#          ${DOSRC}/collie/sa1100-udc-r0.patch;name=dopatch5 \
 SRC_URI[dopatch5.md5sum] = "df1e70e6aa0a97563e7a71d45cfce684"
 SRC_URI[dopatch5.sha256sum] = "50ec92aaada7752df60cc84beabc517141fb170cfe76ae907b54c421f9b93a0d"
-#          ${DOSRC}/collie/collie-pm-r1.patch;patch=1;name=dopatch6 \
+#          ${DOSRC}/collie/collie-pm-r1.patch;name=dopatch6 \
 SRC_URI[dopatch6.md5sum] = "a1cda9c1d9e872ca73224c9cf2a3edd4"
 SRC_URI[dopatch6.sha256sum] = "adf27cc2b74320e2dff1be941641716d1899b926437190efcc07b79c3add26ea"
-#          ${DOSRC}/tosa-pxaac97-r6.patch;patch=1;name=dopatch7 \
+#          ${DOSRC}/tosa-pxaac97-r6.patch;name=dopatch7 \
 SRC_URI[dopatch7.md5sum] = "17dce7cf6276af37ae9b26d0bb381dc2"
 SRC_URI[dopatch7.sha256sum] = "7ebee992bbcb4c6c745f70bd59cf9fe58fb6e36ef183b05c64ef3bcf802f8208"
-#          ${DOSRC}/tosa-tmio-r6.patch;patch=1;name=dopatch8 \
+#          ${DOSRC}/tosa-tmio-r6.patch;name=dopatch8 \
 SRC_URI[dopatch8.md5sum] = "d4088e44285ce609d41455cf3b31772a"
 SRC_URI[dopatch8.sha256sum] = "ec732cb9ec9522c04769f9e41fab7288e7cdff6566eee18b5ab74542b5d9575a"
-#          ${DOSRC}/tosa-asoc-r1.patch;patch=1;name=dopatch9 "
+#          ${DOSRC}/tosa-asoc-r1.patch;name=dopatch9 "
 SRC_URI[dopatch9.md5sum] = "075bea0d9991a06b62a502b94ab47b6f"
 SRC_URI[dopatch9.sha256sum] = "b3e08f4ca71f849dd2a6cc910379ec4f3bc0c2ea41d205aadc5d54cd3271eb47"
 
-#          ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1;name=jlpatch1 \
+#          ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;name=jlpatch1 \
 SRC_URI[jlpatch1.md5sum] = "9d507962dc5f1cdebd071e92eda20aad"
 SRC_URI[jlpatch1.sha256sum] = "8d6f8e191e50cb90c0681a028669e9e84f2647a05cbd05175e9cf5782961ebba"
diff --git a/recipes/linux/linux-rp_2.6.23.bb b/recipes/linux/linux-rp_2.6.23.bb
index 7c008e4e71..0ef0655f15 100644
--- a/recipes/linux/linux-rp_2.6.23.bb
+++ b/recipes/linux/linux-rp_2.6.23.bb
@@ -6,64 +6,64 @@ PR = "r36"
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;apply=yes
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 #
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2;name=kernel \
-	   file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \
-           ${RPSRC}/pxa25x_suspend_fixes-r0.patch;patch=1;status=merged;name=rppatch30 \
-           ${RPSRC}/lzo_jffs2-r3.patch;patch=1;status=merged;name=rppatch31 \
-           ${RPSRC}/lzo_jffs2_lzomode-r1.patch;patch=1;status=merged;name=rppatch32 \
-           ${RPSRC}/spitzkbd_fix-r0.patch;patch=1;status=merged;name=rppatch33 \
-           file://uvesafb-0.1-rc3-2.6.22.patch;patch=1;status=merged \
-           ${RPSRC}/locomo_led_fix-r0.patch;patch=1;status=merged;name=rppatch34 \
-           file://hrw-add-wcf11-to-hostap.patch;patch=1;status=merged \
-           ${RPSRC}/export_atags-r0a.patch;patch=1;status=pending;name=rppatch35 \
-           ${RPSRC}/lzo_crypto-r2.patch;patch=1;status=pending;name=rppatch36 \
-           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;patch=1;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r29.patch;patch=1;name=rppatch37 \
-           ${RPSRC}/hx2750_bl-r9.patch;patch=1;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1;name=rppatch38 \
-           file://hx2750_make.patch;patch=1;name=rppatch39 \
-           ${RPSRC}/pxa_keys-r7.patch;patch=1;name=rppatch40 \
-           ${RPSRC}/tsc2101-r16.patch;patch=1;name=rppatch41 \
-           ${RPSRC}/hx2750_test1-r7.patch;patch=1;name=rppatch42 \
-           ${RPSRC}/input_power-r9.patch;patch=1;name=rppatch43 \
-           ${RPSRC}/pxa25x_cpufreq-r2.patch;patch=1;name=rppatch44 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;patch=1;name=rppatch9 \
-           ${RPSRC}/usb_add_epalloc-r3.patch;patch=1;name=rppatch45 \
-           ${RPSRC}/usb_pxa27x_udc-r6.patch;patch=1;name=rppatch46 \
-           ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1;name=rppatch47 \
-           ${RPSRC}/pxa27x_overlay-r6.patch;patch=1;name=rppatch48 \
-           ${RPSRC}/w100_extaccel-r2.patch;patch=1;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;patch=1;name=rppatch13 \
-           ${RPSRC}/poodle_pm-r4.patch;patch=1;name=rppatch49 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1;name=rppatch16 \
-           file://wm8750-treble.patch;patch=1 \
-           file://mtd-module.patch;patch=1 \
-           file://squashfs3.0-2.6.15.patch;patch=1;status=external \
-           ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;patch=1;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;patch=1;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack;name=rppatch22 \
-           file://pxa-serial-hack.patch;patch=1;status=hack \
-           file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
-           file://htcuni.patch;patch=1 \
-           file://binutils-buildid-arm.patch;patch=1 \
-           file://versatile-armv6.patch;patch=1 \
+	   file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch \
+           ${RPSRC}/pxa25x_suspend_fixes-r0.patch;status=merged;name=rppatch30 \
+           ${RPSRC}/lzo_jffs2-r3.patch;status=merged;name=rppatch31 \
+           ${RPSRC}/lzo_jffs2_lzomode-r1.patch;status=merged;name=rppatch32 \
+           ${RPSRC}/spitzkbd_fix-r0.patch;status=merged;name=rppatch33 \
+           file://uvesafb-0.1-rc3-2.6.22.patch;status=merged \
+           ${RPSRC}/locomo_led_fix-r0.patch;status=merged;name=rppatch34 \
+           file://hrw-add-wcf11-to-hostap.patch;status=merged \
+           ${RPSRC}/export_atags-r0a.patch;status=pending;name=rppatch35 \
+           ${RPSRC}/lzo_crypto-r2.patch;status=pending;name=rppatch36 \
+           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;name=rppatch1 \
+           ${RPSRC}/hx2750_base-r29.patch;name=rppatch37 \
+           ${RPSRC}/hx2750_bl-r9.patch;name=rppatch3 \
+           ${RPSRC}/hx2750_pcmcia-r2.patch;name=rppatch38 \
+           file://hx2750_make.patch;name=rppatch39 \
+           ${RPSRC}/pxa_keys-r7.patch;name=rppatch40 \
+           ${RPSRC}/tsc2101-r16.patch;name=rppatch41 \
+           ${RPSRC}/hx2750_test1-r7.patch;name=rppatch42 \
+           ${RPSRC}/input_power-r9.patch;name=rppatch43 \
+           ${RPSRC}/pxa25x_cpufreq-r2.patch;name=rppatch44 \
+           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;name=rppatch8 \
+           ${RPSRC}/pm_changes-r1.patch;name=rppatch9 \
+           ${RPSRC}/usb_add_epalloc-r3.patch;name=rppatch45 \
+           ${RPSRC}/usb_pxa27x_udc-r6.patch;name=rppatch46 \
+           ${RPSRC}/locomo_kbd_tweak-r1.patch;name=rppatch47 \
+           ${RPSRC}/pxa27x_overlay-r6.patch;name=rppatch48 \
+           ${RPSRC}/w100_extaccel-r2.patch;name=rppatch12 \
+           ${RPSRC}/w100_extmem-r1.patch;name=rppatch13 \
+           ${RPSRC}/poodle_pm-r4.patch;name=rppatch49 \
+           ${RPSRC}/poodle_lcd_hack-r0.patch;name=rppatch15 \
+           ${RPSRC}/poodle_asoc_fix-r1.patch;name=rppatch16 \
+           file://wm8750-treble.patch \
+           file://mtd-module.patch \
+           file://squashfs3.0-2.6.15.patch;status=external \
+           ${RPSRC}/logo_oh-r1.patch.bz2;status=unmergable;name=rppatch17 \
+           ${RPSRC}/pxa-linking-bug.patch;status=unmergable;name=rppatch18 \
+           file://hostap-monitor-mode.patch;status=unmergable \
+           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;status=unmergable \
+           ${RPSRC}/mmcsd_large_cards-r1.patch;status=hack;name=rppatch19 \
+           ${RPSRC}/mmcsd_no_scr_check-r2.patch;status=hack;name=rppatch20 \
+           ${RPSRC}/integrator_rgb-r1.patch;status=hack;name=rppatch21 \
+           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;status=hack;name=rppatch22 \
+           file://pxa-serial-hack.patch;status=hack \
+           file://connectplus-remove-ide-HACK.patch;status=hack \
+           file://connectplus-prevent-oops-HACK.patch;status=hack \
+           file://htcuni.patch \
+           file://binutils-buildid-arm.patch \
+           file://versatile-armv6.patch \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-collie \
@@ -78,83 +78,83 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2;name=k
            file://defconfig-tosa "
 
 # FIXMEs before made default	   
-# ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack;name=rppatch50
+# ${RPSRC}/mmcsd_no_scr_check-r1.patch;status=hack;name=rppatch50
 
 # Add this to enable pm debug code (useful with a serial lead)
-#  ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1;name=rppatch51
+#  ${RPSRC}/sharpsl_pm_debug-r0.patch;name=rppatch51
 
 # Disabled until I find the reason this gives issues with cdc_subset
-#            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1;name=rppatch52 \
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 
 # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
 # (Pavel Machek's git tree has updated versions of this?)
-#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1;name=jlpatch1
+#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;name=jlpatch1
 
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
 SRC_URI_append_collie = "\
-           ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1;name=dopatch1 \
-           ${DOSRC}/collie/collie-r0.patch;patch=1;name=dopatch2 \
-           ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1;name=dopatch3 \
-           ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1;name=dopatch4 \
-           file://collie-mcp-r1.patch;patch=1 \
-           ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1;name=dopatch5 \
-#          ${DOSRC}/collie/collie-pm-r1.patch;patch=1;name=dopatch6 \
+           ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;name=dopatch1 \
+           ${DOSRC}/collie/collie-r0.patch;name=dopatch2 \
+           ${DOSRC}/collie/locomolcd-backlight-r0.patch;name=dopatch3 \
+           ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;name=dopatch4 \
+           file://collie-mcp-r1.patch \
+           ${DOSRC}/collie/sa1100-udc-r0.patch;name=dopatch5 \
+#          ${DOSRC}/collie/collie-pm-r1.patch;name=dopatch6 \
 "
 
 SRC_URI_append_poodle = "\
-           ${RPSRC}/poodle_serial_vcc-r0.patch;patch=1;name=rppatch53 \
+           ${RPSRC}/poodle_serial_vcc-r0.patch;name=rppatch53 \
 "
 
 SRC_URI_append_tosa = "\
-           ${CHSRC}/tmio-core-r4.patch;patch=1;name=chpatch1 \
-           file://tmio-tc6393-r8.patch;patch=1 \
-           file://tmio-nand-r8.patch;patch=1 \
-           ${CHSRC}/tmio-fb-r6.patch;patch=1;name=chpatch2 \
-	   file://tmio-fb-r6-fix-r0.patch;patch=1 \
-           file://tosa-keyboard-r19.patch;patch=1 \
-           ${DOSRC}/tosa-pxaac97-r6.patch;patch=1;name=dopatch7 \
-	   file://tosa-pxaac97-r6-fix-r0.patch;patch=1 \
-           ${DOSRC}/tosa-tmio-r6.patch;patch=1;name=dopatch8 \
-           file://tosa-power-r18.patch;patch=1 \
-           file://tosa-power-r18-fix-r0.patch;patch=1 \
-           file://tosa-tmio-lcd-r10.patch;patch=1 \
-           file://tosa-tmio-lcd-r10-fix-r0.patch;patch=1 \
-           file://tosa-bluetooth-r8.patch;patch=1 \
-           file://wm97xx-lg13-r0.patch;patch=1 \
-           file://wm97xx-lg13-r0-fix-r0.patch;patch=1 \
-           file://wm9712-suspend-cold-res-r2.patch;patch=1 \
-           file://sharpsl-pm-postresume-r1.patch;patch=1 \
-           file://wm9712-reset-loop-r2.patch;patch=1 \
-           file://tosa-lcdnoise-r1.patch;patch=1 \
-           file://tosa-lcdnoise-r1-fix-r0.patch;patch=1 \
-	   file://arm-dma-coherent.patch;patch=1 \
-           file://usb-ohci-hooks-r3.patch;patch=1 \
-           file://tmio-ohci-r9.patch;patch=1 \
-           file://pxa2xx_udc_support_inverse_vbus.patch;patch=1 \
-           file://tosa_udc_use_gpio_vbus.patch;patch=1 \
+           ${CHSRC}/tmio-core-r4.patch;name=chpatch1 \
+           file://tmio-tc6393-r8.patch \
+           file://tmio-nand-r8.patch \
+           ${CHSRC}/tmio-fb-r6.patch;name=chpatch2 \
+	   file://tmio-fb-r6-fix-r0.patch \
+           file://tosa-keyboard-r19.patch \
+           ${DOSRC}/tosa-pxaac97-r6.patch;name=dopatch7 \
+	   file://tosa-pxaac97-r6-fix-r0.patch \
+           ${DOSRC}/tosa-tmio-r6.patch;name=dopatch8 \
+           file://tosa-power-r18.patch \
+           file://tosa-power-r18-fix-r0.patch \
+           file://tosa-tmio-lcd-r10.patch \
+           file://tosa-tmio-lcd-r10-fix-r0.patch \
+           file://tosa-bluetooth-r8.patch \
+           file://wm97xx-lg13-r0.patch \
+           file://wm97xx-lg13-r0-fix-r0.patch \
+           file://wm9712-suspend-cold-res-r2.patch \
+           file://sharpsl-pm-postresume-r1.patch \
+           file://wm9712-reset-loop-r2.patch \
+           file://tosa-lcdnoise-r1.patch \
+           file://tosa-lcdnoise-r1-fix-r0.patch \
+	   file://arm-dma-coherent.patch \
+           file://usb-ohci-hooks-r3.patch \
+           file://tmio-ohci-r9.patch \
+           file://pxa2xx_udc_support_inverse_vbus.patch \
+           file://tosa_udc_use_gpio_vbus.patch \
            "
-#          ${DOSRC}/tosa-asoc-r1.patch;patch=1;name=dopatch9 "
+#          ${DOSRC}/tosa-asoc-r1.patch;name=dopatch9 "
 
 SRC_URI_append_akita = "\
-           file://sharpsl-rc-r1.patch;patch=1;status=external \
+           file://sharpsl-rc-r1.patch;status=external \
            "
 
 SRC_URI_append_spitz = "\
-           file://sharpsl-rc-r1.patch;patch=1;status=external \
+           file://sharpsl-rc-r1.patch;status=external \
            "
 
 SRC_URI_append_htcuniversal ="\
-	file://htcuni-acx.patch;patch=1;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://arm_pxa_20070923.patch;patch=1 \
-	file://pxa_fb_overlay.patch;patch=1 \
-	file://zylonite-boot.patch;patch=1 \
-	file://zylonite_mtd-r0.patch;patch=1 \
-	file://zylonite_touch-r0.patch;patch=1 \
-	file://zylonite_keypad-r0.patch;patch=1 \
+	file://arm_pxa_20070923.patch \
+	file://pxa_fb_overlay.patch \
+	file://zylonite-boot.patch \
+	file://zylonite_mtd-r0.patch \
+	file://zylonite_touch-r0.patch \
+	file://zylonite_keypad-r0.patch \
 	"
 
 S = "${WORKDIR}/linux-2.6.23"
diff --git a/recipes/linux/linux-rp_2.6.24.bb b/recipes/linux/linux-rp_2.6.24.bb
index 9bf19225fe..c16c187127 100644
--- a/recipes/linux/linux-rp_2.6.24.bb
+++ b/recipes/linux/linux-rp_2.6.24.bb
@@ -15,62 +15,62 @@ DEFAULT_PREFERENCE_spitz = "1"
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;apply=yes
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
-	   file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \
-           ${RPSRC}/export_atags-r2.patch;patch=1;status=pending;name=rppatch54 \
-           ${RPSRC}/lzo_crypto-r2.patch;patch=1;status=pending;name=rppatch36 \
-           ${RPSRC}/corgi_rearrange_lcd-r0.patch;patch=1;status=pending;name=rppatch55 \
-	   file://hrw-hostapcard.patch;patch=1;status=pending \
-           ${RPSRC}/allow_disable_deferrred-r0.patch;patch=1;name=rppatch56 \
-           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;patch=1;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r33.patch;patch=1;name=rppatch57 \
-           ${RPSRC}/hx2750_bl-r9.patch;patch=1;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r3.patch;patch=1;name=rppatch4 \
-           ${RPSRC}/pxa_keys-r8.patch;patch=1;name=rppatch58 \
-           ${RPSRC}/tsc2101-r18.patch;patch=1;name=rppatch59 \
-           ${RPSRC}/hx2750_test1-r8.patch;patch=1;name=rppatch7 \
-           ${RPSRC}/input_power-r10.patch;patch=1;name=rppatch60 \
-           ${RPSRC}/pxa25x_cpufreq-r2.patch;patch=1;name=rppatch44 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;patch=1;name=rppatch9 \
-           ${RPSRC}/usb_add_epalloc-r4.patch;patch=1;name=rppatch61 \
-           ${RPSRC}/usb_pxa27x_udc-r8.patch;patch=1;name=rppatch62 \
-           ${RPSRC}/locomo_kbd_tweak-r1a.patch;patch=1;name=rppatch63 \
-           ${RPSRC}/pxa27x_overlay-r8.patch;patch=1;name=rppatch11 \
-           ${RPSRC}/w100_extaccel-r2.patch;patch=1;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;patch=1;name=rppatch13 \
-           ${RPSRC}/poodle_pm-r5.patch;patch=1;name=rppatch64 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1;name=rppatch16 \
-           file://pxa27x-resume.patch;patch=1;status=external \
-           file://mtd-module.patch;patch=1;status=external \
-           file://wm8750-treble.patch;patch=1;status=external \
-           file://spitz_h_rewrite.patch;patch=1;status=external \
-           file://pxa2xx_udc-clock.patch;patch=1 \
-           file://sharpsl-rc-r1.patch;patch=1 \
-           file://sharpsl-rc-r2.patch;patch=1 \
-           file://squashfs3.3.patch;patch=1;status=external \
-#           ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;patch=1;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;patch=1;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack;name=rppatch22 \
-           file://pxa-serial-hack.patch;patch=1;status=hack \
-           file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
-           file://binutils-buildid-arm.patch;patch=1 \
-           file://versatile-armv6.patch;patch=1 \
-	   file://htcuni.patch;patch=1 \
+	   file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch \
+           ${RPSRC}/export_atags-r2.patch;status=pending;name=rppatch54 \
+           ${RPSRC}/lzo_crypto-r2.patch;status=pending;name=rppatch36 \
+           ${RPSRC}/corgi_rearrange_lcd-r0.patch;status=pending;name=rppatch55 \
+	   file://hrw-hostapcard.patch;status=pending \
+           ${RPSRC}/allow_disable_deferrred-r0.patch;name=rppatch56 \
+           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;name=rppatch1 \
+           ${RPSRC}/hx2750_base-r33.patch;name=rppatch57 \
+           ${RPSRC}/hx2750_bl-r9.patch;name=rppatch3 \
+           ${RPSRC}/hx2750_pcmcia-r3.patch;name=rppatch4 \
+           ${RPSRC}/pxa_keys-r8.patch;name=rppatch58 \
+           ${RPSRC}/tsc2101-r18.patch;name=rppatch59 \
+           ${RPSRC}/hx2750_test1-r8.patch;name=rppatch7 \
+           ${RPSRC}/input_power-r10.patch;name=rppatch60 \
+           ${RPSRC}/pxa25x_cpufreq-r2.patch;name=rppatch44 \
+           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;name=rppatch8 \
+           ${RPSRC}/pm_changes-r1.patch;name=rppatch9 \
+           ${RPSRC}/usb_add_epalloc-r4.patch;name=rppatch61 \
+           ${RPSRC}/usb_pxa27x_udc-r8.patch;name=rppatch62 \
+           ${RPSRC}/locomo_kbd_tweak-r1a.patch;name=rppatch63 \
+           ${RPSRC}/pxa27x_overlay-r8.patch;name=rppatch11 \
+           ${RPSRC}/w100_extaccel-r2.patch;name=rppatch12 \
+           ${RPSRC}/w100_extmem-r1.patch;name=rppatch13 \
+           ${RPSRC}/poodle_pm-r5.patch;name=rppatch64 \
+           ${RPSRC}/poodle_lcd_hack-r0.patch;name=rppatch15 \
+           ${RPSRC}/poodle_asoc_fix-r1.patch;name=rppatch16 \
+           file://pxa27x-resume.patch;status=external \
+           file://mtd-module.patch;status=external \
+           file://wm8750-treble.patch;status=external \
+           file://spitz_h_rewrite.patch;status=external \
+           file://pxa2xx_udc-clock.patch \
+           file://sharpsl-rc-r1.patch \
+           file://sharpsl-rc-r2.patch \
+           file://squashfs3.3.patch;status=external \
+#           ${RPSRC}/logo_oh-r1.patch.bz2;status=unmergable;name=rppatch17 \
+           ${RPSRC}/pxa-linking-bug.patch;status=unmergable;name=rppatch18 \
+           file://hostap-monitor-mode.patch;status=unmergable \
+           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;status=unmergable \
+           ${RPSRC}/mmcsd_large_cards-r1.patch;status=hack;name=rppatch19 \
+           ${RPSRC}/mmcsd_no_scr_check-r2.patch;status=hack;name=rppatch20 \
+           ${RPSRC}/integrator_rgb-r1.patch;status=hack;name=rppatch21 \
+           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;status=hack;name=rppatch22 \
+           file://pxa-serial-hack.patch;status=hack \
+           file://connectplus-remove-ide-HACK.patch;status=hack \
+           file://connectplus-prevent-oops-HACK.patch;status=hack \
+           file://binutils-buildid-arm.patch \
+           file://versatile-armv6.patch \
+	   file://htcuni.patch \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-collie \
@@ -85,120 +85,120 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=k
            file://defconfig-zylonite"
 
 # FIXMEs before made default	   
-# ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack;name=rppatch50
+# ${RPSRC}/mmcsd_no_scr_check-r1.patch;status=hack;name=rppatch50
 
 
 # Add this to enable pm debug code (useful with a serial lead)
-#  ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1;name=rppatch51
+#  ${RPSRC}/sharpsl_pm_debug-r0.patch;name=rppatch51
 
 # Disabled until I find the reason this gives issues with cdc_subset
-#            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1;name=rppatch52 \
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 
 
 SRC_URI_append_collie = "\
-	${TKSRC}/mtd-sharp-flash-hack-r4.patch;patch=1;name=tkpatch1 \
-	${TKSRC}/mcp-sa11x0-r0.patch;patch=1;name=tkpatch2 \
-	${TKSRC}/locomo-r1.patch;patch=1;name=tkpatch3 \
-	${TKSRC}/collie-kexec-r1.patch;patch=1;name=tkpatch4 \
-	${TKSRC}/sharpsl_pm-4.patch;patch=1;name=tkpatch5 \
-	${TKSRC}/collie_pm-3.patch;patch=1;name=tkpatch6 \
-	${TKSRC}/ucb1x00_suspend.patch;patch=1;name=tkpatch7 \
-	${TKSRC}/collie-ts.patch;patch=1;name=tkpatch8 \
-	${TKSRC}/pcmcia_suspend.patch;patch=1;name=tkpatch9 \
-	${TKSRC}/locomo_spi-6.patch;patch=1;name=tkpatch10 \
-	${TKSRC}/config.patch;patch=1;name=tkpatch11 \
-	${TKSRC}/mmc-spi.patch;patch=1;name=tkpatch12 \
-	${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1;name=tkpatch13 \
-	${TKSRC}/sa1100_spinlock.patch;patch=1;name=tkpatch14 \
-	${TKSRC}/sa1100-dma.patch;patch=1;name=tkpatch15 \
+	${TKSRC}/mtd-sharp-flash-hack-r4.patch;name=tkpatch1 \
+	${TKSRC}/mcp-sa11x0-r0.patch;name=tkpatch2 \
+	${TKSRC}/locomo-r1.patch;name=tkpatch3 \
+	${TKSRC}/collie-kexec-r1.patch;name=tkpatch4 \
+	${TKSRC}/sharpsl_pm-4.patch;name=tkpatch5 \
+	${TKSRC}/collie_pm-3.patch;name=tkpatch6 \
+	${TKSRC}/ucb1x00_suspend.patch;name=tkpatch7 \
+	${TKSRC}/collie-ts.patch;name=tkpatch8 \
+	${TKSRC}/pcmcia_suspend.patch;name=tkpatch9 \
+	${TKSRC}/locomo_spi-6.patch;name=tkpatch10 \
+	${TKSRC}/config.patch;name=tkpatch11 \
+	${TKSRC}/mmc-spi.patch;name=tkpatch12 \
+	${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;name=tkpatch13 \
+	${TKSRC}/sa1100_spinlock.patch;name=tkpatch14 \
+	${TKSRC}/sa1100-dma.patch;name=tkpatch15 \
 "
 
 SRC_URI_append_poodle = "\
-           ${RPSRC}/poodle_serial_vcc-r0.patch;patch=1;name=rppatch53 \
-           file://poodle_ts.patch;patch=1 \
-           file://pxafb.patch;patch=1 \
+           ${RPSRC}/poodle_serial_vcc-r0.patch;name=rppatch53 \
+           file://poodle_ts.patch \
+           file://pxafb.patch \
 "
 
 SRC_URI_append_tosa = "\
-           file://tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch;patch=1 \
-           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch;patch=1 \
-           file://tosa/0003-Core-MFD-support.patch;patch=1 \
-           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch;patch=1 \
-           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch;patch=1 \
-           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch;patch=1 \
-           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch;patch=1 \
-           file://tosa/0008-Nand-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0009-FB-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0011-MMC-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0012-Tosa-keyboard-support.patch;patch=1 \
-           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch;patch=1 \
-           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch;patch=1 \
-           file://tosa/0015-sharpsl-export-params.patch;patch=1 \
-           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch;patch=1 \
-           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch;patch=1 \
-           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch;patch=1 \
-           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch;patch=1 \
-           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch;patch=1 \
-           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch;patch=1 \
-           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch;patch=1 \
-           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch;patch=1 \
-           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch;patch=1 \
-           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch;patch=1 \
-           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch;patch=1 \
-           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch;patch=1 \
-           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
-           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
-           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch;patch=1 \
-           file://tosa/0045-Update-tmio_ohci.patch;patch=1 \
-           file://tosa/0046-patch-tc6393xb-cleanup.patch;patch=1 \
-           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch;patch=1 \
-           file://tosa/0048-tc6393xb-GPIO-support.patch;patch=1 \
-           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch;patch=1 \
-           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch;patch=1 \
-           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch;patch=1 \
-           file://tosa/0052-tosa-platform-backlight-support.patch;patch=1 \
-           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch;patch=1 \
-           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch;patch=1 \
-           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch;patch=1 \
-           file://tosa/0058-Fix-tosakbd-suspend.patch;patch=1 \
-           file://tosa/0059-patch-tosa-wakeup-test.patch;patch=1 \
-           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch;patch=1 \
-           file://tosa/0061-tosa-bat-unify.patch;patch=1 \
-           file://tosa/0062-tosa-bat-fix-charging.patch;patch=1 \
-           file://tosa/0063-patch-tosa-bat-jacket-detect.patch;patch=1 \
-           file://tosa/0064-Export-modes-via-sysfs.patch;patch=1 \
-           file://tosa/0065-wm97xx-core-fixes.patch;patch=1 \
-           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch;patch=1 \
-           file://tosa/0067-modeswitching.patch;patch=1 \
-           file://tosa/0068-Preliminary-tosa-denoiser.patch;patch=1 \
-           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch;patch=1 \
-           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch;patch=1 \
-           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch;patch=1 \
-           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch;patch=1 \
-           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch;patch=1 \
-           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch;patch=1 \
-           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch;patch=1 \
-           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch;patch=1 \
-           file://tosa/0040-Clocklib-debugfs-support.patch;patch=1 \
-           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch;patch=1 \
-           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch;patch=1 \
-           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch;patch=1 \
-           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch;patch=1 \
-           file://tosa/0057-Clean-up-tosa-resetting.patch;patch=1 \
-           file://tosa/0001-pxa2xx-ac97-switch-AC-unit-to-correct-state-before.patch;patch=1 \
-	   file://tosa/tosa-bl-fixup.diff;patch=1 \
+           file://tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch \
+           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch \
+           file://tosa/0003-Core-MFD-support.patch \
+           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch \
+           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch \
+           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch \
+           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch \
+           file://tosa/0008-Nand-driver-for-TMIO-devices.patch \
+           file://tosa/0009-FB-driver-for-TMIO-devices.patch \
+           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch \
+           file://tosa/0011-MMC-driver-for-TMIO-devices.patch \
+           file://tosa/0012-Tosa-keyboard-support.patch \
+           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch \
+           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch \
+           file://tosa/0015-sharpsl-export-params.patch \
+           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch \
+           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch \
+           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch \
+           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch \
+           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch \
+           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch \
+           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch \
+           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch \
+           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch \
+           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch \
+           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch \
+           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch \
+           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch \
+           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch \
+           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch \
+           file://tosa/0045-Update-tmio_ohci.patch \
+           file://tosa/0046-patch-tc6393xb-cleanup.patch \
+           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch \
+           file://tosa/0048-tc6393xb-GPIO-support.patch \
+           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch \
+           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch \
+           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch \
+           file://tosa/0052-tosa-platform-backlight-support.patch \
+           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch \
+           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch \
+           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch \
+           file://tosa/0058-Fix-tosakbd-suspend.patch \
+           file://tosa/0059-patch-tosa-wakeup-test.patch \
+           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch \
+           file://tosa/0061-tosa-bat-unify.patch \
+           file://tosa/0062-tosa-bat-fix-charging.patch \
+           file://tosa/0063-patch-tosa-bat-jacket-detect.patch \
+           file://tosa/0064-Export-modes-via-sysfs.patch \
+           file://tosa/0065-wm97xx-core-fixes.patch \
+           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch \
+           file://tosa/0067-modeswitching.patch \
+           file://tosa/0068-Preliminary-tosa-denoiser.patch \
+           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch \
+           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch \
+           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch \
+           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch \
+           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch \
+           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch \
+           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch \
+           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch \
+           file://tosa/0040-Clocklib-debugfs-support.patch \
+           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch \
+           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch \
+           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch \
+           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch \
+           file://tosa/0057-Clean-up-tosa-resetting.patch \
+           file://tosa/0001-pxa2xx-ac97-switch-AC-unit-to-correct-state-before.patch \
+	   file://tosa/tosa-bl-fixup.diff \
            "
-#           file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch;patch=1 \
-#           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch;patch=1 \
+#           file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch \
+#           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch \
 
 SRC_URI_append_htcuniversal ="\
-	file://htcuni-acx.patch;patch=1;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://pxa_fb_overlay.patch;patch=1 \
-	file://zylonite-boot.patch;patch=1 \
+	file://pxa_fb_overlay.patch \
+	file://zylonite-boot.patch \
 	"
 
 S = "${WORKDIR}/linux-2.6.24"
diff --git a/recipes/linux/linux-rp_2.6.25+2.6.26-rc4.bb b/recipes/linux/linux-rp_2.6.25+2.6.26-rc4.bb
index b51d6aa7ef..786a74ed52 100644
--- a/recipes/linux/linux-rp_2.6.25+2.6.26-rc4.bb
+++ b/recipes/linux/linux-rp_2.6.25+2.6.26-rc4.bb
@@ -11,46 +11,46 @@ DEFAULT_PREFERENCE_spitz = "1"
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;apply=yes
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.26/patch-2.6.26-rc4.bz2;patch=1;name=rc4patch \
-           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;patch=1;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r34.patch;patch=1;name=rppatch2 \
-           ${RPSRC}/hx2750_bl-r9.patch;patch=1;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r3.patch;patch=1;name=rppatch4 \
-           ${RPSRC}/pxa_keys-r9.patch;patch=1;name=rppatch5 \
-           ${RPSRC}/tsc2101-r19.patch;patch=1;name=rppatch6 \
-           ${RPSRC}/hx2750_test1-r8.patch;patch=1;name=rppatch7 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;patch=1;name=rppatch9 \
-           ${RPSRC}/locomo_kbd_tweak-r2.patch;patch=1;name=rppatch10 \
-#           ${RPSRC}/pxa27x_overlay-r8.patch;patch=1;name=rppatch11 \
-           ${RPSRC}/w100_extaccel-r2.patch;patch=1;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;patch=1;name=rppatch13 \
-           ${RPSRC}/poodle_pm-r6.patch;patch=1;name=rppatch14 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1;name=rppatch16 \
-           ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;patch=1;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;patch=1;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack;name=rppatch22 \
-           file://sharpsl-rc-r1.patch;patch=1 \
-           file://spitz_h_rewrite.patch;patch=1 \
-           file://pxa-serial-hack.patch;patch=1;status=hack \
-           file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
-           file://htcuni.patch;patch=1 \
-           file://versatile-armv6.patch;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.26/patch-2.6.26-rc4.bz2;apply=yes;name=rc4patch \
+           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;name=rppatch1 \
+           ${RPSRC}/hx2750_base-r34.patch;name=rppatch2 \
+           ${RPSRC}/hx2750_bl-r9.patch;name=rppatch3 \
+           ${RPSRC}/hx2750_pcmcia-r3.patch;name=rppatch4 \
+           ${RPSRC}/pxa_keys-r9.patch;name=rppatch5 \
+           ${RPSRC}/tsc2101-r19.patch;name=rppatch6 \
+           ${RPSRC}/hx2750_test1-r8.patch;name=rppatch7 \
+           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;name=rppatch8 \
+           ${RPSRC}/pm_changes-r1.patch;name=rppatch9 \
+           ${RPSRC}/locomo_kbd_tweak-r2.patch;name=rppatch10 \
+#           ${RPSRC}/pxa27x_overlay-r8.patch;name=rppatch11 \
+           ${RPSRC}/w100_extaccel-r2.patch;name=rppatch12 \
+           ${RPSRC}/w100_extmem-r1.patch;name=rppatch13 \
+           ${RPSRC}/poodle_pm-r6.patch;name=rppatch14 \
+           ${RPSRC}/poodle_lcd_hack-r0.patch;name=rppatch15 \
+           ${RPSRC}/poodle_asoc_fix-r1.patch;name=rppatch16 \
+           ${RPSRC}/logo_oh-r1.patch.bz2;status=unmergable;name=rppatch17 \
+           ${RPSRC}/pxa-linking-bug.patch;status=unmergable;name=rppatch18 \
+           file://hostap-monitor-mode.patch;status=unmergable \
+           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;status=unmergable \
+           ${RPSRC}/mmcsd_large_cards-r1.patch;status=hack;name=rppatch19 \
+           ${RPSRC}/mmcsd_no_scr_check-r2.patch;status=hack;name=rppatch20 \
+           ${RPSRC}/integrator_rgb-r1.patch;status=hack;name=rppatch21 \
+           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;status=hack;name=rppatch22 \
+           file://sharpsl-rc-r1.patch \
+           file://spitz_h_rewrite.patch \
+           file://pxa-serial-hack.patch;status=hack \
+           file://connectplus-remove-ide-HACK.patch;status=hack \
+           file://connectplus-prevent-oops-HACK.patch;status=hack \
+           file://htcuni.patch \
+           file://versatile-armv6.patch \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-akita \
@@ -67,124 +67,124 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2;name=k
 
 
 # FIXMEs before made default	   
-# ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack;name=rppatch50
+# ${RPSRC}/mmcsd_no_scr_check-r1.patch;status=hack;name=rppatch50
 
 
 # Add this to enable pm debug code (useful with a serial lead)
-#  ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1;name=rppatch51
+#  ${RPSRC}/sharpsl_pm_debug-r0.patch;name=rppatch51
 
 # Disabled until I find the reason this gives issues with cdc_subset
-#            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1;name=rppatch52 \
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 
 
 SRC_URI_append_collie = "\
-        ${TKSRC}/mtd-sharp-flash-hack-r4.patch;patch=1;name=tkpatch1 \
-        ${TKSRC}/mcp-sa11x0-r0.patch;patch=1;name=tkpatch2 \
-        ${TKSRC}/locomo-r1.patch;patch=1;name=tkpatch3 \
-        ${TKSRC}/collie-kexec-r1.patch;patch=1;name=tkpatch4 \
-        ${TKSRC}/sharpsl_pm-4.patch;patch=1;name=tkpatch5 \
-        ${TKSRC}/collie_pm-3.patch;patch=1;name=tkpatch6 \
-        ${TKSRC}/ucb1x00_suspend.patch;patch=1;name=tkpatch7 \
-        ${TKSRC}/collie-ts.patch;patch=1;name=tkpatch8 \
-        ${TKSRC}/pcmcia_suspend.patch;patch=1;name=tkpatch9 \
-        ${TKSRC}/locomo_spi-6.patch;patch=1;name=tkpatch10 \
-        ${TKSRC}/config.patch;patch=1;name=tkpatch11 \
-	${TKSRC}/locomokeyb-2.patch;patch=1;name=tkpatch17 \
-        ${TKSRC}/mmc-spi.patch;patch=1;name=tkpatch12 \
-        ${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1;name=tkpatch13 \
-        ${TKSRC}/sa1100_spinlock.patch;patch=1;name=tkpatch14 \
-        ${TKSRC}/sa1100-dma.patch;patch=1;name=tkpatch15 \
-	${TKSRC}/sa1100_udc_g_ether-2.patch;patch=1;name=tkpatch16 \
+        ${TKSRC}/mtd-sharp-flash-hack-r4.patch;name=tkpatch1 \
+        ${TKSRC}/mcp-sa11x0-r0.patch;name=tkpatch2 \
+        ${TKSRC}/locomo-r1.patch;name=tkpatch3 \
+        ${TKSRC}/collie-kexec-r1.patch;name=tkpatch4 \
+        ${TKSRC}/sharpsl_pm-4.patch;name=tkpatch5 \
+        ${TKSRC}/collie_pm-3.patch;name=tkpatch6 \
+        ${TKSRC}/ucb1x00_suspend.patch;name=tkpatch7 \
+        ${TKSRC}/collie-ts.patch;name=tkpatch8 \
+        ${TKSRC}/pcmcia_suspend.patch;name=tkpatch9 \
+        ${TKSRC}/locomo_spi-6.patch;name=tkpatch10 \
+        ${TKSRC}/config.patch;name=tkpatch11 \
+	${TKSRC}/locomokeyb-2.patch;name=tkpatch17 \
+        ${TKSRC}/mmc-spi.patch;name=tkpatch12 \
+        ${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;name=tkpatch13 \
+        ${TKSRC}/sa1100_spinlock.patch;name=tkpatch14 \
+        ${TKSRC}/sa1100-dma.patch;name=tkpatch15 \
+	${TKSRC}/sa1100_udc_g_ether-2.patch;name=tkpatch16 \
 
 "
 
 SRC_URI_append_poodle = "\
-           ${RPSRC}/poodle_serial_vcc-r0.patch;patch=1;name=rppatch53 \
-           file://poodle_ts.patch;patch=1 \
-           file://pxafb.patch;patch=1 \
+           ${RPSRC}/poodle_serial_vcc-r0.patch;name=rppatch53 \
+           file://poodle_ts.patch \
+           file://pxafb.patch \
 "
 
 SRC_URI_append_tosa = "\
-           file://tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch;patch=1 \
-           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch;patch=1 \
-           file://tosa/0003-Core-MFD-support.patch;patch=1 \
-           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch;patch=1 \
-           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch;patch=1 \
-           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch;patch=1 \
-           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch;patch=1 \
-           file://tosa/0008-Nand-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0009-FB-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0011-MMC-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0012-Tosa-keyboard-support.patch;patch=1 \
-           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch;patch=1 \
-           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch;patch=1 \
-           file://tosa/0015-sharpsl-export-params.patch;patch=1 \
-           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch;patch=1 \
-           file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch;patch=1 \
-           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch;patch=1 \
-           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch;patch=1 \
-           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch;patch=1 \
-           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch;patch=1 \
-           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch;patch=1 \
-           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch;patch=1 \
-           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch;patch=1 \
-           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch;patch=1 \
-           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch;patch=1 \
-           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch;patch=1 \
-           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch;patch=1 \
-           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch;patch=1 \
-           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
-           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
-           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch;patch=1 \
-           file://tosa/0045-Update-tmio_ohci.patch;patch=1 \
-           file://tosa/0046-patch-tc6393xb-cleanup.patch;patch=1 \
-           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch;patch=1 \
-           file://tosa/0048-tc6393xb-GPIO-support.patch;patch=1 \
-           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch;patch=1 \
-           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch;patch=1 \
-           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch;patch=1 \
-           file://tosa/0052-tosa-platform-backlight-support.patch;patch=1 \
-           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch;patch=1 \
-           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch;patch=1 \
-           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch;patch=1 \
-           file://tosa/0058-Fix-tosakbd-suspend.patch;patch=1 \
-           file://tosa/0059-patch-tosa-wakeup-test.patch;patch=1 \
-           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch;patch=1 \
-           file://tosa/0061-tosa-bat-unify.patch;patch=1 \
-           file://tosa/0062-tosa-bat-fix-charging.patch;patch=1 \
-           file://tosa/0063-patch-tosa-bat-jacket-detect.patch;patch=1 \
-           file://tosa/0064-Export-modes-via-sysfs.patch;patch=1 \
-           file://tosa/0065-wm97xx-core-fixes.patch;patch=1 \
-           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch;patch=1 \
-           file://tosa/0067-modeswitching.patch;patch=1 \
-           file://tosa/0068-Preliminary-tosa-denoiser.patch;patch=1 \
-           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch;patch=1 \
-           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch;patch=1 \
-           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch;patch=1 \
-           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch;patch=1 \
-           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch;patch=1 \
-           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch;patch=1 \
-           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch;patch=1 \
-           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch;patch=1 \
-           file://tosa/0040-Clocklib-debugfs-support.patch;patch=1 \
-           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch;patch=1 \
-           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch;patch=1 \
-           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch;patch=1 \
-           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch;patch=1 \
-           file://tosa/0057-Clean-up-tosa-resetting.patch;patch=1 \
+           file://tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch \
+           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch \
+           file://tosa/0003-Core-MFD-support.patch \
+           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch \
+           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch \
+           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch \
+           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch \
+           file://tosa/0008-Nand-driver-for-TMIO-devices.patch \
+           file://tosa/0009-FB-driver-for-TMIO-devices.patch \
+           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch \
+           file://tosa/0011-MMC-driver-for-TMIO-devices.patch \
+           file://tosa/0012-Tosa-keyboard-support.patch \
+           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch \
+           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch \
+           file://tosa/0015-sharpsl-export-params.patch \
+           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch \
+           file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch \
+           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch \
+           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch \
+           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch \
+           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch \
+           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch \
+           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch \
+           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch \
+           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch \
+           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch \
+           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch \
+           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch \
+           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch \
+           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch \
+           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch \
+           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch \
+           file://tosa/0045-Update-tmio_ohci.patch \
+           file://tosa/0046-patch-tc6393xb-cleanup.patch \
+           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch \
+           file://tosa/0048-tc6393xb-GPIO-support.patch \
+           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch \
+           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch \
+           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch \
+           file://tosa/0052-tosa-platform-backlight-support.patch \
+           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch \
+           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch \
+           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch \
+           file://tosa/0058-Fix-tosakbd-suspend.patch \
+           file://tosa/0059-patch-tosa-wakeup-test.patch \
+           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch \
+           file://tosa/0061-tosa-bat-unify.patch \
+           file://tosa/0062-tosa-bat-fix-charging.patch \
+           file://tosa/0063-patch-tosa-bat-jacket-detect.patch \
+           file://tosa/0064-Export-modes-via-sysfs.patch \
+           file://tosa/0065-wm97xx-core-fixes.patch \
+           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch \
+           file://tosa/0067-modeswitching.patch \
+           file://tosa/0068-Preliminary-tosa-denoiser.patch \
+           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch \
+           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch \
+           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch \
+           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch \
+           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch \
+           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch \
+           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch \
+           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch \
+           file://tosa/0040-Clocklib-debugfs-support.patch \
+           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch \
+           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch \
+           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch \
+           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch \
+           file://tosa/0057-Clean-up-tosa-resetting.patch \
            "
 
 SRC_URI_append_htcuniversal ="\
-	file://htcuni-acx.patch;patch=1;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://pxa_fb_overlay.patch;patch=1 \
-	file://zylonite-boot.patch;patch=1 \
-	file://zylonite_mtd-r0.patch;patch=1 \
-	file://zylonite_touch-r0.patch;patch=1 \
-	file://zylonite_keypad-r0.patch;patch=1 \
+	file://pxa_fb_overlay.patch \
+	file://zylonite-boot.patch \
+	file://zylonite_mtd-r0.patch \
+	file://zylonite_touch-r0.patch \
+	file://zylonite_keypad-r0.patch \
 	"
 
 S = "${WORKDIR}/linux-2.6.25"
diff --git a/recipes/linux/linux-rp_2.6.26.bb b/recipes/linux/linux-rp_2.6.26.bb
index 42a8981fbf..240ae957fe 100644
--- a/recipes/linux/linux-rp_2.6.26.bb
+++ b/recipes/linux/linux-rp_2.6.26.bb
@@ -14,46 +14,47 @@ DEFAULT_PREFERENCE_c7x0 = "1"
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
-# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;apply=yes
+# ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;apply=yes
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2;name=kernel \
-           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;patch=1;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r34.patch;patch=1;name=rppatch2 \
-           ${RPSRC}/hx2750_bl-r9.patch;patch=1;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r3.patch;patch=1;name=rppatch4 \
-           ${RPSRC}/pxa_keys-r9.patch;patch=1;name=rppatch5 \
-           ${RPSRC}/tsc2101-r19.patch;patch=1;name=rppatch6 \
-           ${RPSRC}/hx2750_test1-r8.patch;patch=1;name=rppatch7 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;patch=1;name=rppatch9 \
-           ${RPSRC}/locomo_kbd_tweak-r2.patch;patch=1;name=rppatch10 \
-#           ${RPSRC}/pxa27x_overlay-r8.patch;patch=1;name=rppatch11 \
-           ${RPSRC}/w100_extaccel-r2.patch;patch=1;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;patch=1;name=rppatch13 \
-           ${RPSRC}/poodle_pm-r6.patch;patch=1;name=rppatch14 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1;name=rppatch16 \
-           file://zaurus-i2c-init.patch;patch=1;status=upstream \
-#           ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;patch=1;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;patch=1;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack;name=rppatch22 \
-           file://sharpsl-rc-r1.patch;patch=1 \
-           file://spitz_h_rewrite.patch;patch=1 \
-           file://pxa-serial-hack.patch;patch=1;status=hack \
-           file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
-           file://htcuni.patch;patch=1 \
-           file://versatile-armv6.patch;patch=1 \
+           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;name=rppatch1 \
+           ${RPSRC}/hx2750_base-r34.patch;name=rppatch2 \
+           ${RPSRC}/hx2750_bl-r9.patch;name=rppatch3 \
+           ${RPSRC}/hx2750_pcmcia-r3.patch;name=rppatch4 \
+           ${RPSRC}/pxa_keys-r9.patch;name=rppatch5 \
+           ${RPSRC}/tsc2101-r19.patch;name=rppatch6 \
+           ${RPSRC}/hx2750_test1-r8.patch;name=rppatch7 \
+           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;name=rppatch8 \
+           ${RPSRC}/pm_changes-r1.patch;name=rppatch9 \
+           ${RPSRC}/locomo_kbd_tweak-r2.patch;name=rppatch10 \
+#           ${RPSRC}/pxa27x_overlay-r8.patch;name=rppatch11 \
+           ${RPSRC}/w100_extaccel-r2.patch;name=rppatch12 \
+           ${RPSRC}/w100_extmem-r1.patch;name=rppatch13 \
+#           ${RPSRC}/poodle_pm-r6.patch;name=rppatch14 \
+           file://poodle_pm-r7.patch;name=rppatch14 \
+           ${RPSRC}/poodle_lcd_hack-r0.patch;name=rppatch15 \
+           ${RPSRC}/poodle_asoc_fix-r1.patch;name=rppatch16 \
+           file://zaurus-i2c-init.patch;status=upstream \
+#           ${RPSRC}/logo_oh-r1.patch.bz2;status=unmergable;name=rppatch17 \
+           ${RPSRC}/pxa-linking-bug.patch;status=unmergable;name=rppatch18 \
+           file://hostap-monitor-mode.patch;status=unmergable \
+           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;status=unmergable \
+           ${RPSRC}/mmcsd_large_cards-r1.patch;status=hack;name=rppatch19 \
+           ${RPSRC}/mmcsd_no_scr_check-r2.patch;status=hack;name=rppatch20 \
+           ${RPSRC}/integrator_rgb-r1.patch;status=hack;name=rppatch21 \
+           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;status=hack;name=rppatch22 \
+           file://sharpsl-rc-r1.patch \
+           file://spitz_h_rewrite.patch \
+           file://pxa-serial-hack.patch;status=hack \
+           file://connectplus-remove-ide-HACK.patch;status=hack \
+           file://connectplus-prevent-oops-HACK.patch;status=hack \
+           file://htcuni.patch \
+           file://versatile-armv6.patch \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-akita \
@@ -63,117 +64,117 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2;name=k
            file://defconfig-bootcdx86 \
            file://defconfig-htcuniversal \
            file://defconfig-collie \
+           file://defconfig-poodle \
            file://defconfig-zylonite"
 # Disabled until the patchset is updated:
 #           file://defconfig-tosa
-#           file://defconfig-poodle
 
 
 # FIXMEs before made default	   
-# ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack;name=rppatch50
+# ${RPSRC}/mmcsd_no_scr_check-r1.patch;status=hack;name=rppatch50
 
 
 # Add this to enable pm debug code (useful with a serial lead)
-#  ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1;name=rppatch51
+#  ${RPSRC}/sharpsl_pm_debug-r0.patch;name=rppatch51
 
 # Disabled until I find the reason this gives issues with cdc_subset
-#            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1;name=rppatch52 \
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 
 
 SRC_URI_append_collie = "\
-	file://collie.patch;patch=1 \
-	file://collie_keymap.patch;patch=1 \
-	file://collie-ucbfix.patch;patch=1 \
-	file://usb-gadget27bp.patch;patch=1 \
+	file://collie.patch \
+	file://collie_keymap.patch \
+	file://collie-ucbfix.patch \
+	file://usb-gadget27bp.patch \
 "
 
 SRC_URI_append_poodle = "\
-           ${RPSRC}/poodle_serial_vcc-r0.patch;patch=1;name=rppatch53 \
-           file://poodle_ts.patch;patch=1 \
-           file://pxafb.patch;patch=1 \
+           file://poodle_serial_vcc-r1.patch \
+#           file://poodle_ts.patch \
+#           file://pxafb.patch \
 "
 
 SRC_URI_append_tosa = "\
-           file://tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch;patch=1 \
-           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch;patch=1 \
-           file://tosa/0003-Core-MFD-support.patch;patch=1 \
-           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch;patch=1 \
-           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch;patch=1 \
-           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch;patch=1 \
-           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch;patch=1 \
-           file://tosa/0008-Nand-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0009-FB-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0011-MMC-driver-for-TMIO-devices.patch;patch=1 \
-           file://tosa/0012-Tosa-keyboard-support.patch;patch=1 \
-           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch;patch=1 \
-           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch;patch=1 \
-           file://tosa/0015-sharpsl-export-params.patch;patch=1 \
-           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch;patch=1 \
-           file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch;patch=1 \
-           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch;patch=1 \
-           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch;patch=1 \
-           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch;patch=1 \
-           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch;patch=1 \
-           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch;patch=1 \
-           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch;patch=1 \
-           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch;patch=1 \
-           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch;patch=1 \
-           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch;patch=1 \
-           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch;patch=1 \
-           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch;patch=1 \
-           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch;patch=1 \
-           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
-           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
-           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch;patch=1 \
-           file://tosa/0045-Update-tmio_ohci.patch;patch=1 \
-           file://tosa/0046-patch-tc6393xb-cleanup.patch;patch=1 \
-           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch;patch=1 \
-           file://tosa/0048-tc6393xb-GPIO-support.patch;patch=1 \
-           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch;patch=1 \
-           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch;patch=1 \
-           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch;patch=1 \
-           file://tosa/0052-tosa-platform-backlight-support.patch;patch=1 \
-           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch;patch=1 \
-           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch;patch=1 \
-           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch;patch=1 \
-           file://tosa/0058-Fix-tosakbd-suspend.patch;patch=1 \
-           file://tosa/0059-patch-tosa-wakeup-test.patch;patch=1 \
-           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch;patch=1 \
-           file://tosa/0061-tosa-bat-unify.patch;patch=1 \
-           file://tosa/0062-tosa-bat-fix-charging.patch;patch=1 \
-           file://tosa/0063-patch-tosa-bat-jacket-detect.patch;patch=1 \
-           file://tosa/0064-Export-modes-via-sysfs.patch;patch=1 \
-           file://tosa/0065-wm97xx-core-fixes.patch;patch=1 \
-           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch;patch=1 \
-           file://tosa/0067-modeswitching.patch;patch=1 \
-           file://tosa/0068-Preliminary-tosa-denoiser.patch;patch=1 \
-           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch;patch=1 \
-           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch;patch=1 \
-           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch;patch=1 \
-           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch;patch=1 \
-           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch;patch=1 \
-           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch;patch=1 \
-           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch;patch=1 \
-           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch;patch=1 \
-           file://tosa/0040-Clocklib-debugfs-support.patch;patch=1 \
-           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch;patch=1 \
-           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch;patch=1 \
-           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch;patch=1 \
-           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch;patch=1 \
-           file://tosa/0057-Clean-up-tosa-resetting.patch;patch=1 \
+           file://tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch \
+           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch \
+           file://tosa/0003-Core-MFD-support.patch \
+           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch \
+           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch \
+           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch \
+           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch \
+           file://tosa/0008-Nand-driver-for-TMIO-devices.patch \
+           file://tosa/0009-FB-driver-for-TMIO-devices.patch \
+           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch \
+           file://tosa/0011-MMC-driver-for-TMIO-devices.patch \
+           file://tosa/0012-Tosa-keyboard-support.patch \
+           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch \
+           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch \
+           file://tosa/0015-sharpsl-export-params.patch \
+           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch \
+           file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch \
+           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch \
+           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch \
+           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch \
+           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch \
+           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch \
+           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch \
+           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch \
+           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch \
+           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch \
+           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch \
+           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch \
+           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch \
+           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch \
+           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch \
+           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch \
+           file://tosa/0045-Update-tmio_ohci.patch \
+           file://tosa/0046-patch-tc6393xb-cleanup.patch \
+           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch \
+           file://tosa/0048-tc6393xb-GPIO-support.patch \
+           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch \
+           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch \
+           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch \
+           file://tosa/0052-tosa-platform-backlight-support.patch \
+           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch \
+           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch \
+           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch \
+           file://tosa/0058-Fix-tosakbd-suspend.patch \
+           file://tosa/0059-patch-tosa-wakeup-test.patch \
+           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch \
+           file://tosa/0061-tosa-bat-unify.patch \
+           file://tosa/0062-tosa-bat-fix-charging.patch \
+           file://tosa/0063-patch-tosa-bat-jacket-detect.patch \
+           file://tosa/0064-Export-modes-via-sysfs.patch \
+           file://tosa/0065-wm97xx-core-fixes.patch \
+           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch \
+           file://tosa/0067-modeswitching.patch \
+           file://tosa/0068-Preliminary-tosa-denoiser.patch \
+           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch \
+           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch \
+           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch \
+           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch \
+           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch \
+           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch \
+           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch \
+           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch \
+           file://tosa/0040-Clocklib-debugfs-support.patch \
+           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch \
+           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch \
+           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch \
+           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch \
+           file://tosa/0057-Clean-up-tosa-resetting.patch \
            "
 
 SRC_URI_append_htcuniversal ="\
-	file://htcuni-acx.patch;patch=1;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://pxa_fb_overlay.patch;patch=1 \
-	file://zylonite-boot.patch;patch=1 \
-	file://zylonite_mtd-r0.patch;patch=1 \
-	file://zylonite_touch-r0.patch;patch=1 \
-	file://zylonite_keypad-r0.patch;patch=1 \
+	file://pxa_fb_overlay.patch \
+	file://zylonite-boot.patch \
+	file://zylonite_mtd-r0.patch \
+	file://zylonite_touch-r0.patch \
+	file://zylonite_keypad-r0.patch \
 	"
 
 S = "${WORKDIR}/linux-2.6.26"
diff --git a/recipes/linux/linux-rt_2.6.24.bb b/recipes/linux/linux-rt_2.6.24.bb
index 982f0008d8..d25640007f 100644
--- a/recipes/linux/linux-rt_2.6.24.bb
+++ b/recipes/linux/linux-rt_2.6.24.bb
@@ -8,22 +8,22 @@ DEFAULT_PREFERENCE_mpc8315e-rdb = "1"
 PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2;patch=1;p=1;name=patch24.7 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.24.7-rt27.bz2;patch=1;p=1;name=patchrt27 \
-           file://squashfs-lzma-2.6.24.patch;patch=1 \
-           file://powerpc-clockres.patch;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2;apply=yes;p=1;name=patch24.7 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.24.7-rt27.bz2;apply=yes;p=1;name=patchrt27 \
+           file://squashfs-lzma-2.6.24.patch \
+           file://powerpc-clockres.patch \
            file://defconfig"
 
-#           file://sysctl_missing_include.patch;patch=1 \
+#           file://sysctl_missing_include.patch \
 
 S = "${WORKDIR}/linux-2.6.24"
 
 SRC_URI_append_mpc8313e-rdb = " \
-           file://leds-cpu-activity.patch;patch=1 \
-           file://leds-cpu-activity-powerpc.patch;patch=1 \
-           file://mpc8313e-rdb-leds.patch;patch=1"
-#	file://mpc831x-nand.patch;patch=1 \
-#	file://mpc8313e-rdb-rtc.patch;patch=1 "
+           file://leds-cpu-activity.patch \
+           file://leds-cpu-activity-powerpc.patch \
+           file://mpc8313e-rdb-leds.patch"
+#	file://mpc831x-nand.patch \
+#	file://mpc8313e-rdb-rtc.patch "
 
 
 # override the device tree source file from linux.inc, as the patches below
@@ -36,38 +36,38 @@ KERNEL_DEVICETREE_mpc8315e-rdb = "arch/${ARCH}/boot/dts/mpc8315erdb_default.dts"
 
 SRC_URI_mpc8315e-rdb = " \
 ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
-${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.24.3.bz2;patch=1;p=1;name=patch24.3 \
-${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/older/patch-2.6.24.3-rt3.bz2;patch=1;p=1;name=patchrt3 \
-file://squashfs-lzma-2.6.24.patch;patch=1 \
-file://powerpc-clockres.patch;patch=1 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-platform-support.patch;patch=1;name=patchmpc1 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-add-all-interrupts.patch;patch=1;name=patchmpc2 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Realtek-821x-phy.patch;patch=1;name=patchmpc3 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-fix-gianfar.patch;patch=1;name=patchmpc4 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Gianfar-buffer-recycling.patch;patch=1;name=patchmpc5 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Gianfar-performance.patch;patch=1;name=patchmpc6 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-sata-support.patch;patch=1;name=patchmpc7 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-fsl-serdes-support.patch;patch=1;name=patchmpc8 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-pcie-INTx-support.patch;patch=1;name=patchmpc9 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-ipic-msi.patch;patch=1;name=patchmpc10 \ 
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-usb-support.patch;patch=1;name=patchmpc11 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-power-management.patch;patch=1;name=patchmpc12 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-usb-power-mangement.patch;patch=1;name=patchmpc13 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-NAND-flash.patch;patch=1;name=patchmpc14 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-elbc-jffs2-on-nand.patch;patch=1;name=patchmpc15 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Codewarrior-kernel-debug.patch;patch=1;name=patchmpc16 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-otg.patch;patch=1;name=patchmpc17 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC831x-LFC.patch;patch=1;name=patchmpc18 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-TDM.patch;patch=1;name=patchmpc19 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-tdm-test-modules.patch;patch=1;name=patchmpc20 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-spi-for-tdm-module.patch;patch=1;name=patchmpc21 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-port-mutiplier-in-sata.patch;patch=1;name=patchmpc22 \ 
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-performance-monitor.patch;patch=1;name=patchmpc23 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-ieee-1588.patch;patch=1;name=patchmpc24 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-DTS.patch;patch=1;name=patchmpc25 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-sata-pm.patch;patch=1;name=patchmpc26 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-fix-large-file-transfer.patch;patch=1;name=patchmpc27 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-default-configuration.patch;patch=1;name=patchmpc28 \
+${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.24.3.bz2;apply=yes;p=1;name=patch24.3 \
+${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/older/patch-2.6.24.3-rt3.bz2;apply=yes;p=1;name=patchrt3 \
+file://squashfs-lzma-2.6.24.patch \
+file://powerpc-clockres.patch \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-platform-support.patch;name=patchmpc1 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-add-all-interrupts.patch;name=patchmpc2 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Realtek-821x-phy.patch;name=patchmpc3 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-fix-gianfar.patch;name=patchmpc4 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Gianfar-buffer-recycling.patch;name=patchmpc5 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Gianfar-performance.patch;name=patchmpc6 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-sata-support.patch;name=patchmpc7 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-fsl-serdes-support.patch;name=patchmpc8 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-pcie-INTx-support.patch;name=patchmpc9 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-ipic-msi.patch;name=patchmpc10 \ 
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-usb-support.patch;name=patchmpc11 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-power-management.patch;name=patchmpc12 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-usb-power-mangement.patch;name=patchmpc13 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-NAND-flash.patch;name=patchmpc14 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-elbc-jffs2-on-nand.patch;name=patchmpc15 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Codewarrior-kernel-debug.patch;name=patchmpc16 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-otg.patch;name=patchmpc17 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC831x-LFC.patch;name=patchmpc18 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-TDM.patch;name=patchmpc19 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-tdm-test-modules.patch;name=patchmpc20 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-spi-for-tdm-module.patch;name=patchmpc21 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-port-mutiplier-in-sata.patch;name=patchmpc22 \ 
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-performance-monitor.patch;name=patchmpc23 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-ieee-1588.patch;name=patchmpc24 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-DTS.patch;name=patchmpc25 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-sata-pm.patch;name=patchmpc26 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-fix-large-file-transfer.patch;name=patchmpc27 \
+http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-default-configuration.patch;name=patchmpc28 \
 file://defconfig \
 "
 
@@ -75,11 +75,11 @@ file://defconfig \
 # against crypto/ocf/ and thus needs a proper rebase against the base dir.
 # This remains a todo. -- Leon Woestenberg.
 #SRC_URI_append_mpc8315e-rdb = " \
-#http://www.bitshrine.org/gpp/ocf-linux-26-20071215.patch.gz;patch=1;name=patchmpc29 \
-#http://www.bitshrine.org/gpp/ocf-linux-20071215-20080427.diff;patch=1;name=patchmpc30 \
-#http://www.bitshrine.org/gpp/linux-fsl-2.6.24-OCF-fsl_soc-2.patch;patch=1;name=patchmpc31 \
-#http://www.bitshrine.org/gpp/linux-2.6.24-Openswan-2.4.12.patch;patch=1;name=patchmpc32 \
-#http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-openswan-sysctl.patch;patch=1;name=patchmpc33 \
+#http://www.bitshrine.org/gpp/ocf-linux-26-20071215.patch.gz;name=patchmpc29 \
+#http://www.bitshrine.org/gpp/ocf-linux-20071215-20080427.diff;name=patchmpc30 \
+#http://www.bitshrine.org/gpp/linux-fsl-2.6.24-OCF-fsl_soc-2.patch;name=patchmpc31 \
+#http://www.bitshrine.org/gpp/linux-2.6.24-Openswan-2.4.12.patch;name=patchmpc32 \
+#http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-openswan-sysctl.patch;name=patchmpc33 \
 #"
 
 SRC_URI[kernel.md5sum] = "3f23ad4b69d0a552042d1ed0f4399857"
diff --git a/recipes/linux/linux-rt_2.6.25.bb b/recipes/linux/linux-rt_2.6.25.bb
index 840abd0700..e483f7d234 100644
--- a/recipes/linux/linux-rt_2.6.25.bb
+++ b/recipes/linux/linux-rt_2.6.25.bb
@@ -12,8 +12,8 @@ PR = "r4"
 #KERNEL_IMAGETYPE_efika = "Image"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.25.4.bz2;patch=1;name=stablepatch \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/older/patch-2.6.25.4-rt6.bz2;patch=1;name=rtpatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.25.4.bz2;apply=yes;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/older/patch-2.6.25.4-rt6.bz2;apply=yes;name=rtpatch \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.25"
diff --git a/recipes/linux/linux-rt_2.6.29.bb b/recipes/linux/linux-rt_2.6.29.bb
index 044278c8dc..30b8bd34ef 100644
--- a/recipes/linux/linux-rt_2.6.29.bb
+++ b/recipes/linux/linux-rt_2.6.29.bb
@@ -8,8 +8,8 @@ DEFAULT_PREFERENCE = "-1"
 PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;patch=1;name=stablepatch \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/older/patch-${PV}.1-rt8.bz2;patch=1;name=rtpatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;apply=yes;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/older/patch-${PV}.1-rt8.bz2;apply=yes;name=rtpatch \
            file://defconfig"
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/recipes/linux/linux-sgh-i900_2.6.32.bb b/recipes/linux/linux-sgh-i900_2.6.32.bb
index 1c16d289b5..f45da3f0e8 100644
--- a/recipes/linux/linux-sgh-i900_2.6.32.bb
+++ b/recipes/linux/linux-sgh-i900_2.6.32.bb
@@ -7,7 +7,7 @@ RDEPENDS += "marvell-gspi-fw"
 COMPATIBLE_MACHINE = "sgh-i900"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           file://sgh-i900-support.patch;patch=1 \
+           file://sgh-i900-support.patch \
            file://sgh_i900_defconfig"
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/recipes/linux/linux-smdk2440_2.6.20+git.bb b/recipes/linux/linux-smdk2440_2.6.20+git.bb
index e90274bc8b..f8ec93f8cf 100644
--- a/recipes/linux/linux-smdk2440_2.6.20+git.bb
+++ b/recipes/linux/linux-smdk2440_2.6.20+git.bb
@@ -6,7 +6,7 @@ PR = "r1"
 GGSRC = "http://www.xora.org.uk/oe/patches/"
 
 SRC_URI = "git://opensource.wolfsonmicro.com/linux-2.6-asoc-ggdev;protocol=git;tag=asoc-merge-0002 \
-           file://0001-Enable-cs8900A-network-device-for-smdk2440-board.patch;patch=1 \
+           file://0001-Enable-cs8900A-network-device-for-smdk2440-board.patch \
            file://defconfig-smdk2440"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-smdk2443_2.6.20+git.bb b/recipes/linux/linux-smdk2443_2.6.20+git.bb
index 136c2ab0b5..aeaa08935c 100644
--- a/recipes/linux/linux-smdk2443_2.6.20+git.bb
+++ b/recipes/linux/linux-smdk2443_2.6.20+git.bb
@@ -8,15 +8,15 @@ PR = "r1"
 GGSRC = "http://www.xora.org.uk/oe/patches/"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.21-rc5 \
-           file://0020-Add-ASoC-S3C24xx-platform-support.patch;patch=1 \
-           file://0021-Add-Neo1973-ASoC-support.patch;patch=1 \
-           file://0022-Add-initial-ASoC-SMDK2440-support.patch;patch=1 \
-           file://0023-Add-ASoC-SMDK2440-support-for-WM8956-codec.patch;patch=1 \
-           file://0034-Export-ac97_dai.patch;patch=1 \
-           file://0036-Move-s3c24xx_i2s_dai-and-add-dma_size.patch;patch=1 \
-           file://0037-Use-dma_size-parameter-and-fix-buffdone-oops.patch;patch=1 \
-           file://0038-Add-smdk2443-s3c2443-ac97-and-wm9710-support.patch;patch=1 \
-           file://asoc-mainline.patch;patch=1 \
+           file://0020-Add-ASoC-S3C24xx-platform-support.patch \
+           file://0021-Add-Neo1973-ASoC-support.patch \
+           file://0022-Add-initial-ASoC-SMDK2440-support.patch \
+           file://0023-Add-ASoC-SMDK2440-support-for-WM8956-codec.patch \
+           file://0034-Export-ac97_dai.patch \
+           file://0036-Move-s3c24xx_i2s_dai-and-add-dma_size.patch \
+           file://0037-Use-dma_size-parameter-and-fix-buffdone-oops.patch \
+           file://0038-Add-smdk2443-s3c2443-ac97-and-wm9710-support.patch \
+           file://asoc-mainline.patch \
            file://defconfig-smdk2443"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-storcenter_2.6.27.7.bb b/recipes/linux/linux-storcenter_2.6.27.7.bb
index 33855b488e..dd606a2109 100644
--- a/recipes/linux/linux-storcenter_2.6.27.7.bb
+++ b/recipes/linux/linux-storcenter_2.6.27.7.bb
@@ -7,7 +7,7 @@ DEPENDS = "dtc-native"
 COMPATIBLE_MACHINE = "storcenter"
 
 SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           file://fw-and-powerpc-install.patch;patch=1 \
+           file://fw-and-powerpc-install.patch \
            file://defconfig-${PV} \
                "
 
diff --git a/recipes/linux/linux-titan-sh4_2.6.21.bb b/recipes/linux/linux-titan-sh4_2.6.21.bb
index 9f60f2013e..623ca1f064 100644
--- a/recipes/linux/linux-titan-sh4_2.6.21.bb
+++ b/recipes/linux/linux-titan-sh4_2.6.21.bb
@@ -4,11 +4,11 @@ LICENSE = "GPLv2"
 PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-	   file://titan-flash.patch;patch=1 \
-	   file://titan-pcibios-scan-update.patch;patch=1 \
-           file://no-mm-mutex.patch;patch=1 \
-	   file://linux-2.6-limits.patch;patch=1 \
-	   file://linux-sh-__sdivsi3_i4i.patch;patch=1 \
+	   file://titan-flash.patch \
+	   file://titan-pcibios-scan-update.patch \
+           file://no-mm-mutex.patch \
+	   file://linux-2.6-limits.patch \
+	   file://linux-sh-__sdivsi3_i4i.patch \
 	   file://titan-config"
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux/linux-tornado-omap2_2.6.16.16.bb b/recipes/linux/linux-tornado-omap2_2.6.16.16.bb
index 5d4a0603d4..bea99a73e1 100644
--- a/recipes/linux/linux-tornado-omap2_2.6.16.16.bb
+++ b/recipes/linux/linux-tornado-omap2_2.6.16.16.bb
@@ -4,9 +4,9 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2;name=kernel \
-	   http://www.muru.com/linux/omap/patches/old/patch-2.6.16-omap2.bz2;patch=1;name=patch \
-           file://linux-2.6.16.16.patch;patch=1 \
-           file://tornado-20070320.patch;patch=1 \
+	   http://www.muru.com/linux/omap/patches/old/patch-2.6.16-omap2.bz2;apply=yes;name=patch \
+           file://linux-2.6.16.16.patch \
+           file://tornado-20070320.patch \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.16"
diff --git a/recipes/linux/linux-turbostation_2.6.20.2.bb b/recipes/linux/linux-turbostation_2.6.20.2.bb
index 1d2fc6c9ae..355ca009bd 100644
--- a/recipes/linux/linux-turbostation_2.6.20.2.bb
+++ b/recipes/linux/linux-turbostation_2.6.20.2.bb
@@ -9,15 +9,15 @@ COMPATIBLE_MACHINE = "turbostation"
 RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-	file://001_r1000.diff;patch=1 \
-	file://linux-2.6.16_arch_ppc_platforms_sandpoint.h;patch=1 \
-	file://002_qnap-pic.diff;patch=1 \
-	file://linux-2.6.16_arch_ppc_syslib_Makefile;patch=1 \
-	file://linux-2.6.16_drivers_mtd_maps_physmap.c;patch=1 \
-	file://linux-2.6.16_arch_ppc_syslib_mpc10x_common.c;patch=1 \
-	file://linux-2.6.16_arch_ppc_platforms_Makefile;patch=1 \
-	file://linux-2.6.16_include_asm-ppc_mpc10x.h;patch=1 \
-	file://linux-2.6.16_arch_ppc_platforms_sandpoint.c;patch=1 \
+	file://001_r1000.diff \
+	file://linux-2.6.16_arch_ppc_platforms_sandpoint.h;apply=yes \
+	file://002_qnap-pic.diff \
+	file://linux-2.6.16_arch_ppc_syslib_Makefile;apply=yes \
+	file://linux-2.6.16_drivers_mtd_maps_physmap.c;apply=yes \
+	file://linux-2.6.16_arch_ppc_syslib_mpc10x_common.c;apply=yes \
+	file://linux-2.6.16_arch_ppc_platforms_Makefile;apply=yes \
+	file://linux-2.6.16_include_asm-ppc_mpc10x.h;apply=yes \
+	file://linux-2.6.16_arch_ppc_platforms_sandpoint.c;apply=yes \
 	file://defconfig"
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/recipes/linux/linux-wrt_2.4.20.bb b/recipes/linux/linux-wrt_2.4.20.bb
index 5608ac89e7..30deb51463 100644
--- a/recipes/linux/linux-wrt_2.4.20.bb
+++ b/recipes/linux/linux-wrt_2.4.20.bb
@@ -4,18 +4,18 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.20.tar.bz2 \
-	   file://linux-2.4.20-mipscvs.patch;patch=1 \
-	   file://2.4.20_broadcom_3_37_2_1109_US.patch;patch=1 \
-	   file://110-sch_htb.patch;patch=1 \
-	   file://120-openwrt.patch;patch=1 \
-	   file://130-nfsswap.patch;patch=1 \
-	   file://140-ebtables-brnf-5.patch;patch=1 \
-	   file://150-mppe-mppc-0.98.patch;patch=1 \
-	   file://160-expr.patch;patch=1 \
-	   file://linux-2.4.24-attribute-used.patch;patch=1 \
-	   file://gcc_mtune.patch;patch=1 \
-	   file://gcc3.patch;patch=1 \
-	   file://nobcom.patch;patch=1 \
+	   file://linux-2.4.20-mipscvs.patch \
+	   file://2.4.20_broadcom_3_37_2_1109_US.patch \
+	   file://110-sch_htb.patch \
+	   file://120-openwrt.patch \
+	   file://130-nfsswap.patch \
+	   file://140-ebtables-brnf-5.patch \
+	   file://150-mppe-mppc-0.98.patch \
+	   file://160-expr.patch \
+	   file://linux-2.4.24-attribute-used.patch \
+	   file://gcc_mtune.patch \
+	   file://gcc3.patch \
+	   file://nobcom.patch \
 	   file://compressed-20040531.tar.bz2 \
 	   file://diag.c \
            file://defconfig"
diff --git a/recipes/linux/linux-wrt_2.4.30.bb b/recipes/linux/linux-wrt_2.4.30.bb
index 1a10e81742..40171c1603 100644
--- a/recipes/linux/linux-wrt_2.4.30.bb
+++ b/recipes/linux/linux-wrt_2.4.30.bb
@@ -9,64 +9,64 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2;name=k
 	cvs://anonymous@openwrt.org/openwrt;module=openwrt/package/linux/kernel-source;tag=TESTED \
 	http://downloads.openwrt.org/sources/kernel-binary-wl-0.2.tar.gz;name=wlpatch \
 	http://downloads.openwrt.org/sources/kernel-source-et-0.6.tar.gz;name=etpatch \
-	file://000-linux-mips-2_4_30.patch;patch=1 \
-	file://001-Makefile;patch=1 \
-	file://002-Rules_make;patch=1 \
-	file://003-arch_mips_Makefile;patch=1 \
-	file://005-arch_mips_config-shared_in;patch=1 \
-	file://007-arch_mips_kernel_cpu-probe_c;patch=1 \
-	file://009-arch_mips_kernel_head_S;patch=1 \
-	file://010-arch_mips_kernel_proc_c;patch=1 \
-	file://011-arch_mips_kernel_setup_c;patch=1 \
-	file://012-arch_mips_kernel_traps_c;patch=1 \
-	file://017-arch_mips_pci_Makefile;patch=1 \
-	file://018_drivers_char_mem_c;patch=1 \
-	file://019-drivers_char_serial_c;patch=1 \
-	file://020-drivers_mtd-jumbo;patch=1 \
-	file://021-drivers_net_Config_in-hnd;patch=1 \
-	file://022-drivers_net_Makefile;patch=1 \
-	file://023-drivers_parport_Makefile;patch=1 \
-	file://024-drivers_parport_Config_in;patch=1 \
-	file://028-drivers_pcmcia_Makefile;patch=1 \
-	file://029-arch_mips_mm_c-r4k_c;patch=1 \
-	file://031-include_asm-mips_bootinfo_h;patch=1 \
-	file://033-include_asm-mips_cpu_h;patch=1 \
-	file://036-include_asm-mips_serial_h;patch=1 \
-	file://037-init_do_mounts_c;patch=1 \
-	file://100-gcc3-mtune;patch=1 \
-	file://200-include_linux_netdevice_h.patch;patch=1 \
-	file://201-include_linux_skbuff_h.patch;patch=1 \
-	file://202-net_core_Makefile.patch;patch=1 \
-	file://203-net_core_dev_c.patch;patch=1 \
-	file://204-net_sched_sched_api_c.patch;patch=1 \
-	file://205-net_sched_sched_generic_c.patch;patch=1 \
-	file://206-include_net_pkt_sched_h.patch;patch=1 \
-	file://207-hfsplus-fix;patch=1 \
-	file://208-gcc-3.4-fix;patch=1 \
-	file://300-squashfs2.1;patch=1 \
-	file://301-jffs-compression;patch=1 \
-	file://302-ebtables;patch=1 \
-	file://303-mppe-mppc;patch=1 \
-	file://304-netfilter-ipp2p-0.7.4;patch=1 \
-	file://305-cifs-1.20c;patch=1 \
-	file://306-netfilter-layer7-0.9.1;patch=1 \
-	file://307-gcc-3.4-fix.patch;patch=1 \
-	file://308-netfilter-nat-pptp;patch=1 \
-	file://309-drivers_net_b44_c.patch;patch=1 \
-	file://310-netfilter-maxconn;patch=1 \
-	file://311-ipsec-nat-traversal;patch=1 \
-	file://312-netfilter-TTL;patch=1 \
-	file://313-gcc-4.0-fixes;patch=1 \
-	file://314-drivers_net_b44_h.patch;patch=1 \
-	file://315-include_linux_pci_ids_h.patch;patch=1 \
-	file://316-b44_mii_phy.patch;patch=1 \
-	file://400-i4l-cvs-2-4-29;patch=1 \
-	file://401-hfc-usb-backport-i4l-cvs;patch=1 \
-	file://402-pl2303-backport-2-4-29;patch=1 \
-	file://403-netdev_random_core.patch;patch=1 \
-	file://404-netdev_random_et.patch;patch=1 \
-	file://600-linux-squashfs-lzma;patch=1 \
-	file://600-optional-aout-support;patch=1 \
+	file://000-linux-mips-2_4_30.patch \
+	file://001-Makefile;apply=yes \
+	file://002-Rules_make;apply=yes \
+	file://003-arch_mips_Makefile;apply=yes \
+	file://005-arch_mips_config-shared_in;apply=yes \
+	file://007-arch_mips_kernel_cpu-probe_c;apply=yes \
+	file://009-arch_mips_kernel_head_S;apply=yes \
+	file://010-arch_mips_kernel_proc_c;apply=yes \
+	file://011-arch_mips_kernel_setup_c;apply=yes \
+	file://012-arch_mips_kernel_traps_c;apply=yes \
+	file://017-arch_mips_pci_Makefile;apply=yes \
+	file://018_drivers_char_mem_c;apply=yes \
+	file://019-drivers_char_serial_c;apply=yes \
+	file://020-drivers_mtd-jumbo;apply=yes \
+	file://021-drivers_net_Config_in-hnd;apply=yes \
+	file://022-drivers_net_Makefile;apply=yes \
+	file://023-drivers_parport_Makefile;apply=yes \
+	file://024-drivers_parport_Config_in;apply=yes \
+	file://028-drivers_pcmcia_Makefile;apply=yes \
+	file://029-arch_mips_mm_c-r4k_c;apply=yes \
+	file://031-include_asm-mips_bootinfo_h;apply=yes \
+	file://033-include_asm-mips_cpu_h;apply=yes \
+	file://036-include_asm-mips_serial_h;apply=yes \
+	file://037-init_do_mounts_c;apply=yes \
+	file://100-gcc3-mtune;apply=yes \
+	file://200-include_linux_netdevice_h.patch \
+	file://201-include_linux_skbuff_h.patch \
+	file://202-net_core_Makefile.patch \
+	file://203-net_core_dev_c.patch \
+	file://204-net_sched_sched_api_c.patch \
+	file://205-net_sched_sched_generic_c.patch \
+	file://206-include_net_pkt_sched_h.patch \
+	file://207-hfsplus-fix;apply=yes \
+	file://208-gcc-3.4-fix;apply=yes \
+	file://300-squashfs2.1;apply=yes \
+	file://301-jffs-compression;apply=yes \
+	file://302-ebtables;apply=yes \
+	file://303-mppe-mppc;apply=yes \
+	file://304-netfilter-ipp2p-0.7.4;apply=yes \
+	file://305-cifs-1.20c;apply=yes \
+	file://306-netfilter-layer7-0.9.1;apply=yes \
+	file://307-gcc-3.4-fix.patch \
+	file://308-netfilter-nat-pptp;apply=yes \
+	file://309-drivers_net_b44_c.patch \
+	file://310-netfilter-maxconn;apply=yes \
+	file://311-ipsec-nat-traversal;apply=yes \
+	file://312-netfilter-TTL;apply=yes \
+	file://313-gcc-4.0-fixes;apply=yes \
+	file://314-drivers_net_b44_h.patch \
+	file://315-include_linux_pci_ids_h.patch \
+	file://316-b44_mii_phy.patch \
+	file://400-i4l-cvs-2-4-29;apply=yes \
+	file://401-hfc-usb-backport-i4l-cvs;apply=yes \
+	file://402-pl2303-backport-2-4-29;apply=yes \
+	file://403-netdev_random_core.patch \
+	file://404-netdev_random_et.patch \
+	file://600-linux-squashfs-lzma;apply=yes \
+	file://600-optional-aout-support;apply=yes \
 	file://linux.config"
 
 S = "${WORKDIR}/linux-2.4.30"
diff --git a/recipes/linux/linux-xilinx-ml507/defconfig b/recipes/linux/linux-xilinx-ml507/defconfig
index 693e14168b..087a5304b4 100644
--- a/recipes/linux/linux-xilinx-ml507/defconfig
+++ b/recipes/linux/linux-xilinx-ml507/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32
-# Fri Feb 26 23:31:02 2010
+# Linux kernel version: 2.6.33
+# Thu Apr 22 23:23:13 2010
 #
 # CONFIG_PPC64 is not set
 
@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
 CONFIG_IRQ_PER_CPU=y
+CONFIG_NR_IRQS=512
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -59,6 +60,7 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DTC=y
 CONFIG_DEFAULT_UIMAGE=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_PPC_DCR_NATIVE=y
 CONFIG_PPC_DCR_MMIO=y
 CONFIG_PPC_DCR=y
@@ -89,6 +91,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 #
 CONFIG_TREE_RCU=y
 # CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -98,8 +101,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_GROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
@@ -112,6 +114,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -172,14 +175,14 @@ CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
-# CONFIG_BLK_DEV_BSG is not set
+CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
 #
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 # CONFIG_DEFAULT_AS is not set
@@ -187,6 +190,35 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_UNLOCK is not set
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_UNLOCK is not set
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_UNLOCK is not set
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 # CONFIG_FREEZER is not set
 # CONFIG_PPC4xx_PCI_EXPRESS is not set
 
@@ -257,6 +289,7 @@ CONFIG_MATH_EMULATION=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_HAS_WALK_MEMORY=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_SPARSE_IRQ=y
 CONFIG_MAX_ACTIVE_REGIONS=32
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -273,8 +306,8 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_HAVE_MLOCK=y
+# CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_STDBINUTILS=y
@@ -285,7 +318,7 @@ CONFIG_PPC_4K_PAGES=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_PROC_DEVICETREE=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE=""
+CONFIG_CMDLINE=" debug "
 CONFIG_EXTRA_TARGETS="simpleImage.virtex440-ml507 simpleImage.initrd.virtex440-ml507"
 CONFIG_SECCOMP=y
 # CONFIG_COMPRESSED_DEVICE_TREE is not set
@@ -383,6 +416,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
 CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
 CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_TUNNEL is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -493,8 +527,8 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_AF_RXRPC is not set
 CONFIG_WIRELESS=y
 # CONFIG_CFG80211 is not set
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-CONFIG_WIRELESS_OLD_REGULATORY=y
+# CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+# CONFIG_WIRELESS_OLD_REGULATORY=y
 # CONFIG_WIRELESS_EXT is not set
 # CONFIG_LIB80211 is not set
 
@@ -512,8 +546,9 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
 #
 # Generic Driver Options
 #
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -619,6 +654,10 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
@@ -667,7 +706,7 @@ CONFIG_HAVE_IDE=y
 #
 
 #
-# See the help texts for more information.
+# The newer stack is recommended.
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
@@ -742,8 +781,10 @@ CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_GMII=y
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 CONFIG_WLAN=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+# CONFIG_AIRO is not set
+# CONFIG_ATMEL is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_HOSTAP is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -756,6 +797,7 @@ CONFIG_WLAN=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 is not set
 # CONFIG_ISDN is not set
 # CONFIG_PHONE is not set
 
@@ -765,6 +807,7 @@ CONFIG_WLAN=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
 
 #
 # Userland interfaces
@@ -774,7 +817,7 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 
 #
@@ -818,6 +861,7 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_XILINXPS2 is not set
 CONFIG_SERIO_XILINX_XPS_PS2=y
 # CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -852,6 +896,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_LEGACY_PTYS=y
@@ -892,6 +937,7 @@ CONFIG_GPIO_XILINX=y
 #
 # PCI GPIO expanders:
 #
+# CONFIG_GPIO_CS5535 is not set
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_LANGWELL is not set
 
@@ -1014,8 +1060,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
 CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_SOUND is not set
 # CONFIG_HID_SUPPORT is not set
@@ -1077,6 +1123,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUTOFS4_FS=y
 # CONFIG_FUSE_FS is not set
+CONFIG_GENERIC_ACL=y
 
 #
 # Caches
@@ -1108,7 +1155,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
@@ -1214,9 +1261,11 @@ CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
+CONFIG_LZO_DECOMPRESS=y
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
@@ -1321,7 +1370,11 @@ CONFIG_PRINT_STACK_DEPTH=64
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
 CONFIG_CRYPTO=y
 
 #
diff --git a/recipes/linux/linux-xilinx-ml507/xilinxfb.patch b/recipes/linux/linux-xilinx-ml507/xilinxfb.patch
new file mode 100644
index 0000000000..886e7e6dba
--- /dev/null
+++ b/recipes/linux/linux-xilinx-ml507/xilinxfb.patch
@@ -0,0 +1,25 @@
+From 54dc9b9e9cced3204b9d9a8a27319d9de662af3b Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <aalonso00@gmail.com>
+Date: Wed, 31 Mar 2010 22:14:55 -0600
+Subject: [PATCH] xilinxfb.c: add tft compatibility versions
+
+Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
+---
+ drivers/video/xilinxfb.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
+index ed7c8d0..829efaa 100644
+--- a/drivers/video/xilinxfb.c
++++ b/drivers/video/xilinxfb.c
+@@ -484,6 +484,8 @@ static int __devexit xilinxfb_of_remove(struct of_device *op)
+ /* Match table for of_platform binding */
+ static struct of_device_id xilinxfb_of_match[] __devinitdata = {
+	{ .compatible = "xlnx,xps-tft-1.00.a", },
++	{ .compatible = "xlnx,xps-tft-2.00.a", },
++	{ .compatible = "xlnx,xps-tft-2.01.a", },
+	{ .compatible = "xlnx,plb-tft-cntlr-ref-1.00.a", },
+	{ .compatible = "xlnx,plb-dvi-cntlr-ref-1.00.c", },
+	{},
+--
+1.6.6.1
diff --git a/recipes/linux/linux-xilinx-ml507_git.bb b/recipes/linux/linux-xilinx-ml507_git.bb
index ec9de1cd49..b6d6eb9501 100644
--- a/recipes/linux/linux-xilinx-ml507_git.bb
+++ b/recipes/linux/linux-xilinx-ml507_git.bb
@@ -1,17 +1,18 @@
 require linux.inc
 
 DESCRIPTION = "Linux kernel for Xilinx ml507 platform"
-KERNEL_RELEASE = "2.6.32+git"
+KERNEL_RELEASE = "2.6.33+git"
 
 COMPATIBLE_MACHINE = "xilinx-ml507"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_xilinx-ml507 = "1"
 
 PV = "${KERNEL_RELEASE}"
-PR = "r0"
+PR = "r1"
 
-SRCREV = "dc53725d22405e384b984d222542f526eaa9b829"
+SRCREV = "17431547113100a3ae0a622b9f76ad17fb76eb56"
 SRC_URI = "git://git.xilinx.com/linux-2.6-xlnx.git;protocol=git \
+           file://xilinxfb.patch \
            file://defconfig"
 
 inherit kernel xilinx-bsp
diff --git a/recipes/linux/linux-xilinx-slab_git.bb b/recipes/linux/linux-xilinx-slab_git.bb
index ec70674b19..8e9bfba74f 100644
--- a/recipes/linux/linux-xilinx-slab_git.bb
+++ b/recipes/linux/linux-xilinx-slab_git.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
 SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c"
 
 PR = "r3"
-PV = "2.6.25+2.6.26+${PR}+gitr${SRCPV}"
+PV = "2.6.25+2.6.26+${PR}+gitr${SRCREV}"
 PE = "1"
 
 COMPATIBLE_MACHINE = "xilinx-ml403"
diff --git a/recipes/linux/linux-xo_git.bb b/recipes/linux/linux-xo_git.bb
index b533249457..37e95208e9 100644
--- a/recipes/linux/linux-xo_git.bb
+++ b/recipes/linux/linux-xo_git.bb
@@ -4,8 +4,7 @@ DESCRIPTION = "Linux kernel for XO laptop (aka OLPC)"
 
 SRCREV = "28f4cb6e780db078a09c765595e0ee84fda20f88"
 
-PV = "2.6.22+gitr${SRCPV}"
-PE = "1"
+PV = "2.6.22+gitr${SRCREV}"
 PR = "r0"
 
 COMPATIBLE_MACHINE = "xo"
diff --git a/recipes/linux/linux-xxs1500_2.4.21.bb b/recipes/linux/linux-xxs1500_2.4.21.bb
index ed6b7a0d90..ec51b85539 100644
--- a/recipes/linux/linux-xxs1500_2.4.21.bb
+++ b/recipes/linux/linux-xxs1500_2.4.21.bb
@@ -7,7 +7,7 @@ PV = "${KV}"
 SRC_URI = "http://mycable.de/xxs1500/cms/index.php?download=linux-2.4.21-20040514.1522.tgz \
 	file://Makefile \
 	file://defconfig-xxs1500 \
-	file://zboot-Makefile-flags.diff;patch=1;pnum=0"
+	file://zboot-Makefile-flags.diff;striplevel=0"
 
 S = "${WORKDIR}/linux"
 
diff --git a/recipes/linux/linux-zigbee/imote2/defconfig b/recipes/linux/linux-zigbee/imote2/defconfig
new file mode 100644
index 0000000000..b0973865df
--- /dev/null
+++ b/recipes/linux/linux-zigbee/imote2/defconfig
@@ -0,0 +1,2020 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.33
+# Fri Apr 30 12:01:12 2010
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+# CONFIG_RD_LZO is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_SLOW_WORK_DEBUG is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_UNLOCK is not set
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_UNLOCK is not set
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_UNLOCK is not set
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+CONFIG_FREEZER=y
+
+#
+# System Type
+#
+CONFIG_MMU=y
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_STMP3XXX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_PNX4008 is not set
+CONFIG_ARCH_PXA=y
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5PC1XX is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_U8500 is not set
+
+#
+# Intel PXA2xx/PXA3xx Implementations
+#
+
+#
+# Intel/Marvell Dev Platforms (sorted by hardware release time)
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_MACH_ZYLONITE300 is not set
+# CONFIG_MACH_ZYLONITE320 is not set
+# CONFIG_MACH_LITTLETON is not set
+# CONFIG_MACH_TAVOREVB is not set
+# CONFIG_MACH_SAAR is not set
+
+#
+# Third Party Dev Platforms (sorted by vendor name)
+#
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_ARCH_VIPER is not set
+# CONFIG_MACH_ARCOM_ZEUS is not set
+# CONFIG_MACH_BALLOON3 is not set
+# CONFIG_MACH_CSB726 is not set
+# CONFIG_MACH_ARMCORE is not set
+# CONFIG_MACH_EM_X270 is not set
+# CONFIG_MACH_EXEDA is not set
+# CONFIG_MACH_CM_X300 is not set
+# CONFIG_ARCH_GUMSTIX is not set
+CONFIG_MACH_INTELMOTE2=y
+# CONFIG_MACH_STARGATE2 is not set
+# CONFIG_MACH_XCEP is not set
+# CONFIG_TRIZEPS_PXA is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
+# CONFIG_MACH_PCM027 is not set
+# CONFIG_MACH_COLIBRI is not set
+# CONFIG_MACH_COLIBRI300 is not set
+# CONFIG_MACH_COLIBRI320 is not set
+
+#
+# End-user Products (sorted by vendor name)
+#
+# CONFIG_MACH_H4700 is not set
+# CONFIG_MACH_H5000 is not set
+# CONFIG_MACH_HIMALAYA is not set
+# CONFIG_MACH_MAGICIAN is not set
+# CONFIG_MACH_MIOA701 is not set
+# CONFIG_PXA_EZX is not set
+# CONFIG_MACH_MP900C is not set
+# CONFIG_ARCH_PXA_PALM is not set
+# CONFIG_PXA_SHARPSL is not set
+# CONFIG_ARCH_PXA_ESERIES is not set
+CONFIG_PXA27x=y
+CONFIG_PXA_SSP=y
+CONFIG_PXA_HAVE_BOARD_IRQS=y
+CONFIG_PLAT_PXA=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_PABRT_LEGACY=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+CONFIG_ARM_L1_CACHE_SHIFT=5
+CONFIG_IWMMXT=y
+CONFIG_XSCALE_PMU=y
+CONFIG_COMMON_CLKDEV=y
+
+#
+# Bus support
+#
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_HZ=100
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=999999
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS2,115200 mem=32M ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0"
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
+
+#
+# CPU Power Management
+#
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=m
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_APM_EMULATION=y
+CONFIG_PM_RUNTIME=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NF_CT_PROTO_DCCP is not set
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+# CONFIG_NETFILTER_TPROXY is not set
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+CONFIG_IEEE802154=m
+CONFIG_MAC802154=m
+# CONFIG_NET_SCHED is not set
+CONFIG_NET_CLS_ROUTE=y
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+# CONFIG_WIRELESS is not set
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=m
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_AFS_PARTS=y
+CONFIG_MTD_AR7_PARTS=y
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_HAVE_MTD_OTP=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+# CONFIG_MTD_CFI_I2 is not set
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_XIP is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PXA2XX=y
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_DRBD is not set
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MG_DISK is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=y
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_NET_ETHERNET is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_WLAN is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+# CONFIG_IEEE802154_FAKEHARD is not set
+CONFIG_IEEE802154_FAKELB=m
+# CONFIG_IEEE802154_SERIAL is not set
+# CONFIG_IEEE802154_AT86RF230 is not set
+CONFIG_IEEE802154_CC2420=m
+# CONFIG_IEEE802154_ADF7242 is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_APMPOWER is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_QT2160 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+CONFIG_KEYBOARD_PXA27x=y
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+CONFIG_TOUCHSCREEN_DA9034=y
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+CONFIG_INPUT_UINPUT=y
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+CONFIG_SERIAL_PXA=y
+CONFIG_SERIAL_PXA_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=8
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_HELPER_AUTO=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_PXA=y
+# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_PXA2XX=y
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+
+#
+# Memory mapped GPIO expanders:
+#
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_ADP5588 is not set
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_APM_POWER is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_DA9030 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+CONFIG_PMIC_DA903X=y
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_88PM8607 is not set
+# CONFIG_AB4500_CORE is not set
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_DEBUG=y
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
+CONFIG_REGULATOR_USERSPACE_CONSUMER=y
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+CONFIG_REGULATOR_DA903X=y
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+CONFIG_MEDIA_SUPPORT=y
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L2_COMMON=y
+CONFIG_VIDEO_ALLOW_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+# CONFIG_DVB_CORE is not set
+CONFIG_VIDEO_MEDIA=y
+
+#
+# Multimedia drivers
+#
+CONFIG_IR_CORE=y
+CONFIG_VIDEO_IR=y
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER_CUSTOMISE=y
+# CONFIG_MEDIA_TUNER_SIMPLE is not set
+# CONFIG_MEDIA_TUNER_TDA8290 is not set
+# CONFIG_MEDIA_TUNER_TDA827X is not set
+# CONFIG_MEDIA_TUNER_TDA18271 is not set
+# CONFIG_MEDIA_TUNER_TDA9887 is not set
+# CONFIG_MEDIA_TUNER_TEA5761 is not set
+# CONFIG_MEDIA_TUNER_TEA5767 is not set
+# CONFIG_MEDIA_TUNER_MT20XX is not set
+# CONFIG_MEDIA_TUNER_MT2060 is not set
+# CONFIG_MEDIA_TUNER_MT2266 is not set
+# CONFIG_MEDIA_TUNER_MT2131 is not set
+# CONFIG_MEDIA_TUNER_QT1010 is not set
+# CONFIG_MEDIA_TUNER_XC2028 is not set
+# CONFIG_MEDIA_TUNER_XC5000 is not set
+# CONFIG_MEDIA_TUNER_MXL5005S is not set
+# CONFIG_MEDIA_TUNER_MXL5007T is not set
+# CONFIG_MEDIA_TUNER_MC44S803 is not set
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEOBUF_GEN=y
+CONFIG_VIDEOBUF_DMA_SG=y
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=y
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TDA9875 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+
+#
+# RDS decoders
+#
+# CONFIG_VIDEO_SAA6588 is not set
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+
+#
+# Video and audio decoders
+#
+# CONFIG_VIDEO_CX25840 is not set
+
+#
+# MPEG video encoders
+#
+# CONFIG_VIDEO_CX2341X is not set
+
+#
+# Video encoders
+#
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+
+#
+# Video improvement chips
+#
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+CONFIG_SOC_CAMERA=y
+# CONFIG_SOC_CAMERA_MT9M001 is not set
+CONFIG_SOC_CAMERA_MT9M111=y
+# CONFIG_SOC_CAMERA_MT9T031 is not set
+# CONFIG_SOC_CAMERA_MT9T112 is not set
+# CONFIG_SOC_CAMERA_MT9V022 is not set
+# CONFIG_SOC_CAMERA_RJ54N1 is not set
+# CONFIG_SOC_CAMERA_TW9910 is not set
+# CONFIG_SOC_CAMERA_PLATFORM is not set
+# CONFIG_SOC_CAMERA_OV772X is not set
+# CONFIG_SOC_CAMERA_OV9640 is not set
+CONFIG_VIDEO_PXA27x=y
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
+# CONFIG_V4L_USB_DRIVERS is not set
+# CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_PXA=y
+CONFIG_FB_PXA_OVERLAY=y
+# CONFIG_FB_PXA_SMARTPANEL is not set
+CONFIG_FB_PXA_PARAMETERS=y
+# CONFIG_FB_MBX is not set
+# CONFIG_FB_W100 is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=y
+# CONFIG_BACKLIGHT_DA903X is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_LOGO is not set
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_JACK=y
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+CONFIG_SND_PXA2XX_LIB=y
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_PXA2XX_SOC=y
+# CONFIG_SND_PXA2XX_SOC_IMOTE2 is not set
+CONFIG_SND_SOC_I2C_AND_SPI=y
+# CONFIG_SND_SOC_ALL_CODECS is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+# CONFIG_HID_PID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+
+#
+# Special HID drivers
+#
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_VST is not set
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+CONFIG_USB_GADGET_PXA27X=y
+CONFIG_USB_PXA27X=y
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_AUDIO is not set
+CONFIG_USB_ETH=y
+# CONFIG_USB_ETH_RNDIS is not set
+# CONFIG_USB_ETH_EEM is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_MULTI is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_UNSAFE_RESUME=y
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_PXA=y
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_AT91 is not set
+# CONFIG_MMC_ATMELMCI is not set
+CONFIG_MMC_SPI=y
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_LP3944=y
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DA903X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_SA1100 is not set
+CONFIG_RTC_DRV_PXA=y
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=m
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_AUTOFS_FS=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_WBUF_VERIFY=y
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_ROOT_NFS is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+CONFIG_DEBUG_PREEMPT=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_PI_LIST=y
+# CONFIG_RT_MUTEX_TESTER is not set
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_LOCKDEP=y
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_LOCKDEP is not set
+CONFIG_TRACE_IRQFLAGS=y
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_PAGE_POISONING is not set
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARM_UNWIND=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_OC_ETM is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI2=m
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=m
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH2=m
+CONFIG_CRYPTO_RNG2=m
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=m
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_WORKQUEUE=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_SALSA20 is not set
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=y
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/recipes/linux/linux-zigbee_git.bb b/recipes/linux/linux-zigbee_git.bb
new file mode 100644
index 0000000000..eea5e46c9f
--- /dev/null
+++ b/recipes/linux/linux-zigbee_git.bb
@@ -0,0 +1,18 @@
+require linux.inc
+
+COMPATIBLE_MACHINE = "imote2"
+
+KERNEL_RELEASE = "2.6.33"
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+
+SRCREV = "4dcdcbf32df853694d31b09ea6cb744463eb27ab"
+PV = "2.6.33+${KERNEL_RELEASE}+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+# Mark archs/machines that this kernel supports
+DEFAULT_PREFERENCE_imote2 = "1"
+
+SRC_URI = "git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/kernel;protocol=git;branch=devel \
+           file://defconfig"
+
+S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc
index 39d04e19ae..0b188d44d1 100644
--- a/recipes/linux/linux.inc
+++ b/recipes/linux/linux.inc
@@ -57,6 +57,16 @@ python __anonymous () {
 }
 
 do_configure_prepend() {
+
+        # Rename getline in ./scripts/unifdef.c
+        # Kernels up to 2.6.29 are currently failing to build unifdef.c,
+        # clashing with exposed getline() from <stdio.h>
+        # see https://patchwork.kernel.org/patch/11166/
+        # committed in 2.6.29 (commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7)
+
+        sed -i -e 's/getline/parseline/g' ${S}/scripts/unifdef.c
+
+
         echo "" > ${S}/.config
 
         #
@@ -89,6 +99,12 @@ do_configure_prepend() {
             echo "CONFIG_ARM_THUMB=y" >> ${S}/.config
         fi
 
+        # Enable thumb2 fixup for specific issue in angstrom toolchains when used on A8 r1p[012] silicon
+        if [ "${DISTRO_NAME}" = "Angstrom" ] ; then
+            sed -i -e /CONFIG_ARM_ERRATA_430973/d ${WORKDIR}/defconfig
+            echo "CONFIG_ARM_ERRATA_430973=y" >> ${S}/.config
+        fi
+
 	#
 	# endian support
 	#
@@ -184,6 +200,13 @@ do_configure_append() {
 	fi
 }
 
+do_install_append() {
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH
+}
+
+PACKAGES =+ "kernel-headers"
+FILES_kernel-headers = "${exec_prefix}/src/linux*"
+
 do_devicetree_image() {
     if test -n "${KERNEL_DEVICETREE}" ; then
         dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree ${KERNEL_DEVICETREE}
diff --git a/recipes/linux/linux/ARM-Add-support-for-LZMA-compressed-kernel-images.patch b/recipes/linux/linux/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
new file mode 100644
index 0000000000..6f5e00aa8e
--- /dev/null
+++ b/recipes/linux/linux/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
@@ -0,0 +1,51 @@
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index 350921d..34163da 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -21,6 +21,7 @@
+ 	select HAVE_GENERIC_DMA_COHERENT
+ 	select HAVE_KERNEL_GZIP
+ 	select HAVE_KERNEL_LZO
++	select HAVE_KERNEL_LZMA
+ 	select HAVE_PERF_EVENTS
+ 	select PERF_USE_VMALLOC
+ 	help
+diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
+index 2d4d88b..3906432 100644
+--- a/arch/arm/boot/compressed/Makefile
++++ b/arch/arm/boot/compressed/Makefile
+@@ -65,6 +65,7 @@ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
+ 
+ suffix_$(CONFIG_KERNEL_GZIP) = gzip
+ suffix_$(CONFIG_KERNEL_LZO)  = lzo
++suffix_$(CONFIG_KERNEL_LZMA)  = lzma
+ 
+ targets       := vmlinux vmlinux.lds \
+ 		 piggy.$(suffix_y) piggy.$(suffix_y).o \
+diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
+index 7e0fe4d..4e35a10 100644
+--- a/arch/arm/boot/compressed/decompress.c
++++ b/arch/arm/boot/compressed/decompress.c
+@@ -40,6 +40,10 @@
+ #include "../../../../lib/decompress_unlzo.c"
+ #endif
+ 
++#ifdef CONFIG_KERNEL_LZMA
++#include "../../../../lib/decompress_unlzma.c"
++#endif
++
+ void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
+ {
+ 	decompress(input, len, NULL, NULL, output, NULL, error);
+diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
+new file mode 100644
+index 0000000..d7e69cf
+--- /dev/null
++++ b/arch/arm/boot/compressed/piggy.lzma.S
+@@ -0,0 +1,6 @@
++	.section .piggydata,#alloc
++	.globl	input_data
++input_data:
++	.incbin	"arch/arm/boot/compressed/piggy.lzma"
++	.globl	input_data_end
++input_data_end:
diff --git a/recipes/linux/linux/spitz/defconfig b/recipes/linux/linux/spitz/defconfig
new file mode 100644
index 0000000000..6b7d13213e
--- /dev/null
+++ b/recipes/linux/linux/spitz/defconfig
@@ -0,0 +1,2242 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.34
+# Mon May 17 09:31:07 2010
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+# CONFIG_SLUB is not set
+CONFIG_SLOB=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_SLOW_WORK_DEBUG is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+# CONFIG_LBDAF is not set
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+CONFIG_FREEZER=y
+
+#
+# System Type
+#
+CONFIG_MMU=y
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_STMP3XXX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_NUC93X is not set
+# CONFIG_ARCH_PNX4008 is not set
+CONFIG_ARCH_PXA=y
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P6440 is not set
+# CONFIG_ARCH_S5P6442 is not set
+# CONFIG_ARCH_S5PC1XX is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Intel PXA2xx/PXA3xx Implementations
+#
+
+#
+# Intel/Marvell Dev Platforms (sorted by hardware release time)
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_MACH_ZYLONITE300 is not set
+# CONFIG_MACH_ZYLONITE320 is not set
+# CONFIG_MACH_LITTLETON is not set
+# CONFIG_MACH_TAVOREVB is not set
+# CONFIG_MACH_SAAR is not set
+
+#
+# Third Party Dev Platforms (sorted by vendor name)
+#
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_ARCH_VIPER is not set
+# CONFIG_MACH_ARCOM_ZEUS is not set
+# CONFIG_MACH_BALLOON3 is not set
+# CONFIG_MACH_CSB726 is not set
+# CONFIG_MACH_ARMCORE is not set
+# CONFIG_MACH_EM_X270 is not set
+# CONFIG_MACH_EXEDA is not set
+# CONFIG_MACH_CM_X300 is not set
+# CONFIG_MACH_CAPC7117 is not set
+# CONFIG_ARCH_GUMSTIX is not set
+# CONFIG_MACH_INTELMOTE2 is not set
+# CONFIG_MACH_STARGATE2 is not set
+# CONFIG_MACH_XCEP is not set
+# CONFIG_TRIZEPS_PXA is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
+# CONFIG_MACH_PCM027 is not set
+# CONFIG_MACH_COLIBRI is not set
+# CONFIG_MACH_COLIBRI300 is not set
+# CONFIG_MACH_COLIBRI320 is not set
+
+#
+# End-user Products (sorted by vendor name)
+#
+# CONFIG_MACH_H4700 is not set
+# CONFIG_MACH_H5000 is not set
+# CONFIG_MACH_HIMALAYA is not set
+# CONFIG_MACH_MAGICIAN is not set
+# CONFIG_MACH_MIOA701 is not set
+# CONFIG_PXA_EZX is not set
+# CONFIG_MACH_MP900C is not set
+# CONFIG_ARCH_PXA_PALM is not set
+# CONFIG_MACH_RAUMFELD_RC is not set
+# CONFIG_MACH_RAUMFELD_CONNECTOR is not set
+# CONFIG_MACH_RAUMFELD_SPEAKER is not set
+CONFIG_PXA_SHARPSL=y
+CONFIG_SHARPSL_PM=y
+CONFIG_SHARPSL_PM_MAX1111=y
+# CONFIG_MACH_POODLE is not set
+# CONFIG_MACH_CORGI is not set
+# CONFIG_MACH_SHEPHERD is not set
+# CONFIG_MACH_HUSKY is not set
+# CONFIG_MACH_AKITA is not set
+CONFIG_MACH_SPITZ=y
+# CONFIG_MACH_BORZOI is not set
+# CONFIG_MACH_TOSA is not set
+# CONFIG_MACH_ICONTROL is not set
+# CONFIG_ARCH_PXA_ESERIES is not set
+CONFIG_PXA27x=y
+CONFIG_PXA_SHARP_Cxx00=y
+CONFIG_PXA_SSP=y
+CONFIG_PLAT_PXA=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_PABRT_LEGACY=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+CONFIG_ARM_L1_CACHE_SHIFT=5
+CONFIG_IWMMXT=y
+CONFIG_XSCALE_PMU=y
+CONFIG_CPU_HAS_PMU=y
+CONFIG_SHARP_PARAM=y
+CONFIG_SHARP_SCOOP=y
+CONFIG_COMMON_CLKDEV=y
+
+#
+# Bus support
+#
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCCARD=y
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+# CONFIG_PCMCIA_IOCTL is not set
+
+#
+# PC-card bridges
+#
+CONFIG_PCMCIA_SOC_COMMON=y
+CONFIG_PCMCIA_PXA2XX=y
+# CONFIG_PCMCIA_DEBUG is not set
+
+#
+# Kernel Features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_HZ=100
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=999999
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE=" debug "
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
+
+#
+# CPU Power Management
+#
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=m
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_APM_EMULATION=y
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_OPS=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+CONFIG_NF_CONNTRACK=m
+# CONFIG_NF_CT_ACCT is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+CONFIG_NF_CONNTRACK_SIP=m
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NETFILTER_TPROXY is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_CT is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+CONFIG_NETFILTER_XT_TARGET_HL=m
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+CONFIG_NETFILTER_XT_MATCH_HL=m
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+# CONFIG_KINGSUN_DONGLE is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
+# CONFIG_KS959_DONGLE is not set
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
+CONFIG_PXA_FICP=m
+# CONFIG_MCS_FIR is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_LL is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+# CONFIG_BT_MRVL is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_DEFAULT_PS is not set
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_RC_PID is not set
+# CONFIG_MAC80211_RC_MINSTREL is not set
+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
+CONFIG_MAC80211_RC_DEFAULT=""
+# CONFIG_MAC80211_MESH is not set
+# CONFIG_MAC80211_LEDS is not set
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+CONFIG_MTD_ROM=y
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=y
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_H1900 is not set
+# CONFIG_MTD_NAND_GPIO is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_NAND_SHARPSL=y
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
+# UBI - Unsorted block images
+#
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=m
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MG_DISK is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_IWMC3200TOP is not set
+CONFIG_HAVE_IDE=y
+CONFIG_IDE=y
+
+#
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
+CONFIG_BLK_DEV_IDECS=y
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_SATA_PMP=y
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_MV is not set
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PLATFORM is not set
+CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
+# CONFIG_BLK_DEV_DM is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_VETH is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=m
+# CONFIG_AX88796 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+# CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_DNET is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_B44 is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+CONFIG_WLAN=y
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_ATMEL is not set
+# CONFIG_AT76C50X_USB is not set
+CONFIG_AIRO_CS=m
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_ATH_COMMON is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_CS=m
+# CONFIG_IWM is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_HERMES is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_WL12XX is not set
+# CONFIG_ZD1211RW is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_CDC_EEM is not set
+CONFIG_USB_NET_DM9601=m
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+CONFIG_USB_NET_ZAURUS=m
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_IPHETH is not set
+CONFIG_USB_SIERRA_NET=m
+CONFIG_NET_PCMCIA=y
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+CONFIG_PCMCIA_PCNET=m
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_AXNET is not set
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+CONFIG_INPUT_APMPOWER=y
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_QT2160 is not set
+# CONFIG_KEYBOARD_CORGI is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_MATRIX=y
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_PXA27x is not set
+CONFIG_KEYBOARD_SPITZ=y
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=y
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_CORGI is not set
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+CONFIG_SERIAL_PXA=y
+CONFIG_SERIAL_PXA_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_TIMBERDALE is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_R3964 is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_IPWIRELESS is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+# CONFIG_I2C_CHARDEV is not set
+CONFIG_I2C_HELPER_AUTO=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_PXA=y
+# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_PXA2XX=y
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+
+#
+# Memory mapped GPIO expanders:
+#
+# CONFIG_GPIO_IT8761E is not set
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_ADP5588 is not set
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+CONFIG_POWER_SUPPLY_DEBUG=y
+CONFIG_PDA_POWER=y
+CONFIG_APM_POWER=y
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LM95241 is not set
+CONFIG_SENSORS_MAX1111=y
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_AB4500_CORE is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_PXA=y
+CONFIG_FB_PXA_OVERLAY=y
+CONFIG_FB_PXA_SMARTPANEL=y
+CONFIG_FB_PXA_PARAMETERS=y
+# CONFIG_FB_MBX is not set
+# CONFIG_FB_W100 is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_CORGI=y
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LCD_PLATFORM is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=y
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=y
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_LOGO is not set
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+# CONFIG_SND_SEQ_DUMMY is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_SEQUENCER_OSS is not set
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_RAWMIDI_SEQ=m
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_ARM=y
+CONFIG_SND_PXA2XX_PCM=m
+CONFIG_SND_PXA2XX_LIB=m
+CONFIG_SND_PXA2XX_LIB_AC97=y
+CONFIG_SND_PXA2XX_AC97=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_CAIAQ is not set
+CONFIG_SND_PCMCIA=y
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_PXA2XX_SOC=m
+CONFIG_SND_PXA2XX_SOC_I2S=m
+CONFIG_SND_PXA2XX_SOC_SPITZ=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+# CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_WM8750=m
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+
+#
+# Special HID drivers
+#
+# CONFIG_HID_3M_PCT is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MOSART is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_STANTUM is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_ZEROPLUS is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=m
+CONFIG_USB_DEBUG=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+CONFIG_USB_OTG_WHITELIST=y
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_MON=m
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+# CONFIG_USB_SERIAL_CP210X is not set
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+# CONFIG_USB_SERIAL_IUU is not set
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+# CONFIG_USB_SERIAL_OPTION is not set
+CONFIG_USB_SERIAL_OMNINET=m
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_GADGET_DEBUG_FS=y
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+CONFIG_USB_GADGET_PXA27X=y
+CONFIG_USB_PXA27X=m
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+CONFIG_USB_ZERO=m
+# CONFIG_USB_AUDIO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_CDC_COMPOSITE=m
+# CONFIG_USB_G_NOKIA is not set
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_USB_ULPI=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_UNSAFE_RESUME=y
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_PXA=y
+# CONFIG_MMC_SDHCI is not set
+CONFIG_MMC_SPI=y
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_GPIO is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_XATTR is not set
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+# CONFIG_LOGFS is not set
+CONFIG_CRAMFS=m
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
+# CONFIG_CEPH_FS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="cp437"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=y
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_RCU_CPU_STALL_DETECTOR=y
+# CONFIG_LKDTM is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_RING_BUFFER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_ARM_UNWIND=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_OC_ETM is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI2=m
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=m
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH2=m
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=m
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=m
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_WORKQUEUE=m
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=m
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_GHASH is not set
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_ZLIB is not set
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=m
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
+CONFIG_GENERIC_ATOMIC64=y
diff --git a/recipes/linux/linux_2.6.14.bb b/recipes/linux/linux_2.6.14.bb
index 3ac3cbff6c..a6352308c5 100644
--- a/recipes/linux/linux_2.6.14.bb
+++ b/recipes/linux/linux_2.6.14.bb
@@ -9,34 +9,34 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=ke
            file://defconfig"
 
 SRC_URI_append_acern30 = "\
-           http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1;name=patch1 \
-           http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch;patch=1;name=patch2 \
-           file://n30-cleanup.patch;patch=1 \
-           file://n35.patch;patch=1 \
-           file://n30-lcd.patch;patch=1 \
-           file://n30-backlight.patch;patch=1 \
-           file://n30-ts.patch;patch=1 \
-           file://n30-buttons.patch;patch=1 \
-           file://n30-mmc.patch;patch=1 \
-           file://n30-mmc-power.patch;patch=1 \
-           file://n30-mmc-wprotect.patch;patch=1 \
-           file://n30-nand.patch;patch=1 \
-           file://n30-usbstart.patch;patch=1 \
-           file://n30-hardcode.patch;patch=1 \
-           file://n30-apm.patch;patch=1 \
-           file://s3c2410fb-resume.patch;patch=1 \
-           file://s3c2410_ts-pm.patch;patch=1 \
-           file://s3c2410_lcd-pm.c;patch=1 \
-           file://s3c2410mci-pm.patch;patch=1 \
-           file://s3c2410-nand-pm.patch;patch=1 \
-           file://n30-nand-hack.patch;patch=1 \
-           file://mmc-plus.patch;patch=1 \
-           file://gpio-sysfs.patch;patch=1 \
-           file://regdump.patch;patch=1 \
-           file://n30-pm.patch;patch=1 \
-           file://spi.patch;patch=1 \
-           file://wingel-hacking.patch;patch=1 \
-           file://gcc4-fixes.patch;patch=1 \
+           http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;name=patch1 \
+           http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch;name=patch2 \
+           file://n30-cleanup.patch \
+           file://n35.patch \
+           file://n30-lcd.patch \
+           file://n30-backlight.patch \
+           file://n30-ts.patch \
+           file://n30-buttons.patch \
+           file://n30-mmc.patch \
+           file://n30-mmc-power.patch \
+           file://n30-mmc-wprotect.patch \
+           file://n30-nand.patch \
+           file://n30-usbstart.patch \
+           file://n30-hardcode.patch \
+           file://n30-apm.patch \
+           file://s3c2410fb-resume.patch \
+           file://s3c2410_ts-pm.patch \
+           file://s3c2410_lcd-pm.c;apply=yes \
+           file://s3c2410mci-pm.patch \
+           file://s3c2410-nand-pm.patch \
+           file://n30-nand-hack.patch \
+           file://mmc-plus.patch \
+           file://gpio-sysfs.patch \
+           file://regdump.patch \
+           file://n30-pm.patch \
+           file://spi.patch \
+           file://wingel-hacking.patch \
+           file://gcc4-fixes.patch \
            "
 
 inherit kernel
diff --git a/recipes/linux/linux_2.6.18.bb b/recipes/linux/linux_2.6.18.bb
index 6b7f39d991..e66fc6d598 100644
--- a/recipes/linux/linux_2.6.18.bb
+++ b/recipes/linux/linux_2.6.18.bb
@@ -11,98 +11,98 @@ PR = "r1"
 PARALLEL_MAKE=""
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.8.bz2;patch=1;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.8.bz2;apply=yes;name=stablepatch \
            file://defconfig \
            " 
 
 SRC_URI_append_avr32 = " \
-           file://atmel-version.patch;patch=1 \
-           file://add-flush_buffer-operation-to-uart_ops.patch;patch=1 \
-           file://kbuild-add-unifdef.patch;patch=1 \
-           file://kbuild-replace-use-of-strlcpy-with-a-dedicated-implmentation-in-unifdef.patch;patch=1 \
-           file://kbuild-use-in-kernel-unifdef.patch;patch=1 \
-           file://spi-set-kset-of-master-class-dev-explicitly.patch;patch=1 \
-           file://spi-fix-spi-busnum-to-master-buffer-and-bus_num-0.patch;patch=1 \
-           file://usb-ethernet-align-all-descriptors-on-a-word-boundary.patch;patch=1 \
-           file://usb-ethernet-define-cdc-capability-for-husb2.patch;patch=1 \
-           file://usb-file-storage-align-all-descriptors-on-a-word-boundary.patch;patch=1 \
-           file://usb-serial-align-all-descriptors-on-a-word-boundary.patch;patch=1 \
-           file://usb-zero-align-all-descriptors-on-a-word-boundary.patch;patch=1 \
-           file://dont-include-map-h-from-physmap-h.patch;patch=1 \
-           file://mtd-unlock-nor-flash-automatically-where-necessary.patch;patch=1 \
-           file://avr32-arch.patch;patch=1 \
-           file://avr32-dont-include-asm-delay-h.patch;patch=1 \
-           file://avr32-unistd-h-move-ifdef-kernel.patch;patch=1 \
-           file://avr32-checkstack.patch;patch=1 \
-           file://avr32-oprofile.patch;patch=1 \
-           file://avr32-drop-GFP_COMP-for-DMA-memory-allocations.patch;patch=1 \
-           file://avr32-move-ethernet-tag-parsing-to-board-specific-code.patch;patch=1 \
-           file://avr32-dma-controller-framework.patch;patch=1 \
-           file://avr32-arch-neutral-gpio-api.patch;patch=1 \
-           file://add-mach-specific-kconfig.patch;patch=1 \
-           file://avr32-gpio-dev.patch;patch=1 \
-           file://atmel-usart3-driver.patch;patch=1 \
-           file://atmel-macb-ethernet-driver.patch;patch=1 \
-           file://at32ap7000-dmac-driver.patch;patch=1 \
-           file://atmel-mmc-host-driver.patch;patch=1 \
-           file://atmel-spi-master-driver.patch;patch=1 \
-           file://atmel-twi-driver.patch;patch=1 \
-           file://atmel-lcdc-framebuffer-driver.patch;patch=1 \
-           file://lcdc-wait-for-vsync.patch;patch=1 \
-           file://ltv350qv-lcd-driver.patch;patch=1 \
-           file://atmel-husb2-udc-driver.patch;patch=1 \
-           file://avr32-sound.patch;patch=1 \
-           file://atmel-ac97c-alsa-driver.patch;patch=1 \
-           file://at73c213-alsa-driver.patch;patch=1 \
-           file://at32-dac-oss-driver.patch;patch=1 \
-           file://renumber-usart-devices.patch;patch=1 \
-           file://rename-ttyUS-to-ttyS-or-ttyAT.patch;patch=1 \
-           file://at32-dac-oss-driver-clk-fix.patch;patch=1 \
-           file://add-all-parameters-to-smc-driver.patch;patch=1 \
-           file://at32ap7000-platform_device-definitions.patch;patch=1 \
-           file://atstk1000-instantiate-devices.patch;patch=1 \
-           file://add-hmatrix-support.patch;patch=1 \
-           file://add-ide-header.patch;patch=1 \
-           file://avr32-network-gateway-support.patch;patch=1 \
-           file://ngw-fix-usart-initialization.patch;patch=1 \
-           file://avr32-little-endian-read-write-bwl.patch;patch=1 \
-           file://gpio-dev-robustness.patch;patch=1 \
-           file://add-intc_pending_irq-to-intc.patch;patch=1 \
-           file://update-atstk1002_defconfig.patch;patch=1 \
-           file://fix-usart3-rx-BUG.patch;patch=1 \
-           file://fix-lcd-display-off-by-two-problem.patch;patch=1 \
-           file://fix-alpha-color-bitfield.patch;patch=1 \
-           file://jffs2_can_mark_obsolete-should-return-0-for-dataflash.patch;patch=1 \
-           file://mtd-fix-atmel-pri-for-cmdset-0001-and-cmdset-0002.patch;patch=1 \
-           file://fix-gpio-prototypes.patch;patch=1 \
-           file://pio-deglitch.patch;patch=1 \
-           file://pio-interrupt-controller.patch;patch=1 \
-           file://gpio-dev-blocking-read.patch;patch=1 \
-           file://add-default-atngw-defconfig.patch;patch=1 \
-           file://gpio-define-pio-none.patch;patch=1 \
-           file://mmc-add-platform-data.patch;patch=1 \
-           file://ngw100-change-spi-clock-on-dataflash.patch;patch=1 \
-           file://atstk1000-add-platform-data-for-mmc.patch;patch=1 \
-           file://avr32-increment-pointer-when-parsing-for-fbmem_start.patch;patch=1 \
-           file://lcdc-do-not-clear-mem-if-fbmem_start-is-set.patch;patch=1 \
-           file://avr32-fix-oprofile-interrupts.patch;patch=1 \
-           file://avr32-time-add-shared-interrupts.patch;patch=1 \
-           file://usart-make-rx-timeout-baudrate-independent.patch;patch=1 \
-           file://spi-reduce-dlybs-and-dlybct.patch;patch=1 \
-           file://dmac-stopping-idle-channel-is-not-fatal.patch;patch=1 \
-           file://mmc-core-dma-fix.patch;patch=1 \
-           file://atstk1000-board-fix-fbmem-setup.patch;patch=1 \
-           file://lcdc-fix-possible-null-pointer-and-match-guard-time-to-uboot.patch;patch=1 \
-           file://ltv350qv-add-initial_power_state-param.patch;patch=1 \
-           file://atmel-mci-debugfs.patch;patch=1 \
-           file://dmac-add-explicit-blockcount-to-dma_request_sg.patch;patch=1 \
-           file://atmel-mci-init-nr_blocks-in-dma-request.patch;patch=1 \
-           file://mmc-add-bit-manipulating-macros.patch;patch=1 \
-           file://mmc-add-detect-card-and-wp-support.patch;patch=1 \
-           file://atmel_spi-handle-rx-overrun.patch;patch=1 \
-           file://atmel_spi-send-zeroes-when-tx_buf-is-not-set.patch;patch=1 \
-           file://husb2_udc-test-mode.patch;patch=1 \
-           file://0001-AVR32-Fix-compile-error-with-gcc-4.1.patch;patch=1 \
+           file://atmel-version.patch \
+           file://add-flush_buffer-operation-to-uart_ops.patch \
+           file://kbuild-add-unifdef.patch \
+           file://kbuild-replace-use-of-strlcpy-with-a-dedicated-implmentation-in-unifdef.patch \
+           file://kbuild-use-in-kernel-unifdef.patch \
+           file://spi-set-kset-of-master-class-dev-explicitly.patch \
+           file://spi-fix-spi-busnum-to-master-buffer-and-bus_num-0.patch \
+           file://usb-ethernet-align-all-descriptors-on-a-word-boundary.patch \
+           file://usb-ethernet-define-cdc-capability-for-husb2.patch \
+           file://usb-file-storage-align-all-descriptors-on-a-word-boundary.patch \
+           file://usb-serial-align-all-descriptors-on-a-word-boundary.patch \
+           file://usb-zero-align-all-descriptors-on-a-word-boundary.patch \
+           file://dont-include-map-h-from-physmap-h.patch \
+           file://mtd-unlock-nor-flash-automatically-where-necessary.patch \
+           file://avr32-arch.patch \
+           file://avr32-dont-include-asm-delay-h.patch \
+           file://avr32-unistd-h-move-ifdef-kernel.patch \
+           file://avr32-checkstack.patch \
+           file://avr32-oprofile.patch \
+           file://avr32-drop-GFP_COMP-for-DMA-memory-allocations.patch \
+           file://avr32-move-ethernet-tag-parsing-to-board-specific-code.patch \
+           file://avr32-dma-controller-framework.patch \
+           file://avr32-arch-neutral-gpio-api.patch \
+           file://add-mach-specific-kconfig.patch \
+           file://avr32-gpio-dev.patch \
+           file://atmel-usart3-driver.patch \
+           file://atmel-macb-ethernet-driver.patch \
+           file://at32ap7000-dmac-driver.patch \
+           file://atmel-mmc-host-driver.patch \
+           file://atmel-spi-master-driver.patch \
+           file://atmel-twi-driver.patch \
+           file://atmel-lcdc-framebuffer-driver.patch \
+           file://lcdc-wait-for-vsync.patch \
+           file://ltv350qv-lcd-driver.patch \
+           file://atmel-husb2-udc-driver.patch \
+           file://avr32-sound.patch \
+           file://atmel-ac97c-alsa-driver.patch \
+           file://at73c213-alsa-driver.patch \
+           file://at32-dac-oss-driver.patch \
+           file://renumber-usart-devices.patch \
+           file://rename-ttyUS-to-ttyS-or-ttyAT.patch \
+           file://at32-dac-oss-driver-clk-fix.patch \
+           file://add-all-parameters-to-smc-driver.patch \
+           file://at32ap7000-platform_device-definitions.patch \
+           file://atstk1000-instantiate-devices.patch \
+           file://add-hmatrix-support.patch \
+           file://add-ide-header.patch \
+           file://avr32-network-gateway-support.patch \
+           file://ngw-fix-usart-initialization.patch \
+           file://avr32-little-endian-read-write-bwl.patch \
+           file://gpio-dev-robustness.patch \
+           file://add-intc_pending_irq-to-intc.patch \
+           file://update-atstk1002_defconfig.patch \
+           file://fix-usart3-rx-BUG.patch \
+           file://fix-lcd-display-off-by-two-problem.patch \
+           file://fix-alpha-color-bitfield.patch \
+           file://jffs2_can_mark_obsolete-should-return-0-for-dataflash.patch \
+           file://mtd-fix-atmel-pri-for-cmdset-0001-and-cmdset-0002.patch \
+           file://fix-gpio-prototypes.patch \
+           file://pio-deglitch.patch \
+           file://pio-interrupt-controller.patch \
+           file://gpio-dev-blocking-read.patch \
+           file://add-default-atngw-defconfig.patch \
+           file://gpio-define-pio-none.patch \
+           file://mmc-add-platform-data.patch \
+           file://ngw100-change-spi-clock-on-dataflash.patch \
+           file://atstk1000-add-platform-data-for-mmc.patch \
+           file://avr32-increment-pointer-when-parsing-for-fbmem_start.patch \
+           file://lcdc-do-not-clear-mem-if-fbmem_start-is-set.patch \
+           file://avr32-fix-oprofile-interrupts.patch \
+           file://avr32-time-add-shared-interrupts.patch \
+           file://usart-make-rx-timeout-baudrate-independent.patch \
+           file://spi-reduce-dlybs-and-dlybct.patch \
+           file://dmac-stopping-idle-channel-is-not-fatal.patch \
+           file://mmc-core-dma-fix.patch \
+           file://atstk1000-board-fix-fbmem-setup.patch \
+           file://lcdc-fix-possible-null-pointer-and-match-guard-time-to-uboot.patch \
+           file://ltv350qv-add-initial_power_state-param.patch \
+           file://atmel-mci-debugfs.patch \
+           file://dmac-add-explicit-blockcount-to-dma_request_sg.patch \
+           file://atmel-mci-init-nr_blocks-in-dma-request.patch \
+           file://mmc-add-bit-manipulating-macros.patch \
+           file://mmc-add-detect-card-and-wp-support.patch \
+           file://atmel_spi-handle-rx-overrun.patch \
+           file://atmel_spi-send-zeroes-when-tx_buf-is-not-set.patch \
+           file://husb2_udc-test-mode.patch \
+           file://0001-AVR32-Fix-compile-error-with-gcc-4.1.patch \
 "
 
 
diff --git a/recipes/linux/linux_2.6.20.bb b/recipes/linux/linux_2.6.20.bb
index 9452aaca73..bc047d6113 100644
--- a/recipes/linux/linux_2.6.20.bb
+++ b/recipes/linux/linux_2.6.20.bb
@@ -9,36 +9,36 @@ DEFAULT_PREFERENCE_nhk15 = "1"
 PR = "r11"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.21.bz2;patch=1;name=stablepatch \
-	   file://0001-kbuild-include-limits.h-in-sumversion.c-for-PATH_MAX.patch;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.21.bz2;apply=yes;name=stablepatch \
+	   file://0001-kbuild-include-limits.h-in-sumversion.c-for-PATH_MAX.patch \
            file://defconfig"
 
 SRC_URI_append_n2100 = "\
-	   file://n2100-r8169-parity.patch;patch=1 \
-	   file://rtc-rs5c372-n2100.patch;patch=1 \
+	   file://n2100-r8169-parity.patch \
+	   file://rtc-rs5c372-n2100.patch \
 	   "
 
 SRC_URI_append_at91sam9263ek = " \
-                                 http://maxim.org.za/AT91RM9200/2.6/${PV}-at91.patch.gz;patch=1;name=at91patch \
-                                 http://www.at91.com/repFichier/Project-217/linux-${PV}-at91-exp.diff.bz2;patch=1;name=exppatch \
+                                 http://maxim.org.za/AT91RM9200/2.6/${PV}-at91.patch.gz;name=at91patch \
+                                 http://www.at91.com/repFichier/Project-217/linux-${PV}-at91-exp.diff.bz2;name=exppatch \
                                "
 SRC_URI_append_at91sam9261ek = " \
-                                 http://maxim.org.za/AT91RM9200/2.6/${PV}-at91.patch.gz;patch=1;name=at91patch \
-                                 http://www.at91.com/repFichier/Project-217/linux-${PV}-at91-exp.diff.bz2;patch=1;name=exppatch \
+                                 http://maxim.org.za/AT91RM9200/2.6/${PV}-at91.patch.gz;name=at91patch \
+                                 http://www.at91.com/repFichier/Project-217/linux-${PV}-at91-exp.diff.bz2;name=exppatch \
                                "
 SRC_URI_append_at91sam9260ek = " \
-                                 http://maxim.org.za/AT91RM9200/2.6/${PV}-at91.patch.gz;patch=1;name=at91patch \
-                                 http://www.at91.com/repFichier/Project-217/linux-${PV}-at91-exp.diff.bz2;patch=1;name=exppatch \
+                                 http://maxim.org.za/AT91RM9200/2.6/${PV}-at91.patch.gz;name=at91patch \
+                                 http://www.at91.com/repFichier/Project-217/linux-${PV}-at91-exp.diff.bz2;name=exppatch \
                                "
 
 SRC_URI_append_nhk15 = " \
-		file://nomadik_baseline_linux_2620.patch;patch=1 \
-		file://audio_codec_patch_base_v5.6.0.patch;patch=1 \
-		file://linux-2.6.20_01_dec_2.patch;patch=1 \
-		file://patch_classdamp_pm_v_audio_codec_patch.patch;patch=1 \
-		file://patch_audiocodec_glitch.patch;patch=1 \
-		file://hrw-saa-fix.diff;patch=1 \
-		file://hrw-make-create-kconfig-executable.patch;patch=1 \
+		file://nomadik_baseline_linux_2620.patch \
+		file://audio_codec_patch_base_v5.6.0.patch \
+		file://linux-2.6.20_01_dec_2.patch \
+		file://patch_classdamp_pm_v_audio_codec_patch.patch \
+		file://patch_audiocodec_glitch.patch \
+		file://hrw-saa-fix.diff \
+		file://hrw-make-create-kconfig-executable.patch \
 "
 
 do_install_append_nhk15 () {
diff --git a/recipes/linux/linux_2.6.21+2.6.22-rc1.bb b/recipes/linux/linux_2.6.21+2.6.22-rc1.bb
index f7fcc93df3..0e2ac80909 100644
--- a/recipes/linux/linux_2.6.21+2.6.22-rc1.bb
+++ b/recipes/linux/linux_2.6.21+2.6.22-rc1.bb
@@ -9,21 +9,21 @@ KERNEL_RELEASE = "2.6.22-rc1"
 PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.22/patch-2.6.22-rc1.bz2;patch=1;name=patch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.22/patch-2.6.22-rc1.bz2;apply=yes;name=patch \
            file://defconfig \
 	   "
 
 SRC_URI_append_simpad = "\
-           file://linux-2.6.21-SIMpad-cs3-simpad.patch;patch=1 \
-           file://linux-2.6.21-SIMpad-mq200.patch;patch=1 \
-           file://linux-2.6.21-SIMpad-serial-and-gpio_keys.patch;patch=1 \
-           file://linux-2.6.21-SIMpad-ucb1x00-switches.patch;patch=1 \
-           file://linux-2.6.21-pcmcia-device-to-platform-driver.patch;patch=1 \
+           file://linux-2.6.21-SIMpad-cs3-simpad.patch \
+           file://linux-2.6.21-SIMpad-mq200.patch \
+           file://linux-2.6.21-SIMpad-serial-and-gpio_keys.patch \
+           file://linux-2.6.21-SIMpad-ucb1x00-switches.patch \
+           file://linux-2.6.21-pcmcia-device-to-platform-driver.patch \
            "
-SRC_URI_append_kb9202 = " http://maxim.org.za/AT91RM9200/2.6/2.6.22-rc1-at91.patch.gz;patch=1;name=at91patch \
-                          file://at91-mmcfix.patch;patch=1"
-SRC_URI_append_at91sam9263ek = " http://maxim.org.za/AT91RM9200/2.6/2.6.22-rc1-at91.patch.gz;patch=1;name=at91patch \
-                                 file://at91-mmcfix.patch;patch=1"
+SRC_URI_append_kb9202 = " http://maxim.org.za/AT91RM9200/2.6/2.6.22-rc1-at91.patch.gz;name=at91patch \
+                          file://at91-mmcfix.patch"
+SRC_URI_append_at91sam9263ek = " http://maxim.org.za/AT91RM9200/2.6/2.6.22-rc1-at91.patch.gz;name=at91patch \
+                                 file://at91-mmcfix.patch"
 
 S = "${WORKDIR}/linux-2.6.21"
 
diff --git a/recipes/linux/linux_2.6.21.bb b/recipes/linux/linux_2.6.21.bb
index 0d7a9e68f6..4aefbd19a3 100644
--- a/recipes/linux/linux_2.6.21.bb
+++ b/recipes/linux/linux_2.6.21.bb
@@ -8,74 +8,74 @@ DEFAULT_PREFERENCE_gumstix-verdex = "1"
 PR = "r13"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;patch=1;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \
            file://tsc2003.c \
-	   file://tsc2003-config.diff;patch=1 \
+	   file://tsc2003-config.diff \
 	   file://defconfig \
 	   "
 
 SRC_URI_append_simpad = "\
-           file://linux-2.6.21-SIMpad-cs3-simpad.patch;patch=1 \
-           file://linux-2.6.21-SIMpad-mq200.patch;patch=1 \
-           file://linux-2.6.21-SIMpad-serial-gpio_keys-and-cs3-ro.patch;patch=1 \
-           file://linux-2.6.21-SIMpad-ucb1x00-switches.patch;patch=1 \
-	   file://linux-2.6.21-SIMpad-pcmcia.patch;patch=1 \
-	   file://linux-2.6.21-SIMpad-net-shared-irq.patch;patch=1 \
-	   file://linux-2.6.21-SIMpad-ucb1x00-ts-supend-and-accuracy.patch;patch=1 \
-           file://linux-2.6.21-SIMpad-GPIO-MMC-mod.patch;patch=1 \
-	   file://linux-2.6.21-SIMpad-battery-old-way-but-also-with-sysfs.patch;patch=1 \
-	   file://linux-2.6.21-SIMpad-usb-gadget.patch;patch=1 \
+           file://linux-2.6.21-SIMpad-cs3-simpad.patch \
+           file://linux-2.6.21-SIMpad-mq200.patch \
+           file://linux-2.6.21-SIMpad-serial-gpio_keys-and-cs3-ro.patch \
+           file://linux-2.6.21-SIMpad-ucb1x00-switches.patch \
+	   file://linux-2.6.21-SIMpad-pcmcia.patch \
+	   file://linux-2.6.21-SIMpad-net-shared-irq.patch \
+	   file://linux-2.6.21-SIMpad-ucb1x00-ts-supend-and-accuracy.patch \
+           file://linux-2.6.21-SIMpad-GPIO-MMC-mod.patch \
+	   file://linux-2.6.21-SIMpad-battery-old-way-but-also-with-sysfs.patch \
+	   file://linux-2.6.21-SIMpad-usb-gadget.patch \
            "
-SRC_URI_append_kb9202 = " http://maxim.org.za/AT91RM9200/2.6/2.6.21-at91.patch.gz;patch=1;name=at91patch "
-SRC_URI_append_at91sam9263ek = " http://maxim.org.za/AT91RM9200/2.6/2.6.21-at91.patch.gz;patch=1;name=at91patch "
-SRC_URI_append_sarge-at91 = " http://maxim.org.za/AT91RM9200/2.6/2.6.21-at91.patch.gz;patch=1;name=at91patch \
-                              file://2.6.21-sarge-kernel.patch;patch=1 \
-                              file://2.6.21-sarge-phy.patch;patch=1 \
-                              file://2.6.21-sarge-mmc.patch;patch=1"
+SRC_URI_append_kb9202 = " http://maxim.org.za/AT91RM9200/2.6/2.6.21-at91.patch.gz;name=at91patch "
+SRC_URI_append_at91sam9263ek = " http://maxim.org.za/AT91RM9200/2.6/2.6.21-at91.patch.gz;name=at91patch "
+SRC_URI_append_sarge-at91 = " http://maxim.org.za/AT91RM9200/2.6/2.6.21-at91.patch.gz;name=at91patch \
+                              file://2.6.21-sarge-kernel.patch \
+                              file://2.6.21-sarge-phy.patch \
+                              file://2.6.21-sarge-mmc.patch"
 
 GUMSTIX_PATCHES = "\
-       file://pxa-regs-additions.patch;patch=1 \
-       file://header.patch;patch=1 \
-       file://arch-config.patch;patch=1 \
-       file://board-init.patch;patch=1 \
-       file://compact-flash.patch;patch=1 \
-       file://flash.patch;patch=1 \
-       file://pxa2xx_udc.patch;patch=1 \
-       file://bkpxa-pxa-cpu.patch;patch=1 \
-       file://bkpxa-pxa-cpufreq.patch;patch=1 \
-       file://proc-gpio.patch;patch=1 \
-       file://serial-ether-addr.patch;patch=1 \
-       file://cpufreq-better-freqs.patch;patch=1 \
-       file://ethernet-config.patch;patch=1 \
-       file://smc-ether-addr.patch;patch=1 \
-       file://cpufreq-ondemand-by-default.patch;patch=1 \
-       file://modular-init-bluetooth.patch;patch=1 \
-       file://modular-init-smc91x.patch;patch=1 \
-       file://modular-init-usb-gadget.patch;patch=1 \
-       file://bugfix-i2c-include.patch;patch=1 \
-       file://bugfix-mmc-clock.patch;patch=1 \
-       file://bugfix-pxa-cpufreq.patch;patch=1 \
-       file://bugfix-serial-interrupt.patch;patch=1 \
-       file://bugfix-serial-register-status.patch;patch=1 \
-       file://mach-types-fix.patch;patch=1 \
-       file://pcm-gcc-411-bugfix.patch;patch=1 \
-       file://ucb1400-ac97-audio.patch;patch=1 \
-       file://gumstix-asoc.patch;patch=1 \
-       file://disable-uncompress-message.patch;patch=1 \
-       file://serial-divisor.patch;patch=1 \
-       file://mmc-card-detect.patch;patch=1 \
-       file://misalignment-handling.patch;patch=1 \
-       file://compile-fix-pxa_cpufreq.patch;patch=1 \
-       file://pxafb-definition.patch;patch=1 \
-       file://270-usb-gadget-udc.patch;patch=1 \
-       file://gumstix-pxa270-usb-host.patch;patch=1 \
-       file://cpufreq-fixup.patch;patch=1 \
-       file://uImage-in-own-partition.patch;patch=1 \
-       file://pxa-regs-fixup.patch;patch=1 \
-       file://gumstix-fb-logo.patch;patch=1 \
-       file://gumstix-pxa270-mmc.patch;patch=1 \
-       ${RPSRC}/pxa27x_overlay-r5.patch;patch=1;name=rppatch23 \
-       file://smc911x-fixup.patch;patch=1 \
+       file://pxa-regs-additions.patch \
+       file://header.patch \
+       file://arch-config.patch \
+       file://board-init.patch \
+       file://compact-flash.patch \
+       file://flash.patch \
+       file://pxa2xx_udc.patch \
+       file://bkpxa-pxa-cpu.patch \
+       file://bkpxa-pxa-cpufreq.patch \
+       file://proc-gpio.patch \
+       file://serial-ether-addr.patch \
+       file://cpufreq-better-freqs.patch \
+       file://ethernet-config.patch \
+       file://smc-ether-addr.patch \
+       file://cpufreq-ondemand-by-default.patch \
+       file://modular-init-bluetooth.patch \
+       file://modular-init-smc91x.patch \
+       file://modular-init-usb-gadget.patch \
+       file://bugfix-i2c-include.patch \
+       file://bugfix-mmc-clock.patch \
+       file://bugfix-pxa-cpufreq.patch \
+       file://bugfix-serial-interrupt.patch \
+       file://bugfix-serial-register-status.patch \
+       file://mach-types-fix.patch \
+       file://pcm-gcc-411-bugfix.patch \
+       file://ucb1400-ac97-audio.patch \
+       file://gumstix-asoc.patch \
+       file://disable-uncompress-message.patch \
+       file://serial-divisor.patch \
+       file://mmc-card-detect.patch \
+       file://misalignment-handling.patch \
+       file://compile-fix-pxa_cpufreq.patch \
+       file://pxafb-definition.patch \
+       file://270-usb-gadget-udc.patch \
+       file://gumstix-pxa270-usb-host.patch \
+       file://cpufreq-fixup.patch \
+       file://uImage-in-own-partition.patch \
+       file://pxa-regs-fixup.patch \
+       file://gumstix-fb-logo.patch \
+       file://gumstix-pxa270-mmc.patch \
+       ${RPSRC}/pxa27x_overlay-r5.patch;name=rppatch23 \
+       file://smc911x-fixup.patch \
        "
 
 SRC_URI_append_gumstix-verdex = "${GUMSTIX_PATCHES}"
diff --git a/recipes/linux/linux_2.6.22+2.6.23-rc3.bb b/recipes/linux/linux_2.6.22+2.6.23-rc3.bb
index 7d5ba9451c..cd833e3804 100644
--- a/recipes/linux/linux_2.6.22+2.6.23-rc3.bb
+++ b/recipes/linux/linux_2.6.22+2.6.23-rc3.bb
@@ -10,13 +10,13 @@ KERNEL_RELEASE = "2.6.23-rc3"
 PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${BASE_KERNEL_VERSION}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.23/patch-${KERNEL_VERSION}.bz2;patch=1;name=patch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.23/patch-${KERNEL_VERSION}.bz2;apply=yes;name=patch \
            file://defconfig \
            "
 
-SRC_URI_append_kb9202 = " http://maxim.org.za/AT91RM9200/2.6/2.6.23-rc3-at91.patch.gz;patch=1;name=at91patch \
+SRC_URI_append_kb9202 = " http://maxim.org.za/AT91RM9200/2.6/2.6.23-rc3-at91.patch.gz;name=at91patch \
                         "
-SRC_URI_append_at91sam9263ek = " http://maxim.org.za/AT91RM9200/2.6/2.6.23-rc3-at91.patch.gz;patch=1;name=at91patch \
+SRC_URI_append_at91sam9263ek = " http://maxim.org.za/AT91RM9200/2.6/2.6.23-rc3-at91.patch.gz;name=at91patch \
                                "
 
 S = "${WORKDIR}/linux-${BASE_KERNEL_VERSION}"
diff --git a/recipes/linux/linux_2.6.22+2.6.23-rc5.bb b/recipes/linux/linux_2.6.22+2.6.23-rc5.bb
index d1af39c186..f308a008d1 100644
--- a/recipes/linux/linux_2.6.22+2.6.23-rc5.bb
+++ b/recipes/linux/linux_2.6.22+2.6.23-rc5.bb
@@ -10,23 +10,23 @@ KERNEL_VERSION = "2.6.23-rc5"
 KERNEL_RELEASE = "2.6.23-rc5"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${BASE_KERNEL_VERSION}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.23/patch-${KERNEL_VERSION}.bz2;patch=1;name=patch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.23/patch-${KERNEL_VERSION}.bz2;apply=yes;name=patch \
            file://defconfig \
            "
 
 SRC_URI_append_ts72xx = "\
-           file://ep93xx-gpio-interrupt-debounce.diff;patch=1 \
-           file://ep93xx-i2c-bus.diff;patch=1 \
-           file://ep93xx-i2c.diff;patch=1 \
-           file://ep93xx-leds.diff;patch=1 \
-           file://ep93xx-serial-uartbaud.diff;patch=1 \
-           file://ep93xx-serial-clocks.diff;patch=1 \
-           file://ep93xx-timer-accuracy.diff;patch=1 \
-           file://ep93xx-maverick-uniqid.patch;patch=1 \
-           file://ts72xx-nfbit-fix.patch;patch=1 \
-           file://ts72xx-machine-id-fix.patch;patch=1 \
-           file://ts72xx-watchdog.patch;patch=1 \
-           file://ts72xx-use-cpld-reset.patch;patch=1 \
+           file://ep93xx-gpio-interrupt-debounce.diff \
+           file://ep93xx-i2c-bus.diff \
+           file://ep93xx-i2c.diff \
+           file://ep93xx-leds.diff \
+           file://ep93xx-serial-uartbaud.diff \
+           file://ep93xx-serial-clocks.diff \
+           file://ep93xx-timer-accuracy.diff \
+           file://ep93xx-maverick-uniqid.patch \
+           file://ts72xx-nfbit-fix.patch \
+           file://ts72xx-machine-id-fix.patch \
+           file://ts72xx-watchdog.patch \
+           file://ts72xx-use-cpld-reset.patch \
            "
 
 S = "${WORKDIR}/linux-2.6.22"
diff --git a/recipes/linux/linux_2.6.22.bb b/recipes/linux/linux_2.6.22.bb
index 52b11dd072..4c0e44893a 100644
--- a/recipes/linux/linux_2.6.22.bb
+++ b/recipes/linux/linux_2.6.22.bb
@@ -9,27 +9,27 @@ DEFAULT_PREFERENCE_mx31moboard = "1"
 PR = "r6"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.19.bz2;patch=1;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.19.bz2;apply=yes;name=stablepatch \
            file://defconfig \
 	   "
 
 SRC_URI_append_cm-x270 = "\
-	file://0001-cm-x270-base2.patch;patch=1 \
-	file://0002-cm-x270-match-type.patch;patch=1 \
-	file://0003-cm-x270-ide.patch;patch=1 \
-	file://0004-cm-x270-it8152.patch;patch=1 \
-	file://0005-cm-x270-pcmcia.patch;patch=1 \
-	file://0006-ramdisk_load.patch;patch=1 \
-	file://0007-mmcsd_large_cards-r0.patch;patch=1 \
-	file://0008-cm-x270-nand-simplify-name.patch;patch=1"
+	file://0001-cm-x270-base2.patch \
+	file://0002-cm-x270-match-type.patch \
+	file://0003-cm-x270-ide.patch \
+	file://0004-cm-x270-it8152.patch \
+	file://0005-cm-x270-pcmcia.patch \
+	file://0006-ramdisk_load.patch \
+	file://0007-mmcsd_large_cards-r0.patch \
+	file://0008-cm-x270-nand-simplify-name.patch"
 
-SRC_URI_append_mx31moboard = "http://mobots.epfl.ch/mx31moboard/linux-2.6.22-moboard.patch.bz2;patch=1;name=mx31patch"
+SRC_URI_append_mx31moboard = "http://mobots.epfl.ch/mx31moboard/linux-2.6.22-moboard.patch.bz2;name=mx31patch"
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
 FILES_kernel-image_cm-x270 = ""
 
-SRC_URI_append_bd-neon =  " http://www.boundarydevices.com/boundary-2.6.22-2007-07-22.patch.bz2;patch=1;name=neonpatch"
+SRC_URI_append_bd-neon =  " http://www.boundarydevices.com/boundary-2.6.22-2007-07-22.patch.bz2;name=neonpatch"
 
 python do_compulab_image() {
 	import os
diff --git a/recipes/linux/linux_2.6.23+2.6.24-rc5.bb b/recipes/linux/linux_2.6.23+2.6.24-rc5.bb
index 9874e000b2..87005cf3f3 100644
--- a/recipes/linux/linux_2.6.23+2.6.24-rc5.bb
+++ b/recipes/linux/linux_2.6.23+2.6.24-rc5.bb
@@ -6,20 +6,20 @@ DEFAULT_PREFERENCE = "-1"
 PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2;name=kernel \
-	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.24/patch-2.6.24-rc5.bz2;patch=1;name=patch \
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.24/patch-2.6.24-rc5.bz2;apply=yes;name=patch \
            file://defconfig \
 	   "
 
 S = "${WORKDIR}/linux-2.6.23"
 
 SRC_URI_append_cm-x270 = "\
-	file://0001-cm-x270-match-type.patch;patch=1 \
-	file://0002-ramdisk_load.patch;patch=1 \
-	file://0003-mmcsd_large_cards-r0.patch;patch=1 \
-	file://0004-cm-x270-nand-simplify-name.patch;patch=1 \
-	file://0005-cmx270-pci.patch;patch=1"
+	file://0001-cm-x270-match-type.patch \
+	file://0002-ramdisk_load.patch \
+	file://0003-mmcsd_large_cards-r0.patch \
+	file://0004-cm-x270-nand-simplify-name.patch \
+	file://0005-cmx270-pci.patch"
 
-SRC_URI_append_gesbc-9302 = "file://0001-gesbc-nand.patch;patch=1"
+SRC_URI_append_gesbc-9302 = "file://0001-gesbc-nand.patch"
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
diff --git a/recipes/linux/linux_2.6.23+2.6.24-rc6.bb b/recipes/linux/linux_2.6.23+2.6.24-rc6.bb
index 63fffa56e2..08d039ea61 100644
--- a/recipes/linux/linux_2.6.23+2.6.24-rc6.bb
+++ b/recipes/linux/linux_2.6.23+2.6.24-rc6.bb
@@ -6,14 +6,14 @@ DEFAULT_PREFERENCE = "-1"
 PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2;name=kernel \
-	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.24/patch-2.6.24-rc6.bz2;patch=1;name=patch \
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.24/patch-2.6.24-rc6.bz2;apply=yes;name=patch \
            file://defconfig \
 	   "
 
 S = "${WORKDIR}/linux-2.6.23"
 
 SRC_URI_append_at91sam9260ek = "\
-	file://0001-2.6.23-at91.patch;patch=1 \
+	file://0001-2.6.23-at91.patch \
 	"
 CMDLINE_at91sam9260ek = "mem=64M console=ttyS0,115200 root=/dev/mtdblock0 rw rootfstype=jffs2"
 
diff --git a/recipes/linux/linux_2.6.23.bb b/recipes/linux/linux_2.6.23.bb
index b62d9b7a19..d446b232f0 100644
--- a/recipes/linux/linux_2.6.23.bb
+++ b/recipes/linux/linux_2.6.23.bb
@@ -9,47 +9,47 @@ DEFAULT_PREFERENCE_avr32 = "1"
 PR = "r13"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2;name=kernel \
-	   file://binutils-buildid-arm.patch;patch=1 \
-           file://kallsyms-missing-include.patch;patch=1 \
+	   file://binutils-buildid-arm.patch \
+           file://kallsyms-missing-include.patch \
            file://defconfig \
 	   "
 
 # Bug fixes on the 2.6.23.x stable branch
-SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.23.17.bz2;patch=1;name=stablepatch"
+SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.23.17.bz2;apply=yes;name=stablepatch"
 # Real-time preemption (includes CFS). This is experimental and requires a different defconfig.
-#SRC_URI += "file://patch-2.6.23.12-rt14;patch=1"
+#SRC_URI += "file://patch-2.6.23.12-rt14;apply=yes"
 # Only the Completely Fair Scheduler (CFS), the official backport from 2.6.24 (adapted for 2.6.23.17)
-SRC_URI += "file://sched-cfs-v2.6.23.12-v24.1.patch;patch=1"
+SRC_URI += "file://sched-cfs-v2.6.23.12-v24.1.patch"
 # Add support for squashfs-lzma (a highly compressed read-only filesystem)
-SRC_URI += "http://kamikaze.waninkoko.info/patches/2.6.23/klight1/broken-out/squashfs-lzma-2.6.23.patch;patch=1;name=squashfspatch"
+SRC_URI += "http://kamikaze.waninkoko.info/patches/2.6.23/klight1/broken-out/squashfs-lzma-2.6.23.patch;name=squashfspatch"
 
-SRC_URI += "file://time.h.patch;patch=1"
+SRC_URI += "file://time.h.patch"
 
 # The Atmel patch doesn't apply against 2.6.23.12  :( 
 SRC_URI_avr32 = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2;name=kernel \
                  file://defconfig \
-                 http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.23.atmel.3.patch.bz2;patch=1;name=atmelpatch \
+                 http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.23.atmel.3.patch.bz2;name=atmelpatch \
                 "
 SRC_URI_append_em-x270 = "\
-	file://em-x270.patch;patch=1 "
+	file://em-x270.patch "
 
 SRC_URI_append_cm-x270 = "\
-	file://0001-cm-x270-base2.patch;patch=1 \
-	file://0002-cm-x270-match-type.patch;patch=1 \
-	file://0003-cm-x270-ide.patch;patch=1 \
-	file://0004-cm-x270-it8152.patch;patch=1 \
-	file://0005-cm-x270-pcmcia.patch;patch=1 \
-	file://0006-ramdisk_load.patch;patch=1 \
-	file://0007-mmcsd_large_cards-r0.patch;patch=1 \
-	file://0008-cm-x270-nand-simplify-name.patch;patch=1"
+	file://0001-cm-x270-base2.patch \
+	file://0002-cm-x270-match-type.patch \
+	file://0003-cm-x270-ide.patch \
+	file://0004-cm-x270-it8152.patch \
+	file://0005-cm-x270-pcmcia.patch \
+	file://0006-ramdisk_load.patch \
+	file://0007-mmcsd_large_cards-r0.patch \
+	file://0008-cm-x270-nand-simplify-name.patch"
 
 SRC_URI_append_mpc8313e-rdb = "\
-	file://mpc831x-nand.patch;patch=1 \
-	file://mpc8313e-rdb-leds.patch;patch=1 \
-	file://mpc8313e-rdb-rtc.patch;patch=1"
+	file://mpc831x-nand.patch \
+	file://mpc8313e-rdb-leds.patch \
+	file://mpc8313e-rdb-rtc.patch"
 
 SRC_URI_append_mpc8323e-rdb = "\
-	file://mpc832x-leds.patch;patch=1" 
+	file://mpc832x-leds.patch" 
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb
index b04c2740bd..9f3655c585 100644
--- a/recipes/linux/linux_2.6.24.bb
+++ b/recipes/linux/linux_2.6.24.bb
@@ -14,55 +14,55 @@ DEFAULT_PREFERENCE_smartq5 = "1"
 PR = "r34"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;patch=1;name=stablepatch \
-           file://squashfs-lzma-2.6.24.patch;patch=1 \
-           file://ubifs-v2.6.24.patch;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \
+           file://squashfs-lzma-2.6.24.patch \
+           file://ubifs-v2.6.24.patch \
            file://defconfig"
 
 # Moved away temporarely until committed properly (work in progress).
-#           file://powerpc-clockres.patch;patch=1 \
-#           file://leds-cpu-activity.patch;patch=1 \
-#           file://leds-cpu-activity-powerpc.patch;patch=1 \
+#           file://powerpc-clockres.patch \
+#           file://leds-cpu-activity.patch \
+#           file://leds-cpu-activity-powerpc.patch \
 
 SRC_URI_append_simpad = "\
-           file://linux-2.6.24-SIMpad-GPIO-MMC-mod.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-cs3-simpad.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-mq200.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-pcmcia.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch.v2;patch=1 \ 
-           file://linux-2.6.24-SIMpad-ucb1x00-switches.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch;patch=1 \ 
-           file://linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-ucb1x00-audio.patch;patch=1 \
-	   file://connectplus-remove-ide-HACK.patch;patch=1 \
-	   file://collie-kexec.patch;patch=1 \
-           file://export_atags-r2.patch;patch=1 \
-           "	   
+           file://linux-2.6.24-SIMpad-GPIO-MMC-mod.patch \
+           file://linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch \
+           file://linux-2.6.24-SIMpad-cs3-simpad.patch \
+           file://linux-2.6.24-SIMpad-mq200.patch \
+           file://linux-2.6.24-SIMpad-pcmcia.patch \
+           file://linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch.v2;apply=yes \
+           file://linux-2.6.24-SIMpad-ucb1x00-switches.patch \
+           file://linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch \
+           file://linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch \
+           file://linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch \
+           file://linux-2.6.24-SIMpad-rtc-sa1100.patch \
+           file://linux-2.6.24-SIMpad-ucb1x00-audio.patch \
+	   file://connectplus-remove-ide-HACK.patch \
+	   file://collie-kexec.patch \
+           file://export_atags-r2.patch \
+           "
 
 SRC_URI_append_gesbc-9302 = " \
-	file://0001-gesbc-nand.patch;patch=1 \
-	file://0002-gesbc-eth-platform.patch;patch=1 \
-	file://0005-ep93xx-reboot.patch;patch=1 \
+	file://0001-gesbc-nand.patch \
+	file://0002-gesbc-eth-platform.patch \
+	file://0005-ep93xx-reboot.patch \
 	"
 
 SRC_URI_append_mpc8313e-rdb = "\
-	file://mpc831x-nand.patch;patch=1 \
-	file://mpc8313e-rdb-leds.patch;patch=1 \
-	file://mpc8313e-rdb-rtc.patch;patch=1 \
-	file://mpc8313e-rdb-cardbus.patch;patch=1 \
+	file://mpc831x-nand.patch \
+	file://mpc8313e-rdb-leds.patch \
+	file://mpc8313e-rdb-rtc.patch \
+	file://mpc8313e-rdb-cardbus.patch \
 	"
 
 CMDLINE_gesbc-9302 = "console=ttyAM0 root=mtd5 rootfstype=jffs2 mtdparts=GESBC-NAND:64m(app),-(data)"
 
 SRC_URI_append_cm-x270 = " \
-	file://0001-cm-x270-match-type.patch;patch=1 \
-	file://0002-ramdisk_load.patch;patch=1 \
-	file://0003-mmcsd_large_cards-r0.patch;patch=1 \
-	file://0004-cm-x270-nand-simplify-name.patch;patch=1 \
-	file://0005-add-display-set-default-16bpp.patch;patch=1 \
+	file://0001-cm-x270-match-type.patch \
+	file://0002-ramdisk_load.patch \
+	file://0003-mmcsd_large_cards-r0.patch \
+	file://0004-cm-x270-nand-simplify-name.patch \
+	file://0005-add-display-set-default-16bpp.patch \
 	"
 
 SRC_URI_avr32 = "http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.3.atmel.3.tar.bz2;name=atmelpatch \
@@ -70,56 +70,56 @@ SRC_URI_avr32 = "http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.
 S_avr32 = "${WORKDIR}/linux-2.6.24.3.atmel.3"
 
 SRC_URI_append_ts72xx = "\
-	file://ep93xx-gpio-interrupt-debounce.diff;patch=1 \
-	file://ep93xx-i2c-bus.diff;patch=1 \
-	file://ep93xx-i2c.diff;patch=1 \
-	file://ep93xx-leds.diff;patch=1 \
-	file://ep93xx-serial-uartbaud.diff;patch=1 \
-	file://ep93xx-serial-clocks.diff;patch=1 \
-	file://ep93xx-timer-accuracy.diff;patch=1 \
-	file://ep93xx-maverick-uniqid.patch;patch=1 \
-	file://ep93xx-eth-phylib-framework.patch;patch=1 \
-	file://ts72xx-nfbit-fix.patch;patch=1 \
-	file://ts72xx-machine-id-fix.patch;patch=1 \
-	file://ts72xx-watchdog.patch;patch=1 \
-	file://ts72xx-use-cpld-reset.patch;patch=1 \
-	file://ts72xx-rs485.patch;patch=1"
+	file://ep93xx-gpio-interrupt-debounce.diff \
+	file://ep93xx-i2c-bus.diff \
+	file://ep93xx-i2c.diff \
+	file://ep93xx-leds.diff \
+	file://ep93xx-serial-uartbaud.diff \
+	file://ep93xx-serial-clocks.diff \
+	file://ep93xx-timer-accuracy.diff \
+	file://ep93xx-maverick-uniqid.patch \
+	file://ep93xx-eth-phylib-framework.patch \
+	file://ts72xx-nfbit-fix.patch \
+	file://ts72xx-machine-id-fix.patch \
+	file://ts72xx-watchdog.patch \
+	file://ts72xx-use-cpld-reset.patch \
+	file://ts72xx-rs485.patch"
 
 SRC_URI_append_hipox = " \
-	file://hipox-mach-type.patch;patch=1 \
-	file://hipox.patch;patch=1 \
-	file://hipox-uart.patch;patch=1 \
-	file://hipox-pci-config-delay.patch;patch=1 \
-	file://hipox-pci-max-size.patch;patch=1 \
-	file://hipox-nand.patch;patch=1 \
-	file://hipox-ubifs.patch;patch=1 \
-	file://hipox-kconfig.patch;patch=1 \
-	file://hipox-sata-module.patch;patch=1 \
-	file://hipox-OXE-INT2.patch;patch=1 \
-	file://hipox-rtc.patch;patch=1 \
-	file://hipox-nand-vs-pci.patch;patch=1 \
-	file://hipox-nand-vs-nor.patch;patch=1 \
-	file://ox810-gmac-without-leon.patch;patch=1 \
+	file://hipox-mach-type.patch \
+	file://hipox.patch \
+	file://hipox-uart.patch \
+	file://hipox-pci-config-delay.patch \
+	file://hipox-pci-max-size.patch \
+	file://hipox-nand.patch \
+	file://hipox-ubifs.patch \
+	file://hipox-kconfig.patch \
+	file://hipox-sata-module.patch \
+	file://hipox-OXE-INT2.patch \
+	file://hipox-rtc.patch \
+	file://hipox-nand-vs-pci.patch \
+	file://hipox-nand-vs-nor.patch \
+	file://ox810-gmac-without-leon.patch \
 	"
 
 EXTRA_OEMAKE_smartq5 = " OBJCOPY=${OBJCOPY}"
 SRC_URI_smartq5 = " ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
-    http://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2;patch=1;name=stablepatch \
-    file://smartq-gitupdate.diff;patch=1 \
-    file://base/0001-Apply-samsung-kernel-patch.patch;patch=1 \
-    file://base/0002-Apply-smartq-patch.patch;patch=1 \
-    file://mer/0001-Mer-keymappings-change.patch;patch=1 \
-    file://mer/0002-no-DM9000.patch;patch=1 \
-    file://mer/0003-Mer-WPA-fix.patch;patch=1 \
-    file://mer/0004-Mer-hardwire-USB-OTG-gadget-type.patch;patch=1 \
-    file://mer/0005-backlight-parameter-and-fixes.patch;patch=1 \
-    file://mer/0006-tv-encoder.patch;patch=1 \
-    file://mer/0007-make-tv-encoder-scaler-compile.patch;patch=1 \
-    file://mer/0008-build-TV-by-default.patch;patch=1 \
-    file://mer/0009-Apply-cpufreq-patch-from-gqwang.patch;patch=1 \
-    file://mer/0010-Better-compatibility-with-some-memory-chips.patch;patch=1 \
-    file://mer/0011-Only-reserve-memory-for-TV-if-CONFIG_VIDEO_SAMSUNG_T.patch;patch=1 \
-    file://mer/0012-Disable-TV-out-to-save-RAM.patch;patch=1 \
+    http://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2;apply=yes;name=stablepatch \
+    file://smartq-gitupdate.diff \
+    file://base/0001-Apply-samsung-kernel-patch.patch \
+    file://base/0002-Apply-smartq-patch.patch \
+    file://mer/0001-Mer-keymappings-change.patch \
+    file://mer/0002-no-DM9000.patch \
+    file://mer/0003-Mer-WPA-fix.patch \
+    file://mer/0004-Mer-hardwire-USB-OTG-gadget-type.patch \
+    file://mer/0005-backlight-parameter-and-fixes.patch \
+    file://mer/0006-tv-encoder.patch \
+    file://mer/0007-make-tv-encoder-scaler-compile.patch \
+    file://mer/0008-build-TV-by-default.patch \
+    file://mer/0009-Apply-cpufreq-patch-from-gqwang.patch \
+    file://mer/0010-Better-compatibility-with-some-memory-chips.patch \
+    file://mer/0011-Only-reserve-memory-for-TV-if-CONFIG_VIDEO_SAMSUNG_T.patch \
+    file://mer/0012-Disable-TV-out-to-save-RAM.patch \
     file://defconfig \
 "
 
diff --git a/recipes/linux/linux_2.6.25.bb b/recipes/linux/linux_2.6.25.bb
index 9f415cebb1..75ac394ef8 100644
--- a/recipes/linux/linux_2.6.25.bb
+++ b/recipes/linux/linux_2.6.25.bb
@@ -17,46 +17,46 @@ DEFAULT_PREFERENCE_ronetix-pm9263 = "1"
 DEFAULT_PREFERENCE_ronetix-pm9261 = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.20.bz2;patch=1;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.20.bz2;apply=yes;name=stablepatch \
            file://defconfig"
 
 SRC_URI_append_mpc8313e-rdb = "\
-	file://mpc831x-nand.patch;patch=1 \
-	file://mpc8313e-rdb-leds.patch;patch=1 \
-	file://mpc8313e-rdb-cardbus.patch;patch=1 \
+	file://mpc831x-nand.patch \
+	file://mpc8313e-rdb-leds.patch \
+	file://mpc8313e-rdb-cardbus.patch \
 	"
 
 SRC_URI_append_cm-x270 = " \
-	file://0001-cm-x270-match-type.patch;patch=1 \
-	file://0002-ramdisk_load.patch;patch=1 \
-	file://0003-mmcsd_large_cards-r0.patch;patch=1 \
-	file://0004-cm-x270-nand-simplify-name.patch;patch=1 \
-	file://0005-add-display-set-default-16bpp.patch;patch=1 \
+	file://0001-cm-x270-match-type.patch \
+	file://0002-ramdisk_load.patch \
+	file://0003-mmcsd_large_cards-r0.patch \
+	file://0004-cm-x270-nand-simplify-name.patch \
+	file://0005-add-display-set-default-16bpp.patch \
 	"
 
 SRC_URI_append_at32stk1000 = " \
-	http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.6.atmel.1.patch.bz2;patch=1;name=atmelpatch \
-	file://virtualmouse.patch;patch=1 \
-#    file://pll1.diff;patch=1 \
+	http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.6.atmel.1.patch.bz2;name=atmelpatch \
+	file://virtualmouse.patch \
+#    file://pll1.diff \
 "
 
 SRC_URI_append_at91-l9260 = " \
-	http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;patch=1;name=at91patch \
+	http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;name=at91patch \
 "
 
 SRC_URI_append_ronetix-pm9263 = " \
-        http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;patch=1;name=at91patch \
-        http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/linux-2.6.25.4-ronetix-08-11-02.2228.patch;patch=1;name=ronetixpatch \
-        http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch;patch=1;name=socketat91patch \
+        http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;name=at91patch \
+        http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/linux-2.6.25.4-ronetix-08-11-02.2228.patch;name=ronetixpatch \
+        http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch;name=socketat91patch \
 "
 
 SRC_URI_append_ronetix-pm9261 = " \
-        http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;patch=1;name=at91patch \
-        http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/linux-2.6.25.4-ronetix-08-11-02.2228.patch;patch=1;name=ronetixpatch \
-        http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch;patch=1;name=socketat91patch \
+        http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;name=at91patch \
+        http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/linux-2.6.25.4-ronetix-08-11-02.2228.patch;name=ronetixpatch \
+        http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch;name=socketat91patch \
 "
 
-SRC_URI_append_m8050 = " file://m8050.diff;patch=1 file://update-mach-types.diff;patch=1"
+SRC_URI_append_m8050 = " file://m8050.diff file://update-mach-types.diff"
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
diff --git a/recipes/linux/linux_2.6.26.bb b/recipes/linux/linux_2.6.26.bb
index 6089f47bf5..cae682f51e 100644
--- a/recipes/linux/linux_2.6.26.bb
+++ b/recipes/linux/linux_2.6.26.bb
@@ -11,33 +11,33 @@ DEFAULT_PREFERENCE_topas910 = "1"
 
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.8.bz2;patch=1;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.8.bz2;apply=yes;name=stablepatch \
            file://defconfig"
 
 SRC_URI_append_boc01 = "\
 	file://boc01.dts \
-	file://fsl-elbc-nand-backport.patch;patch=1 \
-	file://002-081105-headers.patch;patch=1 \
-	file://004-081105-usb.patch;patch=1 \
-	file://005-081217-isl12024.patch;patch=1 \
-	file://006-081216-at24c32.patch;patch=1 \
-	file://007-081216-lm73.patch;patch=1 \
-	file://008-081127-spi.patch;patch=1 \
-	file://010-081105-mii.patch;patch=1 \
-	file://011-081202-gpio.patch;patch=1 \
-	file://012-081222-cy3218-btns.patch;patch=1 \
-	file://013-081212-lcd.patch;patch=1 \
+	file://fsl-elbc-nand-backport.patch \
+	file://002-081105-headers.patch \
+	file://004-081105-usb.patch \
+	file://005-081217-isl12024.patch \
+	file://006-081216-at24c32.patch \
+	file://007-081216-lm73.patch \
+	file://008-081127-spi.patch \
+	file://010-081105-mii.patch \
+	file://011-081202-gpio.patch \
+	file://012-081222-cy3218-btns.patch \
+	file://013-081212-lcd.patch \
 	"
 
 SRC_URI_append_mpc8313e-rdb = "\
-	file://cdc-ether-hack.patch;patch=1 \
-	file://fsl-elbc-nand-backport.patch;patch=1 \
-	file://mpc8313e-rdb-leds.patch;patch=1 \
-	file://mpc8313e-rdb-cardbus.patch;patch=1 \
-	file://mpc8313e-rdb-eth-fixed.patch;patch=1 \
+	file://cdc-ether-hack.patch \
+	file://fsl-elbc-nand-backport.patch \
+	file://mpc8313e-rdb-leds.patch \
+	file://mpc8313e-rdb-cardbus.patch \
+	file://mpc8313e-rdb-eth-fixed.patch \
 	"
 
-SRC_URI_append_topas910 = "http://www.bplan-gmbh.org/data/toshiba/topas/linux/2.6.26.5/patch_2.6.26.5_topas910.bz2;patch=1;name=topaspatch"
+SRC_URI_append_topas910 = "http://www.bplan-gmbh.org/data/toshiba/topas/linux/2.6.26.5/patch_2.6.26.5_topas910.bz2;apply=yes;name=topaspatch"
 
 # see http://bugzilla.kernel.org/show_bug.cgi?id=11143
 do_install_append() {
diff --git a/recipes/linux/linux_2.6.27.bb b/recipes/linux/linux_2.6.27.bb
index b5c67e2dbf..7014958ba2 100644
--- a/recipes/linux/linux_2.6.27.bb
+++ b/recipes/linux/linux_2.6.27.bb
@@ -10,70 +10,70 @@ DEFAULT_PREFERENCE_simpad = "-1"
 DEFAULT_PREFERENCE_ts72xx = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.45.bz2;patch=1;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.45.bz2;apply=yes;name=stablepatch \
            file://defconfig "
 
 SRC_URI_append_boc01 = "\
 	file://boc01.dts \
-	file://001-090114-sqn11x0-usb-hack.patch;patch=1 \
-	file://004-081205-usb.patch;patch=1 \
-	file://005-090226-isl12024.patch;patch=1 \
-	file://007-081217-lm73.patch;patch=1 \
-	file://008-081208-spi.patch;patch=1 \
-	file://011-090115-gpio.patch;patch=1 \
-	file://012-090219-capsense.patch;patch=1 \
-	file://013-090306-lcd.patch;patch=1 \
+	file://001-090114-sqn11x0-usb-hack.patch \
+	file://004-081205-usb.patch \
+	file://005-090226-isl12024.patch \
+	file://007-081217-lm73.patch \
+	file://008-081208-spi.patch \
+	file://011-090115-gpio.patch \
+	file://012-090219-capsense.patch \
+	file://013-090306-lcd.patch \
 	"
 
-SRC_URI_append_progear = "file://progear-bl.patch;patch=1\
-                          file://progear-ac2.patch;patch=1"
+SRC_URI_append_progear = "file://progear-bl.patch\
+                          file://progear-ac2.patch"
 
 SRC_URI_append_simpad = "\
-           file://linux-2.6.27-SIMpad-GPIO-MMC-mod.patch;patch=1 \
-           file://linux-2.6.27-SIMpad-battery-old-way-but-also-with-sysfs.patch;patch=1 \
-           file://linux-2.6.27-SIMpad-cs3-simpad.patch;patch=1 \
-           file://linux-2.6.27-SIMpad-mq200.patch;patch=1 \
-           file://linux-2.6.27-SIMpad-pcmcia.patch;patch=1 \
-           file://linux-2.6.27-SIMpad-serial-gpio_keys-and-cs3-ro.patch.v2;patch=1 \
-           file://linux-2.6.27-SIMpad-ucb1x00-switches.patch;patch=1 \
-           file://linux-2.6.27-SIMpad-ucb1x00-ts-supend-and-accuracy.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \
-           file://connectplus-remove-ide-HACK.patch;patch=1 \
+           file://linux-2.6.27-SIMpad-GPIO-MMC-mod.patch \
+           file://linux-2.6.27-SIMpad-battery-old-way-but-also-with-sysfs.patch \
+           file://linux-2.6.27-SIMpad-cs3-simpad.patch \
+           file://linux-2.6.27-SIMpad-mq200.patch \
+           file://linux-2.6.27-SIMpad-pcmcia.patch \
+           file://linux-2.6.27-SIMpad-serial-gpio_keys-and-cs3-ro.patch.v2;apply=yes \
+           file://linux-2.6.27-SIMpad-ucb1x00-switches.patch \
+           file://linux-2.6.27-SIMpad-ucb1x00-ts-supend-and-accuracy.patch \
+           file://linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch \
+           file://linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch \
+           file://linux-2.6.24-SIMpad-rtc-sa1100.patch \
+           file://connectplus-remove-ide-HACK.patch \
            "
 
 SRC_URI_append_ts72xx = "\
-           file://0001-TS72xx-update-memory-map-comments.patch;patch=1 \
-           file://0002-GPIO-fix.patch;patch=1 \
-           file://0003-Debounce-IRQ.patch;patch=1 \
-           file://0004-OHCI-fix.patch;patch=1 \
-           file://0005-Fix-wrong-machine-ID-passed-from-RedBoot.patch;patch=1 \
-           file://0006-Force-the-nF-bit-on.patch;patch=1 \
-           file://0007-Use-CPLD-watchdog-to-reset.patch;patch=1 \
-           file://0008-Fix-UART-clocks.patch;patch=1 \
-           file://0009-CPU-info-and-board-revision.patch;patch=1 \
-           file://0010-GPIO-leds.patch;patch=1 \
-           file://0011-EP93xx-Ethernet-support.patch;patch=1 \
-           file://0012-TS72xx-watchdog.patch;patch=1 \
-           file://0013-TS7200-NOR-physmap-fix.patch;patch=1 \
-           file://0014-TS-7200-8MB-NOR-flash.patch;patch=1 \
-           file://0015-TS-72xx-MAX197-support.patch;patch=1 \
-           file://0016-RS485-common-bits.patch;patch=1 \
-           file://0017-TS-72xx-SBC-proc-info.patch;patch=1 \
-           file://0018-EP93xx-GPIO-I2C.patch;patch=1 \
-           file://0019-EP93xx-SPI-driver.patch;patch=1 \
-           file://0020-TS-72XX-LCD-console-driver.patch;patch=1 \
-           file://0021-EP93xx-GPIO-matrix-keypad.patch;patch=1 \
-           file://0022-TS-72xx-RS485-auto-mode-support.patch;patch=1 \
-           file://0023-Clean-and-invalidate-D-cache-entry.patch;patch=1 \
-           file://0024-PC-104-I-O-and-memory-mappings.patch;patch=1 \
-           file://0025-EP93xx-discontigmem.patch;patch=1 \
-           file://0026-TS72xx-PATA-support.patch;patch=1 \
-           file://0027-TS72xx-TS-SER1-support.patch;patch=1 \
-           file://0028-TS72xx-TS-ETH100.patch;patch=1 \
-           file://0029-EP93xx-Power-Management-Routines.patch;patch=1 \
-           file://0030-EP93xx-CPUfreq-driver.patch;patch=1 \
+           file://0001-TS72xx-update-memory-map-comments.patch \
+           file://0002-GPIO-fix.patch \
+           file://0003-Debounce-IRQ.patch \
+           file://0004-OHCI-fix.patch \
+           file://0005-Fix-wrong-machine-ID-passed-from-RedBoot.patch \
+           file://0006-Force-the-nF-bit-on.patch \
+           file://0007-Use-CPLD-watchdog-to-reset.patch \
+           file://0008-Fix-UART-clocks.patch \
+           file://0009-CPU-info-and-board-revision.patch \
+           file://0010-GPIO-leds.patch \
+           file://0011-EP93xx-Ethernet-support.patch \
+           file://0012-TS72xx-watchdog.patch \
+           file://0013-TS7200-NOR-physmap-fix.patch \
+           file://0014-TS-7200-8MB-NOR-flash.patch \
+           file://0015-TS-72xx-MAX197-support.patch \
+           file://0016-RS485-common-bits.patch \
+           file://0017-TS-72xx-SBC-proc-info.patch \
+           file://0018-EP93xx-GPIO-I2C.patch \
+           file://0019-EP93xx-SPI-driver.patch \
+           file://0020-TS-72XX-LCD-console-driver.patch \
+           file://0021-EP93xx-GPIO-matrix-keypad.patch \
+           file://0022-TS-72xx-RS485-auto-mode-support.patch \
+           file://0023-Clean-and-invalidate-D-cache-entry.patch \
+           file://0024-PC-104-I-O-and-memory-mappings.patch \
+           file://0025-EP93xx-discontigmem.patch \
+           file://0026-TS72xx-PATA-support.patch \
+           file://0027-TS72xx-TS-SER1-support.patch \
+           file://0028-TS72xx-TS-ETH100.patch \
+           file://0029-EP93xx-Power-Management-Routines.patch \
+           file://0030-EP93xx-CPUfreq-driver.patch \
            "
 
 # see http://bugzilla.kernel.org/show_bug.cgi?id=11143
diff --git a/recipes/linux/linux_2.6.28-rc6.bb b/recipes/linux/linux_2.6.28-rc6.bb
index b6a728b274..770ca1b782 100644
--- a/recipes/linux/linux_2.6.28-rc6.bb
+++ b/recipes/linux/linux_2.6.28-rc6.bb
@@ -13,7 +13,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.28/linux-${KER
            file://defconfig"
 
 SRC_URI_append_afeb9260 = " \
-        file://0002-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX.patch;patch=1 \
+        file://0002-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX.patch \
 "
 SRC_URI[md5sum] = "b94ed91fcc77cce6627cebba89695c75"
 SRC_URI[sha256sum] = "c5e7857c257491bbb40cf18f576f72df8480cad4980dea399d887e5c46c86279"
diff --git a/recipes/linux/linux_2.6.28.bb b/recipes/linux/linux_2.6.28.bb
index 27b14413f9..893e470bd6 100644
--- a/recipes/linux/linux_2.6.28.bb
+++ b/recipes/linux/linux_2.6.28.bb
@@ -16,69 +16,69 @@ DEFAULT_PREFERENCE_nokia900 = "1"
 DEFAULT_PREFERENCE_mh355 = "2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.10.bz2;patch=1;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.10.bz2;apply=yes;name=stablepatch \
            file://defconfig"
 
 SRC_URI_append_at91sam9263ek = " \
-           file://linux-2.6.28-at91.patch.bz2;patch=1 \
-	   file://linux-2.6.28-exp.patch.bz2;patch=1 "
+           file://linux-2.6.28-at91.patch.bz2 \
+	   file://linux-2.6.28-exp.patch.bz2 "
 
 SRC_URI_append_ronetix-pm9263 = " \
-           file://linux-2.6.28-at91.patch.bz2;patch=1 \
-           file://linux-2.6.28-exp.patch.bz2;patch=1 \
-           http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.28/003_linux-2.6.28-at91-ronetix-20112009.patch;patch=1;name=ronetixpatch "
+           file://linux-2.6.28-at91.patch.bz2 \
+           file://linux-2.6.28-exp.patch.bz2 \
+           http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.28/003_linux-2.6.28-at91-ronetix-20112009.patch;name=ronetixpatch "
 
 SRC_URI_append_mh355 = " \
-           file://linux-2.6.28-at91.patch.bz2;patch=1 \
-           file://linux-2.6.28-exp.patch.bz2;patch=1 \
-           file://linux-2.6.28.10-at91-mh.patch;patch=1 "
+           file://linux-2.6.28-at91.patch.bz2 \
+           file://linux-2.6.28-exp.patch.bz2 \
+           file://linux-2.6.28.10-at91-mh.patch "
 
 SRC_URI_append_stb225 = " \
-           file://uImage.patch;patch=1 \
-           file://ebase-fix.patch;patch=1 \
-           file://enable-uart.patch;patch=1 \
-           file://ip3902.patch;patch=1"
+           file://uImage.patch \
+           file://ebase-fix.patch \
+           file://enable-uart.patch \
+           file://ip3902.patch"
 
 SRC_URI_append_collie = " \
-	file://0001-collie-start-scoop-converton-to-new-api.patch;patch=1 \
-	file://0002-add-locomo_spi-driver.patch;patch=1 \
-	file://0003-enable-cpufreq-for-collie.patch;patch=1 \
-	file://0004-fix-dma-for-SA1100.patch;patch=1 \
-	file://0005-fix-collie-keyboard-bug.patch;patch=1 \
-	file://0006-add-collie-flash-hack.patch;patch=1 \
-	file://0007-hostap-workaround-for-buggy-sa1100-pcmcia-driver.patch;patch=1 \
-	file://0008-fix-collie-suspend-hack.patch;patch=1 \
-	file://0009-add-sa1100-usb-gadget-driver-hack.patch;patch=1 \
-	file://0010-mmc_spi-add-suspend-and-resume-callbacks.patch;patch=1 \
-	file://0011-move-drivers-mfd-.h-to-include-linux-mfd.patch;patch=1 \
-	file://0012-move-ucb1200-ts-driver.patch;patch=1 \
-	file://0013-add-collie-touchscreen-driver.patch;patch=1 \
-	file://0014-collie-locomo-led-change-default-trigger.patch;patch=1 \
-	file://0015-SA1100-make-gpio_to_irq-and-reverse-a-macro.patch;patch=1 \
-	file://0016-add-gpiolib-support-to-ucb1x00.patch;patch=1 \
-	file://0017-collie-convert-to-gpiolib-for-ucb1x00.patch;patch=1 \
-	file://0018-collie-add-battery-driver.patch;patch=1 \
-	file://0019-collie-support-pda_power-driver.patch;patch=1 \
-	file://0020-remove-collie_pm.c.patch;patch=1 \
-	file://0021-mmc-trivial-annotation-of-blocks.patch;patch=1 \
-	file://0022-mmc_block-print-better-error-messages.patch;patch=1 \
-	file://0023-mmc_block-ensure-all-sectors-that-do-not-have-error.patch;patch=1 " 
+	file://0001-collie-start-scoop-converton-to-new-api.patch \
+	file://0002-add-locomo_spi-driver.patch \
+	file://0003-enable-cpufreq-for-collie.patch \
+	file://0004-fix-dma-for-SA1100.patch \
+	file://0005-fix-collie-keyboard-bug.patch \
+	file://0006-add-collie-flash-hack.patch \
+	file://0007-hostap-workaround-for-buggy-sa1100-pcmcia-driver.patch \
+	file://0008-fix-collie-suspend-hack.patch \
+	file://0009-add-sa1100-usb-gadget-driver-hack.patch \
+	file://0010-mmc_spi-add-suspend-and-resume-callbacks.patch \
+	file://0011-move-drivers-mfd-.h-to-include-linux-mfd.patch \
+	file://0012-move-ucb1200-ts-driver.patch \
+	file://0013-add-collie-touchscreen-driver.patch \
+	file://0014-collie-locomo-led-change-default-trigger.patch \
+	file://0015-SA1100-make-gpio_to_irq-and-reverse-a-macro.patch \
+	file://0016-add-gpiolib-support-to-ucb1x00.patch \
+	file://0017-collie-convert-to-gpiolib-for-ucb1x00.patch \
+	file://0018-collie-add-battery-driver.patch \
+	file://0019-collie-support-pda_power-driver.patch \
+	file://0020-remove-collie_pm.c.patch \
+	file://0021-mmc-trivial-annotation-of-blocks.patch \
+	file://0022-mmc_block-print-better-error-messages.patch \
+	file://0023-mmc_block-ensure-all-sectors-that-do-not-have-error.patch " 
 
 SRC_URI_append_tosa = " \
-	file://commit-31c9b28;patch=1 \
-	file://commit-ddfb33c;patch=1 \
-	file://commit-f34ee79;patch=1 \
+	file://commit-31c9b28;apply=yes \
+	file://commit-ddfb33c;apply=yes \
+	file://commit-f34ee79;apply=yes \
 	"
 SRC_URI_append_gamecube = " \
-	file://patch-2.6.28-gc;patch=1 \
+	file://patch-2.6.28-gc;apply=yes \
 	"
 
 SRC_URI_append_tx27 = " \
-	file://linux-2.6.28-karo4.diff;patch=1 \
+	file://linux-2.6.28-karo4.diff \
 	"
 
 SRC_URI_nokia900 = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2;name=kernel \
-		    http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20094803.3+0m5.diff.gz;patch=1;name=nokiapatch \
+		    http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20094803.3+0m5.diff.gz;name=nokiapatch \
 		    file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.28/"
diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
index 5ebcbb6f8a..10e595e21c 100644
--- a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
+++ b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
@@ -21,18 +21,18 @@ DEFAULT_PREFERENCE_tx25 = "1"
 
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.30/patch-${KERNEL_RELEASE}.bz2;patch=1;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.30/patch-${KERNEL_RELEASE}.bz2;apply=yes;name=stablepatch \
            file://defconfig"
 
 SRC_URI_append_afeb9260 = " \
-        file://0001-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX.patch;patch=1 \
-        file://0002-RS-485-mode-of-USART1.patch;patch=1 \
-        file://0004-AFEB9260-ASoC-driver.patch;patch=1 \
+        file://0001-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX.patch \
+        file://0002-RS-485-mode-of-USART1.patch \
+        file://0004-AFEB9260-ASoC-driver.patch \
 "
 
-SRC_URI_append_tx25 = " file://linux-2.6.30-rc4-git.patch;patch=1 \
-	file://linux-2.6.30-rc4-karo3.diff;patch=1 \
-        file://stk5-baseboard_c_vesa640.patch;patch=1"
+SRC_URI_append_tx25 = " file://linux-2.6.30-rc4-git.patch \
+	file://linux-2.6.30-rc4-karo3.diff \
+        file://stk5-baseboard_c_vesa640.patch"
 
 SRC_URI[kernel.md5sum] = "64921b5ff5cdadbccfcd3820f03be7d8"
 SRC_URI[kernel.sha256sum] = "58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f"
diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc5.bb b/recipes/linux/linux_2.6.29+2.6.30-rc5.bb
index b530d6f35e..aa8fdb22ab 100644
--- a/recipes/linux/linux_2.6.29+2.6.30-rc5.bb
+++ b/recipes/linux/linux_2.6.29+2.6.30-rc5.bb
@@ -19,7 +19,7 @@ DEFAULT_PREFERENCE_spitz = "-1"
 DEFAULT_PREFERENCE_tosa = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.30/patch-${KERNEL_RELEASE}.bz2;patch=1;name=patch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.30/patch-${KERNEL_RELEASE}.bz2;apply=yes;name=patch \
            file://defconfig"
 
 
diff --git a/recipes/linux/linux_2.6.29.bb b/recipes/linux/linux_2.6.29.bb
index 5fa410e9c1..2b80884544 100644
--- a/recipes/linux/linux_2.6.29.bb
+++ b/recipes/linux/linux_2.6.29.bb
@@ -19,56 +19,56 @@ DEFAULT_PREFERENCE_tqm8540 = "1"
 DEFAULT_PREFERENCE_stamp9g20evb = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.6.bz2;patch=1;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.6.bz2;apply=yes;name=stablepatch \
            file://defconfig"
 
 SRC_URI_append_boc01 = "\
 	file://boc01.dts \
 	file://boc01.dts.v1 \
-	file://004-081205-usb.patch;patch=1 \
-	file://005-091008-isl12024.patch;patch=1 \
-	file://007-091005-lm73.patch;patch=1 \
-	file://008-091005-spi.patch;patch=1 \
-	file://011-090115-gpio.patch;patch=1 \
-	file://012-091019-capsense.patch;patch=1 \
-	file://013-091015-lcd.patch;patch=1 \
+	file://004-081205-usb.patch \
+	file://005-091008-isl12024.patch \
+	file://007-091005-lm73.patch \
+	file://008-091005-spi.patch \
+	file://011-090115-gpio.patch \
+	file://012-091019-capsense.patch \
+	file://013-091015-lcd.patch \
 	"
 
 SRC_URI_append_canyonlands = " \
-        file://0001-powerpc-4xx-Add-PPC4xx-PCIe-MSI-support.patch;patch=1 \
+        file://0001-powerpc-4xx-Add-PPC4xx-PCIe-MSI-support.patch \
         "
 
 SRC_URI_append_micro2440 = " \
-	file://0001-S3C-Backported-the-s3c2410-touchscreen-from-openmok.patch;patch=1 \
-	file://0002-S3C-Backported-openmoko-s-touchscreen-filters.patch;patch=1 \
-	file://0003-VENDOR-armworks-logo.patch;patch=1 \
-	file://0004-920T-Use-specific-920t-mtune.patch;patch=1 \
-	file://0006-S3C-Allow-the-machine-code-to-get-the-BBT-table-fro.patch;patch=1 \
-	file://0007-MINI2440-Add-machine-support.patch;patch=1 \
-	file://0008-MINI2440-Delays-command-check-response-on-SD.patch;patch=1 \
-	file://0009-MINI2440-Rename-the-SoC-tty-names.patch;patch=1 \
-	file://0010-MINI2440-creates-a-mini2440_defconfig-file.patch;patch=1 \
-	file://0011-MINI2440-Add-touchscreen-support.patch;patch=1 \
+	file://0001-S3C-Backported-the-s3c2410-touchscreen-from-openmok.patch \
+	file://0002-S3C-Backported-openmoko-s-touchscreen-filters.patch \
+	file://0003-VENDOR-armworks-logo.patch \
+	file://0004-920T-Use-specific-920t-mtune.patch \
+	file://0006-S3C-Allow-the-machine-code-to-get-the-BBT-table-fro.patch \
+	file://0007-MINI2440-Add-machine-support.patch \
+	file://0008-MINI2440-Delays-command-check-response-on-SD.patch \
+	file://0009-MINI2440-Rename-the-SoC-tty-names.patch \
+	file://0010-MINI2440-creates-a-mini2440_defconfig-file.patch \
+	file://0011-MINI2440-Add-touchscreen-support.patch \
 	"
 
 SRC_URI_append_tosa = " \
-        file://0001-pxa-make-second-argument-of-clk_add_alias-a-name-in.patch;patch=1 \
-        file://0002-spi-pxa2xx-spi-set-default-cs_control-to-null_cs_co.patch;patch=1 \
+        file://0001-pxa-make-second-argument-of-clk_add_alias-a-name-in.patch \
+        file://0002-spi-pxa2xx-spi-set-default-cs_control-to-null_cs_co.patch \
         "
 
 SRC_URI_append_ep93xx = " \
-        file://add-edb9301.patch;patch=1 \
-	file://edb9301-fix-machine-id.patch;patch=1 \
+        file://add-edb9301.patch \
+	file://edb9301-fix-machine-id.patch \
 	"
 
 SRC_URI_append_cm-x270 = "\
-	file://0001-xm_x2xx-config-fix-up-CMDLINE.patch;patch=1 \
-	file://0002-cm-x270-nand-change-name-of-device.patch;patch=1 \
-	file://0003-cm-x2xx.c-add-support-for-sharp-VGA-display-panel.patch;patch=1 \
+	file://0001-xm_x2xx-config-fix-up-CMDLINE.patch \
+	file://0002-cm-x270-nand-change-name-of-device.patch \
+	file://0003-cm-x2xx.c-add-support-for-sharp-VGA-display-panel.patch \
 	"	
 
 SRC_URI_append_stamp9g20evb = " \
-    file://stamp9g20.patch;patch=1 \
+    file://stamp9g20.patch \
     "
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),0x230000(root),-(config);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd4 rootfstype=jffs2"
diff --git a/recipes/linux/linux_2.6.30.bb b/recipes/linux/linux_2.6.30.bb
index 7f97c1a816..2c3431481f 100644
--- a/recipes/linux/linux_2.6.30.bb
+++ b/recipes/linux/linux_2.6.30.bb
@@ -16,14 +16,14 @@ DEFAULT_PREFERENCE_at91sam9263ek = "-1"
 DEFAULT_PREFERENCE_tosa = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.10.bz2;patch=1;name=stablepatch \
-           http://maxim.org.za/AT91RM9200/2.6/2.6.30-at91.patch.gz;patch=1;name=at91patch \
-           file://aufs2-30.patch;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.10.bz2;apply=yes;name=stablepatch \
+           http://maxim.org.za/AT91RM9200/2.6/2.6.30-at91.patch.gz;name=at91patch \
+           file://aufs2-30.patch \
            file://defconfig"
 
-SRC_URI_append_mpc8315e-rdb = " file://mpc8315erdb-add-msi-to-dts.patch;patch=1"
+SRC_URI_append_mpc8315e-rdb = " file://mpc8315erdb-add-msi-to-dts.patch"
 
-SRC_URI_append_at91sam9263ek = " file://hrw-linux-2.6.30-exp.patch;patch=1 "
+SRC_URI_append_at91sam9263ek = " file://hrw-linux-2.6.30-exp.patch "
 
 
 SRC_URI[kernel.md5sum] = "7a80058a6382e5108cdb5554d1609615"
diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb
index 638622de3c..5c1562c088 100644
--- a/recipes/linux/linux_2.6.31.bb
+++ b/recipes/linux/linux_2.6.31.bb
@@ -15,60 +15,60 @@ DEFAULT_PREFERENCE_iei-nanogx-466 = "1"
 DEFAULT_PREFERENCE_cm-x300 = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.12.bz2;patch=1;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.12.bz2;apply=yes;name=stablepatch \
            file://defconfig"
 
-SRC_URI += "file://0001-Squashfs-move-zlib-decompression-wrapper-code-into.patch;patch=1 \
-            file://0002-Squashfs-Factor-out-remaining-zlib-dependencies-int.patch;patch=1 \
-            file://0003-Squashfs-add-a-decompressor-framework.patch;patch=1 \
-            file://0004-Squashfs-add-decompressor-entries-for-lzma-and-lzo.patch;patch=1 \
-            file://0005-Squashfs-add-an-extra-parameter-to-the-decompressor.patch;patch=1 \
-            file://0006-Squashfs-add-LZMA-compression.patch;patch=1 \
-            file://0007-Squashfs-Make-unlzma-available-to-non-initramfs-ini.patch;patch=1 \
+SRC_URI += "file://0001-Squashfs-move-zlib-decompression-wrapper-code-into.patch \
+            file://0002-Squashfs-Factor-out-remaining-zlib-dependencies-int.patch \
+            file://0003-Squashfs-add-a-decompressor-framework.patch \
+            file://0004-Squashfs-add-decompressor-entries-for-lzma-and-lzo.patch \
+            file://0005-Squashfs-add-an-extra-parameter-to-the-decompressor.patch \
+            file://0006-Squashfs-add-LZMA-compression.patch \
+            file://0007-Squashfs-Make-unlzma-available-to-non-initramfs-ini.patch \
            "
 
 SRC_URI_append_db1200 ="\
-            http://maxim.org.za/AT91RM9200/2.6/2.6.31-at91.patch.gz;patch=1;name=at91patch \
+            http://maxim.org.za/AT91RM9200/2.6/2.6.31-at91.patch.gz;name=at91patch \
 	    "
 
 SRC_URI_append_boc01 = "\
-           http://maxim.org.za/AT91RM9200/2.6/2.6.31-at91.patch.gz;patch=1;name=at91patch \
+           http://maxim.org.za/AT91RM9200/2.6/2.6.31-at91.patch.gz;name=at91patch \
            file://boc01.dts \
            file://boc01.dts.v1 \
-           file://004-081205-usb.patch;patch=1 \
-           file://005-091110-isl12024.patch;patch=1 \
-           file://007-091005-lm73.patch;patch=1 \
-           file://011-091028-gpio.patch;patch=1 \
-           file://012-091019-capsense.patch;patch=1 \
-           file://013-091015-lcd.patch;patch=1 \
-           file://014-091030-buttons.patch;patch=1 \
+           file://004-081205-usb.patch \
+           file://005-091110-isl12024.patch \
+           file://007-091005-lm73.patch \
+           file://011-091028-gpio.patch \
+           file://012-091019-capsense.patch \
+           file://013-091015-lcd.patch \
+           file://014-091030-buttons.patch \
            "
 
 SRC_URI_append_collie = "\
-           file://0001-add-locomo_spi-driver.patch;patch=1 \
-           file://0002-collie-fix-scoop-convesion-to-new-api.patch;patch=1 \
-           file://0003-collie-prepare-for-gpiolib-use.patch;patch=1 \
-           file://0004-move-drivers-mfd-.h-to-include-linux-mfd.patch;patch=1 \
-           file://0005-collie-locomo-led-change-default-trigger.patch;patch=1 \
-           file://0006-SA1100-make-gpio_to_irq-and-reverse-a-macro.patch;patch=1 \
-           file://0007-add-gpiolib-support-to-ucb1x00.patch;patch=1 \
-           file://0008-collie-convert-to-gpiolib-for-ucb1x00.patch;patch=1 \
-           file://0009-collie-add-battery-driver.patch;patch=1 \
-           file://0010-collie-support-pda_power-driver.patch;patch=1 \
-           file://0011-fix-collie-keyboard-bug.patch;patch=1 \
-           file://0012-add-collie-touchscreen-driver.patch;patch=1 \
-           file://0013-add-sa1100-udc-hack-extra-hacked-for-collie.patch;patch=1 \
-           file://0014-gadget-add-file.patch;patch=1 \
-           file://0004-fix-dma-for-SA1100.patch;patch=1 \
+           file://0001-add-locomo_spi-driver.patch \
+           file://0002-collie-fix-scoop-convesion-to-new-api.patch \
+           file://0003-collie-prepare-for-gpiolib-use.patch \
+           file://0004-move-drivers-mfd-.h-to-include-linux-mfd.patch \
+           file://0005-collie-locomo-led-change-default-trigger.patch \
+           file://0006-SA1100-make-gpio_to_irq-and-reverse-a-macro.patch \
+           file://0007-add-gpiolib-support-to-ucb1x00.patch \
+           file://0008-collie-convert-to-gpiolib-for-ucb1x00.patch \
+           file://0009-collie-add-battery-driver.patch \
+           file://0010-collie-support-pda_power-driver.patch \
+           file://0011-fix-collie-keyboard-bug.patch \
+           file://0012-add-collie-touchscreen-driver.patch \
+           file://0013-add-sa1100-udc-hack-extra-hacked-for-collie.patch \
+           file://0014-gadget-add-file.patch \
+           file://0004-fix-dma-for-SA1100.patch \
            "
 
 
 SRC_URI_append_ep93xx = " \
-           file://edb9301-fix-machine-id.patch;patch=1 \
+           file://edb9301-fix-machine-id.patch \
            "
 
 SRC_URI_append_cm-x300 = "\
-           file://linux-2.6.31-cm-x300.patch;patch=1 \
+           file://linux-2.6.31-cm-x300.patch \
            "
 
 do_devicetree_image_append_boc01() {
diff --git a/recipes/linux/linux_2.6.32.bb b/recipes/linux/linux_2.6.32.bb
index 009ba43778..564e311a05 100644
--- a/recipes/linux/linux_2.6.32.bb
+++ b/recipes/linux/linux_2.6.32.bb
@@ -23,7 +23,7 @@ DEFAULT_PREFERENCE_jornada7xx = "-1"
 DEFAULT_PREFERENCE_ts72xx = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.9.bz2;patch=1;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.9.bz2;apply=yes;name=stablepatch \
            file://defconfig"
 
 SRC_URI[kernel.md5sum] = "260551284ac224c3a43c4adac7df4879"
@@ -32,46 +32,46 @@ SRC_URI[stablepatch.md5sum] = "7f615dd3b4a3b19fb86e479996a2deb5"
 SRC_URI[stablepatch.sha256sum] = "8aeb15c31fb09c769f004c8dc51e29aa26be8e84d70db418af70ecefc463459a"
 
 SRC_URI_append_at91sam9g45ek = " \
-	file://at91/linux-2.6.32-001-configurable-nand-partitions.patch;patch=1 \
-	file://at91/linux-2.6.32-002-sam9g20-proper-reset.patch;patch=1 \
+	file://at91/linux-2.6.32-001-configurable-nand-partitions.patch \
+	file://at91/linux-2.6.32-002-sam9g20-proper-reset.patch \
 	"
 
 
 # part of 2.6.24.7 patchset from Sim.One project
 # other patches needs work
 SRC_URI_append_simone = " \
-			file://ep93xx/edb9301-fix-machine-id.patch;patch=1 \
-			file://ep93xx/simone-board-def.patch;patch=1 \
-			file://ep93xx/ep93xx-regs.patch;patch=1 \
-			file://ep93xx/ep93xx-i2c.patch;patch=1 \
-			file://ep93xx/ep93xx-touchscreen.patch;patch=1 \
-			file://ep93xx/ep93xx-spi.patch;patch=1 \
-			file://ep93xx/ep93xx-cpuinfo.patch;patch=1 "
+			file://ep93xx/edb9301-fix-machine-id.patch \
+			file://ep93xx/simone-board-def.patch \
+			file://ep93xx/ep93xx-regs.patch \
+			file://ep93xx/ep93xx-i2c.patch \
+			file://ep93xx/ep93xx-touchscreen.patch \
+			file://ep93xx/ep93xx-spi.patch \
+			file://ep93xx/ep93xx-cpuinfo.patch "
 
 FILES_kernel-image_simone = ""
 
 SRC_URI_append_ts72xx = " \
-                        file://0001-ts72xx_base.patch;patch=1 \
-                        file://0002-ts72xx_force_machine-id.patch;patch=1 \
-                        file://0003-ep93xx_cpuinfo.patch;patch=1 \
-                        file://0004-ts72xx_sbcinfo.patch;patch=1 \
-                        file://0005-ep93xx_eth.patch;patch=1 \
-                        file://0006-ts72xx_ts_ser1.patch;patch=1 \
-                        file://0007-ts72xx_rs485.patch;patch=1 \
-                        file://0008-ts72xx_ts_eth100.patch;patch=1 \
-                        file://0009-ts7200_cf_ide.patch;patch=1 \
-                        file://0010-ts72xx_pata.patch;patch=1 \
-                        file://0011-ep93xx_pm.patch;patch=1 \
-                        file://0012-ts72xx_gpio_i2c.patch;patch=1 \
-                        file://0013-ts72xx_dio_keypad.patch;patch=1 \
-                        file://0014-ep93xx_spi.patch;patch=1 \
-                        file://0015-ep93xx_cpufreq.patch;patch=1 \
-                        file://0016-ts7200_nor_flash.patch;patch=1 \
+                        file://0001-ts72xx_base.patch \
+                        file://0002-ts72xx_force_machine-id.patch \
+                        file://0003-ep93xx_cpuinfo.patch \
+                        file://0004-ts72xx_sbcinfo.patch \
+                        file://0005-ep93xx_eth.patch \
+                        file://0006-ts72xx_ts_ser1.patch \
+                        file://0007-ts72xx_rs485.patch \
+                        file://0008-ts72xx_ts_eth100.patch \
+                        file://0009-ts7200_cf_ide.patch \
+                        file://0010-ts72xx_pata.patch \
+                        file://0011-ep93xx_pm.patch \
+                        file://0012-ts72xx_gpio_i2c.patch \
+                        file://0013-ts72xx_dio_keypad.patch \
+                        file://0014-ep93xx_spi.patch \
+                        file://0015-ep93xx_cpufreq.patch \
+                        file://0016-ts7200_nor_flash.patch \
                         "
 
 # Zaurus family bootloader patches
 RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
-ZAURUSPATCHES = " ${RPSRC}/pxa-linking-bug-r1.patch;patch=1;status=unmergable;name=pxa-linking-bug-r1 "
+ZAURUSPATCHES = " ${RPSRC}/pxa-linking-bug-r1.patch;status=unmergable;name=pxa-linking-bug-r1 "
 SRC_URI[pxa-linking-bug-r1.md5sum] = "1e2a99787260c3566033e7f41180e2c8"
 SRC_URI[pxa-linking-bug-r1.sha256sum] = "785d2680022325ad54c1593082dce902f5fee31dae4c1922ba43956b1dcfcd8b"
 
@@ -84,4 +84,4 @@ SRC_URI_append_spitz = "${ZAURUSPATCHES}"
 SRC_URI_append_tosa = "${ZAURUSPATCHES}"
 
 SRC_URI_append_eee701 = " \
-	file://intelfb.patch;patch=1 "
+	file://intelfb.patch "
diff --git a/recipes/linux/linux_2.6.33.bb b/recipes/linux/linux_2.6.33.bb
index caa415c07d..a27c79aa14 100644
--- a/recipes/linux/linux_2.6.33.bb
+++ b/recipes/linux/linux_2.6.33.bb
@@ -9,6 +9,11 @@ DEFAULT_PREFERENCE_mpc8641-hpcn = "1"
 DEFAULT_PREFERENCE_p2020ds = "1"
 DEFAULT_PREFERENCE_imote2 = "1"
 DEFAULT_PREFERENCE_afeb9260 = "1"
+DEFAULT_PREFERENCE_qemuarm = "1"
+DEFAULT_PREFERENCE_qemuppc = "1"
+DEFAULT_PREFERENCE_qemush4 = "1"
+DEFAULT_PREFERENCE_qemumips = "1"
+DEFAULT_PREFERENCE_qemux86 = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/${P}.tar.bz2;name=kernel \
            file://defconfig"
@@ -17,31 +22,31 @@ SRC_URI[kernel.md5sum] = "c3883760b18d50e8d78819c54d579b00"
 SRC_URI[kernel.sha256sum] = "63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6"
 
 SRC_URI_append_ts72xx = " \
-                        file://0001-ts72xx_base.patch;patch=1 \
-                        file://0002-ts72xx_force_machine-id.patch;patch=1 \
-                        file://0003-ep93xx_cpuinfo.patch;patch=1 \
-                        file://0004-ts72xx_sbcinfo.patch;patch=1 \
-                        file://0005-ep93xx_eth.patch;patch=1 \
-                        file://0006-ts72xx_ts_ser1.patch;patch=1 \
-                        file://0007-ts72xx_rs485.patch;patch=1 \
-                        file://0008-ts72xx_ts_eth100.patch;patch=1 \
-                        file://0009-ts7200_cf_ide.patch;patch=1 \
-                        file://0010-ts72xx_pata.patch;patch=1 \
-                        file://0011-ep93xx_pm.patch;patch=1 \
-                        file://0012-ts72xx_gpio_i2c.patch;patch=1 \
-                        file://0013-ts72xx_dio_keypad.patch;patch=1 \
-                        file://0014-ep93xx_spi.patch;patch=1 \
-                        file://0015-ep93xx_cpufreq.patch;patch=1 \
-                        file://0016-ts7200_nor_flash.patch;patch=1 \
+                        file://0001-ts72xx_base.patch \
+                        file://0002-ts72xx_force_machine-id.patch \
+                        file://0003-ep93xx_cpuinfo.patch \
+                        file://0004-ts72xx_sbcinfo.patch \
+                        file://0005-ep93xx_eth.patch \
+                        file://0006-ts72xx_ts_ser1.patch \
+                        file://0007-ts72xx_rs485.patch \
+                        file://0008-ts72xx_ts_eth100.patch \
+                        file://0009-ts7200_cf_ide.patch \
+                        file://0010-ts72xx_pata.patch \
+                        file://0011-ep93xx_pm.patch \
+                        file://0012-ts72xx_gpio_i2c.patch \
+                        file://0013-ts72xx_dio_keypad.patch \
+                        file://0014-ep93xx_spi.patch \
+                        file://0015-ep93xx_cpufreq.patch \
+                        file://0016-ts7200_nor_flash.patch \
                         "
 SRC_URI_append_afeb9260 = " \
-                        file://0001-RS-485-mode-of-USART1.patch;patch=1 \
-                        file://0002-SRAM-for-ethernet-TX-patch.patch;patch=1 \
-                        file://0003-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX-.patch;patch=1 \
-                        file://0004-Disallowing-non-power-of-2-ring-size-proper-resource.patch;patch=1 \
-                        file://0005-Add-missing-header-file.patch;patch=1 \
-                        file://0006-Enable-SPI1.patch;patch=1 \
-                        file://0007-Adding-4th-serial-port.patch;patch=1 \
+                        file://0001-RS-485-mode-of-USART1.patch \
+                        file://0002-SRAM-for-ethernet-TX-patch.patch \
+                        file://0003-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX-.patch \
+                        file://0004-Disallowing-non-power-of-2-ring-size-proper-resource.patch \
+                        file://0005-Add-missing-header-file.patch \
+                        file://0006-Enable-SPI1.patch \
+                        file://0007-Adding-4th-serial-port.patch \
                         "
 
 
diff --git a/recipes/linux/linux_2.6.34.bb b/recipes/linux/linux_2.6.34.bb
new file mode 100644
index 0000000000..b406e535df
--- /dev/null
+++ b/recipes/linux/linux_2.6.34.bb
@@ -0,0 +1,11 @@
+require linux.inc
+
+# Mark archs/machines that this kernel supports
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/${P}.tar.bz2;name=kernel \
+           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \
+           file://defconfig"
+
+SRC_URI[kernel.md5sum] = "10eebcb0178fb4540e2165bfd7efc7ad"
+SRC_URI[kernel.sha256sum] = "fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633"
diff --git a/recipes/linux/linux_git.bb b/recipes/linux/linux_git.bb
new file mode 100644
index 0000000000..c8fedc8f9a
--- /dev/null
+++ b/recipes/linux/linux_git.bb
@@ -0,0 +1,14 @@
+require linux.inc
+
+KERNEL_RELEASE = "2.6.34"
+SRCREV = "e40152ee1e1c7a63f4777791863215e3faa37a86"
+PV = "${KERNEL_RELEASE}+gitr${SRCPV}"
+
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \
+           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \
+           file://defconfig"
+
+S = "${WORKDIR}/git"
+
+# Mark archs/machines that this kernel supports
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb b/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb
index 9d8ccdc4be..19fea4229a 100644
--- a/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb
+++ b/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb
@@ -4,9 +4,9 @@ LICENSE = "GPLv2"
 PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.17/linux-2.6.17-rc5.tar.bz2 \
-           file://linux-2.6.17-rc5.patch;pnum=0;patch=1 \
-           file://ucb1400-ac97-audio.patch;pnum=1;patch=1 \
-           file://ucb1400-touchscreen.patch;pnum=1;patch=1 \
+           file://linux-2.6.17-rc5.patch;striplevel=0 \
+           file://ucb1400-ac97-audio.patch \
+           file://ucb1400-touchscreen.patch \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.17-rc5"
diff --git a/recipes/linux/logicpd-pxa270_2.6.19.2.bb b/recipes/linux/logicpd-pxa270_2.6.19.2.bb
index 183b2520d4..f5282b8ad3 100644
--- a/recipes/linux/logicpd-pxa270_2.6.19.2.bb
+++ b/recipes/linux/logicpd-pxa270_2.6.19.2.bb
@@ -4,29 +4,29 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2 \
-	   file://asoc-v0.12.4.patch;patch=1 \
-	   file://pxafb_fix_params-r2.patch;patch=1 \
-           file://pxa_irda_susres_fix-r0.patch;patch=1 \
-           file://pxa_keys-r5.patch;patch=1 \
-           file://pxa_timerfix-r0.patch;patch=1 \
-           file://input_power-r6.patch;patch=1 \
-           file://pxa25x_cpufreq-r1.patch;patch=1 \
-           file://pm_changes-r1.patch;patch=1 \
-           file://usb_add_epalloc-r3.patch;patch=1 \
-           file://usb_pxa27x_udc-r3.patch;patch=1 \
-           file://kexec-arm-r3.patch;patch=1 \
-           file://pxa27x_overlay-r4.patch;patch=1 \
-           file://xscale_cache_workaround-r1.patch;patch=1 \
-           file://ucb1400-touchscreen.patch;patch=1 \
-           file://config-nr-tty-devices.patch;pnum=1;patch=1 \
+	   file://asoc-v0.12.4.patch \
+	   file://pxafb_fix_params-r2.patch \
+           file://pxa_irda_susres_fix-r0.patch \
+           file://pxa_keys-r5.patch \
+           file://pxa_timerfix-r0.patch \
+           file://input_power-r6.patch \
+           file://pxa25x_cpufreq-r1.patch \
+           file://pm_changes-r1.patch \
+           file://usb_add_epalloc-r3.patch \
+           file://usb_pxa27x_udc-r3.patch \
+           file://kexec-arm-r3.patch \
+           file://pxa27x_overlay-r4.patch \
+           file://xscale_cache_workaround-r1.patch \
+           file://ucb1400-touchscreen.patch \
+           file://config-nr-tty-devices.patch \
 	   "
 
 SRC_URI_append_logicpd-pxa270 = "\
-           file://logicpd-pxa270-cf-hack.patch;pnum=0;patch=1 \
-           file://logicpd-pxa270-flash.patch;pnum=0;patch=1 \
-           file://logicpd-pxa270-hardware-id-hack.patch;pnum=0;patch=1 \
-           file://logicpd-pxa270-smc91x.patch;pnum=0;patch=1 \
-           file://logicpd-pxa270-lcd-osd024ttea2.patch;pnum=0;patch=1 \
+           file://logicpd-pxa270-cf-hack.patch;striplevel=0 \
+           file://logicpd-pxa270-flash.patch;striplevel=0 \
+           file://logicpd-pxa270-hardware-id-hack.patch;striplevel=0 \
+           file://logicpd-pxa270-smc91x.patch;striplevel=0 \
+           file://logicpd-pxa270-lcd-osd024ttea2.patch;striplevel=0 \
            file://defconfig-logicpd-pxa270 \
            "
 
diff --git a/recipes/linux/mainstone-kernel_2.6.18.bb b/recipes/linux/mainstone-kernel_2.6.18.bb
index 7735879599..1e3df352bd 100644
--- a/recipes/linux/mainstone-kernel_2.6.18.bb
+++ b/recipes/linux/mainstone-kernel_2.6.18.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
-           file://flash-unlock.patch;patch=1;pnum=0 \
+           file://flash-unlock.patch;striplevel=0 \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.18"
diff --git a/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index 93a8f9e527..3145e9d4fe 100644
--- a/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -9,9 +9,9 @@ PXAV = "1"
 PR = "r5"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2;name=kernel \
-	   http://ftp.linux.org.uk/pub/linux/arm/kernel/v2.4/patch-${KV}-rmk${RMKV}.bz2;patch=1;name=rmkpatch \
-	   file://diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \
-	   file://mnci-combined.patch;patch=1"
+	   http://ftp.linux.org.uk/pub/linux/arm/kernel/v2.4/patch-${KV}-rmk${RMKV}.bz2;apply=yes;name=rmkpatch \
+	   file://diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;apply=yes \
+	   file://mnci-combined.patch"
 
 S = "${WORKDIR}/linux-${KV}"
 
diff --git a/recipes/linux/multi-kernel.inc b/recipes/linux/multi-kernel.inc
index 1516a42f12..3e11928155 100644
--- a/recipes/linux/multi-kernel.inc
+++ b/recipes/linux/multi-kernel.inc
@@ -87,5 +87,6 @@ do_deploy_append () {
 
 }
 
+do_compileconfigs[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}:do_populate_sysroot"
 addtask compileconfigs after do_patch before do_configure
 
diff --git a/recipes/linux/mx21ads-kernel_2.6.19rc6.bb b/recipes/linux/mx21ads-kernel_2.6.19rc6.bb
index a19919af6e..6891d7f4cf 100644
--- a/recipes/linux/mx21ads-kernel_2.6.19rc6.bb
+++ b/recipes/linux/mx21ads-kernel_2.6.19rc6.bb
@@ -6,8 +6,8 @@ PR = "r2"
 PV = "2.6.18+2.6.19-rc6"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2;name=kernel \
-    ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1;name=rcpatch \
-    http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx21/mx21ads-2.6.19rc6-lg1.patch.bz2;patch=1;name=mx21patch \
+    ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;apply=yes;name=rcpatch \
+    http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx21/mx21ads-2.6.19rc6-lg1.patch.bz2;name=mx21patch \
     file://mx21ads_defconfig"
 
 S = "${WORKDIR}/linux-2.6.18"
diff --git a/recipes/linux/netbook-pro-kernel_2.6.17.bb b/recipes/linux/netbook-pro-kernel_2.6.17.bb
index eb0d013668..151a649889 100644
--- a/recipes/linux/netbook-pro-kernel_2.6.17.bb
+++ b/recipes/linux/netbook-pro-kernel_2.6.17.bb
@@ -6,9 +6,9 @@ PR = "r2"
 COMPATIBLE_MACHINE = "netbook-pro"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2;name=kernel \
-	http://linuxtogo.org/~koen/netbook-base-r3.patch;patch=1;name=patch1 \
-	http://linuxtogo.org/~koen/netbook-pcon-r0.patch;patch=1;name=patch2 \
-	http://linuxtogo.org/~koen/netbook-pcon-i2c-r1.patch;patch=1;name=patch3 \
+	http://linuxtogo.org/~koen/netbook-base-r3.patch;name=patch1 \
+	http://linuxtogo.org/~koen/netbook-pcon-r0.patch;name=patch2 \
+	http://linuxtogo.org/~koen/netbook-pcon-i2c-r1.patch;name=patch3 \
 	http://linuxtogo.org/~koen/defconfig;name=config \
 		   "
 
diff --git a/recipes/linux/openezx-kernel_git.bb b/recipes/linux/openezx-kernel_git.bb
index a07309cc9f..55461d1290 100644
--- a/recipes/linux/openezx-kernel_git.bb
+++ b/recipes/linux/openezx-kernel_git.bb
@@ -3,8 +3,7 @@ AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 SRCREV = "b390bb1ee708277297fdfd38e26d955b17d81c2e"
 KV = "2.6.33"
-PV = "${KV}+gitr${SRCPV}"
-PE = "1"
+PV = "${KV}+gitr${SRCREV}"
 PR = "r4"
 
 require linux.inc
diff --git a/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index 8f72feabc0..3406a63672 100644
--- a/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -12,30 +12,30 @@ COMPATIBLE_MACHINE = 'simpad'
 FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2;name=kernel \
-           file://${KV}-${VRSV}.patch;patch=1 \
-           file://${KV}-${VRSV}-${PXAV}.patch;patch=1 \
-           file://${KV}-${VRSV}-${PXAV}-${JPMV}.patch;patch=1 \
-           file://sound-volume-reversed.patch;patch=1 \
-	   file://disable-pcmcia-probe.patch;patch=1 \
-           file://mkdep.patch;patch=1 \
+           file://${KV}-${VRSV}.patch \
+           file://${KV}-${VRSV}-${PXAV}.patch \
+           file://${KV}-${VRSV}-${PXAV}-${JPMV}.patch \
+           file://sound-volume-reversed.patch \
+	   file://disable-pcmcia-probe.patch \
+           file://mkdep.patch \
            file://defconfig-${MACHINE} \
-	   http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1;name=patch \
-           file://mipv6-1.1-v2.4.25.patch;patch=1 \
-           file://simpad-backlight-if.patch;patch=1 \
-           file://simpad-switches-input.patch;patch=1 \
-           file://simpad-switches-input2.patch;patch=1 \
-           file://simpad-apm.diff;patch=1;pnum=0 \
-           file://simpad-ts-noninput.patch;patch=1 \
-           file://simpad-pm-updates.patch;patch=1;pnum=0 \
-           file://support-128mb-ram.patch;patch=1 \
-           file://mmc-spi.patch;patch=1 \
-           file://iw249_we17-13.diff;patch=1 \
-           file://iw240_we18-5.diff;patch=1 \
+	   http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz;name=patch \
+           file://mipv6-1.1-v2.4.25.patch \
+           file://simpad-backlight-if.patch \
+           file://simpad-switches-input.patch \
+           file://simpad-switches-input2.patch \
+           file://simpad-apm.diff;striplevel=0 \
+           file://simpad-ts-noninput.patch \
+           file://simpad-pm-updates.patch;striplevel=0 \
+           file://support-128mb-ram.patch \
+           file://mmc-spi.patch \
+           file://iw249_we17-13.diff \
+           file://iw240_we18-5.diff \
 "
 
 # apply this when we have a patch that allows building with gcc 3.x:
-# SRC_URI_append = file://gcc-3.3.patch;patch=1
-# SRC_URI_append = file://machtune-args.patch;patch=1
+# SRC_URI_append = file://gcc-3.3.patch
+# SRC_URI_append = file://machtune-args.patch
 
 S = "${WORKDIR}/linux-${KV}"
 
diff --git a/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
index 53cefb7a91..ac8d3e2c83 100644
--- a/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
@@ -13,38 +13,38 @@ COMPATIBLE_MACHINE = 'simpad'
 FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2;name=kernel \
-           file://${KV}-${VRSV}.patch;patch=1 \
-           file://${KV}-${VRSV}-${PXAV}.patch;patch=1 \
-           file://${KV}-${VRSV}-${PXAV}-${JPMV}.patch;patch=1 \
-           file://${KV}-mh1.patch;patch=1 \
-           file://sound-volume-reversed.patch;patch=1 \
-	   file://disable-pcmcia-probe.patch;patch=1 \
-           file://mkdep.patch;patch=1 \
+           file://${KV}-${VRSV}.patch \
+           file://${KV}-${VRSV}-${PXAV}.patch \
+           file://${KV}-${VRSV}-${PXAV}-${JPMV}.patch \
+           file://${KV}-mh1.patch \
+           file://sound-volume-reversed.patch \
+	   file://disable-pcmcia-probe.patch \
+           file://mkdep.patch \
            file://defconfig-${MACHINE} \
-	   http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1;name=patch \
-           file://mipv6-1.1-v${KV}.patch;patch=1 \
-           file://simpad-backlight-if.patch;patch=1 \
-           file://simpad-switches-input.patch;patch=1 \
-           file://simpad-switches-input2.patch;patch=1 \
-           file://simpad-apm.patch;patch=1 \
-           file://simpad-ts-noninput.patch;patch=1 \
-           file://simpad-pm-updates.patch;patch=1 \
-           file://support-128mb-ram.patch;patch=1 \
-           file://simpad-proc-sys-board.patch;patch=1 \
-           file://simpad-serial.patch;patch=1 \
-           file://mppe-20040216.patch;patch=1 \
-           file://sa1100-usb-tcl1.patch;patch=1 \
-           file://mmc-spi.patch;patch=1 \
-           file://iw249_we17-13.diff;patch=1 \
-           file://iw240_we18-5.diff;patch=1 \
+	   http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz;name=patch \
+           file://mipv6-1.1-v${KV}.patch \
+           file://simpad-backlight-if.patch \
+           file://simpad-switches-input.patch \
+           file://simpad-switches-input2.patch \
+           file://simpad-apm.patch \
+           file://simpad-ts-noninput.patch \
+           file://simpad-pm-updates.patch \
+           file://support-128mb-ram.patch \
+           file://simpad-proc-sys-board.patch \
+           file://simpad-serial.patch \
+           file://mppe-20040216.patch \
+           file://sa1100-usb-tcl1.patch \
+           file://mmc-spi.patch \
+           file://iw249_we17-13.diff \
+           file://iw240_we18-5.diff \
 "
 # This applies right after the jpm patch but is useless until we
 # have sa1100_udc.c
-#           file://${KV}-${VRSV}-${USBV}.patch;patch=1 \
+#           file://${KV}-${VRSV}-${USBV}.patch \
 
 # apply this when we have a patch that allows building with gcc 3.x:
-# SRC_URI_append = file://gcc-3.3.patch;patch=1
-# SRC_URI_append = file://machtune-args.patch;patch=1
+# SRC_URI_append = file://gcc-3.3.patch
+# SRC_URI_append = file://machtune-args.patch
 
 S = "${WORKDIR}/linux-${KV}"
 
diff --git a/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
index 50dea86ef5..a8e1cca561 100644
--- a/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
+++ b/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
@@ -7,44 +7,44 @@ KV = "2.4.20"
 PR = "r18"
 
 SRC_URI = "http://developer.ezaurus.com/sl_j/source/c3100/20050602/linux-c3100-20050602-rom1_01.tar.bz2;name=kernel \
-           file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \
-           file://P02-C3000-voltage_050221.patch;pnum=2;patch=1 \
-           file://P03-C3000-SIGSTOP_FIX_041207.patch;pnum=2;patch=1 \
-           file://P04-C3000-UNICON_041206.patch;pnum=2;patch=1 \
-           file://P05-C3000-TSPRESSURE_041207.patch;pnum=2;patch=1 \
-           file://P06-C3000-WRITETS_041206.patch;pnum=2;patch=1 \
-           file://P07-C3000-KBDDEV_041206.patch;pnum=2;patch=1 \
-           file://P08-rtc-mremap-mremap2nd-fix_041213.patch;pnum=2;patch=1 \
-           file://P09-ext3-isofs-fix_041216.patch;pnum=2;patch=1 \
-           file://P10-ntfs-fix_041216.patch;pnum=2;patch=1 \
-           file://P11-bluetooth-mh18_041216.patch;pnum=2;patch=1 \
-           file://P12-fbcon-fix_041219.patch;pnum=2;patch=1 \
-           file://P14-lowlatency_041221.patch;pnum=2;patch=1 \
-           file://P17-bvdd_050222.patch;pnum=2;patch=1 \
-           file://P18-detailed_battery_050309.patch;pnum=2;patch=1 \
-           file://P02++050226.patch;pnum=1;patch=1 \
+           file://P01-C3000-clockup_050221.patch;striplevel=2 \
+           file://P02-C3000-voltage_050221.patch;striplevel=2 \
+           file://P03-C3000-SIGSTOP_FIX_041207.patch;striplevel=2 \
+           file://P04-C3000-UNICON_041206.patch;striplevel=2 \
+           file://P05-C3000-TSPRESSURE_041207.patch;striplevel=2 \
+           file://P06-C3000-WRITETS_041206.patch;striplevel=2 \
+           file://P07-C3000-KBDDEV_041206.patch;striplevel=2 \
+           file://P08-rtc-mremap-mremap2nd-fix_041213.patch;striplevel=2 \
+           file://P09-ext3-isofs-fix_041216.patch;striplevel=2 \
+           file://P10-ntfs-fix_041216.patch;striplevel=2 \
+           file://P11-bluetooth-mh18_041216.patch;striplevel=2 \
+           file://P12-fbcon-fix_041219.patch;striplevel=2 \
+           file://P14-lowlatency_041221.patch;striplevel=2 \
+           file://P17-bvdd_050222.patch;striplevel=2 \
+           file://P18-detailed_battery_050309.patch;striplevel=2 \
+           file://P02++050226.patch \
            \
-           file://swap-performance.patch;patch=1 \
-           file://iw240_we15-6.diff;patch=1 \
-           file://iw241_we16-6.diff;patch=1 \
-           file://iw249_we17-13.diff;patch=1 \
-           file://iw240_we18-5.diff;patch=1 \
-           file://bluecard_cs.patch;patch=1 \
-           file://compile.patch;patch=1 \
-           file://idecs.patch;patch=1 \
-           file://logo.patch;patch=1 \
-           file://initsh.patch;patch=1 \
-           file://disable-pcmcia-probe.patch;patch=1 \
-           file://deviceinfo.patch;patch=1 \
-           file://corgi-fbcon-logo.patch;patch=1 \
-           file://corgi-default-brightness.patch;patch=1 \
-           file://1764-1.patch;patch=1 \
-           file://armdeffix.patch;patch=1 \
-           file://add-oz-release-string.patch;patch=1 \
-           file://saner-spitz-keymap.patch;patch=1 \
+           file://swap-performance.patch \
+           file://iw240_we15-6.diff \
+           file://iw241_we16-6.diff \
+           file://iw249_we17-13.diff \
+           file://iw240_we18-5.diff \
+           file://bluecard_cs.patch \
+           file://compile.patch \
+           file://idecs.patch \
+           file://logo.patch \
+           file://initsh.patch \
+           file://disable-pcmcia-probe.patch \
+           file://deviceinfo.patch \
+           file://corgi-fbcon-logo.patch \
+           file://corgi-default-brightness.patch \
+           file://1764-1.patch \
+           file://armdeffix.patch \
+           file://add-oz-release-string.patch \
+           file://saner-spitz-keymap.patch \
            file://defconfig-${MACHINE} "
 # Breaks compilation for now, needs to be fixed
-# SRC_URI += "file://CPAR050218.patch;patch=1"
+# SRC_URI += "file://CPAR050218.patch"
 
 S = "${WORKDIR}/linux"
 
diff --git a/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index 8a39e9f8ab..486cd86a5a 100644
--- a/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -11,54 +11,54 @@ SHARPV = "20031107"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2;name=kernel \
-           ftp://ftp.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1;name=patch1 \
-           ftp://source.mvista.com/pub/xscale/pxa/diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1;name=patch2 \
-           http://openzaurus.org/mirror/linux-${PV}-slc860-${SHARPV}-rom1_10.bz2;patch=1;name=patch3 \
-           file://piro.patch;patch=1 \
-           file://swap-performance.patch;patch=1 \
-           file://bluetooth-2.4.18-mh15.patch;patch=1 \
-           file://iw_handlers.w13-5.diff;patch=1 \
-           file://iw_handlers.w14-5.diff;patch=1 \
-           file://iw240_we15-6.diff;patch=1 \
-           file://iw249_we16-6.diff;patch=1 \
-           file://iw249_we17-13.diff;patch=1 \
-           file://iw240_we18-5.diff;patch=1 \
-           file://bt950_cs.patch;patch=1 \
-           file://bluecard_cs.patch;patch=1 \
-           file://sharpsl_battery.patch;patch=1 \
-           file://buffered-fbmem.patch;patch=1 \
-           file://enable-sysrq.patch;patch=1 \
-           file://compile.patch;patch=1 \
-           file://idecs.patch;patch=1 \
-           file://logo.patch;patch=1 \
-           file://initsh.patch;patch=1 \
-           file://keyboard-ctrl+alt.patch;patch=1 \
-           file://keymap-more-sane.patch;patch=1 \
-           file://mkdep.patch;patch=1 \
-           file://disable-pcmcia-probe.patch;patch=1 \
-           file://deviceinfo.patch;patch=1 \
-           file://linux-2.4.18-list_move.patch;patch=1 \
-           file://tosa_map.patch;patch=1 \
-           file://tosa_ts.patch;patch=1 \
-           file://corgi-fbcon-logo.patch;patch=1 \
-           file://corgi-default-brightness.patch;patch=1 \
-           http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1;name=patch4 \
-           file://1764-1.patch;patch=1 \
-           file://module_licence.patch;patch=1 \
-           file://ir240_sys_max_tx-2.diff;patch=1 \
-           file://ir241_qos_param-2.diff;patch=1 \
+           ftp://ftp.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;apply=yes;name=patch1 \
+           ftp://source.mvista.com/pub/xscale/pxa/diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;apply=yes;name=patch2 \
+           http://openzaurus.org/mirror/linux-${PV}-slc860-${SHARPV}-rom1_10.bz2;apply=yes;name=patch3 \
+           file://piro.patch \
+           file://swap-performance.patch \
+           file://bluetooth-2.4.18-mh15.patch \
+           file://iw_handlers.w13-5.diff \
+           file://iw_handlers.w14-5.diff \
+           file://iw240_we15-6.diff \
+           file://iw249_we16-6.diff \
+           file://iw249_we17-13.diff \
+           file://iw240_we18-5.diff \
+           file://bt950_cs.patch \
+           file://bluecard_cs.patch \
+           file://sharpsl_battery.patch \
+           file://buffered-fbmem.patch \
+           file://enable-sysrq.patch \
+           file://compile.patch \
+           file://idecs.patch \
+           file://logo.patch \
+           file://initsh.patch \
+           file://keyboard-ctrl+alt.patch \
+           file://keymap-more-sane.patch \
+           file://mkdep.patch \
+           file://disable-pcmcia-probe.patch \
+           file://deviceinfo.patch \
+           file://linux-2.4.18-list_move.patch \
+           file://tosa_map.patch \
+           file://tosa_ts.patch \
+           file://corgi-fbcon-logo.patch \
+           file://corgi-default-brightness.patch \
+           http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz;name=patch4 \
+           file://1764-1.patch \
+           file://module_licence.patch \
+           file://ir240_sys_max_tx-2.diff \
+           file://ir241_qos_param-2.diff \
            http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz;name=patch5 \
-           file://fix_tosa_apm.patch;patch=1 \
-           file://dumb-hack-for-wlan-ng.patch;patch=1 \
-           file://unb0rk-apm.patch;patch=1 \
-           file://apm_arrowkey.patch;patch=1 \
+           file://fix_tosa_apm.patch \
+           file://dumb-hack-for-wlan-ng.patch \
+           file://unb0rk-apm.patch \
+           file://apm_arrowkey.patch \
            file://defconfig-${MACHINE} "
 
-SRC_URI_append_poodle += " file://smallfonts.diff;patch=1"
-SRC_URI_append_poodle255 += " file://smallfonts.diff;patch=1"
+SRC_URI_append_poodle += " file://smallfonts.diff"
+SRC_URI_append_poodle255 += " file://smallfonts.diff"
 # apply this when we have a kernel that builds with gcc 3.x:
-# SRC_URI_append = file://machtune-args.patch;patch=1
-SRC_URI_append_tosa = " file://tosa-power-key-off.patch;patch=1"
+# SRC_URI_append = file://machtune-args.patch
+SRC_URI_append_tosa = " file://tosa-power-key-off.patch"
 
 S = "${WORKDIR}/linux"
 
diff --git a/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index ef1a8515b1..249fc6feab 100644
--- a/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -10,39 +10,39 @@ PR = "r23"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
 
 SRC_URI = "http://www.openzaurus.org/mirror/linux-sl5500-${SHARPV}-rom3_10.tar.bz2;name=kernel \
-           file://cacko.patch;patch=1 \
-           file://unb0rk-rightarrow.patch;patch=1 \
-           file://unb0rk-apm.patch;patch=1 \
-           file://battery.patch;patch=1 \
-           file://bluetooth-2.4.18-mh15.patch;patch=1 \
-           file://iw_handlers.w13-5.diff;patch=1 \
-           file://iw_handlers.w14-5.diff;patch=1 \
-           file://iw240_we15-6.diff;patch=1 \
-           file://iw249_we16-6.diff;patch=1 \
-           file://iw249_we17-13.diff;patch=1 \
-           file://iw240_we18-5.diff;patch=1 \
-           file://idecs.patch;patch=1 \
-           file://logo.patch;patch=1 \
-           file://initsh.patch;patch=1 \
-           file://keymap-more-sane.patch;patch=1 \
-           file://mkdep.patch;patch=1 \
-           file://disable-pcmcia-probe.patch;patch=1 \
-           file://linux-2.4.18-list_move.patch;patch=1 \
-           http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1;name=patch \
-           file://1764-1.patch;patch=1 \
-           file://module_licence.patch;patch=1 \
-           file://ir240_sys_max_tx-2.diff;patch=1 \
-           file://ir241_qos_param-2.diff;patch=1 \
+           file://cacko.patch \
+           file://unb0rk-rightarrow.patch \
+           file://unb0rk-apm.patch \
+           file://battery.patch \
+           file://bluetooth-2.4.18-mh15.patch \
+           file://iw_handlers.w13-5.diff \
+           file://iw_handlers.w14-5.diff \
+           file://iw240_we15-6.diff \
+           file://iw249_we16-6.diff \
+           file://iw249_we17-13.diff \
+           file://iw240_we18-5.diff \
+           file://idecs.patch \
+           file://logo.patch \
+           file://initsh.patch \
+           file://keymap-more-sane.patch \
+           file://mkdep.patch \
+           file://disable-pcmcia-probe.patch \
+           file://linux-2.4.18-list_move.patch \
+           http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz;name=patch \
+           file://1764-1.patch \
+           file://module_licence.patch \
+           file://ir240_sys_max_tx-2.diff \
+           file://ir241_qos_param-2.diff \
            file://defconfig-${MACHINE} \
 	   "
 
 # that patch allow to use buzzer as sound device but it removes alarms,
 # touchclicks etc so it is removed until be fixed
-#           file://sound-2.4.18r2.patch;patch=1
+#           file://sound-2.4.18r2.patch
 
 # apply this when we have a patch that allows building with gcc 3.x:
-# SRC_URI_append = file://gcc-3.3.patch;patch=1
-# SRC_URI_append = file://machtune-args.patch;patch=1
+# SRC_URI_append = file://gcc-3.3.patch
+# SRC_URI_append = file://machtune-args.patch
 
 S = "${WORKDIR}/linux"
 
diff --git a/recipes/linux/triton-kernel_2.6.11.bb b/recipes/linux/triton-kernel_2.6.11.bb
index 9ba8dfacaf..110384fc12 100644
--- a/recipes/linux/triton-kernel_2.6.11.bb
+++ b/recipes/linux/triton-kernel_2.6.11.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2"
 PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${PV}/${PV}-mm2/${PV}-mm2.bz2;patch=1;name=patch \
-		   file://patch-2.6.11-mm2-karo9.bz2;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${PV}/${PV}-mm2/${PV}-mm2.bz2;apply=yes;name=patch \
+		   file://patch-2.6.11-mm2-karo9.bz2;apply=yes \
 		   file://defconfig"
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/recipes/lisa/lisa_0.2.2.bb b/recipes/lisa/lisa_0.2.2.bb
index 8f12c77721..165b03cc94 100644
--- a/recipes/lisa/lisa_0.2.2.bb
+++ b/recipes/lisa/lisa_0.2.2.bb
@@ -4,8 +4,8 @@ like the network neighbourhood under windows, but more and \
 only relying on the TCP/IP protocol stack."
 
 SRC_URI = "http://lisa-home.sourceforge.net/src/lisa-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-	   file://head-n.patch;patch=1"
+	   file://configure.patch \
+	   file://head-n.patch"
 LICENSE = "GPL"
 inherit autotools
 
diff --git a/recipes/live555/live555_20100409.bb b/recipes/live555/live555_20100409.bb
new file mode 100644
index 0000000000..7f3aab4a81
--- /dev/null
+++ b/recipes/live555/live555_20100409.bb
@@ -0,0 +1,55 @@
+# live555 OE build file
+# Copyright (C) 2005, Koninklijke Philips Electronics NV.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "LIVE555 Streaming Media libraries"
+HOMEPAGE = "http://live.com/"
+LICENSE = "LGPL"
+SECTION = "devel"
+
+PR = "r0"
+
+SRC_URI = "http://www.live555.com/liveMedia/public/live.2010.04.09.tar.gz \
+           file://config.linux-cross"
+
+S = "${WORKDIR}/live"
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_configure() {
+	cp ${WORKDIR}/config.linux-cross .
+	./genMakefiles linux-cross
+}
+
+do_compile() {
+	make
+}
+
+do_install() {
+	install -d ${D}${includedir}/BasicUsageEnvironment
+	install -d ${D}${includedir}/groupsock
+	install -d ${D}${includedir}/liveMedia
+	install -d ${D}${includedir}/UsageEnvironment
+	install -d ${D}${libdir}
+	cp -a ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/
+	cp -a ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/
+	cp -a ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/
+	cp -a ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/
+	cp -a ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/
+	# Find all the headers
+	for i in $(find . -name "*.hh") $(find . -name "*.h") ; do
+		install ${i} ${D}${includedir}
+	done
+	cp ${S}/*/*.a ${D}${libdir}
+	install -d ${D}${bindir}
+	for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2AudioVideoToDarwin testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testMPEG4VideoToDarwin testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do
+		install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/
+	done
+}
+
+SRC_URI[md5sum] = "7f56f54c1c4697764c6e88282e353e81"
+SRC_URI[sha256sum] = "e9539f59058cb885f28ac48cdce285f8a0fe567c4aa889c2ac3bd0638b007944"
+
+PACKAGES =+ " live555-openrtsp live555-playsip"
+FILES_${PN} = "${bindir}/sapWatch ${bindir}/testMPEG1or2AudioVideoToDarwin ${bindir}/testMPEG1or2ProgramToTransportStream ${bindir}/testMPEG1or2Splitter ${bindir}/testMPEG1or2VideoReceiver ${bindir}/testMPEG2TransportStreamTrickPlay ${bindir}/testMPEG4VideoToDarwin ${bindir}/testOnDemandRTSPServer ${bindir}/testRelay ${bindir}/testAMRAudioStreamer ${bindir}/testDVVideoStreamer ${bindir}/testMP3Receiver ${bindir}/testMP3Streamer ${bindir}/testMPEG1or2AudioVideoStreamer ${bindir}/testMPEG1or2VideoStreamer ${bindir}/testMPEG2TransportStreamer ${bindir}/testMPEG4VideoStreamer ${bindir}/testWAVAudioStreamer ${bindir}/vobStreamer ${bindir}/MPEG2TransportStreamIndexer"
+FILES_live555-openrtsp = "${bindir}/openRTSP"
+FILES_live555-playsip = "${bindir}/playSIP"
diff --git a/recipes/lksctp-tools/lksctp-tools.inc b/recipes/lksctp-tools/lksctp-tools.inc
new file mode 100644
index 0000000000..02ec988499
--- /dev/null
+++ b/recipes/lksctp-tools/lksctp-tools.inc
@@ -0,0 +1,28 @@
+DESCRIPTION = "The Linux Kernel Stream Control Transmission Protocol (lksctp) project"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPLv2"
+
+S = "${WORKDIR}/${BPN}-${PV}"
+
+INC_PR = "r0"
+
+BBCLASSEXTEND = "native"
+
+inherit autotools pkgconfig binconfig
+
+export LDFLAGS += "-ldl"
+
+do_install_append_virtclass-native() {
+	:
+}
+
+DEBIANNAME_${PN} = "lksctp"
+
+PACKAGES =+ "${PN}-tools"
+FILES_${PN} = "${libexecdir}/* ${libdir}/lib*${SOLIBS} \
+            ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+            ${base_libdir}/*${SOLIBS}"
+
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN}-utils = ""
diff --git a/recipes/lksctp-tools/lksctp-tools_1.0.7.bb b/recipes/lksctp-tools/lksctp-tools_1.0.7.bb
new file mode 100644
index 0000000000..1d4faa332b
--- /dev/null
+++ b/recipes/lksctp-tools/lksctp-tools_1.0.7.bb
@@ -0,0 +1,7 @@
+require lksctp-tools.inc
+PR = "${INC_PR}.0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lksctp/lksctp-tools-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "047562b40537eb3be5d5ec3ae0a2198b"
+SRC_URI[sha256sum] = "e920e89d110cff9847f1d86a1d7a23a156a8abcc9e65a35655d687fd08377595"
diff --git a/recipes/llvm/llvm-native.inc b/recipes/llvm/llvm-native.inc
index ab1ce56000..15ce0b731c 100644
--- a/recipes/llvm/llvm-native.inc
+++ b/recipes/llvm/llvm-native.inc
@@ -1,6 +1,6 @@
 require llvm.inc
 
-DEPENDS = "llvm-common-native cmake-native"
+DEPENDS = "llvm-common-native cmake-native binutils-cross perl-native"
 
 inherit native
 
@@ -14,13 +14,16 @@ EXTRA_OECMAKE = "\
   -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \
   -DCMAKE_RANLIB:FILEPATH=${RANLIB} \
   -DCMAKE_STRIP:FILEPATH=${STRIP} \
+  -DNM_PATH:FILEPATH=${NM} \
 "
 
 do_stage() {
+  cd ${OECMAKE_BUILDPATH}
+
   llvm_stage
 
   install -d ${STAGING_BINDIR}
-	install -m 0755 build/bin/llvm-config${LLVM_RELEASE} ${STAGING_BINDIR}
+  install -m 0755 bin/llvm-config${LLVM_RELEASE} ${STAGING_BINDIR}
 }
 
 
diff --git a/recipes/llvm/llvm.inc b/recipes/llvm/llvm.inc
index 7e6bacb3e7..3c22318e33 100644
--- a/recipes/llvm/llvm.inc
+++ b/recipes/llvm/llvm.inc
@@ -44,7 +44,6 @@ LLVM_RELEASE = "${PV}"
 # llvm *must* be built out of tree
 OECMAKE_SOURCEPATH = ".."
 OECMAKE_BUILDPATH = "build"
-EXTRA_OEMAKE = "-C build"
 EXTRA_OECMAKE = "\
   -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm${LLVM_RELEASE}/tblgen \
   -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \
@@ -54,6 +53,7 @@ EXTRA_OECMAKE = "\
   -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \
   -DCMAKE_RANLIB:FILEPATH=${RANLIB} \
   -DCMAKE_STRIP:FILEPATH=${STRIP} \
+  -DNM_PATH:FILEPATH=${NM} \
   -DLLVM_ENABLE_PIC:BOOL=ON \
 "
 
@@ -63,7 +63,7 @@ llvm_stage() {
 
 	# Create our custom target directories
 	install -d ${STAGING_BINDIR}/llvm${LLVM_RELEASE}
-  install -d ${STAGING_INCDIR}/llvm${LLVM_RELEASE}
+    install -d ${STAGING_INCDIR}/llvm${LLVM_RELEASE}
 	install -d ${STAGING_LIBDIR}/llvm${LLVM_RELEASE}
 
 	#	Move headers into their own directory
@@ -84,7 +84,7 @@ llvm_stage() {
     install {} ${STAGING_BINDIR}/llvm${LLVM_RELEASE} \;
 
 	# LLVM does not install this by default.
-  install build/bin/tblgen ${STAGING_BINDIR}/llvm${LLVM_RELEASE}
+  install bin/tblgen ${STAGING_BINDIR}/llvm${LLVM_RELEASE}
 
   # Fix the paths in the config script to make it find the binaries and
   # library files. Doing so allows 3rd party configure scripts working
@@ -93,14 +93,16 @@ llvm_stage() {
       -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \
       -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \
       -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \
-      build/bin/llvm-config > build/bin/llvm-config${LLVM_RELEASE}
+      bin/llvm-config > bin/llvm-config${LLVM_RELEASE}
 }
 
 do_stage() {
+  cd ${OECMAKE_BUILDPATH}
+
   llvm_stage
 
   install -d ${STAGING_BINDIR_CROSS}
-	install -m 0755 build/bin/llvm-config${LLVM_RELEASE} ${STAGING_BINDIR_CROSS}
+  install -m 0755 bin/llvm-config${LLVM_RELEASE} ${STAGING_BINDIR_CROSS}
 }
 
 # Retrieve the target in a way that is compatible to the arch
diff --git a/recipes/llvm/llvm2.5-native_2.5.bb b/recipes/llvm/llvm2.5-native_2.5.bb
index f6ed05995b..416e0683b7 100644
--- a/recipes/llvm/llvm2.5-native_2.5.bb
+++ b/recipes/llvm/llvm2.5-native_2.5.bb
@@ -1,6 +1,6 @@
 require llvm-native.inc
 
-SRC_URI += "file://fix-build.patch;patch=1"
+SRC_URI += "file://fix-build.patch"
 
 
 SRC_URI[md5sum] = "55df2ea8665c8094ad2ef85187b9fc74"
diff --git a/recipes/llvm/llvm2.5_2.5.bb b/recipes/llvm/llvm2.5_2.5.bb
index 02094ac98d..301aa47365 100644
--- a/recipes/llvm/llvm2.5_2.5.bb
+++ b/recipes/llvm/llvm2.5_2.5.bb
@@ -1,6 +1,6 @@
 require llvm.inc
 
-SRC_URI += "file://fix-build.patch;patch=1"
+SRC_URI += "file://fix-build.patch"
 
 
 SRC_URI[md5sum] = "55df2ea8665c8094ad2ef85187b9fc74"
diff --git a/recipes/llvm/llvm2.6-native_2.6.bb b/recipes/llvm/llvm2.6-native_2.6.bb
index fa28970680..dec132a8c1 100644
--- a/recipes/llvm/llvm2.6-native_2.6.bb
+++ b/recipes/llvm/llvm2.6-native_2.6.bb
@@ -3,8 +3,8 @@ require llvm-native.inc
 PR = "r0"
 
 SRC_URI += "\
-  file://fix-build.patch;patch=1 \
-  file://llvm-debugonly-zeroormore.patch;patch=1;pnum=0 \
+  file://fix-build.patch \
+  file://llvm-debugonly-zeroormore.patch;striplevel=0 \
 "
 
 LLVM_RELEASE = "2.6"
diff --git a/recipes/llvm/llvm2.6_2.6.bb b/recipes/llvm/llvm2.6_2.6.bb
index c476f34bcb..35aa38fe76 100644
--- a/recipes/llvm/llvm2.6_2.6.bb
+++ b/recipes/llvm/llvm2.6_2.6.bb
@@ -5,9 +5,9 @@ PR = "r1"
 DEPENDS = "llvm-common llvm2.6-native"
 
 SRC_URI += "\
-  file://fix-build.patch;patch=1 \
-  file://llvm-debugonly-zeroormore.patch;patch=1;pnum=0 \
-  file://BX_to_BLX.patch;patch=1 \
+  file://fix-build.patch \
+  file://llvm-debugonly-zeroormore.patch;striplevel=0 \
+  file://BX_to_BLX.patch \
 "
 
 LLVM_RELEASE = "2.6"
diff --git a/recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb b/recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb
deleted file mode 100644
index ada81c625d..0000000000
--- a/recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require llvm-native.inc
-
-SRCREV = "83459"
-
-PV = "2.6+svnr${SRCPV}"
-
-PR = "r0"
-
-SRC_URI = "\
-  svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \
-  file://llvm-debugonly-zeroormore.patch;patch=1 \
-"
-
-S = "${WORKDIR}/trunk"
-
-LLVM_RELEASE = "2.7"
diff --git a/recipes/llvm/llvm2.7-native_2.7.bb b/recipes/llvm/llvm2.7-native_2.7.bb
new file mode 100644
index 0000000000..e438702d9a
--- /dev/null
+++ b/recipes/llvm/llvm2.7-native_2.7.bb
@@ -0,0 +1,12 @@
+require llvm-native.inc
+
+PR = "r0"
+
+SRC_URI = "\
+  http://llvm.org/releases/${PV}/llvm-${PV}.tgz \
+"
+
+LLVM_RELEASE = "2.7"
+
+SRC_URI[md5sum] = "ac322661f20e7d6c810b1869f886ad9b"
+SRC_URI[sha256sum] = "99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5"
diff --git a/recipes/llvm/llvm2.7/BX_to_BLX.patch b/recipes/llvm/llvm2.7/BX_to_BLX.patch
index 7cf36766af..2e34c623b4 100644
--- a/recipes/llvm/llvm2.7/BX_to_BLX.patch
+++ b/recipes/llvm/llvm2.7/BX_to_BLX.patch
@@ -1,11 +1,11 @@
 Index: llvm/lib/Target/ARM/ARMInstrInfo.td
 ===================================================================
---- llvm.orig/lib/Target/ARM/ARMInstrInfo.td	2009-10-06 12:35:26.000000000 +0000
-+++ llvm/lib/Target/ARM/ARMInstrInfo.td	2009-10-06 12:36:03.000000000 +0000
-@@ -645,7 +645,7 @@
-                   IIC_Br, "mov lr, pc\n\tbx $func",
-                   [(ARMcall_nolink GPR:$func)]>,
-            Requires<[IsARM, IsNotDarwin]> {
+--- llvm.orig/lib/Target/ARM/ARMInstrInfo.td	2010-03-08 16:07:25.000000000 +0100
++++ llvm/lib/Target/ARM/ARMInstrInfo.td	2010-03-08 16:10:21.000000000 +0100
+@@ -942,7 +942,7 @@
+                   IIC_Br, "mov\tlr, pc\n\tbx\t$func",
+                   [(ARMcall_nolink tGPR:$func)]>,
+            Requires<[IsARM, HasV4T, IsNotDarwin]> {
 -    let Inst{7-4}   = 0b0001;
 +    let Inst{7-4}   = 0b0011;
      let Inst{19-8}  = 0b111111111111;
diff --git a/recipes/llvm/llvm2.7/llvm-debugonly-zeroormore.patch b/recipes/llvm/llvm2.7/llvm-debugonly-zeroormore.patch
deleted file mode 100644
index ee32a7966c..0000000000
--- a/recipes/llvm/llvm2.7/llvm-debugonly-zeroormore.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/lib/Support/Debug.cpp
-===================================================================
---- trunk.orig/lib/Support/Debug.cpp	2009-09-17 10:41:42.000000000 +0200
-+++ trunk/lib/Support/Debug.cpp	2009-09-17 10:42:55.000000000 +0200
-@@ -48,7 +48,7 @@
- static cl::opt<DebugOnlyOpt, true, cl::parser<std::string> >
- DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"),
-           cl::Hidden, cl::value_desc("debug string"),
--          cl::location(DebugOnlyOptLoc), cl::ValueRequired);
-+          cl::location(DebugOnlyOptLoc), cl::ValueRequired, cl::ZeroOrMore);
- 
- // isCurrentDebugType - Return true if the specified string is the debug type
- // specified on the command line, or if none was specified on the command line
diff --git a/recipes/llvm/llvm2.7_2.6+svnr20091007.bb b/recipes/llvm/llvm2.7_2.7.bb
index 142e15ea4f..b72581c7e3 100644
--- a/recipes/llvm/llvm2.7_2.6+svnr20091007.bb
+++ b/recipes/llvm/llvm2.7_2.7.bb
@@ -1,17 +1,12 @@
 require llvm.inc
 
-SRCREV = "83459"
-
-PV = "2.6+svnr${SRCPV}"
-
 PR = "r0"
 
 DEPENDS = "llvm-common llvm2.7-native"
 
 SRC_URI = "\
-  svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \
-  file://llvm-debugonly-zeroormore.patch;patch=1 \
-  file://BX_to_BLX.patch;patch=1 \
+  http://llvm.org/releases/${PV}/llvm-${PV}.tgz \
+  file://BX_to_BLX.patch \
   "
 
 EXTRA_OECMAKE += "\
@@ -20,6 +15,7 @@ EXTRA_OECMAKE += "\
         -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
 	"
 
-S = "${WORKDIR}/trunk"
-
 LLVM_RELEASE = "2.7"
+
+SRC_URI[md5sum] = "ac322661f20e7d6c810b1869f886ad9b"
+SRC_URI[sha256sum] = "99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5"
diff --git a/recipes/lm_sensors/lmsensors-apps_2.10.1.bb b/recipes/lm_sensors/lmsensors-apps_2.10.1.bb
index fb0b805fce..a397653fe2 100644
--- a/recipes/lm_sensors/lmsensors-apps_2.10.1.bb
+++ b/recipes/lm_sensors/lmsensors-apps_2.10.1.bb
@@ -5,10 +5,10 @@ LICENSE = "GPL"
 PR = "r3"
 
 SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.gz;name=archive \
-           file://prefix-fix.patch;patch=1 \
-           file://add-sysfs-ldflags.patch;patch=1"
+           file://prefix-fix.patch \
+           file://add-sysfs-ldflags.patch"
 
-SRC_URI_append_uclibc = "file://iconv.patch;patch=1"
+SRC_URI_append_uclibc = "file://iconv.patch"
 SRC_URI[archive.md5sum] = "cdc857b78e813b88cbf8be92441aa299"
 SRC_URI[archive.sha256sum] = "a332cacfa9d0eed6e9158c394db714e536f38c27451d7df08b9634952118fa1b"
 
diff --git a/recipes/lm_sensors/lmsensors-apps_2.10.8.bb b/recipes/lm_sensors/lmsensors-apps_2.10.8.bb
index 6411e33ec5..dcc33ac3ad 100644
--- a/recipes/lm_sensors/lmsensors-apps_2.10.8.bb
+++ b/recipes/lm_sensors/lmsensors-apps_2.10.8.bb
@@ -5,10 +5,10 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.gz \
-           file://prefix-fix.patch;patch=1 \
-           file://add-sysfs-ldflags.patch;patch=1"
+           file://prefix-fix.patch \
+           file://add-sysfs-ldflags.patch"
 
-SRC_URI_append_uclibc = "file://iconv.patch;patch=1"
+SRC_URI_append_uclibc = "file://iconv.patch"
 
 S = "${WORKDIR}/lm_sensors-${PV}"
 
diff --git a/recipes/lmbench/lmbench_2.0.4.bb b/recipes/lmbench/lmbench_2.0.4.bb
index 81b0a15b13..bb852abd2d 100644
--- a/recipes/lmbench/lmbench_2.0.4.bb
+++ b/recipes/lmbench/lmbench_2.0.4.bb
@@ -5,8 +5,8 @@ RDEPENDS = "debianutils"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
-	   file://debian.patch;patch=1 \
-	   file://exe.patch;patch=1 \
+	   file://debian.patch \
+	   file://exe.patch \
 	   file://lmbench-run"
 S = "${WORKDIR}/lmbench-${PV}"
 
diff --git a/recipes/lmbench/lmbench_2.5.bb b/recipes/lmbench/lmbench_2.5.bb
index 7b097d8498..3692dafe92 100644
--- a/recipes/lmbench/lmbench_2.5.bb
+++ b/recipes/lmbench/lmbench_2.5.bb
@@ -5,7 +5,7 @@ RDEPENDS = "debianutils"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
-	   file://build.patch;patch=1 \
+	   file://build.patch \
 	   file://lmbench-run"
 S = "${WORKDIR}/lmbench-${PV}"
 
diff --git a/recipes/log4cxx/log4cxx_0.9.7.bb b/recipes/log4cxx/log4cxx_0.9.7.bb
index b1f9805c42..c014d51954 100644
--- a/recipes/log4cxx/log4cxx_0.9.7.bb
+++ b/recipes/log4cxx/log4cxx_0.9.7.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://logging.apache.org/log4cxx/"
 PR = "r1"
 
 SRC_URI = "http://archive.apache.org/dist/logging/log4cxx/log4cxx-0.9.7.tar.gz \
-          file://log4cxx097.patch;patch=1"
+          file://log4cxx097.patch"
 
 #build this:
 S = "${WORKDIR}/${PN}-${PV}"
diff --git a/recipes/logic-analyzer/logic-analyzer_0.8.bb b/recipes/logic-analyzer/logic-analyzer_0.8.bb
index 9815b44602..4c4011cbb7 100644
--- a/recipes/logic-analyzer/logic-analyzer_0.8.bb
+++ b/recipes/logic-analyzer/logic-analyzer_0.8.bb
@@ -11,9 +11,9 @@ RDEPENDS = "java2-runtime classpath-awt librxtx-java"
 
 SRC_URI = "\
     http://sump.org/projects/analyzer/downloads/la-src-${PV}.tar.bz2 \
-    file://cp-run-fix.patch;patch=1 \
-    file://client-makefile.patch;patch=1 \
-    file://scrolling-capture-dialog.patch;patch=1 \
+    file://cp-run-fix.patch \
+    file://client-makefile.patch \
+    file://scrolling-capture-dialog.patch \
     "
 
 S = "${WORKDIR}/LogicAnalyzer"
diff --git a/recipes/logrotate/logrotate_3.7.1.bb b/recipes/logrotate/logrotate_3.7.1.bb
index dcac5fd8e0..cc57b909eb 100644
--- a/recipes/logrotate/logrotate_3.7.1.bb
+++ b/recipes/logrotate/logrotate_3.7.1.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "http://ftp.debian.org/debian/pool/main/l/logrotate/logrotate_${PV}.orig.tar.gz \
-	   file://logrotate-3.7.1.patch;patch=1 \
+	   file://logrotate-3.7.1.patch \
            file://logrotate.conf"
 
 CFLAGS_prepend  += "-I${STAGING_INCDIR} "
diff --git a/recipes/loudmouth/loudmouth_1.4.3.bb b/recipes/loudmouth/loudmouth_1.4.3.bb
index 72ce1a9c7a..b0627b44ad 100644
--- a/recipes/loudmouth/loudmouth_1.4.3.bb
+++ b/recipes/loudmouth/loudmouth_1.4.3.bb
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 gnutls check"
 PR = "r1"
 
 SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.gz \
-           file://04-use-pkg-config-for-gnutls.patch;patch=1" 
+           file://04-use-pkg-config-for-gnutls.patch" 
 
 inherit autotools pkgconfig
 
diff --git a/recipes/lrzsz/lrzsz_0.12.20.bb b/recipes/lrzsz/lrzsz_0.12.20.bb
index 4e3de0e63b..4a4e358d58 100644
--- a/recipes/lrzsz/lrzsz_0.12.20.bb
+++ b/recipes/lrzsz/lrzsz_0.12.20.bb
@@ -6,9 +6,9 @@ DEPENDS = ""
 PR = "r4"
 
 SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
-	   file://autotools.patch;patch=1 \
-	   file://makefile.patch;patch=1 \
-	   file://gettext.patch;patch=1"
+	   file://autotools.patch \
+	   file://makefile.patch \
+	   file://gettext.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/ltp/ltp_20070228.bb b/recipes/ltp/ltp_20070228.bb
index 4b7078f436..5a4e78b53c 100644
--- a/recipes/ltp/ltp_20070228.bb
+++ b/recipes/ltp/ltp_20070228.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 SECTION = "console/utils"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.tgz \
-           file://cross-compile.patch;patch=1 \
-           file://runltp-path.patch;patch=1 \
+           file://cross-compile.patch \
+           file://runltp-path.patch \
            file://ltp-run"
 
 S = "${WORKDIR}/ltp-full-${PV}"
diff --git a/recipes/ltp/ltp_20080229.bb b/recipes/ltp/ltp_20080229.bb
index 497b9c743c..b09c5016a5 100644
--- a/recipes/ltp/ltp_20080229.bb
+++ b/recipes/ltp/ltp_20080229.bb
@@ -4,11 +4,11 @@ LICENSE = "GPL"
 SECTION = "console/utils"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.tgz \
-           file://cross-compile.patch;patch=1 \
-           file://runltp-path.patch;patch=1 \
+           file://cross-compile.patch \
+           file://runltp-path.patch \
            file://ltp-run \
-           file://posix_shell_compat.patch;patch=1 \
-           file://ballista.patch;patch=1"
+           file://posix_shell_compat.patch \
+           file://ballista.patch"
 
 S = "${WORKDIR}/ltp-full-${PV}"
 
diff --git a/recipes/ltp/ltp_20090131.bb b/recipes/ltp/ltp_20090131.bb
index 0ea417dbed..5494c041dd 100644
--- a/recipes/ltp/ltp_20090131.bb
+++ b/recipes/ltp/ltp_20090131.bb
@@ -8,17 +8,17 @@ PR = "r4"
 inherit autotools
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.tgz \
-           file://cross-compile.patch;patch=1 \
-           file://runltp-path.patch;patch=1 \
-           file://fix-tcore_patch_test_suites.patch;patch=1 \
-           file://no-IDcheck.patch;patch=1 \
-           file://no_hyperthreading_tests.patch;patch=1 \
-           file://syscalls.patch;patch=1"
+           file://cross-compile.patch \
+           file://runltp-path.patch \
+           file://fix-tcore_patch_test_suites.patch \
+           file://no-IDcheck.patch \
+           file://no_hyperthreading_tests.patch \
+           file://syscalls.patch"
 
-SRC_URI_append_mips += "file://no_epoll_create2.patch;patch=1"
-SRC_URI_append_mipsel += "file://no_epoll_create2.patch;patch=1"
-SRC_URI_append_arm += "file://no_epoll_create2.patch;patch=1"
-SRC_URI_append_armeb += "file://no_epoll_create2.patch;patch=1"
+SRC_URI_append_mips += "file://no_epoll_create2.patch"
+SRC_URI_append_mipsel += "file://no_epoll_create2.patch"
+SRC_URI_append_arm += "file://no_epoll_create2.patch"
+SRC_URI_append_armeb += "file://no_epoll_create2.patch"
 
 S = "${WORKDIR}/ltp-full-${PV}"
 
diff --git a/recipes/ltrace/ltrace_0.5.3.bb b/recipes/ltrace/ltrace_0.5.3.bb
index 7e2ddb1cd4..eab47eb5da 100644
--- a/recipes/ltrace/ltrace_0.5.3.bb
+++ b/recipes/ltrace/ltrace_0.5.3.bb
@@ -6,12 +6,12 @@ LICENSE = "GPLv2"
 
 SRC_URI = "\
   ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz;name=archive \
-  ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.diff.gz;patch=1;name=patch \
-  file://add-sysdep.patch;patch=1 \
-  file://ltrace-compile.patch;patch=1 \
-  file://ltrace-mips-remove-CP.patch;patch=1 \
-  file://ltrace-mips.patch;patch=1 \
-  file://ltrace-ppc.patch;patch=1 \
+  ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.diff.gz;name=patch \
+  file://add-sysdep.patch \
+  file://ltrace-compile.patch \
+  file://ltrace-mips-remove-CP.patch \
+  file://ltrace-mips.patch \
+  file://ltrace-ppc.patch \
 "
 inherit autotools
 
diff --git a/recipes/lua/lua-gtk2_0.3.bb b/recipes/lua/lua-gtk2_0.3.bb
index 177d92d8e5..268398c7db 100644
--- a/recipes/lua/lua-gtk2_0.3.bb
+++ b/recipes/lua/lua-gtk2_0.3.bb
@@ -8,7 +8,7 @@ RDEPENDS = "lua"
 inherit gpe
 
 SRC_URI = "http://luaforge.net/frs/download.php/989/${P}.tar.gz \
-	file://lua-gtk2-0.3_fixbuild.patch;patch=1"
+	file://lua-gtk2-0.3_fixbuild.patch"
 
 FILES_${PN} =  "${datadir}/lua   ${libdir}/lua50"
 
diff --git a/recipes/lua/lua_5.0.2.bb b/recipes/lua/lua_5.0.2.bb
index dc4f456afd..06efdc0528 100644
--- a/recipes/lua/lua_5.0.2.bb
+++ b/recipes/lua/lua_5.0.2.bb
@@ -3,10 +3,10 @@ require lua.inc
 DEPENDS += "readline"
 PR = "r5"
 SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
-	   file://debian.patch;patch=1 \
-	   file://make.patch;patch=1 \
-	   file://advanced-readline.patch;patch=1"
-#	   http://lua-users.org/files/wiki_insecure/power_patches/5.0/advanced-readline.patch;patch=1"
+	   file://debian.patch \
+	   file://make.patch \
+	   file://advanced-readline.patch"
+#	   http://lua-users.org/files/wiki_insecure/power_patches/5.0/advanced-readline.patch"
 S = "${WORKDIR}/lua-${PV}"
 FILESPATH = "${FILE_DIRNAME}/lua-${PV}:${FILE_DIRNAME}/lua:${FILE_DIRNAME}/files"
 
diff --git a/recipes/lvm2/lvm2_2.01.15.bb b/recipes/lvm2/lvm2_2.01.15.bb
index e83ed1e4de..d66e355b27 100644
--- a/recipes/lvm2/lvm2_2.01.15.bb
+++ b/recipes/lvm2/lvm2_2.01.15.bb
@@ -7,7 +7,7 @@ DEPENDS = "device-mapper"
 S = "${WORKDIR}/LVM2.${PV}"
 
 SRC_URI = "ftp://sources.redhat.com/pub/lvm2/LVM2.${PV}.tgz \
-           file://crosscompile_fix.patch;patch=1"
+           file://crosscompile_fix.patch"
 
 # Unset user/group to unbreak install.
 EXTRA_OECONF = "--with-user= --with-group= --disable-o_direct"
diff --git a/recipes/lxde/lxde-common_0.5.0.bb b/recipes/lxde/lxde-common_0.5.0.bb
new file mode 100644
index 0000000000..32c49dd261
--- /dev/null
+++ b/recipes/lxde/lxde-common_0.5.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "LXDE Common Files"
+SECTION = "x11"
+DEPENDS = ""
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "23606ab3d6e1039386d62a4b68b4ffc6"
+SRC_URI[sha256sum] = "db427817070172be349709604944ba7024ac56e5c87f687b7c3f97be58a1e80a"
+
+inherit autotools update-alternatives
+
+PACKAGES += "lxde-icon-theme"
+FILES_${PN} += "${datadir}/lxde/ ${datadir}/lxpanel ${datadir}/xsessions"
+FILES_lxde-icon-theme = "${datadir}/icons"
+
+ALTERNATIVE_PATH = "${bindir}/startlxde"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "15"
+
diff --git a/recipes/lxde/lxmenu-data_0.1.1.bb b/recipes/lxde/lxmenu-data_0.1.1.bb
new file mode 100644
index 0000000000..4b6364a3fe
--- /dev/null
+++ b/recipes/lxde/lxmenu-data_0.1.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "LXDE Panel"
+SECTION = "x11"
+DEPENDS = ""
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "cee3181dd22088f3db0e99ffbedc986d"
+SRC_URI[sha256sum] = "c665d804ac25a6c3f2ee76d0ebdc6cc8c5c37895aa44f5ef88c4024e98cbdf4d"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}/desktop-directories/"
+
diff --git a/recipes/lxde/lxpanel_0.5.5.bb b/recipes/lxde/lxpanel_0.5.5.bb
new file mode 100644
index 0000000000..e3747ae193
--- /dev/null
+++ b/recipes/lxde/lxpanel_0.5.5.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "LXDE Panel"
+SECTION = "x11"
+DEPENDS = "menu-cache"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "6162b7e8d912a41f9c075fe982370bfb"
+SRC_URI[sha256sum] = "729c3dc52e343fe15dfde40475875c2b3670b3b37958c6c1e4c936242cdc2e9b"
+
+inherit autotools
+
+RDEPENDS_${PN} = "lxmenu-data menu-cache"
+FILES_${PN}-dbg += "${libdir}/lxpanel/plugins/.debug"
+
diff --git a/recipes/lxde/lxsession_0.4.4.bb b/recipes/lxde/lxsession_0.4.4.bb
new file mode 100644
index 0000000000..f1d4f85ac1
--- /dev/null
+++ b/recipes/lxde/lxsession_0.4.4.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "LXDE Session"
+SECTION = "x11"
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "9d433e1219eac07862c0d725ab58444f"
+SRC_URI[sha256sum] = "5d9304697fbc872f34e60728d046b10a0f41322099be828bae461b6b9ab617f8"
+
+inherit autotools
+
+RPROVIDES_${PN} = "lxsession-lite"
+FILES_${PN} += "${datadir}/lxsession"
+
diff --git a/recipes/lxde/menu-cache_0.3.2.bb b/recipes/lxde/menu-cache_0.3.2.bb
new file mode 100644
index 0000000000..a51d393de9
--- /dev/null
+++ b/recipes/lxde/menu-cache_0.3.2.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "LXDE menucache"
+SECTION = "x11"
+LICENSE = "GPLv2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "ac4a9ea77db68d3db3f9f53cc75af66a"
+SRC_URI[sha256sum] = "6b7c1627b5102d8301a8a3e845f673a7181a71dde32f6455abf22d03e392b89f"
+
+inherit autotools
diff --git a/recipes/lxt/lxt_1.0.bb b/recipes/lxt/lxt_1.0.bb
index c59056c126..c7a4cf5fb1 100644
--- a/recipes/lxt/lxt_1.0.bb
+++ b/recipes/lxt/lxt_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "ncurses"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/lxt-1.0"
 
 SRC_URI = "http://www.xtreefanpage.org/download/lxt-1.0.tgz \
-	   file://lxt.patch;patch=1"
+	   file://lxt.patch"
 S = "${WORKDIR}/lxt"
 
 do_install() {
diff --git a/recipes/lyx/lyx_1.6.1.bb b/recipes/lyx/lyx_1.6.1.bb
index d29cfdb973..9c4ac08e6d 100644
--- a/recipes/lyx/lyx_1.6.1.bb
+++ b/recipes/lyx/lyx_1.6.1.bb
@@ -9,7 +9,7 @@ PR = "r0"
 
 SRC_URI = "\
   ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-${PV}.tar.bz2 \
-  file://no-session-manager.patch;patch=1 \
+  file://no-session-manager.patch \
 "
 
 inherit qt4x11 autotools
diff --git a/recipes/lyx/lyx_1.6.4.1.bb b/recipes/lyx/lyx_1.6.4.1.bb
index 1dd007e231..885293fb51 100644
--- a/recipes/lyx/lyx_1.6.4.1.bb
+++ b/recipes/lyx/lyx_1.6.4.1.bb
@@ -8,8 +8,8 @@ RDEPENDS = "python-shell python-textutils"
 
 SRC_URI = "\
   ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-${PV}.tar.bz2 \
-  file://no-session-manager.patch;patch=1 \
-  file://qt4tools-detect.diff;patch=1 \
+  file://no-session-manager.patch \
+  file://qt4tools-detect.diff \
 "
 
 inherit qt4x11 autotools
diff --git a/recipes/lzma/lzma.inc b/recipes/lzma/lzma.inc
index fb34e0baac..1c8eba3ebc 100644
--- a/recipes/lzma/lzma.inc
+++ b/recipes/lzma/lzma.inc
@@ -5,10 +5,10 @@ DEPENDS = "zlib"
 INC_PR = "r4"
 
 SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@bb.data.getVar('PV',d,1).replace('.','')}.tar.bz2 \
-           file://001-large_files.patch;patch=1 \
-           file://002-lzmp.patch;patch=1 \
-           file://003-compile_fixes.patch;patch=1 \
-           file://100-static_library.patch;patch=1"
+           file://001-large_files.patch \
+           file://002-lzmp.patch \
+           file://003-compile_fixes.patch \
+           file://100-static_library.patch"
 
 S = "${WORKDIR}"
 
diff --git a/recipes/lzo/lzo2_2.03.bb b/recipes/lzo/lzo2_2.03.bb
new file mode 100644
index 0000000000..3396b78f8a
--- /dev/null
+++ b/recipes/lzo/lzo2_2.03.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Lossless data compression library"
+HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/"
+LICENSE = "GPLv2+"
+SECTION = "libs"
+PRIORITY = "optional"
+
+SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz"
+SRC_URI[md5sum] = "0c3d078c2e8ea5a88971089a2f02a726"
+SRC_URI[sha256sum] = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591"
+
+S = "${WORKDIR}/lzo-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-shared"
+
+do_configure() {
+	gnu-configize --force
+	oe_runconf
+}
+
+NATIVE_INSTALL_WORKS = "1"
+BBCLASSEXTEND = "native"
+
diff --git a/recipes/madbufferfly/madbutterfly_git.bb b/recipes/madbufferfly/madbutterfly_git.bb
index fb8f7e211b..f8671fa5f8 100644
--- a/recipes/madbufferfly/madbutterfly_git.bb
+++ b/recipes/madbufferfly/madbutterfly_git.bb
@@ -4,11 +4,10 @@ PRIORITY = "optional"
 LICENSE = "BSD"
 DEPENDS = "cairo pango"
 SRCREV = "ecd1842714b5e982f3138cbdd358517d57be6aa3"
-PV = "0.0.1+gitr${SRCPV}"
-PE = "1"
+PV = "0.0.1+gitr${SRCREV}"
 
 SRC_URI = "git://git.gitorious.org/madbutterfly/mainline.git;protocol=git \
-           file://001_makefile.am_bugs.patch;patch=1"
+           file://001_makefile.am_bugs.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/madfu/madfu_1.2.bb b/recipes/madfu/madfu_1.2.bb
index f84601a9db..261ecf1af5 100644
--- a/recipes/madfu/madfu_1.2.bb
+++ b/recipes/madfu/madfu_1.2.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/usb-midi-fw/madfuload-1.2.tar.gz \
-           file://autofoo.patch;patch=1"
+           file://autofoo.patch"
 
 S = "${WORKDIR}/madfuload-1.2"
 
diff --git a/recipes/madwifi/madwifi-modules_0.9.3.bb b/recipes/madwifi/madwifi-modules_0.9.3.bb
index 473c742dc6..539149852f 100644
--- a/recipes/madwifi/madwifi-modules_0.9.3.bb
+++ b/recipes/madwifi/madwifi-modules_0.9.3.bb
@@ -9,8 +9,8 @@ SRCDATE = "20050803"
 PV = "0.9.3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/madwifi/madwifi-${PV}.tar.bz2 \
-	   file://madwifi-devname.patch;patch=1 \
-	   file://madwifi-skbpanic.patch;patch=1"
+	   file://madwifi-devname.patch \
+	   file://madwifi-skbpanic.patch"
 S = "${WORKDIR}/madwifi-${PV}"
 
 inherit module-base
diff --git a/recipes/madwifi/madwifi-ng_r.inc b/recipes/madwifi/madwifi-ng_r.inc
index 219dfc4f46..baab484e49 100644
--- a/recipes/madwifi/madwifi-ng_r.inc
+++ b/recipes/madwifi/madwifi-ng_r.inc
@@ -7,15 +7,15 @@ DEPENDS = "virtual/kernel"
 PR ="r6"
 
 WACKELF_SRC_URI = ""
-WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1"
-WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf.patch;patch=1"
+WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch"
+WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf.patch"
 
 SRCNAME = "${PN}"
 SRC_URI = "http://snapshots.madwifi-project.org/madwifi-trunk/${SRCNAME}-${PV}.tar.gz \
-           file://10-xscale-be-elf-copts.patch;patch=1 \
-           file://10-xscale-le-elf-copts.patch;patch=1 \
-           file://10-sh4-le-elf-copts.patch;patch=1 \
-	   file://powerpc-fix.patch;patch=1 \
+           file://10-xscale-be-elf-copts.patch \
+           file://10-xscale-le-elf-copts.patch \
+           file://10-sh4-le-elf-copts.patch \
+	   file://powerpc-fix.patch \
            ${WACKELF_SRC_URI}"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/recipes/madwifi/madwifi-ng_r2826-20071105.bb b/recipes/madwifi/madwifi-ng_r2826-20071105.bb
index 899be22ba2..515458a02a 100644
--- a/recipes/madwifi/madwifi-ng_r2826-20071105.bb
+++ b/recipes/madwifi/madwifi-ng_r2826-20071105.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 
 # Disable stripping of kernel modules, since this action strips too
 # much out, and the resulting module won't load.
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 require madwifi-ng_r.inc
 
diff --git a/recipes/madwifi/madwifi-ng_r3314-20080131.bb b/recipes/madwifi/madwifi-ng_r3314-20080131.bb
index 1648c2e2a0..75c9851541 100644
--- a/recipes/madwifi/madwifi-ng_r3314-20080131.bb
+++ b/recipes/madwifi/madwifi-ng_r3314-20080131.bb
@@ -2,12 +2,12 @@
 
 # Disable stripping of kernel modules, since this action strips too
 # much out, and the resulting module won't load.
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 require madwifi-ng_r.inc
 
 SRC_URI += " \
-	file://30-define-ioreadwrite32be-for-little-endian-too.patch;patch=1 \
+	file://30-define-ioreadwrite32be-for-little-endian-too.patch \
 	"
 
 # PR set after the include, to override what's set in the included file.
diff --git a/recipes/madwifi/madwifi-ng_r3837-20080802.bb b/recipes/madwifi/madwifi-ng_r3837-20080802.bb
index f702720fb6..9d49f1285b 100644
--- a/recipes/madwifi/madwifi-ng_r3837-20080802.bb
+++ b/recipes/madwifi/madwifi-ng_r3837-20080802.bb
@@ -2,18 +2,18 @@
 
 # Disable stripping of kernel modules, since this action strips too
 # much out, and the resulting module won't load.
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 require madwifi-ng_r.inc
 
 # Due to a minor Makefile restructuring, newer versions require an updated
 # patch; this is really ugly and some alternate way to do this that's more
 # generic should be figured out.
-WACKELF_SRC_URI_ixp4xx =          " file://20-xscale-VFP-wackelf-v2.patch;patch=1"
-WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch;patch=1"
+WACKELF_SRC_URI_ixp4xx =          " file://20-xscale-VFP-wackelf-v2.patch"
+WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch"
 
-SRC_URI += "file://respect-ldflags.patch;patch=1"
-SRC_URI += "file://madwifi-fix-2.6.30.patch;patch=1"
+SRC_URI += "file://respect-ldflags.patch"
+SRC_URI += "file://madwifi-fix-2.6.30.patch"
 
 SRCNAME = "madwifi-trunk"
 
diff --git a/recipes/madwifi/madwifi-ng_r3878-20081204.bb b/recipes/madwifi/madwifi-ng_r3878-20081204.bb
index 289a59b8d3..379a6998d7 100644
--- a/recipes/madwifi/madwifi-ng_r3878-20081204.bb
+++ b/recipes/madwifi/madwifi-ng_r3878-20081204.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE_slugos = "1"
 
 # Disable stripping of kernel modules, since this action strips too
 # much out, and the resulting module won't load.
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 require madwifi-ng_r.inc
 
diff --git a/recipes/madwifi/madwifi-ng_r4029-20090525.bb b/recipes/madwifi/madwifi-ng_r4029-20090525.bb
index dc288d8e37..ef21695f3d 100644
--- a/recipes/madwifi/madwifi-ng_r4029-20090525.bb
+++ b/recipes/madwifi/madwifi-ng_r4029-20090525.bb
@@ -2,18 +2,18 @@
 
 # Disable stripping of kernel modules, since this action strips too
 # much out, and the resulting module won't load.
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 require madwifi-ng_r.inc
 
 # Due to a minor Makefile restructuring, newer versions require an updated
 # patch; this is really ugly and some alternate way to do this that's more
 # generic should be figured out.
-WACKELF_SRC_URI_ixp4xx =          " file://20-xscale-VFP-wackelf-v2.patch;patch=1"
-WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch;patch=1"
+WACKELF_SRC_URI_ixp4xx =          " file://20-xscale-VFP-wackelf-v2.patch"
+WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch"
 
 SRC_URI = "http://snapshots.madwifi-project.org/madwifi-trunk/${SRCNAME}-${PV}.tar.gz \
-		file://respect-ldflags.patch;patch=1"
+		file://respect-ldflags.patch"
 
 SRCNAME = "madwifi-trunk"
 
diff --git a/recipes/maemo-mapper/maemo-mapper-nohildon_svn.bb b/recipes/maemo-mapper/maemo-mapper-nohildon_svn.bb
index 2510d7aa2c..0385263534 100644
--- a/recipes/maemo-mapper/maemo-mapper-nohildon_svn.bb
+++ b/recipes/maemo-mapper/maemo-mapper-nohildon_svn.bb
@@ -8,8 +8,8 @@ PR = "r1"
 
 # Only works with SRCDATE_maemo-mapper-nohildon = "20061114"
 SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \
-           http://home.tal.org/%7Emilang/n770/maemo-mapper-desktop-20061114-001.patch;patch=1;pnum=0;name=mapperPatch \
-	   file://fix_segfault.patch;patch=1"
+           http://home.tal.org/%7Emilang/n770/maemo-mapper-desktop-20061114-001.patch;striplevel=0;name=mapperPatch \
+	   file://fix_segfault.patch"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/maemo-mapper/maemo-mapper_svn.bb b/recipes/maemo-mapper/maemo-mapper_svn.bb
index 2c1bb4cfe2..94fccab01b 100644
--- a/recipes/maemo-mapper/maemo-mapper_svn.bb
+++ b/recipes/maemo-mapper/maemo-mapper_svn.bb
@@ -8,7 +8,7 @@ PV = "2.0.3+svnr${SRCPV}"
 PR = "r2"
 
 SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \
-           file://mapper-hildon1.diff;patch=1;maxrev=108" 
+           file://mapper-hildon1.diff;maxrev=108" 
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/maemo/hildon-control-panel_0.9.1-1.2.bb b/recipes/maemo/hildon-control-panel_0.9.1-1.2.bb
index 9edc7ffc61..3c56364363 100644
--- a/recipes/maemo/hildon-control-panel_0.9.1-1.2.bb
+++ b/recipes/maemo/hildon-control-panel_0.9.1-1.2.bb
@@ -4,8 +4,8 @@ LICENSE    = "GPL"
 DEPENDS = "hildon-lgpl hildon-base-lib osso-af-settings libosso hildon-libs osso-af-settings libosso-help"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
-           file://config-path.patch;patch=1;pnum=0 \
-           file://noWerror.patch;patch=1;pnum=0"
+           file://config-path.patch;striplevel=0 \
+           file://noWerror.patch;striplevel=0"
 
 S = "${WORKDIR}/hildon-control-panel-0.9.1"
 
diff --git a/recipes/maemo/hildon-status-bar_0.8.11-1.bb b/recipes/maemo/hildon-status-bar_0.8.11-1.bb
index 2474654e12..5d6238cd06 100644
--- a/recipes/maemo/hildon-status-bar_0.8.11-1.bb
+++ b/recipes/maemo/hildon-status-bar_0.8.11-1.bb
@@ -4,7 +4,7 @@ LICENSE    = "GPL"
 DEPENDS = "hildon-lgpl libosso hildon-libs"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
-           file://source.patch;patch=1;pnum=0"
+           file://source.patch;striplevel=0"
 
 S = "${WORKDIR}/hildon-status-bar-0.8.11"
 
diff --git a/recipes/maemo/libosso-help_1.0.01.bb b/recipes/maemo/libosso-help_1.0.01.bb
index a3655a61dd..b80d45ad88 100644
--- a/recipes/maemo/libosso-help_1.0.01.bb
+++ b/recipes/maemo/libosso-help_1.0.01.bb
@@ -3,8 +3,8 @@ PR = "r0"
 
 DEPENDS = 	"libosso hildon-lgpl hildon-base-lib hildon-libs"
 SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/libo/${PN}/libosso-help_${PV}.tar.gz \
-                 file://no-Werror.patch;patch=1;pnum=0 \
-                 file://help-header-pp.patch;patch=1;pnum=0"
+                 file://no-Werror.patch;striplevel=0 \
+                 file://help-header-pp.patch;striplevel=0"
 
 inherit pkgconfig autotools
 
diff --git a/recipes/maemo/osso-af-startup_0.28-1.bb b/recipes/maemo/osso-af-startup_0.28-1.bb
index 576074e3fb..dbf80abb6e 100644
--- a/recipes/maemo/osso-af-startup_0.28-1.bb
+++ b/recipes/maemo/osso-af-startup_0.28-1.bb
@@ -7,8 +7,8 @@ RDEPENDS_osso-af-services = "${PN}"
 RDEPENDS_osso-af-base-apps = "${PN}"
 
 SRC_URI = "http://stage.maemo.org:80/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz \
-           file://osso-af-startup-source.patch;patch=1;pnum=0 \
-           file://launch-no-o.patch;patch=1;pnum=0"
+           file://osso-af-startup-source.patch;striplevel=0 \
+           file://launch-no-o.patch;striplevel=0"
 
 S = "${WORKDIR}/${PN}-0.28"
 
diff --git a/recipes/maemo/osso-application-installer_1.0.03-1.bb b/recipes/maemo/osso-application-installer_1.0.03-1.bb
index 3c9e534af7..550c8a5228 100644
--- a/recipes/maemo/osso-application-installer_1.0.03-1.bb
+++ b/recipes/maemo/osso-application-installer_1.0.03-1.bb
@@ -5,7 +5,7 @@ DEPENDS = "hildon-lgpl hildon-base-lib libosso hildon-libs hildon-control-panel
 RDEPENDS = "shared-mime-info"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz \
-           file://fix-buildsystem.patch;patch=1"
+           file://fix-buildsystem.patch"
 
 S = "${WORKDIR}/osso-application-installer-1.0.03"
 
diff --git a/recipes/maemo/osso-esd_0.5.bb b/recipes/maemo/osso-esd_0.5.bb
index 2e2957f2e0..65854fa85d 100644
--- a/recipes/maemo/osso-esd_0.5.bb
+++ b/recipes/maemo/osso-esd_0.5.bb
@@ -6,7 +6,7 @@ RPROVIDES_${PN}  = "esd"
 DEPENDS = "audiofile osso-dsp-headers"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.orig.tar.gz \
-           file://qa-silence.patch;patch=1"
+           file://qa-silence.patch"
 
 # for qa-silence.patch:
 export MME_INCDIR = "${STAGING_INCDIR}/mme"
diff --git a/recipes/maemo/osso-gwconnect_0.70.1.bb b/recipes/maemo/osso-gwconnect_0.70.1.bb
index 9bb25dd0e5..c608ee0ed6 100644
--- a/recipes/maemo/osso-gwconnect_0.70.1.bb
+++ b/recipes/maemo/osso-gwconnect_0.70.1.bb
@@ -3,7 +3,7 @@ LICENSE = 	""
 DEPENDS =	"dbus gconf glib-2.0 libosso bluez-libs"
 
 SRC_URI = 	"http://repository.maemo.org/pool/maemo/ossw/source/o/osso-gwconnect/osso-gwconnect_${PV}.tar.gz \
-			file://osso-gwconnect-stdio.patch;patch=1"
+			file://osso-gwconnect-stdio.patch"
 
 EXTRA_OECONF = 	"--disable-mce"
 
diff --git a/recipes/maemo/tscalib_0.0.1-3.bb b/recipes/maemo/tscalib_0.0.1-3.bb
index 5e88bb76ef..11f3594a36 100644
--- a/recipes/maemo/tscalib_0.0.1-3.bb
+++ b/recipes/maemo/tscalib_0.0.1-3.bb
@@ -3,7 +3,7 @@ LICENSE    = "GPL"
 DEPENDS    = "virtual/xserver tslib"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/${PN}/${PN}_${PV}.tar.gz \
-           file://makefile.patch;patch=1;pnum=0"
+           file://makefile.patch;striplevel=0"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/maemo/xpext_1.0-5.bb b/recipes/maemo/xpext_1.0-5.bb
index 9f902c8f2b..f28881cbc0 100644
--- a/recipes/maemo/xpext_1.0-5.bb
+++ b/recipes/maemo/xpext_1.0-5.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "virtual/libx11 libxext"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \
-           file://auxdir.patch;patch=1;pnum=0"
+           file://auxdir.patch;striplevel=0"
 S = "${WORKDIR}/xpext-1.0"
 
 inherit autotools pkgconfig
diff --git a/recipes/maemo/xsp_1.0.0-8.bb b/recipes/maemo/xsp_1.0.0-8.bb
index f351b0c501..45499a905d 100644
--- a/recipes/maemo/xsp_1.0.0-8.bb
+++ b/recipes/maemo/xsp_1.0.0-8.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "virtual/libx11 libxext xpext"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz \
-           file://xsp-fix-pc.patch;patch=1"
+           file://xsp-fix-pc.patch"
 S = "${WORKDIR}/Xsp"
 
 inherit autotools pkgconfig
diff --git a/recipes/maemo4/libgpsbt_0.1.bb b/recipes/maemo4/libgpsbt_0.1.bb
index 4197f910fe..c6c6ea6517 100644
--- a/recipes/maemo4/libgpsbt_0.1.bb
+++ b/recipes/maemo4/libgpsbt_0.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "libgpsmgr dbus"
 # This is proprietary software in Chinook, so we have to stay with the last released
 # free version.
 SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-18.tar.gz \
-           file://configure-fix-version.patch;patch=1"
+           file://configure-fix-version.patch"
 
 inherit autotools
 
diff --git a/recipes/maemo4/libgpsmgr_0.1.bb b/recipes/maemo4/libgpsmgr_0.1.bb
index b09396c9a8..ccfef316be 100644
--- a/recipes/maemo4/libgpsmgr_0.1.bb
+++ b/recipes/maemo4/libgpsmgr_0.1.bb
@@ -3,7 +3,7 @@ LICENSE = "nokia"
 # This is proprietary software in Chinook, so we have to stay with the last released
 # free version.
 SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-10.tar.gz \
-           file://configure-fix-version.patch;patch=1"
+           file://configure-fix-version.patch"
 
 PR = "r1"
 
diff --git a/recipes/maemo4/libhildon_1.99.0.bb b/recipes/maemo4/libhildon_1.99.0.bb
index dbed502bfa..2991691a78 100644
--- a/recipes/maemo4/libhildon_1.99.0.bb
+++ b/recipes/maemo4/libhildon_1.99.0.bb
@@ -4,7 +4,7 @@ DEPENDS += "libpng libxt libxi"
 
 SRC_URI = "\
   http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz \
-  file://libhildon-buildfix.patch;patch=1 \
+  file://libhildon-buildfix.patch \
   "
 
 
diff --git a/recipes/maemo4/libhildonfm_1.9.46.bb b/recipes/maemo4/libhildonfm_1.9.46.bb
index df866a1411..d14955574b 100644
--- a/recipes/maemo4/libhildonfm_1.9.46.bb
+++ b/recipes/maemo4/libhildonfm_1.9.46.bb
@@ -4,7 +4,7 @@ PR = "r1"
 
 SRC_URI = "\
 	http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}.tar.gz \
-  file://libhildonfm-gtkmaemo-ifdef.patch;patch=1 \
+  file://libhildonfm-gtkmaemo-ifdef.patch \
 	"
 
 
diff --git a/recipes/maemo4/libosso_2.13.bb b/recipes/maemo4/libosso_2.13.bb
index 2193427fe5..e785818efa 100644
--- a/recipes/maemo4/libosso_2.13.bb
+++ b/recipes/maemo4/libosso_2.13.bb
@@ -4,8 +4,8 @@ PR = "r2"
 
 SRC_URI = "\
   http://repository.maemo.org/pool/maemo4.0/free/source/libo/${PN}/${PN}_${PV}-1.1fix.tar.gz \
-  file://libosso-buildfix.patch;patch=1 \
-  file://libosso-dont-use-inline.patch;patch=1 \
+  file://libosso-buildfix.patch \
+  file://libosso-dont-use-inline.patch \
   "
 
 PACKAGES += "${PN}-outo ${PN}-outo-dev ${PN}-outo-dbg ${PN}-outo-bin-dbg ${PN}-outo-bin"
diff --git a/recipes/maemo4/osso-ic-oss_1.0.4.bb b/recipes/maemo4/osso-ic-oss_1.0.4.bb
index afc3f5e765..5bc7e94599 100644
--- a/recipes/maemo4/osso-ic-oss_1.0.4.bb
+++ b/recipes/maemo4/osso-ic-oss_1.0.4.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 # No sources for that Maemo revision any more.
 SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz \
-           file://dbus-api-update.patch;patch=1 "
+           file://dbus-api-update.patch "
 
 inherit autotools pkgconfig lib_package
 
diff --git a/recipes/mailutils/mailutils_0.3.1.bb b/recipes/mailutils/mailutils_0.3.1.bb
index 9a4ae22000..e44dc8afe6 100644
--- a/recipes/mailutils/mailutils_0.3.1.bb
+++ b/recipes/mailutils/mailutils_0.3.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "GNU Mailutils contains a series of \
 useful mail clients, servers, and libraries."
 LICENSE = "GPL LGPL"
 SRC_URI = "${GNU_MIRROR}/mailutils/mailutils-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/mailx/mailx_8.1.2-0.20020411cvs.bb b/recipes/mailx/mailx_8.1.2-0.20020411cvs.bb
index 6cfc2b17ad..918f938684 100644
--- a/recipes/mailx/mailx_8.1.2-0.20020411cvs.bb
+++ b/recipes/mailx/mailx_8.1.2-0.20020411cvs.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "mailx is the traditional command-line-mode \
 mail user agent."
 LICENSE = "GPL"
 SRC_URI = "${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}.orig.tar.gz;name=archive \
-	   ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-1.diff.gz;patch=1;name=patch \
-	   file://install.patch;patch=1"
+	   ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-1.diff.gz;name=patch \
+	   file://install.patch"
 S = "${WORKDIR}/mailx-${PV}.orig"
 
 CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN"
diff --git a/recipes/mailx/mailx_8.1.2-0.20040524cvs.bb b/recipes/mailx/mailx_8.1.2-0.20040524cvs.bb
index c8b51bba46..a1416d1924 100644
--- a/recipes/mailx/mailx_8.1.2-0.20040524cvs.bb
+++ b/recipes/mailx/mailx_8.1.2-0.20040524cvs.bb
@@ -5,8 +5,8 @@ DESCRIPTION = "mailx is the traditional command-line-mode \
 mail user agent."
 LICENSE = "GPL"
 SRC_URI = "${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}.orig.tar.gz;name=archive \
-	   ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-4.diff.gz;patch=1;name=patch \
-	   file://install.patch;patch=1"
+	   ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-4.diff.gz;name=patch \
+	   file://install.patch"
 S = "${WORKDIR}/mailx-${PV}.orig"
 
 CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT"
diff --git a/recipes/mailx/mailx_8.1.2-0.20050715cvs.bb b/recipes/mailx/mailx_8.1.2-0.20050715cvs.bb
index d7fc19ae12..aad6a7a4ef 100644
--- a/recipes/mailx/mailx_8.1.2-0.20050715cvs.bb
+++ b/recipes/mailx/mailx_8.1.2-0.20050715cvs.bb
@@ -6,8 +6,8 @@ mail user agent."
 PR = "r0"
 LICENSE = "GPL"
 SRC_URI = "${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}.orig.tar.gz;name=archive \
-	   ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-1.diff.gz;patch=1;name=patch \
-	   file://install.patch;patch=1"
+	   ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-1.diff.gz;name=patch \
+	   file://install.patch"
 S = "${WORKDIR}/mailx-${PV}.orig"
 
 CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT"
diff --git a/recipes/make/make.inc b/recipes/make/make.inc
index af21861c2e..c6e9f949d9 100644
--- a/recipes/make/make.inc
+++ b/recipes/make/make.inc
@@ -6,7 +6,7 @@ SECTION = "devel"
 LICENSE = "GPL"
 
 SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \
-           file://SCCS.patch;patch=1"
+           file://SCCS.patch"
 
 inherit autotools
 
diff --git a/recipes/mamona/bash-noemu_3.2.bb b/recipes/mamona/bash-noemu_3.2.bb
index 7e846742d7..4b517ec95d 100644
--- a/recipes/mamona/bash-noemu_3.2.bb
+++ b/recipes/mamona/bash-noemu_3.2.bb
@@ -5,8 +5,8 @@ RCONFLICTS = "bash"
 RREPLACES = "bash"
 
 SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
-           file://001-005.patch;patch=1 \
-           file://006-add_internal_libcpwd_functions.patch;patch=1"
+           file://001-005.patch \
+           file://006-add_internal_libcpwd_functions.patch"
 
 S = "${WORKDIR}/bash-${PV}"
 
diff --git a/recipes/mamona/binutils-noemu_2.17.50.0.5.bb b/recipes/mamona/binutils-noemu_2.17.50.0.5.bb
index d4a1ef6f97..2ba6b44304 100644
--- a/recipes/mamona/binutils-noemu_2.17.50.0.5.bb
+++ b/recipes/mamona/binutils-noemu_2.17.50.0.5.bb
@@ -7,13 +7,13 @@ RREPLACES = "binutils"
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://binutils-configure-texinfo-version.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://binutils-configure-texinfo-version.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
      "
 
 EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
diff --git a/recipes/mamona/binutils-noemu_2.18.bb b/recipes/mamona/binutils-noemu_2.18.bb
index 1cee45211b..71ee3842b3 100644
--- a/recipes/mamona/binutils-noemu_2.18.bb
+++ b/recipes/mamona/binutils-noemu_2.18.bb
@@ -9,17 +9,17 @@ RREPLACES_binutils-noemu-symlinks = "binutils-symlinks"
 
 SRC_URI = "\
      ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
-     file://binutils-configure-texinfo-version.patch;patch=1 \
-     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
-     file://110-arm-eabi-conf.patch;patch=1 \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
-     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \
+     file://binutils-configure-texinfo-version.patch \
+     file://binutils-uclibc-100-uclibc-conf.patch \
+     file://110-arm-eabi-conf.patch \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
+     file://binutils-uclibc-300-006_better_file_error.patch \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
      "
 
 # powerpc patches
-SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+SRC_URI += "file://binutils-2.16.1-e300c2c3.patch"
 
 EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} --disable-shared"
 
diff --git a/recipes/mamona/cx3110x-770he_0.8.1.bb b/recipes/mamona/cx3110x-770he_0.8.1.bb
index 781a0546e0..ff8d53ef4c 100644
--- a/recipes/mamona/cx3110x-770he_0.8.1.bb
+++ b/recipes/mamona/cx3110x-770he_0.8.1.bb
@@ -14,14 +14,14 @@ SRC_URI += "https://garage.maemo.org/frs/download.php/2443/cx3110x-0.8.1.tar.gz;
  http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi-i686-pc-linux-gnu.tar.bz2;name=arm \

  http://dev.openbossa.org/mamona/sources/kernel-source-${KERVER}.tar.gz;name=kernel \

  file://defconfig \

- file://fix_mem_corruption.patch;patch=1 \

- file://fix_mem_allign.patch;patch=1 \

- file://cx3110x.patch;patch=1 \

- file://fix_cross_makefile.patch;patch=1 \

- file://fix_ssid_data_length.patch;patch=1 \

- file://770_performance_improvements.patch;patch=1 \

- file://create_sysfs_link_for_wlan0.patch;patch=1 \

- file://fix_opps_while_connecting_with_nm.patch;patch=1 \

+ file://fix_mem_corruption.patch \

+ file://fix_mem_allign.patch \

+ file://cx3110x.patch \

+ file://fix_cross_makefile.patch \

+ file://fix_ssid_data_length.patch \

+ file://770_performance_improvements.patch \

+ file://create_sysfs_link_for_wlan0.patch \

+ file://fix_opps_while_connecting_with_nm.patch \

 "

 

 SRC_URI[archive.md5sum] = "85c115a81fa4429bee2cd16bfe961d44"

diff --git a/recipes/mamona/cx3110x-chinooke_2.0.15.bb b/recipes/mamona/cx3110x-chinooke_2.0.15.bb
index 24536a9671..3365b04830 100644
--- a/recipes/mamona/cx3110x-chinooke_2.0.15.bb
+++ b/recipes/mamona/cx3110x-chinooke_2.0.15.bb
@@ -15,9 +15,9 @@ SRC_URI += "\
  http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi-i686-pc-linux-gnu.tar.bz2;name=arm \

  http://repository.maemo.org/pool/chinook/free/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0.orig.tar.gz;name=kernel \

  http://repository.maemo.org/pool/chinook/free/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz;name=kernelpatch \

- file://cx3110x.patch;patch=1 \

- file://create_sysfs_link_for_wlan0.patch;patch=1 \

- file://fix_old_include.patch;patch=1 \

+ file://cx3110x.patch \

+ file://create_sysfs_link_for_wlan0.patch \

+ file://fix_old_include.patch \

 "

 

 SRC_URI[archive.md5sum] = "6ac5db5e602ef205200428a6612b4036"

diff --git a/recipes/mamona/cx3110x-diablo_2.0.15.bb b/recipes/mamona/cx3110x-diablo_2.0.15.bb
index 73e684c54c..84a481b928 100644
--- a/recipes/mamona/cx3110x-diablo_2.0.15.bb
+++ b/recipes/mamona/cx3110x-diablo_2.0.15.bb
@@ -14,9 +14,9 @@ SRC_URI += "\
  http://repository.maemo.org/pool/maemo4.1/free/c/cx3110x-module-src/cx3110x-module-src_2.0.15-1.tar.gz;name=archive \

  http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi-i686-pc-linux-gnu.tar.bz2;name=arm \

  http://repository.maemo.org/pool/maemo4.1/free/k/kernel-source-diablo/kernel-source-diablo_2.6.21-200823maemo6.tar.gz;name=kernel \

- file://cx3110x.patch;patch=1 \

- file://create_sysfs_link_for_wlan0.patch;patch=1 \

- file://fix_old_include.patch;patch=1 \

+ file://cx3110x.patch \

+ file://create_sysfs_link_for_wlan0.patch \

+ file://fix_old_include.patch \

 "

 

 SRC_URI[archive.md5sum] = "6ac5db5e602ef205200428a6612b4036"

diff --git a/recipes/mamona/gcc-noemu_4.1.1.bb b/recipes/mamona/gcc-noemu_4.1.1.bb
index 543813a101..bd00ee1fa7 100644
--- a/recipes/mamona/gcc-noemu_4.1.1.bb
+++ b/recipes/mamona/gcc-noemu_4.1.1.bb
@@ -12,38 +12,38 @@ inherit autotools gettext
 require gcc-package-noemu.inc
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://110-arm-eabi.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://801-arm-bigendian-eabi.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://gcc41-configure.in.patch;patch=1 \
-	file://arm-thumb.patch;patch=1 \
-	file://arm-thumb-cache.patch;patch=1 \
-	file://ldflags.patch;patch=1 \
-	file://cse.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
-        file://gcc-4.1.1-pr13685-1.patch;patch=1 \
-        file://gcc-ignore-cache.patch;patch=1 \
+	file://100-uclibc-conf.patch \
+	file://110-arm-eabi.patch \
+	file://200-uclibc-locale.patch \
+	file://300-libstdc++-pic.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://801-arm-bigendian-eabi.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://gcc41-configure.in.patch \
+	file://arm-thumb.patch \
+	file://arm-thumb-cache.patch \
+	file://ldflags.patch \
+	file://cse.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://unbreak-armv4t.patch \
+        file://fix-ICE-in-arm_unwind_emit_set.diff \
+        file://gcc-4.1.1-pr13685-1.patch \
+        file://gcc-ignore-cache.patch \
 	"
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 #This is a dirty hack to get gcc 4.1.1 to compile for glibc AND uclibc on ppc
 #the patch that is need it to get gcc support soft-floats with glibc, makes gcc fail with uclibc
-SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \
-                         file://ppc-sfp-long-double-gcc411-7.patch;patch=1 "
+SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch \
+                         file://ppc-sfp-long-double-gcc411-7.patch "
 
 
 #Set the fortran bits
@@ -57,7 +57,7 @@ JAVA_arm = ""
 JAVA = ""
 
 LANGUAGES = "c,c++${FORTRAN}${JAVA}"
-require recipes/gcc/gcc-${PV}.inc
+require ../gcc/gcc-${PV}.inc
 
 EXTRA_OECONF += "--disable-libspp --with-slibdir=\"/lib\""
 
diff --git a/recipes/mamona/gcc-noemu_4.1.2.bb b/recipes/mamona/gcc-noemu_4.1.2.bb
index 247cbd0897..05cdeb003b 100644
--- a/recipes/mamona/gcc-noemu_4.1.2.bb
+++ b/recipes/mamona/gcc-noemu_4.1.2.bb
@@ -18,47 +18,47 @@ inherit autotools gettext
 require gcc-package-noemu.inc
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://110-arm-eabi.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://gcc41-configure.in.patch;patch=1 \
-	file://arm-thumb.patch;patch=1 \
-	file://arm-thumb-cache.patch;patch=1 \
-	file://ldflags.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran.patch;patch=1 \
-        file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-        file://pr34130.patch;patch=1 \
+	file://100-uclibc-conf.patch \
+	file://110-arm-eabi.patch \
+	file://200-uclibc-locale.patch \
+	file://300-libstdc++-pic.patch \
+	file://301-missing-execinfo_h.patch \
+	file://302-c99-snprintf.patch \
+	file://303-c99-complex-ugly-hack.patch \
+	file://304-index_macro.patch \
+	file://602-sdk-libstdc++-includes.patch \
+	file://740-sh-pr24836.patch \
+	file://800-arm-bigendian.patch \
+	file://arm-nolibfloat.patch \
+	file://arm-softfloat.patch \
+	file://gcc41-configure.in.patch \
+	file://arm-thumb.patch \
+	file://arm-thumb-cache.patch \
+	file://ldflags.patch \
+	file://zecke-xgcc-cpp.patch \
+	file://unbreak-armv4t.patch \
+        file://fix-ICE-in-arm_unwind_emit_set.diff \
+	file://cache-amnesia.patch \
+	file://gfortran.patch \
+        file://gcc-4.0.2-e300c2c3.patch \
+        file://pr34130.patch \
        "
 
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 SRC_URI_avr32 = "http://www.angstrom-distribution.org/unstable/sources/gcc-4.1.2-atmel.1.1.0.tar.gz \
-#           file://100-uclibc-conf.patch;patch=1 \
-#           file://200-uclibc-locale.patch;patch=1 \
-#           file://300-libstdc++-pic.patch;patch=1 \
-           file://301-missing-execinfo_h.patch;patch=1 \
-           file://302-c99-snprintf.patch;patch=1 \
-           file://303-c99-complex-ugly-hack.patch;patch=1 \
-           file://304-index_macro.patch;patch=1 \
-           file://602-sdk-libstdc++-includes.patch;patch=1 \
-           file://gcc41-configure.in.patch;patch=1 \
-           file://ldflags.patch;patch=1 \
-           file://zecke-xgcc-cpp.patch;patch=1 \
-           file://cache-amnesia.patch;patch=1 \
+#           file://100-uclibc-conf.patch \
+#           file://200-uclibc-locale.patch \
+#           file://300-libstdc++-pic.patch \
+           file://301-missing-execinfo_h.patch \
+           file://302-c99-snprintf.patch \
+           file://303-c99-complex-ugly-hack.patch \
+           file://304-index_macro.patch \
+           file://602-sdk-libstdc++-includes.patch \
+           file://gcc41-configure.in.patch \
+           file://ldflags.patch \
+           file://zecke-xgcc-cpp.patch \
+           file://cache-amnesia.patch \
            "
 
 do_compile_prepend_avr32() {
@@ -77,7 +77,7 @@ JAVA_arm = ""
 
 
 LANGUAGES = "c,c++${FORTRAN}${JAVA}"
-require recipes/gcc/gcc-${PV}.inc
+require ../gcc/gcc-${PV}.inc
 
 
 EXTRA_OECONF += " --disable-libssp --with-slibdir=\"/lib\" "
diff --git a/recipes/maradns/maradns_1.0.39.bb b/recipes/maradns/maradns_1.0.39.bb
index 672eef60b6..19957c62ae 100644
--- a/recipes/maradns/maradns_1.0.39.bb
+++ b/recipes/maradns/maradns_1.0.39.bb
@@ -5,7 +5,7 @@ LICENSE = "PD"
 
 SRC_URI = "http://www.maradns.org/download/1.0/maradns-${PV}.tar.bz2 \
            file://init \
-           file://rng-makefile-build-cc.patch;patch=1;pnum=0"
+           file://rng-makefile-build-cc.patch;striplevel=0"
 
 do_install() {
 	install -d ${D}${bindir}
diff --git a/recipes/maradns/maradns_1.4.03.bb b/recipes/maradns/maradns_1.4.03.bb
index 4d547a2788..fb59151e80 100644
--- a/recipes/maradns/maradns_1.4.03.bb
+++ b/recipes/maradns/maradns_1.4.03.bb
@@ -5,8 +5,8 @@ LICENSE = "PD"
 
 SRC_URI = "http://www.maradns.org/download/1.4/${PV}/maradns-${PV}.tar.bz2;name=src \
            file://init \
-           file://rng-makefile-build-cc.patch;patch=1;pnum=0 \
-           file://compile-1.4.0.3.patch;patch=1 "
+           file://rng-makefile-build-cc.patch;striplevel=0 \
+           file://compile-1.4.0.3.patch "
 SRC_URI[src.md5sum] = "071b3a3df07e18855a7edf9a6281641a"
 SRC_URI[src.sha256sum] = "a611b6ac0f3abee62c227b128c1773be4a2a41de75a37ca123d684db33793b23"
 
diff --git a/recipes/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb b/recipes/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
index b9266dbb82..0fc7bae963 100644
--- a/recipes/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
+++ b/recipes/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
@@ -5,7 +5,7 @@ SECTION = "x11/wm"
 PR = "r1"
 
 SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/mb-applet-cards-${PV}.tar.bz2 \
-	file://oz-gpe.patch;patch=1 \
+	file://oz-gpe.patch \
 	file://gpe-applet-cards \
 	file://cf_mount.png \
 	file://cf_unmount.png \
diff --git a/recipes/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/recipes/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
index 5f42643532..a201291cf5 100644
--- a/recipes/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
+++ b/recipes/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
@@ -6,9 +6,9 @@ SECTION = "x11/wm"
 PR = "r4"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.gz \
-	   file://update-to-svn.diff;patch=1 \
-           file://mbinputmgr-libgtkinput.patch;patch=1 \
-	   file://visibility-protocol.patch;patch=1 \
+	   file://update-to-svn.diff \
+           file://mbinputmgr-libgtkinput.patch \
+	   file://visibility-protocol.patch \
 	   "
 
 S = "${WORKDIR}/mb-applet-input-manager-${PV}"
diff --git a/recipes/matchbox-common/matchbox-common_0.9.1.bb b/recipes/matchbox-common/matchbox-common_0.9.1.bb
index 70e7d94194..b3666b2d48 100644
--- a/recipes/matchbox-common/matchbox-common_0.9.1.bb
+++ b/recipes/matchbox-common/matchbox-common_0.9.1.bb
@@ -2,11 +2,12 @@ DESCRIPTION = "Matchbox window manager common files"
 SECTION = "x11/wm"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox"
-PR = "r5"
+RDEPENDS += "matchbox-panel"
+PR = "r6"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
-           file://no-utilities-category.patch;patch=1 \
-           file://add-media-category.patch;patch=1"
+           file://no-utilities-category.patch \
+           file://add-media-category.patch"
 
 inherit autotools pkgconfig update-alternatives
 
diff --git a/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb b/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb
index c2d44d971f..d209414e68 100644
--- a/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb
+++ b/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb
@@ -9,7 +9,7 @@ PV = "0.0+svnr${SRCPV}"
 S = "${WORKDIR}/${PN}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
-        file://no-handed.patch;patch=1;pnum=0"
+        file://no-handed.patch;striplevel=0"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/matchbox-desktop/matchbox-desktop_0.8.1.bb b/recipes/matchbox-desktop/matchbox-desktop_0.8.1.bb
index 592ced5e8b..cd44bd9689 100644
--- a/recipes/matchbox-desktop/matchbox-desktop_0.8.1.bb
+++ b/recipes/matchbox-desktop/matchbox-desktop_0.8.1.bb
@@ -4,7 +4,7 @@ DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.8/matchbox-desktop-${PV}.tar.bz2 \
-	   file://enable-file-manager.patch;patch=1"
+	   file://enable-file-manager.patch"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
 
diff --git a/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb b/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb
index 21e6dd9a60..c63a64f011 100644
--- a/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -2,11 +2,13 @@ DESCRIPTION = "Matchbox Window Manager Desktop"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \
-           file://pkgconfig_fix.patch;patch=1 \
-           file://mb-desktop-multi-category-matching.patch;patch=1"
+           file://pkgconfig_fix.patch \
+           file://mb-desktop-multi-category-matching.patch"
+
+RDEPENDS += "matchbox-common"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
 
@@ -26,12 +28,5 @@ FILES_${PN}-dev += "${libdir}/matchbox-desktop \
 
 FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
 
-
-do_stage() {
-		install -d ${STAGING_INCDIR}/matchbox-desktop/
-		install -m 0644 ${S}/src/*.h ${STAGING_INCDIR}/matchbox-desktop/
-
-}
-
 SRC_URI[md5sum] = "3335a30b1a1aacfb39f23b505254765c"
 SRC_URI[sha256sum] = "ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793"
diff --git a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
index 3343b6fa71..bbe887476d 100644
--- a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
+++ b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
@@ -9,17 +9,17 @@ PV = "0.0+svnr${SRCPV}"
 PR = "r11"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
-	    file://smallscreen-fontsize.patch;patch=1 \
-        file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
-        file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
-        file://4-Add-rendering-debug-logging.patch;patch=1 \
-        file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
-        file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
-        file://7-Newer-autotools.patch;patch=1 \
+	    file://smallscreen-fontsize.patch \
+        file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch \
+        file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch \
+        file://4-Add-rendering-debug-logging.patch \
+        file://5-Add-support-for-loading-multiple-independent-layouts.patch \
+        file://6-Add-layout-switch-key-to-all-layouts.patch \
+        file://7-Newer-autotools.patch \
 	    file://80matchboxkeyboard"
 
-SRC_URI_append_om-gta01 = " file://fic-gta01-font-size.patch;patch=1"
-SRC_URI_append_om-gta02 = " file://fic-gta01-font-size.patch;patch=1"
+SRC_URI_append_om-gta01 = " file://fic-gta01-font-size.patch"
+SRC_URI_append_om-gta02 = " file://fic-gta01-font-size.patch"
 
 S = "${WORKDIR}/matchbox-keyboard"
 
diff --git a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb
index dd820e656c..d3ea264e18 100644
--- a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -9,12 +9,12 @@ PV = "0.0+svnr${SRCPV}"
 PR ="r7"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
-           file://smallscreen-fontsize.patch;patch=1 \
-           file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
-           file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
-           file://4-Add-rendering-debug-logging.patch;patch=1 \
-           file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
-           file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
+           file://smallscreen-fontsize.patch \
+           file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch \
+           file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch \
+           file://4-Add-rendering-debug-logging.patch \
+           file://5-Add-support-for-loading-multiple-independent-layouts.patch \
+           file://6-Add-layout-switch-key-to-all-layouts.patch \
           "
 
 
diff --git a/recipes/matchbox-keyboard/mboxkbd-layouts-gui_git.bb b/recipes/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
index 2e51cb38bf..55497e971f 100644
--- a/recipes/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
+++ b/recipes/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
@@ -9,8 +9,8 @@ PV = "0.0+git5b42aeff36d930dc3a9b75eedc74dacfec45f43f"
 
 SRC_URI = "http://linux-h4000.sourceforge.net/mirror/mk-layouts-gui.git_5b42aeff36d930dc3a9b75eedc74dacfec45f43f.tar.gz \
 #git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git;tag=5b42aeff36d930dc3a9b75eedc74dacfec45f43f \
-           file://auto-mkdir.patch;patch=1 \
-	   file://sanitize-desktop-file.patch;patch=1 \
+           file://auto-mkdir.patch \
+	   file://sanitize-desktop-file.patch \
 	   file://mboxkbd-layouts-gui.png"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/matchbox-panel/matchbox-panel_0.8.1.bb b/recipes/matchbox-panel/matchbox-panel_0.8.1.bb
index 1ea51af065..1b65c7b30b 100644
--- a/recipes/matchbox-panel/matchbox-panel_0.8.1.bb
+++ b/recipes/matchbox-panel/matchbox-panel_0.8.1.bb
@@ -5,9 +5,9 @@ LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
-	file://automake-lossage.patch;patch=1 \
-	file://more-automake-lossage.patch;patch=1 \
-	file://make-batteryapp-less-strict.patch;patch=1"
+	file://automake-lossage.patch \
+	file://more-automake-lossage.patch \
+	file://make-batteryapp-less-strict.patch"
 S = "${WORKDIR}/matchbox-panel-${PV}"
 
 inherit autotools pkgconfig gettext
diff --git a/recipes/matchbox-panel/matchbox-panel_0.8.3.bb b/recipes/matchbox-panel/matchbox-panel_0.8.3.bb
index 738e7f48af..1bdc4728d0 100644
--- a/recipes/matchbox-panel/matchbox-panel_0.8.3.bb
+++ b/recipes/matchbox-panel/matchbox-panel_0.8.3.bb
@@ -5,8 +5,8 @@ SECTION = "x11/wm"
 PR = "r1"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
-	file://make-batteryapp-less-strict.patch;patch=1 \
-	file://wifi-location.patch;patch=1"
+	file://make-batteryapp-less-strict.patch \
+	file://wifi-location.patch"
 S = "${WORKDIR}/matchbox-panel-${PV}"
 
 inherit autotools pkgconfig gettext
diff --git a/recipes/matchbox-panel/matchbox-panel_0.9.1.bb b/recipes/matchbox-panel/matchbox-panel_0.9.1.bb
index cba39db3e5..e7c9e2c6b3 100644
--- a/recipes/matchbox-panel/matchbox-panel_0.9.1.bb
+++ b/recipes/matchbox-panel/matchbox-panel_0.9.1.bb
@@ -5,8 +5,8 @@ SECTION = "x11/wm"
 PR = "r2"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
-           file://allow-100-per-cent-battery.patch;patch=1 \
-	   file://no_time_support.patch;patch=1"
+           file://allow-100-per-cent-battery.patch \
+	   file://no_time_support.patch"
 
 inherit autotools pkgconfig gettext
 
diff --git a/recipes/matchbox-panel/matchbox-panel_0.9.2.bb b/recipes/matchbox-panel/matchbox-panel_0.9.2.bb
index 17abb15a44..b682738582 100644
--- a/recipes/matchbox-panel/matchbox-panel_0.9.2.bb
+++ b/recipes/matchbox-panel/matchbox-panel_0.9.2.bb
@@ -2,13 +2,13 @@ require matchbox-panel.inc
 
 PR ="r12"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz;name=archive \
-           file://add_hostap.patch;patch=1 \
-           http://handhelds.org/~pb/mb-panel-0.9.2-polling.patch;patch=1;name=patch1 \
-           http://handhelds.org/~pb/mb-panel-0.9.2-msgcancel.patch;patch=1;name=patch2 \
-           file://mb-applet-battery-repaint.patch;patch=1 \
-           file://mb-panel-multi-category-matching.patch;patch=1 \
-           file://mb-panel-allow-disabling-menu-panel.patch;patch=1 \
-	   file://system-monitor-crash-fix.patch;patch=1 "
+           file://add_hostap.patch \
+           http://handhelds.org/~pb/mb-panel-0.9.2-polling.patch;name=patch1 \
+           http://handhelds.org/~pb/mb-panel-0.9.2-msgcancel.patch;name=patch2 \
+           file://mb-applet-battery-repaint.patch \
+           file://mb-panel-multi-category-matching.patch \
+           file://mb-panel-allow-disabling-menu-panel.patch \
+	   file://system-monitor-crash-fix.patch "
 
 
 
diff --git a/recipes/matchbox-panel/matchbox-panel_0.9.3.bb b/recipes/matchbox-panel/matchbox-panel_0.9.3.bb
index 8036f3a572..ff49abaa66 100644
--- a/recipes/matchbox-panel/matchbox-panel_0.9.3.bb
+++ b/recipes/matchbox-panel/matchbox-panel_0.9.3.bb
@@ -1,9 +1,9 @@
 require matchbox-panel.inc
 PR ="r5"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
-	   file://mb-applet-battery-repaint-093.patch;patch=1 \
-	   file://mb-applet-system-monitor-crash.patch;patch=1 \
-	   file://matchbox-panel-uninitialised-crash.patch;patch=1"
+	   file://mb-applet-battery-repaint-093.patch \
+	   file://mb-applet-system-monitor-crash.patch \
+	   file://matchbox-panel-uninitialised-crash.patch"
 
 SRC_URI[md5sum] = "48b58a2e9ada4ae4de6555315ee3506f"
 SRC_URI[sha256sum] = "1ec04f3660fecc9c47afd75a9197950ecf8ca5d051b428da188f0262ff982500"
diff --git a/recipes/matchbox-wm/matchbox-wm_1.2.bb b/recipes/matchbox-wm/matchbox-wm_1.2.bb
index 85ed0dce9e..5a667194dd 100644
--- a/recipes/matchbox-wm/matchbox-wm_1.2.bb
+++ b/recipes/matchbox-wm/matchbox-wm_1.2.bb
@@ -6,8 +6,8 @@ RDEPENDS = ""
 PR ="r5"
 
 SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
-           file://configure_fix.patch;patch=1 \
-           file://select-client-crash.patch;patch=1 \
+           file://configure_fix.patch \
+           file://select-client-crash.patch \
            file://gconf-2.m4 \
            file://kbdconfig"
 
diff --git a/recipes/matchbox2/matchbox-desktop-2_svn.bb b/recipes/matchbox2/matchbox-desktop-2_svn.bb
index 0a50bacf2b..bf7557d687 100644
--- a/recipes/matchbox2/matchbox-desktop-2_svn.bb
+++ b/recipes/matchbox2/matchbox-desktop-2_svn.bb
@@ -10,7 +10,7 @@ PR = "r1"
 inherit autotools_stage pkgconfig
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
-	   file://fallback-folder.patch;patch=1;pnum=0 \
+	   file://fallback-folder.patch;striplevel=0 \
 "
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/matchbox2/matchbox-panel-2_svn.bb b/recipes/matchbox2/matchbox-panel-2_svn.bb
index eff83f7e06..36a6c0fb0a 100644
--- a/recipes/matchbox2/matchbox-panel-2_svn.bb
+++ b/recipes/matchbox2/matchbox-panel-2_svn.bb
@@ -13,10 +13,10 @@ PR = "r1"
 inherit autotools_stage pkgconfig
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
-	   file://scaling-image-double-free.patch;patch=1;pnum=0 \
-	   file://startup-invalid-access.patch;patch=1;pnum=0 \
-	   file://startup-shown-uninitialized.patch;patch=1;pnum=0 \
-	   file://themeable-icons.patch;patch=1;pnum=0 \
+	   file://scaling-image-double-free.patch;striplevel=0 \
+	   file://startup-invalid-access.patch;striplevel=0 \
+	   file://startup-shown-uninitialized.patch;striplevel=0 \
+	   file://themeable-icons.patch;striplevel=0 \
 "
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/matchbox2/matchbox-wm-2_svn.bb b/recipes/matchbox2/matchbox-wm-2_svn.bb
index a31f121f6e..d38f03be18 100644
--- a/recipes/matchbox2/matchbox-wm-2_svn.bb
+++ b/recipes/matchbox2/matchbox-wm-2_svn.bb
@@ -4,8 +4,8 @@ PV = "0.1.0+svnr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager-2;proto=http \
-	   file://fix-timeout-handler-free.patch;patch=1 \
-	   file://makefile-vars.patch;patch=1;pnum=0 \
+	   file://fix-timeout-handler-free.patch \
+	   file://makefile-vars.patch;striplevel=0 \
 "
 S = "${WORKDIR}/matchbox-window-manager-2"
 
diff --git a/recipes/matrixssl/matrixssl_1.1.1.bb b/recipes/matrixssl/matrixssl_1.1.1.bb
index 9b513b6fe9..38ed0c2206 100644
--- a/recipes/matrixssl/matrixssl_1.1.1.bb
+++ b/recipes/matrixssl/matrixssl_1.1.1.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "GPL"
 PR = "r1"
 SRC_URI = "http://wiki.openembedded.org/dl/matrixssl-1-1-1.tar.gz \
-	   file://cross.patch;patch=1"
+	   file://cross.patch"
 S = "${WORKDIR}/matrixssl/src"
 
 require matrixssl.inc
diff --git a/recipes/mbmerlin/mbmerlin_0.8.1-2.bb b/recipes/mbmerlin/mbmerlin_0.8.1-2.bb
index 0607c7e5d2..5c3a93a52b 100644
--- a/recipes/mbmerlin/mbmerlin_0.8.1-2.bb
+++ b/recipes/mbmerlin/mbmerlin_0.8.1-2.bb
@@ -11,7 +11,7 @@ FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/mbmerlin ${datadir}/applicatio
 FILES_${PN} += " ${datadir}/pixmaps"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
-	   file://fix_makefile.patch;patch=1"
+	   file://fix_makefile.patch"
 
 S = "${WORKDIR}/mbmerlin"
 
diff --git a/recipes/mc/mc_4.6.2.bb b/recipes/mc/mc_4.6.2.bb
index 516854b43b..da49427ac8 100644
--- a/recipes/mc/mc_4.6.2.bb
+++ b/recipes/mc/mc_4.6.2.bb
@@ -4,24 +4,24 @@ HOMEPAGE = "http://www.midnight-commander.org/"
 
 # most of these fixes were copied from openSUSE Factory.
 SRC_URI = "http://www.midnight-commander.org/downloads/${P}.tar.gz \
-	   file://mhl-stdbool.patch;patch=1 \
-	   file://mc-utf8.patch;patch=1 \
-	   file://00-70-utf8-common.patch;patch=1 \
-	   file://00-73-utf8-bottom-buttons-width.patch;patch=1 \
-	   file://00-75-utf8-cmdline-help.patch;patch=1 \
-	   file://00-76-utf8-hotlist-highlight.patch;patch=1 \
-	   file://00-77-utf8-filename-search-highlight.patch;patch=1 \
-	   file://mc-utf8-nlink.patch;patch=1 \
-	   file://mc-utf8-look-and-feel.patch;patch=1 \
-	   file://mc-utf8-slang-codeset.patch;patch=1 \
-	   file://99_regexp-replace-fixed.patch;patch=1 \
-	   file://99b_fix-regex-pattern-lengths.patch;patch=1 \
-	   file://multi-press-f-keys.patch;patch=1 \
-	   file://cross-compile.patch;patch=1 \
-	   file://01_ftpfs_symlink.patch;patch=1 \
-	   file://02_ignore_ftp_chmod_error.patch;patch=1 \
-	   file://mc-cursor-appearance.patch;patch=1 \
-	   file://mc-esc-seq.patch;patch=1"
+	   file://mhl-stdbool.patch \
+	   file://mc-utf8.patch \
+	   file://00-70-utf8-common.patch \
+	   file://00-73-utf8-bottom-buttons-width.patch \
+	   file://00-75-utf8-cmdline-help.patch \
+	   file://00-76-utf8-hotlist-highlight.patch \
+	   file://00-77-utf8-filename-search-highlight.patch \
+	   file://mc-utf8-nlink.patch \
+	   file://mc-utf8-look-and-feel.patch \
+	   file://mc-utf8-slang-codeset.patch \
+	   file://99_regexp-replace-fixed.patch \
+	   file://99b_fix-regex-pattern-lengths.patch \
+	   file://multi-press-f-keys.patch \
+	   file://cross-compile.patch \
+	   file://01_ftpfs_symlink.patch \
+	   file://02_ignore_ftp_chmod_error.patch \
+	   file://mc-cursor-appearance.patch \
+	   file://mc-esc-seq.patch"
 
 EXTRA_OECONF = "--without-x --without-samba \
 --without-nfs --without-gpm-mouse --enable-charset \
diff --git a/recipes/mdadm/mdadm_1.12.0.bb b/recipes/mdadm/mdadm_1.12.0.bb
index 7a657a86da..75c2178cf4 100644
--- a/recipes/mdadm/mdadm_1.12.0.bb
+++ b/recipes/mdadm/mdadm_1.12.0.bb
@@ -1,7 +1,7 @@
 require mdadm.inc
 PR = "r3"
 
-SRC_URI += " file://build_flags.patch;patch=1 "
+SRC_URI += " file://build_flags.patch "
 
 SRC_URI[mdadm-1.12.0.md5sum] = "736705240e918294740929518477fc6f"
 SRC_URI[mdadm-1.12.0.sha256sum] = "22831449225cc39948b187c9e3bd89ba12d5c8abee18b2d0242da883cb7d9490"
diff --git a/recipes/mdk/mdk3_v2.bb b/recipes/mdk/mdk3_v2.bb
index 59324244ac..7906d83670 100644
--- a/recipes/mdk/mdk3_v2.bb
+++ b/recipes/mdk/mdk3_v2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.tu-darmstadt.de/~p_larbig/wlan/mdk3-${PV}.tar.bz2 \
-           file://cross-compile.diff;patch=1"
+           file://cross-compile.diff"
 
 do_install() {
         install -d ${D}/${sbindir}
diff --git a/recipes/mediatomb/mediatomb_0.11.0.bb b/recipes/mediatomb/mediatomb_0.11.0.bb
index 866ea27641..b9b4dab806 100644
--- a/recipes/mediatomb/mediatomb_0.11.0.bb
+++ b/recipes/mediatomb/mediatomb_0.11.0.bb
@@ -5,8 +5,8 @@ DEPENDS = "expat ffmpeg sqlite3 libexif js zlib file id3lib"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz \
-           file://curl.diff;patch=1 \
-	   file://inotify.diff;patch=1 \
+           file://curl.diff \
+	   file://inotify.diff \
 	  "
 
 inherit autotools pkgconfig
diff --git a/recipes/memtester/memtester_4.0.5.bb b/recipes/memtester/memtester_4.0.5.bb
index f6d74f6f4b..5b29e2fe32 100644
--- a/recipes/memtester/memtester_4.0.5.bb
+++ b/recipes/memtester/memtester_4.0.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 PR = "r2"
 
 SRC_URI = "http://pyropus.ca/software/memtester/old-versions/memtester-${PV}.tar.gz"
-SRC_URI += "file://Makefile.patch;patch=1"
+SRC_URI += "file://Makefile.patch"
 
 S = "${WORKDIR}/memtester-${PV}"
 
diff --git a/recipes/memtester/memtester_4.0.6.bb b/recipes/memtester/memtester_4.0.6.bb
index e535bd2e0c..611beb7dea 100644
--- a/recipes/memtester/memtester_4.0.6.bb
+++ b/recipes/memtester/memtester_4.0.6.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 PR = "r0"
 
 SRC_URI = "http://pyropus.ca/software/memtester/old-versions/memtester-${PV}.tar.gz"
-SRC_URI += "file://Makefile.patch;patch=1"
+SRC_URI += "file://Makefile.patch"
 
 S = "${WORKDIR}/memtester-${PV}"
 
diff --git a/recipes/memtester/memtester_4.1.3.bb b/recipes/memtester/memtester_4.1.3.bb
new file mode 100644
index 0000000000..721345d37c
--- /dev/null
+++ b/recipes/memtester/memtester_4.1.3.bb
@@ -0,0 +1,25 @@
+SECTION = "console/utils"
+DESCRIPTION = "Utility to test for faulty memory subsystem"
+LICENSE = "GPLv2"
+
+SRC_URI = "http://pyropus.ca/software/memtester/old-versions/memtester-${PV}.tar.gz"
+SRC_URI += "file://Makefile.patch"
+
+SRC_URI[md5sum] = "e562451620cf5343016950462bc0dc38"
+SRC_URI[sha256sum] = "ac56f0b6d6d6e58bcf2a3fa7f2c9b29894f5177871f21115a1906c535106acf6"
+
+S = "${WORKDIR}/memtester-${PV}"
+
+do_compile () {
+	echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc
+	echo '${CC} ${LDFLAGS}' > conf-ld
+	oe_runmake
+}
+
+do_install () {
+	install -d ${D}${bindir}
+	install -d ${D}${mandir}/man8
+	install -m 0755 memtester ${D}${bindir}/
+	install -m 0755 memtester.8 ${D}${mandir}/man8/
+}
+
diff --git a/recipes/mesa/mesa-common-old.inc b/recipes/mesa/mesa-common-old.inc
index a88a07f019..01f0adce42 100644
--- a/recipes/mesa/mesa-common-old.inc
+++ b/recipes/mesa/mesa-common-old.inc
@@ -2,7 +2,7 @@ SECTION = "x11"
 PE = "2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
-	file://mklib-rpath-link.patch;patch=1"
+	file://mklib-rpath-link.patch"
 
 S = "${WORKDIR}/Mesa-${PV}"
 
diff --git a/recipes/mesa/mesa-dri-7.8.1/fix-progs-makefile.patch b/recipes/mesa/mesa-dri-7.8.1/fix-progs-makefile.patch
new file mode 100644
index 0000000000..40e6a1b16e
--- /dev/null
+++ b/recipes/mesa/mesa-dri-7.8.1/fix-progs-makefile.patch
@@ -0,0 +1,81 @@
+From e03daf13a562414f07230c17998edd39564b5f1b Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 4 Mar 2010 14:16:27 +0100
+Subject: [PATCH] fix libs
+
+---
+ progs/demos/Makefile   |    2 +-
+ progs/glsl/Makefile    |    2 +-
+ progs/redbook/Makefile |    2 +-
+ progs/samples/Makefile |    2 +-
+ progs/xdemos/Makefile  |    2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/progs/demos/Makefile b/progs/demos/Makefile
+index 5b1d2a0..121b862 100644
+--- a/progs/demos/Makefile
++++ b/progs/demos/Makefile
+@@ -8,7 +8,7 @@ INCDIR = $(TOP)/include
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
+ 	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ \
+ 	$(APP_LIB_DEPS)
+ 
+ PROGS = \
+diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
+index 3b5a595..836c4ac 100644
+--- a/progs/glsl/Makefile
++++ b/progs/glsl/Makefile
+@@ -10,7 +10,7 @@ LIB_DEP = \
+ 	$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
+ 	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -lstdc++ \
+ 	-l$(GL_LIB) $(APP_LIB_DEPS)
+ 
+ # using : to avoid APP_CC pointing to CC loop
+diff --git a/progs/redbook/Makefile b/progs/redbook/Makefile
+index b41e488..95ed746 100644
+--- a/progs/redbook/Makefile
++++ b/progs/redbook/Makefile
+@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
+ 
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
+ 
+ PROGS = aaindex \
+ 	aapoly \
+diff --git a/progs/samples/Makefile b/progs/samples/Makefile
+index 64fa47a..9f72c8b 100644
+--- a/progs/samples/Makefile
++++ b/progs/samples/Makefile
+@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
+ 
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
+ 
+ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
+ 	font line logo nurb olympic overlay point prim rgbtoppm quad select \
+diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
+index f866a32..c0f4e06 100644
+--- a/progs/xdemos/Makefile
++++ b/progs/xdemos/Makefile
+@@ -11,7 +11,7 @@
+ # Add X11 and pthread libs to satisfy GNU gold.
+ APP_LIB_DEPS += -lX11 -lpthread
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) -lstdc++ $(APP_LIB_DEPS)
+ 
+ PROGS = \
+ 	corender \
+-- 
+1.7.0
+
diff --git a/recipes/mesa/mesa-dri-7.8.1/glamo.patch b/recipes/mesa/mesa-dri-7.8.1/glamo.patch
new file mode 100644
index 0000000000..cc55c8b91e
--- /dev/null
+++ b/recipes/mesa/mesa-dri-7.8.1/glamo.patch
@@ -0,0 +1,2373 @@
+diff --git a/configure.ac b/configure.ac
+index 61487c3..c4952bf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,6 +125,9 @@ dnl Add flags for gcc and g++
+ if test "x$GCC" = xyes; then
+     CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99 -ffast-math"
+ 
++    # Work around GCC bug #39501
++    CFLAGS="$CFLAGS -fno-finite-math-only"
++
+     # Enable -fvisibility=hidden if using a gcc that supports it
+     save_CFLAGS="$CFLAGS"
+     AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
+@@ -138,6 +141,9 @@ fi
+ if test "x$GXX" = xyes; then
+     CXXFLAGS="$CXXFLAGS -Wall"
+ 
++    # Work around GCC bug #39501
++    CXXFLAGS="$CXXFLAGS -fno-finite-math-only"
++
+     # Work around aliasing bugs - developers should comment this out
+     CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+ fi
+diff --git a/src/mesa/drivers/dri/glamo/Makefile b/src/mesa/drivers/dri/glamo/Makefile
+new file mode 100644
+index 0000000..e77193d
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/Makefile
+@@ -0,0 +1,22 @@
++# src/mesa/drivers/dri/glamo/Makefile
++
++TOP = ../../../../..
++include $(TOP)/configs/current
++
++LIBNAME = glamo_dri.so
++
++DRIVER_SOURCES = \
++	glamo_screen.c glamo_context.c glamo_state.c glamo_fbo.c glamo_tris.c \
++	glamo_cmdq.c glamo_render.c
++
++C_SOURCES = \
++	$(COMMON_SOURCES) \
++	$(DRIVER_SOURCES)
++
++ASM_SOURCES =
++
++DRI_LIB_DEPS += -ldrm_glamo
++
++include ../Makefile.template
++
++symlinks:
+diff --git a/src/mesa/drivers/dri/glamo/glamo_cmdq.c b/src/mesa/drivers/dri/glamo/glamo_cmdq.c
+new file mode 100644
+index 0000000..1334f8e
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_cmdq.c
+@@ -0,0 +1,110 @@
++/*
++ * Command queue submission via DRM
++ *
++ * Copyright 2009 Thomas White <taw@bitwiz.org.uk>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++
++#include <stdint.h>
++#include <stdlib.h>
++#include <drm.h>
++#include <glamo_drm.h>
++#include <glamo_bo.h>
++
++#include "glamo_context.h"
++#include "glamo_cmdq.h"
++
++
++/* Submit the prepared command sequence to the kernel */
++void glamoDRMDispatch(glamoContext *gCtx)
++{
++	drm_glamo_cmd_burst_t burst;
++	int r;
++
++	burst.base = gCtx->cmd_burst_base;
++	burst.data = gCtx->cmdq_drm;
++	burst.bufsz = gCtx->cmdq_drm_used * 2;	/* -> bytes */
++	burst.nobjs = gCtx->cmdq_obj_used;
++	burst.objs = gCtx->cmdq_objs;
++	burst.obj_pos = gCtx->cmdq_obj_pos;
++
++	r = drmCommandWrite(gCtx->drm_fd, DRM_GLAMO_CMDBURST,
++	                    &burst, sizeof(burst));
++	if ( r != 0 ) {
++		fprintf(stderr, "DRM_GLAMO_CMDBURST failed\n");
++	}
++
++	/* Reset counts to zero for the next sequence */
++	gCtx->cmdq_obj_used = 0;
++	gCtx->cmdq_drm_used = 0;
++}
++
++
++void glamoDRMAddData(glamoContext *gCtx, uint32_t val, int len)
++{
++	if ( gCtx->cmdq_drm_used+4 > gCtx->cmdq_drm_size ) {
++		fprintf(stderr, "Burst command too large\n");
++		return;
++	}
++
++	/* Record command */
++	if ( len == 2 ) {
++		gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = val & 0xffff;
++	} else if ( len == 4 ) {
++		gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = val & 0x0000ffff;
++		gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = val & 0xffff0000;
++	} else {
++		fprintf(stderr, "Wrong command length!\n");
++	}
++}
++
++
++void glamoDRMAddBO(glamoContext *gCtx, struct glamo_bo *bo)
++{
++	if ( gCtx->cmdq_drm_used+4 > gCtx->cmdq_drm_size ) {
++		fprintf(stderr, "Burst command too large\n");
++		return;
++	}
++
++	/* Record object position */
++	gCtx->cmdq_objs[gCtx->cmdq_obj_used] = bo->handle;
++	/* -> bytes */
++	gCtx->cmdq_obj_pos[gCtx->cmdq_obj_used] = gCtx->cmdq_drm_used * 2;
++	gCtx->cmdq_obj_used++;
++
++	/* Record command */
++	gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = 0x0000;
++	gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = 0x0000;
++}
++
++
++void glamoDRMStartBurst(glamoContext *gCtx, uint16_t base)
++{
++	gCtx->cmd_burst_base = base;
++}
++
++
++void glamoInitCmdqCache(glamoContext *gCtx)
++{
++	gCtx->cmdq_objs = malloc(1024);
++	gCtx->cmdq_obj_pos = malloc(1024);
++	gCtx->cmdq_obj_used = 0;
++	gCtx->cmdq_drm_used = 0;
++	gCtx->cmdq_drm_size = 4 * 1024;
++	gCtx->cmdq_drm = malloc(gCtx->cmdq_drm_size);
++}
+diff --git a/src/mesa/drivers/dri/glamo/glamo_cmdq.h b/src/mesa/drivers/dri/glamo/glamo_cmdq.h
+new file mode 100644
+index 0000000..7420d7b
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_cmdq.h
+@@ -0,0 +1,33 @@
++/*
++ * Command queue submission via DRM
++ *
++ * Copyright 2009 Thomas White <taw@bitwiz.org.uk>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++
++#include <stdint.h>
++#include <glamo_bo.h>
++
++#include "glamo_context.h"
++
++
++extern void glamoDRMDispatch(glamoContext *gCtx);
++extern void glamoDRMAddBO(glamoContext *gCtx, struct glamo_bo *bo);
++extern void glamoDRMAddData(glamoContext *gCtx, uint32_t val, int len);
++extern void glamoDRMStartBurst(glamoContext *gCtx, uint16_t base);
++extern void glamoInitCmdqCache(glamoContext *gCtx);
+diff --git a/src/mesa/drivers/dri/glamo/glamo_context.c b/src/mesa/drivers/dri/glamo/glamo_context.c
+new file mode 100644
+index 0000000..527654f
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_context.c
+@@ -0,0 +1,360 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
++ * Roughly based on sis_context.c (c) 2003 Eric Anholt
++ *              and radeon_common_context.c
++ *
++ * 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 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.
++ */
++
++
++#include "dri_util.h"
++#include "drirenderbuffer.h"
++#include "utils.h"
++
++#include "swrast/swrast.h"
++#include "swrast_setup/swrast_setup.h"
++#include "drivers/common/driverfuncs.h"
++#include "vbo/vbo.h"
++#include "tnl/tnl.h"
++#include "tnl/t_pipeline.h"
++#include "main/state.h"
++
++#include "glamo_context.h"
++#include "glamo_screen.h"
++#include "glamo_state.h"
++#include "glamo_fbo.h"
++#include "glamo_tris.h"
++#include "glamo_render.h"
++#include "glamo_cmdq.h"
++
++#include <glamo_bo.h>
++#include <glamo_bo_gem.h>
++#include <glamo_drm.h>
++
++
++#define DRIVER_DATE  "20090913"
++
++
++static inline struct glamo_renderbuffer *glamo_get_renderbuffer(
++                                                      struct gl_framebuffer *fb,
++                                                      int att_index)
++{
++	if ( att_index >= 0 ) {
++		struct glamo_renderbuffer *gr;
++		gr = glamo_renderbuffer(fb->Attachment[att_index].Renderbuffer);
++		return gr;
++	} else {
++		return NULL;
++	}
++}
++
++
++static const GLubyte *glamoGetString(GLcontext *ctx, GLenum name)
++{
++	static char buffer[128];
++
++	switch (name) {
++	case GL_VENDOR:
++		return (GLubyte *)"Thomas White";
++	case GL_RENDERER: {
++		driGetRendererString(buffer, "Glamo", DRIVER_DATE, 0);
++		return (GLubyte *) buffer;
++	}
++	default:
++		return 0;
++	}
++}
++
++
++/* Called when Mesa needs to know the size of the framebuffer */
++static void glamoBufferSize(GLframebuffer *buffer,
++                            GLuint *width, GLuint *height)
++{
++	GET_CURRENT_CONTEXT(ctx);
++	glamoContextPtr glamo = GLAMO_CONTEXT(ctx);
++
++	*width = glamo->driDrawable->w;
++	*height = glamo->driDrawable->h;
++}
++
++
++GLboolean glamoCreateContext(const __GLcontextModes *glVisual,
++                             __DRIcontext *driContextPriv,
++                             void *sharedContextPrivate)
++{
++	GLcontext *ctx, *shareCtx;
++	__DRIscreen *sPriv = driContextPriv->driScreenPriv;
++	glamoContextPtr context;
++	glamoScreenPtr glamoScreen;
++	struct dd_function_table functions;
++
++	context = (glamoContextPtr)CALLOC(sizeof(*context));
++	if ( context == NULL ) return GL_FALSE;
++
++	_mesa_init_driver_functions(&functions);
++
++	/* Allocate the Mesa context */
++	if ( sharedContextPrivate )
++		shareCtx = ((glamoContextPtr)sharedContextPrivate)->glCtx;
++	else
++		shareCtx = NULL;
++	context->glCtx = _mesa_create_context(glVisual, shareCtx,
++		                        &functions, (void *)context);
++	if ( context->glCtx == NULL ) {
++		FREE(context);
++		return GL_FALSE;
++	}
++	driContextPriv->driverPrivate = context;
++	ctx = context->glCtx;
++
++	glamoScreen = context->glamoScreen = (glamoScreenPtr)sPriv->private;
++
++	ctx->Driver.GetString = glamoGetString;
++	ctx->Driver.GetBufferSize = glamoBufferSize;
++
++	context->driContext = driContextPriv;
++	context->driScreen = sPriv;
++	context->driDrawable = NULL;
++	context->drm_fd = sPriv->fd;
++
++	/* Initialize the software rasterizer and helper modules. */
++	_swrast_CreateContext(ctx);
++	_vbo_CreateContext(ctx);
++	_tnl_CreateContext(ctx);
++	_swsetup_CreateContext(ctx);
++
++	/* Install our pipeline (see glamo_render.c) */
++	_tnl_install_pipeline(ctx, glamo_pipeline);
++
++	_swrast_allow_pixel_fog(ctx, GL_TRUE);
++	_swrast_allow_vertex_fog(ctx, GL_FALSE);
++	_tnl_allow_pixel_fog(ctx, GL_TRUE);
++	_tnl_allow_vertex_fog(ctx, GL_FALSE);
++
++	glamoInitCmdqCache(context);
++	glamoInitStateFuncs(ctx);
++	glamoInitTriFuncs(ctx);
++
++	return GL_TRUE;
++}
++
++
++void glamoDestroyContext(__DRIcontext *driContextPriv)
++{
++	glamoContextPtr context;
++
++	context = (glamoContextPtr)driContextPriv->driverPrivate;
++	assert(context != NULL);
++
++	if ( context != NULL ) {
++
++		_swsetup_DestroyContext(context->glCtx);
++		_tnl_DestroyContext(context->glCtx);
++		_vbo_DestroyContext(context->glCtx);
++		_swrast_DestroyContext(context->glCtx);
++
++		_mesa_destroy_context(context->glCtx);
++
++	}
++
++	FREE(context);
++}
++
++
++void glamo_update_renderbuffers(__DRIcontext *context,
++                                __DRIdrawable *drawable)
++{
++	unsigned int attachments[10];
++	__DRIbuffer *buffers;
++	__DRIscreen *screen;
++	int i, count;
++	struct glamo_framebuffer *draw;
++	glamoContextPtr glamo;
++	struct glamo_bo *bo;
++
++	draw = drawable->driverPrivate;
++	screen = context->driScreenPriv;
++	glamo = (glamoContextPtr)context->driverPrivate;
++	i = 0;
++	if ( draw->color_rb[0] ) {
++		attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
++	}
++	if ( draw->color_rb[1] ) {
++		attachments[i++] = __DRI_BUFFER_BACK_LEFT;
++	}
++
++	buffers = screen->dri2.loader->getBuffers(drawable,
++	                                          &drawable->w,
++	                                          &drawable->h,
++	                                          attachments, i,
++	                                          &count,
++	                                          drawable->loaderPrivate);
++	if ( buffers == NULL ) return;
++
++	/* Set one cliprect to cover the whole drawable */
++	drawable->x = 0;
++	drawable->y = 0;
++	drawable->backX = 0;
++	drawable->backY = 0;
++	drawable->numClipRects = 1;
++	drawable->pClipRects[0].x1 = 0;
++	drawable->pClipRects[0].y1 = 0;
++	drawable->pClipRects[0].x2 = drawable->w;
++	drawable->pClipRects[0].y2 = drawable->h;
++	drawable->numBackClipRects = 1;
++	drawable->pBackClipRects[0].x1 = 0;
++	drawable->pBackClipRects[0].y1 = 0;
++	drawable->pBackClipRects[0].x2 = drawable->w;
++	drawable->pBackClipRects[0].y2 = drawable->h;
++
++	/* For each attachment */
++	for ( i=0; i<count; i++ ) {
++
++		struct glamo_renderbuffer *grb;
++
++		switch ( buffers[i].attachment ) {
++		case __DRI_BUFFER_FRONT_LEFT:
++			grb = draw->color_rb[0];
++			break;
++		case __DRI_BUFFER_BACK_LEFT:
++			grb = draw->color_rb[1];
++			break;
++		case __DRI_BUFFER_DEPTH:
++			grb = glamo_get_renderbuffer(&draw->base, BUFFER_DEPTH);
++			break;
++		case __DRI_BUFFER_STENCIL:
++			grb = glamo_get_renderbuffer(&draw->base,
++			                                        BUFFER_STENCIL);
++			break;
++		case __DRI_BUFFER_FAKE_FRONT_LEFT:
++			grb = draw->color_rb[0];
++			break;
++		case __DRI_BUFFER_ACCUM:
++		default:
++			fprintf(stderr,
++				"Unhandled buffer attach event,"
++				" attachment type %d\n", buffers[i].attachment);
++			return;
++		}
++
++		if ( grb == NULL ) {
++			/* Don't know how to handle this type of buffer */
++			continue;
++		}
++
++		if ( grb->bo ) {
++			uint32_t name = glamo_gem_get_name(grb->bo);
++			if ( name == buffers[i].name ) {
++				/* Buffer already attached.  No action needed */
++				continue;
++			}
++		}
++
++		grb->cpp = buffers[i].cpp;
++		grb->pitch = buffers[i].pitch;
++		grb->width = drawable->w;
++		grb->height = drawable->h;
++
++		bo = glamo_bo_open(glamo->glamoScreen->bom, buffers[i].name,
++		                   0, 0, GLAMO_GEM_DOMAIN_VRAM,
++		                   buffers[i].flags);
++		if ( bo == NULL ) {
++			fprintf(stderr, "Failed to attach buffer %d\n",
++				buffers[i].name);
++		}
++
++		glamo_renderbuffer_set_bo(grb, bo);
++		glamo_bo_unref(bo);
++
++	}
++
++	driUpdateFramebufferSize(glamo->glCtx, drawable);
++}
++
++
++GLboolean glamoMakeCurrent(__DRIcontext *driContextPriv,
++                           __DRIdrawable *driDrawPriv,
++                           __DRIdrawable *driReadPriv)
++{
++	struct glamo_framebuffer *draw_fb;
++	struct gl_framebuffer *read_fb;
++	glamoContextPtr glamo;
++
++	if ( driContextPriv == NULL ) {
++		_mesa_make_current(NULL, NULL, NULL);
++		return GL_TRUE;
++	}
++
++	/* The Glamo context we're switching to */
++	glamo = (glamoContextPtr)driContextPriv->driverPrivate;
++
++	glamo->driDrawable = driDrawPriv;
++
++	/* These two will probably be the same */
++	draw_fb = (struct glamo_framebuffer *)driDrawPriv->driverPrivate;
++	read_fb = (struct gl_framebuffer *)driReadPriv->driverPrivate;
++
++	glamo_update_renderbuffers(driContextPriv, driDrawPriv);
++	if (driDrawPriv != driReadPriv)
++		glamo_update_renderbuffers(driContextPriv, driReadPriv);
++
++	_mesa_make_current(glamo->glCtx, &draw_fb->base, read_fb);
++	_mesa_update_state(glamo->glCtx);
++
++	return GL_TRUE;
++}
++
++
++GLboolean glamoUnbindContext(__DRIcontext *driContextPriv)
++{
++	return GL_TRUE;
++}
++
++
++/* Convert IEEE754 32-bit float to Glamo's signed 24-bit float */
++uint32_t float7s16(GLfloat in)
++{
++	uint32_t a, b;
++	uint32_t sign, expo, mant;  /* Sign, exponent, significand */
++
++	a = *(uint32_t *)&in;
++
++	/* This is bad */
++	if ( a & 0x40000000 ) {
++		printf(stderr, "Warning: Exponent won't fit into 7 bits\n");
++	}
++
++	/* This hopefully isn't a big problem */
++	if ( a & 0x0000007f ) {
++		printf(stderr, "Warning: Precision lost in FP conversion\n");
++	}
++
++	/* Separate out the right bits */
++	mant = a & 0x007fff80;  /* Bits 7-22 (bits 0-6 are lost) */
++	expo = a & 0x3f800000;  /* Bits 23-29 (bit 30 is lost) */
++	sign = a & 0x80000000;  /* Bit 31 */
++
++	/* Shift and recombine */
++	b  = sign >> 8;  /* Fills bit 23 */
++	b |= expo >> 7;  /* Fills bits 16-22 */
++	b |= mant >> 7;  /* Fills bits 0-15 */
++
++	return b;
++}
+diff --git a/src/mesa/drivers/dri/glamo/glamo_context.h b/src/mesa/drivers/dri/glamo/glamo_context.h
+new file mode 100644
+index 0000000..ccce29c
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_context.h
+@@ -0,0 +1,106 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
++ * Roughly based on sis_context.h (c) 2003 Eric Anholt
++ *
++ * 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 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.
++ */
++
++#ifndef __GLAMO_CONTEXT_H
++#define __GLAMO_CONTEXT_H
++
++
++#include "dri_util.h"
++#include "utils.h"
++#include "tnl/t_vertex.h"
++
++#include "glamo_screen.h"
++
++
++typedef struct glamo_context glamoContext;
++typedef struct glamo_context *glamoContextPtr;
++
++struct glamo_context {
++
++	GLcontext *glCtx;                  /* Must be first in this structure */
++
++	int drm_fd;                        /* DRM fd */
++
++	__DRIcontext  *driContext;  /* DRI context */
++	__DRIscreen   *driScreen;   /* DRI screen */
++	__DRIdrawable *driDrawable; /* DRI drawable bound to this ctx */
++
++	glamoScreenPtr glamoScreen;        /* Screen private DRI data */
++
++	driOptionCache optionCache;
++
++	uint16_t *cmdq_drm;                /* Command queue cache */
++	uint16_t cmd_burst_base;
++	int cmdq_drm_used;
++	int cmdq_drm_size;
++	int cmdq_obj_used;
++	uint32_t *cmdq_objs;
++	unsigned int *cmdq_obj_pos;
++
++	/* Information about the current primitive */
++	struct {
++		GLuint id;
++		uint32_t primitive;	/* Current hardware primitive type */
++		struct glamo_bo *vb_bo;
++		uint8_t *vb;
++		unsigned int start_offset; /* Byte offset of start */
++		unsigned int current_offset; /* Byte offset of next vertex */
++		unsigned int count;	/* Number of vertices */
++	} prim;
++
++	/* Current vertex format and attributes */
++	int vertex_size;
++	struct tnl_attr_map vertex_attrs[VERT_ATTRIB_MAX];
++
++	/* State */
++	GLuint new_state;      /* State which must be updated */
++	uint16_t col_clear;
++
++};
++
++#define GLAMO_CONTEXT(ctx) ((glamoContextPtr)(ctx->DriverCtx))
++
++#define TAG(x) glamo##x
++#include "tnl_dd/t_dd_vertex.h"
++#undef TAG
++
++extern GLboolean glamoCreateContext(const __GLcontextModes *glVis,
++                                    __DRIcontext *driContextPriv,
++                                    void *sharedContextPrivate);
++extern void glamoDestroyContext(__DRIcontext *dcp);
++extern GLboolean glamoMakeCurrent(__DRIcontext *driContextPriv,
++                                  __DRIdrawable *driDrawPriv,
++                                  __DRIdrawable *driReadPriv);
++extern GLboolean glamoUnbindContext(__DRIcontext *driContextPriv);
++extern void glamo_update_renderbuffers(__DRIcontext *context,
++                                       __DRIdrawable *drawable);
++
++#define GLAMO_PACKCOLOR565(r, g, b) \
++	((((r) & 0xf8) << 8)        \
++	| (((g) & 0xfc) << 3)       \
++	| (((b) & 0xf8) >> 3))
++
++extern uint32_t float7s16(GLfloat in);
++
++#endif   /* __GLAMO_CONTEXT_H */
+diff --git a/src/mesa/drivers/dri/glamo/glamo_fbo.c b/src/mesa/drivers/dri/glamo/glamo_fbo.c
+new file mode 100644
+index 0000000..c866d21
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_fbo.c
+@@ -0,0 +1,130 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
++ * Roughly based on radeon_fbo.c (c) 2008 Red Hat Inc
++ *
++ * 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 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.
++ */
++
++
++#include "main/imports.h"
++#include "main/macros.h"
++#include "main/mtypes.h"
++#include "main/formats.h"
++#include "main/fbobject.h"
++#include "main/framebuffer.h"
++#include "main/renderbuffer.h"
++#include "main/context.h"
++#include "dri_util.h"
++
++/* This comes from libdrm_glamo */
++#include <glamo_bo.h>
++
++#include "glamo_fbo.h"
++
++
++static void glamo_delete_renderbuffer(struct gl_renderbuffer *rb)
++{
++   struct glamo_renderbuffer *grb = glamo_renderbuffer(rb);
++
++   ASSERT(grb);
++
++   if ( grb && grb->bo ) {
++      glamo_bo_unref(grb->bo);
++   }
++   _mesa_free(grb);
++}
++
++
++static void *glamo_get_pointer(GLcontext *ctx, struct gl_renderbuffer *rb,
++                               GLint x, GLint y)
++{
++   return NULL;   /* Can't be directly addressed */
++}
++
++
++/* Called for each hardware renderbuffer when a _window_ is resized.
++ * Just update fields.
++ * Not used for user-created renderbuffers!
++ */
++static GLboolean glamo_alloc_window_storage(GLcontext *ctx,
++                                            struct gl_renderbuffer *rb,
++                                            GLenum internalFormat,
++                                            GLuint width, GLuint height)
++{
++   ASSERT(rb->Name == 0);
++   rb->Width = width;
++   rb->Height = height;
++   rb->Format = internalFormat;
++   return GL_TRUE;
++}
++
++
++/* Create a buffer, such as a colour or depth buffer */
++struct glamo_renderbuffer *glamo_create_renderbuffer(GLenum format,
++                                              __DRIdrawable *driDrawPriv)
++{
++   struct glamo_renderbuffer *grb;
++
++   grb = CALLOC_STRUCT(glamo_renderbuffer);
++   if ( !grb ) return NULL;
++
++   _mesa_init_renderbuffer(&grb->base, 0);
++   grb->base.ClassID = GLAMO_RB_CLASS;
++
++   switch (format) {
++      case GL_RGB5:
++         grb->base.Format = MESA_FORMAT_RGB565;
++         grb->base._BaseFormat = GL_RGB;
++
++         grb->base.DataType = GL_UNSIGNED_BYTE;
++         break;
++      case GL_DEPTH_COMPONENT16:
++         grb->base.DataType = GL_UNSIGNED_SHORT;
++	 grb->base._BaseFormat = GL_DEPTH_COMPONENT;
++         break;
++      default:
++         fprintf(stderr, "%s: Unknown format 0x%04x\n", __FUNCTION__, format);
++         _mesa_delete_renderbuffer(&grb->base);
++         return NULL;
++   }
++
++   grb->dPriv = driDrawPriv;
++   grb->base.InternalFormat = format;
++
++   grb->base.Delete = glamo_delete_renderbuffer;
++   grb->base.AllocStorage = glamo_alloc_window_storage;
++   grb->base.GetPointer = glamo_get_pointer;
++
++   return grb;
++}
++
++
++void glamo_renderbuffer_set_bo(struct glamo_renderbuffer *grb,
++                               struct glamo_bo *bo)
++{
++  struct glamo_bo *old;
++  old = grb->bo;
++  grb->bo = bo;
++  glamo_bo_ref(bo);
++  if ( old ) glamo_bo_unref(old);
++}
++
++
++/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
+diff --git a/src/mesa/drivers/dri/glamo/glamo_fbo.h b/src/mesa/drivers/dri/glamo/glamo_fbo.h
+new file mode 100644
+index 0000000..48210dd
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_fbo.h
+@@ -0,0 +1,77 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
++ *
++ * 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 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.
++ */
++
++#ifndef __GLAMO_FBO_H
++#define __GLAMO_FBO_H
++
++
++#include "main/mtypes.h"
++#include "dri_util.h"
++
++
++/* This is just a marker so we can tell a Glamo renderbuffer from a Mesa one */
++#define GLAMO_RB_CLASS (0xdeadbeef)
++
++
++struct glamo_renderbuffer
++{
++	struct gl_renderbuffer base;   /* Must be first */
++	struct glamo_bo *bo;
++	unsigned int cpp;
++	unsigned int pitch;
++	unsigned int width;
++	unsigned int height;
++
++	__DRIdrawable *dPriv;
++};
++
++
++struct glamo_framebuffer
++{
++	struct gl_framebuffer base;
++	struct glamo_renderbuffer *color_rb[2];
++};
++
++
++/* This is just a small wrapper function to return NULL if the gl_renderbuffer
++ * is not a glamo_renderbuffer */
++static inline struct glamo_renderbuffer
++                                 *glamo_renderbuffer(struct gl_renderbuffer *rb)
++{
++	struct glamo_renderbuffer *grb = (struct glamo_renderbuffer *)rb;
++	if ( grb && grb->base.ClassID == GLAMO_RB_CLASS )
++		return grb;
++	else
++		return NULL;
++}
++
++
++extern struct glamo_renderbuffer *glamo_create_renderbuffer(GLenum format,
++                                             __DRIdrawable *driDrawPriv);
++
++extern void glamo_renderbuffer_set_bo(struct glamo_renderbuffer *grb,
++                               struct glamo_bo *bo);
++
++#endif   /* __GLAMO_FBO_H */
++
++/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
+diff --git a/src/mesa/drivers/dri/glamo/glamo_regs.h b/src/mesa/drivers/dri/glamo/glamo_regs.h
+new file mode 100644
+index 0000000..02b2294
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_regs.h
+@@ -0,0 +1,174 @@
++#ifndef _GLAMO_REGS_H
++#define _GLAMO_REGS_H
++
++/* Smedia Glamo 336x/337x driver
++ *
++ * (C) 2007 by OpenMoko, Inc.
++ * Author: Harald Welte <laforge@openmoko.org>
++ * All rights reserved.
++ *
++ * Modified for Glamo Mesa driver by Thomas White <taw@bitwiz.org.uk>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++enum glamo_regster_offsets {
++	GLAMO_REGOFS_GENERIC	= 0x0000,
++	GLAMO_REGOFS_HOSTBUS	= 0x0200,
++	GLAMO_REGOFS_MEMORY	= 0x0300,
++	GLAMO_REGOFS_VIDCAP	= 0x0400,
++	GLAMO_REGOFS_ISP	= 0x0500,
++	GLAMO_REGOFS_JPEG	= 0x0800,
++	GLAMO_REGOFS_MPEG	= 0x0c00,
++	GLAMO_REGOFS_LCD	= 0x1100,
++	GLAMO_REGOFS_MMC	= 0x1400,
++	GLAMO_REGOFS_MPROC0	= 0x1500,
++	GLAMO_REGOFS_MPROC1	= 0x1580,
++	GLAMO_REGOFS_CMDQUEUE	= 0x1600,
++	GLAMO_REGOFS_RISC	= 0x1680,
++	GLAMO_REGOFS_2D		= 0x1700,
++	GLAMO_REGOFS_3D		= 0x1b00,
++};
++
++
++#define REG_MPEG(x)           (GLAMO_REGOFS_MPEG+(x))
++
++enum glamo_register_mpeg {
++      //
++      GLAMO_REG_MPEG_DC_ADDRL         = REG_MPEG(0x3c),
++      GLAMO_REG_MPEG_DC_ADDRH         = REG_MPEG(0x3e),
++      GLAMO_REG_MPEG_AC_ADDRL         = REG_MPEG(0x40),
++      GLAMO_REG_MPEG_AC_ADDRH         = REG_MPEG(0x42),
++      //
++      GLAMO_REG_MPEG_SAFE_1           = REG_MPEG(0x60),
++      GLAMO_REG_MPEG_SAFE_2           = REG_MPEG(0x62),
++      GLAMO_REG_MPEG_SAFE_3           = REG_MPEG(0x64),
++      //
++      GLAMO_REG_MPEG_DEC_OUT0_Y_ADDRL = REG_MPEG(0x6e),
++      GLAMO_REG_MPEG_DEC_OUT0_Y_ADDRH = REG_MPEG(0x70),
++      GLAMO_REG_MPEG_DEC_OUT0_U_ADDRL = REG_MPEG(0x72),
++      GLAMO_REG_MPEG_DEC_OUT0_U_ADDRH = REG_MPEG(0x74),
++      GLAMO_REG_MPEG_DEC_OUT0_V_ADDRL = REG_MPEG(0x76),
++      GLAMO_REG_MPEG_DEC_OUT0_V_ADDRH = REG_MPEG(0x78),
++      GLAMO_REG_MPEG_DEC_OUT1_Y_ADDRL = REG_MPEG(0x7a),
++      GLAMO_REG_MPEG_DEC_OUT1_Y_ADDRH = REG_MPEG(0x7c),
++      GLAMO_REG_MPEG_DEC_OUT1_U_ADDRL = REG_MPEG(0x7e),
++      GLAMO_REG_MPEG_DEC_OUT1_U_ADDRH = REG_MPEG(0x80),
++      GLAMO_REG_MPEG_DEC_OUT1_V_ADDRL = REG_MPEG(0x82),
++      GLAMO_REG_MPEG_DEC_OUT1_V_ADDRH = REG_MPEG(0x84),
++      GLAMO_REG_MPEG_DEC_OUT2_Y_ADDRL = REG_MPEG(0x86),
++      GLAMO_REG_MPEG_DEC_OUT2_Y_ADDRH = REG_MPEG(0x88),
++      GLAMO_REG_MPEG_DEC_OUT2_U_ADDRL = REG_MPEG(0x8a),
++      GLAMO_REG_MPEG_DEC_OUT2_U_ADDRH = REG_MPEG(0x8c),
++      GLAMO_REG_MPEG_DEC_OUT2_V_ADDRL = REG_MPEG(0x8e),
++      GLAMO_REG_MPEG_DEC_OUT2_V_ADDRH = REG_MPEG(0x90),
++      GLAMO_REG_MPEG_DEC_WIDTH        = REG_MPEG(0x92),
++      GLAMO_REG_MPEG_DEC_HEIGHT       = REG_MPEG(0x94),
++      GLAMO_REG_MPEG_SPECIAL          = REG_MPEG(0x96),
++      GLAMO_REG_MPEG_DEC_IN_ADDRL     = REG_MPEG(0x98),
++      GLAMO_REG_MPEG_DEC_IN_ADDRH     = REG_MPEG(0x9a),
++      //
++      GLAMO_REG_MPEG_DEBLK_THRESHOLD  = REG_MPEG(0xc0),
++      //
++      GLAMO_REG_MPEG_DEC_STATUS       = REG_MPEG(0xc8),
++      GLAMO_REG_MPEG_DEC_RB0          = REG_MPEG(0xca),
++      GLAMO_REG_MPEG_DEC_RB1          = REG_MPEG(0xcc),
++};
++
++
++#define REG_2D(x)		(GLAMO_REGOFS_2D+(x))
++
++enum glamo_register_2d {
++	GLAMO_REG_2D_SRC_ADDRL		= REG_2D(0x00),
++	GLAMO_REG_2D_SRC_ADDRH		= REG_2D(0x02),
++	GLAMO_REG_2D_SRC_PITCH		= REG_2D(0x04),
++	GLAMO_REG_2D_SRC_X		= REG_2D(0x06),
++	GLAMO_REG_2D_SRC_Y		= REG_2D(0x08),
++	GLAMO_REG_2D_DST_X		= REG_2D(0x0a),
++	GLAMO_REG_2D_DST_Y		= REG_2D(0x0c),
++	GLAMO_REG_2D_DST_ADDRL		= REG_2D(0x0e),
++	GLAMO_REG_2D_DST_ADDRH		= REG_2D(0x10),
++	GLAMO_REG_2D_DST_PITCH		= REG_2D(0x12),
++	GLAMO_REG_2D_DST_HEIGHT		= REG_2D(0x14),
++	GLAMO_REG_2D_RECT_WIDTH		= REG_2D(0x16),
++	GLAMO_REG_2D_RECT_HEIGHT	= REG_2D(0x18),
++	GLAMO_REG_2D_PAT_ADDRL		= REG_2D(0x1a),
++	GLAMO_REG_2D_PAT_ADDRH		= REG_2D(0x1c),
++	GLAMO_REG_2D_PAT_FG		= REG_2D(0x1e),
++	GLAMO_REG_2D_PAT_BG		= REG_2D(0x20),
++	GLAMO_REG_2D_SRC_FG		= REG_2D(0x22),
++	GLAMO_REG_2D_SRC_BG		= REG_2D(0x24),
++	GLAMO_REG_2D_MASK1		= REG_2D(0x26),
++	GLAMO_REG_2D_MASK2		= REG_2D(0x28),
++	GLAMO_REG_2D_MASK3		= REG_2D(0x2a),
++	GLAMO_REG_2D_MASK4		= REG_2D(0x2c),
++	GLAMO_REG_2D_ROT_X		= REG_2D(0x2e),
++	GLAMO_REG_2D_ROT_Y		= REG_2D(0x30),
++	GLAMO_REG_2D_LEFT_CLIP		= REG_2D(0x32),
++	GLAMO_REG_2D_TOP_CLIP		= REG_2D(0x34),
++	GLAMO_REG_2D_RIGHT_CLIP		= REG_2D(0x36),
++	GLAMO_REG_2D_BOTTOM_CLIP	= REG_2D(0x38),
++	GLAMO_REG_2D_COMMAND1		= REG_2D(0x3A),
++	GLAMO_REG_2D_COMMAND2		= REG_2D(0x3C),
++	GLAMO_REG_2D_COMMAND3		= REG_2D(0x3E),
++	GLAMO_REG_2D_SAFE		= REG_2D(0x40),
++	GLAMO_REG_2D_STATUS		= REG_2D(0x42),
++	GLAMO_REG_2D_ID1		= REG_2D(0x44),
++	GLAMO_REG_2D_ID2		= REG_2D(0x46),
++	GLAMO_REG_2D_ID3		= REG_2D(0x48),
++};
++
++
++/* No offset this time */
++#define REG_3D(x)		(x)
++
++enum glamo_register_3d
++{
++	/* Fire the engine */
++	G3D_FIRE			= REG_3D(0x2058),
++
++	/* Streams of vertex/colour/normal/texcoord data */
++	G3D_ACTIVE_STREAMS		= REG_3D(0x1f00),
++	G3D_LAST_STREAM__VCOLFMT	= REG_3D(0x2030),
++	G3D_STREAM_MODE_0		= REG_3D(0x1f10),
++	G3D_STREAM_BASE_0		= REG_3D(0x1f14),
++	G3D_STREAM_MODE_1		= REG_3D(0x1f18),
++	G3D_STREAM_BASE_1		= REG_3D(0x1f1c),
++	G3D_STREAM_MODE_2		= REG_3D(0x1f20),
++	G3D_STREAM_BASE_2		= REG_3D(0x1f24),
++	G3D_STREAM_MODE_3		= REG_3D(0x1f28),
++	G3D_STREAM_BASE_3		= REG_3D(0x1f2c),
++	G3D_STREAM_MODE_4		= REG_3D(0x1f30),
++	G3D_STREAM_BASE_4		= REG_3D(0x1f34),
++	G3D_STREAM_MODE_5		= REG_3D(0x1f38),
++	G3D_STREAM_BASE_5		= REG_3D(0x1f3c),
++	G3D_STREAM_MODE_6		= REG_3D(0x1f40),
++	G3D_STREAM_BASE_6		= REG_3D(0x1f44),
++	G3D_STREAM_MODE_7		= REG_3D(0x1f48),
++	G3D_STREAM_BASE_7		= REG_3D(0x1f4c),
++
++	/* Modelview*projection matrix */
++	G3D_MATRIX_MVP			= REG_3D(0x26a0), /* .. 0x27df */
++
++	/* Modelview matrix */
++	G3D_MATRIX_MV			= REG_3D(0x26e0), /* .. 0x270f */
++
++	/* Inverse MVP, 3x3 only */
++	G3D_MATRIX_IMVP			= REG_3D(0x2710), /* .. 0x2733 */
++
++};
++
++#endif /* _GLAMO_REGS_H */
+diff --git a/src/mesa/drivers/dri/glamo/glamo_render.c b/src/mesa/drivers/dri/glamo/glamo_render.c
+new file mode 100644
+index 0000000..fd52418
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_render.c
+@@ -0,0 +1,230 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
++ *
++ * 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 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.
++ *
++ *
++ * Based on intel_render.c, to which the following notice applies:
++ *
++ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
++ * All Rights Reserved.
++ *
++ * 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, sub license, 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 (including the
++ * next paragraph) 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 NON-INFRINGEMENT.
++ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
++ *
++ */
++
++
++/*
++ * Render unclipped vertex buffers by emitting vertices directly to
++ * dma buffers.  Use strip/fan hardware acceleration where possible.
++ *
++ */
++#include "main/glheader.h"
++#include "main/context.h"
++#include "main/macros.h"
++#include "main/imports.h"
++#include "main/mtypes.h"
++#include "main/enums.h"
++
++#include "tnl/t_context.h"
++#include "tnl/t_vertex.h"
++#include "tnl/t_pipeline.h"
++
++#include "glamo_context.h"
++#include "glamo_tris.h"
++#include "glamo_regs.h"
++
++/*
++ * Render unclipped vertex buffers by emitting vertices directly to
++ * VRAM buffers.  Use strip/fan hardware primitives where possible.
++ * Try to simulate missing primitives with indexed vertices.
++ */
++#define HAVE_POINTS      1
++#define HAVE_LINES       1
++#define HAVE_LINE_STRIPS 0
++#define HAVE_TRIANGLES   1
++#define HAVE_TRI_STRIPS  0
++#define HAVE_TRI_STRIP_1 0
++#define HAVE_TRI_FANS    0
++#define HAVE_POLYGONS    0
++#define HAVE_QUADS       0
++#define HAVE_QUAD_STRIPS 0
++#define HAVE_ELTS        0
++
++
++static void glamoFlushPrim(struct glamo_context *gCtx)
++{
++	printf("glamoFlushPrim: %i vertices, %i %i\n", gCtx->prim.count,
++	gCtx->prim.start_offset, gCtx->prim.current_offset);
++
++	if ( gCtx->prim.vb_bo == NULL ) return;
++
++	/* Upload to hardware */
++	glamo_bo_subdata(gCtx->prim.vb_bo, 0, gCtx->prim.current_offset,
++	                 gCtx->prim.vb);
++
++	/* Dispatch to the hardware */
++	glamoDRMStartBurst(gCtx, G3D_STREAM_MODE_0);
++	glamoDRMAddData(gCtx, 0x000f0300, 4);
++	glamoDRMAddBO(gCtx, gCtx->prim.vb_bo);
++	glamoDRMDispatch(gCtx);
++
++	/* Please use a new BO for the next buffer */
++	gCtx->prim.vb_bo = NULL;
++
++	/* Continue from new start */
++	gCtx->prim.start_offset = gCtx->prim.current_offset;
++}
++
++
++static inline GLuint glamoGetVBMax(struct glamo_context *gCtx)
++{
++	return GLAMO_VB_SIZE / gCtx->vertex_size;
++}
++
++
++static inline GLuint glamoGetCurrentMax(struct glamo_context *gCtx)
++{
++	/* How many more vertices can be accommodated?
++	 * Each vertex takes up 4x 32-bit fixed point values */
++	return (GLAMO_VB_SIZE - gCtx->prim.current_offset) / gCtx->vertex_size;
++}
++
++
++#define LOCAL_VARS \
++	struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
++
++#define INIT(prim)
++
++#define FLUSH() glamoFlushPrim(gCtx)
++
++#define GET_SUBSEQUENT_VB_MAX_VERTS() glamoGetVBMax(gCtx)
++#define GET_CURRENT_VB_MAX_VERTS() glamoGetCurrentMax(gCtx)
++
++#define ALLOC_VERTS(nr) glamoGetPrimSpace(gCtx, nr)
++
++#define EMIT_VERTS(ctx, j, nr, buf) \
++	_tnl_emit_vertices_to_buffer(ctx, j, (j)+(nr), buf)
++
++#define TAG(x) glamo_##x
++#include "tnl_dd/t_dd_dmatmp.h"
++
++
++/**********************************************************************/
++/*                          Render pipeline stage                     */
++/**********************************************************************/
++
++static void glamoFireEngine(struct glamo_context *gCtx)
++{
++	glamoDRMStartBurst(gCtx, G3D_FIRE);
++	glamoDRMAddData(gCtx, 0, 2);  /* Fire! */
++	glamoDRMDispatch(gCtx);
++}
++
++
++static GLboolean glamoRunRender(GLcontext *ctx,
++                                struct tnl_pipeline_stage *stage)
++{
++	TNLcontext *tnl = TNL_CONTEXT(ctx);
++	struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
++	struct vertex_buffer *VB = &tnl->vb;
++	GLuint i;
++
++	printf("glamoRunRender\n");
++
++	/* Don't handle clipping */
++	if ( !glamo_validate_render(ctx, VB) ) {
++		return GL_TRUE; /* Failed */
++	}
++
++	/* Validate GPU state */
++	if ( gCtx->new_state ) {
++		if ( !glamoValidateState(ctx, gCtx->new_state) ) {
++			printf("Couldn't validate state...\n");
++		}
++	} /* else nothing to update */
++
++	tnl->clipspace.new_inputs |= VERT_BIT_POS;
++
++	tnl->Driver.Render.Start(ctx);
++
++	for ( i=0; i<VB->PrimitiveCount; i++ ) {
++
++		GLuint prim = _tnl_translate_prim(&VB->Primitive[i]);
++		GLuint start = VB->Primitive[i].start;
++		GLuint length = VB->Primitive[i].count;
++
++		if (!length) continue;
++
++		glamo_render_tab_verts[prim & PRIM_MODE_MASK](ctx, start,
++                                                     start + length, prim);
++
++	}
++
++	tnl->Driver.Render.Finish(ctx);
++
++	glamoFireEngine(gCtx);
++
++	return GL_FALSE;  /* Ok */
++}
++
++
++static const struct tnl_pipeline_stage _glamo_render_stage = {
++	"glamo render",
++	NULL,
++	NULL,
++	NULL,
++	NULL,
++	glamoRunRender
++};
++
++
++const struct tnl_pipeline_stage *glamo_pipeline[] = {
++	&_tnl_vertex_transform_stage,
++	&_tnl_vertex_cull_stage,
++	&_tnl_normal_transform_stage,
++	&_tnl_lighting_stage,
++	&_tnl_fog_coordinate_stage,
++	&_tnl_texgen_stage,
++	&_tnl_texture_transform_stage,
++	&_tnl_point_attenuation_stage,
++	&_tnl_vertex_program_stage,
++	&_glamo_render_stage,        /* ADD: unclipped rastersetup-to-dma */
++	&_tnl_render_stage,
++	0,
++};
+diff --git a/src/mesa/drivers/dri/glamo/glamo_render.h b/src/mesa/drivers/dri/glamo/glamo_render.h
+new file mode 100644
+index 0000000..99c36a8
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_render.h
+@@ -0,0 +1,31 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
++ *
++ * 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 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.
++ */
++
++#ifndef __GLAMO_RENDER_H
++#define __GLAMO_RENDER_H
++
++#include "main/mtypes.h"
++
++extern const struct tnl_pipeline_stage *glamo_pipeline[];
++
++#endif   /* __GLAMO_RENDER_H */
+diff --git a/src/mesa/drivers/dri/glamo/glamo_screen.c b/src/mesa/drivers/dri/glamo/glamo_screen.c
+new file mode 100644
+index 0000000..39148f3
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_screen.c
+@@ -0,0 +1,250 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
++ * Roughly based on sis_screen.c (c) 2003 Eric Anholt
++ *
++ * 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 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.
++ */
++
++
++#include "dri_util.h"
++#include "utils.h"
++#include "xmlconfig.h"
++#include "GL/internal/dri_interface.h"
++#include "main/framebuffer.h"
++#include "main/renderbuffer.h"
++
++#include "glamo_screen.h"
++#include "glamo_context.h"
++#include "glamo_fbo.h"
++
++/* This comes from libdrm_glamo */
++#include <glamo_bo_gem.h>
++
++
++static int glamoInitDriver(__DRIscreen *psp)
++{
++   return 0;
++}
++
++
++static glamoScreenPtr glamoCreateScreen(__DRIscreen *sPriv)
++{
++   glamoScreenPtr glamoScreen;
++
++   /* Allocate the private area */
++   glamoScreen = (glamoScreenPtr)CALLOC(sizeof(*glamoScreen));
++   if ( glamoScreen == NULL )
++      return NULL;
++
++   glamoScreen->driScreen = sPriv;
++
++   /* This is our link to the kernel's memory manager, via libdrm */
++   glamoScreen->bom = glamo_bo_manager_gem_ctor(sPriv->fd);
++
++   return glamoScreen;
++}
++
++
++static void glamoDestroyScreen(__DRIscreen *sPriv)
++{
++   glamoScreenPtr glamoScreen = (glamoScreenPtr)sPriv->private;
++
++   if ( glamoScreen == NULL )
++      return;
++
++   FREE(glamoScreen);
++   sPriv->private = NULL;
++}
++
++
++static const __DRIconfig **glamoInitScreen(__DRIscreen *sPriv)
++{
++   __DRIconfig **configs;
++   uint8_t depth_bits_array[2];
++   uint8_t stencil_bits_array[2];
++   uint8_t msaa_samples_array[1];
++   static const GLenum db_modes[] = { GLX_SWAP_COPY_OML, GLX_NONE };
++
++   /* Driver initialisation */
++   if ( glamoInitDriver(sPriv) ) {
++      return NULL;
++   }
++
++   /* Screen-specific initialisation */
++   sPriv->private = glamoCreateScreen(sPriv);
++   if ( !sPriv->private ) {
++      glamoDestroyScreen(sPriv);
++      return NULL;
++   }
++
++   depth_bits_array[0] = 0;
++   stencil_bits_array[0] = 0;
++   depth_bits_array[1] = 16;
++   stencil_bits_array[1] = 0;
++   msaa_samples_array[0] = 0;
++
++   configs = driCreateConfigs(GL_RGB, GL_UNSIGNED_SHORT_5_6_5,
++                           depth_bits_array, stencil_bits_array, 2,
++                           db_modes, 2, msaa_samples_array, 1, GL_TRUE);
++
++   if ( configs == NULL ) {
++      fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__);
++      return NULL;
++   }
++
++   return (const __DRIconfig **)configs;
++}
++
++
++static const __DRIconfig **glamoInitScreen2(__DRIscreen *sPriv)
++{
++   __DRIconfig **configs;
++   uint8_t depth_bits_array[2];
++   uint8_t stencil_bits_array[2];
++   uint8_t msaa_samples_array[1];
++   static const GLenum db_modes[] = { GLX_SWAP_COPY_OML, GLX_NONE };
++
++   /* Driver initialisation */
++   if ( glamoInitDriver(sPriv) ) {
++      return NULL;
++   }
++
++   /* Screen-specific initialisation */
++   sPriv->private = glamoCreateScreen(sPriv);
++   if ( !sPriv->private ) {
++      glamoDestroyScreen(sPriv);
++      return NULL;
++   }
++
++   depth_bits_array[0] = 0;
++   stencil_bits_array[0] = 0;
++   depth_bits_array[1] = 16;
++   stencil_bits_array[1] = 0;
++   msaa_samples_array[0] = 0;
++
++   configs = driCreateConfigs(GL_RGB, GL_UNSIGNED_SHORT_5_6_5,
++                           depth_bits_array, stencil_bits_array, 2,
++                           db_modes, 2, msaa_samples_array, 1, GL_TRUE);
++
++   if ( configs == NULL ) {
++      fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__);
++      return NULL;
++   }
++
++   return (const __DRIconfig **)configs;
++}
++
++
++/* Allocate buffers for a context.  This is where the fun starts... */
++static GLboolean glamoCreateBuffer(__DRIscreen *driScrnPriv,
++                                   __DRIdrawable *driDrawPriv,
++                                   const __GLcontextModes *mesaVis,
++                                   GLboolean isPixmap)
++{
++   struct glamo_framebuffer *gfb;
++   GLenum rgbFormat;
++
++   if ( isPixmap ) return GL_FALSE; /* not implemented */
++
++   gfb = CALLOC_STRUCT(glamo_framebuffer);
++   if ( !gfb ) return GL_FALSE;
++
++   _mesa_initialize_framebuffer(&gfb->base, mesaVis);
++
++   /* we only support this one format at the moment */
++   rgbFormat = GL_RGB5;
++
++   /* Front color renderbuffer */
++   gfb->color_rb[0] = glamo_create_renderbuffer(rgbFormat, driDrawPriv);
++   _mesa_add_renderbuffer(&gfb->base, BUFFER_FRONT_LEFT,
++                          &gfb->color_rb[0]->base);
++
++   /* Back color renderbuffer, if requested */
++   if ( mesaVis->doubleBufferMode ) {
++      gfb->color_rb[1] = glamo_create_renderbuffer(rgbFormat, driDrawPriv);
++      _mesa_add_renderbuffer(&gfb->base, BUFFER_BACK_LEFT,
++                             &gfb->color_rb[1]->base);
++   }
++
++   if ( mesaVis->depthBits == 16 ) {
++      struct glamo_renderbuffer *depth;
++      depth = glamo_create_renderbuffer(GL_DEPTH_COMPONENT16, driDrawPriv);
++      _mesa_add_renderbuffer(&gfb->base, BUFFER_DEPTH, &depth->base);
++   }
++
++   /* Add software renderbuffers for the things we can't support in hardware */
++   _mesa_add_soft_renderbuffers(&gfb->base,
++      GL_FALSE,  /* color */
++      GL_FALSE,  /* depth */
++      mesaVis->stencilBits > 0,   /* stencil, if required */
++      mesaVis->accumRedBits > 0,  /* accum, if required */
++      GL_FALSE,  /* alpha */
++      GL_FALSE   /* aux */
++   );
++   driDrawPriv->driverPrivate = (void *)gfb;
++
++   return (driDrawPriv->driverPrivate != NULL);
++}
++
++
++static void glamoDestroyBuffer(__DRIdrawable *driDrawPriv)
++{
++}
++
++
++static void glamoSwapBuffers(__DRIdrawable *driDrawPriv)
++{
++   printf("glamoSwapBuffers\n"); fflush(stdout);
++}
++
++
++/*
++ *  Mesa entry points
++ *
++ *  See src/mesa/drivers/dri/common/dri_util.h for information about these
++ */
++const struct __DriverAPIRec driDriverAPI = {
++   .InitScreen      = glamoInitScreen,
++   .DestroyScreen   = glamoDestroyScreen,
++   .CreateContext   = glamoCreateContext,
++   .DestroyContext  = glamoDestroyContext,
++   .CreateBuffer    = glamoCreateBuffer,
++   .DestroyBuffer   = glamoDestroyBuffer,
++   .SwapBuffers     = glamoSwapBuffers,
++   .MakeCurrent     = glamoMakeCurrent,
++   .UnbindContext   = glamoUnbindContext,
++   .GetSwapInfo     = NULL,   /* Not used */
++   .WaitForMSC      = NULL,
++   .WaitForSBC      = NULL,
++   .SwapBuffersMSC  = NULL,
++   .CopySubBuffer   = NULL,
++   .GetDrawableMSC  = NULL,   /* Not used */
++   .InitScreen2     = glamoInitScreen2,    /* For DRI2 */
++};
++
++/* This is the table of extensions that the loader will dlsym() for. */
++PUBLIC const __DRIextension *__driDriverExtensions[] = {
++    &driCoreExtension.base,
++    &driLegacyExtension.base,
++    &driDRI2Extension.base,
++    NULL
++};
++
++/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
+diff --git a/src/mesa/drivers/dri/glamo/glamo_screen.h b/src/mesa/drivers/dri/glamo/glamo_screen.h
+new file mode 100644
+index 0000000..3f2eb5f
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_screen.h
+@@ -0,0 +1,44 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
++ * Roughly based on sis_screen.h (c) 2003 Eric Anholt
++ *
++ * 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 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.
++ */
++
++#ifndef __GLAMO_SCREEN_H
++#define __GLAMO_SCREEN_H
++
++#include "xmlconfig.h"
++#include "dri_util.h"
++
++#include <glamo_bo_gem.h>
++
++typedef struct {
++
++   __DRIscreen *driScreen;
++   driOptionCache optionCache;
++
++   struct glamo_bo_manager *bom;
++
++} glamoScreenRec, *glamoScreenPtr;
++
++#endif   /* __GLAMO_SCREEN_H */
++
++/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
+diff --git a/src/mesa/drivers/dri/glamo/glamo_state.c b/src/mesa/drivers/dri/glamo/glamo_state.c
+new file mode 100644
+index 0000000..4046c24
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_state.c
+@@ -0,0 +1,304 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009-2010 Thomas White <taw@bitwiz.org.uk>
++ * Roughly based on sis_state.c (c) 2003 Eric Anholt
++ *
++ * 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 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.
++ *
++ *
++ * Also partially based on intel_fbo.c, to which the following notice applies:
++ *
++ * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
++ * All Rights Reserved.
++ *
++ * 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, sub license, 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 (including the
++ * next paragraph) 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 NON-INFRINGEMENT.
++ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
++ */
++
++
++#include "main/context.h"
++#include "main/framebuffer.h"
++#include "main/api_arrayelt.h"
++#include "swrast/swrast.h"
++#include "swrast_setup/swrast_setup.h"
++#include "tnl/tnl.h"
++
++#include "glamo_fbo.h"
++#include "glamo_state.h"
++#include "glamo_context.h"
++#include "glamo_cmdq.h"
++#include "glamo_regs.h"
++
++
++static void glamoResizeBuffers(GLcontext *ctx, struct gl_framebuffer *fb,
++                               GLuint width, GLuint height)
++{
++	struct glamo_framebuffer *glamo_fb = (struct glamo_framebuffer *)fb;
++	int i;
++
++	_mesa_resize_framebuffer(ctx, fb, width, height);
++
++	fb->Initialized = GL_TRUE; /* XXX remove someday */
++
++	if (fb->Name != 0) {
++		return;
++	}
++
++	/* Make sure all window system renderbuffers are up to date */
++	for (i = 0; i < 2; i++) {
++		struct gl_renderbuffer *rb = &glamo_fb->color_rb[i]->base;
++
++		/* only resize if size is changing */
++		if (rb && (rb->Width != width || rb->Height != height)) {
++			rb->AllocStorage(ctx, rb, rb->InternalFormat,
++		                         width, height);
++		}
++	}
++}
++
++
++static void glamoClear(GLcontext *ctx, GLbitfield mask)
++{
++	glamoContext *gCtx;
++	struct gl_framebuffer *fb;
++	int i;
++
++	gCtx = GLAMO_CONTEXT(ctx);
++	fb = ctx->DrawBuffer;
++
++	printf("glamoClear (%f %f %f %f)\n", ctx->Color.ClearColor[0],
++	       ctx->Color.ClearColor[1], ctx->Color.ClearColor[2],
++	       ctx->Color.ClearColor[3]); fflush(stdout);
++
++	for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
++
++		struct glamo_renderbuffer *grb;
++
++		grb = glamo_renderbuffer(fb->_ColorDrawBuffers[i]);
++
++		glamoDRMStartBurst(gCtx, GLAMO_REG_2D_DST_X);
++		glamoDRMAddData(gCtx, fb->_Xmin, 2);           /* dest X */
++		glamoDRMAddData(gCtx, fb->_Ymin, 2);           /* dest Y */
++		glamoDRMAddBO(gCtx, grb->bo);                  /* dest L/H */
++		glamoDRMAddData(gCtx, grb->pitch & 0x7ff, 2);  /* dest pitch */
++		glamoDRMAddData(gCtx, grb->height, 2);         /* dest height */
++		glamoDRMAddData(gCtx, fb->_Xmax-fb->_Xmin, 2); /* width */
++		glamoDRMAddData(gCtx, fb->_Ymax-fb->_Ymin, 2); /* height */
++		glamoDRMAddData(gCtx, 0x0000, 2);              /* patt L */
++		glamoDRMAddData(gCtx, 0x0000, 2);              /* patt H */
++		glamoDRMAddData(gCtx, gCtx->col_clear, 2);     /* FG colour */
++		glamoDRMDispatch(gCtx);
++
++		glamoDRMStartBurst(gCtx, GLAMO_REG_2D_COMMAND1);
++		glamoDRMAddData(gCtx, 0x0000, 2);    /* Cmd param 1 */
++		glamoDRMAddData(gCtx, 0xf0 << 8, 2); /* Cmd param 2 */
++		glamoDRMAddData(gCtx, 0x0000, 2);    /* Cmd param 3 */
++		glamoDRMDispatch(gCtx);
++
++	}
++}
++
++
++static void glamoClearColor(GLcontext *ctx, const GLfloat color[4])
++{
++	struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
++	GLubyte col_byte[4];
++
++	printf("glamoClearColor (%f %f %f %f)\n", color[0], color[1], color[2],
++	       color[3]); fflush(stdout);
++
++	CLAMPED_FLOAT_TO_UBYTE(col_byte[0], color[0]);
++	CLAMPED_FLOAT_TO_UBYTE(col_byte[1], color[1]);
++	CLAMPED_FLOAT_TO_UBYTE(col_byte[2], color[2]);
++	CLAMPED_FLOAT_TO_UBYTE(col_byte[3], color[3]);
++
++	gCtx->col_clear = GLAMO_PACKCOLOR565(col_byte[0], col_byte[1],
++	                                     col_byte[2]);
++}
++
++
++static void glamoShadeModel(GLcontext *ctx, GLenum mode)
++{
++	printf("glamoShadeModel\n"); fflush(stdout);
++}
++
++
++static void glamoViewport(GLcontext *ctx, GLint x, GLint y,
++                          GLsizei width, GLsizei height )
++{
++	struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
++	__DRIcontext *driContext = gCtx->driContext;
++	void (*old_viewport)(GLcontext *ctx, GLint x, GLint y,
++			 GLsizei w, GLsizei h);
++
++	if ( !driContext->driScreenPriv->dri2.enabled ) return;
++
++	/* TODO: Flush before fiddling with fake front buffer */
++
++	if ( ctx->DrawBuffer->Name == 0 ) {
++
++		glamo_update_renderbuffers(driContext,
++		                           driContext->driDrawablePriv);
++		if ( driContext->driDrawablePriv
++		                              != driContext->driReadablePriv ) {
++			glamo_update_renderbuffers(driContext,
++				                   driContext->driReadablePriv);
++		}
++
++	}
++
++	old_viewport = ctx->Driver.Viewport;
++	ctx->Driver.Viewport = NULL;
++	gCtx->driDrawable = driContext->driDrawablePriv;
++	ctx->Driver.Viewport = old_viewport;
++}
++
++
++static void glamoUploadMatrix(struct glamo_context *gCtx, uint16_t mreg,
++                              GLfloat *matrix)
++{
++	int i;
++	char *type;
++
++	switch ( mreg ) {
++	case G3D_MATRIX_MVP :
++		type = "MVP"; break;
++	case G3D_MATRIX_MV :
++		type = "MV"; break;
++	case G3D_MATRIX_IMVP :
++		type = "inverse MVP"; break;
++	default :
++		type = "unknown"; break;
++	}
++	printf("Uploading %s matrix...\n", type);
++
++	glamoDRMStartBurst(gCtx, mreg);
++	if ( mreg != G3D_MATRIX_IMVP ) {
++		for ( i=0; i<16; i++ ) {
++			glamoDRMAddData(gCtx, float7s16(matrix[i]), 4);
++		}
++	} else {
++		/* Normal matrix needs special treatment */
++		for ( i=0; i<3; i++ ) {
++			glamoDRMAddData(gCtx, float7s16(matrix[4*i]), 4);
++			glamoDRMAddData(gCtx, float7s16(matrix[4*i+1]), 4);
++			glamoDRMAddData(gCtx, float7s16(matrix[4*i+2]), 4);
++		}
++	}
++	glamoDRMDispatch(gCtx);
++}
++
++
++GLboolean glamoValidateState(GLcontext *ctx, GLuint new_state)
++{
++	struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
++
++	if ( new_state & (_NEW_MODELVIEW|_NEW_PROJECTION) ) {
++
++		glamoUploadMatrix(gCtx, G3D_MATRIX_MVP,
++		                  ctx->_ModelProjectMatrix.m);
++
++		/* FIXME: The following two aren't needed unless lighting
++		 * is in use... */
++		glamoUploadMatrix(gCtx, G3D_MATRIX_MV,
++		                  ctx->ModelviewMatrixStack.Top->m);
++		_math_matrix_alloc_inv(&(ctx->_ModelProjectMatrix));
++		_math_matrix_analyse(&(ctx->_ModelProjectMatrix));
++		glamoUploadMatrix(gCtx, G3D_MATRIX_IMVP,
++		                  ctx->_ModelProjectMatrix.inv);
++	}
++
++	gCtx->new_state = 0;
++	return GL_TRUE;
++}
++
++
++static void glamoUpdateState(GLcontext *ctx, GLbitfield new_state)
++{
++	struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
++
++	printf("glamoUpdateState\n");
++
++	_swrast_InvalidateState(ctx, new_state);
++	_swsetup_InvalidateState(ctx, new_state);
++	_vbo_InvalidateState(ctx, new_state);
++	_tnl_InvalidateState(ctx, new_state);
++	_ae_invalidate_state(ctx, new_state);
++
++	/* Make a note that some state has changed,
++	 * so that it can be sent to the GPU later. */
++	gCtx->new_state |= new_state;
++}
++
++
++static void glamoFlush(GLcontext *ctx)
++{
++	printf("glamoFlush\n");
++}
++
++
++void glamoInitStateFuncs(GLcontext *ctx)
++{
++	ctx->Driver.UpdateState       = glamoUpdateState;
++	ctx->Driver.Clear             = glamoClear;
++	ctx->Driver.ClearColor        = glamoClearColor;
++	ctx->Driver.ClearDepth        = NULL;
++	ctx->Driver.ClearStencil      = NULL;
++	ctx->Driver.AlphaFunc         = NULL;
++	ctx->Driver.BlendFuncSeparate = NULL;
++	ctx->Driver.ColorMask         = NULL;
++	ctx->Driver.CullFace          = NULL;
++	ctx->Driver.DepthMask         = NULL;
++	ctx->Driver.DepthFunc         = NULL;
++	ctx->Driver.DepthRange        = NULL;
++	ctx->Driver.DrawBuffer        = NULL;
++	ctx->Driver.Enable            = NULL;
++	ctx->Driver.FrontFace         = NULL;
++	ctx->Driver.Fogfv             = NULL;
++	ctx->Driver.Hint              = NULL;
++	ctx->Driver.Lightfv           = NULL;
++	ctx->Driver.LogicOpcode       = NULL;
++	ctx->Driver.PolygonMode       = NULL;
++	ctx->Driver.PolygonStipple    = NULL;
++	ctx->Driver.ReadBuffer        = NULL;
++	ctx->Driver.RenderMode        = NULL;
++	ctx->Driver.Scissor           = NULL;
++	ctx->Driver.ShadeModel        = glamoShadeModel;
++	ctx->Driver.LightModelfv      = NULL;
++	ctx->Driver.Viewport          = glamoViewport;
++	ctx->Driver.ResizeBuffers     = glamoResizeBuffers;
++	ctx->Driver.Flush             = glamoFlush;
++}
+diff --git a/src/mesa/drivers/dri/glamo/glamo_state.h b/src/mesa/drivers/dri/glamo/glamo_state.h
+new file mode 100644
+index 0000000..98f0b97
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_state.h
+@@ -0,0 +1,34 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
++ * Roughly based on sis_state.h (c) 2003 Eric Anholt
++ *
++ * 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 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.
++ */
++
++#ifndef __GLAMO_STATE_H
++#define __GLAMO_STATE_H
++
++#include "main/context.h"
++
++extern void glamoInitStateFuncs(GLcontext *ctx);
++
++#endif   /* __GLAMO_STATE_H */
++
++/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
+diff --git a/src/mesa/drivers/dri/glamo/glamo_tris.c b/src/mesa/drivers/dri/glamo/glamo_tris.c
+new file mode 100644
+index 0000000..6c6b5a6
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_tris.c
+@@ -0,0 +1,310 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
++ *
++ * 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 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.
++ *
++ *
++ * Based on intel_tris.c, to which the following notice applies:
++ *
++ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
++ * All Rights Reserved.
++ *
++ * 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, sub license, 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 (including the
++ * next paragraph) 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 NON-INFRINGEMENT.
++ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
++ *
++ */
++
++
++#include <glamo_bo.h>
++#include <glamo_bo_gem.h>
++#include <glamo_drm.h>
++
++#include "main/mtypes.h"
++#include "swrast/swrast.h"
++#include "tnl/t_context.h"
++#include "tnl/t_vertex.h"
++#include "tnl/t_pipeline.h"
++
++#include "glamo_tris.h"
++#include "glamo_context.h"
++
++
++static void glamoRunPipeline(GLcontext *ctx)
++{
++	printf("glamoRunPipeline\n");
++
++	/* TODO: Emit state */
++
++	_tnl_run_pipeline(ctx);
++}
++
++
++static void glamoRenderStart(GLcontext *ctx)
++{
++	struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
++
++	/* Decide which attributes will be used */
++	gCtx->vertex_attrs[0].attrib = _TNL_ATTRIB_POS;
++	gCtx->vertex_attrs[0].format = EMIT_4F;
++
++	gCtx->vertex_size = _tnl_install_attrs(ctx, gCtx->vertex_attrs, 1,
++	                                       NULL, 0);
++}
++
++
++static void glamoRenderFinish(GLcontext *ctx)
++{
++	printf("glamoRenderFinish\n");
++}
++
++
++static void glamoPrimitiveNotify(GLcontext *ctx, GLenum prim)
++{
++	printf("glamoPrimitiveNotify\n");
++}
++
++
++uint32_t *glamoGetPrimSpace(struct glamo_context *gCtx, unsigned int count)
++{
++	uint32_t *addr;
++
++	printf("glamoGetPrimSpace\n");
++
++	/* Check for space in the existing VB */
++	if (gCtx->prim.vb_bo == NULL || (gCtx->prim.current_offset +
++	                           count * gCtx->vertex_size) > GLAMO_VB_SIZE) {
++
++		/* Not enough space, or no VB existing. Start a new one... */
++		if (gCtx->prim.vb == NULL) {
++			printf("Allocated %i bytes\n", GLAMO_VB_SIZE);
++			gCtx->prim.vb = malloc(GLAMO_VB_SIZE);
++		}
++		gCtx->prim.vb_bo = glamo_bo_open(gCtx->glamoScreen->bom, 0,
++		                                 GLAMO_VB_SIZE, 4,
++		                                 GLAMO_GEM_DOMAIN_VRAM, 0);
++		gCtx->prim.start_offset = 0;
++		gCtx->prim.current_offset = 0;
++	}
++
++	addr = (uint32_t *)(gCtx->prim.vb + gCtx->prim.current_offset);
++	gCtx->prim.current_offset += gCtx->vertex_size * count;
++	gCtx->prim.count += count;
++
++	return addr;
++}
++
++
++#define COPY_DWORDS( j, vb, vertsize, v )	\
++do {						\
++   for ( j = 0 ; j < vertsize ; j++ ) {		\
++      vb[j] = ((GLuint *)v)[j];			\
++   }						\
++   vb += vertsize;				\
++} while (0)
++
++
++static void glamo_draw_triangle(struct glamo_context *gCtx,
++                                glamoVertexPtr v0, glamoVertexPtr v1,
++                                glamoVertexPtr v2)
++{
++	GLuint *vb = glamoGetPrimSpace(gCtx, 3);
++	int j;
++
++	COPY_DWORDS(j, vb, gCtx->vertex_size, v0);
++	COPY_DWORDS(j, vb, gCtx->vertex_size, v1);
++	COPY_DWORDS(j, vb, gCtx->vertex_size, v2);
++}
++
++
++static void glamo_draw_line(struct glamo_context *gCtx,
++                            glamoVertexPtr v0, glamoVertexPtr v1)
++{
++	GLuint *vb = glamoGetPrimSpace(gCtx, 2);
++	int j;
++
++	COPY_DWORDS(j, vb, gCtx->vertex_size, v0);
++	COPY_DWORDS(j, vb, gCtx->vertex_size, v1);
++}
++
++
++static void glamo_draw_point(struct glamo_context *gCtx, glamoVertexPtr v0)
++{
++	GLuint *vb = glamoGetPrimSpace(gCtx, 2);
++	int j;
++
++	COPY_DWORDS(j, vb, gCtx->vertex_size, v0);
++}
++
++
++#define TRI( a, b, c )                          \
++do {                                            \
++        glamo_draw_triangle(gCtx, a, b, c  );   \
++} while (0)
++
++
++#define QUAD( a, b, c, d )                      \
++printf("Drawing a quad\n");                     \
++do {                                            \
++        glamo_draw_triangle(gCtx, a, b, d);     \
++        glamo_draw_triangle(gCtx, b, c, d);     \
++} while (0)
++
++
++#define LINE(v0, v1)                            \
++do {                                            \
++        glamo_draw_line(gCtx, v0, v1);          \
++} while (0)
++
++
++#define POINT(v0)                               \
++do {                                            \
++        glamo_draw_point(gCtx, v0);             \
++} while (0)
++
++
++#define IND (0)
++#define TAG(x) x
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_offset
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_twoside
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_twoside_offset
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_unfilled
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_offset_unfilled
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_twoside_unfilled
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_twoside_offset_unfilled
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_fallback
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_offset_fallback
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_twoside_fallback
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_twoside_offset_fallback
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_unfilled_fallback
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_offset_unfilled_fallback
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_twoside_unfilled_fallback
++#include "tnl_dd/t_dd_tritmp.h"
++
++#define IND (0)
++#define TAG(x) x##_twoside_offset_unfilled_fallback
++#include "tnl_dd/t_dd_tritmp.h"
++
++
++static void init_rast_tab()
++{
++	init();
++	init_offset();
++	init_twoside();
++	init_twoside_offset();
++	init_unfilled();
++	init_offset_unfilled();
++	init_twoside_unfilled();
++	init_twoside_offset_unfilled();
++	init_fallback();
++	init_offset_fallback();
++	init_twoside_fallback();
++	init_twoside_offset_fallback();
++	init_unfilled_fallback();
++	init_offset_unfilled_fallback();
++	init_twoside_unfilled_fallback();
++	init_twoside_offset_unfilled_fallback();
++}
++
++
++void glamoInitTriFuncs(GLcontext *ctx)
++{
++	TNLcontext *tnl = TNL_CONTEXT(ctx);
++	struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
++	static int firsttime = 1;
++
++	if (firsttime) {
++		init_rast_tab();
++		firsttime = 0;
++	}
++
++	gCtx->prim.start_offset = 0;
++	gCtx->prim.current_offset = 0;
++	gCtx->prim.vb_bo = NULL;
++	gCtx->prim.vb = NULL;
++	gCtx->prim.count = 0;
++
++	tnl->Driver.RunPipeline = glamoRunPipeline;
++	tnl->Driver.Render.Start = glamoRenderStart;
++	tnl->Driver.Render.Finish = glamoRenderFinish;
++	tnl->Driver.Render.PrimitiveNotify = glamoPrimitiveNotify;
++	tnl->Driver.Render.ResetLineStipple = _swrast_ResetLineStipple;
++	tnl->Driver.Render.BuildVertices = _tnl_build_vertices;
++	tnl->Driver.Render.CopyPV = _tnl_copy_pv;
++	tnl->Driver.Render.Interp = _tnl_interp;
++}
+diff --git a/src/mesa/drivers/dri/glamo/glamo_tris.h b/src/mesa/drivers/dri/glamo/glamo_tris.h
+new file mode 100644
+index 0000000..ba8f997
+--- /dev/null
++++ b/src/mesa/drivers/dri/glamo/glamo_tris.h
+@@ -0,0 +1,38 @@
++/*
++ * Direct Rendering Support for SMedia Glamo 336x/337x
++ *
++ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
++ *
++ * 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 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.
++ */
++
++#ifndef __GLAMO_TRIS_H
++#define __GLAMO_TRIS_H
++
++#include "main/mtypes.h"
++
++#include "glamo_context.h"
++
++/* Amount of space reserved for vertex submission */
++#define GLAMO_VB_SIZE (32*1024)
++
++extern void glamoInitTriFuncs(GLcontext *ctx);
++extern uint32_t *glamoGetPrimSpace(struct glamo_context *gCtx,
++                                   unsigned int count);
++
++#endif   /* __GLAMO_TRIS_H */
diff --git a/recipes/mesa/mesa-dri_6.5.2.bb b/recipes/mesa/mesa-dri_6.5.2.bb
index ec4bce37bf..323d20ff3a 100644
--- a/recipes/mesa/mesa-dri_6.5.2.bb
+++ b/recipes/mesa/mesa-dri_6.5.2.bb
@@ -1,6 +1,6 @@
 include mesa-common-old.inc
 
-SRC_URI += " file://mklib-cross.patch;patch=1"
+SRC_URI += " file://mklib-cross.patch"
 
 FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
diff --git a/recipes/mesa/mesa-dri_7.0.3.bb b/recipes/mesa/mesa-dri_7.0.3.bb
index 71704e3599..3ce7d9871d 100644
--- a/recipes/mesa/mesa-dri_7.0.3.bb
+++ b/recipes/mesa/mesa-dri_7.0.3.bb
@@ -1,7 +1,7 @@
 include mesa-common-old.inc
 
 # suppress mklib-rpath-link patch from mesa-common
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 file://mklib-cross.patch;patch=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 file://mklib-cross.patch"
 
 FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
diff --git a/recipes/mesa/mesa-dri_7.8.1.bb b/recipes/mesa/mesa-dri_7.8.1.bb
new file mode 100644
index 0000000000..1d8e764046
--- /dev/null
+++ b/recipes/mesa/mesa-dri_7.8.1.bb
@@ -0,0 +1,43 @@
+include mesa-common.inc
+
+PROTO_DEPS = "xf86driproto glproto dri2proto expat"
+LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native mesa-dri-glsl-native"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
+           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \
+	   file://fix-progs-makefile.patch \
+	   file://glamo.patch \
+          "
+SRC_URI[archive.md5sum] = "25ec15f8e41fde6d206118cc786dbac4"
+SRC_URI[archive.sha256sum] = "b0b46e5abfd75db44501e308125fa92bcf1c91d91e97a043a3b1764cfa0907fa"
+SRC_URI[demos.md5sum] = "9ef47f911869657c6bf2f43ebce86b61"
+SRC_URI[demos.sha256sum] = "e9f20b9345240064ac35ec914ebce63322a96d3f7c566963791d0daf7e7a93e5"
+
+PR = "${INC_PR}.1"
+
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_shr = "2"
+
+# ASUS EeePC 901 has DRI support so use mesa-dri by default
+DEFAULT_PREFERENCE_eee901 = "1"
+
+PACKAGES =+ "${PN}-xprogs"
+
+FILES_${PN} += "${libdir}/dri/*.so \
+                ${libdir}/egl/*.so"
+FILES_${PN}-dbg += "${libdir}/dri/.debug/* \
+                    ${libdir}/egl/.debug/*"
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+
+EXTRA_OECONF += "--with-driver=dri --disable-glx-tls --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
+EXTRA_OECONF_shr += "--with-driver=dri --disable-glx-tls --disable-gallium \
+ --disable-gallium-intel --with-dri-drivers=swrast,${MACHINE_DRI_MODULES} \
+ ${@base_conditional( 'MACHINE',"htcdream", "--disable-egl", "",d)} "
+
+# We need glsl-compile built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
+do_configure_prepend() {
+  sed -i "s#^GLSL_CL = .*\$#GLSL_CL = ${STAGING_BINDIR_NATIVE}/glsl-compile#g" ${S}/src/mesa/shader/slang/library/Makefile
+}
diff --git a/recipes/mesa/mesa-dri_7.8.bb b/recipes/mesa/mesa-dri_7.8.bb
index 46b7faa7a9..c5f95ffed7 100644
--- a/recipes/mesa/mesa-dri_7.8.bb
+++ b/recipes/mesa/mesa-dri_7.8.bb
@@ -7,8 +7,8 @@ DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native mesa-dri-glsl-native"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
            ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \
-	   file://fix-progs-makefile.patch;patch=1 \
-	   file://glamo.patch;patch=1 \
+	   file://fix-progs-makefile.patch \
+	   file://glamo.patch \
           "
 SRC_URI[archive.md5sum] = "85cb891eecb89aae4fdd3499cccd934b"
 SRC_URI[archive.sha256sum] = "8c85db5844303b806b18fc6bd40a9dccb02d90b54878a94f910674673ba0aa35"
diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb
index fe8bcd5966..5f726418ec 100644
--- a/recipes/mesa/mesa-dri_git.bb
+++ b/recipes/mesa/mesa-dri_git.bb
@@ -17,8 +17,8 @@ SRCREV_shr = "1ac166895fef47806c9e9286d2a6356b4db8398d"
 
 SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
 SRC_URI_shr = "git://git.bitwiz.org.uk/mesa.git;protocol=git;branch=glamo"
-SRC_URI_append = " file://fix-progs-makefile.patch;patch=1"
-SRC_URI_shr_append = " file://fix-progs-makefile.patch;patch=1"
+SRC_URI_append = " file://fix-progs-makefile.patch"
+SRC_URI_shr_append = " file://fix-progs-makefile.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/mesa/mesa-full_7.0.2.bb b/recipes/mesa/mesa-full_7.0.2.bb
index efb54e0d29..2f98eedbb6 100644
--- a/recipes/mesa/mesa-full_7.0.2.bb
+++ b/recipes/mesa/mesa-full_7.0.2.bb
@@ -3,9 +3,9 @@ include mesa-mesa.inc
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2;name=archive \
         ${SOURCEFORGE_MIRROR}/mesa3d/MesaGLUT-${PV}.tar.bz2;name=glut \
         ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2;name=demos \
-        file://mklib-rpath-link.patch;patch=1 \
-        file://fix-host-compile.patch;patch=1 \
-        file://fix-progs-makefile.patch;patch=1 \
+        file://mklib-rpath-link.patch \
+        file://fix-host-compile.patch \
+        file://fix-progs-makefile.patch \
         "
 
 do_install_append = "install -d ${D}${bindir}; \
diff --git a/recipes/mesa/mesa-xlib-7.8/fix-progs-makefile.patch b/recipes/mesa/mesa-xlib-7.8/fix-progs-makefile.patch
new file mode 100644
index 0000000000..40e6a1b16e
--- /dev/null
+++ b/recipes/mesa/mesa-xlib-7.8/fix-progs-makefile.patch
@@ -0,0 +1,81 @@
+From e03daf13a562414f07230c17998edd39564b5f1b Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 4 Mar 2010 14:16:27 +0100
+Subject: [PATCH] fix libs
+
+---
+ progs/demos/Makefile   |    2 +-
+ progs/glsl/Makefile    |    2 +-
+ progs/redbook/Makefile |    2 +-
+ progs/samples/Makefile |    2 +-
+ progs/xdemos/Makefile  |    2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/progs/demos/Makefile b/progs/demos/Makefile
+index 5b1d2a0..121b862 100644
+--- a/progs/demos/Makefile
++++ b/progs/demos/Makefile
+@@ -8,7 +8,7 @@ INCDIR = $(TOP)/include
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
+ 	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ \
+ 	$(APP_LIB_DEPS)
+ 
+ PROGS = \
+diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
+index 3b5a595..836c4ac 100644
+--- a/progs/glsl/Makefile
++++ b/progs/glsl/Makefile
+@@ -10,7 +10,7 @@ LIB_DEP = \
+ 	$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
+ 	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -lstdc++ \
+ 	-l$(GL_LIB) $(APP_LIB_DEPS)
+ 
+ # using : to avoid APP_CC pointing to CC loop
+diff --git a/progs/redbook/Makefile b/progs/redbook/Makefile
+index b41e488..95ed746 100644
+--- a/progs/redbook/Makefile
++++ b/progs/redbook/Makefile
+@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
+ 
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
+ 
+ PROGS = aaindex \
+ 	aapoly \
+diff --git a/progs/samples/Makefile b/progs/samples/Makefile
+index 64fa47a..9f72c8b 100644
+--- a/progs/samples/Makefile
++++ b/progs/samples/Makefile
+@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
+ 
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
+ 
+ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
+ 	font line logo nurb olympic overlay point prim rgbtoppm quad select \
+diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
+index f866a32..c0f4e06 100644
+--- a/progs/xdemos/Makefile
++++ b/progs/xdemos/Makefile
+@@ -11,7 +11,7 @@
+ # Add X11 and pthread libs to satisfy GNU gold.
+ APP_LIB_DEPS += -lX11 -lpthread
+ 
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) -lstdc++ $(APP_LIB_DEPS)
+ 
+ PROGS = \
+ 	corender \
+-- 
+1.7.0
+
diff --git a/recipes/mesa/mesa-xlib_7.2.bb b/recipes/mesa/mesa-xlib_7.2.bb
index 9fedd8bd86..dfc0d7ce80 100644
--- a/recipes/mesa/mesa-xlib_7.2.bb
+++ b/recipes/mesa/mesa-xlib_7.2.bb
@@ -5,7 +5,6 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PE = "1"
 PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "--with-driver=xlib"
diff --git a/recipes/mesa/mesa-xlib_7.4.bb b/recipes/mesa/mesa-xlib_7.4.bb
index f24087dba2..68e7218ea7 100644
--- a/recipes/mesa/mesa-xlib_7.4.bb
+++ b/recipes/mesa/mesa-xlib_7.4.bb
@@ -5,7 +5,6 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PE = "1"
 PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "--with-driver=xlib"
diff --git a/recipes/mesa/mesa-xlib_7.8.bb b/recipes/mesa/mesa-xlib_7.8.bb
new file mode 100644
index 0000000000..6c0e7ea461
--- /dev/null
+++ b/recipes/mesa/mesa-xlib_7.8.bb
@@ -0,0 +1,20 @@
+include mesa-common.inc
+
+PROTO_DEPS = "xf86driproto glproto"
+LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
+           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \
+           file://fix-progs-makefile.patch \
+          "
+
+SRC_URI[archive.md5sum] = "85cb891eecb89aae4fdd3499cccd934b"
+SRC_URI[archive.sha256sum] = "8c85db5844303b806b18fc6bd40a9dccb02d90b54878a94f910674673ba0aa35"
+SRC_URI[demos.md5sum] = "9fe8ec184c7f78691e43c4c0a7f97d56"
+SRC_URI[demos.sha256sum] = "5bf65f03ddcd04b02e9ca044285f8754decee67eb274191da1f31627f1d84b0e"
+
+PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--disable-gallium --with-driver=xlib"
diff --git a/recipes/mesa/mesa_6.0.1.bb b/recipes/mesa/mesa_6.0.1.bb
index 73f96f72e7..3b37b8fd11 100644
--- a/recipes/mesa/mesa_6.0.1.bb
+++ b/recipes/mesa/mesa_6.0.1.bb
@@ -1,7 +1,7 @@
 SECTION = "unknown"
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
-	file://Make-config.patch;patch=1 \
-	file://mklib.patch;patch=1"
+	file://Make-config.patch \
+	file://mklib.patch"
 S = "${WORKDIR}/Mesa-${PV}"
 PE = "2"
 LICENSE = "LGPL"
diff --git a/recipes/mesa/mesa_6.4.1+cvs20060101.bb b/recipes/mesa/mesa_6.4.1+cvs20060101.bb
index 7eb52b2579..0ecd04f9ec 100644
--- a/recipes/mesa/mesa_6.4.1+cvs20060101.bb
+++ b/recipes/mesa/mesa_6.4.1+cvs20060101.bb
@@ -5,7 +5,7 @@ PV = "6.4.1+cvs${SRCDATE}"
 PE = "2"
 
 SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE} \
-	file://mklib-rpath-link.patch;patch=1"
+	file://mklib-rpath-link.patch"
 S = "${WORKDIR}/Mesa"
 
 LICENSE = "LGPL"
diff --git a/recipes/mesa/mesa_6.5.2.bb b/recipes/mesa/mesa_6.5.2.bb
index cbb2a32ddb..8573ce36d2 100644
--- a/recipes/mesa/mesa_6.5.2.bb
+++ b/recipes/mesa/mesa_6.5.2.bb
@@ -2,7 +2,7 @@ include mesa-mesa.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI_append = " file://fix-host-compile.patch;patch=1 "
+SRC_URI_append = " file://fix-host-compile.patch "
 
 SRC_URI[md5sum] = "e4d894181f1859651658b3704633e10d"
 SRC_URI[sha256sum] = "137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f"
diff --git a/recipes/mesa/mesa_7.0.2.bb b/recipes/mesa/mesa_7.0.2.bb
index a5063cf9f8..96dd966a27 100644
--- a/recipes/mesa/mesa_7.0.2.bb
+++ b/recipes/mesa/mesa_7.0.2.bb
@@ -2,7 +2,7 @@ include mesa-mesa.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI_append = " file://fix-host-compile.patch;patch=1 "
+SRC_URI_append = " file://fix-host-compile.patch "
 
 SRC_URI[md5sum] = "93e6ed7924ff069a4f883b4fce5349dc"
 SRC_URI[sha256sum] = "9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e"
diff --git a/recipes/mesa/mesa_7.8.bb b/recipes/mesa/mesa_7.8.bb
new file mode 100644
index 0000000000..bbd0c4134d
--- /dev/null
+++ b/recipes/mesa/mesa_7.8.bb
@@ -0,0 +1,8 @@
+# This is a dummy package so OE can use the poky mesa files
+require mesa-dri_${PV}.bb
+
+FILESPATHPKG =. "mesa-dri-${PV}:"
+
+PR = "${INC_PR}.1"
+
+EXTRA_OECONF += "--disable-egl"
diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb
index aa2252efe8..7cbfe0ac19 100644
--- a/recipes/meta/external-toolchain-csl.bb
+++ b/recipes/meta/external-toolchain-csl.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r5"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
@@ -24,7 +24,6 @@ PROVIDES = "\
 	linux-libc-headers \
 "
 
-RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
 RPROVIDES_glibc-dev += "libc-dev"
 PACKAGES_DYNAMIC += "glibc-gconv-*"
 PACKAGES_DYNAMIC += "glibc-locale-*"
@@ -189,6 +188,12 @@ PKGV_localedef = ${CSL_VER_LIBC}
 PKGV_libsegfault = ${CSL_VER_LIBC}
 PKGV_linux-libc-headers = ${CSL_VER_KERNEL}
 
+LICENSE_ldd = "LGPLv2.1+"
+LICENSE_glibc = "LGPLv2.1+"
+LICENSE_glibc-thread-db = "LGPLv2.1+"
+LICENSE_libgcc := "${@["GPLv3 with GCC RLE", "GPLv2 with GCC RLE"][csl_get_main_version(d) <= "2009q1-203"]}"
+LICENSE_libstdc++ := "${@["GPLv3 with GCC RLE", "GPLv2 with GCC RLE"][csl_get_main_version(d) <= "2009q1-203"]}"
+
 do_install() {
 	install -d ${D}${sysconfdir}
 	install -d ${D}${bindir}
diff --git a/recipes/meta/meta-toolchain-qte.bb b/recipes/meta/meta-toolchain-qte.bb
index 789b99a032..bb24db8b7f 100644
--- a/recipes/meta/meta-toolchain-qte.bb
+++ b/recipes/meta/meta-toolchain-qte.bb
@@ -1,11 +1,11 @@
 # Qt Embedded toolchain
-PR = "r2"
+PR = "r3"
 TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host"
 TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target"
 
 require meta-toolchain.bb
 SDK_SUFFIX = "toolchain-qte"
-
+SDK_SUFFIX_angstrom = "toolchain-qte-${ANGSTROM_QT_VERSION}"
 
 QT_DIR_NAME = "qtopia"
 
diff --git a/recipes/meta/meta-toolchain.bb b/recipes/meta/meta-toolchain.bb
index bdafdbccaa..adc057a253 100644
--- a/recipes/meta/meta-toolchain.bb
+++ b/recipes/meta/meta-toolchain.bb
@@ -19,7 +19,9 @@ FEED_ARCH ?= "${TARGET_ARCH}"
 SDK_SUFFIX = "toolchain"
 TOOLCHAIN_OUTPUTNAME ?= "${DISTRO}-${DISTRO_VERSION}-${SDK_SYS}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}"
 
-RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
+DISTRO_FEED_CONFIGS ?= " "
+
+RDEPENDS = "${DISTRO_FEED_CONFIGS} ${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
 
 TOOLCHAIN_FEED_URI ?= "${DISTRO_FEED_URI}"
 
@@ -30,13 +32,21 @@ modify_opkg_conf () {
         rm -f ${OUTPUT_OPKGCONF_TARGET}
         rm -f ${OUTPUT_OPKGCONF_HOST}
         rm -f ${OUTPUT_OPKGCONF_SDK}
-        opkgarchs="${PACKAGE_ARCHS}"
-        priority=1
-        for arch in ${opkgarchs}; do
-                echo "arch ${arch} ${priority}" >> ${OUTPUT_OPKGCONF_TARGET};
-                echo "src/gz ${arch} ${TOOLCHAIN_FEED_URI}/${arch}" >> ${OUTPUT_OPKGCONF_TARGET};
-                priority=$(expr ${priority} + 5);
-        done
+
+        if [ -e ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${sysconfdir}/opkg/arch.conf ] ; then
+            echo "Creating empty opkg.conf since arch.conf is already present"
+            echo > ${OUTPUT_OPKGCONF_TARGET} 
+        else
+            opkgarchs="${PACKAGE_ARCHS}"
+            priority=1
+            for arch in ${opkgarchs}; do
+                    echo "arch ${arch} ${priority}" >> ${OUTPUT_OPKGCONF_TARGET};
+                    if [ -n "${TOOLCHAIN_FEED_URI}" ] ; then
+                        echo "src/gz ${arch} ${TOOLCHAIN_FEED_URI}/${arch}" >> ${OUTPUT_OPKGCONF_TARGET};
+                    fi
+                    priority=$(expr ${priority} + 5);
+            done
+        fi
 }
 
 do_populate_sdk() {
@@ -55,7 +65,7 @@ do_populate_sdk() {
 	${IPKG_HOST} -force-depends install ${TOOLCHAIN_HOST_TASK}
 
 	${IPKG_TARGET} update
-	${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK}
+	${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} ${DISTRO_FEED_CONFIGS}
 
 	# Remove packages in the exclude list which were installed by dependencies
 	if [ ! -z "${TOOLCHAIN_TARGET_EXCLUDE}" ]; then
diff --git a/recipes/metalog/metalog_0.7.bb b/recipes/metalog/metalog_0.7.bb
index 3eab734507..c6f92f52be 100644
--- a/recipes/metalog/metalog_0.7.bb
+++ b/recipes/metalog/metalog_0.7.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/metalog/metalog-${PV}.tar.gz \
-           file://crosscompile.patch;patch=1"
+           file://crosscompile.patch"
 S = "${WORKDIR}/metalog-${PV}"
 
 inherit autotools
diff --git a/recipes/mgetty/mgetty_1.1.30.bb b/recipes/mgetty/mgetty_1.1.30.bb
index db764eb3ea..0289f3ca09 100644
--- a/recipes/mgetty/mgetty_1.1.30.bb
+++ b/recipes/mgetty/mgetty_1.1.30.bb
@@ -8,38 +8,38 @@ PR ="r4"
 # The source can no longer be found at ${DEBIAN_MIRROR}/main/m/mgetty/mgetty_${PV}.orig.tar.gz
 # so the nslu2-linux project has mirrored it until someone updates this package to a newer version.
 SRC_URI = "http://nslu.sf.net/downloads/mgetty_1.1.30.orig.tar.gz \
-           file://debian.patch;patch=1 \
-           file://00-g3_Makefile;patch=1 \
-           file://01-adjust-path;patch=1 \
-           file://02-pending-fix-includes;patch=1 \
-           file://03-callback_Makefile;patch=1 \
-           file://04-new_fax.pbm;patch=1 \
-           file://06-pending-contrib_g3tolj.c;patch=1 \
-           file://07-pending-contrib_g3toxwd.c;patch=1 \
-           file://09-doc_Makefile;patch=1 \
-           file://10-doc_faxrunqd.8in;patch=1 \
-           file://12-fax_faxrunqd.in;patch=1 \
-           file://13-fax_faxspool.in;patch=1 \
-           file://14-frontends_X11_viewfax-2.5_Makefile;patch=1 \
-           file://23-samples_new_fax.mime4;patch=1 \
-           file://24-voice_include_paths.h;patch=1 \
-           file://26-voice_libpvf_usr.c;patch=1 \
-           file://36-voice_voice.conf-dist;patch=1 \
-           file://37-Makefile;patch=1 \
-           file://39-mgetty.cfg.in;patch=1 \
-           file://40-locks.c_bug153394;patch=1 \
-           file://41-ugly-redo-ring.c_bug128668;patch=1 \
-           file://42-voice_libvoice_detect.c;patch=1 \
-           file://43-moreinfo-cnd.c_bug112163;patch=1 \
-           file://44-pending-faxexpand.h_bug169455;patch=1 \
-           file://45-logfile.c;patch=1 \
-           file://47-doc_mgetty.texi-in;patch=1 \
-           file://50-pending-voice-zoom-2949l-c;patch=1 \
-           file://51-pending-faxq-time;patch=1 \
-           file://52-pending-metamail;patch=1 \
-           file://install.patch;patch=1 \
-	   file://newslock_ldflags.patch;patch=1 \
-	   file://faxqhelper_ldflags.patch;patch=1 \
+           file://debian.patch \
+           file://00-g3_Makefile;apply=yes \
+           file://01-adjust-path;apply=yes \
+           file://02-pending-fix-includes;apply=yes \
+           file://03-callback_Makefile;apply=yes \
+           file://04-new_fax.pbm;apply=yes \
+           file://06-pending-contrib_g3tolj.c;apply=yes \
+           file://07-pending-contrib_g3toxwd.c;apply=yes \
+           file://09-doc_Makefile;apply=yes \
+           file://10-doc_faxrunqd.8in;apply=yes \
+           file://12-fax_faxrunqd.in;apply=yes \
+           file://13-fax_faxspool.in;apply=yes \
+           file://14-frontends_X11_viewfax-2.5_Makefile;apply=yes \
+           file://23-samples_new_fax.mime4;apply=yes \
+           file://24-voice_include_paths.h;apply=yes \
+           file://26-voice_libpvf_usr.c;apply=yes \
+           file://36-voice_voice.conf-dist;apply=yes \
+           file://37-Makefile;apply=yes \
+           file://39-mgetty.cfg.in;apply=yes \
+           file://40-locks.c_bug153394;apply=yes \
+           file://41-ugly-redo-ring.c_bug128668;apply=yes \
+           file://42-voice_libvoice_detect.c;apply=yes \
+           file://43-moreinfo-cnd.c_bug112163;apply=yes \
+           file://44-pending-faxexpand.h_bug169455;apply=yes \
+           file://45-logfile.c;apply=yes \
+           file://47-doc_mgetty.texi-in;apply=yes \
+           file://50-pending-voice-zoom-2949l-c;apply=yes \
+           file://51-pending-faxq-time;apply=yes \
+           file://52-pending-metamail;apply=yes \
+           file://install.patch \
+	   file://newslock_ldflags.patch \
+	   file://faxqhelper_ldflags.patch \
            file://policy.h \
            file://voice-defs.h"
 
diff --git a/recipes/miau/miau_0.5.3.bb b/recipes/miau/miau_0.5.3.bb
index 3933abab6e..5d09b366a3 100644
--- a/recipes/miau/miau_0.5.3.bb
+++ b/recipes/miau/miau_0.5.3.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/miau/miau-${PV}.tar.gz \
-           file://paths.patch;patch=1 \
+           file://paths.patch \
 	   file://miau.init"
 S = "${WORKDIR}/miau-${PV}"
 
diff --git a/recipes/micro-emacs/micro-emacs_20060909.bb b/recipes/micro-emacs/micro-emacs_20060909.bb
index f20269c6f5..1fb7af153b 100644
--- a/recipes/micro-emacs/micro-emacs_20060909.bb
+++ b/recipes/micro-emacs/micro-emacs_20060909.bb
@@ -8,7 +8,7 @@ S = "${WORKDIR}/me060909"
 
 SRC_URI = "http://www.jasspa.com/release_${PV}/jasspa-mesrc-${PV}-2.tar.gz;name=archive \
            http://www.jasspa.com/release_${PV}/jasspa-memacros-${PV}.tar.gz;name=macros \
-           file://zaurus_make.patch;patch=1"
+           file://zaurus_make.patch"
 
 do_compile () {
         oe_runmake -C src -f zaurus.gmk mec
diff --git a/recipes/microcom/microcom_1.02.bb b/recipes/microcom/microcom_1.02.bb
index 861a750379..22a643789c 100644
--- a/recipes/microcom/microcom_1.02.bb
+++ b/recipes/microcom/microcom_1.02.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 # CVS, because openwrt is just another mirror of a file which no
 # longer seems to exist outside mirrors.  mirror magic.
 SRC_URI = "http://downloads.openwrt.org/sources/m102.tar.gz \
-	   file://make.patch;patch=1"
+	   file://make.patch"
 S = "${WORKDIR}"
 
 do_install () {
diff --git a/recipes/microwindows/microwindows-snapshot.bb b/recipes/microwindows/microwindows-snapshot.bb
index 31ba5ad24f..05bc70d2ba 100644
--- a/recipes/microwindows/microwindows-snapshot.bb
+++ b/recipes/microwindows/microwindows-snapshot.bb
@@ -3,8 +3,8 @@ require microwindows.inc
 SRC_URI = " \
   ftp://ftp.microwindows.org/pub/microwindows/microwindows-src-snapshot.tar.gz \
   file://defconfig \
-  file://pagesize.patch;patch=1 \
-  file://makefilerules.patch;patch=1 \
+  file://pagesize.patch \
+  file://makefilerules.patch \
  "
 
 S=${WORKDIR}/microwin
diff --git a/recipes/microwindows/microwindows_0.90.bb b/recipes/microwindows/microwindows_0.90.bb
index 4d220b9a0b..d6ed3d3128 100644
--- a/recipes/microwindows/microwindows_0.90.bb
+++ b/recipes/microwindows/microwindows_0.90.bb
@@ -3,8 +3,8 @@ require microwindows.inc
 SRC_URI = " \
   ftp://ftp.microwindows.org/pub/microwindows/microwindows-${PV}.tar.gz \
   file://defconfig \
-  file://pagesize.patch;patch=1 \
-  file://nochown.patch;patch=1 \
+  file://pagesize.patch \
+  file://nochown.patch \
  "
 
 
diff --git a/recipes/microwindows/microwindows_0.91.bb b/recipes/microwindows/microwindows_0.91.bb
index e19a433e6f..54254a9b43 100644
--- a/recipes/microwindows/microwindows_0.91.bb
+++ b/recipes/microwindows/microwindows_0.91.bb
@@ -3,8 +3,8 @@ require microwindows.inc
 SRC_URI = " \
   ftp://ftp.microwindows.org/pub/microwindows/microwindows-src-${PV}.tar.gz \
   file://defconfig \
-  file://pagesize.patch;patch=1 \
-  file://staticwin.patch;patch=1 \
+  file://pagesize.patch \
+  file://staticwin.patch \
  "
 
 
diff --git a/recipes/microwindows/nxlib_0.45.bb b/recipes/microwindows/nxlib_0.45.bb
index 266681d10e..22367a0647 100644
--- a/recipes/microwindows/nxlib_0.45.bb
+++ b/recipes/microwindows/nxlib_0.45.bb
@@ -8,7 +8,7 @@ PR="r0"
 
 SRC_URI = " \
   ftp://ftp.microwindows.org/pub/microwindows/nxlib-${PV}.tar.gz \
-  file://varargs.patch;patch=1 \
+  file://varargs.patch \
  "
 
 EXTRA_OEMAKE = ' \
diff --git a/recipes/midpath/midpath-core_0.2+0.3rc2.bb b/recipes/midpath/midpath-core_0.2+0.3rc2.bb
index 696daceb21..4f63d6d3bc 100644
--- a/recipes/midpath/midpath-core_0.2+0.3rc2.bb
+++ b/recipes/midpath/midpath-core_0.2+0.3rc2.bb
@@ -9,7 +9,7 @@ S = "${WORKDIR}/midpath-0.3rc2"
 require midpath-common.inc
 
 SRC_URI += "\
-	file://fix-openfile.patch;patch=1 \
+	file://fix-openfile.patch \
   file://midpath-suitemanager \
   file://midpath-launcher-j2se \
   file://midpath-suitemanager.desktop \
diff --git a/recipes/miglayout/miglayout_3.0.3.bb b/recipes/miglayout/miglayout_3.0.3.bb
index a362e16452..7013914d88 100644
--- a/recipes/miglayout/miglayout_3.0.3.bb
+++ b/recipes/miglayout/miglayout_3.0.3.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}"
 inherit java-library
 
 DEPENDS = "fastjar-native classpath swt3.4-gtk"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 
 do_unpackpost() {
 	find -name "*.jar" -exec rm {} \;
diff --git a/recipes/mii-diag/mii-diag_2.11.bb b/recipes/mii-diag/mii-diag_2.11.bb
index e49a990b77..fc87a00e04 100644
--- a/recipes/mii-diag/mii-diag_2.11.bb
+++ b/recipes/mii-diag/mii-diag_2.11.bb
@@ -6,7 +6,7 @@ PR = "r4"
 
 S = "${WORKDIR}/"
 
-#INHIBIT_PACKAGE_STRIP = "1"
+#PACKAGE_STRIP = "no"
 
 SRC_URI = "file://mii-diag.c \
            file://libmii.c"
diff --git a/recipes/mikmod/mikmod_3.2.2-beta1.bb b/recipes/mikmod/mikmod_3.2.2-beta1.bb
index aaac95bf45..91b140b259 100644
--- a/recipes/mikmod/mikmod_3.2.2-beta1.bb
+++ b/recipes/mikmod/mikmod_3.2.2-beta1.bb
@@ -5,7 +5,7 @@ DEPENDS = "ncurses libmikmod"
 PR = "r1"
 LICENSE = "GPL"
 SRC_URI = "http://mikmod.raphnet.net/files/mikmod-${PV}.tar.bz2 \
-           file://m4.patch;patch=1"
+           file://m4.patch"
 
 inherit autotools
 
diff --git a/recipes/mini-httpd/mini-httpd_1.19.bb b/recipes/mini-httpd/mini-httpd_1.19.bb
index 50914086d4..2f5ab1485c 100644
--- a/recipes/mini-httpd/mini-httpd_1.19.bb
+++ b/recipes/mini-httpd/mini-httpd_1.19.bb
@@ -12,8 +12,8 @@ DEPENDS = "openssl"
 PR = "r0"
 
 SRC_URI="http://www.acme.com/software/mini_httpd/mini_httpd-${PV}.tar.gz \
-	 file://new-bindir-mandir.patch;patch=1 \
-	 file://remove-CC.patch;patch=1 \
+	 file://new-bindir-mandir.patch \
+	 file://remove-CC.patch \
 	 file://mini-httpd.conf \
 	 file://init \
 	"
diff --git a/recipes/miniclipboard/miniclipboard_0.3.bb b/recipes/miniclipboard/miniclipboard_0.3.bb
index e1464f69a9..8e358d1a46 100644
--- a/recipes/miniclipboard/miniclipboard_0.3.bb
+++ b/recipes/miniclipboard/miniclipboard_0.3.bb
@@ -7,7 +7,7 @@ RDEPENDS = "gdk-pixbuf-loader-xpm"
 PR = "r2"
 
 SRC_URI += "file://miniclipboard.desktop \
-            file://makefile.patch;patch=1;pnum=0"
+            file://makefile.patch;striplevel=0"
 
 do_install() {
 	install -d ${D}${bindir}
diff --git a/recipes/minicom/minicom_2.1.bb b/recipes/minicom/minicom_2.1.bb
index bf6af33422..36880a285f 100644
--- a/recipes/minicom/minicom_2.1.bb
+++ b/recipes/minicom/minicom_2.1.bb
@@ -2,9 +2,9 @@ SECTION = "console/network"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
 SRC_URI = "http://alioth.debian.org/download.php/123/minicom-${PV}.tar.gz \
-	file://configure.patch;patch=1 \
-	file://gcc4-scope.patch;patch=1 \
-	file://gcc4-scope2.patch;patch=1"
+	file://configure.patch \
+	file://gcc4-scope.patch \
+	file://gcc4-scope2.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/minicom/minicom_2.3.bb b/recipes/minicom/minicom_2.3.bb
index f043188649..69939e6098 100644
--- a/recipes/minicom/minicom_2.3.bb
+++ b/recipes/minicom/minicom_2.3.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
 SRC_URI = "http://alioth.debian.org/frs/download.php/2332/minicom-${PV}.tar.gz \
-	file://rename-conflicting-functions.patch;patch=1 \
+	file://rename-conflicting-functions.patch \
 	"
 
 inherit autotools gettext
diff --git a/recipes/minilite/minilite.inc b/recipes/minilite/minilite.inc
index 79f28e0da3..0804920c32 100644
--- a/recipes/minilite/minilite.inc
+++ b/recipes/minilite/minilite.inc
@@ -7,6 +7,6 @@ DESCRIPTION = "GPE Screen light control dockapp"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 export CVSBUILD="no"
diff --git a/recipes/minimix/minimix_0.9.bb b/recipes/minimix/minimix_0.9.bb
index 56bb300cd5..890744d088 100644
--- a/recipes/minimix/minimix_0.9.bb
+++ b/recipes/minimix/minimix_0.9.bb
@@ -7,7 +7,7 @@ DEPENDS = "libgpewidget"
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpe autotools
 
-SRC_URI += "file://setlocale.patch;patch=1"
+SRC_URI += "file://setlocale.patch"
 
 SRC_URI[md5sum] = "087e60bbf0de3b8f14660977596bf6a1"
 SRC_URI[sha256sum] = "6023a460561b02f9682213f10c4fcfd1dd848e94a3de99caf8cf9385bae8b093"
diff --git a/recipes/minipredict/minipredict.bb b/recipes/minipredict/minipredict.bb
index db1398303e..cd2e75e285 100644
--- a/recipes/minipredict/minipredict.bb
+++ b/recipes/minipredict/minipredict.bb
@@ -6,8 +6,8 @@ SECTION = "gpe"
 PRIORITY = "optional"
 
 SRC_URI = "http://handhelds.org/~paxanima/files/${PN}.tar.gz \
-	   file://fix-makefile.patch;patch=1 \
-	   file://fix-include.patch;patch=1 \
+	   file://fix-makefile.patch \
+	   file://fix-include.patch \
 	   file://minipredict.desktop \
 	   file://minipredict.png"
 
diff --git a/recipes/mipl-mipv6/mipv6_1.1-v2.4.26.bb b/recipes/mipl-mipv6/mipv6_1.1-v2.4.26.bb
index fbc70dbd59..913a388a21 100644
--- a/recipes/mipl-mipv6/mipv6_1.1-v2.4.26.bb
+++ b/recipes/mipl-mipv6/mipv6_1.1-v2.4.26.bb
@@ -1,7 +1,7 @@
 SECTION = "unknown"
 SRC_URI = "http://www.mobile-ipv6.org/software/download/mipv6-${PV}.tar.gz \
-        file://sbindir.patch;pnum=0;patch=1 \
-        file://outputfix.patch;pnum=0;patch=1"
+        file://sbindir.patch;striplevel=0 \
+        file://outputfix.patch;striplevel=0"
 DEPENDS = "virtual/kernel"
 LICENSE = "GPL"
 CFLAGS =+ "-I${S}/include -I${STAGING_KERNEL_DIR}/include"
diff --git a/recipes/misc-binary-only/prism2-firmware-update_1.7.4.bb b/recipes/misc-binary-only/prism2-firmware-update_1.7.4.bb
index dae62aebed..501fa8ad84 100644
--- a/recipes/misc-binary-only/prism2-firmware-update_1.7.4.bb
+++ b/recipes/misc-binary-only/prism2-firmware-update_1.7.4.bb
@@ -6,7 +6,7 @@ LICENSE = "unknown"
 
 SRC_URI = "http://www.red-bean.com/~proski/firmware/${PV}.tar.bz2"
 
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 do_install() {
 	install -d ${D}tmp
diff --git a/recipes/misc-binary-only/tda1004x-firmware.bb b/recipes/misc-binary-only/tda1004x-firmware.bb
index 56fa8ee6c2..d862e9eafb 100644
--- a/recipes/misc-binary-only/tda1004x-firmware.bb
+++ b/recipes/misc-binary-only/tda1004x-firmware.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 
 SRC_URI = "http://hauppauge.lightpath.net/de/nova-pci218c.exe"
 FILES_${PN} = '*'
diff --git a/recipes/mktemp/mktemp_1.6.bb b/recipes/mktemp/mktemp_1.6.bb
index db96d6d98c..d0312d5f8b 100644
--- a/recipes/mktemp/mktemp_1.6.bb
+++ b/recipes/mktemp/mktemp_1.6.bb
@@ -9,8 +9,8 @@ EXTRA_OECONF = "--with-libc"
 
 SRC_URI = "\
   ftp://ftp.mktemp.org/pub/mktemp/${P}.tar.gz \
-  file://add_destdir.patch;patch=1 \
-  file://disable-strip.patch;patch=1 \
+  file://add_destdir.patch \
+  file://disable-strip.patch \
 "
 
 do_install_append () {
diff --git a/recipes/mml-widget/gtkmathview_0.8.0.bb b/recipes/mml-widget/gtkmathview_0.8.0.bb
index 77ab883061..cd9154538b 100644
--- a/recipes/mml-widget/gtkmathview_0.8.0.bb
+++ b/recipes/mml-widget/gtkmathview_0.8.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "t1lib gtk+ popt libxslt libxml2"
 PR = "r1"
 
 SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz \
-           file://mathview-gcc43x.diff;patch=1 \
+           file://mathview-gcc43x.diff \
 	  "
 
 inherit autotools 
diff --git a/recipes/moblin/hornsey_git.bb b/recipes/moblin/hornsey_git.bb
index fa316311d5..6b1eb0315f 100644
--- a/recipes/moblin/hornsey_git.bb
+++ b/recipes/moblin/hornsey_git.bb
@@ -9,7 +9,7 @@ PR_append = "+git${SRCREV}"
 DEPENDS = "clutter-0.9 clutter-gst-0.9 bickley nbtk bognor-regis libunique startup-notification gtk+"
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
-           file://fix-api.patch;patch=1 \
+           file://fix-api.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes/moblin/json-glib_0.6.2.bb b/recipes/moblin/json-glib_0.6.2.bb
index 2a1e376e1c..a1355c9535 100644
--- a/recipes/moblin/json-glib_0.6.2.bb
+++ b/recipes/moblin/json-glib_0.6.2.bb
@@ -1,7 +1,6 @@
 
 SRC_URI = "http://folks.o-hand.com/~ebassi/sources/json-glib-0.6.2.tar.gz"
 PR = "r0"
-PE = "1"
 
 DEPENDS = "glib-2.0"
 
diff --git a/recipes/moblin/json-glib_git.bb b/recipes/moblin/json-glib_git.bb
index ca043847c0..85664581e9 100644
--- a/recipes/moblin/json-glib_git.bb
+++ b/recipes/moblin/json-glib_git.bb
@@ -1,7 +1,6 @@
 HOMEPAGE = "http://live.gnome.org/JsonGlib"
 SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git"
-PV = "0.6.2+gitr${SRCPV}"
-PE = "1"
+PV = "0.6.2+git${SRCREV}"
 PR = "r0"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/moblin/libccss_git.bb b/recipes/moblin/libccss_git.bb
index 900524b0ed..e622d9f9bf 100644
--- a/recipes/moblin/libccss_git.bb
+++ b/recipes/moblin/libccss_git.bb
@@ -1,6 +1,5 @@
 SRC_URI = "git://anongit.freedesktop.org/git/ccss.git;protocol=git"
-PV = "0.0+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+git${SRCREV}"
 PR = "r0"
 
 DEPENDS = "glib-2.0 cairo librsvg libsoup-2.4"
diff --git a/recipes/moblin/librest_git.bb b/recipes/moblin/librest_git.bb
index 52f649375e..0576c0dd8d 100644
--- a/recipes/moblin/librest_git.bb
+++ b/recipes/moblin/librest_git.bb
@@ -1,7 +1,7 @@
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.0+gitr${SRCPV}"
-PE = "1"
+SRCREV="18bce68c8e54032f2d7e78a8484ac892ba3ebd5a"
+PV = "0.0+git${SRCREV}"
 PR = "r1"
 
 DEPENDS = "libsoup-2.4"
diff --git a/recipes/moblin/moblin-menus_git.bb b/recipes/moblin/moblin-menus_git.bb
index 5b779a8c81..b61ef2dda7 100644
--- a/recipes/moblin/moblin-menus_git.bb
+++ b/recipes/moblin/moblin-menus_git.bb
@@ -1,8 +1,7 @@
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
-           file://configurefix.patch;patch=1"
-PV = "0.0+gitr${SRCPV}"
-PE = "1"
+           file://configurefix.patch"
+PV = "0.0+git${SRCREV}"
 PR = "r1"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/moblin/mojito_git.bb b/recipes/moblin/mojito_git.bb
index e9b3cf0972..f9104a9371 100644
--- a/recipes/moblin/mojito_git.bb
+++ b/recipes/moblin/mojito_git.bb
@@ -1,7 +1,6 @@
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.0+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+git${SRCREV}"
 PR = "r3"
 
 DEPENDS = "libsoup-2.4 gconf librest glib-2.0 twitter-glib sqlite3 gnome-keyring"
diff --git a/recipes/moblin/twitter-glib_git.bb b/recipes/moblin/twitter-glib_git.bb
index 99eb2bf65a..9458f165cf 100644
--- a/recipes/moblin/twitter-glib_git.bb
+++ b/recipes/moblin/twitter-glib_git.bb
@@ -1,7 +1,6 @@
 HOMEPAGE = "http://live.gnome.org/TwitterGlib"
 SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git"
-PV = "0.0+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+git${SRCREV}"
 PR = "r0"
 
 DEPENDS = "glib-2.0 gtk+ json-glib"
diff --git a/recipes/modphp/modphp5.inc b/recipes/modphp/modphp5.inc
index a0417cf189..6e6d570b82 100644
--- a/recipes/modphp/modphp5.inc
+++ b/recipes/modphp/modphp5.inc
@@ -4,7 +4,7 @@ LICENSE = "PHP"
 RDEPENDS = "apache2"
 DEPENDS = "apache2-native apache2 zlib"
 SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
+	   file://configure.patch \
 	  "
 
 S = "${WORKDIR}/php-${PV}"
diff --git a/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb b/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb
index b4bf6127bd..4fa5bf4bb1 100644
--- a/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb
+++ b/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb
@@ -1,4 +1,3 @@
-
 require module-init-tools.inc
 inherit cross
 DEFAULT_PREFERENCE = "0"
@@ -10,13 +9,8 @@ RDEPENDS_${PN} = ""
 
 EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
 
-do_stage () {
-        oe_runmake install
-        mv ${bindir}/${TARGET_PREFIX}depmod ${bindir}/${TARGET_PREFIX}depmod-2.6
-}
-
-do_install () {
-        :
+do_install_append () {
+        mv ${D}${bindir}/${TARGET_PREFIX}depmod ${D}${bindir}/${TARGET_PREFIX}depmod-2.6
 }
 
 SRC_URI[md5sum] = "a1ad0a09d3231673f70d631f3f5040e9"
diff --git a/recipes/module-init-tools/module-init-tools.inc b/recipes/module-init-tools/module-init-tools.inc
index 9ad925f82b..3cfaf11901 100644
--- a/recipes/module-init-tools/module-init-tools.inc
+++ b/recipes/module-init-tools/module-init-tools.inc
@@ -12,14 +12,13 @@ FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
 FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
-	   file://ignore_arch_directory;patch=1 \
-	   file://modutils_extension;patch=1 \
-	   file://no_man_rebuild;patch=1 \
-	   file://manpagesopt;patch=1 \
-           file://module-init-tools-remove-index.patch;patch=1 "
+	   file://ignore_arch_directory;apply=yes \
+	   file://modutils_extension;apply=yes \
+	   file://no_man_rebuild;apply=yes \
+	   file://manpagesopt;apply=yes \
+           file://module-init-tools-remove-index.patch "
 S = "${WORKDIR}/module-init-tools-${PV}"
 
 EXTRA_OECONF = "--disable-manpages"
 
-
 inherit autotools
diff --git a/recipes/module-init-tools/module-init-tools_3.2.1.bb b/recipes/module-init-tools/module-init-tools_3.2.1.bb
index 3ec4cf10f8..3e7980ff87 100644
--- a/recipes/module-init-tools/module-init-tools_3.2.1.bb
+++ b/recipes/module-init-tools/module-init-tools_3.2.1.bb
@@ -1,10 +1,10 @@
 require module-init-tools.inc
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
-	   file://ignore_arch_directory;patch=1 \
-	   file://modutils_extension;patch=1 \
-	   file://no_man_rebuild;patch=1 \
-	   file://manpagesopt;patch=1 "
+	   file://ignore_arch_directory;apply=yes \
+	   file://modutils_extension;apply=yes \
+	   file://no_man_rebuild;apply=yes \
+	   file://manpagesopt;apply=yes "
 
 bindir = "/bin"
 sbindir = "/sbin"
diff --git a/recipes/module-init-tools/module-init-tools_3.4.bb b/recipes/module-init-tools/module-init-tools_3.4.bb
index cabd696005..19da593583 100644
--- a/recipes/module-init-tools/module-init-tools_3.4.bb
+++ b/recipes/module-init-tools/module-init-tools_3.4.bb
@@ -1,7 +1,7 @@
 require module-init-tools.inc
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
-	   file://modutils_extension;patch=1 \
+	   file://modutils_extension;apply=yes \
 "
 
 bindir = "/bin"
diff --git a/recipes/modutils/modutils-cross_2.4.27.bb b/recipes/modutils/modutils-cross_2.4.27.bb
index 2a4f11f4ce..5eb9ca215e 100644
--- a/recipes/modutils/modutils-cross_2.4.27.bb
+++ b/recipes/modutils/modutils-cross_2.4.27.bb
@@ -8,7 +8,7 @@ PACKAGES = ""
 PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.4"
 DEFAULT_PREFERENCE = "1"
 
-SRC_URI +=  "file://modutils-cross/module.h.diff;patch=1"
+SRC_URI +=  "file://modutils-cross/module.h.diff"
 
 sbindir = "${prefix}/bin"
 
diff --git a/recipes/modutils/modutils_2.4.27.bb b/recipes/modutils/modutils_2.4.27.bb
index d8dde7c1e0..450cdd51e8 100644
--- a/recipes/modutils/modutils_2.4.27.bb
+++ b/recipes/modutils/modutils_2.4.27.bb
@@ -7,12 +7,12 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files"
 PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
-           file://lex.l.diff;patch=1 \
-           file://modutils-notest.patch;patch=1 \
-           file://configure.patch;patch=1 \
-           file://program_prefix.patch;patch=1 \
-           file://armeb.patch;patch=1 \
-	   file://gcc4.patch;patch=1"
+           file://lex.l.diff \
+           file://modutils-notest.patch \
+           file://configure.patch \
+           file://program_prefix.patch \
+           file://armeb.patch \
+	   file://gcc4.patch"
 
 inherit autotools
 
diff --git a/recipes/mokoeightball/mokoeightball_svn.bb b/recipes/mokoeightball/mokoeightball_svn.bb
index dde59cb018..63cf813a5b 100644
--- a/recipes/mokoeightball/mokoeightball_svn.bb
+++ b/recipes/mokoeightball/mokoeightball_svn.bb
@@ -11,7 +11,7 @@ FILES_${PN} += /usr/share/moko_eightball/Accelerometer/__init__.py
 FILES_${PN} += /usr/share/moko_eightball/themes/eightball.edj
 
 SRC_URI = "svn://svn.pureenergy.cc/moko_eightball;module=.;proto=svn \
-	   file://files/fixpath.patch;patch=1"
+	   file://files/fixpath.patch"
 
 do_compile() {
 	cd python/src/data/themes
diff --git a/recipes/mokomaze/mokomaze_0.5.5.bb b/recipes/mokomaze/mokomaze_0.5.5.bb
index 57e3bbbb85..6785148e17 100644
--- a/recipes/mokomaze/mokomaze_0.5.5.bb
+++ b/recipes/mokomaze/mokomaze_0.5.5.bb
@@ -14,7 +14,7 @@ PV="0.5.5+git8"
 
 SRC_URI="http://mokomaze.projects.openmoko.org/files/${PN}-${PV}.tar.gz"
 
-SRC_URI_append_shr = " file://fsoraw.patch;patch=1"
+SRC_URI_append_shr = " file://fsoraw.patch"
 
 inherit autotools
 
diff --git a/recipes/monit/monit_4.10.1.bb b/recipes/monit/monit_4.10.1.bb
index 22437ffc6a..4bdeeb8c6e 100644
--- a/recipes/monit/monit_4.10.1.bb
+++ b/recipes/monit/monit_4.10.1.bb
@@ -3,7 +3,7 @@ DEPENDS = "openssl"
 PR = "r1"
 
 SRC_URI = "http://www.tildeslash.com/monit/dist/monit-${PV}.tar.gz\
-	file://no-strip-in-makefile.patch;patch=1 \
+	file://no-strip-in-makefile.patch \
 	file://init"
 
 INITSCRIPT_NAME = "monit"
diff --git a/recipes/mono/files/configure-svnr87352.patch b/recipes/mono/files/configure-svnr87352.patch
deleted file mode 100644
index 021554f35e..0000000000
--- a/recipes/mono/files/configure-svnr87352.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mono/configure.in.orig	2007-10-11 21:05:59.000000000 +0200
-+++ mono/configure.in	2007-10-11 23:44:23.000000000 +0200
-@@ -1148,6 +1148,8 @@
- 		], [
- 				AC_MSG_RESULT(no)
- 				with_tls=pthread
-+		], [
-+				AC_MSG_RESULT(yes)
- 		])
- 	fi
- 
-@@ -1250,6 +1252,9 @@
- 		], [
- 				with_sigaltstack=no
- 				AC_MSG_RESULT(no)
-+		], [
-+				AC_MSG_RESULT(yes)
-+				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
- 		])
- 	fi
- 
diff --git a/recipes/mono/files/cpu-arm.h b/recipes/mono/files/cpu-arm.h
deleted file mode 100644
index 29ece47036..0000000000
--- a/recipes/mono/files/cpu-arm.h
+++ /dev/null
@@ -1,756 +0,0 @@
-/* File automatically generated by genmdesc, don't change */
-
-const char * const arm_cpu_desc [OP_LAST] = {
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* nop */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* break */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldarg.0 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldarg.1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldarg.2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldarg.3 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldloc.0 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldloc.1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldloc.2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldloc.3 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stloc.0 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stloc.1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stloc.2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stloc.3 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldarg.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldarga.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* starg.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldloc.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldloca.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stloc.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldnull */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4.m1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4.0 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4.1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4.2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4.3 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4.4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4.5 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4.6 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4.7 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4.8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.i8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.r4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldc.r8 */
-	NULL,	/* unused99 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* dup */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* pop */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x5c" "",	/* jmp */
-	"a\x0" "\x0" "\x0" "c\x0" "\x0" "\x0" "\x14" "",	/* call */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* calli */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ret */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* br.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* brfalse.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* brtrue.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* beq.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* bge.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* bgt.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ble.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* blt.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* bne.un.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* bge.un.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* bgt.un.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ble.un.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* blt.un.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* br */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* brfalse */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* brtrue */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* beq */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* bge */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* bgt */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* ble */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* blt */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* bne.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* bge.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* bgt.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* ble.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* blt.un */
-	"\x0" "i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* switch */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* ldind.i1 */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* ldind.u1 */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* ldind.i2 */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* ldind.u2 */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* ldind.i4 */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* ldind.u4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldind.i8 */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* ldind.i */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldind.r4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldind.r8 */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* ldind.ref */
-	"\x0" "bi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stind.ref */
-	"\x0" "bi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stind.i1 */
-	"\x0" "bi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stind.i2 */
-	"\x0" "bi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stind.i4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stind.i8 */
-	"\x0" "bf\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stind.r4 */
-	"\x0" "bf\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stind.r8 */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* add */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* sub */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* mul */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x28" "",	/* div */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* div.un */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "0",	/* rem */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x18" "",	/* rem.un */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* and */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* or */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* xor */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* shl */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* shr */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* shr.un */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* neg */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* not */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* conv.i1 */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* conv.i2 */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* conv.i4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.i8 */
-	"fi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x24" "",	/* conv.r4 */
-	"fi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x24" "",	/* conv.r8 */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.u4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.u8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* callvirt */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* cpobj */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldobj */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldstr */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* newobj */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* castclass */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* isinst */
-	"fi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "8",	/* conv.r.un */
-	NULL,	/* unused58 */
-	NULL,	/* unused1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* unbox */
-	"\x0" "i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* throw */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldfld */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldflda */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stfld */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldsfld */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldsflda */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stsfld */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stobj */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.i1.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.i2.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.i4.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.i8.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.u1.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.u2.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.u4.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.u8.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.i.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.u.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* box */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* newarr */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldlen */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelema */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelem.i1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelem.u1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelem.i2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelem.u2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelem.i4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelem.u4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelem.i8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelem.i */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelem.r4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelem.r8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldelem.ref */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stelem.i */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stelem.i1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stelem.i2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stelem.i4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stelem.i8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stelem.r4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stelem.r8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stelem.ref */
-	NULL,	/* ldelem.any */
-	NULL,	/* stelem.any */
-	NULL,	/* unbox.any */
-	NULL,	/* unused5 */
-	NULL,	/* unused6 */
-	NULL,	/* unused7 */
-	NULL,	/* unused8 */
-	NULL,	/* unused9 */
-	NULL,	/* unused10 */
-	NULL,	/* unused11 */
-	NULL,	/* unused12 */
-	NULL,	/* unused13 */
-	NULL,	/* unused14 */
-	NULL,	/* unused15 */
-	NULL,	/* unused16 */
-	NULL,	/* unused17 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.i1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.u1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.i2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.u2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.i4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.u4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.i8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.u8 */
-	NULL,	/* unused50 */
-	NULL,	/* unused18 */
-	NULL,	/* unused19 */
-	NULL,	/* unused20 */
-	NULL,	/* unused21 */
-	NULL,	/* unused22 */
-	NULL,	/* unused23 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* refanyval */
-	"ff\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x18" "",	/* ckfinite */
-	NULL,	/* unused24 */
-	NULL,	/* unused25 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* mkrefany */
-	NULL,	/* unused59 */
-	NULL,	/* unused60 */
-	NULL,	/* unused61 */
-	NULL,	/* unused62 */
-	NULL,	/* unused63 */
-	NULL,	/* unused64 */
-	NULL,	/* unused65 */
-	NULL,	/* unused66 */
-	NULL,	/* unused67 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldtoken */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* conv.u2 */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* conv.u1 */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* conv.i */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.i */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* conv.ovf.u */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* add.ovf */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* add.ovf.un */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* mul.ovf */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* mul.ovf.un */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* sub.ovf */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* sub.ovf.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* endfinally */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* leave */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* leave.s */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stind.i */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* conv.u */
-	NULL,	/* unused26 */
-	NULL,	/* unused27 */
-	NULL,	/* unused28 */
-	NULL,	/* unused29 */
-	NULL,	/* unused30 */
-	NULL,	/* unused31 */
-	NULL,	/* unused32 */
-	NULL,	/* unused33 */
-	NULL,	/* unused34 */
-	NULL,	/* unused35 */
-	NULL,	/* unused36 */
-	NULL,	/* unused37 */
-	NULL,	/* unused38 */
-	NULL,	/* unused39 */
-	NULL,	/* unused40 */
-	NULL,	/* unused41 */
-	NULL,	/* unused42 */
-	NULL,	/* unused43 */
-	NULL,	/* unused44 */
-	NULL,	/* unused45 */
-	NULL,	/* unused46 */
-	NULL,	/* unused47 */
-	NULL,	/* unused48 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* prefix7 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* prefix6 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* prefix5 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* prefix4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* prefix3 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* prefix2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* prefix1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* prefixref */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* arglist */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* ceq */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* cgt */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* cgt.un */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* clt */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* clt.un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldftn */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldvirtftn */
-	NULL,	/* unused56 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldarg */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldarga */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* starg */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldloc */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldloca */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* stloc */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x3c" "",	/* localloc */
-	NULL,	/* unused57 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* endfilter */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* unaligned. */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* volatile. */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* tail. */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* initobj */
-	NULL,	/* constrained. */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* cpblk */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* initblk */
-	NULL,	/* no. */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* rethrow */
-	NULL,	/* unused */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* sizeof */
-	NULL,	/* refanytype */
-	NULL,	/* readonly. */
-	NULL,	/* unused53 */
-	NULL,	/* unused54 */
-	NULL,	/* unused55 */
-	NULL,	/* unused70 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* illegal */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* endmac */
-	NULL,	/* mono_icall */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* mono_objaddr */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* mono_ldptr */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* mono_vtaddr */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* mono_newobj */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* mono_retobj */
-	NULL,	/* mono_ldnativeobj */
-	NULL,	/* mono_cisinst */
-	NULL,	/* mono_ccastclass */
-	NULL,	/* mono_save_lmf */
-	NULL,	/* mono_restore_lmf */
-	NULL,	/* mono_classconst */
-	NULL,	/* mono_not_taken */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* load */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* ldaddr */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* store */
-	NULL,	/* objaddr */
-	NULL,	/* vtaddr */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* phi */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* rename */
-	"\x0" "ii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* compare */
-	"\x0" "i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* compare_imm */
-	"\x0" "ff\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* fcompare */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* lcompare */
-	NULL,	/* icompare */
-	NULL,	/* icompare_imm */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* local */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* arg */
-	"\x0" "i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* oparglist */
-	"\x0" "i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x1" "",	/* outarg */
-	NULL,	/* outarg_reg */
-	NULL,	/* outarg_freg */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* outarg_imm */
-	NULL,	/* outarg_r4 */
-	NULL,	/* outarg_r8 */
-	NULL,	/* outarg_vt */
-	NULL,	/* outarg_membase */
-	NULL,	/* inarg_vt */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* retarg */
-	"ai\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* setret */
-	NULL,	/* setfret */
-	"\x0" "ii\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* setlret */
-	"ii\x0" "\x0" "r\x0" "\x0" "\x0" "\x4" "",	/* setreg */
-	"i\x0" "\x0" "\x0" "r\x0" "\x0" "\x0" "\x10" "",	/* setregimm */
-	"ff\x0" "\x0" "r\x0" "\x0" "\x0" "\x4" "",	/* setfreg */
-	"\x0" "b\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* checkthis */
-	"\x0" "\x0" "\x0" "\x0" "c\x0" "\x0" "\x0" "\x14" "",	/* voidcall */
-	NULL,	/* voidcallvirt */
-	"\x0" "i\x0" "\x0" "c\x0" "\x0" "\x0" "\x8" "",	/* voidcall_reg */
-	"\x0" "b\x0" "\x0" "c\x0" "\x0" "\x0" "\xc" "",	/* voidcall_membase */
-	"g\x0" "\x0" "\x0" "c\x0" "\x0" "\x0" "\x14" "",	/* fcall */
-	NULL,	/* fcallvirt */
-	"gi\x0" "\x0" "c\x0" "\x0" "\x0" "\x8" "",	/* fcall_reg */
-	"gb\x0" "\x0" "c\x0" "\x0" "\x0" "\xc" "",	/* fcall_membase */
-	"l\x0" "\x0" "\x0" "c\x0" "\x0" "\x0" "\x14" "",	/* lcall */
-	NULL,	/* lcallvirt */
-	"li\x0" "\x0" "c\x0" "\x0" "\x0" "\x8" "",	/* lcall_reg */
-	"lb\x0" "\x0" "c\x0" "\x0" "\x0" "\xc" "",	/* lcall_membase */
-	"\x0" "\x0" "\x0" "\x0" "c\x0" "\x0" "\x0" "\x14" "",	/* vcall */
-	NULL,	/* vcallvirt */
-	"\x0" "i\x0" "\x0" "c\x0" "\x0" "\x0" "\x8" "",	/* vcall_reg */
-	"\x0" "b\x0" "\x0" "c\x0" "\x0" "\x0" "\xc" "",	/* vcall_membase */
-	"ai\x0" "\x0" "c\x0" "\x0" "\x0" "\x8" "",	/* call_reg */
-	"ab\x0" "\x0" "c\x0" "\x0" "\x0" "\xc" "",	/* call_membase */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* trap */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* iconst */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* i8const */
-	"f\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* r4const */
-	"f\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* r8const */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* regvar */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* reg */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* regoffset */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* label */
-	NULL,	/* check_array_type */
-	NULL,	/* array_rank */
-	NULL,	/* throw_or_null */
-	"\x0" "i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* op_rethrow */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* refanytype */
-	NULL,	/* op_newobj */
-	"b\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* store_membase_imm */
-	"bi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* store_membase_reg */
-	"b\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* storei1_membase_imm */
-	"bi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* storei1_membase_reg */
-	"b\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* storei2_membase_imm */
-	"bi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* storei2_membase_reg */
-	"b\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* storei4_membase_imm */
-	"bi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* storei4_membase_reg */
-	"b\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* storei8_membase_imm */
-	"bi\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* storei8_membase_reg */
-	"bf\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* storer4_membase_reg */
-	"bf\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* storer8_membase_reg */
-	"ib\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* load_membase */
-	"ib\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadi1_membase */
-	"ib\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadu1_membase */
-	"ib\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadi2_membase */
-	"ib\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadu2_membase */
-	"ib\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadi4_membase */
-	"ib\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadu4_membase */
-	"ib\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* loadi8_membase */
-	"fb\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadr4_membase */
-	"fb\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadr8_membase */
-	"ibi\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* load_memindex */
-	"ibi\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadi1_memindex */
-	"ibi\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadu1_memindex */
-	"ibi\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadi2_memindex */
-	"ibi\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadu2_memindex */
-	"ibi\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadi4_memindex */
-	"ibi\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* loadu4_memindex */
-	NULL,	/* loadi8_memindex */
-	NULL,	/* loadr4_memindex */
-	NULL,	/* loadr8_memindex */
-	"bii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* store_memindex */
-	"bii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* storei1_memindex */
-	"bii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* storei2_memindex */
-	"bii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* storei4_memindex */
-	NULL,	/* storei8_memindex */
-	NULL,	/* storer4_memindex */
-	NULL,	/* storer8_memindex */
-	NULL,	/* loadr8_spill_membase */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* loadu4_mem */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* move */
-	"ff\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* fmove */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* add_imm */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* sub_imm */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* mul_imm */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* div_imm */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* div_un_imm */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x1c" "",	/* rem_imm */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* rem_un_imm */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* and_imm */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* or_imm */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* xor_imm */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* shl_imm */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* shr_imm */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* shr_un_imm */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_eq */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_ge */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_gt */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_le */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_lt */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_ne_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_ge_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_gt_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_le_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_lt_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* cond_exc_ov */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_no */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* cond_exc_c */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* cond_exc_nc */
-	NULL,	/* cond_exc_ieq */
-	NULL,	/* cond_exc_ige */
-	NULL,	/* cond_exc_igt */
-	NULL,	/* cond_exc_ile */
-	NULL,	/* cond_exc_ilt */
-	NULL,	/* cond_exc_ine_un */
-	NULL,	/* cond_exc_ige_un */
-	NULL,	/* cond_exc_igt_un */
-	NULL,	/* cond_exc_ile_un */
-	NULL,	/* cond_exc_ilt_un */
-	NULL,	/* cond_exc_iov */
-	NULL,	/* cond_exc_ino */
-	NULL,	/* cond_exc_ic */
-	NULL,	/* cond_exc_inc */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_add */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_sub */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_mul */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_div */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_div_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_rem */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_rem_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_and */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_or */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_xor */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_shl */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_shr */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_shr_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_neg */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_not */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_i1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_i2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_i4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_i8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_r4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_r8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_u4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_u8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_u2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_u1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_i */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x1e" "",	/* long_conv_to_ovf_i */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_u */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_add_ovf */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_add_ovf_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_mul_ovf */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_mul_ovf_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_sub_ovf */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_sub_ovf_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_i1_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_i2_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_i4_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_i8_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_u1_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_u2_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_u4_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_u8_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_i_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_u_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_i1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_u1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_i2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_u2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_i4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_u4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_i8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_ovf_u8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_ceq */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_cgt */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_cgt_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_clt */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_clt_un */
-	"fii\x0" "\x0" "\x0" "\x0" "\x0" "\x25" "",	/* long_conv_to_r_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_conv_to_u */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_shr_imm */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_shr_un_imm */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_shl_imm */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_add_imm */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_sub_imm */
-	NULL,	/* long_mul_imm */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_beq */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_bne_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_blt */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_blt_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_bgt */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_btg_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_bge */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_bge_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_ble */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* long_ble_un */
-	NULL,	/* long_shr_un_32 */
-	NULL,	/* int_add */
-	NULL,	/* int_sub */
-	NULL,	/* int_mul */
-	NULL,	/* int_div */
-	NULL,	/* int_div_un */
-	NULL,	/* int_rem */
-	NULL,	/* int_rem_un */
-	NULL,	/* int_and */
-	NULL,	/* int_or */
-	NULL,	/* int_xor */
-	NULL,	/* int_shl */
-	NULL,	/* int_shr */
-	NULL,	/* int_shr_un */
-	NULL,	/* int_neg */
-	NULL,	/* int_not */
-	NULL,	/* int_conv_to_i1 */
-	NULL,	/* int_conv_to_i2 */
-	NULL,	/* int_conv_to_i4 */
-	NULL,	/* int_conv_to_i8 */
-	NULL,	/* int_conv_to_r4 */
-	NULL,	/* int_conv_to_r8 */
-	NULL,	/* int_conv_to_u4 */
-	NULL,	/* int_conv_to_u8 */
-	NULL,	/* int_conv_to_u2 */
-	NULL,	/* int_conv_to_u1 */
-	NULL,	/* int_conv_to_i */
-	NULL,	/* int_conv_to_ovf_i */
-	NULL,	/* int_conv_to_ovf_u */
-	NULL,	/* int_add_ovf */
-	NULL,	/* int_add_ovf_un */
-	NULL,	/* int_mul_ovf */
-	NULL,	/* int_mul_ovf_un */
-	NULL,	/* int_sub_ovf */
-	NULL,	/* int_sub_ovf_un */
-	NULL,	/* int_conv_to_ovf_i1_un */
-	NULL,	/* int_conv_to_ovf_i2_un */
-	NULL,	/* int_conv_to_ovf_i4_un */
-	NULL,	/* int_conv_to_ovf_i8_un */
-	NULL,	/* int_conv_to_ovf_u1_un */
-	NULL,	/* int_conv_to_ovf_u2_un */
-	NULL,	/* int_conv_to_ovf_u4_un */
-	NULL,	/* int_conv_to_ovf_u8_un */
-	NULL,	/* int_conv_to_ovf_i_un */
-	NULL,	/* int_conv_to_ovf_u_un */
-	NULL,	/* int_conv_to_ovf_i1 */
-	NULL,	/* int_conv_to_ovf_u1 */
-	NULL,	/* int_conv_to_ovf_i2 */
-	NULL,	/* int_conv_to_ovf_u2 */
-	NULL,	/* int_conv_to_ovf_i4 */
-	NULL,	/* int_conv_to_ovf_u4 */
-	NULL,	/* int_conv_to_ovf_i8 */
-	NULL,	/* int_conv_to_ovf_u8 */
-	NULL,	/* int_adc */
-	NULL,	/* int_adc_imm */
-	NULL,	/* int_sbb */
-	NULL,	/* int_sbb_imm */
-	NULL,	/* int_addcc */
-	NULL,	/* int_subcc */
-	NULL,	/* int_add_imm */
-	NULL,	/* int_sub_imm */
-	NULL,	/* int_mul_imm */
-	NULL,	/* int_div_imm */
-	NULL,	/* int_div_un_imm */
-	NULL,	/* int_rem_imm */
-	NULL,	/* int_rem_un_imm */
-	NULL,	/* int_and_imm */
-	NULL,	/* int_or_imm */
-	NULL,	/* int_xor_imm */
-	NULL,	/* int_shl_imm */
-	NULL,	/* int_shr_imm */
-	NULL,	/* int_shr_un_imm */
-	NULL,	/* int_ceq */
-	NULL,	/* int_cgt */
-	NULL,	/* int_cgt_un */
-	NULL,	/* int_clt */
-	NULL,	/* int_clt_un */
-	NULL,	/* int_beq */
-	NULL,	/* int_bne_un */
-	NULL,	/* int_blt */
-	NULL,	/* int_blt_un */
-	NULL,	/* int_bgt */
-	NULL,	/* int_bgt_un */
-	NULL,	/* int_bge */
-	NULL,	/* int_bge_un */
-	NULL,	/* int_ble */
-	NULL,	/* int_ble_un */
-	"\x0" "ff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_beq */
-	"\x0" "ff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_bne_un */
-	"\x0" "ff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_blt */
-	"\x0" "ff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_blt_un */
-	"\x0" "ff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_bgt */
-	"\x0" "ff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_btg_un */
-	"\x0" "ff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_bge */
-	"\x0" "ff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_bge_un */
-	"\x0" "ff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_ble */
-	"\x0" "ff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_ble_un */
-	"fff\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* float_add */
-	"fff\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* float_sub */
-	"fff\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* float_mul */
-	"fff\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* float_div */
-	"fff\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* float_div_un */
-	"fff\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* float_rem */
-	"fff\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* float_rem_un */
-	"ff\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* float_neg */
-	"ff\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* float_not */
-	"if\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x28" "",	/* float_conv_to_i1 */
-	"if\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x28" "",	/* float_conv_to_i2 */
-	"if\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x28" "",	/* float_conv_to_i4 */
-	"lf\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x28" "",	/* float_conv_to_i8 */
-	"ff\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* float_conv_to_r4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_r8 */
-	"if\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x28" "",	/* float_conv_to_u4 */
-	"lf\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x28" "",	/* float_conv_to_u8 */
-	"if\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x28" "",	/* float_conv_to_u2 */
-	"if\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x28" "",	/* float_conv_to_u1 */
-	"if\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x28" "",	/* float_conv_to_i */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_i */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovd_u */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_add_ovf */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_add_ovf_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_mul_ovf */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_mul_ovf_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_sub_ovf */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_sub_ovf_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_i1_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_i2_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_i4_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_i8_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_u1_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_u2_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_u4_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_u8_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_i_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_u_un */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_i1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_u1 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_i2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_u2 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_i4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_u4 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_i8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "",	/* float_conv_to_ovf_u8 */
-	"iff\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* float_ceq */
-	"iff\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* float_cgt */
-	"iff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_cgt_un */
-	"iff\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* float_clt */
-	"iff\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* float_clt_un */
-	NULL,	/* float_ceq_membase */
-	NULL,	/* float_cgt_membase */
-	NULL,	/* float_cgt_un_membase */
-	NULL,	/* float_clt_membase */
-	NULL,	/* float_clt_un_membase */
-	"if\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x24" "",	/* float_conv_to_u */
-	NULL,	/* group */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* aot_const */
-	NULL,	/* patch_info */
-	NULL,	/* got_entry */
-	NULL,	/* unboxcast */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* call_handler */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x14" "",	/* start_handler */
-	"\x0" "i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* op_endfilter */
-	"lii\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* op_bigmul */
-	"lii\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* op_bigmul_un */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* adc */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* adc_imm */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* sbb */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* sbb_imm */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* addcc */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* addcc_imm */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* subcc */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\xc" "",	/* subcc_imm */
-	"\x0" "i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* br_reg */
-	NULL,	/* sext_i1 */
-	NULL,	/* sext_i2 */
-	NULL,	/* sext_i4 */
-	NULL,	/* zext_i1 */
-	NULL,	/* zext_i2 */
-	NULL,	/* zext_i4 */
-	NULL,	/* cne */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* add_ovf_carry */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* sub_ovf_carry */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* add_ovf_un_carry */
-	"iii\x0" "\x0" "\x0" "\x0" "\x0" "\x10" "",	/* sub_ovf_un_carry */
-	NULL,	/* sin */
-	NULL,	/* cos */
-	NULL,	/* abs */
-	NULL,	/* tan */
-	NULL,	/* atan */
-	"ff\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* sqrt */
-	NULL,	/* getchar */
-	NULL,	/* str_char_addr */
-	NULL,	/* strlen */
-	NULL,	/* gettype */
-	NULL,	/* gethashcode */
-	NULL,	/* getldelema2 */
-	NULL,	/* memcpy */
-	NULL,	/* memset */
-	NULL,	/* cisinst */
-	NULL,	/* ccastclass */
-	NULL,	/* save_lmf */
-	NULL,	/* restore_lmf */
-	"i\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x8" "",	/* tls_get */
-	NULL,	/* load_gotaddr */
-	NULL,	/* dummy_use */
-	NULL,	/* dummy_store */
-	NULL,	/* not_reached */
-	NULL,	/* atomic_add_i4 */
-	NULL,	/* atomic_add_new_i4 */
-	NULL,	/* atomic_add_imm_i4 */
-	NULL,	/* atomic_add_imm_new_i4 */
-	NULL,	/* atomic_exchange_i4 */
-	NULL,	/* atomic_add_i8 */
-	NULL,	/* atomic_add_new_i8 */
-	NULL,	/* atomic_add_imm_i8 */
-	NULL,	/* atomic_add_imm_new_i8 */
-	NULL,	/* atomic_exchange_i8 */
-	"\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* memory_barrier */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* arm_rsbs_imm */
-	"ii\x0" "\x0" "\x0" "\x0" "\x0" "\x0" "\x4" "",	/* arm_rsc_imm */
-};
-
diff --git a/recipes/mono/files/genmdesc-cpp.patch b/recipes/mono/files/genmdesc-cpp.patch
deleted file mode 100644
index 56eca8effd..0000000000
--- a/recipes/mono/files/genmdesc-cpp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mono-1.2.5.1/mono/mini/genmdesc.pl.orig	2007-10-03 21:02:07.000000000 +0200
-+++ mono-1.2.5.1/mono/mini/genmdesc.pl	2007-10-03 21:06:16.000000000 +0200
-@@ -36,7 +36,9 @@
- 		$i++;
- 	}
- 	close (OPS);
--	my $cpp = "cpp -undef ";
-+	my $cpp = $ENV{"CPP"};
-+	$cpp = "cpp" unless defined $cpp;
-+	$cpp .= " -undef ";
- 	foreach (@defines) {
- 		$cpp .= " -U$_";
- 		$arch_found = 1 if $arch eq $_;
-@@ -44,7 +46,7 @@
- 	die "$arch arch is not supported.\n" unless $arch_found;
- 
- 	$cpp .= " -D$arch $srcdir/mini-ops.h|";
--	#print "Running: $cpp\n";
-+	print "Running: $cpp\n";
- 	open (OPS, $cpp) || die "Cannot execute cpp: $!";
- 	while (<OPS>) {
- 		next unless /MINI_OP\s*\(\s*(\S+?)\s*,\s*"(.*?)"/;
diff --git a/recipes/mono/files/libgc_cppflags.patch b/recipes/mono/files/libgc_cppflags.patch
deleted file mode 100644
index d4a51179d1..0000000000
--- a/recipes/mono/files/libgc_cppflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: mono-1.9.1/configure.in
-===================================================================
---- mono-1.9.1.orig/configure.in	2008-07-16 23:37:52.000000000 -0400
-+++ mono-1.9.1/configure.in	2008-07-16 23:38:23.000000000 -0400
-@@ -660,13 +660,6 @@
- 		;;
- 
- 	xincluded)
--		AC_CONFIG_SUBDIRS(libgc)
--
--		# Pass CPPFLAGS to libgc configure
--		# Maybe we should use a separate variable for this to avoid passing useless and
--		# potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
--		export CPPFLAGS
--
- 		found_boehm=yes
- 		gc_headers=yes
- 		use_included_gc=yes
-@@ -714,9 +707,6 @@
-    CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
- fi
- 
--# tell libgc/configure about what we want
--ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args"
--
- AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
- AC_SUBST(LIBGC_CFLAGS)
- AC_SUBST(LIBGC_LIBS)
-@@ -1970,6 +1960,17 @@
- 	CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
- fi
- 
-+case "x$gc" in
-+	xincluded)
-+		# Pass CPPFLAGS to libgc configure
-+		# We should use a separate variable for this to avoid passing useless and
-+		# potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
-+		# This should be executed late so we pick up the final version of CPPFLAGS
-+		ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\""
-+		AC_CONFIG_SUBDIRS(libgc)
-+		;;
-+esac
-+
- PREVIEW=yes
- AC_ARG_WITH(preview,  [ --with-preview=yes,no     If you want to install the 2.0 FX preview],[
- 	if test x$with_preview = xno; then
diff --git a/recipes/mono/files/mono-configure.patch b/recipes/mono/files/mono-configure.patch
deleted file mode 100644
index 6baa39aa1a..0000000000
--- a/recipes/mono/files/mono-configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- mono-1.2.3.50.20070416.orig/configure.in	2007-04-16 07:02:59.000000000 +0200
-+++ mono-1.2.3.50.20070416/configure.in	2007-04-16 18:36:00.000000000 +0200
-@@ -806,7 +806,9 @@ if test x$platform_win32 = xno; then
- 			large_offt=yes
- 		], [
- 			AC_MSG_RESULT(no)
--		], "")
-+		], [
-+			AC_MSG_RESULT(no)
-+		])
- 		CPPFLAGS=$large_CPPFLAGS
- 	])
- 
-@@ -1131,6 +1133,8 @@ if test x$platform_win32 = xno; then
- 		], [
- 				AC_MSG_RESULT(no)
- 				with_tls=pthread
-+		], [
-+				AC_MSG_RESULT(yes)
- 		])
- 	fi
- 
-@@ -1233,6 +1237,9 @@ if test x$platform_win32 = xno; then
- 		], [
- 				with_sigaltstack=no
- 				AC_MSG_RESULT(no)
-+		], [
-+				AC_MSG_RESULT(yes)
-+				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
- 		])
- 	fi
- 
diff --git a/recipes/mono/files/mono-libgc-configure.patch b/recipes/mono/files/mono-libgc-configure.patch
deleted file mode 100644
index 641635da3c..0000000000
--- a/recipes/mono/files/mono-libgc-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: mono-1.2.6/libgc/configure.in
-===================================================================
---- mono-1.2.6.orig/libgc/configure.in	2007-12-12 15:02:31.000000000 -0500
-+++ mono-1.2.6/libgc/configure.in	2007-12-12 15:05:10.000000000 -0500
-@@ -17,6 +17,15 @@
- AC_PREREQ(2.53)
- AC_INIT(libgc-mono, 6.6, Hans_Boehm@hp.com)
- 
-+# the following is a very strange bug.  CPPFLAGS does not get set correctly
-+# if CPPFLAGS is set in the environment.  The top level configure script
-+# appends to the CPPFLAGS variable, and then exports it.  This change should
-+# be picked up by this configure script, but it is not.  The original 
-+# env variable is still used for some reason.  If CPPFLAGS is not set in the
-+# environment, everything works fine.
-+# Someone more experienced with autoconf will have to come up with a better fix.
-+CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP  -DUSE_COMPILER_TLS"
-+echo "CPPFLAGS verify: start of libgc/configure.in, CPPFLAGS = $CPPFLAGS"
- AM_INIT_AUTOMAKE(libgc-mono, 6.6, no-define)
- 
- AC_CONFIG_SRCDIR(gcj_mlc.c)
diff --git a/recipes/mono/files/mono-mini-Makefile.patch b/recipes/mono/files/mono-mini-Makefile.patch
deleted file mode 100644
index 92399e8241..0000000000
--- a/recipes/mono/files/mono-mini-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mono-1.2.3.20070219.orig/mono/mini/Makefile.am	2007-02-20 01:21:57.000000000 +0100
-+++ mono-1.2.3.20070219/mono/mini/Makefile.am	2007-02-20 01:22:45.000000000 +0100
-@@ -409,7 +409,7 @@
- 	$(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc
- 
- inssel.c inssel.h: $(BURGSRC)
--	$(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
-+	monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
- 
- testi: mono test.exe
- 	$(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe
diff --git a/recipes/mono/files/mono-mips-endian.patch b/recipes/mono/files/mono-mips-endian.patch
deleted file mode 100644
index c0f1d3c759..0000000000
--- a/recipes/mono/files/mono-mips-endian.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mono-1.2.20070131/mono/mini/mini-mips.c	2007-01-31 07:00:22.000000000 +0100
-+++ mono-1.2.20070131.mod/mono/mini/mini-mips.c	2007-02-17 21:22:34.000000000 +0100
-@@ -238,6 +238,11 @@
- patch_lui_addiu(guint32 *ip, guint32 val)
- {
- 	guint16 *__lui_addiu = (guint16*)(void *)(ip);
-+#if G_BYTE_ORDER == G_BIG_ENDIAN
-+ 	int index=1;
-+#else
-+	int index=0;
-+#endif
- 
- #if 0
- 	printf ("patch_lui_addiu ip=0x%08x (0x%08x, 0x%08x) to point to 0x%08x\n",
-@@ -245,10 +250,10 @@
- 	fflush (stdout);
- #endif
- 	if (((guint32)(val)) & (1 << 15))
--		__lui_addiu [1] = ((((guint32)(val)) >> 16) & 0xffff) + 1;
-+		__lui_addiu [index] = ((((guint32)(val)) >> 16) & 0xffff) + 1;
- 	else
--		__lui_addiu [1] = (((guint32)(val)) >> 16) & 0xffff;
--	__lui_addiu [3] = ((guint32)(val)) & 0xffff;
-+		__lui_addiu [index] = (((guint32)(val)) >> 16) & 0xffff;
-+	__lui_addiu [index+2] = ((guint32)(val)) & 0xffff;
- 	mono_arch_flush_icache ((guint8 *)ip, 8);
- }
- 
diff --git a/recipes/mono/files/mono-monoburg-Makefile.patch b/recipes/mono/files/mono-monoburg-Makefile.patch
deleted file mode 100644
index 03f51c4b36..0000000000
--- a/recipes/mono/files/mono-monoburg-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mono-1.2.20070131/mono/monoburg/Makefile.am	2006-10-10 07:00:26.000000000 +0200
-+++ mono-1.2.20070131.mod/mono/monoburg/Makefile.am	2007-02-13 17:44:02.000000000 +0100
-@@ -1,5 +1,3 @@
--CC=$(CC_FOR_BUILD)
--
- am_CFLAGS = $(BUILD_GLIB_CFLAGS) -I$(srcdir) $(CFLAGS_FOR_BUILD)
- 
- #noinst_PROGRAMS = sample
-@@ -12,10 +10,10 @@
- 	bison $(srcdir)/monoburg.y -o parser.c
- 
- monoburg$(BUILD_EXEEXT): $(srcdir)/monoburg.c $(srcdir)/monoburg.h parser.c
--	$(CC_FOR_BUILD) -o $@ $(srcdir)/monoburg.c parser.c $(am_CFLAGS) $(LDFLAGS) $(BUILD_GLIB_LIBS)
-+	$(CC) -o $@ $(srcdir)/monoburg.c parser.c $(am_CFLAGS) $(LDFLAGS) $(BUILD_GLIB_LIBS)
- 
- sample.c: monoburg$(BUILD_EXEEXT) $(srcdir)/sample.brg
--	./monoburg$(BUILD_EXEEXT) $(srcdir)/sample.brg > sample.c
-+	monoburg$(BUILD_EXEEXT) $(srcdir)/sample.brg > sample.c
- 
- #sample_LDADD = $(BUILD_GLIB_LIBS)
- 
diff --git a/recipes/mono/mono-1.2.5.1/configure.patch b/recipes/mono/mono-1.2.5.1/configure.patch
deleted file mode 100644
index 1553115c0e..0000000000
--- a/recipes/mono/mono-1.2.5.1/configure.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: mono-1.2.5/configure.in
-===================================================================
---- mono-1.2.5.orig/configure.in
-+++ mono-1.2.5/configure.in
-@@ -1134,6 +1134,8 @@ if test x$platform_win32 = xno; then
- 		], [
- 				AC_MSG_RESULT(no)
- 				with_tls=pthread
-+		], [
-+				AC_MSG_RESULT(yes)
- 		])
- 	fi
- 
-@@ -1236,6 +1238,9 @@ if test x$platform_win32 = xno; then
- 		], [
- 				with_sigaltstack=no
- 				AC_MSG_RESULT(no)
-+		], [
-+				AC_MSG_RESULT(yes)
-+				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
- 		])
- 	fi
- 
-@@ -1893,24 +1898,26 @@ if test "x$with_tls" = "x__thread"; then
- 	])
- fi
- 
--if test ${TARGET} = ARM; then
--	dnl ******************************************
--	dnl *** Check to see what FPU is available ***
--	dnl ******************************************
--	AC_MSG_CHECKING(which FPU to use)
--
--	AC_TRY_COMPILE([], [
--		__asm__ ("ldfd f0, [r0]");
--		], fpu=FPA, [
--			AC_TRY_COMPILE([], [
--				__asm__ ("fldd d0, [r0]");
--			], fpu=VFP, fpu=NONE)
--		])
-+#if test ${TARGET} = ARM; then
-+#	dnl ******************************************
-+#	dnl *** Check to see what FPU is available ***
-+#	dnl ******************************************
-+#	AC_MSG_CHECKING(which FPU to use)
-+#
-+#	AC_TRY_COMPILE([], [
-+#		__asm__ ("ldfd f0, [r0]");
-+#		], fpu=FPA, [
-+#			AC_TRY_COMPILE([], [
-+#				__asm__ ("fldd d0, [r0]");
-+#			], fpu=VFP, fpu=NONE)
-+#		])
-+#
-+#	AC_MSG_RESULT($fpu)
-+#	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
-+#	unset fpu
-+#fi
- 
--	AC_MSG_RESULT($fpu)
--	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
--	unset fpu
--fi
-+	CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1"
- 
- if test ${TARGET} = unknown; then
- 	CPPFLAGS="$CPPFLAGS -DNO_PORT"
diff --git a/recipes/mono/mono-1.2.5.1/disable-monoburg.patch b/recipes/mono/mono-1.2.5.1/disable-monoburg.patch
deleted file mode 100644
index 21c1e30f07..0000000000
--- a/recipes/mono/mono-1.2.5.1/disable-monoburg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: mono-1.2.5.1/mono/Makefile.am
-===================================================================
---- mono-1.2.5.1.orig/mono/Makefile.am	2008-03-05 15:52:06.000000000 +0800
-+++ mono-1.2.5.1/mono/Makefile.am	2008-03-05 15:52:23.000000000 +0800
-@@ -1,3 +1,3 @@
- 
--SUBDIRS = utils io-layer monoburg os cil metadata \
-+SUBDIRS = utils io-layer os cil metadata \
-       arch interpreter mini dis monograph tests benchmark profiler
-Index: mono-1.2.5.1/mono/mini/Makefile.am
-===================================================================
---- mono-1.2.5.1.orig/mono/mini/Makefile.am	2008-03-05 16:02:51.000000000 +0800
-+++ mono-1.2.5.1/mono/mini/Makefile.am	2008-03-05 16:02:57.000000000 +0800
-@@ -436,7 +436,7 @@
- 	$(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc
- 
- inssel.c inssel.h: $(BURGSRC)
--	$(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
-+	monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
- 
- testi: mono test.exe
- 	$(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe
diff --git a/recipes/mono/mono-1.2.6/configure.patch b/recipes/mono/mono-1.2.6/configure.patch
deleted file mode 100644
index f033248621..0000000000
--- a/recipes/mono/mono-1.2.6/configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: mono-1.2.6/configure.in
-===================================================================
---- mono-1.2.6.orig/configure.in	2007-11-08 17:07:57.000000000 -0500
-+++ mono-1.2.6/configure.in	2007-12-12 15:27:52.000000000 -0500
-@@ -1150,6 +1150,8 @@
- 		], [
- 				AC_MSG_RESULT(no)
- 				with_tls=pthread
-+		], [
-+				AC_MSG_RESULT(yes)
- 		])
- 	fi
- 
-@@ -1252,6 +1254,9 @@
- 		], [
- 				with_sigaltstack=no
- 				AC_MSG_RESULT(no)
-+		], [
-+				AC_MSG_RESULT(yes)
-+				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
- 		])
- 	fi
- 
diff --git a/recipes/mono/mono-1.9.1+2.2-rc1/configure.patch b/recipes/mono/mono-1.9.1+2.2-rc1/configure.patch
deleted file mode 100644
index 689f7be5da..0000000000
--- a/recipes/mono/mono-1.9.1+2.2-rc1/configure.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: mono-2.2/configure.in
-===================================================================
---- mono-2.2.orig/configure.in	2008-11-13 18:22:29.000000000 -0500
-+++ mono-2.2/configure.in	2008-12-10 16:03:11.000000000 -0500
-@@ -1155,6 +1155,8 @@
- 		], [
- 				AC_MSG_RESULT(no)
- 				with_tls=pthread
-+		], [
-+				AC_MSG_RESULT(yes)
- 		])
- 	fi
- 
-@@ -1257,6 +1259,9 @@
- 		], [
- 				with_sigaltstack=no
- 				AC_MSG_RESULT(no)
-+		], [
-+				AC_MSG_RESULT(yes)
-+				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
- 		])
- 	fi
- 
-@@ -1746,6 +1751,7 @@
- 
- jit_wanted=false
- interp_wanted=false
-+echo "CLIFF: checking host = $host"
- case "$host" in
- #	mips-sgi-irix5.* | mips-sgi-irix6.*)
- #		TARGET=MIPS;
-@@ -1882,10 +1888,12 @@
- 		jit_wanted=true
- 		;;
- 	arm*-linux*)
-+    echo "CLIFF: found arm linux"
- 		TARGET=ARM;
- 		arch_target=arm;
- 		ACCESS_UNALIGNED="no"
- 		JIT_SUPPORTED=yes
-+		CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1"
- 		jit_wanted=true
- 		;;
- 	s390-*-linux*)
diff --git a/recipes/mono/mono-1.9.1+2.2-rc1/disable-docs.patch b/recipes/mono/mono-1.9.1+2.2-rc1/disable-docs.patch
deleted file mode 100644
index 2c1812e1a5..0000000000
--- a/recipes/mono/mono-1.9.1+2.2-rc1/disable-docs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mono-2.2/Makefile.am
-===================================================================
---- mono-2.2.orig/Makefile.am	2008-12-10 16:25:14.000000000 -0500
-+++ mono-2.2/Makefile.am	2008-12-10 16:25:24.000000000 -0500
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign
- ACLOCAL_AMFLAGS = -I .
- 
--SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc docs
-+SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc 
- 
- # Keep in sync with SUBDIRS
- ## 'tools' is not normally built
diff --git a/recipes/mono/mono-1.9.1+2.2-rc1/disable-monoburg.patch b/recipes/mono/mono-1.9.1+2.2-rc1/disable-monoburg.patch
deleted file mode 100644
index 14a2a094a7..0000000000
--- a/recipes/mono/mono-1.9.1+2.2-rc1/disable-monoburg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: mono-2.2/mono/Makefile.am
-===================================================================
---- mono-2.2.orig/mono/Makefile.am	2008-12-10 15:38:30.000000000 -0500
-+++ mono-2.2/mono/Makefile.am	2008-12-10 15:38:37.000000000 -0500
-@@ -1,3 +1,3 @@
- 
--SUBDIRS = utils io-layer monoburg os cil metadata \
-+SUBDIRS = utils io-layer os cil metadata \
-       arch interpreter mini dis monograph tests benchmark profiler
-Index: mono-2.2/mono/mini/Makefile.am
-===================================================================
---- mono-2.2.orig/mono/mini/Makefile.am	2008-12-10 15:44:11.000000000 -0500
-+++ mono-2.2/mono/mini/Makefile.am	2008-12-10 15:44:22.000000000 -0500
-@@ -482,7 +482,7 @@
- 	$(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc
- 
- inssel.c inssel.h: $(BURGSRC)
--	$(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
-+	monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
- 
- testi: mono test.exe
- 	$(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe
diff --git a/recipes/mono/mono-1.9.1+2.2-rc1/fix-eabi-syscall.patch b/recipes/mono/mono-1.9.1+2.2-rc1/fix-eabi-syscall.patch
deleted file mode 100644
index b752a8bd14..0000000000
--- a/recipes/mono/mono-1.9.1+2.2-rc1/fix-eabi-syscall.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mono.orig/mono/mini/mini-arm.c	2008/12/12 19:49:41	121457
-+++ mono/mono/mini/mini-arm.c	2009/01/05 08:58:47	122416
-@@ -581,6 +581,8 @@
- {
- #if __APPLE__
- 	sys_icache_invalidate (code, size);
-+#elif ((__GNUC__ >= 4) && (__GNUC_MINOR__ >= 1))
-+	__clear_cache (code, code + size);
- #else
- 	__asm __volatile ("mov r0, %0\n"
- 			"mov r1, %1\n"
-
diff --git a/recipes/mono/mono-2.4.2.3/0001-remove-docs-dir-from-build.patch b/recipes/mono/mono-2.4.2.3/0001-remove-docs-dir-from-build.patch
deleted file mode 100644
index 4e276e3f0c..0000000000
--- a/recipes/mono/mono-2.4.2.3/0001-remove-docs-dir-from-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2ca04d7b2af1f1d690d918da047b03de768f1a8b Mon Sep 17 00:00:00 2001
-From: Cliff Brake <cbrake@bec-systems.com>
-Date: Fri, 31 Jul 2009 17:48:47 -0400
-Subject: [PATCH] remove docs dir from build
-
----
- Makefile.am |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 083bb82..386ed91 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,11 +1,11 @@
- AUTOMAKE_OPTIONS = foreign
- ACLOCAL_AMFLAGS = -I .
- 
--SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc docs
-+SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc
- 
- # Keep in sync with SUBDIRS
- ## 'tools' is not normally built
--DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support data runtime scripts man samples web tools msvc docs
-+DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support data runtime scripts man samples web tools msvc
- 
- EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs
- 
--- 
-1.6.0.4
-
diff --git a/recipes/mono/mono-2.4.2.3/mini-arm.patch b/recipes/mono/mono-2.4.2.3/mini-arm.patch
deleted file mode 100644
index d517a5a276..0000000000
--- a/recipes/mono/mono-2.4.2.3/mini-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mono-2.4.2.1/mono/mini/mini-arm.h	2009-06-23 09:41:00.000000000 -0600
-+++ mono-2.4.2.1/mono/mini/mini-arm.h	2009-06-23 09:40:27.000000000 -0600
-@@ -9,7 +9,7 @@
- #endif
- 
- #ifdef ARM_FPU_VFP
--#error "VFP support is not complete, try mono SVN for that."
-+//#error "VFP support is not complete, try mono SVN for that."
- #endif
- 
- #if defined(__ARM_EABI__)
diff --git a/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch b/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch
deleted file mode 100644
index 3cf5473e8a..0000000000
--- a/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-https://bugzilla.novell.com/show_bug.cgi?id=515050#c2
-
-Backport following fixes from mono-2-4 branch
-http://lists.ximian.com/pipermail/mono-patches/2009-June/151386.html
-http://lists.ximian.com/pipermail/mono-patches/2009-June/151387.html
-
--Khem
-Index: mono-2.4.2.3/mono/mini/genmdesc.pl
-===================================================================
---- mono-2.4.2.3.orig/mono/mini/genmdesc.pl	2009-11-04 15:36:19.000000000 -0800
-+++ mono-2.4.2.3/mono/mini/genmdesc.pl	2009-11-04 15:36:27.000000000 -0800
-@@ -51,7 +51,7 @@ sub load_opcodes
- 	#print "Running: $cpp\n";
- 	open (OPS, $cpp) || die "Cannot execute cpp: $!";
- 	while (<OPS>) {
--		next unless /MINI_OP\s*\(\s*(\S+?)\s*,\s*"(.*?)"/;
-+		next unless /MINI_OP3?\s*\(\s*(\S+?)\s*,\s*"(.*?)"/;
- 		my ($sym, $name) = ($1, $2);
- 		push @opcodes, [$sym, $name];
- 		$table{$name} = {num => $i, name => $name};
-@@ -159,16 +159,19 @@ sub build_table {
- }
- 
- sub usage {
--	die "genmdesc.pl arch srcdir desc output name\n";
-+	die "genmdesc.pl arch srcdir output name desc [desc2 ...]\n";
- }
- 
- my $arch = shift || usage ();
- my $srcdir = shift || usage ();
--my $file = shift || usage ();
- my $output = shift || usage ();
- my $name = shift || usage ();
-+usage () unless @ARGV;
-+my @files = @ARGV;
- 
- load_opcodes ($srcdir, $arch);
--load_file ($file);
-+foreach my $file (@files) {
-+	load_file ($file);
-+}
- build_table ($output, $name);
- 
-Index: mono-2.4.2.3/mono/mini/Makefile.am
-===================================================================
---- mono-2.4.2.3.orig/mono/mini/Makefile.am	2009-11-04 15:30:20.000000000 -0800
-+++ mono-2.4.2.3/mono/mini/Makefile.am	2009-11-04 15:36:27.000000000 -0800
-@@ -422,40 +422,40 @@ GENMDESC_PRG=./genmdesc
- endif !CROSS_COMPILING
- 
- cpu-x86.h: cpu-x86.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-x86.md cpu-x86.h x86_desc
-+	$(GENMDESC_PRG) cpu-x86.h x86_desc $(srcdir)/cpu-x86.md
- 
- cpu-amd64.h: cpu-amd64.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-amd64.md cpu-amd64.h amd64_desc
-+	$(GENMDESC_PRG) cpu-amd64.h amd64_desc $(srcdir)/cpu-amd64.md
- 
- cpu-ppc.h: cpu-ppc.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-ppc.md cpu-ppc.h ppcg4
-+	$(GENMDESC_PRG) cpu-ppc.h ppcg4 $(srcdir)/cpu-ppc.md
- 
- cpu-ppc64.h: cpu-ppc64.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-ppc64.md cpu-ppc64.h ppc64_cpu_desc
-+	$(GENMDESC_PRG) cpu-ppc64.h ppc64_cpu_desc $(srcdir)/cpu-ppc64.md
- 
- cpu-arm.h: cpu-arm.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-arm.md cpu-arm.h arm_cpu_desc
-+	$(GENMDESC_PRG) cpu-arm.h arm_cpu_desc $(srcdir)/cpu-arm.md
- 
- cpu-sparc.h: cpu-sparc.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-sparc.md cpu-sparc.h sparc_desc
-+	$(GENMDESC_PRG) cpu-sparc.h sparc_desc $(srcdir)/cpu-sparc.md
- 
- cpu-s390.h: cpu-s390.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-s390.md cpu-s390.h s390_cpu_desc
-+	$(GENMDESC_PRG) cpu-s390.h s390_cpu_desc $(srcdir)/cpu-s390.md
- 
- cpu-s390x.h: cpu-s390x.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-s390x.md cpu-s390x.h s390x_cpu_desc
-+	$(GENMDESC_PRG) cpu-s390x.h s390x_cpu_desc $(srcdir)/cpu-s390x.md
- 
- cpu-ia64.h: cpu-ia64.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-ia64.md cpu-ia64.h ia64_desc
-+	$(GENMDESC_PRG) cpu-ia64.h ia64_desc $(srcdir)/cpu-ia64.md
- 
- cpu-alpha.h: cpu-alpha.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-alpha.md cpu-alpha.h alpha_desc
-+	$(GENMDESC_PRG) cpu-alpha.h alpha_desc $(srcdir)/cpu-alpha.md
- 
- cpu-hppa.h: cpu-hppa.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-hppa.md cpu-hppa.h hppa_desc
-+	$(GENMDESC_PRG) cpu-hppa.h hppa_desc $(srcdir)/cpu-hppa.md
- 
- cpu-mips.h: cpu-mips.md genmdesc$(EXEEXT)
--	$(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc
-+	$(GENMDESC_PRG) cpu-mips.h mips_desc $(srcdir)/cpu-mips.md
- 
- testi: mono test.exe
- 	$(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe
-Index: mono-2.4.2.3/mono/mini/genmdesc.c
-===================================================================
---- mono-2.4.2.3.orig/mono/mini/genmdesc.c	2009-11-04 15:35:34.000000000 -0800
-+++ mono-2.4.2.3/mono/mini/genmdesc.c	2009-11-04 15:36:27.000000000 -0800
-@@ -211,21 +211,20 @@ int 
- main (int argc, char* argv [])
- {
- 	init_table ();
--	switch (argc) {
--	case 2:
-+	if (argc == 2) {
- 		/* useful to get a new file when some opcodes are added: looses the comments, though */
- 		load_file (argv [1]);
- 		dump ();
--		break;
--	case 4:
--		load_file (argv [1]);
--		build_table (argv [2], argv [3]);
--		break;
--	default:
-+	} else if (argc < 4) {
- 		g_print ("Usage: genmdesc arguments\n");
--		g_print ("\tgenmdesc desc             Output to stdout the description file.\n");
--		g_print ("\tgenmdesc desc output name Write to output the description in a table named 'name'.\n");
-+		g_print ("\tgenmdesc desc                        Output to stdout the description file.\n");
-+		g_print ("\tgenmdesc output name desc [desc1...] Write to output the description in a table named 'name'.\n");
- 		return 1;
-+	} else {
-+		int i;
-+		for (i = 3; i < argc; ++i)
-+			load_file (argv [i]);
-+		build_table (argv [1], argv [2]);
- 	}
- 	return 0;
- }
-Index: mono-2.4.2.3/mono/mini/mini-ops.h
-===================================================================
---- mono-2.4.2.3.orig/mono/mini/mini-ops.h	2009-11-04 15:35:34.000000000 -0800
-+++ mono-2.4.2.3/mono/mini/mini-ops.h	2009-11-04 15:38:37.000000000 -0800
-@@ -72,7 +72,7 @@ MINI_OP(OP_STOREI8_MEMBASE_REG, "storei8
- MINI_OP(OP_STORER4_MEMBASE_REG, "storer4_membase_reg", IREG, FREG, NONE)
- MINI_OP(OP_STORER8_MEMBASE_REG, "storer8_membase_reg", IREG, FREG, NONE)
- 
--#ifdef MONO_ARCH_SUPPORT_SIMD_INTRINSICS
-+#if defined(TARGET_X86) || defined(TARGET_AMD64)
- MINI_OP(OP_STOREX_MEMBASE_REG, "storex_membase_reg", IREG, XREG, NONE)
- MINI_OP(OP_STOREX_ALIGNED_MEMBASE_REG,     "storex_aligned_membase_reg", IREG, XREG, NONE)
- MINI_OP(OP_STOREX_NTA_MEMBASE_REG,     "storex_nta_membase_reg", IREG, XREG, NONE)
-@@ -100,7 +100,7 @@ MINI_OP(OP_LOADR8_MEMBASE,"loadr8_membas
- 
- MINI_OP(OP_LOADX_MEMBASE, 			"loadx_membase", XREG, IREG, NONE)
- 
--#ifdef MONO_ARCH_SUPPORT_SIMD_INTRINSICS
-+#if defined(TARGET_X86) || defined(TARGET_AMD64)
- MINI_OP(OP_LOADX_ALIGNED_MEMBASE,  "loadx_aligned_membase", XREG, IREG, NONE)
- #endif
- 
-@@ -578,7 +578,7 @@ MINI_OP(OP_NOT_NULL, "not_null", NONE, I
- 
- /* SIMD opcodes. */
- 
--#ifdef MONO_ARCH_SUPPORT_SIMD_INTRINSICS
-+#if defined(TARGET_X86) || defined(TARGET_AMD64)
- 
- MINI_OP(OP_ADDPS, "addps", XREG, XREG, XREG)
- MINI_OP(OP_DIVPS, "divps", XREG, XREG, XREG)
diff --git a/recipes/mono/mono-2.4.2.3/configure.patch b/recipes/mono/mono-2.6.3/configure.patch
index 7ca874ab07..55636c792e 100644
--- a/recipes/mono/mono-2.4.2.3/configure.patch
+++ b/recipes/mono/mono-2.6.3/configure.patch
@@ -29,16 +29,3 @@ Index: mono-2.4.2.1/configure.in
  case "$host" in
  #	mips-sgi-irix5.* | mips-sgi-irix6.*)
  #		TARGET=MIPS;
-@@ -1882,10 +1888,12 @@
- 		jit_wanted=true
- 		;;
- 	arm*-linux*)
-+    echo "CLIFF: found arm linux"
- 		TARGET=ARM;
- 		arch_target=arm;
- 		ACCESS_UNALIGNED="no"
- 		JIT_SUPPORTED=yes
-+		CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1"
- 		jit_wanted=true
- 		;;
- 	s390-*-linux*)
diff --git a/recipes/mono/mono-mcs-intermediate.inc b/recipes/mono/mono-mcs-intermediate.inc
index 9706fc2b35..ee00550d71 100644
--- a/recipes/mono/mono-mcs-intermediate.inc
+++ b/recipes/mono/mono-mcs-intermediate.inc
@@ -8,12 +8,11 @@
 PR = "r0"
 DEPENDS = "mono-native glib-2.0-native perl-native"
 
-SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
+SRC_URI += "file://mono-fix-libdir-path.patch"
 
 # Inherit native to set up compiler and paths ...
 inherit native
 # ... but override the target prefix
-prefix = "/usr"
 exec_prefix = "/usr"
 sysconfdir = "/etc"
 # TODO: Where does the mono package get
@@ -29,19 +28,8 @@ do_fix_libtool_name() {
 }
 addtask fix_libtool_name after do_patch before do_configure
 
-do_stage() {
-	true
-}
-
-do_install() {
+do_compile_append() {
 	oe_runmake 'DESTDIR=${D}' install
-}
-
-do_package() {
-	true
-}
-
-do_stage() {
 	cd ${D}
 	rm -f ${WORKDIR}/mono-mcs-${PV}.tar.gz
 	tar -cvzf ${WORKDIR}/mono-mcs-${PV}.tar.gz .
@@ -49,6 +37,10 @@ do_stage() {
 	cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DATADIR}/mono-mcs/
 }
 
+do_package() {
+	true
+}
+
 do_package_write_ipk() {
 	true
 }
diff --git a/recipes/mono/mono-mcs-intermediate_1.2.5.1.bb b/recipes/mono/mono-mcs-intermediate_1.2.5.1.bb
deleted file mode 100644
index 5a1e10464c..0000000000
--- a/recipes/mono/mono-mcs-intermediate_1.2.5.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-# This is a straw-man recipe for step 1 in the two-step build of
-# mono. Because it's impossible to build the mcs directory
-# in cross-compile mode, this recipe will do a native build,
-# then tar the resulting install tree for usage by the mono
-# package in step 2.
-# See http://www.mono-project.com/Mono:ARM
-
-require mono_1.2.5.inc
-require mono-mcs-intermediate.inc
-
-PARALLEL_MAKE = ""
-
-
-SRC_URI[md5sum] = "dfede0c8c29384a8f8a6953a9bd06224"
-SRC_URI[sha256sum] = "434f91032e48c03e1202ba3cef1648e2708eeefcf51143d3547e34acc9c68a96"
diff --git a/recipes/mono/mono-mcs-intermediate_1.2.6.bb b/recipes/mono/mono-mcs-intermediate_1.2.6.bb
deleted file mode 100644
index 44bda177e1..0000000000
--- a/recipes/mono/mono-mcs-intermediate_1.2.6.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-# This is a straw-man recipe for step 1 in the two-step build of
-# mono. Because it's impossible to build the mcs directory
-# in cross-compile mode, this recipe will do a native build,
-# then tar the resulting install tree for usage by the mono
-# package in step 2.
-# See http://www.mono-project.com/Mono:ARM
-
-require mono_1.2.6.inc
-require mono-mcs-intermediate.inc
-
-PARALLEL_MAKE = ""
-
-
-
-SRC_URI[md5sum] = "391f85b4f962269e044ceac2b5235310"
-SRC_URI[sha256sum] = "24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f"
diff --git a/recipes/mono/mono-mcs-intermediate_1.9.1+2.2-rc1.bb b/recipes/mono/mono-mcs-intermediate_1.9.1+2.2-rc1.bb
deleted file mode 100644
index 7e8d0f7fbc..0000000000
--- a/recipes/mono/mono-mcs-intermediate_1.9.1+2.2-rc1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# This is a straw-man recipe for step 1 in the two-step build of
-# mono. Because it's impossible to build the mcs directory
-# in cross-compile mode, this recipe will do a native build,
-# then tar the resulting install tree for usage by the mono
-# package in step 2.
-# See http://www.mono-project.com/Mono:ARM
-
-require mono_2.2.0.inc
-require mono-mcs-intermediate.inc
-
-DEFAULT_PREFERENCE = "-1"
-
-#SRC_URI += "file://libgc_cppflags.patch;patch=1"
-
-
-
-SRC_URI[md5sum] = "6dfc8364f6e761d558f134a707bae421"
-SRC_URI[sha256sum] = "44fc0eddf56c0abe861190051fceec6e223122c5835967459c69fbf98ee52067"
diff --git a/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb b/recipes/mono/mono-mcs-intermediate_2.6.3.bb
index ecbb0fb501..cd5bcae569 100644
--- a/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb
+++ b/recipes/mono/mono-mcs-intermediate_2.6.3.bb
@@ -5,12 +5,13 @@
 # package in step 2.
 # See http://www.mono-project.com/Mono:ARM
 
-require mono-${PV}.inc
+require mono.inc
 require mono-mcs-intermediate.inc
 
 SRC_URI += ""
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "b1dc21bac2c7c75814a9f32246eadadd"
+SRC_URI[sha256sum] = "0ecb82d2007f472f8eebc85c349813515bf642e6ea021890ece40555ad50d947"
 
-SRC_URI[md5sum] = "696f25afc8453cd0d1c78de6e905dcf2"
-SRC_URI[sha256sum] = "1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae"
diff --git a/recipes/mono/mono-mcs-intermediate_svn.bb b/recipes/mono/mono-mcs-intermediate_svn.bb
deleted file mode 100644
index f5dbedd612..0000000000
--- a/recipes/mono/mono-mcs-intermediate_svn.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is a straw-man recipe for step 1 in the two-step build of
-# mono. Because it's impossible to build the mcs directory
-# in cross-compile mode, this recipe will do a native build,
-# then tar the resulting install tree for usage by the mono
-# package in step 2.
-# See http://www.mono-project.com/Mono:ARM
-
-require mono_svn.inc
-require mono-mcs-intermediate.inc
-
-DEFAULT_PREFERENCE = "-1"
-EXTRA_OECONF_append = " --without-tls "
diff --git a/recipes/mono/mono-native_1.2.5.1.bb b/recipes/mono/mono-native_1.2.5.1.bb
deleted file mode 100644
index a20be564a2..0000000000
--- a/recipes/mono/mono-native_1.2.5.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-require mono_1.2.5.inc
-PR = "r2"
-DEPENDS = "glib-2.0-native perl-native"
-
-SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
-
-PARALLEL_MAKE = ""
-
-inherit native
-
-do_stage_prepend() {
-	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
-}
-
-do_fix_libtool_name() {
-	# inherit native will make that all native tools that are being
-	# built are prefixed with something like "i686-linux-",
-	# including libtool. Fix up some hardcoded libtool names:
-	for i in "${S}"/runtime/*-wrapper.in; do
-		sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}"
-	done
-}
-addtask fix_libtool_name after do_patch before do_configure
-
-SRC_URI[md5sum] = "dfede0c8c29384a8f8a6953a9bd06224"
-SRC_URI[sha256sum] = "434f91032e48c03e1202ba3cef1648e2708eeefcf51143d3547e34acc9c68a96"
diff --git a/recipes/mono/mono-native_1.9.1+2.2-rc1.bb b/recipes/mono/mono-native_1.9.1+2.2-rc1.bb
deleted file mode 100644
index 3b74a0f623..0000000000
--- a/recipes/mono/mono-native_1.9.1+2.2-rc1.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-require mono_2.2.0.inc
-PR = "r3"
-DEPENDS = "glib-2.0-native perl-native"
-
-DEFAULT_PREFERENCE = "-1"
-
-#SRC_URI += "file://mono-fix-libdir-path.patch;patch=1 \
-#	    file://libgc_cppflags.patch;patch=1 \
-#           "
-
-inherit native
-
-do_stage_prepend() {
-	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
-}
-
-do_fix_libtool_name() {
-	# inherit native will make that all native tools that are being
-	# built are prefixed with something like "i686-linux-",
-	# including libtool. Fix up some hardcoded libtool names:
-	for i in "${S}"/runtime/*-wrapper.in; do
-		sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}"
-	done
-}
-addtask fix_libtool_name after do_patch before do_configure
-
-SRC_URI[md5sum] = "6dfc8364f6e761d558f134a707bae421"
-SRC_URI[sha256sum] = "44fc0eddf56c0abe861190051fceec6e223122c5835967459c69fbf98ee52067"
diff --git a/recipes/mono/mono-native_2.4.2.3.bb b/recipes/mono/mono-native_2.6.3.bb
index 59cc13e937..03820d3cd3 100644
--- a/recipes/mono/mono-native_2.4.2.3.bb
+++ b/recipes/mono/mono-native_2.6.3.bb
@@ -1,7 +1,7 @@
-require mono-${PV}.inc
+require mono.inc
 DEPENDS = "glib-2.0-native perl-native"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 SRC_URI += ""
 
@@ -17,5 +17,6 @@ do_fix_libtool_name() {
 }
 addtask fix_libtool_name after do_patch before do_configure
 
-SRC_URI[md5sum] = "696f25afc8453cd0d1c78de6e905dcf2"
-SRC_URI[sha256sum] = "1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae"
+SRC_URI[md5sum] = "b1dc21bac2c7c75814a9f32246eadadd"
+SRC_URI[sha256sum] = "0ecb82d2007f472f8eebc85c349813515bf642e6ea021890ece40555ad50d947"
+
diff --git a/recipes/mono/mono-2.4.2.3.inc b/recipes/mono/mono.inc
index 2625703497..c1e80a416a 100644
--- a/recipes/mono/mono-2.4.2.3.inc
+++ b/recipes/mono/mono.inc
@@ -2,12 +2,12 @@ DESCRIPTION = "Mono Programming Language"
 SECTION = "devel/mono"
 LICENSE = "GPL LGPL X11"
 
-SRC_URI = "http://ftp.novell.com/pub/mono/sources/mono/mono-2.4.2.3.tar.bz2"
+SRC_URI = "http://ftp.novell.com/pub/mono/sources/mono/mono-${PV}.tar.bz2"
 
-INC_PR = "r3"
+INC_PR = "r0"
 
 S = "${WORKDIR}/mono-${PV}"
-
+CFLAGS_append += " -DARM_FPU_NONE=1 "
 # parallel make does not work for mono (currently)
 
 PARALLEL_MAKE = ""
@@ -16,6 +16,7 @@ do_fix_dolt_libtool() {
 	# look for libtool prefixed with HOST_SYS
 	sed -e "s/slash\}libtool/slash\}${HOST_SYS}-libtool/" -i acinclude.m4
 	echo No acinclude!
+	libtoolize --force --copy
 }
 
 inherit autotools
@@ -23,3 +24,5 @@ EXTRA_OECONF_arm = "--without-tls"
 EXTRA_OECONF_mipsel = "--without-tls"
 
 addtask fix_dolt_libtool after do_patch before do_configure
+
+
diff --git a/recipes/mono/mono_1.2.5.1-files.inc b/recipes/mono/mono_1.2.5.1-files.inc
deleted file mode 100644
index 1d7b74e345..0000000000
--- a/recipes/mono/mono_1.2.5.1-files.inc
+++ /dev/null
@@ -1,1634 +0,0 @@
-# This is a generated file, please do not edit directly
-# Use collect-files.py instead. -- Henryk <henryk@openmoko.org>
-FILES_mono-jit-dbg += "/usr/bin/mono*.mdb \
-	/usr/bin/mono*/*.mdb"
-FILES_mono-jit = "/usr/bin/mono"
-FILES_mono-gac-dbg += "/usr/bin/gacutil*.mdb \
-	/usr/bin/gacutil*/*.mdb \
-	/usr/lib/mono/1.0/gacutil.exe*.mdb \
-	/usr/lib/mono/1.0/gacutil.exe*/*.mdb"
-FILES_mono-gac = "/usr/bin/gacutil \
-	/usr/lib/mono/1.0/gacutil.exe"
-FILES_mono-mjs-dbg += "/usr/bin/mjs*.mdb \
-	/usr/bin/mjs*/*.mdb \
-	/usr/lib/mono/1.0/mjs.exe*.mdb \
-	/usr/lib/mono/1.0/mjs.exe*/*.mdb"
-FILES_mono-mjs = "/usr/bin/mjs \
-	/usr/lib/mono/1.0/mjs.exe*"
-FILES_mono-gmcs-dbg += "/usr/bin/gmcs*.mdb \
-	/usr/bin/gmcs*/*.mdb \
-	/usr/bin/wsdl2*.mdb \
-	/usr/bin/wsdl2*/*.mdb \
-	/usr/bin/monop2*.mdb \
-	/usr/bin/monop2*/*.mdb \
-	/usr/bin/ilasm2*.mdb \
-	/usr/bin/ilasm2*/*.mdb \
-	/usr/bin/resgen2*.mdb \
-	/usr/bin/resgen2*/*.mdb \
-	/usr/bin/mono-api-info2*.mdb \
-	/usr/bin/mono-api-info2*/*.mdb \
-	/usr/bin/mono-service2*.mdb \
-	/usr/bin/mono-service2*/*.mdb \
-	/usr/bin/mkbundle2*.mdb \
-	/usr/bin/mkbundle2*/*.mdb \
-	/usr/bin/xbuild*.mdb \
-	/usr/bin/xbuild*/*.mdb \
-	/usr/bin/sgen*.mdb \
-	/usr/bin/sgen*/*.mdb \
-	/usr/bin/al2*.mdb \
-	/usr/bin/al2*/*.mdb \
-	/usr/bin/httpcfg*.mdb \
-	/usr/bin/httpcfg*/*.mdb \
-	/usr/lib/mono/2.0/*.exe*.mdb \
-	/usr/lib/mono/2.0/*.exe*/*.mdb \
-	/usr/lib/mono/2.0/xbuild.rsp*.mdb \
-	/usr/lib/mono/2.0/xbuild.rsp*/*.mdb \
-	/usr/lib/mono/2.0/MSBuild/*.mdb \
-	/usr/lib/mono/2.0/MSBuild/*/*.mdb \
-	/usr/lib/mono/2.0/MSBuild/.debug/ \
-	/usr/lib/mono/2.0/MSBuild/../.debug/ \
-	/usr/lib/mono/2.0/Microsoft.Build.xsd*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Build.xsd*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.CSharp.targets*.mdb \
-	/usr/lib/mono/2.0/Microsoft.CSharp.targets*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Common.tasks*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Common.tasks*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Common.targets*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Common.targets*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.VisualBasic.targets*.mdb \
-	/usr/lib/mono/2.0/Microsoft.VisualBasic.targets*/*.mdb"
-FILES_mono-gmcs = "/usr/bin/gmcs \
-	/usr/bin/wsdl2 \
-	/usr/bin/monop2 \
-	/usr/bin/ilasm2 \
-	/usr/bin/resgen2 \
-	/usr/bin/mono-api-info2 \
-	/usr/bin/mono-service2 \
-	/usr/bin/mkbundle2 \
-	/usr/bin/xbuild \
-	/usr/bin/sgen \
-	/usr/bin/al2 \
-	/usr/bin/httpcfg \
-	/usr/lib/mono/2.0/*.exe* \
-	/usr/lib/mono/2.0/xbuild.rsp \
-	/usr/lib/mono/2.0/MSBuild/ \
-	/usr/lib/mono/2.0/Microsoft.Build.xsd \
-	/usr/lib/mono/2.0/Microsoft.CSharp.targets \
-	/usr/lib/mono/2.0/Microsoft.Common.tasks \
-	/usr/lib/mono/2.0/Microsoft.Common.targets \
-	/usr/lib/mono/2.0/Microsoft.VisualBasic.targets"
-FILES_mono-utils-dbg += "/usr/bin/pedump*.mdb \
-	/usr/bin/pedump*/*.mdb \
-	/usr/bin/monodis*.mdb \
-	/usr/bin/monodis*/*.mdb \
-	/usr/bin/monograph*.mdb \
-	/usr/bin/monograph*/*.mdb \
-	/usr/bin/mono-find-provides*.mdb \
-	/usr/bin/mono-find-provides*/*.mdb \
-	/usr/bin/mono-find-requires*.mdb \
-	/usr/bin/mono-find-requires*/*.mdb"
-FILES_mono-utils = "/usr/bin/pedump \
-	/usr/bin/monodis \
-	/usr/bin/monograph \
-	/usr/bin/mono-find-provides \
-	/usr/bin/mono-find-requires"
-FILES_libmono-peapi1.0-cil-dbg += "/usr/lib/mono/gac/PEAPI/1.0.*/*.mdb \
-	/usr/lib/mono/gac/PEAPI/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/PEAPI/1.0.*/.debug/ \
-	/usr/lib/mono/gac/PEAPI/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/PEAPI.dll*.mdb \
-	/usr/lib/mono/1.0/PEAPI.dll*/*.mdb"
-FILES_libmono-peapi1.0-cil = "/usr/lib/mono/gac/PEAPI/1.0.*/ \
-	/usr/lib/mono/1.0/PEAPI.dll"
-FILES_libmono-cairo1.0-cil-dbg += "/usr/lib/mono/gac/Mono.Cairo/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Cairo/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Cairo/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Cairo/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Mono.Cairo.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.Cairo.dll*/*.mdb \
-	/usr/lib/pkgconfig/mono-cairo.pc*.mdb \
-	/usr/lib/pkgconfig/mono-cairo.pc*/*.mdb"
-FILES_libmono-cairo1.0-cil = "/usr/lib/mono/gac/Mono.Cairo/1.0.*/ \
-	/usr/lib/mono/1.0/Mono.Cairo.dll \
-	/usr/lib/pkgconfig/mono-cairo.pc"
-FILES_libmono-system-web2.0-cil-dbg += "/usr/lib/mono/gac/System.Web/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Web/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Web/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Web/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Web.Services/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Web.Services/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Web.Services/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Web.Services/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Web.dll*.mdb \
-	/usr/lib/mono/2.0/System.Web.dll*/*.mdb \
-	/usr/lib/mono/2.0/System.Web.Services.dll*.mdb \
-	/usr/lib/mono/2.0/System.Web.Services.dll*/*.mdb"
-FILES_libmono-system-web2.0-cil = "/usr/lib/mono/gac/System.Web/2.0.*/ \
-	/usr/lib/mono/gac/System.Web.Services/2.0.*/ \
-	/usr/lib/mono/2.0/System.Web.dll \
-	/usr/lib/mono/2.0/System.Web.Services.dll"
-FILES_libmono-accessibility2.0-cil-dbg += "/usr/lib/mono/gac/Accessibility/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Accessibility/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Accessibility/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Accessibility/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Accessibility.dll*.mdb \
-	/usr/lib/mono/2.0/Accessibility.dll*/*.mdb"
-FILES_libmono-accessibility2.0-cil = "/usr/lib/mono/gac/Accessibility/2.0.*/ \
-	/usr/lib/mono/2.0/Accessibility.dll"
-FILES_libmono-microsoft7.0-cil-dbg += "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/../.debug/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/../.debug/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Microsoft.JScript.dll*.mdb \
-	/usr/lib/mono/1.0/Microsoft.JScript.dll*/*.mdb \
-	/usr/lib/mono/1.0/Microsoft.VisualC.dll*.mdb \
-	/usr/lib/mono/1.0/Microsoft.VisualC.dll*/*.mdb \
-	/usr/lib/mono/1.0/Microsoft.Vsa.dll*.mdb \
-	/usr/lib/mono/1.0/Microsoft.Vsa.dll*/*.mdb"
-FILES_libmono-microsoft7.0-cil = "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/ \
-	/usr/lib/mono/1.0/Microsoft.JScript.dll \
-	/usr/lib/mono/1.0/Microsoft.VisualC.dll \
-	/usr/lib/mono/1.0/Microsoft.Vsa.dll"
-FILES_libmono-winforms2.0-cil-dbg += "/usr/lib/mono/gac/System.Windows.Forms/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Design/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Design/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Design/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Design/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Windows.Forms.dll*.mdb \
-	/usr/lib/mono/2.0/System.Windows.Forms.dll*/*.mdb \
-	/usr/lib/mono/2.0/System.Drawing.Design.dll*.mdb \
-	/usr/lib/mono/2.0/System.Drawing.Design.dll*/*.mdb \
-	/usr/lib/mono/2.0/System.Design.dll*.mdb \
-	/usr/lib/mono/2.0/System.Design.dll*/*.mdb"
-FILES_libmono-winforms2.0-cil = "/usr/lib/mono/gac/System.Windows.Forms/2.0.*/ \
-	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/ \
-	/usr/lib/mono/gac/System.Design/2.0.*/ \
-	/usr/lib/mono/2.0/System.Windows.Forms.dll \
-	/usr/lib/mono/2.0/System.Drawing.Design.dll \
-	/usr/lib/mono/2.0/System.Design.dll"
-FILES_libmono-ldap1.0-cil-dbg += "/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Novell.Directory.Ldap.dll*.mdb \
-	/usr/lib/mono/1.0/Novell.Directory.Ldap.dll*/*.mdb"
-FILES_libmono-ldap1.0-cil = "/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/ \
-	/usr/lib/mono/1.0/Novell.Directory.Ldap.dll"
-FILES_libmono-sharpzip2.84-cil-dbg += "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/.debug/ \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/../.debug/ \
-	/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll*.mdb \
-	/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
-FILES_libmono-sharpzip2.84-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/ \
-	/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll"
-FILES_libmono-system-data2.0-cil-dbg += "/usr/lib/mono/gac/System.Data/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Data/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Data/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Data/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Data.dll*.mdb \
-	/usr/lib/mono/2.0/System.Data.dll*/*.mdb"
-FILES_libmono-system-data2.0-cil = "/usr/lib/mono/gac/System.Data/2.0.*/ \
-	/usr/lib/mono/2.0/System.Data.dll"
-FILES_libmono-corlib2.0-cil-dbg += "/usr/lib/mono/gac/I18N*/2.0.*/*.mdb \
-	/usr/lib/mono/gac/I18N*/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/I18N*/2.0.*/.debug/ \
-	/usr/lib/mono/gac/I18N*/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/I18N*.dll*.mdb \
-	/usr/lib/mono/2.0/I18N*.dll*/*.mdb \
-	/usr/lib/mono/2.0/mscorlib.dll*.mdb \
-	/usr/lib/mono/2.0/mscorlib.dll*/*.mdb"
-FILES_libmono-corlib2.0-cil = "/usr/lib/mono/gac/I18N*/2.0.*/ \
-	/usr/lib/mono/2.0/I18N*.dll \
-	/usr/lib/mono/2.0/mscorlib.dll*"
-FILES_libmono-winforms1.0-cil-dbg += "/usr/lib/mono/gac/System.Windows.Forms/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Design/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Design/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Design/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Design/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Windows.Forms.dll*.mdb \
-	/usr/lib/mono/1.0/System.Windows.Forms.dll*/*.mdb \
-	/usr/lib/mono/1.0/System.Drawing.Design.dll*.mdb \
-	/usr/lib/mono/1.0/System.Drawing.Design.dll*/*.mdb \
-	/usr/lib/mono/1.0/System.Design.dll*.mdb \
-	/usr/lib/mono/1.0/System.Design.dll*/*.mdb"
-FILES_libmono-winforms1.0-cil = "/usr/lib/mono/gac/System.Windows.Forms/1.0.*/ \
-	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/ \
-	/usr/lib/mono/gac/System.Design/1.0.*/ \
-	/usr/lib/mono/1.0/System.Windows.Forms.dll \
-	/usr/lib/mono/1.0/System.Drawing.Design.dll \
-	/usr/lib/mono/1.0/System.Design.dll"
-FILES_libmono-microsoft8.0-cil-dbg += "/usr/lib/mono/gac/Microsoft.JScript/8.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/../.debug/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/../.debug/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Microsoft.JScript.dll*.mdb \
-	/usr/lib/mono/2.0/Microsoft.JScript.dll*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.VisualC.dll*.mdb \
-	/usr/lib/mono/2.0/Microsoft.VisualC.dll*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Vsa.dll*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Vsa.dll*/*.mdb"
-FILES_libmono-microsoft8.0-cil = "/usr/lib/mono/gac/Microsoft.JScript/8.0.*/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/ \
-	/usr/lib/mono/2.0/Microsoft.JScript.dll \
-	/usr/lib/mono/2.0/Microsoft.VisualC.dll \
-	/usr/lib/mono/2.0/Microsoft.Vsa.dll"
-FILES_libmono-corlib1.0-cil-dbg += "/usr/lib/mono/gac/I18N*/1.0.*/*.mdb \
-	/usr/lib/mono/gac/I18N*/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/I18N*/1.0.*/.debug/ \
-	/usr/lib/mono/gac/I18N*/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/I18N*.dll*.mdb \
-	/usr/lib/mono/1.0/I18N*.dll*/*.mdb \
-	/usr/lib/mono/1.0/mscorlib.dll*.mdb \
-	/usr/lib/mono/1.0/mscorlib.dll*/*.mdb"
-FILES_libmono-corlib1.0-cil = "/usr/lib/mono/gac/I18N*/1.0.*/ \
-	/usr/lib/mono/1.0/I18N*.dll \
-	/usr/lib/mono/1.0/mscorlib.dll*"
-FILES_libmono-system-web1.0-cil-dbg += "/usr/lib/mono/gac/System.Web/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Web/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Web/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Web/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Web.Services/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Web.Services/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Web.Services/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Web.Services/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Web.dll*.mdb \
-	/usr/lib/mono/1.0/System.Web.dll*/*.mdb \
-	/usr/lib/mono/1.0/System.Web.Services.dll*.mdb \
-	/usr/lib/mono/1.0/System.Web.Services.dll*/*.mdb"
-FILES_libmono-system-web1.0-cil = "/usr/lib/mono/gac/System.Web/1.0.*/ \
-	/usr/lib/mono/gac/System.Web.Services/1.0.*/ \
-	/usr/lib/mono/1.0/System.Web.dll \
-	/usr/lib/mono/1.0/System.Web.Services.dll"
-FILES_libmono-system-runtime2.0-cil-dbg += "/usr/lib/mono/gac/System.Runtime.*/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Runtime.*/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Runtime.*/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Runtime.*/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Runtime.*.dll*.mdb \
-	/usr/lib/mono/2.0/System.Runtime.*.dll*/*.mdb"
-FILES_libmono-system-runtime2.0-cil = "/usr/lib/mono/gac/System.Runtime.*/2.0.*/ \
-	/usr/lib/mono/2.0/System.Runtime.*.dll"
-FILES_libmono-cscompmgd8.0-cil-dbg += "/usr/lib/mono/gac/cscompmgd/8.0.*/*.mdb \
-	/usr/lib/mono/gac/cscompmgd/8.0.*/*/*.mdb \
-	/usr/lib/mono/gac/cscompmgd/8.0.*/.debug/ \
-	/usr/lib/mono/gac/cscompmgd/8.0.*/../.debug/ \
-	/usr/lib/mono/2.0/cscompmgd.dll*.mdb \
-	/usr/lib/mono/2.0/cscompmgd.dll*/*.mdb"
-FILES_libmono-cscompmgd8.0-cil = "/usr/lib/mono/gac/cscompmgd/8.0.*/ \
-	/usr/lib/mono/2.0/cscompmgd.dll"
-FILES_libmono-cscompmgd7.0-cil-dbg += "/usr/lib/mono/gac/cscompmgd/7.0.*/*.mdb \
-	/usr/lib/mono/gac/cscompmgd/7.0.*/*/*.mdb \
-	/usr/lib/mono/gac/cscompmgd/7.0.*/.debug/ \
-	/usr/lib/mono/gac/cscompmgd/7.0.*/../.debug/ \
-	/usr/lib/mono/1.0/cscompmgd.dll*.mdb \
-	/usr/lib/mono/1.0/cscompmgd.dll*/*.mdb"
-FILES_libmono-cscompmgd7.0-cil = "/usr/lib/mono/gac/cscompmgd/7.0.*/ \
-	/usr/lib/mono/1.0/cscompmgd.dll"
-FILES_libmono-firebirdsql1.7-cil-dbg += "/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/*.mdb \
-	/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/*/*.mdb \
-	/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/.debug/ \
-	/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/../.debug/ \
-	/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll*.mdb \
-	/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll*/*.mdb"
-FILES_libmono-firebirdsql1.7-cil = "/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/ \
-	/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll"
-FILES_mono-jay-dbg += "/usr/bin/jay*.mdb \
-	/usr/bin/jay*/*.mdb"
-FILES_mono-jay = "/usr/bin/jay"
-FILES_libmono-data-tds1.0-cil-dbg += "/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Mono.Data.Tds.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.Data.Tds.dll*/*.mdb"
-FILES_libmono-data-tds1.0-cil = "/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/ \
-	/usr/lib/mono/1.0/Mono.Data.Tds.dll"
-FILES_libmono-sqlite1.0-cil-dbg += "/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Mono.Data.Sqlite.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.Data.Sqlite.dll*/*.mdb \
-	/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll*/*.mdb"
-FILES_libmono-sqlite1.0-cil = "/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/ \
-	/usr/lib/mono/1.0/Mono.Data.Sqlite.dll \
-	/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll"
-FILES_libmono-relaxng1.0-cil-dbg += "/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll*.mdb \
-	/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll*/*.mdb"
-FILES_libmono-relaxng1.0-cil = "/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/ \
-	/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll"
-FILES_libmono-dev-dbg += "/usr/lib/libmono*.a*.mdb \
-	/usr/lib/libmono*.a*/*.mdb \
-	/usr/lib/libMono*.a*.mdb \
-	/usr/lib/libMono*.a*/*.mdb \
-	/usr/lib/libmono*.so*.mdb \
-	/usr/lib/libmono*.so*/*.mdb \
-	/usr/lib/libMonoSupportW.a*.mdb \
-	/usr/lib/libMonoSupportW.a*/*.mdb \
-	/usr/lib/pkgconfig/mono.pc*.mdb \
-	/usr/lib/pkgconfig/mono.pc*/*.mdb \
-	/usr/lib/pkgconfig/dotnet.pc*.mdb \
-	/usr/lib/pkgconfig/dotnet.pc*/*.mdb \
-	/usr/include/*.mdb \
-	/usr/include/*/*.mdb \
-	/usr/include/.debug/ \
-	/usr/include/../.debug/"
-FILES_libmono-dev = "/usr/lib/libmono*.a \
-	/usr/lib/libMono*.a \
-	/usr/lib/libmono*.so \
-	/usr/lib/libMonoSupportW.a \
-	/usr/lib/pkgconfig/mono.pc \
-	/usr/lib/pkgconfig/dotnet.pc \
-	/usr/include/"
-FILES_libmono-accessibility1.0-cil-dbg += "/usr/lib/mono/gac/Accessibility/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Accessibility/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Accessibility/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Accessibility/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Accessibility.dll*.mdb \
-	/usr/lib/mono/1.0/Accessibility.dll*/*.mdb"
-FILES_libmono-accessibility1.0-cil = "/usr/lib/mono/gac/Accessibility/1.0.*/ \
-	/usr/lib/mono/1.0/Accessibility.dll"
-FILES_mono-common-dbg += "/etc/mono*.mdb \
-	/etc/mono*/*.mdb \
-	/usr/share/mono-1.0/mono/cil/cil-opcodes.xml*.mdb \
-	/usr/share/mono-1.0/mono/cil/cil-opcodes.xml*/*.mdb"
-FILES_mono-common = "/etc/mono \
-	/usr/share/mono-1.0/mono/cil/cil-opcodes.xml"
-FILES_libmono-oracle1.0-cil-dbg += "/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Data.OracleClient.dll*.mdb \
-	/usr/lib/mono/1.0/System.Data.OracleClient.dll*/*.mdb"
-FILES_libmono-oracle1.0-cil = "/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/ \
-	/usr/lib/mono/1.0/System.Data.OracleClient.dll"
-FILES_libmono-system-data1.0-cil-dbg += "/usr/lib/mono/gac/System.Data/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Data/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Data/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Data/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Data.dll*.mdb \
-	/usr/lib/mono/1.0/System.Data.dll*/*.mdb"
-FILES_libmono-system-data1.0-cil = "/usr/lib/mono/gac/System.Data/1.0.*/ \
-	/usr/lib/mono/1.0/System.Data.dll"
-FILES_libmono-bytefx0.7.6.2-cil-dbg += "/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/*.mdb \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/*/*.mdb \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/.debug/ \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/../.debug/ \
-	/usr/lib/mono/2.0/ByteFX.Data.dll*.mdb \
-	/usr/lib/mono/2.0/ByteFX.Data.dll*/*.mdb"
-FILES_libmono-bytefx0.7.6.2-cil = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/ \
-	/usr/lib/mono/2.0/ByteFX.Data.dll"
-FILES_libmono0-dbg += "/usr/lib/libmono*.so.*.mdb \
-	/usr/lib/libmono*.so.*/*.mdb \
-	/usr/lib/libMonoPosixHelper.so*.mdb \
-	/usr/lib/libMonoPosixHelper.so*/*.mdb \
-	/usr/lib/libMonoSupportW.so*.mdb \
-	/usr/lib/libMonoSupportW.so*/*.mdb"
-FILES_libmono0 = "/usr/lib/libmono*.so.* \
-	/usr/lib/libMonoPosixHelper.so \
-	/usr/lib/libMonoSupportW.so"
-FILES_libmono-sharpzip0.6-cil-dbg += "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/.debug/ \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/../.debug/ \
-	/usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll*.mdb \
-	/usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
-FILES_libmono-sharpzip0.6-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/ \
-	/usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll"
-FILES_libmono-data-tds2.0-cil-dbg += "/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.Data.Tds.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.Data.Tds.dll*/*.mdb"
-FILES_libmono-data-tds2.0-cil = "/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/ \
-	/usr/lib/mono/2.0/Mono.Data.Tds.dll"
-FILES_libmono-system-messaging1.0-cil-dbg += "/usr/lib/mono/gac/System.Messaging/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Messaging/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Messaging/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Messaging/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Messaging.dll*.mdb \
-	/usr/lib/mono/1.0/System.Messaging.dll*/*.mdb"
-FILES_libmono-system-messaging1.0-cil = "/usr/lib/mono/gac/System.Messaging/1.0.*/ \
-	/usr/lib/mono/1.0/System.Messaging.dll"
-FILES_libmono-npgsql1.0-cil-dbg += "/usr/lib/mono/gac/Npgsql/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Npgsql/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Npgsql/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Npgsql/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Npgsql.dll*.mdb \
-	/usr/lib/mono/1.0/Npgsql.dll*/*.mdb"
-FILES_libmono-npgsql1.0-cil = "/usr/lib/mono/gac/Npgsql/1.0.*/ \
-	/usr/lib/mono/1.0/Npgsql.dll"
-FILES_libmono-security2.0-cil-dbg += "/usr/lib/mono/gac/Mono.Security/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Security/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Security/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Security/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.Security.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.Security.dll*/*.mdb"
-FILES_libmono-security2.0-cil = "/usr/lib/mono/gac/Mono.Security/2.0.*/ \
-	/usr/lib/mono/2.0/Mono.Security.dll"
-FILES_libmono-security1.0-cil-dbg += "/usr/lib/mono/gac/Mono.Security/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Security/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Security/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Security/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Mono.Security.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.Security.dll*/*.mdb"
-FILES_libmono-security1.0-cil = "/usr/lib/mono/gac/Mono.Security/1.0.*/ \
-	/usr/lib/mono/1.0/Mono.Security.dll"
-FILES_libmono-bytefx0.7.6.1-cil-dbg += "/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/*.mdb \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/*/*.mdb \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/.debug/ \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/../.debug/ \
-	/usr/lib/mono/1.0/ByteFX.Data.dll*.mdb \
-	/usr/lib/mono/1.0/ByteFX.Data.dll*/*.mdb"
-FILES_libmono-bytefx0.7.6.1-cil = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/ \
-	/usr/lib/mono/1.0/ByteFX.Data.dll"
-FILES_libmono-microsoft-build2.0-cil-dbg += "/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Microsoft.Build.*.dll*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Build.*.dll*/*.mdb"
-FILES_libmono-microsoft-build2.0-cil = "/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/ \
-	/usr/lib/mono/2.0/Microsoft.Build.*.dll"
-FILES_libmono-system-ldap1.0-cil-dbg += "/usr/lib/mono/gac/System.DirectoryServices/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.DirectoryServices/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.DirectoryServices/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.DirectoryServices/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.DirectoryServices.dll*.mdb \
-	/usr/lib/mono/1.0/System.DirectoryServices.dll*/*.mdb"
-FILES_libmono-system-ldap1.0-cil = "/usr/lib/mono/gac/System.DirectoryServices/1.0.*/ \
-	/usr/lib/mono/1.0/System.DirectoryServices.dll"
-FILES_libmono-relaxng2.0-cil-dbg += "/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Commons.Xml.Relaxng.dll*.mdb \
-	/usr/lib/mono/2.0/Commons.Xml.Relaxng.dll*/*.mdb"
-FILES_libmono-relaxng2.0-cil = "/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/ \
-	/usr/lib/mono/2.0/Commons.Xml.Relaxng.dll"
-FILES_libmono-system-ldap2.0-cil-dbg += "/usr/lib/mono/gac/System.DirectoryServices/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.DirectoryServices/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.DirectoryServices/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.DirectoryServices/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.DirectoryServices.dll*.mdb \
-	/usr/lib/mono/2.0/System.DirectoryServices.dll*/*.mdb"
-FILES_libmono-system-ldap2.0-cil = "/usr/lib/mono/gac/System.DirectoryServices/2.0.*/ \
-	/usr/lib/mono/2.0/System.DirectoryServices.dll"
-FILES_libmono-system-messaging2.0-cil-dbg += "/usr/lib/mono/gac/System.Messaging/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Messaging/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Messaging/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Messaging/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Messaging.dll*.mdb \
-	/usr/lib/mono/2.0/System.Messaging.dll*/*.mdb"
-FILES_libmono-system-messaging2.0-cil = "/usr/lib/mono/gac/System.Messaging/2.0.*/ \
-	/usr/lib/mono/2.0/System.Messaging.dll"
-FILES_libmono-sharpzip0.84-cil-dbg += "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/.debug/ \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/../.debug/ \
-	/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll*.mdb \
-	/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
-FILES_libmono-sharpzip0.84-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/ \
-	/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll"
-FILES_libmono-sqlite2.0-cil-dbg += "/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.Data.Sqlite.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.Data.Sqlite.dll*/*.mdb \
-	/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll*/*.mdb"
-FILES_libmono-sqlite2.0-cil = "/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/ \
-	/usr/lib/mono/2.0/Mono.Data.Sqlite.dll \
-	/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll"
-FILES_libmono-ldap2.0-cil-dbg += "/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Novell.Directory.Ldap.dll*.mdb \
-	/usr/lib/mono/2.0/Novell.Directory.Ldap.dll*/*.mdb"
-FILES_libmono-ldap2.0-cil = "/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/ \
-	/usr/lib/mono/2.0/Novell.Directory.Ldap.dll"
-FILES_libmono-npgsql2.0-cil-dbg += "/usr/lib/mono/gac/Npgsql/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Npgsql/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Npgsql/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Npgsql/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Npgsql.dll*.mdb \
-	/usr/lib/mono/2.0/Npgsql.dll*/*.mdb"
-FILES_libmono-npgsql2.0-cil = "/usr/lib/mono/gac/Npgsql/2.0.*/ \
-	/usr/lib/mono/2.0/Npgsql.dll"
-FILES_libmono-system-runtime1.0-cil-dbg += "/usr/lib/mono/gac/System.Runtime.*/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Runtime.*/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Runtime.*/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Runtime.*/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Runtime.*.dll*.mdb \
-	/usr/lib/mono/1.0/System.Runtime.*.dll*/*.mdb"
-FILES_libmono-system-runtime1.0-cil = "/usr/lib/mono/gac/System.Runtime.*/1.0.*/ \
-	/usr/lib/mono/1.0/System.Runtime.*.dll"
-FILES_libmono-oracle2.0-cil-dbg += "/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Data.OracleClient.dll*.mdb \
-	/usr/lib/mono/2.0/System.Data.OracleClient.dll*/*.mdb"
-FILES_libmono-oracle2.0-cil = "/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/ \
-	/usr/lib/mono/2.0/System.Data.OracleClient.dll"
-FILES_libmono-c5-1.0-cil-dbg += "/usr/lib/mono/gac/Mono.C5/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.C5/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.C5/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.C5/1.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.C5.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.C5.dll*/*.mdb"
-FILES_libmono-c5-1.0-cil = "/usr/lib/mono/gac/Mono.C5/1.0.*/ \
-	/usr/lib/mono/2.0/Mono.C5.dll"
-FILES_libmono-sharpzip2.6-cil-dbg += "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/.debug/ \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/../.debug/ \
-	/usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll*.mdb \
-	/usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
-FILES_libmono-sharpzip2.6-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/ \
-	/usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll"
-FILES_libmono-cairo2.0-cil-dbg += "/usr/lib/mono/gac/Mono.Cairo/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Cairo/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Cairo/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Cairo/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.Cairo.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.Cairo.dll*/*.mdb"
-FILES_libmono-cairo2.0-cil = "/usr/lib/mono/gac/Mono.Cairo/2.0.*/ \
-	/usr/lib/mono/2.0/Mono.Cairo.dll"
-FILES_libmono-peapi2.0-cil-dbg += "/usr/lib/mono/gac/PEAPI/2.0.*/*.mdb \
-	/usr/lib/mono/gac/PEAPI/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/PEAPI/2.0.*/.debug/ \
-	/usr/lib/mono/gac/PEAPI/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/PEAPI.dll*.mdb \
-	/usr/lib/mono/2.0/PEAPI.dll*/*.mdb"
-FILES_libmono-peapi2.0-cil = "/usr/lib/mono/gac/PEAPI/2.0.*/ \
-	/usr/lib/mono/2.0/PEAPI.dll"
-FILES_mono-mcs-dbg += "/usr/bin/*.mdb \
-	/usr/bin/*/*.mdb \
-	/usr/bin/.debug/ \
-	/usr/bin/../.debug/ \
-	/usr/lib/mono/1.0/*.exe*.mdb \
-	/usr/lib/mono/1.0/*.exe*/*.mdb"
-FILES_mono-mcs = "/usr/bin/ \
-	/usr/lib/mono/1.0/*.exe*"
-FILES_libmono-system1.0-cil-dbg += "/usr/lib/mono/gac/System*/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System*/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System*/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System*/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/CustomMarshalers/1.0.*/*.mdb \
-	/usr/lib/mono/gac/CustomMarshalers/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/CustomMarshalers/1.0.*/.debug/ \
-	/usr/lib/mono/gac/CustomMarshalers/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System*.dll*.mdb \
-	/usr/lib/mono/1.0/System*.dll*/*.mdb \
-	/usr/lib/mono/1.0/CustomMarshalers.dll*.mdb \
-	/usr/lib/mono/1.0/CustomMarshalers.dll*/*.mdb"
-FILES_libmono-system1.0-cil = "/usr/lib/mono/gac/System*/1.0.*/ \
-	/usr/lib/mono/gac/CustomMarshalers/1.0.*/ \
-	/usr/lib/mono/1.0/System*.dll \
-	/usr/lib/mono/1.0/CustomMarshalers.dll*"
-FILES_libmono-system2.0-cil-dbg += "/usr/lib/mono/gac/System*/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System*/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System*/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System*/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/CustomMarshalers/2.0.*/*.mdb \
-	/usr/lib/mono/gac/CustomMarshalers/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/CustomMarshalers/2.0.*/.debug/ \
-	/usr/lib/mono/gac/CustomMarshalers/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System*.dll*.mdb \
-	/usr/lib/mono/2.0/System*.dll*/*.mdb \
-	/usr/lib/mono/2.0/CustomMarshalers.dll*.mdb \
-	/usr/lib/mono/2.0/CustomMarshalers.dll*/*.mdb"
-FILES_libmono-system2.0-cil = "/usr/lib/mono/gac/System*/2.0.*/ \
-	/usr/lib/mono/gac/CustomMarshalers/2.0.*/ \
-	/usr/lib/mono/2.0/System*.dll \
-	/usr/lib/mono/2.0/CustomMarshalers.dll*"
-FILES_libmono1.0-cil-dbg += "/usr/lib/mono/gac/Mono.*/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.*/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.*/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.*/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/OpenSystem.C/1.0.*.mdb \
-	/usr/lib/mono/gac/OpenSystem.C/1.0.*/*.mdb \
-	/usr/lib/mono/gac/mono-service/1.0.*/*.mdb \
-	/usr/lib/mono/gac/mono-service/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/mono-service/1.0.*/.debug/ \
-	/usr/lib/mono/gac/mono-service/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Mono.*.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.*.dll*/*.mdb \
-	/usr/lib/mono/1.0/OpenSystem.C.dll*.mdb \
-	/usr/lib/mono/1.0/OpenSystem.C.dll*/*.mdb"
-FILES_libmono1.0-cil = "/usr/lib/mono/gac/Mono.*/1.0.*/ \
-	/usr/lib/mono/gac/OpenSystem.C/1.0.* \
-	/usr/lib/mono/gac/mono-service/1.0.*/ \
-	/usr/lib/mono/1.0/Mono.*.dll \
-	/usr/lib/mono/1.0/OpenSystem.C.dll"
-FILES_libmono2.0-cil-dbg += "/usr/lib/mono/gac/Mono.*/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.*/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.*/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.*/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/OpenSystem.C/2.0.*.mdb \
-	/usr/lib/mono/gac/OpenSystem.C/2.0.*/*.mdb \
-	/usr/lib/mono/gac/mono-service/2.0.*/*.mdb \
-	/usr/lib/mono/gac/mono-service/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/mono-service/2.0.*/.debug/ \
-	/usr/lib/mono/gac/mono-service/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.*.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.*.dll*/*.mdb \
-	/usr/lib/mono/2.0/OpenSystem.C.dll*.mdb \
-	/usr/lib/mono/2.0/OpenSystem.C.dll*/*.mdb"
-FILES_libmono2.0-cil = "/usr/lib/mono/gac/Mono.*/2.0.*/ \
-	/usr/lib/mono/gac/OpenSystem.C/2.0.* \
-	/usr/lib/mono/gac/mono-service/2.0.*/ \
-	/usr/lib/mono/2.0/Mono.*.dll \
-	/usr/lib/mono/2.0/OpenSystem.C.dll"
-
-PACKAGES = "mono-jit-dbg \
-	mono-jit \
-	mono-gac-dbg \
-	mono-gac \
-	mono-mjs-dbg \
-	mono-mjs \
-	mono-gmcs-dbg \
-	mono-gmcs \
-	mono-utils-dbg \
-	mono-utils \
-	libmono-peapi1.0-cil-dbg \
-	libmono-peapi1.0-cil \
-	libmono-cairo1.0-cil-dbg \
-	libmono-cairo1.0-cil \
-	libmono-system-web2.0-cil-dbg \
-	libmono-system-web2.0-cil \
-	libmono-accessibility2.0-cil-dbg \
-	libmono-accessibility2.0-cil \
-	libmono-microsoft7.0-cil-dbg \
-	libmono-microsoft7.0-cil \
-	libmono-winforms2.0-cil-dbg \
-	libmono-winforms2.0-cil \
-	libmono-ldap1.0-cil-dbg \
-	libmono-ldap1.0-cil \
-	libmono-sharpzip2.84-cil-dbg \
-	libmono-sharpzip2.84-cil \
-	libmono-system-data2.0-cil-dbg \
-	libmono-system-data2.0-cil \
-	libmono-corlib2.0-cil-dbg \
-	libmono-corlib2.0-cil \
-	libmono-winforms1.0-cil-dbg \
-	libmono-winforms1.0-cil \
-	libmono-microsoft8.0-cil-dbg \
-	libmono-microsoft8.0-cil \
-	libmono-corlib1.0-cil-dbg \
-	libmono-corlib1.0-cil \
-	libmono-system-web1.0-cil-dbg \
-	libmono-system-web1.0-cil \
-	libmono-system-runtime2.0-cil-dbg \
-	libmono-system-runtime2.0-cil \
-	libmono-cscompmgd8.0-cil-dbg \
-	libmono-cscompmgd8.0-cil \
-	libmono-cscompmgd7.0-cil-dbg \
-	libmono-cscompmgd7.0-cil \
-	libmono-firebirdsql1.7-cil-dbg \
-	libmono-firebirdsql1.7-cil \
-	mono-jay-dbg \
-	mono-jay \
-	libmono-data-tds1.0-cil-dbg \
-	libmono-data-tds1.0-cil \
-	libmono-sqlite1.0-cil-dbg \
-	libmono-sqlite1.0-cil \
-	libmono-relaxng1.0-cil-dbg \
-	libmono-relaxng1.0-cil \
-	libmono-dev-dbg \
-	libmono-dev \
-	libmono-accessibility1.0-cil-dbg \
-	libmono-accessibility1.0-cil \
-	mono-common-dbg \
-	mono-common \
-	libmono-oracle1.0-cil-dbg \
-	libmono-oracle1.0-cil \
-	libmono-system-data1.0-cil-dbg \
-	libmono-system-data1.0-cil \
-	libmono-bytefx0.7.6.2-cil-dbg \
-	libmono-bytefx0.7.6.2-cil \
-	libmono0-dbg \
-	libmono0 \
-	libmono-sharpzip0.6-cil-dbg \
-	libmono-sharpzip0.6-cil \
-	libmono-data-tds2.0-cil-dbg \
-	libmono-data-tds2.0-cil \
-	libmono-system-messaging1.0-cil-dbg \
-	libmono-system-messaging1.0-cil \
-	libmono-npgsql1.0-cil-dbg \
-	libmono-npgsql1.0-cil \
-	libmono-security2.0-cil-dbg \
-	libmono-security2.0-cil \
-	libmono-security1.0-cil-dbg \
-	libmono-security1.0-cil \
-	libmono-bytefx0.7.6.1-cil-dbg \
-	libmono-bytefx0.7.6.1-cil \
-	libmono-microsoft-build2.0-cil-dbg \
-	libmono-microsoft-build2.0-cil \
-	libmono-system-ldap1.0-cil-dbg \
-	libmono-system-ldap1.0-cil \
-	libmono-relaxng2.0-cil-dbg \
-	libmono-relaxng2.0-cil \
-	libmono-system-ldap2.0-cil-dbg \
-	libmono-system-ldap2.0-cil \
-	libmono-system-messaging2.0-cil-dbg \
-	libmono-system-messaging2.0-cil \
-	libmono-sharpzip0.84-cil-dbg \
-	libmono-sharpzip0.84-cil \
-	libmono-sqlite2.0-cil-dbg \
-	libmono-sqlite2.0-cil \
-	libmono-ldap2.0-cil-dbg \
-	libmono-ldap2.0-cil \
-	libmono-npgsql2.0-cil-dbg \
-	libmono-npgsql2.0-cil \
-	libmono-system-runtime1.0-cil-dbg \
-	libmono-system-runtime1.0-cil \
-	libmono-oracle2.0-cil-dbg \
-	libmono-oracle2.0-cil \
-	libmono-c5-1.0-cil-dbg \
-	libmono-c5-1.0-cil \
-	libmono-sharpzip2.6-cil-dbg \
-	libmono-sharpzip2.6-cil \
-	libmono-cairo2.0-cil-dbg \
-	libmono-cairo2.0-cil \
-	libmono-peapi2.0-cil-dbg \
-	libmono-peapi2.0-cil \
-	mono-mcs-dbg \
-	mono-mcs \
-	libmono-system1.0-cil-dbg \
-	libmono-system1.0-cil \
-	libmono-system2.0-cil-dbg \
-	libmono-system2.0-cil \
-	libmono1.0-cil-dbg \
-	libmono1.0-cil \
-	libmono2.0-cil-dbg \
-	libmono2.0-cil"
-# This is a generated file, please do not edit directly
-# Use collect-files.py instead. -- Henryk <henryk@openmoko.org>
-FILES_mono-jit-dbg += "/usr/bin/mono*.mdb \
-	/usr/bin/mono*/*.mdb"
-FILES_mono-jit = "/usr/bin/mono"
-FILES_mono-gac-dbg += "/usr/bin/gacutil*.mdb \
-	/usr/bin/gacutil*/*.mdb \
-	/usr/lib/mono/1.0/gacutil.exe*.mdb \
-	/usr/lib/mono/1.0/gacutil.exe*/*.mdb"
-FILES_mono-gac = "/usr/bin/gacutil \
-	/usr/lib/mono/1.0/gacutil.exe"
-FILES_mono-mjs-dbg += "/usr/bin/mjs*.mdb \
-	/usr/bin/mjs*/*.mdb \
-	/usr/lib/mono/1.0/mjs.exe*.mdb \
-	/usr/lib/mono/1.0/mjs.exe*/*.mdb"
-FILES_mono-mjs = "/usr/bin/mjs \
-	/usr/lib/mono/1.0/mjs.exe*"
-FILES_mono-gmcs-dbg += "/usr/bin/gmcs*.mdb \
-	/usr/bin/gmcs*/*.mdb \
-	/usr/bin/wsdl2*.mdb \
-	/usr/bin/wsdl2*/*.mdb \
-	/usr/bin/monop2*.mdb \
-	/usr/bin/monop2*/*.mdb \
-	/usr/bin/ilasm2*.mdb \
-	/usr/bin/ilasm2*/*.mdb \
-	/usr/bin/resgen2*.mdb \
-	/usr/bin/resgen2*/*.mdb \
-	/usr/bin/mono-api-info2*.mdb \
-	/usr/bin/mono-api-info2*/*.mdb \
-	/usr/bin/mono-service2*.mdb \
-	/usr/bin/mono-service2*/*.mdb \
-	/usr/bin/mkbundle2*.mdb \
-	/usr/bin/mkbundle2*/*.mdb \
-	/usr/bin/xbuild*.mdb \
-	/usr/bin/xbuild*/*.mdb \
-	/usr/bin/sgen*.mdb \
-	/usr/bin/sgen*/*.mdb \
-	/usr/bin/al2*.mdb \
-	/usr/bin/al2*/*.mdb \
-	/usr/bin/httpcfg*.mdb \
-	/usr/bin/httpcfg*/*.mdb \
-	/usr/lib/mono/2.0/*.exe*.mdb \
-	/usr/lib/mono/2.0/*.exe*/*.mdb \
-	/usr/lib/mono/2.0/xbuild.rsp*.mdb \
-	/usr/lib/mono/2.0/xbuild.rsp*/*.mdb \
-	/usr/lib/mono/2.0/MSBuild/*.mdb \
-	/usr/lib/mono/2.0/MSBuild/*/*.mdb \
-	/usr/lib/mono/2.0/MSBuild/.debug/ \
-	/usr/lib/mono/2.0/MSBuild/../.debug/ \
-	/usr/lib/mono/2.0/Microsoft.Build.xsd*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Build.xsd*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.CSharp.targets*.mdb \
-	/usr/lib/mono/2.0/Microsoft.CSharp.targets*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Common.tasks*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Common.tasks*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Common.targets*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Common.targets*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.VisualBasic.targets*.mdb \
-	/usr/lib/mono/2.0/Microsoft.VisualBasic.targets*/*.mdb"
-FILES_mono-gmcs = "/usr/bin/gmcs \
-	/usr/bin/wsdl2 \
-	/usr/bin/monop2 \
-	/usr/bin/ilasm2 \
-	/usr/bin/resgen2 \
-	/usr/bin/mono-api-info2 \
-	/usr/bin/mono-service2 \
-	/usr/bin/mkbundle2 \
-	/usr/bin/xbuild \
-	/usr/bin/sgen \
-	/usr/bin/al2 \
-	/usr/bin/httpcfg \
-	/usr/lib/mono/2.0/*.exe* \
-	/usr/lib/mono/2.0/xbuild.rsp \
-	/usr/lib/mono/2.0/MSBuild/ \
-	/usr/lib/mono/2.0/Microsoft.Build.xsd \
-	/usr/lib/mono/2.0/Microsoft.CSharp.targets \
-	/usr/lib/mono/2.0/Microsoft.Common.tasks \
-	/usr/lib/mono/2.0/Microsoft.Common.targets \
-	/usr/lib/mono/2.0/Microsoft.VisualBasic.targets"
-FILES_mono-utils-dbg += "/usr/bin/pedump*.mdb \
-	/usr/bin/pedump*/*.mdb \
-	/usr/bin/monodis*.mdb \
-	/usr/bin/monodis*/*.mdb \
-	/usr/bin/monograph*.mdb \
-	/usr/bin/monograph*/*.mdb \
-	/usr/bin/mono-find-provides*.mdb \
-	/usr/bin/mono-find-provides*/*.mdb \
-	/usr/bin/mono-find-requires*.mdb \
-	/usr/bin/mono-find-requires*/*.mdb"
-FILES_mono-utils = "/usr/bin/pedump \
-	/usr/bin/monodis \
-	/usr/bin/monograph \
-	/usr/bin/mono-find-provides \
-	/usr/bin/mono-find-requires"
-FILES_libmono-peapi1.0-cil-dbg += "/usr/lib/mono/gac/PEAPI/1.0.*/*.mdb \
-	/usr/lib/mono/gac/PEAPI/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/PEAPI/1.0.*/.debug/ \
-	/usr/lib/mono/gac/PEAPI/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/PEAPI.dll*.mdb \
-	/usr/lib/mono/1.0/PEAPI.dll*/*.mdb"
-FILES_libmono-peapi1.0-cil = "/usr/lib/mono/gac/PEAPI/1.0.*/ \
-	/usr/lib/mono/1.0/PEAPI.dll"
-FILES_libmono-cairo1.0-cil-dbg += "/usr/lib/mono/gac/Mono.Cairo/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Cairo/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Cairo/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Cairo/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Mono.Cairo.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.Cairo.dll*/*.mdb \
-	/usr/lib/pkgconfig/mono-cairo.pc*.mdb \
-	/usr/lib/pkgconfig/mono-cairo.pc*/*.mdb"
-FILES_libmono-cairo1.0-cil = "/usr/lib/mono/gac/Mono.Cairo/1.0.*/ \
-	/usr/lib/mono/1.0/Mono.Cairo.dll \
-	/usr/lib/pkgconfig/mono-cairo.pc"
-FILES_libmono-system-web2.0-cil-dbg += "/usr/lib/mono/gac/System.Web/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Web/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Web/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Web/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Web.Services/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Web.Services/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Web.Services/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Web.Services/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Web.dll*.mdb \
-	/usr/lib/mono/2.0/System.Web.dll*/*.mdb \
-	/usr/lib/mono/2.0/System.Web.Services.dll*.mdb \
-	/usr/lib/mono/2.0/System.Web.Services.dll*/*.mdb"
-FILES_libmono-system-web2.0-cil = "/usr/lib/mono/gac/System.Web/2.0.*/ \
-	/usr/lib/mono/gac/System.Web.Services/2.0.*/ \
-	/usr/lib/mono/2.0/System.Web.dll \
-	/usr/lib/mono/2.0/System.Web.Services.dll"
-FILES_libmono-accessibility2.0-cil-dbg += "/usr/lib/mono/gac/Accessibility/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Accessibility/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Accessibility/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Accessibility/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Accessibility.dll*.mdb \
-	/usr/lib/mono/2.0/Accessibility.dll*/*.mdb"
-FILES_libmono-accessibility2.0-cil = "/usr/lib/mono/gac/Accessibility/2.0.*/ \
-	/usr/lib/mono/2.0/Accessibility.dll"
-FILES_libmono-microsoft7.0-cil-dbg += "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/../.debug/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/../.debug/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Microsoft.JScript.dll*.mdb \
-	/usr/lib/mono/1.0/Microsoft.JScript.dll*/*.mdb \
-	/usr/lib/mono/1.0/Microsoft.VisualC.dll*.mdb \
-	/usr/lib/mono/1.0/Microsoft.VisualC.dll*/*.mdb \
-	/usr/lib/mono/1.0/Microsoft.Vsa.dll*.mdb \
-	/usr/lib/mono/1.0/Microsoft.Vsa.dll*/*.mdb"
-FILES_libmono-microsoft7.0-cil = "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/ \
-	/usr/lib/mono/1.0/Microsoft.JScript.dll \
-	/usr/lib/mono/1.0/Microsoft.VisualC.dll \
-	/usr/lib/mono/1.0/Microsoft.Vsa.dll"
-FILES_libmono-winforms2.0-cil-dbg += "/usr/lib/mono/gac/System.Windows.Forms/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Design/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Design/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Design/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Design/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Windows.Forms.dll*.mdb \
-	/usr/lib/mono/2.0/System.Windows.Forms.dll*/*.mdb \
-	/usr/lib/mono/2.0/System.Drawing.Design.dll*.mdb \
-	/usr/lib/mono/2.0/System.Drawing.Design.dll*/*.mdb \
-	/usr/lib/mono/2.0/System.Design.dll*.mdb \
-	/usr/lib/mono/2.0/System.Design.dll*/*.mdb"
-FILES_libmono-winforms2.0-cil = "/usr/lib/mono/gac/System.Windows.Forms/2.0.*/ \
-	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/ \
-	/usr/lib/mono/gac/System.Design/2.0.*/ \
-	/usr/lib/mono/2.0/System.Windows.Forms.dll \
-	/usr/lib/mono/2.0/System.Drawing.Design.dll \
-	/usr/lib/mono/2.0/System.Design.dll"
-FILES_libmono-ldap1.0-cil-dbg += "/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Novell.Directory.Ldap.dll*.mdb \
-	/usr/lib/mono/1.0/Novell.Directory.Ldap.dll*/*.mdb"
-FILES_libmono-ldap1.0-cil = "/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/ \
-	/usr/lib/mono/1.0/Novell.Directory.Ldap.dll"
-FILES_libmono-sharpzip2.84-cil-dbg += "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/.debug/ \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/../.debug/ \
-	/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll*.mdb \
-	/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
-FILES_libmono-sharpzip2.84-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/ \
-	/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll"
-FILES_libmono-system-data2.0-cil-dbg += "/usr/lib/mono/gac/System.Data/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Data/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Data/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Data/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Data.dll*.mdb \
-	/usr/lib/mono/2.0/System.Data.dll*/*.mdb"
-FILES_libmono-system-data2.0-cil = "/usr/lib/mono/gac/System.Data/2.0.*/ \
-	/usr/lib/mono/2.0/System.Data.dll"
-FILES_libmono-corlib2.0-cil-dbg += "/usr/lib/mono/gac/I18N*/2.0.*/*.mdb \
-	/usr/lib/mono/gac/I18N*/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/I18N*/2.0.*/.debug/ \
-	/usr/lib/mono/gac/I18N*/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/I18N*.dll*.mdb \
-	/usr/lib/mono/2.0/I18N*.dll*/*.mdb \
-	/usr/lib/mono/2.0/mscorlib.dll*.mdb \
-	/usr/lib/mono/2.0/mscorlib.dll*/*.mdb"
-FILES_libmono-corlib2.0-cil = "/usr/lib/mono/gac/I18N*/2.0.*/ \
-	/usr/lib/mono/2.0/I18N*.dll \
-	/usr/lib/mono/2.0/mscorlib.dll*"
-FILES_libmono-winforms1.0-cil-dbg += "/usr/lib/mono/gac/System.Windows.Forms/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Design/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Design/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Design/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Design/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Windows.Forms.dll*.mdb \
-	/usr/lib/mono/1.0/System.Windows.Forms.dll*/*.mdb \
-	/usr/lib/mono/1.0/System.Drawing.Design.dll*.mdb \
-	/usr/lib/mono/1.0/System.Drawing.Design.dll*/*.mdb \
-	/usr/lib/mono/1.0/System.Design.dll*.mdb \
-	/usr/lib/mono/1.0/System.Design.dll*/*.mdb"
-FILES_libmono-winforms1.0-cil = "/usr/lib/mono/gac/System.Windows.Forms/1.0.*/ \
-	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/ \
-	/usr/lib/mono/gac/System.Design/1.0.*/ \
-	/usr/lib/mono/1.0/System.Windows.Forms.dll \
-	/usr/lib/mono/1.0/System.Drawing.Design.dll \
-	/usr/lib/mono/1.0/System.Design.dll"
-FILES_libmono-microsoft8.0-cil-dbg += "/usr/lib/mono/gac/Microsoft.JScript/8.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/../.debug/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/../.debug/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Microsoft.JScript.dll*.mdb \
-	/usr/lib/mono/2.0/Microsoft.JScript.dll*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.VisualC.dll*.mdb \
-	/usr/lib/mono/2.0/Microsoft.VisualC.dll*/*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Vsa.dll*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Vsa.dll*/*.mdb"
-FILES_libmono-microsoft8.0-cil = "/usr/lib/mono/gac/Microsoft.JScript/8.0.*/ \
-	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/ \
-	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/ \
-	/usr/lib/mono/2.0/Microsoft.JScript.dll \
-	/usr/lib/mono/2.0/Microsoft.VisualC.dll \
-	/usr/lib/mono/2.0/Microsoft.Vsa.dll"
-FILES_libmono-corlib1.0-cil-dbg += "/usr/lib/mono/gac/I18N*/1.0.*/*.mdb \
-	/usr/lib/mono/gac/I18N*/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/I18N*/1.0.*/.debug/ \
-	/usr/lib/mono/gac/I18N*/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/I18N*.dll*.mdb \
-	/usr/lib/mono/1.0/I18N*.dll*/*.mdb \
-	/usr/lib/mono/1.0/mscorlib.dll*.mdb \
-	/usr/lib/mono/1.0/mscorlib.dll*/*.mdb"
-FILES_libmono-corlib1.0-cil = "/usr/lib/mono/gac/I18N*/1.0.*/ \
-	/usr/lib/mono/1.0/I18N*.dll \
-	/usr/lib/mono/1.0/mscorlib.dll*"
-FILES_libmono-system-web1.0-cil-dbg += "/usr/lib/mono/gac/System.Web/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Web/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Web/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Web/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/System.Web.Services/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Web.Services/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Web.Services/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Web.Services/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Web.dll*.mdb \
-	/usr/lib/mono/1.0/System.Web.dll*/*.mdb \
-	/usr/lib/mono/1.0/System.Web.Services.dll*.mdb \
-	/usr/lib/mono/1.0/System.Web.Services.dll*/*.mdb"
-FILES_libmono-system-web1.0-cil = "/usr/lib/mono/gac/System.Web/1.0.*/ \
-	/usr/lib/mono/gac/System.Web.Services/1.0.*/ \
-	/usr/lib/mono/1.0/System.Web.dll \
-	/usr/lib/mono/1.0/System.Web.Services.dll"
-FILES_libmono-system-runtime2.0-cil-dbg += "/usr/lib/mono/gac/System.Runtime.*/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Runtime.*/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Runtime.*/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Runtime.*/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Runtime.*.dll*.mdb \
-	/usr/lib/mono/2.0/System.Runtime.*.dll*/*.mdb"
-FILES_libmono-system-runtime2.0-cil = "/usr/lib/mono/gac/System.Runtime.*/2.0.*/ \
-	/usr/lib/mono/2.0/System.Runtime.*.dll"
-FILES_libmono-cscompmgd8.0-cil-dbg += "/usr/lib/mono/gac/cscompmgd/8.0.*/*.mdb \
-	/usr/lib/mono/gac/cscompmgd/8.0.*/*/*.mdb \
-	/usr/lib/mono/gac/cscompmgd/8.0.*/.debug/ \
-	/usr/lib/mono/gac/cscompmgd/8.0.*/../.debug/ \
-	/usr/lib/mono/2.0/cscompmgd.dll*.mdb \
-	/usr/lib/mono/2.0/cscompmgd.dll*/*.mdb"
-FILES_libmono-cscompmgd8.0-cil = "/usr/lib/mono/gac/cscompmgd/8.0.*/ \
-	/usr/lib/mono/2.0/cscompmgd.dll"
-FILES_libmono-cscompmgd7.0-cil-dbg += "/usr/lib/mono/gac/cscompmgd/7.0.*/*.mdb \
-	/usr/lib/mono/gac/cscompmgd/7.0.*/*/*.mdb \
-	/usr/lib/mono/gac/cscompmgd/7.0.*/.debug/ \
-	/usr/lib/mono/gac/cscompmgd/7.0.*/../.debug/ \
-	/usr/lib/mono/1.0/cscompmgd.dll*.mdb \
-	/usr/lib/mono/1.0/cscompmgd.dll*/*.mdb"
-FILES_libmono-cscompmgd7.0-cil = "/usr/lib/mono/gac/cscompmgd/7.0.*/ \
-	/usr/lib/mono/1.0/cscompmgd.dll"
-FILES_libmono-firebirdsql1.7-cil-dbg += "/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/*.mdb \
-	/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/*/*.mdb \
-	/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/.debug/ \
-	/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/../.debug/ \
-	/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll*.mdb \
-	/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll*/*.mdb"
-FILES_libmono-firebirdsql1.7-cil = "/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/ \
-	/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll"
-FILES_mono-jay-dbg += "/usr/bin/jay*.mdb \
-	/usr/bin/jay*/*.mdb"
-FILES_mono-jay = "/usr/bin/jay"
-FILES_libmono-data-tds1.0-cil-dbg += "/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Mono.Data.Tds.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.Data.Tds.dll*/*.mdb"
-FILES_libmono-data-tds1.0-cil = "/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/ \
-	/usr/lib/mono/1.0/Mono.Data.Tds.dll"
-FILES_libmono-sqlite1.0-cil-dbg += "/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Mono.Data.Sqlite.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.Data.Sqlite.dll*/*.mdb \
-	/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll*/*.mdb"
-FILES_libmono-sqlite1.0-cil = "/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/ \
-	/usr/lib/mono/1.0/Mono.Data.Sqlite.dll \
-	/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll"
-FILES_libmono-relaxng1.0-cil-dbg += "/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll*.mdb \
-	/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll*/*.mdb"
-FILES_libmono-relaxng1.0-cil = "/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/ \
-	/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll"
-FILES_libmono-dev-dbg += "/usr/lib/libmono*.a*.mdb \
-	/usr/lib/libmono*.a*/*.mdb \
-	/usr/lib/libMono*.a*.mdb \
-	/usr/lib/libMono*.a*/*.mdb \
-	/usr/lib/libmono*.so*.mdb \
-	/usr/lib/libmono*.so*/*.mdb \
-	/usr/lib/libMonoSupportW.a*.mdb \
-	/usr/lib/libMonoSupportW.a*/*.mdb \
-	/usr/lib/pkgconfig/mono.pc*.mdb \
-	/usr/lib/pkgconfig/mono.pc*/*.mdb \
-	/usr/lib/pkgconfig/dotnet.pc*.mdb \
-	/usr/lib/pkgconfig/dotnet.pc*/*.mdb \
-	/usr/include/*.mdb \
-	/usr/include/*/*.mdb \
-	/usr/include/.debug/ \
-	/usr/include/../.debug/"
-FILES_libmono-dev = "/usr/lib/libmono*.a \
-	/usr/lib/libMono*.a \
-	/usr/lib/libmono*.so \
-	/usr/lib/libMonoSupportW.a \
-	/usr/lib/pkgconfig/mono.pc \
-	/usr/lib/pkgconfig/dotnet.pc \
-	/usr/include/"
-FILES_libmono-accessibility1.0-cil-dbg += "/usr/lib/mono/gac/Accessibility/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Accessibility/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Accessibility/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Accessibility/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Accessibility.dll*.mdb \
-	/usr/lib/mono/1.0/Accessibility.dll*/*.mdb"
-FILES_libmono-accessibility1.0-cil = "/usr/lib/mono/gac/Accessibility/1.0.*/ \
-	/usr/lib/mono/1.0/Accessibility.dll"
-FILES_mono-common-dbg += "/etc/mono*.mdb \
-	/etc/mono*/*.mdb \
-	/usr/share/mono-1.0/mono/cil/cil-opcodes.xml*.mdb \
-	/usr/share/mono-1.0/mono/cil/cil-opcodes.xml*/*.mdb"
-FILES_mono-common = "/etc/mono \
-	/usr/share/mono-1.0/mono/cil/cil-opcodes.xml"
-FILES_libmono-oracle1.0-cil-dbg += "/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Data.OracleClient.dll*.mdb \
-	/usr/lib/mono/1.0/System.Data.OracleClient.dll*/*.mdb"
-FILES_libmono-oracle1.0-cil = "/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/ \
-	/usr/lib/mono/1.0/System.Data.OracleClient.dll"
-FILES_libmono-system-data1.0-cil-dbg += "/usr/lib/mono/gac/System.Data/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Data/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Data/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Data/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Data.dll*.mdb \
-	/usr/lib/mono/1.0/System.Data.dll*/*.mdb"
-FILES_libmono-system-data1.0-cil = "/usr/lib/mono/gac/System.Data/1.0.*/ \
-	/usr/lib/mono/1.0/System.Data.dll"
-FILES_libmono-bytefx0.7.6.2-cil-dbg += "/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/*.mdb \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/*/*.mdb \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/.debug/ \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/../.debug/ \
-	/usr/lib/mono/2.0/ByteFX.Data.dll*.mdb \
-	/usr/lib/mono/2.0/ByteFX.Data.dll*/*.mdb"
-FILES_libmono-bytefx0.7.6.2-cil = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/ \
-	/usr/lib/mono/2.0/ByteFX.Data.dll"
-FILES_libmono0-dbg += "/usr/lib/libmono*.so.*.mdb \
-	/usr/lib/libmono*.so.*/*.mdb \
-	/usr/lib/libMonoPosixHelper.so*.mdb \
-	/usr/lib/libMonoPosixHelper.so*/*.mdb \
-	/usr/lib/libMonoSupportW.so*.mdb \
-	/usr/lib/libMonoSupportW.so*/*.mdb"
-FILES_libmono0 = "/usr/lib/libmono*.so.* \
-	/usr/lib/libMonoPosixHelper.so \
-	/usr/lib/libMonoSupportW.so"
-FILES_libmono-sharpzip0.6-cil-dbg += "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/.debug/ \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/../.debug/ \
-	/usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll*.mdb \
-	/usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
-FILES_libmono-sharpzip0.6-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/ \
-	/usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll"
-FILES_libmono-data-tds2.0-cil-dbg += "/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.Data.Tds.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.Data.Tds.dll*/*.mdb"
-FILES_libmono-data-tds2.0-cil = "/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/ \
-	/usr/lib/mono/2.0/Mono.Data.Tds.dll"
-FILES_libmono-system-messaging1.0-cil-dbg += "/usr/lib/mono/gac/System.Messaging/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Messaging/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Messaging/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Messaging/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Messaging.dll*.mdb \
-	/usr/lib/mono/1.0/System.Messaging.dll*/*.mdb"
-FILES_libmono-system-messaging1.0-cil = "/usr/lib/mono/gac/System.Messaging/1.0.*/ \
-	/usr/lib/mono/1.0/System.Messaging.dll"
-FILES_libmono-npgsql1.0-cil-dbg += "/usr/lib/mono/gac/Npgsql/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Npgsql/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Npgsql/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Npgsql/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Npgsql.dll*.mdb \
-	/usr/lib/mono/1.0/Npgsql.dll*/*.mdb"
-FILES_libmono-npgsql1.0-cil = "/usr/lib/mono/gac/Npgsql/1.0.*/ \
-	/usr/lib/mono/1.0/Npgsql.dll"
-FILES_libmono-security2.0-cil-dbg += "/usr/lib/mono/gac/Mono.Security/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Security/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Security/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Security/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.Security.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.Security.dll*/*.mdb"
-FILES_libmono-security2.0-cil = "/usr/lib/mono/gac/Mono.Security/2.0.*/ \
-	/usr/lib/mono/2.0/Mono.Security.dll"
-FILES_libmono-security1.0-cil-dbg += "/usr/lib/mono/gac/Mono.Security/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Security/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Security/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Security/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Mono.Security.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.Security.dll*/*.mdb"
-FILES_libmono-security1.0-cil = "/usr/lib/mono/gac/Mono.Security/1.0.*/ \
-	/usr/lib/mono/1.0/Mono.Security.dll"
-FILES_libmono-bytefx0.7.6.1-cil-dbg += "/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/*.mdb \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/*/*.mdb \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/.debug/ \
-	/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/../.debug/ \
-	/usr/lib/mono/1.0/ByteFX.Data.dll*.mdb \
-	/usr/lib/mono/1.0/ByteFX.Data.dll*/*.mdb"
-FILES_libmono-bytefx0.7.6.1-cil = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/ \
-	/usr/lib/mono/1.0/ByteFX.Data.dll"
-FILES_libmono-microsoft-build2.0-cil-dbg += "/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Microsoft.Build.*.dll*.mdb \
-	/usr/lib/mono/2.0/Microsoft.Build.*.dll*/*.mdb"
-FILES_libmono-microsoft-build2.0-cil = "/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/ \
-	/usr/lib/mono/2.0/Microsoft.Build.*.dll"
-FILES_libmono-system-ldap1.0-cil-dbg += "/usr/lib/mono/gac/System.DirectoryServices/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.DirectoryServices/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.DirectoryServices/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.DirectoryServices/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.DirectoryServices.dll*.mdb \
-	/usr/lib/mono/1.0/System.DirectoryServices.dll*/*.mdb"
-FILES_libmono-system-ldap1.0-cil = "/usr/lib/mono/gac/System.DirectoryServices/1.0.*/ \
-	/usr/lib/mono/1.0/System.DirectoryServices.dll"
-FILES_libmono-relaxng2.0-cil-dbg += "/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Commons.Xml.Relaxng.dll*.mdb \
-	/usr/lib/mono/2.0/Commons.Xml.Relaxng.dll*/*.mdb"
-FILES_libmono-relaxng2.0-cil = "/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/ \
-	/usr/lib/mono/2.0/Commons.Xml.Relaxng.dll"
-FILES_libmono-system-ldap2.0-cil-dbg += "/usr/lib/mono/gac/System.DirectoryServices/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.DirectoryServices/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.DirectoryServices/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.DirectoryServices/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.DirectoryServices.dll*.mdb \
-	/usr/lib/mono/2.0/System.DirectoryServices.dll*/*.mdb"
-FILES_libmono-system-ldap2.0-cil = "/usr/lib/mono/gac/System.DirectoryServices/2.0.*/ \
-	/usr/lib/mono/2.0/System.DirectoryServices.dll"
-FILES_libmono-system-messaging2.0-cil-dbg += "/usr/lib/mono/gac/System.Messaging/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Messaging/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Messaging/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Messaging/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Messaging.dll*.mdb \
-	/usr/lib/mono/2.0/System.Messaging.dll*/*.mdb"
-FILES_libmono-system-messaging2.0-cil = "/usr/lib/mono/gac/System.Messaging/2.0.*/ \
-	/usr/lib/mono/2.0/System.Messaging.dll"
-FILES_libmono-sharpzip0.84-cil-dbg += "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/.debug/ \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/../.debug/ \
-	/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll*.mdb \
-	/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
-FILES_libmono-sharpzip0.84-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/ \
-	/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll"
-FILES_libmono-sqlite2.0-cil-dbg += "/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.Data.Sqlite.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.Data.Sqlite.dll*/*.mdb \
-	/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll*/*.mdb"
-FILES_libmono-sqlite2.0-cil = "/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/ \
-	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/ \
-	/usr/lib/mono/2.0/Mono.Data.Sqlite.dll \
-	/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll"
-FILES_libmono-ldap2.0-cil-dbg += "/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Novell.Directory.Ldap.dll*.mdb \
-	/usr/lib/mono/2.0/Novell.Directory.Ldap.dll*/*.mdb"
-FILES_libmono-ldap2.0-cil = "/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/ \
-	/usr/lib/mono/2.0/Novell.Directory.Ldap.dll"
-FILES_libmono-npgsql2.0-cil-dbg += "/usr/lib/mono/gac/Npgsql/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Npgsql/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Npgsql/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Npgsql/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Npgsql.dll*.mdb \
-	/usr/lib/mono/2.0/Npgsql.dll*/*.mdb"
-FILES_libmono-npgsql2.0-cil = "/usr/lib/mono/gac/Npgsql/2.0.*/ \
-	/usr/lib/mono/2.0/Npgsql.dll"
-FILES_libmono-system-runtime1.0-cil-dbg += "/usr/lib/mono/gac/System.Runtime.*/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Runtime.*/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Runtime.*/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Runtime.*/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System.Runtime.*.dll*.mdb \
-	/usr/lib/mono/1.0/System.Runtime.*.dll*/*.mdb"
-FILES_libmono-system-runtime1.0-cil = "/usr/lib/mono/gac/System.Runtime.*/1.0.*/ \
-	/usr/lib/mono/1.0/System.Runtime.*.dll"
-FILES_libmono-oracle2.0-cil-dbg += "/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System.Data.OracleClient.dll*.mdb \
-	/usr/lib/mono/2.0/System.Data.OracleClient.dll*/*.mdb"
-FILES_libmono-oracle2.0-cil = "/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/ \
-	/usr/lib/mono/2.0/System.Data.OracleClient.dll"
-FILES_libmono-c5-1.0-cil-dbg += "/usr/lib/mono/gac/Mono.C5/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.C5/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.C5/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.C5/1.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.C5.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.C5.dll*/*.mdb"
-FILES_libmono-c5-1.0-cil = "/usr/lib/mono/gac/Mono.C5/1.0.*/ \
-	/usr/lib/mono/2.0/Mono.C5.dll"
-FILES_libmono-sharpzip2.6-cil-dbg += "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/*/*.mdb \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/.debug/ \
-	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/../.debug/ \
-	/usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll*.mdb \
-	/usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
-FILES_libmono-sharpzip2.6-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/ \
-	/usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll"
-FILES_libmono-cairo2.0-cil-dbg += "/usr/lib/mono/gac/Mono.Cairo/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.Cairo/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.Cairo/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.Cairo/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.Cairo.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.Cairo.dll*/*.mdb"
-FILES_libmono-cairo2.0-cil = "/usr/lib/mono/gac/Mono.Cairo/2.0.*/ \
-	/usr/lib/mono/2.0/Mono.Cairo.dll"
-FILES_libmono-peapi2.0-cil-dbg += "/usr/lib/mono/gac/PEAPI/2.0.*/*.mdb \
-	/usr/lib/mono/gac/PEAPI/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/PEAPI/2.0.*/.debug/ \
-	/usr/lib/mono/gac/PEAPI/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/PEAPI.dll*.mdb \
-	/usr/lib/mono/2.0/PEAPI.dll*/*.mdb"
-FILES_libmono-peapi2.0-cil = "/usr/lib/mono/gac/PEAPI/2.0.*/ \
-	/usr/lib/mono/2.0/PEAPI.dll"
-FILES_mono-mcs-dbg += "/usr/bin/*.mdb \
-	/usr/bin/*/*.mdb \
-	/usr/bin/.debug/ \
-	/usr/bin/../.debug/ \
-	/usr/lib/mono/1.0/*.exe*.mdb \
-	/usr/lib/mono/1.0/*.exe*/*.mdb"
-FILES_mono-mcs = "/usr/bin/ \
-	/usr/lib/mono/1.0/*.exe*"
-FILES_libmono-system1.0-cil-dbg += "/usr/lib/mono/gac/System*/1.0.*/*.mdb \
-	/usr/lib/mono/gac/System*/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System*/1.0.*/.debug/ \
-	/usr/lib/mono/gac/System*/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/CustomMarshalers/1.0.*/*.mdb \
-	/usr/lib/mono/gac/CustomMarshalers/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/CustomMarshalers/1.0.*/.debug/ \
-	/usr/lib/mono/gac/CustomMarshalers/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/System*.dll*.mdb \
-	/usr/lib/mono/1.0/System*.dll*/*.mdb \
-	/usr/lib/mono/1.0/CustomMarshalers.dll*.mdb \
-	/usr/lib/mono/1.0/CustomMarshalers.dll*/*.mdb"
-FILES_libmono-system1.0-cil = "/usr/lib/mono/gac/System*/1.0.*/ \
-	/usr/lib/mono/gac/CustomMarshalers/1.0.*/ \
-	/usr/lib/mono/1.0/System*.dll \
-	/usr/lib/mono/1.0/CustomMarshalers.dll*"
-FILES_libmono-system2.0-cil-dbg += "/usr/lib/mono/gac/System*/2.0.*/*.mdb \
-	/usr/lib/mono/gac/System*/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/System*/2.0.*/.debug/ \
-	/usr/lib/mono/gac/System*/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/CustomMarshalers/2.0.*/*.mdb \
-	/usr/lib/mono/gac/CustomMarshalers/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/CustomMarshalers/2.0.*/.debug/ \
-	/usr/lib/mono/gac/CustomMarshalers/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/System*.dll*.mdb \
-	/usr/lib/mono/2.0/System*.dll*/*.mdb \
-	/usr/lib/mono/2.0/CustomMarshalers.dll*.mdb \
-	/usr/lib/mono/2.0/CustomMarshalers.dll*/*.mdb"
-FILES_libmono-system2.0-cil = "/usr/lib/mono/gac/System*/2.0.*/ \
-	/usr/lib/mono/gac/CustomMarshalers/2.0.*/ \
-	/usr/lib/mono/2.0/System*.dll \
-	/usr/lib/mono/2.0/CustomMarshalers.dll*"
-FILES_libmono1.0-cil-dbg += "/usr/lib/mono/gac/Mono.*/1.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.*/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.*/1.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.*/1.0.*/../.debug/ \
-	/usr/lib/mono/gac/OpenSystem.C/1.0.*.mdb \
-	/usr/lib/mono/gac/OpenSystem.C/1.0.*/*.mdb \
-	/usr/lib/mono/gac/mono-service/1.0.*/*.mdb \
-	/usr/lib/mono/gac/mono-service/1.0.*/*/*.mdb \
-	/usr/lib/mono/gac/mono-service/1.0.*/.debug/ \
-	/usr/lib/mono/gac/mono-service/1.0.*/../.debug/ \
-	/usr/lib/mono/1.0/Mono.*.dll*.mdb \
-	/usr/lib/mono/1.0/Mono.*.dll*/*.mdb \
-	/usr/lib/mono/1.0/OpenSystem.C.dll*.mdb \
-	/usr/lib/mono/1.0/OpenSystem.C.dll*/*.mdb"
-FILES_libmono1.0-cil = "/usr/lib/mono/gac/Mono.*/1.0.*/ \
-	/usr/lib/mono/gac/OpenSystem.C/1.0.* \
-	/usr/lib/mono/gac/mono-service/1.0.*/ \
-	/usr/lib/mono/1.0/Mono.*.dll \
-	/usr/lib/mono/1.0/OpenSystem.C.dll"
-FILES_libmono2.0-cil-dbg += "/usr/lib/mono/gac/Mono.*/2.0.*/*.mdb \
-	/usr/lib/mono/gac/Mono.*/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/Mono.*/2.0.*/.debug/ \
-	/usr/lib/mono/gac/Mono.*/2.0.*/../.debug/ \
-	/usr/lib/mono/gac/OpenSystem.C/2.0.*.mdb \
-	/usr/lib/mono/gac/OpenSystem.C/2.0.*/*.mdb \
-	/usr/lib/mono/gac/mono-service/2.0.*/*.mdb \
-	/usr/lib/mono/gac/mono-service/2.0.*/*/*.mdb \
-	/usr/lib/mono/gac/mono-service/2.0.*/.debug/ \
-	/usr/lib/mono/gac/mono-service/2.0.*/../.debug/ \
-	/usr/lib/mono/2.0/Mono.*.dll*.mdb \
-	/usr/lib/mono/2.0/Mono.*.dll*/*.mdb \
-	/usr/lib/mono/2.0/OpenSystem.C.dll*.mdb \
-	/usr/lib/mono/2.0/OpenSystem.C.dll*/*.mdb"
-FILES_libmono2.0-cil = "/usr/lib/mono/gac/Mono.*/2.0.*/ \
-	/usr/lib/mono/gac/OpenSystem.C/2.0.* \
-	/usr/lib/mono/gac/mono-service/2.0.*/ \
-	/usr/lib/mono/2.0/Mono.*.dll \
-	/usr/lib/mono/2.0/OpenSystem.C.dll"
-
-PACKAGES = "mono-jit-dbg \
-	mono-jit \
-	mono-gac-dbg \
-	mono-gac \
-	mono-mjs-dbg \
-	mono-mjs \
-	mono-gmcs-dbg \
-	mono-gmcs \
-	mono-utils-dbg \
-	mono-utils \
-	libmono-peapi1.0-cil-dbg \
-	libmono-peapi1.0-cil \
-	libmono-cairo1.0-cil-dbg \
-	libmono-cairo1.0-cil \
-	libmono-system-web2.0-cil-dbg \
-	libmono-system-web2.0-cil \
-	libmono-accessibility2.0-cil-dbg \
-	libmono-accessibility2.0-cil \
-	libmono-microsoft7.0-cil-dbg \
-	libmono-microsoft7.0-cil \
-	libmono-winforms2.0-cil-dbg \
-	libmono-winforms2.0-cil \
-	libmono-ldap1.0-cil-dbg \
-	libmono-ldap1.0-cil \
-	libmono-sharpzip2.84-cil-dbg \
-	libmono-sharpzip2.84-cil \
-	libmono-system-data2.0-cil-dbg \
-	libmono-system-data2.0-cil \
-	libmono-corlib2.0-cil-dbg \
-	libmono-corlib2.0-cil \
-	libmono-winforms1.0-cil-dbg \
-	libmono-winforms1.0-cil \
-	libmono-microsoft8.0-cil-dbg \
-	libmono-microsoft8.0-cil \
-	libmono-corlib1.0-cil-dbg \
-	libmono-corlib1.0-cil \
-	libmono-system-web1.0-cil-dbg \
-	libmono-system-web1.0-cil \
-	libmono-system-runtime2.0-cil-dbg \
-	libmono-system-runtime2.0-cil \
-	libmono-cscompmgd8.0-cil-dbg \
-	libmono-cscompmgd8.0-cil \
-	libmono-cscompmgd7.0-cil-dbg \
-	libmono-cscompmgd7.0-cil \
-	libmono-firebirdsql1.7-cil-dbg \
-	libmono-firebirdsql1.7-cil \
-	mono-jay-dbg \
-	mono-jay \
-	libmono-data-tds1.0-cil-dbg \
-	libmono-data-tds1.0-cil \
-	libmono-sqlite1.0-cil-dbg \
-	libmono-sqlite1.0-cil \
-	libmono-relaxng1.0-cil-dbg \
-	libmono-relaxng1.0-cil \
-	libmono-dev-dbg \
-	libmono-dev \
-	libmono-accessibility1.0-cil-dbg \
-	libmono-accessibility1.0-cil \
-	mono-common-dbg \
-	mono-common \
-	libmono-oracle1.0-cil-dbg \
-	libmono-oracle1.0-cil \
-	libmono-system-data1.0-cil-dbg \
-	libmono-system-data1.0-cil \
-	libmono-bytefx0.7.6.2-cil-dbg \
-	libmono-bytefx0.7.6.2-cil \
-	libmono0-dbg \
-	libmono0 \
-	libmono-sharpzip0.6-cil-dbg \
-	libmono-sharpzip0.6-cil \
-	libmono-data-tds2.0-cil-dbg \
-	libmono-data-tds2.0-cil \
-	libmono-system-messaging1.0-cil-dbg \
-	libmono-system-messaging1.0-cil \
-	libmono-npgsql1.0-cil-dbg \
-	libmono-npgsql1.0-cil \
-	libmono-security2.0-cil-dbg \
-	libmono-security2.0-cil \
-	libmono-security1.0-cil-dbg \
-	libmono-security1.0-cil \
-	libmono-bytefx0.7.6.1-cil-dbg \
-	libmono-bytefx0.7.6.1-cil \
-	libmono-microsoft-build2.0-cil-dbg \
-	libmono-microsoft-build2.0-cil \
-	libmono-system-ldap1.0-cil-dbg \
-	libmono-system-ldap1.0-cil \
-	libmono-relaxng2.0-cil-dbg \
-	libmono-relaxng2.0-cil \
-	libmono-system-ldap2.0-cil-dbg \
-	libmono-system-ldap2.0-cil \
-	libmono-system-messaging2.0-cil-dbg \
-	libmono-system-messaging2.0-cil \
-	libmono-sharpzip0.84-cil-dbg \
-	libmono-sharpzip0.84-cil \
-	libmono-sqlite2.0-cil-dbg \
-	libmono-sqlite2.0-cil \
-	libmono-ldap2.0-cil-dbg \
-	libmono-ldap2.0-cil \
-	libmono-npgsql2.0-cil-dbg \
-	libmono-npgsql2.0-cil \
-	libmono-system-runtime1.0-cil-dbg \
-	libmono-system-runtime1.0-cil \
-	libmono-oracle2.0-cil-dbg \
-	libmono-oracle2.0-cil \
-	libmono-c5-1.0-cil-dbg \
-	libmono-c5-1.0-cil \
-	libmono-sharpzip2.6-cil-dbg \
-	libmono-sharpzip2.6-cil \
-	libmono-cairo2.0-cil-dbg \
-	libmono-cairo2.0-cil \
-	libmono-peapi2.0-cil-dbg \
-	libmono-peapi2.0-cil \
-	mono-mcs-dbg \
-	mono-mcs \
-	libmono-system1.0-cil-dbg \
-	libmono-system1.0-cil \
-	libmono-system2.0-cil-dbg \
-	libmono-system2.0-cil \
-	libmono1.0-cil-dbg \
-	libmono1.0-cil \
-	libmono2.0-cil-dbg \
-	libmono2.0-cil"
diff --git a/recipes/mono/mono_1.2.5.1.bb b/recipes/mono/mono_1.2.5.1.bb
deleted file mode 100644
index 7c2f6a2441..0000000000
--- a/recipes/mono/mono_1.2.5.1.bb
+++ /dev/null
@@ -1,86 +0,0 @@
-require mono_1.2.5.inc
-
-DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
-
-PR = "r5"
-
-# mono makes use of non-thumb-compatible inline asm.
-ARM_INSTRUCTION_SET = "arm"
-
-SRC_URI += "file://configure.patch;patch=1 \
-	file://genmdesc-cpp.patch;patch=1 \
-	file://disable-monoburg.patch;patch=1"
-
-# Per http://www.mono-project.com/Mono:ARM
-EXTRA_OECONF += " --disable-mcs-build "
-# Instead, get the mcs tree from a different build (see mono-mcs-intermediate)
-
-do_install_prepend() {
-	install -d ${D}
-	cd ${D}
-	tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
-	cd ${S}
-}
-
-do_install_append() {
-	# mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#),
-	# however, jay is not being cross-compiled and thus only
-	# available for the buildhost architecture, so remove it
-	# entirely
-	cd ${D}
-	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
-	    ./usr/share/jay/README.jay \
-	    ./usr/bin/jay
-	cd ${S}
-
-	# Not packaged with the default rules and apparently
-	# not used for anything
-	rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml
-}
-
-inherit mono
-
-# Import file definitions from Debian
-require mono_1.2.5.1-files.inc
-
-# Add some packages
-PACKAGES_append = " mono-doc mono mono-runtime"
-
-FILES_mono-doc_append = " /usr/share/libgc-mono/ "
-
-FILES_mono = ""
-ALLOW_EMPTY_mono = "1"
-RDEPENDS_mono = "mono-common mono-jit"
-
-FILES_mono-runtime = ""
-ALLOW_EMPTY_mono-runtime = "1"
-RDEPENDS_mono-runtime = "mono-jit mono-gac"
-
-RDEPENDS_mono-jit = "mono-common"
-
-FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \
-	/usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la"
-FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \
-	/usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so"
-
-# Packages not included in Debian
-PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \
-	libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \
-	libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil"
-
-FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll"
-FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc"
-FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb"
-
-FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*"
-FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb"
-
-FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll"
-FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb"
-
-# Move .pc files
-FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc"
-PACKAGES =+ " libmono-cairo1.0-cil-dev "
-
-SRC_URI[md5sum] = "dfede0c8c29384a8f8a6953a9bd06224"
-SRC_URI[sha256sum] = "434f91032e48c03e1202ba3cef1648e2708eeefcf51143d3547e34acc9c68a96"
diff --git a/recipes/mono/mono_1.2.5.inc b/recipes/mono/mono_1.2.5.inc
deleted file mode 100644
index aeca713d6b..0000000000
--- a/recipes/mono/mono_1.2.5.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Mono Programming Language"
-SECTION = "devel/mono"
-LICENSE = "GPL LGPL X11"
-
-SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.bz2"
-
-S = "${WORKDIR}/mono-${PV}"
-
-inherit autotools
-EXTRA_OECONF_arm = "--without-tls"
-EXTRA_OECONF_mipsel = "--without-tls"
-
diff --git a/recipes/mono/mono_1.2.6.bb b/recipes/mono/mono_1.2.6.bb
deleted file mode 100644
index 4d6abe7b06..0000000000
--- a/recipes/mono/mono_1.2.6.bb
+++ /dev/null
@@ -1,84 +0,0 @@
-require mono_1.2.6.inc
-
-DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
-
-PR = "r2"
-
-# mono makes use of non-thumb-compatible inline asm.
-ARM_INSTRUCTION_SET = "arm"
-
-SRC_URI += "file://configure.patch;patch=1"
-
-# Per http://www.mono-project.com/Mono:ARM
-EXTRA_OECONF += " --disable-mcs-build "
-# Instead, get the mcs tree from a different build (see mono-mcs-intermediate)
-
-do_install_prepend() {
-	install -d ${D}
-	cd ${D}
-	tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
-	cd ${S}
-}
-
-do_install_append() {
-	# mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#),
-	# however, jay is not being cross-compiled and thus only
-	# available for the buildhost architecture, so remove it
-	# entirely
-	cd ${D}
-	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
-	    ./usr/share/jay/README.jay \
-	    ./usr/bin/jay
-	cd ${S}
-
-	# Not packaged with the default rules and apparently
-	# not used for anything
-	rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml
-}
-
-inherit mono
-
-# Import file definitions from Debian
-require mono_1.2.5.1-files.inc
-
-# Add some packages
-PACKAGES_append = " mono-doc mono mono-runtime"
-
-FILES_mono-doc_append = " /usr/share/libgc-mono/ "
-
-FILES_mono = ""
-ALLOW_EMPTY_mono = "1"
-RDEPENDS_mono = "mono-common mono-jit"
-
-FILES_mono-runtime = ""
-ALLOW_EMPTY_mono-runtime = "1"
-RDEPENDS_mono-runtime = "mono-jit mono-gac"
-
-RDEPENDS_mono-jit = "mono-common"
-
-FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \
-	/usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la"
-FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \
-	/usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so"
-
-# Packages not included in Debian
-PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \
-	libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \
-	libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil"
-
-FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll"
-FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc"
-FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb"
-
-FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*"
-FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb"
-
-FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll"
-FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb"
-
-# Move .pc files
-FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc"
-PACKAGES =+ " libmono-cairo1.0-cil-dev "
-
-SRC_URI[md5sum] = "391f85b4f962269e044ceac2b5235310"
-SRC_URI[sha256sum] = "24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f"
diff --git a/recipes/mono/mono_1.2.6.inc b/recipes/mono/mono_1.2.6.inc
deleted file mode 100644
index 36eece0148..0000000000
--- a/recipes/mono/mono_1.2.6.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Mono Programming Language"
-SECTION = "devel/mono"
-LICENSE = "GPL LGPL X11"
-
-SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2 \
-	   file://mono-libgc-configure.patch;patch=1"
-
-S = "${WORKDIR}/mono-1.2.6"
-
-inherit autotools
-ARM_INSTRUCTION_SET = "arm"
-EXTRA_OECONF_arm = "--without-tls"
-EXTRA_OECONF_mipsel = "--without-tls"
-
diff --git a/recipes/mono/mono_1.9.1+2.2-rc1.bb b/recipes/mono/mono_1.9.1+2.2-rc1.bb
deleted file mode 100644
index f30febb1b8..0000000000
--- a/recipes/mono/mono_1.9.1+2.2-rc1.bb
+++ /dev/null
@@ -1,90 +0,0 @@
-require mono_2.2.0.inc
-
-DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
-
-DEFAULT_PREFERENCE = "-1"
-
-PR = "r3"
-
-# mono makes use of non-thumb-compatible inline asm.
-ARM_INSTRUCTION_SET = "arm"
-
-SRC_URI += "file://configure.patch;patch=1 \
-            file://disable-docs.patch;patch=1 \
-            file://disable-monoburg.patch;patch=1 \
-            file://fix-eabi-syscall.patch;patch=1 \
-	   "
-
-# Per http://www.mono-project.com/Mono:ARM
-EXTRA_OECONF += " --disable-mcs-build "
-# Instead, get the mcs tree from a different build (see mono-mcs-intermediate)
-
-do_install_prepend() {
-	install -d ${D}
-	pushd ${D}
-	tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
-	popd
-}
-
-do_install_append() {
-	# mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#),
-	# however, jay is not being cross-compiled and thus only
-	# available for the buildhost architecture, so remove it
-	# entirely
-	pushd ${D}
-	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
-	    ./usr/share/jay/README.jay \
-	    ./usr/bin/jay
-	popd
-
-	# Not packaged with the default rules and apparently
-	# not used for anything
-	rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml
-}
-
-inherit mono
-
-# Import file definitions from Debian
-require mono_2.x-files.inc
-
-# Add some packages
-PACKAGES_append = " mono-doc mono mono-runtime"
-
-FILES_mono-doc_append = " /usr/share/libgc-mono/ "
-
-FILES_mono = ""
-ALLOW_EMPTY_mono = "1"
-RDEPENDS_mono = "mono-common mono-jit"
-
-FILES_mono-runtime = ""
-ALLOW_EMPTY_mono-runtime = "1"
-RDEPENDS_mono-runtime = "mono-jit mono-gac"
-
-RDEPENDS_mono-jit = "mono-common"
-
-FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \
-	/usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la"
-FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \
-	/usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so"
-
-# Packages not included in Debian
-PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \
-	libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \
-	libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil"
-
-FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll"
-FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc"
-FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb"
-
-FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*"
-FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb"
-
-FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll"
-FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb"
-
-# Move .pc files
-FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc"
-PACKAGES =+ " libmono-cairo1.0-cil-dev "
-
-SRC_URI[md5sum] = "6dfc8364f6e761d558f134a707bae421"
-SRC_URI[sha256sum] = "44fc0eddf56c0abe861190051fceec6e223122c5835967459c69fbf98ee52067"
diff --git a/recipes/mono/mono_2.2.0.inc b/recipes/mono/mono_2.2.0.inc
deleted file mode 100644
index eb22b1bfb6..0000000000
--- a/recipes/mono/mono_2.2.0.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Mono Programming Language"
-SECTION = "devel/mono"
-LICENSE = "GPL LGPL X11"
-
-SRC_URI = "http://bec-systems.com/pub/mono/mono-2.2-rc1.tar.bz2 \
-		"
-
-#	   file://mono-libgc-configure.patch;patch=1"
-
-S = "${WORKDIR}/mono-2.2"
-
-do_fix_dolt_libtool() {
-	# look for libtool prefixed with HOST_SYS
-	sed -e "s/slash\}libtool/slash\}${HOST_SYS}-libtool/" -i acinclude.m4
-}
-
-inherit autotools
-EXTRA_OECONF_arm = "--without-tls"
-EXTRA_OECONF_mipsel = "--without-tls"
-
-addtask fix_dolt_libtool after do_patch before do_configure
-
diff --git a/recipes/mono/mono_2.4.2.3.bb b/recipes/mono/mono_2.6.3.bb
index a6bbd08887..dbbe67951e 100644
--- a/recipes/mono/mono_2.4.2.3.bb
+++ b/recipes/mono/mono_2.6.3.bb
@@ -1,16 +1,13 @@
-require mono-${PV}.inc
+require mono.inc
 
 DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.0"
 
 # mono makes use of non-thumb-compatible inline asm.
 ARM_INSTRUCTION_SET = "arm"
 
-SRC_URI += "file://configure.patch;patch=1\
-	    file://mini-arm.patch;patch=1\
-            file://0001-remove-docs-dir-from-build.patch;patch=1 \
-            file://mono-cross-compilation-for-amd64.patch;patch=1 \
+SRC_URI += "file://configure.patch\
            "
 
 # Per http://www.mono-project.com/Mono:ARM
@@ -84,5 +81,6 @@ FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB
 FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc"
 PACKAGES =+ " libmono-cairo1.0-cil-dev "
 
-SRC_URI[md5sum] = "696f25afc8453cd0d1c78de6e905dcf2"
-SRC_URI[sha256sum] = "1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae"
+SRC_URI[md5sum] = "b1dc21bac2c7c75814a9f32246eadadd"
+SRC_URI[sha256sum] = "0ecb82d2007f472f8eebc85c349813515bf642e6ea021890ece40555ad50d947"
+
diff --git a/recipes/mono/mono_svn.bb b/recipes/mono/mono_svn.bb
deleted file mode 100644
index 311d2a38dd..0000000000
--- a/recipes/mono/mono_svn.bb
+++ /dev/null
@@ -1,95 +0,0 @@
-require mono_svn.inc
-
-DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
-
-PR = "r0"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI += ""
-
-# Per http://www.mono-project.com/Mono:ARM
-EXTRA_OECONF += " --disable-mcs-build "
-# Instead, get the mcs tree from a different build (see mono-mcs-intermediate)
-
-do_install_prepend() {
-	install -d ${D}
-	cd ${D}
-	tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
-	cd ${S}
-}
-
-do_install_append() {
-	# mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#),
-	# however, jay is not being cross-compiled and thus only
-	# available for the buildhost architecture, so remove it
-	# entirely
-	cd ${D}
-	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
-	    ./usr/share/jay/README.jay \
-	    ./usr/bin/jay
-	cd ${S}
-
-	# Not packaged with the default rules and apparently
-	# not used for anything
-	rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml
-}
-
-inherit mono
-
-# Import file definitions from Debian
-require mono_2.x-files.inc
-
-# Add some packages
-PACKAGES_append = " mono-doc mono mono-runtime"
-
-FILES_mono-doc_append = " /usr/share/libgc-mono/ "
-
-FILES_mono = ""
-ALLOW_EMPTY_mono = "1"
-RDEPENDS_mono = "mono-common mono-jit"
-
-FILES_mono-runtime = ""
-ALLOW_EMPTY_mono-runtime = "1"
-RDEPENDS_mono-runtime = "mono-jit mono-gac"
-
-RDEPENDS_mono-jit = "mono-common"
-
-FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \
-	/usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la"
-FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \
-	/usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so"
-
-# Packages not included in Debian
-PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \
-	libmono-cecil0.6-cil-dbg libmono-cecil0.6-cil-dev libmono-cecil0.6-cil \
-	libmono-cecil-mdb0.2-cil-dbg libmono-cecil-mdb0.2-cil \
-	libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil \
-	libmono-mozilla0.1-cil-dbg libmono-mozilla0.1-cil \
-	libmono-system-web-extensions1.0-cil-dbg libmono-system-web-extensions1.0-cil"
-
-FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll"
-FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc"
-FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb"
-
-FILES_libmono-cecil0.6-cil = "/usr/lib/mono/gac/Mono.Cecil*/0.6.*"
-FILES_libmono-cecil0.6-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil*/0.6.*/Mono.Cecil*.dll.mdb"
-FILES_libmono-cecil0.6-cil-dev = "/usr/lib/pkgconfig/cecil.pc"
-
-FILES_libmono-cecil-mdb0.2-cil = "/usr/lib/mono/gac/Mono.Cecil.Mdb/0.2.*"
-FILES_libmono-cecil-mdb0.2-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil.Mdb/0.2.*/Mono.Cecil*.dll.mdb"
-
-FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll"
-FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb"
-
-FILES_libmono-system2.0-cil-dbg_append = " /usr/lib/mono/gac/System.Core/3.5.*/*.mdb "
-FILES_libmono-system2.0-cil_append = " /usr/lib/mono/gac/System.Core/3.5.* "
-
-FILES_libmono-mozilla0.1-cil-dbg = "/usr/lib/mono/gac/Mono.Mozilla/0.1.0.0*/Mono.Mozilla.dll.mdb"
-FILES_libmono-mozilla0.1-cil = "/usr/lib/mono/gac/Mono.Mozilla/0.1.0.0*/Mono.Mozilla.dll"
-
-FILES_libmono-system-web-extensions1.0-cil-dbg = "/usr/lib/mono/gac/System.Web.Extensions*/1.0*/*.mdb"
-FILES_libmono-system-web-extensions1.0-cil =  "/usr/lib/mono/gac/System.Web.Extensions*/1.0*/*.dll"
-
-# Move .pc files
-FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc"
-PACKAGES =+ " libmono-cairo1.0-cil-dev "
diff --git a/recipes/mono/mono_svn.inc b/recipes/mono/mono_svn.inc
deleted file mode 100644
index d369d8bd54..0000000000
--- a/recipes/mono/mono_svn.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Mono Programming Language"
-SECTION = "devel/mono"
-LICENSE = "GPL LGPL X11"
-
-SRCREV = "87352"
-SRC_URI = "svn://anonsvn.mono-project.com/source/trunk/;module=mcs;rev=${SRCREV};name=mcs \
-	svn://anonsvn.mono-project.com/source/trunk/;module=mono;rev=${SRCREV};name=mono "
-SRCREV_FORMAT = "rmono"
-
-PV = "1.2.5.1+svnr${SRCPV}"
-S = "${WORKDIR}/mono"
-
-inherit autotools
-EXTRA_OECONF_arm = "--without-tls"
-EXTRA_OECONF_mipsel = "--without-tls"
-
diff --git a/recipes/monotone/monotone-5_0.25.2.bb b/recipes/monotone/monotone-5_0.25.2.bb
index d175adcdda..c06759001e 100644
--- a/recipes/monotone/monotone-5_0.25.2.bb
+++ b/recipes/monotone/monotone-5_0.25.2.bb
@@ -8,9 +8,9 @@ require monotone.inc
 PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
-           file://txt2c-cross-post-0.22.patch;patch=1 \
-	   file://uclibc.database.hh.stdarg.patch;patch=1 \
-	   file://configure.ac-no-sync-with-stdio-0.25.patch;patch=1 \
+           file://txt2c-cross-post-0.22.patch \
+	   file://uclibc.database.hh.stdarg.patch \
+	   file://configure.ac-no-sync-with-stdio-0.25.patch \
 	   "
 
 ALTERNATIVE_PRIORITY = "50"
diff --git a/recipes/monotone/monotone-6_0.27.bb b/recipes/monotone/monotone-6_0.27.bb
index b7af4288e9..27d81f9e57 100644
--- a/recipes/monotone/monotone-6_0.27.bb
+++ b/recipes/monotone/monotone-6_0.27.bb
@@ -25,9 +25,9 @@ ARM_INSTRUCTION_SET = "arm"
 PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
-           file://txt2c-cross-post-0.22.patch;patch=1 \
-	   file://uclibc.database.hh.stdarg.patch;patch=1 \
-           file://configure.ac-no-sync-with-stdio-0.26.patch;patch=1 \
+           file://txt2c-cross-post-0.22.patch \
+	   file://uclibc.database.hh.stdarg.patch \
+           file://configure.ac-no-sync-with-stdio-0.26.patch \
 	   "
 # This makes the testsuite as a package and renames the monotone executable
 # to include the netsync suffix.
diff --git a/recipes/monotone/monotone-6_0.31.bb b/recipes/monotone/monotone-6_0.31.bb
index 08c0b2b43a..10ddf4d43e 100644
--- a/recipes/monotone/monotone-6_0.31.bb
+++ b/recipes/monotone/monotone-6_0.31.bb
@@ -25,9 +25,9 @@ ARM_INSTRUCTION_SET = "arm"
 PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
-           file://txt2c-cross-post-0.22.patch;patch=1 \
-	   file://uclibc.database.hh.stdarg.patch;patch=1 \
-	   file://configure.ac-no-sync-with-stdio-0.31.patch;patch=1 \
+           file://txt2c-cross-post-0.22.patch \
+	   file://uclibc.database.hh.stdarg.patch \
+	   file://configure.ac-no-sync-with-stdio-0.31.patch \
 	  "
 do_compile_append() {
 	touch testsuite
diff --git a/recipes/monotone/monotone-6_0.33.bb b/recipes/monotone/monotone-6_0.33.bb
index 1e53508e4c..8bc24f24d3 100644
--- a/recipes/monotone/monotone-6_0.33.bb
+++ b/recipes/monotone/monotone-6_0.33.bb
@@ -28,9 +28,9 @@ ARM_INSTRUCTION_SET = "arm"
 PR = "r1"
 
 SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \
-           file://txt2c-cross-post-0.22.patch;patch=1 \
-	   file://uclibc.database.hh.stdarg.patch;patch=1 \
-	   file://configure.ac-no-sync-with-stdio-0.31.patch;patch=1 \
+           file://txt2c-cross-post-0.22.patch \
+	   file://uclibc.database.hh.stdarg.patch \
+	   file://configure.ac-no-sync-with-stdio-0.31.patch \
 	  "
 do_compile_append() {
 	touch testsuite
diff --git a/recipes/monotone/monotone-6_0.34.bb b/recipes/monotone/monotone-6_0.34.bb
index 873f68b2ad..9a6695237f 100644
--- a/recipes/monotone/monotone-6_0.34.bb
+++ b/recipes/monotone/monotone-6_0.34.bb
@@ -28,9 +28,9 @@ ARM_INSTRUCTION_SET = "arm"
 PR = "r0"
 
 SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \
-           file://txt2c-cross-post-0.22.patch;patch=1 \
-	   file://uclibc.database.hh.stdarg.patch;patch=1 \
-	   file://configure.ac-no-sync-with-stdio-0.31.patch;patch=1 \
+           file://txt2c-cross-post-0.22.patch \
+	   file://uclibc.database.hh.stdarg.patch \
+	   file://configure.ac-no-sync-with-stdio-0.31.patch \
 	  "
 do_compile_append() {
 	touch testsuite
diff --git a/recipes/monotone/monotone-6_0.37.bb b/recipes/monotone/monotone-6_0.37.bb
index 0bf39114a3..716a26b5bc 100644
--- a/recipes/monotone/monotone-6_0.37.bb
+++ b/recipes/monotone/monotone-6_0.37.bb
@@ -28,9 +28,9 @@ ARM_INSTRUCTION_SET = "arm"
 PR = "r0"
 
 SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \
-           file://txt2c-cross-post-0.22.patch;patch=1 \
-#	   file://uclibc.database.hh.stdarg.patch;patch=1 \
-	   file://configure.ac-no-sync-with-stdio-0.31.patch;patch=1 \
+           file://txt2c-cross-post-0.22.patch \
+#	   file://uclibc.database.hh.stdarg.patch \
+	   file://configure.ac-no-sync-with-stdio-0.31.patch \
 	  "
 do_compile_append() {
 	touch testsuite
diff --git a/recipes/motion/motion_3.2.11.bb b/recipes/motion/motion_3.2.11.bb
index 01f50fd435..d43ed27939 100644
--- a/recipes/motion/motion_3.2.11.bb
+++ b/recipes/motion/motion_3.2.11.bb
@@ -10,7 +10,7 @@ RSUGGESTS = "mysql-client postgresql-client"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
-           file://ffmpeg-0.4.9.15594svn-20081010.diff;patch=1 "
+           file://ffmpeg-0.4.9.15594svn-20081010.diff "
 
 inherit autotools
 
diff --git a/recipes/mozilla/fennec/mozilla-fennec.desktop b/recipes/mozilla/fennec/mozilla-fennec.desktop
index 5c56d1d21d..6c9bd20a7b 100644
--- a/recipes/mozilla/fennec/mozilla-fennec.desktop
+++ b/recipes/mozilla/fennec/mozilla-fennec.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=0.7
+Version=1.1beta1
 Encoding=UTF-8
 Name=Fennec
 Comment=Fennec mobile browser
diff --git a/recipes/mozilla/fennec/use-native-bpp.patch b/recipes/mozilla/fennec/use-native-bpp.patch
index fd3f9b71f8..1ecb9f3922 100644
--- a/recipes/mozilla/fennec/use-native-bpp.patch
+++ b/recipes/mozilla/fennec/use-native-bpp.patch
@@ -1,12 +1,6 @@
-diff -r f603fec24bf7 gfx/thebes/src/gfxPlatformGtk.cpp
---- a/gfx/thebes/src/gfxPlatformGtk.cpp	Tue Dec 02 16:05:36 2008 -0500
-+++ b/gfx/thebes/src/gfxPlatformGtk.cpp	Tue Dec 02 23:14:03 2008 -0500
-@@ -80,18 +80,23 @@
- 
- #define GDK_PIXMAP_SIZE_MAX 32767
- 
- #ifndef MOZ_PANGO
- #include <ft2build.h>
+--- a/gfx/thebes/src/gfxPlatformGtk.cpp	2010-04-19 18:02:04.000000000 +0000
++++ b/gfx/thebes/src/gfxPlatformGtk.cpp	2010-04-25 11:36:49.000000000 +0000
+@@ -91,7 +91,12 @@
  #include FT_FREETYPE_H
  #endif
  
@@ -14,26 +8,15 @@ diff -r f603fec24bf7 gfx/thebes/src/gfxPlatformGtk.cpp
 +#include "nsIPrefBranch.h"
 +#include "nsServiceManagerUtils.h"
 +
- double gfxPlatformGtk::sDPI = -1.0;
  gfxFontconfigUtils *gfxPlatformGtk::sFontconfigUtils = nsnull;
 +static PRBool gUseSystemVisualFormat = PR_FALSE;
  
  #ifndef MOZ_PANGO
  typedef nsDataHashtable<nsStringHashKey, nsRefPtr<FontFamily> > FontTable;
- static FontTable *gPlatformFonts = NULL;
- static FontTable *gPlatformFontAliases = NULL;
- static FT_Library gPlatformFTLibrary = NULL;
- #endif
- 
-@@ -113,16 +118,26 @@ gfxPlatformGtk::gfxPlatformGtk()
-     gPlatformFonts = new FontTable();
-     gPlatformFonts->Init(100);
-     gPlatformFontAliases = new FontTable();
-     gPlatformFontAliases->Init(100);
+@@ -127,6 +132,16 @@
+     gCodepointsWithNoFonts = new gfxSparseBitSet();
      UpdateFontList();
  #endif
- 
-     InitDPI();
 +
 +    nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
 +    if (!prefs)
@@ -47,17 +30,7 @@ diff -r f603fec24bf7 gfx/thebes/src/gfxPlatformGtk.cpp
  }
  
  gfxPlatformGtk::~gfxPlatformGtk()
- {
-     gfxFontconfigUtils::Shutdown();
-     sFontconfigUtils = nsnull;
- 
- #ifdef MOZ_PANGO
-@@ -184,18 +199,24 @@ gfxPlatformGtk::CreateOffscreenSurface(c
-     // XXX we really need a different interface here, something that passes
-     // in more context, including the display and/or target surface type that
-     // we should try to match
-     Display* display = GDK_DISPLAY();
-     if (!display)
+@@ -202,8 +217,14 @@
          return nsnull;
  
      GdkPixmap* pixmap = nsnull;
@@ -74,8 +47,3 @@ diff -r f603fec24bf7 gfx/thebes/src/gfxPlatformGtk.cpp
  
      if (xrenderFormat && sizeOk) {
          pixmap = gdk_pixmap_new(nsnull, size.width, size.height,
-                                 xrenderFormat->depth);
- 
-         if (pixmap) {
-             gdk_drawable_set_colormap(GDK_DRAWABLE(pixmap), nsnull);
-             newSurface = new gfxXlibSurface(display,
diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb
index ada5fa8e87..482ea1da82 100644
--- a/recipes/mozilla/fennec_hg.bb
+++ b/recipes/mozilla/fennec_hg.bb
@@ -1,15 +1,15 @@
 DESCRIPTION = "Mozilla Mobile browser"
 
-PV = "0.9+1.0b4pre"
-MOZPV = "1.0b4pre"
-PR = "r7"
+PV = "0.9+${MOZPV}"
+MOZPV = "1.1b2"
+PR = "r9"
 PE = "1"
 
-SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=37acc871cb55 \
-           hg://hg.mozilla.org/;module=mobile-browser;rev=c725e5e30b9d \
+SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=060ddfe5aa48 \
+           hg://hg.mozilla.org/;module=mobile-browser;rev=ad254d8abbc9 \
+           file://use-native-bpp.patch \
            file://jsautocfg.h \
-           file://jsautocfg-dontoverwrite.patch;patch=1 \
-           file://use-native-bpp.patch;patch=1 \
+           file://jsautocfg-dontoverwrite.patch \
 "
 
 S = "${WORKDIR}/mozilla-central"
diff --git a/recipes/mozilla/firefox-3.6.3/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.6.3/0001-Remove-Werror-from-build.patch
new file mode 100644
index 0000000000..008dabbe8d
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/0001-Remove-Werror-from-build.patch
@@ -0,0 +1,43 @@
+From 48a378ae647cbd6f8466bd0e8dbb04400bb175a8 Mon Sep 17 00:00:00 2001
+From: Eduardo Valentin <eduardo.valentin@openpossa.org>
+Date: Thu, 24 Jul 2008 16:05:09 -0400
+Subject: [PATCH 1/1] Remove -Werror from build
+
+Remove -Werror from build
+
+Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org>
+---
+ configure |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: mozilla-1.9.1/configure
+===================================================================
+--- mozilla-1.9.1.orig/configure
++++ mozilla-1.9.1/configure
+@@ -5525,7 +5525,7 @@ if test "$GNU_CC"; then
+         # Don't allow undefined symbols in libraries
+         DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs"
+     fi
+-    WARNINGS_AS_ERRORS='-Werror'
++    WARNINGS_AS_ERRORS=''
+     DSO_CFLAGS=''
+     DSO_PIC_CFLAGS='-fPIC'
+     ASFLAGS="$ASFLAGS -fPIC"
+@@ -7104,7 +7104,7 @@ EOF
+     IMPLIB='emximp -o'
+     FILTER='emxexp -o'
+     LDFLAGS='-Zmap'
+-    WARNINGS_AS_ERRORS='-Werror'
++    WARNINGS_AS_ERRORS=''
+     MOZ_DEBUG_FLAGS="-g -fno-inline"
+     MOZ_OPTIMIZE_FLAGS="-O2"
+     MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
+@@ -7283,7 +7283,7 @@ else
+ fi
+ rm -f conftest*
+        fi
+-       WARNINGS_AS_ERRORS='-Werror'
++       WARNINGS_AS_ERRORS=''
+        MOZ_OPTIMIZE_FLAGS="-xO4"
+        MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
+        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@'
diff --git a/recipes/mozilla/firefox-3.6.3/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.6.3/0002-Fix-security-cross-compile-cpu-detection-error.patch
new file mode 100644
index 0000000000..ce8d4d9948
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/0002-Fix-security-cross-compile-cpu-detection-error.patch
@@ -0,0 +1,42 @@
+From 599b26141d493ff19633796ce5e19b00315d3821 Mon Sep 17 00:00:00 2001
+From: Eduardo Valentin <eduardo.valentin@openpossa.org>
+Date: Fri, 25 Jul 2008 11:20:02 -0400
+Subject: [PATCH 1/1] Fix security cross compile cpu detection error
+
+Fix security cross compile cpu detection error.
+Reference to bug 376279.
+
+Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org>
+---
+ security/coreconf/arch.mk    |    2 ++
+ security/manager/Makefile.in |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk
+index fba38ff..28da32e 100644
+--- a/security/coreconf/arch.mk
++++ b/security/coreconf/arch.mk
+@@ -66,7 +66,9 @@ OS_ARCH := $(subst /,_,$(shell uname -s))
+ # Attempt to differentiate between sparc and x86 Solaris
+ #
+
++ifndef OE_TEST
+ OS_TEST := $(shell uname -m)
++endif
+ ifeq ($(OS_TEST),i86pc)
+     OS_RELEASE := $(shell uname -r)_$(OS_TEST)
+ else
+diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
+index 86119f7..86c09ca 100644
+--- a/security/manager/Makefile.in
++++ b/security/manager/Makefile.in
+@@ -240,6 +240,7 @@ DEFAULT_GMAKE_FLAGS += \
+	RC="$(RC) $(RCFLAGS)" \
+	OS_ARCH="$(OS_ARCH)" \
+	CPU_ARCH="$(TARGET_CPU)" \
++	OS_TEST="$(TARGET_CPU)" \
+	$(NULL)
+ SKIP_CHK=1
+ endif
+--
+1.5.4.3
diff --git a/recipes/mozilla/firefox-3.6.3/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.6.3/010_FPU_IS_ARM_FPA_xslt.diff
new file mode 100644
index 0000000000..854100c4c3
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/010_FPU_IS_ARM_FPA_xslt.diff
@@ -0,0 +1,56 @@
+# Bug 369722 – prdtoa.c jsnum.h txDouble.h not required IEEE_ARM define on Codesourcery EABI gcc3.4.4 compiler
+#
+--- mozilla/content/xslt/public/txDouble.h.orig	2006-07-13 17:21:52.000000000 +0300
++++ mozilla/content/xslt/public/txDouble.h	2007-10-25 15:01:25.000000000 +0300
+@@ -58,46 +58,48 @@ fp_except_t oldmask = fpsetmask(~allmask
+ /**
+  * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports:
+  *  ARM is a little endian architecture but 64 bit double words are stored
+  * differently: the 32 bit words are in little endian byte order, the two words
+  * are stored in big endian`s way.
+  */
+ 
+ #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
+-#define CPU_IS_ARM
++#if !defined(__VFP_FP__)
++#define FPU_IS_ARM_FPA
++#endif
+ #endif
+ 
+ #if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
+ /**
+  * This version of the macros is safe for the alias optimizations
+  * that gcc does, but uses gcc-specific extensions.
+  */
+ 
+ typedef union txdpun {
+     PRFloat64 d;
+     struct {
+-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
+         PRUint32 lo, hi;
+ #else
+         PRUint32 hi, lo;
+ #endif
+     } s;
+ } txdpun;
+ 
+ #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; }))
+ #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; }))
+ 
+ #else // __GNUC__
+ 
+ /* We don't know of any non-gcc compilers that perform alias optimization,
+  * so this code should work.
+  */
+ 
+-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
+ #define TX_DOUBLE_HI32(x)        (((PRUint32 *)&(x))[1])
+ #define TX_DOUBLE_LO32(x)        (((PRUint32 *)&(x))[0])
+ #else
+ #define TX_DOUBLE_HI32(x)        (((PRUint32 *)&(x))[0])
+ #define TX_DOUBLE_LO32(x)        (((PRUint32 *)&(x))[1])
+ #endif
+ 
+ #endif // __GNUC__
diff --git a/recipes/mozilla/firefox-3.6.3/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.6.3/Bug339782.additional.fix.diff
new file mode 100644
index 0000000000..0848e730d3
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/Bug339782.additional.fix.diff
@@ -0,0 +1,39 @@
+# XPTC_InvokeByIndex crashes
+# Bug 339782  [ARM] XPTC_InvokeByIndex crashes when cross-compiled under GCC 3.4.x with EABI (CodeSourcery)
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+===================================================================
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+@@ -51,22 +51,32 @@
+ #ifdef __ARM_EABI__
+ #define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8))
+ #define VAR_STACK_SIZE_64 3
+ #else
+ #define DOUBLEWORD_ALIGN(p) (p)
+ #define VAR_STACK_SIZE_64 2
+ #endif
+ 
++#ifdef __ARM_EABI__
++#define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8))
++#else
++#define DOUBLEWORD_ALIGN(p) (p)
++#endif
++
+ // Remember that these 'words' are 32bit DWORDS
+ 
+ static PRUint32
+ invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
+ {
+     PRUint32 result = 0;
++
++    /* Note that we give a "worst case" estimate of how much stack _might_ be
++     * needed, rather than the real count - this should be safe */
++
+     for(PRUint32 i = 0; i < paramCount; i++, s++)
+     {
+         if(s->IsPtrData())
+         {
+             result++;
+             continue;
+         }
+         switch(s->type)
diff --git a/recipes/mozilla/firefox-3.6.3/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.6.3/Bug385583.nspr.jmp_buf.eabi.diff
new file mode 100644
index 0000000000..486440c30e
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/Bug385583.nspr.jmp_buf.eabi.diff
@@ -0,0 +1,33 @@
+diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h
+--- mozilla/nsprpub/pr/include/md/_linux.h.orig	2007-11-28 14:16:03.000000000 -0500
++++ mozilla/nsprpub/pr/include/md/_linux.h	2007-11-28 14:12:09.000000000 -0500
+@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void);
+ #error "Linux/MIPS pre-glibc2 not supported yet"
+ #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+ 
+-#elif defined(__arm__)
+-/* ARM/Linux */
++#elif defined(__arm__) && !defined(__ARM_EABI__)
++/* ARM/Linux (old-ABI) */
+ #if defined(__GLIBC__) && __GLIBC__ >= 2
+ #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20]
+ #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val))
+@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void);
+ #error "ARM/Linux pre-glibc2 not supported yet"
+ #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+ 
++#elif defined(__arm__) && defined(__ARM_EABI__)
++/* ARM/Linux (EABI) */
++#if defined(__GLIBC__) && __GLIBC__ >= 2
++#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8]
++#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val))
++#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
++#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7])
++#define _MD_SP_TYPE __ptr_t
++#else
++#error "ARM/Linux pre-glibc2 not supported yet"
++#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
++
+ #else
+ 
+ #error "Unknown CPU architecture"
diff --git a/recipes/mozilla/firefox-3.6.3/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.6.3/Bug405992.atomic.nspr.diff
new file mode 100644
index 0000000000..f54f916a6a
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/Bug405992.atomic.nspr.diff
@@ -0,0 +1,48 @@
+#    Add atomic operations for ARM.
+diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h
+index 5b794c5..cb8d58e 100644
+--- a/nsprpub/pr/include/md/_linux.h
++++ b/nsprpub/pr/include/md/_linux.h
+@@ -194,6 +194,42 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
+ })
+ #endif
+ 
++#if defined(__arm__)
++#define _PR_HAVE_ATOMIC_OPS
++#define _MD_INIT_ATOMIC()
++
++typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
++#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *)0xffff0fc0)
++
++#define _MD_ATOMIC_INCREMENT(ptr) _MD_ATOMIC_ADD(ptr, 1)
++#define _MD_ATOMIC_DECREMENT(ptr) _MD_ATOMIC_ADD(ptr, -1)
++#define _MD_ATOMIC_ADD(ptr, n)                  \
++    ({                                          \
++        PRInt32 ov, nv;                         \
++        volatile PRInt32 *vp = (ptr);           \
++                                                \
++        do {                                    \
++            ov = *vp;                           \
++            nv = ov + (n);                      \
++        }                                       \
++        while (__kernel_cmpxchg(ov, nv, vp));   \
++                                                \
++        nv;                                     \
++    })
++#define _MD_ATOMIC_SET(ptr, nv)                 \
++    ({                                          \
++        PRInt32 ov;                             \
++        volatile PRInt32 *vp = (ptr);           \
++                                                \
++        do {                                    \
++            ov = *vp;                           \
++        }                                       \
++        while (__kernel_cmpxchg(ov, (nv), vp)); \
++                                                \
++        ov;                                     \
++    })
++#endif
++
+ #define USE_SETJMP
+ #if defined(__GLIBC__) && __GLIBC__ >= 2
+ #define _PR_POLL_AVAILABLE
diff --git a/recipes/mozilla/firefox-3.6.3/configure-wchart.patch b/recipes/mozilla/firefox-3.6.3/configure-wchart.patch
new file mode 100644
index 0000000000..36ee2a0ba4
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/configure-wchart.patch
@@ -0,0 +1,11 @@
+--- a/configure.in	2008-04-15 12:56:35.000000000 +0300
++++ b/configure.in.old	2008-03-20 21:17:09.000000000 +0200
+@@ -2743,7 +2743,7 @@
+ 
+     AC_CACHE_CHECK(for compiler -fshort-wchar option, 
+         ac_cv_have_usable_wchar_option_v2,
+-        [AC_TRY_LINK([#include <stddef.h>
++        [AC_TRY_COMPILE([#include <stddef.h>
+                          $configure_static_assert_macros],
+                         [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2);
+                          CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)],
diff --git a/recipes/mozilla/firefox-3.6.3/firefox-plugin.pc b/recipes/mozilla/firefox-3.6.3/firefox-plugin.pc
new file mode 100644
index 0000000000..c9c1ce8d9c
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/firefox-plugin.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include/firefox-3.6.3
+
+Name: Mozilla Plug-In API
+Description: Mozilla Plug-In API
+Version: 3.6
+Requires: firefox-xpcom = 3.6.3
+Cflags: -I${includedir}/java -I${includedir}/plugin
diff --git a/recipes/mozilla/firefox-3.6.3/firefox-xpcom.pc b/recipes/mozilla/firefox-3.6.3/firefox-xpcom.pc
new file mode 100644
index 0000000000..a0edec60de
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/firefox-xpcom.pc
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include
+mozdir=${includedir}/firefox-3.6.3
+idldir=${includedir}/firefox-3.6.3
+
+Name: XPCOM
+Description: The Mozilla Cross Platform Component Library
+Version: 3.6.3
+Requires: nspr >= 4.8
+Libs: -L${libdir} -lxpcom -Wl,-R${libdir}
+Cflags: -I${mozdir} -I${mozdir}/xpcom -I${mozdir}/string
diff --git a/recipes/mozilla/firefox-3.6.3/jemalloc-tls.patch b/recipes/mozilla/firefox-3.6.3/jemalloc-tls.patch
new file mode 100644
index 0000000000..d1d740989e
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/jemalloc-tls.patch
@@ -0,0 +1,28 @@
+--- /tmp/jemalloc.c	2008-06-23 10:57:36.000000000 +0200
++++ mozilla/memory/jemalloc/jemalloc.c	2008-06-23 11:20:13.000000000 +0200
+@@ -386,7 +386,7 @@
+ #else
+ #  define NO_TLS
+ #endif
+-#if 0
++
+ #ifdef __i386__
+ #  define QUANTUM_2POW_MIN	4
+ #  define SIZEOF_PTR_2POW	2
+@@ -420,7 +420,6 @@
+ #  define QUANTUM_2POW_MIN	4
+ #  define SIZEOF_PTR_2POW	2
+ #endif
+-#endif
+ 
+ #define	SIZEOF_PTR		(1U << SIZEOF_PTR_2POW)
+ 
+@@ -2582,7 +2581,7 @@
+ 		 * knowledge of how _pthread_self() calculates values, we can't
+ 		 * easily do much better than this.
+ 		 */
+-		ind = (unsigned long) _pthread_self() % narenas;
++		ind = 255255 % narenas;
+ 
+ 		/*
+ 		 * Optimistially assume that arenas[ind] has been initialized.
diff --git a/recipes/mozilla/firefox-3.6.3/linkage-problem.patch b/recipes/mozilla/firefox-3.6.3/linkage-problem.patch
new file mode 100644
index 0000000000..28bffd1e22
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/linkage-problem.patch
@@ -0,0 +1,14 @@
+--- mozilla/layout/build/Makefile.in~	2007-11-24 00:38:14.000000000 -0200
++++ mozilla/layout/build/Makefile.in	2007-11-24 00:38:14.000000000 -0200
+@@ -229,6 +229,11 @@
+ 		    $(NULL)
+ endif
+ 
++ifdef MOZ_ENABLE_XFT
++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \
++		    $(NULL)
++endif
++
+ ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
+ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
+ 		    $(NULL)
diff --git a/recipes/mozilla/firefox-3.6.3/mozconfig b/recipes/mozilla/firefox-3.6.3/mozconfig
new file mode 100644
index 0000000000..883a396e53
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/mozconfig
@@ -0,0 +1,73 @@
+. $topsrcdir/browser/config/mozconfig
+
+# use GTK+-2 widget set with XFT font rendering
+#ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+
+# enable minimal profile support
+ac_add_options --disable-profilesharing
+ac_add_options --disable-profilelocking
+ac_add_options --enable-single-profile
+
+ac_add_options --with-system-zlib
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-bz2
+#ac_add_options --with-system-png
+
+ac_add_options --disable-accessibility
+ac_add_options --disable-composer
+#ac_add_options --enable-plaintext-editor-only
+ac_add_options --disable-mailnews
+ac_add_options --disable-ldap
+#ac_add_options --disable-postscript
+ac_add_options --disable-mathml
+ac_add_options --disable-jsd
+ac_add_options --disable-installer
+ac_add_options --disable-xprint
+ac_add_options --enable-necko-disk-cache
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-updater
+
+# configure necko to allocate smaller network buffers
+ac_add_options --enable-necko-small-buffers
+
+# disable debug logging and tests
+#ac_add_options --disable-dtd-debug
+ac_add_options --disable-logging
+ac_add_options --disable-gtktest
+ac_add_options --disable-tests
+ac_add_options --disable-printing
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+ac_add_options --enable-debugger-info-modules
+
+# build crypto module (PSM + NSS)
+ac_add_options --enable-crypto
+
+# build minimal set of protocol handlers
+ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource
+
+# build minimal set of image decoders
+#ac_add_options --enable-image-decoders=png,gif,jpeg
+
+#ac_add_options --enable-reorder
+#ac_add_options --enable-elf-dynstr-gc
+
+# enable static build
+#ac_add_options --disable-shared
+#ac_add_options --enable-static
+ac_add_options --enable-optimize=-O2
+
+# Use cairo from system
+ac_add_options --enable-system-cairo
+
+# Disable jemalloc
+ac_add_options --disable-jemalloc
+
+# enable libxul
+ac_add_options --enable-libxul
+
+# Disable striping
+ac_add_options --disable-strip
+ac_add_options --disable-install-strip
diff --git a/recipes/mozilla/firefox-3.6.3/nspr.pc b/recipes/mozilla/firefox-3.6.3/nspr.pc
new file mode 100644
index 0000000000..6e4499235f
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/nspr.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include/firefox-3.6.3
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: 4.8
+Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl  -Wl,-R${libdir}
+Cflags: -I${includedir}
diff --git a/recipes/mozilla/firefox-3.6.3/plugins-dir.patch b/recipes/mozilla/firefox-3.6.3/plugins-dir.patch
new file mode 100644
index 0000000000..2c8b8e9bd1
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/plugins-dir.patch
@@ -0,0 +1,16 @@
+Index: mozilla-1.9.1/build/unix/mozilla.in
+===================================================================
+--- mozilla-1.9.1.orig/build/unix/mozilla.in
++++ mozilla-1.9.1/build/unix/mozilla.in
+@@ -52,6 +52,11 @@
+ 
+ moz_libdir=%MOZAPPDIR%
+ 
++if test -d /usr/lib/mozilla/plugins; then
++       MOZ_PLUGIN_PATH="${MOZ_PLUGIN_PATH:+"$MOZ_PLUGIN_PATH:"}/usr/lib/mozilla/plugins"
++       export MOZ_PLUGIN_PATH
++fi
++
+ # Use run-mozilla.sh in the current dir if it exists
+ # If not, then start resolving symlinks until we find run-mozilla.sh
+ found=0
diff --git a/recipes/mozilla/firefox-3.6.3/security-cross.patch b/recipes/mozilla/firefox-3.6.3/security-cross.patch
new file mode 100644
index 0000000000..cfe57b28f0
--- /dev/null
+++ b/recipes/mozilla/firefox-3.6.3/security-cross.patch
@@ -0,0 +1,57 @@
+--- /tmp/Linux.mk	2010-03-23 18:52:06.000000000 +0100
++++ mozilla-1.9.2/security/coreconf/Linux.mk	2010-03-23 18:52:57.000000000 +0100
+@@ -52,52 +52,8 @@
+ 
+ DEFAULT_COMPILER = gcc
+ 
+-ifeq ($(OS_TEST),ppc64)
+-	CPU_ARCH	= ppc
+-ifeq ($(USE_64),1)
+-	ARCHFLAG	= -m64
+-endif
+-else
+-ifeq ($(OS_TEST),alpha)
+-        OS_REL_CFLAGS   = -D_ALPHA_
+-	CPU_ARCH	= alpha
+-else
+-ifeq ($(OS_TEST),x86_64)
+-ifeq ($(USE_64),1)
+-	CPU_ARCH	= x86_64
+-else
+-	OS_REL_CFLAGS	= -Di386
+-	CPU_ARCH	= x86
+-	ARCHFLAG	= -m32
+-endif
+-else
+-ifeq ($(OS_TEST),sparc64)
+-	CPU_ARCH        = sparc
+-else
+-ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
+-	CPU_ARCH        = arm
+-else
+-ifeq (,$(filter-out parisc%,$(OS_TEST)))
+-	CPU_ARCH        = hppa
+-else
+-ifeq (,$(filter-out i%86,$(OS_TEST)))
+-	OS_REL_CFLAGS	= -Di386
+-	CPU_ARCH	= x86
+-else
+-ifeq ($(OS_TEST),sh4a)
+-	CPU_ARCH        = sh4
+-else
+-# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4
+-	CPU_ARCH	= $(OS_TEST)
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-
++OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
++CPU_ARCH =
+ 
+ LIBC_TAG		= _glibc
+ 
diff --git a/recipes/mozilla/firefox.inc b/recipes/mozilla/firefox.inc
index 024858a64d..0c75e1002b 100644
--- a/recipes/mozilla/firefox.inc
+++ b/recipes/mozilla/firefox.inc
@@ -1,5 +1,5 @@
 DESCRIPTION ?= "Browser made by mozilla"
-DEPENDS += "alsa-lib"
+DEPENDS += "alsa-lib curl"
 SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop"
 
 ARM_INSTRUCTION_SET = "arm"
diff --git a/recipes/mozilla/firefox_1.0.7.bb b/recipes/mozilla/firefox_1.0.7.bb
index 28746f392d..f8f5d97539 100644
--- a/recipes/mozilla/firefox_1.0.7.bb
+++ b/recipes/mozilla/firefox_1.0.7.bb
@@ -1,14 +1,14 @@
 PR = "r2"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://firefox-cc-fix.patch;patch=1 \
+	file://xptcstubs.patch \
+	file://no-xmb.patch \
+	file://firefox-cc-fix.patch \
 	file://jsautocfg.h \
-	file://extensions-hack.patch;patch=1 \
-	file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \
-	file://xptcinvoke-arm.patch;patch=1 \
-	file://mozilla-eabi.patch;patch=1"
+	file://extensions-hack.patch \
+	file://firefox-1.0-gcc4-compile.patch;striplevel=0 \
+	file://xptcinvoke-arm.patch \
+	file://mozilla-eabi.patch"
 S = "${WORKDIR}/mozilla"
 
 inherit autotools mozilla
diff --git a/recipes/mozilla/firefox_2.0.0.3.bb b/recipes/mozilla/firefox_2.0.0.3.bb
index be33d679af..7a0f38d8ba 100644
--- a/recipes/mozilla/firefox_2.0.0.3.bb
+++ b/recipes/mozilla/firefox_2.0.0.3.bb
@@ -2,17 +2,17 @@ DEPENDS += "cairo"
 PR = "r3"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
+	file://xptcstubs.patch \
+	file://no-xmb.patch \
 	file://jsautocfg.h \
-	file://extensions-hack.patch;patch=1 \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://xptcinvoke-arm.patch;patch=1 \
-	file://eabi-fix.patch;patch=1 \
-	file://eabi-fix2.patch;patch=1 \
-	file://eabi-fix3.patch;patch=1 \
-	file://linkage-problem.patch;patch=1 \
+	file://extensions-hack.patch \
+	file://security-cross.patch \
+	file://jsautocfg-dontoverwrite.patch \
+	file://xptcinvoke-arm.patch \
+	file://eabi-fix.patch \
+	file://eabi-fix2.patch \
+	file://eabi-fix3.patch \
+	file://linkage-problem.patch \
 "
 
 S = "${WORKDIR}/mozilla"
diff --git a/recipes/mozilla/firefox_3.0.1.bb b/recipes/mozilla/firefox_3.0.1.bb
index 48013e6249..0e62cbe2f7 100644
--- a/recipes/mozilla/firefox_3.0.1.bb
+++ b/recipes/mozilla/firefox_3.0.1.bb
@@ -3,17 +3,17 @@ PR = "r9"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://random_to_urandom.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://wchart.diff;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://use-native-bpp.patch;patch=1 \
+	file://security-cross.patch \
+	file://jsautocfg-dontoverwrite.patch \
+	file://Bug339782.additional.fix.diff \
+	file://Bug385583.nspr.jmp_buf.eabi.diff \
+	file://Bug405992.atomic.nspr.diff \
+	file://random_to_urandom.diff \
+	file://jemalloc-tls.patch \
+	file://wchart.diff \
+	file://0001-Remove-Werror-from-build.patch \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch \
+	file://use-native-bpp.patch \
 "
 
 S = "${WORKDIR}/mozilla"
diff --git a/recipes/mozilla/firefox_3.0.4.bb b/recipes/mozilla/firefox_3.0.4.bb
index 6f1e226088..988c435aba 100644
--- a/recipes/mozilla/firefox_3.0.4.bb
+++ b/recipes/mozilla/firefox_3.0.4.bb
@@ -3,16 +3,16 @@ PR = "r1"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://random_to_urandom.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch \
+	file://jsautocfg-dontoverwrite.patch \
+	file://Bug339782.additional.fix.diff \
+	file://Bug385583.nspr.jmp_buf.eabi.diff \
+	file://Bug405992.atomic.nspr.diff \
+	file://random_to_urandom.diff \
+	file://jemalloc-tls.patch \
+	file://0001-Remove-Werror-from-build.patch \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch \
+	file://plugins-dir.patch \
 "
 
 S = "${WORKDIR}/mozilla"
diff --git a/recipes/mozilla/firefox_3.0.8.bb b/recipes/mozilla/firefox_3.0.8.bb
index 12635287e8..a4659eca10 100644
--- a/recipes/mozilla/firefox_3.0.8.bb
+++ b/recipes/mozilla/firefox_3.0.8.bb
@@ -7,15 +7,15 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch \
+	file://jsautocfg-dontoverwrite.patch \
+	file://Bug339782.additional.fix.diff \
+	file://Bug385583.nspr.jmp_buf.eabi.diff \
+	file://Bug405992.atomic.nspr.diff \
+	file://jemalloc-tls.patch \
+	file://0001-Remove-Werror-from-build.patch \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch \
+	file://plugins-dir.patch \
 "
 
 S = "${WORKDIR}/mozilla"
diff --git a/recipes/mozilla/firefox_3.1b1.bb b/recipes/mozilla/firefox_3.1b1.bb
index 113f44e24d..8bd30f2390 100644
--- a/recipes/mozilla/firefox_3.1b1.bb
+++ b/recipes/mozilla/firefox_3.1b1.bb
@@ -6,8 +6,8 @@ PR = "r1"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build2/source/firefox-${MOZPV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://random_to_urandom.diff;patch=1 \
+	file://jsautocfg-dontoverwrite.patch \
+	file://random_to_urandom.diff \
 "
 
 S = "${WORKDIR}/mozilla-central"
diff --git a/recipes/mozilla/firefox_3.1b2.bb b/recipes/mozilla/firefox_3.1b2.bb
index a74e8d2954..8ef9f5f2c9 100644
--- a/recipes/mozilla/firefox_3.1b2.bb
+++ b/recipes/mozilla/firefox_3.1b2.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build2/source/firefox-${MOZPV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
+	file://jsautocfg-dontoverwrite.patch \
 "
 
 S = "${WORKDIR}/mozilla-central"
diff --git a/recipes/mozilla/firefox_3.5.2.bb b/recipes/mozilla/firefox_3.5.2.bb
index 282148c492..d77c71d065 100644
--- a/recipes/mozilla/firefox_3.5.2.bb
+++ b/recipes/mozilla/firefox_3.5.2.bb
@@ -4,15 +4,15 @@ PR = "r4"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch \
+	file://jsautocfg-dontoverwrite.patch \
+	file://Bug339782.additional.fix.diff \
+	file://Bug385583.nspr.jmp_buf.eabi.diff \
+	file://Bug405992.atomic.nspr.diff \
+	file://jemalloc-tls.patch \
+	file://0001-Remove-Werror-from-build.patch \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch \
+	file://plugins-dir.patch \
 	file://firefox-plugin.pc \
 	file://firefox-xpcom.pc \
 	file://nspr.pc \
diff --git a/recipes/mozilla/firefox_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb
index 18e864d984..9331294237 100644
--- a/recipes/mozilla/firefox_3.5.4.bb
+++ b/recipes/mozilla/firefox_3.5.4.bb
@@ -4,15 +4,15 @@ PR = "r3"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch \
+	file://jsautocfg-dontoverwrite.patch \
+	file://Bug339782.additional.fix.diff \
+	file://Bug385583.nspr.jmp_buf.eabi.diff \
+	file://Bug405992.atomic.nspr.diff \
+	file://jemalloc-tls.patch \
+	file://0001-Remove-Werror-from-build.patch \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch \
+	file://plugins-dir.patch \
 	file://firefox-plugin.pc \
 	file://firefox-xpcom.pc \
 	file://nspr.pc \
diff --git a/recipes/mozilla/firefox_3.5.5.bb b/recipes/mozilla/firefox_3.5.5.bb
index 5de60b9777..8da7d3a39c 100644
--- a/recipes/mozilla/firefox_3.5.5.bb
+++ b/recipes/mozilla/firefox_3.5.5.bb
@@ -4,15 +4,15 @@ PR = "r4"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch \
+	file://jsautocfg-dontoverwrite.patch \
+	file://Bug339782.additional.fix.diff \
+	file://Bug385583.nspr.jmp_buf.eabi.diff \
+	file://Bug405992.atomic.nspr.diff \
+	file://jemalloc-tls.patch \
+	file://0001-Remove-Werror-from-build.patch \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch \
+	file://plugins-dir.patch \
 	file://firefox-plugin.pc \
 	file://firefox-xpcom.pc \
 	file://nspr.pc \
diff --git a/recipes/mozilla/firefox_3.5b4.bb b/recipes/mozilla/firefox_3.5b4.bb
index e8571cef37..3fbbf2aa71 100644
--- a/recipes/mozilla/firefox_3.5b4.bb
+++ b/recipes/mozilla/firefox_3.5b4.bb
@@ -6,7 +6,7 @@ PR = "r3"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/source/firefox-${MOZPV}-source.tar.bz2 \
 	file://jsautocfg.h \
-	file://jsautocfg-dontoverwrite.patch;patch=1 \
+	file://jsautocfg-dontoverwrite.patch \
 "
 
 S = "${WORKDIR}/mozilla-1.9.1"
diff --git a/recipes/mozilla/firefox_3.6.2.bb b/recipes/mozilla/firefox_3.6.2.bb
index 1c975e0baf..dcc9fc50c6 100644
--- a/recipes/mozilla/firefox_3.6.2.bb
+++ b/recipes/mozilla/firefox_3.6.2.bb
@@ -3,14 +3,14 @@ DEPENDS += "cairo sqlite3 libnotify"
 # The .pc files below have "3.6" hardcoded, fix that before using them in a newer FF version!
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch \
+	file://Bug339782.additional.fix.diff \
+	file://Bug385583.nspr.jmp_buf.eabi.diff \
+	file://Bug405992.atomic.nspr.diff \
+	file://jemalloc-tls.patch \
+	file://0001-Remove-Werror-from-build.patch \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch \
+	file://plugins-dir.patch \
 	file://firefox-plugin.pc \
 	file://firefox-xpcom.pc \
 	file://nspr.pc \
diff --git a/recipes/mozilla/firefox_3.6.3.bb b/recipes/mozilla/firefox_3.6.3.bb
new file mode 100644
index 0000000000..98a0e400bd
--- /dev/null
+++ b/recipes/mozilla/firefox_3.6.3.bb
@@ -0,0 +1,36 @@
+DEPENDS += "cairo sqlite3 libnotify"
+
+# The .pc files below have "3.6" hardcoded, fix that before using them in a newer FF version!
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \
+	file://jsautocfg.h \
+	file://security-cross.patch \
+	file://Bug339782.additional.fix.diff \
+	file://Bug385583.nspr.jmp_buf.eabi.diff \
+	file://Bug405992.atomic.nspr.diff \
+	file://jemalloc-tls.patch \
+	file://0001-Remove-Werror-from-build.patch \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch \
+	file://plugins-dir.patch \
+	file://firefox-plugin.pc \
+	file://firefox-xpcom.pc \
+	file://nspr.pc \
+"
+
+SRC_URI[archive.md5sum] = "5e4541ab23084b7b14ba228291ce2688"
+SRC_URI[archive.sha256sum] = "35a0b35d79baa502b6c5781ed3e9c4b5eb623bdaf1940460dcf465192848a2d0"
+
+S = "${WORKDIR}/mozilla-1.9.2"
+
+inherit mozilla
+require firefox.inc
+
+EXTRA_OECONF += " --enable-official-branding --disable-crashreporter"
+
+
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+
+do_compile_prepend() {
+	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
+	sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk
+}
+
diff --git a/recipes/mozilla/firefox_3.6.bb b/recipes/mozilla/firefox_3.6.bb
index 573154f3aa..cb542cbc5d 100644
--- a/recipes/mozilla/firefox_3.6.bb
+++ b/recipes/mozilla/firefox_3.6.bb
@@ -5,14 +5,14 @@ PR = "r4"
 # The .pc files below have "3.6" hardcoded, fix that before using them in a newer FF version!
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \
 	file://jsautocfg.h \
-	file://security-cross.patch;patch=1 \
-	file://Bug339782.additional.fix.diff;patch=1 \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
-	file://Bug405992.atomic.nspr.diff;patch=1 \
-	file://jemalloc-tls.patch;patch=1 \
-	file://0001-Remove-Werror-from-build.patch;patch=1 \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \
-	file://plugins-dir.patch;patch=1 \
+	file://security-cross.patch \
+	file://Bug339782.additional.fix.diff \
+	file://Bug385583.nspr.jmp_buf.eabi.diff \
+	file://Bug405992.atomic.nspr.diff \
+	file://jemalloc-tls.patch \
+	file://0001-Remove-Werror-from-build.patch \
+	file://0002-Fix-security-cross-compile-cpu-detection-error.patch \
+	file://plugins-dir.patch \
 	file://firefox-plugin.pc \
 	file://firefox-xpcom.pc \
 	file://nspr.pc \
diff --git a/recipes/mozilla/firefox_hg.bb b/recipes/mozilla/firefox_hg.bb
index 37bb2608bd..c6ea7d1629 100644
--- a/recipes/mozilla/firefox_hg.bb
+++ b/recipes/mozilla/firefox_hg.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=8c9a6d851018 \
            file://jsautocfg.h \
-           file://jsautocfg-dontoverwrite.patch;patch=1 \
+           file://jsautocfg-dontoverwrite.patch \
 "
 
 S = "${WORKDIR}/mozilla-central"
diff --git a/recipes/mozilla/minimo_cvs.bb b/recipes/mozilla/minimo_cvs.bb
index 25ab87a181..3c274ea28b 100644
--- a/recipes/mozilla/minimo_cvs.bb
+++ b/recipes/mozilla/minimo_cvs.bb
@@ -16,14 +16,14 @@ PE = "1"
 PR = "r1"
 
 SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
-	   file://minimo.patch;patch=1 \
-           file://bug-322806.diff;patch=1 \
+	   file://minimo.patch \
+           file://bug-322806.diff \
 	   file://mozconfig file://minimo \
-	   file://eabi-fix.patch;patch=1 \
-	   file://eabi-fix2.patch;patch=1 \
-	   file://eabi-fix3.patch;patch=1 \
-	   file://minimo-components-ssr-only.patch;patch=1 \
-	   file://minimo-disable-mode-switch.patch;patch=1 \
+	   file://eabi-fix.patch \
+	   file://eabi-fix2.patch \
+	   file://eabi-fix3.patch \
+	   file://minimo-components-ssr-only.patch \
+	   file://minimo-disable-mode-switch.patch \
            file://minimo.desktop file://minimo.png"
 
 inherit autotools
diff --git a/recipes/mozilla/nspr-tools-native_4.7.1.bb b/recipes/mozilla/nspr-tools-native_4.7.1.bb
index 5fc9a32960..3aa38647c1 100644
--- a/recipes/mozilla/nspr-tools-native_4.7.1.bb
+++ b/recipes/mozilla/nspr-tools-native_4.7.1.bb
@@ -2,11 +2,11 @@ require nspr-tools-native.inc
 
 SRC_URI = "\
 	http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz;name=archive \
-	file://30_config_64bits.dpatch;patch=1 \
-	file://30_pkgconfig.dpatch;patch=1 \
-	file://81_sonames.dpatch;patch=1 \
-	file://99_configure.dpatch;patch=1 \
-	file://unbreak-build.diff;patch=1 \
+	file://30_config_64bits.dpatch;apply=yes \
+	file://30_pkgconfig.dpatch;apply=yes \
+	file://81_sonames.dpatch;apply=yes \
+	file://99_configure.dpatch;apply=yes \
+	file://unbreak-build.diff \
 	"
 
 SRC_URI[archive.md5sum] = "7c6e75a0867ce2b9ec62e399a908b5ac"
diff --git a/recipes/mozilla/nspr_4.7.1.bb b/recipes/mozilla/nspr_4.7.1.bb
index 92ed18d3c3..7120764d17 100644
--- a/recipes/mozilla/nspr_4.7.1.bb
+++ b/recipes/mozilla/nspr_4.7.1.bb
@@ -2,11 +2,11 @@ require nspr.inc
 
 SRC_URI = "\
 	http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz;name=archive \
-	file://30_config_64bits.dpatch;patch=1 \
-	file://30_pkgconfig.dpatch;patch=1 \
-	file://81_sonames.dpatch;patch=1 \
-	file://99_configure.dpatch;patch=1 \
-	file://unbreak-build.diff;patch=1 \
+	file://30_config_64bits.dpatch;apply=yes \
+	file://30_pkgconfig.dpatch;apply=yes \
+	file://81_sonames.dpatch;apply=yes \
+	file://99_configure.dpatch;apply=yes \
+	file://unbreak-build.diff \
 	"
 
 SRC_URI[archive.md5sum] = "7c6e75a0867ce2b9ec62e399a908b5ac"
diff --git a/recipes/mozilla/nss_3.12.6.bb b/recipes/mozilla/nss_3.12.6.bb
index 76ad318a7e..a1b97eb2f1 100644
--- a/recipes/mozilla/nss_3.12.6.bb
+++ b/recipes/mozilla/nss_3.12.6.bb
@@ -9,21 +9,21 @@ DEPENDS = "sqlite3 nspr"
 
 SRC_URI = "\
 	http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/${PN}-${PV}.tar.gz;name=archive \
-	file://00_ckbi_1.79.patch;patch=1 \
-	file://25_entropy.patch;patch=1 \
-	file://38_hurd.patch;patch=1 \
-	file://38_kbsd.patch;patch=1 \
-	file://38_mips64_build.patch;patch=1 \
-	file://80_security_build.patch;patch=1 \
-	file://80_security_tools.patch;patch=1 \
-	file://81_sonames.patch;patch=1 \
-	file://85_security_load.patch;patch=1 \
-	file://90_realpath.patch;patch=1 \
-	file://91_build_pwdecrypt.patch;patch=1 \
-	file://95_add_spi+cacert_ca_certs.patch;patch=1 \
-	file://96_NSS_VersionCheck.patch;patch=1 \
-	file://97_SSL_RENEGOTIATE_TRANSITIONAL.patch;patch=1 \
-	file://build-fix.patch;patch=1;pnum=0 \
+	file://00_ckbi_1.79.patch \
+	file://25_entropy.patch \
+	file://38_hurd.patch \
+	file://38_kbsd.patch \
+	file://38_mips64_build.patch \
+	file://80_security_build.patch \
+	file://80_security_tools.patch \
+	file://81_sonames.patch \
+	file://85_security_load.patch \
+	file://90_realpath.patch \
+	file://91_build_pwdecrypt.patch \
+	file://95_add_spi+cacert_ca_certs.patch \
+	file://96_NSS_VersionCheck.patch \
+	file://97_SSL_RENEGOTIATE_TRANSITIONAL.patch \
+	file://build-fix.patch;striplevel=0 \
 	file://nss.pc.in \
 "
 
diff --git a/recipes/mozilla/nss_3.12.bb b/recipes/mozilla/nss_3.12.bb
index a6408954cb..ac0947f5e3 100644
--- a/recipes/mozilla/nss_3.12.bb
+++ b/recipes/mozilla/nss_3.12.bb
@@ -9,16 +9,16 @@ DEPENDS = "sqlite3 nspr"
 
 SRC_URI = "\
 	http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_RTM/src/${PN}-${PV}.tar.gz;name=archive \
-	file://25_entropy.dpatch;patch=1 \
-	file://38_mips64_build.dpatch;patch=1 \
-	file://80_security_build.dpatch;patch=1 \
-	file://80_security_tools.dpatch;patch=1 \
-	file://81_sonames.dpatch;patch=1 \
-	file://85_security_load.dpatch;patch=1 \
-	file://90_realpath.dpatch;patch=1 \
-	file://91_build_pwdecrypt.dpatch;patch=1 \
-	file://95_add_spi+cacert_ca_certs.dpatch;patch=1 \
-	file://build-fix.patch;patch=1 \
+	file://25_entropy.dpatch;apply=yes \
+	file://38_mips64_build.dpatch;apply=yes \
+	file://80_security_build.dpatch;apply=yes \
+	file://80_security_tools.dpatch;apply=yes \
+	file://81_sonames.dpatch;apply=yes \
+	file://85_security_load.dpatch;apply=yes \
+	file://90_realpath.dpatch;apply=yes \
+	file://91_build_pwdecrypt.dpatch;apply=yes \
+	file://95_add_spi+cacert_ca_certs.dpatch;apply=yes \
+	file://build-fix.patch \
     file://nss.pc.in \
 "
 
diff --git a/recipes/mozilla/thunderbird_1.0.7.bb b/recipes/mozilla/thunderbird_1.0.7.bb
index cc4e6744c0..e7f4d37c8e 100644
--- a/recipes/mozilla/thunderbird_1.0.7.bb
+++ b/recipes/mozilla/thunderbird_1.0.7.bb
@@ -8,10 +8,10 @@ IPCVER="1.1.3"
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2;name=archive \
 	http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz;name=enigmail \
 http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz;name=ipc \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://extensions-hack.patch;patch=1 \
-	file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \
+	file://xptcstubs.patch \
+	file://no-xmb.patch \
+	file://extensions-hack.patch \
+	file://firefox-1.0-gcc4-compile.patch;striplevel=0 \
 	file://mozilla-thunderbird.png file://mozilla-thunderbird.desktop"
 S = "${WORKDIR}/mozilla"
 
diff --git a/recipes/mp3blaster/mp3blaster_3.1.3.bb b/recipes/mp3blaster/mp3blaster_3.1.3.bb
index f16bf3732c..337d37e06b 100644
--- a/recipes/mp3blaster/mp3blaster_3.1.3.bb
+++ b/recipes/mp3blaster/mp3blaster_3.1.3.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "A console MP3 player based on ncurses"
 DEPENDS = "ncurses libsidplay libogg libvorbis"
 
 SRC_URI = "http://www.stack.nl/~brama/mp3blaster/src/mp3blaster-${PV}.tar.gz \
-	   file://includedir.patch;patch=1"
+	   file://includedir.patch"
 
 inherit autotools
 
diff --git a/recipes/mp3blaster/mp3blaster_3.2.0.bb b/recipes/mp3blaster/mp3blaster_3.2.0.bb
index 7b654d6074..d57c3acfe7 100644
--- a/recipes/mp3blaster/mp3blaster_3.2.0.bb
+++ b/recipes/mp3blaster/mp3blaster_3.2.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "A console MP3 player based on ncurses"
 DEPENDS = "ncurses libsidplay libogg libvorbis"
 
 SRC_URI = "http://www.stack.nl/~brama/mp3blaster/src/mp3blaster-${PV}.tar.gz \
-	   file://includedir.patch;patch=1"
+	   file://includedir.patch"
 
 inherit autotools
 
diff --git a/recipes/mp3blaster/mp3blaster_3.2.3.bb b/recipes/mp3blaster/mp3blaster_3.2.3.bb
index 4abdee0c3a..4df85b350e 100644
--- a/recipes/mp3blaster/mp3blaster_3.2.3.bb
+++ b/recipes/mp3blaster/mp3blaster_3.2.3.bb
@@ -3,7 +3,7 @@ SECTION = "console/multimedia"
 DESCRIPTION = "A console MP3 player based on ncurses"
 DEPENDS = "ncurses libogg libvorbis"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/mp3blaster/mp3blaster-${PV}.tar.gz file://includedir.patch;patch=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/mp3blaster/mp3blaster-${PV}.tar.gz file://includedir.patch"
 
 inherit autotools
 
diff --git a/recipes/mp3blaster/mp3blaster_3.2.5.bb b/recipes/mp3blaster/mp3blaster_3.2.5.bb
index 86d7af05f0..3a80a5ac18 100644
--- a/recipes/mp3blaster/mp3blaster_3.2.5.bb
+++ b/recipes/mp3blaster/mp3blaster_3.2.5.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "A console MP3 player based on ncurses"
 DEPENDS = "ncurses libogg libvorbis"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mp3blaster/mp3blaster-${PV}.tar.gz;name=tarball \
-           file://includedir.patch;patch=1"
+           file://includedir.patch"
 SRC_URI[tarball.md5sum] = "edb3bb122553d2d544dfb084010311c6"
 SRC_URI[tarball.sha256sum] = "129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29"
 
diff --git a/recipes/mpeg-encode/mpeg-encode_1.5b.bb b/recipes/mpeg-encode/mpeg-encode_1.5b.bb
index 3a65856c80..b9b0e7bac4 100644
--- a/recipes/mpeg-encode/mpeg-encode_1.5b.bb
+++ b/recipes/mpeg-encode/mpeg-encode_1.5b.bb
@@ -4,7 +4,7 @@ SECTION = "multimedia"
 PR = "r2"
 
 SRC_URI = "http://bmrc.berkeley.edu/ftp/pub/multimedia/mpeg/encode/mpeg_encode-${PV}-src.tar.gz \
-           file://fixup.patch;patch=1"
+           file://fixup.patch"
 
 S = "${WORKDIR}/mpeg_encode"
 
diff --git a/recipes/mpfr/mpfr_2.3.1.bb b/recipes/mpfr/mpfr_2.3.1.bb
index 4e2df27fec..fd640430fe 100644
--- a/recipes/mpfr/mpfr_2.3.1.bb
+++ b/recipes/mpfr/mpfr_2.3.1.bb
@@ -4,8 +4,8 @@ DEPENDS = "gmp"
 PR = "r1"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2 \
-           file://long-long-thumb.patch;patch=1 \
-	   file://dont_use_mips_h_constraint.patch;patch=1 \
+           file://long-long-thumb.patch \
+	   file://dont_use_mips_h_constraint.patch \
 	  "
 S = "${WORKDIR}/mpfr-${PV}"
 
diff --git a/recipes/mpg321/mpg321_0.2.10.bb b/recipes/mpg321/mpg321_0.2.10.bb
index 30aa68f2ac..4566b484b1 100644
--- a/recipes/mpg321/mpg321_0.2.10.bb
+++ b/recipes/mpg321/mpg321_0.2.10.bb
@@ -9,7 +9,7 @@ RREPLACES_${PN} = "mpg123"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mpg321/mpg321-0.2.10.tar.gz \
-           file://libao.m4.patch;patch=1"
+           file://libao.m4.patch"
 
 inherit autotools
 
diff --git a/recipes/mplayer/files/fix-emu_qtx_api.diff b/recipes/mplayer/files/fix-emu_qtx_api.diff
new file mode 100644
index 0000000000..e657475d56
--- /dev/null
+++ b/recipes/mplayer/files/fix-emu_qtx_api.diff
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/213836
+
+Fix the following error :
+
+| loader/module.o: In function `MODULE_GetProcAddress':
+| module.c:(.text+0x125): undefined reference to `report_entry'
+| module.c:(.text+0x12f): undefined reference to `report_ret'
+| module.c:(.text+0x139): undefined reference to `wrapper_target'
+| module.c:(.text+0x13e): undefined reference to `wrapper'
+| loader/module.o: In function `LoadLibraryExA':
+| module.c:(.text+0x10d4): undefined reference to `report_entry'
+| module.c:(.text+0x10de): undefined reference to `report_ret'
+| module.c:(.text+0x10ea): undefined reference to `wrapper_target'
+| module.c:(.text+0x10f0): undefined reference to `wrapper'
+| collect2: ld returned 1 exit status
+| make: *** [mplayer] Error 1
+
+---
+diff --git a/loader/module.c b/loader/module.c
+index e316cf0..2023acb 100644
+--- a/loader/module.c
++++ b/loader/module.c
+@@ -9,8 +9,8 @@
+  */
+ 
+ // define for quicktime calls debugging and/or MacOS-level emulation:
+-#ifndef __APPLE__
+-#define EMU_QTX_API
++#ifdef __APPLE__
++#undef EMU_QTX_API
+ #endif /* __APPLE__ */
+ 
+ // define for quicktime debugging (verbose logging):
diff --git a/recipes/mplayer/mplayer-maemo_svn.bb b/recipes/mplayer/mplayer-maemo_svn.bb
index c85d7115f7..685138702f 100644
--- a/recipes/mplayer/mplayer-maemo_svn.bb
+++ b/recipes/mplayer/mplayer-maemo_svn.bb
@@ -15,17 +15,17 @@ RCONFLICTS_${PN} = "mplayer"
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "svn://garage.maemo.org/svn/mplayer/;module=trunk;proto=https \
-           file://Makefile-codec-cfg.patch;patch=1 \
-           file://pld-onlyarm5.patch;patch=1 \
-           file://makefile-nostrip.patch;patch=1 \
-           file://motion-comp-pld.patch;patch=1 \
-	   file://cfg-common-position.patch;patch=1 "
+           file://Makefile-codec-cfg.patch \
+           file://pld-onlyarm5.patch \
+           file://makefile-nostrip.patch \
+           file://motion-comp-pld.patch \
+	   file://cfg-common-position.patch "
 
 # This is required for the collie machine only as all stacks in that
 # machine seem to be set to executable by the toolchain. If someone
 # discovers this is more general than please make this more general
 # ie. for all armv4 machines.
-SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 
 PACKAGE_ARCH_collie = "collie"
 
diff --git a/recipes/mplayer/mplayer_0.0+1.0rc1.bb b/recipes/mplayer/mplayer_0.0+1.0rc1.bb
index d77b7210bd..cb6ce51e70 100644
--- a/recipes/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/recipes/mplayer/mplayer_0.0+1.0rc1.bb
@@ -12,28 +12,28 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2;name
            file://vo_w100_fb.h \
            file://vo_pxa.c \
            file://vo_pxa.h \
-           file://Makefile.patch;patch=1 \
-           file://w100-configure.patch;patch=1 \
-           file://w100-Makefile.patch;patch=1 \
-           file://w100-video_out.patch;patch=1 \
-           file://w100-mplayer.patch;patch=1 \
-           file://pld-onlyarm5.patch;patch=1 \
-           file://makefile-nostrip.patch;patch=1 \
-           ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1;name=imageon \
-           file://imageon-video_out.patch;patch=1 \
-	   file://powerpc-is-ppc.diff;patch=1 \
-           file://pxa_configure.patch;patch=1 \
-           file://pxa-video_out.patch;patch=1 \
+           file://Makefile.patch \
+           file://w100-configure.patch \
+           file://w100-Makefile.patch \
+           file://w100-video_out.patch \
+           file://w100-mplayer.patch \
+           file://pld-onlyarm5.patch \
+           file://makefile-nostrip.patch \
+           ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;name=imageon \
+           file://imageon-video_out.patch \
+	   file://powerpc-is-ppc.diff \
+           file://pxa_configure.patch \
+           file://pxa-video_out.patch \
           "
 
-SRC_URI_append_avr32 = " file://mplayer-1.0rc1-atmel.2.patch;patch=1 \
+SRC_URI_append_avr32 = " file://mplayer-1.0rc1-atmel.2.patch \
                        "
 
 # This is required for the collie machine only as all stacks in that
 # machine seem to be set to executable by the toolchain. If someone
 # discovers this is more general than please make this more general
 # ie. for all armv4 machines.
-SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 PACKAGE_ARCH_mplayer_collie = "collie"
 PACKAGE_ARCH_mencoder_collie = "collie"
 
diff --git a/recipes/mplayer/mplayer_0.0+1.0rc2.bb b/recipes/mplayer/mplayer_0.0+1.0rc2.bb
index c9c46f05e3..876c88bbce 100644
--- a/recipes/mplayer/mplayer_0.0+1.0rc2.bb
+++ b/recipes/mplayer/mplayer_0.0+1.0rc2.bb
@@ -18,24 +18,24 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2 \
            file://vo_pxa.c \
            file://vo_pxa.h \
 	   file://simple_idct_armv5te.S \
-           file://Makefile-codec-cfg.patch;patch=1 \
-           file://w100-configure-svn.patch;patch=1 \
-           file://w100-video_out.patch;patch=1 \
+           file://Makefile-codec-cfg.patch \
+           file://w100-configure-svn.patch \
+           file://w100-video_out.patch \
            file://w100-mplayer.patch;patch= \
-           file://pld-onlyarm5.patch;patch=1 \
-           file://makefile-nostrip-rc2.patch;patch=1 \
-           file://mplayer-imageon-svn.patch;patch=1 \
-           file://imageon-video_out.patch;patch=1 \
-           file://pxa_configure.patch;patch=1 \
-           file://pxa-video_out.patch;patch=1 \
-           file://motion-comp-pld.patch;patch=1 \
-	   file://ivtv-fix.patch;patch=1 "
+           file://pld-onlyarm5.patch \
+           file://makefile-nostrip-rc2.patch \
+           file://mplayer-imageon-svn.patch \
+           file://imageon-video_out.patch \
+           file://pxa_configure.patch \
+           file://pxa-video_out.patch \
+           file://motion-comp-pld.patch \
+	   file://ivtv-fix.patch "
 
 # This is required for the collie machine only as all stacks in that
 # machine seem to be set to executable by the toolchain. If someone
 # discovers this is more general than please make this more general
 # ie. for all armv4 machines.
-SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 
 PACKAGE_ARCH_collie = "collie"
 PACKAGE_ARCH_c7x0 = "c7x0"
diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb
index f766e04d3d..c08676ab1f 100644
--- a/recipes/mplayer/mplayer_git.bb
+++ b/recipes/mplayer/mplayer_git.bb
@@ -8,11 +8,11 @@ DEPENDS = "live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jp
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=master \
-   file://makefile-nostrip-svn.patch;patch=1 \
+   file://makefile-nostrip-svn.patch \
    "
 
 SRC_URI_append_armv7a = " \
-		file://omapfb.patch;patch=1 \
+		file://omapfb.patch \
 	   file://vo_omapfb.c \
 	   file://yuv.S \
 	  "
@@ -21,9 +21,9 @@ SRC_URI_append_armv7a = " \
 # machine seem to be set to executable by the toolchain. If someone
 # discovers this is more general than please make this more general
 # ie. for all armv4 machines.
-SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 
-SRCREV = "5b7a3c944e39b8dad17eeae2c3bdc038662f9352"
+SRCREV = "e64bef6a821e12e4a2fabeae15a2dfeef2ab460b"
 
 PACKAGE_ARCH_collie = "collie"
 PACKAGE_ARCH_c7x0 = "c7x0"
diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index dd94767167..ae24cdba49 100644
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -8,17 +8,18 @@ DEPENDS = "live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jp
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
-	   file://makefile-nostrip-svn.patch;patch=1 \
-	   file://mplayer-arm-pld.patch;patch=1 \
-	   file://mplayer-lavc-arm.patch;patch=1 \
-       file://fix-exp.diff;patch=1;maxrev=30291 \
-	   file://fix-addrinfo.patch;patch=1;maxrev=30302 \
-       file://fix-avconfig.diff;patch=1;maxrev=30376 \
+	   file://makefile-nostrip-svn.patch \
+	   file://mplayer-arm-pld.patch \
+	   file://mplayer-lavc-arm.patch \
+       file://fix-exp.diff;maxrev=30291 \
+	   file://fix-addrinfo.patch;maxrev=30302 \
+       file://fix-avconfig.diff;maxrev=30376 \
+	   file://fix-emu_qtx_api.diff;maxrev=30165 \
 "
 
 SRCREV = "30165"
 SRC_URI_append_armv7a = " \
-		file://omapfb.patch;patch=1 \
+		file://omapfb.patch \
 	   file://vo_omapfb.c \
 	   file://yuv.S \
 	  "
@@ -27,7 +28,7 @@ SRC_URI_append_armv7a = " \
 # machine seem to be set to executable by the toolchain. If someone
 # discovers this is more general than please make this more general
 # ie. for all armv4 machines.
-SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 
 PACKAGE_ARCH_collie = "collie"
 PACKAGE_ARCH_c7x0 = "c7x0"
@@ -39,7 +40,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "0.0+1.0rc3+svnr${SRCPV}"
-PR = "r19"
+PR = "r20"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 DEFAULT_PREFERENCE_shr = "1"
@@ -156,6 +157,9 @@ EXTRA_OECONF = " \
 	--disable-tga \
 	--disable-pnm \
 	--disable-md5sum \
+	--disable-xss \
+	--disable-dga1 \
+	--disable-dga2 \
 	\
 	--enable-alsa \
 	--enable-ossaudio \
diff --git a/recipes/mrxvt/mrxvt_0.5.2.bb b/recipes/mrxvt/mrxvt_0.5.2.bb
index 71dc488b5f..ceb16ac40e 100644
--- a/recipes/mrxvt/mrxvt_0.5.2.bb
+++ b/recipes/mrxvt/mrxvt_0.5.2.bb
@@ -7,9 +7,9 @@ DEPENDS = "freetype fontconfig libxft virtual/libx11"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz;name=archive \
-           ${SOURCEFORGE_MIRROR}/materm/no_debug_x.patch;pnum=0;patch=1;name=patch \
-           file://fix-compile.patch;patch=1 \
-           file://font-defaults.patch;patch=1"
+           ${SOURCEFORGE_MIRROR}/materm/no_debug_x.patch;striplevel=0;name=patch \
+           file://fix-compile.patch \
+           file://font-defaults.patch"
 
 inherit autotools
 
diff --git a/recipes/mt-daapd/mt-daapd_0.2.1.1.bb b/recipes/mt-daapd/mt-daapd_0.2.1.1.bb
index ea2ccef640..eb61eef1e2 100644
--- a/recipes/mt-daapd/mt-daapd_0.2.1.1.bb
+++ b/recipes/mt-daapd/mt-daapd_0.2.1.1.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 PR = "r4"
-SRC_URI += "file://itunes-5-fix.patch;patch=1"
+SRC_URI += "file://itunes-5-fix.patch"
 
 SRC_URI[md5sum] = "87356d2750ad82388a58d901aa566465"
 SRC_URI[sha256sum] = "92d9abd2d0cabaea198b9434100ebf1d5524283de8df02b0f04d907b2274959b"
diff --git a/recipes/mtd/mtd-utils-tests_1.2.0+git.bb b/recipes/mtd/mtd-utils-tests_1.2.0+git.bb
index 7787c51f89..fa90696e21 100644
--- a/recipes/mtd/mtd-utils-tests_1.2.0+git.bb
+++ b/recipes/mtd/mtd-utils-tests_1.2.0+git.bb
@@ -19,7 +19,7 @@ do_compile () {
 do_stage () {
 }
 
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 mtd_utils_tests = " \
 	help_all.sh \
diff --git a/recipes/mtd/mtd-utils_1.1.0.bb b/recipes/mtd/mtd-utils_1.1.0.bb
index 48c1a96cc2..00aee3d778 100644
--- a/recipes/mtd/mtd-utils_1.1.0.bb
+++ b/recipes/mtd/mtd-utils_1.1.0.bb
@@ -2,9 +2,9 @@ require mtd-utils.inc
 
 PR = "r4"
 
-SRC_URI += "file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \
-	    file://fix-ignoreerrors-git.patch;patch=1 \
-	    file://lzo_1x.patch;patch=1"
+SRC_URI += "file://add-exclusion-to-mkfs-jffs2-git.patch \
+	    file://fix-ignoreerrors-git.patch \
+	    file://lzo_1x.patch"
 
 SRC_URI[md5sum] = "05aa9b015625aa20afba728fb7ee47b3"
 SRC_URI[sha256sum] = "a74b0cc7ec668418389d9f56f85ca8a4619b8674a2d90f5e51bfb8ae9a0667de"
diff --git a/recipes/mtd/mtd-utils_1.2.0+git.bb b/recipes/mtd/mtd-utils_1.2.0+git.bb
index 8ea5424d71..4d73c83dc9 100644
--- a/recipes/mtd/mtd-utils_1.2.0+git.bb
+++ b/recipes/mtd/mtd-utils_1.2.0+git.bb
@@ -11,9 +11,9 @@ ARM_INSTRUCTION_SET = "arm"
 TAG = "ea429635388f7bb53f62c41ec3d5ccf5fa207370"
 
 SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \
-	   file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1 \
-	   file://fix-ignoreerrors-git.patch;patch=1 \
-	   file://lzo_1x-git.patch;patch=1"
+	   file://add-exclusion-to-mkfs-jffs2-git-2.patch \
+	   file://fix-ignoreerrors-git.patch \
+	   file://lzo_1x-git.patch"
 
 S = "${WORKDIR}/git/"
 
diff --git a/recipes/mtd/mtd-utils_1.3.1.bb b/recipes/mtd/mtd-utils_1.3.1.bb
index 58fbc65b43..75ff7b9bb2 100644
--- a/recipes/mtd/mtd-utils_1.3.1.bb
+++ b/recipes/mtd/mtd-utils_1.3.1.bb
@@ -11,9 +11,9 @@ ARM_INSTRUCTION_SET = "arm"
 TAG = "v${PV}"
 
 SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \
-	   file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1 \
-	   file://fix-ignoreerrors-git.patch;patch=1 \
-	   file://lzo_1x-git.patch;patch=1"
+	   file://add-exclusion-to-mkfs-jffs2-git-2.patch \
+	   file://fix-ignoreerrors-git.patch \
+	   file://lzo_1x-git.patch"
 
 S = "${WORKDIR}/git/"
 
diff --git a/recipes/mtkbabel/mtkbabel_0.8.bb b/recipes/mtkbabel/mtkbabel_0.8.bb
index a02d95b046..375d8d76fe 100644
--- a/recipes/mtkbabel/mtkbabel_0.8.bb
+++ b/recipes/mtkbabel/mtkbabel_0.8.bb
@@ -8,7 +8,7 @@ PR = "r1"
 RDEPENDS = "libdevice-serialport-perl libtimedate-perl perl-module-file-basename perl-module-getopt-std"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/${PN}/${P}.tar.gz \
-	   file://fast-logging.patch;patch=1"
+	   file://fast-logging.patch"
 
 do_install() {
 	install -d ${D}${bindir}
diff --git a/recipes/mtools/mtools_4.0.10.bb b/recipes/mtools/mtools_4.0.10.bb
index f40970595b..5f758bbd50 100644
--- a/recipes/mtools/mtools_4.0.10.bb
+++ b/recipes/mtools/mtools_4.0.10.bb
@@ -8,10 +8,10 @@ HOMEPAGE="http://mtools.linux.lu"
 LICENSE="GPL"
 
 SRC_URI="http://ftp.gnu.org/gnu/mtools/mtools-${PV}.tar.bz2 \
-	file://m486.patch;patch=1 \
-	file://mtools-makeinfo.patch;patch=1 \
-	file://plainio.patch;patch=1 \
-	file://use-sg_io.patch;patch=1"
+	file://m486.patch \
+	file://mtools-makeinfo.patch \
+	file://plainio.patch \
+	file://use-sg_io.patch"
 
 PR = "r1"
 
diff --git a/recipes/murasaki/murasaki_0.8.8.bb b/recipes/murasaki/murasaki_0.8.8.bb
index 4e490c32ca..f098bfa3a0 100644
--- a/recipes/murasaki/murasaki_0.8.8.bb
+++ b/recipes/murasaki/murasaki_0.8.8.bb
@@ -4,7 +4,7 @@ USB, Cardbus, and other hot-pluggable devices using the new Hotplug \
 feature in Linux 2.4."
 LICENSE = "GPL"
 SRC_URI = "http://www.dotaster.com/~shuu/linux/murasaki/0.8/8/murasaki-${PV}.tar.gz \
-	   file://fix-compile.patch;patch=1"
+	   file://fix-compile.patch"
 
 EXTRA_OEMAKE = 'OPT="-DPATH_MAX" DEBUG= INC="-I ../inc ${CFLAGS}"'
 
diff --git a/recipes/musicbrainz/libmusicbrainz_2.1.5.bb b/recipes/musicbrainz/libmusicbrainz_2.1.5.bb
index 1609a50098..9695c08d53 100644
--- a/recipes/musicbrainz/libmusicbrainz_2.1.5.bb
+++ b/recipes/musicbrainz/libmusicbrainz_2.1.5.bb
@@ -6,7 +6,7 @@ DEPENDS = "expat"
 
 # gcc43.patch from openSUSE
 SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz \
-           file://libmusicbrainz-2.1.5-gcc43.patch;patch=1"
+           file://libmusicbrainz-2.1.5-gcc43.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb
index 8084a58fd4..a27ddcb439 100644
--- a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb
+++ b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb
@@ -2,7 +2,7 @@ require ${PN}.inc
 
 PR = "r1"
 
-SRC_URI_append = " file://libmusicbrainz-3.0.2-gcc-4.4-fix.patch;patch=1"
+SRC_URI_append = " file://libmusicbrainz-3.0.2-gcc-4.4-fix.patch"
 
 
 SRC_URI[md5sum] = "648ecd43f7b80852419aaf73702bc23f"
diff --git a/recipes/musicpd/mpd-alsa_0.11.5.bb b/recipes/musicpd/mpd-alsa_0.11.5.bb
index 47a6ada62d..238963785b 100644
--- a/recipes/musicpd/mpd-alsa_0.11.5.bb
+++ b/recipes/musicpd/mpd-alsa_0.11.5.bb
@@ -8,7 +8,7 @@ RDEPENDS = "libao-alsa"
 PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
-           file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init"
+           file://mpd/save-volume-state.patch file://mpd/mpd.init"
 S = "${WORKDIR}/mpd-${PV}"
 
 inherit autotools update-rc.d
diff --git a/recipes/mutt/mutt_1.5.15.bb b/recipes/mutt/mutt_1.5.15.bb
index f338fc0525..6fa15869de 100644
--- a/recipes/mutt/mutt_1.5.15.bb
+++ b/recipes/mutt/mutt_1.5.15.bb
@@ -9,11 +9,11 @@ groups of messages."
 LICENSE = "GPL"
 PR = "r0"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz;name=archive \
-           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.nntp.2.gz;patch=1;name=patch1 \
-           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.initials.gz;patch=1;name=patch2 \
-           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.quote.gz;patch=1;name=patch3 \
-           file://patch-1.5.15.sidebar.20070408.txt;patch=1 \
-           file://makedoc.patch;patch=1 "
+           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.nntp.2.gz;apply=yes;name=patch1 \
+           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.initials.gz;apply=yes;name=patch2 \
+           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.quote.gz;apply=yes;name=patch3 \
+           file://patch-1.5.15.sidebar.20070408.txt;apply=yes \
+           file://makedoc.patch "
 
 S = "${WORKDIR}/mutt-1.5.15"
 
diff --git a/recipes/mutt/mutt_1.5.19.bb b/recipes/mutt/mutt_1.5.19.bb
index ffaadec309..e6ae2f7479 100644
--- a/recipes/mutt/mutt_1.5.19.bb
+++ b/recipes/mutt/mutt_1.5.19.bb
@@ -9,9 +9,9 @@ groups of messages."
 LICENSE = "GPL"
 PR = "r1"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
-           file://patch-1.5.19.sidebar.20090522.txt;patch=1 \
-	   file://529838-gnutls-autoconf.patch;patch=1 \
-           file://makedoc.patch;patch=1" 
+           file://patch-1.5.19.sidebar.20090522.txt;apply=yes \
+	   file://529838-gnutls-autoconf.patch \
+           file://makedoc.patch" 
 
 S = "${WORKDIR}/mutt-1.5.19"
 
diff --git a/recipes/mutt/mutt_1.5.4i.bb b/recipes/mutt/mutt_1.5.4i.bb
index f30845afb6..8237a093a5 100644
--- a/recipes/mutt/mutt_1.5.4i.bb
+++ b/recipes/mutt/mutt_1.5.4i.bb
@@ -9,14 +9,14 @@ groups of messages."
 LICENSE = "GPL"
 PR = "r1"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz;name=archive \
-	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.rr.compressed.gz;patch=1;name=patch1 \
-	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.nntp.gz;patch=1;name=patch2 \
-	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.initials.gz;patch=1;name=patch3 \
-	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.quote.gz;patch=1;name=patch4 \
-	   file://cppflags.patch;patch=1 \
-	   file://posix1_lim.patch;patch=1 \
-	   file://keymap.h.patch;patch=1 \
-	   file://configure.patch;patch=1"
+	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.rr.compressed.gz;apply=yes;name=patch1 \
+	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.nntp.gz;apply=yes;name=patch2 \
+	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.initials.gz;apply=yes;name=patch3 \
+	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.quote.gz;apply=yes;name=patch4 \
+	   file://cppflags.patch \
+	   file://posix1_lim.patch \
+	   file://keymap.h.patch \
+	   file://configure.patch"
 S = "${WORKDIR}/mutt-1.5.4"
 
 inherit autotools
diff --git a/recipes/mutt/mutt_1.5.9i.bb b/recipes/mutt/mutt_1.5.9i.bb
index f5bf64b00b..700834d3e9 100644
--- a/recipes/mutt/mutt_1.5.9i.bb
+++ b/recipes/mutt/mutt_1.5.9i.bb
@@ -9,16 +9,16 @@ groups of messages."
 LICENSE = "GPL"
 PR = "r0"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz;name=archive \
-	   http://www.mutt.org.ua/download/mutt-1.5.9/patch-1.5.9.rr.compressed.gz;patch=1;name=rr \
-	   http://www.mutt.org.ua/download/mutt-1.5.9/patch-1.5.9.vvv.nntp.gz;patch=1;name=nntp \
-	   http://www.mutt.org.ua/download/mutt-1.5.9/patch-1.5.9.vvv.initials.gz;patch=1;name=initials \
-	   http://www.mutt.org.ua/download/mutt-1.5.9/patch-1.5.9.vvv.quote.gz;patch=1;name=quote \
-	   file://patch-1.5.9i.sidebar.20050628.txt.hackedfornntp;patch=1 \
-	   file://sidebar-nntp-clash.patch;patch=1 \
-	   file://cppflags.patch;patch=1 \
-	   file://posix1_lim.patch;patch=1 \
-	   file://makedoc.patch;patch=1 "
-#	   file://configure.patch;patch=1"
+	   http://www.mutt.org.ua/download/mutt-1.5.9/patch-1.5.9.rr.compressed.gz;apply=yes;name=rr \
+	   http://www.mutt.org.ua/download/mutt-1.5.9/patch-1.5.9.vvv.nntp.gz;apply=yes;name=nntp \
+	   http://www.mutt.org.ua/download/mutt-1.5.9/patch-1.5.9.vvv.initials.gz;apply=yes;name=initials \
+	   http://www.mutt.org.ua/download/mutt-1.5.9/patch-1.5.9.vvv.quote.gz;apply=yes;name=quote \
+	   file://patch-1.5.9i.sidebar.20050628.txt.hackedfornntp;apply=yes \
+	   file://sidebar-nntp-clash.patch \
+	   file://cppflags.patch \
+	   file://posix1_lim.patch \
+	   file://makedoc.patch "
+#	   file://configure.patch"
 S = "${WORKDIR}/mutt-1.5.9"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/mux/mux_git.bb b/recipes/mux/mux_git.bb
index 8bf410f913..068fb4b651 100644
--- a/recipes/mux/mux_git.bb
+++ b/recipes/mux/mux_git.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "GTK+ widgets for moblin"
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
 LICENSE = "LGPLv2.1"
 SRCREV = "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-PV = "0.0+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+git${SRCREV}"
 PR = "r0"
 
 LICENSE = "LGPLv2.1"
diff --git a/recipes/mysql/mysql5_5.1.40.inc b/recipes/mysql/mysql5_5.1.40.inc
index 28716747e6..eb64fc1b43 100644
--- a/recipes/mysql/mysql5_5.1.40.inc
+++ b/recipes/mysql/mysql5_5.1.40.inc
@@ -6,12 +6,12 @@ DEPENDS = "ncurses"
 PR = "r2"
 
 SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \
-           file://configure.in.patch;patch=1 \
-           file://plug.in.patch;patch=1 \
-           file://misc.m4.patch;patch=1 \
-           file://Makefile.am.patch;patch=1 \
-           file://fix_host_path.patch;patch=1 \
-	   file://configure-ps-cache-check.patch;patch=1 \
+           file://configure.in.patch \
+           file://plug.in.patch \
+           file://misc.m4.patch \
+           file://Makefile.am.patch \
+           file://fix_host_path.patch \
+	   file://configure-ps-cache-check.patch \
            file://my.cnf \
            file://mysqld.sh"
 
diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb
index 4423d1e9d8..d3a4bc9083 100644
--- a/recipes/mysql/mysql_4.1.22.bb
+++ b/recipes/mysql/mysql_4.1.22.bb
@@ -6,9 +6,9 @@ DEPENDS = "ncurses"
 PR = "r6"
 
 SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
-           file://autofoo.patch;patch=1 \
-           file://fix_host_path.patch;patch=1 \
-	   file://configure-ps-cache-check.patch;patch=1 \
+           file://autofoo.patch \
+           file://fix_host_path.patch \
+	   file://configure-ps-cache-check.patch \
            file://my.cnf \
            file://mysqld.sh"
 
diff --git a/recipes/mystun-server/mystun-server_cvs.bb b/recipes/mystun-server/mystun-server_cvs.bb
index bcbfc10b32..43a3e3b427 100644
--- a/recipes/mystun-server/mystun-server_cvs.bb
+++ b/recipes/mystun-server/mystun-server_cvs.bb
@@ -8,7 +8,7 @@ PV = "1:0.0+cvs${SRCDATE}"
 
 SRC_URI="cvs://anonymous@cvs.mystun.berlios.de/cvsroot/mystun;module=mystun \
 	file://init \
-	file://nossl.patch;patch=1"
+	file://nossl.patch"
 
 S = "${WORKDIR}/mystun"
 
diff --git a/recipes/mythtv/mythplugins_0.22+fixes.bb b/recipes/mythtv/mythplugins_0.22+fixes.bb
index eaf4fff132..3cbf01513b 100644
--- a/recipes/mythtv/mythplugins_0.22+fixes.bb
+++ b/recipes/mythtv/mythplugins_0.22+fixes.bb
@@ -16,10 +16,10 @@ PV = "0.22"
 
 SRCREV = "23710"
 SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythplugins;proto=http \
-        file://sysroot.patch;patch=1 \
-        file://mythplugins_wo_qtopengl.diff;patch=1 \
-        file://configure.patch;patch=1 \
-        file://mytharchive.pro.patch;patch=1 \
+        file://sysroot.patch \
+        file://mythplugins_wo_qtopengl.diff \
+        file://configure.patch \
+        file://mytharchive.pro.patch \
         "
 
 
diff --git a/recipes/mythtv/mythtv_0.22+fixes.bb b/recipes/mythtv/mythtv_0.22+fixes.bb
index 35b884b2b1..18bfb76a2e 100644
--- a/recipes/mythtv/mythtv_0.22+fixes.bb
+++ b/recipes/mythtv/mythtv_0.22+fixes.bb
@@ -16,7 +16,7 @@ PV = "0.22"
 # but for packaging the real PV is needed
 REALPV = "0.22"
 
-SRCREV = "23710"
+SRCREV = "24225"
 SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythtv;proto=http"
 
 S = "${WORKDIR}/mythtv"
@@ -26,7 +26,7 @@ ALLOW_EMPTY_${PN} = "1"
 QMAKE_PROFILES = "mythtv.pro"
 
 SRC_URI += " \
-        file://configure.patch;patch=1 \
+        file://configure.patch \
         "
 
 inherit qmake2 qt4x11
diff --git a/recipes/nail/nail_11.21.bb b/recipes/nail/nail_11.21.bb
index b6f5cdc190..26eece030a 100644
--- a/recipes/nail/nail_11.21.bb
+++ b/recipes/nail/nail_11.21.bb
@@ -6,7 +6,7 @@ PR = "r2"
 LICENSE = "GPL"
 
 SRC_URI = "http://optusnet.dl.sourceforge.net/sourceforge/nail/nail-11.21.tar.bz2 \
-	   file://nail.spec.diff;patch=1"
+	   file://nail.spec.diff"
 
 S = "${WORKDIR}/nail-11.21/"
 
diff --git a/recipes/nano/nano.inc b/recipes/nano/nano.inc
new file mode 100644
index 0000000000..5b59b68b07
--- /dev/null
+++ b/recipes/nano/nano.inc
@@ -0,0 +1,17 @@
+DESCRIPTION = "GNU nano (Nano's ANOther editor, or \
+Not ANOther editor) is an enhanced clone of the \
+Pico text editor."
+HOMEPAGE = "http://www.nano-editor.org/"
+LICENSE = "GPLv2"
+SECTION = "console/utils"
+DEPENDS = "ncurses"
+
+INC_PR = "r0"
+
+PV_MAJOR = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+SRC_URI = "http://www.nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.gz"
+
+inherit autotools gettext
+
+EXTRA_OECONF = "--enable-all"
diff --git a/recipes/nano/nano_2.0.7.bb b/recipes/nano/nano_2.0.7.bb
index 7289d07d14..a6ff1b8c47 100644
--- a/recipes/nano/nano_2.0.7.bb
+++ b/recipes/nano/nano_2.0.7.bb
@@ -1,18 +1,8 @@
-DESCRIPTION = "GNU nano (Nano's ANOther editor, or \
-Not ANOther editor) is an enhanced clone of the \
-Pico text editor."
-HOMEPAGE = "http://www.nano-editor.org/"
-LICENSE = "GPLv2"
-SECTION = "console/utils"
-DEPENDS = "ncurses"
+include nano.inc
 
-SRC_URI = "http://www.nano-editor.org/dist/v2.0/nano-${PV}.tar.gz \
-           file://glib.m4"
+PR = "${INC_PR}.0"
 
-inherit autotools
-
-# only 16K more to get everything but the kitchen sink
-EXTRA_OECONF = "--enable-all"
+SRC_URI += "file://glib.m4"
 
 do_configure_prepend () {
 	install -m 0644 ${WORKDIR}/glib.m4 m4/
diff --git a/recipes/nano/nano_2.0.9.bb b/recipes/nano/nano_2.0.9.bb
index fd9f0da9f5..479d2cc6b9 100644
--- a/recipes/nano/nano_2.0.9.bb
+++ b/recipes/nano/nano_2.0.9.bb
@@ -1,18 +1,8 @@
-DESCRIPTION = "GNU nano (Nano's ANOther editor, or \
-Not ANOther editor) is an enhanced clone of the \
-Pico text editor."
-HOMEPAGE = "http://www.nano-editor.org/"
-LICENSE = "GPLv2"
-SECTION = "console/utils"
-DEPENDS = "ncurses"
+include nano.inc
 
-SRC_URI = "http://www.nano-editor.org/dist/v2.0/nano-${PV}.tar.gz \
-           file://glib.m4"
+PR = "${INC_PR}.0"
 
-inherit autotools
-
-# only 16K more to get everything but the kitchen sink
-EXTRA_OECONF = "--enable-all"
+SRC_URI += "file://glib.m4"
 
 do_configure_prepend () {
 	install -m 0644 ${WORKDIR}/glib.m4 m4/
diff --git a/recipes/nano/nano_2.2.4.bb b/recipes/nano/nano_2.2.4.bb
new file mode 100644
index 0000000000..42fc87e415
--- /dev/null
+++ b/recipes/nano/nano_2.2.4.bb
@@ -0,0 +1,6 @@
+include nano.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "6304308afb1f7ef4a5e93eb99206632a"
+SRC_URI[sha256sum] = "971b8547be157de5a814cb26c804dc2515b686d7188f4dc016269312965d4da5"
diff --git a/recipes/nautilus/nautilus-cd-burner_2.25.3.bb b/recipes/nautilus/nautilus-cd-burner_2.25.3.bb
index 3457bd4c88..f6c0c819ff 100644
--- a/recipes/nautilus/nautilus-cd-burner_2.25.3.bb
+++ b/recipes/nautilus/nautilus-cd-burner_2.25.3.bb
@@ -4,8 +4,8 @@ SECTION = "x11/gnome"
 
 inherit gnome
 
-SRC_URI += " file://eject1.diff;patch=1 \
-             file://eject2.diff;patch=1 \
+SRC_URI += " file://eject1.diff \
+             file://eject2.diff \
 "
 
 SRC_URI[archive.md5sum] = "02324246d8e4804e15e41ef7b62836a7"
diff --git a/recipes/nautilus/nautilus_2.24.2.bb b/recipes/nautilus/nautilus_2.24.2.bb
index 659034f299..2b5054bb84 100644
--- a/recipes/nautilus/nautilus_2.24.2.bb
+++ b/recipes/nautilus/nautilus_2.24.2.bb
@@ -4,7 +4,7 @@
 
 inherit gnome
 
-SRC_URI += "file://idl-sysroot.patch;patch=1"
+SRC_URI += "file://idl-sysroot.patch"
 export SYSROOT = "${STAGING_DIR_HOST}"
 
 LICENSE="GPL"
diff --git a/recipes/nautilus/nautilus_2.26.1.bb b/recipes/nautilus/nautilus_2.26.1.bb
index 21ee8f1484..8b7d84a51a 100644
--- a/recipes/nautilus/nautilus_2.26.1.bb
+++ b/recipes/nautilus/nautilus_2.26.1.bb
@@ -4,8 +4,8 @@
 
 inherit gnome
 
-SRC_URI += "file://idl-sysroot.patch;patch=1 \
-            file://no-try-run-strftime.diff;patch=1 \
+SRC_URI += "file://idl-sysroot.patch \
+            file://no-try-run-strftime.diff \
 "
 
 export SYSROOT = "${STAGING_DIR_HOST}"
diff --git a/recipes/nautilus/nautilus_2.28.0.bb b/recipes/nautilus/nautilus_2.28.0.bb
index fd37b95ae2..6d1c052718 100644
--- a/recipes/nautilus/nautilus_2.28.0.bb
+++ b/recipes/nautilus/nautilus_2.28.0.bb
@@ -4,8 +4,8 @@
 
 inherit gnome
 
-SRC_URI += "file://idl-sysroot.patch;patch=1 \
-            file://no-try-run-strftime.diff;patch=1 \
+SRC_URI += "file://idl-sysroot.patch \
+            file://no-try-run-strftime.diff \
 "
 
 export SYSROOT = "${STAGING_DIR_HOST}"
diff --git a/recipes/nautilus/nautilus_2.28.1.bb b/recipes/nautilus/nautilus_2.28.1.bb
index 28c1d7b52b..6b4f3b1101 100644
--- a/recipes/nautilus/nautilus_2.28.1.bb
+++ b/recipes/nautilus/nautilus_2.28.1.bb
@@ -4,8 +4,8 @@
 
 inherit gnome
 
-SRC_URI += "file://idl-sysroot.patch;patch=1 \
-            file://no-try-run-strftime.diff;patch=1 \
+SRC_URI += "file://idl-sysroot.patch \
+            file://no-try-run-strftime.diff \
 "
 
 export SYSROOT = "${STAGING_DIR_HOST}"
diff --git a/recipes/nautilus/nautilus_2.30.0.bb b/recipes/nautilus/nautilus_2.30.0.bb
index 34f22d0df9..1366c35331 100644
--- a/recipes/nautilus/nautilus_2.30.0.bb
+++ b/recipes/nautilus/nautilus_2.30.0.bb
@@ -4,8 +4,8 @@
 
 inherit gnome
 
-SRC_URI += "file://idl-sysroot.patch;patch=1 \
-            file://no-try-run-strftime.diff;patch=1 \
+SRC_URI += "file://idl-sysroot.patch \
+            file://no-try-run-strftime.diff \
 "
 
 SRC_URI[archive.md5sum] = "e09aea66166c0a90d09955bd4d2672be"
diff --git a/recipes/navit/files/shr/osd.xml b/recipes/navit/files/shr/osd.xml
index a8a97d74c9..789e1c9221 100644
--- a/recipes/navit/files/shr/osd.xml
+++ b/recipes/navit/files/shr/osd.xml
@@ -1,32 +1,47 @@
         <!-- FreeRunner Layout 3 -->
-          <osd enabled="yes" type="text" label="${navigation.item.street_name} ${navigation.item[1].street_name_systematic}" x="0" y="0" w="480" h="30" align="0" background_color="#000000cc" font_size="300" />
+          <!--osd enabled="yes" type="text" label="${navigation.item.street_name} ${navigation.item[1].street_name_systematic}" x="0" y="0" w="480" h="30" align="0" background_color="#000000cc" font_size="300" />
           <osd enabled="yes" type="gps_status" x="430" y="0" w="65" h="30" align="0" background_color="#000000cc" font_size="300" />
           <osd enabled="yes" type="compass" align="0" font_size="350" x="0" y="30" w="150" h="150"  background_color="#000000cc" />
-          <osd enabled="yes" type="navigation_next_turn" x="-150" y="30" w="150" h="60"  background_color="#000000cc" />
+          <osd enabled="yes" type="navigation_next_turn" x="-150" y="30" w="150" h="60"  background_color="#000000cc" icon_src="$NAVIT_SHAREDIR/xpm/%s_wh_48_48.png" />
           <osd enabled="yes" type="text" label="${navigation.item[1].length[named]}" x="-150" y="90" w="150" h="40" align="0" background_color="#000000cc" font_size="450"/>
-          <osd enabled="yes" type="button" x="-55" y="-90" command="zoom_in()" src="gui_zoom_in.svg"/>
-          <osd enabled="yes" type="button" x="5" y="-90" command="zoom_out()" src="gui_zoom_out.svg"/>
+          <osd enabled="yes" type="button" x="-55" y="-90" command="zoom_in()" src="gui_zoom_in_48_48.png"/>
+          <osd enabled="yes" type="button" x="5" y="-90" command="zoom_out()" src="gui_zoom_out_48_48.png"/>
           <osd enabled="yes" type="text" label="${vehicle.position_speed}" x="120" y="-50" w="240" h="25" align="0" background_color="#000000cc" font_size="280"/>
           <osd enabled="yes" type="text" label="ETA:${navigation.item.destination_time[arrival]}" x="0" y="-25" w="160" h="25" align="4" background_color="#000000cc" font_size="350" />
           <osd enabled="yes" type="text" label="TL:${navigation.item.destination_time[remaining]}" x="160" y="-25" w="160" h="25" align="4" background_color="#000000cc" font_size="350" />
-          <osd enabled="yes" type="text" label="Dist:${navigation.item.destination_length[named]}" x="320" y="-25" w="160" h="25" align="4" background_color="#000000cc" font_size="350" />
+          <osd enabled="yes" type="text" label="Dist:${navigation.item.destination_length[named]}" x="320" y="-25" w="160" h="25" align="4" background_color="#000000cc" font_size="350" /-->
         <!-- / FreeRunner Layout 3 -->
 
+        <!-- FreeRunner Layout from undrwater -->
+          <osd enabled="yes" type="text" label="${navigation.item.street_name} ${navigation.item[1].street_name_systematic}" x="0" y="0" w="480" h="30" align="0" background_color="#3e6fd2cc" font_size="400" />
+          <osd enabled="yes" type="gps_status" x="430" y="0" w="65" h="30" align="0" background_color="#3e6fd2cc" font_size="400" />
+          <osd enabled="yes" type="navigation_next_turn" x="165" y="58" w="150" h="60"  background_color="#3e6fd2cc" icon_src="$NAVIT_SHAREDIR/xpm/%s_wh_48_48.png" />
+          <osd enabled="yes" type="text" label="${navigation.item[1].length[named]}" x="165" y="118" w="150" h="40" align="" background_color="#3e6fd2cc" font_size="450"/>
+          <osd enabled="yes" type="button" x="-55" y="-90" command="zoom_in()" src="/usr/share/navit/xpm/gui_zoom_in_48_48.png"/>
+          <osd enabled="yes" type="button" x="5" y="-90" command="zoom_out()" src="/usr/share/navit/xpm/gui_zoom_out_48_48.png"/>
+          <osd enabled="yes" type="text" label="${vehicle.position_speed}" x="120" y="-105" w="240" h="80" align="0" background_color="#3e6fd2cc" font_size="480"/>
+          <osd enabled="yes" type="text" label="ETA:${navigation.item.destination_time[arrival]}" x="0" y="-25" w="160" h="25"align="4" background_color="#3e6fd2cc" font_size="400" />
+          <osd enabled="yes" type="text" label="TL:${navigation.item.destination_time[remaining]}" x="160" y="-25" w="160" h="25" align="4" background_color="#3e6fd2cc" font_size="400" />
+          <osd enabled="yes" type="text" label="Dist:${navigation.item.destination_length[named]}" x="320" y="-25" w="160" h="25" align="4" background_color="#3e6fd2cc" font_size="400" />
+          <!-- Next turn is onto ROADNAME -->
+          <osd enabled="yes" type="text" label="Turn onto: ${navigation.item[1].street_name} ${navigation.item[1].street_name_systematic}" x="0" y="30" w="480" h="28" align="4" background_color="#3e6fd2cc" font_size="400"/>
+        <!-- / FreeRunner Layout from undrwater -->
+
         <!-- Mineque's OSD 003 Layout -->
-          <!--osd enabled="yes" type="text" label="Currently On ${navigation.item.street_name} ${navigation.item[1].street_name_systematic}" x="0" y="0" w="735" h="35" align="16" background_color="#a60c0f00" font_size="430" src="gui_fullscreen.svg" />
+          <!--osd enabled="yes" type="text" label="Currently On ${navigation.item.street_name} ${navigation.item[1].street_name_systematic}" x="0" y="0" w="735" h="35" align="16" background_color="#a60c0f00" font_size="430" src="gui_fullscreen_48_48.png" />
           <osd enabled="yes" type="gps_status" x="735" y="0" w="65" h="30" align="0" background_color="#a60c0f00" font_size="300" />
           <osd enabled="yes" type="text" label="ETA:${navigation.item.destination_time[arrival]}" x="50" y="-100" w="275" h="70" align="4" background_color="#a60c0f01" font_size="500" />
           <osd enabled="yes" type="text" label="TL:${navigation.item.destination_time[remaining]}" x="475" y="-100" w="275" h="70"align="4" background_color="#a60c0f00" font_size="500" />
           <osd enabled="yes" type="text" label="Dist:${navigation.item.destination_length[named]}" x="50" y="-60" w="275" h="70" align="4" background_color="#a60c0f00" font_size="500" />
           <osd enabled="yes" type="text" label="${vehicle.position_speed} / ${tracking.item.route_speed}" x="475" y="-60" w="275" h="70" align="4" background_color="#a60c0f00" font_size="500"/>
           <osd enabled="yes" type="text" label="${navigation.item[1].length[named]}" x="325" y="-40" w="150" h="40" align="0" background_color="#a60c0f00" font_size="500"/>
-          <osd enabled="yes" type="navigation_next_turn" x="325" y="-135"  w="150" h="100" align="15" background_color="#a60c0f00" />
+          <osd enabled="yes" type="navigation_next_turn" x="325" y="-135"  w="150" h="100" align="15" background_color="#a60c0f00" icon_src="$NAVIT_SHAREDIR/xpm/%s_wh_48_48.png" />
           <osd enabled="yes" type="button" x="0" y="-120" w="800" h="120" command="" src="/home/mineque/.navit/skins/Mineque_003/M_003_01.png" />
           <osd enabled="yes" type="button" x="0" y="0" w="800" h="35" command="" src="/home/mineque/.navit/skins/Mineque_003/M_003_02.png" />
-          <osd enabled="yes"  type="button" x="5" y="35" command="gui.fullscreen()" src="gui_fullscreen.svg"/>
+          <osd enabled="yes"  type="button" x="5" y="35" command="gui.fullscreen()" src="gui_fullscreen_48_48.png"/>
           <osd enabled="no"  type="button" x="300" y="100" command="gui.menu()" src="menu.xpm"/>
-          <osd enabled="yes"  type="button" x="5" y="475" command="zoom_in()" src="gui_zoom_in.svg"/>
-          <osd enabled="yes"  type="button" x="-53" y="475" command="zoom_out()" src="gui_zoom_out.svg"/-->
+          <osd enabled="yes"  type="button" x="5" y="475" command="zoom_in()" src="gui_zoom_in_48_48.png"/>
+          <osd enabled="yes"  type="button" x="-53" y="475" command="zoom_out()" src="gui_zoom_out_48_48.png"/-->
         <!-- / Mineque's OSD 003 Layout -->
 
         <!-- Default -->
diff --git a/recipes/navit/navit-icons_svn.bb b/recipes/navit/navit-icons_svn.bb
index 5846e651ca..92f7a5ee58 100644
--- a/recipes/navit/navit-icons_svn.bb
+++ b/recipes/navit/navit-icons_svn.bb
@@ -18,7 +18,7 @@ inherit autotools
 
 FILES_${PN} = " /usr/share/navit/xpm/"
 
-SRCREV = "3135"
+SRCREV = "3276"
 
 #use different URL than navit_svn does, to prevent upgrade/downgrade cycle in downloads dir
 SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk/navit/navit;module=xpm;proto=https \
diff --git a/recipes/navit/navit_0.0.4.bb b/recipes/navit/navit_0.0.4.bb
index abf8ac2dc3..cdd2e83af9 100644
--- a/recipes/navit/navit_0.0.4.bb
+++ b/recipes/navit/navit_0.0.4.bb
@@ -4,7 +4,7 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
 
-SRC_URI_append +=  "file://navit.xml-so.patch;patch=1"
+SRC_URI_append +=  "file://navit.xml-so.patch"
 
 SRC_URI[md5sum] = "c2ec1ddff62c2b248dbaeab1ab656d74"
 SRC_URI[sha256sum] = "c069e983ea8bb9b6706d35126350d4d14619b9ce0ac888adbcdda3ff13362ab4"
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index e04cc03d86..7cde0381d6 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -7,13 +7,13 @@ S = "${WORKDIR}/navit"
 
 # override navit.inc RRECOMMENDS, we only suggest a text2speech app
 RRECOMMENDS = "gpsd"
-RSUGGESTS   = "flite espeak
+RSUGGESTS_${PN} = "flite espeak"
 
-DEPENDS_shr += " librsvg-native"
+DEPENDS_shr += " gd librsvg-native"
 RDEPENDS = " navit-icons"
 EXTRA_OECONF += " --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher --enable-cache-size=20971520"
 
-SRCREV = "3174"
+SRCREV = "3279"
 SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https"
 
 EXTRA_AUTORECONF = " -I m4"
diff --git a/recipes/nbd/nbd_2.8.7.bb b/recipes/nbd/nbd_2.8.7.bb
index bfc4f44067..2fe81cddf7 100644
--- a/recipes/nbd/nbd_2.8.7.bb
+++ b/recipes/nbd/nbd_2.8.7.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://nbd.sourceforge.net"
 DEPENDS = "glib-2.0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2;md5sum=bc7995b4961385269abc645575bcaf4d \
-           file://cross-compile.patch;patch=1 "
+           file://cross-compile.patch "
 
 inherit autotools
 
diff --git a/recipes/nbench-byte/nbench-byte_2.2.3.bb b/recipes/nbench-byte/nbench-byte_2.2.3.bb
index 18bc888bc6..2c7a045d3f 100644
--- a/recipes/nbench-byte/nbench-byte_2.2.3.bb
+++ b/recipes/nbench-byte/nbench-byte_2.2.3.bb
@@ -6,7 +6,7 @@ LICENSE = "freely distributable"
 SECTION = "console/utils"
 
 SRC_URI = "http://www.tux.org/~mayer/linux/${PN}-${PV}.tar.gz \
-           file://nbench_32bits.patch;patch=1"
+           file://nbench_32bits.patch"
 
 PR = "r1"
 
diff --git a/recipes/ncftp/ncftp_3.2.0.bb b/recipes/ncftp/ncftp_3.2.0.bb
index ce62c5ff91..57d1a3d4ec 100644
--- a/recipes/ncftp/ncftp_3.2.0.bb
+++ b/recipes/ncftp/ncftp_3.2.0.bb
@@ -5,8 +5,8 @@ LICENSE = "ClarifiedArtistic"
 
 SRC_URI = "ftp://ftp.ncftp.com/ncftp/older_versions/ncftp-${PV}-src.tar.bz2 \
 	   file://acinclude.m4 \
-	   file://make.patch;patch=1 \
-	   file://fixes.patch;patch=1"
+	   file://make.patch \
+	   file://fixes.patch"
 
 inherit autotools
 
diff --git a/recipes/ncurses/ncurses_5.4.bb b/recipes/ncurses/ncurses_5.4.bb
index 1ecaa121be..a6aed6dcef 100644
--- a/recipes/ncurses/ncurses_5.4.bb
+++ b/recipes/ncurses/ncurses_5.4.bb
@@ -1,9 +1,9 @@
 PR = "r19"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
-           file://makefile_tweak.patch;patch=1 \
-           file://use_ldflags.patch;patch=1 \
-           file://visibility.patch;patch=1"
+           file://makefile_tweak.patch \
+           file://use_ldflags.patch \
+           file://visibility.patch"
 S = "${WORKDIR}/ncurses-${PV}"
 
 require ncurses.inc
diff --git a/recipes/ndisc6/ndisc6_0.6.7.bb b/recipes/ndisc6/ndisc6_0.6.7.bb
index 45e842c58c..7489947f1e 100644
--- a/recipes/ndisc6/ndisc6_0.6.7.bb
+++ b/recipes/ndisc6/ndisc6_0.6.7.bb
@@ -12,7 +12,7 @@ RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6"
 RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6"
 
 SRC_URI = "http://www.remlab.net/files/ndisc6/ndisc6-${PV}.tar.bz2 \
-	   file://autoconf-older-version.patch;patch=1 \
+	   file://autoconf-older-version.patch \
 	   file://acinclude.m4"
 
 inherit autotools
diff --git a/recipes/neon/neon_0.25.5.bb b/recipes/neon/neon_0.25.5.bb
index 67e71eac73..65fb14006d 100644
--- a/recipes/neon/neon_0.25.5.bb
+++ b/recipes/neon/neon_0.25.5.bb
@@ -7,8 +7,8 @@ DEPENDS = "zlib libxml2 expat time gnutls"
 PR = "r4"
 
 SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \
-           file://gnutls-force-and-detect.patch;patch=1 \
-           file://gnutls-2.patch;patch=1"
+           file://gnutls-force-and-detect.patch \
+           file://gnutls-2.patch"
 
 inherit autotools binconfig lib_package pkgconfig
 
diff --git a/recipes/net-snmp/net-snmp.inc b/recipes/net-snmp/net-snmp.inc
index a96ae70f39..81bc079ab3 100644
--- a/recipes/net-snmp/net-snmp.inc
+++ b/recipes/net-snmp/net-snmp.inc
@@ -6,7 +6,7 @@ RDEPENDS_${PN}-server += "net-snmp-mibs"
 RDEPENDS_${PN}-client += "net-snmp-mibs"
 RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTENDPV})"
 RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTENDPV})"
-INC_PR = "r5"
+INC_PR = "r7"
 
 inherit autotools update-rc.d siteinfo
 
@@ -25,44 +25,20 @@ do_install_append() {
         install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd
         install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/
         install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/
+	install -d ${STAGING_BINDIR}
+	install -m 0755 ${D}${bindir}/net-snmp-config ${STAGING_BINDIR}/
+	sed -e "s@-I/usr/include@@g" \
+		-e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
+		-e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \
+		-e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
+		-e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
+		-i ${STAGING_BINDIR}/net-snmp-config
 }
 
-do_stage() {
-	    rm -rf ${STAGE_TEMP}
-	    mkdir -p ${STAGE_TEMP}
-	    oe_runmake INSTALL_PREFIX="${STAGE_TEMP}" install
-	    autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR}
-	    if [ -d ${STAGE_TEMP}/${libdir} ]
-	    then
-    		olddir=`pwd`
-    		cd ${STAGE_TEMP}/${libdir}
-    		las=$(find . -name \*.la -type f)
-    		cd $olddir
-    		echo "Found la files: $las"		 
-    		for i in $las
-    		do
-    			sed -e 's/^installed=yes$/installed=no/' \
-    			    -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
-    			    -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
-    			    -i ${STAGE_TEMP}/${libdir}/$i
-    		done
-    		autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
-    	fi
-        install -d ${STAGING_DIR_HOST}${layout_bindir}
-        sed -e "s@-I/usr/include@@g" \
-            -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
-            -e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \
-            -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
-            -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
-                -i net-snmp-config
-
-        install -m 755 net-snmp-config ${STAGING_DIR_HOST}${layout_bindir}
-        rm -Rf ${STAGE_TEMP}
-}
-
-PACKAGES = "net-snmp-dbg net-snmp-doc net-snmp-dev net-snmp-libs \
+PACKAGES = "net-snmp-dbg net-snmp-doc net-snmp-dev net-snmp-static net-snmp-libs \
             net-snmp-mibs net-snmp-server net-snmp-client"
 
+FILES_${PN}-static = "${libdir}/*.a"
 FILES_${PN}-libs = "${libdir}/*"
 FILES_${PN}-mibs = "${datadir}/snmp/mibs"
 FILES_${PN}-server = "${sbindir}/* ${sysconfdir}"
diff --git a/recipes/net-snmp/net-snmp_5.1.2.bb b/recipes/net-snmp/net-snmp_5.1.2.bb
index 62e6b73236..45694c399a 100644
--- a/recipes/net-snmp/net-snmp_5.1.2.bb
+++ b/recipes/net-snmp/net-snmp_5.1.2.bb
@@ -2,7 +2,7 @@ require net-snmp.inc
 PR = "${INC_PR}.0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
-	file://uclibc-fix.patch;patch=1 \
+	file://uclibc-fix.patch \
 	file://init \
 	file://snmpd.conf \
 	file://snmptrapd.conf"
diff --git a/recipes/net-snmp/net-snmp_5.4.1.bb b/recipes/net-snmp/net-snmp_5.4.1.bb
index 91aef7e278..bd9782746b 100644
--- a/recipes/net-snmp/net-snmp_5.4.1.bb
+++ b/recipes/net-snmp/net-snmp_5.4.1.bb
@@ -2,7 +2,7 @@ require net-snmp.inc
 PR = "${INC_PR}.0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
-        file://configure-tail.patch;patch=1 \
+        file://configure-tail.patch \
         file://init \
         file://snmpd.conf \
         file://snmptrapd.conf"
diff --git a/recipes/net-snmp/net-snmp_5.4.2.1.bb b/recipes/net-snmp/net-snmp_5.4.2.1.bb
index 713fa7402b..1f80cbcef4 100644
--- a/recipes/net-snmp/net-snmp_5.4.2.1.bb
+++ b/recipes/net-snmp/net-snmp_5.4.2.1.bb
@@ -2,8 +2,8 @@ require net-snmp.inc
 PR = "${INC_PR}.1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
-        file://configure-tail.patch;patch=1 \
-        file://CVE-2008-6123.patch;patch=1 \
+        file://configure-tail.patch \
+        file://CVE-2008-6123.patch \
         file://init \
         file://snmpd.conf \
         file://snmptrapd.conf"
diff --git a/recipes/net-tools/net-tools_1.60.bb b/recipes/net-tools/net-tools_1.60.bb
index a370d83bdf..4e9d0fc714 100644
--- a/recipes/net-tools/net-tools_1.60.bb
+++ b/recipes/net-tools/net-tools_1.60.bb
@@ -19,47 +19,47 @@ SRC_URI = "http://download.berlios.de/${PN}/${PN}-${PV}.tar.bz2;md5sum=888774acc
            file://ether-wake.8 \
            file://mii-diag.c   \
            file://mii-diag.8   \
-           file://net-tools-1.57-bug22040.patch;patch=1 \
-           file://net-tools-1.60-miiioctl.patch;patch=1 \
-           file://net-tools-1.60-manydevs.patch;patch=1;pnum=0 \
-           file://net-tools-1.60-virtualname.patch;patch=1 \
-           file://net-tools-1.60-cycle.patch;patch=1 \
-           file://net-tools-1.60-nameif.patch;patch=1 \
-           file://net-tools-1.60-ipx.patch;patch=1 \
-           file://net-tools-1.60-inet6-lookup.patch;patch=1 \
-           file://net-tools-1.60-man.patch;patch=1 \
-           file://net-tools-1.60-gcc33.patch;patch=1 \
-           file://net-tools-1.60-trailingblank.patch;patch=1 \
-           file://net-tools-1.60-interface.patch;patch=1 \
-           file://net-tools-1.60-gcc34.patch;patch=1 \
-           file://net-tools-1.60-overflow.patch;patch=1 \
-           file://net-tools-1.60-siunits.patch;patch=1 \
-           file://net-tools-1.60-trunc.patch;patch=1 \
-           file://net-tools-1.60-return.patch;patch=1 \
-           file://net-tools-1.60-parse.patch;patch=1 \
-           file://net-tools-1.60-netmask.patch;patch=1 \
-           file://net-tools-1.60-ulong.patch;patch=1 \
-           file://net-tools-1.60-bcast.patch;patch=1 \
-           file://net-tools-1.60-mii-tool-obsolete.patch;patch=1 \
-           file://net-tools-1.60-netstat_ulong.patch;patch=1 \
-           file://net-tools-1.60-note.patch;patch=1 \
-           file://net-tools-1.60-num-ports.patch;patch=1 \
-           file://net-tools-1.60-duplicate-tcp.patch;patch=1 \
-           file://net-tools-1.60-statalias.patch;patch=1 \
-           file://net-tools-1.60-isofix.patch;patch=1 \
-           file://net-tools-1.60-ifconfig_ib.patch;patch=1 \
-           file://net-tools-1.60-de.patch;patch=1 \
-           file://net-tools-1.60-pie.patch;patch=1 \
-           file://net-tools-1.60-ifaceopt.patch;patch=1 \
-           file://net-tools-1.60-trim_iface.patch;patch=1 \
-           file://net-tools-1.60-stdo.patch;patch=1 \
-           file://net-tools-1.60-statistics.patch;patch=1 \
-           file://net-tools-1.60-ifconfig.patch;patch=1 \
-           file://net-tools-1.60-arp_overflow.patch;patch=1 \
-           file://net-tools-1.60-hostname_man.patch;patch=1 \
-           file://net-tools-1.60-interface_stack.patch;patch=1;pnum=0 \
-           file://net-tools-1.60-selinux.patch;patch=1 \
-           file://net-tools-1.60-netstat_stop_trim.patch;patch=1 "
+           file://net-tools-1.57-bug22040.patch \
+           file://net-tools-1.60-miiioctl.patch \
+           file://net-tools-1.60-manydevs.patch;striplevel=0 \
+           file://net-tools-1.60-virtualname.patch \
+           file://net-tools-1.60-cycle.patch \
+           file://net-tools-1.60-nameif.patch \
+           file://net-tools-1.60-ipx.patch \
+           file://net-tools-1.60-inet6-lookup.patch \
+           file://net-tools-1.60-man.patch \
+           file://net-tools-1.60-gcc33.patch \
+           file://net-tools-1.60-trailingblank.patch \
+           file://net-tools-1.60-interface.patch \
+           file://net-tools-1.60-gcc34.patch \
+           file://net-tools-1.60-overflow.patch \
+           file://net-tools-1.60-siunits.patch \
+           file://net-tools-1.60-trunc.patch \
+           file://net-tools-1.60-return.patch \
+           file://net-tools-1.60-parse.patch \
+           file://net-tools-1.60-netmask.patch \
+           file://net-tools-1.60-ulong.patch \
+           file://net-tools-1.60-bcast.patch \
+           file://net-tools-1.60-mii-tool-obsolete.patch \
+           file://net-tools-1.60-netstat_ulong.patch \
+           file://net-tools-1.60-note.patch \
+           file://net-tools-1.60-num-ports.patch \
+           file://net-tools-1.60-duplicate-tcp.patch \
+           file://net-tools-1.60-statalias.patch \
+           file://net-tools-1.60-isofix.patch \
+           file://net-tools-1.60-ifconfig_ib.patch \
+           file://net-tools-1.60-de.patch \
+           file://net-tools-1.60-pie.patch \
+           file://net-tools-1.60-ifaceopt.patch \
+           file://net-tools-1.60-trim_iface.patch \
+           file://net-tools-1.60-stdo.patch \
+           file://net-tools-1.60-statistics.patch \
+           file://net-tools-1.60-ifconfig.patch \
+           file://net-tools-1.60-arp_overflow.patch \
+           file://net-tools-1.60-hostname_man.patch \
+           file://net-tools-1.60-interface_stack.patch;striplevel=0 \
+           file://net-tools-1.60-selinux.patch \
+           file://net-tools-1.60-netstat_stop_trim.patch "
 
 TOPDIR[unexport] = "1"
 
@@ -83,8 +83,8 @@ do_compile() {
     unset LDFLAGS
 
     oe_runmake
-    $CC $CFLAGS -o ether-wake ether-wake.c
-    $CC $CFLAGS -o mii-diag   mii-diag.c
+    ${CC} ${CFLAGS} ${LDFLAGS} -o ether-wake ether-wake.c
+    ${CC} ${CFLAGS} ${LDFLAGS} -o mii-diag   mii-diag.c
 }
 
 do_install() {
diff --git a/recipes/netatalk/netatalk_2.0.5.bb b/recipes/netatalk/netatalk_2.0.5.bb
index 8971f07bed..1408d42b74 100644
--- a/recipes/netatalk/netatalk_2.0.5.bb
+++ b/recipes/netatalk/netatalk_2.0.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "cups db openssl"
 
 SRC_URI = "http://ovh.dl.sourceforge.net/sourceforge/netatalk/netatalk-${PV}.tar.gz;name=src \
-	   file://netatalk-dbd.patch;patch=1 \
+	   file://netatalk-dbd.patch \
 	   file://netatalk.conf \
 	   file://init"
 SRC_URI[src.md5sum] = "f35cd7a4ce26c780de380cd2bcae5ce6"
diff --git a/recipes/netbook-launcher/liblauncher-0.3.8/0001-liblauncher-udpate-0.3.6-to-0.3.8-which-the-ubuntu-f.patch b/recipes/netbook-launcher/liblauncher-0.3.8/0001-liblauncher-udpate-0.3.6-to-0.3.8-which-the-ubuntu-f.patch
new file mode 100644
index 0000000000..02743fff70
--- /dev/null
+++ b/recipes/netbook-launcher/liblauncher-0.3.8/0001-liblauncher-udpate-0.3.6-to-0.3.8-which-the-ubuntu-f.patch
@@ -0,0 +1,1902 @@
+From aa6fe8c9abab71cc584ac64faf983fd25bf7bd4f Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Thu, 22 Apr 2010 15:20:32 +0200
+Subject: [PATCH] liblauncher: udpate 0.3.6 to 0.3.8, which the ubuntu folks don't have available as tarball
+
+---
+ Makefile.in                     |   17 +-
+ aclocal.m4                      |    6 +-
+ build/Makefile.in               |    6 +-
+ build/autotools/Makefile.in     |    2 +-
+ compile                         |    6 +-
+ configure                       |   28 +-
+ configure.ac                    |    2 +-
+ launcher/Makefile.in            |    2 +-
+ launcher/launcher-application.c |  676 ++++++++++++++++++++++-----------------
+ launcher/launcher-application.h |   26 +-
+ launcher/launcher-appman.c      |  108 ++++---
+ launcher/launcher-appman.h      |   22 +-
+ launcher/launcher-category.h    |   26 +-
+ launcher/launcher-session.c     |  209 ++++--------
+ launcher/launcher-session.h     |    6 -
+ tests/Makefile.am               |    4 +-
+ tests/Makefile.in               |    6 +-
+ 17 files changed, 594 insertions(+), 558 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 144b494..ce59a43 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -368,7 +368,7 @@ uninstall-pkgconfigDATA:
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@failcom='exit 1'; \
++	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -393,7 +393,7 @@ $(RECURSIVE_TARGETS):
+ 	fi; test -z "$$fail"
+ 
+ $(RECURSIVE_CLEAN_TARGETS):
+-	@failcom='exit 1'; \
++	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -557,7 +557,8 @@ distdir: $(DISTFILES)
+ 	  fi; \
+ 	done
+ 	-test -n "$(am__skip_mode_fix)" \
+-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++	|| find "$(distdir)" -type d ! -perm -755 \
++		-exec chmod u+rwx,go+rx {} \; -o \
+ 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -601,17 +602,17 @@ dist dist-all: distdir
+ distcheck: dist
+ 	case '$(DIST_ARCHIVES)' in \
+ 	*.tar.gz*) \
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ 	*.tar.bz2*) \
+-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ 	*.tar.lzma*) \
+-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ 	*.tar.xz*) \
+ 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ 	*.tar.Z*) \
+ 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ 	*.shar.gz*) \
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ 	*.zip*) \
+ 	  unzip $(distdir).zip ;;\
+ 	esac
+diff --git a/aclocal.m4 b/aclocal.m4
+index 7db2b06..aa94962 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+@@ -192,7 +192,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.11], [],
++m4_if([$1], [1.11.1], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -208,7 +208,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+diff --git a/build/Makefile.in b/build/Makefile.in
+index e35e7c8..671dc90 100644
+--- a/build/Makefile.in
++++ b/build/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -271,7 +271,7 @@ clean-libtool:
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@failcom='exit 1'; \
++	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -296,7 +296,7 @@ $(RECURSIVE_TARGETS):
+ 	fi; test -z "$$fail"
+ 
+ $(RECURSIVE_CLEAN_TARGETS):
+-	@failcom='exit 1'; \
++	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+diff --git a/build/autotools/Makefile.in b/build/autotools/Makefile.in
+index b7ca0ef..53cec97 100644
+--- a/build/autotools/Makefile.in
++++ b/build/autotools/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+diff --git a/compile b/compile
+index ec64c62..c0096a7 100755
+--- a/compile
++++ b/compile
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # Wrapper for compilers which do not understand `-c -o'.
+ 
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2009-10-06.20; # UTC
+ 
+ # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+ # Foundation, Inc.
+@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
+ ret=$?
+ 
+ if test -f "$cofile"; then
+-  mv "$cofile" "$ofile"
++  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+ elif test -f "${cofile}bj"; then
+-  mv "${cofile}bj" "$ofile"
++  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+ fi
+ 
+ rmdir "$lockdir"
+diff --git a/configure b/configure
+index 11bb9cc..7db452e 100755
+--- a/configure
++++ b/configure
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.65 for liblauncher 0.3.6.
++# Generated by GNU Autoconf 2.65 for liblauncher 0.3.8.
+ #
+ # Report bugs to <https://bugs.launchpad.net/avani>.
+ #
+@@ -701,8 +701,8 @@ MAKEFLAGS=
+ # Identity of this package.
+ PACKAGE_NAME='liblauncher'
+ PACKAGE_TARNAME='liblauncher'
+-PACKAGE_VERSION='0.3.6'
+-PACKAGE_STRING='liblauncher 0.3.6'
++PACKAGE_VERSION='0.3.8'
++PACKAGE_STRING='liblauncher 0.3.8'
+ PACKAGE_BUGREPORT='https://bugs.launchpad.net/avani'
+ PACKAGE_URL=''
+ 
+@@ -1439,7 +1439,7 @@ if test "$ac_init_help" = "long"; then
+   # Omit some internal or obsolete options to make the list less imposing.
+   # This message is too long to be a string in the A/UX 3.1 sh.
+   cat <<_ACEOF
+-\`configure' configures liblauncher 0.3.6 to adapt to many kinds of systems.
++\`configure' configures liblauncher 0.3.8 to adapt to many kinds of systems.
+ 
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+@@ -1509,7 +1509,7 @@ fi
+ 
+ if test -n "$ac_init_help"; then
+   case $ac_init_help in
+-     short | recursive ) echo "Configuration of liblauncher 0.3.6:";;
++     short | recursive ) echo "Configuration of liblauncher 0.3.8:";;
+    esac
+   cat <<\_ACEOF
+ 
+@@ -1616,7 +1616,7 @@ fi
+ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
+-liblauncher configure 0.3.6
++liblauncher configure 0.3.8
+ generated by GNU Autoconf 2.65
+ 
+ Copyright (C) 2009 Free Software Foundation, Inc.
+@@ -1987,7 +1987,7 @@ cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+-It was created by liblauncher $as_me 0.3.6, which was
++It was created by liblauncher $as_me 0.3.8, which was
+ generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+   $ $0 $@
+@@ -2804,7 +2804,7 @@ fi
+ 
+ # Define the identity of the package.
+  PACKAGE='liblauncher'
+- VERSION='0.3.6'
++ VERSION='0.3.8'
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -2847,8 +2847,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+ 
+ LAUNCHER_MAJOR_VERSION=0
+ LAUNCHER_MINOR_VERSION=3
+-LAUNCHER_MICRO_VERSION=6
+-LAUNCHER_VERSION=0.3.6
++LAUNCHER_MICRO_VERSION=8
++LAUNCHER_VERSION=0.3.8
+ 
+ 
+ 
+@@ -2857,9 +2857,9 @@ LAUNCHER_VERSION=0.3.6
+ 
+ 
+ 
+-LAUNCHER_LT_CURRENT=306
++LAUNCHER_LT_CURRENT=308
+ LAUNCHER_LT_REV=0
+-LAUNCHER_LT_AGE=306
++LAUNCHER_LT_AGE=308
+ LAUNCHER_LT_VERSION="$LAUNCHER_LT_CURRENT:$LAUNCHER_LT_REV:$LAUNCHER_LT_AGE"
+ LAUNCHER_LT_LDFLAGS="-version-info $LAUNCHER_LT_VERSION"
+ 
+@@ -12041,7 +12041,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.
+ ac_log="
+-This file was extended by liblauncher $as_me 0.3.6, which was
++This file was extended by liblauncher $as_me 0.3.8, which was
+ generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+@@ -12107,7 +12107,7 @@ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+-liblauncher config.status 0.3.6
++liblauncher config.status 0.3.8
+ configured by $0, generated by GNU Autoconf 2.65,
+   with options \\"\$ac_cs_config\\"
+ 
+diff --git a/configure.ac b/configure.ac
+index 7aa97ce..fd99da2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ #
+ m4_define([launcher_major], [0])
+ m4_define([launcher_minor], [3])
+-m4_define([launcher_micro], [6])
++m4_define([launcher_micro], [8])
+ 
+ m4_define([launcher_api],
+           [launcher_major.launcher_minor])
+diff --git a/launcher/Makefile.in b/launcher/Makefile.in
+index 863a46e..b273ed6 100644
+--- a/launcher/Makefile.in
++++ b/launcher/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+diff --git a/launcher/launcher-application.c b/launcher/launcher-application.c
+index fec440e..241abd2 100644
+--- a/launcher/launcher-application.c
++++ b/launcher/launcher-application.c
+@@ -34,6 +34,7 @@
+ #include "launcher-application.h"
+ 
+ #include <gio/gdesktopappinfo.h>
++#include <libwncksync/libwncksync.h>
+ 
+ #define TYPE_GS_LIST gs_list_get_type()
+ 
+@@ -68,13 +69,15 @@ enum
+   PROP_RUNNING,
+   PROP_FAVORITE,
+   PROP_FOCUSED,
+-  PROP_WNCKAPPLICATIONS
+ };
+ 
+ enum
+ {
+   OPENED,
+   CLOSED,
++  FOCUS_CHANGED,
++  RUNNING_CHANGED,
++  URGENT_CHANGED,
+ 
+   LAST_SIGNAL
+ };
+@@ -93,26 +96,29 @@ struct _LauncherApplicationWindow
+ 
+ struct _LauncherApplicationPrivate
+ {
+-  gchar *name;
+-  gchar *exec;
+-  gchar *icon_name;
+-  gchar *comment;
+-  gchar *desktop_file_path;
+-  gchar *unique_string;
+-  GSList *categories;
+-  gboolean running;
+-  gboolean favorite;
+-  GSList *wnck_apps;
+-  gboolean focused;
++  gchar    *name;
++  gchar    *exec;
++  gchar    *icon_name;
++  gchar    *comment;
++  gchar    *desktop_file_path;
++  gchar    *unique_string;
++  GSList   *categories;
++  GSList   *managed_windows;
++  gboolean  running;
++  gboolean  favorite;
++  gboolean  focused;
+   
+   WnckScreen  *screen;
+-  GHashTable *windows;
++  WnckWindow  *primary_window;
+ };
+ 
+ static void
+-on_application_closed (WnckScreen              *screen,
+-                       WnckApplication         *app,
+-                       LauncherApplication     *application);
++on_active_window_changed (WnckScreen *screen,
++                          WnckWindow *previous,
++                          LauncherApplication *app)
++{
++  launcher_application_ensure_state (app);
++}
+ 
+ static void
+ launcher_application_init (LauncherApplication *object)
+@@ -120,14 +126,11 @@ launcher_application_init (LauncherApplication *object)
+   LauncherApplicationPrivate *priv;
+     
+   priv = object->priv = LAUNCHER_APPLICATION_GET_PRIVATE (object);
+-  priv->running = FALSE;
+-  priv->favorite = FALSE;
+   
+   priv->screen = wnck_screen_get_default ();
+-  g_signal_connect (priv->screen, "application-closed",
+-                    G_CALLBACK (on_application_closed), object);
+-
+-  priv->windows = g_hash_table_new (g_direct_hash, g_direct_equal);
++  
++  g_signal_connect (priv->screen, "active-window-changed",
++                    G_CALLBACK (on_active_window_changed), object);
+ }
+ 
+ static void
+@@ -137,7 +140,6 @@ launcher_application_finalize (GObject *object)
+   LauncherApplicationPrivate *priv;
+   
+   priv = LAUNCHER_APPLICATION_GET_PRIVATE (app);
+-  g_hash_table_destroy (priv->windows);
+   
+   G_OBJECT_CLASS (launcher_application_parent_class)->finalize (object);
+   
+@@ -178,24 +180,16 @@ launcher_application_set_property (GObject *object,
+     case PROP_DESKTOP_FILE_PATH:
+       launcher_application_set_desktop_file(application, 
+                                             g_value_dup_string(value));
++      launcher_application_update_windows (application);
+       break;
+     case PROP_UNIQUE_STRING:
+       break;
+     case PROP_CATEGORIES:
+       application->priv->categories = g_value_get_boxed(value);
+       break;
+-    case PROP_RUNNING:
+-      application->priv->running = g_value_get_boolean(value);
+-      break;
+     case PROP_FAVORITE:
+       application->priv->favorite = g_value_get_boolean(value);
+       break;
+-    case PROP_WNCKAPPLICATIONS:
+-      application->priv->wnck_apps = g_value_get_boxed(value);
+-      break;
+-    case PROP_FOCUSED:
+-      application->priv->focused = g_value_get_boolean (value);
+-      break;
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       break;
+@@ -246,15 +240,8 @@ launcher_application_get_property (GObject *object,
+     case PROP_FAVORITE:
+       g_value_set_boolean(value, priv->favorite);
+       break;
+-    case PROP_WNCKAPPLICATIONS:
+-      g_value_set_object(value, priv->wnck_apps);
+-      break;
+     case PROP_FOCUSED:
+-      {
+-        gboolean focused = FALSE;
+-        focused = launcher_application_get_focused (application);
+-        g_value_set_boolean (value, priv->focused);
+-      }
++      g_value_set_boolean (value, priv->focused);
+       break;
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+@@ -264,14 +251,14 @@ launcher_application_get_property (GObject *object,
+ 
+ static void
+ launcher_application_opened (LauncherApplication *self, 
+-                             WnckApplication *wnckapp)
++                             WnckWindow *window)
+ {
+   /* TODO: Add default signal handler implementation here */
+ }
+ 
+ static void
+ launcher_application_closed (LauncherApplication *self,
+-                             WnckApplication *wnckapp)
++                             WnckWindow *window)
+ {
+   /* TODO: Add default signal handler implementation here */
+ }
+@@ -369,22 +356,14 @@ launcher_application_class_init (LauncherApplicationClass *klass)
+                                                         FALSE,
+                                                         G_PARAM_READABLE));
+ 
+-  g_object_class_install_property (object_class,
+-                                   PROP_WNCKAPPLICATIONS,
+-                                   g_param_spec_boxed  ("wnckapps",
+-                                                        "wnckapps",
+-                                                        "a list of WnckApplication objects that this Application current has",
+-                                                        TYPE_GS_LIST,
+-                                                        G_PARAM_READABLE));
+-
+   application_signals[OPENED] =
+       g_signal_new ("opened",
+                     G_OBJECT_CLASS_TYPE (klass),
+                     0,
+                     G_STRUCT_OFFSET (LauncherApplicationClass, opened),
+                     NULL, NULL,
+-                    g_cclosure_marshal_VOID__POINTER,
+-                    G_TYPE_NONE, 1, G_TYPE_POINTER
++                    g_cclosure_marshal_VOID__OBJECT,
++                    G_TYPE_NONE, 1, WNCK_TYPE_WINDOW
+                     );
+ 
+   application_signals[CLOSED] =
+@@ -393,82 +372,44 @@ launcher_application_class_init (LauncherApplicationClass *klass)
+                     0,
+                     G_STRUCT_OFFSET (LauncherApplicationClass, closed),
+                     NULL, NULL,
+-                    g_cclosure_marshal_VOID__POINTER,
+-                    G_TYPE_NONE, 1, WNCK_TYPE_APPLICATION
++                    g_cclosure_marshal_VOID__OBJECT,
++                    G_TYPE_NONE, 1, WNCK_TYPE_WINDOW
+                     );
+-}
+-
+-/*
+- * Private Methods
+- */
+-
+-
+-static void
+-on_application_closed (WnckScreen      *screen,
+-                       WnckApplication *app,
+-                       LauncherApplication     *application)
+-{
+-  int       wnck_pid = 0;
+-  int       app_pid = 1;
+-  GSList    *a;
+-  WnckApplication *found_app = NULL;
+-  /* when *any* application closes we do a quick check to see if its this one
+-   * thus we need to make this check as quick and easy as possible
+-   */
+-  g_return_if_fail (LAUNCHER_IS_APPLICATION (application));
+-  g_return_if_fail (WNCK_IS_APPLICATION (app));
+   
+-  /* we need to go though and check each wnckapp in this launcherapplication 
+-   * to see if the pid's match
+-   */
+-  wnck_pid = wnck_application_get_pid (app);
+-  for (a = application->priv->wnck_apps; a; a = a->next) 
+-    {
+-      WnckApplication *store_app = a->data;
+-      app_pid = wnck_application_get_pid (store_app);
+-      if (wnck_pid == app_pid) 
+-        {
+-          found_app = store_app;
+-          break;
+-        }
+-    }
+-    
+-  if (!found_app)
+-    return;
+-    
+-  // we get here then we have the wnckapplication in our store
+-  application->priv->wnck_apps = g_slist_remove(application->priv->wnck_apps,
+-                                                found_app);
+-  g_object_unref (found_app);
++  application_signals[FOCUS_CHANGED] =
++      g_signal_newv ("focus-changed",
++                     G_OBJECT_CLASS_TYPE (klass),
++                     0,
++                     NULL, NULL, NULL,
++                     g_cclosure_marshal_VOID__VOID,
++                     G_TYPE_NONE,
++                     0,
++                     NULL);
+   
+-  // do we have any apps in our store? if so, we are running!
+-  if (application->priv->wnck_apps != NULL)
+-    {
+-      g_object_set (G_OBJECT (application),
+-                    "running", TRUE,
+-                    NULL);
+-    } else
+-    { 
+-      g_object_set (G_OBJECT (application),
+-                    "running", FALSE,
+-                    NULL);
+-    }   
+-    
+-  g_object_set (G_OBJECT (application),
+-                "focused", FALSE,
+-                NULL);
+-
+-  // we are closing apprently, lets emit a signal about that :-)
+-  g_signal_emit (application, application_signals[CLOSED], 0, app);
++  application_signals[RUNNING_CHANGED] =
++      g_signal_newv ("running-changed",
++                     G_OBJECT_CLASS_TYPE (klass),
++                     0,
++                     NULL, NULL, NULL,
++                     g_cclosure_marshal_VOID__VOID,
++                     G_TYPE_NONE,
++                     0,
++                     NULL);
++  
++  application_signals[URGENT_CHANGED] =
++      g_signal_newv ("urgent-changed",
++                     G_OBJECT_CLASS_TYPE (klass),
++                     0,
++                     NULL, NULL, NULL,
++                     g_cclosure_marshal_VOID__VOID,
++                     G_TYPE_NONE,
++                     0,
++                     NULL);
+ }
+ 
+-
+-
+ /* 
+  * Constructors 
+  */
+-
+-
+ LauncherApplication *
+ launcher_application_new (void)
+ {
+@@ -477,24 +418,43 @@ launcher_application_new (void)
+   application = g_object_new (LAUNCHER_TYPE_APPLICATION,
+                               "running", FALSE,
+                               NULL);
++                              
++  
++  
+   return application;
+ }
+ 
+ /**
+- * launcher_application_new_from_wnck_app:
+- * @app: A #WnckApplication object
++ * launcher_application_new_from_wnck_window:
++ * @window: A #WnckWindow object
+  *
+- * creates a new #LauncherApplication object based on information from @app
++ * creates a new #LauncherApplication object based on information from @window
+  */
+ LauncherApplication *
+-launcher_application_new_from_wnck_app (WnckApplication *app)
++launcher_application_new_from_wnck_window (WnckWindow *window)
+ {
+   LauncherApplication *application;
++  gchar *desktop_file;
++  
++  g_return_val_if_fail (WNCK_IS_WINDOW (window), NULL);
++
++  desktop_file = wncksync_desktop_item_for_xid (wnck_window_get_xid (window));
+ 
+   application = g_object_new (LAUNCHER_TYPE_APPLICATION,
+-                        "running", TRUE,
+-                        NULL);
+-  launcher_application_add_wnckapp (application, app);
++                              NULL);
++                              
++  /* give ourself a primary window to key off of if we have no desktop file to work with */
++  if (!desktop_file || !g_file_test (desktop_file, G_FILE_TEST_EXISTS))
++    {
++      application->priv->primary_window = window;
++    }
++  else
++    {
++      launcher_application_set_desktop_file (application, desktop_file);
++    }
++                              
++  launcher_application_update_windows (application);
++  
+   return application;
+ }
+ 
+@@ -514,9 +474,10 @@ launcher_application_new_from_desktop_file (const gchar *desktop_file)
+   /* we can now make our application */
+   application = g_object_new (LAUNCHER_TYPE_APPLICATION,
+                               "desktop_file_path", desktop_file, 
+-                              "running", FALSE,
+                               NULL);
+ 
++  launcher_application_update_windows (application);
++
+   return application;
+ }
+ 
+@@ -595,6 +556,20 @@ launcher_application_get_unique_string (LauncherApplication *application)
+   return application->priv->unique_string;
+ }
+ 
++gboolean
++launcher_application_owns_window (LauncherApplication *application,
++                                  WnckWindow          *window)
++{
++  LauncherApplicationPrivate *priv;
++  
++  g_return_val_if_fail (LAUNCHER_IS_APPLICATION (application), FALSE);
++  g_return_val_if_fail (WNCK_IS_WINDOW (window), FALSE);
++  
++  priv = application->priv;
++  
++  return g_slist_find (priv->managed_windows, window) != NULL;
++}
++
+ /**
+  * launcher_application_get_wnckapp:
+  * @app: a #LauncherApplication
+@@ -604,53 +579,209 @@ launcher_application_get_unique_string (LauncherApplication *application)
+  * Returns: (transfer none): a #GSList containing #WnckApplications 
+  */
+ GSList *
+-launcher_application_get_wnckapps (LauncherApplication *application)
++launcher_application_get_windows (LauncherApplication *application)
+ {
+-  g_return_val_if_fail (application, NULL);
++  g_return_val_if_fail (LAUNCHER_IS_APPLICATION (application), NULL);
+   
+-  return application->priv->wnck_apps;
++  return application->priv->managed_windows;
++}
++
++gboolean
++launcher_application_get_urgent (LauncherApplication *application)
++{
++  LauncherApplicationPrivate *priv;
++  GSList *l = NULL;
++  WnckWindow *window;
++  
++  g_return_val_if_fail (LAUNCHER_IS_APPLICATION (application), FALSE);
++  
++  priv = application->priv;
++  
++  for (l = priv->managed_windows; l; l = l->next)
++    {
++      window = l->data;
++      
++      if (wnck_window_needs_attention (window))
++        return TRUE;
++    }
++  return FALSE;
+ }
+ 
+-/**
+- * launcher_application_add_wnckapp
+- * @application: a #LauncherApplication object
+- * @wnck_app: a #WnckApplication object
+- * 
+- * This method will add @wnck_app to @application and associate it with
+- * the various signals @application has.
+- */ 
+ void
+-launcher_application_add_wnckapp (LauncherApplication *application, 
+-                                  WnckApplication *wnck_app) 
++launcher_application_ensure_state (LauncherApplication *application)
+ {
+-  GSList *a;
+-  gint pid = 0;
+-  g_return_if_fail (application);
+-  g_return_if_fail (wnck_app);
+-  
+-  /* first i guess we need to check to make sure that
+-   * this WnckApplication does not already exist in the list
+-   * of wnckapplications
+-   */
+-  pid = wnck_application_get_pid (wnck_app);
+-  for (a = application->priv->wnck_apps; a; a = a->next)
++  LauncherApplicationPrivate *priv;
++  WnckWindow *active_window;
++  GSList *l = NULL;
++  gboolean prev_focus, prev_running;
++  
++  g_return_if_fail (LAUNCHER_IS_APPLICATION (application));
++  
++  priv = application->priv;
++  prev_focus = priv->focused;
++  prev_running = priv->running;
++  
++  active_window = wnck_screen_get_active_window (priv->screen);
++  
++  if (priv->managed_windows)
++    {
++      priv->running = TRUE;
++      priv->focused = FALSE;
++      
++      if (active_window)
++        {
++        for (l = priv->managed_windows; l; l = l->next)
++          {
++            if (active_window == l->data)
++              {
++                priv->focused = TRUE;
++                break;
++              }
++          }
++        }
++    }
++  else if (WNCK_IS_WINDOW (priv->primary_window))
++    {
++      priv->running = TRUE;
++      priv->focused = active_window == priv->primary_window;
++    }
++  else
++    {
++      priv->running = FALSE;
++      priv->focused = FALSE;
++    }
++  
++  if (prev_focus != priv->focused)
++    {
++      g_signal_emit (application, application_signals[FOCUS_CHANGED], 0);
++    }
++  if (prev_running != priv->running)
++    {
++      g_signal_emit (application, application_signals[RUNNING_CHANGED], 0);
++    }
++}
++
++
++void on_window_state_changed (WnckWindow *window,
++                              WnckWindowState change_mask,
++                              WnckWindowState new_state,
++                              LauncherApplication *application)
++{
++  if (change_mask & WNCK_WINDOW_STATE_URGENT)
+     {
+-      WnckApplication *app = a->data;
+-      if (wnck_application_get_pid (app) == pid)
+-        return;
++      g_signal_emit (application, application_signals[URGENT_CHANGED], 0);
+     }
++}
+ 
+-  application->priv->wnck_apps = g_slist_append(application->priv->wnck_apps, 
+-                                                wnck_app);
+-  g_object_ref(wnck_app);
++void
++connect_window_events (LauncherApplication *application)
++{
++  LauncherApplicationPrivate *priv;
++  GSList *l = NULL;
++  WnckWindow *window;
++  
++  g_return_if_fail (LAUNCHER_IS_APPLICATION (application));
+   
+-  // we emit the opened signal here
+-  g_signal_emit (application, application_signals[OPENED], 0, wnck_app);
++  priv = application->priv;
+   
+-  g_object_set (G_OBJECT (application),
+-                "running", TRUE,
+-                NULL);
++  for (l = priv->managed_windows; l; l = l->next)
++    {
++      window = l->data;
++      g_signal_connect (window, "state-changed",
++                        G_CALLBACK (on_window_state_changed), application);
++    }
++}
+ 
++void disconnect_window_events (LauncherApplication *application)
++{
++  LauncherApplicationPrivate *priv;
++  GSList *l = NULL;
++  WnckWindow *window;
++  
++  g_return_if_fail (LAUNCHER_IS_APPLICATION (application));
++  
++  priv = application->priv;
++  
++  for (l = priv->managed_windows; l; l = l->next)
++    {
++      window = l->data;
++      g_signal_handlers_disconnect_by_func (window, 
++                                            G_CALLBACK (on_window_state_changed), 
++                                            application);
++    }
++}
++
++void
++launcher_application_update_windows (LauncherApplication *application)
++{
++  LauncherApplicationPrivate *priv;
++  GArray *xids;
++  GSList *new_windows = NULL, *l = NULL;
++  WnckWindow *window;
++  int i;
++  guint32 xid;
++  
++  g_return_if_fail (LAUNCHER_IS_APPLICATION (application));
++  
++  priv = application->priv;
++  
++  if (priv->primary_window)
++    {
++      if (!priv->managed_windows)
++        priv->managed_windows = g_slist_prepend (priv->managed_windows, priv->primary_window);
++      return;
++    }
++  
++  xids = wncksync_xids_for_desktop_file (priv->desktop_file_path);
++  
++  for (i = 0; i < xids->len; i++)
++    {
++      xid = g_array_index (xids, guint32, i);
++      window = wnck_window_get (xid);
++      
++      if (!WNCK_IS_WINDOW (window) || wnck_window_is_skip_tasklist (window))
++        {
++          continue;
++        }
++      new_windows = g_slist_prepend (new_windows, window);
++    }
++  
++  
++  if (new_windows && priv->managed_windows)
++    {
++    if (g_slist_length (new_windows) > g_slist_length (priv->managed_windows))
++      {
++        for (l = new_windows; l; l = l->next)
++          {
++            if (g_slist_find (priv->managed_windows, l->data))
++              continue;
++            g_signal_emit (application, application_signals[OPENED], 0, l->data);
++            break;
++          }
++      }
++    else if (g_slist_length (new_windows) < g_slist_length (priv->managed_windows))
++      {
++        for (l = priv->managed_windows; l; l = l->next)
++          {
++            if (g_slist_find (new_windows, l->data))
++              continue;
++            g_signal_emit (application, application_signals[CLOSED], 0, l->data);
++            break;
++          }
++      }
++    }
++  
++  if (priv->managed_windows)
++    {
++      disconnect_window_events (application);
++      g_slist_free (priv->managed_windows);
++    }
++  priv->managed_windows = new_windows;
++  connect_window_events (application);
++  
++  launcher_application_ensure_state (application);
++  
++  g_array_free (xids, TRUE);
+ }
+   
+ /**
+@@ -746,7 +877,7 @@ void
+ launcher_application_set_desktop_file (LauncherApplication *application,
+                                        gchar *desktop_file)
+ {
+-  GKeyFile *desktop_keyfile;
++  GKeyFile  *desktop_keyfile;
+   GError    *error = NULL;
+   gchar     *name = NULL;
+   gchar     *exec = NULL;
+@@ -884,149 +1015,110 @@ launcher_application_get_focused (LauncherApplication *application)
+ }
+ 
+ /**
+- * launcher_application_set_focused
+- * @application: A #LauncherApplication
+- * @window: A #WnckWindow
+- * 
+- * provides a mechanism to set @application as focused by providing it the 
+- * focused @window (or null), this does not focus said @window - passing null
+- * will not use the window tracking feature
++ * launcher_application_show
++ * @application: a #LauncherApplication
++ *
++ * this method will focus the latest un-minimized window this @application has
++ * all this @application's windows are minimized then this method will 
++ * unminimize them all
+  */
+-
+ void
+-launcher_application_set_focused (LauncherApplication *application, 
+-                                  WnckWindow *window)
++launcher_application_show (LauncherApplication *application)
+ {
+-  g_return_if_fail (application);
+-  LauncherApplicationWindow *founditem;
+-  GTimeVal timeval;
+-
+-  g_get_current_time (&timeval);
++  LauncherApplicationPrivate *priv;
++  WnckWindow *best = NULL;
++  WnckWorkspace *workspace;
++  GSList *j;
++  GList *l;
++  GList *stack;
++  
++  g_return_if_fail (LAUNCHER_IS_APPLICATION (application));
++  
++  priv = application->priv;
++  workspace = wnck_screen_get_active_workspace (priv->screen);
++  stack = wnck_screen_get_windows_stacked (priv->screen);
+   
+-  if (window == NULL)
++  for (l = stack; l; l = l->next)
+     {
+-      g_object_set (G_OBJECT (application),
+-                    "focused", TRUE,
+-                    NULL);
+-      return;
++      j = g_slist_find (priv->managed_windows, l->data);
++      if (j)
++        {
++          best = j->data;
++        }
+     }
+-
+-   founditem = g_hash_table_lookup (application->priv->windows,
+-                                    window);
+-
+-   if (founditem)
+-     {
+-       founditem->timestamp.tv_sec = timeval.tv_sec;
+-       founditem->timestamp.tv_usec = timeval.tv_usec;
+-     }
+-   else 
+-     {
+-       founditem = g_slice_new (LauncherApplicationWindow);
+-       founditem->window = window;
+-       founditem->timestamp.tv_sec = timeval.tv_sec;
+-       founditem->timestamp.tv_usec = timeval.tv_usec;
+-       g_hash_table_insert (application->priv->windows, window, founditem);
+-     }
+-
+-   g_object_set (G_OBJECT (application),
+-                 "focused", TRUE,
+-                 NULL);
++  
++  if (best)
++    wnck_window_activate (best, gtk_get_current_event_time ());
+ }
+ 
+-WnckWindow *
+-get_latest_window(LauncherApplication *app)
++void
++launcher_application_minimize (LauncherApplication *application)
+ {
+-  // attempts to find the last focused wnckwindow
+-  WnckWindow *founditem = NULL;
+-  GTimeVal best_time;
+-  GHashTableIter iter;
+-  gpointer key, value;
+-
+-  best_time.tv_sec = 0;
+-  best_time.tv_usec = 0;
+-
+-  g_hash_table_iter_init (&iter, app->priv->windows);
+-  while (g_hash_table_iter_next (&iter, &key, &value))
++  LauncherApplicationPrivate *priv;
++  WnckWindow *window;
++  GSList *l;
++  
++  g_return_if_fail (LAUNCHER_IS_APPLICATION (application));
++  
++  priv = application->priv;
++  
++  for (l = priv->managed_windows; l; l = l->next)
+     {
+-      LauncherApplicationWindow *appwin = (LauncherApplicationWindow *)value;
+-      if (WNCK_IS_WINDOW (appwin->window))
+-        {
+-          WnckWindowType type = wnck_window_get_window_type (appwin->window);
+-          
+-          if (type == WNCK_WINDOW_DESKTOP ||
+-              type == WNCK_WINDOW_DOCK ||
+-              type == WNCK_WINDOW_TOOLBAR ||
+-              type == WNCK_WINDOW_MENU ||
+-              type == WNCK_WINDOW_SPLASHSCREEN)
+-            {
+-              continue;
+-            }
+-          if (appwin->timestamp.tv_sec > best_time.tv_sec)
+-            {
+-              if (appwin->timestamp.tv_usec > best_time.tv_usec)
+-                {
+-                  best_time.tv_sec = appwin->timestamp.tv_sec;
+-                  best_time.tv_usec = appwin->timestamp.tv_usec;
+-                  founditem = appwin->window;
+-                }
+-            }
+-        }
+-      else 
+-        {
+-          // our window no longer exists, remove it from the table
+-          g_hash_table_remove (app->priv->windows, key);
+-        }
++      window = l->data;
++      
++      if (!WNCK_IS_WINDOW (window) || wnck_window_is_minimized (window))
++        continue;
++      
++      wnck_window_minimize (window);
+     }
+-
+-  return founditem;
+ }
+ 
+-
+-/**
+- * launcher_application_show
+- * @application: a #LauncherApplication
+- *
+- * this method will focus the latest un-minimized window this @application has
+- * all this @application's windows are minimized then this method will 
+- * unminimize them all
+- */
+-void
+-launcher_application_show (LauncherApplication *application)
++gboolean
++launcher_application_has_minimized (LauncherApplication *application)
+ {
+-  g_return_if_fail (application);
+-  g_return_if_fail (application->priv->wnck_apps);
+- 
+-  /* FIXME
+-   * for now i am just grabbing the first wnckwindow we find thats not 
+-   * minimized, really we need to track what windows are focused so we know
+-   * the last focused window
+-   */
+- 
+-  GSList *a;
+-  GList *w;
+-  WnckWindow *found_window = NULL;
+-
+-  // get the last focused window
+-  found_window = get_latest_window (application);
+-
+-  if (found_window)
+-      /* just show this window */
+-      wnck_window_activate (found_window, gtk_get_current_event_time ());
+-  else
++  LauncherApplicationPrivate *priv;
++  WnckWindow *window;
++  GSList *l;
++  
++  g_return_val_if_fail (LAUNCHER_IS_APPLICATION (application), FALSE);
++  
++  priv = application->priv;
++  
++  for (l = priv->managed_windows; l; l = l->next)
+     {
+-      /* either there were no windows or all windows were minimized, so 
+-       * unminimize them
+-       */
+-      for (a = application->priv->wnck_apps; a; a = a->next)
+-        {
+-          WnckApplication *app = a->data;
+-          
+-          for (w = wnck_application_get_windows (app); w; w = w->next)
+-            {
+-              WnckWindow *window = w->data;
+-              wnck_window_activate (window, gtk_get_current_event_time ());
+-            }
+-        }
++      window = l->data;
++      
++      if (!WNCK_IS_WINDOW (window))
++        continue;
++      
++      if (wnck_window_is_minimized (window))
++        return TRUE;
+     }
++  return FALSE;
+ }
++
++void
++launcher_application_restore (LauncherApplication *application)
++{
++  LauncherApplicationPrivate *priv;
++  WnckWindow *window;
++  WnckWorkspace *workspace;
++  GSList *l;
++  
++  g_return_if_fail (LAUNCHER_IS_APPLICATION (application));
++  
++  priv = application->priv;
++  workspace = wnck_screen_get_active_workspace (priv->screen);
+   
++  
++  for (l = priv->managed_windows; l; l = l->next)
++    {
++      window = l->data;
++      
++      if (!WNCK_IS_WINDOW (window) || 
++          !wnck_window_is_minimized (window)) 
++        continue;
++      
++      wnck_window_unminimize (window, gtk_get_current_event_time ());
++    }
++} 
+diff --git a/launcher/launcher-application.h b/launcher/launcher-application.h
+index 6290a1a..6b4f532 100644
+--- a/launcher/launcher-application.h
++++ b/launcher/launcher-application.h
+@@ -54,8 +54,8 @@ struct _LauncherApplicationClass
+   GObjectClass parent_class;
+ 
+   /* Signals */
+-  void(* opened) (LauncherApplication *self, WnckApplication *wnckapp);
+-  void(* closed) (LauncherApplication *self, WnckApplication *wnckapp);
++  void(* opened) (LauncherApplication *self, WnckWindow *wnckwindow);
++  void(* closed) (LauncherApplication *self, WnckWindow *wnckwindow);
+ };
+ 
+ 
+@@ -71,16 +71,21 @@ GType launcher_application_get_type (void) G_GNUC_CONST;
+ 
+ LauncherApplication * launcher_application_new (void);
+ LauncherApplication * launcher_application_new_from_desktop_file (const gchar *desktop_file);
+-LauncherApplication * launcher_application_new_from_wnck_app (WnckApplication *app);
++LauncherApplication * launcher_application_new_from_wnck_window (WnckWindow *window);
+ 
+ gboolean      launcher_application_launch             (LauncherApplication *application, 
+                                                        GError **error);
+ 
+ const gchar * launcher_application_get_unique_string  (LauncherApplication *application);
+ 
+-GSList *      launcher_application_get_wnckapps       (LauncherApplication *application);
+-void          launcher_application_add_wnckapp        (LauncherApplication *application,
+-                                                       WnckApplication     *wnck_app);
++GSList *      launcher_application_get_windows        (LauncherApplication *application);
++
++gboolean      launcher_application_owns_window        (LauncherApplication *application,
++                                                       WnckWindow          *window);
++
++void          launcher_application_update_windows     (LauncherApplication *application);
++
++void          launcher_application_ensure_state       (LauncherApplication *application);
+ 
+ const gchar * launcher_application_get_name           (LauncherApplication *application);
+ 
+@@ -93,6 +98,8 @@ const gchar * launcher_application_get_exec_string    (LauncherApplication *appl
+ const gchar * launcher_application_get_desktop_file   (LauncherApplication *application);
+ void          launcher_application_set_desktop_file   (LauncherApplication *application,
+                                                        gchar *desktop_file);
++                                                       
++gboolean      launcher_application_get_urgent         (LauncherApplication *application);
+ 
+ const gchar * launcher_application_get_unique_string  (LauncherApplication *application);
+ 
+@@ -103,11 +110,14 @@ gboolean      launcher_application_get_favorite       (LauncherApplication *appl
+ GSList *      launcher_application_get_categories     (LauncherApplication *application);
+ 
+ gboolean      launcher_application_get_focused        (LauncherApplication *application);
+-void          launcher_application_set_focused        (LauncherApplication *application, 
+-                                                       WnckWindow *window);
+ 
+ void          launcher_application_show               (LauncherApplication *application);
+ 
++void          launcher_application_minimize           (LauncherApplication *application);
++gboolean      launcher_application_has_minimized       (LauncherApplication *application);
++
++void          launcher_application_restore           (LauncherApplication *application);
++
+ G_END_DECLS
+ 
+ #endif /* _LAUNCHER_APPLICATION_H_ */
+diff --git a/launcher/launcher-appman.c b/launcher/launcher-appman.c
+index 9715b62..2787390 100644
+--- a/launcher/launcher-appman.c
++++ b/launcher/launcher-appman.c
+@@ -38,7 +38,6 @@ LAUNCHER_TYPE_APPMAN, LauncherAppmanPrivate))
+ 
+ struct _LauncherAppmanPrivate
+ {
+-  GHashTable *app_lookup;
+   GSequence *app_list;
+ };
+ 
+@@ -55,7 +54,6 @@ launcher_appman_finalize (GObject *appman)
+   /* we assume that the application is shutting down and no longer needs the 
+    * app cache 
+    */
+-  g_hash_table_destroy(priv->app_lookup);
+   g_sequence_free(priv->app_list);
+   
+   G_OBJECT_CLASS (launcher_appman_parent_class)->finalize (appman);
+@@ -67,8 +65,6 @@ launcher_appman_init (LauncherAppman *appman)
+   LauncherAppmanPrivate *priv;
+   
+   priv = appman->priv = LAUNCHER_APPMAN_GET_PRIVATE (appman);
+-  /* FIXME - replace with g_hash_table_new_full */
+-  priv->app_lookup = g_hash_table_new(g_str_hash, g_str_equal); 
+   /* FIXME - add GDestroyNotify peramater */
+   priv->app_list = g_sequence_new(NULL); 
+ }
+@@ -82,6 +78,18 @@ launcher_appman_class_init (LauncherAppmanClass *klass)
+   g_type_class_add_private (object_class, sizeof (LauncherAppmanPrivate));
+ }
+ 
++static void
++launcher_appman_add_application (LauncherAppman *appman,
++                                 LauncherApplication *application)
++{
++  LauncherAppmanPrivate *priv;
++  
++  g_return_if_fail (LAUNCHER_IS_APPMAN (appman));
++  g_return_if_fail (LAUNCHER_IS_APPLICATION (application));
++  
++  priv = appman->priv;
++  g_sequence_append (priv->app_list, application);
++}
+ /*
+  * Public methods
+  */
+@@ -120,33 +128,34 @@ LauncherApplication *
+ launcher_appman_get_application_for_desktop_file (LauncherAppman *appman, 
+                                                   const gchar *desktop)
+ {
+-  LauncherApplication *found_app;
+-
++  LauncherAppmanPrivate *    priv;
++  LauncherApplication *   app;
++  const gchar *           app_desktop_file;
++  GSequenceIter *         iter;
++  
+   g_return_val_if_fail (LAUNCHER_IS_APPMAN (appman), NULL);
+-
+-  /* try and find the application in our cache */
+-  found_app = g_hash_table_lookup (appman->priv->app_lookup, desktop);
+-
+-  if (!found_app) 
++  
++  priv = appman->priv;
++  
++  for (iter = g_sequence_get_begin_iter (priv->app_list);
++       !g_sequence_iter_is_end (iter);
++       iter = g_sequence_iter_next (iter))
+     {
+-      /* we don't have this app in the cache yet, we need to generate it first
+-       */    
+-      found_app = launcher_application_new_from_desktop_file (desktop);
+-      if (found_app != NULL)
+-      {
+-        //add our app to the hash table
+-        g_sequence_append (appman->priv->app_list, found_app);
+-        g_hash_table_insert (appman->priv->app_lookup, 
+-                            g_strdup (desktop), 
+-                            found_app);
+-        
+-      } else {
+-        // if we get here, there is a problem with the desktop file
+-        g_critical("Could not create desktop file from %s", desktop);
+-      }
++      app = g_sequence_get (iter);
++      
++      if (!LAUNCHER_IS_APPLICATION (app))
++        continue;
++      
++      app_desktop_file = launcher_application_get_desktop_file (app);
++      
++      if (g_strcmp0 (app_desktop_file, desktop) == 0)
++        return app;
+     }
+-    
+-  return found_app;
++  
++  app = launcher_application_new_from_desktop_file (desktop);
++  launcher_appman_add_application (appman, app);
++  
++  return app;
+ }
+ 
+ /**
+@@ -160,37 +169,37 @@ launcher_appman_get_application_for_desktop_file (LauncherAppman *appman,
+  * Returns: A LauncherApplication object or NULL
+  */
+ LauncherApplication *
+-launcher_appman_get_application_for_wnck_app (LauncherAppman *appman,
+-                                              WnckApplication *wnck_app)
++launcher_appman_get_application_for_wnck_window (LauncherAppman *appman,
++                                                 WnckWindow     *wnck_window)
+ {
+-  LauncherApplication *   found_app;
+-  const gchar *           wnck_name;
++  LauncherAppmanPrivate *    priv;
++  LauncherApplication *   app;
++  GSequenceIter *         iter;
+   
+   g_return_val_if_fail (LAUNCHER_IS_APPMAN (appman), NULL);
+-  g_return_val_if_fail (WNCK_IS_APPLICATION (wnck_app), NULL);
++  g_return_val_if_fail (WNCK_IS_WINDOW (wnck_window), NULL);
+   // we need this method because of complications todo with sometimes not having
+   // a desktop file available
+   
+-  wnck_name = wnck_application_get_name (wnck_app);
++  priv = appman->priv;
+   
+-  found_app = g_hash_table_lookup (appman->priv->app_lookup, wnck_name);
+-  if (!found_app)
++  for (iter = g_sequence_get_begin_iter (priv->app_list);
++       !g_sequence_iter_is_end (iter);
++       iter = g_sequence_iter_next (iter))
+     {
+-      /* we don't have an app with this name in the cache yet, so generate a new
+-       * one, this app basically has no info though
+-       */
+-      found_app = launcher_application_new_from_wnck_app (wnck_app);
+-      if (found_app != NULL)
+-        {
+-          //add our app to the hash table
+-          g_sequence_append (appman->priv->app_list, found_app);
+-          g_hash_table_insert (appman->priv->app_lookup, 
+-                               g_strdup (wnck_name), 
+-                               found_app);
+-        }
++      app = g_sequence_get (iter);
++      
++      if (!LAUNCHER_IS_APPLICATION (app))
++        continue;
++      
++      if (launcher_application_owns_window (app, wnck_window))
++        return app;
+     }
+   
+-  return found_app; 
++  app = launcher_application_new_from_wnck_window (wnck_window);
++  launcher_appman_add_application (appman, app);
++  
++  return app;
+ }
+                                             
+ 
+@@ -210,3 +219,4 @@ launcher_appman_get_applications (LauncherAppman *appman)
+   g_return_val_if_fail (LAUNCHER_IS_APPMAN (appman), NULL);
+   return appman->priv->app_list;
+ }
++
+diff --git a/launcher/launcher-appman.h b/launcher/launcher-appman.h
+index 674a06e..e73af68 100644
+--- a/launcher/launcher-appman.h
++++ b/launcher/launcher-appman.h
+@@ -24,22 +24,24 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
++#include <launcher/launcher-application.h>
++
+ G_BEGIN_DECLS
+ 
+ #define LAUNCHER_TYPE_APPMAN (launcher_appman_get_type ())
+ 
+ #define LAUNCHER_APPMAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+         LAUNCHER_TYPE_APPMAN, LauncherAppman))
+-        
++
+ #define LAUNCHER_APPMAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
+          LAUNCHER_TYPE_APPMAN, LauncherAppmanClass))
+-         
++
+ #define LAUNCHER_IS_APPMAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+         LAUNCHER_TYPE_APPMAN))
+-        
++
+ #define LAUNCHER_IS_APPMAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+         LAUNCHER_TYPE_APPMAN))
+-        
++
+ #define LAUNCHER_APPMAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+         LAUNCHER_TYPE_APPMAN, LauncherAppmanClass))
+ 
+@@ -56,7 +58,7 @@ struct _LauncherAppmanClass
+ struct _LauncherAppman
+ {
+   GObject parent_instance;
+-  
++
+   /* private */
+   LauncherAppmanPrivate   *priv;
+ };
+@@ -64,12 +66,12 @@ struct _LauncherAppman
+ GType launcher_appman_get_type (void) G_GNUC_CONST;
+ LauncherAppman *      launcher_appman_get_default                       (void);
+ 
+-LauncherApplication * launcher_appman_get_application_for_desktop_file  (LauncherAppman *appman, 
++LauncherApplication * launcher_appman_get_application_for_desktop_file  (LauncherAppman *appman,
+                                                                          const gchar *desktop);
+-                                                                         
+-LauncherApplication * launcher_appman_get_application_for_wnck_app      (LauncherAppman *appman,
+-                                                                         WnckApplication *wnck_app);
+-                                                                         
++
++LauncherApplication * launcher_appman_get_application_for_wnck_window   (LauncherAppman *appman,
++                                                                         WnckWindow     *wnck_window);
++
+ GSequence *           launcher_appman_get_applications                  (LauncherAppman *appman);
+ 
+ G_END_DECLS
+diff --git a/launcher/launcher-category.h b/launcher/launcher-category.h
+index 6aa624e..fd1f342 100644
+--- a/launcher/launcher-category.h
++++ b/launcher/launcher-category.h
+@@ -23,26 +23,28 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ #include <gdk/gdk.h>
+-#include "launcher-application.h"
++
++#include <launcher/launcher-application.h>
++
+ G_BEGIN_DECLS
+ 
+ #define LAUNCHER_TYPE_CATEGORY (launcher_category_get_type ())
+ 
+ #define LAUNCHER_CATEGORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+         LAUNCHER_TYPE_CATEGORY, LauncherCategory))
+-        
++
+ #define LAUNCHER_CATEGORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
+         LAUNCHER_TYPE_CATEGORY, LauncherCategoryClass))
+-        
++
+ #define LAUNCHER_IS_CATEGORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+         LAUNCHER_TYPE_CATEGORY))
+-        
++
+ #define LAUNCHER_IS_CATEGORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+         LAUNCHER_TYPE_CATEGORY))
+-        
++
+ #define LAUNCHER_CATEGORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+         LAUNCHER_TYPE_CATEGORY, LauncherCategoryClass))
+-        
++
+ typedef struct _LauncherCategory LauncherCategory;
+ typedef struct _LauncherCategoryClass LauncherCategoryClass;
+ typedef struct _LauncherCategoryPrivate LauncherCategoryPrivate;
+@@ -62,20 +64,16 @@ struct _LauncherCategoryClass
+ 
+   /* Signals */
+   void(* removed)               (LauncherCategory *self);
+-  void(* application_added)     (LauncherCategory *self, 
++  void(* application_added)     (LauncherCategory *self,
+                                  LauncherApplication *application);
+-  void(* application_removed)   (LauncherCategory *self, 
++  void(* application_removed)   (LauncherCategory *self,
+                                  LauncherApplication *application);
+ };
+ 
+-
+-
+-
+-
+ LauncherCategory * launcher_category_new   (const gchar *name,
+                                             const gchar *comment,
+                                             const gchar *icon_name);
+-                                            
++
+ const gchar *  launcher_category_get_name      (LauncherCategory *category);
+ 
+ const gchar *  launcher_category_get_comment   (LauncherCategory *category);
+@@ -84,7 +82,7 @@ const gchar *  launcher_category_get_icon_name (LauncherCategory *category);
+ 
+ void           launcher_category_add_application     (LauncherCategory *category,
+                                                       LauncherApplication *application);
+-                                                      
++
+ void           launcher_category_remove_application  (LauncherCategory *category,
+                                                       LauncherApplication *application);
+ 
+diff --git a/launcher/launcher-session.c b/launcher/launcher-session.c
+index 80249b0..2993e5e 100644
+--- a/launcher/launcher-session.c
++++ b/launcher/launcher-session.c
+@@ -53,7 +53,6 @@ struct _LauncherSessionPrivate
+ {
+   /* Application variables */
+   WnckScreen *screen;
+-  GSList *running_apps;
+ };
+ 
+ enum
+@@ -69,14 +68,13 @@ static guint _session_signals[LAST_SIGNAL] = { 0 };
+ static LauncherSession *launcher_session = NULL;
+ 
+ /* Forwards */
+-static void on_application_opened (WnckScreen      *screen,
+-                                   WnckApplication *app,
+-                                   LauncherSession     *session);
++static void on_window_opened (WnckScreen      *screen,
++                              WnckWindow      *window,
++                              LauncherSession *session);
+ 
+-static void
+-on_active_window_changed (WnckScreen *screen,
+-                          WnckWindow *previously_active_window,
+-                          LauncherSession *session);
++static void on_window_closed (WnckScreen      *screen,
++                              WnckWindow      *window,
++                              LauncherSession *session);
+ 
+ /* GObject Init */
+ static void
+@@ -87,12 +85,6 @@ launcher_session_finalize (GObject *session)
+   g_return_if_fail (LAUNCHER_IS_SESSION (session));
+   priv = LAUNCHER_SESSION (session)->priv;
+ 
+-  if (priv->running_apps)
+-    {
+-      g_slist_foreach (priv->running_apps, (GFunc)g_object_unref, NULL);
+-      g_slist_free (priv->running_apps);
+-      priv->running_apps = NULL;
+-    }
+   /* Note: We don't ref/unref priv->screen as-per-wnck-docs */
+   priv->screen = NULL;
+ 
+@@ -112,8 +104,8 @@ launcher_session_class_init (LauncherSessionClass *klass)
+                   G_SIGNAL_RUN_LAST,
+                   G_STRUCT_OFFSET (LauncherSessionClass, application_launching),
+                   NULL, NULL,
+-                  g_cclosure_marshal_VOID__POINTER,
+-                  G_TYPE_NONE, 1, G_TYPE_POINTER);
++                  g_cclosure_marshal_VOID__OBJECT,
++                  G_TYPE_NONE, 1, LAUNCHER_TYPE_APPLICATION);
+ 
+   _session_signals[APP_OPENED] =
+     g_signal_new ("application-opened",
+@@ -121,8 +113,8 @@ launcher_session_class_init (LauncherSessionClass *klass)
+                   G_SIGNAL_RUN_LAST,
+                   G_STRUCT_OFFSET (LauncherSessionClass, application_opened),
+                   NULL, NULL,
+-                  g_cclosure_marshal_VOID__POINTER,
+-                  G_TYPE_NONE, 1, G_TYPE_POINTER);
++                  g_cclosure_marshal_VOID__OBJECT,
++                  G_TYPE_NONE, 1, LAUNCHER_TYPE_APPLICATION);
+   g_type_class_add_private (obj_class, sizeof (LauncherSessionPrivate));
+ }
+ 
+@@ -137,11 +129,11 @@ launcher_session_init (LauncherSession *session)
+ 
+   /* Grab WnckScreen and connect to the important signals */
+   priv->screen = wnck_screen_get_default ();
+-  g_signal_connect (priv->screen, "application-opened",
+-                    G_CALLBACK (on_application_opened), session);
+-
+-  g_signal_connect (priv->screen, "active-window-changed",
+-                    G_CALLBACK (on_active_window_changed), session);
++  g_signal_connect (priv->screen, "window-opened",
++                    G_CALLBACK (on_window_opened), session);
++                    
++  g_signal_connect (priv->screen, "window-closed",
++                    G_CALLBACK (on_window_closed), session);
+ }
+ 
+ LauncherSession *
+@@ -163,139 +155,76 @@ launcher_session_get_default (void)
+  */
+ 
+ static void
+-on_application_opened (WnckScreen      *screen,
+-                       WnckApplication *app,
+-                       LauncherSession *session)
++on_window_opened (WnckScreen      *screen,
++                  WnckWindow      *window,
++                  LauncherSession *session)
+ {
+-  LauncherSessionPrivate *priv;
+-  gchar              *app_name = NULL;
+-  gchar              *res_name = NULL;
+-  gchar              *class_name = NULL;
+-  LauncherApplication    *bestmatch = NULL;
+-  LauncherAppman         *appman = NULL;
+-  GList              *windows, *w;
+-
+-
++  LauncherSessionPrivate   *priv;
++  LauncherApplication      *app;
++  LauncherAppman           *appman;
++  GSequence                *applications;
++  GSequenceIter            *iter;
++  gboolean                  found = FALSE;
++  
+   g_return_if_fail (LAUNCHER_IS_SESSION (session));
+-  g_return_if_fail (WNCK_IS_APPLICATION (app));
++  g_return_if_fail (WNCK_IS_WINDOW (window));
++  
++  if (wnck_window_is_skip_tasklist (window))
++    return;
++  
+   priv = session->priv;
+   
+   appman = launcher_appman_get_default ();
++  applications = launcher_appman_get_applications (appman);
+   
+-  /* first we want to attempt a match to a desktop file with libwncksync */
+-  // grab a list of windows, loop though until we get a match
+-  windows = wnck_application_get_windows (app);
+-  for (w = windows; w; w = w->next)
++  for (iter = g_sequence_get_begin_iter (applications); 
++       !g_sequence_iter_is_end (iter); 
++       iter = g_sequence_iter_next (iter))
+     {
+-      WnckWindow *window = w->data;
+-      gchar     *desktop_file = NULL;
++      app = g_sequence_get (iter);
++      launcher_application_update_windows (app);
+       
+-      desktop_file = wncksync_desktop_item_for_xid (wnck_window_get_xid (window));
+-      //try the next item
+-      if (!g_strcmp0("\0", desktop_file))
+-	      continue;
+-      // create our LauncherApplication by looking in the LauncherAppman
+-      bestmatch = launcher_appman_get_application_for_desktop_file (appman, 
+-                                                                    desktop_file);
+-      if (bestmatch)
+-        break;
+-    }
+-  
+-  /* If we have a match, just ref it, otherwise create an app to represent the
+-   * opened application */
+-  if (bestmatch)
+-    {
+-      g_object_ref (bestmatch);
++      found = launcher_application_owns_window (app, window);
++      
++      if (found)
++        {
++          if (g_slist_length (launcher_application_get_windows (app)) == 1)
++            g_signal_emit (session, _session_signals[APP_OPENED], 0, app);
++          break;
++        }
+     }
+-  else
++    
++  if (!found)
+     {
+-      bestmatch = launcher_appman_get_application_for_wnck_app (appman, 
+-                                                                app);
++      app = launcher_appman_get_application_for_wnck_window (appman, window);
++      g_signal_emit (session, _session_signals[APP_OPENED], 0, app);
+     }
+-
+-  static GQuark quark;
+-  if (!quark)
+-    quark = g_quark_from_static_string ("launcher_app_qdata");
+-
+-  launcher_application_add_wnckapp (bestmatch, app);
+-  g_object_set_qdata (G_OBJECT (app), quark, bestmatch);
+-
+-  /* Add to the list of running apps, set the data property for the
+-   * WnckApplication class, so it's easy to locate when the application quits
+-   * and finally emit the signal notifying of the opened application
+-   */
+-  priv->running_apps = g_slist_append (priv->running_apps, bestmatch);
+-  g_object_set_data (G_OBJECT (app), LAUNCHERAPP_ID, bestmatch);
+-  g_signal_emit (session, _session_signals[APP_OPENED], 0, bestmatch);
+-
+-  g_free (app_name);
+-  g_free (res_name);
+-  g_free (class_name);
+ }
+ 
+ static void
+-on_active_window_changed (WnckScreen *screen,
+-                          WnckWindow *previously_active_window,
+-                          LauncherSession *session)
++on_window_closed (WnckScreen      *screen,
++                  WnckWindow      *window,
++                  LauncherSession *session)
+ {
+-  g_return_if_fail (session);
+- 
+-  WnckWindow *active_window = NULL;
+-  WnckApplication *new_wnckapp = NULL;
+-  LauncherApplication *old_focused_app = NULL;
+-  LauncherApplication *new_focused_app = NULL;
+-
+-  static GQuark quark;
+-  if (!quark)
+-    quark = g_quark_from_static_string ("launcher_app_qdata");
+-
+-  active_window = wnck_screen_get_active_window (screen); 
+-
+-  if (previously_active_window)
+-    {
+-      WnckApplication *old_wnckapp = NULL;
+-      old_wnckapp = wnck_window_get_application (previously_active_window);
+-      if (WNCK_IS_APPLICATION (old_wnckapp))
+-        old_focused_app = g_object_get_qdata (G_OBJECT (old_wnckapp),
+-                                              quark);
+-
+-      if (old_focused_app)
+-	      g_object_set (G_OBJECT (old_focused_app),
+-		      "focused", FALSE,
+-		      NULL);
+-    }
++  LauncherSessionPrivate   *priv;
++  LauncherApplication      *app;
++  LauncherAppman           *appman;
++  GSequence                *applications;
++  GSequenceIter            *iter;
+   
+-
++  g_return_if_fail (LAUNCHER_IS_SESSION (session));
++  g_return_if_fail (WNCK_IS_WINDOW (window));
+   
+-  if (active_window)
+-    { 
+-      new_wnckapp = wnck_window_get_application (active_window);
+-      new_focused_app = g_object_get_qdata (G_OBJECT (new_wnckapp),
+-					    quark);
+-      g_assert (LAUNCHER_IS_APPLICATION (new_focused_app));
+-
+-      launcher_application_set_focused (new_focused_app, active_window);
++  priv = session->priv;
++  
++  appman = launcher_appman_get_default ();
++  applications = launcher_appman_get_applications (appman);
++  
++  for (iter = g_sequence_get_begin_iter (applications); 
++       !g_sequence_iter_is_end (iter); 
++       iter = g_sequence_iter_next (iter))
++    {
++      app = g_sequence_get (iter);
++      launcher_application_update_windows (app);
+     }
+ }
+-
+-
+-/*
+- * Public Methods
+- */
+-
+-/**
+- * launcher_session_get_running_applications:
+- * @session: a #LauncherSession object
+- *
+- * This will produce a #GSList populated with currently running #LauncherApplication objects. 
+- * This should be called after the mainloop has been started
+- * <emphasis>This list should not be modified as it is owned by #LauncherSession</emphasis>
+- *
+- * Returns: A #GSList containing LauncherApplication objects
+- */
+- GSList *
+-launcher_session_get_running_applications (LauncherSession *session)
+-{
+-  g_return_val_if_fail (LAUNCHER_IS_SESSION (session), NULL);
+-  return session->priv->running_apps;
+-}
+diff --git a/launcher/launcher-session.h b/launcher/launcher-session.h
+index 18a5dac..7f6ab24 100644
+--- a/launcher/launcher-session.h
++++ b/launcher/launcher-session.h
+@@ -80,12 +80,6 @@ GType         launcher_session_get_type                 (void) G_GNUC_CONST;
+  */
+ LauncherSession * launcher_session_get_default              (void);
+ 
+-/* Get's a list of LauncherApplication structs. _DO NOT_ modify this list,
+- * LauncherSession owns it. The LauncherApplication objects it contains can be
+- * ref'd/unref'd as desired (although not needed in normal use)
+- */
+-GSList      * launcher_session_get_running_applications (LauncherSession *session);
+-
+ G_END_DECLS
+ 
+ #endif /* _HAVE_LAUNCHER_SESSION_H */
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 77ba6e9..9f483e0 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -41,7 +41,7 @@ full-report:
+ check-local: test
+ 
+ # Xvfb server stuff (thanks Ted!)
+-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 -extension RANDR -x GLX
++XVFB = Xvfb -ac -noreset -screen 0 800x600x16 -extension RANDR
+ XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
+    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
+    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
+@@ -53,7 +53,7 @@ XVFB_START = \
+ 	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
+ 	&& { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
+ 	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
+-	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
++	|| { echo "Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ 	&& DISPLAY=:$$XID && export DISPLAY
+ # call as: $(XVFB_START) && someprogram
+ 
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 406eef8..138432d 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -227,7 +227,7 @@ test_liblauncher_CPPFLAGS = \
+ test_liblauncher_LDADD = $(top_builddir)/launcher/liblauncher-@LAUNCHER_MAJOR_VERSION@.@LAUNCHER_MINOR_VERSION@.la
+ 
+ # Xvfb server stuff (thanks Ted!)
+-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 -extension RANDR -x GLX
++XVFB = Xvfb -ac -noreset -screen 0 800x600x16 -extension RANDR
+ XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
+    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
+    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
+@@ -240,7 +240,7 @@ XVFB_START = \
+ 	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
+ 	&& { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
+ 	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
+-	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
++	|| { echo "Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ 	&& DISPLAY=:$$XID && export DISPLAY
+ 
+ EXTRA_DIST = firefox.desktop
+-- 
+1.6.6.1
+
diff --git a/recipes/netbook-launcher/liblauncher_0.3.8.bb b/recipes/netbook-launcher/liblauncher_0.3.8.bb
new file mode 100644
index 0000000000..43ba05a64c
--- /dev/null
+++ b/recipes/netbook-launcher/liblauncher_0.3.8.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "A library to build launchers"
+LICENSE = "GPLv3,LGPLv2.1,LGPLv3"
+
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS = "glib-2.0 wncksync libwnck virtual/libx11 gconf gnome-menus"
+
+SRC_URI = "http://launchpad.net/liblauncher/0.3/0.3.6/+download/liblauncher-0.3.6.tar.gz;name=liblauncher \
+           file://0001-liblauncher-udpate-0.3.6-to-0.3.8-which-the-ubuntu-f.patch \
+"
+
+SRC_URI[liblauncher.md5sum] = "ba3ea890473f69000d1c843cee471471"
+SRC_URI[liblauncher.sha256sum] = "ec3223c6f46cf29d291ccd383527443ba725a0baca65e490307400af0ad30c04"
+
+inherit autotools
+
+S = "${WORKDIR}/${PN}-0.3.6"
+
diff --git a/recipes/netkit-base/netkit-base_0.17.bb b/recipes/netkit-base/netkit-base_0.17.bb
index bdf08b4219..c9864ae84a 100644
--- a/recipes/netkit-base/netkit-base_0.17.bb
+++ b/recipes/netkit-base/netkit-base_0.17.bb
@@ -4,8 +4,8 @@ LICENSE = "BSD"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
-           file://mconfig.patch;patch=1 \
+           file://configure.patch \
+           file://mconfig.patch \
            file://init \
            file://inetd.conf"
 
diff --git a/recipes/netkit-ftp/netkit-ftp_0.17.bb b/recipes/netkit-ftp/netkit-ftp_0.17.bb
index 70bf64c739..86afb86747 100644
--- a/recipes/netkit-ftp/netkit-ftp_0.17.bb
+++ b/recipes/netkit-ftp/netkit-ftp_0.17.bb
@@ -2,8 +2,8 @@ SECTION = "console/network"
 DESCRIPTION = "netkit-ftp includes a commandline ftp client."
 LICENSE = "BSD"
 SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ftp-${PV}.tar.gz;name=archive \
-	   file://mconfig.patch;patch=1 \
-       http://ftp.de.debian.org/debian/pool/main/n/netkit-ftp/netkit-ftp_0.17-19.diff.gz;patch=1;name=patch19 "
+	   file://mconfig.patch \
+       http://ftp.de.debian.org/debian/pool/main/n/netkit-ftp/netkit-ftp_0.17-19.diff.gz;name=patch19 "
 
 PR = "r2"
 
diff --git a/recipes/netkit-rpc/netkit-rpc_0.17.bb b/recipes/netkit-rpc/netkit-rpc_0.17.bb
index f21eb99645..3f97fc4632 100644
--- a/recipes/netkit-rpc/netkit-rpc_0.17.bb
+++ b/recipes/netkit-rpc/netkit-rpc_0.17.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "netkit-rpc includes rpcgen and rpcinfo."
 PR = "r1"
 LICENSE = "GPL"
 SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rpc-${PV}.tar.gz \
-	   file://gcc4.patch;patch=1 \
-	   file://install.patch;patch=1"
+	   file://gcc4.patch \
+	   file://install.patch"
 S = "${WORKDIR}/netkit-rpc-${PV}"
 
 EXTRA_OEMAKE = ""
diff --git a/recipes/netkit-telnet/netkit-telnet_0.17.bb b/recipes/netkit-telnet/netkit-telnet_0.17.bb
index 74ba102533..8aceb2e23d 100644
--- a/recipes/netkit-telnet/netkit-telnet_0.17.bb
+++ b/recipes/netkit-telnet/netkit-telnet_0.17.bb
@@ -5,8 +5,8 @@ LICENSE = "BSD"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz \
-           file://netkit-telnet-debian_0.17-36.diff;patch=1 \
-           file://cross-compile.patch;patch=1 "
+           file://netkit-telnet-debian_0.17-36.diff \
+           file://cross-compile.patch "
 
 do_configure () {
     ./configure --prefix=${prefix}
diff --git a/recipes/netkit-tftp/netkit-tftp_0.17.bb b/recipes/netkit-tftp/netkit-tftp_0.17.bb
index d1348a87f6..17b9d80a3a 100644
--- a/recipes/netkit-tftp/netkit-tftp_0.17.bb
+++ b/recipes/netkit-tftp/netkit-tftp_0.17.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "netkit-tftp includes a commandline tftp client."
 LICENSE = "BSD"
 SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${PV}.tar.gz \
-	   file://mconfig.patch;patch=1"
+	   file://mconfig.patch"
 
 EXTRA_OEMAKE = ""
 do_compile () {
diff --git a/recipes/netkit-tftp/netkit-tftpd_0.17.bb b/recipes/netkit-tftp/netkit-tftpd_0.17.bb
index d2a89578a4..0d57e2581f 100644
--- a/recipes/netkit-tftp/netkit-tftpd_0.17.bb
+++ b/recipes/netkit-tftp/netkit-tftpd_0.17.bb
@@ -6,9 +6,9 @@ LICENSE = "BSD"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/netkit-tftp-${PV}"
 
 SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${PV}.tar.gz \
-	   file://mconfig.patch;patch=1 \
-           file://tftpd_add_debug.patch;patch=1 \
-	   file://pack_tftphdr.patch;patch=1"
+	   file://mconfig.patch \
+           file://tftpd_add_debug.patch \
+	   file://pack_tftphdr.patch"
 
 S = "${WORKDIR}/netkit-tftp-${PV}"
 
diff --git a/recipes/netpbm/netpbm_10.28.bb b/recipes/netpbm/netpbm_10.28.bb
index de18acd31e..de94abb424 100644
--- a/recipes/netpbm/netpbm_10.28.bb
+++ b/recipes/netpbm/netpbm_10.28.bb
@@ -28,8 +28,8 @@ RDEPENDS += "perl-module-file-spec-unix"
 PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \
-	   file://ppmtojpeg.patch;patch=42 \
-	   file://libgnuhash.patch;patch=1 \
+	   file://ppmtojpeg.patch;striplevel=42 \
+	   file://libgnuhash.patch \
 	   file://Makefile.config \
 	   file://oeendiangen"
 
diff --git a/recipes/netperf/netperf_2.4.4.bb b/recipes/netperf/netperf_2.4.4.bb
index a86c21b9ea..8a3e159a87 100644
--- a/recipes/netperf/netperf_2.4.4.bb
+++ b/recipes/netperf/netperf_2.4.4.bb
@@ -5,7 +5,7 @@ LICENSE = "netperf"
 PR = "r1"
 
 SRC_URI="ftp://ftp.netperf.org/netperf/archive/netperf-${PV}.tar.bz2 \
-         file://cpu_set.patch;patch=1 \
+         file://cpu_set.patch \
          file://init"
 
 inherit update-rc.d autotools
diff --git a/recipes/netsurf/hubbub_0.0.1.bb b/recipes/netsurf/hubbub_0.0.1.bb
index aa74e957fc..88a6ce7b92 100644
--- a/recipes/netsurf/hubbub_0.0.1.bb
+++ b/recipes/netsurf/hubbub_0.0.1.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 DEPENDS = "libparserutils"
 
 SRC_URI = "http://www.netsurf-browser.org/projects/releases/hubbub-${PV}-src.tar.gz \
-           file://hubbub-uninitialised.patch;patch=1"
+           file://hubbub-uninitialised.patch"
 
 PR = "r1"
 
diff --git a/recipes/netsurf/libnsgif_0.0.1.bb b/recipes/netsurf/libnsgif_0.0.1.bb
index 7561ac727f..4845398ca8 100644
--- a/recipes/netsurf/libnsgif_0.0.1.bb
+++ b/recipes/netsurf/libnsgif_0.0.1.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "MIT"
 
 SRC_URI = "http://www.netsurf-browser.org/projects/releases/libnsgif-${PV}-src.tar.gz \
-           file://libnsgif-strict-aliasing.patch;patch=1"
+           file://libnsgif-strict-aliasing.patch"
 
 PR = "r1"
 
diff --git a/recipes/netsurf/netsurf_2.1.bb b/recipes/netsurf/netsurf_2.1.bb
index 4e6559400e..3aeae0c8c7 100644
--- a/recipes/netsurf/netsurf_2.1.bb
+++ b/recipes/netsurf/netsurf_2.1.bb
@@ -5,8 +5,8 @@ SECTION = "x11/network"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.netsurf-browser.org/downloads/releases/netsurf-${PV}-src.tar.gz \
-	   file://fix_makefile.patch;patch=1 \
-	   file://debugxml_fix.patch;patch=1 \
+	   file://fix_makefile.patch \
+	   file://debugxml_fix.patch \
 	   file://netsurf.png \
 	   file://netsurf.desktop \
 	   file://Makefile.config"
diff --git a/recipes/networkmanager/netm-cli_0.2.bb b/recipes/networkmanager/netm-cli_0.2.bb
index 9166c44a52..34bc7bf8c5 100644
--- a/recipes/networkmanager/netm-cli_0.2.bb
+++ b/recipes/networkmanager/netm-cli_0.2.bb
@@ -8,6 +8,6 @@ PR = "r3"
 inherit setuptools
 
 SRC_URI = "git://dev.openbossa.org/mamona/users/salveti/netm-cli.git;protocol=http;tag=netm-cli-${PV}"
-SRC_URI_append_mamona = " file://scan_support.patch;patch=1"
+SRC_URI_append_mamona = " file://scan_support.patch"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/networkmanager/networkmanager-applet_0.6.6.bb b/recipes/networkmanager/networkmanager-applet_0.6.6.bb
index e1dae5b0d4..1f7276199f 100644
--- a/recipes/networkmanager/networkmanager-applet_0.6.6.bb
+++ b/recipes/networkmanager/networkmanager-applet_0.6.6.bb
@@ -7,7 +7,7 @@ RDEPENDS = "networkmanager"
 inherit gnome gtk-icon-cache
 
 SRC_URI = "http://people.redhat.com/dcbw/NetworkManager/0.6.6/nm-applet-0.6.6.tar.gz \
- file://applet-no-gnome.diff;patch=1;pnum=0"
+ file://applet-no-gnome.diff;striplevel=0"
 
 FILES_${PN} += "${datadir}/nm-applet/ \
         ${datadir}/gnome-vpn-properties/ \
diff --git a/recipes/networkmanager/networkmanager-applet_svn.bb b/recipes/networkmanager/networkmanager-applet_svn.bb
index d4df048083..ea8c0a8191 100644
--- a/recipes/networkmanager/networkmanager-applet_svn.bb
+++ b/recipes/networkmanager/networkmanager-applet_svn.bb
@@ -7,7 +7,7 @@ RDEPENDS = "networkmanager"
 inherit gnome gtk-icon-cache
 
 SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \
-           file://applet-no-gnome.diff;patch=1;pnum=0"
+           file://applet-no-gnome.diff;striplevel=0"
 
 SRCREV = "200"
 
diff --git a/recipes/networkmanager/networkmanager_0.6.4.bb b/recipes/networkmanager/networkmanager_0.6.4.bb
index ed43e67a9a..f7f9746002 100644
--- a/recipes/networkmanager/networkmanager_0.6.4.bb
+++ b/recipes/networkmanager/networkmanager_0.6.4.bb
@@ -9,8 +9,8 @@ RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme"
 PR = "r6"
 
 SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \
-	file://dbus-api-fix.patch;patch=1 \
-	file://dbus-1.0-fix.patch;patch=1 \
+	file://dbus-api-fix.patch \
+	file://dbus-1.0-fix.patch \
         file://99_networkmanager \
 	file://NetworkManager \
 	file://nm-applet.desktop"
diff --git a/recipes/networkmanager/networkmanager_0.6.6.bb b/recipes/networkmanager/networkmanager_0.6.6.bb
index d7775f54f5..e3043322a1 100644
--- a/recipes/networkmanager/networkmanager_0.6.6.bb
+++ b/recipes/networkmanager/networkmanager_0.6.6.bb
@@ -6,17 +6,17 @@ PR = "r7"
 SRC_URI = "http://people.redhat.com/dcbw/NetworkManager/0.6.6/NetworkManager-0.6.6.tar.gz \
 	       file://25NetworkManager \
 	       file://99_networkmanager \
-           file://fix_seg_fault.patch;patch=1 \
+           file://fix_seg_fault.patch \
           "
 
 SRC_URI_append_mamona = " \
-                    file://avoid_frequent_scan.patch;patch=1 \
-                    file://adding_no_scan_by_default.patch;patch=1 \
+                    file://avoid_frequent_scan.patch \
+                    file://adding_no_scan_by_default.patch \
                   "
 
-SRC_URI_append_nokia770 = " file://cx3110_bring_up.patch;patch=1 "
-SRC_URI_append_nokia800 = " file://cx3110_bring_up.patch;patch=1 "
-SRC_URI_append_nokia810 = " file://cx3110_bring_up.patch;patch=1 "
+SRC_URI_append_nokia770 = " file://cx3110_bring_up.patch "
+SRC_URI_append_nokia800 = " file://cx3110_bring_up.patch "
+SRC_URI_append_nokia810 = " file://cx3110_bring_up.patch "
 
 SRC_URI[md5sum] = "412ed4db5d2db04285799c4303ddeeed"
 SRC_URI[sha256sum] = "36d48a11957e1c4f53a685b0fcc7d060e8972b435501c92b10737bb844dd95e2"
diff --git a/recipes/networkmanager/networkmanager_0.7.1.997.bb b/recipes/networkmanager/networkmanager_0.7.1.997.bb
index 471b397161..812f101fa0 100644
--- a/recipes/networkmanager/networkmanager_0.7.1.997.bb
+++ b/recipes/networkmanager/networkmanager_0.7.1.997.bb
@@ -3,7 +3,7 @@ require networkmanager-0.7.inc
 PR = "r1"
 
 SRC_URI += " \
-    file://remove-gtk-doc-make.patch;patch=1 \
+    file://remove-gtk-doc-make.patch \
     file://nm-system-settings.conf \
     file://NetworkManager \
     file://gtk-doc.make \
diff --git a/recipes/networkmanager/networkmanager_0.7.1.bb b/recipes/networkmanager/networkmanager_0.7.1.bb
index baf19fd1af..7bada30efd 100644
--- a/recipes/networkmanager/networkmanager_0.7.1.bb
+++ b/recipes/networkmanager/networkmanager_0.7.1.bb
@@ -3,10 +3,10 @@ require networkmanager-0.7.inc
 PR = "r1"
 
 SRC_URI += " \
-	file://remove-gtk-doc-make.patch;patch=1 \
-	file://008-BACKEND-debian-fallback-to-generic-loopback.loom.patch;patch=1 \
-	file://02-dbus_access_network_manager.patch;patch=1 \
-	file://cx3110_bring_up.patch;patch=1 \
+	file://remove-gtk-doc-make.patch \
+	file://008-BACKEND-debian-fallback-to-generic-loopback.loom.patch \
+	file://02-dbus_access_network_manager.patch \
+	file://cx3110_bring_up.patch \
 	file://nm-system-settings.conf \
 	file://NetworkManager \
 "
diff --git a/recipes/networkmanager/networkmanager_0.7.999.bb b/recipes/networkmanager/networkmanager_0.7.999.bb
index a27e6da9dd..35f6a33232 100644
--- a/recipes/networkmanager/networkmanager_0.7.999.bb
+++ b/recipes/networkmanager/networkmanager_0.7.999.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1"
 PR = "r3"
 
 SRC_URI += " \
-    file://remove-gtk-doc-make.patch;patch=1 \
+    file://remove-gtk-doc-make.patch \
     file://nm-system-settings.conf \
     file://NetworkManager \
     file://gtk-doc.make \
diff --git a/recipes/networkmanager/networkmanager_0.7.bb b/recipes/networkmanager/networkmanager_0.7.bb
index 9ae5b91374..64fdace664 100644
--- a/recipes/networkmanager/networkmanager_0.7.bb
+++ b/recipes/networkmanager/networkmanager_0.7.bb
@@ -4,16 +4,16 @@ PV = "0.7"
 PR = "r10"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/NetworkManager-0.7.0.tar.bz2 \
-	file://remove-gtk-doc-make.patch;patch=1 \
-	file://008-BACKEND-debian-fallback-to-generic-loopback.loom.patch;patch=1 \
-	file://02-dbus_access_network_manager.patch;patch=1 \
-	file://add_probe_for_v250_modems.patch;patch=1 \
-	file://cx3110_bring_up.patch;patch=1 \
+	file://remove-gtk-doc-make.patch \
+	file://008-BACKEND-debian-fallback-to-generic-loopback.loom.patch \
+	file://02-dbus_access_network_manager.patch \
+	file://add_probe_for_v250_modems.patch \
+	file://cx3110_bring_up.patch \
 	file://nm-system-settings.conf \
 	file://NetworkManager \
 "
 
-SRC_URI_append_mamona += " file://disable_wireless_by_default.patch;patch=1 "
+SRC_URI_append_mamona += " file://disable_wireless_by_default.patch "
 
 S = "${WORKDIR}/NetworkManager-0.7.0"
 
diff --git a/recipes/networkmanager/networkmanager_0.7olpc.bb b/recipes/networkmanager/networkmanager_0.7olpc.bb
index 230360168d..16cf9c52f2 100644
--- a/recipes/networkmanager/networkmanager_0.7olpc.bb
+++ b/recipes/networkmanager/networkmanager_0.7olpc.bb
@@ -6,6 +6,6 @@ PV = "0.7olpc+git"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += "git://dev.laptop.org/users/sjoerd/NetworkManager.git;protocol=git;branch=olpc-patches;tag=f1fa6c27710196b7327402c59b2c55d920a12bb0 \
-            file://define_kernel_types_for_old_linux_headers_and_warn_functions_from_glib_2_16.patch;patch=1 \
+            file://define_kernel_types_for_old_linux_headers_and_warn_functions_from_glib_2_16.patch \
            "
 S = "${WORKDIR}/git"
diff --git a/recipes/networkmanager/networkmanager_0.8.bb b/recipes/networkmanager/networkmanager_0.8.bb
index d8b249a608..21aace01d1 100644
--- a/recipes/networkmanager/networkmanager_0.8.bb
+++ b/recipes/networkmanager/networkmanager_0.8.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1"
 PR = "r4"
 
 SRC_URI += " \
-    file://remove-gtk-doc-make.patch;patch=1 \
+    file://remove-gtk-doc-make.patch \
     file://nm-system-settings.conf \
     file://NetworkManager \
     file://gtk-doc.make \
diff --git a/recipes/networkmanager/networkmanager_git.bb b/recipes/networkmanager/networkmanager_git.bb
index a492470c94..39b0bf3ca5 100644
--- a/recipes/networkmanager/networkmanager_git.bb
+++ b/recipes/networkmanager/networkmanager_git.bb
@@ -9,7 +9,7 @@ PR_append = ".gitr${SRCREV}"
 inherit gnome
 
 SRC_URI = "git://anongit.freedesktop.org/NetworkManager/NetworkManager;protocol=git;branch=NETWORKMANAGER_0_7 \
-	file://remove-gtk-doc-make.patch;patch=1 \
+	file://remove-gtk-doc-make.patch \
 	file://nm-system-settings.conf \
 	file://NetworkManager \
            file://gtk-doc.make \
diff --git a/recipes/networkmanager/networkmanager_svn.bb b/recipes/networkmanager/networkmanager_svn.bb
index 9d8f22dc7b..b8bda2e1f2 100644
--- a/recipes/networkmanager/networkmanager_svn.bb
+++ b/recipes/networkmanager/networkmanager_svn.bb
@@ -8,8 +8,8 @@ PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += "svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
-            file://define_kernel_types_for_old_linux_headers.patch;patch=1 \
-            file://no-restarts.diff;patch=1;pnum=0 \
+            file://define_kernel_types_for_old_linux_headers.patch \
+            file://no-restarts.diff;striplevel=0 \
            "
 
 S = "${WORKDIR}/trunk"
diff --git a/recipes/neuros-public/neuros-app-photoalbum_git.bb b/recipes/neuros-public/neuros-app-photoalbum_git.bb
index 81dabca283..a17fdb55a6 100644
--- a/recipes/neuros-public/neuros-app-photoalbum_git.bb
+++ b/recipes/neuros-public/neuros-app-photoalbum_git.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Neuros photoalbum app"
 LICENSE = "GPL"
 
-PV = "0.0+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+${PR}+gitr${SRCREV}"
 PR = "r1"
 
 inherit qt4e
diff --git a/recipes/neuros-public/neuros-app-vplayer_git.bb b/recipes/neuros-public/neuros-app-vplayer_git.bb
index 2d80785f94..5bb2d8008c 100644
--- a/recipes/neuros-public/neuros-app-vplayer_git.bb
+++ b/recipes/neuros-public/neuros-app-vplayer_git.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Neuros videoplayer app"
 LICENSE = "GPL"
 
-PV = "0.0+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+${PR}+gitr${SRCREV}"
 PR = "r1"
 
 inherit qt4e
diff --git a/recipes/neuros-public/neuros-lib-gui_git.bb b/recipes/neuros-public/neuros-lib-gui_git.bb
index ccadf0e74a..2c46dcc843 100644
--- a/recipes/neuros-public/neuros-lib-gui_git.bb
+++ b/recipes/neuros-public/neuros-lib-gui_git.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Neuros lib-gui"
 LICENSE = "GPL"
 
-PV = "0.0+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+${PR}+gitr${SRCREV}"
 PR = "r1"
 
 inherit qt4e
diff --git a/recipes/neuros-public/neuros-lib-widgets_git.bb b/recipes/neuros-public/neuros-lib-widgets_git.bb
index 2857b98079..6718880583 100644
--- a/recipes/neuros-public/neuros-lib-widgets_git.bb
+++ b/recipes/neuros-public/neuros-lib-widgets_git.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
-PV = "0.0+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+${PR}+gitr${SRCREV}"
 PR = "r3"
 
 inherit qt4e
diff --git a/recipes/neuros-public/neuros-mainmenu_git.bb b/recipes/neuros-public/neuros-mainmenu_git.bb
index f1bb262e9f..a8aca3124c 100644
--- a/recipes/neuros-public/neuros-mainmenu_git.bb
+++ b/recipes/neuros-public/neuros-mainmenu_git.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Neuros window manager"
 LICENSE = "GPL"
 
-PV = "0.0+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+${PR}+gitr${SRCREV}"
 PR = "r2"
 
 inherit qt4e
diff --git a/recipes/neuros-public/neuros-nwm_git.bb b/recipes/neuros-public/neuros-nwm_git.bb
index bbe40b0059..258842afa4 100644
--- a/recipes/neuros-public/neuros-nwm_git.bb
+++ b/recipes/neuros-public/neuros-nwm_git.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Neuros window manager"
 LICENSE = "GPL"
 
-PV = "0.0+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+${PR}+gitr${SRCREV}"
 PR = "r7"
 
 inherit qt4e update-rc.d
diff --git a/recipes/neuros-public/neuros-qt-plugins_git.bb b/recipes/neuros-public/neuros-qt-plugins_git.bb
index 6b3ecf496a..416639ba6e 100644
--- a/recipes/neuros-public/neuros-qt-plugins_git.bb
+++ b/recipes/neuros-public/neuros-qt-plugins_git.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
-PV = "0.0+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+${PR}+gitr${SRCREV}"
 PR = "r4"
 
 inherit qt4e
diff --git a/recipes/nfs-utils/nfs-utils-1.1.2/nfs-utils-S_ISREG-missing-include.patch b/recipes/nfs-utils/nfs-utils-1.1.2/nfs-utils-S_ISREG-missing-include.patch
new file mode 100644
index 0000000000..6b2c75e7a8
--- /dev/null
+++ b/recipes/nfs-utils/nfs-utils-1.1.2/nfs-utils-S_ISREG-missing-include.patch
@@ -0,0 +1,33 @@
+diff -uNr nfs-utils-1.1.2.orig//utils/exportfs/exportfs.c nfs-utils-1.1.2/utils/exportfs/exportfs.c
+--- nfs-utils-1.1.2.orig//utils/exportfs/exportfs.c	2008-03-14 16:46:29.000000000 +0100
++++ nfs-utils-1.1.2/utils/exportfs/exportfs.c	2010-05-26 10:31:23.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include <getopt.h>
+ #include <netdb.h>
+ #include <errno.h>
++#include <sys/stat.h>
+ #include "xmalloc.h"
+ #include "misc.h"
+ #include "nfslib.h"
+diff -uNr nfs-utils-1.1.2.orig//utils/mount/mount.c nfs-utils-1.1.2/utils/mount/mount.c
+--- nfs-utils-1.1.2.orig//utils/mount/mount.c	2008-03-14 16:46:29.000000000 +0100
++++ nfs-utils-1.1.2/utils/mount/mount.c	2010-05-26 10:31:32.000000000 +0200
+@@ -24,6 +24,7 @@
+ 
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
+diff -uNr nfs-utils-1.1.2.orig//utils/mount/network.c nfs-utils-1.1.2/utils/mount/network.c
+--- nfs-utils-1.1.2.orig//utils/mount/network.c	2008-03-14 16:46:29.000000000 +0100
++++ nfs-utils-1.1.2/utils/mount/network.c	2010-05-26 10:31:35.000000000 +0200
+@@ -37,6 +37,7 @@
+ #include <rpc/pmap_prot.h>
+ #include <rpc/pmap_clnt.h>
+ #include <sys/socket.h>
++#include <sys/stat.h>
+ 
+ #include "xcommon.h"
+ #include "mount.h"
diff --git a/recipes/nfs-utils/nfs-utils_1.0.6.bb b/recipes/nfs-utils/nfs-utils_1.0.6.bb
index ba82f5bbba..e847c86ced 100644
--- a/recipes/nfs-utils/nfs-utils_1.0.6.bb
+++ b/recipes/nfs-utils/nfs-utils_1.0.6.bb
@@ -5,12 +5,12 @@ LICENSE = "GPL"
 PR = "r13"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
-	file://acinclude-lossage.patch;patch=1 \
-	file://rpcgen-lossage.patch;patch=1 \
-	file://stat-include.patch;patch=1 \
-	file://nfs-utils-1.0.6-uclibc.patch;patch=1 \
-	file://kernel-2.6.18+.patch;patch=1 \
-	file://uclibc_bzero_fix.patch;patch=1 \
+	file://acinclude-lossage.patch \
+	file://rpcgen-lossage.patch \
+	file://stat-include.patch \
+	file://nfs-utils-1.0.6-uclibc.patch \
+	file://kernel-2.6.18+.patch \
+	file://uclibc_bzero_fix.patch \
 	file://nfsserver \
 	file://forgotten-defines"
 
diff --git a/recipes/nfs-utils/nfs-utils_1.1.2.bb b/recipes/nfs-utils/nfs-utils_1.1.2.bb
index c8200c207b..be45310d06 100644
--- a/recipes/nfs-utils/nfs-utils_1.1.2.bb
+++ b/recipes/nfs-utils/nfs-utils_1.1.2.bb
@@ -3,13 +3,14 @@ PRIORITY = "optional"
 SECTION = "console/network"
 LICENSE = "GPL"
 
-PR = "r7"
+PR = "r8"
 
 DEPENDS = "util-linux-ng tcp-wrappers libevent"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
-	file://nfs-utils-tools-unset-cflags.patch;patch=1 \
-	file://nfs-utils-uclibc-compile.patch;patch=1 \
+	file://nfs-utils-tools-unset-cflags.patch \
+	file://nfs-utils-uclibc-compile.patch \
+	file://nfs-utils-S_ISREG-missing-include.patch \
 	file://nfsserver \
    "
 
diff --git a/recipes/ngrep/ngrep_1.42.bb b/recipes/ngrep/ngrep_1.42.bb
index e20acf251d..7e12eb18d4 100644
--- a/recipes/ngrep/ngrep_1.42.bb
+++ b/recipes/ngrep/ngrep_1.42.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 DEPENDS = "libpcap libpcre"
 LICENSE="ngrep"
 SRC_URI = "${SOURCEFORGE_MIRROR}/ngrep/ngrep-${PV}.tar.bz2 \
-           file://use-our-pcre.patch;patch=1"
+           file://use-our-pcre.patch"
 
 EXTRA_OECONF = "--with-restart --enable-pcre --with-pcap-includes=${STAGING_INCDIR}"
 EXTRA_OEMAKE = "INCLUDES=${S}"
diff --git a/recipes/nilfs-utils/nilfs-utils_2.0.13.bb b/recipes/nilfs-utils/nilfs-utils_2.0.13.bb
index d37315555d..78174e13a3 100644
--- a/recipes/nilfs-utils/nilfs-utils_2.0.13.bb
+++ b/recipes/nilfs-utils/nilfs-utils_2.0.13.bb
@@ -11,7 +11,7 @@ RRECOMMENDS_${PN} = "nilfs-utils-mkfs nilfs-utils-stats"
 PR = "r0"
 
 SRC_URI ="http://www.nilfs.org/download/nilfs-utils-${PV}.tar.bz2 \
-file://no-ldconfig-during-install.patch;patch=1"
+file://no-ldconfig-during-install.patch"
 
 S = "${WORKDIR}/nilfs-utils-${PV}"
 
diff --git a/recipes/nis/pwdutils_2.6.bb b/recipes/nis/pwdutils_2.6.bb
index 06e2bdb938..2c24ddc625 100644
--- a/recipes/nis/pwdutils_2.6.bb
+++ b/recipes/nis/pwdutils_2.6.bb
@@ -16,8 +16,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
 
 # an selinux API is used even if no selinux is detected by
 # configure.
-SRC_URI += " file://no-selinux.patch;patch=1"
-SRC_URI += " file://libdl.patch;patch=1"
+SRC_URI += " file://no-selinux.patch"
+SRC_URI += " file://libdl.patch"
 
 DEPENDS += " libpam openldap openssl"
 
diff --git a/recipes/nmap/nmap_3.81.bb b/recipes/nmap/nmap_3.81.bb
index ca61d7ebe4..4350c22d98 100644
--- a/recipes/nmap/nmap_3.81.bb
+++ b/recipes/nmap/nmap_3.81.bb
@@ -8,8 +8,8 @@ PR = "r2"
 inherit autotools
 
 SRC_URI = "http://download.insecure.org/nmap/dist-old/nmap-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1 \
-	   file://remove_gtk.patch;patch=1"
+	   file://autofoo.patch \
+	   file://remove_gtk.patch"
 S = "${WORKDIR}/nmap-${PV}"
 
 EXTRA_OECONF = "--with-pcap=linux \
diff --git a/recipes/nmon/nmon_13g.bb b/recipes/nmon/nmon_13g.bb
new file mode 100644
index 0000000000..0aa4095c75
--- /dev/null
+++ b/recipes/nmon/nmon_13g.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "nmon performance monitor"
+HOMEPAGE = "http://nmon.sf.net"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon13g.c"
+
+SRC_URI[md5sum] = "b1b8e6c0123ad232394991f2d4f40494"
+SRC_URI[sha256sum] = "456ab2a342b31d1a352d0d940af5962fa65a12ae8757ff73e6e73210832ae8b5"
+
+CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM"
+LDFLAGS += "-lncurses"
+
+do_compile() {
+	${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/lmon13g.c -o nmon
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 nmon ${D}${bindir}
+}
diff --git a/recipes/nonworking/aodv/aodv-modules_2.2.2.bb b/recipes/nonworking/aodv/aodv-modules_2.2.2.bb
index 94a67ee557..417d6766ec 100644
--- a/recipes/nonworking/aodv/aodv-modules_2.2.2.bb
+++ b/recipes/nonworking/aodv/aodv-modules_2.2.2.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.antd.nist.gov/wctg/aodv_kernel/kernel-aodv_v${PV}.tgz \
-	   file://fix-makefile.patch;patch=1"
+	   file://fix-makefile.patch"
 S = "${WORKDIR}/kernel-aodv_v${PV}"
 
 inherit module
diff --git a/recipes/nonworking/atmelwlandriver/atmelwlandriver_3.3.5.6.bb b/recipes/nonworking/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
index b3f3f5c1f1..b6f39e964d 100644
--- a/recipes/nonworking/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
+++ b/recipes/nonworking/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
@@ -1,7 +1,7 @@
 SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \
 	file://dotconfig \
 	file://pcmf502rd.conf \
-	file://makefile.patch;patch=1"
+	file://makefile.patch"
 S = "${WORKDIR}/atmelwlandriver"
 LICENSE = "GPL"
 
diff --git a/recipes/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/recipes/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
index ed6a6ccdf1..ff97fc2856 100644
--- a/recipes/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
+++ b/recipes/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
@@ -1,10 +1,10 @@
 SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \
 	file://dotconfig \
 	file://pcmf502rd.conf \
-	file://makefile.patch;patch=1 \
-	file://add-compaq-usb-ids.patch;patch=1 \
-	file://power-on-and-leds.patch;patch=1 \
-	file://fix-kernel-version-test-for-hh.patch;patch=1"
+	file://makefile.patch \
+	file://add-compaq-usb-ids.patch \
+	file://power-on-and-leds.patch \
+	file://fix-kernel-version-test-for-hh.patch"
 S = "${WORKDIR}/atmelwlandriver"
 LICENSE = "GPL"
 PR = "r2"
diff --git a/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb b/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb
index cbfddb373d..c35193dcee 100644
--- a/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb
+++ b/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb
@@ -3,7 +3,7 @@ require e2fsprogs.inc
 PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI += "file://no-hardlinks.patch;patch=1"
+SRC_URI += "file://no-hardlinks.patch"
 
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
diff --git a/recipes/nonworking/gnuboy/qtopiagnuboy_1.0.3.bb b/recipes/nonworking/gnuboy/qtopiagnuboy_1.0.3.bb
index ec09449ea4..55c27903a4 100644
--- a/recipes/nonworking/gnuboy/qtopiagnuboy_1.0.3.bb
+++ b/recipes/nonworking/gnuboy/qtopiagnuboy_1.0.3.bb
@@ -4,8 +4,8 @@ PRIORITY = "optional"
 DEPENDS = "libsdl-qpe"
 
 SRC_URI = "http://www.warmi.net/zaurus/files/gnuboy-${PV}-qtopia3.tar.gz \
-           file://qtopiagnuboyl-hwkeys.patch;patch=1 \
-           file://gcc3.patch;patch=1"
+           file://qtopiagnuboyl-hwkeys.patch \
+           file://gcc3.patch"
 S = "${WORKDIR}/gnuboy"
 
 FILES = ""
diff --git a/recipes/nonworking/greader/greader_0.61.bb b/recipes/nonworking/greader/greader_0.61.bb
index df06d98e80..a75d208ccf 100644
--- a/recipes/nonworking/greader/greader_0.61.bb
+++ b/recipes/nonworking/greader/greader_0.61.bb
@@ -6,7 +6,7 @@ SECTION = "gpe/applications"
 #RDEPENDS = "gpe-icons"
 
 SRC_URI = "http://handhelds.org/~gberenfield/${PN}_${PV}_src.tgz \
-           file://greader.patch;patch=1;pnum=1"
+           file://greader.patch"
 S = "${WORKDIR}/greader/"
 
 SRC_URI[md5sum] = "6a2c4167c79ccd768e770e693e5e69bd"
diff --git a/recipes/nonworking/gtk+/gtk+-directfb_2.10.14.bb b/recipes/nonworking/gtk+/gtk+-directfb_2.10.14.bb
index 0ea6168028..2b7ea24095 100644
--- a/recipes/nonworking/gtk+/gtk+-directfb_2.10.14.bb
+++ b/recipes/nonworking/gtk+/gtk+-directfb_2.10.14.bb
@@ -25,23 +25,23 @@ RRECOMMENDS_${PN}_linux-gnueabi = " "
 FILESPATH = "${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch;patch=1 \
-           file://automake-lossage.patch;patch=1 \
-           file://disable-tooltips.patch;patch=1 \
-           file://gtklabel-resize-patch;patch=1 \
-           file://menu-deactivate.patch;patch=1 \
-           file://xsettings.patch;patch=1 \
-           file://scroll-timings.patch;patch=1 \
-           file://small-gtkfilesel.patch;patch=1 \
-           file://migration.patch;patch=1;pnum=0 \
-           file://run-iconcache.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://single-click.patch;patch=1 \
-           file://spinbutton.patch;patch=1 \
-           file://gtk+-handhelds.patch;patch=1 \
-	   file://directfb-pixbuf-deprecated-fix.patch;patch=1 \
-#	   file://gtk-doc.patch;patch=1 \
+           file://no-xwc.patch \
+           file://automake-lossage.patch \
+           file://disable-tooltips.patch \
+           file://gtklabel-resize-patch;apply=yes \
+           file://menu-deactivate.patch \
+           file://xsettings.patch \
+           file://scroll-timings.patch \
+           file://small-gtkfilesel.patch \
+           file://migration.patch;striplevel=0 \
+           file://run-iconcache.patch \
+           file://hardcoded_libtool.patch \
+           file://no-demos.patch \
+           file://single-click.patch \
+           file://spinbutton.patch \
+           file://gtk+-handhelds.patch \
+	   file://directfb-pixbuf-deprecated-fix.patch \
+#	   file://gtk-doc.patch \
 "
 EXTRA_OECONF =" \
                 --prefix=${STAGING_DIR_HOST}${layout_prefix} \
diff --git a/recipes/nonworking/guile/guile-native_1.6.4.bb b/recipes/nonworking/guile/guile-native_1.6.4.bb
index 0305cf5a12..6ccbf9b1f5 100644
--- a/recipes/nonworking/guile/guile-native_1.6.4.bb
+++ b/recipes/nonworking/guile/guile-native_1.6.4.bb
@@ -2,7 +2,7 @@ SECTION = "unknown"
 LICENSE = "GPL"
 DEPENDS = "gmp-native"
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
-	   file://guile-amd64.patch;patch=1"
+	   file://guile-amd64.patch"
 
 inherit autotools native
 
diff --git a/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb b/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb
index 81c51ce6a4..52f5d9d5a5 100644
--- a/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb
+++ b/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb
@@ -6,21 +6,21 @@ RDEPENDS = "mtd-utils"
 PR ="r2"
 
 SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_24_pre2 \
-	file://01-mtd-2004-01-27.diff;patch=1 \
-	file://02-mtd-mtx-1-map.diff;patch=1 \
-	file://03-mtd-erase-compiler-bug.diff;patch=1 \
-	file://04-zboot-2.4.24.patch;patch=1 \
-	file://05-zboot-cflags.diff;patch=1 \
-	file://06-zboot-mtx.diff;patch=1 \
-	file://07-zimage-flash-bin.patch;patch=1 \
-	file://08-usb-nonpci-2.4.24.patch;patch=1 \
-	file://09-iw-max-spy-32.diff;patch=1 \
-	file://10-mtx-pci-slots.diff;patch=1 \
-	file://11-mtx-extraversion.diff;patch=1 \
-	file://12-openswan-2.2.0-nat-t.diff;patch=1 \
-	file://13-openswan-2.2.0.patch;patch=1 \
-	file://14-au1000-eth-vlan.diff;patch=1 \
-	file://15-mtd-proc-partition-rw.diff;patch=1 \
+	file://01-mtd-2004-01-27.diff \
+	file://02-mtd-mtx-1-map.diff \
+	file://03-mtd-erase-compiler-bug.diff \
+	file://04-zboot-2.4.24.patch \
+	file://05-zboot-cflags.diff \
+	file://06-zboot-mtx.diff \
+	file://07-zimage-flash-bin.patch \
+	file://08-usb-nonpci-2.4.24.patch \
+	file://09-iw-max-spy-32.diff \
+	file://10-mtx-pci-slots.diff \
+	file://11-mtx-extraversion.diff \
+	file://12-openswan-2.2.0-nat-t.diff \
+	file://13-openswan-2.2.0.patch \
+	file://14-au1000-eth-vlan.diff \
+	file://15-mtd-proc-partition-rw.diff \
 	file://defconfig-mtx-1"
 
 S = "${WORKDIR}/linux"
diff --git a/recipes/nonworking/mISDN/misdn_cvs.bb b/recipes/nonworking/mISDN/misdn_cvs.bb
index 865e41b2f9..5d254b0e74 100644
--- a/recipes/nonworking/mISDN/misdn_cvs.bb
+++ b/recipes/nonworking/mISDN/misdn_cvs.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1"
 # hfcs_usb_endianchecks.diff does not apply cleanly anymore (cf. bug 240)
 # without it the package at least compiles.  no guarantees about functionality.
 SRC_URI = "cvs://anonymous:readonly@cvs.isdn4linux.de/i4ldev;module=mISDN;method=pserver \
-#	   file://hfcs_usb_endianchecks.diff;patch=1 \
+#	   file://hfcs_usb_endianchecks.diff \
 	   file://Makefile"
 
 S = "${WORKDIR}/mISDN/"
diff --git a/recipes/nonworking/maemo/hildon-home_0.8.20-2.bb b/recipes/nonworking/maemo/hildon-home_0.8.20-2.bb
index 5147a8b9e0..61c2ddf5bb 100644
--- a/recipes/nonworking/maemo/hildon-home_0.8.20-2.bb
+++ b/recipes/nonworking/maemo/hildon-home_0.8.20-2.bb
@@ -4,8 +4,8 @@ LICENSE    = "GPL"
 DEPENDS = "gtk+-2.6.4-1.osso7 hildon-lgpl libosso hildon-base-lib hildon-libs osso-gnome-vfs2 osso-thumbnail"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
-           file://source.patch;patch=1;pnum=0 \
-           file://noWerror.patch;patch=1;pnum=0"
+           file://source.patch;striplevel=0 \
+           file://noWerror.patch;striplevel=0"
 
 S = "${WORKDIR}/hildon-home-0.8.20"
 
diff --git a/recipes/nonworking/maemo/hildon-initscripts_0.8.14-1.bb b/recipes/nonworking/maemo/hildon-initscripts_0.8.14-1.bb
index 5ca6a9ba90..713d6da669 100644
--- a/recipes/nonworking/maemo/hildon-initscripts_0.8.14-1.bb
+++ b/recipes/nonworking/maemo/hildon-initscripts_0.8.14-1.bb
@@ -4,7 +4,7 @@ LICENSE    = "GPL"
 DEPENDS = "gtk+-2.6.4-1.osso7 matchbox-wm dbus osso-esd"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
-           file://hildon-initscripts-source.patch;patch=1;pnum=0"
+           file://hildon-initscripts-source.patch;striplevel=0"
 
 S = "${WORKDIR}/hildon-initscripts-0.8.14"
 
diff --git a/recipes/nonworking/maemo/hildon-lgpl_0.9.14-2.bb b/recipes/nonworking/maemo/hildon-lgpl_0.9.14-2.bb
index 2d0f1e15ba..3d5a9d6bd0 100644
--- a/recipes/nonworking/maemo/hildon-lgpl_0.9.14-2.bb
+++ b/recipes/nonworking/maemo/hildon-lgpl_0.9.14-2.bb
@@ -3,7 +3,7 @@ LICENSE = 	"LGPL"
 DEPENDS = "gtk+-2.6.4-1.osso7 outo libxtst libmatchbox libxi libxt libpng gconf"
 
 SRC_URI = 	"http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-lgpl/hildon-lgpl_${PV}.tar.gz \
-			file://hildon-lgpl-noWerror.patch;patch=1"
+			file://hildon-lgpl-noWerror.patch"
 
 S =	"${WORKDIR}/hildon-lgpl-0.9.14"
 EXTRA_OECONF =	"--enable-shared --disable-gtk-doc"
diff --git a/recipes/nonworking/maemo/hildon-libs_0.9.6-2.bb b/recipes/nonworking/maemo/hildon-libs_0.9.6-2.bb
index 70fc90e21d..2e5e6d9903 100644
--- a/recipes/nonworking/maemo/hildon-libs_0.9.6-2.bb
+++ b/recipes/nonworking/maemo/hildon-libs_0.9.6-2.bb
@@ -3,7 +3,7 @@ LICENSE = 	"LGPL"
 
 DEPENDS =	"dbus hildon-lgpl hildon-fm outo gtk+-2.6.4-1.osso7"
 SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
-			file://hildon-libs-no-werror.patch;patch=1"
+			file://hildon-libs-no-werror.patch"
 
 S = "${WORKDIR}/hildon-libs-0.9.6"
 
diff --git a/recipes/nonworking/maemo/hildon-navigator_0.9.6-2.bb b/recipes/nonworking/maemo/hildon-navigator_0.9.6-2.bb
index 25fe77ac3f..28598a1dcc 100644
--- a/recipes/nonworking/maemo/hildon-navigator_0.9.6-2.bb
+++ b/recipes/nonworking/maemo/hildon-navigator_0.9.6-2.bb
@@ -4,7 +4,7 @@ LICENSE    = "GPL"
 DEPENDS = "gtk+-2.6.4-1.osso7 libmatchbox gconf hildon-lgpl libosso osso-af-settings hildon-base-lib"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
-           file://source.patch;patch=1;pnum=0"
+           file://source.patch;striplevel=0"
 
 S = "${WORKDIR}/hildon-navigator-0.9.6"
 
diff --git a/recipes/nonworking/maemo/sapwood_1.20-1.bb b/recipes/nonworking/maemo/sapwood_1.20-1.bb
index 3e1de4be0e..f72b1f86b0 100644
--- a/recipes/nonworking/maemo/sapwood_1.20-1.bb
+++ b/recipes/nonworking/maemo/sapwood_1.20-1.bb
@@ -7,8 +7,8 @@ DEPENDS = "gtk+-2.6.4-1.osso7"
 FILES_${PN} += "${libdir}/gtk-2.0/2.4.0/engines/"
 
 SRC_URI = "http://stage.maemo.org/pool/maemo/ossw/source/s/${PN}/${PN}_${PV}.tar.gz \
-           file://cflags.patch;patch=1;pnum=0 \
-           file://sockets.patch;patch=1;pnum=0"
+           file://cflags.patch;striplevel=0 \
+           file://sockets.patch;striplevel=0"
 
 S = "${WORKDIR}/${PN}-1.20"
 EXTRA_OECONF = "--enable-abstract-sockets=no"
diff --git a/recipes/nonworking/php/php.inc b/recipes/nonworking/php/php.inc
index cbec13d72d..bfee93c5cd 100644
--- a/recipes/nonworking/php/php.inc
+++ b/recipes/nonworking/php/php.inc
@@ -4,8 +4,8 @@ SECTION = "console/network"
 LICENSE = "PHP"
 
 SRC_URI =     "http://us2.php.net/distributions/php-${PV}.tar.bz2;name=src \
-               file://acinclude-xml2-config.patch;patch=1 \
-               file://php-m4-divert.patch;patch=1"
+               file://acinclude-xml2-config.patch \
+               file://php-m4-divert.patch"
 
 S = "${WORKDIR}/php-${PV}"
 
diff --git a/recipes/nonworking/php/php_4.4.4.bb b/recipes/nonworking/php/php_4.4.4.bb
index 6f72e91365..b97a97440f 100644
--- a/recipes/nonworking/php/php_4.4.4.bb
+++ b/recipes/nonworking/php/php_4.4.4.bb
@@ -3,8 +3,8 @@ require php.inc
 PR = "r1"
 
 SRC_URI = "http://museum.php.net/php4/php-${PV}.tar.bz2 \
-           file://${FILESDIR}/autotools.patch;patch=1 \
-           file://${FILESDIR}/pear.patch;patch=1"
+           file://${FILESDIR}/autotools.patch \
+           file://${FILESDIR}/pear.patch"
 
 
 SRC_URI[md5sum] = "bc6fa8908e2ac36e93bab9f7d42cda3a"
diff --git a/recipes/nonworking/pixdev/pixdev-stable_0.1.bb b/recipes/nonworking/pixdev/pixdev-stable_0.1.bb
index 9d3ae84060..405b802d92 100644
--- a/recipes/nonworking/pixdev/pixdev-stable_0.1.bb
+++ b/recipes/nonworking/pixdev/pixdev-stable_0.1.bb
@@ -5,7 +5,7 @@ DEPENDS = "microwindows"
 RDEPENDS = "microwindows"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pixdev/pixdev-stable-${PV}.tar.gz \
-          file://${FILESDIR}/braces.patch;patch=1"
+          file://${FILESDIR}/braces.patch"
 export EXTRA_OEMAKE=
 
 inherit autotools
diff --git a/recipes/nonworking/python/python-gsl_0.2.0.bb b/recipes/nonworking/python/python-gsl_0.2.0.bb
index 03f5eb8f0b..7673f23875 100644
--- a/recipes/nonworking/python/python-gsl_0.2.0.bb
+++ b/recipes/nonworking/python/python-gsl_0.2.0.bb
@@ -6,7 +6,7 @@ RDEPENDS = "python-core gsl"
 SRCNAME = "pygsl"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-           file://${FILESDIR}/cross-compile.patch;patch=1"
+           file://${FILESDIR}/cross-compile.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/recipes/nonworking/r/r_2.0.0.bb b/recipes/nonworking/r/r_2.0.0.bb
index 68d8e5d3bc..0815869fcc 100644
--- a/recipes/nonworking/r/r_2.0.0.bb
+++ b/recipes/nonworking/r/r_2.0.0.bb
@@ -6,21 +6,21 @@ PRIORITY = "optional"
 DEPENDS = "ncurses readline less perl-native r-native"
 
 SRC_URI = "http://www.stats.bris.ac.uk/R/src/base/R-2/R-${PV}.tar.gz \
-	file://configure.patch;patch=1 \
-	file://src_library_Makefile.patch;patch=1 \
-	file://src_library_Recommended_Makefile.patch;patch=1 \
-	file://src_library_base_Makefile.patch;patch=1 \
-	file://src_library_tools_Makefile.patch;patch=1 \
-	file://src_library_utils_Makefile.patch;patch=1 \
-	file://src_library_datasets_Makefile.patch;patch=1 \
-	file://src_library_graphics_Makefile.patch;patch=1 \
-	file://src_library_grid_Makefile.patch;patch=1 \
-	file://src_library_methods_Makefile.patch;patch=1 \
-	file://src_library_splines_Makefile.patch;patch=1 \
-	file://src_library_stats4_Makefile.patch;patch=1 \
-	file://src_library_stats_Makefile.patch;patch=1 \
-	file://src_library_tcltk_Makefile.patch;patch=1 \
-	file://src_library_grDevices_Makefile.patch;patch=1"
+	file://configure.patch \
+	file://src_library_Makefile.patch \
+	file://src_library_Recommended_Makefile.patch \
+	file://src_library_base_Makefile.patch \
+	file://src_library_tools_Makefile.patch \
+	file://src_library_utils_Makefile.patch \
+	file://src_library_datasets_Makefile.patch \
+	file://src_library_graphics_Makefile.patch \
+	file://src_library_grid_Makefile.patch \
+	file://src_library_methods_Makefile.patch \
+	file://src_library_splines_Makefile.patch \
+	file://src_library_stats4_Makefile.patch \
+	file://src_library_stats_Makefile.patch \
+	file://src_library_tcltk_Makefile.patch \
+	file://src_library_grDevices_Makefile.patch"
 
 S = "${WORKDIR}/R-${PV}"
 
diff --git a/recipes/nonworking/sword/sword_1.5.9.bb b/recipes/nonworking/sword/sword_1.5.9.bb
index ba2d24334c..d9f3c65fa0 100644
--- a/recipes/nonworking/sword/sword_1.5.9.bb
+++ b/recipes/nonworking/sword/sword_1.5.9.bb
@@ -9,7 +9,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz \
-           file://gcc-visibility.patch;patch=1"
+           file://gcc-visibility.patch"
 
 inherit autotools pkgconfig lib_package
 
diff --git a/recipes/nonworking/tetex/tetex_3.0.bb b/recipes/nonworking/tetex/tetex_3.0.bb
index ac9141deb0..ee0f84c010 100644
--- a/recipes/nonworking/tetex/tetex_3.0.bb
+++ b/recipes/nonworking/tetex/tetex_3.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxe
 PR = "r6"
 
 SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \
-           file://configure.patch;patch=1"
+           file://configure.patch"
 S = "${WORKDIR}/tetex-src-${PV}"
 
 inherit autotools
diff --git a/recipes/nonworking/unionfs/unionfs-modules_1.0.11.bb b/recipes/nonworking/unionfs/unionfs-modules_1.0.11.bb
index dc40123660..c82a0cb5dc 100644
--- a/recipes/nonworking/unionfs/unionfs-modules_1.0.11.bb
+++ b/recipes/nonworking/unionfs/unionfs-modules_1.0.11.bb
@@ -1,7 +1,7 @@
 require unionfs-modules.inc
 require unionfs.inc
 
-SRC_URI += "file://make.patch;patch=1"
+SRC_URI += "file://make.patch"
 
 SRC_URI[md5sum] = "494651fe0cf724c093b4be80e35e857f"
 SRC_URI[sha256sum] = "f1df81423a65590ffd20df43f5cd0be14cf6746437eb40c2c924f5f58a6e18a7"
\ No newline at end of file
diff --git a/recipes/nonworking/unison/unison_2.9.1.bb b/recipes/nonworking/unison/unison_2.9.1.bb
index 5d248d8ae1..82ce78c361 100644
--- a/recipes/nonworking/unison/unison_2.9.1.bb
+++ b/recipes/nonworking/unison/unison_2.9.1.bb
@@ -3,7 +3,7 @@ SECTION = "net"
 PRIORITY = "optional"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/u/${PN}/${PN}_${PV}.orig.tar.gz \
-           file://${FILESDIR}/debian.patch;patch=1"
+           file://${FILESDIR}/debian.patch"
 
 SRC_URI[md5sum] = "d8084fa87c13671de21ec1b701a4606c"
 SRC_URI[sha256sum] = "42420dcea33d337cb9859d7f51d76ec5a1cf48f7f8b24b1b820c969248a270a6"
diff --git a/recipes/notecase/notecase.inc b/recipes/notecase/notecase.inc
index 951930d27b..983a2d42a8 100644
--- a/recipes/notecase/notecase.inc
+++ b/recipes/notecase/notecase.inc
@@ -6,7 +6,7 @@ LICENSE = "BSD"
 DEPENDS = "zlib gtk+ gnome-vfs"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}_src.tar.gz \
-           file://no-hardcoded-cxx.patch;patch=1"
+           file://no-hardcoded-cxx.patch"
 
 do_compile_prepend() {
         cp ${STAGING_LIBDIR}/libz.a ${S}/src/lib/zlib/
diff --git a/recipes/notez/notez_1.1.0.bb b/recipes/notez/notez_1.1.0.bb
index e37cc9ec7c..99fc83ae76 100644
--- a/recipes/notez/notez_1.1.0.bb
+++ b/recipes/notez/notez_1.1.0.bb
@@ -10,8 +10,8 @@ APPDESKTOP = "${S}"
 PR = "r1"
 
 SRC_URI = "http://www.holtschneider.com/notez/notez-${PV}.tar.gz \
-file://use-homedir.patch;patch=1 \
-file://fix-encoding.patch;patch=1"
+file://use-homedir.patch \
+file://fix-encoding.patch"
 
 inherit opie
 
diff --git a/recipes/notification-daemon/notification-daemon_0.3.6.bb b/recipes/notification-daemon/notification-daemon_0.3.6.bb
index d21e555937..285b2e3a60 100644
--- a/recipes/notification-daemon/notification-daemon_0.3.6.bb
+++ b/recipes/notification-daemon/notification-daemon_0.3.6.bb
@@ -6,7 +6,7 @@ DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
 PR = "r1"
 
 SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
-           file://dbus-glib-tool-prefix.patch;patch=1"
+           file://dbus-glib-tool-prefix.patch"
 
 EXTRA_OECONF = "--disable-binreloc"
 
diff --git a/recipes/notification-daemon/notification-daemon_0.3.7.bb b/recipes/notification-daemon/notification-daemon_0.3.7.bb
index 0f5dceb977..366fafd5cb 100644
--- a/recipes/notification-daemon/notification-daemon_0.3.7.bb
+++ b/recipes/notification-daemon/notification-daemon_0.3.7.bb
@@ -6,7 +6,7 @@ DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
 PR = "r1"
 
 SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
-           file://notification-daemon-fix-text-color.diff;patch=1"
+           file://notification-daemon-fix-text-color.diff"
 
 EXTRA_OECONF = "--disable-binreloc"
 
diff --git a/recipes/nrlolsr/nrlolsr_7.8.1.bb b/recipes/nrlolsr/nrlolsr_7.8.1.bb
index 7e60c82b16..3a748b90d1 100644
--- a/recipes/nrlolsr/nrlolsr_7.8.1.bb
+++ b/recipes/nrlolsr/nrlolsr_7.8.1.bb
@@ -5,7 +5,7 @@ LICENSE = "Public Domain"
 S="${WORKDIR}/nrlolsr/"
 
 SRC_URI = "http://downloads.pf.itd.nrl.navy.mil/olsr/nrlolsrdv7.8.1.tgz \
-           file://nrlolsr-cross.patch;patch=1 \
+           file://nrlolsr-cross.patch \
           "
 
 do_compile () {
diff --git a/recipes/ntop/ntop_3.0.bb b/recipes/ntop/ntop_3.0.bb
index 3e4c211ff4..d8f4426b8b 100644
--- a/recipes/ntop/ntop_3.0.bb
+++ b/recipes/ntop/ntop_3.0.bb
@@ -6,8 +6,8 @@ DEPENDS = "gdbm zlib libpcap libpng gd"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tgz \
-           file://autotools.patch;patch=1 \
-           file://plugins.patch;patch=1"
+           file://autotools.patch \
+           file://plugins.patch"
 
 inherit autotools
 
diff --git a/recipes/ntp/files/hipox/ntp.conf b/recipes/ntp/files/hipox/ntp.conf
new file mode 100644
index 0000000000..57e585c175
--- /dev/null
+++ b/recipes/ntp/files/hipox/ntp.conf
@@ -0,0 +1,13 @@
+# This is the most basic ntp configuration file
+# The driftfile must remain in a place specific to this
+# machine - it records the machine specific clock error
+driftfile /etc/ntp.drift
+# This obtains a random server which will be close
+# (in IP terms) to the machine.  Add other servers
+# as required, or change this.
+#server pool.ntp.org
+# Using local hardware clock as fallback
+server 127.127.1.0
+fudge 127.127.1.0 stratum 14
+# Defining a default security setting
+restrict default nomodify nopeer
diff --git a/recipes/ntp/files/hipox/ntpd b/recipes/ntp/files/hipox/ntpd
new file mode 100755
index 0000000000..7d2cd34cdf
--- /dev/null
+++ b/recipes/ntp/files/hipox/ntpd
@@ -0,0 +1,62 @@
+#! /bin/sh
+#
+# ntpd	init.d script for ntpdc from ntp.isc.org
+test -x /usr/bin/ntpd -a -r /etc/ntp.conf || exit 0
+# rcS contains TICKADJ
+test -r /etc/default/rcS && . /etc/default/rcS
+
+# Functions to do individual actions
+settick(){
+  	# If TICKADJ is set we *must* adjust it before we start, because the
+	# driftfile relies on the correct setting
+	test -n "$TICKADJ" -a -x /usr/bin/tickadj && {
+		echo -n "Setting tick to $TICKADJ: "
+		/usr/bin/tickadj "$TICKADJ"
+		echo "done"
+	}
+}
+startdaemon(){
+	# The -g option allows ntpd to step the time to correct it just
+	# once.  The daemon will exit if the clock drifts too much after
+	# this.  If ntpd seems to disappear after a while assume TICKADJ
+	# above is set to a totally incorrect value.
+	echo -n "Starting ntpd: "
+	start-stop-daemon --start -x /usr/bin/ntpd -- -p /var/run/ntp.pid "$@"
+	echo "done"
+}
+stopdaemon(){
+	echo -n "Stopping ntpd: "
+	start-stop-daemon --stop -p /var/run/ntp.pid
+	echo "done"
+}
+
+case "$1" in
+  start)
+  	settick
+	startdaemon -g -x
+	;;
+  stop)
+  	stopdaemon
+	;;
+  force-reload)
+  	stopdaemon
+  	settick
+	startdaemon -g -x
+	;;
+  restart)
+  	# Don't reset the tick here
+	stopdaemon
+	startdaemon -g -x
+	;;
+  reload)
+  	# Must do this by hand, but don't do -g
+	stopdaemon
+	startdaemon -x
+	;;
+  *)
+	echo "Usage: ntpd { start | stop | restart | reload }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/recipes/ntp/ntp.inc b/recipes/ntp/ntp.inc
index 7ef6d672d1..68b98db80f 100644
--- a/recipes/ntp/ntp.inc
+++ b/recipes/ntp/ntp.inc
@@ -9,7 +9,7 @@ LICENSE = "ntp"
 RSUGGESTS = "iana-etc"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
-	file://ipv6only-workaround.patch;patch=1 \
+	file://ipv6only-workaround.patch \
 	file://ntpd \
 	file://ntp.conf \
 	file://ntpdate"
diff --git a/recipes/ntp/ntp_4.1.2.bb b/recipes/ntp/ntp_4.1.2.bb
index 6555dfcfb0..24e9b05e45 100644
--- a/recipes/ntp/ntp_4.1.2.bb
+++ b/recipes/ntp/ntp_4.1.2.bb
@@ -3,8 +3,8 @@ require ntp.inc
 PR = "r5"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.1/ntp-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://readline.patch;patch=1 \
+	   file://configure.patch \
+	   file://readline.patch \
 	   file://ntpdate \
 	   file://ntp"
 
diff --git a/recipes/ntp/ntp_4.2.0.bb b/recipes/ntp/ntp_4.2.0.bb
index 634c3bffd0..62342ca602 100644
--- a/recipes/ntp/ntp_4.2.0.bb
+++ b/recipes/ntp/ntp_4.2.0.bb
@@ -3,9 +3,9 @@ require ntp.inc
 PR = "r9"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
-	file://ntpdc.Makefile.am.maybe-layout.patch;patch=1 \
-	file://ipv6only-workaround.patch;patch=1 \
-        file://gcc4.patch;patch=1 \
+	file://ntpdc.Makefile.am.maybe-layout.patch \
+	file://ipv6only-workaround.patch \
+        file://gcc4.patch \
 	file://ntpd \
 	file://ntp.conf \
 	file://ntpdate"
diff --git a/recipes/ntp/ntp_4.2.4p7.bb b/recipes/ntp/ntp_4.2.4p7.bb
index 6010b4a920..f21befe554 100644
--- a/recipes/ntp/ntp_4.2.4p7.bb
+++ b/recipes/ntp/ntp_4.2.4p7.bb
@@ -3,8 +3,8 @@ require ntp.inc
 PR = "r1"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
-	file://tickadj.c.patch;patch=1 \
-        file://ntp-4.2.4_p6-nano.patch;patch=1 \
+	file://tickadj.c.patch \
+        file://ntp-4.2.4_p6-nano.patch \
 	file://ntpd \
 	file://ntp.conf \
 	file://ntpdate"
diff --git a/recipes/numptyphysics/numptyphysics_svn.bb b/recipes/numptyphysics/numptyphysics_svn.bb
index 2a9d63d0b4..23920c6480 100644
--- a/recipes/numptyphysics/numptyphysics_svn.bb
+++ b/recipes/numptyphysics/numptyphysics_svn.bb
@@ -15,11 +15,11 @@ SRC_URI = "\
 # Maemo garage is sadly only available with https. Can make you trouble while fetching without accepting the certificate.
   svn://vcs.maemo.org/svn/${PN};module=trunk;proto=https \
   http://wwwpub.zih.tu-dresden.de/~mkluge/numptyphysics_setup.tgz \
-  file://replay_off.patch;patch=1;pnum=0 \
+  file://replay_off.patch;striplevel=0 \
   file://next.png \
-  file://keyb.patch;patch=1;pnum=0 \
+  file://keyb.patch;striplevel=0 \
   file://keyb.png \
-  file://faster.patch;patch=1;pnum=0 \
+  file://faster.patch;striplevel=0 \
   file://numptyphysics.desktop \
 "
 S = "${WORKDIR}/trunk"
diff --git a/recipes/nunome/nunome_1.0.2.bb b/recipes/nunome/nunome_1.0.2.bb
index df38ab48b8..d1a0ff60b0 100644
--- a/recipes/nunome/nunome_1.0.2.bb
+++ b/recipes/nunome/nunome_1.0.2.bb
@@ -7,8 +7,8 @@ RDEPENDS = "virtual-japanese-font"
 PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-${PV}.tar.bz2 \
-	file://timer.patch;patch=1 \
-	file://nunome.patch;patch=1"
+	file://timer.patch \
+	file://nunome.patch"
 S = "${WORKDIR}/nunome"
 
 inherit opie
diff --git a/recipes/nut/nut_2.2.1.bb b/recipes/nut/nut_2.2.1.bb
index 699f2480c3..f6bc606b3b 100644
--- a/recipes/nut/nut_2.2.1.bb
+++ b/recipes/nut/nut_2.2.1.bb
@@ -8,7 +8,7 @@ inherit autotools
 EXTRA_OECONF = "--with-usb"
 
 SRC_URI = "http://www.networkupstools.org/source/2.2/nut-${PV}.tar.gz \
-    file://libm.patch;patch=1 \
+    file://libm.patch \
     "
 
 FILES_${PN} += "${datadir}/"
diff --git a/recipes/nvidia-drivers/nvidia-display_1.0-8756.bb b/recipes/nvidia-drivers/nvidia-display_1.0-8756.bb
index a255025e0c..276043b534 100644
--- a/recipes/nvidia-drivers/nvidia-display_1.0-8756.bb
+++ b/recipes/nvidia-drivers/nvidia-display_1.0-8756.bb
@@ -7,7 +7,7 @@ require nvidia-drivers.inc
 PKG_BASENAME="NVIDIA-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}"
 
 SRC_URI="http://download.nvidia.com/XFree86/Linux-${NVIDIA_ARCH}/${PV}/${PKG_BASENAME}.run \
-	file://nvidia-oe-conftest.patch;patch=1"
+	file://nvidia-oe-conftest.patch"
 
 S="${WORKDIR}/${PKG_BASENAME}/usr/src/nv"
 
diff --git a/recipes/nvidia-drivers/nvidia-display_190.42.bb b/recipes/nvidia-drivers/nvidia-display_190.42.bb
index 474d91b7bd..7a7d600709 100644
--- a/recipes/nvidia-drivers/nvidia-display_190.42.bb
+++ b/recipes/nvidia-drivers/nvidia-display_190.42.bb
@@ -12,7 +12,7 @@ DEFAULT_PREFERENCE_ion = "1"
 PKG_BASENAME="NVIDIA-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}"
 
 SRC_URI="http://download.nvidia.com/XFree86/Linux-${NVIDIA_ARCH}/${PV}/${PKG_BASENAME}.run \
-	file://nvidia-oe-conftest.patch;patch=1"
+	file://nvidia-oe-conftest.patch"
 
 S="${WORKDIR}/${PKG_BASENAME}/usr/src/nv"
 
diff --git a/recipes/nvidia-drivers/nvidia-drivers.inc b/recipes/nvidia-drivers/nvidia-drivers.inc
index 32f16a43b9..ef65ae4c91 100644
--- a/recipes/nvidia-drivers/nvidia-drivers.inc
+++ b/recipes/nvidia-drivers/nvidia-drivers.inc
@@ -7,7 +7,7 @@ DESCRIPTION="NVidia Graphics Driver Binary"
 LICENSE = "NVIDIA"
 
 inherit module
-INHIBIT_PACKAGE_STRIP="1"
+PACKAGE_STRIP = "no"
 
 def nvidia_pkgrun(d):
 	import bb, re
diff --git a/recipes/nvidia-drivers/nvidia-nforce_1.0-0310.bb b/recipes/nvidia-drivers/nvidia-nforce_1.0-0310.bb
index 0005b24d39..31407ebf82 100644
--- a/recipes/nvidia-drivers/nvidia-nforce_1.0-0310.bb
+++ b/recipes/nvidia-drivers/nvidia-nforce_1.0-0310.bb
@@ -7,7 +7,7 @@ require nvidia-drivers.inc
 PKG_BASENAME="NFORCE-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}"
 
 SRC_URI="http://download.nvidia.com/XFree86/nforce/${PV}/NFORCE-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}.run \
-	file://nvaudio-remap_page_range.patch;patch=1"
+	file://nvaudio-remap_page_range.patch"
 
 S="${WORKDIR}/${PKG_BASENAME}"
 
diff --git a/recipes/nxcl/libnxcl_0.9.bb b/recipes/nxcl/libnxcl_0.9.bb
index 5f55023ea3..7b860b9c9a 100644
--- a/recipes/nxcl/libnxcl_0.9.bb
+++ b/recipes/nxcl/libnxcl_0.9.bb
@@ -7,13 +7,13 @@ PR = "r2"
 RDEPENDS = "nxproxy nxssh"
 
 SRC_URI = "http://download.berlios.de/freenx/freenx-client-${PV}.tar.bz2 \
-	   file://gcc4.3-ftbfs.patch;patch=1 \
-	   file://dodnx.patch;patch=1 \
-	   file://gcc-warnings.patch;patch=1 \
-	   file://restorekeyboard.patch;patch=1 \
-	   file://publicKey.patch;patch=1 \
-	   file://deletelogfiles.patch;patch=1 \
-	   file://ssh_dnserror.patch;patch=1 \
+	   file://gcc4.3-ftbfs.patch \
+	   file://dodnx.patch \
+	   file://gcc-warnings.patch \
+	   file://restorekeyboard.patch \
+	   file://publicKey.patch \
+	   file://deletelogfiles.patch \
+	   file://ssh_dnserror.patch \
 	  "
 
 S = "${WORKDIR}/freenx-client-${PV}/nxcl"
diff --git a/recipes/nxproxy/nxproxy_3.2.0-1.bb b/recipes/nxproxy/nxproxy_3.2.0-1.bb
index 46e1e79d82..04ddac0ba6 100644
--- a/recipes/nxproxy/nxproxy_3.2.0-1.bb
+++ b/recipes/nxproxy/nxproxy_3.2.0-1.bb
@@ -6,7 +6,7 @@ PR = "r1"
 DEPENDS = "libxcomp"
 
 SRC_URI = "http://64.34.161.181/download/3.2.0/sources/${PN}-${PV}.tar.gz \
-	   file://stdin.patch;patch=1 \
+	   file://stdin.patch \
 	  "
 inherit autotools
           
diff --git a/recipes/nxssh/nxssh_3.3.0-1.bb b/recipes/nxssh/nxssh_3.3.0-1.bb
index 9b26ae22a2..5354125633 100644
--- a/recipes/nxssh/nxssh_3.3.0-1.bb
+++ b/recipes/nxssh/nxssh_3.3.0-1.bb
@@ -6,9 +6,9 @@ PR = "r0"
 DEPENDS = "openssl libxcomp"
 
 SRC_URI = "http://64.34.161.181/download/3.3.0/sources/${PN}-${PV}.tar.gz \
-	   file://autotools.patch;patch=1 \
-	   file://stdarg.patch;patch=1 \
-	   file://link.patch;patch=1 \
+	   file://autotools.patch \
+	   file://stdarg.patch \
+	   file://link.patch \
 	  "
 inherit autotools
           
diff --git a/recipes/nylon/nylon-scripts_cvs.bb b/recipes/nylon/nylon-scripts_cvs.bb
index 602f1c2352..6a253a661f 100644
--- a/recipes/nylon/nylon-scripts_cvs.bb
+++ b/recipes/nylon/nylon-scripts_cvs.bb
@@ -11,9 +11,9 @@ PR = "r2"
 RDEPENDS = "bash"
 
 SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz \
-	file://firewall-bash.diff;patch=1"
+	file://firewall-bash.diff"
 S = "${WORKDIR}/${PN}"
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 do_install() {
 	install -d -m 755 ${D}
diff --git a/recipes/nylon/nylon-statistics.bb b/recipes/nylon/nylon-statistics.bb
index 91527ac297..abed00596d 100644
--- a/recipes/nylon/nylon-statistics.bb
+++ b/recipes/nylon/nylon-statistics.bb
@@ -10,7 +10,7 @@ PR = "r1"
 
 SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz"
 S = "${WORKDIR}/${PN}"
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 do_install() {
 	install -d ${D}/srv/www/cgi-bin
diff --git a/recipes/nylon/simple-firewall.bb b/recipes/nylon/simple-firewall.bb
index ad9f3349a2..8e34f3a475 100644
--- a/recipes/nylon/simple-firewall.bb
+++ b/recipes/nylon/simple-firewall.bb
@@ -10,7 +10,7 @@ RDEPENDS = "kernel-module-ipt-limit kernel-module-ipt-tcpmss"
 PV = "cvs20051022"
 
 SRC_URI = "http://br1.einfach.org/nylon/stable/sources/simple-firewall_gruen.4g__20051022.tar.gz \
-	file://simple-firewall-bash.diff;patch=1"
+	file://simple-firewall-bash.diff"
 S = "${WORKDIR}/${PN}"
 
 do_install() {
diff --git a/recipes/obexftp/obexftp_0.20.bb b/recipes/obexftp/obexftp_0.20.bb
index cb3a8fe424..040f8001d7 100644
--- a/recipes/obexftp/obexftp_0.20.bb
+++ b/recipes/obexftp/obexftp_0.20.bb
@@ -6,9 +6,9 @@ DEPENDS = "openobex libgsm"
 PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
-	   file://iconv.patch;patch=1 \
-	   file://i-hate-libtool.patch;patch=1 \
-	   file://m4.patch;patch=1"
+	   file://iconv.patch \
+	   file://i-hate-libtool.patch \
+	   file://m4.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/obexftp/obexftp_0.23.bb b/recipes/obexftp/obexftp_0.23.bb
index 560d4c09ab..63ec0e2770 100644
--- a/recipes/obexftp/obexftp_0.23.bb
+++ b/recipes/obexftp/obexftp_0.23.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "OBEX Ftp Client based on openobex."
 SECTION = "console/network"
 HOMEPAGE = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
-LICENSE = "GPL"
+LICENSE = "GPLv2/LGPLv2"
 DEPENDS = "openobex bluez-libs virtual/libusb0 virtual/libiconv"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.bz2 \
 	  "
diff --git a/recipes/obexpush/obexpush_1.0.0.bb b/recipes/obexpush/obexpush_1.0.0.bb
index 99e3d54124..5701c28438 100644
--- a/recipes/obexpush/obexpush_1.0.0.bb
+++ b/recipes/obexpush/obexpush_1.0.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "glib-2.0 openobex bluez-libs"
 PR = "r7"
 
 SRC_URI = "http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz \
-           file://add-obextool.patch;patch=1 \
+           file://add-obextool.patch \
            file://init \
            file://opd_args"
 S = "${WORKDIR}/obexpush"
diff --git a/recipes/obsolete/antlr/antlr_2.7.5.bb b/recipes/obsolete/antlr/antlr_2.7.5.bb
index 88f601cd4e..fceb96597e 100644
--- a/recipes/obsolete/antlr/antlr_2.7.5.bb
+++ b/recipes/obsolete/antlr/antlr_2.7.5.bb
@@ -9,7 +9,7 @@ SECTION = "devel"
 RDEPENDS += "java-virtual-machine"
 
 SRC_URI = "http://www.antlr.org/download/antlr-${PV}.tar.gz \
-	   file://install.patch;patch=1"
+	   file://install.patch"
 S = "${WORKDIR}/antlr-${PV}"
 
 inherit autotools
diff --git a/recipes/obsolete/dbus/dbus_0.20.bb b/recipes/obsolete/dbus/dbus_0.20.bb
index 91f15215a5..e8db001c7d 100644
--- a/recipes/obsolete/dbus/dbus_0.20.bb
+++ b/recipes/obsolete/dbus/dbus_0.20.bb
@@ -6,7 +6,7 @@ PROVIDES = "dbus-glib"
 LICENSE = "GPL"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-	   file://cross.patch;patch=1"
+	   file://cross.patch"
 
 SRC_URI[md5sum] = "8ebff3cb4beec993e9160ff844e0411c"
 SRC_URI[sha256sum] = "3923076133c5a3f6c4c66f3fc842c2e05c14cd87b89096811a3cc853ab848577"
diff --git a/recipes/obsolete/dbus/dbus_0.21.bb b/recipes/obsolete/dbus/dbus_0.21.bb
index 717c4bec5f..ebb10fb57f 100644
--- a/recipes/obsolete/dbus/dbus_0.21.bb
+++ b/recipes/obsolete/dbus/dbus_0.21.bb
@@ -7,7 +7,7 @@ PROVIDES = "dbus-glib"
 LICENSE = "GPL"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
+	   file://cross.patch \
 	   file://dbus-1.init"
 
 SRC_URI[md5sum] = "311229d60154334ee3f908badc56747d"
diff --git a/recipes/obsolete/dbus/dbus_0.22.bb b/recipes/obsolete/dbus/dbus_0.22.bb
index 729687c6da..d6bbc8b97d 100644
--- a/recipes/obsolete/dbus/dbus_0.22.bb
+++ b/recipes/obsolete/dbus/dbus_0.22.bb
@@ -7,9 +7,9 @@ DEPENDS = "expat glib-2.0 virtual/libintl"
 PROVIDES = "dbus-glib"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   file://tmpdir.patch;patch=1 \
-	   file://gettext.patch;patch=1 \
+	   file://cross.patch \
+	   file://tmpdir.patch \
+	   file://gettext.patch \
 	   file://dbus-1.init"
 
 inherit autotools pkgconfig update-rc.d gettext
diff --git a/recipes/obsolete/dbus/dbus_0.23.1-osso5.bb b/recipes/obsolete/dbus/dbus_0.23.1-osso5.bb
index 7860a90b74..eaa8490b7a 100644
--- a/recipes/obsolete/dbus/dbus_0.23.1-osso5.bb
+++ b/recipes/obsolete/dbus/dbus_0.23.1-osso5.bb
@@ -8,16 +8,16 @@ DEPENDS = "expat glib-2.0 virtual/libintl"
 PROVIDES = "dbus-glib"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/d/${PN}/${PN}_${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   file://tmpdir.patch;patch=1 \
-	   file://gettext.patch;patch=1 \
-           file://0.23.1.diff;patch=1 \
-           file://dbus-monitor.patch;patch=1 \
-           file://dbussend.patch;patch=1;pnum=0 \
-           file://spawn-priority.diff;patch=1 \
-           file://config.diff;patch=1;pnum=0 \
-           file://dbus-quiesce-startup-errors.patch;patch=1 \
-           file://tools.diff;patch=1;pnum=0 \
+	   file://cross.patch \
+	   file://tmpdir.patch \
+	   file://gettext.patch \
+           file://0.23.1.diff \
+           file://dbus-monitor.patch \
+           file://dbussend.patch;striplevel=0 \
+           file://spawn-priority.diff \
+           file://config.diff;striplevel=0 \
+           file://dbus-quiesce-startup-errors.patch \
+           file://tools.diff;striplevel=0 \
 	   file://dbus-1.init"
 
 inherit autotools pkgconfig update-rc.d gettext
diff --git a/recipes/obsolete/dbus/dbus_0.23.4.bb b/recipes/obsolete/dbus/dbus_0.23.4.bb
index 1fe0cc5c1b..1e6b0f18ab 100644
--- a/recipes/obsolete/dbus/dbus_0.23.4.bb
+++ b/recipes/obsolete/dbus/dbus_0.23.4.bb
@@ -7,9 +7,9 @@ DEPENDS = "expat glib-2.0 virtual/libintl"
 PROVIDES = "dbus-glib"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   file://tmpdir.patch;patch=1 \
-	   file://gettext.patch;patch=1 \
+	   file://cross.patch \
+	   file://tmpdir.patch \
+	   file://gettext.patch \
 	   file://dbus-1.init"
 
 inherit autotools pkgconfig update-rc.d gettext
diff --git a/recipes/obsolete/dbus/dbus_0.23.bb b/recipes/obsolete/dbus/dbus_0.23.bb
index 017150e15d..8cfc60284e 100644
--- a/recipes/obsolete/dbus/dbus_0.23.bb
+++ b/recipes/obsolete/dbus/dbus_0.23.bb
@@ -7,9 +7,9 @@ DEPENDS = "expat glib-2.0 virtual/libintl"
 PROVIDES = "dbus-glib"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   file://tmpdir.patch;patch=1 \
-	   file://gettext.patch;patch=1 \
+	   file://cross.patch \
+	   file://tmpdir.patch \
+	   file://gettext.patch \
 	   file://dbus-1.init"
 
 inherit autotools pkgconfig update-rc.d gettext
diff --git a/recipes/obsolete/dbus/dbus_0.34.bb b/recipes/obsolete/dbus/dbus_0.34.bb
index 75b8e24319..9bf021e10f 100644
--- a/recipes/obsolete/dbus/dbus_0.34.bb
+++ b/recipes/obsolete/dbus/dbus_0.34.bb
@@ -3,7 +3,7 @@ require dbus_${PV}.inc
 
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
 DEFAULT_PREFERENCE = "-1"
-SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
+SRC_URI_EXTRA = "file://no-introspect.patch file://no-bindings.patch"
 
 FILES_${PN} += "${bindir}/dbus-daemon"
 FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
diff --git a/recipes/obsolete/dbus/dbus_0.34.inc b/recipes/obsolete/dbus/dbus_0.34.inc
index 1c63c37fdf..69a18cb2d5 100644
--- a/recipes/obsolete/dbus/dbus_0.34.inc
+++ b/recipes/obsolete/dbus/dbus_0.34.inc
@@ -7,8 +7,8 @@ DEPENDS = "expat glib-2.0 virtual/libintl"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   file://tmpdir.patch;patch=1 \
+	   file://cross.patch \
+	   file://tmpdir.patch \
 	   file://dbus-1.init \
 	   ${SRC_URI_EXTRA}"
 
diff --git a/recipes/obsolete/dbus/dbus_0.50.bb b/recipes/obsolete/dbus/dbus_0.50.bb
index 12821cf584..af4c3da05e 100644
--- a/recipes/obsolete/dbus/dbus_0.50.bb
+++ b/recipes/obsolete/dbus/dbus_0.50.bb
@@ -3,7 +3,7 @@ require dbus_${PV}.inc
 
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
 DEFAULT_PREFERENCE = "-1"
-SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
+SRC_URI_EXTRA = "file://no-introspect.patch file://no-bindings.patch"
 
 FILES_${PN} += "${bindir}/dbus-daemon"
 FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
diff --git a/recipes/obsolete/dbus/dbus_0.50.inc b/recipes/obsolete/dbus/dbus_0.50.inc
index 094a9b68d6..9ab4e4f69f 100644
--- a/recipes/obsolete/dbus/dbus_0.50.inc
+++ b/recipes/obsolete/dbus/dbus_0.50.inc
@@ -7,10 +7,10 @@ DEPENDS = "expat glib-2.0 virtual/libintl"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   file://tmpdir.patch;patch=1 \
+	   file://cross.patch \
+	   file://tmpdir.patch \
 	   file://dbus-1.init \
-	   file://no-examples.patch;patch=1 \
+	   file://no-examples.patch \
 	   ${SRC_URI_EXTRA}"
 
 inherit autotools pkgconfig update-rc.d gettext
diff --git a/recipes/obsolete/efl1/etk-native_svn.bb b/recipes/obsolete/efl1/etk-native_svn.bb
index 345802d25d..5d90c56137 100644
--- a/recipes/obsolete/efl1/etk-native_svn.bb
+++ b/recipes/obsolete/efl1/etk-native_svn.bb
@@ -2,4 +2,4 @@ require etk_svn.bb
 inherit native
 DEPENDS = "evas-native ecore-native edje-native"
 
-SRC_URI += "file://no-tests.patch;patch=1"
+SRC_URI += "file://no-tests.patch"
diff --git a/recipes/obsolete/gaim/gaim_1.0.3.bb b/recipes/obsolete/gaim/gaim_1.0.3.bb
index 6d8585ec1d..121660a267 100644
--- a/recipes/obsolete/gaim/gaim_1.0.3.bb
+++ b/recipes/obsolete/gaim/gaim_1.0.3.bb
@@ -1,7 +1,7 @@
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
-	file://desktop-name.patch;patch=1"
+	file://desktop-name.patch"
 
 require gaim.inc
 
diff --git a/recipes/obsolete/gaim/gaim_1.1.0.bb b/recipes/obsolete/gaim/gaim_1.1.0.bb
index cf27651916..00c989a0c5 100644
--- a/recipes/obsolete/gaim/gaim_1.1.0.bb
+++ b/recipes/obsolete/gaim/gaim_1.1.0.bb
@@ -1,7 +1,7 @@
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
-	file://desktop-name.patch;patch=1"
+	file://desktop-name.patch"
 
 require gaim.inc
 
diff --git a/recipes/obsolete/gaim/gaim_1.1.1.bb b/recipes/obsolete/gaim/gaim_1.1.1.bb
index a7867c3926..d9f8e1cb94 100644
--- a/recipes/obsolete/gaim/gaim_1.1.1.bb
+++ b/recipes/obsolete/gaim/gaim_1.1.1.bb
@@ -1,7 +1,7 @@
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
-	file://desktop-name.patch;patch=1"
+	file://desktop-name.patch"
 
 require gaim.inc
 
diff --git a/recipes/obsolete/gaim/gaim_1.1.2.bb b/recipes/obsolete/gaim/gaim_1.1.2.bb
index ef145ba5bd..78e7551cb4 100644
--- a/recipes/obsolete/gaim/gaim_1.1.2.bb
+++ b/recipes/obsolete/gaim/gaim_1.1.2.bb
@@ -1,7 +1,7 @@
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
-	file://desktop-name.patch;patch=1"
+	file://desktop-name.patch"
 
 require gaim.inc
 
diff --git a/recipes/obsolete/gaim/gaim_1.4.0.bb b/recipes/obsolete/gaim/gaim_1.4.0.bb
index 8b8d4722f2..bf9f4a223e 100644
--- a/recipes/obsolete/gaim/gaim_1.4.0.bb
+++ b/recipes/obsolete/gaim/gaim_1.4.0.bb
@@ -1,7 +1,7 @@
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
-	file://desktop-name_1.4.0.patch;patch=1"
+	file://desktop-name_1.4.0.patch"
 
 require gaim.inc
 
diff --git a/recipes/obsolete/gaim/gaim_1.5.0.bb b/recipes/obsolete/gaim/gaim_1.5.0.bb
index 29fe1abe76..2d68304d26 100644
--- a/recipes/obsolete/gaim/gaim_1.5.0.bb
+++ b/recipes/obsolete/gaim/gaim_1.5.0.bb
@@ -1,7 +1,7 @@
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
-	file://desktop-name.patch;patch=1"
+	file://desktop-name.patch"
 
 require gaim.inc
 
diff --git a/recipes/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb b/recipes/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb
index bf8591920c..0a2f7e003b 100644
--- a/recipes/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb
+++ b/recipes/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb
@@ -8,21 +8,21 @@ DEFAULT_PREFERENCE = "-1"
 WEBCVSURL = "http://handhelds.org/cgi-bin/cvsweb.cgi/~checkout~/gaim"
 
 SRC_URI = "cvs://anonymous@gaim.cvs.sourceforge.net/cvsroot/gaim;module=gaim \
-	${WEBCVSURL}/no-superimposed-version-on-logo.patch;patch=1 \
-	${WEBCVSURL}/01-optional-icons-in-dialogs.patch;patch=1 \
-	${WEBCVSURL}/02-request-field-dialogs.patch;patch=1 \
-	${WEBCVSURL}/03-blist-dialogs.patch;patch=1 \
-	${WEBCVSURL}/04-saved-status-dialogs.patch;patch=1 \
-	${WEBCVSURL}/05-statusbox-icon-size.patch;patch=1 \
-	${WEBCVSURL}/06-account-dialogs.patch;patch=1 \
-	${WEBCVSURL}/07-roomlist-dialog.patch;patch=1 \
-	${WEBCVSURL}/define-pda-mode.patch;patch=1 \
-	${WEBCVSURL}/desktop-name-2.0.0.patch;patch=1 \
-	${WEBCVSURL}/docklet-icon-size.patch;patch=1 \
-	${WEBCVSURL}/08-prefs-dialog.patch;patch=1 \
-	${WEBCVSURL}/09-filetransfer-dialog.patch;patch=1 \
-	${WEBCVSURL}/10-pda-default-settings.patch;patch=1 \
-	file://gaim-OE-branding.patch;patch=1 \
+	${WEBCVSURL}/no-superimposed-version-on-logo.patch \
+	${WEBCVSURL}/01-optional-icons-in-dialogs.patch \
+	${WEBCVSURL}/02-request-field-dialogs.patch \
+	${WEBCVSURL}/03-blist-dialogs.patch \
+	${WEBCVSURL}/04-saved-status-dialogs.patch \
+	${WEBCVSURL}/05-statusbox-icon-size.patch \
+	${WEBCVSURL}/06-account-dialogs.patch \
+	${WEBCVSURL}/07-roomlist-dialog.patch \
+	${WEBCVSURL}/define-pda-mode.patch \
+	${WEBCVSURL}/desktop-name-2.0.0.patch \
+	${WEBCVSURL}/docklet-icon-size.patch \
+	${WEBCVSURL}/08-prefs-dialog.patch \
+	${WEBCVSURL}/09-filetransfer-dialog.patch \
+	${WEBCVSURL}/10-pda-default-settings.patch \
+	file://gaim-OE-branding.patch \
 	"
 
 require gaim.inc
diff --git a/recipes/obsolete/gimp/gimp.inc b/recipes/obsolete/gimp/gimp.inc
index 87aa161bed..578e02efe2 100644
--- a/recipes/obsolete/gimp/gimp.inc
+++ b/recipes/obsolete/gimp/gimp.inc
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "sed-native gdk-pixbuf-csource-native libart-lgpl gtk+ jpeg libpng libexif tiff"
 
 SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2;name=archive \
-                 file://configure-libwmf.patch;patch=1"
+                 file://configure-libwmf.patch"
 
 inherit gnome
 
diff --git a/recipes/obsolete/gtk-webcore/midori_0.0.17.bb b/recipes/obsolete/gtk-webcore/midori_0.0.17.bb
index 63e71c3fb8..4b5fe27578 100644
--- a/recipes/obsolete/gtk-webcore/midori_0.0.17.bb
+++ b/recipes/obsolete/gtk-webcore/midori_0.0.17.bb
@@ -1,6 +1,6 @@
 require midori.inc           
 
-SRC_URI += "file://webkit-update.patch;patch=1"
+SRC_URI += "file://webkit-update.patch"
 
 
 
diff --git a/recipes/obsolete/gtk-webcore/midori_0.0.18.bb b/recipes/obsolete/gtk-webcore/midori_0.0.18.bb
index 3b0d34490b..9366a2727c 100644
--- a/recipes/obsolete/gtk-webcore/midori_0.0.18.bb
+++ b/recipes/obsolete/gtk-webcore/midori_0.0.18.bb
@@ -2,7 +2,7 @@ require midori.inc
 
 PR = "r2"
 
-SRC_URI += "file://desktop.patch;patch=1"
+SRC_URI += "file://desktop.patch"
 
 
 SRC_URI[md5sum] = "aa9c10bbf6fe3502a65633c4fac0fb80"
diff --git a/recipes/obsolete/libsdl/libsdl-qpe_1.2.7.bb b/recipes/obsolete/libsdl/libsdl-qpe_1.2.7.bb
index 4bbc704147..686df6405f 100644
--- a/recipes/obsolete/libsdl/libsdl-qpe_1.2.7.bb
+++ b/recipes/obsolete/libsdl/libsdl-qpe_1.2.7.bb
@@ -9,14 +9,14 @@ LICENSE = "LGPL"
 PR = "r9"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-           file://agawa-piro-mickey.patch;patch=1 \
-           file://pygame.patch;patch=1 \
-           file://gcc34.patch;patch=1 \
-           file://mouse.patch;patch=1 \
-	   file://kill-stdc++.patch;patch=1 \
-	   file://ipaq.patch;patch=1 \
-	   file://SDL-Akita.patch;patch=1 \
-	   file://fixlibs.patch;patch=1"
+           file://agawa-piro-mickey.patch \
+           file://pygame.patch \
+           file://gcc34.patch \
+           file://mouse.patch \
+	   file://kill-stdc++.patch \
+	   file://ipaq.patch \
+	   file://SDL-Akita.patch \
+	   file://fixlibs.patch"
 S = "${WORKDIR}/SDL-${PV}"
 
 inherit autotools binconfig
diff --git a/recipes/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/recipes/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
index 668065b9bd..392c8bcd4d 100644
--- a/recipes/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
+++ b/recipes/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
@@ -11,7 +11,7 @@ DEPENDS = "libxml2 gconf-osso dbus-0.23.1-osso5 bzip2 gnome-mime-data zlib samba
 RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz \
-           file://gconftool-lossage.patch;patch=1;pnum=1"
+           file://gconftool-lossage.patch"
 
 EXTRA_OECONF = "--with-ipc=dbus --enable-ext-dbus-daemon --disable-orbit"
 
diff --git a/recipes/obsolete/olsr/olsrd_0.4.9.bb b/recipes/obsolete/olsr/olsrd_0.4.9.bb
index 90f31488a3..32a9742412 100644
--- a/recipes/obsolete/olsr/olsrd_0.4.9.bb
+++ b/recipes/obsolete/olsr/olsrd_0.4.9.bb
@@ -1,7 +1,7 @@
 require olsrd.inc
 PR = "r2"
 
-SRC_URI += "file://0.4.9-httpinfo-makefile.diff;patch=1"
+SRC_URI += "file://0.4.9-httpinfo-makefile.diff"
 
 do_compile() {
 	oe_runmake OS=linux clean
diff --git a/recipes/obsolete/pixman/pixman_0.17.6.bb b/recipes/obsolete/pixman/pixman_0.17.6.bb
index 01febb81dd..771b7798f7 100644
--- a/recipes/obsolete/pixman/pixman_0.17.6.bb
+++ b/recipes/obsolete/pixman/pixman_0.17.6.bb
@@ -11,12 +11,12 @@ PR = "r1"
 BBCLASSEXTEND="native"
 
 SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz;name=archive \
-           file://0001-Dropped-delegation-support-for-pixman_blt.patch;patch=1 \
-           file://0002-Test-program-for-pixman_blt-function.patch;patch=1 \
-           file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;patch=1 \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;patch=1 \
-           file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;patch=1 \
-           file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;patch=1 \
+           file://0001-Dropped-delegation-support-for-pixman_blt.patch \
+           file://0002-Test-program-for-pixman_blt-function.patch \
+           file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+           file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+           file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
           "
 SRC_URI[archive.md5sum] = "32cbdf7a1ac1c275ee56230e26701456"
 SRC_URI[archive.sha256sum] = "14ea5a185d8ea6ce3203ff008279e3f3433b6a5bad5853b42a82978527e618cb"
diff --git a/recipes/obsolete/quilt/quilt-native.inc b/recipes/obsolete/quilt/quilt-native.inc
index cad1b745f3..5c5a0153cc 100644
--- a/recipes/obsolete/quilt/quilt-native.inc
+++ b/recipes/obsolete/quilt/quilt-native.inc
@@ -1,6 +1,6 @@
 require quilt.inc
 
-SRC_URI_append_build-darwin = "?   file://non-gnu.patch;patch=1 "
+SRC_URI_append_build-darwin = "?   file://non-gnu.patch "
 RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/quilt-${PV}"
 
diff --git a/recipes/obsolete/quilt/quilt-package.inc b/recipes/obsolete/quilt/quilt-package.inc
index 900884b917..1721049b5c 100644
--- a/recipes/obsolete/quilt/quilt-package.inc
+++ b/recipes/obsolete/quilt/quilt-package.inc
@@ -2,7 +2,7 @@ require quilt.inc
 
 RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
 
-SRC_URI += "file://aclocal.patch;patch=1"
+SRC_URI += "file://aclocal.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/obsolete/quilt/quilt.inc b/recipes/obsolete/quilt/quilt.inc
index ce9679ded1..fd0d40dc57 100644
--- a/recipes/obsolete/quilt/quilt.inc
+++ b/recipes/obsolete/quilt/quilt.inc
@@ -4,6 +4,6 @@ SECTION = "devel"
 LICENSE = "GPL"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
-           file://install.patch;patch=1"
+           file://install.patch"
 
 S = "${WORKDIR}/quilt-${PV}"
diff --git a/recipes/obsolete/quilt/quilt_0.39.inc b/recipes/obsolete/quilt/quilt_0.39.inc
index 4fbbb03316..140b333b62 100644
--- a/recipes/obsolete/quilt/quilt_0.39.inc
+++ b/recipes/obsolete/quilt/quilt_0.39.inc
@@ -1,5 +1,5 @@
 require quilt.inc
 
-SRC_URI += "file://install.patch;patch=1 \
-	   file://nostrip.patch;patch=1"
+SRC_URI += "file://install.patch \
+	   file://nostrip.patch"
 
diff --git a/recipes/obsolete/xmame/xmame_0.86.bb b/recipes/obsolete/xmame/xmame_0.86.bb
index cb70cadfa8..7a015dfe43 100644
--- a/recipes/obsolete/xmame/xmame_0.86.bb
+++ b/recipes/obsolete/xmame/xmame_0.86.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 DEPENDS = "expat virtual/libsdl libsdl-mixer"
 
 SRC_URI = "http://x.mame.net/download/historic/${P}.tar.bz2 \
-          file://${FILESDIR}/crosscompile.patch;patch=1"
+          file://${FILESDIR}/crosscompile.patch"
 
 inherit flow-lossage
 
diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb
index 202fd9f10b..c2f2c065d9 100644
--- a/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb
+++ b/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb
@@ -6,11 +6,11 @@ RDEPENDS += "hal"
 PE = "2"
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://sysroot_fix.patch;patch=1 \
-	    file://dolt-fix.patch;patch=1"
+SRC_URI += "file://sysroot_fix.patch \
+	    file://dolt-fix.patch"
 
 # This requires support in pixman, which the default one doesn't have
-SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
 
 MESA_VER = "7.2"
 
diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb b/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb
index 67201a5449..efe68d2180 100644
--- a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb
+++ b/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb
@@ -5,9 +5,9 @@ DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://sysroot_fix.patch;patch=1 \
-            file://dolt-fix-1.7.0.patch;patch=1 \
-            file://randr-support-1.7.0.patch;patch=1 \
+SRC_URI += "file://sysroot_fix.patch \
+            file://dolt-fix-1.7.0.patch \
+            file://randr-support-1.7.0.patch \
            "
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts
diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb
index a82a85d694..fc8c3540cd 100644
--- a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb
+++ b/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb
@@ -5,14 +5,14 @@ DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://sysroot_fix.patch;patch=1 \
-            file://dolt-fix-1.7.0.patch;patch=1 \
-            file://randr-support-1.7.0.patch;patch=1 \
-            file://hack-fbdev-ignore-return-mode.patch;patch=1 \
+SRC_URI += "file://sysroot_fix.patch \
+            file://dolt-fix-1.7.0.patch \
+            file://randr-support-1.7.0.patch \
+            file://hack-fbdev-ignore-return-mode.patch \
            "
 
-SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
-SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
+SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch"
 
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts
diff --git a/recipes/obsolete/zd1211/zd1211_r77.bb b/recipes/obsolete/zd1211/zd1211_r77.bb
index 42e034c2cc..c04e3db460 100644
--- a/recipes/obsolete/zd1211/zd1211_r77.bb
+++ b/recipes/obsolete/zd1211/zd1211_r77.bb
@@ -6,7 +6,7 @@ PR = "r3"
 RDEPENDS = "wireless-tools"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
-	file://makefile.patch;patch=1 \
+	file://makefile.patch \
 	"
 
 S = "${WORKDIR}/zd1211-driver-${PV}"
diff --git a/recipes/obsolete/zd1211/zd1211_r83.bb b/recipes/obsolete/zd1211/zd1211_r83.bb
index 062c387658..ad710daf3b 100644
--- a/recipes/obsolete/zd1211/zd1211_r83.bb
+++ b/recipes/obsolete/zd1211/zd1211_r83.bb
@@ -7,7 +7,7 @@ RDEPENDS = "wireless-tools"
 PR = "r1"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
-           file://makefile.patch;patch=1"
+           file://makefile.patch"
 
 S = "${WORKDIR}/zd1211-driver-${PV}"
 
diff --git a/recipes/octave/octave_2.9.19.bb b/recipes/octave/octave_2.9.19.bb
index c1f9fe9da4..d3d8f3e3a5 100644
--- a/recipes/octave/octave_2.9.19.bb
+++ b/recipes/octave/octave_2.9.19.bb
@@ -1,7 +1,7 @@
 require octave.inc
 
 SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
-           file://configure.patch;patch=1"
+           file://configure.patch"
 
 SRC_URI[md5sum] = "32cb8153463ebc6ab27bee8b4e538b1a"
 SRC_URI[sha256sum] = "c888ee643451396fc2677a16577d9a2b31cac1b816769d5c915c1a82bbea3cc4"
diff --git a/recipes/octave/octave_3.0.0.bb b/recipes/octave/octave_3.0.0.bb
index ff9d878a7c..017a91f1f4 100644
--- a/recipes/octave/octave_3.0.0.bb
+++ b/recipes/octave/octave_3.0.0.bb
@@ -1,7 +1,7 @@
 require octave.inc
 
 SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
-           file://configure.patch;patch=1"
+           file://configure.patch"
 
 PR = "r1"
 
diff --git a/recipes/octave/octave_3.0.3.bb b/recipes/octave/octave_3.0.3.bb
index 8fd954df4e..b994f61ad4 100644
--- a/recipes/octave/octave_3.0.3.bb
+++ b/recipes/octave/octave_3.0.3.bb
@@ -3,7 +3,7 @@ require octave.inc
 PR = "r2"
 
 SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
-           file://configure.patch;patch=1"
+           file://configure.patch"
 
 PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
 	     libcruft-dev liboctave-dev liboctinterp-dev \
diff --git a/recipes/ode/ode_0.9.bb b/recipes/ode/ode_0.9.bb
index e26f32bf8a..1383329d2b 100644
--- a/recipes/ode/ode_0.9.bb
+++ b/recipes/ode/ode_0.9.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \
-           file://install.patch;patch=1"
+           file://install.patch"
 
 inherit autotools binconfig
 
diff --git a/recipes/ogre/freeimage_3.11.0.bb b/recipes/ogre/freeimage_3.11.0.bb
index fd238f275a..d38882f124 100644
--- a/recipes/ogre/freeimage_3.11.0.bb
+++ b/recipes/ogre/freeimage_3.11.0.bb
@@ -1,5 +1,5 @@
 LICENSE = "MIT"
-do_unpack[depends] += "unzip-native:do_populate_staging"
+do_unpack[depends] += "unzip-native:do_populate_sysroot"
 
 PR = "r1"
 
diff --git a/recipes/ogre/ogre-egl_svn.bb b/recipes/ogre/ogre-egl_svn.bb
index abebf9d159..4e66e2ecb9 100644
--- a/recipes/ogre/ogre-egl_svn.bb
+++ b/recipes/ogre/ogre-egl_svn.bb
@@ -8,7 +8,7 @@ SRCREV = "8310"
 PV = "1.6.1+svnr${SRCPV}"
 
 SRC_URI = "svn://ogre.svn.sourceforge.net/svnroot/ogre;module=trunk;proto=https \
-           file://ogre-egl-update.diff;patch=1;pnum=0 \
+           file://ogre-egl-update.diff;striplevel=0 \
           "
 
 inherit autotools_stage siteinfo
diff --git a/recipes/olsrd/olsrd_0.5.3.bb b/recipes/olsrd/olsrd_0.5.3.bb
index 27f8508b43..7c2f676e8a 100644
--- a/recipes/olsrd/olsrd_0.5.3.bb
+++ b/recipes/olsrd/olsrd_0.5.3.bb
@@ -2,7 +2,7 @@ require olsrd.inc
 
 PR = "r1"
 
-SRC_URI += "file://unbreak-makefile.patch;patch=1"
+SRC_URI += "file://unbreak-makefile.patch"
 
 
 SRC_URI[md5sum] = "786fdf52adeb0d421905332312e5b75f"
diff --git a/recipes/olsrd/olsrd_0.5.5.bb b/recipes/olsrd/olsrd_0.5.5.bb
index afc7bc9506..bd6efee2f9 100644
--- a/recipes/olsrd/olsrd_0.5.5.bb
+++ b/recipes/olsrd/olsrd_0.5.5.bb
@@ -4,7 +4,7 @@ PR = "r0"
 # Oddity in the 0.5.5 source tarball.
 S = "${WORKDIR}/olsrd-a5b9cf969979"
 
-SRC_URI += "file://olsrd-0.5.5-unbreak-makefile.patch;patch=1"
+SRC_URI += "file://olsrd-0.5.5-unbreak-makefile.patch"
 
 SRC_URI[md5sum] = "bd1cd216c318c1359ab6e832adbb1962"
 SRC_URI[sha256sum] = "2fab4646166cc887a87933f52e51ce07c23f4e0395d380ee2f8557805c4884bc"
diff --git a/recipes/omgps/omgps_svn.bb b/recipes/omgps/omgps_svn.bb
index 0745c18fbc..b48a92896e 100644
--- a/recipes/omgps/omgps_svn.bb
+++ b/recipes/omgps/omgps_svn.bb
@@ -9,6 +9,6 @@ PV = "0.1+svnr${SRCPV}"
 PR = "r0"
 S = "${WORKDIR}/${PN}"
 SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;proto=http \
-           file://gcc-4.4.patch;patch=1"
+           file://gcc-4.4.patch"
 
 inherit autotools
diff --git a/recipes/omnewrotate/files/xsession.script.patch b/recipes/omnewrotate/files/xsession.script.patch
new file mode 100644
index 0000000000..eb1412e458
--- /dev/null
+++ b/recipes/omnewrotate/files/xsession.script.patch
@@ -0,0 +1,35 @@
+Index: omnewrotate.orig/data/omnewrotate.in
+===================================================================
+--- omnewrotate.orig/data/omnewrotate.in	(revision 66)
++++ omnewrotate/data/omnewrotate.in	(working copy)
+@@ -4,10 +4,14 @@
+ 	. @SYSCONFDIR@/default/omnewrotate.conf
+ fi
+ 
+-export DIPLAY=:0
+ PIDFILE="/var/run/omnewrotate.pid"
+ 
+ case "$1" in
++	autostart)
++		if test "$START" == "yes" ; then
++			$0 start
++		fi
++	;;
+ 	start)
+ 		echo -n starting omnewrotate...
+ 		/sbin/start-stop-daemon -S \
+Index: omnewrotate.orig/data/89omnewrotate.in
+===================================================================
+--- omnewrotate.orig/data/89omnewrotate.in	(revision 66)
++++ omnewrotate/data/89omnewrotate.in	(working copy)
+@@ -1,9 +1,3 @@
+ #!/bin/sh
+ 
+-if [ -f @CONFIGDIR@/omnewrotate.conf ] ; then
+-	. @CONFIGDIR@/omnewrotate.conf
+-fi
+-
+-if test "$START" == "yes" ; then
+-	exec @SYSCONFDIR@/init.d/omnewrotate start
+-fi
++@SYSCONFDIR@/init.d/omnewrotate autostart
diff --git a/recipes/omnewrotate/omnewrotate_svn.bb b/recipes/omnewrotate/omnewrotate_svn.bb
index 410d12f6a8..316a8d04b0 100644
--- a/recipes/omnewrotate/omnewrotate_svn.bb
+++ b/recipes/omnewrotate/omnewrotate_svn.bb
@@ -8,9 +8,10 @@ DEPENDS = "libframeworkd-glib xrandr"
 SRCREV = "66"
 
 PV = "0.5.8+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "svn://omnewrotate.googlecode.com/svn;module=trunk;proto=http"
+SRC_URI = "svn://omnewrotate.googlecode.com/svn;module=trunk;proto=http \
+           file://xsession.script.patch"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/omniorb/omniorb-native_4.1.4.bb b/recipes/omniorb/omniorb-native_4.1.4.bb
index c06a74a676..c5c550d0ec 100644
--- a/recipes/omniorb/omniorb-native_4.1.4.bb
+++ b/recipes/omniorb/omniorb-native_4.1.4.bb
@@ -3,7 +3,7 @@ DEPENDS += "python-native"
 PR = "r0"
 
 SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORB-4.1.4.tar.gz;name=omniORB414targz \
-	  file://omniorb_4.1.4.patch;patch=1 \
+	  file://omniorb_4.1.4.patch \
 "
 
 SRC_URI[omniORB414targz.md5sum] = "1f6070ff9b6339876976d61981eeaa6a"
diff --git a/recipes/omniorb/omniorb_4.0.7.bb b/recipes/omniorb/omniorb_4.0.7.bb
index 7b1e14ac28..4f2be67c3c 100644
--- a/recipes/omniorb/omniorb_4.0.7.bb
+++ b/recipes/omniorb/omniorb_4.0.7.bb
@@ -7,11 +7,11 @@ PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz \
 file://omniORB.cfg \
-file://omniORB-cross.patch;patch=1 \
-file://omniORB_embedded_appl.patch;patch=1 \
-file://rm_LongDouble.patch;patch=1 \
-file://arm_double.patch;patch=1;pnum=0 \
-file://dynskel.patch;patch=1;pnum=0 \
+file://omniORB-cross.patch \
+file://omniORB_embedded_appl.patch \
+file://rm_LongDouble.patch \
+file://arm_double.patch;striplevel=0 \
+file://dynskel.patch;striplevel=0 \
 "
 
 S = "${WORKDIR}/omniORB-${PV}"
diff --git a/recipes/omniorb/omniorb_4.1.4.bb b/recipes/omniorb/omniorb_4.1.4.bb
index 3d0c43ce17..a4c032c5d3 100644
--- a/recipes/omniorb/omniorb_4.1.4.bb
+++ b/recipes/omniorb/omniorb_4.1.4.bb
@@ -6,11 +6,11 @@ DEPENDS = "omniorb-native"
 PR = "r0"
 
 SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORB-4.1.4.tar.gz;name=omniORB414targz \
-file://omniorb_4.1.4.patch;patch=1 \ 
+file://omniorb_4.1.4.patch \ 
 file://omniORB.cfg \
-file://omniORB-cross.patch;patch=1 \
-file://omniORB_embedded_appl.patch;patch=1 \
-file://rm_LongDouble.patch;patch=1 \
+file://omniORB-cross.patch \
+file://omniORB_embedded_appl.patch \
+file://rm_LongDouble.patch \
 "
 
 SRC_URI[omniORB414targz.md5sum] = "1f6070ff9b6339876976d61981eeaa6a"
diff --git a/recipes/oneko/oneko_1.2.sakura.5.bb b/recipes/oneko/oneko_1.2.sakura.5.bb
index 75de27d964..4c9940596b 100644
--- a/recipes/oneko/oneko_1.2.sakura.5.bb
+++ b/recipes/oneko/oneko_1.2.sakura.5.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://www.daidouji.com/oneko/distfiles/oneko-${PV}.tar.gz \
            file://kill-oneko.desktop \
 	   file://oneko.png \
 	   file://kill-oneko.png \
-	   file://remove-bsd-daemon-logo.patch;patch=1"
+	   file://remove-bsd-daemon-logo.patch"
 
 inherit pkgconfig 
 
diff --git a/recipes/openais/openais_1.1.2.bb b/recipes/openais/openais_1.1.2.bb
index 599d80666a..118264c9e5 100644
--- a/recipes/openais/openais_1.1.2.bb
+++ b/recipes/openais/openais_1.1.2.bb
@@ -4,7 +4,7 @@ DEPENDS = "cluster-glue corosync"
 
 SRC_URI = " \
 	ftp://ftp@openais.org/downloads/openais-${PV}/openais-${PV}.tar.gz;name=tar \
-	file://fix-lcrso-linkage.patch;patch=1 \
+	file://fix-lcrso-linkage.patch \
 	"
 SRC_URI[tar.md5sum] = "f94ccb867358ac54ab24bc54def27335"
 SRC_URI[tar.sha256sum] = "7ba87dc480a9dd224fe3a3732c966d6fdf6ec5f192bb184d586afa3703f808f2"
diff --git a/recipes/openbmap/openbmap-logger-0.4.0/fsogsmd-fix.patch b/recipes/openbmap/openbmap-logger-0.4.0/fsogsmd-fix.patch
new file mode 100644
index 0000000000..93da2a6dc0
--- /dev/null
+++ b/recipes/openbmap/openbmap-logger-0.4.0/fsogsmd-fix.patch
@@ -0,0 +1,22 @@
+diff -uri openbmap-logger-0.4.0/openbmap/logger.py openbmap-logger-0.4.0-fsogsmd/openbmap/logger.py
+--- openbmap-logger-0.4.0/openbmap/logger.py	2009-07-20 19:07:43.000000000 +0200
++++ openbmap-logger-0.4.0-fsogsmd/openbmap/logger.py	2010-05-21 22:00:02.024118210 +0200
+@@ -220,7 +220,10 @@
+         """If available, returns the manufacturer, model and revision."""
+         #TODO call the dBus interface only if instance attributes are not set.
+         obj = dbus.SystemBus().get_object('org.freesmartphone.ogsmd', '/org/freesmartphone/GSM/Device')
+-        data = dbus.Interface(obj, 'org.freesmartphone.GSM.Device').GetInfo()
++	try:
++            data = dbus.Interface(obj, 'org.freesmartphone.GSM.Device').GetInfo()
++	except:
++            data = dbus.Interface(obj, 'org.freesmartphone.Info').GetInfo()
+         if 'manufacturer' in data:
+             # At the moment the returned string starts and ends with '"' for model and revision
+             self._manufacturer = data['manufacturer'].strip('"')
+@@ -1392,4 +1395,4 @@
+         mainloop.quit()
+     else:
+         logging.info("normal exit.")
+-        sys.exit( 0 )
+\ Kein Zeilenumbruch am Dateiende.
++        sys.exit( 0 )
diff --git a/recipes/openbmap/openbmap-logger_0.4.0.bb b/recipes/openbmap/openbmap-logger_0.4.0.bb
index fa7e6c9726..099694fae7 100644
--- a/recipes/openbmap/openbmap-logger_0.4.0.bb
+++ b/recipes/openbmap/openbmap-logger_0.4.0.bb
@@ -1,8 +1,11 @@
 DESCRIPTION = "openBmap logger and uploader of GPS/GSM data"
 SECTION = "x11/utils"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/myposition/openbmap-logger-${PV}.tar.gz"
+SRC_URI = "\
+${SOURCEFORGE_MIRROR}/myposition/openbmap-logger-${PV}.tar.gz \
+file://fsogsmd-fix.patch \
+"
 
 inherit distutils
 
diff --git a/recipes/openbsc/openbsc-onwaves_git.bb b/recipes/openbsc/openbsc-onwaves_git.bb
index 888c6f4c0f..0d53008435 100644
--- a/recipes/openbsc/openbsc-onwaves_git.bb
+++ b/recipes/openbsc/openbsc-onwaves_git.bb
@@ -3,6 +3,6 @@ require openbsc.inc
 S = "${WORKDIR}/git/openbsc"
 SRC_URI = "git://bs11-abis.gnumonks.org/openbsc.git;protocol=git;branch=on-waves/bsc-master"
 SRCREV = "0d9ed87d5c7d5b6e21dc3bbb282e215068742566"
-PV = "0.0.1.1+gitr${SRCPV}"
+PV = "0.0.1.1+gitr${SRCREV}"
 PR = "${INC_PR}.1"
 
diff --git a/recipes/openbsc/openbsc_git.bb b/recipes/openbsc/openbsc_git.bb
index 4fe138ff69..55898b147a 100644
--- a/recipes/openbsc/openbsc_git.bb
+++ b/recipes/openbsc/openbsc_git.bb
@@ -3,7 +3,6 @@ require ${PN}.inc
 S = "${WORKDIR}/git/openbsc"
 SRC_URI = "git://bs11-abis.gnumonks.org/openbsc.git;protocol=git"
 SRCREV = "5e68183a201ab92f29cd2467df5209f7b351a66d"
-PE = "1"
-PV = "0.0.1.1+gitr${SRCPV}"
+PV = "0.0.1.1+gitr${SRCREV}"
 PR = "${INC_PR}.1"
 
diff --git a/recipes/openchrome/xf86-video-openchrome_0.2.902.bb b/recipes/openchrome/xf86-video-openchrome_0.2.902.bb
index cabf1cc716..75946ec8b5 100644
--- a/recipes/openchrome/xf86-video-openchrome_0.2.902.bb
+++ b/recipes/openchrome/xf86-video-openchrome_0.2.902.bb
@@ -1,4 +1,4 @@
-SRC_URI = "http://www.openchrome.org/releases/xf86-video-openchrome-${PV}.tar.gz file://configure.patch;patch=1 file://configure-dri.patch;patch=1"
+SRC_URI = "http://www.openchrome.org/releases/xf86-video-openchrome-${PV}.tar.gz file://configure.patch file://configure-dri.patch"
 PACKAGES_DYNAMIC = "xorg-driver-openchrome"
 
 include openchrome.inc
diff --git a/recipes/opencv/artoolkit_2.72.1.bb b/recipes/opencv/artoolkit_2.72.1.bb
index 7000a7c04a..fad502603e 100644
--- a/recipes/opencv/artoolkit_2.72.1.bb
+++ b/recipes/opencv/artoolkit_2.72.1.bb
@@ -6,8 +6,8 @@ DEPENDS = "libxi gstreamer virtual/libx11 freeglut virtual/libgl"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/artoolkit/ARToolKit-${PV}.tgz \
-           file://configure.diff;patch=1 \
-           file://paddle.diff;patch=1 "
+           file://configure.diff \
+           file://paddle.diff "
 
 S = "${WORKDIR}/ARToolKit"
 
diff --git a/recipes/opencv/gst-opencv_git.bb b/recipes/opencv/gst-opencv_git.bb
new file mode 100644
index 0000000000..424fac24ff
--- /dev/null
+++ b/recipes/opencv/gst-opencv_git.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "A collection of elements for the GStreamer multimedia framework which provide access to a number of computer vision techniques from the OpenCV project "
+LICENSE = "LGPLv2"
+
+DEPENDS = "opencv gstreamer ffmpeg"
+
+inherit autotools
+
+PV = "0.10.0.1+gitr${SRCPV}"
+SRCREV = "4514ee1608f001e85f264001355a76b5607b2144"
+SRC_URI = "git://github.com/Elleo/gst-opencv.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN}-dbg += "${libdir}/gstreamer-*/.debug"
+FILES_${PN}-dev += "${libdir}/gstreamer-*/*.la"
+FILES_${PN}-static += "${libdir}/gstreamer-*/*.a"
+FILES_${PN} += "${libdir}/gstreamer-*/*.so"
+
diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb
index c52f00adf4..b4989d14a1 100644
--- a/recipes/opencv/opencv-samples_svn.bb
+++ b/recipes/opencv/opencv-samples_svn.bb
@@ -6,11 +6,11 @@ LICENSE = "GPLv2"
 
 DEPENDS = "opencv"
 
-SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \
+SRC_URI = "svn://code.ros.org/svn/opencv/trunk;module=opencv;proto=https \
 "
 
-SRCREV = "2219"
-PV = "2.0.0+svnr${SRCPV}"
+SRCREV = "3058"
+PV = "2.1.0+svnr${SRCPV}"
 
 S = "${WORKDIR}/opencv"
 
diff --git a/recipes/opencv/opencv_1.0.0.bb b/recipes/opencv/opencv_1.0.0.bb
index 2872d06273..32ca2d079e 100644
--- a/recipes/opencv/opencv_1.0.0.bb
+++ b/recipes/opencv/opencv_1.0.0.bb
@@ -10,24 +10,24 @@ DEPENDS = "libtool swig swig-native python jpeg zlib libpng tiff glib-2.0"
 #RDEPENDS = "python jpeg zlib libpng tiff glib-2.0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-${PV}.tar.gz \
-          file://debian/010_enable_static.diff;patch=1 \
-          file://debian/010_ffmpeg_linking.diff;patch=1 \
-          file://debian/010_fix_optimisations.diff;patch=1 \
-          file://debian/010_m4_syntax.diff;patch=1 \
-          file://debian/010_makefile_syntax.diff;patch=1 \
-          file://debian/010_python_cspec.diff;patch=1 \
-          file://debian/020_python_linking.diff;patch=1 \
-          file://debian/030_install_hook.diff;patch=1 \
-          file://debian/050_rebootstrap.diff;patch=1 \
-          file://debian/100_amd64.diff;patch=1 \
-          file://debian/100_static_inline.diff;patch=1 \
-          file://debian/100_ffmpeg_updates.diff;patch=1 \
-          file://debian/110_dc1394.diff;patch=1 \
-          file://debian/120_header_warnings.diff;patch=1 \
-          file://debian/200_documentation.diff;patch=1 \
-          file://debian/200_examples_makefile.diff;patch=1 \
-          file://debian/210_openmp_compilation.diff;patch=1 \
-          file://debian/300_fix_segfault_in_window_gtk.diff;patch=1 \
+          file://debian/010_enable_static.diff \
+          file://debian/010_ffmpeg_linking.diff \
+          file://debian/010_fix_optimisations.diff \
+          file://debian/010_m4_syntax.diff \
+          file://debian/010_makefile_syntax.diff \
+          file://debian/010_python_cspec.diff \
+          file://debian/020_python_linking.diff \
+          file://debian/030_install_hook.diff \
+          file://debian/050_rebootstrap.diff \
+          file://debian/100_amd64.diff \
+          file://debian/100_static_inline.diff \
+          file://debian/100_ffmpeg_updates.diff \
+          file://debian/110_dc1394.diff \
+          file://debian/120_header_warnings.diff \
+          file://debian/200_documentation.diff \
+          file://debian/200_examples_makefile.diff \
+          file://debian/210_openmp_compilation.diff \
+          file://debian/300_fix_segfault_in_window_gtk.diff \
 "
 
 inherit distutils-base autotools pkgconfig
diff --git a/recipes/opencv/opencv_svn.bb b/recipes/opencv/opencv_svn.bb
index 1e63e1f6d0..c8211e16e3 100644
--- a/recipes/opencv/opencv_svn.bb
+++ b/recipes/opencv/opencv_svn.bb
@@ -8,15 +8,15 @@ ARM_INSTRUCTION_SET = "arm"
 
 DEPENDS = "ffmpeg gtk+ libtool swig swig-native python jpeg zlib libpng tiff glib-2.0"
 
-SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \
-           file://acinclude.m4"
+SRC_URI = "svn://code.ros.org/svn/opencv/trunk;module=opencv;proto=https \
+"
 
-SRCREV = "2219"
-PV = "2.0.0+svnr${SRCPV}"
+SRCREV = "3058"
+PV = "2.1.0+svnr${SRCPV}"
 
 S = "${WORKDIR}/opencv"
 
-inherit distutils-base autotools_stage pkgconfig cmake
+inherit distutils-base autotools pkgconfig cmake
 
 EXTRA_OECONF = " \
 		--disable-debug \
@@ -38,12 +38,6 @@ export HOST_SYS
 export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}"
 export PYTHON=${STAGING_BINDIR_NATIVE}/python
 
-do_configure_prepend() {
-	cp ${WORKDIR}/acinclude.m4 ${S}
-	sed -i -e /AC_CONFIG_MACRO_DIR/d -e /AZ_PYTHON_CSPEC/d ${S}/configure.in
-	sed -i -e s:samples::g -e 's: doc::g' ${S}/Makefile.am
-}
-
 TARGET_CC_ARCH += "-I${S}/include "
 
 PACKAGES += "${PN}-apps python-opencv"
@@ -62,11 +56,13 @@ FILES_${PN}-apps = "${bindir}/* ${datadir}/opencv/"
 FILES_${PN}-dbg += "${libdir}/.debug"
 FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig"
 
+ALLOW_EMPTY_${PN} = "1"
+
 INSANE_SKIP_python-opencv = True
 DESCRIPTION_python-opencv = "Python bindings to opencv"
 FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*"
 RDEPENDS_python-opencv = "python-core"
 
-do_stage_append() {
-	cp ${S}/include/opencv/*.h ${STAGING_INCDIR}/opencv/
+do_install_append() {
+	cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/
 }
diff --git a/recipes/opencv/openscenegraph_2.9.6.bb b/recipes/opencv/openscenegraph_2.9.6.bb
index effe8b60bc..0118a460be 100644
--- a/recipes/opencv/openscenegraph_2.9.6.bb
+++ b/recipes/opencv/openscenegraph_2.9.6.bb
@@ -6,7 +6,7 @@ DEPENDS = "gtk+ ffmpeg poppler libxrandr"
 inherit cmake
 
 SRC_URI = "http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-2.9.6.zip;name=osg \
-           file://gles.diff;patch=1 "
+           file://gles.diff "
 
 SRC_URI[osg.md5sum] = "f27a69499f3eadf1d8ad2ee22f6d5e85"
 SRC_URI[osg.sha256sum] = "9aa8ce2a581d42f8c9bac14dff5069c66633ddf73370a1e7412873048d643e9a"
diff --git a/recipes/opencvs/opencvs_cvs.bb b/recipes/opencvs/opencvs_cvs.bb
index 19e8f0bc0b..f28dbe5575 100644
--- a/recipes/opencvs/opencvs_cvs.bb
+++ b/recipes/opencvs/opencvs_cvs.bb
@@ -10,7 +10,7 @@ PV = "0.0+cvs${SRCDATE}"
 PR = "r1"
 
 SRC_URI = "cvs://anoncvs@anoncvs.ca.openbsd.org/cvs;method=ext;module=src/usr.bin/cvs \
-	   file://linux.patch;patch=1"
+	   file://linux.patch"
 S = "${WORKDIR}/cvs"
 
 inherit autotools
diff --git a/recipes/openh323/openh323_1.13.5.4.bb b/recipes/openh323/openh323_1.13.5.4.bb
index 1397f6742e..4d862192d7 100644
--- a/recipes/openh323/openh323_1.13.5.4.bb
+++ b/recipes/openh323/openh323_1.13.5.4.bb
@@ -7,7 +7,7 @@ DESCRIPTION="Open Soure ITU-T H.323 teleconferencing protocol implementation."
 LICENSE = "GPL"
 
 SRC_URI="http://http.us.debian.org/debian/pool/main/o/${PN}/${PN}_${PV}.orig.tar.gz \
-	file://fixes.patch;patch=1"
+	file://fixes.patch"
 
 S="${WORKDIR}/${PN}"
 DEPENDS="pwlib openssl"
diff --git a/recipes/openjade/openjade-native_1.3.2.bb b/recipes/openjade/openjade-native_1.3.2.bb
index 9848efcfca..20e96abd94 100644
--- a/recipes/openjade/openjade-native_1.3.2.bb
+++ b/recipes/openjade/openjade-native_1.3.2.bb
@@ -2,8 +2,8 @@ SECTION = "unknown"
 DEPENDS = "opensp-native sgml-common-native"
 LICENSE = "MIT"
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://oj-native-libosp-fix.patch;patch=1;pnum=1"
+	   file://configure.patch \
+	   file://oj-native-libosp-fix.patch"
 S = "${WORKDIR}/openjade-${PV}"
 
 inherit autotools native
diff --git a/recipes/openjade/openjade_1.3.2.bb b/recipes/openjade/openjade_1.3.2.bb
index 62e08f5a0d..c7ea360d7b 100644
--- a/recipes/openjade/openjade_1.3.2.bb
+++ b/recipes/openjade/openjade_1.3.2.bb
@@ -6,7 +6,7 @@ processing, and applying DSSSL (Document Style Semantics and \
 Specification Language) stylesheets to SGML and XML documents."
 LICENSE = "BSD"
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
+	   file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb b/recipes/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb
index 9c2f870698..39b6dd9c54 100644
--- a/recipes/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb
+++ b/recipes/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/icepick-0.0+hg20080118"
 SRC_URI = "\
 	http://jalimo.evolvis.org/repository/sources/icepick-0.0+hg20080118.tar.bz2;name=archive \
 	http://jalimo.evolvis.org/repository/sources/openjdk-langtools-jdk7-b31.tar.bz2;name=langtools \
-	file://${PV}-build-fix.patch;patch=1 \
+	file://${PV}-build-fix.patch \
 	"	
 
 inherit java autotools native
diff --git a/recipes/openldap/openldap_2.2.29.bb b/recipes/openldap/openldap_2.2.29.bb
index ba70f6e1bd..8d17e47109 100644
--- a/recipes/openldap/openldap_2.2.29.bb
+++ b/recipes/openldap/openldap_2.2.29.bb
@@ -14,15 +14,15 @@ SECTION = "libs"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz"
-SRC_URI += "file://openldap-autoconf.patch;patch=1"
+SRC_URI += "file://openldap-autoconf.patch"
 # The build tries to run a host executable, this fails.  The patch
 # causes the executable and its data to be installed instead of
 # the output - ucgendat must be run after the ipkg install!
-SRC_URI += "file://ucgendat.patch;patch=1"
+SRC_URI += "file://ucgendat.patch"
 # The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when
 # installing .so and executables, this fails in cross compilation
 # environments
-SRC_URI += "file://install-strip.patch;patch=1"
+SRC_URI += "file://install-strip.patch"
 
 inherit autotools
 
diff --git a/recipes/openldap/openldap_2.3.11.bb b/recipes/openldap/openldap_2.3.11.bb
index c3b27900b4..23b0dae4be 100644
--- a/recipes/openldap/openldap_2.3.11.bb
+++ b/recipes/openldap/openldap_2.3.11.bb
@@ -16,16 +16,16 @@ PR = "r5"
 LDAP_VER = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
 
 SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz"
-SRC_URI += "file://openldap-m4-pthread.patch;patch=1"
+SRC_URI += "file://openldap-m4-pthread.patch"
 SRC_URI += "file://initscript"
 # The build tries to run a host executable, this fails.  The patch
 # causes the executable and its data to be installed instead of
 # the output - ucgendat must be run after the ipkg install!
-#SRC_URI += "file://ucgendat.patch;patch=1"
+#SRC_URI += "file://ucgendat.patch"
 # The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when
 # installing .so and executables, this fails in cross compilation
 # environments
-SRC_URI += "file://install-strip.patch;patch=1"
+SRC_URI += "file://install-strip.patch"
 
 inherit autotools
 
diff --git a/recipes/openldap/openldap_2.4.21.bb b/recipes/openldap/openldap_2.4.21.bb
index 939dabca5d..7fb97c07f5 100644
--- a/recipes/openldap/openldap_2.4.21.bb
+++ b/recipes/openldap/openldap_2.4.21.bb
@@ -14,18 +14,18 @@ SECTION = "libs"
 LDAP_VER = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
 
 SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz;name=openldap-${PV}"
-SRC_URI += "file://openldap-m4-pthread.patch;patch=1"
+SRC_URI += "file://openldap-m4-pthread.patch"
 SRC_URI += "file://initscript"
 SRC_URI[openldap-2.4.21.md5sum] = "e7128c57b2bacd940e8906057c94ff26"
 SRC_URI[openldap-2.4.21.sha256sum] = "22eca357137c135b5561e2fa0e3336b280702acf2e5c4f40bc7aed1d1e8e9324"
 # The build tries to run a host executable, this fails.  The patch
 # causes the executable and its data to be installed instead of
 # the output - ucgendat must be run after the ipkg install!
-#SRC_URI += "file://ucgendat.patch;patch=1"
+#SRC_URI += "file://ucgendat.patch"
 # The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when
 # installing .so and executables, this fails in cross compilation
 # environments
-SRC_URI += "file://install-strip.patch;patch=1"
+SRC_URI += "file://install-strip.patch"
 
 inherit autotools
 
diff --git a/recipes/openmax/gst-openmax_0.10.0.4.bb b/recipes/openmax/gst-openmax_0.10.0.4.bb
index 5e13851441..127c1bd94c 100644
--- a/recipes/openmax/gst-openmax_0.10.0.4.bb
+++ b/recipes/openmax/gst-openmax_0.10.0.4.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2"
 DEPENDS = "gstreamer libomxil-bellagio"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-openmax/pre/gst-openmax-${PV}.tar.bz2 \
-           file://check.diff;patch=1 \
+           file://check.diff \
           "
 
 inherit autotools
diff --git a/recipes/openmoko-3rdparty/emtooth_svn.bb b/recipes/openmoko-3rdparty/emtooth_svn.bb
index 88b55f9d1d..b1854fc5f1 100644
--- a/recipes/openmoko-3rdparty/emtooth_svn.bb
+++ b/recipes/openmoko-3rdparty/emtooth_svn.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 DEPENDS = "elementary eina edbus"
 RDEPENDS = "bluez4 obexd"
 
-SRCREV = "76"
+SRCREV = "77"
 PV = "0.1+svnr${SRCPV}"
 PR = "r1"
 
diff --git a/recipes/openmoko-3rdparty/iliwi_git.bb b/recipes/openmoko-3rdparty/iliwi_git.bb
index d41992e7fe..63d61d1cba 100644
--- a/recipes/openmoko-3rdparty/iliwi_git.bb
+++ b/recipes/openmoko-3rdparty/iliwi_git.bb
@@ -8,13 +8,9 @@ RDEPENDS = "wireless-tools wpa-supplicant"
 
 SRCREV = "5be2b301033418fb9a33759047274b676034f096"
 PV = "0.0.1+gitr${SRCPV}"
+PR = "r1"
 
 SRC_URI = "git://github.com/Ebbe/Iliwi.git;protocol=http;branch=master"
 S = "${WORKDIR}/git"
 
 inherit autotools vala
-
-# needed because there is do_stage_append in vala.bbclass and no do_stage()
-do_stage() {
-
-}
diff --git a/recipes/openmoko-3rdparty/mcnavi_0.2.5.bb b/recipes/openmoko-3rdparty/mcnavi_0.2.5.bb
index 973023e78c..d011ec920e 100644
--- a/recipes/openmoko-3rdparty/mcnavi_0.2.5.bb
+++ b/recipes/openmoko-3rdparty/mcnavi_0.2.5.bb
@@ -5,7 +5,7 @@ DEPENDS = "ecore evas imlib2 gpsd edje-native"
 PR = "r2"
 
 SRC_URI = "http://www.gps-routes.info/debian/pool/main/m/mcnavi/mcnavi_${PV}.tar.gz;name=archive \
-           file://gpsd-2.90.patch;patch=1"
+           file://gpsd-2.90.patch"
 
 SRC_URI[archive.md5sum] = "b572c3691f05e22b37efd6cd53da203e"
 SRC_URI[archive.sha256sum] = "ee6792bef93070319141ee2020b7ae376527e3b8043f0f540bcd58d418576d44"
diff --git a/recipes/openmoko-3rdparty/pisi_0.4.10.bb b/recipes/openmoko-3rdparty/pisi_0.4.10.bb
deleted file mode 100644
index 025c24781e..0000000000
--- a/recipes/openmoko-3rdparty/pisi_0.4.10.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "PISI is synchronizing information"
-AUTHOR = "Michael Pilgermann"
-PRIORITY = "optional"
-LICENSE = "GPL"
-HOMEPAGE = "http://projects.openmoko.org/projects/pisi/"
-SRCNAME = "pisi"
-DEPENDS = "python-native python"
-RDEPENDS = "python-vobject python python-pygtk python-pygobject python-pycairo\
-           python-gdata python-webdav python-ldap python-epydoc python-core\
-           python-dateutil python-sqlite3 python-netserver python-netclient\
-           python-misc"
-
-PACKAGE_ARCH = "all"
-
-PR = "r0"
-
-SRC_URI = "http://projects.openmoko.org/frs/download.php/937/pisi-src-${PV}.tar.gz"
-SRC_URI[archive.md5sum] = "5311ff9ddbca49ab751ad6f526c53e8f"
-SRC_URI[archive.sha256sum] = "540a363188a51387e5296fdb3f7b885f9a0a116d106d578c14e738075e7edf42"
-
-FILES_${PN} += "/opt/pisi \
-                ${datadir}/pixmaps \
-                ${datadir}/applications \
-                /home"
-CONFFILES_${PN} += "/home/root/.${PN}/conf.default"
-
-do_compile() {
-	${STAGING_BINDIR_NATIVE}/python ${S}/setup.py build ${D}
-}
-
-do_install() {
-	${STAGING_BINDIR_NATIVE}/python ${S}/setup.py install ${D}
-	rm -rf ${D}/opt/pisi/build/
-	rm -rf ${D}/opt/pisi/patches/
-}
-
-SRC_URI[md5sum] = "5311ff9ddbca49ab751ad6f526c53e8f"
-SRC_URI[sha256sum] = "540a363188a51387e5296fdb3f7b885f9a0a116d106d578c14e738075e7edf42"
diff --git a/recipes/openmoko-3rdparty/pisi_0.5.2.bb b/recipes/openmoko-3rdparty/pisi_0.5.3.bb
index b7249912d0..08d3bbeeeb 100644
--- a/recipes/openmoko-3rdparty/pisi_0.5.2.bb
+++ b/recipes/openmoko-3rdparty/pisi_0.5.3.bb
@@ -13,8 +13,8 @@ RDEPENDS = "python-vobject python-core python-pygtk python-pygobject python-pyca
 PACKAGE_ARCH = "all"
 
 SRC_URI = "http://github.com/downloads/kichkasch/pisi/pisi-src-${PV}.tar.gz"
-SRC_URI[md5sum] = "ea947696e99db19b61893c43b47609f6"
-SRC_URI[sha256sum] = "58e0411cdc7b7c18a5276b10dc3b5261193a5c2f4c79c45ab0c91bdd7d351b28"
+SRC_URI[md5sum] = "c416b316668575f8506dc54e19475795"
+SRC_URI[sha256sum] = "a27603662747aee9a0440acc6472fe274c0724fcc66ad05849eb186bfb24868e"
 
 FILES_${PN} += "/opt/${PN} \
                 ${datadir}/pixmaps \
diff --git a/recipes/openmoko-3rdparty/podboy_svn.bb b/recipes/openmoko-3rdparty/podboy_svn.bb
index 6dcabdbb22..08c0655588 100644
--- a/recipes/openmoko-3rdparty/podboy_svn.bb
+++ b/recipes/openmoko-3rdparty/podboy_svn.bb
@@ -5,8 +5,9 @@ AUTHOR = "Valéry Febvre <vfebvre@easter-eggs.com>"
 SECTION = "x11/applications"
 PRIORITY = "optional"
 
-SRCREV = "123"
-PV = "1.5.0+svnr${SRCPV}"
+SRCREV = "174"
+PV = "1.6.1+svnr${SRCPV}"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 
@@ -17,7 +18,8 @@ inherit distutils
 
 FILES_${PN} += "${datadir}/podboy ${datadir}/applications/podboy.desktop ${datadir}/pixmaps/podboy.png"
 
-RDEPENDS += "python-compression python-elementary python-gst python-html python-netclient python-netserver python-sqlite3 python-subprocess gst-plugin-alsa gst-plugin-audioconvert gst-plugin-audioresample gst-plugin-bluez gst-plugin-mad gst-plugin-ogg gst-plugin-volume gst-plugin-vorbis"
+DEPENDS = "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}"
+RDEPENDS += "python-compression python-elementary python-gst python-html python-netclient python-netserver python-sqlite3 python-subprocess gst-plugin-alsa gst-plugin-audioconvert gst-plugin-audioresample gst-plugin-bluez ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)} gst-plugin-ogg gst-plugin-volume gst-plugin-vorbis"
 
 do_compile_prepend() {
 	${STAGING_BINDIR_NATIVE}/edje_cc ${S}/data/podboy.edc
diff --git a/recipes/openmoko-3rdparty/spojegui_svn.bb b/recipes/openmoko-3rdparty/spojegui_svn.bb
new file mode 100644
index 0000000000..6be74610cc
--- /dev/null
+++ b/recipes/openmoko-3rdparty/spojegui_svn.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "GUI for CLI program spoje.py (http://code.google.com/p/spoje/) for searching public transport connections in Czech Republic."
+HOMEPAGE = "http://multi.xeres.cz/programovani/spojegui"
+LICENSE = "GPLv3"
+AUTHOR = "Josef Jebavy <josef.jebavy@gmail.com>"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+RDEPENDS = "python-core python-elementary python-sqlite3 python-netclient"
+
+SRCREV = "64"
+PV = "0.4.2+svnr${SRCPV}"
+
+S = "${WORKDIR}/build"
+
+PACKAGE_ARCH = "all"
+
+SRC_URI = "svn://xeres.cz/spoje;module=build"
+
+do_install() {
+  install -d "${D}/${bindir}"
+  install -m 0755 "${S}/src/spoje.py" "${D}/${bindir}"
+  install -m 0755 "${S}/src/spoje-gui.py" "${D}/${bindir}"
+  install -d "${D}/${datadir}/pixmaps"
+  install -m 0644 "${S}/img/train.png" "${D}/${datadir}/pixmaps"
+  install -d "${D}/${datadir}/applications"
+  install -m 0644 "${S}/data/spoje.desktop" "${D}/${datadir}/applications"
+}
+
+FILES_${PN} += " ${datadir}/applications/spoje.desktop ${datadir}/pixmaps"
diff --git a/recipes/openmoko-3rdparty/ventura_svn.bb b/recipes/openmoko-3rdparty/ventura_svn.bb
index 608d8eeaf3..6bfa4e4418 100644
--- a/recipes/openmoko-3rdparty/ventura_svn.bb
+++ b/recipes/openmoko-3rdparty/ventura_svn.bb
@@ -10,7 +10,7 @@ PR = "1"
 
 SRC_URI = "svn://elm-browser.googlecode.com/svn;module=trunk;proto=http"
 
-SRCREV = "15"
+SRCREV = "16"
 S = "${WORKDIR}/trunk"
 
 inherit autotools
diff --git a/recipes/openmoko-projects/diversity-daemon_svn.bb b/recipes/openmoko-projects/diversity-daemon_svn.bb
index 286e475639..09b3005a34 100644
--- a/recipes/openmoko-projects/diversity-daemon_svn.bb
+++ b/recipes/openmoko-projects/diversity-daemon_svn.bb
@@ -9,7 +9,7 @@ PV = "0.0+svnr${SRCPV}"
 PR = "r3"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https \
-           file://no-xmmp.patch;patch=1;minrev=276"
+           file://no-xmmp.patch;minrev=276"
 S = "${WORKDIR}/diversity-daemon"
 
 inherit autotools pkgconfig
diff --git a/recipes/openmoko-projects/openmoko-agpsui_svn.bb b/recipes/openmoko-projects/openmoko-agpsui_svn.bb
index 043a0dea69..5df6073d07 100644
--- a/recipes/openmoko-projects/openmoko-agpsui_svn.bb
+++ b/recipes/openmoko-projects/openmoko-agpsui_svn.bb
@@ -8,7 +8,7 @@ PV = "0.1+svnr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/openmoko-agpsui;module=trunk;proto=http \
-file://fix-configure-for-new-autotools.patch;patch=1;pnum=2"
+file://fix-configure-for-new-autotools.patch;striplevel=2"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/openmoko-projects/paroli_git.bb b/recipes/openmoko-projects/paroli_git.bb
index 251c2585a6..e3f2523b9a 100644
--- a/recipes/openmoko-projects/paroli_git.bb
+++ b/recipes/openmoko-projects/paroli_git.bb
@@ -24,7 +24,7 @@ RDEPENDS = "\
   task-fso-compliance \
   elementary \
   elementary-themes \
-  edbus-ehal \
+  edbus \
 "
 
 E_CONFIG_DIR="/usr/share/enlightenment/data"
diff --git a/recipes/openmoko2/libmokoui2_svn.bb b/recipes/openmoko2/libmokoui2_svn.bb
index 97d715ca74..478f3f5238 100644
--- a/recipes/openmoko2/libmokoui2_svn.bb
+++ b/recipes/openmoko2/libmokoui2_svn.bb
@@ -8,8 +8,8 @@ PR = "r5"
 inherit openmoko2 python-dir
 
 SRC_URI += "\
-	file://configure.patch;patch=1 \
-	file://makefile.am.patch;patch=1 \
+	file://configure.patch \
+	file://makefile.am.patch \
 	"
 LICENSE = "LGPL"
 
diff --git a/recipes/openmoko2/neod_svn.bb b/recipes/openmoko2/neod_svn.bb
index 13fd9f0df9..eebb154ecc 100644
--- a/recipes/openmoko2/neod_svn.bb
+++ b/recipes/openmoko2/neod_svn.bb
@@ -10,8 +10,8 @@ PR = "r7"
 
 inherit openmoko2 gconf
 
-SRC_URI += "file://htc.patch;patch=1;maxrev=3348 \
-            file://ipaq.patch;patch=1;maxrev=3348"
+SRC_URI += "file://htc.patch;maxrev=3348 \
+            file://ipaq.patch;maxrev=3348"
 
 EXTRA_OECONF_om-gta01 = "--with-platform=neo1973"
 EXTRA_OECONF_om-gta02 = "--with-platform=neo1973"
diff --git a/recipes/openmoko2/openmoko-browser2_svn.bb b/recipes/openmoko2/openmoko-browser2_svn.bb
index 6a0f5987d5..3d329b7db6 100644
--- a/recipes/openmoko2/openmoko-browser2_svn.bb
+++ b/recipes/openmoko2/openmoko-browser2_svn.bb
@@ -8,9 +8,9 @@ PR = "r2"
 inherit openmoko2
 LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
 
-SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171"
+SRC_URI += "file://webkit-update.patch;minrev=3646;maxrev=4171"
 
-#SRC_URI += "file://fingerscroll.diff;patch=1"
+#SRC_URI += "file://fingerscroll.diff"
 
 do_compile_prepend() {
         find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g
diff --git a/recipes/openmoko2/openmoko-dialer2_svn.bb b/recipes/openmoko2/openmoko-dialer2_svn.bb
index 49712a7f7c..33b90ffb70 100644
--- a/recipes/openmoko2/openmoko-dialer2_svn.bb
+++ b/recipes/openmoko2/openmoko-dialer2_svn.bb
@@ -8,8 +8,8 @@ PE = "1"
 
 inherit openmoko2
 
-SRC_URI_append_om-gta01 = " file://kernel-2.6.24.patch;patch=1"
-SRC_URI_append_om-gta02 = " file://kernel-2.6.24.patch;patch=1"
+SRC_URI_append_om-gta01 = " file://kernel-2.6.24.patch"
+SRC_URI_append_om-gta02 = " file://kernel-2.6.24.patch"
 
 EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
 
diff --git a/recipes/openntpd/openntpd_3.7p1.bb b/recipes/openntpd/openntpd_3.7p1.bb
index bc11095d64..f1bf431c6e 100644
--- a/recipes/openntpd/openntpd_3.7p1.bb
+++ b/recipes/openntpd/openntpd_3.7p1.bb
@@ -7,9 +7,9 @@ DEPENDS += "openssl tzdata"
 PR = "r14"
 
 SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \
-           file://autofoo.patch;patch=1 \
-           file://adjtimex-${PV}.patch;patch=1 \
-           file://makefile-install.patch;patch=1 \
+           file://autofoo.patch \
+           file://adjtimex-${PV}.patch \
+           file://makefile-install.patch \
            file://init"
 
 S = "${WORKDIR}/openntpd-${PV}"
diff --git a/recipes/openntpd/openntpd_3.9p1.bb b/recipes/openntpd/openntpd_3.9p1.bb
index 7a861818fd..3ed2a0fd05 100644
--- a/recipes/openntpd/openntpd_3.9p1.bb
+++ b/recipes/openntpd/openntpd_3.9p1.bb
@@ -7,7 +7,7 @@ DEPENDS += "openssl tzdata"
 PR = "r1"
 
 SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/${P}.tar.gz \
-           file://adjtimex-${PV}.patch;patch=1 \
+           file://adjtimex-${PV}.patch \
            file://init"
 
 S = "${WORKDIR}/openntpd-${PV}"
diff --git a/recipes/openobex/openobex_1.2.bb b/recipes/openobex/openobex_1.2.bb
index d55de2807b..6c756f6e15 100644
--- a/recipes/openobex/openobex_1.2.bb
+++ b/recipes/openobex/openobex_1.2.bb
@@ -8,8 +8,8 @@ LICENSE = "GPL"
 PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
-           file://disable-cable-test.patch;patch=1 \
-	   file://libusb_crosscompile_check.patch;patch=1"
+           file://disable-cable-test.patch \
+	   file://libusb_crosscompile_check.patch"
 
 inherit autotools binconfig pkgconfig
 
diff --git a/recipes/openobex/openobex_1.3.bb b/recipes/openobex/openobex_1.3.bb
index c05698d6e3..af22687bc6 100644
--- a/recipes/openobex/openobex_1.3.bb
+++ b/recipes/openobex/openobex_1.3.bb
@@ -8,8 +8,8 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
-           file://disable-cable-test.patch;patch=1 \
-           file://libusb_crosscompile_check.patch;patch=1"
+           file://disable-cable-test.patch \
+           file://libusb_crosscompile_check.patch"
 
 inherit autotools binconfig pkgconfig
 
diff --git a/recipes/openobex/openobex_1.5.bb b/recipes/openobex/openobex_1.5.bb
index be44e3c925..fa08df7f2d 100644
--- a/recipes/openobex/openobex_1.5.bb
+++ b/recipes/openobex/openobex_1.5.bb
@@ -4,12 +4,12 @@ HOMEPAGE = "http://openobex.triq.net"
 SECTION = "libs"
 PROVIDES = "openobex-apps"
 DEPENDS = "virtual/libusb0 bluez-libs"
-LICENSE = "GPL"
-PR = "r1"
+LICENSE = "GPLv2/LGPLv2.1"
+PR = "r2"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/openobex-${PV}.tar.gz \
-           file://disable-cable-test.patch;patch=1 \
-           file://libusb_crosscompile_check.patch;patch=1"
+           file://disable-cable-test.patch \
+           file://libusb_crosscompile_check.patch"
 
 inherit autotools_stage binconfig pkgconfig
 
diff --git a/recipes/openocd/openocd_svn.bb b/recipes/openocd/openocd_svn.bb
index 763665b3e6..e6859e98ed 100644
--- a/recipes/openocd/openocd_svn.bb
+++ b/recipes/openocd/openocd_svn.bb
@@ -8,7 +8,7 @@ PR = "r3"
 inherit autotools
 
 SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \
-           file://openocd-link-static.patch;patch=1"
+           file://openocd-link-static.patch"
 S = "${WORKDIR}/trunk"
 
 DEPENDS = "libftdi"
diff --git a/recipes/openrdate/openrdate_1.1.3.bb b/recipes/openrdate/openrdate_1.1.3.bb
index 138f579e6e..46024fe755 100644
--- a/recipes/openrdate/openrdate_1.1.3.bb
+++ b/recipes/openrdate/openrdate_1.1.3.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 PR="r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openrdate/openrdate-${PV}.tar.gz \
-           file://debian.patch;patch=1"
+           file://debian.patch"
 
 inherit autotools
 
diff --git a/recipes/openscada/openscada_svn.bb b/recipes/openscada/openscada_svn.bb
index dd75e80d1f..deb0c76981 100644
--- a/recipes/openscada/openscada_svn.bb
+++ b/recipes/openscada/openscada_svn.bb
@@ -8,7 +8,7 @@ SECTION = "Applications"
 DEPENDS = "gd mysql expat sqlite3 lmsensors-apps fftw qt4-x11-free"
 #SRC_URI = "ftp://ftp.oscada.org/OpenSCADA/0.6.4/openscada-0.6.4.tar.gz"
 SRC_URI = "svn://oscada.org.ua/trunk;module=OpenSCADA;rev=;proto=svn \
-           file://rcc-moc.patch;patch=1 \
+           file://rcc-moc.patch \
           "
 
 PV = "0.6.4+svnr${SRCPV}"
diff --git a/recipes/opensp/opensp-native_1.5.bb b/recipes/opensp/opensp-native_1.5.bb
index ab3df69b32..9d8b6262c6 100644
--- a/recipes/opensp/opensp-native_1.5.bb
+++ b/recipes/opensp/opensp-native_1.5.bb
@@ -3,9 +3,9 @@ DEPENDS = ""
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \
-		file://m4.patch;patch=1 \
-		file://attributevalue.patch;patch=1 \
-		file://rangmap-fix.patch;patch=1"
+		file://m4.patch \
+		file://attributevalue.patch \
+		file://rangmap-fix.patch"
 
 S = "${WORKDIR}/OpenSP-${PV}"
 LICENSE = "MIT"
diff --git a/recipes/opensp/opensp_1.5.bb b/recipes/opensp/opensp_1.5.bb
index 5fdf00b48e..13d0534dc3 100644
--- a/recipes/opensp/opensp_1.5.bb
+++ b/recipes/opensp/opensp_1.5.bb
@@ -10,10 +10,10 @@ PR = "r2"
 FULL_OPTIMIZATION_sh4 = "-O1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \
-           file://m4.patch;patch=1 \
-           file://attributevalue.patch;patch=1 \
-           file://rangmap-fix.patch;patch=1 \
-           file://fix-docdir.patch;patch=1"
+           file://m4.patch \
+           file://attributevalue.patch \
+           file://rangmap-fix.patch \
+           file://fix-docdir.patch"
 
 S = "${WORKDIR}/OpenSP-${PV}"
 
diff --git a/recipes/openssh/openssh_3.7.1p1.bb b/recipes/openssh/openssh_3.7.1p1.bb
index a8b7d0c382..f63c7fa252 100644
--- a/recipes/openssh/openssh_3.7.1p1.bb
+++ b/recipes/openssh/openssh_3.7.1p1.bb
@@ -10,8 +10,8 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \
 used to provide applications with a secure communication channel."
 LICENSE = "openssh"
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
-           file://scp-nossl.patch;patch=1 \
+           file://configure.patch \
+           file://scp-nossl.patch \
            file://sshd_config"
 
 inherit autotools
diff --git a/recipes/openssh/openssh_3.7.1p2.bb b/recipes/openssh/openssh_3.7.1p2.bb
index d24981fc29..7d8671c980 100644
--- a/recipes/openssh/openssh_3.7.1p2.bb
+++ b/recipes/openssh/openssh_3.7.1p2.bb
@@ -10,8 +10,8 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \
 used to provide applications with a secure communication channel."
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
-           file://scp-nossl.patch;patch=1 \
+           file://configure.patch \
+           file://scp-nossl.patch \
            file://sshd_config"
 
 inherit autotools
diff --git a/recipes/openssh/openssh_3.8p1.bb b/recipes/openssh/openssh_3.8p1.bb
index b562b3c931..fe5a623365 100644
--- a/recipes/openssh/openssh_3.8p1.bb
+++ b/recipes/openssh/openssh_3.8p1.bb
@@ -13,8 +13,8 @@ LICENSE = "BSD"
 PR ="r3"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
-           file://scp-nossl.patch;patch=1 \
+           file://configure.patch \
+           file://scp-nossl.patch \
 	   file://ssh_config \
            file://sshd_config \
            file://init"
diff --git a/recipes/openssh/openssh_4.0p1.bb b/recipes/openssh/openssh_4.0p1.bb
index 250e6c7c09..4e595bf615 100644
--- a/recipes/openssh/openssh_4.0p1.bb
+++ b/recipes/openssh/openssh_4.0p1.bb
@@ -17,7 +17,7 @@ LICENSE = "BSD"
 PR = "r10"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
+           file://configure.patch \
            file://sshd_config \
 	   file://ssh_config \
            file://init"
diff --git a/recipes/openssh/openssh_4.6p1.bb b/recipes/openssh/openssh_4.6p1.bb
index 3bab1da0b9..dba3785dcb 100644
--- a/recipes/openssh/openssh_4.6p1.bb
+++ b/recipes/openssh/openssh_4.6p1.bb
@@ -1,6 +1,6 @@
 require openssh.inc
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
-           file://sftp-server-nolibcrypto.patch;patch=1 \
+           file://sftp-server-nolibcrypto.patch \
            file://sshd_config \
            file://ssh_config \
            file://init \
diff --git a/recipes/openssh/openssh_5.2p1.bb b/recipes/openssh/openssh_5.2p1.bb
index 4e8a67e1ac..66eff25928 100644
--- a/recipes/openssh/openssh_5.2p1.bb
+++ b/recipes/openssh/openssh_5.2p1.bb
@@ -6,7 +6,7 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
            file://sshd_config \
            file://ssh_config \
            file://init \
-           file://openssh-5.2-sftp-server-nolibcrypto.patch;patch=1 \
+           file://openssh-5.2-sftp-server-nolibcrypto.patch \
           "
 
 SRC_URI[md5sum] = "ada79c7328a8551bdf55c95e631e7dad"
diff --git a/recipes/openssl/openssl-1.0.0/configure-targets.patch b/recipes/openssl/openssl-1.0.0/configure-targets.patch
index b68123a233..112732b3fd 100644
--- a/recipes/openssl/openssl-1.0.0/configure-targets.patch
+++ b/recipes/openssl/openssl-1.0.0/configure-targets.patch
@@ -1,24 +1,25 @@
 
 The number of colons are important :)
 
-Index: openssl-0.9.8g/Configure
+
+Index: openssl-1.0.0/Configure
 ===================================================================
---- openssl-0.9.8g.orig/Configure	2008-04-12 04:27:22.000000000 +0200
-+++ openssl-0.9.8g/Configure	2008-04-12 04:38:56.000000000 +0200
-@@ -395,6 +395,16 @@
- "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
- "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
+--- openssl-1.0.0.orig/Configure	2010-01-19 13:40:54.000000000 -0800
++++ openssl-1.0.0/Configure	2010-05-26 22:58:01.238104854 -0700
+@@ -380,6 +380,16 @@ my %table=(
+ "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
+ "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
  
 + # Linux on ARM
-+"linux-elf-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibcgnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibcgnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-elf-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +
-+"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
++"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
 +
  #### *BSD [do see comment about ${BSDthreads} above!]
  "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-x86",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "BSD-x86",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/recipes/openssl/openssl-1.0.0/debian.patch b/recipes/openssl/openssl-1.0.0/debian.patch
index 636c113408..1cd6e11966 100644
--- a/recipes/openssl/openssl-1.0.0/debian.patch
+++ b/recipes/openssl/openssl-1.0.0/debian.patch
@@ -1,22 +1,8 @@
 Index: openssl-1.0.0/Makefile
 ===================================================================
---- openssl-1.0.0.orig/Makefile	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/Makefile	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-@@ -26,10 +26,10 @@
+--- openssl-1.0.0.orig/Makefile
++++ openssl-1.0.0/Makefile
+@@ -26,10 +26,10 @@ HERE=.
  # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
  # Normally it is left empty.
  INSTALL_PREFIX=
@@ -29,7 +15,7 @@ Display the current time in the given FORMAT.
  
  # NO_IDEA - Define to build without the IDEA algorithm
  # NO_RC4  - Define to build without the RC4 algorithm
-@@ -133,12 +133,13 @@
+@@ -133,12 +133,13 @@ TESTS = alltests
  
  MAKEFILE= Makefile
  
@@ -46,7 +32,7 @@ Display the current time in the given FORMAT.
  SHELL=/bin/sh
  
  TOP=    .
-@@ -149,8 +150,8 @@
+@@ -149,8 +150,8 @@ LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
  SHARED_SSL=libssl$(SHLIB_EXT)
  SHARED_LIBS=
@@ -57,7 +43,7 @@ Display the current time in the given FORMAT.
  
  GENERAL=        Makefile
  BASENAME=       openssl
-@@ -324,7 +325,8 @@
+@@ -324,7 +325,8 @@ libcrypto.pc: Makefile
  	    echo 'Description: OpenSSL cryptography library'; \
  	    echo 'Version: '$(VERSION); \
  	    echo 'Requires: '; \
@@ -67,7 +53,7 @@ Display the current time in the given FORMAT.
  	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
  
  libssl.pc: Makefile
-@@ -337,7 +339,8 @@
+@@ -337,7 +339,8 @@ libssl.pc: Makefile
  	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
  	    echo 'Version: '$(VERSION); \
  	    echo 'Requires: '; \
@@ -77,7 +63,7 @@ Display the current time in the given FORMAT.
  	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
  
  openssl.pc: Makefile
-@@ -350,7 +353,8 @@
+@@ -350,7 +353,8 @@ openssl.pc: Makefile
  	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
  	    echo 'Version: '$(VERSION); \
  	    echo 'Requires: '; \
@@ -87,7 +73,7 @@ Display the current time in the given FORMAT.
  	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
  
  Makefile: Makefile.org Configure config
-@@ -499,7 +503,7 @@
+@@ -499,7 +503,7 @@ install: all install_docs install_sw
  install_sw:
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
@@ -96,7 +82,7 @@ Display the current time in the given FORMAT.
  		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
  		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-@@ -608,7 +612,7 @@
+@@ -608,7 +612,7 @@ install_docs:
  		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
  		(cd `$(PERL) util/dirname.pl $$i`; \
  		sh -c "$$pod2man \
@@ -105,7 +91,7 @@ Display the current time in the given FORMAT.
  			--release=$(VERSION) `basename $$i`") \
  			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
  		$(PERL) util/extract-names.pl < $$i | \
-@@ -625,7 +629,7 @@
+@@ -625,7 +629,7 @@ install_docs:
  		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
  		(cd `$(PERL) util/dirname.pl $$i`; \
  		sh -c "$$pod2man \
@@ -116,29 +102,15 @@ Display the current time in the given FORMAT.
  		$(PERL) util/extract-names.pl < $$i | \
 Index: openssl-1.0.0/Configure
 ===================================================================
---- openssl-1.0.0.orig/Configure	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/Configure	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- openssl-1.0.0.orig/Configure
++++ openssl-1.0.0/Configure
 @@ -1,4 +1,4 @@
 -:
 +#!/usr/local/bin/perl
  eval 'exec perl -S $0 ${1+"$@"}'
      if $running_under_some_shell;
  ##
-@@ -331,6 +331,47 @@
+@@ -331,6 +331,44 @@ my %table=(
  "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
  "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
  
@@ -146,47 +118,44 @@ Display the current time in the given FORMAT.
 +"debian-alpha","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-alpha-ev4","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev4 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-alpha-ev5","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev5 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armel","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+#"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-armel","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+#"debian-freebsd-alpha","gcc:-DTERMIOS -O -Wa,--noexecstack -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-ia64","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+#"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
-+"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-i386-i486","gcc:-DL_ENDIAN 	-DTERMIO -fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb3 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-i386",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-m68k",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-sparc",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -Wa,--noexecstack -g::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-i386",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-mips","gcc:-O2 -Wa,--noexecstack -g -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
-+"debian-sh3",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m32r","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -mcpu=v8 -g -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,--noexecstack -Wa,-Av8plus -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-netbsd-i386",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-netbsd-m68k",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-netbsd-sparc",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -Wa,--noexecstack -g::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-openbsd-i386",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-openbsd-mips","gcc:-O2 -Wa,--noexecstack -g -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::linux_ppc32.o:::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o:::::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
++"debian-sh3",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sh4",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sh3eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sh4eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-m32r","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -mcpu=v8 -g -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,--noexecstack -Wa,-Av8plus -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +
  ####
  #### Variety of LINUX:-)
  ####
-@@ -529,7 +570,7 @@
+@@ -529,7 +567,7 @@ my %table=(
  # Cygwin
  "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
  "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
@@ -195,7 +164,7 @@ Display the current time in the given FORMAT.
  
  # NetWare from David Ward (dsward@novell.com)
  # requires either MetroWerks NLM development tools, or gcc / nlmconv
-@@ -1465,6 +1506,8 @@
+@@ -1465,6 +1503,8 @@ if ($strict_warnings)
  		}
  	}
  
@@ -204,7 +173,7 @@ Display the current time in the given FORMAT.
  open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
  unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
  open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-@@ -1555,7 +1598,8 @@
+@@ -1555,7 +1595,8 @@ while (<IN>)
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
  		{
  		my $sotmp = $1;
@@ -214,7 +183,7 @@ Display the current time in the given FORMAT.
  		}
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
  		{
-@@ -1683,7 +1727,7 @@
+@@ -1683,7 +1724,7 @@ while (<IN>)
  		}
  	elsif	(/^#define\s+ENGINESDIR/)
  		{
@@ -225,23 +194,9 @@ Display the current time in the given FORMAT.
  		}
 Index: openssl-1.0.0/config
 ===================================================================
---- openssl-1.0.0.orig/config	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/config	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-@@ -170,8 +170,8 @@
+--- openssl-1.0.0.orig/config
++++ openssl-1.0.0/config
+@@ -170,8 +170,8 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
  	echo "${MACHINE}-whatever-linux1"; exit 0
  	;;
  
@@ -254,23 +209,9 @@ Display the current time in the given FORMAT.
      LynxOS:*)
 Index: openssl-1.0.0/Makefile.org
 ===================================================================
---- openssl-1.0.0.orig/Makefile.org	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/Makefile.org	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-@@ -131,12 +131,13 @@
+--- openssl-1.0.0.orig/Makefile.org
++++ openssl-1.0.0/Makefile.org
+@@ -131,12 +131,13 @@ TESTS = alltests
  
  MAKEFILE= Makefile
  
@@ -287,7 +228,7 @@ Display the current time in the given FORMAT.
  SHELL=/bin/sh
  
  TOP=    .
-@@ -322,7 +323,8 @@
+@@ -322,7 +323,8 @@ libcrypto.pc: Makefile
  	    echo 'Description: OpenSSL cryptography library'; \
  	    echo 'Version: '$(VERSION); \
  	    echo 'Requires: '; \
@@ -297,7 +238,7 @@ Display the current time in the given FORMAT.
  	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
  
  libssl.pc: Makefile
-@@ -335,7 +337,8 @@
+@@ -335,7 +337,8 @@ libssl.pc: Makefile
  	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
  	    echo 'Version: '$(VERSION); \
  	    echo 'Requires: '; \
@@ -307,7 +248,7 @@ Display the current time in the given FORMAT.
  	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
  
  openssl.pc: Makefile
-@@ -348,7 +351,8 @@
+@@ -348,7 +351,8 @@ openssl.pc: Makefile
  	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
  	    echo 'Version: '$(VERSION); \
  	    echo 'Requires: '; \
@@ -317,7 +258,7 @@ Display the current time in the given FORMAT.
  	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
  
  Makefile: Makefile.org Configure config
-@@ -497,7 +501,7 @@
+@@ -497,7 +501,7 @@ install: all install_docs install_sw
  install_sw:
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
@@ -326,7 +267,7 @@ Display the current time in the given FORMAT.
  		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
  		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-@@ -606,7 +610,7 @@
+@@ -606,7 +610,7 @@ install_docs:
  		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
  		(cd `$(PERL) util/dirname.pl $$i`; \
  		sh -c "$$pod2man \
@@ -335,7 +276,7 @@ Display the current time in the given FORMAT.
  			--release=$(VERSION) `basename $$i`") \
  			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
  		$(PERL) util/extract-names.pl < $$i | \
-@@ -623,7 +627,7 @@
+@@ -623,7 +627,7 @@ install_docs:
  		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
  		(cd `$(PERL) util/dirname.pl $$i`; \
  		sh -c "$$pod2man \
@@ -346,15 +287,8 @@ Display the current time in the given FORMAT.
  		$(PERL) util/extract-names.pl < $$i | \
 Index: openssl-1.0.0/openssl.ld
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.0/openssl.ld	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- /dev/null
++++ openssl-1.0.0/openssl.ld
 @@ -0,0 +1,5 @@
 +OPENSSL_0.9.8 {
 +	 global:
@@ -363,15 +297,8 @@ Display the current time in the given FORMAT.
 +
 Index: openssl-1.0.0/engines/openssl.ld
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.0/engines/openssl.ld	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- /dev/null
++++ openssl-1.0.0/engines/openssl.ld
 @@ -0,0 +1,5 @@
 +OPENSSL_0.9.8 {
 +	 global:
@@ -380,15 +307,8 @@ Display the current time in the given FORMAT.
 +
 Index: openssl-1.0.0/doc/Makefile
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.0/doc/Makefile	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- /dev/null
++++ openssl-1.0.0/doc/Makefile
 @@ -0,0 +1,40 @@
 +VERSION =
 +
@@ -432,15 +352,8 @@ Display the current time in the given FORMAT.
 +	-$(MAKE) clean
 Index: openssl-1.0.0/doc/apps/c_rehash.pod
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.0/doc/apps/c_rehash.pod	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- /dev/null
++++ openssl-1.0.0/doc/apps/c_rehash.pod
 @@ -0,0 +1,55 @@
 +
 +=pod
@@ -499,22 +412,8 @@ Display the current time in the given FORMAT.
 +=cut
 Index: openssl-1.0.0/crypto/opensslconf.h
 ===================================================================
---- openssl-1.0.0.orig/crypto/opensslconf.h	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/crypto/opensslconf.h	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- openssl-1.0.0.orig/crypto/opensslconf.h
++++ openssl-1.0.0/crypto/opensslconf.h
 @@ -11,6 +11,9 @@
  #ifndef OPENSSL_NO_JPAKE
  # define OPENSSL_NO_JPAKE
@@ -593,7 +492,7 @@ Display the current time in the given FORMAT.
  #endif /* HEADER_BF_LOCL_H */
  
  #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-@@ -170,7 +176,7 @@
+@@ -170,7 +176,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND D
  /* Unroll the inner loop, this sometimes helps, sometimes hinders.
   * Very mucy CPU dependant */
  #ifndef DES_UNROLL
@@ -604,22 +503,8 @@ Display the current time in the given FORMAT.
  /* These default values were supplied by
 Index: openssl-1.0.0/crypto/sha/sha.h
 ===================================================================
---- openssl-1.0.0.orig/crypto/sha/sha.h	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/crypto/sha/sha.h	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- openssl-1.0.0.orig/crypto/sha/sha.h
++++ openssl-1.0.0/crypto/sha/sha.h
 @@ -59,6 +59,7 @@
  #ifndef HEADER_SHA_H
  #define HEADER_SHA_H
diff --git a/recipes/openssl/openssl-1.0.0/engines-install-in-libdir-ssl.patch b/recipes/openssl/openssl-1.0.0/engines-install-in-libdir-ssl.patch
index c6901ef2f4..949d6ad8c4 100644
--- a/recipes/openssl/openssl-1.0.0/engines-install-in-libdir-ssl.patch
+++ b/recipes/openssl/openssl-1.0.0/engines-install-in-libdir-ssl.patch
@@ -1,21 +1,7 @@
 Index: openssl-1.0.0/engines/Makefile
 ===================================================================
---- openssl-1.0.0.orig/engines/Makefile	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/engines/Makefile	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- openssl-1.0.0.orig/engines/Makefile
++++ openssl-1.0.0/engines/Makefile
 @@ -107,7 +107,7 @@
  	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
  	@if [ -n "$(SHARED_LIBS)" ]; then \
@@ -45,22 +31,8 @@ Display the current time in the given FORMAT.
  	@target=install; $(RECURSIVE_MAKE)
 Index: openssl-1.0.0/engines/ccgost/Makefile
 ===================================================================
---- openssl-1.0.0.orig/engines/ccgost/Makefile	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/engines/ccgost/Makefile	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- openssl-1.0.0.orig/engines/ccgost/Makefile
++++ openssl-1.0.0/engines/ccgost/Makefile
 @@ -53,13 +53,13 @@
  			*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
  			*) sfx=".bad";; \
diff --git a/recipes/openssl/openssl-1.0.0/libdeps-first.patch b/recipes/openssl/openssl-1.0.0/libdeps-first.patch
index 9c0037ab96..1fda69ba93 100644
--- a/recipes/openssl/openssl-1.0.0/libdeps-first.patch
+++ b/recipes/openssl/openssl-1.0.0/libdeps-first.patch
@@ -2,22 +2,8 @@ Links to previously staged 0.9.8* easily otherwise
 
 Index: openssl-1.0.0/Makefile.shared
 ===================================================================
---- openssl-1.0.0.orig/Makefile.shared	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/Makefile.shared	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- openssl-1.0.0.orig/Makefile.shared
++++ openssl-1.0.0/Makefile.shared
 @@ -96,7 +96,7 @@
      LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
      LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
diff --git a/recipes/openssl/openssl-1.0.0/oe-ldflags.patch b/recipes/openssl/openssl-1.0.0/oe-ldflags.patch
index 6111bf9fda..3dd3bedab0 100644
--- a/recipes/openssl/openssl-1.0.0/oe-ldflags.patch
+++ b/recipes/openssl/openssl-1.0.0/oe-ldflags.patch
@@ -1,21 +1,7 @@
 Index: openssl-1.0.0/Makefile.shared
 ===================================================================
---- openssl-1.0.0.orig/Makefile.shared	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/Makefile.shared	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- openssl-1.0.0.orig/Makefile.shared
++++ openssl-1.0.0/Makefile.shared
 @@ -92,7 +92,7 @@
  LINK_APP=	\
    ( $(SET_X);   \
diff --git a/recipes/openssl/openssl-1.0.0/shared-libs.patch b/recipes/openssl/openssl-1.0.0/shared-libs.patch
index e65713b176..7cd70d8fdc 100644
--- a/recipes/openssl/openssl-1.0.0/shared-libs.patch
+++ b/recipes/openssl/openssl-1.0.0/shared-libs.patch
@@ -1,21 +1,7 @@
 Index: openssl-1.0.0/crypto/Makefile
 ===================================================================
---- openssl-1.0.0.orig/crypto/Makefile	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/crypto/Makefile	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- openssl-1.0.0.orig/crypto/Makefile
++++ openssl-1.0.0/crypto/Makefile
 @@ -104,7 +104,7 @@
  
  shared: buildinf.h lib subdirs
@@ -27,22 +13,8 @@ Display the current time in the given FORMAT.
  libs:
 Index: openssl-1.0.0/Makefile.org
 ===================================================================
---- openssl-1.0.0.orig/Makefile.org	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/Makefile.org	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- openssl-1.0.0.orig/Makefile.org
++++ openssl-1.0.0/Makefile.org
 @@ -260,7 +260,7 @@
  
  libcrypto$(SHLIB_EXT): libcrypto.a
@@ -63,22 +35,8 @@ Display the current time in the given FORMAT.
  		exit 1; \
 Index: openssl-1.0.0/ssl/Makefile
 ===================================================================
---- openssl-1.0.0.orig/ssl/Makefile	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
-+++ openssl-1.0.0/ssl/Makefile	Usage: date [OPTION]... [+FORMAT]
-Display the current time in the given FORMAT.
-
-  -d, --date=STRING         display time described by STRING, not `now'
-  -f, --file=DATEFILE       like --date once for each line of DATEFILE
-  -R, --rfc-822             output RFC-822 compliant date string
-  -u, --utc, --universal    print or set Coordinated Universal Time
-      --help                display this help and exit
+--- openssl-1.0.0.orig/ssl/Makefile
++++ openssl-1.0.0/ssl/Makefile
 @@ -62,7 +62,7 @@
  
  shared: lib
diff --git a/recipes/openssl/openssl-native_0.9.7g.bb b/recipes/openssl/openssl-native_0.9.7g.bb
index 41e6e21943..229a9b2078 100644
--- a/recipes/openssl/openssl-native_0.9.7g.bb
+++ b/recipes/openssl/openssl-native_0.9.7g.bb
@@ -4,9 +4,9 @@ require openssl.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://debian.patch;patch=1 \
-            file://armeb.patch;patch=1;pnum=0 \
-            file://gnueabi-arm.patch;patch=1"
+SRC_URI += "file://debian.patch \
+            file://armeb.patch;striplevel=0 \
+            file://gnueabi-arm.patch"
 
 do_install() {
 	:
diff --git a/recipes/openssl/openssl-native_0.9.7m.bb b/recipes/openssl/openssl-native_0.9.7m.bb
index ef680f1a3f..3b76dd5198 100644
--- a/recipes/openssl/openssl-native_0.9.7m.bb
+++ b/recipes/openssl/openssl-native_0.9.7m.bb
@@ -8,9 +8,9 @@ export BUILD_OPTIMIZATION = " "
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://debian.patch;patch=1 \
-            file://armeb.patch;patch=1;pnum=0 \
-            file://gnueabi-arm.patch;patch=1"
+SRC_URI += "file://debian.patch \
+            file://armeb.patch;striplevel=0 \
+            file://gnueabi-arm.patch"
 
 do_install() {
 	:
diff --git a/recipes/openssl/openssl-native_0.9.8g.bb b/recipes/openssl/openssl-native_0.9.8g.bb
index 9de05ffe93..bef8dfb563 100644
--- a/recipes/openssl/openssl-native_0.9.8g.bb
+++ b/recipes/openssl/openssl-native_0.9.8g.bb
@@ -8,9 +8,9 @@ PR = "${INC_PR}.0"
 export FULL_OPTIMIZATION = " "
 export BUILD_OPTIMIZATION = " "
 
-SRC_URI += "file://debian.patch;patch=1 \
-            file://configure-targets.patch;patch=1 \
-            file://shared-libs.patch;patch=1"
+SRC_URI += "file://debian.patch \
+            file://configure-targets.patch \
+            file://shared-libs.patch"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/openssl/openssl-native_0.9.8m.bb b/recipes/openssl/openssl-native_0.9.8m.bb
index 169f3ef981..1b82645b78 100644
--- a/recipes/openssl/openssl-native_0.9.8m.bb
+++ b/recipes/openssl/openssl-native_0.9.8m.bb
@@ -10,9 +10,9 @@ PR = "${INC_PR}.2"
 export FULL_OPTIMIZATION = " "
 export BUILD_OPTIMIZATION = " "
 
-SRC_URI += "file://configure-targets.patch;patch=1 \
-            file://shared-libs.patch;patch=1 \
-            file://debian.patch;patch=1"
+SRC_URI += "file://configure-targets.patch \
+            file://shared-libs.patch \
+            file://debian.patch"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/openssl/openssl-native_1.0.0.bb b/recipes/openssl/openssl-native_1.0.0.bb
index a4ae71528a..7029bfe77d 100644
--- a/recipes/openssl/openssl-native_1.0.0.bb
+++ b/recipes/openssl/openssl-native_1.0.0.bb
@@ -14,10 +14,10 @@ export DIRS = "crypto ssl apps engines"
 export FULL_OPTIMIZATION = " "
 export BUILD_OPTIMIZATION = " "
 
-SRC_URI += "file://configure-targets.patch;patch=1 \
-            file://shared-libs.patch;patch=1 \
-            file://debian.patch;patch=1 \
-	    file://libdeps-first.patch;patch=1 \
+SRC_URI += "file://configure-targets.patch \
+            file://shared-libs.patch \
+            file://debian.patch \
+	    file://libdeps-first.patch \
 	   "
 
 PARALLEL_MAKE = ""
diff --git a/recipes/openssl/openssl_0.9.7e.bb b/recipes/openssl/openssl_0.9.7e.bb
index 16d66428fc..6b13717852 100644
--- a/recipes/openssl/openssl_0.9.7e.bb
+++ b/recipes/openssl/openssl_0.9.7e.bb
@@ -2,9 +2,9 @@ require openssl.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://debian.patch;patch=1 \
-            file://armeb.patch;patch=1 \
-            file://gnueabi-arm.patch;patch=1"
+SRC_URI += "file://debian.patch \
+            file://armeb.patch \
+            file://gnueabi-arm.patch"
 
 SRC_URI[src.md5sum] = "a8777164bca38d84e5eb2b1535223474"
 SRC_URI[src.sha256sum] = "25121b5dbd2b830929519325e033086ce45861cff2d0000d928f48261b1e0b7c"
diff --git a/recipes/openssl/openssl_0.9.7g.bb b/recipes/openssl/openssl_0.9.7g.bb
index 0a54c3fb46..bf1043ca25 100644
--- a/recipes/openssl/openssl_0.9.7g.bb
+++ b/recipes/openssl/openssl_0.9.7g.bb
@@ -4,12 +4,12 @@ require openssl.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://debian.patch;patch=1 \
-            file://armeb.patch;patch=1;pnum=0 \
-            file://gnueabi-arm.patch;patch=1 \
-            file://gnueabi-armeb.patch;patch=1 \
-            file://uclibcgnueabi.patch;patch=1 \
-            file://avr32.patch;patch=1;pnum=0"
+SRC_URI += "file://debian.patch \
+            file://armeb.patch;striplevel=0 \
+            file://gnueabi-arm.patch \
+            file://gnueabi-armeb.patch \
+            file://uclibcgnueabi.patch \
+            file://avr32.patch;striplevel=0"
 
 SRC_URI[src.md5sum] = "991615f73338a571b6a1be7d74906934"
 SRC_URI[src.sha256sum] = "e7e1a287141dd1be7f4b4fedd54ec29fa904655ed76a13ac87ae69a3fc76b062"
diff --git a/recipes/openssl/openssl_0.9.7m.bb b/recipes/openssl/openssl_0.9.7m.bb
index 9c614800fa..28283ade96 100644
--- a/recipes/openssl/openssl_0.9.7m.bb
+++ b/recipes/openssl/openssl_0.9.7m.bb
@@ -4,12 +4,12 @@ require openssl.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://debian.patch;patch=1 \
-            file://armeb.patch;patch=1;pnum=0 \
-            file://gnueabi-arm.patch;patch=1 \
-            file://gnueabi-armeb.patch;patch=1 \
-            file://uclibcgnueabi.patch;patch=1 \
-            file://avr32.patch;patch=1;pnum=0"
+SRC_URI += "file://debian.patch \
+            file://armeb.patch;striplevel=0 \
+            file://gnueabi-arm.patch \
+            file://gnueabi-armeb.patch \
+            file://uclibcgnueabi.patch \
+            file://avr32.patch;striplevel=0"
 
 SRC_URI[src.md5sum] = "74a4d1b87e1e6e1ec95dbe58cb4c5b9a"
 SRC_URI[src.sha256sum] = "c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572"
diff --git a/recipes/openssl/openssl_0.9.8g.bb b/recipes/openssl/openssl_0.9.8g.bb
index 921daad424..d90e8851e4 100644
--- a/recipes/openssl/openssl_0.9.8g.bb
+++ b/recipes/openssl/openssl_0.9.8g.bb
@@ -4,9 +4,9 @@ require openssl.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://debian.patch;patch=1 \
-            file://configure-targets.patch;patch=1 \
-            file://shared-libs.patch;patch=1"
+SRC_URI += "file://debian.patch \
+            file://configure-targets.patch \
+            file://shared-libs.patch"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/openssl/openssl_0.9.8m.bb b/recipes/openssl/openssl_0.9.8m.bb
index db3c48a1e0..a7eb332857 100644
--- a/recipes/openssl/openssl_0.9.8m.bb
+++ b/recipes/openssl/openssl_0.9.8m.bb
@@ -8,9 +8,9 @@ PR = "${INC_PR}.0"
 
 export OE_LDFLAGS="${LDFLAGS}"
 
-SRC_URI += "file://configure-targets.patch;patch=1 \
-            file://shared-libs.patch;patch=1 \
-            file://debian.patch;patch=1 \
-            file://oe-ldflags.patch;patch=1"
+SRC_URI += "file://configure-targets.patch \
+            file://shared-libs.patch \
+            file://debian.patch \
+            file://oe-ldflags.patch"
 
 PARALLEL_MAKE = ""
diff --git a/recipes/openssl/openssl_1.0.0.bb b/recipes/openssl/openssl_1.0.0.bb
index 8e521c8017..4f7dcb7263 100644
--- a/recipes/openssl/openssl_1.0.0.bb
+++ b/recipes/openssl/openssl_1.0.0.bb
@@ -4,19 +4,19 @@ require openssl.inc
 SRC_URI[src.md5sum] = "89eaa86e25b2845f920ec00ae4c864ed"
 SRC_URI[src.sha256sum] = "1bbf9afc5a6215121ac094147d0a84178294fe4c3d0a231731038fd3717ba7ca"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.2"
 
 DEFAULT_PREFERENCE = "-1"
 
 export DIRS = "crypto ssl apps engines"
 export OE_LDFLAGS="${LDFLAGS}"
 
-SRC_URI += "file://configure-targets.patch;patch=1 \
-            file://shared-libs.patch;patch=1 \
-            file://debian.patch;patch=1 \
-            file://oe-ldflags.patch;patch=1 \
-	    file://libdeps-first.patch;patch=1 \
-	    file://engines-install-in-libdir-ssl.patch;patch=1 \
+SRC_URI += "file://configure-targets.patch \
+            file://shared-libs.patch \
+            file://debian.patch \
+            file://oe-ldflags.patch \
+	    file://libdeps-first.patch \
+	    file://engines-install-in-libdir-ssl.patch \
 	   "
 
 PARALLEL_MAKE = ""
diff --git a/recipes/openswan/openswan_2.2.0.bb b/recipes/openswan/openswan_2.2.0.bb
index 94fe456f4b..a0bf6526f1 100644
--- a/recipes/openswan/openswan_2.2.0.bb
+++ b/recipes/openswan/openswan_2.2.0.bb
@@ -9,11 +9,11 @@ RDEPENDS_append_nylon = "perl"
 PR = "r6"
 
 SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
-	   file://openswan-2.2.0-gentoo.patch;patch=1 \
-           file://gcc4-fixes.patch;patch=1 \
-           file://installflags.patch;patch=1 \
-	   file://makefile-whitespace-fix.patch;patch=1 \
-	   file://ld-library-path-breakage.patch;patch=1"
+	   file://openswan-2.2.0-gentoo.patch \
+           file://gcc4-fixes.patch \
+           file://installflags.patch \
+	   file://makefile-whitespace-fix.patch \
+	   file://ld-library-path-breakage.patch"
 S = "${WORKDIR}/openswan-${PV}"
 
 PARALLEL_MAKE = ""
diff --git a/recipes/openswan/openswan_2.4.7.bb b/recipes/openswan/openswan_2.4.7.bb
index 946ecebacf..0f154cf9eb 100644
--- a/recipes/openswan/openswan_2.4.7.bb
+++ b/recipes/openswan/openswan_2.4.7.bb
@@ -9,9 +9,9 @@ RDEPENDS_append_nylon = "perl"
 PR = "r1"
 
 SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
-	   file://openswan-2.4.7-gentoo.patch;patch=1 \
-           file://installflags.patch;patch=1 \
-	   file://ld-library-path-breakage.patch;patch=1"
+	   file://openswan-2.4.7-gentoo.patch \
+           file://installflags.patch \
+	   file://ld-library-path-breakage.patch"
 S = "${WORKDIR}/openswan-${PV}"
 
 PARALLEL_MAKE = ""
diff --git a/recipes/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb b/recipes/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb
index a81417bf7e..653635fdcd 100644
--- a/recipes/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb
+++ b/recipes/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb
@@ -1,8 +1,8 @@
 PR = "r1"
 
 SRC_URI = "svn://svn.opensync.org/plugins/syncml-client/plugin/tags;module=release-${PV};proto=http \
-	file://missing-syncml-config.patch;patch=1 \
-	file://syncml-client-plugin-cpp.patch;patch=1"
+	file://missing-syncml-config.patch \
+	file://syncml-client-plugin-cpp.patch"
 
 
 S = "${WORKDIR}/release-${PV}"
diff --git a/recipes/opensync/libopensync_0.36.bb b/recipes/opensync/libopensync_0.36.bb
index 12a894412f..d3be52eaf7 100644
--- a/recipes/opensync/libopensync_0.36.bb
+++ b/recipes/opensync/libopensync_0.36.bb
@@ -4,9 +4,9 @@ HOMEPAGE = "http://www.opensync.org/"
 DEPENDS = "sqlite3 libxml2 glib-2.0 check"
 
 SRC_URI = "http://opensync.org/download/releases/${PV}/libopensync-${PV}.tar.bz2\
-           file://cmake.patch;patch=1 \
-	   file://build-in-src.patch;patch=1 \
-	   file://no-python-check.patch;patch=1"
+           file://cmake.patch \
+	   file://build-in-src.patch \
+	   file://no-python-check.patch"
 
 inherit cmake pkgconfig
 
diff --git a/recipes/opensync/libsyncml_0.4.6.bb b/recipes/opensync/libsyncml_0.4.6.bb
index d6956c51a7..3a8425668e 100644
--- a/recipes/opensync/libsyncml_0.4.6.bb
+++ b/recipes/opensync/libsyncml_0.4.6.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
 DEPENDS = "sed-native wbxml2 libsoup libxml2 bluez-libs openobex"
 
 SRC_URI = "http://libsyncml.opensync.org/download/releases/${PV}/libsyncml-${PV}.tar.bz2 \
-           file://build-in-src.patch;patch=1"
+           file://build-in-src.patch"
 
 inherit cmake pkgconfig
 
diff --git a/recipes/opensync/syncml-client_0.1.bb b/recipes/opensync/syncml-client_0.1.bb
index e971624c8f..ac2f1e0dfe 100644
--- a/recipes/opensync/syncml-client_0.1.bb
+++ b/recipes/opensync/syncml-client_0.1.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector."
 PR ="r1"
 
 SRC_URI = "http://hem.bredband.net/miko22/${P}.tar.gz       \
-	   file://syncml-client-pc-in-cross.patch;patch=1 "
+	   file://syncml-client-pc-in-cross.patch "
 
 inherit autotools pkgconfig
 
diff --git a/recipes/opensync/wbxml2_0.9.2.bb b/recipes/opensync/wbxml2_0.9.2.bb
index 1722d0e47e..6d73c38c2d 100644
--- a/recipes/opensync/wbxml2_0.9.2.bb
+++ b/recipes/opensync/wbxml2_0.9.2.bb
@@ -4,14 +4,14 @@ LICENSE = "LGPL"
 DEPENDS = "expat popt"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${PN}-${PV}.tar.gz \
-	   file://00-fix-includes.patch;patch=1 \
-	   file://01-anonymous-support-and-misc-fixes.patch;patch=1 \
-	   file://02-namespaces.patch;patch=1 \
-	   file://04_saxlike_entity_parsing.patch;patch=1 \
-	   file://05-syncml-fixes.patch;patch=1 \
-	   file://06-no-install-docs.patch;patch=1 \
-	   file://07-current_attr_null.patch;patch=1 \
-	   file://08-maxsize-translation-table.patch;patch=1;pnum=0 \
+	   file://00-fix-includes.patch \
+	   file://01-anonymous-support-and-misc-fixes.patch \
+	   file://02-namespaces.patch \
+	   file://04_saxlike_entity_parsing.patch \
+	   file://05-syncml-fixes.patch \
+	   file://06-no-install-docs.patch \
+	   file://07-current_attr_null.patch \
+	   file://08-maxsize-translation-table.patch;striplevel=0 \
 	   "
 
 inherit autotools pkgconfig
diff --git a/recipes/openttd/openttd_0.6.3.bb b/recipes/openttd/openttd_0.6.3.bb
index 12a7d5c910..f25a5502e8 100644
--- a/recipes/openttd/openttd_0.6.3.bb
+++ b/recipes/openttd/openttd_0.6.3.bb
@@ -3,7 +3,7 @@ require openttd.inc
 PR = "r0"
 
 # When upgrading this recipe make sure to refresh this patch.
-SRC_URI += "file://openttd_${PV}-buildfix.patch;patch=1"
+SRC_URI += "file://openttd_${PV}-buildfix.patch"
 
 
 
diff --git a/recipes/openvpn/openvpn_2.1.0.bb b/recipes/openvpn/openvpn_2.1.0.bb
new file mode 100644
index 0000000000..e46d369123
--- /dev/null
+++ b/recipes/openvpn/openvpn_2.1.0.bb
@@ -0,0 +1,10 @@
+require openvpn.inc
+
+SRC_URI = "http://openvpn.net/release/${P}.tar.gz \
+	   file://openvpn"
+
+# I want openvpn to be able to read password from file (hrw)
+EXTRA_OECONF += "--enable-password-save"
+
+SRC_URI[md5sum] = "452a83326ae198cf961e9ae02539c8fb"
+SRC_URI[sha256sum] = "6634f89575040b1987a1e793b5d6fedb11088007eb150dbdab4a8cfdf3c0686e"
diff --git a/recipes/openvz/vzctl_3.0.23.bb b/recipes/openvz/vzctl_3.0.23.bb
index 6c7aae87b3..51c1e4df30 100644
--- a/recipes/openvz/vzctl_3.0.23.bb
+++ b/recipes/openvz/vzctl_3.0.23.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 RDEPENDS = "bash gawk sed grep coreutils tar"
 
 SRC_URI = "http://download.openvz.org/utils/vzctl/${PV}/src/vzctl-${PV}.tar.bz2 \
-           file://vzctl-add-arm-syscalls.patch;patch=1 \
+           file://vzctl-add-arm-syscalls.patch \
           "
 
 inherit autotools
diff --git a/recipes/opie-alarm/opie-alarm_1.2.3.bb b/recipes/opie-alarm/opie-alarm_1.2.3.bb
index d298efc34c..bccb11449e 100644
--- a/recipes/opie-alarm/opie-alarm_1.2.3.bb
+++ b/recipes/opie-alarm/opie-alarm_1.2.3.bb
@@ -4,4 +4,4 @@ PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \
            file://01opiealarm \
-	   file://dirdefines.patch;patch=1 "
+	   file://dirdefines.patch "
diff --git a/recipes/opie-alarm/opie-alarm_1.2.4.bb b/recipes/opie-alarm/opie-alarm_1.2.4.bb
index d298efc34c..bccb11449e 100644
--- a/recipes/opie-alarm/opie-alarm_1.2.4.bb
+++ b/recipes/opie-alarm/opie-alarm_1.2.4.bb
@@ -4,4 +4,4 @@ PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \
            file://01opiealarm \
-	   file://dirdefines.patch;patch=1 "
+	   file://dirdefines.patch "
diff --git a/recipes/opie-alarm/opie-alarm_cvs.bb b/recipes/opie-alarm/opie-alarm_cvs.bb
index fca5f8b51a..3b00444153 100644
--- a/recipes/opie-alarm/opie-alarm_cvs.bb
+++ b/recipes/opie-alarm/opie-alarm_cvs.bb
@@ -5,4 +5,4 @@ PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
            file://01opiealarm \
-	   file://dirdefines.patch;patch=1 "
+	   file://dirdefines.patch "
diff --git a/recipes/opie-console/opie-console_1.2.3.bb b/recipes/opie-console/opie-console_1.2.3.bb
index a364181d76..0258dd23dc 100644
--- a/recipes/opie-console/opie-console_1.2.3.bb
+++ b/recipes/opie-console/opie-console_1.2.3.bb
@@ -5,5 +5,5 @@ PR = "r1"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-	   file://double_name.patch;patch=1 \
+	   file://double_name.patch \
  	  "
diff --git a/recipes/opie-dvorak/opie-dvorak_1.2.3.bb b/recipes/opie-dvorak/opie-dvorak_1.2.3.bb
index 54af47b2bc..873fc20598 100644
--- a/recipes/opie-dvorak/opie-dvorak_1.2.3.bb
+++ b/recipes/opie-dvorak/opie-dvorak_1.2.3.bb
@@ -4,4 +4,4 @@ PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dvorak \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard \
-	   file://fix-rpath.patch;patch=1 "
+	   file://fix-rpath.patch "
diff --git a/recipes/opie-dvorak/opie-dvorak_1.2.4.bb b/recipes/opie-dvorak/opie-dvorak_1.2.4.bb
index 54af47b2bc..873fc20598 100644
--- a/recipes/opie-dvorak/opie-dvorak_1.2.4.bb
+++ b/recipes/opie-dvorak/opie-dvorak_1.2.4.bb
@@ -4,4 +4,4 @@ PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dvorak \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard \
-	   file://fix-rpath.patch;patch=1 "
+	   file://fix-rpath.patch "
diff --git a/recipes/opie-dvorak/opie-dvorak_cvs.bb b/recipes/opie-dvorak/opie-dvorak_cvs.bb
index 54234dda7a..f89e6f2449 100644
--- a/recipes/opie-dvorak/opie-dvorak_cvs.bb
+++ b/recipes/opie-dvorak/opie-dvorak_cvs.bb
@@ -5,4 +5,4 @@ PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \
            ${HANDHELDS_CVS};module=opie/inputmethods/pickboard \
-	   file://fix-rpath.patch;patch=1 "
+	   file://fix-rpath.patch "
diff --git a/recipes/opie-init/opie-init_1.2.4.bb b/recipes/opie-init/opie-init_1.2.4.bb
index b067ae27e4..5effa73319 100644
--- a/recipes/opie-init/opie-init_1.2.4.bb
+++ b/recipes/opie-init/opie-init_1.2.4.bb
@@ -8,4 +8,4 @@ SRC_URI = "file://opie-reorgfiles \
            file://opie_defaults"
 
 # This should not be necessary anymore (w100 is currently disabled for c7x0)
-#SRC_URI_append_c7x0 = " file://qpe-suspend-resume"
+SRC_URI_append_c7x0 = " file://qpe-suspend-resume"
diff --git a/recipes/opie-keyboard/opie-keyboard_1.2.3.bb b/recipes/opie-keyboard/opie-keyboard_1.2.3.bb
index 04c368ba89..04caf8a07e 100644
--- a/recipes/opie-keyboard/opie-keyboard_1.2.3.bb
+++ b/recipes/opie-keyboard/opie-keyboard_1.2.3.bb
@@ -3,4 +3,4 @@ require ${PN}.inc
 PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/keyboard \
-	file://fix-rpath.patch;patch=1 "
+	file://fix-rpath.patch "
diff --git a/recipes/opie-keyboard/opie-keyboard_1.2.4.bb b/recipes/opie-keyboard/opie-keyboard_1.2.4.bb
index 04c368ba89..04caf8a07e 100644
--- a/recipes/opie-keyboard/opie-keyboard_1.2.4.bb
+++ b/recipes/opie-keyboard/opie-keyboard_1.2.4.bb
@@ -3,4 +3,4 @@ require ${PN}.inc
 PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/keyboard \
-	file://fix-rpath.patch;patch=1 "
+	file://fix-rpath.patch "
diff --git a/recipes/opie-keyboard/opie-keyboard_cvs.bb b/recipes/opie-keyboard/opie-keyboard_cvs.bb
index e2cdeef495..213844ee0f 100644
--- a/recipes/opie-keyboard/opie-keyboard_cvs.bb
+++ b/recipes/opie-keyboard/opie-keyboard_cvs.bb
@@ -4,4 +4,4 @@ PV = "${OPIE_CVS_PV}"
 PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard \
-	file://fix-rpath.patch;patch=1 "
+	file://fix-rpath.patch "
diff --git a/recipes/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb b/recipes/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb
index db194b9a37..71f230979e 100644
--- a/recipes/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb
+++ b/recipes/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb
@@ -3,4 +3,4 @@ require ${PN}.inc
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-           file://double_name.patch;patch=1"
+           file://double_name.patch"
diff --git a/recipes/opie-multikey/opie-multikey_1.2.2.bb b/recipes/opie-multikey/opie-multikey_1.2.2.bb
index 9217992acc..de7b041c7e 100644
--- a/recipes/opie-multikey/opie-multikey_1.2.2.bb
+++ b/recipes/opie-multikey/opie-multikey_1.2.2.bb
@@ -4,4 +4,4 @@ PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
-           file://friendly-button-names.patch;patch=1"
+           file://friendly-button-names.patch"
diff --git a/recipes/opie-multikey/opie-multikey_1.2.3.bb b/recipes/opie-multikey/opie-multikey_1.2.3.bb
index a32dd47e7c..c7f0b24cad 100644
--- a/recipes/opie-multikey/opie-multikey_1.2.3.bb
+++ b/recipes/opie-multikey/opie-multikey_1.2.3.bb
@@ -4,6 +4,6 @@ PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
-           file://fix-rpath.patch;patch=1"
+           file://fix-rpath.patch"
 
-#           file://friendly-button-names.patch;patch=1"
+#           file://friendly-button-names.patch"
diff --git a/recipes/opie-multikey/opie-multikey_1.2.4.bb b/recipes/opie-multikey/opie-multikey_1.2.4.bb
index a32dd47e7c..c7f0b24cad 100644
--- a/recipes/opie-multikey/opie-multikey_1.2.4.bb
+++ b/recipes/opie-multikey/opie-multikey_1.2.4.bb
@@ -4,6 +4,6 @@ PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
-           file://fix-rpath.patch;patch=1"
+           file://fix-rpath.patch"
 
-#           file://friendly-button-names.patch;patch=1"
+#           file://friendly-button-names.patch"
diff --git a/recipes/opie-multikey/opie-multikey_cvs.bb b/recipes/opie-multikey/opie-multikey_cvs.bb
index 307f06ae74..180d8bb19d 100644
--- a/recipes/opie-multikey/opie-multikey_cvs.bb
+++ b/recipes/opie-multikey/opie-multikey_cvs.bb
@@ -5,6 +5,6 @@ PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
            ${HANDHELDS_CVS};module=opie/share \
-           file://fix-rpath.patch;patch=1"
+           file://fix-rpath.patch"
 
-#           file://friendly-button-names.patch;patch=1"
+#           file://friendly-button-names.patch"
diff --git a/recipes/opie-networksettings/opie-networksettings.inc b/recipes/opie-networksettings/opie-networksettings.inc
index 8bda9f0b59..e8bfa8ed90 100644
--- a/recipes/opie-networksettings/opie-networksettings.inc
+++ b/recipes/opie-networksettings/opie-networksettings.inc
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
 APPNAME = "networksettings"
 
-SRC_URI_append = " file://wireless.patch;patch=1"
+SRC_URI_append = " file://wireless.patch"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb b/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb
index 28fc5b873b..b01c90550e 100644
--- a/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb
+++ b/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb
@@ -9,6 +9,6 @@ EXTRA_QMAKEVARS_PRE += "LIBIPK_INC_DIR=${STAGING_INCDIR}/libopkg"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-           file://split-config.patch;patch=1 \
-           file://opkg.patch;patch=1 \
-           file://opkg_update.patch;patch=1"
+           file://split-config.patch \
+           file://opkg.patch \
+           file://opkg_update.patch"
diff --git a/recipes/opie-qcop/opie-qcop_1.2.3.bb b/recipes/opie-qcop/opie-qcop_1.2.3.bb
index c62004a1db..ccf3092c9c 100644
--- a/recipes/opie-qcop/opie-qcop_1.2.3.bb
+++ b/recipes/opie-qcop/opie-qcop_1.2.3.bb
@@ -3,4 +3,4 @@ require ${PN}.inc
 PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qcop \
-           file://unbreak-logging.patch;patch=1"
+           file://unbreak-logging.patch"
diff --git a/recipes/opie-qcop/opie-qcop_1.2.4.bb b/recipes/opie-qcop/opie-qcop_1.2.4.bb
index c62004a1db..ccf3092c9c 100644
--- a/recipes/opie-qcop/opie-qcop_1.2.4.bb
+++ b/recipes/opie-qcop/opie-qcop_1.2.4.bb
@@ -3,4 +3,4 @@ require ${PN}.inc
 PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qcop \
-           file://unbreak-logging.patch;patch=1"
+           file://unbreak-logging.patch"
diff --git a/recipes/opie-qcop/opie-qcop_cvs.bb b/recipes/opie-qcop/opie-qcop_cvs.bb
index 01a1d1b407..16b051db7f 100644
--- a/recipes/opie-qcop/opie-qcop_cvs.bb
+++ b/recipes/opie-qcop/opie-qcop_cvs.bb
@@ -4,4 +4,4 @@ PV = "${OPIE_CVS_PV}"
 PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop \
-           file://unbreak-logging.patch;patch=1"
+           file://unbreak-logging.patch"
diff --git a/recipes/opie-rdesktop/opie-rdesktop_1.2.4.bb b/recipes/opie-rdesktop/opie-rdesktop_1.2.4.bb
index 38484b9413..f0d3fb5ac2 100644
--- a/recipes/opie-rdesktop/opie-rdesktop_1.2.4.bb
+++ b/recipes/opie-rdesktop/opie-rdesktop_1.2.4.bb
@@ -5,4 +5,4 @@ PR = "r1"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opierdesktop \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           file://crash_fix.patch;patch=1"
+           file://crash_fix.patch"
diff --git a/recipes/opie-reader/uqtreader_cvs.bb b/recipes/opie-reader/uqtreader_cvs.bb
index 9b7ae57196..19a3d9ab0a 100644
--- a/recipes/opie-reader/uqtreader_cvs.bb
+++ b/recipes/opie-reader/uqtreader_cvs.bb
@@ -12,7 +12,7 @@ PR = "r3"
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/apps \
-	   file://qt4.patch;patch=1"
+	   file://qt4.patch"
 S = "${WORKDIR}/opie-reader"
 
 export OPIEDIR="${S}/opiedir"
diff --git a/recipes/opie-sh/opie-sh_1.2.3.bb b/recipes/opie-sh/opie-sh_1.2.3.bb
index 377aa887dd..245d04471a 100644
--- a/recipes/opie-sh/opie-sh_1.2.3.bb
+++ b/recipes/opie-sh/opie-sh_1.2.3.bb
@@ -7,5 +7,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/opie-sh \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/bin \
-           file://opie-sh-path.patch;patch=1 \
-           file://opie-sh-fsmounter-name.patch;patch=1"
+           file://opie-sh-path.patch \
+           file://opie-sh-fsmounter-name.patch"
diff --git a/recipes/opie-sh/opie-sh_1.2.4.bb b/recipes/opie-sh/opie-sh_1.2.4.bb
index 377aa887dd..245d04471a 100644
--- a/recipes/opie-sh/opie-sh_1.2.4.bb
+++ b/recipes/opie-sh/opie-sh_1.2.4.bb
@@ -7,5 +7,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/opie-sh \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/bin \
-           file://opie-sh-path.patch;patch=1 \
-           file://opie-sh-fsmounter-name.patch;patch=1"
+           file://opie-sh-path.patch \
+           file://opie-sh-fsmounter-name.patch"
diff --git a/recipes/opie-sheet/opie-sheet_1.2.4.bb b/recipes/opie-sheet/opie-sheet_1.2.4.bb
index b2cd1d213d..fe12b77c26 100644
--- a/recipes/opie-sheet/opie-sheet_1.2.4.bb
+++ b/recipes/opie-sheet/opie-sheet_1.2.4.bb
@@ -5,4 +5,4 @@ PR = "r1"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-sheet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-           file://different-arg-names.patch;patch=1 "
+           file://different-arg-names.patch "
diff --git a/recipes/opie-sysinfo/opie-sysinfo_1.2.2.bb b/recipes/opie-sysinfo/opie-sysinfo_1.2.2.bb
index 3a8954bebe..6e4a2a5778 100644
--- a/recipes/opie-sysinfo/opie-sysinfo_1.2.2.bb
+++ b/recipes/opie-sysinfo/opie-sysinfo_1.2.2.bb
@@ -7,4 +7,4 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share"
 
-SRC_URI_append_jlime = "file://jornada-6xx-7xx.patch;patch=1"
+SRC_URI_append_jlime = "file://jornada-6xx-7xx.patch"
diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.2.bb b/recipes/opie-taskbar/opie-taskbar_1.2.2.bb
index ad2952f3e2..ab547b0bdc 100644
--- a/recipes/opie-taskbar/opie-taskbar_1.2.2.bb
+++ b/recipes/opie-taskbar/opie-taskbar_1.2.2.bb
@@ -8,6 +8,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
-	   file://nomax.patch;patch=1;pnum=3 \
-           file://server-pro-old.patch;patch=1 \
+	   file://nomax.patch;striplevel=3 \
+           file://server-pro-old.patch \
           "
diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.3.bb b/recipes/opie-taskbar/opie-taskbar_1.2.3.bb
index 360e3f4c62..8dfb6a05e8 100644
--- a/recipes/opie-taskbar/opie-taskbar_1.2.3.bb
+++ b/recipes/opie-taskbar/opie-taskbar_1.2.3.bb
@@ -8,10 +8,10 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
-           file://nomax.patch;patch=1;pnum=3 \
-           file://no-builtin-qss-startup.patch;patch=1 \
-           file://kbdlocks-runtime.patch;patch=1 \
-	   file://restart-from-bindir.patch;patch=1 \
-           file://server-pro-old.patch;patch=1 \
-	   file://firstuse-path.patch;patch=1 \
+           file://nomax.patch;striplevel=3 \
+           file://no-builtin-qss-startup.patch \
+           file://kbdlocks-runtime.patch \
+	   file://restart-from-bindir.patch \
+           file://server-pro-old.patch \
+	   file://firstuse-path.patch \
           "
diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
index a9df7c9527..bd0c3fa6fc 100644
--- a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
+++ b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
@@ -8,11 +8,11 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
-           file://nomax.patch;patch=1;pnum=3 \
-           file://no-builtin-qss-startup.patch;patch=1 \
-           file://kbdlocks-runtime.patch;patch=1 \
-	   file://restart-from-bindir.patch;patch=1 \
-           file://server-pro-1.2.4.patch;patch=1 \
-	   file://firstuse-path.patch;patch=1 \
-           file://force-firstuse-calibrate.patch;patch=1 \
+           file://nomax.patch;striplevel=3 \
+           file://no-builtin-qss-startup.patch \
+           file://kbdlocks-runtime.patch \
+	   file://restart-from-bindir.patch \
+           file://server-pro-1.2.4.patch \
+	   file://firstuse-path.patch \
+           file://force-firstuse-calibrate.patch \
           "
diff --git a/recipes/opie-taskbar/opie-taskbar_cvs.bb b/recipes/opie-taskbar/opie-taskbar_cvs.bb
index 3422bbe180..c4a289c5e5 100644
--- a/recipes/opie-taskbar/opie-taskbar_cvs.bb
+++ b/recipes/opie-taskbar/opie-taskbar_cvs.bb
@@ -9,11 +9,11 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/apps \
            ${HANDHELDS_CVS};module=opie/root \
            ${HANDHELDS_CVS};module=opie/etc \
-           file://nomax.patch;patch=1;pnum=3 \
-           file://no-builtin-qss-startup.patch;patch=1 \
-           file://kbdlocks-runtime.patch;patch=1 \
-	   file://restart-from-bindir.patch;patch=1 \
-           file://server-pro-cvs.patch;patch=1 \
-	   file://firstuse-path.patch;patch=1 \
+           file://nomax.patch;striplevel=3 \
+           file://no-builtin-qss-startup.patch \
+           file://kbdlocks-runtime.patch \
+	   file://restart-from-bindir.patch \
+           file://server-pro-cvs.patch \
+	   file://firstuse-path.patch \
           "
 
diff --git a/recipes/opie-todo/opie-todo_1.2.3.bb b/recipes/opie-todo/opie-todo_1.2.3.bb
index 8f76d33bd7..884aa83258 100644
--- a/recipes/opie-todo/opie-todo_1.2.3.bb
+++ b/recipes/opie-todo/opie-todo_1.2.3.bb
@@ -4,5 +4,5 @@ PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-           file://unbreak-logging.patch;patch=1 \
-	   file://gcc-syntax-fix.patch;patch=1"
+           file://unbreak-logging.patch \
+	   file://gcc-syntax-fix.patch"
diff --git a/recipes/opie-todo/opie-todo_1.2.4.bb b/recipes/opie-todo/opie-todo_1.2.4.bb
index f68a559f97..a6b503e94d 100644
--- a/recipes/opie-todo/opie-todo_1.2.4.bb
+++ b/recipes/opie-todo/opie-todo_1.2.4.bb
@@ -4,4 +4,4 @@ PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-           file://unbreak-logging.patch;patch=1"
+           file://unbreak-logging.patch"
diff --git a/recipes/opie-todo/opie-todo_cvs.bb b/recipes/opie-todo/opie-todo_cvs.bb
index 164c13f25b..4b41bdf4b2 100644
--- a/recipes/opie-todo/opie-todo_cvs.bb
+++ b/recipes/opie-todo/opie-todo_cvs.bb
@@ -5,4 +5,4 @@ PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/todo \
            ${HANDHELDS_CVS};module=opie/apps \
-           file://unbreak-logging.patch;patch=1"
+           file://unbreak-logging.patch"
diff --git a/recipes/opkg/opkg-native_svn.bb b/recipes/opkg/opkg-native_svn.bb
index f5bd992132..fe3ed4e7d4 100644
--- a/recipes/opkg/opkg-native_svn.bb
+++ b/recipes/opkg/opkg-native_svn.bb
@@ -4,7 +4,7 @@ DEPENDS = "curl-native openssl-native"
 PR = "${INC_PR}"
 PROVIDES =+ "virtual/update-alternatives-native"
 
-SRC_URI += "file://opkg-libdir.patch;patch=1;maxrev=342"
+SRC_URI += "file://opkg-libdir.patch;maxrev=342"
 
 target_libdir := "${libdir}"
 
diff --git a/recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb b/recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb
index 253bded098..4d49dff5c3 100644
--- a/recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb
+++ b/recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb
@@ -16,13 +16,13 @@ DEPENDS = ""
 PROVIDES += "opkg"
 
 SRC_URI += " \
-	    file://isatty.patch;patch=1 \
-	    file://opkg_wget.patch;patch=1;maxrev=180 \
-	    file://reduce-nogpg-noise.patch;patch=1;maxrev=180 \
-	    file://opkg_wget_nogpg_01_use_vfork_gunzip.patch;patch=1 \
-	    file://opkg_wget_nogpg_02_use_vfork_system.patch;patch=1 \
-	    file://opkg_wget_nogpg_03_fix_tmpdirs.patch;patch=1 \
-	    file://opkg_wget_nogpg_04_default_tmpdir.patch;patch=1 \
+	    file://isatty.patch \
+	    file://opkg_wget.patch;maxrev=180 \
+	    file://reduce-nogpg-noise.patch;maxrev=180 \
+	    file://opkg_wget_nogpg_01_use_vfork_gunzip.patch \
+	    file://opkg_wget_nogpg_02_use_vfork_system.patch \
+	    file://opkg_wget_nogpg_03_fix_tmpdirs.patch \
+	    file://opkg_wget_nogpg_04_default_tmpdir.patch \
 	   "
 PR = "${INC_PR}"
 
diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc
index 7865f1a0a7..1149b723f7 100644
--- a/recipes/opkg/opkg.inc
+++ b/recipes/opkg/opkg.inc
@@ -10,8 +10,8 @@ INC_PR = "r21"
 FILESPATHPKG =. "opkg:"
 
 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
-	file://opkg_unarchive.patch;patch=1;maxrev=201 \
-	file://opkg-intercept-cleanup.patch;patch=1;maxrev=241 \
+	file://opkg_unarchive.patch;maxrev=201 \
+	file://opkg-intercept-cleanup.patch;maxrev=241 \
 "
 
 SRC_URI += "file://configure"
diff --git a/recipes/oprofile/oprofile_0.9.3.bb b/recipes/oprofile/oprofile_0.9.3.bb
index 3cc3402cb1..19b5514b34 100644
--- a/recipes/oprofile/oprofile_0.9.3.bb
+++ b/recipes/oprofile/oprofile_0.9.3.bb
@@ -3,13 +3,13 @@ require oprofile.inc
 PR = "${INC_PR}.0"
 
 SRC_URI += "\
-           file://armv6_fix.patch;patch=1 \
-           file://oparchive_fix.patch;patch=1 \
-           file://root_option.patch;patch=1 \
-           file://opstart.patch;patch=1 \
-           file://fix-arith.patch;patch=1;pnum=0 \
-           file://gcc43x-fix.patch;patch=1 \
-           file://armv7a.diff;patch=1"
+           file://armv6_fix.patch \
+           file://oparchive_fix.patch \
+           file://root_option.patch \
+           file://opstart.patch \
+           file://fix-arith.patch;striplevel=0 \
+           file://gcc43x-fix.patch \
+           file://armv7a.diff"
 
 SRC_URI[tarball.md5sum] = "bb91e4d5bd45ff0d5c3e6214653422b7"
 SRC_URI[tarball.sha256sum] = "4f86ab165dabcc7bc4008710a66fa0ed391c083e2a8bdf8a8f5bf11c0244b2cb"
diff --git a/recipes/oprofile/oprofile_0.9.4.bb b/recipes/oprofile/oprofile_0.9.4.bb
index e552deae9e..221fac4777 100644
--- a/recipes/oprofile/oprofile_0.9.4.bb
+++ b/recipes/oprofile/oprofile_0.9.4.bb
@@ -3,8 +3,8 @@ require oprofile.inc
 PR = "${INC_PR}.0"
 
 SRC_URI += "\
-	file://opjitconv-execvp-fix.diff;patch=1 \
-	file://0.9.4-armv7a.diff;patch=1 \
+	file://opjitconv-execvp-fix.diff \
+	file://0.9.4-armv7a.diff \
 	"
 
 
diff --git a/recipes/oprofile/oprofile_0.9.5.bb b/recipes/oprofile/oprofile_0.9.5.bb
index 47527ca340..257833073e 100644
--- a/recipes/oprofile/oprofile_0.9.5.bb
+++ b/recipes/oprofile/oprofile_0.9.5.bb
@@ -2,7 +2,7 @@ require oprofile.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://fix-timer-mode.patch;patch=1"
+SRC_URI += "file://fix-timer-mode.patch"
 
 
 SRC_URI[tarball.md5sum] = "4b2ceca3fa013c95cc8d47c790807dc2"
diff --git a/recipes/oprofile/oprofile_cvs.bb b/recipes/oprofile/oprofile_cvs.bb
index 03094aa145..ba4fb35719 100644
--- a/recipes/oprofile/oprofile_cvs.bb
+++ b/recipes/oprofile/oprofile_cvs.bb
@@ -9,7 +9,7 @@ RDEPENDS += "binutils-symlinks"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
-           file://opstart.patch;patch=1 \
+           file://opstart.patch \
 	   file://acinclude.m4"
 
 S = "${WORKDIR}/oprofile"
diff --git a/recipes/orc/files/044_orcutils.patch b/recipes/orc/files/044_orcutils.patch
new file mode 100644
index 0000000000..e87b39d8fc
--- /dev/null
+++ b/recipes/orc/files/044_orcutils.patch
@@ -0,0 +1,12 @@
+diff -Nru orc-0.4.4_orig/orc/orcutils.c orc-0.4.4/orc/orcutils.c
+--- orc-0.4.4_orig/orc/orcutils.c	2010-03-19 23:44:36.000000000 +0100
++++ orc-0.4.4/orc/orcutils.c	2010-05-19 10:56:28.000000000 +0200
+@@ -40,7 +40,7 @@
+  * @title: Utility functions
+  * @short_description: Orc utility functions
+  */
+-
++#define unused
+ #ifdef unused
+ int
+ get_file_int (const char *file, int *value)
diff --git a/recipes/orc/orc.inc b/recipes/orc/orc.inc
index b2c227689d..5baeac924f 100644
--- a/recipes/orc/orc.inc
+++ b/recipes/orc/orc.inc
@@ -17,3 +17,6 @@ python populate_packages_prepend () {
 	do_split_packages(d, libdir, '^lib(.*)\.so\.*', 'lib%s', 'ORC %s library', extra_depends='', allow_links=True)
 }
 
+do_compile_prepend_virtclass-native () {
+	sed -i -e 's#/tmp#.#g' ${S}/orc/orccodemem.c
+}
\ No newline at end of file
diff --git a/recipes/orc/orc_0.4.3.bb b/recipes/orc/orc_0.4.3.bb
index 6da5789e5e..a80c59efe5 100644
--- a/recipes/orc/orc_0.4.3.bb
+++ b/recipes/orc/orc_0.4.3.bb
@@ -1,11 +1,11 @@
 require orc.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[orc.md5sum] = "9b2e7030c8df8a0d371115869fe5685a"
 SRC_URI[orc.sha256sum] = "4c0266d81da67fef0b2abd5e624a9ab0db5de04eb23c3ab24e22f5f9ceeefbfe"
 
-SRC_URI += "file://03_orcutils.patch;patch=1 \
-	file://99_autoreconf.patch;patch=1"
+SRC_URI += "file://03_orcutils.patch \
+	file://99_autoreconf.patch"
 
 
diff --git a/recipes/orc/orc_0.4.4.bb b/recipes/orc/orc_0.4.4.bb
new file mode 100644
index 0000000000..29bf11b812
--- /dev/null
+++ b/recipes/orc/orc_0.4.4.bb
@@ -0,0 +1,8 @@
+require orc.inc
+
+PR = "r0"
+
+SRC_URI[orc.md5sum] = "35f3b7283f391ab8ade7f94332940414"
+SRC_URI[orc.sha256sum] = "62f8808d61a275861c8e0429c76932ef923f0ca50db8dc3e73b0745a631e386f"
+
+SRC_URI += "file://044_orcutils.patch "
diff --git a/recipes/orinoco/orinoco-modules_0.13e.bb b/recipes/orinoco/orinoco-modules_0.13e.bb
index f1a786287f..7eee6862d2 100644
--- a/recipes/orinoco/orinoco-modules_0.13e.bb
+++ b/recipes/orinoco/orinoco-modules_0.13e.bb
@@ -4,8 +4,8 @@ RDEPENDS_orinoco-modules-cs += "orinoco-modules"
 PR = "r5"
 
 SRC_URI += "\
-           file://crosscompile.patch;patch=1 \
-           file://monitor-${PV}.patch;patch=1 \
+           file://crosscompile.patch \
+           file://monitor-${PV}.patch \
            file://spectrum.conf \
            file://spectrum_fw.h \
 	   file://spectrum_cs.c \
diff --git a/recipes/orinoco/orinoco-modules_0.15rc1.bb b/recipes/orinoco/orinoco-modules_0.15rc1.bb
index 13bb8265c6..6188ee6aec 100644
--- a/recipes/orinoco/orinoco-modules_0.15rc1.bb
+++ b/recipes/orinoco/orinoco-modules_0.15rc1.bb
@@ -6,11 +6,11 @@ RDEPENDS_orinoco-modules-cs += "orinoco-modules spectrum-fw"
 PR = "r8"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \
-           file://makefile_fix.patch;patch=1 \
-           file://list-move.patch;patch=1 \
-           file://add_event.patch;patch=1 \
-           file://add_utsname.patch;patch=1 \
-           file://spectrum_cs_ids.patch;patch=1"
+           file://makefile_fix.patch \
+           file://list-move.patch \
+           file://add_event.patch \
+           file://add_utsname.patch \
+           file://spectrum_cs_ids.patch"
 
 do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
diff --git a/recipes/orinoco/orinoco-modules_0.15rc2.bb b/recipes/orinoco/orinoco-modules_0.15rc2.bb
index 243f46b6b6..1af5dca656 100644
--- a/recipes/orinoco/orinoco-modules_0.15rc2.bb
+++ b/recipes/orinoco/orinoco-modules_0.15rc2.bb
@@ -6,12 +6,12 @@ RDEPENDS_orinoco-modules-cs += "orinoco-modules spectrum-fw"
 PR = "r10"
 
 SRC_URI += "\
-           file://makefile_fix.patch;patch=1 \
-           file://list-move.patch;patch=1 \
-           file://add_utsname.patch;patch=1 \
-           file://add_event.patch;patch=1 \
-           file://spectrum_cs_ids.patch;patch=1 \
-           file://catch-up-with-kernel-changes.patch;patch=1"
+           file://makefile_fix.patch \
+           file://list-move.patch \
+           file://add_utsname.patch \
+           file://add_event.patch \
+           file://spectrum_cs_ids.patch \
+           file://catch-up-with-kernel-changes.patch"
 
 do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
diff --git a/recipes/orinoco/orinoco-modules_cvs.bb b/recipes/orinoco/orinoco-modules_cvs.bb
index 6cbb7eb8f6..2939b5dc16 100644
--- a/recipes/orinoco/orinoco-modules_cvs.bb
+++ b/recipes/orinoco/orinoco-modules_cvs.bb
@@ -12,7 +12,7 @@ EXTRA_OEMAKE = 'KERNEL_SRC="${KERNEL_STAGING_DIR}"'
 DEFAULT_PREFERENCE_arm = "-1"
 
 SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/orinoco;module=orinoco;method=pserver \
-           file://list-move.patch;patch=1"
+           file://list-move.patch"
 S = "${WORKDIR}/orinoco"
 
 do_install() {
diff --git a/recipes/orpheus/orpheus_1.5.bb b/recipes/orpheus/orpheus_1.5.bb
index 19b079cfb6..69a416c3ae 100644
--- a/recipes/orpheus/orpheus_1.5.bb
+++ b/recipes/orpheus/orpheus_1.5.bb
@@ -5,7 +5,7 @@ MP3 and Vorbis OGG format."
 DEPENDS = "ncurses"
 LICENSE = "GPL"
 SRC_URI = "http://thekonst.net/download/orpheus-${PV}.tar.bz2 \
-	   file://m4.patch;patch=1"
+	   file://m4.patch"
 S = "${WORKDIR}/orpheus-${PV}"
 
 inherit autotools
diff --git a/recipes/otpcalc/otpcalc_0.97.bb b/recipes/otpcalc/otpcalc_0.97.bb
index d6e07b2615..6c05146622 100644
--- a/recipes/otpcalc/otpcalc_0.97.bb
+++ b/recipes/otpcalc/otpcalc_0.97.bb
@@ -8,10 +8,10 @@ PR = "r1"
 S = "${WORKDIR}/otpCalc-${PV}"
 
 SRC_URI = "http://killa.net/infosec/otpCalc/otpCalc-${PV}.tar.gz \
-	file://otpcalc-man-table-format.diff;patch=1 \
-	file://otpcalc-0.97-badindex.diff;patch=1 \
-	file://otpcalc-crypto-proto.diff;patch=1 \
-	file://otpcalc-0.97-gtk2-gentoo.patch;patch=1 \
+	file://otpcalc-man-table-format.diff \
+	file://otpcalc-0.97-badindex.diff \
+	file://otpcalc-crypto-proto.diff \
+	file://otpcalc-0.97-gtk2-gentoo.patch \
 	"
 
 inherit autotools pkgconfig
diff --git a/recipes/oxnas-boot-tools/files/oxnas-boot-tools-0.1.tar.gz b/recipes/oxnas-boot-tools/files/oxnas-boot-tools-0.1.tar.gz
new file mode 100644
index 0000000000..9cf0fc0d17
--- /dev/null
+++ b/recipes/oxnas-boot-tools/files/oxnas-boot-tools-0.1.tar.gz
diff --git a/recipes/oxnas-boot-tools/oxnas-boot-tools.inc b/recipes/oxnas-boot-tools/oxnas-boot-tools.inc
new file mode 100644
index 0000000000..a77d0cda6d
--- /dev/null
+++ b/recipes/oxnas-boot-tools/oxnas-boot-tools.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "Boot tools for OXNAS boards"
+INC_PR = "r0"
+
+SRC_URI = "file://oxnas-boot-tools-${PV}.tar.gz"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/oxnas-boot-tools/oxnas-boot-tools_0.1.bb b/recipes/oxnas-boot-tools/oxnas-boot-tools_0.1.bb
new file mode 100644
index 0000000000..8de2adb1b8
--- /dev/null
+++ b/recipes/oxnas-boot-tools/oxnas-boot-tools_0.1.bb
@@ -0,0 +1,5 @@
+require oxnas-boot-tools.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "707b66dfc49278b310c1e837f8c99d76"
+SRC_URI[sha256sum] = "02e896dceb3c052034e94d634f7e3ebc0514991f1a855b2de354410f77f17061"
diff --git a/recipes/p3scan/p3scan_2.9.05d.bb b/recipes/p3scan/p3scan_2.9.05d.bb
index 3dbb0d109c..689330d427 100644
--- a/recipes/p3scan/p3scan_2.9.05d.bb
+++ b/recipes/p3scan/p3scan_2.9.05d.bb
@@ -9,9 +9,9 @@ RDEPENDS_${PN} = "${PN}-templates-en"
 PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/p3scan/p3scan-2.9.05d.tar.gz \
-           file://libtool-fix.patch;patch=1 \
-           file://dont-search-use-include.patch;patch=1 \
-           file://configure.in-add-newline.patch;patch=1 \
+           file://libtool-fix.patch \
+           file://dont-search-use-include.patch \
+           file://configure.in-add-newline.patch \
            file://p3scan.init \
            file://p3scan.conf \
            file://doc.configure.txt \
diff --git a/recipes/pacemaker/files/kill-stack-protector.patch b/recipes/pacemaker/files/kill-stack-protector.patch
new file mode 100644
index 0000000000..a9f5b83bb2
--- /dev/null
+++ b/recipes/pacemaker/files/kill-stack-protector.patch
@@ -0,0 +1,12 @@
+Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac
+===================================================================
+--- Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac	2010-05-06 13:43:17.000000000 +0400
++++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac	2010-05-06 13:43:20.000000000 +0400
+@@ -1302,7 +1302,6 @@
+ 
+ 	# We had to eliminate -Wnested-externs because of libtool changes
+         EXTRA_FLAGS="-fgnu89-inline
+-		-fstack-protector-all
+ 		-Wall
+ 		-Waggregate-return
+ 		-Wbad-function-cast 
diff --git a/recipes/pacemaker/files/volatiles b/recipes/pacemaker/files/volatiles
index 50a55be8f4..9ad1434500 100644
--- a/recipes/pacemaker/files/volatiles
+++ b/recipes/pacemaker/files/volatiles
@@ -3,5 +3,3 @@ d hacluster haclient 0755 /var/lib/pengine none
 d hacluster haclient 0755 /var/run/heartbeat none
 d hacluster haclient 0755 /var/run/heartbeat/rsctmp none
 d hacluster haclient 0755 /var/run/crm none
-
-
diff --git a/recipes/pacemaker/pacemaker_1.0.8.bb b/recipes/pacemaker/pacemaker_1.0.8.bb
index 50f26087cd..fb8c9dd5fc 100644
--- a/recipes/pacemaker/pacemaker_1.0.8.bb
+++ b/recipes/pacemaker/pacemaker_1.0.8.bb
@@ -16,15 +16,16 @@ DEPENDS = " \
 	"
 RDEPENDS_${PN} += "openais"
 
-PR = "r1"
+PR = "r4"
 
 SRC_URI = " \
 	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-${PV}.tar.bz2;name=tar \
-	file://pacemaker-remove-native-includes.patch;patch=1 \
-	file://pacemaker-dont-use-help2man.patch;patch=1 \
-	file://fix-header-defs-lookup.patch;patch=1 \
+	file://pacemaker-remove-native-includes.patch \
+	file://pacemaker-dont-use-help2man.patch \
+	file://fix-header-defs-lookup.patch \
 	file://volatiles \
 	"
+SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch"
 SRC_URI[tar.md5sum] = "088569ca893fe9f2239b68abe2856132"
 SRC_URI[tar.sha256sum] = "07e2e5559720890603baac96aa7635ff02f0b33ead592977554e661c6afe7b55"
 inherit autotools_stage python-dir
@@ -34,7 +35,6 @@ S = "${WORKDIR}/Pacemaker-1-0-Pacemaker-${PV}"
 EXTRA_OECONF = "--with-ais --without-heartbeat --disable-fatal-warnings --disable-pretty"
 
 CFLAGS += "-I${STAGING_INCDIR}/heartbeat"
-CFLAGS_libc-uclibc += "-I${STAGING_INCDIR}/heartbeat -fstack-protector-all"
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/default/volatiles
diff --git a/recipes/packagekit/packagekit_0.2.4.bb b/recipes/packagekit/packagekit_0.2.4.bb
index 5f1667ab4b..be9d4dca22 100644
--- a/recipes/packagekit/packagekit_0.2.4.bb
+++ b/recipes/packagekit/packagekit_0.2.4.bb
@@ -9,10 +9,10 @@ PE = "1"
 PR = "r1"
 
 SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \
-           file://disable-docbook2man.patch;patch=1 \
-           file://repository-ping.patch;patch=1 \
-           file://force_depends.patch;patch=1 \
-           file://racing_condition.patch;patch=1 \
+           file://disable-docbook2man.patch \
+           file://repository-ping.patch \
+           file://force_depends.patch \
+           file://racing_condition.patch \
            "
 
 
diff --git a/recipes/packagekit/packagekit_0.4.6.bb b/recipes/packagekit/packagekit_0.4.6.bb
index ddef2b5d83..306ff4b02b 100644
--- a/recipes/packagekit/packagekit_0.4.6.bb
+++ b/recipes/packagekit/packagekit_0.4.6.bb
@@ -8,9 +8,9 @@ RDEPENDS_${PN} = "${IPKG_VARIANT}"
 inherit gnome autotools_stage
 
 SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \
-           file://no_validate.patch;patch=1 \
-           file://opkg-fix-includes.diff;patch=1 \
-           file://opkg-fix-declarations.diff;patch=1 "
+           file://no_validate.patch \
+           file://opkg-fix-includes.diff \
+           file://opkg-fix-declarations.diff "
 
 PR = "r3"
 PE = "1"
diff --git a/recipes/packagekit/packagekit_0.4.8.bb b/recipes/packagekit/packagekit_0.4.8.bb
index 216876f6fe..6fc50c27aa 100644
--- a/recipes/packagekit/packagekit_0.4.8.bb
+++ b/recipes/packagekit/packagekit_0.4.8.bb
@@ -8,7 +8,7 @@ RDEPENDS_${PN} = "${IPKG_VARIANT}"
 inherit gnome autotools_stage
 
 SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \
-           file://no_validate.patch;patch=1 \
+           file://no_validate.patch \
           "
 
 PR = "r0"
diff --git a/recipes/packagekit/packagekit_0.5.6.bb b/recipes/packagekit/packagekit_0.5.6.bb
index 171c9722b2..3822edfd9a 100644
--- a/recipes/packagekit/packagekit_0.5.6.bb
+++ b/recipes/packagekit/packagekit_0.5.6.bb
@@ -11,8 +11,8 @@ PE = "2"
 PR = "r1"
 
 SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz;name=archive \
-           file://configurefix.patch;patch=1 \
-           file://opkgfixes.patch;patch=1"
+           file://configurefix.patch \
+           file://opkgfixes.patch"
 
 SRC_URI[archive.md5sum] = "6c8d9c48e21b82abeea15c3fd5066242"
 SRC_URI[archive.sha256sum] = "0eafd1be5516a41ebc0f0c3acff0b0763da105a4178b5eee0ff16d66ccd04408"
diff --git a/recipes/pam/libpam_0.79.bb b/recipes/pam/libpam_0.79.bb
index e992f90411..8cef0bc0a5 100644
--- a/recipes/pam/libpam_0.79.bb
+++ b/recipes/pam/libpam_0.79.bb
@@ -30,9 +30,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/pam/pre/library/${p}.tar.bz2"
 
 # the patches are necessary to get the autoreconf and cross build
 # to work correctly
-SRC_URI += " file://libpam-config.patch;patch=1"
+SRC_URI += " file://libpam-config.patch"
 # The Makefile uses 'FAKEROOT' not DESTDIR.
-SRC_URI += " file://libpam-make.patch;patch=1"
+SRC_URI += " file://libpam-make.patch"
 
 inherit autotools
 
diff --git a/recipes/pam/libpam_1.0.2.bb b/recipes/pam/libpam_1.0.2.bb
index e6bde140c5..08cb78f20e 100644
--- a/recipes/pam/libpam_1.0.2.bb
+++ b/recipes/pam/libpam_1.0.2.bb
@@ -24,10 +24,10 @@ p = "${pn}-${PV}"
 S = "${WORKDIR}/${p}"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/pam/library/${p}.tar.bz2 \
-           file://pam-nodocs.patch;patch=1 "
+           file://pam-nodocs.patch "
 
-SRC_URI_append_linux-uclibc = " file://pam-disable-nis-on-uclibc.patch;patch=1"
-SRC_URI_append_linux-uclibceabi = " file://pam-disable-nis-on-uclibc.patch;patch=1"
+SRC_URI_append_linux-uclibc = " file://pam-disable-nis-on-uclibc.patch"
+SRC_URI_append_linux-uclibceabi = " file://pam-disable-nis-on-uclibc.patch"
 
 inherit autotools
 
diff --git a/recipes/pam/libpam_1.1.0.bb b/recipes/pam/libpam_1.1.0.bb
index c4dcedf125..3e8837649b 100644
--- a/recipes/pam/libpam_1.1.0.bb
+++ b/recipes/pam/libpam_1.1.0.bb
@@ -24,12 +24,12 @@ p = "${pn}-${PV}"
 S = "${WORKDIR}/${p}"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/pam/library/${p}.tar.bz2 \
-           file://pam-nodocs.patch;patch=1 \
-           file://fix_disabled_nls.patch;patch=1 \
+           file://pam-nodocs.patch \
+           file://fix_disabled_nls.patch \
           "
 
-UCLIBC_PATCHES = " file://pam-disable-nis-on-uclibc.patch;patch=1 \
-                   file://disable_modules_uclibc.patch;patch=1 \
+UCLIBC_PATCHES = " file://pam-disable-nis-on-uclibc.patch \
+                   file://disable_modules_uclibc.patch \
                  "
 
 SRC_URI_append_linux-uclibc = ${UCLIBC_PATCHES}
diff --git a/recipes/pango/pango.inc b/recipes/pango/pango.inc
index d0b18755b9..0a01814510 100644
--- a/recipes/pango/pango.inc
+++ b/recipes/pango/pango.inc
@@ -22,7 +22,7 @@ INC_PR = "r0"
 # seems to go wrong with default cflags
 FULL_OPTIMIZATION_arm = "-O2"
 
-SRC_URI += "file://no-tests.patch;patch=1 \
+SRC_URI += "file://no-tests.patch \
            "
 
 EXTRA_OECONF = "--disable-glibtest \
diff --git a/recipes/pango/pango_1.10.2.bb b/recipes/pango/pango_1.10.2.bb
index e54eee5fc0..34ca0ecbaf 100644
--- a/recipes/pango/pango_1.10.2.bb
+++ b/recipes/pango/pango_1.10.2.bb
@@ -12,7 +12,7 @@ RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 FULL_OPTIMIZATION_arm = "-O2"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/pango-${PV}.tar.bz2 \
-	   file://no-tests.patch;patch=1"
+	   file://no-tests.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/pango/pango_1.12.0.bb b/recipes/pango/pango_1.12.0.bb
index 4f0d92f107..2eea1785a4 100644
--- a/recipes/pango/pango_1.12.0.bb
+++ b/recipes/pango/pango_1.12.0.bb
@@ -12,7 +12,7 @@ RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 FULL_OPTIMIZATION_arm = "-O2"
 
 SRC_URI = "http://download.gnome.org/sources/pango/1.12/pango-${PV}.tar.bz2 \
-	   file://no-tests.patch;patch=1"
+	   file://no-tests.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/pango/pango_1.14.8.bb b/recipes/pango/pango_1.14.8.bb
index f76978a0f6..be9e81d875 100644
--- a/recipes/pango/pango_1.14.8.bb
+++ b/recipes/pango/pango_1.14.8.bb
@@ -14,7 +14,7 @@ RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 FULL_OPTIMIZATION_arm = "-O2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pango/1.14/pango-${PV}.tar.bz2 \
-	   file://no-tests.patch;patch=1 \
+	   file://no-tests.patch \
 		"
 inherit autotools pkgconfig
 
diff --git a/recipes/pango/pango_1.18.3.bb b/recipes/pango/pango_1.18.3.bb
index e79f061a29..0d0f025bb2 100644
--- a/recipes/pango/pango_1.18.3.bb
+++ b/recipes/pango/pango_1.18.3.bb
@@ -1,6 +1,6 @@
 require pango.inc
 
-SRC_URI += "file://pkgconfig_fixes.patch;patch=1"
+SRC_URI += "file://pkgconfig_fixes.patch"
 
 
 SRC_URI[archive.md5sum] = "4a9862b5151f16dcad8e30dd6ef08549"
diff --git a/recipes/pango/pango_1.24.4.bb b/recipes/pango/pango_1.24.4.bb
index 1a9979757c..84af64f7ad 100644
--- a/recipes/pango/pango_1.24.4.bb
+++ b/recipes/pango/pango_1.24.4.bb
@@ -2,7 +2,7 @@ require pango.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://CVE-2010-0421.patch;patch=1"
+SRC_URI += "file://CVE-2010-0421.patch"
 
 
 SRC_URI[archive.md5sum] = "f2eeaf183930e00ed28fca3a6ed1deb0"
diff --git a/recipes/pango/pango_1.4.1.bb b/recipes/pango/pango_1.4.1.bb
index f6b1eda187..51da5b1470 100644
--- a/recipes/pango/pango_1.4.1.bb
+++ b/recipes/pango/pango_1.4.1.bb
@@ -6,7 +6,7 @@ Open Source framework for the layout and rendering of \
 internationalized text."
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/pango-${PV}.tar.bz2 \
-	   file://no-tests.patch;patch=1"
+	   file://no-tests.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/pango/pango_1.8.2.bb b/recipes/pango/pango_1.8.2.bb
index cdb7245e51..43778e474d 100644
--- a/recipes/pango/pango_1.8.2.bb
+++ b/recipes/pango/pango_1.8.2.bb
@@ -11,8 +11,8 @@ PR = "r0"
 FULL_OPTIMIZATION_arm = "-O2"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/pango-${PV}.tar.bz2 \
-	   file://no-tests.patch;patch=1 \
-	   file://pkgconfig_fixes.patch;patch=1"
+	   file://no-tests.patch \
+	   file://pkgconfig_fixes.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/parted/parted_1.8.8.bb b/recipes/parted/parted_1.8.8.bb
index 2890e23915..c915f4c36e 100644
--- a/recipes/parted/parted_1.8.8.bb
+++ b/recipes/parted/parted_1.8.8.bb
@@ -6,8 +6,8 @@ DEPENDS = "readline util-linux-ng"
 PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \
-	   file://use_llseek_syscall.patch;patch=1 \
-	   file://parted-1.8.x.patch;patch=1 \
+	   file://use_llseek_syscall.patch \
+	   file://parted-1.8.x.patch \
 "
            
 EXTRA_OECONF = "--disable-Werror ac_cv_func_calloc_0_nonnull=yes"
diff --git a/recipes/patch/patch_2.5.9.bb b/recipes/patch/patch_2.5.9.bb
index 3fcc331067..0ca5c8bd87 100644
--- a/recipes/patch/patch_2.5.9.bb
+++ b/recipes/patch/patch_2.5.9.bb
@@ -1,11 +1,11 @@
 require patch.inc
 
 SRC_URI = "${GNU_MIRROR}/patch/patch-2.5.4.tar.gz \
-	   file://2.5.9.patch;patch=1 \
-	   file://debian.patch;patch=1 \
-	   file://install.patch;patch=1 \
-           file://unified-reject-files.diff;patch=1 \
-           file://global-reject-file.diff;patch=1 "
+	   file://2.5.9.patch \
+	   file://debian.patch \
+	   file://install.patch \
+           file://unified-reject-files.diff \
+           file://global-reject-file.diff "
 S = "${WORKDIR}/patch-2.5.4"
 PR = "r2"
 SRC_URI[md5sum] = "ee5ae84d115f051d87fcaaef3b4ae782"
diff --git a/recipes/patcher/patcher-native_20040913.bb b/recipes/patcher/patcher-native_20040913.bb
index 6f321d9bd8..5fc00f100b 100644
--- a/recipes/patcher/patcher-native_20040913.bb
+++ b/recipes/patcher/patcher-native_20040913.bb
@@ -10,7 +10,7 @@ PR = "r1"
 inherit native
 
 SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2"
-SRC_URI_append_build-freebsd = " file://freebsd_gpatch.patch;patch=1 "
+SRC_URI_append_build-freebsd = " file://freebsd_gpatch.patch "
 S = "${WORKDIR}/patcher"
 
 PATCHTOOL = "patch"
diff --git a/recipes/pax-utils/pax-utils-native_0.1.13.bb b/recipes/pax-utils/pax-utils-native_0.1.13.bb
deleted file mode 100644
index 633e0781f0..0000000000
--- a/recipes/pax-utils/pax-utils-native_0.1.13.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-inherit native
-
-require pax-utils_${PV}.bb
-
-do_stage() {
-    oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_exec_prefix} install
-}
-
-do_install() {
-	:
-}
-
diff --git a/recipes/pax-utils/pax-utils-native_0.1.19.bb b/recipes/pax-utils/pax-utils-native_0.1.19.bb
deleted file mode 100644
index 76b648dd71..0000000000
--- a/recipes/pax-utils/pax-utils-native_0.1.19.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-inherit native
-
-require pax-utils_${PV}.bb
-
-do_stage() {
-    oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_exec_prefix} install
-}
-
-do_install() {
-	:
-}
-
-
-SRC_URI[md5sum] = "98f6b9fe17a740a8cc577255422c6103"
-SRC_URI[sha256sum] = "3918628e9f2508708a1a28f5ed4cb39d07cbd5711747bbb3ddf63816d056c11e"
diff --git a/recipes/pax-utils/pax-utils_0.1.13.bb b/recipes/pax-utils/pax-utils_0.1.13.bb
index 280aa52f07..4ca926c2bc 100644
--- a/recipes/pax-utils/pax-utils_0.1.13.bb
+++ b/recipes/pax-utils/pax-utils_0.1.13.bb
@@ -12,9 +12,11 @@ do_compile() {
 }
 
 do_install() {
-    oe_runmake DESTDIR=${D} install
+    oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install
 }
 
+NATIVE_INSTALL_WORKS = "1"
+BBCLASSEXTEND = "native"
 
 SRC_URI[md5sum] = "5f09df47a16e83462384b44b75310539"
 SRC_URI[sha256sum] = "72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36"
diff --git a/recipes/pax-utils/pax-utils_0.1.19.bb b/recipes/pax-utils/pax-utils_0.1.19.bb
index 59a1f02fe0..d7cd49fd3b 100644
--- a/recipes/pax-utils/pax-utils_0.1.19.bb
+++ b/recipes/pax-utils/pax-utils_0.1.19.bb
@@ -5,6 +5,8 @@ LICENSE     = "GPLv2"
 SRC_URI     = "http://gentoo.osuosl.org/distfiles/pax-utils-${PV}.tar.bz2"
 S           = "${WORKDIR}/pax-utils-${PV}"
 
+PR = "r2"
+
 CPPFLAGS   += "-D_GNU_SOURCE "
 
 do_compile() {
@@ -12,9 +14,11 @@ do_compile() {
 }
 
 do_install() {
-    oe_runmake DESTDIR=${D} install
+    oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install
 }
 
+NATIVE_INSTALL_WORKS = "1"
+BBCLASSEXTEND = "native"
 
 SRC_URI[md5sum] = "98f6b9fe17a740a8cc577255422c6103"
 SRC_URI[sha256sum] = "3918628e9f2508708a1a28f5ed4cb39d07cbd5711747bbb3ddf63816d056c11e"
diff --git a/recipes/pciutils/pciutils_2.1.11.bb b/recipes/pciutils/pciutils_2.1.11.bb
index 306cebf3e9..1b8c770071 100644
--- a/recipes/pciutils/pciutils_2.1.11.bb
+++ b/recipes/pciutils/pciutils_2.1.11.bb
@@ -11,9 +11,9 @@ PARALLEL_MAKE = ""
 FILES_pciutils-ids="${prefix}/share/pci.ids"
 PACKAGES =+ "pciutils-ids"
 SRC_URI = "${KERNELORG_MIRROR}/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-	   file://configure-uclibc.patch;patch=1 \
-	   file://pcimodules-pciutils-2.1.11.diff;patch=1"
+	   file://configure.patch \
+	   file://configure-uclibc.patch \
+	   file://pcimodules-pciutils-2.1.11.diff"
 
 do_configure () {
 	(cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})
diff --git a/recipes/pciutils/pciutils_2.2.4.bb b/recipes/pciutils/pciutils_2.2.4.bb
index dd3eee52d4..d9fa88dce0 100644
--- a/recipes/pciutils/pciutils_2.2.4.bb
+++ b/recipes/pciutils/pciutils_2.2.4.bb
@@ -7,9 +7,9 @@ LICENSE = "GPLv2"
 DEPENDS = "zlib"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-	   file://configure-uclibc.patch;patch=1 \
-	   file://pcimodules-pciutils.diff;patch=1"
+	   file://configure.patch \
+	   file://configure-uclibc.patch \
+	   file://pcimodules-pciutils.diff"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/pciutils/pciutils_3.1.2.bb b/recipes/pciutils/pciutils_3.1.2.bb
index 97aa2f6c8d..79942650fd 100644
--- a/recipes/pciutils/pciutils_3.1.2.bb
+++ b/recipes/pciutils/pciutils_3.1.2.bb
@@ -7,8 +7,8 @@ LICENSE = "GPLv2"
 DEPENDS = "zlib"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
-	   file://pciutils.patch;patch=1 "
-SRC_URI_append_nylon = "file://gcc-3-compatibility.patch;patch=1 "
+	   file://pciutils.patch "
+SRC_URI_append_nylon = "file://gcc-3-compatibility.patch "
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/pcmanfm/pcmanfm_0.5.bb b/recipes/pcmanfm/pcmanfm_0.5.bb
index baac2cfcda..8c723e8640 100644
--- a/recipes/pcmanfm/pcmanfm_0.5.bb
+++ b/recipes/pcmanfm/pcmanfm_0.5.bb
@@ -7,13 +7,13 @@ RRECOMMENDS = "pmount-hal"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
-           file://desired_mount_point.patch;patch=1 \
-           file://auto_mount.patch;patch=1 \
+           file://desired_mount_point.patch \
+           file://auto_mount.patch \
 	   file://gnome-fs-directory.png \
 	   file://gnome-fs-regular.png \
 	   file://gnome-mime-text-plain.png \
 	   file://emblem-symbolic-link.png \
-	   file://desktop.patch;patch=1"
+	   file://desktop.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/pcmcia-cs/pcmcia-cs_3.2.8.bb b/recipes/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 8ae6b27072..155a217289 100644
--- a/recipes/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/recipes/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -10,21 +10,21 @@ RDEPENDS = "hostap-conf orinoco-conf"
 PR = "r28"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
-	   file://busybox.patch;patch=1 \
-	   file://network.patch;patch=1 \
-	   file://pcic-extra.patch;patch=1 \
-	   file://automount.patch;patch=1 \
-	   file://ratoc-cfu1u.patch;patch=1 \
-	   file://no-hostap-cards.patch;patch=1 \
-	   file://gcc4_fixes.patch;patch=1 \
+	   file://busybox.patch \
+	   file://network.patch \
+	   file://pcic-extra.patch \
+	   file://automount.patch \
+	   file://ratoc-cfu1u.patch \
+	   file://no-hostap-cards.patch \
+	   file://gcc4_fixes.patch \
 	   file://pcmcia \
 	   file://ide.opts \
 	   file://wireless.opts \
 	   file://network.conf \
 	   file://wnv.conf"
 
-SRC_URI_append_spitz = " file://nocleanup.patch;patch=1"
-SRC_URI_append_sh3 = " file://superh-noO3.patch;patch=1"
+SRC_URI_append_spitz = " file://nocleanup.patch"
+SRC_URI_append_sh3 = " file://superh-noO3.patch"
 
 S = "${WORKDIR}/pcmcia-cs-${PV}"
 
diff --git a/recipes/pcmciautils/pcmciautils_013.bb b/recipes/pcmciautils/pcmciautils_013.bb
index 31cd3442b5..101d997fc1 100644
--- a/recipes/pcmciautils/pcmciautils_013.bb
+++ b/recipes/pcmciautils/pcmciautils_013.bb
@@ -2,9 +2,9 @@ require pcmciautils.inc
 
 PR = "r1"
 
-SRC_URI += "file://makefile_fix.patch;patch=1 \
-            file://version_workaround.patch;patch=1 \
-	    file://modalias_update.patch;patch=1"
+SRC_URI += "file://makefile_fix.patch \
+            file://version_workaround.patch \
+	    file://modalias_update.patch"
 
 SRC_URI[md5sum] = "5882b7c84f095a7492b1ebe7577dce5a"
 SRC_URI[sha256sum] = "7c1adf1a5ebeba124cef4102cbbf9ca65b8493ad6b8fcfb48091e27e983ffc41"
diff --git a/recipes/pcmciautils/pcmciautils_014.bb b/recipes/pcmciautils/pcmciautils_014.bb
index 1f52f8b057..c44116a284 100644
--- a/recipes/pcmciautils/pcmciautils_014.bb
+++ b/recipes/pcmciautils/pcmciautils_014.bb
@@ -2,9 +2,9 @@ require pcmciautils.inc
 
 PR = "r1"
 
-SRC_URI += "file://makefile_fix.patch;patch=1 \
-            file://version_workaround.patch;patch=1 \
-	    file://modalias_update.patch;patch=1"
+SRC_URI += "file://makefile_fix.patch \
+            file://version_workaround.patch \
+	    file://modalias_update.patch"
 
 SRC_URI[md5sum] = "3f07c926875f6c5dcb83240f39725177"
 SRC_URI[sha256sum] = "6bef7c05ba9fad231fe7a188043c61c116c24bab5fa79d9d72c1d8e11ff38925"
diff --git a/recipes/pcmciautils/pcmciautils_015.bb b/recipes/pcmciautils/pcmciautils_015.bb
index 34b440af5c..1e21f0035e 100644
--- a/recipes/pcmciautils/pcmciautils_015.bb
+++ b/recipes/pcmciautils/pcmciautils_015.bb
@@ -2,9 +2,9 @@ require pcmciautils.inc
 
 PR = "r0"
 
-SRC_URI += "file://makefile_fix.patch;patch=1 \
-            file://version_workaround.patch;patch=1 \
-	    file://ccdv.patch;patch=1 \
+SRC_URI += "file://makefile_fix.patch \
+            file://version_workaround.patch \
+	    file://ccdv.patch \
 	   "
 
 SRC_URI[md5sum] = "9e12435c8b6cf7bf59894e90e480b4aa"
diff --git a/recipes/pdm/pdm_1.0.bb b/recipes/pdm/pdm_1.0.bb
index 7411a98003..75f6d741d7 100644
--- a/recipes/pdm/pdm_1.0.bb
+++ b/recipes/pdm/pdm_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DESCRIPTION = "pdm is a minimal session manager for GUIs."
 
 SRC_URI="http://www.penguru.net/download/${PN}-${PV}.tar.gz \
-	file://pdm-1.0-changes.patch;patch=1 \
+	file://pdm-1.0-changes.patch \
 	file://pdm.conf \
 	file://xfce \
 	file://mythtv"
diff --git a/recipes/perl/libmail-spf-perl_2.007.bb b/recipes/perl/libmail-spf-perl_2.007.bb
index b4fdd05923..ae9a83cf5f 100644
--- a/recipes/perl/libmail-spf-perl_2.007.bb
+++ b/recipes/perl/libmail-spf-perl_2.007.bb
@@ -24,7 +24,7 @@ PR = "r0"
 
 SRC_URI = " \
 	http://search.cpan.org/CPAN/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v${PV}.tar.gz;name=mail-spf-perl-${PV} \
-	file://fix-sbin-native-install.patch;patch=1 \
+	file://fix-sbin-native-install.patch \
 	"
 SRC_URI[mail-spf-perl-2.007.md5sum] = "67dccdc91e3264679a0e17d493d3cc30"
 SRC_URI[mail-spf-perl-2.007.sha256sum] = "d8886e6a5b300946434284a6527bbb68ed98d27d3582c8e475e338facb96c50b"
diff --git a/recipes/perl/libnet-pcap-perl_0.16.bb b/recipes/perl/libnet-pcap-perl_0.16.bb
index ed5ec978b7..63917287ab 100644
--- a/recipes/perl/libnet-pcap-perl_0.16.bb
+++ b/recipes/perl/libnet-pcap-perl_0.16.bb
@@ -14,7 +14,7 @@ export STAGING_LIBDIR
 
 SRC_URI = " \
 	http://search.cpan.org/CPAN/authors/id/S/SA/SAPER/Net-Pcap-${PV}.tar.gz;name=net-pcap-perl-${PV} \
-	file://kill-runtime-pcap-check-fake-functions-check.patch;patch=1 \
+	file://kill-runtime-pcap-check-fake-functions-check.patch \
 	"
 SRC_URI[net-pcap-perl-0.16.md5sum] = "b150d8e0a40137fad2a7df792d80cab4"
 SRC_URI[net-pcap-perl-0.16.sha256sum] = "9311d0d4043ea1f8b855dd1f2dc3312436064f4291c74127eb7c3f79b14677aa"
diff --git a/recipes/perl/libnet-rawip-perl_0.25.bb b/recipes/perl/libnet-rawip-perl_0.25.bb
index ec57c7a9cf..e0da3381f2 100644
--- a/recipes/perl/libnet-rawip-perl_0.25.bb
+++ b/recipes/perl/libnet-rawip-perl_0.25.bb
@@ -13,7 +13,7 @@ RDEPENDS = " \
 
 SRC_URI = " \
 	http://search.cpan.org/CPAN/authors/id/S/SA/SAPER/Net-RawIP-${PV}.tar.gz;name=net-rawip-perl-${PV} \
-	file://kill-pcap-check.patch;patch=1 \
+	file://kill-pcap-check.patch \
 	"
 SRC_URI[net-rawip-perl-0.25.md5sum] = "a99f461e20e7894154f64729a4652448"
 SRC_URI[net-rawip-perl-0.25.sha256sum] = "6d104b2f0e453eff7a1b479c528798670b15729ed6ecf41430405ff6d7e1ee58"
diff --git a/recipes/perl/libxml-libxml-perl_1.70.bb b/recipes/perl/libxml-libxml-perl_1.70.bb
index ac56c9f4ad..f298ac873f 100644
--- a/recipes/perl/libxml-libxml-perl_1.70.bb
+++ b/recipes/perl/libxml-libxml-perl_1.70.bb
@@ -8,7 +8,7 @@ DEPENDS += "libxml2 \
 PR = "r0"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PA/PAJAS/XML-LibXML-${PV}.tar.gz;name=libxml \
-        file://libxml-libxml-perl-disable-libxml2-check.patch;patch=1 \
+        file://libxml-libxml-perl-disable-libxml2-check.patch \
 "
 SRC_URI[libxml.md5sum] = "33d4294f708e20c298cfe534d1166844"
 SRC_URI[libxml.sha256sum] = "53e6cf06772ba9d85055dc6e4488dbd876d2376e48ef3578fa73246ee98b3ba0"
diff --git a/recipes/perl/perl-native_5.10.1.bb b/recipes/perl/perl-native_5.10.1.bb
index a56805c0ce..8bafff0b34 100644
--- a/recipes/perl/perl-native_5.10.1.bb
+++ b/recipes/perl/perl-native_5.10.1.bb
@@ -3,7 +3,8 @@ HOMEPAGE = "http://www.perl.org/"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/db-native gdbm-native"
-PR = "r0"
+PR = "r3"
+NATIVE_INSTALL_WORKS = "1"
 
 # Not tested enough
 DEFAULT_PREFERENCE = "-1"
@@ -11,10 +12,10 @@ DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
 
 SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz;name=perl-${PV} \
-           file://Configure-multilib.patch;patch=1 \
-           file://perl-configpm-switch.patch;patch=1 \
-           file://native-nopacklist.patch;patch=1 \
-           file://native-perlinc.patch;patch=1 \
+           file://Configure-multilib.patch \
+           file://perl-configpm-switch.patch \
+           file://native-nopacklist.patch \
+           file://native-perlinc.patch \
 	   "
 
 SRC_URI[perl-5.10.1.md5sum] = "b9b2fdb957f50ada62d73f43ee75d044"
@@ -65,17 +66,20 @@ do_configure () {
 	 s!^installsitebin=.*!installsitebin=\'${STAGING_BINDIR}\'!" < config.sh > config.sh.new
     mv config.sh.new config.sh
 }
-do_stage_append() {
+
+do_install() {
+	oe_runmake DESTDIR="${D}" install.perl
+
         # We need a hostperl link for building perl
-        ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl
+        ln -sf perl${PV} ${D}${bindir}/hostperl
         # Store native config in non-versioned directory
-        install -d ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE \
-                   ${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils
-        install config.sh ${STAGING_LIBDIR}/perl
+        install -d ${D}${libdir}/perl/${PV}/CORE \
+                   ${D}${datadir}/perl/${PV}/ExtUtils
+        install config.sh ${D}${libdir}/perl
 	# target configuration
-        install lib/Config.pm       ${STAGING_LIBDIR_NATIVE}/perl/${PV}/
-	install lib/ExtUtils/xsubpp ${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils/
-	install lib/ExtUtils/typemap ${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils/
+        install lib/Config.pm       ${D}${libdir}/perl/${PV}/
+	install lib/ExtUtils/xsubpp ${D}${datadir}/perl/${PV}/ExtUtils/
+	install lib/ExtUtils/typemap ${D}${datadir}/perl/${PV}/ExtUtils/
         # perl shared library headers
         for i in av.h embed.h gv.h keywords.h op.h perlio.h pp.h regexp.h \
                  uconfig.h XSUB.h cc_runtime.h embedvar.h handy.h opnames.h \
@@ -86,15 +90,15 @@ do_stage_append() {
                  nostdio.h overload.h parser.h perlapi.h perlvars.h util.h \
                  dosish.h form.h iperlsys.h opcode.h perl.h perly.h regcomp.h \
                  thread.h warnings.h; do
-            install $i ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE
+            install $i ${D}${libdir}/perl/${PV}/CORE
         done
 
 	# Fix Errno.pm for target builds
-	sed -i -r "s,^\tdie\ (\"Errno\ architecture.+)$,\twarn\ \1," ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Errno.pm
+	sed -i -r "s,^\tdie\ (\"Errno\ architecture.+)$,\twarn\ \1," ${D}${libdir}/perl/${PV}/Errno.pm
 }
-do_stage_append_nylon() {
+do_install_append_nylon() {
         # get rid of definitions not supported by the gcc version we use for nylon...
-        for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_LIBDIR}/perl/config.sh; do
+        for i in ${D}${libdir}/perl/${PV}/Config_heavy.pl ${D}${libdir}/perl/config.sh; do
                 perl -pi -e 's/-Wdeclaration-after-statement //g' ${i}
         done
 }
diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb
index b148f0ed01..336b419e95 100644
--- a/recipes/perl/perl-native_5.8.8.bb
+++ b/recipes/perl/perl-native_5.8.8.bb
@@ -3,19 +3,20 @@ HOMEPAGE = "http://www.perl.org/"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/db-native gdbm-native"
-PR = "r16"
+PR = "r19"
+NATIVE_INSTALL_WORKS = "1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
 
 SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/5.0/perl-${PV}.tar.gz \
-           file://perl-5.8.8-gcc-4.2.patch;patch=1 \
-           file://Configure-multilib.patch;patch=1 \
-           file://perl-configpm-switch.patch;patch=1 \
-           file://native-nopacklist.patch;patch=1 \
-           file://native-no-gdbminc.patch;patch=1 \
-           file://native-perlinc.patch;patch=1 \
-           file://makedepend-dash.patch;patch=1 \
-           file://asm-pageh-fix.patch;patch=1"
+           file://perl-5.8.8-gcc-4.2.patch \
+           file://Configure-multilib.patch \
+           file://perl-configpm-switch.patch \
+           file://native-nopacklist.patch \
+           file://native-no-gdbminc.patch \
+           file://native-perlinc.patch \
+           file://makedepend-dash.patch \
+           file://asm-pageh-fix.patch"
 
 S = "${WORKDIR}/perl-${PV}"
 
@@ -62,18 +63,21 @@ do_configure () {
 	 s!^installsitebin=.*!installsitebin=\'${STAGING_BINDIR}\'!" < config.sh > config.sh.new
     mv config.sh.new config.sh
 }
-do_stage_append() {
+
+do_install() {
+	oe_runmake DESTDIR="${D}" install.perl
+
         # We need a hostperl link for building perl
-        ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl
+        ln -sf perl${PV} ${D}${bindir}/hostperl
         # Store native config in non-versioned directory
-        install -d ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE \
-                   ${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils
-        install config.sh ${STAGING_LIBDIR}/perl
+        install -d ${D}${libdir}/perl/${PV}/CORE \
+                   ${D}${datadir}/perl/${PV}/ExtUtils
+        install config.sh ${D}${libdir}/perl
 	# Fix Errno.pm for target builds
-	sed -i -r "s,^\tdie\ (\"Errno\ architecture.+)$,\twarn\ \1," ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Errno.pm
+	sed -i -r "s,^\tdie\ (\"Errno\ architecture.+)$,\twarn\ \1," ${D}${libdir}/perl/${PV}/Errno.pm
 	# target configuration
-        install lib/Config.pm       ${STAGING_LIBDIR_NATIVE}/perl/${PV}/
-	install lib/ExtUtils/typemap ${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils/
+        install lib/Config.pm       ${D}${libdir}/perl/${PV}/
+	install lib/ExtUtils/typemap ${D}${datadir}/perl/${PV}/ExtUtils/
         # perl shared library headers
         for i in av.h embed.h gv.h keywords.h op.h perlio.h pp.h regexp.h \
                  uconfig.h XSUB.h cc_runtime.h embedvar.h handy.h opnames.h \
@@ -84,12 +88,13 @@ do_stage_append() {
                  nostdio.h perlapi.h perlvars.h reentr.inc thrdvar.h util.h \
                  dosish.h form.h iperlsys.h opcode.h perl.h perly.h regcomp.h \
                  thread.h warnings.h; do
-            install $i ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE
+            install $i ${D}${libdir}/perl/${PV}/CORE
         done
 }
-do_stage_append_nylon() {
+
+do_install_append_nylon() {
         # get rid of definitions not supported by the gcc version we use for nylon...
-        for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_LIBDIR}/perl/config.sh; do
+        for i in ${D}${libdir}/perl/${PV}/Config_heavy.pl ${D}${libdir}/perl/config.sh; do
                 perl -pi -e 's/-Wdeclaration-after-statement //g' ${i}
         done
 }
diff --git a/recipes/perl/perl_5.10.1.bb b/recipes/perl/perl_5.10.1.bb
index 7c8ff2648c..75ae81d75b 100644
--- a/recipes/perl/perl_5.10.1.bb
+++ b/recipes/perl/perl_5.10.1.bb
@@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL"
 PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native grep-native"
-PR = "r1"
+PR = "r4"
 
 # Not tested enough
 DEFAULT_PREFERENCE = "-1"
@@ -14,16 +14,16 @@ DEFAULT_PREFERENCE = "-1"
 PVM = "5.10"
 
 SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz;name=perl-${PV} \
-	file://perl_${PV}-8.diff.gz;patch=1 \
-        file://Makefile.patch;patch=1 \
-        file://Makefile.SH.patch;patch=1 \
-        file://installperl.patch;patch=1 \
-        file://perl-dynloader.patch;patch=1 \
-        file://perl-moreconfig.patch;patch=1 \
-        file://letgcc-find-errno.patch;patch=1 \
-        file://generate-sh.patch;patch=1 \
-        file://shared-ldflags.patch;patch=1 \
-	file://cross-generate_uudmap.patch;patch=1 \
+	file://perl_${PV}-8.diff.gz \
+        file://Makefile.patch \
+        file://Makefile.SH.patch \
+        file://installperl.patch \
+        file://perl-dynloader.patch \
+        file://perl-moreconfig.patch \
+        file://letgcc-find-errno.patch \
+        file://generate-sh.patch \
+        file://shared-ldflags.patch \
+	file://cross-generate_uudmap.patch \
         file://config.sh \
         file://config.sh-32 \
         file://config.sh-32-le \
@@ -49,7 +49,7 @@ CFLAGS += "-DDEBIAN"
 
 do_configure() {
         # Make hostperl in build directory be the native perl
-        cp -f ${HOSTPERL} hostperl
+        ln -sf ${HOSTPERL} hostperl
 
         # Do out work in the cross subdir
         cd Cross
@@ -65,6 +65,7 @@ do_configure() {
         # Fixups for uclibc
         if [ "${TARGET_OS}" = "linux-uclibc" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then
                 sed -i -e "s,\(d_crypt_r=\)'define',\1'undef',g" \
+                       -e "s,\(d_futimes=\)'define',\1'undef',g" \
                        -e "s,\(crypt_r_proto=\)'\w+',\1'0',g" \
                        -e "s,\(d_getnetbyname_r=\)'define',\1'undef',g" \
                        -e "s,\(getnetbyname_r_proto=\)'\w+',\1'0',g" \
diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb
index 2019ea6e03..4f4c468a78 100644
--- a/recipes/perl/perl_5.8.8.bb
+++ b/recipes/perl/perl_5.8.8.bb
@@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL"
 PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native grep-native"
-PR = "r31"
+PR = "r34"
 
 # Major part of version
 PVM = "5.8"
@@ -14,25 +14,25 @@ SRC_URI[perl588targz.md5sum] = "b8c118d4360846829beb30b02a6b91a7"
 SRC_URI[perl588targz.sha256sum] = "e15d499321e003d12ed183601e37ee7ba5f64b278d1de30149ce01bd4a3f234d"
 
 SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/5.0/perl-5.8.8.tar.gz;name=perl588targz \
-        file://Makefile.patch;patch=1 \
-        file://Makefile.SH.patch;patch=1 \
-        file://makedepend-dash.patch;patch=1 \
-        file://installperl.patch;patch=1 \
-        file://perl-dynloader.patch;patch=1 \
-        file://perl-moreconfig.patch;patch=1 \
-        file://letgcc-find-errno.patch;patch=1 \
-        file://generate-sh.patch;patch=1 \
-        file://perl-5.8.8-gcc-4.2.patch;patch=1 \
-        file://09_fix_installperl.patch;patch=1 \
-        file://52_debian_extutils_hacks.patch;patch=1 \
-        file://53_debian_mod_paths.patch;patch=1 \
-        file://54_debian_perldoc-r.patch;patch=1 \
-        file://58_debian_cpan_config_path.patch;patch=1 \
-        file://60_debian_libnet_config_path.patch;patch=1 \
-        file://62_debian_cpan_definstalldirs.patch;patch=1 \
-        file://64_debian_enc2xs_inc.patch;patch=1 \
-        file://asm-pageh-fix.patch;patch=1 \
-        file://shared-ldflags.patch;patch=1 \
+        file://Makefile.patch \
+        file://Makefile.SH.patch \
+        file://makedepend-dash.patch \
+        file://installperl.patch \
+        file://perl-dynloader.patch \
+        file://perl-moreconfig.patch \
+        file://letgcc-find-errno.patch \
+        file://generate-sh.patch \
+        file://perl-5.8.8-gcc-4.2.patch \
+        file://09_fix_installperl.patch \
+        file://52_debian_extutils_hacks.patch \
+        file://53_debian_mod_paths.patch \
+        file://54_debian_perldoc-r.patch \
+        file://58_debian_cpan_config_path.patch \
+        file://60_debian_libnet_config_path.patch \
+        file://62_debian_cpan_definstalldirs.patch \
+        file://64_debian_enc2xs_inc.patch \
+        file://asm-pageh-fix.patch \
+        file://shared-ldflags.patch \
         file://config.sh \
         file://config.sh-32 \
         file://config.sh-32-le \
@@ -54,7 +54,7 @@ export LDDLFLAGS = "${LDFLAGS} -shared"
 
 do_configure() {
         # Make hostperl in build directory be the native perl
-        cp -f ${HOSTPERL} hostperl
+        ln -sf ${HOSTPERL} hostperl
 
         # Do out work in the cross subdir
         cd Cross
@@ -70,6 +70,7 @@ do_configure() {
         # Fixups for uclibc
         if [ "${TARGET_OS}" = "linux-uclibc" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then
                 sed -i -e "s,\(d_crypt_r=\)'define',\1'undef',g" \
+                       -e "s,\(d_futimes=\)'define',\1'undef',g" \
                        -e "s,\(crypt_r_proto=\)'\w+',\1'0',g" \
                        -e "s,\(d_getnetbyname_r=\)'define',\1'undef',g" \
                        -e "s,\(getnetbyname_r_proto=\)'\w+',\1'0',g" \
diff --git a/recipes/petitepainture/petitepainture_1.5.bb b/recipes/petitepainture/petitepainture_1.5.bb
index 893e281410..6e84968c40 100644
--- a/recipes/petitepainture/petitepainture_1.5.bb
+++ b/recipes/petitepainture/petitepainture_1.5.bb
@@ -8,7 +8,7 @@ APPNAME = "petitpeintu"
 APPDESKTOP = "${WORKDIR}"
 
 SRC_URI = "http://sun.dhis.portside.net/~sakira/archive/SPainter_1.5_src.tar.gz \
-           file://dialogs.patch;patch=1 \
+           file://dialogs.patch \
            file://petitpeintu.desktop \
            file://petitpeintu.png "
 S = "${WORKDIR}/SPainter"
diff --git a/recipes/phalanx/phalanx_22.bb b/recipes/phalanx/phalanx_22.bb
index d368b0736a..4a25363752 100644
--- a/recipes/phalanx/phalanx_22.bb
+++ b/recipes/phalanx/phalanx_22.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 PR = "r4"
 LICENSE = "GPL"
 SRC_URI = "http://ftp.debian.org/debian/pool/main/p/phalanx/phalanx_22.orig.tar.gz \
-           file://gcc3.patch;patch=1 \
+           file://gcc3.patch \
            file://capabilities \
            file://description"
 S = "${WORKDIR}/phalanx-22.orig"
diff --git a/recipes/phoneme/phoneme-advanced-foundation_0.0.b160.bb b/recipes/phoneme/phoneme-advanced-foundation_0.0.b160.bb
index 7bb03b3287..34adeae570 100644
--- a/recipes/phoneme/phoneme-advanced-foundation_0.0.b160.bb
+++ b/recipes/phoneme/phoneme-advanced-foundation_0.0.b160.bb
@@ -5,7 +5,7 @@ require phoneme-advanced.inc
 BUILDREV = "b160"
 SRCREV = "20424"
 
-SRC_URI += "file://${BUILDREV}-makefile-fix.patch;patch=1;pnum=0"
+SRC_URI += "file://${BUILDREV}-makefile-fix.patch;striplevel=0"
 
 FILES_${PN} += "\
 	${COMMON_DIR}/bin/cvm \ 
diff --git a/recipes/phoneme/phoneme-advanced-foundation_0.0.b87.bb b/recipes/phoneme/phoneme-advanced-foundation_0.0.b87.bb
index 7348e87ca3..b77eb82f0d 100644
--- a/recipes/phoneme/phoneme-advanced-foundation_0.0.b87.bb
+++ b/recipes/phoneme/phoneme-advanced-foundation_0.0.b87.bb
@@ -5,7 +5,7 @@ require phoneme-advanced.inc
 BUILDREV = "b87"
 SRCREV = "13783"
 
-SRC_URI += "file://${BUILDREV}-makefile-fix.patch;patch=1;pnum=0"
+SRC_URI += "file://${BUILDREV}-makefile-fix.patch;striplevel=0"
 
 FILES_${PN} += "\
 	${COMMON_DIR}/bin/cvm \ 
diff --git a/recipes/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb b/recipes/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb
index 675d7b7b9a..ca00e30144 100644
--- a/recipes/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb
+++ b/recipes/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb
@@ -5,7 +5,7 @@ require phoneme-advanced.inc
 BUILDREV = "b87"
 SRCREV = "13783"
 
-SRC_URI += "file://${BUILDREV}-makefile-fix.patch;patch=1;pnum=0"
+SRC_URI += "file://${BUILDREV}-makefile-fix.patch;striplevel=0"
 
 FILES_${PN} += "\
 	${COMMON_DIR}/bin/cvm \ 
diff --git a/recipes/php/php-native_5.3.2.bb b/recipes/php/php-native_5.3.2.bb
index 9920088648..d5ed932ad8 100644
--- a/recipes/php/php-native_5.3.2.bb
+++ b/recipes/php/php-native_5.3.2.bb
@@ -2,7 +2,7 @@ require php-native.inc
 
 PR = "r1"
 
-SRC_URI += "file://CVE-2010-0397.patch;patch=1"
+SRC_URI += "file://CVE-2010-0397.patch"
 
 SRC_URI[src.md5sum] = "46f500816125202c48a458d0133254a4"
 SRC_URI[src.sha256sum] = "9a380a574adcb3a9abe3226e7c3a9bae619e8a1b90842ec2a7edf0ad92afdeda"
diff --git a/recipes/php/php.inc b/recipes/php/php.inc
index cbec13d72d..bfee93c5cd 100644
--- a/recipes/php/php.inc
+++ b/recipes/php/php.inc
@@ -4,8 +4,8 @@ SECTION = "console/network"
 LICENSE = "PHP"
 
 SRC_URI =     "http://us2.php.net/distributions/php-${PV}.tar.bz2;name=src \
-               file://acinclude-xml2-config.patch;patch=1 \
-               file://php-m4-divert.patch;patch=1"
+               file://acinclude-xml2-config.patch \
+               file://php-m4-divert.patch"
 
 S = "${WORKDIR}/php-${PV}"
 
diff --git a/recipes/php/php_5.2.13.bb b/recipes/php/php_5.2.13.bb
index dad6bcd44e..2a31299308 100644
--- a/recipes/php/php_5.2.13.bb
+++ b/recipes/php/php_5.2.13.bb
@@ -5,9 +5,9 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \
 
 PR = "r6"
 
-SRC_URI += "file://pear-makefile.patch;patch=1 \
-            file://imap-fix-autofoo.patch;patch=1 \
-            file://CVE-2010-0397.patch;patch=1 \
+SRC_URI += "file://pear-makefile.patch \
+            file://imap-fix-autofoo.patch \
+            file://CVE-2010-0397.patch \
             "
 SRC_URI[src.md5sum] = "eb4d0766dc4fb9667f05a68b6041e7d1"
 SRC_URI[src.sha256sum] = "2b50a2535e3bb9a98cd4d1633f9452d877276c40b385915261f040d535c7eadb"
diff --git a/recipes/php/php_5.2.6.bb b/recipes/php/php_5.2.6.bb
index 515eb29ea2..3b011ab1ac 100644
--- a/recipes/php/php_5.2.6.bb
+++ b/recipes/php/php_5.2.6.bb
@@ -4,8 +4,8 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql"
 
 PR = "r7"
 
-SRC_URI += "file://pear-makefile.patch;patch=1 \
-	file://string.c.patch;patch=1 "
+SRC_URI += "file://pear-makefile.patch \
+	file://string.c.patch "
 
 export THREADS="pthread"
 export LIBS=" -lpthread "
diff --git a/recipes/piccontrol/piccontrol_0.4.bb b/recipes/piccontrol/piccontrol_0.4.bb
index 2c9f03cb43..dfb828bb96 100644
--- a/recipes/piccontrol/piccontrol_0.4.bb
+++ b/recipes/piccontrol/piccontrol_0.4.bb
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 #COMPATIBLE_MACHINE = "tsx09"
 
 SRC_URI = "http://byronbradley.co.uk/piccontrol/qcontrol-0.4.tar.gz \
-           file://luafix-0.4.patch;patch=0 \
-           file://configlocation.patch;patch=1 \
+           file://luafix-0.4.patch \
+           file://configlocation.patch \
            file://piccontrol-0.4.conf \
            file://init"
 S = "${WORKDIR}/qcontrol-${PV}"
diff --git a/recipes/picocom/picocom_1.4.bb b/recipes/picocom/picocom_1.4.bb
index 1fa86c98a6..7e2e4ed43e 100644
--- a/recipes/picocom/picocom_1.4.bb
+++ b/recipes/picocom/picocom_1.4.bb
@@ -5,8 +5,8 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "http://efault.net/npat/hacks/picocom/dist/picocom-${PV}.tar.gz \
-           file://nolock.patch;patch=1 \
-           file://gcc4.patch;patch=1"
+           file://nolock.patch \
+           file://gcc4.patch"
 
 CFLAGS_append = ' -DVERSION_STR=\\"${PV}\\"'
 
diff --git a/recipes/pidgin/msn-pecan_git.bb b/recipes/pidgin/msn-pecan_git.bb
index 259a608b86..4db737768b 100644
--- a/recipes/pidgin/msn-pecan_git.bb
+++ b/recipes/pidgin/msn-pecan_git.bb
@@ -5,7 +5,7 @@ LICENSE="GPL-2"
 RDEPENDS="pidgin"
 DEPENDS="pidgin"
 SRCREV = "e795b33b29d792f19fcf699275eb966dc68be257"
-PV="0.0.1+gitr${SRCPV}"
+PV="0.0.1+gitr${SRCREV}"
 PR="r0"
 
 inherit pkgconfig
diff --git a/recipes/pidgin/pidgin_2.5.8.bb b/recipes/pidgin/pidgin_2.5.8.bb
index 1fb4c9d4c0..7f22cd62bd 100644
--- a/recipes/pidgin/pidgin_2.5.8.bb
+++ b/recipes/pidgin/pidgin_2.5.8.bb
@@ -3,10 +3,10 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
-  file://sanitize-configure.ac.patch;patch=1 \
-  file://pidgin.desktop-set-icon.patch;patch=1 \
-  file://purple-OE-branding-25.patch;patch=1 \
-  file://pidgin-cross-python.patch;patch=1 \
+  file://sanitize-configure.ac.patch \
+  file://pidgin.desktop-set-icon.patch \
+  file://purple-OE-branding-25.patch \
+  file://pidgin-cross-python.patch \
 "
 
 EXTRA_OECONF += "\
diff --git a/recipes/pidgin/pidgin_2.6.5.bb b/recipes/pidgin/pidgin_2.6.5.bb
index ae4b6f85bf..0fe0e5133d 100644
--- a/recipes/pidgin/pidgin_2.6.5.bb
+++ b/recipes/pidgin/pidgin_2.6.5.bb
@@ -5,10 +5,10 @@ DEPENDS += "farsight2 libidn"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
-  file://sanitize-configure.ac.patch;patch=1 \
-  file://pidgin.desktop-set-icon.patch;patch=1 \
-  file://purple-OE-branding-25.patch;patch=1 \
-  file://pidgin-cross-python-265.patch;patch=1 \
+  file://sanitize-configure.ac.patch \
+  file://pidgin.desktop-set-icon.patch \
+  file://purple-OE-branding-25.patch \
+  file://pidgin-cross-python-265.patch \
 "
 
 EXTRA_OECONF += "\
diff --git a/recipes/pidgin/pidgin_2.6.6.bb b/recipes/pidgin/pidgin_2.6.6.bb
index fdf2bdd5ac..102dfe06ee 100644
--- a/recipes/pidgin/pidgin_2.6.6.bb
+++ b/recipes/pidgin/pidgin_2.6.6.bb
@@ -5,10 +5,10 @@ DEPENDS += "farsight2 libidn"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2;name=pidgin \
-  file://sanitize-configure.ac.patch;patch=1 \
-  file://pidgin.desktop-set-icon.patch;patch=1 \
-  file://purple-OE-branding-25.patch;patch=1 \
-  file://pidgin-cross-python-265.patch;patch=1 \
+  file://sanitize-configure.ac.patch \
+  file://pidgin.desktop-set-icon.patch \
+  file://purple-OE-branding-25.patch \
+  file://pidgin-cross-python-265.patch \
 "
 
 SRC_URI[pidgin.md5sum] = "b37ab6c52db8355e8c70c044c2ba17c1"
diff --git a/recipes/pimlico/contacts_0.8.bb b/recipes/pimlico/contacts_0.8.bb
index 666c58753f..1dfed1f5ee 100644
--- a/recipes/pimlico/contacts_0.8.bb
+++ b/recipes/pimlico/contacts_0.8.bb
@@ -5,8 +5,8 @@ PR = "r1"
 SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
 	   file://stock_contact.png \
 	   file://stock_person.png  \
-	   file://contacts-owl-window-menu.patch;patch=1 \
-	   file://contacts-util-fixup.diff;patch=1 \
+	   file://contacts-owl-window-menu.patch \
+	   file://contacts-util-fixup.diff \
 	  "
 
 SRC_URI[md5sum] = "dbcff54980ec6d6203c290dc409b5598"
diff --git a/recipes/pimlico/contacts_svn.bb b/recipes/pimlico/contacts_svn.bb
index 09c8887f8e..daf1014ab8 100644
--- a/recipes/pimlico/contacts_svn.bb
+++ b/recipes/pimlico/contacts_svn.bb
@@ -11,7 +11,7 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
 	   file://stock_contact.png \
 	   file://stock_person.png \
-	   file://contacts-owl-window-menu.patch;patch=1 \
+	   file://contacts-owl-window-menu.patch \
 	  "
 
 S = "${WORKDIR}/trunk"
diff --git a/recipes/pimlico/dates_0.4.5.bb b/recipes/pimlico/dates_0.4.5.bb
index 2d0bfea05f..29bf77d774 100644
--- a/recipes/pimlico/dates_0.4.5.bb
+++ b/recipes/pimlico/dates_0.4.5.bb
@@ -3,7 +3,7 @@ require dates.inc
 PR ="r2"
 
 SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz \
-	   file://dates-owl-window-menu.patch;patch=1 \
+	   file://dates-owl-window-menu.patch \
 	  "
 
 SRC_URI[md5sum] = "13f2bb562a13610c005a4e6204112661"
diff --git a/recipes/pimlico/dates_svn.bb b/recipes/pimlico/dates_svn.bb
index e7ea9c8338..71ebe4d73a 100644
--- a/recipes/pimlico/dates_svn.bb
+++ b/recipes/pimlico/dates_svn.bb
@@ -6,5 +6,5 @@ PV = "0.4.5+svnr${SRCPV}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
-	   file://dates-owl-window-menu.patch;patch=1 \
+	   file://dates-owl-window-menu.patch \
 	  "
diff --git a/recipes/pimlico/tasks_0.13.bb b/recipes/pimlico/tasks_0.13.bb
index ec177908c6..5dd8a393b0 100644
--- a/recipes/pimlico/tasks_0.13.bb
+++ b/recipes/pimlico/tasks_0.13.bb
@@ -1,7 +1,7 @@
 require tasks.inc
 
 SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
-        file://tasks-owl.diff;patch=1;pnum=0 file://libtool.diff;patch=1;pnum=0"
+        file://tasks-owl.diff;striplevel=0 file://libtool.diff;striplevel=0"
 
 SRC_URI[md5sum] = "536ffbbd0f38489c8e3ea9eaf0f67d59"
 SRC_URI[sha256sum] = "3a1029eb587a0587cf3ebcb8c256062ca595b4f5d0a30188fa4aae3adb49ca5a"
diff --git a/recipes/pimlico/tasks_svn.bb b/recipes/pimlico/tasks_svn.bb
index 552980dd68..7f528fc4b5 100644
--- a/recipes/pimlico/tasks_svn.bb
+++ b/recipes/pimlico/tasks_svn.bb
@@ -6,4 +6,4 @@ PV = "0.13+svnr${SRCPV}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
-        file://tasks-owl.diff;patch=1"
+        file://tasks-owl.diff"
diff --git a/recipes/pingus/pingus_0.7.2.bb b/recipes/pingus/pingus_0.7.2.bb
index ede5c125b8..94bc84fd5b 100644
--- a/recipes/pingus/pingus_0.7.2.bb
+++ b/recipes/pingus/pingus_0.7.2.bb
@@ -11,9 +11,9 @@ inherit scons
 
 SRC_URI = "\
   http://pingus.seul.org/files/pingus-0.7.2.tar.bz2 \
-  file://sconstruct.diff;patch=1 \
-  file://boost.patch;patch=1 \
-  file://cheader.patch;patch=1 \
+  file://sconstruct.diff \
+  file://boost.patch \
+  file://cheader.patch \
   file://pingus.desktop \
   file://pingus.png \
   file://pingus-gta012.sh \
diff --git a/recipes/pipepanic/pipepanic_0.1.1.bb b/recipes/pipepanic/pipepanic_0.1.1.bb
index 7c579578ed..cdadcf00e3 100644
--- a/recipes/pipepanic/pipepanic_0.1.1.bb
+++ b/recipes/pipepanic/pipepanic_0.1.1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-${PV}-source.tar.gz \
-           file://fix-datadir.patch;patch=1"
+           file://fix-datadir.patch"
 S = "${WORKDIR}/pipepanic-0.1.1-source"
 
 APPIMAGE = "zaurus/pipepanic.png"
diff --git a/recipes/pjproject/pjproject-1.0_1.0.3.bb b/recipes/pjproject/pjproject-1.0_1.0.3.bb
new file mode 100644
index 0000000000..e6ea9e9795
--- /dev/null
+++ b/recipes/pjproject/pjproject-1.0_1.0.3.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Open source SIP stack and media stack for presence, im/instant \
+               messaging, and multimedia communication"
+SECTION = "libs"
+HOMEPAGE = "http://www.pjsip.org/"
+LICENSE = "GPLv3"
+
+DEPENDS = "alsa-lib openssl"
+
+PARALLEL_MAKE = ""
+
+SRC_URI = "http://www.pjsip.org/release/${PV}/pjproject-${PV}.tar.bz2 "
+SRC_URI[md5sum] = "1680ed5ffa00ab38449efc2affda53c5"
+SRC_URI[sha256sum] = "de39b121f10bae22cf3e53b0b8d7f62f19b8ca994d29f175a72644f1bd9a60f9"
+
+S = "${WORKDIR}/pjproject-${PV}"
+
+inherit autotools pkgconfig
+
+do_configure_prepend () {
+        sed -i -e 's#ac_default_prefix=/usr/local#ac_default_prefix=/usr#' aconfigure
+        sed -i -e 's#^prefix = /usr/local#prefix = /usr#' Makefile
+}
+
+do_compile_prepend() {
+        oe_runmake dep
+}
+
+do_stage() {
+        :
+}
\ No newline at end of file
diff --git a/recipes/pjproject/pjproject_1.5.5.bb b/recipes/pjproject/pjproject_1.5.5.bb
new file mode 100644
index 0000000000..2c32daa5a7
--- /dev/null
+++ b/recipes/pjproject/pjproject_1.5.5.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Open source SIP stack and media stack for presence, im/instant \
+               messaging, and multimedia communication"
+SECTION = "libs"
+HOMEPAGE = "http://www.pjsip.org/"
+LICENSE = "GPLv3"
+
+DEPENDS = "alsa-lib openssl"
+
+PARALLEL_MAKE = ""
+
+SRC_URI = "http://www.pjsip.org/release/${PV}/pjproject-${PV}.tar.bz2 "
+SRC_URI[md5sum] = "bcafe54494e0ba44942d352b442ba773"
+SRC_URI[sha256sum] = "a769d4e3812ae9ea2342fa8d918841e60797d1a8605fd9f46a6496ce2e61998c"
+
+S = "${WORKDIR}/pjproject-${PV}"
+
+inherit autotools pkgconfig
+
+do_configure_prepend () {
+        sed -i -e 's#ac_default_prefix=/usr/local#ac_default_prefix=/usr#' aconfigure
+        sed -i -e 's#^prefix = /usr/local#prefix = /usr#' Makefile
+}
+
+do_compile_prepend() {
+        oe_runmake dep
+}
diff --git a/recipes/pkgconfig/pkgconfig.inc b/recipes/pkgconfig/pkgconfig.inc
index 4f618f8df4..acbda40848 100644
--- a/recipes/pkgconfig/pkgconfig.inc
+++ b/recipes/pkgconfig/pkgconfig.inc
@@ -8,8 +8,8 @@ LICENSE = "GPL"
 INC_PR = "r8"
 
 SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
-           file://autofoo.patch;patch=1 \
-           file://sysrootfix.patch;patch=1 \
+           file://autofoo.patch \
+           file://sysrootfix.patch \
            file://glibconfig-sysdefs.h"
 
 S = "${WORKDIR}/pkg-config-${PV}/"
diff --git a/recipes/plinciv/plinciv_0.16.bb b/recipes/plinciv/plinciv_0.16.bb
index 246c34bda1..a7a1031681 100644
--- a/recipes/plinciv/plinciv_0.16.bb
+++ b/recipes/plinciv/plinciv_0.16.bb
@@ -5,8 +5,8 @@ DESCRIPTION = "Embedded version of a popular FreeCiv game"
 HOMEPAGE = "http://www.handhelds.org/moin/moin.cgi/PlinCiv"
 
 SRC_URI = "ftp://ftp.freeciv.org/freeciv/stable/freeciv-1.14.1.tar.bz2 \
-	file://FC1.14.1-PC0.16.diff.gz;patch=1 \
-	file://configure.patch;patch=1"
+	file://FC1.14.1-PC0.16.diff.gz \
+	file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/pmount/pmount_0.9.17.bb b/recipes/pmount/pmount_0.9.17.bb
index 9c403dfb89..5348575249 100644
--- a/recipes/pmount/pmount_0.9.17.bb
+++ b/recipes/pmount/pmount_0.9.17.bb
@@ -8,8 +8,8 @@ RDEPENDS_${PN}-hal = "${PN}"
 RRECOMMENDS_${PN}-hal = "hal"
 
 SRC_URI = "http://alioth.debian.org/frs/download.php/2247/${P}.tar.gz \
-	   file://gettext.patch;patch=1 \
-	   file://install.patch;patch=1 \
+	   file://gettext.patch \
+	   file://install.patch \
 	  "
 
 inherit autotools gettext
diff --git a/recipes/pmount/pmount_0.9.18.bb b/recipes/pmount/pmount_0.9.18.bb
index b4c8375cc2..9d1ca57c48 100644
--- a/recipes/pmount/pmount_0.9.18.bb
+++ b/recipes/pmount/pmount_0.9.18.bb
@@ -8,8 +8,8 @@ RDEPENDS_${PN}-hal = "${PN}"
 RRECOMMENDS_${PN}-hal = "hal"
 
 SRC_URI = "http://alioth.debian.org/frs/download.php/2624/${P}.tar.gz \
-	   file://gettext.patch;patch=1 \
-	   file://install.patch;patch=1 \
+	   file://gettext.patch \
+	   file://install.patch \
 	  "
 
 inherit autotools gettext
diff --git a/recipes/pmount/pmount_0.9.19.bb b/recipes/pmount/pmount_0.9.19.bb
index 3b548e677b..f6088da6b0 100644
--- a/recipes/pmount/pmount_0.9.19.bb
+++ b/recipes/pmount/pmount_0.9.19.bb
@@ -8,12 +8,16 @@ RDEPENDS_${PN}-hal = "${PN}"
 RRECOMMENDS_${PN}-hal = "hal"
 
 SRC_URI = "https://alioth.debian.org/frs/download.php/2867/pmount-0.9.19.tar.gz \
-	   file://gettext.patch;patch=1 \
-	   file://install.patch;patch=1 \
+	   file://gettext.patch \
+	   file://install.patch \
 	  "
 
 inherit autotools gettext
 
+do_configure_prepend() {
+	autopoint --force || true
+}
+
 EXTRA_OECONF = "--enable-hal"
 
 PACKAGES =+ "${PN}-hal"
diff --git a/recipes/pmount/pmount_0.9.4.bb b/recipes/pmount/pmount_0.9.4.bb
index 7b06479d76..8dccc3f7f7 100644
--- a/recipes/pmount/pmount_0.9.4.bb
+++ b/recipes/pmount/pmount_0.9.4.bb
@@ -3,8 +3,8 @@ DEPENDS="sysfsutils"
 PR ="r1"
 
 SRC_URI="http://www.piware.de/projects/pmount-0.9.4.tar.gz \
-	 file://mmc-fix.patch;patch=1 \
-	 file://no-hal.patch;patch=1"
+	 file://mmc-fix.patch \
+	 file://no-hal.patch"
 
 do_install() {
 	install -m 4755 -D ${S}/pmount ${D}/${bindir}/pmount
diff --git a/recipes/poboxserver/poboxserver_1.2.5.bb b/recipes/poboxserver/poboxserver_1.2.5.bb
index 0486c4433e..ab732e4544 100644
--- a/recipes/poboxserver/poboxserver_1.2.5.bb
+++ b/recipes/poboxserver/poboxserver_1.2.5.bb
@@ -6,9 +6,9 @@ PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2;name=archive \
            http://www.vanille.de/mirror/pbserver-${PV}.tar.gz;name=pbserver \
-           file://OpenPOBox-1.25.diff;patch=1 \
-           file://remove-local-includes.patch;patch=1 \
-           file://unicode.patch;patch=1 \
+           file://OpenPOBox-1.25.diff \
+           file://remove-local-includes.patch \
+           file://unicode.patch \
            file://pbserver.sh"
 
 S = "${WORKDIR}/OpenPOBox"
diff --git a/recipes/poboxserver/qpobox_0.5.4.bb b/recipes/poboxserver/qpobox_0.5.4.bb
index 9bde191151..f107e4d8d4 100644
--- a/recipes/poboxserver/qpobox_0.5.4.bb
+++ b/recipes/poboxserver/qpobox_0.5.4.bb
@@ -6,8 +6,8 @@ HOMEPAGE = "http://takahr.dhis.portside.net/cgi-bin/rwiki.cgi?cmd=view;name=QPOB
 PR = "r2"
 
 SRC_URI = "http://www.vanille.de/mirror/qpobox-${PV}.tar.gz \
-           file://qpobox-0.5.4-opie.patch;patch=1 \
-           file://qpobox.patch;patch=1"
+           file://qpobox-0.5.4-opie.patch \
+           file://qpobox.patch"
 S = "${WORKDIR}/qpobox"
 
 inherit opie
diff --git a/recipes/pocketcellar/pocketcellar_1.1.bb b/recipes/pocketcellar/pocketcellar_1.1.bb
index 05e540a7ec..8c0ebec2ed 100644
--- a/recipes/pocketcellar/pocketcellar_1.1.bb
+++ b/recipes/pocketcellar/pocketcellar_1.1.bb
@@ -7,10 +7,10 @@ LICENSE = "GPL"
 PR = "r3"
 
 SRC_URI = "http://www.staikos.net/~staikos/pocketcellar/pocketcellar-${PV}.tar.gz \
-           file://winedb.patch;patch=1 \
-           file://cellardb.patch;patch=1 \
-           file://pocketcellar.patch;patch=1 \
-           file://gcc3.patch;patch=1"
+           file://winedb.patch \
+           file://cellardb.patch \
+           file://pocketcellar.patch \
+           file://gcc3.patch"
 
 inherit palmtop
 
diff --git a/recipes/podget/podget_0.5.8.bb b/recipes/podget/podget_0.5.8.bb
index b1cac05ec9..f5b0508e29 100644
--- a/recipes/podget/podget_0.5.8.bb
+++ b/recipes/podget/podget_0.5.8.bb
@@ -7,7 +7,7 @@ RDEPENDS = "bash sed wget"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/podget/podget_${PV}.tar.gz \
-           file://busybox_df.patch;patch=1"
+           file://busybox_df.patch"
 
 S = "${WORKDIR}/podget"
 
diff --git a/recipes/pointercal/pointercal_0.0.bb b/recipes/pointercal/pointercal_0.0.bb
index d98a78f66e..96ef765c56 100644
--- a/recipes/pointercal/pointercal_0.0.bb
+++ b/recipes/pointercal/pointercal_0.0.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Touchscreen calibration data"
+LICENSE = "MIT"
 SECTION = "base"
-PR = "r20"
+PR = "r21"
 
 SRC_URI = "file://pointercal"
 S = "${WORKDIR}"
diff --git a/recipes/poppler/poppler_0.5.9.bb b/recipes/poppler/poppler_0.5.9.bb
index 510e3e5209..aefbbfb73d 100644
--- a/recipes/poppler/poppler_0.5.9.bb
+++ b/recipes/poppler/poppler_0.5.9.bb
@@ -2,7 +2,7 @@ require poppler.inc
 
 PR = "r1"
 
-SRC_URI += "file://fix-splash.patch;patch=1"
+SRC_URI += "file://fix-splash.patch"
 EXTRA_OECONF_append = " --disable-abiword-output "
 
 
diff --git a/recipes/popt/popt_1.7.bb b/recipes/popt/popt_1.7.bb
index bc95e25090..aab80943a4 100644
--- a/recipes/popt/popt_1.7.bb
+++ b/recipes/popt/popt_1.7.bb
@@ -8,9 +8,9 @@ inherit autotools autotools_stage
 
 SRC_URI = "\
   http://rpm.org/releases/historical/rpm-4.1.x/popt-${PV}.tar.gz \
-  file://m4.patch;patch=1 \
-  file://intl.patch;patch=1 \
-  file://mkinstalldirs.patch;patch=1 \
+  file://m4.patch \
+  file://intl.patch \
+  file://mkinstalldirs.patch \
 "
 
 do_configure() {
diff --git a/recipes/poptop/poptop_1.3.4.bb b/recipes/poptop/poptop_1.3.4.bb
index 714edd5009..e833e18ea5 100644
--- a/recipes/poptop/poptop_1.3.4.bb
+++ b/recipes/poptop/poptop_1.3.4.bb
@@ -11,7 +11,7 @@ RDEPENDS_${PN}-logwtmp-plugin = "${PN}"
 PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/poptop/pptpd-${PV}.tar.gz \
-           file://fix-plugins-install.patch;patch=1 \
+           file://fix-plugins-install.patch \
            file://pptpd.init"
 
 S = "${WORKDIR}/pptpd-${PV}"
diff --git a/recipes/portabase/metakit_2.4.9.3.bb b/recipes/portabase/metakit_2.4.9.3.bb
index 31a571d6b7..f193871324 100644
--- a/recipes/portabase/metakit_2.4.9.3.bb
+++ b/recipes/portabase/metakit_2.4.9.3.bb
@@ -7,7 +7,7 @@ LICENSE = "MetaKit"
 HOMEPAGE = "http://www.equi4.com/metakit.html"
 
 SRC_URI = "http://www.equi4.com/pub/mk/metakit-${PV}.tar.gz \
-	   file://metakit-2.4.9.3.patch;patch=1"
+	   file://metakit-2.4.9.3.patch"
 PR = "r3"
 
 FILES_${PN} += " ${libdir}/*.so"
diff --git a/recipes/portabase/portabase_1.9.bb b/recipes/portabase/portabase_1.9.bb
index cbdecf47eb..6c0843267f 100644
--- a/recipes/portabase/portabase_1.9.bb
+++ b/recipes/portabase/portabase_1.9.bb
@@ -8,10 +8,10 @@ APPNAME = "portabase"
 PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/portabase/portabase_${PV}.tar.gz \
-	   file://qtopia.patch;patch=1 		\
-	   file://fileselector.patch;patch=1    \
-           file://qtversion.patch;patch=1 \
-           file://qt2310-fontbug.patch;patch=1"
+	   file://qtopia.patch 		\
+	   file://fileselector.patch    \
+           file://qtversion.patch \
+           file://qt2310-fontbug.patch"
 
 S = "${WORKDIR}/portabase"
 
diff --git a/recipes/portmap/portmap.inc b/recipes/portmap/portmap.inc
index 86b9c4d8a1..5f2c47c197 100644
--- a/recipes/portmap/portmap.inc
+++ b/recipes/portmap/portmap.inc
@@ -4,10 +4,10 @@ LICENSE = "GPL"
 DEPENDS = "fakeroot-native"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz;name=archive \
-	${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1;name=patch \
-	file://no-libwrap.patch;patch=1;pnum=0 \
+	${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;name=patch \
+	file://no-libwrap.patch;striplevel=0 \
 	file://portmap.init \
-	file://make.patch;patch=1"
+	file://make.patch"
 S = "${WORKDIR}/portmap_5beta"
 
 INITSCRIPT_NAME = "portmap"
diff --git a/recipes/portmap/portmap_6.0.bb b/recipes/portmap/portmap_6.0.bb
index a7f2cd9535..85cf7059e9 100644
--- a/recipes/portmap/portmap_6.0.bb
+++ b/recipes/portmap/portmap_6.0.bb
@@ -3,9 +3,9 @@ require portmap.inc
 PR = "r5"
 
 SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
-           file://destdir-no-strip.patch;patch=1 \
-	   file://no-tcpd-support.patch;patch=1 \
-           file://no-libwrap.patch;patch=1;pnum=0 \
+           file://destdir-no-strip.patch \
+	   file://no-tcpd-support.patch \
+           file://no-libwrap.patch;striplevel=0 \
            file://portmap.init "
 
 S = "${WORKDIR}/${PN}_${PV}/"
diff --git a/recipes/postfix/postfix.inc b/recipes/postfix/postfix.inc
index 51d5e8f037..153e651d49 100644
--- a/recipes/postfix/postfix.inc
+++ b/recipes/postfix/postfix.inc
@@ -6,8 +6,8 @@ LICENSE = "IPL"
 INC_PR = "r13"
 
 SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz;name=postfix-${PV} \
-	   file://makedefs.patch;patch=1 \
-	   file://install.patch;patch=1 \
+	   file://makedefs.patch \
+	   file://install.patch \
 	   file://main.cf_2.0 \
 	   file://volatiles \
 	   file://postfix \
diff --git a/recipes/postgresql/postgresql_8.2.4.bb b/recipes/postgresql/postgresql_8.2.4.bb
index 4b12ccf3cc..b1a90e7d98 100644
--- a/recipes/postgresql/postgresql_8.2.4.bb
+++ b/recipes/postgresql/postgresql_8.2.4.bb
@@ -3,7 +3,7 @@ require postgresql.inc
 PR = "r4"
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI += "file://no-ecpg-test.patch;patch=1"
+SRC_URI += "file://no-ecpg-test.patch"
 
 SRC_URI[md5sum] = "af7ec100a33c41bfb8d87b5e0ec2f44a"
 SRC_URI[sha256sum] = "8ff6afab743e894c0d96e668dcf9b3d3c1044719d6def45ef7390c64b54ed268"
diff --git a/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb b/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb
index 9587625d7f..f5eb8d198b 100644
--- a/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb
+++ b/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb
@@ -8,9 +8,9 @@ PR = "r2"
 
 #We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack.
 SRC_URI = "http://www.povray.org/redirect/www.povray.org/beta/source/povray-src-3.7.0.beta.25b.tar.bz2 \
-           file://configure-cross-hack.patch;patch=1 \
-	   file://gcc43.diff;patch=1 \
-           file://boost.patch;patch=1 \
+           file://configure-cross-hack.patch \
+	   file://gcc43.diff \
+           file://boost.patch \
 	   "
 
 S = "${WORKDIR}/povray-3.7.0.beta.25b"
diff --git a/recipes/povray/povray_3.6.1.bb b/recipes/povray/povray_3.6.1.bb
index 914aaa0777..33a6e1775c 100644
--- a/recipes/povray/povray_3.6.1.bb
+++ b/recipes/povray/povray_3.6.1.bb
@@ -10,7 +10,7 @@ PR = "r2"
 
 #We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack.
 SRC_URI = "http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/${P}.tar.bz2 \
-	   file://configure-cross-hack.patch;patch=1"
+	   file://configure-cross-hack.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/powermanga/powermanga_0.79.bb b/recipes/powermanga/powermanga_0.79.bb
index e4baf13a00..579ed90c0d 100644
--- a/recipes/powermanga/powermanga_0.79.bb
+++ b/recipes/powermanga/powermanga_0.79.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 SRC_URI = "http://linux.tlk.fr/games/Powermanga/download/powermanga-0.79.tgz \
 	   file://linuxroutines.cpp \
-	   file://pda-tweaks.patch;patch=1 \
+	   file://pda-tweaks.patch \
 	   file://powermanga.pro \
 	   file://powermanga.png \
 	   file://powermanga.desktop"
diff --git a/recipes/powernowd/powernowd_0.96.bb b/recipes/powernowd/powernowd_0.96.bb
index 5964a87858..a852a343e8 100644
--- a/recipes/powernowd/powernowd_0.96.bb
+++ b/recipes/powernowd/powernowd_0.96.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 
 
 SRC_URI = "http://www.deater.net/john/${P}.tar.gz \
-		   file://fix-makefile.patch;patch=1"
+		   file://fix-makefile.patch"
 
 do_install() {
 	install -d ${D}${sbindir}
diff --git a/recipes/powertop/powertop.inc b/recipes/powertop/powertop.inc
index 931abadc44..a113b93bee 100644
--- a/recipes/powertop/powertop.inc
+++ b/recipes/powertop/powertop.inc
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libintl ncurses"
 INC_PR = "r1"
 
 SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \
-	   file://ldflags.patch;patch=1 \
+	   file://ldflags.patch \
 	  "
 
 CFLAGS = "${LDFLAGS}"
diff --git a/recipes/powertop/powertop_1.11.bb b/recipes/powertop/powertop_1.11.bb
index 4791397c85..e383cc1392 100644
--- a/recipes/powertop/powertop_1.11.bb
+++ b/recipes/powertop/powertop_1.11.bb
@@ -2,7 +2,7 @@ require powertop.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI_append_armv7a = " file://omap.patch;patch=1;pnum=0"
+SRC_URI_append_armv7a = " file://omap.patch;striplevel=0"
 
 CFLAGS_append_armv7a = " -DOMAP3"
 
diff --git a/recipes/powertop/powertop_svn.bb b/recipes/powertop/powertop_svn.bb
index 793035baa1..a29767b4bc 100644
--- a/recipes/powertop/powertop_svn.bb
+++ b/recipes/powertop/powertop_svn.bb
@@ -5,7 +5,7 @@ PV = "1.12+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 
 SRC_URI = "svn://powertop.googlecode.com/svn;module=trunk;proto=http"
-SRC_URI_append_omap3 = " file://omap-svn.patch;patch=1"
+SRC_URI_append_omap3 = " file://omap-svn.patch"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/powervr-drivers/bc-cube_0.1.0.bb b/recipes/powervr-drivers/bc-cube_0.1.0.bb
index 1ea5dcc67b..6323a79a5f 100644
--- a/recipes/powervr-drivers/bc-cube_0.1.0.bb
+++ b/recipes/powervr-drivers/bc-cube_0.1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "TI-BSD/GPLv2"
 DEPENDS = "virtual/egl"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/apps_processors/OMAP35x_AM35x_Video_Texture_Streaming/1_0/exports/bc-cat-${PV}.tar.gz \
-           file://bc-cat-0.1.0-BC_PIX_FMT_.patch;patch=1;pnum=0"
+           file://bc-cat-0.1.0-BC_PIX_FMT_.patch;striplevel=0"
 
 S = "${WORKDIR}/bc-cat-${PV}"
 
diff --git a/recipes/powervr-drivers/bc-cube_0.2.0.bb b/recipes/powervr-drivers/bc-cube_0.2.0.bb
index 01b6f94588..66e78de0b9 100644
--- a/recipes/powervr-drivers/bc-cube_0.2.0.bb
+++ b/recipes/powervr-drivers/bc-cube_0.2.0.bb
@@ -3,7 +3,7 @@ LICENSE = "TI-BSD/GPLv2"
 DEPENDS = "virtual/egl"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/apps_processors/OMAP35x_AM35x_Video_Texture_Streaming/1_0/exports/bc-cat-${PV}.tar.gz;name=bccat \
-           file://bc-cat-0.2.0.patch;patch=1 \
+           file://bc-cat-0.2.0.patch \
            file://bc-cube.desktop \
 "
 
diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc
index 3a6d243154..dd832ad0fd 100644
--- a/recipes/powervr-drivers/libgles-omap3.inc
+++ b/recipes/powervr-drivers/libgles-omap3.inc
@@ -1,7 +1,9 @@
 DESCRIPTION = "libGLES for the omap3"
-LICENCE = "proprietary-binary"
+LICENSE = "proprietary-binary"
 
-COMPATIBLE_MACHINE = "(am3517-evm|beagleboard|cm-t35|igep0020|omap3-pandora|omap3-touchbook|omap3evm|omapzoom|omapzoom2|overo|palmpre)"
+PR = "r4"
+
+COMPATIBLE_MACHINE = "(dm3730-am3715-evm|am3517-evm|beagleboard|cm-t35|igep0020|omap3-pandora|omap3-touchbook|omap3evm|omapzoom|omapzoom2|overo|palmpre)"
 
 DEPENDS = "virtual/libx11 libxau libxdmcp"
 
@@ -12,15 +14,17 @@ PROVIDES += "virtual/egl"
 #
 # 1. if you don't already have a ti account get one here. it's free:
 #  http://www.ti.com/hdr_my_ti
-# 2. fetch the gl-es bin from here:
-#  https://www-a.ti.com/downloads/sds_support/targetcontent/dvsdk/oslinux_dvsdk/v3_00_3530/OMAP35x_Graphics_SDK_setuplinux_3_00_00_06.bin
-# (replace version in .bin file as appropriate)
-# 3. put the OMAP35x_*.bin file in libgles-omap3/
-#  mv OMAP35x_Graphics_SDK_setuplinux_3_00_00_06.bin ./libgles-omap3/
+# 2. fetch the gl-es bin (full OMAP Graphics SDK) from here:
+#  http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html
+# 3. put the OMAP35x_*.bin file in $DL_DIR, i.e. downloads/
+#  mv OMAP35x_Graphics_SDK_setuplinux_3_01_00_06.bin ./downloads/
+# 4. make the checksum file in ./downloads/ directory:
+#  cd ./downloads/
+#  md5sum OMAP35x_Graphics_SDK_setuplinux_3_01_00_06.bin > OMAP35x_Graphics_SDK_setuplinux_3_01_00_06.bin.md5
 # 
 # voila!
 
-SRC_URI = "file://OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \
+SRC_URI = "http://install.source.dir.local/OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \
 		   file://cputype \
 		   file://rc.pvr \
 		   file://sample.desktop \
@@ -57,6 +61,7 @@ do_configure() {
 	# Due to recursive make PLAT_* isn't always passed down correctly, so use sed to fix those
 	for mak in $(find ${S} -name "*.mak") ; do
 		sed -i -e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g $mak
+		sed -i -e 's:-lX11 -lXau:-lX11 -lXau -lXdmcp:g' $mak
 	done
 
 	# clear out old stuff
@@ -68,7 +73,8 @@ TARGET_CC_ARCH += " ${TARGET_LINK_HASH_STYLE} -Wl,-rpath-link,${BINLOCATION} -L$
 PARALLEL_MAKE = ""
 
 do_compile() {
-	export X11ROOT="${STAGING_INCDIR}"
+	export X11ROOT="${STAGING_DIR_HOST}/usr"
+	export TOOLCHAIN="${TOOLCHAIN_PATH}"
 	export PLATFORM="LinuxOMAP3"
 
 	export PLAT_CC="${CC}"
@@ -157,7 +163,7 @@ do_install () {
 
 	install -d ${D}${sysconfdir}
 	echo "[default]" > ${D}${sysconfdir}/powervr.ini
-	echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so" >> ${D}${sysconfdir}/powervr.ini
+	echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so.1" >> ${D}${sysconfdir}/powervr.ini
 
 	# The ES2.x, ES3.x and ES5.x CPUs have different SGX hardware, so we need to install 2 sets of userspace
 
@@ -213,6 +219,16 @@ PACKAGES =+ "${PN}-rawdemos \
 PACKAGES += "xserver-kdrive-powervrsgx \
              ${PN}-tests "
 
+PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl ${PN}-linuxfbwsegl ${PN}-x11wsegl"
+
+FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.* ${libdir}/*/libpvrPVR2D_BLITWSEGL.so.*"
+FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.* ${libdir}/*/libpvrPVR2D_FLIPWSEGL.so.*"
+FILES_${PN}-frontwsegl = "${libdir}/libpvrPVR2D_FRONTWSEGL.so.* ${libdir}/*/libpvrPVR2D_FRONTWSEGL.so.*"
+FILES_${PN}-linuxfbwsegl = "${libdir}/libpvrPVR2D_LINUXFBWSEGL.so.* ${libdir}/*/libpvrPVR2D_LINUXFBWSEGL.so.*"
+FILES_${PN}-x11wsegl = "${libdir}/libpvrPVR2D_X11WSEGL.so* ${libdir}/*/libpvrPVR2D_X11WSEGL.so*"
+
+CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
+
 FILES_${PN} = "${sysconfdir} ${libdir}/lib*.so.* ${libdir}/ES*/* ${bindir}/pvrsrvinit ${bindir}/cputype ${bindir}/*/*"
 FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
 FILES_${PN}-tests = "${bindir}/*"
@@ -236,6 +252,11 @@ RDEPENDS_${PN} += "fbset devmem2"
 
 #HACK! These are binaries, so we can't guarantee that LDFLAGS match :(
 INSANE_SKIP_${PN} = True
+INSANE_SKIP_${PN}-blitwsegl = True
+INSANE_SKIP_${PN}-flipwsegl = True
+INSANE_SKIP_${PN}-frontwsegl = True
+INSANE_SKIP_${PN}-linuxfbwsegl = True
+INSANE_SKIP_${PN}-x11wsegl = True
 INSANE_SKIP_${PN}-tests = True
 INSANE_SKIP_xserver-kdrive-powervrsgx = True
 
diff --git a/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb b/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb
index 129db3f6e2..3b68c18852 100644
--- a/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb
+++ b/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb
@@ -5,14 +5,9 @@ require libgles-omap3.inc
 PR = "r7"
 
 # download required binary distribution from:
-# http://software-dl.ti.com/dsps/forms/export.html?prod_no=/OMAP35x_Graphics_SDK_setuplinux_3_01_00_02.bin
+# http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html
+# see libgles-omap3.inc for detailed installation instructions
 
 SGXPV = "3_01_00_02"
 IMGPV = "1.4.14.2514"
 BINFILE := "OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin"
-
-
-
-
-
-
diff --git a/recipes/powervr-drivers/libgles-omap3_3.01.00.06.bb b/recipes/powervr-drivers/libgles-omap3_3.01.00.06.bb
index 8ed6d7f169..bb7994f70e 100644
--- a/recipes/powervr-drivers/libgles-omap3_3.01.00.06.bb
+++ b/recipes/powervr-drivers/libgles-omap3_3.01.00.06.bb
@@ -1,22 +1,18 @@
-
 BINLOCATION = "${S}/gfx_rel_es3.x"
 
 ES2LOCATION = "${S}/gfx_rel_es2.x"
 ES3LOCATION = "${S}/gfx_rel_es3.x"
 ES5LOCATION = "${S}/gfx_rel_es5.x"
 
-
 require libgles-omap3.inc
 
 # download required binary distribution from:
-# http://software-dl.ti.com/dsps/forms/export.html?prod_no=/OMAP35x_Graphics_SDK_setuplinux_3_01_00_06.bin
+# http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html
+# see libgles-omap3.inc for detailed installation instructions
 
 SGXPV = "3_01_00_06"
 IMGPV = "1.4.14.2616"
 BINFILE := "OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin"
 
-
-
-
-
-
+SRC_URI[md5sum] = "7aa37ca72f34011d353e72cc67f8aac1"
+SRC_URI[sha256sum] = "02276bc728699c36b0d2411c60f23030aa066ca6b8ed5adb7a40204563a227fb"
diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2514.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2514.bb
index efb453137f..6f6e073cde 100644
--- a/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2514.bb
+++ b/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2514.bb
@@ -4,7 +4,8 @@ LICENSE = "GPLv2"
 PR_append = "a"
 
 # download required binary distribution from:
-# http://software-dl.ti.com/dsps/forms/export.html?prod_no=/OMAP35x_Graphics_SDK_setuplinux_3_01_00_02.bin
+# http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html
+# see libgles-omap3.inc for detailed installation instructions
 
 TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
 require ../ti/ti-eula-unpack.inc
@@ -13,8 +14,8 @@ SGXPV = "3_01_00_02"
 IMGPV = "1.4.14.2514"
 BINFILE := "OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin"
 
-SRC_URI = "file://OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \
-           file://0001-Compile-fixes-for-recent-kernels.patch;patch=1 \
+SRC_URI = "http://install.source.dir.local/OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \
+           file://0001-Compile-fixes-for-recent-kernels.patch \
 "
 S = "${WORKDIR}/OMAP35x_Graphics_SDK_${SGXPV}/GFX_Linux_KM"
 
@@ -22,7 +23,7 @@ inherit module
 
 PVRBUILD = "release"
 
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 MAKE_TARGETS = " BUILD=${PVRBUILD}"
 
diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb
index 4863ff116e..202c8e6ef8 100644
--- a/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb
+++ b/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb
@@ -4,7 +4,8 @@ LICENSE = "GPLv2"
 PR_append = "b"
 
 # download required binary distribution from:
-# http://software-dl.ti.com/dsps/forms/export.html?prod_no=/OMAP35x_Graphics_SDK_setuplinux_3_01_00_05.bin
+# http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html
+# see libgles-omap3.inc for detailed installation instructions
 
 TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
 require ../ti/ti-eula-unpack.inc
@@ -13,7 +14,7 @@ SGXPV = "3_01_00_06"
 IMGPV = "1.4.14.2616"
 BINFILE := "OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin"
 
-SRC_URI = "file://OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \
+SRC_URI = "http://install.source.dir.local/OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \
 "
 S = "${WORKDIR}/OMAP35x_Graphics_SDK_${SGXPV}/GFX_Linux_KM"
 
@@ -21,7 +22,7 @@ inherit module
 
 PVRBUILD = "release"
 
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=omap3630"
 
@@ -32,3 +33,6 @@ do_install() {
 	   ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
 	   ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
 }
+
+SRC_URI[md5sum] = "7aa37ca72f34011d353e72cc67f8aac1"
+SRC_URI[sha256sum] = "02276bc728699c36b0d2411c60f23030aa066ca6b8ed5adb7a40204563a227fb"
diff --git a/recipes/ppp/ppp_2.4.1.bb b/recipes/ppp/ppp_2.4.1.bb
index 3fe1514554..6816328cdf 100644
--- a/recipes/ppp/ppp_2.4.1.bb
+++ b/recipes/ppp/ppp_2.4.1.bb
@@ -5,10 +5,10 @@ LICENSE = "BSD GPLv2"
 PR = "r7"
 
 SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
-	file://pppd.patch;patch=1 \
-	file://man.patch;patch=1 \
-	file://cifdefroute.dif;patch=1 \
-	file://pppd-resolv-varrun.patch;patch=1 \
+	file://pppd.patch \
+	file://man.patch \
+	file://cifdefroute.dif;apply=yes \
+	file://pppd-resolv-varrun.patch \
 	file://pon \
 	file://poff \
 	file://init \
@@ -17,7 +17,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
 	file://08setupdns \
 	file://92removedns"
 
-SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
+SRC_URI_append_nylon = " file://ppp-tdbread.patch"
 
 inherit autotools
 
diff --git a/recipes/ppp/ppp_2.4.3.bb b/recipes/ppp/ppp_2.4.3.bb
index 27d206105e..20ab3f8ac1 100644
--- a/recipes/ppp/ppp_2.4.3.bb
+++ b/recipes/ppp/ppp_2.4.3.bb
@@ -6,15 +6,15 @@ LICENSE = "BSD GPLv2"
 PR = "r9"
 
 SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
-        file://ppp-2.4.3-mppe-mppc-1.1.patch;patch=1 \
-	file://makefile.patch;patch=1 \
-	file://cifdefroute.patch;patch=1 \
-	file://pppd-resolv-varrun.patch;patch=1 \
-	file://plugins-fix-CC.patch;patch=1 \
-	file://pppoatm-makefile.patch;patch=1 \
-	file://enable-ipv6.patch;patch=1 \
-	file://makefile-remove-hard-usr-reference.patch;patch=1 \
-	file://ldflags.patch;patch=1 \
+        file://ppp-2.4.3-mppe-mppc-1.1.patch \
+	file://makefile.patch \
+	file://cifdefroute.patch \
+	file://pppd-resolv-varrun.patch \
+	file://plugins-fix-CC.patch \
+	file://pppoatm-makefile.patch \
+	file://enable-ipv6.patch \
+	file://makefile-remove-hard-usr-reference.patch \
+	file://ldflags.patch \
 	file://pon \
 	file://poff \
 	file://init \
@@ -23,7 +23,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
 	file://08setupdns \
 	file://92removedns"
 
-SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
+SRC_URI_append_nylon = " file://ppp-tdbread.patch"
 
 inherit autotools
 
diff --git a/recipes/ppp/ppp_2.4.4.bb b/recipes/ppp/ppp_2.4.4.bb
index 6bf294bebc..73bbe9c7e2 100644
--- a/recipes/ppp/ppp_2.4.4.bb
+++ b/recipes/ppp/ppp_2.4.4.bb
@@ -8,15 +8,15 @@ PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
-        file://ppp-2.4.4-mppe-mppc.1.1.patch;patch=1 \
-	file://makefile.patch;patch=1 \
-	file://cifdefroute.patch;patch=1 \
-	file://pppd-resolv-varrun.patch;patch=1 \
-	file://plugins-fix-CC.patch;patch=1 \
-	file://pppoatm-makefile.patch;patch=1 \
-	file://enable-ipv6.patch;patch=1 \
-	file://makefile-remove-hard-usr-reference.patch;patch=1 \
-	file://ldflags.patch;patch=1 \
+        file://ppp-2.4.4-mppe-mppc.1.1.patch \
+	file://makefile.patch \
+	file://cifdefroute.patch \
+	file://pppd-resolv-varrun.patch \
+	file://plugins-fix-CC.patch \
+	file://pppoatm-makefile.patch \
+	file://enable-ipv6.patch \
+	file://makefile-remove-hard-usr-reference.patch \
+	file://ldflags.patch \
 	file://pon \
 	file://poff \
 	file://init \
@@ -25,7 +25,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
 	file://08setupdns \
 	file://92removedns"
 
-SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
+SRC_URI_append_nylon = " file://ppp-tdbread.patch"
 
 inherit autotools
 
diff --git a/recipes/pptp-linux/pptp-linux_1.5.0.bb b/recipes/pptp-linux/pptp-linux_1.5.0.bb
index 5907f2262d..b2931c2c94 100644
--- a/recipes/pptp-linux/pptp-linux_1.5.0.bb
+++ b/recipes/pptp-linux/pptp-linux_1.5.0.bb
@@ -11,7 +11,7 @@ DEPENDS     = "ppp "
 inherit base
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pptpclient/pptp-linux-1.5.0.tar.gz \
-	   file://makefile.patch;patch=1 \
+	   file://makefile.patch \
 	   file://options.pptp"
 
 
diff --git a/recipes/preboot/linux-preboot-palmpre_2.6.24.bb b/recipes/preboot/linux-preboot-palmpre_2.6.24.bb
index 7799272bee..1b2f40b8e5 100644
--- a/recipes/preboot/linux-preboot-palmpre_2.6.24.bb
+++ b/recipes/preboot/linux-preboot-palmpre_2.6.24.bb
@@ -8,7 +8,7 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=
            "
 
 SRC_URI_append_palmpre = "\
-http://palm.cdnetworks.net/opensource/1.3.1/linuxkernel-2.6.24-patch.gz;patch=1;name=patch \
+http://palm.cdnetworks.net/opensource/1.3.1/linuxkernel-2.6.24-patch.gz;apply=yes;name=patch \
 "
 S = "${WORKDIR}/linux-2.6.24"
 
diff --git a/recipes/prelink/prelink_20061027.bb b/recipes/prelink/prelink_20061027.bb
index 1c7f930de8..ad2faf561c 100644
--- a/recipes/prelink/prelink_20061027.bb
+++ b/recipes/prelink/prelink_20061027.bb
@@ -13,7 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \
 
 TARGET_OS_ORIG := "${TARGET_OS}"
 OVERRIDES_append = ":${TARGET_OS_ORIG}"
-SRC_URI_append_linux-gnueabi = " file://arm_eabi.patch;patch=1"
+SRC_URI_append_linux-gnueabi = " file://arm_eabi.patch"
 
 S = "${WORKDIR}/prelink-0.0.${PV}"
 
diff --git a/recipes/prelink/prelink_20071009.bb b/recipes/prelink/prelink_20071009.bb
index c3d3e80d23..faf930cd01 100644
--- a/recipes/prelink/prelink_20071009.bb
+++ b/recipes/prelink/prelink_20071009.bb
@@ -13,7 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \
 
 TARGET_OS_ORIG := "${TARGET_OS}"
 OVERRIDES_append = ":${TARGET_OS_ORIG}"
-SRC_URI_append_linux-gnueabi = " file://arm_eabi.patch;patch=1"
+SRC_URI_append_linux-gnueabi = " file://arm_eabi.patch"
 
 S = "${WORKDIR}/prelink-0.0.${PV}"
 
diff --git a/recipes/prelink/prelink_20090925.bb b/recipes/prelink/prelink_20090925.bb
index 0f0d670d1f..4c83402aa3 100644
--- a/recipes/prelink/prelink_20090925.bb
+++ b/recipes/prelink/prelink_20090925.bb
@@ -4,6 +4,7 @@ DESCRIPTION = " The prelink package contains a utility which modifies ELF shared
 and executables, so that far fewer relocations need to be resolved at \
 runtime and thus programs come up faster."
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \
            file://prelink.conf \
@@ -12,7 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \
 
 #TARGET_OS_ORIG := "${TARGET_OS}"
 #OVERRIDES_append = ":${TARGET_OS_ORIG}"
-#SRC_URI_append_linux-gnueabi = " file://arm_eabi.patch;patch=1"
+#SRC_URI_append_linux-gnueabi = " file://arm_eabi.patch"
 
 S = "${WORKDIR}/prelink-0.0.${PV}"
 
@@ -20,6 +21,10 @@ EXTRA_OECONF = "--disable-64bit"
 
 inherit autotools 
 
+do_compile_prepend () {
+	sed -i -e 's:prelink_LDFLAGS = -all-static:#prelink_LDFLAGS = -all-static:g' src/Makefile
+}
+
 do_install_append () {
 	install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default
 	install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf
diff --git a/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
index 2fafa27866..dd36ce7c5a 100644
--- a/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
+++ b/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
@@ -12,10 +12,10 @@ RRECOMMENDS = "gpsd"
 # wireless.patch is required for linux-libc-headers == 2.6.23
 # but breaks build with linux-libc-headers >= 2.6.30.
 SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz \
-           file://gpsapi.patch;patch=1 \
-      ${@['', 'file://wireless.patch;patch=1'][bb.data.getVar('PREFERRED_VERSION_linux-libc-headers', d, 1) and bb.data.getVar('PREFERRED_VERSION_linux-libc-headers', d, 1).split('.')[2] < '30']} \
-           file://fix-includes.patch;patch=1;pnum=0 \
-           file://libgps-check.patch;patch=1"
+           file://gpsapi.patch \
+      ${@['', 'file://wireless.patch'][bb.data.getVar('PREFERRED_VERSION_linux-libc-headers', d, 1) and bb.data.getVar('PREFERRED_VERSION_linux-libc-headers', d, 1).split('.')[2] < '30']} \
+           file://fix-includes.patch;striplevel=0 \
+           file://libgps-check.patch"
 
 S = "${WORKDIR}/${PN}-0.7.4pre1"
 
diff --git a/recipes/prismstumbler/prismstumbler_0.7.3.bb b/recipes/prismstumbler/prismstumbler_0.7.3.bb
index efb642b87c..531efcca08 100644
--- a/recipes/prismstumbler/prismstumbler_0.7.3.bb
+++ b/recipes/prismstumbler/prismstumbler_0.7.3.bb
@@ -8,10 +8,10 @@ DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib libxpm"
 RDEPENDS = "wireless-tools"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/prismstumbler/${PN}-${PV}.tar.bz2 \
-	file://bogoconf.patch;patch=1 \
-	file://crosscompile.patch;patch=1 \
-        file://libz.patch;patch=1;pnum=0 \
-	file://wireless.patch;patch=1"
+	file://bogoconf.patch \
+	file://crosscompile.patch \
+        file://libz.patch;striplevel=0 \
+	file://wireless.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/procps/procps.inc b/recipes/procps/procps.inc
index 1db030d752..863debf599 100644
--- a/recipes/procps/procps.inc
+++ b/recipes/procps/procps.inc
@@ -13,7 +13,7 @@ INC_PR = "r9"
 SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz;name=tarball \
 	   file://sysctl.conf \
 	   file://procps.init \
-           file://install.patch;patch=1"
+           file://install.patch"
 
 inherit autotools update-rc.d
 
diff --git a/recipes/procps/procps_3.2.8.bb b/recipes/procps/procps_3.2.8.bb
index f98b8493ca..a2653b1647 100644
--- a/recipes/procps/procps_3.2.8.bb
+++ b/recipes/procps/procps_3.2.8.bb
@@ -2,10 +2,10 @@ require procps.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://procmodule.patch;patch=1 \
-            file://psmodule.patch;patch=1 \
-	    file://linux-limits.patch;patch=1 \
-	    file://60_linux_version_init.dpatch;patch=1 \
+SRC_URI += "file://procmodule.patch \
+            file://psmodule.patch \
+	    file://linux-limits.patch \
+	    file://60_linux_version_init.dpatch;apply=yes \
 	    "
 
 SRC_URI[tarball.md5sum] = "9532714b6846013ca9898984ba4cd7e0"
diff --git a/recipes/proftpd/proftpd_1.3.2e.bb b/recipes/proftpd/proftpd_1.3.2e.bb
index b6cec1b707..204a23f0ac 100644
--- a/recipes/proftpd/proftpd_1.3.2e.bb
+++ b/recipes/proftpd/proftpd_1.3.2e.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz;name=src \
-	file://make.patch;patch=1 \
+	file://make.patch \
 	"
 SRC_URI[src.md5sum] = "4ecb82cb1050c0e897d5343f6d2cc1ed"
 SRC_URI[src.sha256sum] = "7c7f295944e8e7c85060829deeaed74f3f0b36c8f1d3936277d59bbea5d60093"
diff --git a/recipes/progear/progear-battery_0.3.bb b/recipes/progear/progear-battery_0.3.bb
index 8ed0e86384..afe6596a4a 100644
--- a/recipes/progear/progear-battery_0.3.bb
+++ b/recipes/progear/progear-battery_0.3.bb
@@ -2,7 +2,7 @@ require progear.inc
 
 DESCRIPTION += "Battery support"
 
-SRC_URI += "file://kernel-update.patch;patch=1"
+SRC_URI += "file://kernel-update.patch"
 
 SRC_URI[md5sum] = "a3bb00cc8e6f5b9f9ef91f9eca1fe2b6"
 SRC_URI[sha256sum] = "68a862f63e77b7acb08095b969e372ae1bfd53836f0635f44b1722efae4f29d7"
diff --git a/recipes/progear/progear.inc b/recipes/progear/progear.inc
index 2dbfcdafbe..8a87565714 100644
--- a/recipes/progear/progear.inc
+++ b/recipes/progear/progear.inc
@@ -7,7 +7,7 @@ AUTHOR = "Mike Schacht <mschacht at alumni dot washington dot edu>"
 COMPATIBLE_MACHINE = "progear"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/progear/${PN}-${PV}.tar.gz \
-           file://paths.patch;patch=1"
+           file://paths.patch"
 
 inherit module
 
diff --git a/recipes/proxy-libintl/proxy-libintl_20080418.bb b/recipes/proxy-libintl/proxy-libintl_20080418.bb
index d8949e4741..0802365310 100644
--- a/recipes/proxy-libintl/proxy-libintl_20080418.bb
+++ b/recipes/proxy-libintl/proxy-libintl_20080418.bb
@@ -8,9 +8,9 @@ PROVIDES = "virtual/libintl"
 
 SRC_URI = " \
     http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${PN}-${PV}.zip \
-    file://stub-only.patch;patch=1 \
-    file://create-as-shared-lib.patch;patch=1 \
-    file://soname.patch;patch=1 \
+    file://stub-only.patch \
+    file://create-as-shared-lib.patch \
+    file://soname.patch \
 "
 
 S = "${WORKDIR}"
@@ -21,6 +21,7 @@ CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('
 TARGET_CC_ARCH += "${LDFLAGS}"
 CFLAGS_append_mips = " -fPIC"
 CFLAGS_append_mipsel = " -fPIC"
+CFLAGS_append_x86_64 = " -fPIC"
 
 do_compile() {
     cd ${WORKDIR}/src/proxy-libintl
diff --git a/recipes/psmisc/psmisc.inc b/recipes/psmisc/psmisc.inc
index c67705e67b..a8b7bb12e7 100644
--- a/recipes/psmisc/psmisc.inc
+++ b/recipes/psmisc/psmisc.inc
@@ -5,7 +5,7 @@ PRIORITY = "required"
 DEPENDS = "ncurses virtual/libintl"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
-	   file://libintl-link.patch;patch=1"
+	   file://libintl-link.patch"
 S = "${WORKDIR}/psmisc-${PV}"
 
 inherit autotools gettext
diff --git a/recipes/psmisc/psmisc_20.2.bb b/recipes/psmisc/psmisc_20.2.bb
index 4b3444d87c..9c72ed85e4 100644
--- a/recipes/psmisc/psmisc_20.2.bb
+++ b/recipes/psmisc/psmisc_20.2.bb
@@ -6,7 +6,7 @@ DEPENDS = "ncurses"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
-	   file://gettext.patch;patch=1"
+	   file://gettext.patch"
 S = "${WORKDIR}/psmisc-${PV}"
 
 inherit autotools gettext
diff --git a/recipes/psmisc/psmisc_21.8.bb b/recipes/psmisc/psmisc_21.8.bb
index 028afc7fa8..981f8726f2 100644
--- a/recipes/psmisc/psmisc_21.8.bb
+++ b/recipes/psmisc/psmisc_21.8.bb
@@ -1,6 +1,6 @@
 require psmisc.inc
 PR = "r2"
-SRC_URI += "file://signames-header-fix.patch;patch=1"
+SRC_URI += "file://signames-header-fix.patch"
 
 SRC_URI[md5sum] = "d6276e071c10ddf4b0d98856e5573e1a"
 SRC_URI[sha256sum] = "495463860415171d9019798ed4fdf5848ffe93f8a380662a39dd2690a04717ed"
diff --git a/recipes/psplash/files/angstrom/psplash-hand-img.h b/recipes/psplash/files/angstrom/psplash-poky-img.h
index 263befa564..3782872a8f 100644
--- a/recipes/psplash/files/angstrom/psplash-hand-img.h
+++ b/recipes/psplash/files/angstrom/psplash-poky-img.h
@@ -1,10 +1,10 @@
 /* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (920)
-#define HAND_IMG_WIDTH (230)
-#define HAND_IMG_HEIGHT (231)
-#define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+#define POKY_IMG_ROWSTRIDE (920)
+#define POKY_IMG_WIDTH (230)
+#define POKY_IMG_HEIGHT (231)
+#define POKY_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
+#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \
   "\307\354\354\341\377\2\342\345\333\377\344\346\334\377\377\354\354\341" \
   "\377\221\354\354\341\377\3\242\256\246\377t\210\201\377\222\241\231\377" \
   "\315\354\354\341\377\4\325\333\322\377\264\304\275\377\245\271\263\377" \
diff --git a/recipes/psplash/files/boc01/psplash-hand-img.h b/recipes/psplash/files/boc01/psplash-poky-img.h
index 8c23e483d6..7cb17fab04 100644
--- a/recipes/psplash/files/boc01/psplash-hand-img.h
+++ b/recipes/psplash/files/boc01/psplash-poky-img.h
@@ -1,10 +1,10 @@
 /* GdkPixbuf RGB C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (384)
-#define HAND_IMG_WIDTH (128)
-#define HAND_IMG_HEIGHT (64)
-#define HAND_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+#define POKY_IMG_ROWSTRIDE (384)
+#define POKY_IMG_WIDTH (128)
+#define POKY_IMG_HEIGHT (64)
+#define POKY_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
+#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \
   "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\267\377" \
   "\377\377\6\267\267\267~~~\227\227\227\265\265\265\331\331\331\371\371" \
   "\371\372\377\377\377\11\334\334\334\234\234\234tttUUUTTTZZZ\201\201\201" \
diff --git a/recipes/psplash/files/configurability.patch b/recipes/psplash/files/configurability.patch
index c9688655c9..90a9c34719 100644
--- a/recipes/psplash/files/configurability.patch
+++ b/recipes/psplash/files/configurability.patch
@@ -232,15 +232,15 @@ Index: psplash/psplash.c
  
    /* Draw the OH logo  */
 -  psplash_fb_draw_image (fb, 
--			 (fb->width  - HAND_IMG_WIDTH)/2, 
--			 ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2, 
+-			 (fb->width  - POKY_IMG_WIDTH)/2, 
+-			 ((fb->height * 5) / 6 - POKY_IMG_HEIGHT)/2, 
 +  psplash_fb_draw_image (fb,
-+                         (fb->width  - HAND_IMG_WIDTH)/2,
-+                         (fb->height - HAND_IMG_HEIGHT)/2,
- 			 HAND_IMG_WIDTH,
- 			 HAND_IMG_HEIGHT,
- 			 HAND_IMG_BYTES_PER_PIXEL,
- 			 HAND_IMG_RLE_PIXEL_DATA);
++                         (fb->width  - POKY_IMG_WIDTH)/2,
++                         (fb->height - POKY_IMG_HEIGHT)/2,
+ 			 POKY_IMG_WIDTH,
+ 			 POKY_IMG_HEIGHT,
+ 			 POKY_IMG_BYTES_PER_PIXEL,
+ 			 POKY_IMG_RLE_PIXEL_DATA);
  
    /* Draw progress bar border */
 -  psplash_fb_draw_image (fb, 
diff --git a/recipes/psplash/files/kaeilos/psplash-hand-img.h b/recipes/psplash/files/kaeilos/psplash-poky-img.h
index d262d6cc17..73b13758a5 100644
--- a/recipes/psplash/files/kaeilos/psplash-hand-img.h
+++ b/recipes/psplash/files/kaeilos/psplash-poky-img.h
@@ -1,10 +1,10 @@
 /* GdkPixbuf RGB C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (720)
-#define HAND_IMG_WIDTH (240)
-#define HAND_IMG_HEIGHT (136)
-#define HAND_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+#define POKY_IMG_ROWSTRIDE (720)
+#define POKY_IMG_WIDTH (240)
+#define POKY_IMG_HEIGHT (136)
+#define POKY_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
+#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \
   "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \
   "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \
   "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \
diff --git a/recipes/psplash/files/logo-math.patch b/recipes/psplash/files/logo-math.patch
index 21467af0ec..2ebfd7cd4c 100644
--- a/recipes/psplash/files/logo-math.patch
+++ b/recipes/psplash/files/logo-math.patch
@@ -1,15 +1,23 @@
 upstream: http://bugzilla.openedhand.com/show_bug.cgi?id=801
 comment:
 Do better math when showing logo vs progressbar.
+---
+ psplash.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
---- psplash/psplash.c.org	2007-09-22 20:33:36.000000000 +0300
-+++ psplash/psplash.c	2007-12-01 21:27:08.000000000 +0200
-@@ -258,7 +258,7 @@
+diff --git a/psplash.c b/psplash.c
+index 54a65cf..7a52e05 100644
+--- a/psplash.c
++++ b/psplash.c
+@@ -269,7 +269,7 @@ main (int argc, char** argv)
    /* Draw the OH logo  */
    psplash_fb_draw_image (fb, 
- 			 (fb->width  - HAND_IMG_WIDTH)/2, 
--			 (fb->height - HAND_IMG_HEIGHT)/2, 
-+			 ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2, 
- 			 HAND_IMG_WIDTH,
- 			 HAND_IMG_HEIGHT,
- 			 HAND_IMG_BYTES_PER_PIXEL,
+ 			 (fb->width  - POKY_IMG_WIDTH)/2, 
+-			 (fb->height - POKY_IMG_HEIGHT)/2, 
++			 ((fb->height * 5) / 6 - POKY_IMG_HEIGHT)/2, 
+ 			 POKY_IMG_WIDTH,
+ 			 POKY_IMG_HEIGHT,
+ 			 POKY_IMG_BYTES_PER_PIXEL,
+-- 
+1.6.3.3
+
diff --git a/recipes/psplash/files/openmoko/psplash-hand-img.h b/recipes/psplash/files/openmoko/psplash-poky-img.h
index 26f7f41cb5..42cdb6346a 100644
--- a/recipes/psplash/files/openmoko/psplash-hand-img.h
+++ b/recipes/psplash/files/openmoko/psplash-poky-img.h
@@ -1,10 +1,10 @@
 /* GdkPixbuf RGB C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (1440)
-#define HAND_IMG_WIDTH (480)
-#define HAND_IMG_HEIGHT (640)
-#define HAND_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+#define POKY_IMG_ROWSTRIDE (1440)
+#define POKY_IMG_WIDTH (480)
+#define POKY_IMG_HEIGHT (640)
+#define POKY_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
+#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \
   "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" \
   "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" \
   "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" \
diff --git a/recipes/psplash/files/psplash-18bpp.patch b/recipes/psplash/files/psplash-18bpp.patch
index 5e582a44a3..36ab43bf78 100644
--- a/recipes/psplash/files/psplash-18bpp.patch
+++ b/recipes/psplash/files/psplash-18bpp.patch
@@ -1,9 +1,15 @@
 upstream: http://bugzilla.o-hand.com/show_bug.cgi?id=1764
 
-diff -ru psplash/psplash-fb.c /home/muromec/psplash/psplash-fb.c
---- psplash/psplash-fb.c       2007-08-29 21:27:49.000000000 +0300
-+++ /home/muromec/psplash/psplash-fb.c 2009-08-16 11:59:57.000000000 +0300
-@@ -72,6 +72,7 @@
+---
+ psplash-fb.c |    8 +++++++-
+ psplash-fb.h |    1 +
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/psplash-fb.c b/psplash-fb.c
+index 71740cd..860c0c0 100644
+--- a/psplash-fb.c
++++ b/psplash-fb.c
+@@ -160,6 +160,7 @@ psplash_fb_new (int angle)
    fb->real_width  = fb->width  = fb_var.xres;
    fb->real_height = fb->height = fb_var.yres;
    fb->bpp    = fb_var.bits_per_pixel;
@@ -11,34 +17,39 @@ diff -ru psplash/psplash-fb.c /home/muromec/psplash/psplash-fb.c
    fb->stride = fb_fix.line_length;
    fb->type   = fb_fix.type;
    fb->visual = fb_fix.visual;
-@@ -176,7 +177,7 @@
-     }
-
-   /* FIXME: handle no RGB orderings */
--  switch (fb->bpp)
-+  switch (fb->depth)
-     {
-     case 24:
-     case 32:
-@@ -184,6 +185,10 @@
-       *(fb->data + off + 1) = green;
-       *(fb->data + off + 2) = blue;
-       break;
-+    case 18:
-+      *(fb->data + off)     = (red >> 2) | ((green & 0x0C) << 4);
-+      *(fb->data + off + 1) = ((green & 0xF0) >> 4) | ((blue & 0x3C) << 2);
-+      *(fb->data + off + 2) = (blue & 0xC0) >> 6;
-     case 16:
-       *(volatile uint16 *) (fb->data + off)
-       = ((red >> 3) << 11) | ((green >> 2) << 5) | (blue >> 3);
-diff -ru psplash/psplash-fb.h /home/muromec/psplash/psplash-fb.h
---- psplash/psplash-fb.h       2007-08-29 21:27:49.000000000 +0300
-+++ /home/muromec/psplash/psplash-fb.h 2009-08-16 11:58:39.000000000 +0300
-@@ -26,6 +26,7 @@
-   int            visual;
+@@ -308,7 +309,7 @@ psplash_fb_plot_pixel (PSplashFB    *fb,
+         break;
+       }
+   } else if (fb->rgbmode == BGR565 || fb->rgbmode == BGR888) {
+-    switch (fb->bpp)
++    switch (fb->depth)
+       {
+       case 24:
+       case 32:
+@@ -316,6 +317,11 @@ psplash_fb_plot_pixel (PSplashFB    *fb,
+         *(fb->data + off + 1) = green;
+         *(fb->data + off + 2) = blue;
+         break;
++      case 18:
++        *(fb->data + off)     = (red >> 2) | ((green & 0x0C) << 4);
++        *(fb->data + off + 1) = ((green & 0xF0) >> 4) | ((blue & 0x3C) << 2);
++        *(fb->data + off + 2) = (blue & 0xC0) >> 6;
++        break;
+       case 16:
+         *(volatile uint16_t *) (fb->data + off)
+ 	  = ((blue >> 3) << 11) | ((green >> 2) << 5) | (red >> 3);
+diff --git a/psplash-fb.h b/psplash-fb.h
+index ef5b39e..160cdeb 100644
+--- a/psplash-fb.h
++++ b/psplash-fb.h
+@@ -34,6 +34,7 @@ typedef struct PSplashFB
+   int            visual;		
    int            width, height;
    int            bpp;
 +  int            depth;
    int            stride;
-   char                *data;
-   char                *base;
+   char		*data;
+   char		*base;
+-- 
+1.6.3.3
+
diff --git a/recipes/psplash/files/psplash-hand-img.h b/recipes/psplash/files/psplash-hand-img.h
deleted file mode 100644
index c54f04c362..0000000000
--- a/recipes/psplash/files/psplash-hand-img.h
+++ /dev/null
@@ -1,1498 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
-
-#define HAND_IMG_ROWSTRIDE (880)
-#define HAND_IMG_WIDTH (220)
-#define HAND_IMG_HEIGHT (137)
-#define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
-  "\310\354\354\341\377\2\342\342\330\377\352\352\337\377\323\354\354\341" \
-  "\377\2\346\346\333\377\345\345\332\377\377\354\354\341\377\206\354\354" \
-  "\341\377\2\335\335\322\377\350\350\335\377\323\354\354\341\377\2\343" \
-  "\343\331\377\342\342\330\377\377\354\354\341\377\206\354\354\341\377" \
-  "\2\335\335\322\377\350\350\335\377\323\354\354\341\377\2\343\343\331" \
-  "\377\342\342\330\377\377\354\354\341\377\206\354\354\341\377\2\335\335" \
-  "\322\377\350\350\335\377\323\354\354\341\377\2\343\343\331\377\342\342" \
-  "\330\377\377\354\354\341\377\206\354\354\341\377\2\335\335\322\377\350" \
-  "\350\335\377\323\354\354\341\377\2\343\343\331\377\342\342\330\377\377" \
-  "\354\354\341\377\206\354\354\341\377\2\335\335\322\377\350\350\335\377" \
-  "\323\354\354\341\377\2\343\343\331\377\342\342\330\377\375\354\354\341" \
-  "\377\21\346\346\333\377\305\305\273\377\240\240\230\377xyu\377efd\377" \
-  "XYY\377LLM\377FGH\377\77@B\377CDF\377GHI\377QQR\377]^]\377kki\377\210" \
-  "\210\204\377\257\257\247\377\323\323\312\377\303\354\354\341\377\6\337" \
-  "\337\325\377\272\272\261\377\216\216\210\377ab`\377JJJ\377>\77@\377\202" \
-  "<=\77\377\12;<@\37779=\37789=\377\77@B\377YYY\377~~z\377\242\242\232" \
-  "\377\306\306\274\377\342\342\330\377\350\350\335\377\362\354\354\341" \
-  "\377\32\337\337\324\377\231\231\222\377OPP\377\77@D\377@BH\377TVb\377" \
-  "fk~\377}\203\233\377\211\217\253\377\220\227\264\377\230\237\276\377" \
-  "\234\243\302\377\222\230\265\377\231\240\276\377\234\243\302\377\225" \
-  "\234\272\377\215\224\260\377\205\213\246\377sx\217\377_br\377KNV\377" \
-  "=>C\377@AC\377iig\377\271\271\260\377\353\353\340\377\271\354\354\341" \
-  "\377\34\347\347\334\377\260\260\250\377fge\377>\77A\3778:=\377=\77F\377" \
-  "RTa\377fj\177\377\177\205\237\377\216\225\261\377\230\237\275\377\232" \
-  "\241\300\377\233\242\301\377\234\243\302\377\226\235\273\377\225\234" \
-  "\272\377\233\242\301\377\211\220\253\377rw\215\377\\`q\377HKT\3778:=" \
-  "\377BCD\377\216\216\210\377\322\322\307\377\334\334\322\377\344\344\331" \
-  "\377\353\353\340\377\352\354\354\341\377\6\323\323\311\377\206\207\202" \
-  "\377EFG\377CEL\377hm\201\377\224\232\270\377\211\234\243\302\377\2\222" \
-  "\230\265\377\231\240\276\377\211\234\243\302\377\6\204\212\244\377X[" \
-  "i\377<=A\377XXX\377\247\247\237\377\345\345\332\377\263\354\354\341\377" \
-  "\10\322\322\310\377\212\213\206\377FFH\37778=\377SVc\377w}\225\377\224" \
-  "\233\270\377\232\241\277\377\211\234\243\302\377\2\226\235\273\377\225" \
-  "\234\272\377\206\234\243\302\377\11\224\233\270\377dhz\377<=B\377TTT" \
-  "\377\247\247\240\377\330\330\316\377\332\332\320\377\342\342\330\377" \
-  "\352\352\337\377\344\354\354\341\377\6\303\303\272\377stq\377=>A\377" \
-  "HJS\377qv\214\377\230\237\276\377\214\234\243\302\377\2\222\230\265\377" \
-  "\231\240\276\377\214\234\243\302\377\6\214\222\256\377^bs\377;<A\377" \
-  "JJK\377\225\225\217\377\335\335\322\377\255\354\354\341\377\10\352\352" \
-  "\337\377\244\244\235\377BCD\377\77AI\377bgz\377\210\217\252\377\225\234" \
-  "\272\377\232\241\300\377\214\234\243\302\377\2\226\235\273\377\225\234" \
-  "\272\377\211\234\243\302\377\11\213\221\255\377Y\\j\3779:=\377hhf\377" \
-  "\312\312\302\377\332\332\320\377\331\331\317\377\337\337\325\377\351" \
-  "\351\336\377\337\354\354\341\377\5\232\232\224\37789;\377PS^\377z\200" \
-  "\230\377\233\242\301\377\217\234\243\302\377\2\222\230\265\377\231\240" \
-  "\276\377\217\234\243\302\377\5\222\230\265\377ej|\377=\77F\377MNN\377" \
-  "\314\314\303\377\251\354\354\341\377\7\332\332\320\377yyv\377569\377" \
-  "TWe\377\207\215\250\377\227\235\273\377\233\242\301\377\217\234\243\302" \
-  "\377\2\226\235\273\377\225\234\272\377\214\234\243\302\377\10~\203\234" \
-  "\377:<A\377}~z\377\347\347\334\377\344\344\331\377\333\333\321\377\331" \
-  "\331\317\377\346\346\333\377\333\354\354\341\377\4\261\261\251\377<=" \
-  "\77\377]ap\377\230\237\276\377\213\234\243\302\377\20\232\241\277\377" \
-  "\230\237\275\377\226\235\273\377\224\233\270\377\222\231\266\377\220" \
-  "\227\264\377\207\215\250\377ko\205\377w}\226\377\215\223\260\377\221" \
-  "\230\265\377\223\232\267\377\225\233\271\377\227\235\273\377\230\237" \
-  "\276\377\232\241\300\377\213\234\243\302\377\4\206\214\247\377@BI\377" \
-  "`a_\377\331\331\317\377\245\354\354\341\377\6\340\340\326\377mnk\377" \
-  ">>D\377ko\205\377\222\230\265\377\232\241\300\377\213\234\243\302\377" \
-  "\5\232\241\277\377\230\237\275\377\226\235\273\377\224\233\270\377\222" \
-  "\231\266\377\202\220\227\264\377\2\213\221\255\377\212\220\254\377\202" \
-  "\220\227\264\377\5\222\231\266\377\224\233\270\377\226\235\273\377\230" \
-  "\237\275\377\232\241\277\377\207\234\243\302\377\10jn\202\37789;\377" \
-  "\261\261\251\377\354\354\341\377\352\352\337\377\335\335\322\377\332" \
-  "\332\320\377\350\350\335\377\327\354\354\341\377\4\306\306\274\377HI" \
-  "J\377QTa\377\224\232\270\377\211\234\243\302\377\2\227\236\274\377\222" \
-  "\230\265\377\202\220\227\264\377\20\222\231\266\377nt\212\377TXe\377" \
-  "CEL\377@AF\377EFH\377VWX\377rsp\377jki\377KLN\377BDG\377>\77E\377JMV" \
-  "\377\\`o\377\203\211\244\377\222\230\265\377\202\220\227\264\377\2\224" \
-  "\233\270\377\232\241\277\377\211\234\243\302\377\4|\201\232\377:;@\377" \
-  "vvs\377\343\343\331\377\241\354\354\341\377\6\351\351\336\377\211\212" \
-  "\205\37789=\377os\211\377\220\227\264\377\231\240\276\377\211\234\243" \
-  "\302\377\2\230\237\276\377\223\232\267\377\202\220\227\264\377\5\222" \
-  "\231\266\377\224\233\270\377\226\235\273\377\230\237\275\377\232\241" \
-  "\277\377\202\234\243\302\377\2\226\235\273\377\225\234\272\377\202\234" \
-  "\243\302\377\5\232\241\277\377\230\237\275\377\226\235\273\377\224\233" \
-  "\270\377\222\231\266\377\202\220\227\264\377\2\223\232\267\377\230\237" \
-  "\276\377\204\234\243\302\377\11\225\233\271\377OQ\\\377RRR\377\325\325" \
-  "\313\377\354\354\341\377\351\351\336\377\333\333\321\377\334\334\322" \
-  "\377\352\352\337\377\323\354\354\341\377\4\324\324\312\377YYY\377GJS" \
-  "\377\215\223\257\377\207\234\243\302\377\14\233\242\301\377\226\235\273" \
-  "\377\221\230\265\377\220\227\264\377\225\233\271\377\232\241\300\377" \
-  "\231\240\276\377fk}\377:;\77\377}~z\377\277\277\266\377\341\341\327\377" \
-  "\203\354\354\341\377\2\335\335\322\377\350\350\335\377\203\354\354\341" \
-  "\377\13\324\324\312\377\256\256\246\377TUU\377EGO\377\200\206\237\377" \
-  "\234\243\302\377\230\237\275\377\222\231\266\377\220\227\264\377\223" \
-  "\232\267\377\230\237\276\377\210\234\243\302\377\4pu\213\37789<\377\216" \
-  "\216\211\377\352\352\337\377\236\354\354\341\377\5\264\264\255\37789" \
-  ";\377afw\377\216\225\261\377\230\237\276\377\210\234\243\302\377\5\227" \
-  "\236\274\377\222\230\265\377\220\227\264\377\224\232\270\377\231\240" \
-  "\276\377\211\234\243\302\377\20\224\233\271\377\207\215\250\377~\204" \
-  "\235\377ot\213\377cfy\377W[h\377RU`\377X[i\377^br\377dh{\377ko\205\377" \
-  "qv\214\377\202\207\242\377\220\227\264\377\222\230\265\377\227\236\274" \
-  "\377\203\234\243\302\377\3\203\211\243\37767;\377\273\273\262\377\202" \
-  "\354\354\341\377\4\347\347\334\377\331\331\317\377\337\337\324\377\353" \
-  "\353\340\377\317\354\354\341\377\4\342\342\330\377nnl\377@BH\377\203" \
-  "\211\243\377\207\234\243\302\377\13\225\234\272\377\220\227\264\377\221" \
-  "\230\265\377\226\235\273\377\233\242\301\377\234\243\302\377\224\232" \
-  "\270\377Z^l\377<=@\377\225\225\220\377\350\350\335\377\206\354\354\341" \
-  "\377\2\335\335\322\377\350\350\335\377\206\354\354\341\377\4\323\323" \
-  "\311\377efe\377>@E\377sx\217\377\202\234\243\302\377\5\231\240\276\377" \
-  "\223\232\267\377\220\226\263\377\222\230\265\377\230\237\276\377\206" \
-  "\234\243\302\377\4\232\241\300\377ej{\377;;>\377\250\250\241\377\233" \
-  "\354\354\341\377\5\350\350\335\377oom\377CFO\377\210\217\252\377\227" \
-  "\235\273\377\207\234\243\302\377\5\227\235\273\377\221\230\265\377\220" \
-  "\227\264\377\225\233\271\377\232\241\300\377\210\234\243\302\377\33\222" \
-  "\231\266\377ot\213\377RU`\377;<A\377@AC\377YYY\377ttq\377\215\215\207" \
-  "\377\244\244\235\377\271\271\260\377\303\303\272\377\271\271\260\377" \
-  "\256\256\246\377\243\243\234\377\230\230\220\377\211\211\204\377aba\377" \
-  "CDE\377<=B\377GIR\377Z]n\377tz\220\377\226\234\272\377\234\243\302\377" \
-  "\225\233\271\3779;@\377\264\264\255\377\203\354\354\341\377\3\345\345" \
-  "\332\377\331\331\317\377\340\340\326\377\315\354\354\341\377\3\321\321" \
-  "\307\377<=>\377w|\223\377\207\234\243\302\377\3\226\235\273\377\217\226" \
-  "\262\377\226\235\273\377\204\234\243\302\377\3_cs\377ABD\377\252\252" \
-  "\243\377\211\354\354\341\377\2\335\335\322\377\350\350\335\377\210\354" \
-  "\354\341\377\4\337\337\324\377{{x\3779;\77\377\206\214\247\377\203\234" \
-  "\243\302\377\4\232\241\277\377\223\232\267\377\221\230\265\377\231\240" \
-  "\276\377\206\234\243\302\377\4\227\236\274\377RUa\377mnk\377\353\353" \
-  "\340\377\230\354\354\341\377\4\313\313\302\377;<>\377ei|\377\225\233" \
-  "\271\377\207\234\243\302\377\4\230\237\275\377\220\226\263\377\224\233" \
-  "\270\377\233\242\301\377\210\234\243\302\377\11\222\230\265\377^bs\377" \
-  "9:>\377MNN\377\207\207\202\377\302\302\271\377\352\352\337\377\343\343" \
-  "\331\377\342\342\330\377\215\354\354\341\377\11\323\323\311\377\245\245" \
-  "\236\377nnl\37788;\377BEM\377qw\215\377\225\233\271\3779:\77\377\334" \
-  "\334\322\377\204\354\354\341\377\3\341\341\327\377\332\332\320\377\353" \
-  "\353\340\377\312\354\354\341\377\3\266\266\256\37789>\377\214\223\256" \
-  "\377\206\234\243\302\377\3\227\236\274\377\217\226\262\377\225\233\271" \
-  "\377\204\234\243\302\377\3\227\236\274\377DFP\377}~{\377\213\354\354" \
-  "\341\377\2\335\335\322\377\350\350\335\377\212\354\354\341\377\3\330" \
-  "\330\316\377ABC\377qv\213\377\204\234\243\302\377\1\232\241\277\377\202" \
-  "\222\230\265\377\1\232\241\300\377\206\234\243\302\377\3ko\202\377MM" \
-  "M\377\341\341\327\377\226\354\354\341\377\4\234\234\227\3779;A\377\200" \
-  "\206\237\377\230\237\275\377\206\234\243\302\377\4\231\240\276\377\220" \
-  "\227\264\377\222\231\266\377\233\242\301\377\207\234\243\302\377\6\232" \
-  "\241\300\377pu\212\377@BI\377GHI\377\241\241\232\377\347\347\334\377" \
-  "\204\354\354\341\377\2\343\343\331\377\342\342\330\377\221\354\354\341" \
-  "\377\5\313\313\302\377rrp\37778:\377'(-\377^_^\377\205\354\354\341\377" \
-  "\3\346\346\333\377\330\330\316\377\351\351\336\377\310\354\354\341\377" \
-  "\3\222\222\215\377BDK\377\227\235\273\377\205\234\243\302\377\4\230\237" \
-  "\276\377\220\227\264\377\223\232\267\377\233\242\301\377\204\234\243" \
-  "\302\377\3\214\222\256\37778=\377\254\254\246\377\214\354\354\341\377" \
-  "\2\335\335\322\377\350\350\335\377\213\354\354\341\377\3\350\350\335" \
-  "\377aaa\377WZh\377\205\234\243\302\377\4\231\240\276\377\220\227\264" \
-  "\377\224\232\270\377\233\242\301\377\205\234\243\302\377\3}\203\233\377" \
-  ";<>\377\320\320\306\377\224\354\354\341\377\4\205\205\201\377GIS\377" \
-  "\215\223\260\377\232\241\277\377\205\234\243\302\377\4\232\241\300\377" \
-  "\222\230\265\377\221\230\265\377\232\241\300\377\210\234\243\302\377" \
-  "\4mr\207\37789=\377~\177{\377\327\327\315\377\207\354\354\341\377\2\343" \
-  "\343\331\377\342\342\330\377\223\354\354\341\377\4\352\352\337\377\303" \
-  "\303\271\377\257\257\246\377\352\352\337\377\205\354\354\341\377\3\351" \
-  "\351\336\377\330\330\316\377\345\345\332\377\305\354\354\341\377\3\352" \
-  "\352\337\377hig\377UXe\377\205\234\243\302\377\4\232\241\277\377\221" \
-  "\230\265\377\222\230\265\377\232\241\300\377\205\234\243\302\377\3y~" \
-  "\225\377:;=\377\317\317\305\377\215\354\354\341\377\2\335\335\322\377" \
-  "\350\350\335\377\215\354\354\341\377\3\220\221\214\377@BI\377\224\233" \
-  "\270\377\205\234\243\302\377\3\227\236\274\377\220\226\263\377\225\233" \
-  "\271\377\205\234\243\302\377\3\214\223\256\37789>\377\265\265\255\377" \
-  "\222\354\354\341\377\4llj\377SVb\377\220\226\263\377\233\242\301\377" \
-  "\204\234\243\302\377\4\233\242\301\377\223\232\267\377\220\227\264\377" \
-  "\231\240\276\377\210\234\243\302\377\4uz\222\3779;\77\377\177\177{\377" \
-  "\345\345\332\377\211\354\354\341\377\2\343\343\331\377\342\342\330\377" \
-  "\225\354\354\341\377\4\350\350\335\377\333\333\321\377\337\337\324\377" \
-  "\353\353\340\377\204\354\354\341\377\3\353\353\340\377\332\332\320\377" \
-  "\341\341\327\377\303\354\354\341\377\3\337\337\325\377IJJ\377lq\204\377" \
-  "\205\234\243\302\377\3\230\237\275\377\217\226\262\377\231\240\276\377" \
-  "\206\234\243\302\377\3jn\201\377QRQ\377\343\343\331\377\216\354\354\341" \
-  "\377\2\335\335\322\377\350\350\335\377\216\354\354\341\377\3\274\274" \
-  "\263\37768<\377\221\230\265\377\206\234\243\302\377\3\225\234\272\377" \
-  "\220\227\264\377\233\242\301\377\204\234\243\302\377\3\227\235\273\377" \
-  "BDK\377\221\221\214\377\217\354\354\341\377\4\352\352\337\377WXW\377" \
-  "^br\377\222\231\266\377\205\234\243\302\377\3\232\241\277\377\217\226" \
-  "\262\377\230\237\275\377\210\234\243\302\377\4\215\223\257\377=>E\377" \
-  "pqo\377\340\340\326\377\213\354\354\341\377\2\343\343\331\377\342\342" \
-  "\330\377\227\354\354\341\377\3\346\346\333\377\331\331\317\377\351\351" \
-  "\336\377\205\354\354\341\377\2\337\337\324\377\335\335\322\377\301\354" \
-  "\354\341\377\3\315\315\303\3779:<\377~\203\234\377\205\234\243\302\377" \
-  "\3\225\234\272\377\221\230\265\377\233\242\301\377\206\234\243\302\377" \
-  "\3z\200\230\377GGH\377\352\352\337\377\217\354\354\341\377\2\335\335" \
-  "\322\377\350\350\335\377\217\354\354\341\377\3\304\304\273\377:;A\377" \
-  "\231\240\276\377\206\234\243\302\377\3\230\237\276\377\217\226\262\377" \
-  "\232\241\277\377\205\234\243\302\377\3UXe\377ghf\377\353\353\340\377" \
-  "\215\354\354\341\377\3]]\\\377bgx\377\225\234\272\377\205\234\243\302" \
-  "\377\3\230\237\275\377\220\226\263\377\232\241\300\377\210\234\243\302" \
-  "\377\3mr\206\37789;\377\306\306\274\377\215\354\354\341\377\2\343\343" \
-  "\331\377\342\342\330\377\230\354\354\341\377\3\352\352\337\377\331\331" \
-  "\317\377\346\346\333\377\205\354\354\341\377\3\343\343\331\377\331\331" \
-  "\317\377\352\352\337\377\276\354\354\341\377\3\331\331\317\377346\377" \
-  "\215\223\257\377\205\234\243\302\377\2\222\231\266\377\224\232\270\377" \
-  "\207\234\243\302\377\3\214\222\256\377569\377\337\337\325\377\220\354" \
-  "\354\341\377\2\335\335\322\377\350\350\335\377\220\354\354\341\377\2" \
-  "\243\243\235\377JLV\377\207\234\243\302\377\3\232\241\300\377\217\226" \
-  "\262\377\230\237\275\377\205\234\243\302\377\2fj|\377klj\377\214\354" \
-  "\354\341\377\3qro\377W[i\377\230\237\275\377\205\234\243\302\377\3\225" \
-  "\234\272\377\221\230\265\377\233\242\301\377\207\234\243\302\377\4\225" \
-  "\234\272\377FHR\377jjh\377\347\347\334\377\216\354\354\341\377\2\343" \
-  "\343\331\377\342\342\330\377\231\354\354\341\377\3\353\353\340\377\334" \
-  "\334\322\377\341\341\327\377\205\354\354\341\377\2\346\346\333\377\331" \
-  "\331\317\377\275\354\354\341\377\3\347\347\334\377>\77\77\377\202\210" \
-  "\242\377\204\234\243\302\377\3\233\242\301\377\220\226\263\377\227\235" \
-  "\273\377\207\234\243\302\377\3\227\235\273\37756:\377\314\314\303\377" \
-  "\221\354\354\341\377\2\335\335\322\377\350\350\335\377\221\354\354\341" \
-  "\377\2xyv\377adu\377\207\234\243\302\377\3\233\242\301\377\221\230\265" \
-  "\377\225\234\272\377\205\234\243\302\377\2QTa\377\225\226\221\377\212" \
-  "\354\354\341\377\3\207\207\203\377KNZ\377\225\234\272\377\205\234\243" \
-  "\302\377\2\222\231\266\377\224\232\270\377\210\234\243\302\377\3\211" \
-  "\217\252\37778<\377\262\262\253\377\220\354\354\341\377\2\343\343\331" \
-  "\377\342\342\330\377\233\354\354\341\377\2\337\337\325\377\336\336\323" \
-  "\377\205\354\354\341\377\2\343\343\331\377\335\335\322\377\274\354\354" \
-  "\341\377\2Z[Z\377pt\211\377\204\234\243\302\377\3\231\240\276\377\217" \
-  "\226\262\377\230\237\276\377\210\234\243\302\377\2BDL\377\256\256\246" \
-  "\377\222\354\354\341\377\2\335\335\322\377\350\350\335\377\222\354\354" \
-  "\341\377\2RRR\377v{\222\377\210\234\243\302\377\2\224\232\270\377\222" \
-  "\231\266\377\204\234\243\302\377\3\233\242\301\377>@G\377\272\272\261" \
-  "\377\210\354\354\341\377\3\260\260\250\377@BJ\377\222\231\266\377\204" \
-  "\234\243\302\377\3\233\242\301\377\220\227\264\377\227\235\273\377\210" \
-  "\234\243\302\377\3\177\205\237\377<=\77\377\327\327\315\377\221\354\354" \
-  "\341\377\2\343\343\331\377\342\342\330\377\234\354\354\341\377\3\344" \
-  "\344\331\377\332\332\320\377\353\353\340\377\204\354\354\341\377\2\337" \
-  "\337\324\377\341\341\327\377\272\354\354\341\377\2\204\204\200\377X[" \
-  "i\377\204\234\243\302\377\3\230\237\276\377\217\226\262\377\232\241\300" \
-  "\377\210\234\243\302\377\2Y\\j\377\206\206\202\377\223\354\354\341\377" \
-  "\2\335\335\322\377\350\350\335\377\222\354\354\341\377\3\344\344\331" \
-  "\377;<>\377\207\215\250\377\210\234\243\302\377\2\227\235\273\377\220" \
-  "\227\264\377\204\234\243\302\377\3\225\233\271\37767;\377\323\323\312" \
-  "\377\206\354\354\341\377\3\341\341\327\377458\377\212\221\255\377\204" \
-  "\234\243\302\377\3\232\241\300\377\217\226\262\377\231\240\276\377\210" \
-  "\234\243\302\377\3v{\221\377DDE\377\337\337\325\377\222\354\354\341\377" \
-  "\2\343\343\331\377\342\342\330\377\235\354\354\341\377\3\350\350\335" \
-  "\377\331\331\317\377\352\352\337\377\204\354\354\341\377\2\333\333\321" \
-  "\377\346\346\333\377\270\354\354\341\377\2\255\255\246\377BDL\377\204" \
-  "\234\243\302\377\3\232\241\300\377\217\226\262\377\233\242\301\377\210" \
-  "\234\243\302\377\2\205\213\246\377MMM\377\224\354\354\341\377\2\335\335" \
-  "\322\377\350\350\335\377\223\354\354\341\377\2\322\322\310\377;=C\377" \
-  "\211\234\243\302\377\2\226\235\273\377\222\231\266\377\204\234\243\302" \
-  "\377\3\211\217\252\377<<>\377\344\344\331\377\205\354\354\341\377\3[" \
-  "[Z\377os\210\377\233\242\301\377\204\234\243\302\377\2\220\226\263\377" \
-  "\231\240\276\377\210\234\243\302\377\3mr\205\377PPP\377\346\346\333\377" \
-  "\223\354\354\341\377\2\343\343\331\377\342\342\330\377\236\354\354\341" \
-  "\377\2\350\350\335\377\332\332\320\377\204\354\354\341\377\3\353\353" \
-  "\340\377\330\330\316\377\351\351\336\377\266\354\354\341\377\3\314\314" \
-  "\303\37757;\377\227\236\274\377\204\234\243\302\377\2\217\226\262\377" \
-  "\231\240\276\377\211\234\243\302\377\2=\77E\377\317\317\305\377\216\354" \
-  "\354\341\377\15\353\353\340\377\350\350\335\377\345\345\332\377\342\342" \
-  "\330\377\337\337\325\377\335\335\322\377\314\314\302\377\327\327\315" \
-  "\377\336\336\323\377\340\340\326\377\343\343\331\377\346\346\333\377" \
-  "\351\351\336\377\217\354\354\341\377\2opn\377rw\215\377\211\234\243\302" \
-  "\377\2\223\232\267\377\225\234\272\377\204\234\243\302\377\2w|\223\377" \
-  "QRQ\377\204\354\354\341\377\3\253\253\244\377FIS\377\232\241\277\377" \
-  "\204\234\243\302\377\2\222\230\265\377\227\235\273\377\210\234\243\302" \
-  "\377\3v|\222\377NOO\377\352\352\337\377\217\354\354\341\377\14\351\351" \
-  "\336\377\346\346\333\377\343\343\331\377\340\340\326\377\336\336\323" \
-  "\377\323\323\311\377\322\322\310\377\336\336\323\377\340\340\326\377" \
-  "\343\343\331\377\346\346\333\377\351\351\336\377\232\354\354\341\377" \
-  "\2\344\344\331\377\335\335\322\377\204\354\354\341\377\3\351\351\336" \
-  "\377\330\330\316\377\353\353\340\377\264\354\354\341\377\3\337\337\325" \
-  "\377679\377\214\223\256\377\204\234\243\302\377\2\222\230\265\377\227" \
-  "\236\274\377\211\234\243\302\377\2tz\221\377iig\377\214\354\354\341\377" \
-  "\23\352\352\337\377\341\341\327\377\332\332\320\377\331\331\317\377\335" \
-  "\335\322\377\337\337\325\377\342\342\330\377\345\345\332\377\350\350" \
-  "\335\377\334\334\321\377\346\346\333\377\347\347\334\377\344\344\331" \
-  "\377\341\341\327\377\337\337\324\377\333\333\321\377\330\330\316\377" \
-  "\335\335\322\377\345\345\332\377\214\354\354\341\377\3\342\342\330\377" \
-  "67;\377\232\241\300\377\211\234\243\302\377\2\220\227\264\377\230\237" \
-  "\275\377\204\234\243\302\377\2afv\377vvt\377\202\354\354\341\377\3\337" \
-  "\337\325\377235\377\223\231\266\377\204\234\243\302\377\2\225\233\271" \
-  "\377\224\233\270\377\210\234\243\302\377\3\200\206\237\377ABC\377\345" \
-  "\345\332\377\214\354\354\341\377\24\353\353\340\377\343\343\331\377\333" \
-  "\333\321\377\330\330\316\377\334\334\322\377\337\337\324\377\342\342" \
-  "\330\377\345\345\332\377\350\350\335\377\342\342\330\377\341\341\327" \
-  "\377\350\350\335\377\345\345\332\377\342\342\330\377\337\337\324\377" \
-  "\334\334\322\377\330\330\316\377\333\333\321\377\343\343\331\377\353" \
-  "\353\340\377\227\354\354\341\377\2\340\340\326\377\341\341\327\377\204" \
-  "\354\354\341\377\2\346\346\333\377\333\333\321\377\264\354\354\341\377" \
-  "\2TUU\377|\201\232\377\204\234\243\302\377\202\224\233\270\377\211\234" \
-  "\243\302\377\3\232\241\300\37756:\377\337\337\325\377\211\354\354\341" \
-  "\377\6\353\353\340\377\337\337\325\377\331\331\317\377\332\332\320\377" \
-  "\342\342\330\377\352\352\337\377\206\354\354\341\377\2\335\335\322\377" \
-  "\350\350\335\377\206\354\354\341\377\5\347\347\334\377\337\337\324\377" \
-  "\330\330\316\377\333\333\321\377\344\344\331\377\212\354\354\341\377" \
-  "\2\221\221\214\377bfw\377\211\234\243\302\377\3\233\242\301\377\217\226" \
-  "\262\377\232\241\277\377\204\234\243\302\377\5FIR\377\265\265\255\377" \
-  "\354\354\341\377TTS\377tz\221\377\204\234\243\302\377\2\230\237\275\377" \
-  "\221\230\265\377\210\234\243\302\377\3\211\217\253\3779:<\377\336\336" \
-  "\323\377\213\354\354\341\377\5\342\342\330\377\332\332\320\377\331\331" \
-  "\317\377\340\340\326\377\351\351\336\377\206\354\354\341\377\2\343\343" \
-  "\331\377\342\342\330\377\206\354\354\341\377\5\351\351\336\377\340\340" \
-  "\326\377\331\331\317\377\332\332\320\377\342\342\330\377\226\354\354" \
-  "\341\377\2\334\334\322\377\346\346\333\377\204\354\354\341\377\2\341" \
-  "\341\327\377\337\337\325\377\262\354\354\341\377\2\300\300\267\377GJ" \
-  "S\377\204\234\243\302\377\2\227\236\274\377\221\230\265\377\212\234\243" \
-  "\302\377\2chy\377\211\211\205\377\211\354\354\341\377\4\340\340\326\377" \
-  "\330\330\316\377\343\343\331\377\353\353\340\377\211\354\354\341\377" \
-  "\2\335\335\322\377\350\350\335\377\211\354\354\341\377\4\351\351\336" \
-  "\377\336\336\323\377\331\331\317\377\347\347\334\377\210\354\354\341" \
-  "\377\3\353\353\340\377:;>\377\224\233\270\377\211\234\243\302\377\3\232" \
-  "\241\277\377\217\226\262\377\233\242\301\377\203\234\243\302\377\4\221" \
-  "\230\265\377=>@\377\246\246\237\377ILV\377\204\234\243\302\377\2\232" \
-  "\241\277\377\217\226\262\377\210\234\243\302\377\3\227\235\273\37789" \
-  "<\377\323\323\312\377\212\354\354\341\377\4\344\344\331\377\330\330\316" \
-  "\377\340\340\326\377\352\352\337\377\211\354\354\341\377\2\343\343\331" \
-  "\377\342\342\330\377\211\354\354\341\377\4\352\352\337\377\340\340\326" \
-  "\377\330\330\316\377\344\344\331\377\225\354\354\341\377\2\331\331\317" \
-  "\377\351\351\336\377\204\354\354\341\377\2\330\330\316\377\352\352\337" \
-  "\377\261\354\354\341\377\2DEF\377\215\223\257\377\203\234\243\302\377" \
-  "\2\232\241\277\377\217\226\262\377\212\234\243\302\377\3\225\233\271" \
-  "\377679\377\351\351\336\377\207\354\354\341\377\3\343\343\331\377\330" \
-  "\330\316\377\342\342\330\377\214\354\354\341\377\2\335\335\322\377\350" \
-  "\350\335\377\213\354\354\341\377\4\351\351\336\377\334\334\322\377\333" \
-  "\333\321\377\351\351\336\377\207\354\354\341\377\2\261\261\251\377QT" \
-  "a\377\212\234\243\302\377\2\230\237\275\377\220\227\264\377\204\234\243" \
-  "\302\377\3RVd\377)*.\377\223\232\267\377\203\234\243\302\377\3\233\242" \
-  "\301\377\217\226\262\377\232\241\300\377\210\234\243\302\377\2KMW\377" \
-  "\262\262\252\377\211\354\354\341\377\4\346\346\333\377\331\331\317\377" \
-  "\337\337\324\377\353\353\340\377\213\354\354\341\377\2\343\343\331\377" \
-  "\342\342\330\377\213\354\354\341\377\4\353\353\340\377\337\337\324\377" \
-  "\331\331\317\377\346\346\333\377\223\354\354\341\377\3\352\352\337\377" \
-  "\331\331\317\377\353\353\340\377\203\354\354\341\377\2\345\345\332\377" \
-  "\335\335\322\377\260\354\354\341\377\2\256\256\246\377RTa\377\204\234" \
-  "\243\302\377\2\220\226\263\377\232\241\300\377\212\234\243\302\377\2" \
-  "Y\\k\377\247\247\240\377\206\354\354\341\377\4\350\350\335\377\331\331" \
-  "\317\377\337\337\325\377\353\353\340\377\215\354\354\341\377\2\335\335" \
-  "\322\377\350\350\335\377\215\354\354\341\377\3\350\350\335\377\332\332" \
-  "\320\377\337\337\324\377\207\354\354\341\377\2HIJ\377\220\226\263\377" \
-  "\212\234\243\302\377\2\224\233\270\377\226\235\273\377\203\234\243\302" \
-  "\377\2GJW\377os\211\377\204\234\243\302\377\2\222\231\266\377\230\237" \
-  "\275\377\210\234\243\302\377\2ot\211\377klj\377\210\354\354\341\377\4" \
-  "\353\353\340\377\333\333\321\377\334\334\322\377\352\352\337\377\215" \
-  "\354\354\341\377\2\343\343\331\377\342\342\330\377\215\354\354\341\377" \
-  "\4\352\352\337\377\335\335\322\377\333\333\321\377\353\353\340\377\222" \
-  "\354\354\341\377\2\346\346\333\377\336\336\323\377\204\354\354\341\377" \
-  "\2\331\331\317\377\351\351\336\377\256\354\354\341\377\3\353\353\340" \
-  "\377;<>\377\224\232\270\377\203\234\243\302\377\2\227\235\273\377\224" \
-  "\232\270\377\213\234\243\302\377\1:;>\377\206\354\354\341\377\3\345\345" \
-  "\332\377\330\330\316\377\351\351\336\377\217\354\354\341\377\2\335\335" \
-  "\322\377\350\350\335\377\217\354\354\341\377\3\342\342\330\377\332\332" \
-  "\320\377\353\353\340\377\205\354\354\341\377\2\251\251\242\377]ap\377" \
-  "\213\234\243\302\377\1\217\226\262\377\202\234\243\302\377\3\226\235" \
-  "\273\377+-7\377\230\237\276\377\203\234\243\302\377\2\232\241\277\377" \
-  "\220\227\264\377\210\234\243\302\377\3\215\223\257\377;<>\377\350\350" \
-  "\335\377\207\354\354\341\377\3\341\341\326\377\276\276\265\377\342\342" \
-  "\327\377\217\354\354\341\377\2\343\343\331\377\342\342\330\377\217\354" \
-  "\354\341\377\3\346\346\333\377\330\330\316\377\350\350\335\377\222\354" \
-  "\354\341\377\2\333\333\321\377\351\351\336\377\203\354\354\341\377\2" \
-  "\347\347\334\377\333\333\321\377\256\354\354\341\377\2\231\231\223\377" \
-  "\\`p\377\204\234\243\302\377\2\217\226\262\377\233\242\301\377\212\234" \
-  "\243\302\377\2|\202\233\377oom\377\205\354\354\341\377\3\340\340\326" \
-  "\377\333\333\321\377\353\353\340\377\220\354\354\341\377\2\335\335\322" \
-  "\377\350\350\335\377\220\354\354\341\377\3\346\346\333\377\330\330\316" \
-  "\377\350\350\335\377\204\354\354\341\377\2\352\352\337\377:;\77\377\213" \
-  "\234\243\302\377\5\226\235\273\377\224\233\270\377\234\243\302\377Z_" \
-  "q\377`ex\377\204\234\243\302\377\2\221\230\265\377\231\240\276\377\210" \
-  "\234\243\302\377\2>@G\377\311\311\300\377\207\354\354\341\377\10\345" \
-  "\345\332\377\266\266\255\377\14\14\15\377./4\377@BF\377ABE\377iig\377" \
-  "\307\307\276\377\213\354\354\341\377\2\343\343\331\377\342\342\330\377" \
-  "\220\354\354\341\377\3\351\351\336\377\330\330\316\377\345\345\332\377" \
-  "\221\354\354\341\377\2\351\351\336\377\334\334\322\377\204\354\354\341" \
-  "\377\2\333\333\321\377\347\347\334\377\254\354\354\341\377\3\347\347" \
-  "\334\37767:\377\230\237\276\377\203\234\243\302\377\2\225\234\272\377" \
-  "\225\233\271\377\213\234\243\302\377\2JLV\377\313\313\302\377\204\354" \
-  "\354\341\377\2\335\335\322\377\337\337\324\377\222\354\354\341\377\2" \
-  "\335\335\322\377\350\350\335\377\221\354\354\341\377\3\351\351\336\377" \
-  "\330\330\316\377\345\345\332\377\204\354\354\341\377\2ded\377\202\210" \
-  "\242\377\213\234\243\302\377\4\217\226\262\377\232\241\300\377')1\377" \
-  "\230\237\274\377\203\234\243\302\377\2\231\240\276\377\222\230\265\377" \
-  "\210\234\243\302\377\2v|\222\377hig\377\207\354\354\341\377\14\340\340" \
-  "\326\377\332\332\320\377\353\353\340\377\315\315\303\37799;\377v{\222" \
-  "\377\234\243\302\377~\204\235\377KNW\377>\77A\377\220\220\213\377\353" \
-  "\353\340\377\210\354\354\341\377\2\343\343\331\377\342\342\330\377\221" \
-  "\354\354\341\377\3\353\353\340\377\332\332\320\377\340\340\326\377\221" \
-  "\354\354\341\377\2\335\335\322\377\350\350\335\377\203\354\354\341\377" \
-  "\2\351\351\336\377\331\331\317\377\254\354\354\341\377\2\205\205\201" \
-  "\377hl\177\377\203\234\243\302\377\2\233\242\301\377\217\226\262\377" \
-  "\213\234\243\302\377\2\230\237\276\377>\77A\377\204\354\354\341\377\2" \
-  "\333\333\321\377\343\343\331\377\223\354\354\341\377\2\335\335\322\377" \
-  "\350\350\335\377\222\354\354\341\377\3\353\353\340\377\332\332\320\377" \
-  "\346\346\333\377\203\354\354\341\377\2\303\303\272\377NP\\\377\213\234" \
-  "\243\302\377\3\227\236\274\377ei}\377OSc\377\204\234\243\302\377\2\220" \
-  "\227\264\377\232\241\300\377\207\234\243\302\377\3\233\242\301\37768" \
-  "<\377\337\337\325\377\206\354\354\341\377\2\340\340\326\377\336\336\323" \
-  "\377\203\354\354\341\377\3\344\344\331\377VWV\377[^l\377\202\234\243" \
-  "\302\377\4\230\237\276\377cgx\377@AC\377\313\313\302\377\207\354\354" \
-  "\341\377\2\343\343\331\377\342\342\330\377\223\354\354\341\377\2\336" \
-  "\336\323\377\340\340\326\377\220\354\354\341\377\2\352\352\337\377\333" \
-  "\333\321\377\204\354\354\341\377\2\335\335\322\377\345\345\332\377\252" \
-  "\354\354\341\377\3\341\341\327\37767;\377\233\242\301\377\203\234\243" \
-  "\302\377\2\224\232\270\377\227\235\273\377\213\234\243\302\377\2kp\205" \
-  "\377\212\212\205\377\203\354\354\341\377\2\337\337\325\377\340\340\326" \
-  "\377\224\354\354\341\377\2\335\335\322\377\350\350\335\377\223\354\354" \
-  "\341\377\3\353\353\340\377\330\330\316\377\351\351\336\377\203\354\354" \
-  "\341\377\2:;>\377\232\241\277\377\213\234\243\302\377\2)+3\377\216\225" \
-  "\262\377\203\234\243\302\377\2\230\237\275\377\223\232\267\377\210\234" \
-  "\243\302\377\2ei{\377\210\211\204\377\206\354\354\341\377\2\345\345\332" \
-  "\377\333\333\321\377\206\354\354\341\377\2ttq\377]ap\377\203\234\243" \
-  "\302\377\4\214\223\256\377@BH\377\202\203\177\377\353\353\340\377\205" \
-  "\354\354\341\377\2\343\343\331\377\342\342\330\377\224\354\354\341\377" \
-  "\2\333\333\321\377\345\345\332\377\220\354\354\341\377\2\337\337\324" \
-  "\377\346\346\333\377\203\354\354\341\377\2\352\352\337\377\330\330\316" \
-  "\377\252\354\354\341\377\2\232\232\223\377im\201\377\203\234\243\302" \
-  "\377\2\232\241\300\377\220\226\263\377\214\234\243\302\377\2>@F\377\335" \
-  "\335\322\377\202\354\354\341\377\2\344\344\331\377\334\334\322\377\225" \
-  "\354\354\341\377\2\335\335\322\377\350\350\335\377\224\354\354\341\377" \
-  "\3\351\351\336\377\330\330\316\377\353\353\340\377\202\354\354\341\377" \
-  "\2\177\200|\377pu\213\377\212\234\243\302\377\3~\203\235\377<\77K\377" \
-  "\222\230\265\377\203\234\243\302\377\2\217\226\262\377\233\242\301\377" \
-  "\207\234\243\302\377\3\226\235\273\37789;\377\351\351\336\377\205\354" \
-  "\354\341\377\3\350\350\335\377\330\330\316\377\353\353\340\377\207\354" \
-  "\354\341\377\2XXX\377ot\211\377\204\234\243\302\377\3chx\377]^\\\377" \
-  "\353\353\340\377\204\354\354\341\377\2\343\343\331\377\342\342\330\377" \
-  "\224\354\354\341\377\3\353\353\340\377\330\330\316\377\350\350\335\377" \
-  "\217\354\354\341\377\2\353\353\340\377\332\332\320\377\204\354\354\341" \
-  "\377\2\334\334\322\377\350\350\335\377\251\354\354\341\377\2OPP\377\224" \
-  "\232\270\377\203\234\243\302\377\2\222\231\266\377\230\237\275\377\213" \
-  "\234\243\302\377\2\217\226\262\377KLL\377\202\354\354\341\377\2\350\350" \
-  "\335\377\331\331\317\377\226\354\354\341\377\2\335\335\322\377\350\350" \
-  "\335\377\225\354\354\341\377\2\346\346\333\377\332\332\320\377\202\354" \
-  "\354\341\377\2\327\327\315\377ACI\377\212\234\243\302\377\7""9<H\377" \
-  "\201\207\241\377\221\230\265\377\232\241\277\377\234\243\302\377\227" \
-  "\235\273\377\224\233\270\377\210\234\243\302\377\2afw\377\223\223\215" \
-  "\377\205\354\354\341\377\3\353\353\340\377\330\330\316\377\351\351\336" \
-  "\377\210\354\354\341\377\3\350\350\335\377BCC\377~\204\235\377\204\234" \
-  "\243\302\377\3hl~\377]^\\\377\353\353\340\377\203\354\354\341\377\2\343" \
-  "\343\331\377\342\342\330\377\225\354\354\341\377\3\351\351\336\377\330" \
-  "\330\316\377\353\353\340\377\217\354\354\341\377\2\341\341\327\377\344" \
-  "\344\331\377\203\354\354\341\377\2\345\345\332\377\337\337\324\377\250" \
-  "\354\354\341\377\2\347\347\334\377\77AF\377\204\234\243\302\377\1\220" \
-  "\227\264\377\214\234\243\302\377\6in\202\377\225\225\220\377\354\354" \
-  "\341\377\353\353\340\377\330\330\316\377\352\352\337\377\226\354\354" \
-  "\341\377\2\335\335\322\377\350\350\335\377\226\354\354\341\377\2\341" \
-  "\341\327\377\337\337\324\377\202\354\354\341\377\1@AC\377\211\234\243" \
-  "\302\377\10\222\231\266\377.0:\377\234\243\302\377\230\237\276\377\224" \
-  "\232\270\377\234\243\302\377\220\227\264\377\233\242\301\377\210\234" \
-  "\243\302\377\2""57:\377\346\346\333\377\205\354\354\341\377\2\332\332" \
-  "\320\377\346\346\333\377\212\354\354\341\377\3\336\336\323\377569\377" \
-  "\230\237\276\377\204\234\243\302\377\2hl~\377_`^\377\203\354\354\341" \
-  "\377\2\343\343\331\377\342\342\330\377\226\354\354\341\377\2\346\346" \
-  "\333\377\332\332\320\377\217\354\354\341\377\2\353\353\340\377\333\333" \
-  "\321\377\204\354\354\341\377\1\330\330\316\377\250\354\354\341\377\2" \
-  "\252\252\242\377_dt\377\203\234\243\302\377\2\230\237\276\377\224\232" \
-  "\270\377\214\234\243\302\377\5NQ[\377\313\313\302\377\354\354\341\377" \
-  "\337\337\324\377\344\344\331\377\227\354\354\341\377\2\335\335\322\377" \
-  "\350\350\335\377\227\354\354\341\377\5\331\331\317\377\351\351\336\377" \
-  "\354\354\341\377bba\377\207\215\250\377\210\234\243\302\377\2kp\204\377" \
-  "UZj\377\202\234\243\302\377\3\220\227\264\377\233\242\301\377\220\227" \
-  "\264\377\210\234\243\302\377\2w|\224\377ppn\377\205\354\354\341\377\2" \
-  "\345\345\332\377\336\336\323\377\214\354\354\341\377\2\231\231\223\377" \
-  "[^m\377\205\234\243\302\377\2[_m\377\226\226\221\377\202\354\354\341" \
-  "\377\2\343\343\331\377\342\342\330\377\227\354\354\341\377\2\336\336" \
-  "\323\377\344\344\331\377\217\354\354\341\377\2\333\333\321\377\353\353" \
-  "\340\377\203\354\354\341\377\2\333\333\321\377\352\352\337\377\247\354" \
-  "\354\341\377\2Z[Z\377\214\222\256\377\203\234\243\302\377\2\223\232\267" \
-  "\377\231\240\276\377\214\234\243\302\377\4<>B\377\354\354\341\377\352" \
-  "\352\337\377\331\331\317\377\230\354\354\341\377\2\335\335\322\377\350" \
-  "\350\335\377\227\354\354\341\377\5\347\347\334\377\333\333\321\377\354" \
-  "\354\341\377\232\232\223\377hl\177\377\210\234\243\302\377\2ACQ\377\177" \
-  "\205\236\377\202\234\243\302\377\3\222\230\265\377\225\233\271\377\225" \
-  "\234\272\377\210\234\243\302\377\2ACI\377\326\326\314\377\205\354\354" \
-  "\341\377\2\330\330\316\377\353\353\340\377\215\354\354\341\377\2\77\77" \
-  "A\377\217\225\262\377\204\234\243\302\377\6\233\242\301\3779:\77\377" \
-  "\323\323\311\377\354\354\341\377\343\343\331\377\342\342\330\377\227" \
-  "\354\354\341\377\2\353\353\340\377\330\330\316\377\217\354\354\341\377" \
-  "\2\342\342\330\377\344\344\331\377\203\354\354\341\377\2\342\342\330" \
-  "\377\340\340\326\377\246\354\354\341\377\2\353\353\340\377<=A\377\204" \
-  "\234\243\302\377\1\220\226\263\377\214\234\243\302\377\5\232\241\277" \
-  "\377DEG\377\354\354\341\377\335\335\322\377\346\346\333\377\230\354\354" \
-  "\341\377\2\335\335\322\377\350\350\335\377\230\354\354\341\377\4\333" \
-  "\333\321\377\350\350\335\377\316\316\304\377MPY\377\210\234\243\302\377" \
-  "\2)+4\377\233\242\301\377\202\234\243\302\377\3\227\235\273\377\213\221" \
-  "\255\377\232\241\300\377\207\234\243\302\377\2\223\232\267\377KLM\377" \
-  "\205\354\354\341\377\2\342\342\330\377\340\340\326\377\216\354\354\341" \
-  "\377\2\277\277\266\377HKT\377\205\234\243\302\377\5\207\215\250\377B" \
-  "CD\377\353\353\340\377\343\343\331\377\342\342\330\377\230\354\354\341" \
-  "\377\2\340\340\326\377\341\341\327\377\216\354\354\341\377\2\352\352" \
-  "\337\377\335\335\322\377\203\354\354\341\377\2\353\353\340\377\331\331" \
-  "\317\377\246\354\354\341\377\2\272\272\261\377VYf\377\203\234\243\302" \
-  "\377\2\232\241\277\377\222\230\265\377\214\234\243\302\377\4\177\204" \
-  "\236\377pqo\377\351\351\336\377\333\333\321\377\231\354\354\341\377\2" \
-  "\335\335\322\377\350\350\335\377\230\354\354\341\377\4\350\350\335\377" \
-  "\332\332\320\377\354\354\341\377=>B\377\207\234\243\302\377\2\216\224" \
-  "\261\37769C\377\204\234\243\302\377\1\205\214\247\377\210\234\243\302" \
-  "\377\2hm\201\377\227\227\221\377\205\354\354\341\377\1\330\330\316\377" \
-  "\220\354\354\341\377\2IJK\377\222\231\266\377\205\234\243\302\377\4^" \
-  "br\377\223\223\216\377\343\343\331\377\342\342\330\377\231\354\354\341" \
-  "\377\2\327\327\315\377\353\353\340\377\216\354\354\341\377\1\333\333" \
-  "\321\377\204\354\354\341\377\2\331\331\317\377\353\353\340\377\245\354" \
-  "\354\341\377\2ijh\377\201\206\240\377\203\234\243\302\377\2\224\233\270" \
-  "\377\230\237\275\377\214\234\243\302\377\4`du\377\252\252\242\377\333" \
-  "\333\321\377\350\350\335\377\231\354\354\341\377\2\335\335\322\377\350" \
-  "\350\335\377\231\354\354\341\377\4\335\335\322\377\346\346\333\377FF" \
-  "H\377\232\241\277\377\206\234\243\302\377\2dh|\377^bu\377\203\234\243" \
-  "\302\377\3\230\237\275\377\211\217\253\377\233\242\301\377\207\234\243" \
-  "\302\377\2DEM\377\336\336\323\377\204\354\354\341\377\2\340\340\326\377" \
-  "\342\342\330\377\220\354\354\341\377\2\246\246\236\377^bq\377\205\234" \
-  "\243\302\377\2\232\241\277\377<<\77\377\202\342\342\330\377\231\354\354" \
-  "\341\377\2\342\342\330\377\340\340\326\377\216\354\354\341\377\2\340" \
-  "\340\326\377\346\346\333\377\203\354\354\341\377\2\340\340\326\377\343" \
-  "\343\331\377\245\354\354\341\377\1;;>\377\204\234\243\302\377\1\220\226" \
-  "\263\377\215\234\243\302\377\3DFN\377\334\334\321\377\331\331\317\377" \
-  "\232\354\354\341\377\2\335\335\322\377\350\350\335\377\231\354\354\341" \
-  "\377\4\350\350\335\377\334\334\322\377rrp\377\177\204\236\377\206\234" \
-  "\243\302\377\2:=I\377\212\220\253\377\203\234\243\302\377\3\222\231\266" \
-  "\377\223\232\267\377\226\235\273\377\206\234\243\302\377\2\232\241\277" \
-  "\377DEG\377\205\354\354\341\377\1\331\331\317\377\221\354\354\341\377" \
-  "\2\351\351\336\37778<\377\206\234\243\302\377\3]ap\377\237\237\230\377" \
-  "\342\342\330\377\232\354\354\341\377\1\331\331\317\377\216\354\354\341" \
-  "\377\2\351\351\336\377\336\336\323\377\203\354\354\341\377\2\351\351" \
-  "\336\377\333\333\321\377\244\354\354\341\377\2\331\331\317\377FHP\377" \
-  "\203\234\243\302\377\2\232\241\300\377\221\230\265\377\215\234\243\302" \
-  "\377\3>\77B\377\344\344\331\377\340\340\326\377\232\354\354\341\377\2" \
-  "\335\335\322\377\350\350\335\377\232\354\354\341\377\3\330\330\316\377" \
-  "\252\252\242\377aev\377\206\234\243\302\377\1+-6\377\204\234\243\302" \
-  "\377\3\220\227\264\377\233\242\301\377\220\227\264\377\206\234\243\302" \
-  "\377\2tz\221\377\202\202~\377\204\354\354\341\377\2\352\352\337\377\333" \
-  "\333\321\377\222\354\354\341\377\2ggf\377\177\205\237\377\205\234\243" \
-  "\302\377\3\225\233\271\377<=>\377\342\342\330\377\232\354\354\341\377" \
-  "\2\333\333\321\377\352\352\337\377\216\354\354\341\377\1\333\333\321" \
-  "\377\204\354\354\341\377\1\331\331\317\377\244\354\354\341\377\2\265" \
-  "\265\254\377[^l\377\203\234\243\302\377\2\227\236\274\377\225\233\271" \
-  "\377\214\234\243\302\377\4\231\240\276\377DEF\377\334\334\322\377\351" \
-  "\351\336\377\232\354\354\341\377\2\335\335\322\377\350\350\335\377\232" \
-  "\354\354\341\377\3\335\335\322\377\320\320\307\377KMU\377\205\234\243" \
-  "\302\377\2\213\221\255\377:=I\377\203\234\243\302\377\4\232\241\300\377" \
-  "\222\230\265\377\234\243\302\377\220\227\264\377\206\234\243\302\377" \
-  "\2TWd\377\272\272\261\377\204\354\354\341\377\2\341\341\327\377\343\343" \
-  "\331\377\222\354\354\341\377\2\246\246\236\377]aq\377\206\234\243\302" \
-  "\377\2JLV\377\277\277\266\377\232\354\354\341\377\2\343\343\331\377\341" \
-  "\341\327\377\216\354\354\341\377\2\335\335\322\377\352\352\337\377\203" \
-  "\354\354\341\377\2\332\332\320\377\353\353\340\377\243\354\354\341\377" \
-  "\2\217\220\212\377ns\211\377\203\234\243\302\377\2\225\234\272\377\227" \
-  "\236\274\377\214\234\243\302\377\3\217\226\262\377STT\377\330\330\316" \
-  "\377\233\354\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354" \
-  "\341\377\3\345\345\332\377\333\333\320\377@BH\377\205\234\243\302\377" \
-  "\2sx\217\377TXi\377\203\234\243\302\377\4\230\237\276\377\224\232\270" \
-  "\377\234\243\302\377\220\227\264\377\206\234\243\302\377\2>\77E\377\343" \
-  "\343\331\377\204\354\354\341\377\2\332\332\320\377\353\353\340\377\222" \
-  "\354\354\341\377\2\333\333\321\377@BI\377\206\234\243\302\377\2ns\211" \
-  "\377}~z\377\232\354\354\341\377\2\353\353\340\377\332\332\320\377\216" \
-  "\354\354\341\377\2\337\337\325\377\347\347\334\377\203\354\354\341\377" \
-  "\2\336\336\323\377\347\347\334\377\243\354\354\341\377\2ggf\377\207\215" \
-  "\250\377\203\234\243\302\377\2\223\232\267\377\231\240\276\377\214\234" \
-  "\243\302\377\3\205\213\245\377bcb\377\336\336\323\377\233\354\354\341" \
-  "\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\2\330\330" \
-  "\316\377\77@E\377\205\234\243\302\377\2dh|\377ch|\377\203\234\243\302" \
-  "\377\5\227\235\273\377\225\234\272\377\234\243\302\377\221\230\265\377" \
-  "\233\242\301\377\205\234\243\302\377\1=>A\377\204\354\354\341\377\2\353" \
-  "\353\340\377\332\332\320\377\224\354\354\341\377\1""89<\377\206\234\243" \
-  "\302\377\2\221\230\265\377CDE\377\233\354\354\341\377\2\332\332\320\377" \
-  "\353\353\340\377\215\354\354\341\377\2\342\342\330\377\344\344\331\377" \
-  "\203\354\354\341\377\2\341\341\327\377\343\343\331\377\243\354\354\341" \
-  "\377\2GGI\377\232\241\300\377\203\234\243\302\377\2\221\230\265\377\233" \
-  "\242\301\377\214\234\243\302\377\3z\200\230\377qro\377\345\345\332\377" \
-  "\233\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341" \
-  "\377\2\332\332\320\377\77AE\377\205\234\243\302\377\2TWh\377sy\217\377" \
-  "\203\234\243\302\377\5\225\233\271\377\227\236\274\377\234\243\302\377" \
-  "\223\232\267\377\231\240\276\377\204\234\243\302\377\2\226\235\273\377" \
-  "LLM\377\204\354\354\341\377\2\345\345\332\377\337\337\325\377\224\354" \
-  "\354\341\377\2RSS\377\215\223\257\377\205\234\243\302\377\3\226\235\273" \
-  "\3779;@\377\347\347\334\377\232\354\354\341\377\2\337\337\325\377\345" \
-  "\345\332\377\215\354\354\341\377\2\345\345\332\377\341\341\327\377\203" \
-  "\354\354\341\377\2\346\346\333\377\337\337\324\377\243\354\354\341\377" \
-  "\1CEG\377\204\234\243\302\377\1\220\227\264\377\215\234\243\302\377\3" \
-  "pu\213\377\202\203}\377\350\350\335\377\233\354\354\341\377\2\335\335" \
-  "\322\377\350\350\335\377\233\354\354\341\377\2\335\335\322\377ABE\377" \
-  "\205\234\243\302\377\2FIW\377\202\210\243\377\203\234\243\302\377\5\223" \
-  "\232\267\377\231\240\276\377\234\243\302\377\225\233\271\377\227\236" \
-  "\274\377\204\234\243\302\377\2}\203\233\377wwu\377\204\354\354\341\377" \
-  "\202\342\342\330\377\224\354\354\341\377\2\215\215\210\377jo\204\377" \
-  "\205\234\243\302\377\3\226\235\273\377TXe\377\265\265\254\377\232\354" \
-  "\354\341\377\202\342\342\330\377\215\354\354\341\377\2\350\350\335\377" \
-  "\337\337\324\377\203\354\354\341\377\2\352\352\337\377\334\334\322\377" \
-  "\243\354\354\341\377\1BCG\377\204\234\243\302\377\1\220\227\264\377\215" \
-  "\234\243\302\377\3fk\177\377\223\223\213\377\353\353\340\377\233\354" \
-  "\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\2" \
-  "\337\337\325\377CDF\377\205\234\243\302\377\2""9<G\377\222\231\266\377" \
-  "\203\234\243\302\377\5\221\230\265\377\233\242\301\377\234\243\302\377" \
-  "\227\235\273\377\225\234\272\377\204\234\243\302\377\2pu\213\377\217" \
-  "\220\212\377\204\354\354\341\377\2\337\337\325\377\345\345\332\377\224" \
-  "\354\354\341\377\2\302\302\271\377QT_\377\205\234\243\302\377\3\226\235" \
-  "\273\377di}\377\224\224\216\377\232\354\354\341\377\2\345\345\332\377" \
-  "\337\337\325\377\215\354\354\341\377\2\353\353\340\377\334\334\322\377" \
-  "\203\354\354\341\377\2\353\353\340\377\332\332\320\377\243\354\354\341" \
-  "\377\1ABF\377\204\234\243\302\377\1\220\227\264\377\215\234\243\302\377" \
-  "\2_cs\377\241\241\231\377\234\354\354\341\377\2\335\335\322\377\350\350" \
-  "\335\377\233\354\354\341\377\3\342\342\330\377EFG\377\233\242\301\377" \
-  "\204\234\243\302\377\1""02<\377\204\234\243\302\377\1\220\227\264\377" \
-  "\202\234\243\302\377\2\231\240\276\377\224\232\270\377\204\234\243\302" \
-  "\377\2ej}\377\241\241\232\377\204\354\354\341\377\2\335\335\322\377\350" \
-  "\350\335\377\224\354\354\341\377\2\331\331\317\377FHP\377\205\234\243" \
-  "\302\377\3\226\235\273\377ty\220\377{{x\377\232\354\354\341\377\2\350" \
-  "\350\335\377\335\335\322\377\216\354\354\341\377\1\333\333\321\377\204" \
-  "\354\354\341\377\1\331\331\317\377\243\354\354\341\377\1\77AF\377\204" \
-  "\234\243\302\377\1\220\227\264\377\215\234\243\302\377\2WZg\377\260\260" \
-  "\250\377\234\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354" \
-  "\354\341\377\3\345\345\332\377RSS\377\221\230\265\377\204\234\243\302" \
-  "\377\1""02<\377\204\234\243\302\377\1\220\227\264\377\202\234\243\302" \
-  "\377\2\233\242\301\377\222\230\265\377\204\234\243\302\377\2X\\m\377" \
-  "\261\261\251\377\204\354\354\341\377\2\332\332\320\377\353\353\340\377" \
-  "\224\354\354\341\377\2\352\352\337\377=\77D\377\205\234\243\302\377\3" \
-  "\226\235\273\377\203\211\243\377ccc\377\232\354\354\341\377\2\353\353" \
-  "\340\377\332\332\320\377\216\354\354\341\377\1\333\333\321\377\204\354" \
-  "\354\341\377\1\331\331\317\377\231\354\354\341\377\1\352\352\337\377" \
-  "\210\351\351\336\377\2\350\350\335\377>\77E\377\203\232\241\277\377\2" \
-  "\230\237\275\377\220\226\263\377\215\232\241\277\377\2NPY\377\275\275" \
-  "\263\377\234\351\351\336\377\2\332\332\320\377\345\345\332\377\233\351" \
-  "\351\336\377\3\345\345\332\377_`_\377\204\212\245\377\204\232\241\277" \
-  "\377\1/1;\377\204\232\241\277\377\1\217\225\261\377\203\232\241\277\377" \
-  "\1\217\225\261\377\204\232\241\277\377\2KN[\377\277\277\266\377\204\351" \
-  "\351\336\377\1\326\326\314\377\226\351\351\336\377\1>@D\377\205\232\241" \
-  "\277\377\3\224\233\270\377\217\225\261\377KLM\377\233\351\351\336\377" \
-  "\1\326\326\314\377\216\351\351\336\377\1\330\330\316\377\204\351\351" \
-  "\336\377\1\326\326\314\377\213\351\351\336\377\1\352\352\337\377\215" \
-  "\354\354\341\377\1\342\342\330\377\210\334\334\322\377\2\330\330\316" \
-  "\377<>D\377\203\221\230\265\377\2\217\226\262\377\210\217\252\377\215" \
-  "\221\230\265\377\2FGP\377\271\271\260\377\234\334\334\322\377\2\316\316" \
-  "\304\377\330\330\316\377\233\334\334\322\377\3\331\331\317\377ab`\377" \
-  "y~\227\377\204\221\230\265\377\1-/8\377\204\221\230\265\377\1\206\215" \
-  "\250\377\203\221\230\265\377\1\206\215\250\377\204\221\230\265\377\2" \
-  "@CO\377\274\274\264\377\204\334\334\322\377\1\312\312\301\377\226\334" \
-  "\334\322\377\1<=A\377\205\221\230\265\377\3\213\222\256\377\211\220\253" \
-  "\377DEF\377\233\334\334\322\377\1\312\312\301\377\216\334\334\322\377" \
-  "\1\314\314\303\377\204\334\334\322\377\1\312\312\301\377\213\334\334" \
-  "\322\377\1\341\341\327\377\227\354\354\341\377\1\77@E\377\204\234\243" \
-  "\302\377\1\221\230\265\377\215\234\243\302\377\2SVa\377\270\270\260\377" \
-  "\234\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341" \
-  "\377\3\346\346\333\377YZZ\377\214\223\256\377\204\234\243\302\377\1/" \
-  "1;\377\204\234\243\302\377\1\220\227\264\377\203\234\243\302\377\1\220" \
-  "\227\264\377\204\234\243\302\377\2QTc\377\272\272\262\377\204\354\354" \
-  "\341\377\1\331\331\317\377\226\354\354\341\377\1=>C\377\205\234\243\302" \
-  "\377\3\226\235\273\377\212\220\253\377YZZ\377\233\354\354\341\377\1\331" \
-  "\331\317\377\216\354\354\341\377\1\333\333\321\377\204\354\354\341\377" \
-  "\1\331\331\317\377\243\354\354\341\377\1@AF\377\204\234\243\302\377\1" \
-  "\220\227\264\377\215\234\243\302\377\2[_m\377\251\251\241\377\234\354" \
-  "\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\3" \
-  "\343\343\331\377JKL\377\227\236\274\377\204\234\243\302\377\1/1:\377" \
-  "\204\234\243\302\377\1\220\227\264\377\202\234\243\302\377\2\232\241" \
-  "\277\377\222\231\266\377\204\234\243\302\377\2]at\377\251\251\241\377" \
-  "\204\354\354\341\377\2\333\333\321\377\352\352\337\377\224\354\354\341" \
-  "\377\2\347\347\334\377=\77E\377\205\234\243\302\377\3\226\235\273\377" \
-  "~\204\235\377mnl\377\232\354\354\341\377\2\352\352\337\377\333\333\321" \
-  "\377\216\354\354\341\377\1\333\333\321\377\204\354\354\341\377\1\331" \
-  "\331\317\377\243\354\354\341\377\1ACF\377\204\234\243\302\377\1\220\227" \
-  "\264\377\215\234\243\302\377\2cgy\377\231\231\222\377\234\354\354\341" \
-  "\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\2\340\340" \
-  "\326\377CCE\377\205\234\243\302\377\2""69C\377\224\232\270\377\203\234" \
-  "\243\302\377\1\220\227\264\377\202\234\243\302\377\2\230\237\275\377" \
-  "\224\233\270\377\204\234\243\302\377\2im\202\377\227\227\220\377\204" \
-  "\354\354\341\377\2\336\336\323\377\347\347\334\377\224\354\354\341\377" \
-  "\2\327\327\315\377FHP\377\205\234\243\302\377\3\226\235\273\377rx\217" \
-  "\377\201\202~\377\232\354\354\341\377\2\347\347\334\377\336\336\323\377" \
-  "\216\354\354\341\377\1\333\333\321\377\204\354\354\341\377\1\331\331" \
-  "\317\377\243\354\354\341\377\1BCF\377\204\234\243\302\377\1\220\227\264" \
-  "\377\215\234\243\302\377\3kp\205\377\212\212\204\377\352\352\337\377" \
-  "\233\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341" \
-  "\377\2\336\336\323\377BCE\377\205\234\243\302\377\2ADR\377\205\213\246" \
-  "\377\203\234\243\302\377\3\222\231\266\377\232\241\277\377\234\243\302" \
-  "\377\202\226\235\273\377\204\234\243\302\377\2sx\217\377\203\203\177" \
-  "\377\204\354\354\341\377\2\340\340\326\377\344\344\331\377\224\354\354" \
-  "\341\377\2\254\254\244\377[_o\377\205\234\243\302\377\3\226\235\273\377" \
-  "ej}\377\231\231\222\377\232\354\354\341\377\2\344\344\331\377\340\340" \
-  "\326\377\215\354\354\341\377\2\351\351\336\377\336\336\323\377\203\354" \
-  "\354\341\377\2\352\352\337\377\333\333\321\377\243\354\354\341\377\1" \
-  "CDF\377\204\234\243\302\377\1\220\227\264\377\215\234\243\302\377\3v" \
-  "{\222\377zzw\377\346\346\333\377\233\354\354\341\377\2\335\335\322\377" \
-  "\350\350\335\377\233\354\354\341\377\2\333\333\321\377@BE\377\205\234" \
-  "\243\302\377\2NRa\377w}\224\377\203\234\243\302\377\5\224\233\270\377" \
-  "\230\237\275\377\234\243\302\377\224\233\270\377\230\237\275\377\204" \
-  "\234\243\302\377\2\204\212\245\377ghg\377\204\354\354\341\377\2\343\343" \
-  "\331\377\341\341\327\377\224\354\354\341\377\2ssq\377z\200\230\377\205" \
-  "\234\243\302\377\3\226\235\273\377KNW\377\312\312\301\377\232\354\354" \
-  "\341\377\2\341\341\327\377\343\343\331\377\215\354\354\341\377\2\346" \
-  "\346\333\377\340\340\326\377\203\354\354\341\377\2\350\350\335\377\335" \
-  "\335\322\377\243\354\354\341\377\2TUU\377\222\230\265\377\203\234\243" \
-  "\302\377\2\222\231\266\377\232\241\277\377\214\234\243\302\377\3\200" \
-  "\206\237\377jjh\377\341\341\327\377\233\354\354\341\377\2\335\335\322" \
-  "\377\350\350\335\377\233\354\354\341\377\2\330\330\316\377\77AE\377\205" \
-  "\234\243\302\377\2\\`r\377hm\201\377\203\234\243\302\377\202\226\235" \
-  "\273\377\3\234\243\302\377\222\231\266\377\232\241\277\377\204\234\243" \
-  "\302\377\2\232\241\300\377CDE\377\204\354\354\341\377\2\350\350\335\377" \
-  "\335\335\322\377\224\354\354\341\377\2BCD\377\230\237\275\377\205\234" \
-  "\243\302\377\2\226\235\273\3779:>\377\233\354\354\341\377\2\335\335\322" \
-  "\377\350\350\335\377\215\354\354\341\377\202\343\343\331\377\203\354" \
-  "\354\341\377\2\344\344\331\377\340\340\326\377\243\354\354\341\377\2" \
-  "{|x\377z\177\230\377\203\234\243\302\377\2\224\233\270\377\230\237\275" \
-  "\377\214\234\243\302\377\3\212\221\254\377[\\[\377\332\332\320\377\233" \
-  "\354\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354\341\377" \
-  "\3\352\352\337\377\333\333\321\377>@E\377\205\234\243\302\377\2jn\204" \
-  "\377Y]o\377\203\234\243\302\377\4\230\237\275\377\224\233\270\377\234" \
-  "\243\302\377\220\227\264\377\206\234\243\302\377\1;=A\377\205\354\354" \
-  "\341\377\1\331\331\317\377\224\354\354\341\377\1""89=\377\206\234\243" \
-  "\302\377\2\215\224\260\377JKK\377\233\354\354\341\377\1\331\331\317\377" \
-  "\216\354\354\341\377\2\340\340\326\377\346\346\333\377\203\354\354\341" \
-  "\377\2\337\337\325\377\345\345\332\377\243\354\354\341\377\2\244\244" \
-  "\235\377dh{\377\203\234\243\302\377\202\226\235\273\377\214\234\243\302" \
-  "\377\4\225\233\271\377KLL\377\331\331\317\377\353\353\340\377\232\354" \
-  "\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354\341\377\3" \
-  "\340\340\326\377\327\327\315\377FHO\377\205\234\243\302\377\2\205\213" \
-  "\246\377DGU\377\203\234\243\302\377\4\232\241\277\377\222\231\266\377" \
-  "\234\243\302\377\220\227\264\377\206\234\243\302\377\2IKT\377\323\323" \
-  "\311\377\204\354\354\341\377\2\336\336\323\377\347\347\334\377\222\354" \
-  "\354\341\377\2\312\312\301\377KMW\377\206\234\243\302\377\2jn\203\377" \
-  "\205\206\200\377\232\354\354\341\377\2\347\347\334\377\336\336\323\377" \
-  "\216\354\354\341\377\2\336\336\323\377\351\351\336\377\203\354\354\341" \
-  "\377\2\333\333\321\377\352\352\337\377\243\354\354\341\377\2\310\310" \
-  "\277\377QS^\377\203\234\243\302\377\2\230\237\276\377\223\232\267\377" \
-  "\215\234\243\302\377\3<=\77\377\340\340\326\377\344\344\331\377\232\354" \
-  "\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354\341\377\3" \
-  "\331\331\317\377\302\302\271\377UXd\377\206\234\243\302\377\1/1;\377" \
-  "\204\234\243\302\377\3\220\227\264\377\234\243\302\377\220\226\263\377" \
-  "\206\234\243\302\377\2aex\377\244\244\234\377\204\354\354\341\377\2\346" \
-  "\346\333\377\337\337\324\377\222\354\354\341\377\2\223\224\215\377fk" \
-  "\177\377\206\234\243\302\377\2=\77E\377\320\320\306\377\232\354\354\341" \
-  "\377\2\337\337\324\377\346\346\333\377\216\354\354\341\377\1\333\333" \
-  "\321\377\204\354\354\341\377\1\331\331\317\377\244\354\354\341\377\2" \
-  "\350\350\335\377<=B\377\204\234\243\302\377\1\220\226\263\377\215\234" \
-  "\243\302\377\3:<A\377\345\345\332\377\334\334\322\377\232\354\354\341" \
-  "\377\2\335\335\322\377\350\350\335\377\231\354\354\341\377\4\353\353" \
-  "\340\377\331\331\317\377\216\216\211\377ot\212\377\206\234\243\302\377" \
-  "\2""69D\377\224\233\270\377\203\234\243\302\377\3\220\227\264\377\227" \
-  "\236\275\377\223\232\267\377\206\234\243\302\377\2\210\216\251\377\\" \
-  "]\\\377\205\354\354\341\377\1\331\331\317\377\222\354\354\341\377\2E" \
-  "FG\377\224\232\270\377\205\234\243\302\377\3\211\217\252\377RRR\377\342" \
-  "\342\330\377\232\354\354\341\377\1\331\331\317\377\216\354\354\341\377" \
-  "\2\353\353\340\377\333\333\321\377\204\354\354\341\377\1\331\331\317" \
-  "\377\245\354\354\341\377\2JKK\377\223\232\267\377\203\234\243\302\377" \
-  "\2\222\230\265\377\232\241\277\377\214\234\243\302\377\3SUa\377\276\276" \
-  "\265\377\331\331\317\377\232\354\354\341\377\2\335\335\322\377\350\350" \
-  "\335\377\231\354\354\341\377\4\342\342\330\377\340\340\326\377VWW\377" \
-  "\220\226\263\377\206\234\243\302\377\2Z^p\377kp\207\377\203\234\243\302" \
-  "\377\3\225\234\272\377\215\224\260\377\231\240\276\377\207\234\243\302" \
-  "\377\1;<@\377\205\354\354\341\377\2\334\334\322\377\350\350\335\377\220" \
-  "\354\354\341\377\2\321\321\307\377FHP\377\206\234\243\302\377\3MPZ\377" \
-  "\272\272\261\377\342\342\330\377\231\354\354\341\377\2\350\350\335\377" \
-  "\334\334\322\377\216\354\354\341\377\2\344\344\331\377\342\342\330\377" \
-  "\203\354\354\341\377\2\345\345\332\377\337\337\324\377\245\354\354\341" \
-  "\377\2\225\225\220\377im\201\377\203\234\243\302\377\2\227\236\274\377" \
-  "\224\233\270\377\214\234\243\302\377\4ns\211\377\211\211\204\377\342" \
-  "\342\330\377\340\340\326\377\231\354\354\341\377\2\335\335\322\377\350" \
-  "\350\335\377\231\354\354\341\377\3\330\330\316\377\353\353\340\377\77" \
-  "@C\377\207\234\243\302\377\2\204\212\245\377CFS\377\203\234\243\302\377" \
-  "\2\232\241\300\377\206\214\247\377\210\234\243\302\377\2SWd\377\277\277" \
-  "\266\377\204\354\354\341\377\2\350\350\335\377\333\333\321\377\220\354" \
-  "\354\341\377\2opn\377{\201\231\377\205\234\243\302\377\4\222\231\266" \
-  "\377ABC\377\343\343\331\377\342\342\330\377\231\354\354\341\377\2\333" \
-  "\333\321\377\347\347\334\377\216\354\354\341\377\2\334\334\322\377\352" \
-  "\352\337\377\203\354\354\341\377\2\335\335\322\377\350\350\335\377\245" \
-  "\354\354\341\377\2\335\335\322\377CDK\377\204\234\243\302\377\1\220\226" \
-  "\263\377\214\234\243\302\377\5\217\226\262\377RSS\377\354\354\341\377" \
-  "\330\330\316\377\353\353\340\377\230\354\354\341\377\2\335\335\322\377" \
-  "\350\350\335\377\230\354\354\341\377\4\341\341\327\377\340\340\326\377" \
-  "\342\342\330\377ACI\377\210\234\243\302\377\1.09\377\203\234\243\302" \
-  "\377\2\232\241\277\377\207\216\251\377\210\234\243\302\377\2\200\206" \
-  "\237\377oom\377\205\354\354\341\377\2\334\334\322\377\347\347\334\377" \
-  "\216\354\354\341\377\2\337\337\325\3778:>\377\206\234\243\302\377\4E" \
-  "GP\377\273\273\262\377\343\343\331\377\342\342\330\377\230\354\354\341" \
-  "\377\2\347\347\334\377\333\333\321\377\217\354\354\341\377\1\333\333" \
-  "\321\377\204\354\354\341\377\1\330\330\316\377\247\354\354\341\377\2" \
-  "CDF\377\231\240\276\377\203\234\243\302\377\2\220\227\264\377\233\242" \
-  "\301\377\214\234\243\302\377\4<=@\377\354\354\341\377\344\344\331\377" \
-  "\337\337\324\377\230\354\354\341\377\2\335\335\322\377\350\350\335\377" \
-  "\227\354\354\341\377\5\353\353\340\377\327\327\315\377\354\354\341\377" \
-  "\264\264\254\377[_m\377\210\234\243\302\377\2""7:D\377\220\226\263\377" \
-  "\202\234\243\302\377\3\224\232\270\377\220\227\264\377\230\237\275\377" \
-  "\210\234\243\302\377\2""89<\377\353\353\340\377\204\354\354\341\377\2" \
-  "\351\351\336\377\332\332\320\377\216\354\354\341\377\2fge\377w|\224\377" \
-  "\205\234\243\302\377\5sx\215\377iig\377\354\354\341\377\343\343\331\377" \
-  "\342\342\330\377\230\354\354\341\377\2\331\331\317\377\351\351\336\377" \
-  "\216\354\354\341\377\2\346\346\333\377\340\340\326\377\203\354\354\341" \
-  "\377\2\347\347\334\377\335\335\322\377\247\354\354\341\377\2\204\204" \
-  "\177\377sx\217\377\203\234\243\302\377\2\225\234\272\377\226\235\273" \
-  "\377\214\234\243\302\377\5@BI\377\337\337\325\377\354\354\341\377\331" \
-  "\331\317\377\352\352\337\377\227\354\354\341\377\2\335\335\322\377\350" \
-  "\350\335\377\227\354\354\341\377\5\337\337\324\377\343\343\331\377\354" \
-  "\354\341\377}}y\377w}\225\377\210\234\243\302\377\2]at\377gl\200\377" \
-  "\202\234\243\302\377\3\220\226\263\377\232\241\277\377\222\230\265\377" \
-  "\210\234\243\302\377\2Z^l\377\245\245\236\377\205\354\354\341\377\2\336" \
-  "\336\323\377\345\345\332\377\214\354\354\341\377\2\311\311\300\377BD" \
-  "L\377\205\234\243\302\377\6\224\232\270\37778;\377\345\345\332\377\354" \
-  "\354\341\377\343\343\331\377\342\342\330\377\227\354\354\341\377\2\345" \
-  "\345\332\377\335\335\322\377\217\354\354\341\377\2\336\336\323\377\351" \
-  "\351\336\377\203\354\354\341\377\2\337\337\324\377\345\345\332\377\247" \
-  "\354\354\341\377\2\321\321\307\377KMV\377\203\234\243\302\377\2\233\242" \
-  "\301\377\220\227\264\377\214\234\243\302\377\5\\`p\377\256\256\246\377" \
-  "\354\354\341\377\347\347\334\377\334\334\322\377\227\354\354\341\377" \
-  "\2\335\335\322\377\350\350\335\377\226\354\354\341\377\2\352\352\337" \
-  "\377\330\330\316\377\202\354\354\341\377\2JKK\377\225\234\272\377\210" \
-  "\234\243\302\377\7\211\217\252\377<\77K\377\234\243\302\377\232\241\300" \
-  "\377\221\230\265\377\234\243\302\377\220\226\263\377\210\234\243\302" \
-  "\377\2\222\231\266\377ABC\377\205\354\354\341\377\2\353\353\340\377\330" \
-  "\330\316\377\214\354\354\341\377\2EFG\377\212\221\254\377\204\234\243" \
-  "\302\377\3\230\237\276\377<=D\377\270\270\257\377\202\354\354\341\377" \
-  "\2\343\343\331\377\342\342\330\377\227\354\354\341\377\2\330\330\316" \
-  "\377\352\352\337\377\217\354\354\341\377\1\332\332\320\377\204\354\354" \
-  "\341\377\1\330\330\316\377\251\354\354\341\377\1\77AC\377\204\234\243" \
-  "\302\377\2\220\227\264\377\233\242\301\377\213\234\243\302\377\2|\201" \
-  "\232\377nol\377\202\354\354\341\377\2\337\337\324\377\341\341\327\377" \
-  "\226\354\354\341\377\2\335\335\322\377\350\350\335\377\225\354\354\341" \
-  "\377\6\353\353\340\377\330\330\316\377\350\350\335\377\354\354\341\377" \
-  "\352\352\337\3779:>\377\212\234\243\302\377\7""14=\377\221\230\264\377" \
-  "\225\233\271\377\227\235\273\377\234\243\302\377\223\232\267\377\230" \
-  "\237\276\377\210\234\243\302\377\2JLV\377\305\305\273\377\205\354\354" \
-  "\341\377\2\344\344\331\377\334\334\322\377\212\354\354\341\377\2rrp\377" \
-  "ej{\377\204\234\243\302\377\3\231\240\276\377>\77G\377\246\246\237\377" \
-  "\203\354\354\341\377\2\343\343\331\377\342\342\330\377\226\354\354\341" \
-  "\377\2\334\334\322\377\344\344\331\377\217\354\354\341\377\2\347\347" \
-  "\334\377\337\337\324\377\203\354\354\341\377\2\351\351\336\377\333\333" \
-  "\321\377\251\354\354\341\377\2ssq\377~\204\235\377\203\234\243\302\377" \
-  "\2\227\236\274\377\224\232\270\377\214\234\243\302\377\1""78;\377\203" \
-  "\354\354\341\377\2\332\332\320\377\345\345\332\377\225\354\354\341\377" \
-  "\2\335\335\322\377\350\350\335\377\225\354\354\341\377\2\333\333\321" \
-  "\377\344\344\331\377\202\354\354\341\377\2\254\254\244\377Y\\k\377\212" \
-  "\234\243\302\377\3mr\207\377QUe\377\217\226\262\377\202\234\243\302\377" \
-  "\2\232\241\300\377\220\227\264\377\210\234\243\302\377\2\205\213\246" \
-  "\377YZY\377\206\354\354\341\377\2\337\337\325\377\340\340\326\377\210" \
-  "\354\354\341\377\2\223\224\216\377QT`\377\204\234\243\302\377\3\232\241" \
-  "\277\377ACJ\377\243\244\235\377\204\354\354\341\377\2\343\343\331\377" \
-  "\342\342\330\377\225\354\354\341\377\2\340\340\326\377\337\337\325\377" \
-  "\220\354\354\341\377\2\333\333\321\377\352\352\337\377\203\354\354\341" \
-  "\377\2\340\340\326\377\343\343\331\377\251\354\354\341\377\2\305\305" \
-  "\273\377LNX\377\204\234\243\302\377\2\220\227\264\377\232\241\300\377" \
-  "\213\234\243\302\377\2TWd\377\265\265\255\377\202\354\354\341\377\3\353" \
-  "\353\340\377\330\330\316\377\351\351\336\377\224\354\354\341\377\2\335" \
-  "\335\322\377\350\350\335\377\224\354\354\341\377\2\337\337\325\377\340" \
-  "\340\326\377\203\354\354\341\377\2QQR\377\215\223\257\377\212\234\243" \
-  "\302\377\3\232\241\300\377&(1\377\225\233\271\377\203\234\243\302\377" \
-  "\2\223\232\267\377\230\237\275\377\210\234\243\302\377\2@BJ\377\312\312" \
-  "\301\377\206\354\354\341\377\2\333\333\321\377\345\345\332\377\206\354" \
-  "\354\341\377\3\260\260\250\377@BI\377\233\242\301\377\203\234\243\302" \
-  "\377\3\204\212\245\3779:\77\377\243\243\235\377\205\354\354\341\377\2" \
-  "\343\343\331\377\342\342\330\377\224\354\354\341\377\2\345\345\332\377" \
-  "\333\333\321\377\220\354\354\341\377\2\346\346\333\377\337\337\324\377" \
-  "\204\354\354\341\377\2\330\330\316\377\353\353\340\377\252\354\354\341" \
-  "\377\2KLL\377\211\217\253\377\203\234\243\302\377\2\231\240\276\377\222" \
-  "\230\265\377\213\234\243\302\377\2\211\217\252\377XXX\377\203\354\354" \
-  "\341\377\3\351\351\336\377\327\327\315\377\353\353\340\377\223\354\354" \
-  "\341\377\2\335\335\322\377\350\350\335\377\223\354\354\341\377\2\344" \
-  "\344\331\377\334\334\322\377\203\354\354\341\377\2\340\340\326\377=>" \
-  "D\377\213\234\243\302\377\3\233\242\301\377ORc\377gk\200\377\203\234" \
-  "\243\302\377\2\233\242\301\377\220\226\263\377\210\234\243\302\377\2" \
-  "\211\217\253\377GHI\377\206\354\354\341\377\3\353\353\340\377\330\330" \
-  "\316\377\350\350\335\377\204\354\354\341\377\3\225\225\220\377<=C\377" \
-  "\227\235\273\377\202\234\243\302\377\4\232\241\277\377X[i\377LLM\377" \
-  "\326\326\314\377\206\354\354\341\377\2\343\343\331\377\342\342\330\377" \
-  "\223\354\354\341\377\3\350\350\335\377\330\330\316\377\353\353\340\377" \
-  "\220\354\354\341\377\2\332\332\320\377\353\353\340\377\203\354\354\341" \
-  "\377\2\344\344\331\377\337\337\324\377\253\354\354\341\377\2\310\310" \
-  "\277\377BEM\377\204\234\243\302\377\2\221\230\265\377\231\240\276\377" \
-  "\213\234\243\302\377\2;<A\377\345\345\332\377\203\354\354\341\377\3\346" \
-  "\346\333\377\330\330\316\377\351\351\336\377\222\354\354\341\377\2\335" \
-  "\335\322\377\350\350\335\377\222\354\354\341\377\3\342\342\330\377\332" \
-  "\332\320\377\353\353\340\377\203\354\354\341\377\2\221\221\214\377hl" \
-  "\200\377\213\234\243\302\377\3\222\231\266\377\220\226\263\377,.7\377" \
-  "\204\234\243\302\377\2\224\233\270\377\227\235\273\377\210\234\243\302" \
-  "\377\2RUa\377\252\252\243\377\206\354\354\341\377\15\351\351\336\377" \
-  "\330\330\316\377\346\346\333\377\354\354\341\377\346\346\333\377^_]\377" \
-  "SVc\377\233\242\301\377\234\243\302\377\211\217\252\377WZh\37778;\377" \
-  "\233\233\225\377\210\354\354\341\377\2\343\343\331\377\342\342\330\377" \
-  "\222\354\354\341\377\3\346\346\333\377\330\330\316\377\351\351\336\377" \
-  "\220\354\354\341\377\2\344\344\331\377\340\340\326\377\204\354\354\341" \
-  "\377\2\330\330\316\377\353\353\340\377\254\354\354\341\377\2[[[\377\177" \
-  "\205\237\377\203\234\243\302\377\2\232\241\277\377\220\227\264\377\213" \
-  "\234\243\302\377\2chy\377\234\234\225\377\204\354\354\341\377\3\350\350" \
-  "\335\377\330\330\316\377\346\346\333\377\221\354\354\341\377\2\335\335" \
-  "\322\377\350\350\335\377\221\354\354\341\377\2\336\336\323\377\335\335" \
-  "\322\377\205\354\354\341\377\2BCE\377\227\235\273\377\212\234\243\302" \
-  "\377\5\232\241\277\377\220\227\264\377\234\243\302\377CFU\377x~\226\377" \
-  "\204\234\243\302\377\1\220\226\263\377\210\234\243\302\377\3\225\234" \
-  "\272\37778:\377\350\350\335\377\206\354\354\341\377\12\353\353\340\377" \
-  "\331\331\317\377\313\313\302\377--.\377;>I\377\\`p\377QS_\377;<A\377" \
-  "[\\[\377\265\265\255\377\212\354\354\341\377\2\343\343\331\377\342\342" \
-  "\330\377\221\354\354\341\377\3\342\342\330\377\331\331\317\377\353\353" \
-  "\340\377\221\354\354\341\377\1\332\332\320\377\204\354\354\341\377\2" \
-  "\341\341\327\377\340\340\326\377\255\354\354\341\377\2\325\325\313\377" \
-  ";=B\377\204\234\243\302\377\2\222\231\266\377\230\237\275\377\212\234" \
-  "\243\302\377\2\224\233\270\377GHI\377\205\354\354\341\377\3\353\353\340" \
-  "\377\331\331\317\377\342\342\330\377\220\354\354\341\377\2\335\335\322" \
-  "\377\350\350\335\377\217\354\354\341\377\3\353\353\340\377\332\332\320" \
-  "\377\342\342\330\377\205\354\354\341\377\2\322\322\310\377GIQ\377\213" \
-  "\234\243\302\377\6\222\230\265\377\231\240\276\377\234\243\302\377\211" \
-  "\217\252\37768C\377\233\242\301\377\203\234\243\302\377\2\226\235\273" \
-  "\377\225\233\271\377\210\234\243\302\377\2jn\201\377vwt\377\210\354\354" \
-  "\341\377\6\303\303\272\377}}y\377\235\235\226\377\261\261\251\377\306" \
-  "\306\274\377\350\350\335\377\214\354\354\341\377\2\343\343\331\377\342" \
-  "\342\330\377\220\354\354\341\377\2\336\336\323\377\335\335\322\377\222" \
-  "\354\354\341\377\2\341\341\327\377\343\343\331\377\203\354\354\341\377" \
-  "\2\353\353\340\377\327\327\315\377\257\354\354\341\377\2mmk\377ty\220" \
-  "\377\203\234\243\302\377\2\233\242\301\377\220\226\263\377\213\234\243" \
-  "\302\377\2DFM\377\327\327\315\377\206\354\354\341\377\202\335\335\322" \
-  "\377\1\352\352\337\377\216\354\354\341\377\2\335\335\322\377\350\350" \
-  "\335\377\216\354\354\341\377\3\346\346\333\377\330\330\316\377\346\346" \
-  "\333\377\206\354\354\341\377\2vvs\377x}\225\377\212\234\243\302\377\2" \
-  "\231\240\276\377\222\230\265\377\203\234\243\302\377\2""46@\377\205\213" \
-  "\246\377\204\234\243\302\377\2\220\226\263\377\233\242\301\377\210\234" \
-  "\243\302\377\2BDM\377\270\270\257\377\210\354\354\341\377\3\341\341\327" \
-  "\377\331\331\317\377\350\350\335\377\216\354\354\341\377\2\343\343\331" \
-  "\377\342\342\330\377\216\354\354\341\377\3\351\351\336\377\331\331\317" \
-  "\377\341\341\327\377\222\354\354\341\377\2\353\353\340\377\332\332\320" \
-  "\377\204\354\354\341\377\2\337\337\325\377\342\342\330\377\257\354\354" \
-  "\341\377\3\337\337\325\37778<\377\233\242\301\377\203\234\243\302\377" \
-  "\2\225\233\271\377\225\234\272\377\212\234\243\302\377\2{\201\231\377" \
-  "^^^\377\207\354\354\341\377\4\345\345\332\377\330\330\316\377\337\337" \
-  "\325\377\353\353\340\377\214\354\354\341\377\2\335\335\322\377\350\350" \
-  "\335\377\214\354\354\341\377\4\350\350\335\377\332\332\320\377\334\334" \
-  "\322\377\352\352\337\377\206\354\354\341\377\2\336\336\323\3779;\77\377" \
-  "\212\234\243\302\377\3\233\242\301\377\217\226\262\377\232\241\300\377" \
-  "\203\234\243\302\377\3fj\177\377/19\377\232\241\300\377\203\234\243\302" \
-  "\377\2\230\237\275\377\222\230\265\377\210\234\243\302\377\3\224\233" \
-  "\270\377569\377\337\337\324\377\210\354\354\341\377\4\350\350\335\377" \
-  "\332\332\320\377\335\335\322\377\352\352\337\377\214\354\354\341\377" \
-  "\2\343\343\331\377\342\342\330\377\214\354\354\341\377\4\352\352\337" \
-  "\377\335\335\322\377\332\332\320\377\350\350\335\377\223\354\354\341" \
-  "\377\2\335\335\322\377\346\346\333\377\203\354\354\341\377\2\352\352" \
-  "\337\377\330\330\316\377\261\354\354\341\377\2\201\202~\377jn\202\377" \
-  "\204\234\243\302\377\2\221\230\265\377\230\237\275\377\212\234\243\302" \
-  "\377\2ACJ\377\307\307\276\377\210\354\354\341\377\3\342\342\330\377\327" \
-  "\327\315\377\342\342\330\377\213\354\354\341\377\2\335\335\322\377\350" \
-  "\350\335\377\212\354\354\341\377\4\352\352\337\377\334\334\322\377\332" \
-  "\332\320\377\350\350\335\377\210\354\354\341\377\2eed\377z\177\230\377" \
-  "\212\234\243\302\377\2\221\230\265\377\230\237\275\377\204\234\243\302" \
-  "\377\3""9:@\377iig\377ei|\377\204\234\243\302\377\2\224\233\270\377\225" \
-  "\233\271\377\210\234\243\302\377\2|\201\232\377QQQ\377\212\354\354\341" \
-  "\377\4\345\345\332\377\330\330\316\377\337\337\324\377\353\353\340\377" \
-  "\212\354\354\341\377\2\343\343\331\377\342\342\330\377\212\354\354\341" \
-  "\377\4\353\353\340\377\337\337\324\377\330\330\316\377\345\345\332\377" \
-  "\224\354\354\341\377\2\341\341\327\377\340\340\326\377\204\354\354\341" \
-  "\377\2\335\335\322\377\345\345\332\377\261\354\354\341\377\3\347\347" \
-  "\334\377669\377\230\237\276\377\203\234\243\302\377\3\233\242\301\377" \
-  "\220\226\263\377\232\241\277\377\211\234\243\302\377\2\212\220\253\377" \
-  "FFG\377\211\354\354\341\377\5\353\353\340\377\337\337\325\377\330\330" \
-  "\316\377\337\337\324\377\347\347\334\377\210\354\354\341\377\2\335\335" \
-  "\322\377\350\350\335\377\207\354\354\341\377\5\353\353\340\377\343\343" \
-  "\331\377\333\333\321\377\331\331\317\377\346\346\333\377\211\354\354" \
-  "\341\377\2\314\314\303\377ACK\377\212\234\243\302\377\2\224\232\270\377" \
-  "\225\233\271\377\204\234\243\302\377\5pu\212\377uur\377\350\350\335\377" \
-  "568\377\216\225\261\377\204\234\243\302\377\2\222\230\265\377\227\236" \
-  "\274\377\210\234\243\302\377\2^bq\377zzw\377\213\354\354\341\377\4\343" \
-  "\343\331\377\330\330\316\377\335\335\322\377\345\345\332\377\210\354" \
-  "\354\341\377\2\343\343\331\377\342\342\330\377\210\354\354\341\377\4" \
-  "\345\345\332\377\335\335\322\377\330\330\316\377\343\343\331\377\225" \
-  "\354\354\341\377\2\345\345\332\377\335\335\322\377\204\354\354\341\377" \
-  "\2\351\351\336\377\331\331\317\377\263\354\354\341\377\2\251\251\241" \
-  "\377FHQ\377\204\234\243\302\377\3\232\241\300\377\217\226\262\377\233" \
-  "\242\301\377\211\234\243\302\377\2QT`\377\254\254\245\377\213\354\354" \
-  "\341\377\6\346\346\333\377\335\335\322\377\330\330\316\377\335\335\322" \
-  "\377\345\345\332\377\352\352\337\377\204\354\354\341\377\2\335\335\322" \
-  "\377\350\350\335\377\204\354\354\341\377\2\351\351\336\377\341\341\327" \
-  "\377\202\331\331\317\377\2\340\340\326\377\351\351\336\377\213\354\354" \
-  "\341\377\2LMM\377\211\217\252\377\211\234\243\302\377\2\227\235\273\377" \
-  "\222\230\265\377\204\234\243\302\377\7\213\221\255\37789;\377\343\343" \
-  "\331\377\354\354\341\377\274\274\264\377<>E\377\233\242\301\377\204\234" \
-  "\243\302\377\2\220\226\263\377\232\241\277\377\210\234\243\302\377\2" \
-  "OQ]\377\221\221\214\377\214\354\354\341\377\6\350\350\335\377\337\337" \
-  "\324\377\331\331\317\377\333\333\321\377\343\343\331\377\352\352\337" \
-  "\377\204\354\354\341\377\2\343\343\331\377\342\342\330\377\204\354\354" \
-  "\341\377\6\352\352\337\377\343\343\331\377\333\333\321\377\331\331\317" \
-  "\377\337\337\324\377\350\350\335\377\226\354\354\341\377\2\351\351\336" \
-  "\377\332\332\320\377\204\354\354\341\377\3\353\353\340\377\330\330\316" \
-  "\377\350\350\335\377\264\354\354\341\377\2}~z\377]`p\377\204\234\243" \
-  "\302\377\2\230\237\276\377\220\227\264\377\211\234\243\302\377\3\224" \
-  "\233\270\37789;\377\352\352\337\377\215\354\354\341\377\3\350\350\335" \
-  "\377\337\337\325\377\333\333\321\377\203\331\331\317\377\3\332\332\320" \
-  "\377\317\317\304\377\330\330\316\377\204\331\331\317\377\3\334\334\322" \
-  "\377\342\342\330\377\353\353\340\377\215\354\354\341\377\2\262\262\253" \
-  "\377NQ\\\377\211\234\243\302\377\2\231\240\276\377\220\226\263\377\204" \
-  "\234\243\302\377\3\226\235\273\37767;\377\317\317\305\377\203\354\354" \
-  "\341\377\2mnk\377fj}\377\204\234\243\302\377\3\232\241\300\377\217\226" \
-  "\262\377\233\242\301\377\210\234\243\302\377\2DFO\377\245\246\237\377" \
-  "\216\354\354\341\377\3\352\352\337\377\340\340\326\377\334\334\322\377" \
-  "\203\331\331\317\377\4\332\332\320\377\325\325\312\377\324\324\311\377" \
-  "\332\332\320\377\203\331\331\317\377\3\334\334\322\377\340\340\326\377" \
-  "\352\352\337\377\230\354\354\341\377\3\353\353\340\377\331\331\317\377" \
-  "\352\352\337\377\204\354\354\341\377\2\333\333\321\377\345\345\332\377" \
-  "\266\354\354\341\377\2TUT\377sy\216\377\204\234\243\302\377\2\226\235" \
-  "\273\377\223\232\267\377\211\234\243\302\377\2cgx\377\214\215\210\377" \
-  "\223\354\354\341\377\3\353\353\340\377\331\331\317\377\346\346\333\377" \
-  "\223\354\354\341\377\3\353\353\340\377:;=\377\223\232\267\377\210\234" \
-  "\243\302\377\3\232\241\300\377\217\226\262\377\232\241\300\377\204\234" \
-  "\243\302\377\2ACJ\377\262\262\253\377\204\354\354\341\377\3\347\347\334" \
-  "\377679\377\211\217\253\377\204\234\243\302\377\2\230\237\276\377\220" \
-  "\227\264\377\210\234\243\302\377\3\231\240\276\377<>D\377\264\264\255" \
-  "\377\224\354\354\341\377\2\340\340\326\377\337\337\325\377\237\354\354" \
-  "\341\377\2\333\333\321\377\347\347\334\377\204\354\354\341\377\2\337" \
-  "\337\325\377\340\340\326\377\267\354\354\341\377\3\345\345\332\377<<" \
-  "=\377\205\213\246\377\204\234\243\302\377\2\223\232\267\377\225\234\272" \
-  "\377\210\234\243\302\377\3\232\241\300\37778<\377\321\321\307\377\223" \
-  "\354\354\341\377\2\335\335\322\377\350\350\335\377\223\354\354\341\377" \
-  "\2\200\200|\377afw\377\210\234\243\302\377\3\233\242\301\377\220\226" \
-  "\263\377\231\240\276\377\204\234\243\302\377\2VYf\377\214\215\210\377" \
-  "\206\354\354\341\377\3\276\276\265\377>@H\377\226\235\273\377\204\234" \
-  "\243\302\377\2\227\235\273\377\222\231\266\377\210\234\243\302\377\3" \
-  "\226\235\273\377<>D\377\241\241\233\377\223\354\354\341\377\2\343\343" \
-  "\331\377\342\342\330\377\236\354\354\341\377\2\336\336\323\377\344\344" \
-  "\331\377\204\354\354\341\377\2\344\344\331\377\334\334\322\377\271\354" \
-  "\354\341\377\3\325\325\313\377458\377\222\231\266\377\204\234\243\302" \
-  "\377\2\222\231\266\377\223\232\267\377\210\234\243\302\377\3\212\220" \
-  "\253\3779:;\377\342\342\330\377\222\354\354\341\377\2\335\335\322\377" \
-  "\350\350\335\377\222\354\354\341\377\2\252\252\244\377DGP\377\210\234" \
-  "\243\302\377\3\232\241\277\377\217\226\262\377\230\237\275\377\204\234" \
-  "\243\302\377\2mr\206\377bca\377\210\354\354\341\377\3nol\377di|\377\230" \
-  "\237\276\377\204\234\243\302\377\3\225\234\272\377\221\230\265\377\233" \
-  "\242\301\377\207\234\243\302\377\3\232\241\277\377GIS\377\206\207\202" \
-  "\377\222\354\354\341\377\2\343\343\331\377\342\342\330\377\234\354\354" \
-  "\341\377\3\353\353\340\377\334\334\322\377\342\342\330\377\204\354\354" \
-  "\341\377\2\350\350\335\377\331\331\317\377\273\354\354\341\377\3\274" \
-  "\274\263\377:;B\377\232\241\300\377\204\234\243\302\377\3\225\234\272" \
-  "\377\220\227\264\377\233\242\301\377\207\234\243\302\377\3x~\225\377" \
-  "MMM\377\353\353\340\377\221\354\354\341\377\2\335\335\322\377\350\350" \
-  "\335\377\221\354\354\341\377\3\311\311\300\37779=\377\230\237\275\377" \
-  "\207\234\243\302\377\3\230\237\275\377\217\226\262\377\232\241\277\377" \
-  "\204\234\243\302\377\3\201\206\240\377EFF\377\351\351\336\377\210\354" \
-  "\354\341\377\4\347\347\334\377BCD\377sw\216\377\232\241\300\377\204\234" \
-  "\243\302\377\3\230\237\275\377\220\226\263\377\232\241\300\377\210\234" \
-  "\243\302\377\3VYg\377jjh\377\353\353\340\377\220\354\354\341\377\2\343" \
-  "\343\331\377\342\342\330\377\233\354\354\341\377\3\352\352\337\377\331" \
-  "\331\317\377\346\346\333\377\204\354\354\341\377\3\352\352\337\377\330" \
-  "\330\316\377\352\352\337\377\274\354\354\341\377\2\227\227\222\377LO" \
-  "Z\377\205\234\243\302\377\3\230\237\275\377\217\226\262\377\232\241\277" \
-  "\377\207\234\243\302\377\2cgx\377pqn\377\221\354\354\341\377\2\335\335" \
-  "\322\377\350\350\335\377\220\354\354\341\377\3\336\336\323\37778;\377" \
-  "\217\225\262\377\207\234\243\302\377\3\225\234\272\377\220\227\264\377" \
-  "\233\242\301\377\204\234\243\302\377\3\217\226\262\37778;\377\336\336" \
-  "\323\377\212\354\354\341\377\3\337\337\325\37789;\377{\201\232\377\205" \
-  "\234\243\302\377\3\232\241\277\377\217\226\262\377\230\237\276\377\210" \
-  "\234\243\302\377\3gl~\377@AB\377\321\321\307\377\217\354\354\341\377" \
-  "\2\343\343\331\377\342\342\330\377\232\354\354\341\377\3\347\347\334" \
-  "\377\331\331\317\377\351\351\336\377\205\354\354\341\377\2\331\331\317" \
-  "\377\347\347\334\377\276\354\354\341\377\3vvt\377QTa\377\233\242\301" \
-  "\377\204\234\243\302\377\3\232\241\277\377\217\226\262\377\230\237\275" \
-  "\377\207\234\243\302\377\2JLW\377\233\234\226\377\220\354\354\341\377" \
-  "\2\335\335\322\377\350\350\335\377\217\354\354\341\377\3\352\352\337" \
-  "\377FGG\377\177\205\237\377\207\234\243\302\377\202\223\232\267\377\205" \
-  "\234\243\302\377\3\212\221\254\37778<\377\310\310\277\377\214\354\354" \
-  "\341\377\4\327\327\315\377457\377\202\210\243\377\233\242\301\377\204" \
-  "\234\243\302\377\3\233\242\301\377\220\227\264\377\226\235\273\377\210" \
-  "\234\243\302\377\3\207\215\250\37778=\377\224\225\217\377\216\354\354" \
-  "\341\377\2\343\343\331\377\342\342\330\377\231\354\354\341\377\3\343" \
-  "\343\331\377\333\333\321\377\353\353\340\377\204\354\354\341\377\3\353" \
-  "\353\340\377\332\332\320\377\343\343\331\377\300\354\354\341\377\3\225" \
-  "\226\221\377\77AH\377\225\234\272\377\204\234\243\302\377\3\233\242\301" \
-  "\377\220\227\264\377\225\234\272\377\206\234\243\302\377\3\232\241\277" \
-  "\37789\77\377\267\267\256\377\217\354\354\341\377\2\335\335\322\377\350" \
-  "\350\335\377\216\354\354\341\377\3\353\353\340\377_`^\377mq\205\377\206" \
-  "\234\243\302\377\3\233\242\301\377\220\227\264\377\226\235\273\377\205" \
-  "\234\243\302\377\3{\200\230\377;<>\377\323\323\311\377\216\354\354\341" \
-  "\377\4\314\314\303\377126\377\201\206\240\377\231\240\276\377\205\234" \
-  "\243\302\377\202\223\232\267\377\210\234\243\302\377\4\232\241\300\377" \
-  "X\\j\377OPP\377\330\330\316\377\214\354\354\341\377\2\343\343\331\377" \
-  "\342\342\330\377\230\354\354\341\377\202\337\337\324\377\205\354\354" \
-  "\341\377\3\351\351\336\377\330\330\316\377\346\346\333\377\302\354\354" \
-  "\341\377\3\272\272\261\37779<\377\212\221\254\377\205\234\243\302\377" \
-  "\3\224\232\270\377\221\230\265\377\232\241\277\377\205\234\243\302\377" \
-  "\3\224\232\270\377;=D\377\217\217\212\377\216\354\354\341\377\2\335\335" \
-  "\322\377\350\350\335\377\215\354\354\341\377\3\337\337\324\377HII\377" \
-  "ei{\377\206\234\243\302\377\3\226\235\273\377\217\226\262\377\230\237" \
-  "\276\377\205\234\243\302\377\3gl~\377OOO\377\343\343\331\377\220\354" \
-  "\354\341\377\4\312\312\301\377347\377z\177\230\377\227\236\274\377\205" \
-  "\234\243\302\377\3\226\235\273\377\220\226\263\377\230\237\275\377\210" \
-  "\234\243\302\377\4\200\206\237\3779:@\377mnk\377\337\337\324\377\212" \
-  "\354\354\341\377\2\343\343\331\377\342\342\330\377\226\354\354\341\377" \
-  "\3\346\346\333\377\332\332\320\377\343\343\331\377\205\354\354\341\377" \
-  "\3\346\346\333\377\330\330\316\377\351\351\336\377\304\354\354\341\377" \
-  "\3\323\323\312\377<=\77\377{\200\230\377\205\234\243\302\377\4\232\241" \
-  "\277\377\221\230\265\377\222\231\266\377\232\241\300\377\204\234\243" \
-  "\302\377\4\233\242\301\377SWc\377__^\377\350\350\335\377\214\354\354" \
-  "\341\377\2\335\335\322\377\350\350\335\377\214\354\354\341\377\3\306" \
-  "\306\275\37777:\377}\203\233\377\205\234\243\302\377\3\230\237\275\377" \
-  "\220\226\263\377\225\233\271\377\205\234\243\302\377\4\233\242\301\377" \
-  "QS_\377qqo\377\353\353\340\377\222\354\354\341\377\4\327\327\315\377" \
-  "99;\377rx\217\377\225\233\271\377\205\234\243\302\377\4\233\242\301\377" \
-  "\223\232\267\377\220\227\264\377\231\240\276\377\210\234\243\302\377" \
-  "\4tz\220\37789>\377|}y\377\344\344\331\377\210\354\354\341\377\2\343" \
-  "\343\331\377\342\342\330\377\224\354\354\341\377\4\350\350\335\377\332" \
-  "\332\320\377\337\337\324\377\353\353\340\377\205\354\354\341\377\3\341" \
-  "\341\327\377\332\332\320\377\353\353\340\377\306\354\354\341\377\3\343" \
-  "\343\331\377PPP\377gl~\377\206\234\243\302\377\4\230\237\276\377\220" \
-  "\227\264\377\224\232\270\377\233\242\301\377\204\234\243\302\377\3os" \
-  "\210\377>\77@\377\327\327\315\377\213\354\354\341\377\2\335\335\322\377" \
-  "\350\350\335\377\213\354\354\341\377\3\241\241\232\3779;@\377\217\226" \
-  "\262\377\204\234\243\302\377\4\231\240\276\377\220\227\264\377\223\232" \
-  "\267\377\233\242\301\377\205\234\243\302\377\3\225\233\271\377>@G\377" \
-  "\232\232\225\377\225\354\354\341\377\4\340\340\326\377CDE\377gl\200\377" \
-  "\222\230\265\377\206\234\243\302\377\1\232\241\277\377\202\222\230\265" \
-  "\377\1\232\241\300\377\210\234\243\302\377\4ot\210\377:;\77\377aaa\377" \
-  "\301\301\270\377\206\354\354\341\377\2\343\343\331\377\342\342\330\377" \
-  "\222\354\354\341\377\4\333\333\320\377\206\206\202\377789\377EFE\377" \
-  "\206\354\354\341\377\2\335\335\322\377\336\336\323\377\312\354\354\341" \
-  "\377\3stq\377QT_\377\233\242\301\377\206\234\243\302\377\3\227\236\274" \
-  "\377\220\226\263\377\225\234\272\377\204\234\243\302\377\3\204\212\245" \
-  "\377459\377\254\254\244\377\212\354\354\341\377\2\335\335\322\377\350" \
-  "\350\335\377\211\354\354\341\377\4\340\340\326\377lmj\377NP\\\377\232" \
-  "\241\277\377\203\234\243\302\377\1\232\241\300\377\202\222\230\265\377" \
-  "\1\232\241\300\377\206\234\243\302\377\3\211\217\253\37789<\377\275\275" \
-  "\264\377\227\354\354\341\377\5\350\350\335\377ijh\377HJS\377\213\221" \
-  "\255\377\232\241\300\377\206\234\243\302\377\4\231\240\276\377\220\227" \
-  "\264\377\224\232\270\377\233\242\301\377\210\234\243\302\377\5\203\211" \
-  "\243\377PS^\377<=@\377\200\200|\377\322\322\310\377\203\354\354\341\377" \
-  "\2\343\343\331\377\342\342\330\377\217\354\354\341\377\7\337\337\325" \
-  "\377\225\226\220\377CDE\377;=C\377gk\177\377:;B\377\302\302\271\377\204" \
-  "\354\354\341\377\3\353\353\340\377\331\331\317\377\342\342\330\377\314" \
-  "\354\354\341\377\3\233\233\226\37789>\377z\177\230\377\207\234\243\302" \
-  "\377\4\225\234\272\377\220\226\263\377\223\232\267\377\231\240\276\377" \
-  "\202\234\243\302\377\5\224\233\270\377Y\\j\377<=\77\377\227\227\222\377" \
-  "\351\351\336\377\207\354\354\341\377\2\335\335\322\377\350\350\335\377" \
-  "\207\354\354\341\377\4\324\324\312\377hig\377<>C\377uz\217\377\202\234" \
-  "\243\302\377\2\233\242\301\377\226\235\273\377\202\221\230\265\377\1" \
-  "\231\240\276\377\206\234\243\302\377\4\230\237\275\377\\`o\377AAC\377" \
-  "\325\325\313\377\232\354\354\341\377\4\255\255\246\37756:\377w}\224\377" \
-  "\225\234\272\377\207\234\243\302\377\4\230\237\275\377\220\227\264\377" \
-  "\222\230\265\377\230\237\275\377\210\234\243\302\377\10\232\241\300\377" \
-  "sx\217\377GIR\377:;\77\377JKL\377\201\202~\377\265\265\255\377\332\332" \
-  "\320\377\212\354\354\341\377\13\340\340\326\377\264\264\254\377\177\200" \
-  "|\377NNO\377;<\77\377;=D\377`dv\377\221\227\264\377\233\242\301\377I" \
-  "KU\377\214\214\207\377\204\354\354\341\377\3\342\342\330\377\330\330" \
-  "\316\377\346\346\333\377\316\354\354\341\377\4\333\333\321\377ddb\377" \
-  "\77AH\377\205\213\245\377\207\234\243\302\377\13\231\240\276\377\223" \
-  "\232\267\377\220\227\264\377\222\230\265\377\227\236\274\377\234\243" \
-  "\302\377\230\237\275\377cgx\37778;\377\202\203\177\377\341\341\327\377" \
-  "\205\354\354\341\377\2\335\335\322\377\350\350\335\377\205\354\354\341" \
-  "\377\7\306\306\274\377UUU\377ACJ\377|\202\233\377\234\243\302\377\232" \
-  "\241\300\377\225\233\271\377\202\220\227\264\377\2\225\234\272\377\233" \
-  "\242\301\377\206\234\243\302\377\4\233\242\301\377hm\177\37767:\377\233" \
-  "\234\225\377\235\354\354\341\377\5\332\332\320\377HII\377UXf\377\213" \
-  "\221\255\377\227\236\274\377\207\234\243\302\377\6\232\241\277\377\224" \
-  "\233\270\377\220\227\264\377\221\230\265\377\227\235\273\377\233\242" \
-  "\301\377\210\234\243\302\377\30\224\233\270\377ty\220\377RUb\377;=C\377" \
-  "9:\77\377;<\77\377=>A\377@AB\377KLL\377DDE\377ABD\377@BD\377ABE\377@" \
-  "AE\377BCJ\377X\\j\377nr\210\377\211\217\253\377\224\233\270\377\232\241" \
-  "\277\377\234\243\302\377\226\235\273\377CEM\377\217\220\212\377\203\354" \
-  "\354\341\377\4\345\345\332\377\330\330\316\377\337\337\325\377\353\353" \
-  "\340\377\321\354\354\341\377\4\317\317\305\377RSS\377HJS\377\215\224" \
-  "\260\377\210\234\243\302\377\34\232\241\277\377\224\233\270\377\220\227" \
-  "\264\377\221\230\265\377\226\235\273\377\230\237\275\377lq\205\377;<" \
-  "A\377ABD\377\\]\\\377\204\204\200\377\254\254\244\377\317\317\305\377" \
-  "\333\333\321\377\336\336\324\377\300\300\267\377\234\234\225\377stq\377" \
-  "NOP\377<>@\377HJT\377\205\213\246\377\230\237\276\377\224\232\270\377" \
-  "\220\226\263\377\221\230\265\377\227\235\273\377\233\242\301\377\210" \
-  "\234\243\302\377\4tz\220\37778<\377\205\205\201\377\350\350\335\377\240" \
-  "\354\354\341\377\5\232\233\224\377447\377dhz\377\217\226\262\377\230" \
-  "\237\276\377\210\234\243\302\377\2\233\242\301\377\225\234\272\377\202" \
-  "\220\227\264\377\3\225\233\271\377\231\240\276\377\233\242\301\377\206" \
-  "\234\243\302\377\2\226\235\273\377\225\234\272\377\204\234\243\302\377" \
-  "\5\225\233\271\377\232\241\300\377\233\242\301\377\231\240\276\377\225" \
-  "\233\271\377\202\220\227\264\377\2\225\234\272\377\232\241\300\377\203" \
-  "\234\243\302\377\3uz\221\37767:\377\255\255\246\377\202\354\354\341\377" \
-  "\4\347\347\334\377\331\331\317\377\336\336\323\377\352\352\337\377\325" \
-  "\354\354\341\377\4\277\277\266\377CDE\377RUb\377\224\233\270\377\211" \
-  "\234\243\302\377\4\232\241\300\377\225\234\272\377\223\232\267\377\221" \
-  "\230\265\377\202\220\227\264\377\12\202\207\241\377lq\207\377[_o\377" \
-  "KNW\37789\77\377\77@H\377RUa\377aex\377uz\221\377\211\220\253\377\202" \
-  "\220\227\264\377\3\222\230\265\377\224\232\270\377\230\237\275\377\212" \
-  "\234\243\302\377\4\201\206\240\377=\77D\377opm\377\340\340\326\377\243" \
-  "\354\354\341\377\6\346\346\333\377|}y\37778<\377sw\217\377\220\227\264" \
-  "\377\232\241\277\377\211\234\243\302\377\4\233\242\301\377\227\235\273" \
-  "\377\223\232\267\377\221\230\265\377\204\220\227\264\377\6\222\230\265" \
-  "\377\224\232\270\377\220\226\263\377\217\225\262\377\224\232\270\377" \
-  "\222\230\265\377\204\220\227\264\377\4\221\230\265\377\223\232\267\377" \
-  "\227\235\273\377\233\242\301\377\204\234\243\302\377\6\222\230\265\377" \
-  "FIQ\377efd\377\343\343\331\377\354\354\341\377\351\351\336\377\202\333" \
-  "\333\321\377\1\351\351\336\377\331\354\354\341\377\4\254\254\245\377" \
-  ":;=\377^br\377\223\232\267\377\217\234\243\302\377\6\232\241\300\377" \
-  "\230\237\275\377\215\223\257\377\224\233\270\377\231\240\276\377\233" \
-  "\242\301\377\217\234\243\302\377\4\177\204\236\377FHP\377\\]\\\377\326" \
-  "\326\314\377\247\354\354\341\377\6\332\332\320\377efd\377:<A\377afx\377" \
-  "\217\225\262\377\232\241\277\377\217\234\243\302\377\6\232\241\300\377" \
-  "\230\237\276\377\221\230\265\377\220\227\264\377\230\237\276\377\232" \
-  "\241\300\377\213\234\243\302\377\10lq\205\3779:<\377\274\274\263\377" \
-  "\354\354\341\377\351\351\336\377\335\335\322\377\331\331\317\377\347" \
-  "\347\334\377\334\354\354\341\377\6\353\353\340\377\240\240\232\377PQ" \
-  "Q\377\77AF\377_cs\377\213\221\255\377\216\234\243\302\377\2\222\230\265" \
-  "\377\231\240\276\377\215\234\243\302\377\6\232\241\277\377uz\222\377" \
-  "KNW\377:;>\377kki\377\312\312\301\377\253\354\354\341\377\7\342\342\330" \
-  "\377\212\212\206\37767:\377LO[\377\201\206\240\377\223\232\267\377\230" \
-  "\237\276\377\216\234\243\302\377\2\226\235\273\377\225\234\272\377\212" \
-  "\234\243\302\377\11\224\232\270\377aew\3779;\77\377wxu\377\343\343\330" \
-  "\377\337\337\324\377\331\331\317\377\334\334\322\377\345\345\332\377" \
-  "\341\354\354\341\377\6\347\347\334\377\253\253\243\377[[[\377<=A\377" \
-  "VYf\377\201\206\240\377\213\234\243\302\377\2\222\230\265\377\231\240" \
-  "\276\377\212\234\243\302\377\6\226\235\273\377lq\206\377EGN\377>\77A" \
-  "\377z{w\377\312\312\301\377\261\354\354\341\377\7\262\262\252\377RRS" \
-  "\37789>\377MP\\\377ou\213\377\220\226\263\377\227\236\274\377\213\234" \
-  "\243\302\377\2\226\235\273\377\225\234\272\377\207\234\243\302\377\5" \
-  "\233\242\301\377uz\222\377CEL\377EFG\377\231\231\222\377\202\330\330" \
-  "\316\377\2\335\335\322\377\346\346\333\377\347\354\354\341\377\10\353" \
-  "\353\340\377\272\272\262\377ijh\377;;>\377LOX\377gl\177\377~\204\235" \
-  "\377\225\234\272\377\206\234\243\302\377\2\222\230\265\377\231\240\276" \
-  "\377\206\234\243\302\377\7\214\223\256\377ty\220\377_br\377\77AF\377" \
-  "DEF\377\213\214\206\377\326\326\314\377\266\354\354\341\377\12\353\353" \
-  "\340\377\275\275\264\377stq\377=>\77\377<>D\377RVd\377im\202\377\204" \
-  "\211\243\377\227\236\274\377\232\241\300\377\206\234\243\302\377\2\226" \
-  "\235\273\377\225\234\272\377\204\234\243\302\377\11\230\237\276\377{" \
-  "\201\231\377SVd\377569\377ppn\377\304\304\273\377\331\331\317\377\337" \
-  "\337\324\377\350\350\335\377\356\354\354\341\377\26\312\312\301\377\235" \
-  "\235\226\377stq\377NOP\377ABE\377>\77D\377>@F\377EGO\377LOY\377SVb\377" \
-  "SWd\377UYf\377QS_\377JLU\377CDL\377>\77E\377\77AE\377CDE\377\\]\\\377" \
-  "\205\205\200\377\255\255\245\377\337\337\325\377\275\354\354\341\377" \
-  "\30\335\335\322\377\263\263\253\377\207\210\203\377Z[[\377\77\77A\377" \
-  "9:\77\377<>E\377FHR\377LOZ\377RUc\377X\\l\377^bu\377bfz\377_bv\377Y]" \
-  "m\377OS_\377CEO\37779<\377\77@A\377jji\377\250\250\240\377\337\337\324" \
-  "\377\343\343\331\377\351\351\336\377\367\354\354\341\377\11\352\352\337" \
-  "\377\337\337\324\377\323\323\311\377\307\307\276\377\260\260\250\377" \
-  "\274\274\264\377\314\314\303\377\327\327\315\377\343\343\331\377\312" \
-  "\354\354\341\377\13\340\340\326\377\315\315\303\377\302\302\271\377\267" \
-  "\267\256\377\252\252\243\377\237\237\230\377\214\214\207\377\222\222" \
-  "\213\377\254\254\244\377\277\277\266\377\325\325\313\377\377\354\354" \
-  "\341\377\203\354\354\341\377\2\335\335\322\377\350\350\335\377\323\354" \
-  "\354\341\377\2\343\343\331\377\342\342\330\377\377\354\354\341\377\206" \
-  "\354\354\341\377\2\335\335\322\377\350\350\335\377\323\354\354\341\377" \
-  "\2\343\343\331\377\342\342\330\377\377\354\354\341\377\206\354\354\341" \
-  "\377\2\335\335\322\377\350\350\335\377\323\354\354\341\377\2\343\343" \
-  "\331\377\342\342\330\377\377\354\354\341\377\206\354\354\341\377\2\335" \
-  "\335\322\377\350\350\335\377\323\354\354\341\377\2\343\343\331\377\342" \
-  "\342\330\377\377\354\354\341\377\206\354\354\341\377\2\335\335\322\377" \
-  "\350\350\335\377\323\354\354\341\377\2\343\343\331\377\342\342\330\377" \
-  "\377\354\354\341\377\206\354\354\341\377\2\352\352\337\377\353\353\340" \
-  "\377\323\354\354\341\377\2\353\353\340\377\352\352\337\377\377\354\354" \
-  "\341\377\377\354\354\341\377\377\354\354\341\377\377\354\354\341\377" \
-  "\377\354\354\341\377\377\354\354\341\377\377\354\354\341\377\377\354" \
-  "\354\341\377\377\354\354\341\377\377\354\354\341\377\377\354\354\341" \
-  "\377\355\354\354\341\377\2\245\245\242\377\230\230\227\377\233\354\354" \
-  "\341\377\3\302\302\274\377\222\222\222\377\327\327\317\377\211\354\354" \
-  "\341\377\2\245\245\242\377\232\232\231\377\225\354\354\341\377\2\223" \
-  "\223\223\377\254\254\251\377\377\354\354\341\377\233\354\354\341\377" \
-  "\2\245\245\242\377\230\230\227\377\233\354\354\341\377\3\302\302\274" \
-  "\377\222\222\222\377\327\327\317\377\211\354\354\341\377\2\245\245\242" \
-  "\377\232\232\231\377\225\354\354\341\377\2\223\223\223\377\254\254\251" \
-  "\377\377\354\354\341\377\233\354\354\341\377\2\245\245\242\377\230\230" \
-  "\227\377\233\354\354\341\377\3\302\302\274\377\222\222\222\377\327\327" \
-  "\317\377\211\354\354\341\377\2\245\245\242\377\232\232\231\377\225\354" \
-  "\354\341\377\2\223\223\223\377\254\254\251\377\317\354\354\341\377\3" \
-  "\337\337\325\377\274\274\264\377\324\324\312\377\212\354\354\341\377" \
-  "\3\314\314\303\377\306\306\275\377\353\353\340\377\207\354\354\341\377" \
-  "\4\347\347\334\377\302\302\271\377\310\310\277\377\350\350\335\377\210" \
-  "\354\354\341\377\4\352\352\337\377\306\306\274\377\311\311\300\377\352" \
-  "\352\337\377\211\354\354\341\377\4\353\353\340\377\337\337\326\377\333" \
-  "\333\322\377\350\350\335\377\211\354\354\341\377\202\340\340\326\377" \
-  "\204\354\354\341\377\3\350\350\335\377\332\332\321\377\343\343\331\377" \
-  "\205\354\354\341\377\2\245\245\242\377\230\230\227\377\202\354\354\341" \
-  "\377\3\343\343\331\377\333\333\322\377\352\352\337\377\207\354\354\341" \
-  "\377\4\353\353\340\377\337\337\325\377\333\333\322\377\350\350\336\377" \
-  "\207\354\354\341\377\1\352\352\340\377\202\334\334\323\377\4\351\351" \
-  "\336\377\302\302\274\377\222\222\222\377\327\327\317\377\205\354\354" \
-  "\341\377\6\347\347\335\377\331\331\320\377\340\340\326\377\354\354\341" \
-  "\377\245\245\242\377\232\232\231\377\206\354\354\341\377\3\347\347\334" \
-  "\377\331\331\320\377\342\342\330\377\210\354\354\341\377\6\344\344\332" \
-  "\377\330\330\320\377\342\342\330\377\354\354\341\377\223\223\223\377" \
-  "\254\254\251\377\315\354\354\341\377\2\323\323\312\377==:\377\203\0\0" \
-  "\0\377\2\37\37\36\377\264\264\254\377\204\354\354\341\377\4\7\7\7\377" \
-  "EEB\377\215\215\207\377\24\24\23\377\202\0\0\0\377\2\22\22\21\377\260" \
-  "\260\250\377\204\354\354\341\377\3\336\336\323\377XXT\377\5\5\5\377\202" \
-  "\0\0\0\377\3\11\11\10\377\206\206\177\377\353\353\340\377\202\354\354" \
-  "\341\377\5\267\267\256\377\6\6\6\377xxr\377||v\377\15\15\15\377\202\0" \
-  "\0\0\377\2!!\37\377\300\300\267\377\206\354\354\341\377\3\353\353\340" \
-  "\377\302\302\274\377\226\226\226\377\203\222\222\222\377\2\266\266\262" \
-  "\377\350\350\335\377\203\354\354\341\377\4\225\225\224\377\254\254\251" \
-  "\377\314\314\305\377\233\233\232\377\202\222\222\222\377\5\236\236\234" \
-  "\377\336\336\325\377\343\343\331\377\256\256\252\377\223\223\222\377" \
-  "\202\222\222\222\377\2\260\260\254\377\351\351\336\377\203\354\354\341" \
-  "\377\4\245\245\242\377\230\230\227\377\324\324\313\377\240\240\236\377" \
-  "\202\222\222\222\377\2\224\224\224\377\310\310\301\377\204\354\354\341" \
-  "\377\3\352\352\340\377\300\300\272\377\226\226\226\377\203\222\222\222" \
-  "\377\2\270\270\263\377\350\350\335\377\203\354\354\341\377\3\353\353" \
-  "\340\377\303\303\275\377\225\225\225\377\202\222\222\222\377\4\227\227" \
-  "\226\377\241\241\237\377\222\222\222\377\327\327\317\377\203\354\354" \
-  "\341\377\2\345\345\333\377\256\256\253\377\203\222\222\222\377\3\237" \
-  "\237\235\377\231\231\230\377\232\232\231\377\204\354\354\341\377\2\333" \
-  "\333\322\377\244\244\242\377\203\222\222\222\377\2\237\237\235\377\327" \
-  "\327\317\377\204\354\354\341\377\2\336\336\325\377\245\245\242\377\203" \
-  "\222\222\222\377\3\246\246\243\377\222\222\222\377\254\254\251\377\314" \
-  "\354\354\341\377\11\337\337\325\377\30\30\27\377\7\7\7\377vvp\377\253" \
-  "\253\243\377\216\216\207\377\33\33\32\377\2\2\2\377\264\264\254\377\203" \
-  "\354\354\341\377\202\0\0\0\377\7\11\11\10\377YYU\377\206\206\177\377" \
-  "cc^\377\3\3\3\377\6\6\6\377\320\320\306\377\202\354\354\341\377\11\345" \
-  "\345\332\377$$\"\377\17\17\17\377\202\202|\377\272\272\261\377\255\255" \
-  "\245\377HHD\377\0\0\0\377\225\225\216\377\202\354\354\341\377\12\265" \
-  "\265\254\377\0\0\0\377\4\4\4\377\21\21\20\377``[\377\210\210\201\377" \
-  "SSO\377\0\0\0\377**(\377\352\352\337\377\205\354\354\341\377\10\262\262" \
-  "\256\377\223\223\223\377\271\271\264\377\325\325\315\377\327\327\316" \
-  "\377\273\273\266\377\222\222\222\377\264\264\260\377\203\354\354\341" \
-  "\377\17\222\222\222\377\223\223\223\377\224\224\224\377\263\263\257\377" \
-  "\305\305\276\377\265\265\261\377\222\222\222\377\234\234\232\377\230" \
-  "\230\227\377\237\237\235\377\274\274\266\377\303\303\275\377\243\243" \
-  "\241\377\222\222\222\377\306\306\277\377\203\354\354\341\377\1\245\245" \
-  "\242\377\202\222\222\222\377\6\254\254\251\377\302\302\274\377\276\276" \
-  "\270\377\231\231\230\377\222\222\222\377\321\321\311\377\203\354\354" \
-  "\341\377\3\260\260\254\377\223\223\223\377\272\272\265\377\202\326\326" \
-  "\316\377\3\271\271\265\377\222\222\222\377\267\267\263\377\203\354\354" \
-  "\341\377\11\274\274\266\377\222\222\222\377\244\244\242\377\305\305\276" \
-  "\377\313\313\304\377\275\275\267\377\234\234\233\377\222\222\222\377" \
-  "\327\327\317\377\202\354\354\341\377\11\352\352\337\377\240\240\236\377" \
-  "\222\222\222\377\262\262\256\377\312\312\303\377\311\311\302\377\263" \
-  "\263\257\377\224\224\224\377\232\232\231\377\203\354\354\341\377\11\330" \
-  "\330\317\377\224\224\223\377\242\242\240\377\315\315\306\377\332\332" \
-  "\321\377\314\314\305\377\236\236\234\377\225\225\225\377\342\342\330" \
-  "\377\202\354\354\341\377\11\342\342\330\377\226\226\226\377\224\224\224" \
-  "\377\272\272\265\377\314\314\305\377\306\306\300\377\255\255\252\377" \
-  "\222\222\222\377\254\254\251\377\314\354\354\341\377\3ppk\377\0\0\0\377" \
-  "\234\234\225\377\203\354\354\341\377\4\322\322\310\377\7\7\7\37700-\377" \
-  "\353\353\340\377\202\354\354\341\377\3\0\0\0\377$$\"\377\321\321\307" \
-  "\377\203\354\354\341\377\3\217\217\210\377\0\0\0\377eea\377\202\354\354" \
-  "\341\377\3{{u\377\0\0\0\377\233\233\224\377\203\354\354\341\377\3\344" \
-  "\344\331\377\12\12\11\377\36\36\35\377\202\354\354\341\377\4\265\265" \
-  "\254\377\0\0\0\377@@=\377\332\332\320\377\203\354\354\341\377\3@@=\377" \
-  "\0\0\0\377\310\310\277\377\204\354\354\341\377\3\326\326\316\377\222" \
-  "\222\222\377\267\267\263\377\204\354\354\341\377\3\250\250\246\377\222" \
-  "\222\222\377\341\341\327\377\202\354\354\341\377\3\222\222\222\377\235" \
-  "\235\233\377\336\336\324\377\203\354\354\341\377\4\261\261\255\377\222" \
-  "\222\222\377\272\272\265\377\352\352\337\377\202\354\354\341\377\3\344" \
-  "\344\332\377\222\222\222\377\252\252\247\377\203\354\354\341\377\3\245" \
-  "\245\242\377\224\224\224\377\331\331\320\377\203\354\354\341\377\3\333" \
-  "\333\322\377\222\222\222\377\246\246\243\377\202\354\354\341\377\3\324" \
-  "\324\313\377\222\222\222\377\272\272\265\377\204\354\354\341\377\10\246" \
-  "\246\243\377\223\223\222\377\343\343\331\377\354\354\341\377\336\336" \
-  "\325\377\223\223\223\377\246\246\243\377\351\351\337\377\203\354\354" \
-  "\341\377\3\302\302\274\377\222\222\222\377\327\327\317\377\202\354\354" \
-  "\341\377\3\303\303\275\377\222\222\222\377\301\301\273\377\204\354\354" \
-  "\341\377\2\245\245\242\377\232\232\231\377\202\354\354\341\377\4\353" \
-  "\353\340\377\245\245\242\377\225\225\225\377\346\346\333\377\203\354" \
-  "\354\341\377\3\321\321\311\377\222\222\222\377\272\272\265\377\202\354" \
-  "\354\341\377\3\261\261\255\377\222\222\222\377\323\323\313\377\204\354" \
-  "\354\341\377\2\223\223\223\377\254\254\251\377\314\354\354\341\377\3" \
-  "&&%\377\23\23\22\377\352\352\337\377\204\354\354\341\377\3SSO\377\0\0" \
-  "\0\377\322\322\310\377\202\354\354\341\377\2\0\0\0\377AA>\377\204\354" \
-  "\354\341\377\3\346\346\333\377\7\7\7\377//-\377\202\354\354\341\377\3" \
-  "))'\377\34\34\33\377\351\351\336\377\204\354\354\341\377\7LLI\377\0\0" \
-  "\0\377\340\340\326\377\354\354\341\377\265\265\254\377\0\0\0\377yys\377" \
-  "\204\354\354\341\377\3xxr\377\0\0\0\377\254\254\244\377\204\354\354\341" \
-  "\377\3\267\267\263\377\222\222\222\377\337\337\325\377\204\354\354\341" \
-  "\377\3\305\305\276\377\222\222\222\377\322\322\312\377\202\354\354\341" \
-  "\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377\3\300\300" \
-  "\273\377\222\222\222\377\322\322\312\377\204\354\354\341\377\2\234\234" \
-  "\232\377\236\236\235\377\203\354\354\341\377\2\245\245\242\377\230\230" \
-  "\227\377\205\354\354\341\377\7\244\244\242\377\222\222\222\377\352\352" \
-  "\337\377\354\354\341\377\264\264\260\377\223\223\223\377\341\341\327" \
-  "\377\204\354\354\341\377\7\302\302\274\377\222\222\222\377\325\325\314" \
-  "\377\354\354\341\377\303\303\275\377\222\222\222\377\317\317\310\377" \
-  "\204\354\354\341\377\3\302\302\274\377\222\222\222\377\327\327\317\377" \
-  "\202\354\354\341\377\3\245\245\243\377\226\226\225\377\350\350\336\377" \
-  "\204\354\354\341\377\2\245\245\242\377\232\232\231\377\202\354\354\341" \
-  "\377\3\340\340\326\377\222\222\222\377\267\267\263\377\204\354\354\341" \
-  "\377\7\351\351\336\377\225\225\225\377\252\252\247\377\354\354\341\377" \
-  "\353\353\340\377\224\224\224\377\244\244\242\377\205\354\354\341\377" \
-  "\2\223\223\223\377\254\254\251\377\313\354\354\341\377\3\353\353\340" \
-  "\377\7\7\7\37711/\377\205\354\354\341\377\3ssn\377\0\0\0\377\260\260" \
-  "\250\377\202\354\354\341\377\2\0\0\0\377AA>\377\205\354\354\341\377\5" \
-  "\37\37\36\377\24\24\23\377\354\354\341\377\352\352\337\377\7\7\7\377" \
-  "\210\0\0\0\377\5\306\306\274\377\354\354\341\377\265\265\254\377\0\0" \
-  "\0\377yys\377\204\354\354\341\377\3\207\207\200\377\0\0\0\377\245\245" \
-  "\235\377\204\354\354\341\377\1\252\252\247\377\210\222\222\222\377\1" \
-  "\310\310\301\377\202\354\354\341\377\2\222\222\222\377\252\252\247\377" \
-  "\204\354\354\341\377\3\304\304\276\377\222\222\222\377\322\322\312\377" \
-  "\204\354\354\341\377\2\240\240\236\377\234\234\233\377\203\354\354\341" \
-  "\377\2\245\245\242\377\230\230\227\377\205\354\354\341\377\5\260\260" \
-  "\254\377\222\222\222\377\341\341\327\377\354\354\341\377\247\247\244" \
-  "\377\210\222\222\222\377\5\312\312\303\377\354\354\341\377\265\265\261" \
-  "\377\222\222\222\377\340\340\326\377\204\354\354\341\377\3\302\302\274" \
-  "\377\222\222\222\377\327\327\317\377\202\354\354\341\377\2\230\230\227" \
-  "\377\243\243\241\377\205\354\354\341\377\2\245\245\242\377\232\232\231" \
-  "\377\202\354\354\341\377\1\322\322\312\377\210\222\222\222\377\5\237" \
-  "\237\235\377\354\354\341\377\340\340\327\377\222\222\222\377\265\265" \
-  "\260\377\205\354\354\341\377\2\223\223\223\377\254\254\251\377\313\354" \
-  "\354\341\377\3\347\347\334\377\1\1\1\377885\377\205\354\354\341\377\3" \
-  "{{u\377\0\0\0\377\247\247\237\377\202\354\354\341\377\2\0\0\0\377AA>" \
-  "\377\205\354\354\341\377\6\40\40\36\377\30\30\26\377\354\354\341\377" \
-  "\344\344\331\377\0\0\0\377++)\377\207\241\241\232\377\5\337\337\325\377" \
-  "\354\354\341\377\265\265\254\377\0\0\0\377yys\377\204\354\354\341\377" \
-  "\3\210\210\202\377\0\0\0\377\245\245\235\377\204\354\354\341\377\2\245" \
-  "\245\242\377\223\223\223\377\207\317\317\310\377\1\340\340\327\377\202" \
-  "\354\354\341\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377" \
-  "\3\305\305\276\377\222\222\222\377\322\322\312\377\204\354\354\341\377" \
-  "\2\240\240\236\377\234\234\233\377\203\354\354\341\377\2\245\245\242" \
-  "\377\230\230\227\377\205\354\354\341\377\6\262\262\256\377\222\222\222" \
-  "\377\342\342\330\377\354\354\341\377\242\242\240\377\225\225\225\377" \
-  "\207\317\317\310\377\5\341\341\327\377\354\354\341\377\257\257\254\377" \
-  "\222\222\222\377\345\345\333\377\204\354\354\341\377\7\302\302\274\377" \
-  "\222\222\222\377\327\327\317\377\354\354\341\377\353\353\340\377\223" \
-  "\223\222\377\250\250\245\377\205\354\354\341\377\2\245\245\242\377\232" \
-  "\232\231\377\202\354\354\341\377\3\315\315\306\377\222\222\222\377\266" \
-  "\266\261\377\206\317\317\310\377\5\324\324\313\377\354\354\341\377\332" \
-  "\332\321\377\222\222\222\377\272\272\265\377\205\354\354\341\377\2\223" \
-  "\223\223\377\254\254\251\377\314\354\354\341\377\202\35\35\34\377\205" \
-  "\354\354\341\377\3``[\377\0\0\0\377\307\307\276\377\202\354\354\341\377" \
-  "\2\0\0\0\377AA>\377\204\354\354\341\377\3\350\350\335\377\6\6\6\377<" \
-  "<9\377\202\354\354\341\377\2\34\34\33\377\35\35\34\377\211\354\354\341" \
-  "\377\3\265\265\254\377\0\0\0\377yys\377\204\354\354\341\377\3\210\210" \
-  "\202\377\0\0\0\377\245\245\235\377\204\354\354\341\377\3\262\262\256" \
-  "\377\222\222\222\377\341\341\330\377\211\354\354\341\377\2\222\222\222" \
-  "\377\252\252\247\377\204\354\354\341\377\3\305\305\276\377\222\222\222" \
-  "\377\322\322\312\377\204\354\354\341\377\2\240\240\236\377\234\234\233" \
-  "\377\203\354\354\341\377\2\245\245\242\377\230\230\227\377\205\354\354" \
-  "\341\377\2\247\247\245\377\226\226\226\377\202\354\354\341\377\3\260" \
-  "\260\254\377\222\222\222\377\344\344\332\377\210\354\354\341\377\3\271" \
-  "\271\264\377\222\222\222\377\334\334\323\377\204\354\354\341\377\3\302" \
-  "\302\274\377\222\222\222\377\327\327\317\377\202\354\354\341\377\2\233" \
-  "\233\232\377\237\237\235\377\205\354\354\341\377\2\245\245\242\377\232" \
-  "\232\231\377\202\354\354\341\377\3\332\332\321\377\222\222\222\377\271" \
-  "\271\264\377\210\354\354\341\377\3\344\344\332\377\222\222\222\377\261" \
-  "\261\255\377\205\354\354\341\377\2\223\223\223\377\254\254\251\377\314" \
-  "\354\354\341\377\3RRN\377\0\0\0\377\272\272\262\377\203\354\354\341\377" \
-  "\1\343\343\331\377\202\25\25\24\377\1\347\347\334\377\202\354\354\341" \
-  "\377\2\0\0\0\377AA>\377\204\354\354\341\377\3\222\222\213\377\0\0\0\377" \
-  "zzt\377\202\354\354\341\377\3RRN\377\0\0\0\377\240\240\230\377\205\354" \
-  "\354\341\377\1\332\332\320\377\202\354\354\341\377\3\265\265\254\377" \
-  "\0\0\0\377yys\377\204\354\354\341\377\3\210\210\202\377\0\0\0\377\245" \
-  "\245\235\377\204\354\354\341\377\3\307\307\300\377\222\222\222\377\271" \
-  "\271\264\377\205\354\354\341\377\2\351\351\336\377\350\350\335\377\202" \
-  "\354\354\341\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377" \
-  "\3\305\305\276\377\222\222\222\377\322\322\312\377\204\354\354\341\377" \
-  "\2\240\240\236\377\234\234\233\377\203\354\354\341\377\2\245\245\242" \
-  "\377\230\230\227\377\204\354\354\341\377\3\337\337\325\377\223\223\223" \
-  "\377\254\254\250\377\202\354\354\341\377\3\304\304\276\377\222\222\222" \
-  "\377\274\274\266\377\205\354\354\341\377\202\350\350\336\377\4\354\354" \
-  "\341\377\310\310\302\377\222\222\222\377\277\277\272\377\204\354\354" \
-  "\341\377\3\274\274\267\377\222\222\222\377\327\327\317\377\202\354\354" \
-  "\341\377\3\253\253\247\377\222\222\222\377\335\335\323\377\203\354\354" \
-  "\341\377\3\352\352\337\377\241\241\237\377\232\232\231\377\202\354\354" \
-  "\341\377\4\350\350\336\377\230\230\227\377\231\231\230\377\343\343\331" \
-  "\377\205\354\354\341\377\6\345\345\333\377\354\354\341\377\353\353\340" \
-  "\377\231\231\230\377\230\230\227\377\350\350\336\377\203\354\354\341" \
-  "\377\3\346\346\334\377\223\223\222\377\254\254\251\377\314\354\354\341" \
-  "\377\11\312\312\301\377\5\5\5\377\"\"\40\377\271\271\260\377\351\351" \
-  "\336\377\321\321\307\377GGC\377\0\0\0\377\216\216\207\377\203\354\354" \
-  "\341\377\11\0\0\0\377\31\31\30\377\221\221\212\377\306\306\274\377\305" \
-  "\305\273\377\203\203}\377\10\10\7\377\35\35\34\377\344\344\331\377\202" \
-  "\354\354\341\377\1\321\321\307\377\202\13\13\12\377\6\206\206\177\377" \
-  "\320\320\306\377\336\336\323\377\257\257\247\377nni\377\26\26\25\377" \
-  "\202\354\354\341\377\3\265\265\254\377\0\0\0\377yys\377\204\354\354\341" \
-  "\377\3\210\210\202\377\0\0\0\377\245\245\235\377\204\354\354\341\377" \
-  "\12\352\352\337\377\242\242\240\377\222\222\222\377\270\270\263\377\336" \
-  "\336\324\377\350\350\335\377\331\331\320\377\304\304\275\377\234\234" \
-  "\232\377\332\332\321\377\202\354\354\341\377\2\222\222\222\377\252\252" \
-  "\247\377\204\354\354\341\377\3\305\305\276\377\222\222\222\377\322\322" \
-  "\312\377\204\354\354\341\377\2\240\240\236\377\234\234\233\377\203\354" \
-  "\354\341\377\11\245\245\242\377\224\224\224\377\310\310\301\377\341\341" \
-  "\327\377\347\347\335\377\325\325\315\377\240\240\237\377\222\222\222" \
-  "\377\333\333\322\377\202\354\354\341\377\22\352\352\337\377\240\240\237" \
-  "\377\222\222\222\377\271\271\265\377\336\336\325\377\350\350\335\377" \
-  "\331\331\320\377\303\303\275\377\233\233\232\377\335\335\324\377\354" \
-  "\354\341\377\350\350\336\377\231\231\230\377\224\224\224\377\306\306" \
-  "\300\377\336\336\324\377\321\321\312\377\260\260\254\377\202\222\222" \
-  "\222\377\1\327\327\317\377\202\354\354\341\377\11\323\323\313\377\222" \
-  "\222\222\377\237\237\236\377\322\322\313\377\335\335\324\377\312\312" \
-  "\303\377\240\240\237\377\222\222\222\377\232\232\231\377\203\354\354" \
-  "\341\377\11\311\311\302\377\222\222\222\377\240\240\236\377\322\322\312" \
-  "\377\345\345\333\377\342\342\330\377\317\317\307\377\256\256\253\377" \
-  "\262\262\256\377\202\354\354\341\377\11\301\301\273\377\222\222\222\377" \
-  "\252\252\247\377\327\327\317\377\333\333\322\377\304\304\276\377\232" \
-  "\232\231\377\222\222\222\377\254\254\251\377\315\354\354\341\377\10\244" \
-  "\244\235\377\20\20\17\377\0\0\0\377\3\3\3\377\0\0\0\377\2\2\2\377uup" \
-  "\377\352\352\337\377\203\354\354\341\377\3\0\0\0\377\14\14\13\377\4\4" \
-  "\4\377\203\0\0\0\377\2))'\377\307\307\276\377\204\354\354\341\377\2\267" \
-  "\267\256\377++)\377\205\0\0\0\377\1""996\377\202\354\354\341\377\3\265" \
-  "\265\254\377\0\0\0\377yys\377\204\354\354\341\377\3\210\210\202\377\0" \
-  "\0\0\377\245\245\235\377\205\354\354\341\377\2\341\341\330\377\256\256" \
-  "\252\377\205\222\222\222\377\2\235\235\234\377\340\340\327\377\202\354" \
-  "\354\341\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377\3" \
-  "\305\305\276\377\222\222\222\377\322\322\312\377\204\354\354\341\377" \
-  "\2\240\240\236\377\234\234\233\377\203\354\354\341\377\3\245\245\242" \
-  "\377\223\223\223\377\225\225\225\377\203\222\222\222\377\2\225\225\225" \
-  "\377\314\314\305\377\204\354\354\341\377\2\340\340\327\377\254\254\251" \
-  "\377\205\222\222\222\377\2\236\236\234\377\342\342\330\377\202\354\354" \
-  "\341\377\2\324\324\314\377\227\227\226\377\203\222\222\222\377\4\241" \
-  "\241\237\377\261\261\255\377\222\222\222\377\327\327\317\377\203\354" \
-  "\354\341\377\1\274\274\267\377\204\222\222\222\377\3\261\261\255\377" \
-  "\240\240\236\377\232\232\231\377\204\354\354\341\377\2\306\306\300\377" \
-  "\230\230\227\377\204\222\222\222\377\2\224\224\224\377\301\301\273\377" \
-  "\202\354\354\341\377\2\350\350\336\377\256\256\252\377\203\222\222\222" \
-  "\377\4\223\223\223\377\275\275\270\377\223\223\222\377\254\254\251\377" \
-  "\316\354\354\341\377\5\326\326\314\377\236\236\226\377zzt\377\222\222" \
-  "\213\377\306\306\275\377\205\354\354\341\377\7\0\0\0\377AA>\377\327\327" \
-  "\315\377\236\236\226\377\216\216\207\377\265\265\254\377\346\346\333" \
-  "\377\206\354\354\341\377\6\351\351\336\377\267\267\256\377\223\223\214" \
-  "\377\177\177y\377\233\233\224\377\312\312\301\377\203\354\354\341\377" \
-  "\3\337\337\324\377\260\260\250\377\317\317\305\377\204\354\354\341\377" \
-  "\3\323\323\312\377\260\260\250\377\332\332\320\377\207\354\354\341\377" \
-  "\5\334\334\323\377\315\315\306\377\302\302\274\377\312\312\303\377\331" \
-  "\331\320\377\204\354\354\341\377\2\325\325\315\377\333\333\322\377\204" \
-  "\354\354\341\377\3\342\342\330\377\325\325\315\377\345\345\333\377\204" \
-  "\354\354\341\377\2\331\331\320\377\330\330\317\377\203\354\354\341\377" \
-  "\7\332\332\321\377\331\331\320\377\346\346\334\377\314\314\305\377\300" \
-  "\300\272\377\312\312\303\377\341\341\327\377\207\354\354\341\377\5\334" \
-  "\334\323\377\314\314\305\377\302\302\274\377\312\312\303\377\332\332" \
-  "\321\377\205\354\354\341\377\10\342\342\330\377\312\312\303\377\302\302" \
-  "\274\377\322\322\313\377\351\351\337\377\341\341\330\377\325\325\315" \
-  "\377\347\347\334\377\204\354\354\341\377\7\330\330\320\377\304\304\275" \
-  "\377\306\306\300\377\332\332\321\377\354\354\341\377\332\332\321\377" \
-  "\327\327\317\377\205\354\354\341\377\6\346\346\333\377\323\323\313\377" \
-  "\305\305\277\377\305\305\276\377\321\321\311\377\346\346\334\377\204" \
-  "\354\354\341\377\10\353\353\340\377\323\323\313\377\301\301\273\377\312" \
-  "\312\303\377\340\340\326\377\354\354\341\377\326\326\315\377\334\334" \
-  "\323\377\330\354\354\341\377\2\0\0\0\377AA>\377\377\354\354\341\377\333" \
-  "\354\354\341\377\2\0\0\0\377AA>\377\377\354\354\341\377\333\354\354\341" \
-  "\377\2\0\0\0\377AA>\377\377\354\354\341\377\240\354\354\341\377")
-
-
diff --git a/recipes/psplash/files/psplash-poky-img.h b/recipes/psplash/files/psplash-poky-img.h
new file mode 100644
index 0000000000..f21d0f9da3
--- /dev/null
+++ b/recipes/psplash/files/psplash-poky-img.h
@@ -0,0 +1,843 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+
+#define POKY_IMG_ROWSTRIDE (880)
+#define POKY_IMG_WIDTH (220)
+#define POKY_IMG_HEIGHT (177)
+#define POKY_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
+#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \
+  "\342\377\377\377\0\13\\o{\34\\o{B\\o{i\\o{\214\\o{\235\\o{\252\\o{\267" \
+  "\\o{\304\\o{\321\\o{\337\\o{\354\202\\o{\371\13\\o{\354\\o{\337\\o{\321" \
+  "\\o{\304\\o{\267\\o{\252\\o{\235\\o{\214\\o{i\\o{B\\o{\34\377\377\377" \
+  "\377\0\277\377\377\377\0\6\\o{\40\\o{Z\\o{\201\\o{\250\\o{\316\\o{\364" \
+  "\230\\o{\377\6\\o{\364\\o{\316\\o{\250\\o{\201\\o{Z\\o{\40\377\377\377" \
+  "\377\0\265\377\377\377\0\4\\o{\30\\o{Y\\o{\233\\o{\336\244\\o{\377\4" \
+  "\\o{\336\\o{\233\\o{Y\\o{\30\377\377\377\377\0\255\377\377\377\0\4\\" \
+  "o{\10\\o{O\\o{\222\\o{\325\254\\o{\377\4\\o{\325\\o{\222\\o{O\\o{\10" \
+  "\377\377\377\377\0\246\377\377\377\0\4\\o{\1\\o{=\\o{\233\\o{\360\262" \
+  "\\o{\377\4\\o{\360\\o{\233\\o{=\\o{\1\377\377\377\377\0\241\377\377\377" \
+  "\0\3\\o{$\\o{\201\\o{\336\270\\o{\377\3\\o{\336\\o{\201\\o{#\377\377" \
+  "\377\377\0\234\377\377\377\0\3\\o{\6\\o{b\\o{\305\276\\o{\377\3\\o{\305" \
+  "\\o{b\\o{\6\377\377\377\377\0\227\377\377\377\0\3\\o{\11\\o{n\\o{\343" \
+  "\302\\o{\377\3\\o{\343\\o{n\\o{\11\377\377\377\377\0\223\377\377\377" \
+  "\0\3\\o{\16\\o{x\\o{\351\306\\o{\377\3\\o{\351\\o{x\\o{\16\377\377\377" \
+  "\377\0\217\377\377\377\0\3\\o{\23\\o{\202\\o{\357\312\\o{\377\3\\o{\357" \
+  "\\o{\202\\o{\23\377\377\377\377\0\213\377\377\377\0\3\\o{\3\\o{p\\o{" \
+  "\362\316\\o{\377\3\\o{\362\\o{p\\o{\3\377\377\377\377\0\210\377\377\377" \
+  "\0\2\\o{9\\o{\320\322\\o{\377\2\\o{\320\\o{9\377\377\377\377\0\205\377" \
+  "\377\377\0\3\\o{\22\\o{\232\\o{\376\324\\o{\377\3\\o{\376\\o{\232\\o" \
+  "{\22\377\377\377\377\0\4\377\377\377\0\\o{\1\\o{a\\o{\353\330\\o{\377" \
+  "\3\\o{\353\\o{a\\o{\1\375\377\377\377\0\2\\o{\32\\o{\277\334\\o{\377" \
+  "\2\\o{\277\\o{\33\373\377\377\377\0\2\\o{G\\o{\352\336\\o{\377\2\\o{" \
+  "\353\\o{H\370\377\377\377\0\3\\o{\3\\o{\205\\o{\376\340\\o{\377\3\\o" \
+  "{\376\\o{\207\\o{\4\365\377\377\377\0\2\\o{\32\\o{\301\344\\o{\377\2" \
+  "\\o{\304\\o{\34\363\377\377\377\0\2\\o{F\\o{\352\346\\o{\377\2\\o{\354" \
+  "\\o{J\361\377\377\377\0\2\\o{m\\o{\375\350\\o{\377\2\\o{\376\\o{t\357" \
+  "\377\377\377\0\1\\o{\205\354\\o{\377\2\\o{\213\\o{\1\353\377\377\377" \
+  "\0\2\\o{\3\\o{\235\356\\o{\377\2\\o{\241\\o{\4\351\377\377\377\0\2\\" \
+  "o{\11\\o{\262\256\\o{\377\11\\o{\350\\o{\300\\o{\231\\o{r\\o{^\\o{Q\\" \
+  "o{D\\o{8\\o{+\202\\o{\36\11\\o{+\\o{7\\o{D\\o{Q\\o{^\\o{r\\o{\231\\o" \
+  "{\300\\o{\350\256\\o{\377\2\\o{\264\\o{\12\347\377\377\377\0\2\\o{\21" \
+  "\\o{\305\252\\o{\377\5\\o{\347\\o{\245\\o{d\\o{6\\o{\17\224\377\377\377" \
+  "\0\5\\o{\17\\o{6\\o{d\\o{\245\\o{\347\252\\o{\377\2\\o{\306\\o{\22\345" \
+  "\377\377\377\0\2\\o{\24\\o{\324\247\\o{\377\4\\o{\363\\o{\261\\o{n\\" \
+  "o{+\236\377\377\377\0\4\\o{+\\o{n\\o{\261\\o{\363\247\\o{\377\2\\o{\324" \
+  "\\o{\24\343\377\377\377\0\2\\o{\13\\o{\312\245\\o{\377\4\\o{\374\\o{" \
+  "\271\\o{[\\o{\12\244\377\377\377\0\4\\o{\12\\o{[\\o{\271\\o{\374\245" \
+  "\\o{\377\2\\o{\312\\o{\13\341\377\377\377\0\2\\o{\5\\o{\270\244\\o{\377" \
+  "\3\\o{\322\\o{t\\o{\32\252\377\377\377\0\3\\o{\32\\o{t\\o{\322\244\\" \
+  "o{\377\2\\o{\270\\o{\5\337\377\377\377\0\2\\o{\1\\o{\244\243\\o{\377" \
+  "\2\\o{\277\\o{D\260\377\377\377\0\2\\o{D\\o{\277\243\\o{\377\2\\o{\244" \
+  "\\o{\1\336\377\377\377\0\1\\o{\215\242\\o{\377\2\\o{\264\\o{9\264\377" \
+  "\377\377\0\2\\o{9\\o{\264\242\\o{\377\1\\o{\215\335\377\377\377\0\1\\" \
+  "o{u\241\\o{\377\2\\o{\265\\o{0\270\377\377\377\0\2\\o{0\\o{\265\241\\" \
+  "o{\377\1\\o{u\333\377\377\377\0\2\\o{V\\o{\376\237\\o{\377\2\\o{\340" \
+  "\\o{P\274\377\377\377\0\2\\o{P\\o{\340\237\\o{\377\2\\o{\376\\o{V\331" \
+  "\377\377\377\0\2\\o{$\\o{\362\236\\o{\377\3\\o{\371\\o{\205\\o{\12\276" \
+  "\377\377\377\0\3\\o{\12\\o{\205\\o{\371\236\\o{\377\2\\o{\362\\o{$\327" \
+  "\377\377\377\0\2\\o{\7\\o{\316\236\\o{\377\2\\o{\303\\o{'\302\377\377" \
+  "\377\0\2\\o{'\\o{\303\236\\o{\377\2\\o{\316\\o{\7\326\377\377\377\0\1" \
+  "\\o{\225\235\\o{\377\3\\o{\376\\o{\205\\o{\3\230\377\377\377\0\11\0\274" \
+  "\344\17\0\274\344*\0\274\344B\0\274\344Z\0\274\344r\0\274\344\213\0\274" \
+  "\344\243\0\274\344\273\0\274\344\323\202\0\274\344\353\11\0\274\344\323" \
+  "\0\274\344\273\0\274\344\243\0\274\344\213\0\274\344r\0\274\344Z\0\274" \
+  "\344B\0\274\344*\0\274\344\17\230\377\377\377\0\3\\o{\3\\o{\205\\o{\376" \
+  "\235\\o{\377\1\\o{\225\325\377\377\377\0\1\\o{T\235\\o{\377\2\\o{\352" \
+  "\\o{F\226\377\377\377\0\5\0\274\344\1\0\274\3442\0\274\344~\0\274\344" \
+  "\312\0\274\344\376\222\0\274\344\377\5\0\274\344\376\0\274\344\312\0" \
+  "\274\344~\0\274\3442\0\274\344\1\226\377\377\377\0\2\\o{F\\o{\352\235" \
+  "\\o{\377\1\\o{T\323\377\377\377\0\2\\o{\"\\o{\360\234\\o{\377\2\\o{\300" \
+  "\\o{\32\224\377\377\377\0\4\0\274\344\12\0\274\344M\0\274\344\232\0\274" \
+  "\344\345\232\0\274\344\377\4\0\274\344\345\0\274\344\232\0\274\344M\0" \
+  "\274\344\12\224\377\377\377\0\2\\o{\32\\o{\300\234\\o{\377\2\\o{\360" \
+  "\\o{\"\321\377\377\377\0\2\\o{\5\\o{\313\234\\o{\377\2\\o{\232\\o{\3" \
+  "\222\377\377\377\0\4\0\274\344\16\0\274\344i\0\274\344\265\0\274\344" \
+  "\367\240\0\274\344\377\4\0\274\344\367\0\274\344\265\0\274\344i\0\274" \
+  "\344\16\222\377\377\377\0\2\\o{\3\\o{\232\234\\o{\377\2\\o{\313\\o{\5" \
+  "\320\377\377\377\0\1\\o{w\234\\o{\377\1\\o{\205\222\377\377\377\0\3\0" \
+  "\274\344\10\0\274\344t\0\274\344\354\246\0\274\344\377\3\0\274\344\354" \
+  "\0\274\344t\0\274\344\10\222\377\377\377\0\1\\o{\205\234\\o{\377\1\\" \
+  "o{w\317\377\377\377\0\2\\o{\35\\o{\364\232\\o{\377\2\\o{\376\\o{o\221" \
+  "\377\377\377\0\3\0\274\344\4\0\274\344e\0\274\344\344\252\0\274\344\377" \
+  "\3\0\274\344\344\0\274\344e\0\274\344\4\221\377\377\377\0\2\\o{o\\o{" \
+  "\376\232\\o{\377\2\\o{\364\\o{\35\316\377\377\377\0\1\\o{\254\232\\o" \
+  "{\377\2\\o{\372\\o{Z\220\377\377\377\0\3\0\274\344\1\0\274\344W\0\274" \
+  "\344\332\256\0\274\344\377\3\0\274\344\332\0\274\344W\0\274\344\1\220" \
+  "\377\377\377\0\2\\o{Z\\o{\372\232\\o{\377\1\\o{\254\315\377\377\377\0" \
+  "\1\\o{G\232\\o{\377\2\\o{\375\\o{T\220\377\377\377\0\2\0\274\344H\0\274" \
+  "\344\316\262\0\274\344\377\2\0\274\344\316\0\274\344H\220\377\377\377" \
+  "\0\2\\o{T\\o{\375\232\\o{\377\1\\o{G\313\377\377\377\0\2\\o{\7\\o{\332" \
+  "\232\\o{\377\1\\o{j\217\377\377\377\0\2\0\274\344\37\0\274\344\276\266" \
+  "\0\274\344\377\2\0\274\344\276\0\274\344\37\217\377\377\377\0\1\\o{j" \
+  "\232\\o{\377\2\\o{\332\\o{\7\312\377\377\377\0\1\\o{}\232\\o{\377\1\\" \
+  "o{\202\217\377\377\377\0\2\0\274\344Q\0\274\344\357\270\0\274\344\377" \
+  "\2\0\274\344\357\0\274\344Q\217\377\377\377\0\1\\o{\202\232\\o{\377\1" \
+  "\\o{}\311\377\377\377\0\2\\o{\37\\o{\366\231\\o{\377\1\\o{\231\216\377" \
+  "\377\377\0\2\0\274\344\7\0\274\344\224\274\0\274\344\377\2\0\274\344" \
+  "\224\0\274\344\7\216\377\377\377\0\1\\o{\231\231\\o{\377\2\\o{\366\\" \
+  "o{\37\310\377\377\377\0\1\\o{\230\231\\o{\377\2\\o{\266\\o{\3\215\377" \
+  "\377\377\0\2\0\274\344\32\0\274\344\316\276\0\274\344\377\2\0\274\344" \
+  "\316\0\274\344\32\215\377\377\377\0\2\\o{\3\\o{\266\231\\o{\377\1\\o" \
+  "{\230\307\377\377\377\0\2\\o{\33\\o{\370\230\\o{\377\2\\o{\343\\o{\23" \
+  "\215\377\377\377\0\2\0\274\344'\0\274\344\340\300\0\274\344\377\2\0\274" \
+  "\344\340\0\274\344'\215\377\377\377\0\2\\o{\23\\o{\343\230\\o{\377\2" \
+  "\\o{\370\\o{\33\306\377\377\377\0\1\\o{\217\230\\o{\377\2\\o{\374\\o" \
+  "{=\215\377\377\377\0\2\0\274\3447\0\274\344\354\302\0\274\344\377\2\0" \
+  "\274\344\354\0\274\3447\215\377\377\377\0\2\\o{=\\o{\374\230\\o{\377" \
+  "\1\\o{\217\305\377\377\377\0\2\\o{\25\\o{\365\230\\o{\377\1\\o{{\215" \
+  "\377\377\377\0\2\0\274\344I\0\274\344\365\304\0\274\344\377\2\0\274\344" \
+  "\365\0\274\344I\215\377\377\377\0\1\\o{{\230\\o{\377\2\\o{\365\\o{\25" \
+  "\304\377\377\377\0\1\\o{\206\230\\o{\377\2\\o{\272\\o{\2\214\377\377" \
+  "\377\0\2\0\274\344>\0\274\344\367\306\0\274\344\377\2\0\274\344\367\0" \
+  "\274\344=\214\377\377\377\0\2\\o{\2\\o{\272\230\\o{\377\1\\o{\206\303" \
+  "\377\377\377\0\2\\o{\20\\o{\361\227\\o{\377\2\\o{\361\\o{\31\214\377" \
+  "\377\377\0\2\0\274\344-\0\274\344\357\310\0\274\344\377\2\0\274\344\356" \
+  "\0\274\344+\214\377\377\377\0\2\\o{\31\\o{\361\227\\o{\377\2\\o{\361" \
+  "\\o{\20\302\377\377\377\0\1\\o{~\230\\o{\377\1\\o{n\214\377\377\377\0" \
+  "\2\0\274\344\36\0\274\344\345\312\0\274\344\377\2\0\274\344\342\0\274" \
+  "\344\34\214\377\377\377\0\1\\o{n\230\\o{\377\1\\o{~\301\377\377\377\0" \
+  "\2\\o{\3\\o{\346\227\\o{\377\2\\o{\317\\o{\3\213\377\377\377\0\2\0\274" \
+  "\344\20\0\274\344\327\314\0\274\344\377\2\0\274\344\323\0\274\344\20" \
+  "\213\377\377\377\0\2\\o{\3\\o{\317\227\\o{\377\2\\o{\346\\o{\3\300\377" \
+  "\377\377\0\1\\o{F\227\\o{\377\2\\o{\376\\o{8\214\377\377\377\0\1\0\274" \
+  "\344\253\316\0\274\344\377\1\0\274\344\260\214\377\377\377\0\2\\o{8\\" \
+  "o{\376\227\\o{\377\1\\o{F\300\377\377\377\0\1\\o{\243\227\\o{\377\1\\" \
+  "o{\233\214\377\377\377\0\1\0\274\344f\320\0\274\344\377\1\0\274\344g" \
+  "\214\377\377\377\0\1\\o{\233\227\\o{\377\1\\o{\243\277\377\377\377\0" \
+  "\2\\o{\13\\o{\364\226\\o{\377\2\\o{\365\\o{\25\213\377\377\377\0\2\0" \
+  "\274\344+\0\274\344\366\320\0\274\344\377\2\0\274\344\365\0\274\344(" \
+  "\213\377\377\377\0\2\\o{\25\\o{\365\226\\o{\377\2\\o{\364\\o{\13\276" \
+  "\377\377\377\0\1\\o{]\227\\o{\377\1\\o{\217\213\377\377\377\0\2\0\274" \
+  "\344\6\0\274\344\323\242\0\274\344\377\16\0\274\344\361\0\274\344\262" \
+  "\0\274\344\215\0\274\344o\0\274\344Q\0\274\3446\0\274\3445\0\274\344" \
+  ";\0\274\344@\0\274\344H\0\274\344j\0\274\344\224\0\274\344\276\0\274" \
+  "\344\351\242\0\274\344\377\2\0\274\344\316\0\274\344\6\213\377\377\377" \
+  "\0\1\\o{\217\227\\o{\377\1\\o{]\276\377\377\377\0\1\\o{\272\226\\o{\377" \
+  "\2\\o{\371\\o{\34\213\377\377\377\0\1\0\274\344m\240\0\274\344\377\4" \
+  "\0\274\344\323\0\274\344\204\0\274\344<\0\274\344\4\215\377\377\377\0" \
+  "\3\0\274\3444\0\274\344\210\0\274\344\333\240\0\274\344\377\1\0\274\344" \
+  "F\213\377\377\377\0\2\\o{\34\\o{\371\226\\o{\377\1\\o{\272\275\377\377" \
+  "\377\0\2\\o{\32\\o{\375\226\\o{\377\1\\o{\233\213\377\377\377\0\2\0\274" \
+  "\344\13\0\274\344\350\235\0\274\344\377\3\0\274\344\374\0\274\344\255" \
+  "\0\274\344\77\223\377\377\377\0\2\0\274\344\4\0\274\344\303\236\0\274" \
+  "\344\377\1\0\274\344p\215\377\377\377\0\1\\o{\233\226\\o{\377\2\\o{\375" \
+  "\\o{\32\274\377\377\377\0\1\\o{r\226\\o{\377\2\\o{\374\\o{$\213\377\377" \
+  "\377\0\1\0\274\344{\234\0\274\344\377\3\0\274\344\376\0\274\344\235\0" \
+  "\274\344\36\224\377\377\377\0\2\0\274\344\4\0\274\344\252\236\0\274\344" \
+  "\377\1\0\274\344q\216\377\377\377\0\2\\o{$\\o{\374\226\\o{\377\1\\o{" \
+  "r\274\377\377\377\0\1\\o{\271\226\\o{\377\1\\o{\252\213\377\377\377\0" \
+  "\2\0\274\344\21\0\274\344\360\233\0\274\344\377\2\0\274\344\330\0\274" \
+  "\344\77\225\377\377\377\0\2\0\274\344\3\0\274\344\251\236\0\274\344\377" \
+  "\1\0\274\344q\220\377\377\377\0\1\\o{\252\226\\o{\377\1\\o{\271\273\377" \
+  "\377\377\0\2\\o{\6\\o{\365\226\\o{\377\1\\o{G\213\377\377\377\0\1\0\274" \
+  "\344\210\232\0\274\344\377\3\0\274\344\376\0\274\344\204\0\274\344\7" \
+  "\225\377\377\377\0\2\0\274\344\3\0\274\344\250\236\0\274\344\377\1\0" \
+  "\274\344r\221\377\377\377\0\1\\o{H\226\\o{\377\2\\o{\365\\o{\6\272\377" \
+  "\377\377\0\1\\o{=\226\\o{\377\2\\o{\346\\o{\3\212\377\377\377\0\2\0\274" \
+  "\344\31\0\274\344\366\231\0\274\344\377\2\0\274\344\366\0\274\344T\226" \
+  "\377\377\377\0\2\0\274\344\3\0\274\344\247\236\0\274\344\377\1\0\274" \
+  "\344r\222\377\377\377\0\2\\o{\3\\o{\346\226\\o{\377\1\\o{=\272\377\377" \
+  "\377\0\1\\o{\177\226\\o{\377\1\\o{\214\213\377\377\377\0\1\0\274\344" \
+  "\226\231\0\274\344\377\2\0\274\344\350\0\274\3447\226\377\377\377\0\2" \
+  "\0\274\344\3\0\274\344\245\236\0\274\344\377\1\0\274\344s\224\377\377" \
+  "\377\0\1\\o{\214\226\\o{\377\1\\o{\177\272\377\377\377\0\1\\o{\301\226" \
+  "\\o{\377\1\\o{.\212\377\377\377\0\2\0\274\344\"\0\274\344\372\230\0\274" \
+  "\344\377\2\0\274\344\343\0\274\344\40\226\377\377\377\0\2\0\274\344\3" \
+  "\0\274\344\244\236\0\274\344\377\1\0\274\344s\225\377\377\377\0\1\\o" \
+  "{.\226\\o{\377\1\\o{\301\271\377\377\377\0\2\\o{\12\\o{\371\225\\o{\377" \
+  "\1\\o{\320\213\377\377\377\0\1\0\274\344\233\230\0\274\344\377\2\0\274" \
+  "\344\367\0\274\3444\226\377\377\377\0\2\0\274\344\2\0\274\344\243\236" \
+  "\0\274\344\377\1\0\274\344s\227\377\377\377\0\1\\o{\320\225\\o{\377\2" \
+  "\\o{\371\\o{\12\270\377\377\377\0\1\\o{E\226\\o{\377\1\\o{|\212\377\377" \
+  "\377\0\2\0\274\344\2\0\274\344\353\230\0\274\344\377\1\0\274\344\\\226" \
+  "\377\377\377\0\2\0\274\344\2\0\274\344\242\236\0\274\344\377\1\0\274" \
+  "\344t\230\377\377\377\0\1\\o{|\226\\o{\377\1\\o{E\270\377\377\377\0\1" \
+  "\\o{\205\226\\o{\377\1\\o{:\212\377\377\377\0\1\0\274\3449\230\0\274" \
+  "\344\377\1\0\274\344\215\226\377\377\377\0\2\0\274\344\2\0\274\344\241" \
+  "\236\0\274\344\377\1\0\274\344t\216\377\377\377\0\1\0\274\344\5\212\377" \
+  "\377\377\0\1\\o{:\226\\o{\377\1\\o{\205\270\377\377\377\0\1\\o{\261\225" \
+  "\\o{\377\2\\o{\363\\o{\4\212\377\377\377\0\1\0\274\344\204\227\0\274" \
+  "\344\377\2\0\274\344\272\0\274\344\3\225\377\377\377\0\2\0\274\344\2" \
+  "\0\274\344\240\236\0\274\344\377\1\0\274\344u\216\377\377\377\0\2\0\274" \
+  "\344<\0\274\344\243\212\377\377\377\0\2\\o{\4\\o{\363\225\\o{\377\1\\" \
+  "o{\261\270\377\377\377\0\1\\o{\330\225\\o{\377\1\\o{\267\213\377\377" \
+  "\377\0\1\0\274\344\317\226\0\274\344\377\2\0\274\344\372\0\274\344!\225" \
+  "\377\377\377\0\2\0\274\344\2\0\274\344\237\236\0\274\344\377\1\0\274" \
+  "\344u\216\377\377\377\0\4\0\274\344;\0\274\344\363\0\274\344\361\0\274" \
+  "\344\4\212\377\377\377\0\1\\o{\267\225\\o{\377\1\\o{\330\267\377\377" \
+  "\377\0\2\\o{\4\\o{\372\225\\o{\377\1\\o{v\212\377\377\377\0\1\0\274\344" \
+  "\33\227\0\274\344\377\1\0\274\344\224\225\377\377\377\0\2\0\274\344\1" \
+  "\0\274\344\236\236\0\274\344\377\1\0\274\344v\216\377\377\377\0\2\0\274" \
+  "\344:\0\274\344\362\202\0\274\344\377\1\0\274\344;\212\377\377\377\0" \
+  "\1\\o{v\225\\o{\377\2\\o{\372\\o{\4\266\377\377\377\0\1\\o{%\226\\o{" \
+  "\377\1\\o{4\212\377\377\377\0\1\0\274\344f\226\0\274\344\377\2\0\274" \
+  "\344\364\0\274\344\27\224\377\377\377\0\2\0\274\344\1\0\274\344\234\236" \
+  "\0\274\344\377\1\0\274\344v\216\377\377\377\0\2\0\274\344:\0\274\344" \
+  "\362\203\0\274\344\377\1\0\274\344\201\212\377\377\377\0\1\\o{4\226\\" \
+  "o{\377\1\\o{%\266\377\377\377\0\1\\o{L\225\\o{\377\2\\o{\372\\o{\4\212" \
+  "\377\377\377\0\1\0\274\344\261\226\0\274\344\377\1\0\274\344\205\224" \
+  "\377\377\377\0\2\0\274\344\1\0\274\344\233\236\0\274\344\377\1\0\274" \
+  "\344w\216\377\377\377\0\2\0\274\3449\0\274\344\362\204\0\274\344\377" \
+  "\1\0\274\344\307\212\377\377\377\0\2\\o{\4\\o{\372\225\\o{\377\1\\o{" \
+  "L\266\377\377\377\0\1\\o{s\225\\o{\377\1\\o{\327\212\377\377\377\0\2" \
+  "\0\274\344\10\0\274\344\365\225\0\274\344\377\2\0\274\344\357\0\274\344" \
+  "\17\223\377\377\377\0\2\0\274\344\1\0\274\344\232\236\0\274\344\377\1" \
+  "\0\274\344w\216\377\377\377\0\2\0\274\3449\0\274\344\362\205\0\274\344" \
+  "\377\2\0\274\344\374\0\274\344\20\212\377\377\377\0\1\\o{\327\225\\o" \
+  "{\377\1\\o{s\266\377\377\377\0\1\\o{\231\225\\o{\377\1\\o{\257\212\377" \
+  "\377\377\0\1\0\274\344G\226\0\274\344\377\1\0\274\344\241\223\377\377" \
+  "\377\0\2\0\274\344\1\0\274\344\231\236\0\274\344\377\1\0\274\344w\216" \
+  "\377\377\377\0\2\0\274\3448\0\274\344\361\207\0\274\344\377\1\0\274\344" \
+  "P\212\377\377\377\0\1\\o{\257\225\\o{\377\1\\o{\231\266\377\377\377\0" \
+  "\1\\o{\300\225\\o{\377\1\\o{\210\212\377\377\377\0\1\0\274\344p\226\0" \
+  "\274\344\377\1\0\274\344U\222\377\377\377\0\2\0\274\344\1\0\274\344\230" \
+  "\236\0\274\344\377\1\0\274\344x\216\377\377\377\0\2\0\274\3448\0\274" \
+  "\344\361\210\0\274\344\377\1\0\274\344v\212\377\377\377\0\1\\o{\210\225" \
+  "\\o{\377\1\\o{\300\266\377\377\377\0\1\\o{\327\225\\o{\377\1\\o{a\212" \
+  "\377\377\377\0\1\0\274\344\210\225\0\274\344\377\2\0\274\344\372\0\274" \
+  "\344\16\222\377\377\377\0\1\0\274\344\223\236\0\274\344\377\1\0\274\344" \
+  "x\216\377\377\377\0\2\0\274\3447\0\274\344\361\211\0\274\344\377\1\0" \
+  "\274\344\226\212\377\377\377\0\1\\o{a\225\\o{\377\1\\o{\327\266\377\377" \
+  "\377\0\1\\o{\344\225\\o{\377\1\\o{9\212\377\377\377\0\1\0\274\344\240" \
+  "\225\0\274\344\377\1\0\274\344\274\222\377\377\377\0\1\0\274\344R\236" \
+  "\0\274\344\377\1\0\274\344y\216\377\377\377\0\2\0\274\3447\0\274\344" \
+  "\360\212\0\274\344\377\1\0\274\344\267\212\377\377\377\0\1\\o{9\225\\" \
+  "o{\377\1\\o{\344\266\377\377\377\0\1\\o{\362\225\\o{\377\1\\o{\33\212" \
+  "\377\377\377\0\1\0\274\344\270\225\0\274\344\377\1\0\274\344p\221\377" \
+  "\377\377\0\2\0\274\344\25\0\274\344\352\235\0\274\344\377\1\0\274\344" \
+  "y\216\377\377\377\0\2\0\274\3446\0\274\344\360\213\0\274\344\377\1\0" \
+  "\274\344\327\212\377\377\377\0\1\\o{\33\225\\o{\377\1\\o{\362\265\377" \
+  "\377\377\0\2\\o{\1\\o{\375\225\\o{\377\1\\o{\16\212\377\377\377\0\1\0" \
+  "\274\344\320\225\0\274\344\377\1\0\274\344<\221\377\377\377\0\1\0\274" \
+  "\344\255\235\0\274\344\377\1\0\274\344z\216\377\377\377\0\2\0\274\344" \
+  "5\0\274\344\360\214\0\274\344\377\2\0\274\344\367\0\274\344\1\211\377" \
+  "\377\377\0\1\\o{\16\225\\o{\377\2\\o{\375\\o{\1\264\377\377\377\0\1\\" \
+  "o{\14\226\\o{\377\1\\o{\2\212\377\377\377\0\1\0\274\344\351\225\0\274" \
+  "\344\377\1\0\274\344%\220\377\377\377\0\1\0\274\344/\235\0\274\344\377" \
+  "\1\0\274\344z\216\377\377\377\0\2\0\274\3445\0\274\344\360\216\0\274" \
+  "\344\377\1\0\274\344\30\211\377\377\377\0\1\\o{\2\226\\o{\377\1\\o{\14" \
+  "\264\377\377\377\0\1\\o{\31\225\\o{\377\1\\o{\365\212\377\377\377\0\2" \
+  "\0\274\344\3\0\274\344\375\225\0\274\344\377\1\0\274\344\15\220\377\377" \
+  "\377\0\1\0\274\344c\234\0\274\344\377\1\0\274\344{\216\377\377\377\0" \
+  "\2\0\274\3444\0\274\344\357\217\0\274\344\377\1\0\274\3444\212\377\377" \
+  "\377\0\1\\o{\365\225\\o{\377\1\\o{\31\264\377\377\377\0\1\\o{&\225\\" \
+  "o{\377\1\\o{\350\212\377\377\377\0\1\0\274\344\31\225\0\274\344\377\1" \
+  "\0\274\344\365\221\377\377\377\0\1\0\274\344\226\233\0\274\344\377\1" \
+  "\0\274\344{\216\377\377\377\0\2\0\274\3444\0\274\344\357\220\0\274\344" \
+  "\377\1\0\274\3445\212\377\377\377\0\1\\o{\350\225\\o{\377\1\\o{&\264" \
+  "\377\377\377\0\1\\o{3\225\\o{\377\1\\o{\333\212\377\377\377\0\1\0\274" \
+  "\3441\225\0\274\344\377\1\0\274\344\336\221\377\377\377\0\1\0\274\344" \
+  "\310\232\0\274\344\377\1\0\274\344|\216\377\377\377\0\2\0\274\3443\0" \
+  "\274\344\357\221\0\274\344\377\1\0\274\3443\212\377\377\377\0\1\\o{\333" \
+  "\225\\o{\377\1\\o{3\264\377\377\377\0\1\\o{;\225\\o{\377\1\\o{\323\212" \
+  "\377\377\377\0\1\0\274\344A\225\0\274\344\377\1\0\274\344\316\221\377" \
+  "\377\377\0\1\0\274\344\353\231\0\274\344\377\1\0\274\344|\216\377\377" \
+  "\377\0\2\0\274\3443\0\274\344\356\222\0\274\344\377\1\0\274\3441\212" \
+  "\377\377\377\0\1\\o{\323\225\\o{\377\1\\o{;\264\377\377\377\0\1\\o{," \
+  "\225\\o{\377\1\\o{\335\212\377\377\377\0\1\0\274\344.\225\0\274\344\377" \
+  "\1\0\274\344\341\221\377\377\377\0\1\0\274\344\302\230\0\274\344\377" \
+  "\1\0\274\344|\216\377\377\377\0\2\0\274\3442\0\274\344\356\223\0\274" \
+  "\344\377\1\0\274\344.\212\377\377\377\0\1\\o{\335\225\\o{\377\1\\o{," \
+  "\264\377\377\377\0\1\\o{\32\225\\o{\377\1\\o{\352\212\377\377\377\0\1" \
+  "\0\274\344\26\225\0\274\344\377\1\0\274\344\370\221\377\377\377\0\1\0" \
+  "\274\344\217\227\0\274\344\377\1\0\274\344}\216\377\377\377\0\2\0\274" \
+  "\3442\0\274\344\356\224\0\274\344\377\1\0\274\344,\212\377\377\377\0" \
+  "\1\\o{\352\225\\o{\377\1\\o{\32\264\377\377\377\0\1\\o{\11\225\\o{\377" \
+  "\1\\o{\367\212\377\377\377\0\2\0\274\344\2\0\274\344\374\225\0\274\344" \
+  "\377\1\0\274\344\20\220\377\377\377\0\1\0\274\344]\226\0\274\344\377" \
+  "\1\0\274\344}\216\377\377\377\0\2\0\274\344\1\0\274\344\351\225\0\274" \
+  "\344\377\1\0\274\344*\212\377\377\377\0\1\\o{\367\225\\o{\377\1\\o{\11" \
+  "\265\377\377\377\0\1\\o{\367\225\\o{\377\1\\o{\4\212\377\377\377\0\1" \
+  "\0\274\344\346\225\0\274\344\377\1\0\274\344(\220\377\377\377\0\1\0\274" \
+  "\344&\225\0\274\344\377\1\0\274\344~\217\377\377\377\0\1\0\274\344\"" \
+  "\226\0\274\344\377\1\0\274\344!\211\377\377\377\0\1\\o{\4\225\\o{\377" \
+  "\1\\o{\367\266\377\377\377\0\1\\o{\345\225\\o{\377\1\\o{\21\212\377\377" \
+  "\377\0\1\0\274\344\315\225\0\274\344\377\1\0\274\344@\221\377\377\377" \
+  "\0\1\0\274\344\230\223\0\274\344\377\1\0\274\344~\220\377\377\377\0\1" \
+  "\0\274\344R\225\0\274\344\377\2\0\274\344\372\0\274\344\3\211\377\377" \
+  "\377\0\1\\o{\21\225\\o{\377\1\\o{\345\266\377\377\377\0\1\\o{\323\225" \
+  "\\o{\377\1\\o{\37\212\377\377\377\0\1\0\274\344\265\225\0\274\344\377" \
+  "\1\0\274\344z\221\377\377\377\0\2\0\274\344\14\0\274\344\336\221\0\274" \
+  "\344\377\1\0\274\344\177\221\377\377\377\0\1\0\274\344\202\225\0\274" \
+  "\344\377\1\0\274\344\327\212\377\377\377\0\1\\o{\37\225\\o{\377\1\\o" \
+  "{\323\266\377\377\377\0\1\\o{\301\225\\o{\377\1\\o{@\212\377\377\377" \
+  "\0\1\0\274\344\235\225\0\274\344\377\1\0\274\344\306\222\377\377\377" \
+  "\0\2\0\274\344>\0\274\344\376\217\0\274\344\377\1\0\274\344\177\222\377" \
+  "\377\377\0\1\0\274\344\263\225\0\274\344\377\1\0\274\344\261\212\377" \
+  "\377\377\0\1\\o{@\225\\o{\377\1\\o{\301\266\377\377\377\0\1\\o{\257\225" \
+  "\\o{\377\1\\o{f\212\377\377\377\0\1\0\274\344\205\225\0\274\344\377\2" \
+  "\0\274\344\375\0\274\344\25\222\377\377\377\0\2\0\274\344^\0\274\344" \
+  "\361\214\0\274\344\377\2\0\274\344\363\0\274\344f\222\377\377\377\0\2" \
+  "\0\274\344\12\0\274\344\362\225\0\274\344\377\1\0\274\344\212\212\377" \
+  "\377\377\0\1\\o{f\225\\o{\377\1\\o{\257\266\377\377\377\0\1\\o{\235\225" \
+  "\\o{\377\1\\o{\215\212\377\377\377\0\1\0\274\344m\226\0\274\344\377\1" \
+  "\0\274\344`\223\377\377\377\0\2\0\274\344\36\0\274\344\274\212\0\274" \
+  "\344\377\2\0\274\344\275\0\274\344\40\223\377\377\377\0\1\0\274\344\\" \
+  "\226\0\274\344\377\1\0\274\344d\212\377\377\377\0\1\\o{\215\225\\o{\377" \
+  "\1\\o{\235\266\377\377\377\0\1\\o{\213\225\\o{\377\1\\o{\263\212\377" \
+  "\377\377\0\1\0\274\344>\226\0\274\344\377\1\0\274\344\254\224\377\377" \
+  "\377\0\4\0\274\344\1\0\274\344e\0\274\344\270\0\274\344\354\204\0\274" \
+  "\344\377\4\0\274\344\354\0\274\344\270\0\274\344e\0\274\344\1\224\377" \
+  "\377\377\0\1\0\274\344\273\226\0\274\344\377\1\0\274\344>\212\377\377" \
+  "\377\0\1\\o{\263\225\\o{\377\1\\o{\213\266\377\377\377\0\1\\o{y\225\\" \
+  "o{\377\1\\o{\332\212\377\377\377\0\2\0\274\344\4\0\274\344\357\225\0" \
+  "\274\344\377\2\0\274\344\367\0\274\344\33\227\377\377\377\0\1\0\274\344" \
+  "!\202\0\274\344U\1\0\274\344!\227\377\377\377\0\2\0\274\344\34\0\274" \
+  "\344\375\225\0\274\344\377\2\0\274\344\374\0\274\344\21\212\377\377\377" \
+  "\0\1\\o{\332\225\\o{\377\1\\o{y\266\377\377\377\0\1\\o{W\225\\o{\377" \
+  "\2\\o{\373\\o{\6\212\377\377\377\0\1\0\274\344\250\226\0\274\344\377" \
+  "\1\0\274\344\231\262\377\377\377\0\1\0\274\344\201\226\0\274\344\377" \
+  "\1\0\274\344\304\212\377\377\377\0\2\\o{\6\\o{\373\225\\o{\377\1\\o{" \
+  "W\266\377\377\377\0\1\\o{!\226\\o{\377\1\\o{<\212\377\377\377\0\1\0\274" \
+  "\344]\226\0\274\344\377\2\0\274\344\373\0\274\344$\260\377\377\377\0" \
+  "\2\0\274\344\32\0\274\344\364\226\0\274\344\377\1\0\274\344y\212\377" \
+  "\377\377\0\1\\o{<\226\\o{\377\1\\o{!\267\377\377\377\0\1\\o{\354\225" \
+  "\\o{\377\1\\o{}\212\377\377\377\0\2\0\274\344\24\0\274\344\375\226\0" \
+  "\274\344\377\1\0\274\344\246\260\377\377\377\0\1\0\274\344\241\227\0" \
+  "\274\344\377\1\0\274\344.\212\377\377\377\0\1\\o{}\225\\o{\377\1\\o{" \
+  "\354\270\377\377\377\0\1\\o{\267\225\\o{\377\1\\o{\275\213\377\377\377" \
+  "\0\1\0\274\344\306\226\0\274\344\377\2\0\274\344\376\0\274\344.\256\377" \
+  "\377\377\0\2\0\274\3445\0\274\344\376\226\0\274\344\377\1\0\274\344\342" \
+  "\213\377\377\377\0\1\\o{\275\225\\o{\377\1\\o{\267\270\377\377\377\0" \
+  "\1\\o{\202\225\\o{\377\2\\o{\367\\o{\7\212\377\377\377\0\1\0\274\344" \
+  "z\227\0\274\344\377\2\0\274\344\315\0\274\344\11\254\377\377\377\0\2" \
+  "\0\274\344\3\0\274\344\306\227\0\274\344\377\1\0\274\344\230\212\377" \
+  "\377\377\0\2\\o{\7\\o{\367\225\\o{\377\1\\o{\202\270\377\377\377\0\1" \
+  "\\o{L\226\\o{\377\1\\o{\77\212\377\377\377\0\1\0\274\344/\230\0\274\344" \
+  "\377\1\0\274\344\246\254\377\377\377\0\1\0\274\344\223\230\0\274\344" \
+  "\377\1\0\274\344M\212\377\377\377\0\1\\o{\77\226\\o{\377\1\\o{L\270\377" \
+  "\377\377\0\1\\o{\27\226\\o{\377\1\\o{\203\213\377\377\377\0\1\0\274\344" \
+  "\343\230\0\274\344\377\1\0\274\344v\252\377\377\377\0\1\0\274\344i\230" \
+  "\0\274\344\377\2\0\274\344\347\0\274\344\6\212\377\377\377\0\1\\o{\203" \
+  "\226\\o{\377\1\\o{\27\271\377\377\377\0\1\\o{\342\225\\o{\377\1\\o{\334" \
+  "\213\377\377\377\0\1\0\274\344\216\230\0\274\344\377\2\0\274\344\375" \
+  "\0\274\344H\250\377\377\377\0\2\0\274\344C\0\274\344\373\230\0\274\344" \
+  "\377\1\0\274\344z\213\377\377\377\0\1\\o{\334\225\\o{\377\1\\o{\342\272" \
+  "\377\377\377\0\1\\o{\255\226\\o{\377\1\\o{9\212\377\377\377\0\2\0\274" \
+  "\344\27\0\274\344\364\230\0\274\344\377\2\0\274\344\357\0\274\3446\246" \
+  "\377\377\377\0\2\0\274\3446\0\274\344\356\230\0\274\344\377\2\0\274\344" \
+  "\364\0\274\344\22\212\377\377\377\0\1\\o{9\226\\o{\377\1\\o{\255\272" \
+  "\377\377\377\0\1\\o{x\226\\o{\377\1\\o{\226\213\377\377\377\0\1\0\274" \
+  "\344\204\231\0\274\344\377\2\0\274\344\367\0\274\344]\244\377\377\377" \
+  "\0\2\0\274\344]\0\274\344\367\231\0\274\344\377\1\0\274\344\223\213\377" \
+  "\377\377\0\1\\o{\226\226\\o{\377\1\\o{x\272\377\377\377\0\1\\o{B\226" \
+  "\\o{\377\2\\o{\355\\o{\6\212\377\377\377\0\2\0\274\344\17\0\274\344\355" \
+  "\232\0\274\344\377\2\0\274\344\213\0\274\344\2\240\377\377\377\0\2\0" \
+  "\274\344\2\0\274\344\213\232\0\274\344\377\2\0\274\344\375\0\274\344" \
+  "\"\212\377\377\377\0\2\\o{\6\\o{\355\226\\o{\377\1\\o{B\272\377\377\377" \
+  "\0\2\\o{\13\\o{\364\226\\o{\377\1\\o{P\213\377\377\377\0\1\0\274\344" \
+  "v\233\0\274\344\377\2\0\274\344\267\0\274\344\20\236\377\377\377\0\2" \
+  "\0\274\344\20\0\274\344\267\233\0\274\344\377\1\0\274\344\254\213\377" \
+  "\377\377\0\1\\o{P\226\\o{\377\2\\o{\364\\o{\13\273\377\377\377\0\1\\" \
+  "o{\245\226\\o{\377\1\\o{\271\213\377\377\377\0\2\0\274\344\11\0\274\344" \
+  "\345\233\0\274\344\377\3\0\274\344\343\0\274\344d\0\274\344\3\232\377" \
+  "\377\377\0\3\0\274\344\3\0\274\344d\0\274\344\343\233\0\274\344\377\2" \
+  "\0\274\344\375\0\274\3443\213\377\377\377\0\1\\o{\271\226\\o{\377\1\\" \
+  "o{\245\274\377\377\377\0\1\\o{I\227\\o{\377\1\\o{3\213\377\377\377\0" \
+  "\1\0\274\344g\235\0\274\344\377\3\0\274\344\331\0\274\344U\0\274\344" \
+  "\1\226\377\377\377\0\3\0\274\344\1\0\274\344U\0\274\344\331\235\0\274" \
+  "\344\377\1\0\274\344\222\213\377\377\377\0\1\\o{3\227\\o{\377\1\\o{I" \
+  "\274\377\377\377\0\2\\o{\4\\o{\351\226\\o{\377\1\\o{\255\213\377\377" \
+  "\377\0\2\0\274\344\4\0\274\344\333\236\0\274\344\377\3\0\274\344\315" \
+  "\0\274\344R\0\274\344\12\222\377\377\377\0\3\0\274\344\12\0\274\344R" \
+  "\0\274\344\315\236\0\274\344\377\2\0\274\344\341\0\274\344\14\213\377" \
+  "\377\377\0\1\\o{\255\226\\o{\377\2\\o{\351\\o{\4\275\377\377\377\0\1" \
+  "\\o{\222\226\\o{\377\2\\o{\376\\o{)\213\377\377\377\0\1\0\274\344X\240" \
+  "\0\274\344\377\4\0\274\344\367\0\274\344\266\0\274\344i\0\274\344\36" \
+  "\214\377\377\377\0\4\0\274\344\34\0\274\344h\0\274\344\265\0\274\344" \
+  "\367\240\0\274\344\377\1\0\274\344K\213\377\377\377\0\2\\o{)\\o{\376" \
+  "\226\\o{\377\1\\o{\222\276\377\377\377\0\1\\o{7\227\\o{\377\1\\o{\241" \
+  "\213\377\377\377\0\2\0\274\344\1\0\274\344\275\243\0\274\344\377\5\0" \
+  "\274\344\325\0\274\344\263\0\274\344\233\0\274\344\203\0\274\344k\202" \
+  "\0\274\344S\5\0\274\344k\0\274\344\203\0\274\344\232\0\274\344\262\0" \
+  "\274\344\323\243\0\274\344\377\1\0\274\344\247\214\377\377\377\0\1\\" \
+  "o{\241\227\\o{\377\1\\o{7\277\377\377\377\0\1\\o{\333\226\\o{\377\2\\" \
+  "o{\373\\o{%\213\377\377\377\0\2\0\274\344\32\0\274\344\353\320\0\274" \
+  "\344\377\2\0\274\344\355\0\274\344\26\213\377\377\377\0\2\\o{%\\o{\373" \
+  "\226\\o{\377\1\\o{\333\300\377\377\377\0\1\\o{\200\227\\o{\377\1\\o{" \
+  "\266\214\377\377\377\0\1\0\274\344M\320\0\274\344\377\1\0\274\344Y\214" \
+  "\377\377\377\0\1\\o{\266\227\\o{\377\1\\o{\200\300\377\377\377\0\1\\" \
+  "o{%\230\\o{\377\1\\o{O\214\377\377\377\0\1\0\274\344\223\316\0\274\344" \
+  "\377\1\0\274\344\203\214\377\377\377\0\1\\o{O\230\\o{\377\1\\o{%\301" \
+  "\377\377\377\0\1\\o{\311\227\\o{\377\2\\o{\337\\o{\11\213\377\377\377" \
+  "\0\2\0\274\344\7\0\274\344\304\314\0\274\344\377\2\0\274\344\246\0\274" \
+  "\344\1\213\377\377\377\0\2\\o{\11\\o{\337\227\\o{\377\1\\o{\311\302\377" \
+  "\377\377\0\1\\o{k\230\\o{\377\1\\o{\200\214\377\377\377\0\2\0\274\344" \
+  "\21\0\274\344\325\312\0\274\344\377\2\0\274\344\303\0\274\344\7\214\377" \
+  "\377\377\0\1\\o{\200\230\\o{\377\1\\o{k\302\377\377\377\0\2\\o{\11\\" \
+  "o{\347\227\\o{\377\2\\o{\367\\o{'\214\377\377\377\0\2\0\274\344\34\0" \
+  "\274\344\343\310\0\274\344\377\2\0\274\344\333\0\274\344\23\214\377\377" \
+  "\377\0\2\\o{'\\o{\367\227\\o{\377\2\\o{\347\\o{\11\303\377\377\377\0" \
+  "\1\\o{m\230\\o{\377\2\\o{\320\\o{\7\214\377\377\377\0\2\0\274\344*\0" \
+  "\274\344\356\306\0\274\344\377\2\0\274\344\355\0\274\344%\214\377\377" \
+  "\377\0\2\\o{\7\\o{\320\230\\o{\377\1\\o{m\304\377\377\377\0\2\\o{\7\\" \
+  "o{\342\230\\o{\377\1\\o{\224\215\377\377\377\0\2\0\274\3443\0\274\344" \
+  "\351\304\0\274\344\377\2\0\274\344\351\0\274\3442\215\377\377\377\0\1" \
+  "\\o{\224\230\\o{\377\2\\o{\342\\o{\7\305\377\377\377\0\1\\o{e\231\\o" \
+  "{\377\1\\o{P\215\377\377\377\0\2\0\274\344#\0\274\344\334\302\0\274\344" \
+  "\377\2\0\274\344\334\0\274\344#\215\377\377\377\0\1\\o{P\231\\o{\377" \
+  "\1\\o{e\306\377\377\377\0\2\\o{\4\\o{\335\230\\o{\377\2\\o{\356\\o{\36" \
+  "\215\377\377\377\0\2\0\274\344\27\0\274\344\315\300\0\274\344\377\2\0" \
+  "\274\344\315\0\274\344\27\215\377\377\377\0\2\\o{\36\\o{\356\230\\o{" \
+  "\377\2\\o{\335\\o{\4\307\377\377\377\0\1\\o{^\231\\o{\377\2\\o{\313\\" \
+  "o{\13\215\377\377\377\0\2\0\274\344\15\0\274\344\264\276\0\274\344\377" \
+  "\2\0\274\344\264\0\274\344\15\215\377\377\377\0\2\\o{\13\\o{\313\231" \
+  "\\o{\377\1\\o{^\310\377\377\377\0\2\\o{\3\\o{\327\231\\o{\377\2\\o{\266" \
+  "\\o{\4\215\377\377\377\0\3\0\274\344\1\0\274\344t\0\274\344\372\272\0" \
+  "\274\344\377\3\0\274\344\372\0\274\344t\0\274\344\1\215\377\377\377\0" \
+  "\2\\o{\4\\o{\266\231\\o{\377\2\\o{\327\\o{\3\311\377\377\377\0\1\\o{" \
+  "W\232\\o{\377\1\\o{\236\217\377\377\377\0\2\0\274\3446\0\274\344\336" \
+  "\270\0\274\344\377\2\0\274\344\336\0\274\3446\217\377\377\377\0\1\\o" \
+  "{\236\232\\o{\377\1\\o{W\312\377\377\377\0\2\\o{\1\\o{\321\232\\o{\377" \
+  "\1\\o{\203\217\377\377\377\0\3\0\274\344\17\0\274\344\236\0\274\344\375" \
+  "\264\0\274\344\377\3\0\274\344\375\0\274\344\236\0\274\344\17\217\377" \
+  "\377\377\0\1\\o{\203\232\\o{\377\2\\o{\321\\o{\1\313\377\377\377\0\1" \
+  "\\o{8\232\\o{\200\2\\o{\177\\o{\27\220\377\377\377\0\2\0\274\344+\0\274" \
+  "\344\257\262\0\274\344\377\2\0\274\344\257\0\274\344+\220\377\377\377" \
+  "\0\2\\o{\27\\o{\177\232\\o{\200\1\\o{8\373\377\377\377\0\2\0\274\344" \
+  "7\0\274\344\276\256\0\274\344\377\2\0\274\344\276\0\274\3447\377\377" \
+  "\377\377\0\255\377\377\377\0\2\0\274\344E\0\274\344\314\252\0\274\344" \
+  "\377\2\0\274\344\314\0\274\344E\377\377\377\377\0\260\377\377\377\0\3" \
+  "\0\274\344\1\0\274\344T\0\274\344\330\246\0\274\344\377\3\0\274\344\330" \
+  "\0\274\344T\0\274\344\1\377\377\377\377\0\263\377\377\377\0\4\0\274\344" \
+  "\3\0\274\344H\0\274\344\224\0\274\344\337\240\0\274\344\377\4\0\274\344" \
+  "\337\0\274\344\224\0\274\344H\0\274\344\3\377\377\377\377\0\271\377\377" \
+  "\377\0\4\0\274\344*\0\274\344v\0\274\344\301\0\274\344\373\230\0\274" \
+  "\344\377\4\0\274\344\373\0\274\344\301\0\274\344v\0\274\344*\377\377" \
+  "\377\377\0\300\377\377\377\0\5\0\274\344\21\0\274\344X\0\274\344\243" \
+  "\0\274\344\346\0\274\344\376\220\0\274\344\377\5\0\274\344\376\0\274" \
+  "\344\346\0\274\344\243\0\274\344X\0\274\344\21\377\377\377\377\0\307" \
+  "\377\377\377\0\10\0\274\344\5\0\274\344\34\0\274\3445\0\274\344N\0\274" \
+  "\344g\0\274\344\200\0\274\344\231\0\274\344\262\202\0\274\344\313\10" \
+  "\0\274\344\262\0\274\344\231\0\274\344\200\0\274\344g\0\274\344N\0\274" \
+  "\3445\0\274\344\34\0\274\344\5\377\377\377\377\0\377\377\377\377\0\377" \
+  "\377\377\377\0\377\377\377\377\0\377\377\377\377\0\377\377\377\377\0" \
+  "\377\377\377\377\0\377\377\377\377\0\377\377\377\377\0\377\377\377\377" \
+  "\0\377\377\377\377\0\377\377\377\377\0\214\377\377\377\0\4\0\274\344" \
+  "8\0\274\344\222\0\274\344h\0\274\344\20\252\377\377\377\0\4\0\274\344" \
+  "\14\0\274\344b\0\274\344\224\0\274\344\77\216\377\377\377\0\5\0\274\344" \
+  "\7\0\274\344W\0\274\344\227\0\274\344K\0\274\344\2\240\377\377\377\0" \
+  "\4\0\274\344\77\0\274\344\224\0\274\344b\0\274\344\14\362\377\377\377" \
+  "\0\1\0\274\344#\203\0\274\344\377\1\0\274\344\245\252\377\377\377\0\1" \
+  "\0\274\344\225\203\0\274\344\377\1\0\274\3445\215\377\377\377\0\1\0\274" \
+  "\344u\203\0\274\344\377\1\0\274\344U\237\377\377\377\0\1\0\274\3445\203" \
+  "\0\274\344\377\1\0\274\344\225\362\377\377\377\0\1\0\274\344v\203\0\274" \
+  "\344\377\2\0\274\344\366\0\274\344\7\251\377\377\377\0\1\0\274\344\355" \
+  "\203\0\274\344\377\1\0\274\344\215\215\377\377\377\0\1\0\274\344\315" \
+  "\203\0\274\344\377\1\0\274\344\255\237\377\377\377\0\1\0\274\344\215" \
+  "\203\0\274\344\377\1\0\274\344\355\362\377\377\377\0\1\0\274\344\210" \
+  "\204\0\274\344\377\1\0\274\344\20\251\377\377\377\0\204\0\274\344\377" \
+  "\1\0\274\344\240\215\377\377\377\0\1\0\274\344\340\203\0\274\344\377" \
+  "\1\0\274\344\300\237\377\377\377\0\1\0\274\344\240\204\0\274\344\377" \
+  "\362\377\377\377\0\1\0\274\344\210\204\0\274\344\377\1\0\274\344\20\251" \
+  "\377\377\377\0\204\0\274\344\377\1\0\274\344\240\215\377\377\377\0\1" \
+  "\0\274\344\340\203\0\274\344\377\1\0\274\344\300\237\377\377\377\0\1" \
+  "\0\274\344\240\204\0\274\344\377\362\377\377\377\0\1\0\274\344\210\204" \
+  "\0\274\344\377\1\0\274\344\20\251\377\377\377\0\204\0\274\344\377\1\0" \
+  "\274\344\240\215\377\377\377\0\1\0\274\344\340\203\0\274\344\377\1\0" \
+  "\274\344\300\237\377\377\377\0\1\0\274\344\240\204\0\274\344\377\362" \
+  "\377\377\377\0\1\0\274\344\210\204\0\274\344\377\1\0\274\344\20\251\377" \
+  "\377\377\0\204\0\274\344\377\1\0\274\344\240\215\377\377\377\0\1\0\274" \
+  "\344\340\203\0\274\344\377\1\0\274\344\300\237\377\377\377\0\1\0\274" \
+  "\344\240\204\0\274\344\377\362\377\377\377\0\1\0\274\344\210\204\0\274" \
+  "\344\377\1\0\274\344\20\251\377\377\377\0\204\0\274\344\377\1\0\274\344" \
+  "\240\215\377\377\377\0\1\0\274\344\340\203\0\274\344\377\1\0\274\344" \
+  "\300\237\377\377\377\0\1\0\274\344\240\204\0\274\344\377\204\377\377" \
+  "\377\0\7\\o{\11\\o{=\\o{s\\o{\242\\o{\205\\o{U\\o{\36\207\377\377\377" \
+  "\0\3\\o{\7\\o{W\\o{\246\206\\o{\260\3\\o{\233\\o{j\\o{-\212\377\377\377" \
+  "\0\7\\o{\2\\o{/\\o{d\\o{\231\\o{\222\\o{a\\o{/\210\377\377\377\0\2\\" \
+  "o{\77\\o{\231\206\\o{\260\3\\o{\245\\o{w\\o{B\213\377\377\377\0\7\0\274" \
+  "\344!\0\274\344W\0\274\344\214\0\274\344\235\0\274\344n\0\274\344=\0" \
+  "\274\344\6\207\377\377\377\0\2\0\274\344&\0\274\344\206\213\0\274\344" \
+  "\260\4\0\274\344\257\0\274\344\224\0\274\344c\0\274\344!\206\377\377" \
+  "\377\0\1\0\274\344\210\204\0\274\344\377\1\0\274\344\265\203\0\274\344" \
+  "\260\4\0\274\344\247\0\274\344y\0\274\344F\0\274\344\4\211\377\377\377" \
+  "\0\7\0\274\344\3\0\274\3441\0\274\344g\0\274\344\234\0\274\344\220\0" \
+  "\274\344_\0\274\344,\213\377\377\377\0\3\0\274\344$\0\274\344e\0\274" \
+  "\344\242\204\0\274\344\260\204\0\274\344\377\1\0\274\344\240\206\377" \
+  "\377\377\0\3\0\274\344\33\0\274\344\\\0\274\344\234\204\0\274\344\260" \
+  "\1\0\274\344\366\203\0\274\344\377\1\0\274\344\300\207\377\377\377\0" \
+  "\7\0\274\344\33\0\274\344S\0\274\344\211\0\274\344\237\0\274\344q\0\274" \
+  "\344A\0\274\344\11\212\377\377\377\0\4\0\274\344\16\0\274\344L\0\274" \
+  "\344\215\0\274\344\257\203\0\274\344\260\1\0\274\344\342\204\0\274\344" \
+  "\377\203\377\377\377\0\2\\o{K\\o{\345\205\\o{\377\3\\o{\373\\o{\201\\" \
+  "o{\5\205\377\377\377\0\1\\o{u\212\\o{\377\3\\o{\376\\o{\220\\o{\11\207" \
+  "\377\377\377\0\2\\o{(\\o{\307\206\\o{\377\2\\o{\255\\o{\24\205\377\377" \
+  "\377\0\1\\o{5\213\\o{\377\2\\o{\272\\o{\35\207\377\377\377\0\2\0\274" \
+  "\344\20\0\274\344\240\206\0\274\344\377\2\0\274\344\322\0\274\344/\205" \
+  "\377\377\377\0\2\0\274\344\7\0\274\344\356\217\0\274\344\377\3\0\274" \
+  "\344\370\0\274\344u\0\274\344\2\204\377\377\377\0\1\0\274\344\210\213" \
+  "\0\274\344\377\2\0\274\344\313\0\274\344*\207\377\377\377\0\2\0\274\344" \
+  ",\0\274\344\313\206\0\274\344\377\2\0\274\344\247\0\274\344\22\207\377" \
+  "\377\377\0\2\0\274\344\25\0\274\344\320\213\0\274\344\377\1\0\274\344" \
+  "\240\204\377\377\377\0\2\0\274\344\10\0\274\344\267\213\0\274\344\377" \
+  "\1\0\274\344\300\205\377\377\377\0\3\0\274\344\12\0\274\344\220\0\274" \
+  "\344\375\205\0\274\344\377\2\0\274\344\335\0\274\344<\210\377\377\377" \
+  "\0\2\0\274\344\203\0\274\344\374\213\0\274\344\377\3\377\377\377\0\\" \
+  "o{\1\\o{\232\211\\o{\377\2\\o{\315\\o{\27\204\377\377\377\0\1\\o{\315" \
+  "\214\\o{\377\2\\o{\305\\o{\3\205\377\377\377\0\2\\o{c\\o{\367\210\\o" \
+  "{\377\2\\o{\351\\o{;\204\377\377\377\0\1\\o{\215\214\\o{\377\2\\o{\355" \
+  "\\o{\33\205\377\377\377\0\2\0\274\3446\0\274\344\345\210\0\274\344\377" \
+  "\2\0\274\344\372\0\274\344k\204\377\377\377\0\1\0\274\344M\222\0\274" \
+  "\344\377\1\0\274\344\240\204\377\377\377\0\1\0\274\344\210\214\0\274" \
+  "\344\377\2\0\274\344\370\0\274\344.\205\377\377\377\0\2\0\274\344j\0" \
+  "\274\344\371\210\0\274\344\377\2\0\274\344\346\0\274\3446\205\377\377" \
+  "\377\0\2\0\274\344\21\0\274\344\320\214\0\274\344\377\1\0\274\344\240" \
+  "\203\377\377\377\0\2\0\274\344\7\0\274\344\267\214\0\274\344\377\1\0" \
+  "\274\344\300\204\377\377\377\0\2\0\274\344(\0\274\344\333\210\0\274\344" \
+  "\377\2\0\274\344\375\0\274\344\177\206\377\377\377\0\1\0\274\344~\215" \
+  "\0\274\344\377\2\377\377\377\0\\o{h\213\\o{\377\1\\o{\260\204\377\377" \
+  "\377\0\1\\o{\340\215\\o{\377\1\\o{u\204\377\377\377\0\2\\o{.\\o{\371" \
+  "\212\\o{\377\2\\o{\342\\o{\16\203\377\377\377\0\1\\o{\240\215\\o{\377" \
+  "\1\\o{\265\204\377\377\377\0\2\0\274\344\13\0\274\344\334\212\0\274\344" \
+  "\377\2\0\274\344\374\0\274\3444\203\377\377\377\0\1\0\274\344`\223\0" \
+  "\274\344\377\1\0\274\344M\203\377\377\377\0\1\0\274\344\210\215\0\274" \
+  "\344\377\2\0\274\344\312\0\274\344\3\203\377\377\377\0\2\0\274\3444\0" \
+  "\274\344\373\212\0\274\344\377\2\0\274\344\335\0\274\344\13\204\377\377" \
+  "\377\0\1\0\274\344\276\215\0\274\344\377\1\0\274\344\240\203\377\377" \
+  "\377\0\1\0\274\344\236\215\0\274\344\377\1\0\274\344\300\203\377\377" \
+  "\377\0\2\0\274\344\4\0\274\344\313\213\0\274\344\377\1\0\274\344I\204" \
+  "\377\377\377\0\1\0\274\344^\216\0\274\344\377\2\\o{\37\\o{\362\214\\" \
+  "o{\377\1\\o{\\\203\377\377\377\0\1\\o{\340\203\\o{\377\1\\o{\376\204" \
+  "\\o{\370\1\\o{\376\204\\o{\377\2\\o{\365\\o{\5\202\377\377\377\0\2\\" \
+  "o{\4\\o{\315\214\\o{\377\1\\o{\234\203\377\377\377\0\1\\o{\240\204\\" \
+  "o{\377\204\\o{\370\1\\o{\374\205\\o{\377\1\\o{:\203\377\377\377\0\1\0" \
+  "\274\344\222\214\0\274\344\377\2\0\274\344\325\0\274\344\7\202\377\377" \
+  "\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344\372\202\0\274\344\370" \
+  "\1\0\274\344\373\204\0\274\344\377\2\0\274\344\372\0\274\344\370\205" \
+  "\0\274\344\377\1\0\274\344\322\203\377\377\377\0\1\0\274\344\210\204" \
+  "\0\274\344\377\204\0\274\344\370\1\0\274\344\374\205\0\274\344\377\1" \
+  "\0\274\344M\202\377\377\377\0\2\0\274\344\6\0\274\344\323\214\0\274\344" \
+  "\377\1\0\274\344\224\203\377\377\377\0\2\0\274\344\26\0\274\344\376\204" \
+  "\0\274\344\377\1\0\274\344\374\204\0\274\344\370\204\0\274\344\377\1" \
+  "\0\274\344\240\202\377\377\377\0\2\0\274\344\4\0\274\344\361\204\0\274" \
+  "\344\377\1\0\274\344\375\204\0\274\344\370\204\0\274\344\377\1\0\274" \
+  "\344\300\203\377\377\377\0\1\0\274\344z\214\0\274\344\377\2\0\274\344" \
+  "\344\0\274\344\20\203\377\377\377\0\1\0\274\344\265\205\0\274\344\377" \
+  "\204\0\274\344\370\1\0\274\344\375\204\0\274\344\377\1\\o{\201\204\\" \
+  "o{\377\5\\o{\335\\o{n\\o{\24\\o{R\\o{\277\204\\o{\377\1\\o{\316\203\377" \
+  "\377\377\0\1\\o{\340\203\\o{\377\1\\o{\300\204\377\377\377\0\2\\o{!\\" \
+  "o{\276\204\\o{\377\1\\o{/\202\377\377\377\0\1\\o{A\204\\o{\377\6\\o{" \
+  "\361\\o{\212\\o{#\\o{6\\o{\237\\o{\375\204\\o{\377\1\\o{\17\202\377\377" \
+  "\377\0\1\\o{\240\204\\o{\377\204\377\377\377\0\2\\o{\20\\o{\217\204\\" \
+  "o{\377\1\\o{o\202\377\377\377\0\2\0\274\344\7\0\274\344\372\203\0\274" \
+  "\344\377\6\0\274\344\376\0\274\344\244\0\274\344<\0\274\344\37\0\274" \
+  "\344\205\0\274\344\357\204\0\274\344\377\1\0\274\344N\202\377\377\377" \
+  "\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0" \
+  "\274\344`\204\0\274\344\377\4\0\274\344@\377\377\377\0\0\274\344/\0\274" \
+  "\344\330\203\0\274\344\377\2\0\274\344\374\0\274\344\12\202\377\377\377" \
+  "\0\1\0\274\344\210\204\0\274\344\377\1\0\274\344\20\203\377\377\377\0" \
+  "\2\0\274\344\13\0\274\344\201\204\0\274\344\377\1\0\274\344\177\202\377" \
+  "\377\377\0\1\0\274\344I\204\0\274\344\377\6\0\274\344\357\0\274\344\205" \
+  "\0\274\344\37\0\274\344<\0\274\344\244\0\274\344\376\203\0\274\344\377" \
+  "\2\0\274\344\374\0\274\344\12\202\377\377\377\0\1\0\274\344Y\204\0\274" \
+  "\344\377\2\0\274\344\224\0\274\344\21\204\377\377\377\0\204\0\274\344" \
+  "\377\1\0\274\344\240\202\377\377\377\0\1\0\274\3449\204\0\274\344\377" \
+  "\2\0\274\344\254\0\274\344\32\204\377\377\377\0\1\0\274\344\340\203\0" \
+  "\274\344\377\1\0\274\344\300\203\377\377\377\0\1\0\274\344\351\204\0" \
+  "\274\344\377\5\0\274\344\257\0\274\344C\0\274\344\32\0\274\344}\0\274" \
+  "\344\350\204\0\274\344\377\1\0\274\344f\202\377\377\377\0\2\0\274\344" \
+  "\5\0\274\344\364\203\0\274\344\377\2\0\274\344\326\0\274\344/\204\377" \
+  "\377\377\0\1\0\274\344\240\204\0\274\344\377\1\\o{\264\204\\o{\377\1" \
+  "\\o{;\203\377\377\377\0\2\\o{\7\\o{\354\203\\o{\377\2\\o{\371\\o{\6\202" \
+  "\377\377\377\0\1\\o{\340\203\\o{\377\1\\o{\300\205\377\377\377\0\1\\" \
+  "o{M\204\\o{\377\1\\o{]\202\377\377\377\0\1\\o{t\204\\o{\377\1\\o{z\204" \
+  "\377\377\377\0\1\\o{\262\204\\o{\377\1\\o{\77\202\377\377\377\0\1\\o" \
+  "{\240\204\\o{\377\205\377\377\377\0\2\\o{\20\\o{\374\203\\o{\377\1\\" \
+  "o{\235\202\377\377\377\0\1\0\274\3444\204\0\274\344\377\1\0\274\344\272" \
+  "\204\377\377\377\0\1\0\274\344r\204\0\274\344\377\1\0\274\344\200\202" \
+  "\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377" \
+  "\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0" \
+  "\1\0\274\344u\204\0\274\344\377\1\0\274\3445\202\377\377\377\0\1\0\274" \
+  "\344\210\204\0\274\344\377\1\0\274\344\20\204\377\377\377\0\2\0\274\344" \
+  "\6\0\274\344\360\203\0\274\344\377\1\0\274\344\255\202\377\377\377\0" \
+  "\1\0\274\344|\204\0\274\344\377\1\0\274\344r\204\377\377\377\0\1\0\274" \
+  "\344\272\204\0\274\344\377\1\0\274\3447\202\377\377\377\0\1\0\274\344" \
+  "\231\203\0\274\344\377\2\0\274\344\374\0\274\344\20\205\377\377\377\0" \
+  "\204\0\274\344\377\1\0\274\344\240\202\377\377\377\0\1\0\274\344y\204" \
+  "\0\274\344\377\1\0\274\344-\205\377\377\377\0\1\0\274\344\340\203\0\274" \
+  "\344\377\1\0\274\344\300\202\377\377\377\0\1\0\274\344\34\204\0\274\344" \
+  "\377\1\0\274\344\322\204\377\377\377\0\1\0\274\344Z\204\0\274\344\377" \
+  "\1\0\274\344\227\202\377\377\377\0\1\0\274\3449\204\0\274\344\377\1\0" \
+  "\274\344m\205\377\377\377\0\1\0\274\344\240\204\0\274\344\377\1\\o{\346" \
+  "\203\\o{\377\1\\o{\323\205\377\377\377\0\1\\o{\213\204\\o{\377\1\\o{" \
+  "0\202\377\377\377\0\1\\o{\340\203\\o{\377\1\\o{\300\205\377\377\377\0" \
+  "\1\\o{8\204\\o{\377\1\\o{h\202\377\377\377\0\1\\o{\247\203\\o{\377\2" \
+  "\\o{\372\\o{\27\204\377\377\377\0\1\\o{I\204\\o{\377\1\\o{p\202\377\377" \
+  "\377\0\1\\o{\240\204\\o{\377\206\377\377\377\0\1\\o{\370\203\\o{\377" \
+  "\1\\o{\250\202\377\377\377\0\1\0\274\344g\204\0\274\344\377\1\0\274\344" \
+  "Q\204\377\377\377\0\2\0\274\344\22\0\274\344\367\203\0\274\344\377\1" \
+  "\0\274\344\260\202\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274" \
+  "\344@\202\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202" \
+  "\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377" \
+  "\377\0\1\0\274\344\210\204\0\274\344\377\1\0\274\344\20\205\377\377\377" \
+  "\0\1\0\274\344\340\203\0\274\344\377\1\0\274\344\270\202\377\377\377" \
+  "\0\1\0\274\344\257\203\0\274\344\377\2\0\274\344\367\0\274\344\22\204" \
+  "\377\377\377\0\1\0\274\344Q\204\0\274\344\377\1\0\274\344h\202\377\377" \
+  "\377\0\1\0\274\344\250\203\0\274\344\377\1\0\274\344\370\206\377\377" \
+  "\377\0\204\0\274\344\377\1\0\274\344\240\202\377\377\377\0\1\0\274\344" \
+  "\210\204\0\274\344\377\1\0\274\344\30\205\377\377\377\0\1\0\274\344\340" \
+  "\203\0\274\344\377\1\0\274\344\300\202\377\377\377\0\1\0\274\344O\204" \
+  "\0\274\344\377\1\0\274\344i\204\377\377\377\0\2\0\274\344\6\0\274\344" \
+  "\352\203\0\274\344\377\1\0\274\344\310\202\377\377\377\0\1\0\274\344" \
+  "H\204\0\274\344\377\1\0\274\344X\205\377\377\377\0\1\0\274\344\240\204" \
+  "\0\274\344\377\204\\o{\377\1\\o{\240\205\377\377\377\0\1\\o{X\204\\o" \
+  "{\377\1\\o{H\202\377\377\377\0\1\\o{\340\203\\o{\377\1\\o{\300\205\377" \
+  "\377\377\0\1\\o{8\204\\o{\377\1\\o{h\202\377\377\377\0\1\\o{\300\203" \
+  "\\o{\377\1\\o{\365\205\\o{\250\1\\o{\260\204\\o{\377\1\\o{\210\202\377" \
+  "\377\377\0\1\\o{\240\204\\o{\377\206\377\377\377\0\1\\o{\370\203\\o{" \
+  "\377\1\\o{\250\202\377\377\377\0\1\0\274\344\200\204\0\274\344\377\1" \
+  "\0\274\344\263\205\0\274\344\250\1\0\274\344\362\203\0\274\344\377\1" \
+  "\0\274\344\310\202\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274" \
+  "\344@\202\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202" \
+  "\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377" \
+  "\377\0\1\0\274\344\210\204\0\274\344\377\1\0\274\344\20\205\377\377\377" \
+  "\0\1\0\274\344\340\203\0\274\344\377\1\0\274\344\270\202\377\377\377" \
+  "\0\1\0\274\344\310\203\0\274\344\377\1\0\274\344\362\205\0\274\344\250" \
+  "\1\0\274\344\263\204\0\274\344\377\1\0\274\344\200\202\377\377\377\0" \
+  "\1\0\274\344\250\203\0\274\344\377\1\0\274\344\370\206\377\377\377\0" \
+  "\204\0\274\344\377\1\0\274\344\240\202\377\377\377\0\1\0\274\344\210" \
+  "\204\0\274\344\377\1\0\274\344\30\205\377\377\377\0\1\0\274\344\340\203" \
+  "\0\274\344\377\1\0\274\344\300\202\377\377\377\0\1\0\274\344h\204\0\274" \
+  "\344\377\1\0\274\344\273\205\0\274\344\250\1\0\274\344\352\203\0\274" \
+  "\344\377\1\0\274\344\340\202\377\377\377\0\1\0\274\344H\204\0\274\344" \
+  "\377\1\0\274\344X\205\377\377\377\0\1\0\274\344\240\204\0\274\344\377" \
+  "\204\\o{\377\1\\o{\240\205\377\377\377\0\1\\o{X\204\\o{\377\1\\o{H\202" \
+  "\377\377\377\0\1\\o{\340\203\\o{\377\1\\o{\300\205\377\377\377\0\1\\" \
+  "o{8\204\\o{\377\1\\o{h\202\377\377\377\0\1\\o{\300\216\\o{\377\1\\o{" \
+  "\210\202\377\377\377\0\1\\o{\240\204\\o{\377\206\377\377\377\0\1\\o{" \
+  "\370\203\\o{\377\1\\o{\250\202\377\377\377\0\1\0\274\344\200\216\0\274" \
+  "\344\377\1\0\274\344\310\202\377\377\377\0\1\0\274\344`\204\0\274\344" \
+  "\377\1\0\274\344@\202\377\377\377\0\1\0\274\344`\204\0\274\344\377\1" \
+  "\0\274\344@\202\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274" \
+  "\344@\202\377\377\377\0\1\0\274\344\210\204\0\274\344\377\1\0\274\344" \
+  "\20\205\377\377\377\0\1\0\274\344\340\203\0\274\344\377\1\0\274\344\270" \
+  "\202\377\377\377\0\1\0\274\344\310\216\0\274\344\377\1\0\274\344\200" \
+  "\202\377\377\377\0\1\0\274\344\250\203\0\274\344\377\1\0\274\344\370" \
+  "\206\377\377\377\0\204\0\274\344\377\1\0\274\344\240\202\377\377\377" \
+  "\0\1\0\274\344\210\204\0\274\344\377\1\0\274\344\30\205\377\377\377\0" \
+  "\1\0\274\344\340\203\0\274\344\377\1\0\274\344\300\202\377\377\377\0" \
+  "\1\0\274\344h\216\0\274\344\377\1\0\274\344\340\202\377\377\377\0\1\0" \
+  "\274\344H\204\0\274\344\377\1\0\274\344X\205\377\377\377\0\1\0\274\344" \
+  "\240\204\0\274\344\377\204\\o{\377\1\\o{\240\205\377\377\377\0\1\\o{" \
+  "X\204\\o{\377\1\\o{H\202\377\377\377\0\1\\o{\340\203\\o{\377\1\\o{\300" \
+  "\205\377\377\377\0\1\\o{8\204\\o{\377\1\\o{h\202\377\377\377\0\1\\o{" \
+  "\300\216\\o{\377\1\\o{\210\202\377\377\377\0\1\\o{\240\204\\o{\377\206" \
+  "\377\377\377\0\1\\o{\370\203\\o{\377\1\\o{\250\202\377\377\377\0\1\0" \
+  "\274\344\200\216\0\274\344\377\1\0\274\344\310\202\377\377\377\0\1\0" \
+  "\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344" \
+  "`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344`\204\0" \
+  "\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344\210\204\0\274" \
+  "\344\377\1\0\274\344\20\205\377\377\377\0\1\0\274\344\340\203\0\274\344" \
+  "\377\1\0\274\344\270\202\377\377\377\0\1\0\274\344\310\216\0\274\344" \
+  "\377\1\0\274\344\200\202\377\377\377\0\1\0\274\344\250\203\0\274\344" \
+  "\377\1\0\274\344\370\206\377\377\377\0\204\0\274\344\377\1\0\274\344" \
+  "\240\202\377\377\377\0\1\0\274\344\210\204\0\274\344\377\1\0\274\344" \
+  "\30\205\377\377\377\0\1\0\274\344\340\203\0\274\344\377\1\0\274\344\300" \
+  "\202\377\377\377\0\1\0\274\344h\216\0\274\344\377\1\0\274\344\340\202" \
+  "\377\377\377\0\1\0\274\344H\204\0\274\344\377\1\0\274\344X\205\377\377" \
+  "\377\0\1\0\274\344\240\204\0\274\344\377\204\\o{\377\1\\o{\240\205\377" \
+  "\377\377\0\1\\o{X\204\\o{\377\1\\o{H\202\377\377\377\0\1\\o{\340\203" \
+  "\\o{\377\1\\o{\300\205\377\377\377\0\1\\o{8\204\\o{\377\1\\o{h\202\377" \
+  "\377\377\0\1\\o{\300\216\\o{\377\1\\o{\210\202\377\377\377\0\1\\o{\240" \
+  "\204\\o{\377\206\377\377\377\0\1\\o{\370\203\\o{\377\1\\o{\250\202\377" \
+  "\377\377\0\1\0\274\344\200\216\0\274\344\377\1\0\274\344\310\202\377" \
+  "\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377" \
+  "\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0" \
+  "\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344" \
+  "\210\204\0\274\344\377\1\0\274\344\20\205\377\377\377\0\1\0\274\344\340" \
+  "\203\0\274\344\377\1\0\274\344\270\202\377\377\377\0\1\0\274\344\310" \
+  "\216\0\274\344\377\1\0\274\344\200\202\377\377\377\0\1\0\274\344\250" \
+  "\203\0\274\344\377\1\0\274\344\370\206\377\377\377\0\204\0\274\344\377" \
+  "\1\0\274\344\240\202\377\377\377\0\1\0\274\344\210\204\0\274\344\377" \
+  "\1\0\274\344\30\205\377\377\377\0\1\0\274\344\340\203\0\274\344\377\1" \
+  "\0\274\344\300\202\377\377\377\0\1\0\274\344h\216\0\274\344\377\1\0\274" \
+  "\344\340\202\377\377\377\0\1\0\274\344H\204\0\274\344\377\1\0\274\344" \
+  "X\205\377\377\377\0\1\0\274\344\240\204\0\274\344\377\204\\o{\377\1\\" \
+  "o{\240\205\377\377\377\0\1\\o{X\204\\o{\377\1\\o{H\202\377\377\377\0" \
+  "\1\\o{\340\203\\o{\377\1\\o{\300\205\377\377\377\0\1\\o{8\204\\o{\377" \
+  "\1\\o{h\202\377\377\377\0\1\\o{\300\204\\o{\377\212\\o{\370\1\\o{\203" \
+  "\202\377\377\377\0\1\\o{\240\204\\o{\377\206\377\377\377\0\1\\o{\370" \
+  "\203\\o{\377\1\\o{\250\202\377\377\377\0\1\0\274\344\200\204\0\274\344" \
+  "\377\1\0\274\344\371\211\0\274\344\370\1\0\274\344\301\202\377\377\377" \
+  "\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0" \
+  "\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344" \
+  "`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344\210\204" \
+  "\0\274\344\377\1\0\274\344\20\205\377\377\377\0\1\0\274\344\340\203\0" \
+  "\274\344\377\1\0\274\344\270\202\377\377\377\0\1\0\274\344\310\203\0" \
+  "\274\344\377\1\0\274\344\376\212\0\274\344\370\1\0\274\344|\202\377\377" \
+  "\377\0\1\0\274\344\250\203\0\274\344\377\1\0\274\344\370\206\377\377" \
+  "\377\0\204\0\274\344\377\1\0\274\344\240\202\377\377\377\0\1\0\274\344" \
+  "\210\204\0\274\344\377\1\0\274\344\30\205\377\377\377\0\1\0\274\344\340" \
+  "\203\0\274\344\377\1\0\274\344\300\202\377\377\377\0\1\0\274\344h\204" \
+  "\0\274\344\377\1\0\274\344\371\211\0\274\344\370\1\0\274\344\331\202" \
+  "\377\377\377\0\1\0\274\344H\204\0\274\344\377\1\0\274\344X\205\377\377" \
+  "\377\0\1\0\274\344\240\204\0\274\344\377\1\\o{\364\203\\o{\377\1\\o{" \
+  "\267\205\377\377\377\0\1\\o{p\204\\o{\377\1\\o{<\202\377\377\377\0\1" \
+  "\\o{\340\203\\o{\377\1\\o{\300\205\377\377\377\0\1\\o{8\204\\o{\377\1" \
+  "\\o{h\202\377\377\377\0\1\\o{\300\203\\o{\377\1\\o{\340\215\377\377\377" \
+  "\0\1\\o{\240\204\\o{\377\206\377\377\377\0\1\\o{\370\203\\o{\377\1\\" \
+  "o{\250\202\377\377\377\0\1\0\274\344\200\204\0\274\344\377\1\0\274\344" \
+  "\40\214\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202" \
+  "\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377" \
+  "\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0" \
+  "\1\0\274\344\210\204\0\274\344\377\1\0\274\344\20\205\377\377\377\0\1" \
+  "\0\274\344\340\203\0\274\344\377\1\0\274\344\270\202\377\377\377\0\1" \
+  "\0\274\344\310\203\0\274\344\377\1\0\274\344\330\215\377\377\377\0\1" \
+  "\0\274\344\250\203\0\274\344\377\1\0\274\344\370\206\377\377\377\0\204" \
+  "\0\274\344\377\1\0\274\344\240\202\377\377\377\0\1\0\274\344\210\204" \
+  "\0\274\344\377\1\0\274\344\30\205\377\377\377\0\1\0\274\344\340\203\0" \
+  "\274\344\377\1\0\274\344\300\202\377\377\377\0\1\0\274\344h\204\0\274" \
+  "\344\377\1\0\274\3448\214\377\377\377\0\1\0\274\344H\204\0\274\344\377" \
+  "\1\0\274\344X\205\377\377\377\0\1\0\274\344\240\204\0\274\344\377\1\\" \
+  "o{\306\203\\o{\377\2\\o{\373\\o{\31\204\377\377\377\0\1\\o{\323\203\\" \
+  "o{\377\2\\o{\376\\o{\15\202\377\377\377\0\1\\o{\340\203\\o{\377\1\\o" \
+  "{\300\205\377\377\377\0\1\\o{=\204\\o{\377\1\\o{e\202\377\377\377\0\1" \
+  "\\o{\275\203\\o{\377\1\\o{\346\215\377\377\377\0\1\\o{\240\204\\o{\377" \
+  "\206\377\377\377\0\1\\o{\370\203\\o{\377\1\\o{\250\202\377\377\377\0" \
+  "\1\0\274\344}\204\0\274\344\377\1\0\274\344&\214\377\377\377\0\1\0\274" \
+  "\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344`\204" \
+  "\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344`\204\0\274" \
+  "\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344\210\204\0\274\344" \
+  "\377\1\0\274\344\20\205\377\377\377\0\1\0\274\344\346\203\0\274\344\377" \
+  "\1\0\274\344\265\202\377\377\377\0\1\0\274\344\305\203\0\274\344\377" \
+  "\1\0\274\344\336\215\377\377\377\0\1\0\274\344\245\203\0\274\344\377" \
+  "\2\0\274\344\372\0\274\344\3\205\377\377\377\0\204\0\274\344\377\1\0" \
+  "\274\344\240\202\377\377\377\0\1\0\274\344\205\204\0\274\344\377\1\0" \
+  "\274\344\36\205\377\377\377\0\1\0\274\344\340\203\0\274\344\377\1\0\274" \
+  "\344\300\202\377\377\377\0\1\0\274\344e\204\0\274\344\377\1\0\274\344" \
+  ">\214\377\377\377\0\1\0\274\344E\204\0\274\344\377\1\0\274\344^\205\377" \
+  "\377\377\0\1\0\274\344\240\204\0\274\344\377\1\\o{\225\204\\o{\377\5" \
+  "\\o{\241\\o{\33\377\377\377\0\\o{\16\\o{w\204\\o{\377\1\\o{\331\203\377" \
+  "\377\377\0\1\\o{\340\203\\o{\377\1\\o{\300\205\377\377\377\0\1\\o{\217" \
+  "\204\\o{\377\1\\o{>\202\377\377\377\0\1\\o{\226\204\\o{\377\1\\o{A\214" \
+  "\377\377\377\0\1\\o{\240\204\\o{\377\206\377\377\377\0\1\\o{\370\203" \
+  "\\o{\377\1\\o{\250\202\377\377\377\0\1\0\274\344V\204\0\274\344\377\1" \
+  "\0\274\344\201\214\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274" \
+  "\344@\202\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202" \
+  "\377\377\377\0\1\0\274\344`\204\0\274\344\377\1\0\274\344@\202\377\377" \
+  "\377\0\1\0\274\344\210\204\0\274\344\377\1\0\274\344\20\204\377\377\377" \
+  "\0\1\0\274\344<\204\0\274\344\377\1\0\274\344\217\202\377\377\377\0\1" \
+  "\0\274\344\241\204\0\274\344\377\1\0\274\3449\214\377\377\377\0\1\0\274" \
+  "\344\201\204\0\274\344\377\1\0\274\344Y\205\377\377\377\0\204\0\274\344" \
+  "\377\1\0\274\344\240\202\377\377\377\0\1\0\274\344^\204\0\274\344\377" \
+  "\1\0\274\344y\205\377\377\377\0\1\0\274\344\340\203\0\274\344\377\1\0" \
+  "\274\344\300\202\377\377\377\0\1\0\274\344>\204\0\274\344\377\1\0\274" \
+  "\344\230\214\377\377\377\0\1\0\274\344\36\204\0\274\344\377\2\0\274\344" \
+  "\266\0\274\344\2\204\377\377\377\0\1\0\274\344\240\204\0\274\344\377" \
+  "\1\\o{E\205\\o{\377\3\\o{\374\\o{\302\\o{\364\205\\o{\377\1\\o{\212\203" \
+  "\377\377\377\0\1\\o{\340\203\\o{\377\1\\o{\352\204\\o{\250\1\\o{\320" \
+  "\204\\o{\377\2\\o{\376\\o{\16\202\377\377\377\0\1\\o{e\204\\o{\377\2" \
+  "\\o{\374\\o{\271\206\\o{\250\2\\o{\213\\o{.\203\377\377\377\0\1\\o{\240" \
+  "\204\\o{\377\206\377\377\377\0\1\\o{\370\203\\o{\377\1\\o{\250\202\377" \
+  "\377\377\0\1\0\274\344%\205\0\274\344\377\1\0\274\344\313\206\0\274\344" \
+  "\250\3\0\274\344\232\0\274\344F\0\274\344\2\202\377\377\377\0\1\0\274" \
+  "\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344`\204" \
+  "\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344`\204\0\274" \
+  "\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344\210\204\0\274\344" \
+  "\377\1\0\274\344\255\203\0\274\344\250\2\0\274\344\267\0\274\344\373" \
+  "\204\0\274\344\377\1\0\274\344_\202\377\377\377\0\1\0\274\344s\204\0" \
+  "\274\344\377\2\0\274\344\373\0\274\344\267\206\0\274\344\250\2\0\274" \
+  "\344\210\0\274\344+\203\377\377\377\0\1\0\274\344S\204\0\274\344\377" \
+  "\2\0\274\344\376\0\274\344\277\204\0\274\344\250\204\0\274\344\377\1" \
+  "\0\274\344\240\202\377\377\377\0\1\0\274\344-\205\0\274\344\377\1\0\274" \
+  "\344\310\204\0\274\344\250\1\0\274\344\365\203\0\274\344\377\1\0\274" \
+  "\344\300\202\377\377\377\0\2\0\274\344\16\0\274\344\376\204\0\274\344" \
+  "\377\1\0\274\344\323\206\0\274\344\250\3\0\274\344\236\0\274\344O\0\274" \
+  "\344\5\203\377\377\377\0\1\0\274\344\354\204\0\274\344\377\1\0\274\344" \
+  "\336\204\0\274\344\250\1\0\274\344\337\204\0\274\344\377\2\377\377\377" \
+  "\0\\o{\236\213\\o{\377\2\\o{\333\\o{\12\203\377\377\377\0\1\\o{\340\215" \
+  "\\o{\377\1\\o{\251\203\377\377\377\0\2\\o{\26\\o{\355\214\\o{\377\2\\" \
+  "o{\375\\o{\34\202\377\377\377\0\1\\o{\240\204\\o{\377\206\377\377\377" \
+  "\0\1\\o{\370\203\\o{\377\1\\o{\250\202\377\377\377\0\2\0\274\344\1\0" \
+  "\274\344\302\215\0\274\344\377\1\0\274\344Z\202\377\377\377\0\1\0\274" \
+  "\344`\204\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344`\204" \
+  "\0\274\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344`\204\0\274" \
+  "\344\377\1\0\274\344@\202\377\377\377\0\1\0\274\344\210\215\0\274\344" \
+  "\377\2\0\274\344\354\0\274\344\26\202\377\377\377\0\2\0\274\344\37\0" \
+  "\274\344\362\214\0\274\344\377\2\0\274\344\373\0\274\344\26\202\377\377" \
+  "\377\0\2\0\274\344\16\0\274\344\343\215\0\274\344\377\1\0\274\344\240" \
+  "\202\377\377\377\0\2\0\274\344\2\0\274\344\311\215\0\274\344\377\1\0" \
+  "\274\344\300\203\377\377\377\0\1\0\274\344\253\215\0\274\344\377\1\0" \
+  "\274\344r\203\377\377\377\0\1\0\274\344\213\216\0\274\344\377\3\377\377" \
+  "\377\0\\o{\17\\o{\335\211\\o{\377\2\\o{\367\\o{<\204\377\377\377\0\1" \
+  "\\o{\340\214\\o{\377\2\\o{\350\\o{\23\204\377\377\377\0\1\\o{]\215\\" \
+  "o{\377\1\\o{n\202\377\377\377\0\1\\o{\232\203\\o{\377\1\\o{\372\206\377" \
+  "\377\377\0\1\\o{\362\203\\o{\377\1\\o{\242\203\377\377\377\0\2\0\274" \
+  "\344&\0\274\344\367\214\0\274\344\377\1\0\274\344\256\202\377\377\377" \
+  "\0\1\0\274\344Z\204\0\274\344\377\1\0\274\344:\202\377\377\377\0\1\0" \
+  "\274\344Z\204\0\274\344\377\1\0\274\344:\202\377\377\377\0\1\0\274\344" \
+  "Z\204\0\274\344\377\1\0\274\344:\202\377\377\377\0\1\0\274\344\202\215" \
+  "\0\274\344\377\1\0\274\344X\204\377\377\377\0\1\0\274\344g\215\0\274" \
+  "\344\377\1\0\274\344f\203\377\377\377\0\1\0\274\344H\215\0\274\344\377" \
+  "\1\0\274\344\232\203\377\377\377\0\2\0\274\344+\0\274\344\371\214\0\274" \
+  "\344\377\1\0\274\344\272\203\377\377\377\0\2\0\274\344\27\0\274\344\355" \
+  "\214\0\274\344\377\1\0\274\344\306\203\377\377\377\0\2\0\274\344\11\0" \
+  "\274\344\333\214\0\274\344\377\1\0\274\344\372\202\377\377\377\0\2\\" \
+  "o{\16\\o{\235\207\\o{\377\2\\o{\307\\o{(\205\377\377\377\0\1\\o{\340" \
+  "\213\\o{\377\2\\o{\324\\o{/\206\377\377\377\0\2\\o{r\\o{\366\213\\o{" \
+  "\377\1\\o{9\202\377\377\377\0\1\\o{Q\203\\o{\377\1\\o{\261\206\377\377" \
+  "\377\0\1\\o{\251\203\\o{\377\1\\o{Y\204\377\377\377\0\2\0\274\344E\0" \
+  "\274\344\343\213\0\274\344\377\1\0\274\344y\202\377\377\377\0\2\0\274" \
+  "\344\26\0\274\344\373\202\0\274\344\377\2\0\274\344\353\0\274\344\5\202" \
+  "\377\377\377\0\2\0\274\344\26\0\274\344\373\202\0\274\344\377\2\0\274" \
+  "\344\353\0\274\344\5\202\377\377\377\0\2\0\274\344\26\0\274\344\373\202" \
+  "\0\274\344\377\2\0\274\344\353\0\274\344\5\202\377\377\377\0\1\0\274" \
+  "\344=\213\0\274\344\377\2\0\274\344\365\0\274\344l\205\377\377\377\0" \
+  "\3\0\274\344\1\0\274\344w\0\274\344\370\213\0\274\344\377\1\0\274\344" \
+  "1\204\377\377\377\0\2\0\274\344`\0\274\344\360\213\0\274\344\377\1\0" \
+  "\274\344Q\204\377\377\377\0\2\0\274\344J\0\274\344\346\213\0\274\344" \
+  "\377\1\0\274\344q\204\377\377\377\0\2\0\274\3447\0\274\344\331\213\0" \
+  "\274\344\377\1\0\274\344\221\204\377\377\377\0\2\0\274\344'\0\274\344" \
+  "\311\213\0\274\344\377\1\0\274\344\261\204\377\377\377\0\10\\o{E\\o{" \
+  "\224\\o{\303\\o{\353\\o{\313\\o{\231\\o{]\\o{\2\206\377\377\377\0\1\\" \
+  "o{\340\210\\o{\377\4\\o{\353\\o{\272\\o{{\\o{\7\210\377\377\377\0\4\\" \
+  "o{&\\o{\230\\o{\307\\o{\360\206\\o{\370\2\\o{\334\\o{\201\203\377\377" \
+  "\377\0\5\\o{\6\\o{\217\\o{\344\\o{\262\\o{1\206\377\377\377\0\5\\o{," \
+  "\\o{\253\\o{\337\\o{\217\\o{\11\205\377\377\377\0\4\0\274\344\17\0\274" \
+  "\344\204\0\274\344\273\0\274\344\350\206\0\274\344\370\3\0\274\344\353" \
+  "\0\274\344\233\0\274\344\26\203\377\377\377\0\4\0\274\344i\0\274\344" \
+  "\326\0\274\344\312\0\274\344U\204\377\377\377\0\4\0\274\344i\0\274\344" \
+  "\326\0\274\344\312\0\274\344U\204\377\377\377\0\4\0\274\344g\0\274\344" \
+  "\320\0\274\344\305\0\274\344T\203\377\377\377\0\3\0\274\344\1\0\274\344" \
+  "\210\0\274\344\345\206\0\274\344\377\4\0\274\344\367\0\274\344\310\0" \
+  "\274\344\224\0\274\344$\210\377\377\377\0\4\0\274\344*\0\274\344\232" \
+  "\0\274\344\310\0\274\344\361\206\0\274\344\370\2\0\274\344\332\0\274" \
+  "\344|\206\377\377\377\0\4\0\274\344\34\0\274\344\222\0\274\344\307\0" \
+  "\274\344\365\206\0\274\344\377\3\0\274\344\351\0\274\344\217\0\274\344" \
+  "\6\205\377\377\377\0\4\0\274\344\21\0\274\344\210\0\274\344\300\0\274" \
+  "\344\360\206\0\274\344\377\3\0\274\344\361\0\274\344\233\0\274\344\23" \
+  "\205\377\377\377\0\4\0\274\344\11\0\274\344{\0\274\344\267\0\274\344" \
+  "\345\206\0\274\344\370\3\0\274\344\357\0\274\344\243\0\274\344!\205\377" \
+  "\377\377\0\4\0\274\344\3\0\274\344m\0\274\344\264\0\274\344\345\206\0" \
+  "\274\344\377\3\0\274\344\373\0\274\344\262\0\274\3441\222\377\377\377" \
+  "\0\1\\o{\340\203\\o{\377\1\\o{\300\377\377\377\377\0\330\377\377\377" \
+  "\0\1\\o{\340\203\\o{\377\1\\o{\300\377\377\377\377\0\330\377\377\377" \
+  "\0\1\\o{\340\203\\o{\377\1\\o{\300\377\377\377\377\0\330\377\377\377" \
+  "\0\1\\o{\340\203\\o{\377\1\\o{\300\377\377\377\377\0\330\377\377\377" \
+  "\0\1\\o{\340\203\\o{\377\1\\o{\300\377\377\377\377\0\330\377\377\377" \
+  "\0\1\\o{\333\203\\o{\377\1\\o{\273\377\377\377\377\0\330\377\377\377" \
+  "\0\1\\o{\222\203\\o{\377\1\\o{r\377\377\377\377\0\330\377\377\377\0\5" \
+  "\\o{!\\o{\247\\o{\347\\o{\233\\o{\23\377\377\377\377\0\306\377\377\377" \
+  "\0")
+
+
diff --git a/recipes/psplash/files/psplash_grayscale.patch b/recipes/psplash/files/psplash_grayscale.patch
index 8f42369300..531d63a89c 100644
--- a/recipes/psplash/files/psplash_grayscale.patch
+++ b/recipes/psplash/files/psplash_grayscale.patch
@@ -1,17 +1,17 @@
-diff -urN psplash.orig/psplash-fb.c psplash/psplash-fb.c
---- psplash.orig/psplash-fb.c	2007-08-29 20:27:49.000000000 +0200
-+++ psplash/psplash-fb.c	2009-01-15 18:42:11.000000000 +0100
-@@ -62,7 +62,8 @@
+diff -Nru psplash_orig/psplash-fb.c psplash/psplash-fb.c
+--- psplash_orig/psplash-fb.c	2010-04-22 16:17:33.000000000 +0200
++++ psplash/psplash-fb.c	2010-05-16 15:49:40.000000000 +0200
+@@ -132,7 +132,8 @@
        goto fail;
      }
-   
+ 
 -  if (fb_var.bits_per_pixel < 16)
-+  if (fb_var.bits_per_pixel != 1 && fb_var.bits_per_pixel != 2
-+      && fb_var.bits_per_pixel < 16)
++  if (fb_var.bits_per_pixel != 1 && fb_var.bits_per_pixel != 2                           
++       && fb_var.bits_per_pixel < 16) 
      {
        fprintf(stderr,
- 	      "Error, no support currently for %i bpp frame buffers\n",
-@@ -143,7 +144,18 @@
+               "Error, no support currently for %i bpp frame buffers\n"
+@@ -258,7 +259,18 @@
    return NULL;
  }
  
@@ -30,8 +30,8 @@ diff -urN psplash.orig/psplash-fb.c psplash/psplash-fb.c
 +}
  
  inline void
- psplash_fb_plot_pixel (PSplashFB    *fb, 
-@@ -153,7 +165,7 @@
+ psplash_fb_plot_pixel (PSplashFB    *fb,
+@@ -268,7 +280,7 @@
  		       uint8        green,
  		       uint8        blue)
  {
@@ -40,7 +40,7 @@ diff -urN psplash.orig/psplash-fb.c psplash/psplash-fb.c
  
    if (x < 0 || x > fb->width-1 || y < 0 || y > fb->height-1)
      return;
-@@ -161,17 +173,17 @@
+@@ -276,17 +288,17 @@
    switch (fb->angle)
      {
      case 270:
@@ -62,22 +62,22 @@ diff -urN psplash.orig/psplash-fb.c psplash/psplash-fb.c
        break;
      }
  
-@@ -188,6 +200,18 @@
-       *(volatile uint16 *) (fb->data + off) 
- 	= ((red >> 3) << 11) | ((green >> 2) << 5) | (blue >> 3);
-       break;
-+    case 2:
-+      shift = (3 - (off & 3)) << 1;
-+      *(fb->data + (off >> 2)) = (*(fb->data + (off >> 2)) & ~(3 << shift))
-+      | (((11*red + 16*green + 5*blue) >> 11) << shift);
-+      break;
-+    case 1:
-+      shift = 7 - (off & 7);
-+      if (((11*red + 16*green + 5*blue) >> 5) >= 128)
-+        *(fb->data + (off >> 3)) |= (1 << shift);
-+      else
-+        *(fb->data + (off >> 3)) &= ~(1 << shift);
-+      break;
-     default:
-       /* depth not supported yet */
-       break;
+@@ -303,6 +315,18 @@
+         *(volatile uint16_t *) (fb->data + off)
+ 	  = ((red >> 3) << 11) | ((green >> 2) << 5) | (blue >> 3);
+         break;
++      case 2:                                                                              
++        shift = (3 - (off & 3)) << 1;                                                      
++        *(fb->data + (off >> 2)) = (*(fb->data + (off >> 2)) & ~(3 << shift))              
++        | (((11*red + 16*green + 5*blue) >> 11) << shift);                                 
++        break;                                                                             
++      case 1:                                                                              
++        shift = 7 - (off & 7);                                                             
++        if (((11*red + 16*green + 5*blue) >> 5) >= 128)                                    
++          *(fb->data + (off >> 3)) |= (1 << shift);                                        
++        else                                                                               
++          *(fb->data + (off >> 3)) &= ~(1 << shift);                                       
++        break;  
+       default:
+         /* depth not supported yet */
+         break;
diff --git a/recipes/psplash/psplash-angstrom_svn.bb b/recipes/psplash/psplash-angstrom_svn.bb
index fc5e4c2a37..2667cc456d 100644
--- a/recipes/psplash/psplash-angstrom_svn.bb
+++ b/recipes/psplash/psplash-angstrom_svn.bb
@@ -3,16 +3,16 @@ require psplash-ua.inc
 
 ALTERNATIVE_PRIORITY = "20"
 
-# You can create your own pslash-hand-img.h by doing
-# ./make-image-header.sh <file>.png HAND
-# and rename the resulting .h to pslash-hand-img.h (for the logo)
+# You can create your own pslash-poky-img.h by doing
+# ./make-image-header.sh <file>.png POKY
+# and rename the resulting .h to pslash-poky-img.h (for the logo)
 # respectively psplash-bar-img.h (BAR) for the bar.
 # You might also want to patch the colors (see patch)
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
-          file://psplash-18bpp.patch;patch=1 \
-          file://logo-math.patch;patch=1 \
-          file://psplash-hand-img.h \
+          file://psplash-18bpp.patch \
+          file://logo-math.patch \
+          file://psplash-poky-img.h \
           file://psplash-bar-img.h \
           file://psplash-default \
           file://splashfuncs \
diff --git a/recipes/psplash/psplash-omap3pandora/configurability.patch b/recipes/psplash/psplash-omap3pandora/configurability.patch
index c9688655c9..90a9c34719 100644
--- a/recipes/psplash/psplash-omap3pandora/configurability.patch
+++ b/recipes/psplash/psplash-omap3pandora/configurability.patch
@@ -232,15 +232,15 @@ Index: psplash/psplash.c
  
    /* Draw the OH logo  */
 -  psplash_fb_draw_image (fb, 
--			 (fb->width  - HAND_IMG_WIDTH)/2, 
--			 ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2, 
+-			 (fb->width  - POKY_IMG_WIDTH)/2, 
+-			 ((fb->height * 5) / 6 - POKY_IMG_HEIGHT)/2, 
 +  psplash_fb_draw_image (fb,
-+                         (fb->width  - HAND_IMG_WIDTH)/2,
-+                         (fb->height - HAND_IMG_HEIGHT)/2,
- 			 HAND_IMG_WIDTH,
- 			 HAND_IMG_HEIGHT,
- 			 HAND_IMG_BYTES_PER_PIXEL,
- 			 HAND_IMG_RLE_PIXEL_DATA);
++                         (fb->width  - POKY_IMG_WIDTH)/2,
++                         (fb->height - POKY_IMG_HEIGHT)/2,
+ 			 POKY_IMG_WIDTH,
+ 			 POKY_IMG_HEIGHT,
+ 			 POKY_IMG_BYTES_PER_PIXEL,
+ 			 POKY_IMG_RLE_PIXEL_DATA);
  
    /* Draw progress bar border */
 -  psplash_fb_draw_image (fb, 
diff --git a/recipes/psplash/psplash-omap3pandora/logo-math.patch b/recipes/psplash/psplash-omap3pandora/logo-math.patch
index 21467af0ec..2ebfd7cd4c 100644
--- a/recipes/psplash/psplash-omap3pandora/logo-math.patch
+++ b/recipes/psplash/psplash-omap3pandora/logo-math.patch
@@ -1,15 +1,23 @@
 upstream: http://bugzilla.openedhand.com/show_bug.cgi?id=801
 comment:
 Do better math when showing logo vs progressbar.
+---
+ psplash.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
---- psplash/psplash.c.org	2007-09-22 20:33:36.000000000 +0300
-+++ psplash/psplash.c	2007-12-01 21:27:08.000000000 +0200
-@@ -258,7 +258,7 @@
+diff --git a/psplash.c b/psplash.c
+index 54a65cf..7a52e05 100644
+--- a/psplash.c
++++ b/psplash.c
+@@ -269,7 +269,7 @@ main (int argc, char** argv)
    /* Draw the OH logo  */
    psplash_fb_draw_image (fb, 
- 			 (fb->width  - HAND_IMG_WIDTH)/2, 
--			 (fb->height - HAND_IMG_HEIGHT)/2, 
-+			 ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2, 
- 			 HAND_IMG_WIDTH,
- 			 HAND_IMG_HEIGHT,
- 			 HAND_IMG_BYTES_PER_PIXEL,
+ 			 (fb->width  - POKY_IMG_WIDTH)/2, 
+-			 (fb->height - POKY_IMG_HEIGHT)/2, 
++			 ((fb->height * 5) / 6 - POKY_IMG_HEIGHT)/2, 
+ 			 POKY_IMG_WIDTH,
+ 			 POKY_IMG_HEIGHT,
+ 			 POKY_IMG_BYTES_PER_PIXEL,
+-- 
+1.6.3.3
+
diff --git a/recipes/psplash/psplash-omap3pandora/psplash-hand-img.h b/recipes/psplash/psplash-omap3pandora/psplash-poky-img.h
index 13c64cfc8b..c07ae8621d 100644
--- a/recipes/psplash/psplash-omap3pandora/psplash-hand-img.h
+++ b/recipes/psplash/psplash-omap3pandora/psplash-poky-img.h
@@ -1,10 +1,10 @@
 /* GdkPixbuf RGB C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (2400)
-#define HAND_IMG_WIDTH (800)
-#define HAND_IMG_HEIGHT (480)
-#define HAND_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+#define POKY_IMG_ROWSTRIDE (2400)
+#define POKY_IMG_WIDTH (800)
+#define POKY_IMG_HEIGHT (480)
+#define POKY_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
+#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \
   "\347\0\0\0\202\0\0\1\1\0\0\0\202\0\0\1\202\0\0\2\1\0\0\1\202\0\0\2\202" \
   "\0\0\3\1\0\0\2\202\0\0\3\202\0\0\4\1\0\0\3\202\0\0\4\202\0\0\5\1\0\0" \
   "\4\202\0\0\5\202\0\0\6\1\0\0\5\202\0\0\6\202\0\0\7\1\0\0\6\202\0\0\7" \
diff --git a/recipes/psplash/psplash-omap3pandora_svn.bb b/recipes/psplash/psplash-omap3pandora_svn.bb
index bc9e9f68dc..120679b562 100644
--- a/recipes/psplash/psplash-omap3pandora_svn.bb
+++ b/recipes/psplash/psplash-omap3pandora_svn.bb
@@ -4,15 +4,15 @@ require psplash-ua.inc
 ALTERNATIVE_PRIORITY = "30"
 ALTERNATIVE_PRIORITY_omap3pandora = "5"
 
-# You can create your own pslash-hand-img.h by doing
-# ./make-image-header.sh <file>.png HAND
-# and rename the resulting .h to pslash-hand-img.h (for the logo)
+# You can create your own pslash-poky-img.h by doing
+# ./make-image-header.sh <file>.png POKY
+# and rename the resulting .h to pslash-poky-img.h (for the logo)
 # respectively psplash-bar-img.h (BAR) for the bar.
 # You might also want to patch the colors (see patch)
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
-          file://logo-math.patch;patch=1 \
-          file://psplash-hand-img.h \
+          file://logo-math.patch \
+          file://psplash-poky-img.h \
           file://psplash-bar-img.h \
           file://psplash-default \
           file://splashfuncs \
diff --git a/recipes/psplash/psplash-openmoko_svn.bb b/recipes/psplash/psplash-openmoko_svn.bb
index 1114645040..9c675b4e80 100644
--- a/recipes/psplash/psplash-openmoko_svn.bb
+++ b/recipes/psplash/psplash-openmoko_svn.bb
@@ -3,18 +3,18 @@ require psplash-ua.inc
 
 ALTERNATIVE_PRIORITY = "30"
 
-# You can create your own pslash-hand-img.h by doing
-# ./make-image-header.sh <file>.png HAND
-# and rename the resulting .h to pslash-hand-img.h (for the logo)
+# You can create your own pslash-poky-img.h by doing
+# ./make-image-header.sh <file>.png POKY
+# and rename the resulting .h to pslash-poky-img.h (for the logo)
 # respectively psplash-bar-img.h (BAR) for the bar.
 # You might also want to patch the colors (see patch)
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
-          file://logo-math.patch;patch=1 \
-          file://psplash-hand-img.h \
+          file://logo-math.patch \
+          file://psplash-poky-img.h \
           file://psplash-bar-img.h \
           file://psplash-default \
           file://psplash-init"
 S = "${WORKDIR}/psplash"
 
-SRC_URI_append_openmoko = " file://configurability.patch;patch=1 "
+SRC_URI_append_openmoko = " file://configurability.patch "
diff --git a/recipes/psplash/psplash.inc b/recipes/psplash/psplash.inc
index 7319b96443..b7dd6e8749 100644
--- a/recipes/psplash/psplash.inc
+++ b/recipes/psplash/psplash.inc
@@ -7,20 +7,20 @@ PROVIDES = "virtual/psplash"
 RPROVIDES_${PN} = "virtual-psplash"
 RCONFLICTS_${PN} = "exquisite"
 
-SRCREV = "249"
+SRCREV = "422"
 PV = "0.0+svnr${SRCPV}"
-PR = "r23"
+PR = "r29"
 
-# You can create your own pslash-hand-img.h by doing
-# ./make-image-header.sh <file>.png HAND
-# and rename the resulting .h to pslash-hand-img.h (for the logo)
+# You can create your own pslash-poky-img.h by doing
+# ./make-image-header.sh <file>.png POKY
+# and rename the resulting .h to pslash-poky-img.h (for the logo)
 # respectively psplash-bar-img.h (BAR) for the bar.
 # You might also want to patch the colors (see patch)
 
 inherit autotools pkgconfig update-rc.d
 
 do_configure_append() {
-	install -m 0644 ${WORKDIR}/psplash-hand-img.h ${S}/
+	install -m 0644 ${WORKDIR}/psplash-poky-img.h ${S}/
 	install -m 0644 ${WORKDIR}/psplash-bar-img.h ${S}/
 
 	if [ -e "${WORKDIR}/psplash.h" ]; then
diff --git a/recipes/psplash/psplash_svn.bb b/recipes/psplash/psplash_svn.bb
index 584822e254..c47ff11b95 100644
--- a/recipes/psplash/psplash_svn.bb
+++ b/recipes/psplash/psplash_svn.bb
@@ -4,7 +4,7 @@ require psplash-ua.inc
 ALTERNATIVE_PRIORITY = "10"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
-          file://psplash-hand-img.h \
+          file://psplash-poky-img.h \
           file://psplash-bar-img.h \
           file://psplash-default \
           file://splashfuncs \
@@ -12,7 +12,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
 S = "${WORKDIR}/psplash"
 
 # This really should be default, but due yo openmoko hack below, can't be easily
-SRC_URI_append_angstrom = " file://logo-math.patch;patch=1 "
-SRC_URI_append_openmoko = " file://configurability.patch;patch=1 "
-SRC_URI_append_boc01 = " file://psplash_grayscale.patch;patch=1 "
+SRC_URI_append_angstrom = " file://logo-math.patch "
+SRC_URI_append_openmoko = " file://configurability.patch "
+SRC_URI_append_boc01 = " file://psplash_grayscale.patch "
 
diff --git a/recipes/pth/pth_2.0.2.bb b/recipes/pth/pth_2.0.2.bb
index 6d81f2aa41..d27c909cd7 100644
--- a/recipes/pth/pth_2.0.2.bb
+++ b/recipes/pth/pth_2.0.2.bb
@@ -5,8 +5,8 @@ LICENSE = "GPL LGPL FDL"
 PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \
-	   file://m4-warning.patch;patch=1 \
-	   file://ldflags.patch;patch=1 \
+	   file://m4-warning.patch \
+	   file://ldflags.patch \
 	  "
 
 PARALLEL_MAKE=""
diff --git a/recipes/pthsem/pthsem_2.0.7.bb b/recipes/pthsem/pthsem_2.0.7.bb
index bc86bd57a0..b08299ca67 100644
--- a/recipes/pthsem/pthsem_2.0.7.bb
+++ b/recipes/pthsem/pthsem_2.0.7.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL LGPL FDL"
 PR = "r0"
 
 SRC_URI = "https://www.auto.tuwien.ac.at/~mkoegler/pth/pthsem-${PV}.tar.gz \
-           file://ldflags.patch;patch=1 \
+           file://ldflags.patch \
           "
 
 inherit autotools binconfig
diff --git a/recipes/pulseaudio/libatomics-ops_1.2.bb b/recipes/pulseaudio/libatomics-ops_1.2.bb
index 5feab5bb72..a0e2d8f08e 100644
--- a/recipes/pulseaudio/libatomics-ops_1.2.bb
+++ b/recipes/pulseaudio/libatomics-ops_1.2.bb
@@ -4,9 +4,9 @@ LICENSE = "MIT"
 PR = "r3"
 
 SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz \
-           file://fedora/libatomic_ops-1.2-ppclwzfix.patch;patch=1 \
-           file://gentoo/libatomic_ops-1.2-mips.patch;patch=1 \
-	   file://dont.install.header.twice.patch;patch=1"
+           file://fedora/libatomic_ops-1.2-ppclwzfix.patch \
+           file://gentoo/libatomic_ops-1.2-mips.patch \
+	   file://dont.install.header.twice.patch"
 
 S = "${WORKDIR}/libatomic_ops-${PV}"
 
diff --git a/recipes/pulseaudio/libcanberra_0.14.bb b/recipes/pulseaudio/libcanberra_0.14.bb
index f8c480a7c1..58f2b1c08b 100644
--- a/recipes/pulseaudio/libcanberra_0.14.bb
+++ b/recipes/pulseaudio/libcanberra_0.14.bb
@@ -11,7 +11,7 @@ inherit autotools_stage
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \
-           file://libcanberra-increase-buffer-size.patch;patch=1"
+           file://libcanberra-increase-buffer-size.patch"
 
 EXTRA_OECONF = "\
   --enable-alsa \
diff --git a/recipes/pulseaudio/libcanberra_0.17.bb b/recipes/pulseaudio/libcanberra_0.17.bb
index 1999e8c932..0e6f06abc8 100644
--- a/recipes/pulseaudio/libcanberra_0.17.bb
+++ b/recipes/pulseaudio/libcanberra_0.17.bb
@@ -11,7 +11,7 @@ inherit autotools_stage vala
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \
-           file://libcanberra-increase-buffer-size.patch;patch=1"
+           file://libcanberra-increase-buffer-size.patch"
 
 EXTRA_OECONF = "\
   --enable-alsa \
diff --git a/recipes/pulseaudio/pulseaudio.inc b/recipes/pulseaudio/pulseaudio.inc
index 3b65f18a1a..4504656417 100644
--- a/recipes/pulseaudio/pulseaudio.inc
+++ b/recipes/pulseaudio/pulseaudio.inc
@@ -9,8 +9,8 @@ DEPENDS += "alsa-lib glib-2.0 dbus consolekit hal openssl"
 INC_PR = "r9"
 
 SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
-           file://gcc4-compile-fix.patch;patch=1 \
-           file://configure-ac.patch;patch=1 \
+           file://gcc4-compile-fix.patch \
+           file://configure-ac.patch \
            file://volatiles.04_pulse"
 
 inherit autotools pkgconfig
diff --git a/recipes/pulseaudio/pulseaudio_0.9.10.bb b/recipes/pulseaudio/pulseaudio_0.9.10.bb
index 2cce111093..458766ec3b 100644
--- a/recipes/pulseaudio/pulseaudio_0.9.10.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.10.bb
@@ -3,13 +3,13 @@ require pulseaudio.inc
 PR = "${INC_PR}.1"
 
 SRC_URI += "\
-  file://disable-using-glibc-tls.patch;patch=1 \
-  file://libpulsedsp-references-libpulsecore.patch;patch=1 \
-  file://pa-drop-caps-returns-void.patch;patch=1 \
-#  file://libtool2.patch;patch=1 \
-  file://2113.diff;patch=1;pnum=0 \
-  file://2114.diff;patch=1;pnum=0 \
-  file://libiconv.patch;patch=1 \
+  file://disable-using-glibc-tls.patch \
+  file://libpulsedsp-references-libpulsecore.patch \
+  file://pa-drop-caps-returns-void.patch \
+#  file://libtool2.patch \
+  file://2113.diff;striplevel=0 \
+  file://2114.diff;striplevel=0 \
+  file://libiconv.patch \
 "            
 
 do_compile_prepend() {
diff --git a/recipes/pulseaudio/pulseaudio_0.9.11.bb b/recipes/pulseaudio/pulseaudio_0.9.11.bb
index 751b06835c..4f12b7bc23 100644
--- a/recipes/pulseaudio/pulseaudio_0.9.11.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.11.bb
@@ -7,14 +7,14 @@ PR = "${INC_PR}.1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += "\
-  file://disable-using-glibc-tls.patch;patch=1 \
-  file://buildfix.patch;patch=1 \
-#  file://libpulsedsp-references-libpulsecore.patch;patch=1 \
-#  file://pa-drop-caps-returns-void.patch;patch=1 \
-#  file://libtool2.patch;patch=1 \
-  file://2113.diff;patch=1;pnum=0 \
-  file://2114.diff;patch=1;pnum=0 \
-#  file://libiconv.patch;patch=1 \
+  file://disable-using-glibc-tls.patch \
+  file://buildfix.patch \
+#  file://libpulsedsp-references-libpulsecore.patch \
+#  file://pa-drop-caps-returns-void.patch \
+#  file://libtool2.patch \
+  file://2113.diff;striplevel=0 \
+  file://2114.diff;striplevel=0 \
+#  file://libiconv.patch \
 "            
 
 do_compile_prepend() {
diff --git a/recipes/pulseaudio/pulseaudio_0.9.15.bb b/recipes/pulseaudio/pulseaudio_0.9.15.bb
index 9dad0fad37..e95b7d42bf 100644
--- a/recipes/pulseaudio/pulseaudio_0.9.15.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.15.bb
@@ -6,17 +6,17 @@ PR = "${INC_PR}.6"
 inherit gettext
 
 SRC_URI += "\
-  file://buildfix.patch;patch=1 \
-  file://alsaerror.patch;patch=1 \
-  file://periodfix.patch;patch=1 \
-  file://fallback.patch;patch=1 \
-  file://autoconf_version.patch;patch=1 \
-  file://gettext.patch;patch=1 \
-  file://fixbluezbuild.patch;patch=1 \
-  file://tls_m4.patch;patch=1 \
-  file://sbc-thumb.patch;patch=1 \
-  file://CVE-2009-1299.patch;patch=1 \
-  file://CVE-2009-1894.patch;patch=1 \
+  file://buildfix.patch \
+  file://alsaerror.patch \
+  file://periodfix.patch \
+  file://fallback.patch \
+  file://autoconf_version.patch \
+  file://gettext.patch \
+  file://fixbluezbuild.patch \
+  file://tls_m4.patch \
+  file://sbc-thumb.patch \
+  file://CVE-2009-1299.patch \
+  file://CVE-2009-1894.patch \
 "
 
 do_compile_prepend() {
diff --git a/recipes/pulseaudio/pulseaudio_0.9.19.bb b/recipes/pulseaudio/pulseaudio_0.9.19.bb
index e4d9e9ea1a..a0ba1a04bf 100644
--- a/recipes/pulseaudio/pulseaudio_0.9.19.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.19.bb
@@ -11,12 +11,12 @@ PR = "${INC_PR}.0"
 inherit gettext
 
 SRC_URI += "\
-  file://buildfix.patch;patch=1 \
-  file://autoconf_version.patch;patch=1 \
-  file://tls_m4.patch;patch=1 \
-  file://configure_silent_rules.patch;patch=1 \
-  file://gettext.patch;patch=1 \
-  file://fixbluezbuild.patch;patch=1 \
+  file://buildfix.patch \
+  file://autoconf_version.patch \
+  file://tls_m4.patch \
+  file://configure_silent_rules.patch \
+  file://gettext.patch \
+  file://fixbluezbuild.patch \
 "
 
 do_compile_prepend() {
diff --git a/recipes/pulseaudio/pulseaudio_0.9.21.bb b/recipes/pulseaudio/pulseaudio_0.9.21.bb
index 41910e4d80..8be0ea2d0f 100644
--- a/recipes/pulseaudio/pulseaudio_0.9.21.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.21.bb
@@ -9,10 +9,10 @@ DEFAULT_PREFERENCE_motorola-ezx = "-1"
 inherit gettext
 
 SRC_URI += "\
-  file://buildfix.patch;patch=1 \
-  file://autoconf_version.patch;patch=1 \
-  file://tls_m4.patch;patch=1 \
-  file://configure_silent_rules.patch;patch=1 \
+  file://buildfix.patch \
+  file://autoconf_version.patch \
+  file://tls_m4.patch \
+  file://configure_silent_rules.patch \
 "
 
 do_compile_prepend() {
diff --git a/recipes/pulseaudio/pulseaudio_0.9.9.bb b/recipes/pulseaudio/pulseaudio_0.9.9.bb
index 479451a692..9babcaeea1 100644
--- a/recipes/pulseaudio/pulseaudio_0.9.9.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.9.bb
@@ -4,9 +4,9 @@ PR = "${INC_PR}.1"
 
 # this is not correct (see below)
 SRC_URI += "\
-  file://disable-using-glibc-tls.patch;patch=1 \
-  file://fix-dbus-without-hal.patch;patch=1 \
-  file://fix-shm.patch;patch=1 \
+  file://disable-using-glibc-tls.patch \
+  file://fix-dbus-without-hal.patch \
+  file://fix-shm.patch \
 "            
 
 # problems w/ pulseaudio 0.9.9 atm:
diff --git a/recipes/pump/pump_0.8.24.bb b/recipes/pump/pump_0.8.24.bb
index 3b71e24ce5..7bff529cdf 100644
--- a/recipes/pump/pump_0.8.24.bb
+++ b/recipes/pump/pump_0.8.24.bb
@@ -7,7 +7,7 @@ DEPENDS = "popt"
 S = "${WORKDIR}/pump-${PV}"
 
 SRC_URI = "http://ftp.de.debian.org/debian/pool/main/p/pump/pump_0.8.24.orig.tar.gz \
-           file://debian.patch;patch=1"
+           file://debian.patch"
 
 do_compile() {
         oe_runmake pump 
diff --git a/recipes/puppy/puppy_1.11.bb b/recipes/puppy/puppy_1.11.bb
index ee9254bd01..63ca033bec 100644
--- a/recipes/puppy/puppy_1.11.bb
+++ b/recipes/puppy/puppy_1.11.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r3"
 
 SRC_URI = "cvs://anonymous:@puppy.cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_11 \
-	   file://usb-header.patch;patch=1"
+	   file://usb-header.patch"
 S = "${WORKDIR}/puppy"
 
 inherit autotools
diff --git a/recipes/puzz-le/puzz-le_2.0.0.bb b/recipes/puzz-le/puzz-le_2.0.0.bb
index ffec347c09..a2fb02e60a 100644
--- a/recipes/puzz-le/puzz-le_2.0.0.bb
+++ b/recipes/puzz-le/puzz-le_2.0.0.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://www.warmi.net/zaurus/files/puzz-le_${PV}.tar.gz \
-           file://gcc3.patch;patch=1"
+           file://gcc3.patch"
 S = "${WORKDIR}/puzzle_arm"
 
 inherit palmtop
diff --git a/recipes/pvrusb2-mci/pvrusb2-mci_20060903.bb b/recipes/pvrusb2-mci/pvrusb2-mci_20060903.bb
index 6b0498cc55..ffc1c8f86f 100644
--- a/recipes/pvrusb2-mci/pvrusb2-mci_20060903.bb
+++ b/recipes/pvrusb2-mci/pvrusb2-mci_20060903.bb
@@ -16,7 +16,7 @@ RRECOMMENDS = "kernel-module-tveeprom \
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
            file://hotplug.functions \
            file://firmware.hotplug \
-           file://Makefile.patch;patch=1"
+           file://Makefile.patch"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
diff --git a/recipes/pvrusb2-mci/pvrusb2-mci_20080210.bb b/recipes/pvrusb2-mci/pvrusb2-mci_20080210.bb
index cb378e9dda..92ff4c1365 100644
--- a/recipes/pvrusb2-mci/pvrusb2-mci_20080210.bb
+++ b/recipes/pvrusb2-mci/pvrusb2-mci_20080210.bb
@@ -16,7 +16,7 @@ RRECOMMENDS = "kernel-module-tveeprom \
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
            file://hotplug.functions \
            file://firmware.hotplug \
-           file://Makefile.patch;patch=1"
+           file://Makefile.patch"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
diff --git a/recipes/pwc/pwc_10.0.12-rc1.bb b/recipes/pwc/pwc_10.0.12-rc1.bb
index 72e0ae18de..c5cca8dd42 100644
--- a/recipes/pwc/pwc_10.0.12-rc1.bb
+++ b/recipes/pwc/pwc_10.0.12-rc1.bb
@@ -9,7 +9,7 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "http://www.saillard.org/linux/pwc/files/pwc-${PV}.tar.bz2 \
-           file://Makefile.patch;patch=1"
+           file://Makefile.patch"
 
 S = "${WORKDIR}/pwc-${PV}"
 
diff --git a/recipes/pwc/pwc_10.0.6a.bb b/recipes/pwc/pwc_10.0.6a.bb
index b4ae861544..84407e0a56 100644
--- a/recipes/pwc/pwc_10.0.6a.bb
+++ b/recipes/pwc/pwc_10.0.6a.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://www.saillard.org/linux/pwc/files/pwc-${PV}.tar.bz2 \
-	   file://endian-fix.patch;patch=1 \
+	   file://endian-fix.patch \
 	   file://Makefile"
 
 S = "${WORKDIR}/pwc-${PV}"
diff --git a/recipes/pxaregs/pxaregs_1.14.bb b/recipes/pxaregs/pxaregs_1.14.bb
index 2df012ec81..3619891754 100644
--- a/recipes/pxaregs/pxaregs_1.14.bb
+++ b/recipes/pxaregs/pxaregs_1.14.bb
@@ -4,10 +4,10 @@ AUTHOR = "Holger Schurig <hs4233@mail.mn-solutions.de>"
 HOMEPAGE = "http://www.mn-logistik.de/unsupported/pxa250/"
 
 SRC_URI = "http://www.mn-logistik.de/unsupported/pxa250/pxaregs.c \
-           file://i2c.patch;pnum=1;patch=1 \
-           file://munmap.patch;pnum=1;patch=1 \
-           file://serial.patch;pnum=1;patch=1 \
-           file://usb.patch;pnum=1;patch=1 "
+           file://i2c.patch \
+           file://munmap.patch \
+           file://serial.patch \
+           file://usb.patch "
 
 S = "${WORKDIR}"
 
diff --git a/recipes/pyphonelog/pyphonelog_git.bb b/recipes/pyphonelog/pyphonelog_git.bb
index 68c72e3021..54da541206 100644
--- a/recipes/pyphonelog/pyphonelog_git.bb
+++ b/recipes/pyphonelog/pyphonelog_git.bb
@@ -8,7 +8,7 @@ RDEPENDS += "python python-pygtk python-sqlite3 python-phoneutils"
 inherit distutils
 
 S = "${WORKDIR}/git"
-SRCREV = "7672065334cb64e890cfb86d0236f4c36d595e4b"
+SRCREV = "d22159060470d2f429d4e8b9ba1dc3096aa5d099"
 PV = "0.17.0+gitr${SRCPV}"
 PR = "r0"
 SRC_URI = "git://shr.bearstech.com/repo/pyphonelog.git;protocol=http"
diff --git a/recipes/pythm/pythm_svn.bb b/recipes/pythm/pythm_svn.bb
index 556ea33d11..e66cf272c5 100644
--- a/recipes/pythm/pythm_svn.bb
+++ b/recipes/pythm/pythm_svn.bb
@@ -8,7 +8,7 @@ SRCREV = "19"
 PV = "0.5.1+svnr${SRCPV}"
 PR = "r3"
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=pythm \
-           file://mplayer-escape-filenames.patch;patch=0 \
+           file://mplayer-escape-filenames.patch \
            file://pythm.desktop \
 	   file://pythm.conf"
 S = "${WORKDIR}/pythm"
diff --git a/recipes/python/python-2.6-manifest.inc b/recipes/python/python-2.6-manifest.inc
index cee12c866c..16e4465285 100644
--- a/recipes/python/python-2.6-manifest.inc
+++ b/recipes/python/python-2.6-manifest.inc
@@ -1,6 +1,5 @@
-
 # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
-# Generator: '../../contrib/python/generate-manifest-2.6.py' Version 20091004 (C) 2002-2009 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# Generator: './generate-manifest-2.6.py' Version 20100505 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
 # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 
  
@@ -51,7 +50,7 @@ FILES_python-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 RDEPENDS_python-io="python-core python-math"
-FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
+FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/ssl.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
 
 DESCRIPTION_python-compiler="Python Compiler Support"
 RDEPENDS_python-compiler="python-core"
diff --git a/recipes/python/python-edje_svn.bb b/recipes/python/python-edje_svn.bb
index 2c087cabfd..793db0c437 100644
--- a/recipes/python/python-edje_svn.bb
+++ b/recipes/python/python-edje_svn.bb
@@ -3,4 +3,4 @@ SRCREV = "${EFL_SRCREV}"
 DEPENDS += "edje python-evas"
 RDEPENDS += "python-evas"
 
-SRC_URI += "file://0001-fix-unicode-conversion.patch;patch=1"
+SRC_URI += "file://0001-fix-unicode-conversion.patch"
diff --git a/recipes/python/python-gst_0.10.10.bb b/recipes/python/python-gst_0.10.10.bb
index eb00fb6980..d56c201064 100644
--- a/recipes/python/python-gst_0.10.10.bb
+++ b/recipes/python/python-gst_0.10.10.bb
@@ -6,8 +6,8 @@ PR = "ml4"
 
 SRC_URI = "\
   http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
-  file://python-path.patch;patch=1 \
-  file://import-gobject-instead-of-pygtk.patch;patch=1 \
+  file://python-path.patch \
+  file://import-gobject-instead-of-pygtk.patch \
 "
 S = "${WORKDIR}/gst-python-${PV}"
 
diff --git a/recipes/python/python-gst_0.10.17.bb b/recipes/python/python-gst_0.10.17.bb
index 1f82594c71..622da92c57 100644
--- a/recipes/python/python-gst_0.10.17.bb
+++ b/recipes/python/python-gst_0.10.17.bb
@@ -7,8 +7,8 @@ PR = "r1"
 
 SRC_URI = "\
   http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
-  file://python-path.patch;patch=1 \
-  file://import-gobject-instead-of-pygtk.patch;patch=1 \
+  file://python-path.patch \
+  file://import-gobject-instead-of-pygtk.patch \
 "
 S = "${WORKDIR}/gst-python-${PV}"
 
diff --git a/recipes/python/python-imaging_1.1.6.bb b/recipes/python/python-imaging_1.1.6.bb
index 63e98321e5..cf8f348edf 100644
--- a/recipes/python/python-imaging_1.1.6.bb
+++ b/recipes/python/python-imaging_1.1.6.bb
@@ -8,7 +8,7 @@ SRCNAME = "Imaging"
 PR = "ml1"
 
 SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
-           file://path.patch;patch=1"
+           file://path.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/recipes/python/python-ldap_2.3.9.bb b/recipes/python/python-ldap_2.3.9.bb
index 39ffefd0f1..f7f3cbe94e 100644
--- a/recipes/python/python-ldap_2.3.9.bb
+++ b/recipes/python/python-ldap_2.3.9.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.python-ldap.org/"
 DEPENDS = "python openldap" 
  
 SRC_URI = "http://pypi.python.org/packages/source/p/${PN}/${PN}-${PV}.tar.gz \ 
-           file://setup.cfg.patch;patch=1"  
+           file://setup.cfg.patch"  
  
 inherit setuptools  
 
diff --git a/recipes/python/python-m2crypto_0.18.2.bb b/recipes/python/python-m2crypto_0.18.2.bb
index 7a2af1eb24..84e870d8e4 100644
--- a/recipes/python/python-m2crypto_0.18.2.bb
+++ b/recipes/python/python-m2crypto_0.18.2.bb
@@ -8,7 +8,7 @@ PR = "ml1"
 
 SRC_URI = "\
   http://chandlerproject.org/pub/Projects/MeTooCrypto/m2crypto-${PV}.tar.gz \
-  file://install.patch;patch=1 \
+  file://install.patch \
 "
 S = "${WORKDIR}/m2crypto-0.18.2"
 
@@ -20,3 +20,6 @@ export STAGING_LIBDIR
 
 SRC_URI[md5sum] = "445dce53fcfc7ec8f6fd31f54da8a067"
 SRC_URI[sha256sum] = "62ed44c8b2d392bdc757981ac37f05d808a0d917e4f9d95de2fbf3c2bdad41a7"
+
+NATIVE_INSTALL_WORKS = "1"
+BBCLASSEXTEND = "native"
diff --git a/recipes/python/python-mysqldb_1.2.1.bb b/recipes/python/python-mysqldb_1.2.1.bb
index 23b16decbe..ca5e217401 100644
--- a/recipes/python/python-mysqldb_1.2.1.bb
+++ b/recipes/python/python-mysqldb_1.2.1.bb
@@ -9,8 +9,8 @@ inherit distutils
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/mysql-python/MySQL-python-${PV}_p2.tar.gz \
-  file://mysqlpath.patch;patch=1 \
-  file://site.patch;patch=1 \
+  file://mysqlpath.patch \
+  file://site.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}_p2"
 
diff --git a/recipes/python/python-native_2.6.1.bb b/recipes/python/python-native_2.6.1.bb
index 09e8d5a151..44da281d62 100644
--- a/recipes/python/python-native_2.6.1.bb
+++ b/recipes/python/python-native_2.6.1.bb
@@ -4,14 +4,14 @@ PR = "${INC_PR}.2"
 
 SRC_URI = "\
   http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
-  file://00-fix-bindir-libdir-for-cross.patch;patch=1 \
-  file://04-default-is-optimized.patch;patch=1 \
-  file://05-enable-ctypes-cross-build.patch;patch=1 \
-  file://10-distutils-fix-swig-parameter.patch;patch=1 \
-  file://11-distutils-never-modify-shebang-line.patch;patch=1 \
-  file://12-distutils-prefix-is-inside-staging-area.patch;patch=1 \
-  file://debug.patch;patch=1 \
-  file://nohostlibs.patch;patch=1 \
+  file://00-fix-bindir-libdir-for-cross.patch \
+  file://04-default-is-optimized.patch \
+  file://05-enable-ctypes-cross-build.patch \
+  file://10-distutils-fix-swig-parameter.patch \
+  file://11-distutils-never-modify-shebang-line.patch \
+  file://12-distutils-prefix-is-inside-staging-area.patch \
+  file://debug.patch \
+  file://nohostlibs.patch \
 "
 S = "${WORKDIR}/Python-${PV}"
 
diff --git a/recipes/python/python-native_2.6.4.bb b/recipes/python/python-native_2.6.4.bb
index ffa9a45a91..4205312978 100644
--- a/recipes/python/python-native_2.6.4.bb
+++ b/recipes/python/python-native_2.6.4.bb
@@ -4,15 +4,15 @@ PR = "${INC_PR}.3"
 
 SRC_URI = "\
   http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2;name=archive \
-  file://00-fix-bindir-libdir-for-cross.patch;patch=1 \
-  file://04-default-is-optimized.patch;patch=1 \
-  file://05-enable-ctypes-cross-build.patch;patch=1 \
-  file://06-ctypes-libffi-fix-configure.patch;patch=1 \
-  file://10-distutils-fix-swig-parameter.patch;patch=1 \
-  file://11-distutils-never-modify-shebang-line.patch;patch=1 \
-  file://12-distutils-prefix-is-inside-staging-area.patch;patch=1 \
-  file://debug.patch;patch=1 \
-  file://nohostlibs.patch;patch=1 \
+  file://00-fix-bindir-libdir-for-cross.patch \
+  file://04-default-is-optimized.patch \
+  file://05-enable-ctypes-cross-build.patch \
+  file://06-ctypes-libffi-fix-configure.patch \
+  file://10-distutils-fix-swig-parameter.patch \
+  file://11-distutils-never-modify-shebang-line.patch \
+  file://12-distutils-prefix-is-inside-staging-area.patch \
+  file://debug.patch \
+  file://nohostlibs.patch \
 "
 S = "${WORKDIR}/Python-${PV}"
 
diff --git a/recipes/python/python-numeric_23.7.bb b/recipes/python/python-numeric_23.7.bb
index bddef89788..a49e0e156b 100644
--- a/recipes/python/python-numeric_23.7.bb
+++ b/recipes/python/python-numeric_23.7.bb
@@ -5,7 +5,7 @@ LICENSE = "PSF"
 PR = "ml1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz \
-           file://no-lapack.patch;patch=1"
+           file://no-lapack.patch"
 S = "${WORKDIR}/Numeric-${PV}"
 
 inherit distutils
diff --git a/recipes/python/python-numpy_1.1.1.bb b/recipes/python/python-numpy_1.1.1.bb
index 4efd67a8a6..f5c23e055f 100644
--- a/recipes/python/python-numpy_1.1.1.bb
+++ b/recipes/python/python-numpy_1.1.1.bb
@@ -5,8 +5,8 @@ LICENSE = "PSF"
 PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \
-           file://unbreak-assumptions.diff;patch=1 \
-	   file://trycompile.diff;patch=1 \
+           file://unbreak-assumptions.diff \
+	   file://trycompile.diff \
 	   file://config.h \
 	   file://numpyconfig.h \
 	  "
diff --git a/recipes/python/python-oauth_1.0.1.bb b/recipes/python/python-oauth_1.0.1.bb
new file mode 100644
index 0000000000..8de36af002
--- /dev/null
+++ b/recipes/python/python-oauth_1.0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Library for OAuth version 1.0a."
+HOMEPAGE = "http://code.google.com/p/oauth/"
+SECTION = "devel/python"
+LICENSE = "MIT"
+SOURCE = "oauth"
+PR = "r0"
+
+SRC_URI = "http://pypi.python.org/packages/source/o/${SOURCE}/${SOURCE}-${PV}.tar.gz"
+SRC_URI[md5sum] = "30ed3cc8c11d7841a89feab437aabf81"
+SRC_URI[sha256sum] = "e769819ff0b0c043d020246ce1defcaadd65b9c21d244468a45a7f06cb88af5d"
+
+S = "${WORKDIR}/${SOURCE}-${PV}"
+
+inherit setuptools
diff --git a/recipes/python/python-pycairo_1.4.0.bb b/recipes/python/python-pycairo_1.4.0.bb
index 71faeea070..94bb3380e4 100644
--- a/recipes/python/python-pycairo_1.4.0.bb
+++ b/recipes/python/python-pycairo_1.4.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "cairo"
 PR = "ml3"
 
 SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \
-           file://fix-setup-py.patch;patch=1"
+           file://fix-setup-py.patch"
 S = "${WORKDIR}/pycairo-${PV}"
 
 inherit distutils pkgconfig
diff --git a/recipes/python/python-pycairo_1.8.0.bb b/recipes/python/python-pycairo_1.8.0.bb
index 494baefba4..6437c373d1 100644
--- a/recipes/python/python-pycairo_1.8.0.bb
+++ b/recipes/python/python-pycairo_1.8.0.bb
@@ -9,7 +9,7 @@ PR = "ml0"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \
-           file://fix-setup-py.patch;patch=1"
+           file://fix-setup-py.patch"
 S = "${WORKDIR}/pycairo-${PV}"
 
 inherit distutils pkgconfig
diff --git a/recipes/python/python-pycodes_1.2.bb b/recipes/python/python-pycodes_1.2.bb
index 836d928b05..fa260422ec 100644
--- a/recipes/python/python-pycodes_1.2.bb
+++ b/recipes/python/python-pycodes_1.2.bb
@@ -8,7 +8,7 @@ SRCNAME = "pycodes"
 PR = "ml1"
 
 SRC_URI = "http://web.mit.edu/~emin/www/source_code/pycodes/pycodes-1-2.tar.gz \
-           file://no-docs.patch;patch=1"
+           file://no-docs.patch"
 S = "${WORKDIR}/${SRCNAME}"
 
 inherit distutils
diff --git a/recipes/python/python-pycrypto_2.0.1.bb b/recipes/python/python-pycrypto_2.0.1.bb
index 69bd15bba8..f1c94f42ac 100644
--- a/recipes/python/python-pycrypto_2.0.1.bb
+++ b/recipes/python/python-pycrypto_2.0.1.bb
@@ -5,7 +5,6 @@ DEPENDS = "gmp"
 SRCNAME = "pycrypto"
 LICENSE = "pycrypto"
 PR = "ml1"
-PE = "1"
 
 SRC_URI = "http://www.amk.ca/files/python/crypto/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/recipes/python/python-pycrypto_git.bb b/recipes/python/python-pycrypto_git.bb
index aabdf50176..6ae0e9d71c 100644
--- a/recipes/python/python-pycrypto_git.bb
+++ b/recipes/python/python-pycrypto_git.bb
@@ -7,8 +7,7 @@ LICENSE = "pycrypto"
 PR = "ml0"
 
 SRCREV = "d087280d7e9643a3e3f68f209932119fe6738b3c"
-PV = "2.0.1+gitr${SRCPV}"
-PE = "1"
+PV = "2.0.1+gitr${SRCREV}"
 SRC_URI = "git://git.pycrypto.org:9419/crypto/pycrypto-2.x.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
diff --git a/recipes/python/python-pycurl_7.18.2.bb b/recipes/python/python-pycurl_7.18.2.bb
index 00bee250f8..c66e94cbe9 100644
--- a/recipes/python/python-pycurl_7.18.2.bb
+++ b/recipes/python/python-pycurl_7.18.2.bb
@@ -8,7 +8,7 @@ PR = "ml2"
 
 SRC_URI = "\
   http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz \
-  file://no-static-link.patch;patch=1 \
+  file://no-static-link.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/recipes/python/python-pycurl_7.19.0.bb b/recipes/python/python-pycurl_7.19.0.bb
index 36d90d657c..3551b32b28 100644
--- a/recipes/python/python-pycurl_7.19.0.bb
+++ b/recipes/python/python-pycurl_7.19.0.bb
@@ -8,7 +8,7 @@ PR = "ml2"
 
 SRC_URI = "\
   http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \
-  file://no-static-link.patch;patch=1 \
+  file://no-static-link.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 SRC_URI[archive.md5sum] = "919d58fe37e69fe87ce4534d8b6a1c7b"
diff --git a/recipes/python/python-pygobject-native_2.14.2.bb b/recipes/python/python-pygobject-native_2.14.2.bb
index 70af95259c..2853a55723 100644
--- a/recipes/python/python-pygobject-native_2.14.2.bb
+++ b/recipes/python/python-pygobject-native_2.14.2.bb
@@ -7,7 +7,7 @@ inherit native
 
 SRC_URI = "\
   ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
-  file://python-path.patch;patch=1 \
+  file://python-path.patch \
 "
 
 do_stage_append() {
diff --git a/recipes/python/python-pygobject-native_2.16.0.bb b/recipes/python/python-pygobject-native_2.16.0.bb
index a1c733334c..27d5adbd8e 100644
--- a/recipes/python/python-pygobject-native_2.16.0.bb
+++ b/recipes/python/python-pygobject-native_2.16.0.bb
@@ -9,7 +9,7 @@ inherit native
 
 SRC_URI = "\
   ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
-#  file://python-path.patch;patch=1 \
+#  file://python-path.patch \
 "
 
 do_stage_append() {
diff --git a/recipes/python/python-pygobject-native_2.20.0.bb b/recipes/python/python-pygobject-native_2.20.0.bb
index cf36d3ff2d..02ff86e3fc 100644
--- a/recipes/python/python-pygobject-native_2.20.0.bb
+++ b/recipes/python/python-pygobject-native_2.20.0.bb
@@ -8,7 +8,7 @@ PARALLEL_MAKE = ""
 
 SRC_URI = "\
   ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
-#  file://python-path.patch;patch=1 \
+#  file://python-path.patch \
 "
 
 export GOBJECT_INTROSPECTION_CFLAGS="-pthread -I${STAGING_INCDIR}/gobject-introspection-1.0 -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_LIBDIR}/glib-2.0/include"
diff --git a/recipes/python/python-pygobject_2.14.2.bb b/recipes/python/python-pygobject_2.14.2.bb
index d8d3e331ee..155c5d99d3 100644
--- a/recipes/python/python-pygobject_2.14.2.bb
+++ b/recipes/python/python-pygobject_2.14.2.bb
@@ -9,8 +9,8 @@ MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1
 
 SRC_URI = "\
   ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
-  file://python-path.patch;patch=1 \
-  file://generate-constants.patch;patch=1 \
+  file://python-path.patch \
+  file://generate-constants.patch \
 "
 S = "${WORKDIR}/pygobject-${PV}"
 
diff --git a/recipes/python/python-pygobject_2.16.0.bb b/recipes/python/python-pygobject_2.16.0.bb
index 94c52038ad..fc920c72b1 100644
--- a/recipes/python/python-pygobject_2.16.0.bb
+++ b/recipes/python/python-pygobject_2.16.0.bb
@@ -9,7 +9,7 @@ MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1
 
 SRC_URI = "\
   ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
-  file://generate-constants.patch;patch=1 \
+  file://generate-constants.patch \
 "
 S = "${WORKDIR}/pygobject-${PV}"
 
diff --git a/recipes/python/python-pygobject_2.20.0.bb b/recipes/python/python-pygobject_2.20.0.bb
index ecad36b388..f8d4bf0659 100644
--- a/recipes/python/python-pygobject_2.20.0.bb
+++ b/recipes/python/python-pygobject_2.20.0.bb
@@ -10,7 +10,7 @@ MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1
 
 SRC_URI = "\
   ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
-  file://generate-constants.patch;patch=1 \
+  file://generate-constants.patch \
 "
 S = "${WORKDIR}/pygobject-${PV}"
 
diff --git a/recipes/python/python-pygtk-1.2_0.6.12.bb b/recipes/python/python-pygtk-1.2_0.6.12.bb
index e75ad489e0..f8dcdd0bd9 100644
--- a/recipes/python/python-pygtk-1.2_0.6.12.bb
+++ b/recipes/python/python-pygtk-1.2_0.6.12.bb
@@ -8,7 +8,7 @@ SRCNAME = "pygtk"
 PR = "r3"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
-           file://remove-imlib-et-al.patch;patch=1 \
+           file://remove-imlib-et-al.patch \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/recipes/python/python-pygtk_2.10.4.bb b/recipes/python/python-pygtk_2.10.4.bb
index ceea66f5b4..daf854cfa5 100644
--- a/recipes/python/python-pygtk_2.10.4.bb
+++ b/recipes/python/python-pygtk_2.10.4.bb
@@ -10,10 +10,10 @@ PR = "ml12"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \
-           file://fix-gtkunixprint.patch;patch=1 \
-           file://prevent_to_get_display_during_import.patch;patch=1 \
-           file://nodocs.patch;patch=1 \
-           file://gdk_display.patch;patch=1;pnum=0 \
+           file://fix-gtkunixprint.patch \
+           file://prevent_to_get_display_during_import.patch \
+           file://nodocs.patch \
+           file://gdk_display.patch;striplevel=0 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/recipes/python/python-pygtk_2.16.0.bb b/recipes/python/python-pygtk_2.16.0.bb
index 92133c6a54..eaea9af4bb 100644
--- a/recipes/python/python-pygtk_2.16.0.bb
+++ b/recipes/python/python-pygtk_2.16.0.bb
@@ -10,7 +10,7 @@ PR = "r1"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2;name=pygtk \
-           file://fix-gtkunixprint.patch;patch=1 \
+           file://fix-gtkunixprint.patch \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/recipes/python/python-pyid3lib_0.5.1.bb b/recipes/python/python-pyid3lib_0.5.1.bb
index 3b0449a9a6..3a3e7bb274 100644
--- a/recipes/python/python-pyid3lib_0.5.1.bb
+++ b/recipes/python/python-pyid3lib_0.5.1.bb
@@ -8,7 +8,7 @@ PR = "r2"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/pyid3lib/${SRCNAME}-${PV}.tar.bz2\
-  file://gcc4-fix.patch;patch=1 \
+  file://gcc4-fix.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/recipes/python/python-pylinda_0.6.bb b/recipes/python/python-pylinda_0.6.bb
index 3c820c9e61..a0dac36f25 100644
--- a/recipes/python/python-pylinda_0.6.bb
+++ b/recipes/python/python-pylinda_0.6.bb
@@ -7,7 +7,7 @@ SRCNAME = "linda"
 PR = "r1"
 
 SRC_URI = "http://www.handhelds.org/~aquadran/distro/latest/sources/linda-${PV}.tar.gz \
-           file://honor-datadir.patch;patch=1"
+           file://honor-datadir.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/recipes/python/python-pyode_1.2.0.bb b/recipes/python/python-pyode_1.2.0.bb
index 4ffdb2f71b..3b00de84d3 100644
--- a/recipes/python/python-pyode_1.2.0.bb
+++ b/recipes/python/python-pyode_1.2.0.bb
@@ -8,7 +8,7 @@ SRCNAME = "PyODE"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2 \
-           file://install.patch;patch=1"
+           file://install.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/recipes/python/python-pyqt_4.4.3.bb b/recipes/python/python-pyqt_4.4.3.bb
index b594bcb04a..a0003aa95e 100644
--- a/recipes/python/python-pyqt_4.4.3.bb
+++ b/recipes/python/python-pyqt_4.4.3.bb
@@ -13,23 +13,23 @@ PYQT_OE_VERSION = "Qt_4_4_1"
 
 SRC_URI = "\
   http://cvs.fedora.redhat.com/repo/pkgs/PyQt4/PyQt-x11-gpl-4.4.3.tar.gz/89e84c36a8520bf8b3a8a2b20e765154/PyQt-x11-gpl-4.4.3.tar.gz \
-  file://cross-compile.patch;patch=1 \
-  file://01_configure.dpatch;patch=1 \
-  file://02_htmllinks.dpatch;patch=1 \
+  file://cross-compile.patch \
+  file://01_configure.dpatch;apply=yes \
+  file://02_htmllinks.dpatch;apply=yes \
   \
-  file://assistantclient-fix.patch;patch=1 \
+  file://assistantclient-fix.patch \
 "
 S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
 
 # arm and mips machines need some extra patches
 
 SRC_URI_append_arm = "\
-  file://03_qreal.dpatch;patch=1 \
-  file://04_qreal_api_fixes-for-4.4.3.dpatch;patch=1"
+  file://03_qreal.dpatch;apply=yes \
+  file://04_qreal_api_fixes-for-4.4.3.dpatch;apply=yes"
 
 SRC_URI_append_mipsel = "\
-  file://03_qreal.dpatch;patch=1 \
-  file://04_qreal_api_fixes-for-4.4.3.dpatch;patch=1"
+  file://03_qreal.dpatch;apply=yes \
+  file://04_qreal_api_fixes-for-4.4.3.dpatch;apply=yes"
 
 inherit qt4x11 sip distutils-base
 
diff --git a/recipes/python/python-pyrex_0.9.8.5.bb b/recipes/python/python-pyrex_0.9.8.5.bb
index 18784f3116..c354b11839 100644
--- a/recipes/python/python-pyrex_0.9.8.5.bb
+++ b/recipes/python/python-pyrex_0.9.8.5.bb
@@ -9,7 +9,7 @@ PR = "ml1"
 
 SRC_URI = "\
   http://www.cosc.canterbury.ac.nz/greg.ewing/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-  file://pyrex-fix-optimized-mode.patch;patch=1 \
+  file://pyrex-fix-optimized-mode.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/recipes/python/python-pyro_3.8.1.bb b/recipes/python/python-pyro_3.8.1.bb
index 5b0ef87d11..a36fe9b64f 100644
--- a/recipes/python/python-pyro_3.8.1.bb
+++ b/recipes/python/python-pyro_3.8.1.bb
@@ -10,7 +10,7 @@ PR = "ml0"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/pyro/Pyro-${PV}.tar.gz \
-  file://pyro-unattended-install.patch;patch=1;pnum=0 \
+  file://pyro-unattended-install.patch;striplevel=0 \
 "
 S = "${WORKDIR}/Pyro-${PV}"
 
diff --git a/recipes/python/python-pyrtc_git.bb b/recipes/python/python-pyrtc_git.bb
index 789f0e2ecb..bd8452f298 100644
--- a/recipes/python/python-pyrtc_git.bb
+++ b/recipes/python/python-pyrtc_git.bb
@@ -1,17 +1,16 @@
+require ../freesmartphone/python-helpers.inc
+
 DESCRIPTION = "PyRTC is a python extension module that supports talking to the \
 RTC (Real Time Clock) found in most PCs and SOCs"
 SECTION = "devel/python"
-HOMEPAGE = "http://www.freesmartphone.org"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 LICENSE = "GPLv2"
 SRCNAME = "pyrtc"
 DEPENDS = "python-cython-native"
 SRCREV = "${FSO_PYTHONHELPERS_SRCREV}"
 PV = "1.0.0+gitr${SRCPV}"
-PE = "1"
 PR = "ml1"
 
-SRC_URI = "git://git.freesmartphone.org/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/${SRCNAME}"
 
 inherit distutils
diff --git a/recipes/python/python-pysqlite2_2.4.0.bb b/recipes/python/python-pysqlite2_2.4.0.bb
index 407dcc2563..3ed8940bc8 100644
--- a/recipes/python/python-pysqlite2_2.4.0.bb
+++ b/recipes/python/python-pysqlite2_2.4.0.bb
@@ -7,7 +7,7 @@ SRCNAME = "pysqlite"
 PR = "ml2"
 
 SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.4/${PV}/${SRCNAME}-${PV}.tar.gz \
-           file://fix-setup.patch;patch=1"
+           file://fix-setup.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/recipes/python/python-setuptools_0.6c9.bb b/recipes/python/python-setuptools_0.6c9.bb
index a962e62c4d..df24384aa8 100644
--- a/recipes/python/python-setuptools_0.6c9.bb
+++ b/recipes/python/python-setuptools_0.6c9.bb
@@ -9,7 +9,7 @@ PR = "ml0"
 
 SRC_URI = "\
   http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
-  file://fix-log-usage.patch;patch=1 \
+  file://fix-log-usage.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/recipes/python/python-soappy_0.11.6.bb b/recipes/python/python-soappy_0.11.6.bb
index deb3cd4a66..93e9fd18ce 100644
--- a/recipes/python/python-soappy_0.11.6.bb
+++ b/recipes/python/python-soappy_0.11.6.bb
@@ -8,7 +8,7 @@ SRCNAME = "SOAPpy"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pywebsvcs/${SRCNAME}-${PV}.tar.gz \
-           file://fix-future.patch;patch=1 \
+           file://fix-future.patch \
            file://fpconst.py"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/recipes/python/python-traits_3.0.3.bb b/recipes/python/python-traits_3.0.3.bb
index 044b0d159c..83ee814665 100644
--- a/recipes/python/python-traits_3.0.3.bb
+++ b/recipes/python/python-traits_3.0.3.bb
@@ -8,7 +8,7 @@ inherit setuptools
 
 SRC_URI = "\
   http://pypi.python.org/packages/source/T/Traits/Traits-${PV}.tar.gz \
-#  file://fix-import-pyface.diff;patch=1 \
+#  file://fix-import-pyface.diff \
 "
 S = "${WORKDIR}/Traits-${PV}"
 
diff --git a/recipes/python/python-twisted_2.5.0.bb b/recipes/python/python-twisted_2.5.0.bb
index b0d7f791b9..d8f24587a2 100644
--- a/recipes/python/python-twisted_2.5.0.bb
+++ b/recipes/python/python-twisted_2.5.0.bb
@@ -8,7 +8,7 @@ LICENSE = "LGPL"
 PR = "r9"
 
 SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2 \
-           file://remove-zope-check.patch;patch=1"
+           file://remove-zope-check.patch"
 S = "${WORKDIR}/Twisted-${PV}"
 
 inherit distutils
diff --git a/recipes/python/python-vorbis_1.4.bb b/recipes/python/python-vorbis_1.4.bb
index cc940f0fd6..5ff8d4a469 100644
--- a/recipes/python/python-vorbis_1.4.bb
+++ b/recipes/python/python-vorbis_1.4.bb
@@ -7,7 +7,7 @@ SRCNAME = "pyvorbis"
 PR = "ml0"
 
 SRC_URI = "http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz \
-           file://disable-oggcheck.patch;patch=1"
+           file://disable-oggcheck.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/recipes/python/python-xmpppy_0.5.0rc1.bb b/recipes/python/python-xmpppy_0.5.0rc1.bb
new file mode 100644
index 0000000000..1ae218091b
--- /dev/null
+++ b/recipes/python/python-xmpppy_0.5.0rc1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Library for handling xmpp with python"
+HOMEPAGE = "http://sourceforge.net/projects/xmpppy/"
+SECTION = "devel/python"
+LICENSE = "GPL"
+SOURCE = "xmpppy"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SOURCE}/${SOURCE}-${PV}.tar.gz"
+SRC_URI[md5sum] = "e0d2b3f9e4a278c163431e64adb0c861"
+SRC_URI[sha256sum] = "519b025b3c9600c26c5805d0c612fe01e61330d2b9869f05c7c416c627820b9a"
+
+S = "${WORKDIR}/${SOURCE}-${PV}"
+
+inherit setuptools
diff --git a/recipes/python/python.inc b/recipes/python/python.inc
index 7e61f795ba..aff18db6f8 100644
--- a/recipes/python/python.inc
+++ b/recipes/python/python.inc
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
 # bump this on every change in contrib/python/generate-manifest-2.6.py
-INC_PR = "ml8"
+INC_PR = "ml9"
 
 DEFAULT_PREFERENCE = "-26"
 
diff --git a/recipes/python/python_2.6.1.bb b/recipes/python/python_2.6.1.bb
index a030f158d7..fea600826f 100644
--- a/recipes/python/python_2.6.1.bb
+++ b/recipes/python/python_2.6.1.bb
@@ -6,23 +6,23 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "\
   http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
-  file://00-fix-bindir-libdir-for-cross.patch;patch=1 \
-  file://01-use-proper-tools-for-cross-build.patch;patch=1 \
-  file://02-remove-test-for-cross.patch;patch=1 \
-  file://03-fix-tkinter-detection.patch;patch=1 \
-  file://04-default-is-optimized.patch;patch=1 \
-  file://05-enable-ctypes-cross-build.patch;patch=1 \
-  file://06-libffi-enable-default-mips.patch;patch=1 \
-  file://07-export-grammer.patch;patch=1 \
-  file://99-ignore-optimization-flag.patch;patch=1 \
+  file://00-fix-bindir-libdir-for-cross.patch \
+  file://01-use-proper-tools-for-cross-build.patch \
+  file://02-remove-test-for-cross.patch \
+  file://03-fix-tkinter-detection.patch \
+  file://04-default-is-optimized.patch \
+  file://05-enable-ctypes-cross-build.patch \
+  file://06-libffi-enable-default-mips.patch \
+  file://07-export-grammer.patch \
+  file://99-ignore-optimization-flag.patch \
   \
 # not yet pushed forward
 # sitecustomize, sitebranding
   \
-#  file://05-install.patch;patch=1 \
-#  file://06-fix-urllib-exception.patch;patch=1 \
-#  file://16-bug1179-imageop.patch;patch=1 \
-#  file://13-set-wakeup-fix.patch;patch=1 \
+#  file://05-install.patch \
+#  file://06-fix-urllib-exception.patch \
+#  file://16-bug1179-imageop.patch \
+#  file://13-set-wakeup-fix.patch \
   \
   file://sitecustomize.py \
 "
diff --git a/recipes/python/python_2.6.2.bb b/recipes/python/python_2.6.2.bb
index dea274b1fc..8a14db5e7d 100644
--- a/recipes/python/python_2.6.2.bb
+++ b/recipes/python/python_2.6.2.bb
@@ -7,21 +7,21 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "\
   http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
-  file://00-fix-bindir-libdir-for-cross.patch;patch=1 \
-  file://01-use-proper-tools-for-cross-build.patch;patch=1 \
-  file://02-remove-test-for-cross.patch;patch=1 \
-  file://03-fix-tkinter-detection.patch;patch=1 \
-  file://04-default-is-optimized.patch;patch=1 \
-  file://05-enable-ctypes-cross-build.patch;patch=1 \
-  file://99-ignore-optimization-flag.patch;patch=1 \
+  file://00-fix-bindir-libdir-for-cross.patch \
+  file://01-use-proper-tools-for-cross-build.patch \
+  file://02-remove-test-for-cross.patch \
+  file://03-fix-tkinter-detection.patch \
+  file://04-default-is-optimized.patch \
+  file://05-enable-ctypes-cross-build.patch \
+  file://99-ignore-optimization-flag.patch \
   \
 # not yet pushed forward
 # sitebranding
   \
-#  file://05-install.patch;patch=1 \
-#  file://06-fix-urllib-exception.patch;patch=1 \
-#  file://16-bug1179-imageop.patch;patch=1 \
-#  file://13-set-wakeup-fix.patch;patch=1 \
+#  file://05-install.patch \
+#  file://06-fix-urllib-exception.patch \
+#  file://16-bug1179-imageop.patch \
+#  file://13-set-wakeup-fix.patch \
   \
   file://sitecustomize.py \
 "
diff --git a/recipes/python/python_2.6.4.bb b/recipes/python/python_2.6.4.bb
index 17891e926b..84234f7e4d 100644
--- a/recipes/python/python_2.6.4.bb
+++ b/recipes/python/python_2.6.4.bb
@@ -7,22 +7,22 @@ PR = "${INC_PR}.1"
 
 SRC_URI = "\
   http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2;name=archive \
-  file://00-fix-bindir-libdir-for-cross.patch;patch=1 \
-  file://01-use-proper-tools-for-cross-build.patch;patch=1 \
-  file://02-remove-test-for-cross.patch;patch=1 \
-  file://03-fix-tkinter-detection.patch;patch=1 \
-  file://04-default-is-optimized.patch;patch=1 \
-  file://05-enable-ctypes-cross-build.patch;patch=1 \
-  file://06-ctypes-libffi-fix-configure.patch;patch=1 \
-  file://99-ignore-optimization-flag.patch;patch=1 \
+  file://00-fix-bindir-libdir-for-cross.patch \
+  file://01-use-proper-tools-for-cross-build.patch \
+  file://02-remove-test-for-cross.patch \
+  file://03-fix-tkinter-detection.patch \
+  file://04-default-is-optimized.patch \
+  file://05-enable-ctypes-cross-build.patch \
+  file://06-ctypes-libffi-fix-configure.patch \
+  file://99-ignore-optimization-flag.patch \
   \
 # not yet pushed forward
 # sitebranding
   \
-#  file://05-install.patch;patch=1 \
-#  file://06-fix-urllib-exception.patch;patch=1 \
-#  file://16-bug1179-imageop.patch;patch=1 \
-#  file://13-set-wakeup-fix.patch;patch=1 \
+#  file://05-install.patch \
+#  file://06-fix-urllib-exception.patch \
+#  file://16-bug1179-imageop.patch \
+#  file://13-set-wakeup-fix.patch \
   \
   file://sitecustomize.py \
 "
diff --git a/recipes/qc-usb/qc-usb-messenger_0.8.bb b/recipes/qc-usb/qc-usb-messenger_0.8.bb
index 5142b4306c..1084229c8e 100644
--- a/recipes/qc-usb/qc-usb-messenger_0.8.bb
+++ b/recipes/qc-usb/qc-usb-messenger_0.8.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "http://home.mag.cx/messenger/source/${PN}-${PV}.tar.gz \
-	   file://qc-messenger-0.8-fix;patch=1"
+	   file://qc-messenger-0.8-fix;apply=yes"
 
 SRC_URI[md5sum] = "8163c9c6aa773dfc647a4835254706bf"
 SRC_URI[sha256sum] = "d7de5a0b35f3db3a76ff515f35d0fda45cf79e9f7a24b6d9bb4cc2b254742fed"
diff --git a/recipes/qemu/qemu-0.12.3/3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch b/recipes/qemu/qemu-0.12.3/3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch
new file mode 100644
index 0000000000..143b0059ae
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.3/3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch
@@ -0,0 +1,134 @@
+From 3f26c1227e3b08010f2a65379cecf4cb4b5933fa Mon Sep 17 00:00:00 2001
+From: Riku Voipio <riku.voipio@nokia.com>
+Date: Mon, 25 Jan 2010 13:17:32 +0000
+Subject: target-arm: refactor cp15.c13 register access
+
+Access the cp15.c13 TLS registers directly with TCG ops instead of with
+a slow helper. If the the cp15 read/write was not TLS register access,
+fall back to the cp15 helper.
+
+This makes accessing __thread variables in linux-user when apps are compiled
+with -mtp=cp15 possible. legal cp15 register to acces from linux-user are
+already checked in cp15_user_ok.
+
+While at it, make the cp15.c13 Thread ID registers available only on
+ARMv6K and newer.
+
+Signed-off-by: Riku Voipio <riku.voipio@nokia.com>
+---
+diff --git a/target-arm/helper.c b/target-arm/helper.c
+index b3aec99..27001e8 100644
+--- a/target-arm/helper.c
++++ b/target-arm/helper.c
+@@ -511,7 +511,6 @@ void HELPER(set_cp15)(CPUState *env, uint32_t insn, uint32_t val)
+ uint32_t HELPER(get_cp15)(CPUState *env, uint32_t insn)
+ {
+     cpu_abort(env, "cp15 insn %08x\n", insn);
+-    return 0;
+ }
+ 
+ /* These should probably raise undefined insn exceptions.  */
+@@ -1491,15 +1490,6 @@ void HELPER(set_cp15)(CPUState *env, uint32_t insn, uint32_t val)
+               tlb_flush(env, 0);
+             env->cp15.c13_context = val;
+             break;
+-        case 2:
+-            env->cp15.c13_tls1 = val;
+-            break;
+-        case 3:
+-            env->cp15.c13_tls2 = val;
+-            break;
+-        case 4:
+-            env->cp15.c13_tls3 = val;
+-            break;
+         default:
+             goto bad_reg;
+         }
+@@ -1779,12 +1769,6 @@ uint32_t HELPER(get_cp15)(CPUState *env, uint32_t insn)
+             return env->cp15.c13_fcse;
+         case 1:
+             return env->cp15.c13_context;
+-        case 2:
+-            return env->cp15.c13_tls1;
+-        case 3:
+-            return env->cp15.c13_tls2;
+-        case 4:
+-            return env->cp15.c13_tls3;
+         default:
+             goto bad_reg;
+         }
+diff --git a/target-arm/translate.c b/target-arm/translate.c
+index 5cf3e06..786c329 100644
+--- a/target-arm/translate.c
++++ b/target-arm/translate.c
+@@ -2455,6 +2455,57 @@ static int cp15_user_ok(uint32_t insn)
+     return 0;
+ }
+ 
++static int cp15_tls_load_store(CPUState *env, DisasContext *s, uint32_t insn, uint32_t rd)
++{
++    TCGv tmp;
++    int cpn = (insn >> 16) & 0xf;
++    int cpm = insn & 0xf;
++    int op = ((insn >> 5) & 7) | ((insn >> 18) & 0x38);
++
++    if (!arm_feature(env, ARM_FEATURE_V6K))
++        return 0;
++
++    if (!(cpn == 13 && cpm == 0))
++        return 0;
++
++    if (insn & ARM_CP_RW_BIT) {
++        tmp = new_tmp();
++        switch (op) {
++        case 2:
++            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1));
++            break;
++        case 3:
++            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2));
++            break;
++        case 4:
++            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3));
++            break;
++        default:
++            dead_tmp(tmp);
++            return 0;
++        }
++        store_reg(s, rd, tmp);
++
++    } else {
++        tmp = load_reg(s, rd);
++        switch (op) {
++        case 2:
++            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1));
++            break;
++        case 3:
++            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2));
++            break;
++        case 4:
++            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3));
++            break;
++        default:
++            return 0;
++        }
++        dead_tmp(tmp);
++    }
++    return 1;
++}
++
+ /* Disassemble system coprocessor (cp15) instruction.  Return nonzero if
+    instruction is not defined.  */
+ static int disas_cp15_insn(CPUState *env, DisasContext *s, uint32_t insn)
+@@ -2489,6 +2540,10 @@ static int disas_cp15_insn(CPUState *env, DisasContext *s, uint32_t insn)
+         return 0;
+     }
+     rd = (insn >> 12) & 0xf;
++
++    if (cp15_tls_load_store(env, s, insn, rd))
++        return 0;
++
+     tmp2 = tcg_const_i32(insn);
+     if (insn & ARM_CP_RW_BIT) {
+         tmp = new_tmp();
+--
+cgit v0.8.2.1
diff --git a/recipes/qemu/qemu-0.12.3/c5883be23519921254c6940873ee8db04979c20a.patch b/recipes/qemu/qemu-0.12.3/c5883be23519921254c6940873ee8db04979c20a.patch
new file mode 100644
index 0000000000..bbdab11101
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.3/c5883be23519921254c6940873ee8db04979c20a.patch
@@ -0,0 +1,61 @@
+From c5883be23519921254c6940873ee8db04979c20a Mon Sep 17 00:00:00 2001
+From: Paul Brook <paul@codesourcery.com>
+Date: Tue, 23 Feb 2010 14:45:16 +0000
+Subject: ARM CP15 tls fix
+
+Fix temporary handling in cp15 tls register load/store.
+
+Signed-off-by: Paul Brook <paul@codesourcery.com>
+---
+diff --git a/target-arm/translate.c b/target-arm/translate.c
+index 8b3b12d..ac04996 100644
+--- a/target-arm/translate.c
++++ b/target-arm/translate.c
+@@ -2469,19 +2469,17 @@ static int cp15_tls_load_store(CPUState *env, DisasContext *s, uint32_t insn, ui
+         return 0;
+ 
+     if (insn & ARM_CP_RW_BIT) {
+-        tmp = new_tmp();
+         switch (op) {
+         case 2:
+-            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1));
++            tmp = load_cpu_field(cp15.c13_tls1);
+             break;
+         case 3:
+-            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2));
++            tmp = load_cpu_field(cp15.c13_tls2);
+             break;
+         case 4:
+-            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3));
++            tmp = load_cpu_field(cp15.c13_tls3);
+             break;
+         default:
+-            dead_tmp(tmp);
+             return 0;
+         }
+         store_reg(s, rd, tmp);
+@@ -2490,18 +2488,18 @@ static int cp15_tls_load_store(CPUState *env, DisasContext *s, uint32_t insn, ui
+         tmp = load_reg(s, rd);
+         switch (op) {
+         case 2:
+-            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1));
++            store_cpu_field(tmp, cp15.c13_tls1);
+             break;
+         case 3:
+-            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2));
++            store_cpu_field(tmp, cp15.c13_tls2);
+             break;
+         case 4:
+-            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3));
++            store_cpu_field(tmp, cp15.c13_tls3);
+             break;
+         default:
++            dead_tmp(tmp);
+             return 0;
+         }
+-        dead_tmp(tmp);
+     }
+     return 1;
+ }
+--
+cgit v0.8.2.1
diff --git a/recipes/qemu/qemu-0.12.3/fallback.to.safe.mmap_min_addr.patch b/recipes/qemu/qemu-0.12.3/fallback.to.safe.mmap_min_addr.patch
new file mode 100644
index 0000000000..fb1080f078
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.3/fallback.to.safe.mmap_min_addr.patch
@@ -0,0 +1,37 @@
+From c313f89c33217ac0e471554dace2144718f86669 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 13 May 2010 12:23:40 +0200
+Subject: [PATCH] linux-user: use default mmap_min_addr 65536 when /proc/sys/vm/mmap_min_addr cannot be read
+
+* 65536 is default at least for ubuntu and fedora.
+---
+ linux-user/main.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/linux-user/main.c b/linux-user/main.c
+index 18b52c0..cf2cc59 100644
+--- a/linux-user/main.c
++++ b/linux-user/main.c
+@@ -2728,6 +2728,7 @@
+      * When user has explicitly set the quest base, we skip this
+      * test.
+      */
++#define MMAP_MIN_ADDR_DEFAULT 65536
+     if (!have_guest_base) {
+         FILE *fp;
+ 
+@@ -2736,8 +2737,14 @@
+             if (fscanf(fp, "%lu", &tmp) == 1) {
+                 mmap_min_addr = tmp;
+                 qemu_log("host mmap_min_addr=0x%lx\n", mmap_min_addr);
++            } else {
++                qemu_log("cannot read value from /proc/sys/vm/mmap_min_addr, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);
++                mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;
+             }
+             fclose(fp);
++        } else {
++            qemu_log("cannot open /proc/sys/vm/mmap_min_addr for reading, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);
++            mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;
+         }
+     }
+ #endif /* CONFIG_USE_GUEST_BASE */
diff --git a/recipes/qemu/qemu-0.12.4/02_kfreebsd.patch b/recipes/qemu/qemu-0.12.4/02_kfreebsd.patch
new file mode 100644
index 0000000000..67fb663790
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/02_kfreebsd.patch
@@ -0,0 +1,13 @@
+diff --git a/usb-bsd.c b/usb-bsd.c
+index 48567a3..a761b61 100644
+--- a/usb-bsd.c
++++ b/usb-bsd.c
+@@ -35,7 +35,7 @@
+ 
+ #include <sys/ioctl.h>
+ #ifndef __DragonFly__
+-#include <dev/usb/usb.h>
++#include <legacy/dev/usb/usb.h>
+ #else
+ #include <bus/usb/usb.h>
+ #endif
diff --git a/recipes/qemu/qemu-0.12.4/03_support_pselect_in_linux_user_arm.patch b/recipes/qemu/qemu-0.12.4/03_support_pselect_in_linux_user_arm.patch
new file mode 100644
index 0000000000..4f21420daf
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/03_support_pselect_in_linux_user_arm.patch
@@ -0,0 +1,175 @@
+downloaded from: http://bazaar.launchpad.net/%7Eubuntu-server-edgers/ubuntu/lucid/qemu-kvm/qemu-kvm-dailies-packaging.trunk/annotate/head%3A/debian/patches/This-patch-adds-support-for-the-pselect-syscall-in-l.patch
+
+see also: http://lists.gnu.org/archive/html/qemu-devel/2010-02/msg01026.html
+
+From 2c28192f9eb4a23cda0787c97cdb78c33735803e Mon Sep 17 00:00:00 2001
+From: Michael Casadevall <mcasadevall@ubuntu.com>
+Date: Tue, 16 Feb 2010 05:31:19 -0500
+Subject: [PATCH] This patch adds support for the pselect syscall in linux-user emulation and also adds several support functions required to translate the timespec structs between the target and the host.
+
+Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
+---
+ linux-user/arm/syscall_nr.h |    2 +-
+ linux-user/syscall.c        |  119 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 120 insertions(+), 1 deletions(-)
+
+diff --git a/linux-user/arm/syscall_nr.h b/linux-user/arm/syscall_nr.h
+index b1db341..79a216a 100644
+--- a/linux-user/arm/syscall_nr.h
++++ b/linux-user/arm/syscall_nr.h
+@@ -338,7 +338,7 @@
+ #define TARGET_NR_readlinkat			(332)
+ #define TARGET_NR_fchmodat			(333)
+ #define TARGET_NR_faccessat			(334)
+-					/* 335 for pselect6 */
++#define TARGET_NR_pselect6			(335)
+ 					/* 336 for ppoll */
+ #define TARGET_NR_unshare			(337)
+ #define TARGET_NR_set_robust_list		(338)
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 9fb493f..3663451 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -850,6 +850,38 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr,
+     return 0;
+ }
+ 
++static inline abi_long copy_from_user_timespec(struct timespec *ts,
++                                              abi_ulong target_ts_addr)
++{
++    struct target_timespec *target_ts;
++
++    if (!lock_user_struct(VERIFY_READ, target_ts, target_ts_addr, 1))
++        return -TARGET_EFAULT;
++
++    __get_user(ts->tv_sec, &target_ts->tv_sec);
++    __get_user(ts->tv_nsec, &target_ts->tv_nsec);
++
++    unlock_user_struct(target_ts, target_ts_addr, 0);
++
++    return 0;
++}
++
++
++static inline abi_long copy_to_user_timespec(abi_ulong target_ts_addr,
++                                            const struct timespec *ts)
++{
++    struct target_timespec *target_ts;
++
++    if (!lock_user_struct(VERIFY_WRITE, target_ts, target_ts_addr, 0))
++        return -TARGET_EFAULT;
++
++    __put_user(ts->tv_sec, &target_ts->tv_sec);
++    __put_user(ts->tv_nsec, &target_ts->tv_nsec);
++
++    unlock_user_struct(target_ts, target_ts_addr, 1);
++
++    return 0;
++}
+ #if defined(TARGET_NR_mq_open) && defined(__NR_mq_open)
+ #include <mqueue.h>
+ 
+@@ -949,6 +981,75 @@ static abi_long do_select(int n,
+     return ret;
+ }
+ 
++#ifdef TARGET_NR_pselect6
++/* do_pselect() must return target values and target errnos. */
++static abi_long do_pselect(int n,
++                          abi_ulong rfd_addr, abi_ulong wfd_addr,
++                          abi_ulong efd_addr, abi_ulong target_tv_addr,
++                          abi_ulong set_addr)
++{
++    fd_set rfds, wfds, efds;
++    fd_set *rfds_ptr, *wfds_ptr, *efds_ptr;
++    struct timespec tv, *tv_ptr;
++    sigset_t set, *set_ptr;
++    abi_long ret;
++
++    if (rfd_addr) {
++        if (copy_from_user_fdset(&rfds, rfd_addr, n))
++            return -TARGET_EFAULT;
++        rfds_ptr = &rfds;
++    } else {
++        rfds_ptr = NULL;
++    }
++    if (wfd_addr) {
++        if (copy_from_user_fdset(&wfds, wfd_addr, n))
++            return -TARGET_EFAULT;
++        wfds_ptr = &wfds;
++    } else {
++        wfds_ptr = NULL;
++    }
++    if (efd_addr) {
++        if (copy_from_user_fdset(&efds, efd_addr, n))
++            return -TARGET_EFAULT;
++        efds_ptr = &efds;
++    } else {
++        efds_ptr = NULL;
++    }
++
++    if (target_tv_addr) {
++        if (copy_from_user_timespec(&tv, target_tv_addr))
++            return -TARGET_EFAULT;
++        tv_ptr = &tv;
++    } else {
++        tv_ptr = NULL;
++    }
++
++    /* We don't need to return sigmask to target */
++    if (set_addr) {
++        target_to_host_old_sigset(&set, &set_addr);
++        set_ptr = &set;
++    } else {
++        set_ptr = NULL;
++    }
++
++    ret = get_errno(pselect(n, rfds_ptr, wfds_ptr, efds_ptr, tv_ptr, set_ptr));
++
++    if (!is_error(ret)) {
++        if (rfd_addr && copy_to_user_fdset(rfd_addr, &rfds, n))
++            return -TARGET_EFAULT;
++        if (wfd_addr && copy_to_user_fdset(wfd_addr, &wfds, n))
++            return -TARGET_EFAULT;
++        if (efd_addr && copy_to_user_fdset(efd_addr, &efds, n))
++            return -TARGET_EFAULT;
++
++        if (target_tv_addr && copy_to_user_timespec(target_tv_addr, &tv))
++            return -TARGET_EFAULT;
++    }
++
++    return ret;
++}
++#endif
++
+ static abi_long do_pipe2(int host_pipe[], int flags)
+ {
+ #ifdef CONFIG_PIPE2
+@@ -5136,6 +5237,24 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+         }
+         break;
+ #endif
++
++#ifdef TARGET_NR_pselect6
++    case TARGET_NR_pselect6:
++        {
++            abi_ulong inp, outp, exp, tvp, set;
++            long nsel;
++
++            nsel = tswapl(arg1);
++            inp = tswapl(arg2);
++            outp = tswapl(arg3);
++            exp = tswapl(arg4);
++            tvp = tswapl(arg5);
++            set = tswapl(arg6);
++
++            ret = do_pselect(nsel, inp, outp, exp, tvp, set);
++        }
++        break;
++#endif
+     case TARGET_NR_symlink:
+         {
+             void *p2;
+-- 
+1.6.6.1
+
diff --git a/recipes/qemu/qemu-0.12.4/05_bochs_vbe.diff b/recipes/qemu/qemu-0.12.4/05_bochs_vbe.diff
new file mode 100644
index 0000000000..da6092ddca
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/05_bochs_vbe.diff
@@ -0,0 +1,66 @@
+commit af92284bec7ddbd76ddd105c40718627dda3407e
+Author: Gerd Hoffmann <kraxel@redhat.com>
+Date:   Thu Mar 25 11:38:52 2010 +0100
+
+    update bochs vbe interface
+    
+    The bochs vbe interface got a new register a while back, which specifies
+    the linear framebuffer size in 64k units.  This patch adds support for
+    the new register to qemu.  With this patch applied vgabios 0.6c works
+    with qemu.
+    
+    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+    Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+
+diff --git a/hw/vga.c b/hw/vga.c
+index 6a1a059..bb65677 100644
+--- a/hw/vga.c
++++ b/hw/vga.c
+@@ -522,7 +522,7 @@ static uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr)
+     VGACommonState *s = opaque;
+     uint32_t val;
+ 
+-    if (s->vbe_index <= VBE_DISPI_INDEX_NB) {
++    if (s->vbe_index < VBE_DISPI_INDEX_NB) {
+         if (s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_GETCAPS) {
+             switch(s->vbe_index) {
+                 /* XXX: do not hardcode ? */
+@@ -542,6 +542,8 @@ static uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr)
+         } else {
+             val = s->vbe_regs[s->vbe_index];
+         }
++    } else if (s->vbe_index == VBE_DISPI_INDEX_VIDEO_MEMORY_64K) {
++        val = s->vram_size / (64 * 1024);
+     } else {
+         val = 0;
+     }
+@@ -1955,7 +1957,7 @@ void vga_common_reset(VGACommonState *s)
+ #ifdef CONFIG_BOCHS_VBE
+     s->vbe_index = 0;
+     memset(s->vbe_regs, '\0', sizeof(s->vbe_regs));
+-    s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID0;
++    s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID5;
+     s->vbe_start_addr = 0;
+     s->vbe_line_offset = 0;
+     s->vbe_bank_mask = (s->vram_size >> 16) - 1;
+diff --git a/hw/vga_int.h b/hw/vga_int.h
+index 23a42ef..6a46a43 100644
+--- a/hw/vga_int.h
++++ b/hw/vga_int.h
+@@ -47,13 +47,15 @@
+ #define VBE_DISPI_INDEX_VIRT_HEIGHT     0x7
+ #define VBE_DISPI_INDEX_X_OFFSET        0x8
+ #define VBE_DISPI_INDEX_Y_OFFSET        0x9
+-#define VBE_DISPI_INDEX_NB              0xa
++#define VBE_DISPI_INDEX_NB              0xa /* size of vbe_regs[] */
++#define VBE_DISPI_INDEX_VIDEO_MEMORY_64K 0xa /* read-only, not in vbe_regs */
+ 
+ #define VBE_DISPI_ID0                   0xB0C0
+ #define VBE_DISPI_ID1                   0xB0C1
+ #define VBE_DISPI_ID2                   0xB0C2
+ #define VBE_DISPI_ID3                   0xB0C3
+ #define VBE_DISPI_ID4                   0xB0C4
++#define VBE_DISPI_ID5                   0xB0C5
+ 
+ #define VBE_DISPI_DISABLED              0x00
+ #define VBE_DISPI_ENABLED               0x01
diff --git a/recipes/qemu/qemu-0.12.4/06_sh4.diff b/recipes/qemu/qemu-0.12.4/06_sh4.diff
new file mode 100644
index 0000000000..9e5fbecf97
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/06_sh4.diff
@@ -0,0 +1,287 @@
+commit 507dd07316e8b529def4f0f429c72b98e37d13d5
+Author: Aurelien Jarno <aurelien@aurel32.net>
+Date:   Sat Jan 30 20:41:33 2010 +0100
+
+    SH4/R2D: fix poweroff
+    
+    The write the the PA_POWOFF register is currently ignored. Fix that by
+    calling qemu_system_shutdown_request() when a poweroff is requested.
+    
+    Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+
+diff --git a/hw/r2d.c b/hw/r2d.c
+index e4c02f0..8769a12 100644
+--- a/hw/r2d.c
++++ b/hw/r2d.c
+@@ -66,7 +66,6 @@ typedef struct {
+     uint16_t keyctlclr;
+     uint16_t pad0;
+     uint16_t pad1;
+-    uint16_t powoff;
+     uint16_t verreg;
+     uint16_t inport;
+     uint16_t outport;
+@@ -128,7 +127,7 @@ static uint32_t r2d_fpga_read(void *opaque, target_phys_addr_t addr)
+     case PA_OUTPORT:
+ 	return s->outport;
+     case PA_POWOFF:
+-	return s->powoff;
++	return 0x00;
+     case PA_VERREG:
+ 	return 0x10;
+     }
+@@ -150,8 +149,10 @@ r2d_fpga_write(void *opaque, target_phys_addr_t addr, uint32_t value)
+ 	s->outport = value;
+ 	break;
+     case PA_POWOFF:
+-	s->powoff = value;
+-	break;
++        if (value & 1) {
++            qemu_system_shutdown_request();
++        }
++        break;
+     case PA_VERREG:
+ 	/* Discard writes */
+ 	break;
+
+
+commit e6df0efdf7d4e304fe4a099cef625d8e4f60b320
+Author: Aurelien Jarno <aurelien@aurel32.net>
+Date:   Mon Feb 1 20:02:23 2010 +0100
+
+    target-sh4: MMU: simplify call to tlb_set_page()
+    
+    tlb_set_page() doesn't need addresses with offset, but simply the
+    page aligned addresses.
+    
+    Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+
+diff --git a/target-sh4/helper.c b/target-sh4/helper.c
+index e7c494f..f9bf5e2 100644
+--- a/target-sh4/helper.c
++++ b/target-sh4/helper.c
+@@ -464,7 +464,7 @@ static int get_physical_address(CPUState * env, target_ulong * physical,
+ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw,
+ 			     int mmu_idx, int is_softmmu)
+ {
+-    target_ulong physical, page_offset, page_size;
++    target_ulong physical;
+     int prot, ret, access_type;
+ 
+     access_type = ACCESS_INT;
+@@ -511,11 +511,8 @@ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw,
+ 	return 1;
+     }
+ 
+-    page_size = TARGET_PAGE_SIZE;
+-    page_offset =
+-	(address - (address & TARGET_PAGE_MASK)) & ~(page_size - 1);
+-    address = (address & TARGET_PAGE_MASK) + page_offset;
+-    physical = (physical & TARGET_PAGE_MASK) + page_offset;
++    address &= TARGET_PAGE_MASK;
++    physical &= TARGET_PAGE_MASK;
+ 
+     return tlb_set_page(env, address, physical, prot, mmu_idx, is_softmmu);
+ }
+
+
+commit fc1a70eb8792472b7d18ad21f40763d4b32f9413
+Author: Aurelien Jarno <aurelien@aurel32.net>
+Date:   Tue Feb 2 19:50:51 2010 +0100
+
+    target-sh4: MMU: optimize UTLB accesses
+    
+    With the current code, the QEMU TLB is setup to match the read/write
+    mode of the MMU fault. This means when read access is done, the page
+    is setup in read-only mode. When the page is later accessed in write
+    mode, an MMU fault happened, and the page is switch in write-only
+    mode. This flip-flop causes a lot of calls to the MMU code and slow
+    down the emulation.
+    
+    This patch changes the MMU emulation, so that the QEMU TLB is setup
+    to match the UTLB protection key. This impressively increase the
+    speed of the emulation.
+    
+    Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+
+diff --git a/target-sh4/helper.c b/target-sh4/helper.c
+index 589efe4..2d00dfa 100644
+--- a/target-sh4/helper.c
++++ b/target-sh4/helper.c
+@@ -386,38 +386,28 @@ static int get_mmu_address(CPUState * env, target_ulong * physical,
+ 	n = find_utlb_entry(env, address, use_asid);
+ 	if (n >= 0) {
+ 	    matching = &env->utlb[n];
+-	    switch ((matching->pr << 1) | ((env->sr & SR_MD) ? 1 : 0)) {
+-	    case 0:		/* 000 */
+-	    case 2:		/* 010 */
+-		n = (rw == 1) ? MMU_DTLB_VIOLATION_WRITE :
+-		    MMU_DTLB_VIOLATION_READ;
+-		break;
+-	    case 1:		/* 001 */
+-	    case 4:		/* 100 */
+-	    case 5:		/* 101 */
+-		if (rw == 1)
+-		    n = MMU_DTLB_VIOLATION_WRITE;
+-		else
+-		    *prot = PAGE_READ;
+-		break;
+-	    case 3:		/* 011 */
+-	    case 6:		/* 110 */
+-	    case 7:		/* 111 */
+-		*prot = (rw == 1)? PAGE_WRITE : PAGE_READ;
+-		break;
+-	    }
++            if (!(env->sr & SR_MD) && !(matching->pr & 2)) {
++                n = (rw == 1) ? MMU_DTLB_VIOLATION_WRITE :
++                    MMU_DTLB_VIOLATION_READ;
++            } else if ((rw == 1) && !(matching->pr & 1)) {
++                n = MMU_DTLB_VIOLATION_WRITE;
++            } else if ((rw == 1) & !matching->d) {
++                n = MMU_DTLB_INITIAL_WRITE;
++            } else {
++                *prot = PAGE_READ;
++                if ((matching->pr & 1) && matching->d) {
++                    *prot |= PAGE_WRITE;
++                }
++            }
+ 	} else if (n == MMU_DTLB_MISS) {
+ 	    n = (rw == 1) ? MMU_DTLB_MISS_WRITE :
+ 		MMU_DTLB_MISS_READ;
+ 	}
+     }
+     if (n >= 0) {
++	n = MMU_OK;
+ 	*physical = ((matching->ppn << 10) & ~(matching->size - 1)) |
+ 	    (address & (matching->size - 1));
+-	if ((rw == 1) & !matching->d)
+-	    n = MMU_DTLB_INITIAL_WRITE;
+-	else
+-	    n = MMU_OK;
+     }
+     return n;
+ }
+
+
+commit d7b30bf685e88c3cac4a5f470ef42b0b3c37aed9
+Author: Aurelien Jarno <aurelien@aurel32.net>
+Date:   Wed Feb 3 02:32:49 2010 +0100
+
+    target-sh4: MMU: reduce the size of a TLB entry
+    
+    Reduce the size of the TLB entry from 32 to 16 bytes, reorganising
+    members and using a bit field.
+    
+    Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+
+diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h
+index 015d598..85f221d 100644
+--- a/target-sh4/cpu.h
++++ b/target-sh4/cpu.h
+@@ -72,21 +72,20 @@
+  * The use of DELAY_SLOT_TRUE flag makes us accept such SR_T modification.
+  */
+ 
+-/* XXXXX The structure could be made more compact */
+ typedef struct tlb_t {
+-    uint8_t asid;		/* address space identifier */
+     uint32_t vpn;		/* virtual page number */
+-    uint8_t v;			/* validity */
+     uint32_t ppn;		/* physical page number */
+-    uint8_t sz;			/* page size */
+-    uint32_t size;		/* cached page size in bytes */
+-    uint8_t sh;			/* share status */
+-    uint8_t c;			/* cacheability */
+-    uint8_t pr;			/* protection key */
+-    uint8_t d;			/* dirty */
+-    uint8_t wt;			/* write through */
+-    uint8_t sa;			/* space attribute (PCMCIA) */
+-    uint8_t tc;			/* timing control */
++    uint32_t size;		/* mapped page size in bytes */
++    uint8_t asid;		/* address space identifier */
++    uint8_t v:1;		/* validity */
++    uint8_t sz:2;		/* page size */
++    uint8_t sh:1;		/* share status */
++    uint8_t c:1;		/* cacheability */
++    uint8_t pr:2;		/* protection key */
++    uint8_t d:1;		/* dirty */
++    uint8_t wt:1;		/* write through */
++    uint8_t sa:3;		/* space attribute (PCMCIA) */
++    uint8_t tc:1;		/* timing control */
+ } tlb_t;
+ 
+ #define UTLB_SIZE 64
+
+
+commit efcf683080924841f7ef32920fb79019a04dc681
+Author: Aurelien Jarno <aurelien@aurel32.net>
+Date:   Wed Feb 3 02:33:00 2010 +0100
+
+    target-sh4: MMU: remove dead code
+    
+    Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+
+diff --git a/target-sh4/helper.c b/target-sh4/helper.c
+index 2d00dfa..9b3a259 100644
+--- a/target-sh4/helper.c
++++ b/target-sh4/helper.c
+@@ -261,24 +261,6 @@ static int find_tlb_entry(CPUState * env, target_ulong address,
+ 	    continue;		/* Invalid entry */
+ 	if (!entries[i].sh && use_asid && entries[i].asid != asid)
+ 	    continue;		/* Bad ASID */
+-#if 0
+-	switch (entries[i].sz) {
+-	case 0:
+-	    size = 1024;	/* 1kB */
+-	    break;
+-	case 1:
+-	    size = 4 * 1024;	/* 4kB */
+-	    break;
+-	case 2:
+-	    size = 64 * 1024;	/* 64kB */
+-	    break;
+-	case 3:
+-	    size = 1024 * 1024;	/* 1MB */
+-	    break;
+-	default:
+-	    assert(0);
+-	}
+-#endif
+ 	start = (entries[i].vpn << 10) & ~(entries[i].size - 1);
+ 	end = start + entries[i].size - 1;
+ 	if (address >= start && address <= end) {	/* Match */
+
+
+commit 2c8bbb9fabadf3687017694bae1008bee7fedc7c
+Author: Aurelien Jarno <aurelien@aurel32.net>
+Date:   Fri Apr 2 12:16:04 2010 +0200
+
+    hw/r2d: add a USB keyboard
+    
+    The R2D board does not have a PS/2 port, and only support a keyboard on
+    the USB bus.
+    
+    Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+
+diff --git a/hw/r2d.c b/hw/r2d.c
+index 8769a12..ec075db 100644
+--- a/hw/r2d.c
++++ b/hw/r2d.c
+@@ -34,6 +34,7 @@
+ #include "sh7750_regs.h"
+ #include "ide.h"
+ #include "loader.h"
++#include "usb.h"
+ 
+ #define SDRAM_BASE 0x0c000000 /* Physical location of SDRAM: Area 3 */
+ #define SDRAM_SIZE 0x04000000
+@@ -240,6 +241,9 @@ static void r2d_init(ram_addr_t ram_size,
+     for (i = 0; i < nb_nics; i++)
+         pci_nic_init_nofail(&nd_table[i], "rtl8139", i==0 ? "2" : NULL);
+ 
++    /* USB keyboard */
++    usbdevice_create("keyboard");
++
+     /* Todo: register on board registers */
+     if (kernel_filename) {
+       int kernel_size;
diff --git a/recipes/qemu/qemu-0.12.4/3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch b/recipes/qemu/qemu-0.12.4/3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch
new file mode 100644
index 0000000000..143b0059ae
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch
@@ -0,0 +1,134 @@
+From 3f26c1227e3b08010f2a65379cecf4cb4b5933fa Mon Sep 17 00:00:00 2001
+From: Riku Voipio <riku.voipio@nokia.com>
+Date: Mon, 25 Jan 2010 13:17:32 +0000
+Subject: target-arm: refactor cp15.c13 register access
+
+Access the cp15.c13 TLS registers directly with TCG ops instead of with
+a slow helper. If the the cp15 read/write was not TLS register access,
+fall back to the cp15 helper.
+
+This makes accessing __thread variables in linux-user when apps are compiled
+with -mtp=cp15 possible. legal cp15 register to acces from linux-user are
+already checked in cp15_user_ok.
+
+While at it, make the cp15.c13 Thread ID registers available only on
+ARMv6K and newer.
+
+Signed-off-by: Riku Voipio <riku.voipio@nokia.com>
+---
+diff --git a/target-arm/helper.c b/target-arm/helper.c
+index b3aec99..27001e8 100644
+--- a/target-arm/helper.c
++++ b/target-arm/helper.c
+@@ -511,7 +511,6 @@ void HELPER(set_cp15)(CPUState *env, uint32_t insn, uint32_t val)
+ uint32_t HELPER(get_cp15)(CPUState *env, uint32_t insn)
+ {
+     cpu_abort(env, "cp15 insn %08x\n", insn);
+-    return 0;
+ }
+ 
+ /* These should probably raise undefined insn exceptions.  */
+@@ -1491,15 +1490,6 @@ void HELPER(set_cp15)(CPUState *env, uint32_t insn, uint32_t val)
+               tlb_flush(env, 0);
+             env->cp15.c13_context = val;
+             break;
+-        case 2:
+-            env->cp15.c13_tls1 = val;
+-            break;
+-        case 3:
+-            env->cp15.c13_tls2 = val;
+-            break;
+-        case 4:
+-            env->cp15.c13_tls3 = val;
+-            break;
+         default:
+             goto bad_reg;
+         }
+@@ -1779,12 +1769,6 @@ uint32_t HELPER(get_cp15)(CPUState *env, uint32_t insn)
+             return env->cp15.c13_fcse;
+         case 1:
+             return env->cp15.c13_context;
+-        case 2:
+-            return env->cp15.c13_tls1;
+-        case 3:
+-            return env->cp15.c13_tls2;
+-        case 4:
+-            return env->cp15.c13_tls3;
+         default:
+             goto bad_reg;
+         }
+diff --git a/target-arm/translate.c b/target-arm/translate.c
+index 5cf3e06..786c329 100644
+--- a/target-arm/translate.c
++++ b/target-arm/translate.c
+@@ -2455,6 +2455,57 @@ static int cp15_user_ok(uint32_t insn)
+     return 0;
+ }
+ 
++static int cp15_tls_load_store(CPUState *env, DisasContext *s, uint32_t insn, uint32_t rd)
++{
++    TCGv tmp;
++    int cpn = (insn >> 16) & 0xf;
++    int cpm = insn & 0xf;
++    int op = ((insn >> 5) & 7) | ((insn >> 18) & 0x38);
++
++    if (!arm_feature(env, ARM_FEATURE_V6K))
++        return 0;
++
++    if (!(cpn == 13 && cpm == 0))
++        return 0;
++
++    if (insn & ARM_CP_RW_BIT) {
++        tmp = new_tmp();
++        switch (op) {
++        case 2:
++            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1));
++            break;
++        case 3:
++            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2));
++            break;
++        case 4:
++            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3));
++            break;
++        default:
++            dead_tmp(tmp);
++            return 0;
++        }
++        store_reg(s, rd, tmp);
++
++    } else {
++        tmp = load_reg(s, rd);
++        switch (op) {
++        case 2:
++            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1));
++            break;
++        case 3:
++            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2));
++            break;
++        case 4:
++            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3));
++            break;
++        default:
++            return 0;
++        }
++        dead_tmp(tmp);
++    }
++    return 1;
++}
++
+ /* Disassemble system coprocessor (cp15) instruction.  Return nonzero if
+    instruction is not defined.  */
+ static int disas_cp15_insn(CPUState *env, DisasContext *s, uint32_t insn)
+@@ -2489,6 +2540,10 @@ static int disas_cp15_insn(CPUState *env, DisasContext *s, uint32_t insn)
+         return 0;
+     }
+     rd = (insn >> 12) & 0xf;
++
++    if (cp15_tls_load_store(env, s, insn, rd))
++        return 0;
++
+     tmp2 = tcg_const_i32(insn);
+     if (insn & ARM_CP_RW_BIT) {
+         tmp = new_tmp();
+--
+cgit v0.8.2.1
diff --git a/recipes/qemu/qemu-0.12.4/91-oh-sdl-cursor.patch b/recipes/qemu/qemu-0.12.4/91-oh-sdl-cursor.patch
new file mode 100644
index 0000000000..335f4fb47c
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/91-oh-sdl-cursor.patch
@@ -0,0 +1,18 @@
+=== modified file 'sdl.c'
+---
+ sdl.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu/sdl.c
+===================================================================
+--- qemu/sdl.c.orig	2008-04-24 20:15:45.000000000 +0100
++++ qemu/sdl.c	2008-04-24 20:16:12.000000000 +0100
+@@ -247,7 +247,7 @@
+ 
+     if (kbd_mouse_is_absolute()) {
+         SDL_ShowCursor(1);
+-        SDL_SetCursor(sdl_cursor_hidden);
++        /* SDL_SetCursor(sdl_cursor_hidden); */
+     } else {
+         SDL_ShowCursor(0);
+     }
diff --git a/recipes/qemu/qemu-0.12.4/c5883be23519921254c6940873ee8db04979c20a.patch b/recipes/qemu/qemu-0.12.4/c5883be23519921254c6940873ee8db04979c20a.patch
new file mode 100644
index 0000000000..bbdab11101
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/c5883be23519921254c6940873ee8db04979c20a.patch
@@ -0,0 +1,61 @@
+From c5883be23519921254c6940873ee8db04979c20a Mon Sep 17 00:00:00 2001
+From: Paul Brook <paul@codesourcery.com>
+Date: Tue, 23 Feb 2010 14:45:16 +0000
+Subject: ARM CP15 tls fix
+
+Fix temporary handling in cp15 tls register load/store.
+
+Signed-off-by: Paul Brook <paul@codesourcery.com>
+---
+diff --git a/target-arm/translate.c b/target-arm/translate.c
+index 8b3b12d..ac04996 100644
+--- a/target-arm/translate.c
++++ b/target-arm/translate.c
+@@ -2469,19 +2469,17 @@ static int cp15_tls_load_store(CPUState *env, DisasContext *s, uint32_t insn, ui
+         return 0;
+ 
+     if (insn & ARM_CP_RW_BIT) {
+-        tmp = new_tmp();
+         switch (op) {
+         case 2:
+-            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1));
++            tmp = load_cpu_field(cp15.c13_tls1);
+             break;
+         case 3:
+-            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2));
++            tmp = load_cpu_field(cp15.c13_tls2);
+             break;
+         case 4:
+-            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3));
++            tmp = load_cpu_field(cp15.c13_tls3);
+             break;
+         default:
+-            dead_tmp(tmp);
+             return 0;
+         }
+         store_reg(s, rd, tmp);
+@@ -2490,18 +2488,18 @@ static int cp15_tls_load_store(CPUState *env, DisasContext *s, uint32_t insn, ui
+         tmp = load_reg(s, rd);
+         switch (op) {
+         case 2:
+-            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1));
++            store_cpu_field(tmp, cp15.c13_tls1);
+             break;
+         case 3:
+-            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2));
++            store_cpu_field(tmp, cp15.c13_tls2);
+             break;
+         case 4:
+-            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3));
++            store_cpu_field(tmp, cp15.c13_tls3);
+             break;
+         default:
++            dead_tmp(tmp);
+             return 0;
+         }
+-        dead_tmp(tmp);
+     }
+     return 1;
+ }
+--
+cgit v0.8.2.1
diff --git a/recipes/qemu/qemu-0.12.4/fallback.to.safe.mmap_min_addr.patch b/recipes/qemu/qemu-0.12.4/fallback.to.safe.mmap_min_addr.patch
new file mode 100644
index 0000000000..fb1080f078
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/fallback.to.safe.mmap_min_addr.patch
@@ -0,0 +1,37 @@
+From c313f89c33217ac0e471554dace2144718f86669 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 13 May 2010 12:23:40 +0200
+Subject: [PATCH] linux-user: use default mmap_min_addr 65536 when /proc/sys/vm/mmap_min_addr cannot be read
+
+* 65536 is default at least for ubuntu and fedora.
+---
+ linux-user/main.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/linux-user/main.c b/linux-user/main.c
+index 18b52c0..cf2cc59 100644
+--- a/linux-user/main.c
++++ b/linux-user/main.c
+@@ -2728,6 +2728,7 @@
+      * When user has explicitly set the quest base, we skip this
+      * test.
+      */
++#define MMAP_MIN_ADDR_DEFAULT 65536
+     if (!have_guest_base) {
+         FILE *fp;
+ 
+@@ -2736,8 +2737,14 @@
+             if (fscanf(fp, "%lu", &tmp) == 1) {
+                 mmap_min_addr = tmp;
+                 qemu_log("host mmap_min_addr=0x%lx\n", mmap_min_addr);
++            } else {
++                qemu_log("cannot read value from /proc/sys/vm/mmap_min_addr, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);
++                mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;
+             }
+             fclose(fp);
++        } else {
++            qemu_log("cannot open /proc/sys/vm/mmap_min_addr for reading, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);
++            mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;
+         }
+     }
+ #endif /* CONFIG_USE_GUEST_BASE */
diff --git a/recipes/qemu/qemu-0.12.4/fix_baum_c_compilation.patch b/recipes/qemu/qemu-0.12.4/fix_baum_c_compilation.patch
new file mode 100644
index 0000000000..a2eb438ed9
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/fix_baum_c_compilation.patch
@@ -0,0 +1,30 @@
+Index: trunk/hw/baum.c
+===================================================================
+--- trunk.orig/hw/baum.c	2008-11-29 05:12:40.418390606 +0300
++++ trunk/hw/baum.c	2008-11-29 05:13:11.498378426 +0300
+@@ -569,8 +569,10 @@ CharDriverState *chr_baum_init(void)
+     CharDriverState *chr;
+     brlapi_handle_t *handle;
+ #ifdef CONFIG_SDL
++#ifdef SDL_VIDEO_DRIVER_X11
+     SDL_SysWMinfo info;
+ #endif
++#endif
+     int tty;
+
+     baum = qemu_mallocz(sizeof(BaumDriverState));
+@@ -605,12 +607,14 @@ CharDriverState *chr_baum_init(void)
+     }
+
+ #ifdef CONFIG_SDL
++#ifdef SDL_VIDEO_DRIVER_X11
+     memset(&info, 0, sizeof(info));
+     SDL_VERSION(&info.version);
+     if (SDL_GetWMInfo(&info))
+         tty = info.info.x11.wmwindow;
+     else
+ #endif
++#endif
+         tty = BRLAPI_TTY_DEFAULT;
+
+     if (brlapi__enterTtyMode(handle, tty, NULL) == -1) {
diff --git a/recipes/qemu/qemu-0.12.4/fix_fortify_source_compilation.patch b/recipes/qemu/qemu-0.12.4/fix_fortify_source_compilation.patch
new file mode 100644
index 0000000000..db507b3b45
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/fix_fortify_source_compilation.patch
@@ -0,0 +1,15 @@
+Index: qemu-0.12.3/block/vvfat.c
+===================================================================
+--- qemu-0.12.3.orig/block/vvfat.c
++++ qemu-0.12.3/block/vvfat.c
+@@ -868,7 +868,9 @@ static int init_directories(BDRVVVFATSta
+     {
+ 	direntry_t* entry=array_get_next(&(s->directory));
+ 	entry->attributes=0x28; /* archive | volume label */
+-	snprintf((char*)entry->name,11,"QEMU VVFAT");
++	// snprintf((char*)entry->name,11,"QEMU VVFAT");
++	snprintf(entry->name, sizeof(entry->name), "QEMU VV");
++	snprintf(entry->extension, sizeof(entry->extension), "FAT");
+     }
+ 
+     /* Now build FAT, and write back information into directory */
diff --git a/recipes/qemu/qemu-0.12.4/leftover.patch b/recipes/qemu/qemu-0.12.4/leftover.patch
new file mode 100644
index 0000000000..c840d3e1bb
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/leftover.patch
@@ -0,0 +1,25 @@
+Index: qemu-0.10.0/hw/pc.c
+===================================================================
+--- qemu-0.10.0.orig/hw/pc.c	2009-03-07 13:47:27.000000000 +0100
++++ qemu-0.10.0/hw/pc.c	2009-03-07 13:47:30.000000000 +0100
+@@ -390,7 +390,8 @@
+     case 0x400:
+     case 0x401:
+         fprintf(stderr, "BIOS panic at rombios.c, line %d\n", val);
+-        exit(1);
++        /* according to documentation, these can be safely ignored */
++        break;
+     case 0x402:
+     case 0x403:
+ #ifdef DEBUG_BIOS
+@@ -413,8 +414,9 @@
+         /* LGPL'ed VGA BIOS messages */
+     case 0x501:
+     case 0x502:
++        /* according to documentation, these can be safely ignored */
+         fprintf(stderr, "VGA BIOS panic, line %d\n", val);
+-        exit(1);
++        break;
+     case 0x500:
+     case 0x503:
+ #ifdef DEBUG_BIOS
diff --git a/recipes/qemu/qemu-0.12.4/linux-user-fix-running-programs-with-iwmmxt.patch b/recipes/qemu/qemu-0.12.4/linux-user-fix-running-programs-with-iwmmxt.patch
new file mode 100644
index 0000000000..703f097826
--- /dev/null
+++ b/recipes/qemu/qemu-0.12.4/linux-user-fix-running-programs-with-iwmmxt.patch
@@ -0,0 +1,46 @@
+From patchwork Sat May  8 16:58:11 2010
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v2] linux-user: fix running programs with iwmmxt
+Date: Sat, 08 May 2010 06:58:11 -0000
+From: Lars Munch <lars@segv.dk>
+X-Patchwork-Id: 51970
+Message-Id: <1273337891-20342-1-git-send-email-lars@segv.dk>
+To: qemu-devel@nongnu.org
+Cc: Lars Munch <lars@segv.dk>
+
+CP0 and/or CP1 needs to be accessible when using linux-user for emulating a
+pxa270 cpu with code using iwmmxt instructions. This patch inits the cpu to
+have CP0 and/or CP1 accessible if in linux-user mode.
+
+Signed-off-by: Lars Munch <lars@segv.dk>
+
+---
+target-arm/helper.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+Index: qemu-0.12.4/target-arm/helper.c
+===================================================================
+--- qemu-0.12.4.orig/target-arm/helper.c	2010-05-22 22:48:27.045182598 -0700
++++ qemu-0.12.4/target-arm/helper.c	2010-05-23 08:31:29.095165136 -0700
+@@ -165,6 +165,9 @@ static void cpu_reset_model_id(CPUARMSta
+         /* JTAG_ID is ((id << 28) | 0x09265013) */
+         env->cp15.c0_cachetype = 0xd172172;
+         env->cp15.c1_sys = 0x00000078;
++#if defined (CONFIG_USER_ONLY)
++       env->cp15.c15_cpar = 0x00000001;
++#endif
+         break;
+     case ARM_CPUID_PXA270_A0:
+     case ARM_CPUID_PXA270_A1:
+@@ -178,6 +181,9 @@ static void cpu_reset_model_id(CPUARMSta
+         env->iwmmxt.cregs[ARM_IWMMXT_wCID] = 0x69051000 | 'Q';
+         env->cp15.c0_cachetype = 0xd172172;
+         env->cp15.c1_sys = 0x00000078;
++#if defined (CONFIG_USER_ONLY)
++       env->cp15.c15_cpar = 0x00000003;
++#endif
+         break;
+     default:
+         cpu_abort(env, "Bad CPU ID: %x\n", id);
diff --git a/recipes/qemu/qemu_0.12.3.bb b/recipes/qemu/qemu_0.12.3.bb
index b7d52c2e24..db9155c4e3 100644
--- a/recipes/qemu/qemu_0.12.3.bb
+++ b/recipes/qemu/qemu_0.12.3.bb
@@ -1,23 +1,26 @@
 LICENSE = "GPL"
 DEPENDS = "zlib"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "\
     http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz;name=qemu-${PV} \
-    file://06_exit_segfault.patch;patch=1;pnum=0 \
-    file://11_signal_sigaction.patch;patch=1;pnum=0 \
-    file://22_net_tuntap_stall.patch;patch=1 \
-    file://31_syscalls.patch;patch=1;pnum=0 \
-    file://32_syscall_sysctl.patch;patch=1;pnum=0 \
-    file://52_ne2000_return.patch;patch=1 \
-    file://63_sparc_build.patch;patch=1;pnum=0 \
-    file://64_ppc_asm_constraints.patch;patch=1 \
-    file://66_tls_ld.patch;patch=1;pnum=0 \
-    file://91-oh-sdl-cursor.patch;patch=1;pnum=0 \
-    file://fix_segfault.patch;patch=1 \
-    file://fix_baum_c_compilation.patch;patch=1 \
-    file://fix_fortify_source_compilation.patch;patch=1 \
+    file://06_exit_segfault.patch;striplevel=0 \
+    file://11_signal_sigaction.patch;striplevel=0 \
+    file://22_net_tuntap_stall.patch \
+    file://31_syscalls.patch;striplevel=0 \
+    file://32_syscall_sysctl.patch;striplevel=0 \
+    file://52_ne2000_return.patch \
+    file://63_sparc_build.patch;striplevel=0 \
+    file://64_ppc_asm_constraints.patch \
+    file://66_tls_ld.patch;striplevel=0 \
+    file://91-oh-sdl-cursor.patch;striplevel=0 \
+    file://fix_segfault.patch \
+    file://fix_baum_c_compilation.patch \
+    file://fix_fortify_source_compilation.patch \
+    file://3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch \
+    file://c5883be23519921254c6940873ee8db04979c20a.patch \
+    file://fallback.to.safe.mmap_min_addr.patch \
     "
 
 SRC_URI[qemu-0.12.3.sha256sum] = "3ce26f8fb0a59418b2064a26bac4b40ea4e493acbc3df7ad5932635477fade4b"
diff --git a/recipes/qemu/qemu_0.12.4.bb b/recipes/qemu/qemu_0.12.4.bb
new file mode 100644
index 0000000000..6bc5868f64
--- /dev/null
+++ b/recipes/qemu/qemu_0.12.4.bb
@@ -0,0 +1,40 @@
+LICENSE = "GPL"
+DEPENDS = "zlib"
+
+PR = "r1"
+
+SRC_URI = "\
+    http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz;name=qemu-${PV} \
+    file://02_kfreebsd.patch \
+    file://03_support_pselect_in_linux_user_arm.patch \
+    file://05_bochs_vbe.diff \
+    file://06_sh4.diff \
+    file://leftover.patch \
+    file://3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch \
+    file://c5883be23519921254c6940873ee8db04979c20a.patch \
+    file://91-oh-sdl-cursor.patch \
+    file://fix_baum_c_compilation.patch \
+    file://fix_fortify_source_compilation.patch \
+    file://fallback.to.safe.mmap_min_addr.patch \
+    file://linux-user-fix-running-programs-with-iwmmxt.patch \
+    "
+
+SRC_URI[qemu-0.12.4.md5sum] = "93e6b134dff89b2799f57b7d9e0e0fc5"
+SRC_URI[qemu-0.12.4.sha256sum] = "1a29a5b5151162d1de035c4926d1a1dbffee4a145ef61ee865d6b82aaea0602e"
+
+BBCLASSEXTEND="native"
+
+S = "${WORKDIR}/qemu-${PV}"
+
+EXTRA_OECONF += " --disable-curl --disable-sdl --disable-strip \
+                "
+
+inherit autotools
+
+do_configure_prepend_virtclass-native() {
+	export QEMU_CFLAGS="-I${STAGING_INCDIR_NATIVE} ${QEMU_CFLAGS}"
+}
+
+do_configure() {
+	${S}/configure --prefix=${prefix} ${EXTRA_OECONF}
+}
diff --git a/recipes/qgpslog/qgpslog_0.2.0.bb b/recipes/qgpslog/qgpslog_0.2.1.bb
index 4635e51e73..7952d2bffc 100644
--- a/recipes/qgpslog/qgpslog_0.2.0.bb
+++ b/recipes/qgpslog/qgpslog_0.2.1.bb
@@ -9,8 +9,8 @@ PR = "r0"
 
 SRC_URI = "http://openmoko.senfdax.de/sources/${PN}-${PV}.tar.gz;name=archive"
 
-SRC_URI[archive.md5sum] = "26254f2dafc31260f65a8457ff7eada5"
-SRC_URI[archive.sha256sum] = "3f7ef5e1b59f3d75c064d184ff0f91b149c2abfb7e996f70c8f39da8d96383e9"
+SRC_URI[archive.md5sum] = "c4469fa6a84b38cf38c0ecc1d71c2727"
+SRC_URI[archive.sha256sum] = "198d0a5a995c30816dd2f7fc23c78b8d4d5c340f93480e78169282216479a607"
 
 
 inherit qt4x11
diff --git a/recipes/qi/qi-ubi_git.bb b/recipes/qi/qi-ubi_git.bb
index 65995a6241..08bc7c5123 100644
--- a/recipes/qi/qi-ubi_git.bb
+++ b/recipes/qi/qi-ubi_git.bb
@@ -6,5 +6,5 @@ do_configure_prepend() {
 }
 
 SRC_URI_append = "\
-  file://rootfstype.ubifs.patch;patch=1 \
+  file://rootfstype.ubifs.patch \
 "
diff --git a/recipes/qi/qi_git.bb b/recipes/qi/qi_git.bb
index c91ac54469..6a19292a70 100644
--- a/recipes/qi/qi_git.bb
+++ b/recipes/qi/qi_git.bb
@@ -5,7 +5,7 @@ PR_append = "+gitr${SRCPV}"
 SRCREV = "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
 SRC_URI = "\
   git://git.openmoko.org/git/qi.git;protocol=git;branch=master \
-  file://sanitize-makefile.patch;patch=1 \
+  file://sanitize-makefile.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes/qiv/qiv_1.9.bb b/recipes/qiv/qiv_1.9.bb
index 7f8ae50831..a1b63c6c61 100644
--- a/recipes/qiv/qiv_1.9.bb
+++ b/recipes/qiv/qiv_1.9.bb
@@ -5,7 +5,7 @@ DEPENDS = "gtk+-1.2 imlib"
 PR = "r1"
 
 SRC_URI = "http://www.klografx.net/qiv/download/qiv-1.9-src.tgz \
-		file://makefile.patch;patch=1 \
+		file://makefile.patch \
 		"
 inherit pkgconfig binconfig
 
diff --git a/recipes/qmake/qmake2.inc b/recipes/qmake/qmake2.inc
index 9f3de244bb..0e0f9cd55a 100644
--- a/recipes/qmake/qmake2.inc
+++ b/recipes/qmake/qmake2.inc
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r9"
+PR = "r10"
 
 # We call 'moc' during the build 
 DEPENDS = "uicmoc4-native"
@@ -11,9 +11,9 @@ DEPENDS = "uicmoc4-native"
 QTVER = "qt-embedded-linux-opensource-src-${QTVERSION}"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \
-           file://0001-fix-mkspecs.patch;patch=1 \
-           file://qt-config.patch;patch=1 \
-           file://use-lflags-last.patch;patch=1 \
+           file://0001-fix-mkspecs.patch \
+           file://qt-config.patch \
+           file://use-lflags-last.patch \
            file://linux-oe-qmake.conf"
 S = "${WORKDIR}/${QTVER}"
 
diff --git a/recipes/qmake/qmake2_2.10a.bb b/recipes/qmake/qmake2_2.10a.bb
index 37c476ee59..d07f68baa5 100644
--- a/recipes/qmake/qmake2_2.10a.bb
+++ b/recipes/qmake/qmake2_2.10a.bb
@@ -5,7 +5,7 @@ BBCLASSEXTEND = "native sdk"
 
 require ${PN}.inc
 
-SRC_URI += "file://qmake-hack.diff;patch=1"
+SRC_URI += "file://qmake-hack.diff"
 
 do_install() {
     install -d ${D}/${bindir}
@@ -16,6 +16,8 @@ do_install() {
 
     script="${D}/${datadir}/qtopia/environment-setup"
     touch $script
+    echo 'export QT_DIR_NAME=qtopia' >> $script
+    echo 'export QT_LIBINFIX=E' >> $script
     echo 'export OE_QMAKE_CC=gcc' >> $script
     echo 'export OE_QMAKE_CXX=g++' >> $script
     echo 'export OE_QMAKE_LINK=g++' >> $script
diff --git a/recipes/qof/qof_0.6.0.bb b/recipes/qof/qof_0.6.0.bb
index e96fb606c3..3f96b66dea 100644
--- a/recipes/qof/qof_0.6.0.bb
+++ b/recipes/qof/qof_0.6.0.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 DEPENDS = "glib-2.0 libxml2 libtool zlib"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
-           file://libsql-no-host-includes.patch;patch=1 \
-           file://fix-includes.patch;patch=1 \
+           file://libsql-no-host-includes.patch \
+           file://fix-includes.patch \
           "
 
 inherit autotools pkgconfig
diff --git a/recipes/qpdf2/qpdf2_2.2.1.bb b/recipes/qpdf2/qpdf2_2.2.1.bb
index f58e104d3c..7232637f02 100644
--- a/recipes/qpdf2/qpdf2_2.2.1.bb
+++ b/recipes/qpdf2/qpdf2_2.2.1.bb
@@ -10,10 +10,10 @@ APPDESKTOP = "${S}/ipkg-render-freetype/opt/QtPalmtop/apps/Applications"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf2/qpdf2_2.2.1_20040217b.tgz \
-           file://hack-the-hack.patch;patch=1 \
-           file://fix-sigsegv.patch;patch=1 \
-           file://fix_qtversion_check.patch;patch=1 \
-           file://gcc4.patch;patch=1"
+           file://hack-the-hack.patch \
+           file://fix-sigsegv.patch \
+           file://fix_qtversion_check.patch \
+           file://gcc4.patch"
 S = "${WORKDIR}/qpdf2_${PV}"
 
 inherit opie
diff --git a/recipes/qpe-gaim/qpe-gaim_20041030.bb b/recipes/qpe-gaim/qpe-gaim_20041030.bb
index d3256c0d15..c26d710678 100644
--- a/recipes/qpe-gaim/qpe-gaim_20041030.bb
+++ b/recipes/qpe-gaim/qpe-gaim_20041030.bb
@@ -11,9 +11,9 @@ APPDESKTOP = "${S}"
 PR = "r2"
 
 SRC_URI = "http://www.vanille.de/mirror/qpe-gaim_20041030.tar.bz2 \
-           file://qpe-gaim.patch;patch=1 \
-	   file://buzzer-notification.patch;patch=1;pnum=1 \
-	   file://vit.patch;patch=1"
+           file://qpe-gaim.patch \
+	   file://buzzer-notification.patch \
+	   file://vit.patch"
 S = "${WORKDIR}/qpe-gaim"
 
 inherit opie
diff --git a/recipes/qpe-gaim/qpe-libgaim_1.5.0.bb b/recipes/qpe-gaim/qpe-libgaim_1.5.0.bb
index 3adf7640a3..872c729fbb 100644
--- a/recipes/qpe-gaim/qpe-libgaim_1.5.0.bb
+++ b/recipes/qpe-gaim/qpe-libgaim_1.5.0.bb
@@ -7,8 +7,8 @@ HOMEPAGE = "http://gaim.sourceforge.net/"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gaim/gaim-${PV}.tar.bz2 \
-	   file://dont-look-for-gtk.patch;patch=1        \
-	   file://libgaim.patch;patch=1 "
+	   file://dont-look-for-gtk.patch        \
+	   file://libgaim.patch "
 
 S = "${WORKDIR}/gaim-${PV}"
 
diff --git a/recipes/qpe-games/aliens-qt_1.0.0.bb b/recipes/qpe-games/aliens-qt_1.0.0.bb
index c5f2bd65be..9555fa77e1 100644
--- a/recipes/qpe-games/aliens-qt_1.0.0.bb
+++ b/recipes/qpe-games/aliens-qt_1.0.0.bb
@@ -7,8 +7,8 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Aliens.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/aliens_V1.0.0.tar.gz \
-	   file://Makefile.patch;patch=1 \
-           file://aliens.patch;patch=1"
+	   file://Makefile.patch \
+           file://aliens.patch"
 
 PV = "1.0.0"
 S = "${WORKDIR}/aliens_V${PV}"
diff --git a/recipes/qpe-games/atomic_1.0.1.bb b/recipes/qpe-games/atomic_1.0.1.bb
index a84fa531a6..b753268819 100644
--- a/recipes/qpe-games/atomic_1.0.1.bb
+++ b/recipes/qpe-games/atomic_1.0.1.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Atomic.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/atomic_V1.0.1.tar.gz \
-	   file://atomic.patch;patch=1"
+	   file://atomic.patch"
 
 
 PV = "1.0.1"
diff --git a/recipes/qpe-games/checkers_1.0.5ern.bb b/recipes/qpe-games/checkers_1.0.5ern.bb
index 07d9a8000c..5817f2b0f6 100644
--- a/recipes/qpe-games/checkers_1.0.5ern.bb
+++ b/recipes/qpe-games/checkers_1.0.5ern.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Checkers.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/checkers_V1.0.5ern.tar.gz \
-           file://checkers.patch;patch=1"
+           file://checkers.patch"
 
 PV = "1.0.5ern"
 S = "${WORKDIR}/checkers_V${PV}"
diff --git a/recipes/qpe-games/crossword_0.0.3.bb b/recipes/qpe-games/crossword_0.0.3.bb
index 2e8b92fdbe..5b824382b7 100644
--- a/recipes/qpe-games/crossword_0.0.3.bb
+++ b/recipes/qpe-games/crossword_0.0.3.bb
@@ -6,7 +6,7 @@ AUTHOR = "Robert Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Crossword.html"
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/crossword_V0.0.3.tar.gz \
-	   file://crossword.patch;patch=1"
+	   file://crossword.patch"
 
 PR = "r1"
 
diff --git a/recipes/qpe-games/fish_1.1.0.bb b/recipes/qpe-games/fish_1.1.0.bb
index 9016c5fb26..2959cb29c1 100644
--- a/recipes/qpe-games/fish_1.1.0.bb
+++ b/recipes/qpe-games/fish_1.1.0.bb
@@ -8,8 +8,8 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Fish.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/fish_V1.1.0.tar.gz \
-           file://Makefile.patch;patch=1 \
-           file://fish.patch;patch=1"
+           file://Makefile.patch \
+           file://fish.patch"
 
 PV = "1.1.0"
 S = "${WORKDIR}/fish_V${PV}"
diff --git a/recipes/qpe-games/glider_1.0.0.bb b/recipes/qpe-games/glider_1.0.0.bb
index d27a219951..45910073b1 100644
--- a/recipes/qpe-games/glider_1.0.0.bb
+++ b/recipes/qpe-games/glider_1.0.0.bb
@@ -7,8 +7,8 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Glider.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/glider_V1.0.0.tar.gz \
-           file://Makefile.patch;patch=1 \
-	   file://glider.patch;patch=1"
+           file://Makefile.patch \
+	   file://glider.patch"
 
 PV = "1.0.0"
 S = "${WORKDIR}/glider_V${PV}"
diff --git a/recipes/qpe-games/icebloxx_1.0.0.bb b/recipes/qpe-games/icebloxx_1.0.0.bb
index f0320ecbc3..6e5ff81444 100644
--- a/recipes/qpe-games/icebloxx_1.0.0.bb
+++ b/recipes/qpe-games/icebloxx_1.0.0.bb
@@ -7,8 +7,8 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-IceBloxx.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/icebloxx_V1.0.0.tar.gz \
-           file://Makefile.patch;patch=1 \
-	   file://icebloxx.patch;patch=1"
+           file://Makefile.patch \
+	   file://icebloxx.patch"
 
 PV = "1.0.0"
 S = "${WORKDIR}/icebloxx_V${PV}"
diff --git a/recipes/qpe-games/mahjongg_1.0.0.bb b/recipes/qpe-games/mahjongg_1.0.0.bb
index 1685d9b01b..c889cd36f8 100644
--- a/recipes/qpe-games/mahjongg_1.0.0.bb
+++ b/recipes/qpe-games/mahjongg_1.0.0.bb
@@ -7,8 +7,8 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Mahjongg.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/mahjongg_V1.0.0.tar.gz \
-           file://Makefile.patch;patch=1 \
-	   file://mahjongg.patch;patch=1"
+           file://Makefile.patch \
+	   file://mahjongg.patch"
 
 
 PV = "1.0.0"
diff --git a/recipes/qpe-games/maki_1.0.4ern.bb b/recipes/qpe-games/maki_1.0.4ern.bb
index 443bca79b6..0c0f786158 100644
--- a/recipes/qpe-games/maki_1.0.4ern.bb
+++ b/recipes/qpe-games/maki_1.0.4ern.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Maki.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/maki_V1.0.4ern.tar.gz \
-	   file://maki.patch;patch=1"
+	   file://maki.patch"
 
 PV = "1.0.4ern"
 S = "${WORKDIR}/maki_V${PV}"
diff --git a/recipes/qpe-games/nmm_0.0.2.bb b/recipes/qpe-games/nmm_0.0.2.bb
index c3a2d4d197..5ee0c320ff 100644
--- a/recipes/qpe-games/nmm_0.0.2.bb
+++ b/recipes/qpe-games/nmm_0.0.2.bb
@@ -6,8 +6,8 @@ AUTHOR = "Dirk Farin, Port by Rober Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Nine-Mens-Morris.html"
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/nmm_V0.0.2.tar.gz \
-           file://Makefile.patch;patch=1 \
-	   file://nmm.patch;patch=1"
+           file://Makefile.patch \
+	   file://nmm.patch"
 
 PV = "0.0.2"
 S = "${WORKDIR}/nmm_V${PV}"
diff --git a/recipes/qpe-games/pairs_1.1.1.bb b/recipes/qpe-games/pairs_1.1.1.bb
index aee3dd5ef1..d6b33fc57b 100644
--- a/recipes/qpe-games/pairs_1.1.1.bb
+++ b/recipes/qpe-games/pairs_1.1.1.bb
@@ -6,7 +6,7 @@ AUTHOR = "Rober Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Pairs.html"
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/pairs_V1.1.1.tar.gz \
-           file://pairs.patch;patch=1"
+           file://pairs.patch"
 
 PV = "1.1.1"
 S = "${WORKDIR}/pairs_V${PV}"
diff --git a/recipes/qpe-games/pdamaze_1.0.0.bb b/recipes/qpe-games/pdamaze_1.0.0.bb
index 3d6bc81ed9..cd77b37eca 100644
--- a/recipes/qpe-games/pdamaze_1.0.0.bb
+++ b/recipes/qpe-games/pdamaze_1.0.0.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-PDA-Maze.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/pdamaze_V1.0.0.tar.gz \
-           file://Makefile.patch;patch=1"
+           file://Makefile.patch"
 
 PV = "1.0.0"
 S = "${WORKDIR}/pdamaze_V${PV}"
diff --git a/recipes/qpe-games/pipeman_1.0.0.bb b/recipes/qpe-games/pipeman_1.0.0.bb
index 31cca2754d..2c4d30dd7d 100644
--- a/recipes/qpe-games/pipeman_1.0.0.bb
+++ b/recipes/qpe-games/pipeman_1.0.0.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-PDA-Pipeman.html
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/pipeman_V1.0.0.tar.gz \
-           file://pipe.patch;patch=1"
+           file://pipe.patch"
 
 PV = "1.0.0"
 S = "${WORKDIR}/pipeman_V${PV}"
diff --git a/recipes/qpe-games/shisensho_1.0.0.bb b/recipes/qpe-games/shisensho_1.0.0.bb
index 92858ce437..8823b5d597 100644
--- a/recipes/qpe-games/shisensho_1.0.0.bb
+++ b/recipes/qpe-games/shisensho_1.0.0.bb
@@ -6,7 +6,7 @@ AUTHOR = "Mario Weilguni"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Shisen-Sho.html"
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/shisensho_V1.0.0.tar.gz \
-           file://shisen.patch;patch=1"
+           file://shisen.patch"
 
 PV = "1.0.0"
 S = "${WORKDIR}/shisensho_V${PV}"
diff --git a/recipes/qpe-games/sokoban_1.3.8ern.bb b/recipes/qpe-games/sokoban_1.3.8ern.bb
index 99bf3d69d2..0cd69bfb19 100644
--- a/recipes/qpe-games/sokoban_1.3.8ern.bb
+++ b/recipes/qpe-games/sokoban_1.3.8ern.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Sokoban.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/sokoban_V1.3.8ern.tar.gz \
-           file://sokoban.patch;patch=1"
+           file://sokoban.patch"
 
 PV = "1.3.8ern"
 S = "${WORKDIR}/sokoban_V${PV}"
diff --git a/recipes/qpe-games/tron_1.0.0.bb b/recipes/qpe-games/tron_1.0.0.bb
index ec022dbd22..04b015ff39 100644
--- a/recipes/qpe-games/tron_1.0.0.bb
+++ b/recipes/qpe-games/tron_1.0.0.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Tron.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/tron_V1.0.0.tar.gz \
-           file://tron.patch;patch=1"
+           file://tron.patch"
 
 PV = "1.0.0"
 S = "${WORKDIR}/tron_V${PV}"
diff --git a/recipes/qpe-games/win4_1.0.1.bb b/recipes/qpe-games/win4_1.0.1.bb
index e5fc392885..87676ac63c 100644
--- a/recipes/qpe-games/win4_1.0.1.bb
+++ b/recipes/qpe-games/win4_1.0.1.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Win4.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/win4_V1.0.1.tar.gz \
-           file://win4.patch;patch=1"
+           file://win4.patch"
 
 PV = "1.0.1"
 S = "${WORKDIR}/win4_V${PV}"
diff --git a/recipes/qpe-games/ziq_1.1ern.bb b/recipes/qpe-games/ziq_1.1ern.bb
index 0590e05a3b..8c66298d7b 100644
--- a/recipes/qpe-games/ziq_1.1ern.bb
+++ b/recipes/qpe-games/ziq_1.1ern.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZIQ.html"
 
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/ziq_V1.1ern.tar.gz \
-           file://ziq.patch;patch=1"
+           file://ziq.patch"
 
 PV = "1.1ern"
 PR = "r1"
diff --git a/recipes/qpe-games/zrev7_1.0.1.bb b/recipes/qpe-games/zrev7_1.0.1.bb
index a23b2450aa..b2b44297b5 100644
--- a/recipes/qpe-games/zrev7_1.0.1.bb
+++ b/recipes/qpe-games/zrev7_1.0.1.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZRev7.html"
 PR = "r1"
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/zrev7_V1.0.1.tar.gz \
-           file://zrev.patch;patch=1"
+           file://zrev.patch"
 S = "${WORKDIR}/zrev7_V${PV}"
 
 APPNAME = "zrev7"
diff --git a/recipes/qpealarmclock/qpealarmclock_1.0.9.bb b/recipes/qpealarmclock/qpealarmclock_1.0.9.bb
index 935c9c4ac8..c79ec50963 100644
--- a/recipes/qpealarmclock/qpealarmclock_1.0.9.bb
+++ b/recipes/qpealarmclock/qpealarmclock_1.0.9.bb
@@ -10,7 +10,7 @@ APPTYPE = "binary"
 APPDESKTOP = "${S}/dist/opt/QtPalmtop/apps/Applications"
 
 SRC_URI = "http://my-zaurus.narod.ru/downloads/qpealarmclock-1.0.9.tar.gz \
-           file://fix-compile.patch;patch=1 "
+           file://fix-compile.patch "
 
 S = "${WORKDIR}/qpealarmclock"
 
diff --git a/recipes/qpealarmclock/qpealarmclockapplet_1.0.9.bb b/recipes/qpealarmclock/qpealarmclockapplet_1.0.9.bb
index a869ddb56d..de38d97551 100644
--- a/recipes/qpealarmclock/qpealarmclockapplet_1.0.9.bb
+++ b/recipes/qpealarmclock/qpealarmclockapplet_1.0.9.bb
@@ -15,7 +15,7 @@ APPTYPE = "binary"
 
 SRC_URI = "http://my-zaurus.narod.ru/downloads/clockapplet.tar.gz \
 	   file://missing-files.tar.gz \
-	   file://fix-compile.patch;patch=1 "
+	   file://fix-compile.patch "
 
 S = "${WORKDIR}/clockapplet"
 
diff --git a/recipes/qplot/qplot_2.0.1+cvs20020420.bb b/recipes/qplot/qplot_2.0.1+cvs20020420.bb
index 515eefaafc..76b422cbd8 100644
--- a/recipes/qplot/qplot_2.0.1+cvs20020420.bb
+++ b/recipes/qplot/qplot_2.0.1+cvs20020420.bb
@@ -9,7 +9,7 @@ PV = "2.0.1-cvs-${SRCDATE}"
 PR = "r1"
 
 SRC_URI = "cvs://anonymous@qplot.cvs.sourceforge.net/cvsroot/qplot;module=qplot \
-	   file://gcc3.patch;patch=1"
+	   file://gcc3.patch"
 S = "${WORKDIR}/qplot"
 
 inherit palmtop
diff --git a/recipes/qpphoto/qpphoto_1.0.2.bb b/recipes/qpphoto/qpphoto_1.0.2.bb
index 52833c5870..199a5f7c66 100644
--- a/recipes/qpphoto/qpphoto_1.0.2.bb
+++ b/recipes/qpphoto/qpphoto_1.0.2.bb
@@ -12,9 +12,9 @@ PR = "r0"
 inherit opie
 
 SRC_URI = "http://zaurus.colognearts.de/qpphoto/qpPhoto_1.0.2_src.tar.gz \
-           file://draw.patch;patch=1 \
-           file://drawview.patch;patch=1 \
-           file://drawwidget.patch;patch=1 "
+           file://draw.patch \
+           file://drawview.patch \
+           file://drawwidget.patch "
 
 S = "${WORKDIR}/qpPhoto_1.0.2"
 
diff --git a/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb b/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb
index 73b4597c04..cfed35c561 100644
--- a/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb
+++ b/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz \
-           file://no-external-lexers.patch;patch=1;pnum=0"
+           file://no-external-lexers.patch;striplevel=0"
 
 S = "${WORKDIR}/qscintilla-${PV}/qt"
 
diff --git a/recipes/qsvn/qsvn.inc b/recipes/qsvn/qsvn.inc
index c27bbab114..def95633f2 100644
--- a/recipes/qsvn/qsvn.inc
+++ b/recipes/qsvn/qsvn.inc
@@ -14,7 +14,7 @@ def vars_from_file(filename):
 FN := "${@vars_from_file(bb.data.getVar('FILE',d))}"
 
 SRC_URI = "http://download2.berlios.de/${FN}/${FN}-${PV}-src.tar.gz \
-        file://build.patch;patch=1"
+        file://build.patch"
 S = "${WORKDIR}/${FN}-${PV}"
 
 EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/subversion-1"
diff --git a/recipes/qt/qt-x11-free-native_3.3.5.bb b/recipes/qt/qt-x11-free-native_3.3.5.bb
index b64ed533b5..fd7715929e 100644
--- a/recipes/qt/qt-x11-free-native_3.3.5.bb
+++ b/recipes/qt/qt-x11-free-native_3.3.5.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://www.trolltech.com"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
-	   file://no-examples.patch;patch=1"
+	   file://no-examples.patch"
 S = "${WORKDIR}/qt-x11-free-${PV}"
 
 #
diff --git a/recipes/qt/qt-x11-free_3.3.6.bb b/recipes/qt/qt-x11-free_3.3.6.bb
index c7ec3aaa11..8a8d5d93d8 100644
--- a/recipes/qt/qt-x11-free_3.3.6.bb
+++ b/recipes/qt/qt-x11-free_3.3.6.bb
@@ -3,9 +3,9 @@ PROVIDES = "qt3x11"
 PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-	   file://no-examples.patch;patch=1 \
-           file://gcc4_1-HACK.patch;patch=1"
+	   file://configure.patch \
+	   file://no-examples.patch \
+           file://gcc4_1-HACK.patch"
 
 require qt-x11-free-common.inc
 
diff --git a/recipes/qt/qt-x11-free_3.3.7.bb b/recipes/qt/qt-x11-free_3.3.7.bb
index 971d4dd375..1d4d5f978c 100644
--- a/recipes/qt/qt-x11-free_3.3.7.bb
+++ b/recipes/qt/qt-x11-free_3.3.7.bb
@@ -3,9 +3,9 @@ PROVIDES = "qt3x11"
 PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-	   file://no-examples.patch;patch=1 \
-           file://gcc4_1-HACK.patch;patch=1"
+	   file://configure.patch \
+	   file://no-examples.patch \
+           file://gcc4_1-HACK.patch"
 
 require qt-x11-free-common.inc
 
diff --git a/recipes/qt4/files/qte.sh b/recipes/qt4/files/qte.sh
new file mode 100644
index 0000000000..ddea77dcf4
--- /dev/null
+++ b/recipes/qt4/files/qte.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
+
+export QWS_MOUSE_PROTO
diff --git a/recipes/qt4/qt-4.6.0.inc b/recipes/qt4/qt-4.6.0.inc
index c273a81397..d161416499 100644
--- a/recipes/qt4/qt-4.6.0.inc
+++ b/recipes/qt4/qt-4.6.0.inc
@@ -3,46 +3,46 @@ DEFAULT_PREFERENCE = "-1"
 FILESPATHPKG .= ":qt-${PV}"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://0006-freetype-host-includes.patch;patch=1 \
-           file://0008-qt-lib-infix.patch;patch=1 \
-           file://0009-support-2bpp.patch;patch=1 \
-           file://0010-no-simpledecoration-example.patch;patch=1 \
-           file://fix-config-tests.patch;patch=1 \
+           file://0001-cross-compile.patch \
+           file://0002-fix-resinit-declaration.patch \
+           file://0004-no-qmake.patch \
+           file://0006-freetype-host-includes.patch \
+           file://0008-qt-lib-infix.patch \
+           file://0009-support-2bpp.patch \
+           file://0010-no-simpledecoration-example.patch \
+           file://fix-config-tests.patch \
            file://g++.conf \
            file://linux.conf \
            "
 
 # Patches for '4.6' qt branch
 SRC_URI += "\
-           file://0860-Added-caching-of-vectorpaths-to-the-GL-paint-engine.patch;patch=1 \
-           file://0917-Better-check-for-EGL-extension-strings.patch;patch=1 \
-           file://0919-Rebind-window-surface-fbo-after-native-GL-rendering.patch;patch=1 \
-           file://0943-Fixed-OpenGL-graphicssystem-issues-for-OpenGL-ES-2.0.patch;patch=1 \
-           file://0945-Add-EGL_BUFFER_SIZE-to-QEglProperties-reduceConfigur.patch;patch=1 \
-           file://0946-Fix-WA_TranslucentBackground-for-QGLWidgets-on-X11-E.patch;patch=1 \
-           file://0947-Compressed-texture-binding-for-QtOpenGL-ETC1-and-PVR.patch;patch=1 \
-           file://0951-Detect-GL2-paint-engine-based-on-fragment-shaders-no.patch;patch=1 \
-           file://0971-Fix-GL_BGRA-formats-under-OpenGL-ES-systems.patch;patch=1 \
-           file://0991-QGtkStyle-support-for-the-inner-border-property-in-G.patch;patch=1 \
-           file://0992-Make-sure-a-context-is-current-when-loading-compress.patch;patch=1 \
-           file://0993-Fix-upside-down-PVR-compressed-textures.patch;patch=1 \
-           file://0996-Export-QGLShareRegister-because-qgl_share_reg-is-exp.patch;patch=1 \
-           file://0998-Set-stacking-class-for-stays-on-top-windows-in-DFB.patch;patch=1 \
-           file://0999-Enable-customizing-of-DirectFB-layer-to-use.patch;patch=1 \
-           file://1008-GLES-2-should-not-use-a-multisampled-format-by-defau.patch;patch=1 \
-           file://1115-Fix-QGLWidgets-created-with-an-alpha-channel-on-X11-.patch;patch=1 \
-           file://1118-Fix-EGL-surface-leaks-when-re-parenting-QGLWidget-on.patch;patch=1 \
-           file://1136-Disable-depth-testing-during-the-2D-QGLWidget-render.patch;patch=1 \
-           file://1149-GL2Engine-Don-t-mark-brush-as-dirty-if-it-hasn-t-cha.patch;patch=1 \
-           file://1157-Align-GL_RGB-lines-on-a-4-byte-boundary-when-uploadi.patch;patch=1 \
-#           file://1165-NEON-configure-detection-and-initial-blend-function-.patch;patch=1 \
-           file://1175-Fix-memory-leak-of-QGLGlyphCoord-objects-in-the-Open.patch;patch=1 \
-           file://1197-Add-GLfloat-2-2-GLfloat-3-3-uniform-setters-to-QGLSh.patch;patch=1 \
-           file://1198-Handle-broken-shaders-better-in-the-GL2-engine-s-sha.patch;patch=1 \
-           file://1205-Fix-text-rendering-on-GL2-paint-engine.patch;patch=1 \
+           file://0860-Added-caching-of-vectorpaths-to-the-GL-paint-engine.patch \
+           file://0917-Better-check-for-EGL-extension-strings.patch \
+           file://0919-Rebind-window-surface-fbo-after-native-GL-rendering.patch \
+           file://0943-Fixed-OpenGL-graphicssystem-issues-for-OpenGL-ES-2.0.patch \
+           file://0945-Add-EGL_BUFFER_SIZE-to-QEglProperties-reduceConfigur.patch \
+           file://0946-Fix-WA_TranslucentBackground-for-QGLWidgets-on-X11-E.patch \
+           file://0947-Compressed-texture-binding-for-QtOpenGL-ETC1-and-PVR.patch \
+           file://0951-Detect-GL2-paint-engine-based-on-fragment-shaders-no.patch \
+           file://0971-Fix-GL_BGRA-formats-under-OpenGL-ES-systems.patch \
+           file://0991-QGtkStyle-support-for-the-inner-border-property-in-G.patch \
+           file://0992-Make-sure-a-context-is-current-when-loading-compress.patch \
+           file://0993-Fix-upside-down-PVR-compressed-textures.patch \
+           file://0996-Export-QGLShareRegister-because-qgl_share_reg-is-exp.patch \
+           file://0998-Set-stacking-class-for-stays-on-top-windows-in-DFB.patch \
+           file://0999-Enable-customizing-of-DirectFB-layer-to-use.patch \
+           file://1008-GLES-2-should-not-use-a-multisampled-format-by-defau.patch \
+           file://1115-Fix-QGLWidgets-created-with-an-alpha-channel-on-X11-.patch \
+           file://1118-Fix-EGL-surface-leaks-when-re-parenting-QGLWidget-on.patch \
+           file://1136-Disable-depth-testing-during-the-2D-QGLWidget-render.patch \
+           file://1149-GL2Engine-Don-t-mark-brush-as-dirty-if-it-hasn-t-cha.patch \
+           file://1157-Align-GL_RGB-lines-on-a-4-byte-boundary-when-uploadi.patch \
+#           file://1165-NEON-configure-detection-and-initial-blend-function-.patch \
+           file://1175-Fix-memory-leak-of-QGLGlyphCoord-objects-in-the-Open.patch \
+           file://1197-Add-GLfloat-2-2-GLfloat-3-3-uniform-setters-to-QGLSh.patch \
+           file://1198-Handle-broken-shaders-better-in-the-GL2-engine-s-sha.patch \
+           file://1205-Fix-text-rendering-on-GL2-paint-engine.patch \
 "
 
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
@@ -74,7 +74,7 @@ do_install_append() {
 
 LICENSE = "LGPLv2.1 GPLv3"
 SRC_URI += " \
-            file://hack-out-pg_config.patch;patch=1"
+            file://hack-out-pg_config.patch"
 
 SRC_URI[md5sum] = "2a7b5126f2450d8525af355fc4c12ad6"
 SRC_URI[sha256sum] = "55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589"
diff --git a/recipes/qt4/qt-4.6.2.inc b/recipes/qt4/qt-4.6.2.inc
index 3ec329f373..e89cf1787a 100644
--- a/recipes/qt4/qt-4.6.2.inc
+++ b/recipes/qt4/qt-4.6.2.inc
@@ -3,19 +3,22 @@ DEFAULT_PREFERENCE = "-1"
 FILESPATHPKG .= ":qt-${PV}"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://0006-freetype-host-includes.patch;patch=1 \
-           file://0008-qt-lib-infix.patch;patch=1 \
-           file://0009-support-2bpp.patch;patch=1 \
-           file://0010-no-simpledecoration-example.patch;patch=1 \
-           file://fix-config-tests.patch;patch=1 \
-           file://qt-config.patch;patch=1 \
+           file://0001-cross-compile.patch \
+           file://0002-fix-resinit-declaration.patch \
+           file://0004-no-qmake.patch \
+           file://0006-freetype-host-includes.patch \
+           file://0008-qt-lib-infix.patch \
+           file://0009-support-2bpp.patch \
+           file://0010-no-simpledecoration-example.patch \
+           file://fix-config-tests.patch \
+           file://qt-config.patch \
            file://g++.conf \
            file://linux.conf \
            "
 
+# Set necessary variables in the profile
+SRC_URI += "file://qte.sh"
+
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 
 do_configure_prepend() {
@@ -58,7 +61,7 @@ do_install_append() {
 
 LICENSE = "LGPLv2.1 GPLv3"
 SRC_URI += " \
-            file://hack-out-pg_config.patch;patch=1"
+            file://hack-out-pg_config.patch"
 
 SRC_URI[md5sum] = "eb651ee4b157c01696aa56777fc6e0e5"
 SRC_URI[sha256sum] = "176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae"
diff --git a/recipes/qt4/qt4-embedded-gles-4.6.2/cursor-hack.diff b/recipes/qt4/qt4-embedded-gles-4.6.2/cursor-hack.diff
new file mode 100644
index 0000000000..e297e520a0
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-gles-4.6.2/cursor-hack.diff
@@ -0,0 +1,34 @@
+Patch originally done by Bin Liu, rediffed by Koen Kooi for Qt 4.6.2
+
+This patch is a first step to get a working cursor when using the powervr driver, it flickers when hovering over a QGLWidget, but still better than no cursor at all
+
+--- /tmp/pvreglscreen.cpp	2010-04-19 09:30:32.000000000 +0200
++++ qt-everywhere-opensource-src-4.6.2/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp	2010-04-19 09:31:30.000000000 +0200
+@@ -85,6 +85,9 @@
+ bool PvrEglScreen::initDevice()
+ {
+     openTty();
++#ifndef QT_NO_QWS_CURSOR
++    QScreenCursor::initSoftwareCursor();
++#endif
+     return true;
+ }
+ 
+--- /tmp/qwindowsystem_qws.cpp	2010-04-19 09:32:47.000000000 +0200
++++ qt-everywhere-opensource-src-4.6.2/src/gui/embedded/qwindowsystem_qws.cpp	2010-04-19 09:33:30.000000000 +0200
+@@ -3501,7 +3501,6 @@
+         }
+ 
+ #ifdef QT_QWS_CLIENTBLIT
+-#ifdef QT_NO_QWS_CURSOR
+         // This optimization only really works when there isn't a crazy cursor
+         // wizzing around.
+         QRegion directPaint = (r - transparentRegion); // in gloal coords
+@@ -3513,7 +3512,6 @@
+                                          QWSRegionEvent::DirectPaint, id);
+         }
+ #endif
+-#endif
+     }
+ 
+     if (doLock)
diff --git a/recipes/qt4/qt4-embedded-gles/linux.conf b/recipes/qt4/qt4-embedded-gles/linux.conf
index 8c099a6439..4394fbc5f7 100644
--- a/recipes/qt4/qt4-embedded-gles/linux.conf
+++ b/recipes/qt4/qt4-embedded-gles/linux.conf
@@ -61,6 +61,6 @@ QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 
 #These defines are documented in the powervr README, please read it
-DEFINES += QT_NO_OPENVG QT_QWS_CLIENTBLIT QT_NO_QWS_CURSOR
+DEFINES += QT_QWS_CLIENTBLIT
 
 include(unix.conf)
diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
index a888e7d6be..ce3d8f6c50 100644
--- a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
+++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
@@ -10,7 +10,7 @@ LICENSE = "LGPLv2.1 GPLv3"
 
 DEPENDS += "virtual/egl"
 PROVIDES += "qt4-embedded"
-SRC_URI += "file://sgx-hack.patch;patch=1"
+SRC_URI += "file://sgx-hack.patch"
 
 export EXTRA_QMAKE_MUNGE = " glmunge "
 
diff --git a/recipes/qt4/qt4-embedded-gles_4.6.2.bb b/recipes/qt4/qt4-embedded-gles_4.6.2.bb
index 20d4f27c11..21c461a11c 100644
--- a/recipes/qt4/qt4-embedded-gles_4.6.2.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.6.2.bb
@@ -1,11 +1,12 @@
 require qt4-embedded.inc
-PR = "${INC_PR}.7"
+PR = "${INC_PR}.8"
 
 PROVIDES += "qt4-embedded"
-QT_GLFLAGS = "-opengl es2 -no-openvg  -depths 16,24,32  -plugin-gfx-powervr"
+QT_GLFLAGS = "-opengl es2 -depths 16,24,32  -plugin-gfx-powervr"
 
 require qt-${PV}.inc
 
+SRC_URI += "file://cursor-hack.diff"
 
 FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded"
 
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 7e0be6e955..9aaca6eac2 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r18"
+INC_PR = "r19"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_BASE_LIB  ?= "libqt-embedded"
@@ -12,30 +12,40 @@ QT_DIR_NAME = "qtopia"
 QT_LIBINFIX = "E"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://0003-no-tools.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://0006-freetype-host-includes.patch;patch=1 \
-           file://0007-openssl-host-includes.patch;patch=1 \
-           file://0008-qt-lib-infix.patch;patch=1 \
-           file://0009-support-2bpp.patch;patch=1 \
-           file://fix-config-tests.patch;patch=1 \
+           file://0001-cross-compile.patch \
+           file://0002-fix-resinit-declaration.patch \
+           file://0003-no-tools.patch \
+           file://0004-no-qmake.patch \
+           file://0006-freetype-host-includes.patch \
+           file://0007-openssl-host-includes.patch \
+           file://0008-qt-lib-infix.patch \
+           file://0009-support-2bpp.patch \
+           file://fix-config-tests.patch \
            file://g++.conf \
            file://linux.conf \
            "
+
+# Set necessary variables in the profile
+SRC_URI += "file://qte.sh"
+
 S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
 
 QT_CONFIG_FLAGS += " \
     -qtlibinfix ${QT_LIBINFIX} \
-    -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
     -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
-    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \
+    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
     -qt-kbd-tty \
     -DQT_KEYPAD_NAVIGATION \
     "
 
 require qt4.inc
 
+do_install_append() {
+	install -d ${D}${sysconfdir}/profile.d/
+	install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
+}
+
+FILES_qt4-embedded += " ${sysconfdir}/profile.d/qte.sh"
+
 inherit qt4e
 
diff --git a/recipes/qt4/qt4-embedded_4.5.2.bb b/recipes/qt4/qt4-embedded_4.5.2.bb
index ab876ece78..3e0c8600ec 100644
--- a/recipes/qt4/qt4-embedded_4.5.2.bb
+++ b/recipes/qt4/qt4-embedded_4.5.2.bb
@@ -3,8 +3,8 @@ require qt4-embedded.inc
 PR = "${INC_PR}.1"
 
 LICENSE = "LGPLv2.1 GPLv3"
-SRC_URI += "file://0010-no-simpledecoration-example.patch;patch=1 \
-            file://hack-out-pg_config.patch;patch=1"
+SRC_URI += "file://0010-no-simpledecoration-example.patch \
+            file://hack-out-pg_config.patch"
 
 SRC_URI[md5sum] = "62186345c609a72b89f16d83bc7a130f"
 SRC_URI[sha256sum] = "272301a27e2f7bcd44c8d09f496e1c749c80b86d9489ea9c30bb265bf2dd02fc"
diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
index bd0d2e138e..b6e3107cf0 100644
--- a/recipes/qt4/qt4-tools-native.inc
+++ b/recipes/qt4/qt4-tools-native.inc
@@ -5,12 +5,12 @@ HOMEPAGE = "http://www.trolltech.com"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-INC_PR = "r6"
+INC_PR = "r7"
 
 inherit native
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://qt-config.patch;patch=1 \
+           file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
@@ -59,17 +59,19 @@ do_compile() {
     done
 }
 
-do_stage() {
-    install -d ${STAGING_BINDIR_NATIVE}/
-    install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
+NATIVE_INSTALL_WORKS = "1"
+
+do_install() {
+    install -d ${D}${bindir}/
+    install -m 0755 bin/qmake ${D}${bindir}/qmake2
     for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
-        install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4
+        install -m 0755 bin/${i} ${D}${bindir}/${i}4
     done
     
-    install -d ${STAGING_DATADIR_NATIVE}/qt4/
-    cp -PfR mkspecs ${STAGING_DATADIR_NATIVE}/qt4/
-    ln -sf linux-g++ ${STAGING_DATADIR_NATIVE}/qt4/mkspecs/${BUILD_OS}-oe-g++
-    cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${STAGING_DATADIR_NATIVE}/qt4/mkspecs/common/
+    install -d ${D}${datadir}/qt4/
+    cp -PfR mkspecs ${D}${datadir}/qt4/
+    ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++
+    cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/
 
-    install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DATADIR_NATIVE}/qt4/
+    install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/
 }
diff --git a/recipes/qt4/qt4-tools-native_4.4.3.bb b/recipes/qt4/qt4-tools-native_4.4.3.bb
index 5bd97bb001..c7915f303b 100644
--- a/recipes/qt4/qt4-tools-native_4.4.3.bb
+++ b/recipes/qt4/qt4-tools-native_4.4.3.bb
@@ -2,8 +2,8 @@ require qt4-tools-native.inc
 
 # Older releases have different source archive name, than .inc
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://configure-lflags.patch;patch=1 \
-           file://qt-config.patch;patch=1 \
+           file://configure-lflags.patch \
+           file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"
 
diff --git a/recipes/qt4/qt4-tools-native_4.5.2.bb b/recipes/qt4/qt4-tools-native_4.5.2.bb
index 8d33af0129..206e486810 100644
--- a/recipes/qt4/qt4-tools-native_4.5.2.bb
+++ b/recipes/qt4/qt4-tools-native_4.5.2.bb
@@ -2,8 +2,8 @@ require qt4-tools-native.inc
 
 # Older releases have different source archive name, than .inc
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://configure-lflags.patch;patch=1 \
-           file://qt-config.patch;patch=1 \
+           file://configure-lflags.patch \
+           file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"
 
diff --git a/recipes/qt4/qt4-tools-sdk_4.5.2.bb b/recipes/qt4/qt4-tools-sdk_4.5.2.bb
index 858b2abfd2..0fd489044d 100644
--- a/recipes/qt4/qt4-tools-sdk_4.5.2.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.5.2.bb
@@ -8,8 +8,8 @@ LICENSE = "LGPLv2.1 GPLv3"
 inherit sdk
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://configure-lflags.patch;patch=1 \
-           file://qt-config.patch;patch=1 \
+           file://configure-lflags.patch \
+           file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"
 S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
diff --git a/recipes/qt4/qt4-tools-sdk_4.6.0.bb b/recipes/qt4/qt4-tools-sdk_4.6.0.bb
index 7482a6aec9..240f0538c4 100644
--- a/recipes/qt4/qt4-tools-sdk_4.6.0.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.6.0.bb
@@ -9,8 +9,8 @@ DEFAULT_PREFERENCE = "-1"
 inherit sdk
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://configure-lflags.patch;patch=1 \
-           file://qt-config.patch;patch=1 \
+           file://configure-lflags.patch \
+           file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"
 
diff --git a/recipes/qt4/qt4-tools-sdk_4.6.2.bb b/recipes/qt4/qt4-tools-sdk_4.6.2.bb
index d8eda8a811..faf056790a 100644
--- a/recipes/qt4/qt4-tools-sdk_4.6.2.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.6.2.bb
@@ -8,9 +8,11 @@ LICENSE = "LGPLv2.1 GPLv3"
 DEFAULT_PREFERENCE = "-1"
 inherit sdk
 
+PR = "r1"
+
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://configure-lflags.patch;patch=1 \
-           file://qt-config.patch;patch=1 \
+           file://configure-lflags.patch \
+           file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"
 
@@ -70,6 +72,12 @@ do_install() {
     for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
         install -m 0755 bin/${i} ${D}${bindir}/${i}4
     done
+
+	(cd ${D}${bindir}; \
+	ln -s qmake2 qmake; \
+	for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do \
+		ln -s ${i}4 ${i}; \
+	done)
 }
 
 
diff --git a/recipes/qt4/qt4-x11-free-gles/linux.conf b/recipes/qt4/qt4-x11-free-gles/linux.conf
index ef641f54a9..70eccce125 100644
--- a/recipes/qt4/qt4-x11-free-gles/linux.conf
+++ b/recipes/qt4/qt4-x11-free-gles/linux.conf
@@ -60,6 +60,4 @@ QMAKE_MKDIR           = mkdir -p
 QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 
-DEFINES += QT_NO_OPENVG
-
 include(unix.conf)
diff --git a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
index a3f60bf982..3fe721810f 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
@@ -12,8 +12,8 @@ PR = "${INC_PR}.3"
 
 DEPENDS += "virtual/egl"
 PROVIDES += "qt4-x11-free"
-#SRC_URI += "file://sgx-hack.patch;patch=1"
-SRC_URI += "file://hack-out-pg_config.patch;patch=1"
+#SRC_URI += "file://sgx-hack.patch"
+SRC_URI += "file://hack-out-pg_config.patch"
 
 export EXTRA_QMAKE_MUNGE = " glmunge "
 
diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.2.bb b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb
index a1b4e877b1..307770f0dc 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.6.2.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb
@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
-PR = "${INC_PR}.6"
+PR = "${INC_PR}.7"
 
-QT_GLFLAGS = "-opengl es2 -no-openvg  -depths 16,24,32 "
+QT_GLFLAGS = "-opengl es2 -depths 16,24,32 "
 
 require qt-${PV}.inc
 
diff --git a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
index 59778910b5..289eb889cc 100644
--- a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
+++ b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
@@ -13,17 +13,17 @@ DEPENDS += "virtual/egl"
 
 SRCREV = "9ec431c"
 SRC_URI = "git://git.gitorious.org/qt/qt.git;protocol=http \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://0003-no-tools.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://0006-freetype-host-includes.patch;patch=1 \
-           file://0007-openssl-host-includes.patch;patch=1 \
-           file://0008-qt-lib-infix.patch;patch=1 \
+           file://0001-cross-compile.patch \
+           file://0002-fix-resinit-declaration.patch \
+           file://0003-no-tools.patch \
+           file://0004-no-qmake.patch \
+           file://0006-freetype-host-includes.patch \
+           file://0007-openssl-host-includes.patch \
+           file://0008-qt-lib-infix.patch \
            file://g++.conf \
            file://linux.conf \
            "
-#SRC_URI += "file://sgx-hack.patch;patch=1"
+#SRC_URI += "file://sgx-hack.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index d8dfa5c225..fc96f033fc 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -8,14 +8,14 @@ DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcurso
 INC_PR = "r17"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://0003-no-tools.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://0006-freetype-host-includes.patch;patch=1 \
-           file://0007-openssl-host-includes.patch;patch=1 \ 
-           file://0008-qt-lib-infix.patch;patch=1 \
-           file://fix-config-tests.patch;patch=1 \
+           file://0001-cross-compile.patch \
+           file://0002-fix-resinit-declaration.patch \
+           file://0003-no-tools.patch \
+           file://0004-no-qmake.patch \
+           file://0006-freetype-host-includes.patch \
+           file://0007-openssl-host-includes.patch \ 
+           file://0008-qt-lib-infix.patch \
+           file://fix-config-tests.patch \
            file://g++.conf \
            file://linux.conf \
            "
diff --git a/recipes/qt4/qt4-x11-free_4.5.2.bb b/recipes/qt4/qt4-x11-free_4.5.2.bb
index 7099310d14..b545dea629 100644
--- a/recipes/qt4/qt4-x11-free_4.5.2.bb
+++ b/recipes/qt4/qt4-x11-free_4.5.2.bb
@@ -2,7 +2,7 @@ require qt4-x11-free.inc
 LICENSE = "LGPLv2.1 GPLv3"
 PR = "${INC_PR}.3"
 
-SRC_URI += "file://hack-out-pg_config.patch;patch=1"
+SRC_URI += "file://hack-out-pg_config.patch"
 
 SRC_URI[md5sum] = "d8bcc070a58db25c228b7729ffad4550"
 SRC_URI[sha256sum] = "4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2"
diff --git a/recipes/qte/qte-common_2.3.10.inc b/recipes/qte/qte-common_2.3.10.inc
index cd2aa4f1a2..18811c7bd6 100644
--- a/recipes/qte/qte-common_2.3.10.inc
+++ b/recipes/qte/qte-common_2.3.10.inc
@@ -19,35 +19,35 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-${PV}"
 CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5sum=1f7ad30113afc500cab7f5b2f4dec0d7 \
-   	   file://qpe.patch;patch=1 \
-	   file://vt-switch.patch;patch=1 \
-	   file://daemonize.patch;patch=1 \
-	   file://no-moc.patch;patch=1 \
-	   file://gcc3.patch;patch=1 \
-	   file://gcc4.patch;patch=1 \
-	   file://encoding.patch;patch=1 \
-	   file://fix-qgfxraster.patch;patch=1 \
-	   file://qt-visibility.patch;patch=1 \
-	   file://tslib.patch;patch=1 \
-	   file://handhelds.patch;patch=1 \
-	   file://qiconview-speed.patch;patch=1 \
-	   file://qtabbar.patch;patch=1 \
-	   file://increase-qxml-robustness.patch;patch=1 \
-	   file://qte-fix-iconsize.patch;patch=1 \
-	   file://fix-linuxfb-setmode.patch;patch=1 \
-	   file://fix-linuxfb-offscreenoverflow.patch;patch=1 \
-	   file://fix-qscreen-sync.patch;patch=1 \
-	   file://improve-calibration-r0.patch;patch=1 \
-	   file://key.patch;patch=1 \
-	   file://bidimetrics.patch;patch=5 \
-	   file://fix-native-build.patch;patch=1 \
-	   file://fix-errno-exception-spec.patch;patch=1 \
-           file://keyboardless-buttonmap.patch;patch=1 \
-           file://kernel-keymap.patch;patch=1 \
-	   file://kernel-keymap-corgi.patch;patch=1 \
-	   file://remove-unused-kbdhandler.patch;patch=1 \
-	   file://disable-dup-rotation.patch;patch=1 \
-	   file://fix-qte-asm-include.patch;patch=1 \
+   	   file://qpe.patch \
+	   file://vt-switch.patch \
+	   file://daemonize.patch \
+	   file://no-moc.patch \
+	   file://gcc3.patch \
+	   file://gcc4.patch \
+	   file://encoding.patch \
+	   file://fix-qgfxraster.patch \
+	   file://qt-visibility.patch \
+	   file://tslib.patch \
+	   file://handhelds.patch \
+	   file://qiconview-speed.patch \
+	   file://qtabbar.patch \
+	   file://increase-qxml-robustness.patch \
+	   file://qte-fix-iconsize.patch \
+	   file://fix-linuxfb-setmode.patch \
+	   file://fix-linuxfb-offscreenoverflow.patch \
+	   file://fix-qscreen-sync.patch \
+	   file://improve-calibration-r0.patch \
+	   file://key.patch \
+	   file://bidimetrics.patch \
+	   file://fix-native-build.patch \
+	   file://fix-errno-exception-spec.patch \
+           file://keyboardless-buttonmap.patch \
+           file://kernel-keymap.patch \
+	   file://kernel-keymap-corgi.patch \
+	   file://remove-unused-kbdhandler.patch \
+	   file://disable-dup-rotation.patch \
+	   file://fix-qte-asm-include.patch \
 	   file://sharp_char.h \
 	   file://switches.h "
 
@@ -55,18 +55,18 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
 # add device specific patches here
 #
 
-W100_ACCEL_PATCHES = "file://c7x0-w100-accel.patch;patch=1 \
-                      file://c7x0-w100-gcc4.patch;patch=1 \
-		      file://suspend-resume-hooks.patch;patch=1"
+W100_ACCEL_PATCHES = "file://c7x0-w100-accel.patch \
+                      file://c7x0-w100-gcc4.patch \
+		      file://suspend-resume-hooks.patch"
 
 #SRC_URI_append_c7x0         = "${W100_ACCEL_PATCHES} "
-#SRC_URI_append_spitz        = "file://spitz-adhoc-keypad-rotate.patch;patch=1 "
-#SRC_URI_append_akita        = "file://spitz-adhoc-keypad-rotate.patch;patch=1 "
+#SRC_URI_append_spitz        = "file://spitz-adhoc-keypad-rotate.patch "
+#SRC_URI_append_akita        = "file://spitz-adhoc-keypad-rotate.patch "
 
 # "ipaqs" used to have this, but later were proven to at least work
 # without it. Review again and see if has interesting bits to be applied
 # universally.
-#SRC_URI_append   = "file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append   = "file://ipaq_sound_fix.patch "
 
 
 S = "${WORKDIR}/qt-${PV}"
diff --git a/recipes/qtnx/qtnx.inc b/recipes/qtnx/qtnx.inc
index e86b17a15e..7d5189e955 100644
--- a/recipes/qtnx/qtnx.inc
+++ b/recipes/qtnx/qtnx.inc
@@ -8,14 +8,14 @@ DEPENDS = "libnxcl"
 
 SRC_URI = "http://download.berlios.de/freenx/freenx-client-${PV}.tar.bz2 \
 	   file://qtnx.desktop \
-	   file://pro.patch;patch=1 \
-	   file://id-path.patch;patch=1 \
-	   file://scroll.patch;patch=1 \
-           file://keymap.patch;patch=1 \
-           file://dodnx.patch;patch=1 \
-           file://keychooser.patch;patch=1 \
-           file://sessionfiles.patch;patch=1 \
-           file://ssh_dnserror.patch;patch=1 \
+	   file://pro.patch \
+	   file://id-path.patch \
+	   file://scroll.patch \
+           file://keymap.patch \
+           file://dodnx.patch \
+           file://keychooser.patch \
+           file://sessionfiles.patch \
+           file://ssh_dnserror.patch \
 	  "
 
 S = "${WORKDIR}/freenx-client-${PV}/qtnx"
diff --git a/recipes/quagga/quagga.inc b/recipes/quagga/quagga.inc
index 9cff5bb8ca..4c95b7460e 100644
--- a/recipes/quagga/quagga.inc
+++ b/recipes/quagga/quagga.inc
@@ -28,7 +28,7 @@ QUAGGASUBDIR = ""
 # ${QUAGGASUBDIR} is deal with old versions. Set to "/attic" for old
 # versions and leave it empty for recent versions.
 SRC_URI = "http://www.quagga.net/download${QUAGGASUBDIR}/quagga-${PV}.tar.gz;name=quagga-${PV} \
-           file://fix-for-lib-inpath.patch;patch=1 \
+           file://fix-for-lib-inpath.patch \
            file://quagga.init \
            file://quagga.default \
            file://watchquagga.init \
diff --git a/recipes/quake/quake1_0.0.1.bb b/recipes/quake/quake1_0.0.1.bb
index 2d35544c1b..0fc11015ba 100644
--- a/recipes/quake/quake1_0.0.1.bb
+++ b/recipes/quake/quake1_0.0.1.bb
@@ -7,10 +7,10 @@ PR = "r2"
 
 SRC_URI = "http://mirror1.pdaXrom.org/rc9/src/quake1src.tar.bz2;name=archive \
            http://mirror1.pdaxrom.org/source/src/pak0.tar.gz;name=pak0 \
-           file://Makefile.patch;patch=1 \
-           file://cl_parse.c.patch;patch=1 \
-           file://vid_sdl.c.patch;patch=1 \
-           file://host.c.patch;patch=1"
+           file://Makefile.patch \
+           file://cl_parse.c.patch \
+           file://vid_sdl.c.patch \
+           file://host.c.patch"
 
 S = "${WORKDIR}/quake1src"
 
diff --git a/recipes/quake/quake2_svn.bb b/recipes/quake/quake2_svn.bb
index 426fab1731..ff01b065ae 100644
--- a/recipes/quake/quake2_svn.bb
+++ b/recipes/quake/quake2_svn.bb
@@ -8,7 +8,7 @@ PV = "0.16.1+svnr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "svn://svn.icculus.org/quake2/;module=trunk \
-           file://quake2-arm.patch;patch=1"
+           file://quake2-arm.patch"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/quake/quake3-pandora-gles_git.bb b/recipes/quake/quake3-pandora-gles_git.bb
index d468d34a44..fe4d37e9d0 100644
--- a/recipes/quake/quake3-pandora-gles_git.bb
+++ b/recipes/quake/quake3-pandora-gles_git.bb
@@ -8,7 +8,7 @@ PV = "0.0"
 DEPENDS = "virtual/libsdl libgles-omap3"
 
 SRC_URI = "git://github.com/Cpasjuste/quake3_pandora_gles.git;branch=master;protocol=git \ 
-           file://quake3_makefile.patch;patch=1 \
+           file://quake3_makefile.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes/quake/sdlquake_1.0.9.bb b/recipes/quake/sdlquake_1.0.9.bb
index c31e2881fa..bfaf2e8f8c 100644
--- a/recipes/quake/sdlquake_1.0.9.bb
+++ b/recipes/quake/sdlquake_1.0.9.bb
@@ -5,7 +5,7 @@ DEPENDS = "libsdl-x11 libsdl-mixer libsdl-net zlib libxau"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.libsdl.org/projects/quake/src/sdlquake-${PV}.tar.gz \
-	   file://sdlquake-no-x86-asm.diff;patch=1 \
+	   file://sdlquake-no-x86-asm.diff \
 	   " 	
 
 inherit autotools
diff --git a/recipes/quasar/quasar_0.9beta3.bb b/recipes/quasar/quasar_0.9beta3.bb
index bf93fb5121..dc40da40d8 100644
--- a/recipes/quasar/quasar_0.9beta3.bb
+++ b/recipes/quasar/quasar_0.9beta3.bb
@@ -8,7 +8,7 @@ PV = "0.8+0.9beta3"
 S = "${WORKDIR}/v0.9_beta3"
 
 SRC_URI = "http://katastrophos.net/zaurus/sources/quasar/quasar_0.9_beta3_sources.tar.bz2\
-	   file://cross-compile.patch;patch=1"
+	   file://cross-compile.patch"
 
 inherit qmake qt3x11
 
diff --git a/recipes/quilt/quilt-native.inc b/recipes/quilt/quilt-native.inc
index cad1b745f3..5c5a0153cc 100644
--- a/recipes/quilt/quilt-native.inc
+++ b/recipes/quilt/quilt-native.inc
@@ -1,6 +1,6 @@
 require quilt.inc
 
-SRC_URI_append_build-darwin = "?   file://non-gnu.patch;patch=1 "
+SRC_URI_append_build-darwin = "?   file://non-gnu.patch "
 RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/quilt-${PV}"
 
diff --git a/recipes/quilt/quilt-package.inc b/recipes/quilt/quilt-package.inc
index 900884b917..1721049b5c 100644
--- a/recipes/quilt/quilt-package.inc
+++ b/recipes/quilt/quilt-package.inc
@@ -2,7 +2,7 @@ require quilt.inc
 
 RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
 
-SRC_URI += "file://aclocal.patch;patch=1"
+SRC_URI += "file://aclocal.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/quilt/quilt.inc b/recipes/quilt/quilt.inc
index ce9679ded1..fd0d40dc57 100644
--- a/recipes/quilt/quilt.inc
+++ b/recipes/quilt/quilt.inc
@@ -4,6 +4,6 @@ SECTION = "devel"
 LICENSE = "GPL"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
-           file://install.patch;patch=1"
+           file://install.patch"
 
 S = "${WORKDIR}/quilt-${PV}"
diff --git a/recipes/qwo/qwo_0.4.bb b/recipes/qwo/qwo_0.4.bb
index 403f6c3ff6..d226e5a7cc 100644
--- a/recipes/qwo/qwo_0.4.bb
+++ b/recipes/qwo/qwo_0.4.bb
@@ -10,7 +10,7 @@ PV = "0.4"
 PR = "r0"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/qwo/qwo-${PV}.tar.gz \
-	   file://check_lib.patch;patch=1 \
+	   file://check_lib.patch \
           "
 
 inherit autotools
diff --git a/recipes/qwo/qwo_0.5.bb b/recipes/qwo/qwo_0.5.bb
index f8222be30e..c0a5cd0a0d 100644
--- a/recipes/qwo/qwo_0.5.bb
+++ b/recipes/qwo/qwo_0.5.bb
@@ -9,7 +9,7 @@ RDEPENDS += "imlib2-loaders"
 PR = "r1"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/qwo/qwo-${PV}.tar.gz \
-           file://qwo.automake-1.11.patch;patch=1"
+           file://qwo.automake-1.11.patch"
 
 inherit autotools
 
diff --git a/recipes/qwt/qwt_4.2.0rc1.bb b/recipes/qwt/qwt_4.2.0rc1.bb
index 1ab7755385..59a3b299c4 100644
--- a/recipes/qwt/qwt_4.2.0rc1.bb
+++ b/recipes/qwt/qwt_4.2.0rc1.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libqte2"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tgz \
-          file://qt2-fix.patch;patch=1"
+          file://qt2-fix.patch"
 
 inherit palmtop
 
diff --git a/recipes/radlib/radlib-common.inc b/recipes/radlib/radlib-common.inc
index 1eb9bc0d5f..cd6ef25ad5 100644
--- a/recipes/radlib/radlib-common.inc
+++ b/recipes/radlib/radlib-common.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "BSD"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/radlib/radlib-${PV}.tar.gz \
-	file://Makefile.am.patch;patch=1"
+	file://Makefile.am.patch"
 
 S = "${WORKDIR}/radlib-${PV}"
 
diff --git a/recipes/radvd/radvd_0.7.2.bb b/recipes/radvd/radvd_0.7.2.bb
index a7ed081b7a..02b06c921f 100644
--- a/recipes/radvd/radvd_0.7.2.bb
+++ b/recipes/radvd/radvd_0.7.2.bb
@@ -1,6 +1,6 @@
 PR = "r2"
 
-SRC_URI_append += "file://automake.patch;patch=1 "
+SRC_URI_append += "file://automake.patch "
 
 require radvd.inc
 
diff --git a/recipes/rcs/rcs_5.7.bb b/recipes/rcs/rcs_5.7.bb
index 1709ccb4cc..5d780f12d5 100644
--- a/recipes/rcs/rcs_5.7.bb
+++ b/recipes/rcs/rcs_5.7.bb
@@ -6,7 +6,7 @@ PR = "r0"
 
 SRC_URI = "\
   http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${PV}.tar.Z \
-  file://fix-installpath.patch;patch=1 \
+  file://fix-installpath.patch \
   file://oe-src-conf.h \
 "
 
diff --git a/recipes/rdesktop/rdesktop_1.3.1.bb b/recipes/rdesktop/rdesktop_1.3.1.bb
index 2e804859a1..7f093a6405 100644
--- a/recipes/rdesktop/rdesktop_1.3.1.bb
+++ b/recipes/rdesktop/rdesktop_1.3.1.bb
@@ -2,7 +2,7 @@ require rdesktop.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI +="file://configure.patch;patch=1"
+SRC_URI +="file://configure.patch"
 
 # Note - rdesktop 1.3.1 doesn't use autotools - don't make the same
 # mistakes I did.. :)
diff --git a/recipes/rdesktop/rdesktop_1.4.1.bb b/recipes/rdesktop/rdesktop_1.4.1.bb
index 1edc523bd1..6f3e6774f3 100644
--- a/recipes/rdesktop/rdesktop_1.4.1.bb
+++ b/recipes/rdesktop/rdesktop_1.4.1.bb
@@ -2,7 +2,7 @@ require rdesktop.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://strip.patch;patch=1"
+SRC_URI += "file://strip.patch"
 
 inherit autotools
 
diff --git a/recipes/rdesktop/rdesktop_1.6.0.bb b/recipes/rdesktop/rdesktop_1.6.0.bb
index 3257300dcc..b9853d1a54 100644
--- a/recipes/rdesktop/rdesktop_1.6.0.bb
+++ b/recipes/rdesktop/rdesktop_1.6.0.bb
@@ -2,8 +2,8 @@ require rdesktop.inc
 
 PR = "${INC_PR}.2"
 
-SRC_URI += " file://audio-2008.patch;patch=1"
-SRC_URI_append_ossystems = " file://rdesktop-addin.patch;patch=1"
+SRC_URI += " file://audio-2008.patch"
+SRC_URI_append_ossystems = " file://rdesktop-addin.patch"
 
 inherit autotools
 
diff --git a/recipes/readline/readline_4.3.bb b/recipes/readline/readline_4.3.bb
index 903a660f5e..15be6c86d6 100644
--- a/recipes/readline/readline_4.3.bb
+++ b/recipes/readline/readline_4.3.bb
@@ -11,7 +11,7 @@ LEAD_SONAME = "libreadline.so"
 PR = "r4"
 
 SRC_URI = "${GNU_MIRROR}/readline/readline-${PV}.tar.gz \
-	   file://shlink-termcap.patch;patch=1 \
+	   file://shlink-termcap.patch \
 	   file://acinclude.m4"
 S = "${WORKDIR}/readline-${PV}"
 
diff --git a/recipes/readline/readline_5.2.bb b/recipes/readline/readline_5.2.bb
index 6d291132db..845a668297 100644
--- a/recipes/readline/readline_5.2.bb
+++ b/recipes/readline/readline_5.2.bb
@@ -12,8 +12,8 @@ PR = "r6"
 
 SRC_URI = "\
   ftp://ftp.gnu.org/gnu/readline/readline-${PV}.tar.gz \
-  file://fix-includes.patch;patch=1 \
-  file://configure_fix.patch;patch=1 \
+  file://fix-includes.patch \
+  file://configure_fix.patch \
   file://acinclude.m4 \
 "
 S = "${WORKDIR}/readline-${PV}"
diff --git a/recipes/reaim/reaim_7.0.1.13.bb b/recipes/reaim/reaim_7.0.1.13.bb
index f47479fc4e..3ee723373f 100644
--- a/recipes/reaim/reaim_7.0.1.13.bb
+++ b/recipes/reaim/reaim_7.0.1.13.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "libaio"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/re-aim-7/osdl-aim-${PV}.tar.gz \
-           file://makefile-fix.patch;patch=1"
+           file://makefile-fix.patch"
 
 S = "${WORKDIR}/osdl-aim-7/"
 
diff --git a/recipes/realpath/realpath_1.10.bb b/recipes/realpath/realpath_1.10.bb
index 4833740907..cd24dabe0b 100644
--- a/recipes/realpath/realpath_1.10.bb
+++ b/recipes/realpath/realpath_1.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPLv2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/r/realpath/realpath_${PV}.tar.gz;name=realpath \
-           file://makefile.patch;patch=1"
+           file://makefile.patch"
 
 SRC_URI[realpath.md5sum] = "1f2b2bceaacadf79162a9cbb5956c3b6"
 SRC_URI[realpath.sha256sum] = "72199f9c11d1f9a36b3b9693988b558a167def6b88fa146ea6a7f7223f96c535"
diff --git a/recipes/recode/recode_3.6.bb b/recipes/recode/recode_3.6.bb
index 847a5834da..3e7c6cd572 100644
--- a/recipes/recode/recode_3.6.bb
+++ b/recipes/recode/recode_3.6.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 
 PR = "r1"
 SRC_URI = "${GNU_MIRROR}/recode/recode-${PV}.tar.gz \
-	file://recode-bitfield-width.patch;patch=1"
+	file://recode-bitfield-width.patch"
 
 inherit autotools
 
diff --git a/recipes/redfang/redfang.bb b/recipes/redfang/redfang.bb
index 030b3eea08..65a0d5cf76 100644
--- a/recipes/redfang/redfang.bb
+++ b/recipes/redfang/redfang.bb
@@ -1,6 +1,6 @@
 SECTION = "unknown"
 SRC_URI = "http://packetstormsecurity.org/wireless/redfang.2.5.tar.gz \
-    	   file://Makefile.patch;patch=1;pnum=0"
+    	   file://Makefile.patch;striplevel=0"
 
 DEFAULT_PREFERENCE="-1"
 PV="2.5"
diff --git a/recipes/redland/redland_1.0.8.bb b/recipes/redland/redland_1.0.8.bb
index cd08dbcb0e..c58b546a6a 100644
--- a/recipes/redland/redland_1.0.8.bb
+++ b/recipes/redland/redland_1.0.8.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPLv2"
 SRC_URI = "http://download.librdf.org/source/redland-1.0.8.tar.gz \
-           file://crosscompile.patch;patch=1 \
-	   file://sane_pkgconfig.patch;patch=1"
+           file://crosscompile.patch \
+	   file://sane_pkgconfig.patch"
 	   
 PR = "r3"
 
diff --git a/recipes/regina-rexx/regina-rexx_3.3.bb b/recipes/regina-rexx/regina-rexx_3.3.bb
index de42bb4541..5461172958 100644
--- a/recipes/regina-rexx/regina-rexx_3.3.bb
+++ b/recipes/regina-rexx/regina-rexx_3.3.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://regina-rexx.sf.net"
 DEPENDS = "regina-rexx-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/regina-rexx/regina33.zip \
-           file://use-proper-host-tools.patch;patch=1"
+           file://use-proper-host-tools.patch"
 S = "${WORKDIR}"
 
 inherit autotools
diff --git a/recipes/reiser4progs/reiser4progs_1.0.4.bb b/recipes/reiser4progs/reiser4progs_1.0.4.bb
index 83bbc6a365..cd4ff41da4 100644
--- a/recipes/reiser4progs/reiser4progs_1.0.4.bb
+++ b/recipes/reiser4progs/reiser4progs_1.0.4.bb
@@ -8,10 +8,10 @@ SECTION = "base"
 LICENSE = "GPLv2"
 
 SRC_URI = "ftp://ftp.namesys.com/pub/${PN}/old-versions/${P}.tar.gz \
-		file://oid40.c.patch;patch=1 \
-		file://key_short.c.patch;patch=1 \
-		file://key_large.c.patch;patch=1 \
-		file://align.patch;patch=1"
+		file://oid40.c.patch \
+		file://key_short.c.patch \
+		file://key_large.c.patch \
+		file://align.patch"
 
 LIBAAL = "libaal"
 
diff --git a/recipes/reiserfsprogs/reiserfsprogs_3.6.19.bb b/recipes/reiserfsprogs/reiserfsprogs_3.6.19.bb
index 79a096174c..ad43a41907 100644
--- a/recipes/reiserfsprogs/reiserfsprogs_3.6.19.bb
+++ b/recipes/reiserfsprogs/reiserfsprogs_3.6.19.bb
@@ -7,7 +7,7 @@ PR = "r1"
 #Namesys.com seems to be in trouble.  See bug #3482 for more information
 #SRC_URI ="ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz \
 SRC_URI ="${DEBIAN_MIRROR}/main/r/reiserfsprogs/reiserfsprogs_${PV}.orig.tar.gz \
-	  file://header-fix.patch;patch=1 \
+	  file://header-fix.patch \
 	  "
 
 S = "${WORKDIR}/reiserfsprogs-${PV}"
diff --git a/recipes/rfkill/rfkill_0.4.bb b/recipes/rfkill/rfkill_0.4.bb
new file mode 100644
index 0000000000..6691049648
--- /dev/null
+++ b/recipes/rfkill/rfkill_0.4.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "rfkill CLI utility"
+HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/rfkill"
+SECTION = "base"
+LICENSE = "BSD"
+PR = "r0"
+
+DEPENDS = "libnl pkgconfig"
+
+SRC_URI = "http://wireless.kernel.org/download/${PN}/${P}.tar.bz2"
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	oe_runmake DESTDIR=${D} install
+}
+
+SRC_URI[md5sum] = "727892c0fb35c80ee3849fbe89b45350"
+SRC_URI[sha256sum] = "ca10e4827a5f0a36e093aee6ad81b5febf81f8097d7d858889ac51ff364168c1"
diff --git a/recipes/roadmap/roadmap-gtk2_1.1.0.bb b/recipes/roadmap/roadmap-gtk2_1.1.0.bb
index 0e2a3766b4..79d226b5f3 100644
--- a/recipes/roadmap/roadmap-gtk2_1.1.0.bb
+++ b/recipes/roadmap/roadmap-gtk2_1.1.0.bb
@@ -3,10 +3,10 @@ require roadmap-gtk2.inc
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz;name=archive \
-           file://cross.patch;patch=1;pnum=2 \
-           file://options.mk.patch;patch=1;pnum=2 \
-           file://roadmap_path.patch;patch=1 \
-           file://roadmap.desktop.patch;patch=1 \
+           file://cross.patch;striplevel=2 \
+           file://options.mk.patch;striplevel=2 \
+           file://roadmap_path.patch \
+           file://roadmap.desktop.patch \
 	   http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz;name=usdir "
 
 S = "${WORKDIR}/roadmap-${PV}/src"
diff --git a/recipes/roadmap/roadmap-gtk2_cvs.bb b/recipes/roadmap/roadmap-gtk2_cvs.bb
index 05acd9686f..70118e2c3f 100644
--- a/recipes/roadmap/roadmap-gtk2_cvs.bb
+++ b/recipes/roadmap/roadmap-gtk2_cvs.bb
@@ -4,9 +4,9 @@ PV = "0.0+cvs${SRCDATE}"
 PR = "r1"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
-           file://cross.patch;patch=1;pnum=2 \
-           file://options.mk.patch;patch=1;pnum=2 \
-           file://roadmap_path.patch;patch=1 \
+           file://cross.patch;striplevel=2 \
+           file://options.mk.patch;striplevel=2 \
+           file://roadmap_path.patch \
 	   http://roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz;name=usdir "
 
 S = "${WORKDIR}/roadmap/src"
diff --git a/recipes/roadmap/zroadmap_1.1.0.bb b/recipes/roadmap/zroadmap_1.1.0.bb
index 161a41eeab..815a6157d2 100644
--- a/recipes/roadmap/zroadmap_1.1.0.bb
+++ b/recipes/roadmap/zroadmap_1.1.0.bb
@@ -3,14 +3,14 @@ require zroadmap.inc
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz;name=archive \
-           file://cross.patch;patch=1;pnum=2 \
-           file://options.mk.patch;patch=1;pnum=2 \
-           file://qt/qt2-fixes.patch;patch=1 \
-           file://qt/qt_canvas.patch;patch=1 \
-           file://qt/qt_main.patch;patch=1 \
-           file://qt/roadmap_main.patch;patch=1 \
-           file://roadmap_path.patch;patch=1 \
-           file://roadmap.desktop.patch;patch=1 \
+           file://cross.patch;striplevel=2 \
+           file://options.mk.patch;striplevel=2 \
+           file://qt/qt2-fixes.patch \
+           file://qt/qt_canvas.patch \
+           file://qt/qt_main.patch \
+           file://qt/roadmap_main.patch \
+           file://roadmap_path.patch \
+           file://roadmap.desktop.patch \
            http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz;name=usdir"
 
 S = "${WORKDIR}/roadmap-${PV}/src"
diff --git a/recipes/roadmap/zroadmap_cvs.bb b/recipes/roadmap/zroadmap_cvs.bb
index fb06bb76af..d2219d25bd 100644
--- a/recipes/roadmap/zroadmap_cvs.bb
+++ b/recipes/roadmap/zroadmap_cvs.bb
@@ -4,10 +4,10 @@ PV = "0.0+cvs${SRCDATE}"
 PR = "r0"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
-           file://cross.patch;patch=1;pnum=2 \
-           file://options.mk.patch;patch=1;pnum=2 \
-           file://qt/qt2-fixes.patch;patch=1 \
-           file://roadmap_path.patch;patch=1 \
+           file://cross.patch;striplevel=2 \
+           file://options.mk.patch;striplevel=2 \
+           file://qt/qt2-fixes.patch \
+           file://roadmap_path.patch \
            http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz;name=usdir"
 
 S = "${WORKDIR}/roadmap/src"
diff --git a/recipes/robostix/robostix.bb b/recipes/robostix/robostix.bb
index 5e1f8c8b69..368f5a11fb 100644
--- a/recipes/robostix/robostix.bb
+++ b/recipes/robostix/robostix.bb
@@ -8,8 +8,8 @@ DEPENDS = "virtual/kernel"
 PR = "r0"
 
 SRC_URI = "svn://svn.gumstix.com/gumstix-buildroot/branches/projects;module=robostix;rev=1588;proto=http \
-   file://makefile-rules.patch;patch=1 \
-   file://gummake.patch;patch=1 \
+   file://makefile-rules.patch \
+   file://gummake.patch \
    "
 
 S = "${WORKDIR}/robostix"
diff --git a/recipes/rosetta/rosetta_cvs.bb b/recipes/rosetta/rosetta_cvs.bb
index 2cb16608e3..9057e2cf0b 100644
--- a/recipes/rosetta/rosetta_cvs.bb
+++ b/recipes/rosetta/rosetta_cvs.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "Multistroke / full word handwriting recognition for X"
 LICENSE = "GPL"
 
 SRC_URI = "${HANDHELDS_CVS};module=rosetta \
-	file://rosetta-makefile.patch;patch=1"
+	file://rosetta-makefile.patch"
 S = "${WORKDIR}/rosetta"
 PR = "r4"
 
diff --git a/recipes/rott/rott_1.0.bb b/recipes/rott/rott_1.0.bb
index a602390ecb..c082169c35 100644
--- a/recipes/rott/rott_1.0.bb
+++ b/recipes/rott/rott_1.0.bb
@@ -6,7 +6,7 @@ PR = "r2"
 APPIMAGE = "${WORKDIR}/rott.jpg"
 
 SRC_URI = "http://icculus.org/rott/releases/rott-${PV}.tar.gz \
-           file://gcc4.patch;patch=1;pnum=2 \
+           file://gcc4.patch;striplevel=2 \
            file://rott.jpg"
 S = "${WORKDIR}/rott-${PV}/rott"
 
diff --git a/recipes/rox/rox-filer_2.5.bb b/recipes/rox/rox-filer_2.5.bb
index 4f7fcec40e..6e46ee9c58 100644
--- a/recipes/rox/rox-filer_2.5.bb
+++ b/recipes/rox/rox-filer_2.5.bb
@@ -7,7 +7,7 @@ RDEPENDS = "shared-mime-info"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/rox/${P}.tar.bz2 \
-           file://no-strip-objcopy.patch;patch=1;pnum=3"
+           file://no-strip-objcopy.patch;striplevel=3"
 
 inherit mime pkgconfig
 
diff --git a/recipes/rp-pppoe/rp-pppoe_3.5.bb b/recipes/rp-pppoe/rp-pppoe_3.5.bb
index 68d957523c..927217b628 100644
--- a/recipes/rp-pppoe/rp-pppoe_3.5.bb
+++ b/recipes/rp-pppoe/rp-pppoe_3.5.bb
@@ -4,9 +4,9 @@ HOMEPAGE="http://www.roaringpenguin.com/"
 LICENSE="GPLv2"
 
 SRC_URI="http://www.roaringpenguin.com/penguin/pppoe/${P}.tar.gz \
-	file://rp-pppoe-3.5_configure_in_cross.diff;patch=1;pnum=2 \
-	file://rp-pppoe-3.5_libevent_makefile_cross.diff;patch=1;pnum=2 \
-	file://rp-pppoe-3.5_no_strip.diff;patch=1;pnum=2"
+	file://rp-pppoe-3.5_configure_in_cross.diff;striplevel=2 \
+	file://rp-pppoe-3.5_libevent_makefile_cross.diff;striplevel=2 \
+	file://rp-pppoe-3.5_no_strip.diff;striplevel=2"
 
 SRC_URI[md5sum] = "97972f8f8f6a3ab9b7070333a6a29c4b"
 SRC_URI[sha256sum] = "f7d200b13a4bd75e623b88e3d762afc5b11a0dffa11b4b16b93f4ffb284b9cbc"
diff --git a/recipes/rp-pppoe/rp-pppoe_3.8.bb b/recipes/rp-pppoe/rp-pppoe_3.8.bb
index 581ccc2c02..9a41236211 100644
--- a/recipes/rp-pppoe/rp-pppoe_3.8.bb
+++ b/recipes/rp-pppoe/rp-pppoe_3.8.bb
@@ -8,11 +8,11 @@ RRECOMMENDS_${PN} = "ppp-oe"
 PR = "r6"
 
 SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
-           file://top-autoconf.patch;patch=1 \
-           file://configure_in_cross.patch;patch=1 \
-           file://pppoe-src-restrictions.patch;patch=1 \
-           file://update-config.patch;patch=1 \
-           file://dont-swallow-errors.patch;patch=1 \
+           file://top-autoconf.patch \
+           file://configure_in_cross.patch \
+           file://pppoe-src-restrictions.patch \
+           file://update-config.patch \
+           file://dont-swallow-errors.patch \
            file://pppoe-server.default \
            file://pppoe-server.init"
 
diff --git a/recipes/rpm/rpm-4.4.2.3.inc b/recipes/rpm/rpm-4.4.2.3.inc
index f1f4d6562d..b96fde929e 100644
--- a/recipes/rpm/rpm-4.4.2.3.inc
+++ b/recipes/rpm/rpm-4.4.2.3.inc
@@ -5,13 +5,13 @@ DEPENDS = "python-native"
 PR = "r16"
 
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
-           file://external-tools.patch;patch=1 \
-	   file://cross_libpaths.patch;patch=1 \
-	   file://rpmconfigdir.patch;patch=1 \
-	   file://weakdeps.patch;patch=1;pnum=0 \
-	   file://tagsbackport.patch;patch=1;pnum=0 \
-	   file://missingok.patch;patch=1;pnum=0 \
-	   file://extcond.patch;patch=1;pnum=0"
+           file://external-tools.patch \
+	   file://cross_libpaths.patch \
+	   file://rpmconfigdir.patch \
+	   file://weakdeps.patch;striplevel=0 \
+	   file://tagsbackport.patch;striplevel=0 \
+	   file://missingok.patch;striplevel=0 \
+	   file://extcond.patch;striplevel=0"
 
 inherit autotools python-dir
 
diff --git a/recipes/rrdtool/rrdtool_1.0.49.bb b/recipes/rrdtool/rrdtool_1.0.49.bb
index 10e08c7582..44a5545ac6 100644
--- a/recipes/rrdtool/rrdtool_1.0.49.bb
+++ b/recipes/rrdtool/rrdtool_1.0.49.bb
@@ -6,7 +6,7 @@ DEPENDS = "libpng zlib"
 DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader"
 PR = "r2"
 SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rrdtool-${PV}.tar.gz \
-	file://perl-make-options.diff;patch=1;pnum=0"
+	file://perl-make-options.diff;striplevel=0"
 
 inherit autotools
 
diff --git a/recipes/rsync/rsync_3.0.0.bb b/recipes/rsync/rsync_3.0.0.bb
index f912b33add..597a946fb4 100644
--- a/recipes/rsync/rsync_3.0.0.bb
+++ b/recipes/rsync/rsync_3.0.0.bb
@@ -3,7 +3,7 @@ require rsync.inc
 PR = "r1"
 
 SRC_URI += "\
-  file://m4.patch;patch=1 \
+  file://m4.patch \
   file://rsyncd.conf \
 "
 
diff --git a/recipes/rsync/rsync_3.0.6.bb b/recipes/rsync/rsync_3.0.6.bb
index 7abdbca458..c2ee0d70e2 100644
--- a/recipes/rsync/rsync_3.0.6.bb
+++ b/recipes/rsync/rsync_3.0.6.bb
@@ -1,7 +1,7 @@
 require rsync.inc
 
 SRC_URI += "\
-  file://m4.patch;patch=1 \
+  file://m4.patch \
   file://rsyncd.conf \
 "
 # The source tarball from 3.0.6 seems to need this
diff --git a/recipes/rsyslog/rsyslog.inc b/recipes/rsyslog/rsyslog.inc
index 91e4639d03..d94ab34d3b 100644
--- a/recipes/rsyslog/rsyslog.inc
+++ b/recipes/rsyslog/rsyslog.inc
@@ -2,31 +2,61 @@ DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd"
 DEPENDS = "zlib"
 HOMEPAGE = "http://www.rsyslog.com/"
 LICENSE = "GPLv3"
-INC_PR = "r0"
+INC_PR = "r1"
 
-SRC_URI = "http://download.rsyslog.com/rsyslog/${PN}-${PV}.tar.gz;name=archive \
+SRC_URI = "http://download.rsyslog.com/rsyslog/${PN}-${PV}.tar.gz \
           file://rsyslog.conf \
           file://initscript"
 
-inherit autotools update-rc.d
+
+inherit autotools
 
 do_install_append() {
         install -d ${D}/${sysconfdir}/${PN}
         install ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
         install -d ${D}/${sysconfdir}/init.d
-        install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/rsyslog
+        install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN}
+}
+
+# syslog initscript is handled explicitly because order of
+# update-rc.d and update-alternatives is important
+DEPENDS_append = " update-rc.d update-rc.d-native"
+RDEPENDS_${PN}_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
+
+pkg_postinst_${PN} () {
+	update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 300
+
+	if test "x$D" != "x"; then
+		OPT="-r $D"
+	else
+		OPT="-s"
+	fi
+	update-rc.d $OPT syslog defaults
 }
 
-pkg_postinst() {
-        update-rc.d -f syslog remove
+pkg_prerm_${PN} () {
+	if test "x$D" = "x"; then
+		if test "$1" = "upgrade" -o "$1" = "remove"; then
+			/etc/init.d/syslog stop
+		fi
+	fi
+
+	update-alternatives --remove syslog-init syslog.${PN}
 }
 
-pkg_postrm() {
-        update-rc.d syslog add 5
+pkg_postrm_${PN} () {
+	if test "x$D" != "x"; then
+		OPT="-r $D"
+	else
+		OPT=""
+	fi
+	if test "$1" = "remove" -o "$1" = "purge"; then
+		if ! test -e "/etc/init.d/syslog"; then
+			update-rc.d $OPT syslog remove
+		fi
+	fi
 }
 
 CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf"
 
-INITSCRIPT_NAME = "rsyslog"
-#INITSCRIPT_PARAMS = "defaults 05"
-INITSCRIPT_PARAMS = "remove"
+INITSCRIPT_NAME = "syslog"
diff --git a/recipes/rsyslog/rsyslog_5.4.0.bb b/recipes/rsyslog/rsyslog_5.4.0.bb
index b22d4e4882..6a2699c003 100644
--- a/recipes/rsyslog/rsyslog_5.4.0.bb
+++ b/recipes/rsyslog/rsyslog_5.4.0.bb
@@ -1,7 +1,7 @@
 require rsyslog.inc
 PR = "${INC_PR}.0"
 
-SRC_URI += " file://atomics.patch;patch=1"
+SRC_URI += " file://atomics.patch"
 
-SRC_URI[archive.md5sum] = "291882229d50496f42bd63174076dd37"
-SRC_URI[archive.sha256sum] = "d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228"
+SRC_URI[md5sum] = "291882229d50496f42bd63174076dd37"
+SRC_URI[sha256sum] = "d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228"
diff --git a/recipes/rsyslog/rsyslog_5.5.4.bb b/recipes/rsyslog/rsyslog_5.5.4.bb
new file mode 100644
index 0000000000..7a3eb5dbc4
--- /dev/null
+++ b/recipes/rsyslog/rsyslog_5.5.4.bb
@@ -0,0 +1,5 @@
+require rsyslog.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "824df2504955df1619e5ec2915d783aa"
+SRC_URI[sha256sum] = "31853a551ea7ca960c59c9e33406b1748bdf311059c9d8a4ce98816d51b17cac"
diff --git a/recipes/rt-tests/rt-tests_0.28.bb b/recipes/rt-tests/rt-tests_0.28.bb
index e8792847d7..af3bb305e6 100644
--- a/recipes/rt-tests/rt-tests_0.28.bb
+++ b/recipes/rt-tests/rt-tests_0.28.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Real-time tests, such as cyclictest, for real-time linux PREEMPT
 HOMEPAGE = "http://rt.wiki.kernel.org/index.php/Cyclictest"
 LICENSE = "GPL"
 PR = "r1"
-PE = "1"
 
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-${PV}.tar.bz2"
 
diff --git a/recipes/rt-tests/rt-tests_git.bb b/recipes/rt-tests/rt-tests_git.bb
index b6b6e4406b..fbb07911c6 100644
--- a/recipes/rt-tests/rt-tests_git.bb
+++ b/recipes/rt-tests/rt-tests_git.bb
@@ -5,8 +5,7 @@ PR = "r0"
 
 SRCREV = "42ab9e7cd259fae674dc2b2aa2962caaf8f09409"
 
-PV = "0.51+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.51+${PR}+gitr${SRCREV}"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tglx/rt-tests;protocol=git"
 
diff --git a/recipes/rt2x00/rt3070_2.1.1.0.bb b/recipes/rt2x00/rt3070_2.1.1.0.bb
index 46b26cd3e4..3fbed1074b 100644
--- a/recipes/rt2x00/rt3070_2.1.1.0.bb
+++ b/recipes/rt2x00/rt3070_2.1.1.0.bb
@@ -6,8 +6,8 @@ PR = "r2"
 inherit module
 
 SRC_URI = "http://www.ralinktech.com.tw/data/drivers/2009_0525_RT3070_Linux_STA_v${PV}.tar.bz2 \
-           file://makefile.patch;patch=1 \
-	   file://config.patch;patch=1 \
+           file://makefile.patch \
+	   file://config.patch \
 	 "
 
 EXTRA_OEMAKE = "LINUX_SRC=${STAGING_KERNEL_DIR}"
diff --git a/recipes/ruby/ruby.inc b/recipes/ruby/ruby.inc
index 27316e0a7b..6ef65358fa 100644
--- a/recipes/ruby/ruby.inc
+++ b/recipes/ruby/ruby.inc
@@ -10,9 +10,9 @@ INC_PR = "r1"
 
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
-           file://extmk_run.patch;patch=1 \
-           file://openssl.patch;patch=1 \
-           file://disable_wide_getaddrinfo_check.patch;patch=1"
+           file://extmk_run.patch \
+           file://openssl.patch \
+           file://disable_wide_getaddrinfo_check.patch"
 
 S = "${WORKDIR}/ruby-${PV}"
 
diff --git a/recipes/ruby/ruby_1.8.7-p248.bb b/recipes/ruby/ruby_1.8.7-p248.bb
index 9b94503361..6de359d590 100644
--- a/recipes/ruby/ruby_1.8.7-p248.bb
+++ b/recipes/ruby/ruby_1.8.7-p248.bb
@@ -1,8 +1,8 @@
 require ruby.inc
 PR = "${INC_PR}.0"
 SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
-           file://extmk_run.patch;patch=1 \
-           file://extmk.patch;patch=1 \
+           file://extmk_run.patch \
+           file://extmk.patch \
 "
 FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
                     ${libdir}/ruby/1.8/*/*/.debug"
diff --git a/recipes/rxtx/rxtx_2.1-7r2.bb b/recipes/rxtx/rxtx_2.1-7r2.bb
index 44bbc07b86..d2e78b1dbd 100644
--- a/recipes/rxtx/rxtx_2.1-7r2.bb
+++ b/recipes/rxtx/rxtx_2.1-7r2.bb
@@ -11,7 +11,7 @@ inherit autotools java-library
 
 SRC_URI = "\
     http://rxtx.qbang.org/pub/rxtx/${PN}-${PV}.zip \
-    file://rxtx-fixes-from-debian.patch;patch=1 \
+    file://rxtx-fixes-from-debian.patch \
     "
 
 do_removebinaries_append() {
diff --git a/recipes/rxvt-unicode/rxvt-unicode_4.8.bb b/recipes/rxvt-unicode/rxvt-unicode_4.8.bb
index a68e046c31..b246c567ac 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_4.8.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_4.8.bb
@@ -8,8 +8,8 @@ same time, including Xft fonts."
 PR = "r2"
 LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch"
 
 inherit autotools update-alternatives
 
diff --git a/recipes/rxvt-unicode/rxvt-unicode_4.9.bb b/recipes/rxvt-unicode/rxvt-unicode_4.9.bb
index c63cad1204..bad822288b 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_4.9.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_4.9.bb
@@ -7,8 +7,8 @@ output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
 LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch"
 
 inherit autotools update-alternatives
 
diff --git a/recipes/rxvt-unicode/rxvt-unicode_5.2.bb b/recipes/rxvt-unicode/rxvt-unicode_5.2.bb
index afc6ad805d..d125d37869 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_5.2.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_5.2.bb
@@ -7,7 +7,7 @@ output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
 LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PV}.tar.bz2 \
-	   file://signedchar.patch;patch=1"
+	   file://signedchar.patch"
 
 SRC_URI[md5sum] = "52664198e7c6a500dd9728b1a2c97e8a"
 SRC_URI[sha256sum] = "6ce00673bb9be8ed172c41c9246689916e358d331eb24aa05f5d89db4dd23c82"
diff --git a/recipes/rxvt-unicode/rxvt-unicode_5.3.bb b/recipes/rxvt-unicode/rxvt-unicode_5.3.bb
index a6ae3d95a7..7164e1c1bd 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_5.3.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_5.3.bb
@@ -7,8 +7,8 @@ output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
 LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch"
 PR = "r2"
 
 inherit autotools update-alternatives
diff --git a/recipes/rxvt-unicode/rxvt-unicode_5.4.bb b/recipes/rxvt-unicode/rxvt-unicode_5.4.bb
index bfc8e21a02..6c15eb1d9f 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_5.4.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_5.4.bb
@@ -7,8 +7,8 @@ output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
 LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch"
 PR = "r2"
 
 inherit autotools update-alternatives
diff --git a/recipes/rxvt-unicode/rxvt-unicode_5.6.bb b/recipes/rxvt-unicode/rxvt-unicode_5.6.bb
index fd3bd51673..5b9c3da6bb 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -11,8 +11,8 @@ FILES_${PN}-daemon = "${bindir}/rxvtd"
 FILES_${PN}-control = "${bindir}/rxvtc"
 
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch"
 PR = "r3"
 
 inherit autotools update-alternatives
diff --git a/recipes/rxvt-unicode/rxvt-unicode_7.7.bb b/recipes/rxvt-unicode/rxvt-unicode_7.7.bb
index adf22d3ae6..e4879ae981 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_7.7.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_7.7.bb
@@ -11,8 +11,8 @@ FILES_${PN}-daemon = "${bindir}/rxvtd"
 FILES_${PN}-control = "${bindir}/rxvtc"
 
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-           file://xwc.patch;patch=1 \
-           file://signedchar.patch;patch=1"
+           file://xwc.patch \
+           file://signedchar.patch"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/rxvt-unicode/rxvt-unicode_7.9.bb b/recipes/rxvt-unicode/rxvt-unicode_7.9.bb
index 03edd8d447..329c3f0a0d 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_7.9.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_7.9.bb
@@ -11,8 +11,8 @@ FILES_${PN}-daemon = "${bindir}/rxvtd"
 FILES_${PN}-control = "${bindir}/rxvtc"
 
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-           file://xwc.patch;patch=1 \
-           file://signedchar.patch;patch=1"
+           file://xwc.patch \
+           file://signedchar.patch"
 PR = "r1"
 
 inherit autotools update-alternatives
diff --git a/recipes/rxvt-unicode/rxvt-unicode_cvs.bb b/recipes/rxvt-unicode/rxvt-unicode_cvs.bb
index 0ee35f78c8..67ba216ed2 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_cvs.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_cvs.bb
@@ -8,9 +8,9 @@ same time, including Xft fonts."
 DEFAULT_PREFERENCE = "-1"
 LICENSE = "GPL"
 SRC_URI = "cvs://anonymous@cvs.schmorp.de/schmorpforge;module=rxvt-unicode;port=636 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1 \
-	   file://makefile.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch \
+	   file://makefile.patch"
 
 inherit autotools update-alternatives
 
diff --git a/recipes/rxvt/rxvt_2.7.9.bb b/recipes/rxvt/rxvt_2.7.9.bb
index 1d6d586f2a..f4840b7a16 100644
--- a/recipes/rxvt/rxvt_2.7.9.bb
+++ b/recipes/rxvt/rxvt_2.7.9.bb
@@ -4,7 +4,7 @@ PR = "r1"
 DEPENDS = "virtual/libx11 libxft"
 LICENSE = "GPL"
 SRC_URI = "${HANDHELDS_CVS};module=apps/rxvt \
-	   file://include.patch;patch=1"
+	   file://include.patch"
 
 inherit autotools update-alternatives
 
diff --git a/recipes/rxvt/rxvt_2.8.0.bb b/recipes/rxvt/rxvt_2.8.0.bb
index 92bb2dcbf5..0ed4392436 100644
--- a/recipes/rxvt/rxvt_2.8.0.bb
+++ b/recipes/rxvt/rxvt_2.8.0.bb
@@ -4,7 +4,7 @@ PR = "r1"
 DEPENDS = "virtual/libx11 libxft"
 LICENSE = "GPL"
 SRC_URI = "${HANDHELDS_CVS};module=apps/rxvt \
-	   file://include.patch;patch=1"
+	   file://include.patch"
 
 inherit autotools update-alternatives
 
diff --git a/recipes/rygel/rygel_0.4.8.bb b/recipes/rygel/rygel_0.4.8.bb
index b3c558dc94..61b08f4723 100644
--- a/recipes/rygel/rygel_0.4.8.bb
+++ b/recipes/rygel/rygel_0.4.8.bb
@@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 gupnp gupnp-av gstreamer sqlite3 libsoup-2.4 "
 HOMEPAGE = "http://live.gnome.org/Rygel"
 
 SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-${PV}.tar.bz2 \
-           file://configure.ac.patch;patch=1"
+           file://configure.ac.patch"
 
 inherit autotools
 
diff --git a/recipes/sablevm/sablevm-classpath_1.1.9.bb b/recipes/sablevm/sablevm-classpath_1.1.9.bb
index c222572009..f50198142b 100644
--- a/recipes/sablevm/sablevm-classpath_1.1.9.bb
+++ b/recipes/sablevm/sablevm-classpath_1.1.9.bb
@@ -9,7 +9,7 @@ DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native fastjar-
 RDEPENDS_${PN} = "${PN}-native"
 
 SRC_URI = "http://sablevm.org/download/release/${PV}/${PN}-${PV}.tar.gz \
-           file://disable-automake-checks.patch;patch=1"
+           file://disable-automake-checks.patch"
 
 inherit autotools
 
diff --git a/recipes/sablevm/sablevm-classpath_1.11.3.bb b/recipes/sablevm/sablevm-classpath_1.11.3.bb
index 2298145380..0b3e6ddce1 100644
--- a/recipes/sablevm/sablevm-classpath_1.11.3.bb
+++ b/recipes/sablevm/sablevm-classpath_1.11.3.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native zip-nati
 RDEPENDS_${PN} = "${PN}-native (>= ${PV})"
 
 SRC_URI = "http://sablevm.org/download/release/${PV}/${PN}-${PV}.tar.gz \
-           file://disable-automake-checks.patch;patch=1"
+           file://disable-automake-checks.patch"
 
 SRC_URI[md5sum] = "0aed850f5583199b3d1adb41ac2043ed"
 SRC_URI[sha256sum] = "5235747132974dd99591f0986224a82205201ea959e5be62f128378d5dc31003"
diff --git a/recipes/sablevm/sablevm-classpath_1.12.bb b/recipes/sablevm/sablevm-classpath_1.12.bb
index 5cf4f40ca3..2f02e91a8e 100644
--- a/recipes/sablevm/sablevm-classpath_1.12.bb
+++ b/recipes/sablevm/sablevm-classpath_1.12.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native zip-nati
 RDEPENDS_${PN} = "${PN}-native (>= ${PV})"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sablevm/sablevm-classpath-${PV}.tar.gz \
-           file://disable-automake-checks.patch;patch=1"
+           file://disable-automake-checks.patch"
 
 inherit autotools
 
diff --git a/recipes/sablevm/sablevm_1.12.bb b/recipes/sablevm/sablevm_1.12.bb
index bf30e63017..7d1ad8c14a 100644
--- a/recipes/sablevm/sablevm_1.12.bb
+++ b/recipes/sablevm/sablevm_1.12.bb
@@ -10,7 +10,7 @@ DEPENDS = "libffi libtool popt \
 RRECOMMENDS = "sablevm-classpath (>= ${PV})"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sablevm/${PN}-${PV}.tar.gz \
-           file://no-internal-libs.patch;patch=1"
+           file://no-internal-libs.patch"
 
 inherit autotools update-alternatives
 
diff --git a/recipes/samba/samba-ads_3.2.15.bb b/recipes/samba/samba-ads_3.2.15.bb
index dc64754665..17269f3aee 100644
--- a/recipes/samba/samba-ads_3.2.15.bb
+++ b/recipes/samba/samba-ads_3.2.15.bb
@@ -3,11 +3,11 @@ require samba-ads.inc
 LICENSE = "GPLv3"
 
 PR = "r2"
-SRC_URI += "file://config-lfs.patch;patch=1 \
-            file://quota.patch;patch=1;pnum=0 \
-            file://configure-3.2.8.patch;patch=1 \
-            file://config-h.patch;patch=1 \
-            file://mtab.patch;patch=1 \
+SRC_URI += "file://config-lfs.patch \
+            file://quota.patch;striplevel=0 \
+            file://configure-3.2.8.patch \
+            file://config-h.patch \
+            file://mtab.patch \
 	        "
 SRC_URI[src.md5sum] = "5a3bcc4927c9643b9f42970d0815b18f"
 SRC_URI[src.sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46"
diff --git a/recipes/samba/samba-ads_3.3.9.bb b/recipes/samba/samba-ads_3.3.9.bb
index 69555cb620..6407764c52 100644
--- a/recipes/samba/samba-ads_3.3.9.bb
+++ b/recipes/samba/samba-ads_3.3.9.bb
@@ -3,11 +3,11 @@ require samba-ads.inc
 LICENSE = "GPLv3"
 
 PR = "r3"
-SRC_URI += "file://config-lfs.patch;patch=1 \
-            file://quota.patch;patch=1;pnum=0 \
-            file://configure-3.3.0.patch;patch=1 \
-            file://config-h.patch;patch=1 \
-            file://mtab.patch;patch=1 \
+SRC_URI += "file://config-lfs.patch \
+            file://quota.patch;striplevel=0 \
+            file://configure-3.3.0.patch \
+            file://config-h.patch \
+            file://mtab.patch \
 	        "
 
 do_compile () {
diff --git a/recipes/samba/samba-basic.inc b/recipes/samba/samba-basic.inc
index f1bda65286..362762a710 100644
--- a/recipes/samba/samba-basic.inc
+++ b/recipes/samba/samba-basic.inc
@@ -1,5 +1,5 @@
-SRC_URI += "file://config-lfs.patch;patch=1 \
-            file://quota.patch;patch=1;pnum=0 \
+SRC_URI += "file://config-lfs.patch \
+            file://quota.patch;striplevel=0 \
             "
 
 EXTRA_OECONF += "\
diff --git a/recipes/samba/samba-essential.inc b/recipes/samba/samba-essential.inc
index d718fc8a96..0067265f02 100644
--- a/recipes/samba/samba-essential.inc
+++ b/recipes/samba/samba-essential.inc
@@ -3,8 +3,8 @@ LICENSE = "GPL"
 DEPENDS = "readline"
 	       
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
-           file://cifs.patch;patch=1"
+           file://configure.patch \
+           file://cifs.patch"
 S = "${WORKDIR}/samba-${PV}/source"
 
 inherit autotools
diff --git a/recipes/samba/samba-essential_3.0.20.bb b/recipes/samba/samba-essential_3.0.20.bb
index 5486e0ff88..f3c2584d63 100644
--- a/recipes/samba/samba-essential_3.0.20.bb
+++ b/recipes/samba/samba-essential_3.0.20.bb
@@ -3,9 +3,9 @@ inherit update-rc.d
 
 PR = "r7"
 
-SRC_URI = "file://config-lfs.patch;patch=1 \
+SRC_URI = "file://config-lfs.patch \
 	   file://init-essential \
-           file://quota.patch;patch=1;pnum=0 \
+           file://quota.patch;striplevel=0 \
 	   file://smb-essential.conf \
 	   file://smb-essential-inactive.conf \
 	   file://Managing-Samba.txt"
diff --git a/recipes/samba/samba_3.0.23c.bb b/recipes/samba/samba_3.0.23c.bb
index 88e46efabd..c99ba06510 100644
--- a/recipes/samba/samba_3.0.23c.bb
+++ b/recipes/samba/samba_3.0.23c.bb
@@ -1,8 +1,8 @@
 require samba.inc
 require samba-basic.inc
 
-SRC_URI += "file://configure.patch;patch=1 \
-            file://cifs.patch;patch=1"
+SRC_URI += "file://configure.patch \
+            file://cifs.patch"
 
 PR = "r7"
 
diff --git a/recipes/samba/samba_3.0.34.bb b/recipes/samba/samba_3.0.34.bb
index e498ac971f..54a6b0a907 100644
--- a/recipes/samba/samba_3.0.34.bb
+++ b/recipes/samba/samba_3.0.34.bb
@@ -1,10 +1,10 @@
 require samba.inc
 require samba-basic.inc
 
-SRC_URI += "file://configure.patch;patch=1 \
+SRC_URI += "file://configure.patch \
             "
-SRC_URI_append_linux-uclibc        = "file://uclibc-strlcpy-strlcat.patch;patch=1"
-SRC_URI_append_linux-uclibceabi = "file://uclibc-strlcpy-strlcat.patch;patch=1"
+SRC_URI_append_linux-uclibc        = "file://uclibc-strlcpy-strlcat.patch"
+SRC_URI_append_linux-uclibceabi = "file://uclibc-strlcpy-strlcat.patch"
 
 PR = "r5"
 
diff --git a/recipes/samba/samba_3.2.15.bb b/recipes/samba/samba_3.2.15.bb
index 6a14f96078..d5ec4ff562 100644
--- a/recipes/samba/samba_3.2.15.bb
+++ b/recipes/samba/samba_3.2.15.bb
@@ -2,9 +2,9 @@ require samba.inc
 require samba-basic.inc
 LICENSE = "GPLv3"
 
-SRC_URI += "file://configure-3.2.8.patch;patch=1 \
-            file://config-h.patch;patch=1 \
-            file://mtab.patch;patch=1 \
+SRC_URI += "file://configure-3.2.8.patch \
+            file://config-h.patch \
+            file://mtab.patch \
 	        "
 SRC_URI[src.md5sum] = "5a3bcc4927c9643b9f42970d0815b18f"
 SRC_URI[src.sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46"
diff --git a/recipes/samba/samba_3.3.0.bb b/recipes/samba/samba_3.3.0.bb
index 1caf502703..cebcc178e9 100644
--- a/recipes/samba/samba_3.3.0.bb
+++ b/recipes/samba/samba_3.3.0.bb
@@ -8,10 +8,10 @@ LICENSE = "GPLv3"
 # should there be further issues. Appears to work though :)
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI += "file://configure-3.3.0.patch;patch=1 \
-            file://config-h.patch;patch=1 \
-            file://mtab.patch;patch=1 \
-            file://tdbheaderfix.patch;patch=1 "
+SRC_URI += "file://configure-3.3.0.patch \
+            file://config-h.patch \
+            file://mtab.patch \
+            file://tdbheaderfix.patch "
 
 PR = "r3"
 
diff --git a/recipes/samba/samba_3.3.9.bb b/recipes/samba/samba_3.3.9.bb
index 20184e024f..00fef0fc10 100644
--- a/recipes/samba/samba_3.3.9.bb
+++ b/recipes/samba/samba_3.3.9.bb
@@ -8,10 +8,10 @@ LICENSE = "GPLv3"
 # should there be further issues. Appears to work though :)
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI += "file://configure-3.3.0.patch;patch=1 \
-            file://config-h.patch;patch=1 \
-            file://mtab.patch;patch=1 \
-            file://tdbheaderfix.patch;patch=1 "
+SRC_URI += "file://configure-3.3.0.patch \
+            file://config-h.patch \
+            file://mtab.patch \
+            file://tdbheaderfix.patch "
 
 PR = "r3"
 
diff --git a/recipes/sane/sane-backends_1.0.19.bb b/recipes/sane/sane-backends_1.0.19.bb
index 1eb8822b8c..da5ec73f6c 100644
--- a/recipes/sane/sane-backends_1.0.19.bb
+++ b/recipes/sane/sane-backends_1.0.19.bb
@@ -3,11 +3,11 @@ DEPENDS = "hal gphoto2 jpeg virtual/libusb0"
 LICENSE = "LGPL"
 
 SRC_URI = "http://alioth.debian.org/frs/download.php/2318/sane-backends-${PV}.tar.gz \
-	file://Makefile.in.patch;patch=1 \
+	file://Makefile.in.patch \
 	file://saned.xinetd \
 	file://byteorder.m4 \
 	file://stdint.m4 \
-	file://sane-symbols.diff;patch=1 \
+	file://sane-symbols.diff \
 	"
 
 inherit autotools pkgconfig binconfig
diff --git a/recipes/sane/sane-backends_1.0.20.bb b/recipes/sane/sane-backends_1.0.20.bb
index f9792b8d26..f32d302ae1 100644
--- a/recipes/sane/sane-backends_1.0.20.bb
+++ b/recipes/sane/sane-backends_1.0.20.bb
@@ -3,7 +3,7 @@ DEPENDS = "hal gphoto2 jpeg virtual/libusb0"
 LICENSE = "LGPL"
 
 SRC_URI = "http://alioth.debian.org/frs/download.php/3026/sane-backends-${PV}.tar.gz \
-	file://Makefile.in.patch;patch=1 \
+	file://Makefile.in.patch \
 	file://saned.xinetd \
 	file://byteorder.m4 \
 	file://stdint.m4 \
diff --git a/recipes/sapwood/sapwood_svn.bb b/recipes/sapwood/sapwood_svn.bb
index 39ccacb6f6..e47c4cf949 100644
--- a/recipes/sapwood/sapwood_svn.bb
+++ b/recipes/sapwood/sapwood_svn.bb
@@ -5,7 +5,7 @@ PV = "2.43+svn${SRCDATE}"
 PR = "r1"
 
 SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk/;module=sapwood;proto=https \
-	   file://sockets.patch;patch=1 \
+	   file://sockets.patch \
 	  "
 
 S = "${WORKDIR}/${PN}"
diff --git a/recipes/scew/scew_0.3.1.bb b/recipes/scew/scew_0.3.1.bb
index 57deee83ba..027a6c83df 100644
--- a/recipes/scew/scew_0.3.1.bb
+++ b/recipes/scew/scew_0.3.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Simple C Expat Wrapper."
 DEPENDS = "expat"
 LICENSE = "LGPL"
 SRC_URI = "http://savannah.nongnu.org/download/scew/scew-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
+	   file://m4.patch"
 PR = "r1"
 
 inherit autotools pkgconfig
diff --git a/recipes/schroedinger/schroedinger.inc b/recipes/schroedinger/schroedinger.inc
index 90f7ca658b..7819814fc0 100644
--- a/recipes/schroedinger/schroedinger.inc
+++ b/recipes/schroedinger/schroedinger.inc
@@ -7,7 +7,7 @@ PR = "r0"
 SRC_URI = "http://www.diracvideo.org/download/schroedinger/${P}.tar.gz;name=schroedingertargz"
 SRC_URI[schroedingertargz.md5sum] = "d67ec48b7c506db8c8b49156bf409e60"
 SRC_URI[schroedingertargz.sha256sum] = "345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723"
-SRC_URI += "file://configure.ac.patch;patch=1"
+SRC_URI += "file://configure.ac.patch"
 
 EXTRA_OECONF += "STAGING_DIR=${STAGING_DIR_NATIVE}"
 
diff --git a/recipes/scim/scim_1.4.9.bb b/recipes/scim/scim_1.4.9.bb
index 0206c24a87..153a1aa20f 100644
--- a/recipes/scim/scim_1.4.9.bb
+++ b/recipes/scim/scim_1.4.9.bb
@@ -6,16 +6,16 @@ DEPENDS = "gtk+"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
-           file://gcc-4.4-const-char.dpatch;patch=1 \
-           file://configure.patch;patch=1 \
-           file://20_scim_config.dpatch;patch=1 \
-           file://40_scim_user_home_overrides.dpatch;patch=1 \
-           file://50_validate-desktop-entry.dpatch;patch=1 \
-           file://51_scim-1.4.7-fix-capslock.dpatch;patch=1 \
-           file://52_scim-1.4.7-imdkit-read-property-properly.dpatch;patch=1 \
-           file://53_scim-1.4.7-trayicon.dpatch;patch=1 \
-           file://54_scim-1.4.7-xim-wrong-format.dpatch;patch=1 \
-           file://scim-1.4.7-syslibltdl.patch;patch=1 \
+           file://gcc-4.4-const-char.dpatch;apply=yes \
+           file://configure.patch \
+           file://20_scim_config.dpatch;apply=yes \
+           file://40_scim_user_home_overrides.dpatch;apply=yes \
+           file://50_validate-desktop-entry.dpatch;apply=yes \
+           file://51_scim-1.4.7-fix-capslock.dpatch;apply=yes \
+           file://52_scim-1.4.7-imdkit-read-property-properly.dpatch;apply=yes \
+           file://53_scim-1.4.7-trayicon.dpatch;apply=yes \
+           file://54_scim-1.4.7-xim-wrong-format.dpatch;apply=yes \
+           file://scim-1.4.7-syslibltdl.patch \
            "
 
 inherit autotools pkgconfig
diff --git a/recipes/screen/screen_4.0.2.bb b/recipes/screen/screen_4.0.2.bb
index 57569e853d..69058d938d 100644
--- a/recipes/screen/screen_4.0.2.bb
+++ b/recipes/screen/screen_4.0.2.bb
@@ -7,8 +7,8 @@ DEPENDS = "ncurses"
 PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
-           file://screen_4.0.2-4.1sarge1.diff.gz;patch=1 \
-           file://configure.patch;patch=1"
+           file://screen_4.0.2-4.1sarge1.diff.gz \
+           file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/screen/screen_4.0.3.bb b/recipes/screen/screen_4.0.3.bb
index 1a27b44a1f..a29ab817c1 100644
--- a/recipes/screen/screen_4.0.3.bb
+++ b/recipes/screen/screen_4.0.3.bb
@@ -7,11 +7,11 @@ DEPENDS = "ncurses"
 PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
-           file://cross-compile.patch;patch=1 \
-           file://configure.patch;patch=1 \
-           file://sched.patch;patch=1 \
-           file://no-stropts.patch;patch=1 \
-           file://no-utempter.patch;patch=1 \
+           file://cross-compile.patch \
+           file://configure.patch \
+           file://sched.patch \
+           file://no-stropts.patch \
+           file://no-utempter.patch \
 	  "
 
 inherit autotools
diff --git a/recipes/scsi-idle/scsi-idle_2.4.23.bb b/recipes/scsi-idle/scsi-idle_2.4.23.bb
index 8309fa2076..4b85648b45 100644
--- a/recipes/scsi-idle/scsi-idle_2.4.23.bb
+++ b/recipes/scsi-idle/scsi-idle_2.4.23.bb
@@ -10,8 +10,8 @@ AUTHOR = "Eduard Bloch <blade@debian.org>"
 PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/s/scsi-idle/scsi-idle_${PV}-5.tar.gz \
-	file://makefile.patch;patch=1 \
-	file://scsi-idle.init.patch;patch=1"
+	file://makefile.patch \
+	file://scsi-idle.init.patch"
 
 S = "${WORKDIR}/scsi-idle-${PV}"
 
diff --git a/recipes/scummvm/scummvm_0.12.0.bb b/recipes/scummvm/scummvm_0.12.0.bb
index 7e3edf2ca4..38944b2b3d 100644
--- a/recipes/scummvm/scummvm_0.12.0.bb
+++ b/recipes/scummvm/scummvm_0.12.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libsdl libvorbis libogg zlib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 
 SRC_URI += " file://scummvm.desktop \
-	file://no-strip.patch;patch=1"
+	file://no-strip.patch"
 
 SRC_URI_append_openmoko = " file://openmoko-scummvm "
 SRC_URI_append_shr = " file://openmoko-scummvm "
diff --git a/recipes/scummvm/scummvm_0.6.0.bb b/recipes/scummvm/scummvm_0.6.0.bb
index 6525d2b3be..baf21db408 100644
--- a/recipes/scummvm/scummvm_0.6.0.bb
+++ b/recipes/scummvm/scummvm_0.6.0.bb
@@ -6,9 +6,9 @@ DEPENDS = "libsdl-qpe tremor libogg zlib \
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
-			file://sword1.patch;patch=1 \
-			file://tremor.patch;patch=1 \
-			file://mouse.patch;patch=1 "
+			file://sword1.patch \
+			file://tremor.patch \
+			file://mouse.patch "
 PR="r1"
 
 inherit autotools
diff --git a/recipes/scummvm/scummvm_0.6.1b.bb b/recipes/scummvm/scummvm_0.6.1b.bb
index 5e22ac7259..3c76fea7c4 100644
--- a/recipes/scummvm/scummvm_0.6.1b.bb
+++ b/recipes/scummvm/scummvm_0.6.1b.bb
@@ -1,11 +1,11 @@
 require scummvm.inc
 DEPENDS = "virtual/libsdl tremor libogg zlib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
-SRC_URI += " file://mouse.patch;patch=1 \
-             file://gcc-4.x.x-accept.patch;patch=1 \
-	     file://sh3-linux-new-arch.patch;patch=1 \
-	     file://tail-obselete-fix.patch;patch=1 \
-	     file://tremor.patch;patch=1"
+SRC_URI += " file://mouse.patch \
+             file://gcc-4.x.x-accept.patch \
+	     file://sh3-linux-new-arch.patch \
+	     file://tail-obselete-fix.patch \
+	     file://tremor.patch"
 
 
 SRC_URI[md5sum] = "143dd7cfe0995922c49e1f8a6cdf2055"
diff --git a/recipes/scummvm/scummvm_0.9.0.bb b/recipes/scummvm/scummvm_0.9.0.bb
index c9d858ac0b..600e723908 100644
--- a/recipes/scummvm/scummvm_0.9.0.bb
+++ b/recipes/scummvm/scummvm_0.9.0.bb
@@ -1,7 +1,7 @@
 require scummvm.inc
 DEPENDS = "virtual/libsdl libvorbis libogg zlib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
-SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1"
+SRC_URI += "file://sh3-arch-0.9.0+.patch"
 
 EXTRA_OECONF += "--enable-lure \
 		 --enable-agi \
diff --git a/recipes/scummvm/scummvm_0.9.1.bb b/recipes/scummvm/scummvm_0.9.1.bb
index becc13170f..4901de234b 100644
--- a/recipes/scummvm/scummvm_0.9.1.bb
+++ b/recipes/scummvm/scummvm_0.9.1.bb
@@ -3,8 +3,8 @@ require scummvm.inc
 DEPENDS = "virtual/libsdl libvorbis libogg zlib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 
-SRC_URI += "file://makefile-nostrip.patch;patch=1 \
-            file://scummvm-targetcheck.patch;patch=1"
+SRC_URI += "file://makefile-nostrip.patch \
+            file://scummvm-targetcheck.patch"
 SRC_URI_append_openmoko = " file://openmoko-scummvm \
                            file://scummvm.desktop"
 
diff --git a/recipes/scummvm/scummvm_1.0.0.bb b/recipes/scummvm/scummvm_1.0.0.bb
index 20c06273a6..1c4a251678 100644
--- a/recipes/scummvm/scummvm_1.0.0.bb
+++ b/recipes/scummvm/scummvm_1.0.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libsdl libvorbis libogg zlib \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 
 SRC_URI += " file://scummvm.desktop \
-             file://no-strip.patch;patch=1 \
+             file://no-strip.patch \
            "
 
 SRC_URI_append_openmoko = " file://openmoko-scummvm "
diff --git a/recipes/sdcc/sdcc-native_2.5.0.bb b/recipes/sdcc/sdcc-native_2.5.0.bb
index 3b41c33930..69628d5223 100644
--- a/recipes/sdcc/sdcc-native_2.5.0.bb
+++ b/recipes/sdcc/sdcc-native_2.5.0.bb
@@ -4,7 +4,7 @@ DEPENDS = ""
 
 # don't need native-tools patch here
 SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-${PV}.tar.gz \
-           file://gcc4.patch;patch=1"
+           file://gcc4.patch"
 
 do_stage() {
 	oe_runmake install
diff --git a/recipes/sdcc/sdcc_2.5.0.bb b/recipes/sdcc/sdcc_2.5.0.bb
index 3a6fe2aefa..a9cd7912a2 100644
--- a/recipes/sdcc/sdcc_2.5.0.bb
+++ b/recipes/sdcc/sdcc_2.5.0.bb
@@ -6,8 +6,8 @@ DEPENDS = "sdcc-native"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-${PV}.tar.gz \
-           file://gcc4.patch;patch=1 \
-           file://use-native-tools.patch;patch=1"
+           file://gcc4.patch \
+           file://use-native-tools.patch"
 S = "${WORKDIR}/sdcc"
 
 PARALLEL_MAKE = ""
diff --git a/recipes/sdcc/sdcc_2.8.0.bb b/recipes/sdcc/sdcc_2.8.0.bb
index 8becd1fcb0..76fc1c876d 100644
--- a/recipes/sdcc/sdcc_2.8.0.bb
+++ b/recipes/sdcc/sdcc_2.8.0.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://sdcc.sourceforge.net"
 DEPENDS = "sdcc-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-src-${PV}.tar.bz2 \
-           file://use-native-tools.patch;patch=1"
+           file://use-native-tools.patch"
 
 S = "${WORKDIR}/sdcc"
 
diff --git a/recipes/sdlpango/sdlpango_0.1.2.bb b/recipes/sdlpango/sdlpango_0.1.2.bb
index e16856c21c..6613993b89 100644
--- a/recipes/sdlpango/sdlpango_0.1.2.bb
+++ b/recipes/sdlpango/sdlpango_0.1.2.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libsdl pango"
 PR="r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sdlpango/SDL_Pango-${PV}.tar.gz \
-	   file://SDL_Pango-0.1.2-API-adds.patch;patch=1;pnum=0 \
+	   file://SDL_Pango-0.1.2-API-adds.patch;striplevel=0 \
 	  "
 
 inherit autotools
diff --git a/recipes/sdr/dttsp_svn.bb b/recipes/sdr/dttsp_svn.bb
index ad6079fa3c..ac49779a76 100644
--- a/recipes/sdr/dttsp_svn.bb
+++ b/recipes/sdr/dttsp_svn.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "Software Radio Core"
 LICENSE = "GPLv3"
 DEPENDS = "fftwf jack"
 
-PV = "1.0.0+svnr${SRCPV}"
-PE = "1"
+PV = "${SRCREV}"
 SRCREV = "241"
 
 SRC_URI = "svn://206.216.146.154/svn/repos_sdr_linux/branches/ab2kt;module=dttsp-ng"
diff --git a/recipes/sdr/sdrshell_svn.bb b/recipes/sdr/sdrshell_svn.bb
index 30d7241f49..e5ceb13fa6 100644
--- a/recipes/sdr/sdrshell_svn.bb
+++ b/recipes/sdr/sdrshell_svn.bb
@@ -6,11 +6,10 @@ DEPENDS = "dttsp"
 inherit qmake qt3x11 
 
 SRCREV = "57"
-PV = "1.0.0+svnr${SRCPV}"
-PE = "1"
+PV = "${SRCREV}"
 
 SRC_URI = "svn://sdr-shell.googlecode.com/svn/branches;module=sdr-shell-v2;proto=http \
-           file://gcc-43-fix.patch;patch=1;pnum=0"
+           file://gcc-43-fix.patch;striplevel=0"
 S = "${WORKDIR}/sdr-shell-v2"
 
 PARALLEL_MAKE = ""
diff --git a/recipes/sed/sed_4.1.2.bb b/recipes/sed/sed_4.1.2.bb
index 5cfa531db3..474ae3041b 100644
--- a/recipes/sed/sed_4.1.2.bb
+++ b/recipes/sed/sed_4.1.2.bb
@@ -1,12 +1,12 @@
 LICENSE = "GPL"
 SECTION = "console/utils"
 DESCRIPTION = "sed is a Stream EDitor."
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz"
 S = "${WORKDIR}/sed-${PV}"
 
-inherit autotools
+inherit gettext autotools
 
 do_install () {
 	autotools_do_install
diff --git a/recipes/sed/sed_4.1.bb b/recipes/sed/sed_4.1.bb
index 7ef21645b3..cb3d83ad02 100644
--- a/recipes/sed/sed_4.1.bb
+++ b/recipes/sed/sed_4.1.bb
@@ -3,7 +3,7 @@ SECTION = "console/utils"
 DESCRIPTION = "sed is a Stream EDitor."
 
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \
-	   file://fchmod.patch;patch=1"
+	   file://fchmod.patch"
 S = "${WORKDIR}/sed-${PV}"
 
 inherit autotools
diff --git a/recipes/ser/ser_0.9.0.bb b/recipes/ser/ser_0.9.0.bb
index c92945b9f1..5605f4a38c 100644
--- a/recipes/ser/ser_0.9.0.bb
+++ b/recipes/ser/ser_0.9.0.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "flex"
 SRC_URI = "ftp://ftp.berlios.de/pub/ser/0.9.0/src/ser-${PV}_src.tar.gz \
 	file://init \
-	file://fix-sercfg.patch;patch=1"
+	file://fix-sercfg.patch"
 
 LDFLAGS_append = "-rdynamic"
 
diff --git a/recipes/servlet-api/jsp2.0_5.5.26.bb b/recipes/servlet-api/jsp2.0_5.5.26.bb
index 9c3a9c7257..562a5ca00e 100644
--- a/recipes/servlet-api/jsp2.0_5.5.26.bb
+++ b/recipes/servlet-api/jsp2.0_5.5.26.bb
@@ -26,7 +26,7 @@ addtask unpackpost after do_unpack before do_patch
 do_compile() {
   mkdir -p build
 
-  oe_makeclasspath cp -s servlet-api-2.4`
+  oe_makeclasspath cp -s servlet-api-2.4
   javac -sourcepath src/share -d build -cp $cp `find src/share/javax -name \*.java`
 
   # Copy extraneous files according to build.xml's compile task
diff --git a/recipes/setmixer/setmixer_27DEC94.bb b/recipes/setmixer/setmixer_27DEC94.bb
index 4ce1a141b4..06cb0d3ee0 100644
--- a/recipes/setmixer/setmixer_27DEC94.bb
+++ b/recipes/setmixer/setmixer_27DEC94.bb
@@ -3,8 +3,8 @@ LICENSE = "GPL"
 SECTION = "console/utils"
 PRIORITY = "optional"
 SRC_URI = "${DEBIAN_MIRROR}/main/s/setmixer/setmixer_${PV}.orig.tar.gz \
-	   file://setmixer.patch;patch=1"
-SRC_URI_append_mnci = " file://devfs.patch;patch=1"
+	   file://setmixer.patch"
+SRC_URI_append_mnci = " file://devfs.patch"
 
 S = "${WORKDIR}/${PN}-${PV}.orig"
 
diff --git a/recipes/setserial/setserial_2.17.bb b/recipes/setserial/setserial_2.17.bb
index 0156d573f2..8d1c554e4e 100644
--- a/recipes/setserial/setserial_2.17.bb
+++ b/recipes/setserial/setserial_2.17.bb
@@ -10,7 +10,7 @@ inherit autotools
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/setserial/${PN}-${PV}.tar.gz \
-  file://addflags.patch;patch=1 \
+  file://addflags.patch \
 "
 
 do_install() {
diff --git a/recipes/sg3-utils/sg3-utils_1.24.bb b/recipes/sg3-utils/sg3-utils_1.24.bb
index b5ada43573..d189233d38 100644
--- a/recipes/sg3-utils/sg3-utils_1.24.bb
+++ b/recipes/sg3-utils/sg3-utils_1.24.bb
@@ -9,7 +9,7 @@ PR = "r2"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/s/sg3-utils/sg3-utils_${PV}.orig.tar.gz \
-	file://Makefile-r1.patch;patch=1"
+	file://Makefile-r1.patch"
 
 S = "${WORKDIR}/sg3-utils-${PV}"
 
diff --git a/recipes/sgml-common/sgml-common_0.6.3.bb b/recipes/sgml-common/sgml-common_0.6.3.bb
index ed80312722..ea99f46a39 100644
--- a/recipes/sgml-common/sgml-common_0.6.3.bb
+++ b/recipes/sgml-common/sgml-common_0.6.3.bb
@@ -11,7 +11,7 @@ as defined by OASIS."
 FILES_sgml-common_append = " ${datadir}/sgml"
 
 SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-${PV}.tgz \
-	   file://autohell.patch;patch=1"
+	   file://autohell.patch"
 
 inherit autotools
 
diff --git a/recipes/sgmlspl/sgmlspl-native_1.03ii.bb b/recipes/sgmlspl/sgmlspl-native_1.03ii.bb
index 7f8b612b10..36bb3666d8 100644
--- a/recipes/sgmlspl/sgmlspl-native_1.03ii.bb
+++ b/recipes/sgmlspl/sgmlspl-native_1.03ii.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-${PV}.tar.gz \
-          file://combined.patch;patch=1"
+          file://combined.patch"
 
 S = "${WORKDIR}/SGMLSpm"
 
diff --git a/recipes/shadow/shadow.inc b/recipes/shadow/shadow.inc
index 30bd92f394..460930b22a 100644
--- a/recipes/shadow/shadow.inc
+++ b/recipes/shadow/shadow.inc
@@ -11,7 +11,9 @@ LICENSE = "BSD"
 SECTION = "base"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
-INC_PR = "r13"
+PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+
+INC_PR = "r14"
 
 # Additional Policy files for PAM
 PAM_SRC_URI = " \
@@ -90,8 +92,15 @@ do_install_append() {
   mv ${D}${bindir}/login ${D}${base_bindir}/login.${PN}
 
   # Ensure we add a suitable securetty file to the package that has most common embedded TTYs defined.
+  if [ ! -z "${SERIAL_CONSOLE}" ]; then
+  # our SERIAL_CONSOLE contains baud rate too and sometime -L option as well.
+  # the following pearl :) takes that and converts it into newline sepated tty's and appends
+  # them into securetty. So if a machine has a weird looking console device node (e.g. ttyAMA0) that securetty
+  # does not know then it will get appended to securetty and root login will be allowed on
+  # that console.
+    echo "${SERIAL_CONSOLE}" | sed -e 's/[0-9][0-9]\|\-L//g'|tr "[ ]" "[\n]"  >> ${WORKDIR}/securetty
+  fi
   install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty 
-
 }
 
 pkg_postinst_${PN} () {
diff --git a/recipes/shadow/shadow_4.1.4.2.bb b/recipes/shadow/shadow_4.1.4.2.bb
index 15752d6ee0..05b32791c8 100644
--- a/recipes/shadow/shadow_4.1.4.2.bb
+++ b/recipes/shadow/shadow_4.1.4.2.bb
@@ -1,6 +1,6 @@
 require shadow.inc
 
-SRC_URI += " file://shadow.automake-1.11.patch;patch=1"
+SRC_URI += " file://shadow.automake-1.11.patch"
 
 PR = "${INC_PR}.1"
 
diff --git a/recipes/sharp-binary-only/sharp-aticore-oss_1.0.1.bb b/recipes/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
index 26ee6b8274..c9182895cb 100644
--- a/recipes/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
+++ b/recipes/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
@@ -5,9 +5,9 @@ LICENSE = "CLOSED"
 PR = "r4"
 
 SRC_URI = "http://mirror1.pdaxrom.org/source/src/AtiCore-1.0.1.tar.bz2 \
-		file://fixstretchblit.patch;patch=1 \
-		file://aticore-2.6.patch;patch=1 \
-		file://make381.patch;patch=1"
+		file://fixstretchblit.patch \
+		file://aticore-2.6.patch \
+		file://make381.patch"
 S = "${WORKDIR}/AtiCore-1.0.1"
 
 EXTRA_OEMAKE="CC='${CC}' AS='${AS}' AR='${AR}' LD='${LD}' FPU='${TARGET_FPU}'"
diff --git a/recipes/sharp-binary-only/sharp-compat-libs_0.5.bb b/recipes/sharp-binary-only/sharp-compat-libs_0.5.bb
index 6cb7e69f02..9e637253af 100644
--- a/recipes/sharp-binary-only/sharp-compat-libs_0.5.bb
+++ b/recipes/sharp-binary-only/sharp-compat-libs_0.5.bb
@@ -14,8 +14,8 @@ EXCLUDE_FROM_SHLIBS = "1"
 COMPATIBLE_HOST = "arm.*-linux"
 
 SRC_URI = "http://openzaurus.org/mirror/oz-compat_0.5.tar.gz \
-	   file://hentges.patch;patch=1 \
-	   file://qt2310.patch;patch=1"
+	   file://hentges.patch \
+	   file://qt2310.patch"
 
 S = "${WORKDIR}/oz-compat-0.5"
 
diff --git a/recipes/shopper/shopper_1.2.1.bb b/recipes/shopper/shopper_1.2.1.bb
index a1cc531548..67a26d162e 100644
--- a/recipes/shopper/shopper_1.2.1.bb
+++ b/recipes/shopper/shopper_1.2.1.bb
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/zaurus-shopper/Shopper-${PV}.tar.gz \
-           file://gcc3.patch;patch=1 \
-           file://path_fix.patch;patch=1"
+           file://gcc3.patch \
+           file://path_fix.patch"
 S = "${WORKDIR}/Shopper"
 
 inherit palmtop
diff --git a/recipes/shorewall/shorewall_2.0.9.bb b/recipes/shorewall/shorewall_2.0.9.bb
index dd64fb4a39..def9603c69 100644
--- a/recipes/shorewall/shorewall_2.0.9.bb
+++ b/recipes/shorewall/shorewall_2.0.9.bb
@@ -9,8 +9,8 @@ RDEPENDS = "iptables"
 RRECOMMENDS = "kernel-module-ip-tables kernel-module-ip-conntrack kernel-module-ipt-conntrack kernel-module-ipt-multiport kernel-module-ipt-log kernel-module-ipt-mac kernel-module-ipt-mark kernel-module-ipt-masquerade kernel-module-ipt-pkttype kernel-module-ipt-reject kernel-module-ipt-state kernel-module-ipt-tos kernel-module-iptable-filter kernel-module-iptable-mangle kernel-module-iptable-nat"
 
 SRC_URI = "http://www.shorewall.net/pub/shorewall/2.0/shorewall-2.0.9/shorewall-2.0.9.tgz \
-	file://install-no-chown.diff;patch=1;pnum=0"
-SRC_URI_append_nylon = " file://shorewall-conf-nylon.diff;patch=1"
+	file://install-no-chown.diff;striplevel=0"
+SRC_URI_append_nylon = " file://shorewall-conf-nylon.diff"
 
 do_install() {
 	export PREFIX=${D}
diff --git a/recipes/shr/e-wm-config-illume2-shr_git.bb b/recipes/shr/e-wm-config-illume2-shr_git.bb
index 7f978eb97d..0716c4e705 100644
--- a/recipes/shr/e-wm-config-illume2-shr_git.bb
+++ b/recipes/shr/e-wm-config-illume2-shr_git.bb
@@ -3,7 +3,7 @@ SECTION = "e/utils"
 DEPENDS = "eet"
 LICENSE = "MIT BSD"
 RDEPENDS = "shr-e-gadgets"
-SRCREV = "1b6bd24e828455f56c26b2f5cbbf2d16838cace8"
+SRCREV = "1247d22a007435a58f0967189fc92db2931b31cb"
 PV = "1.2+gitr${SRCPV}"
 
 inherit e
diff --git a/recipes/shr/frameworkd-config-shr_git.bb b/recipes/shr/frameworkd-config-shr_git.bb
index b5638e3f79..096297453b 100644
--- a/recipes/shr/frameworkd-config-shr_git.bb
+++ b/recipes/shr/frameworkd-config-shr_git.bb
@@ -5,12 +5,12 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 
-SRCREV_pn-frameworkd-config-shr_FSO_REV ?= "f751f2724eea23d0ca050bdf2672f9011ae09517"
-SRCREV_pn-frameworkd-config-shr_SHR_REV ?= "3d81d813c8c65a5fa4c2ff912f18489af583a47d"
+SRCREV_pn-frameworkd-config-shr_FSO_REV ?= "cfc0a5c3def2dc2556c86f3dad182181124de006"
+SRCREV_pn-frameworkd-config-shr_SHR_REV ?= "8ba6f1545068399060483017451261e9b3c70d4a"
 
 SRCREV_FORMAT = "FSO_REV-SHR_REV"
 PV = "0.9.5.9+gitr${SRCPV}"
-PR = "r8"
+PR = "r10"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master;name=FSO_REV \
            git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master;name=SHR_REV"
@@ -27,16 +27,12 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/
 	install -d ${D}${sysconfdir}/freesmartphone/opreferences/conf/rules/
 	install -d ${D}${sysconfdir}/freesmartphone/oevents/
-	install -d ${D}${sysconfdir}/freesmartphone/ogsmd/
 	install -d ${D}${sysconfdir}/freesmartphone/persist/
         install -d ${D}${sysconfdir}/freesmartphone/opim/
 	install -m 0644 ${S}/etc/freesmartphone/opreferences/schema/phone.yaml ${D}${sysconfdir}/freesmartphone/opreferences/schema/
 	install -m 0644 ${S}/etc/freesmartphone/opreferences/schema/profiles.yaml ${D}${sysconfdir}/freesmartphone/opreferences/schema/
 	install -m 0644 ${S}/etc/freesmartphone/opreferences/schema/rules.yaml ${D}${sysconfdir}/freesmartphone/opreferences/schema/
 	install -m 0644 ${S}/etc/freesmartphone/persist/README ${D}${sysconfdir}/freesmartphone/persist/
-	install -m 0644 ${S}/etc/freesmartphone/ogsmd/networks.tab ${D}${sysconfdir}/freesmartphone/ogsmd/
-        install -m 0644 ${S}/etc/freesmartphone/ogsmd/cell.db ${D}${sysconfdir}/freesmartphone/ogsmd/
-        install -m 0644 ${S}/etc/freesmartphone/ogsmd/la.db ${D}${sysconfdir}/freesmartphone/ogsmd/
 
 	#Check for machine specific conf.
         CONF_PATH_MACHINE="${CONF_PATH}"
@@ -66,10 +62,6 @@ do_install_append() {
 
 PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
 
-# machine specific stuff, should ideally be elsewhere
-# - recommend MUXer on platforms that require one
-RDEPENDS_${PN}_append_om-gta01 = " fso-abyss"
-RDEPENDS_${PN}_append_om-gta02 = " fso-abyss"
 # - add wmiconfig for wireless configuration
 RDEPENDS_${PN}_append_om-gta02 = " wmiconfig"
 
@@ -86,5 +78,4 @@ CONFFILES_${PN} = "\
   ${sysconfdir}/freesmartphone/opreferences/conf/rules/silent.yaml \
   ${sysconfdir}/freesmartphone/opreferences/conf/rules/default.yaml \
   ${sysconfdir}/freesmartphone/oevents/rules.yaml \
-  ${sysconfdir}/freesmartphone/ogsmd/networks.tab \
 "
diff --git a/recipes/shr/initscripts-shr_0.0.1.bb b/recipes/shr/initscripts-shr_0.0.1.bb
index ac7d83f96b..343f9cc5a3 100644
--- a/recipes/shr/initscripts-shr_0.0.1.bb
+++ b/recipes/shr/initscripts-shr_0.0.1.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "SHR init scripts"
 SECTION = "base"
 PRIORITY = "required"
 DEPENDS = ""
-RDEPENDS = ""
+RDEPENDS_${PN} = "procps"
 LICENSE = "GPL"
 PV = "0.0.1"
-PR = "r15"
+PR = "r16"
 
 RPROVIDES_${PN} = "initscripts"
 RCONFLICTS_${PN} = "initscripts"
diff --git a/recipes/shr/libphone-ui-shr_git.bb b/recipes/shr/libphone-ui-shr_git.bb
index 627b9fb9e9..d54b46e809 100644
--- a/recipes/shr/libphone-ui-shr_git.bb
+++ b/recipes/shr/libphone-ui-shr_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "SHR default module for the Phone UI daemon"
 SECTION = "e/apps"
-DEPENDS += " dbus-glib libframeworkd-glib libphone-ui evas ecore edje edje-native elementary"
-SRCREV = "b5322e28774e49f5cdfdb8fbfe985d35f86bc0d1"
+DEPENDS += " dbus-glib libframeworkd-glib libfsoframework libphone-ui evas ecore edje edje-native elementary"
+SRCREV = "29f50f4482feec132e30c075e7c2a36ce09d3638"
 PV = "0.0.0+gitr${SRCPV}"
 PR = "r5"
 
diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb
index 89dfab0468..da87e7280e 100644
--- a/recipes/shr/libphone-ui_git.bb
+++ b/recipes/shr/libphone-ui_git.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "A generic framework for phone ui"
 HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "libs"
-SRCREV = "1e5b5bb3cb8de11a068ca43e20b9481c51e7a26f"
+SRCREV = "2a87a548f004d7e7c7a45cdca5816b552e2b1796"
 PV = "0.0.0+gitr${SRCPV}"
 PR = "r0"
 
-DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils alsa-lib"
+DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libfso-glib libfsoframework libphone-utils alsa-lib"
 
 inherit pkgconfig autotools autotools_stage
 
diff --git a/recipes/shr/phonefsod_git.bb b/recipes/shr/phonefsod_git.bb
index 66cfd12049..c0d9fcfcd1 100644
--- a/recipes/shr/phonefsod_git.bb
+++ b/recipes/shr/phonefsod_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += " dbus-glib libframeworkd-glib sqlite3 shr-specs"
-SRCREV = "de3eab1df1682cb41abfd105bb6767fedfbbf7b4"
+SRCREV = "c01f2eb0eb79d5d5581ab35f2dbd1c3b3979439b"
 PV = "0.0.0+gitr${SRCPV}"
 PR = "r4"
 
diff --git a/recipes/shr/phoneui-shr-theme-neo_git.bb b/recipes/shr/phoneui-shr-theme-neo_git.bb
index 3efa82b3fa..ffe5c66bcc 100644
--- a/recipes/shr/phoneui-shr-theme-neo_git.bb
+++ b/recipes/shr/phoneui-shr-theme-neo_git.bb
@@ -6,7 +6,7 @@ LICENSE = "unknown"
 DEPENDS = "edje-native"
 RDEPENDS = "libphone-ui-shr"
 RSUGGESTS = "e-wm-theme-illume-neo gtk-theme-neo icon-theme-neo elementary-theme-neo"
-SRCREV = "df522dfc585fc0ad83e7164f451d15fb770c524b"
+SRCREV = "20e5e82819a7612aa31c753a6898ccc9e940c7c6"
 PV = "0.1+gitr${SRCPV}"
 PR = "r0"
 
diff --git a/recipes/shr/phoneui-shr-theme-o2_git.bb b/recipes/shr/phoneui-shr-theme-o2_git.bb
index a30a7952fa..06303bbb85 100644
--- a/recipes/shr/phoneui-shr-theme-o2_git.bb
+++ b/recipes/shr/phoneui-shr-theme-o2_git.bb
@@ -6,7 +6,7 @@ LICENSE = "unknown"
 DEPENDS = "edje-native"
 RDEPENDS = "libphone-ui-shr"
 RSUGGESTS = "elementary-theme-o2"
-SRCREV = "5093da3ca27bb50388ac3277d8685a38772d7f48"
+SRCREV = "20e5e82819a7612aa31c753a6898ccc9e940c7c6"
 PV = "0.1+gitr${SRCPV}"
 PR = "r0"
 
diff --git a/recipes/shr/phoneuid_git.bb b/recipes/shr/phoneuid_git.bb
index e188f30bbc..d26af86ff9 100644
--- a/recipes/shr/phoneuid_git.bb
+++ b/recipes/shr/phoneuid_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += " dbus-glib libframeworkd-glib libphone-ui sqlite3 shr-specs"
-SRCREV = "30e063783b4b3fe5a411e7739d76dc85129452aa"
+SRCREV = "ba69e4ed25e10cf47a3d9a9b69fcbda58a5c87cd"
 PV = "0.0.0+gitr${SRCPV}"
 PR = "r6"
 
diff --git a/recipes/shr/shr-e-gadgets_git.bb b/recipes/shr/shr-e-gadgets_git.bb
index f5b367592f..bb4944bcd4 100644
--- a/recipes/shr/shr-e-gadgets_git.bb
+++ b/recipes/shr/shr-e-gadgets_git.bb
@@ -5,7 +5,7 @@ DEPENDS = "e-wm"
 RDEPENDS = "e-wm"
 SECTION = "x11/application"
 
-SRCREV = "c23dda5f81ed3c6d785617696fb009adb5594a55"
+SRCREV = "6480322a8a419e8cbe4af5e627661ff03f56ed18"
 PV = "0.0.0+gitr${SRCPV}"
 
 inherit autotools
@@ -14,6 +14,12 @@ SRC_URI = "git://git.shr-project.org/repo/shr-e-gadgets.git;protocol=http;branch
 S = "${WORKDIR}/git"
 
 FILES_${PN} += "\
-	${libdir}/enlightenment/modules/*/*.* \
-	${libdir}/enlightenment/modules/*/*/* \
+	${datadir}/shr_elm_softkey \
+	${libdir}/enlightenment/modules/*/*.desktop \
+	${libdir}/enlightenment/modules/*/*.edj \
+	${libdir}/enlightenment/modules/*/*/*.so \
 "
+FILES_${PN}-static += "${libdir}/enlightenment/modules/*/*/*.a"
+FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.la"
+FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug"
+
diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb
index e8e260fa91..e1e140a56b 100644
--- a/recipes/shr/shr-launcher_svn.bb
+++ b/recipes/shr/shr-launcher_svn.bb
@@ -4,7 +4,7 @@ AUTHOR = "cchandel"
 LICENSE = "GPLv2"
 SECTION = "e/apps"
 DEPENDS = "elementary eina edbus"
-SRCREV = "103"
+SRCREV = "105"
 PV = "0.0.1+svnr${SRCPV}"
 PR = "r5"
 
@@ -20,6 +20,7 @@ do_install_append() {
         install -d "${D}/${datadir}/applications"
         install -m 0644 "${S}/resources/launcher.desktop" "${D}/${datadir}/applications"
         install -d "${D}/${datadir}/launcher"
+        install -m 0644 "${S}/resources/launcher.edj" "${D}/${datadir}/launcher"
         for ico in "${S}/resources/"*.png; do
                 if [ "$(basename $ico)" != "launcher.png" ]; then
                         install -m 0644 $ico "${D}/${datadir}/launcher"
diff --git a/recipes/images/shr-image/etc/profile.d/elementary.sh b/recipes/shr/shr-settings/elementary.sh
index da435964a7..e215cbdfea 100755..100644
--- a/recipes/images/shr-image/etc/profile.d/elementary.sh
+++ b/recipes/shr/shr-settings/elementary.sh
@@ -1,4 +1,4 @@
 export ELM_ENGINE=x11
-export ELM_THEME=default
+export ELM_THEME=gry
 export ELM_SCALE=2
 export ELM_FINGER_SIZE=70
diff --git a/recipes/shr/shr-settings_git.bb b/recipes/shr/shr-settings_git.bb
index 2da6b75631..a75167451d 100644
--- a/recipes/shr/shr-settings_git.bb
+++ b/recipes/shr/shr-settings_git.bb
@@ -4,10 +4,10 @@ SHR_RELEASE ?= "shr"
 LICENSE ?= "GPL"
 RDEPENDS = "python-elementary python-dbus python-codecs python-shell python-pyrtc python python-core python-edbus dbus-x11 frameworkd python-phoneutils python-pexpect"
 SECTION = "x11/application"
-SRCREV = "dec4e519308b87b4acf23c605d7f2a75b75e7ba6"
+SRCREV = "b6de5ae2e6b73821614f9cea4a1334a3415d60c4"
 PE = "1"
 PV = "0.1.1+gitr${SRCPV}"
-PR = "r9"
+PR = "r11"
 
 inherit setuptools
 
@@ -21,15 +21,30 @@ RRECOMMENDS_${PN} = "\
   ${PN}-backup-configuration \
 "
 
+do_configure_append_shr() {
+  # change category because EFL_SRCREV 48174 (separate Home module) changes
+  # Efreet_Desktop filtering from "sys AND settings OR kbd" to "sys OR settings OR kbd"
+
+  sed -i "s#Categories=Settings;#Categories=Utility;#g" ${S}/data/shr-settings.desktop
+}
+
+do_install_append() {
+  install -d ${D}/${sysconfdir}/profile.d/
+  install -m 0755 "${WORKDIR}/elementary.sh" "${D}/${sysconfdir}/profile.d/elementary.sh"
+}
+
 PACKAGE_ARCH_${PN}-addons-illume = "all"
 PACKAGE_ARCH_${PN}-backup-configuration = "all"
 
-SRC_URI = "git://git.shr-project.org/repo/shr-settings.git;protocol=http;branch=master"
+SRC_URI = "git://git.shr-project.org/repo/shr-settings.git;protocol=http;branch=master \
+           file://elementary.sh"
 S = "${WORKDIR}/git"
+FILES_${PN} += "${sysconfdir}/profile.d/elementary.sh"
 FILES_${PN} += "${prefix}/share/pixmaps"
 FILES_${PN} += "${prefix}/share/applications"
 FILES_${PN}-addons-illume = "${prefix}/share/applications/shr-settings-addons-illume"
 FILES_${PN}-backup-configuration = "${sysconfdir}/shr-settings/"
+CONFFILES_${PN} = "${sysconfdir}/profile.d/elementary.sh"
 CONFFILES_${PN}-backup-configuration = "\
   ${sysconfdir}/shr-settings/backup.conf \
   ${sysconfdir}/shr-settings/backup.blacklist \
diff --git a/recipes/shr/shr-specs_git.bb b/recipes/shr/shr-specs_git.bb
index d257b2602f..463849db67 100644
--- a/recipes/shr/shr-specs_git.bb
+++ b/recipes/shr/shr-specs_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The SHR DBus API Specification"
 HOMEPAGE = "http://shr-project.org/"
 LICENSE = "BSD"
 SECTION = "devel/specifications"
-SRCREV = "d8f0dc85f1a7a6c0c6d24755f3770a55229621ae"
+SRCREV = "53ad1e858eb85eeb3d7c32e7402e93264072e347"
 PV = "0.0.0+gitr${SRCPV}"
 PR = "r0"
 
diff --git a/recipes/shr/shr-version.bb b/recipes/shr/shr-version.bb
new file mode 100644
index 0000000000..26618aa5cc
--- /dev/null
+++ b/recipes/shr/shr-version.bb
@@ -0,0 +1,16 @@
+LICENSE = "MIT"
+
+PV = "1.0${DISTRO_VERSION}"
+
+PACKAGES = "${PN}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+export METADATA_REVISION
+export METADATA_BRANCH
+
+do_install() {
+	mkdir -p ${D}${sysconfdir}
+	echo "SHR ${DISTRO_VERSION}" > ${D}${sysconfdir}/shr-version
+	echo "Built from branch: ${METADATA_BRANCH}" >> ${D}${sysconfdir}/shr-version
+	echo "Revision: ${METADATA_REVISION}" >> ${D}${sysconfdir}/shr-version
+}
diff --git a/recipes/sidplayer/sidplayer_1.5.0.bb b/recipes/sidplayer/sidplayer_1.5.0.bb
index 0610650792..d617ca82c4 100644
--- a/recipes/sidplayer/sidplayer_1.5.0.bb
+++ b/recipes/sidplayer/sidplayer_1.5.0.bb
@@ -7,9 +7,9 @@ DEPENDS = "libsidplay"
 PR = "r1"
 
 SRC_URI = "http://sidplayer.sourceforge.net/sidplayer.tar.gz \
-           file://use-external-libsidplay.patch;patch=1 \
-           file://gcc3.patch;patch=1 \
-	   file://gcc34.patch;patch=1"
+           file://use-external-libsidplay.patch \
+           file://gcc3.patch \
+	   file://gcc34.patch"
 S = "${WORKDIR}/sidplayer"
 
 EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/sidplay"
diff --git a/recipes/silo/silo_1.4.8.bb b/recipes/silo/silo_1.4.8.bb
index d3372276d9..513c9d42c0 100644
--- a/recipes/silo/silo_1.4.8.bb
+++ b/recipes/silo/silo_1.4.8.bb
@@ -3,7 +3,7 @@ SECTION = "unknown"
 DEPENDS = "elftoaout-native"
 
 SRC_URI = "http://www.sparc-boot.org/pub/silo/silo-${PV}.tar.bz2 \
-	file://cross.patch;patch=1"
+	file://cross.patch"
 
 do_compile() {
 	oe_runmake CC="${CC} -m32" LD="${LD}" HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" OECFLAGS="${CFLAGS}" OELDFLAGS="-L${STAGING_LIBDIR} -rpath-link ${STAGING_LIBDIR}" NM="${TARGET_SYS}-nm"
diff --git a/recipes/simh/simh_3.7-1.bb b/recipes/simh/simh_3.7-1.bb
index 2fe53a910e..c1b73caee4 100644
--- a/recipes/simh/simh_3.7-1.bb
+++ b/recipes/simh/simh_3.7-1.bb
@@ -7,7 +7,7 @@ PR = "r0"
 
 URIPV = "${@bb.data.getVar('PV',d,1).replace('.','')}"
 SRC_URI = "http://simh.trailing-edge.com/sources/simhv${URIPV}.zip \
-        file://makefile.patch;patch=1"
+        file://makefile.patch"
 S = "${WORKDIR}/${PN}-${PV}"
 
 python do_unpack() {
diff --git a/recipes/siproxd/siproxd_0.7.1.bb b/recipes/siproxd/siproxd_0.7.1.bb
index bedbc4e57c..d3b02b20a9 100644
--- a/recipes/siproxd/siproxd_0.7.1.bb
+++ b/recipes/siproxd/siproxd_0.7.1.bb
@@ -1,6 +1,6 @@
 require siproxd.inc
 
-SRC_URI += "file://no-docs.patch;patch=1"
+SRC_URI += "file://no-docs.patch"
 
 SRC_URI[md5sum] = "45e5a44803181e2bf3361d562060c904"
 SRC_URI[sha256sum] = "5eef70f4e0a8f0f4628550807da3036f8b3086864bf4bcf5ab6d22ac3a6efd81"
diff --git a/recipes/sipsak/sipsak_0.9.6.bb b/recipes/sipsak/sipsak_0.9.6.bb
index 56ad9b55f9..f6320897a3 100644
--- a/recipes/sipsak/sipsak_0.9.6.bb
+++ b/recipes/sipsak/sipsak_0.9.6.bb
@@ -4,7 +4,7 @@ HOMEPAGE="sipsak.org"
 LICENSE = "GPLv2"
 PR = "r1"
 SRC_URI = "http://download.berlios.de/sipsak/sipsak-${PV}-1.tar.gz\
-           file://sipsak.patch;patch=1"
+           file://sipsak.patch"
 
 inherit autotools
 
diff --git a/recipes/skippy/skippy-xd_0.5.0.bb b/recipes/skippy/skippy-xd_0.5.0.bb
index 8333645b7e..d09bb2110f 100644
--- a/recipes/skippy/skippy-xd_0.5.0.bb
+++ b/recipes/skippy/skippy-xd_0.5.0.bb
@@ -6,8 +6,8 @@ DEPENDS = "virtual/xserver libxdamage libxcomposite"
 inherit pkgconfig
 
 SRC_URI = "http://thegraveyard.org/files/${PN}-${PV}.tar.bz2 \
-           file://fix-makefile.patch;patch=1 \
-           file://event_base.patch;patch=1"
+           file://fix-makefile.patch \
+           file://event_base.patch"
 
 EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR_TARGET}${layout_prefix}' PKG_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config'"
 CFLAGS_append = " -I${STAGING_INCDIR}/X11"
diff --git a/recipes/sl/sl_3.03.bb b/recipes/sl/sl_3.03.bb
index 683afd3642..5fe3ce1515 100644
--- a/recipes/sl/sl_3.03.bb
+++ b/recipes/sl/sl_3.03.bb
@@ -4,7 +4,7 @@ LICENSE = "unknown"
 DEPENDS = "ncurses"
 
 SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/s/sl/sl_3.03.orig.tar.gz;name=archive \
-           http://archive.ubuntu.com/ubuntu/pool/universe/s/sl/sl_3.03-14.diff.gz;patch=1;name=patch"
+           http://archive.ubuntu.com/ubuntu/pool/universe/s/sl/sl_3.03-14.diff.gz;name=patch"
 
 S = "${WORKDIR}/${P}.orig"
 
diff --git a/recipes/slang/slang_1.4.9.bb b/recipes/slang/slang_1.4.9.bb
index 95d3693fd3..0cc1d6f56d 100644
--- a/recipes/slang/slang_1.4.9.bb
+++ b/recipes/slang/slang_1.4.9.bb
@@ -4,8 +4,8 @@ PRIORITY = "optional"
 PR = "r1"
 LICENSE = "GPL Artistic"
 SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v1.4/slang-${PV}.tar.bz2 \
-           file://configure.patch;patch=1 \
-           file://Makefile.patch;patch=1"
+           file://configure.patch \
+           file://Makefile.patch"
 inherit autotools
 
 acpaths = "-I ${S}/autoconf"
diff --git a/recipes/slrn/slrn_0.9.8.0.bb b/recipes/slrn/slrn_0.9.8.0.bb
index 1000e1db7d..08a6cd9457 100644
--- a/recipes/slrn/slrn_0.9.8.0.bb
+++ b/recipes/slrn/slrn_0.9.8.0.bb
@@ -6,8 +6,8 @@ DEPENDS = "slang"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/slrn/slrn-${PV}.tar.bz2 \
-	   file://m4.patch;patch=1 \
-	   file://chkslang.patch;patch=1"
+	   file://m4.patch \
+	   file://chkslang.patch"
 
 inherit autotools
 
diff --git a/recipes/slugtool/slugtool.bb b/recipes/slugtool/slugtool.bb
index f6d48aa641..4011105769 100644
--- a/recipes/slugtool/slugtool.bb
+++ b/recipes/slugtool/slugtool.bb
@@ -4,7 +4,7 @@ flash images for the Linksys NSLU2 device."
 PR = "r1"
 LICENSE = "GPL"
 SRC_URI = "http://www.lantz.com/filemgmt_data/files/slugtool.tar.gz \
-	   file://redboot_typo.patch;patch=1"
+	   file://redboot_typo.patch"
 S = "${WORKDIR}"
 
 do_compile () {
diff --git a/recipes/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb b/recipes/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
index af849a7778..0fac6318a8 100644
--- a/recipes/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
+++ b/recipes/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
@@ -6,8 +6,8 @@ DEPENDS = "virtual/libsdl"
 PROVIDES = "smpeg"
 
 SRC_URI = "cvs://anonymous:anonymous@cvs.icculus.org/cvs/cvsroot;module=smpeg;date=20040311 \
-	   file://m4.patch;patch=1 \
-	   file://compile.patch;patch=1"
+	   file://m4.patch \
+	   file://compile.patch"
 S = "${WORKDIR}/smpeg"
 
 inherit autotools
diff --git a/recipes/snes232/snes232_cvs.bb b/recipes/snes232/snes232_cvs.bb
index 1424f86dfe..1afde81367 100644
--- a/recipes/snes232/snes232_cvs.bb
+++ b/recipes/snes232/snes232_cvs.bb
@@ -1,12 +1,12 @@
 SECTION = "unknown"
 PR = "r4"
 LICENSE = "GPL"
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 RRECOMMENDS = "kernel-module-serport"
 
 SRC_URI = "${HANDHELDS_CVS};module=gpe/games/snes232 \
-	file://snes232-2.6.patch;patch=1;pnum=0 \
+	file://snes232-2.6.patch;striplevel=0 \
 	file://Makefile-2.6"
 
 S = "${WORKDIR}/snes232"
diff --git a/recipes/snes9x/snes9x-sdl-qpe_1.39.bb b/recipes/snes9x/snes9x-sdl-qpe_1.39.bb
index 25acb416e0..19c28c1788 100644
--- a/recipes/snes9x/snes9x-sdl-qpe_1.39.bb
+++ b/recipes/snes9x/snes9x-sdl-qpe_1.39.bb
@@ -6,7 +6,7 @@ LICENSE = "snes9x"
 PR = "r4"
 
 SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \
-	   file://compile.patch;patch=1"
+	   file://compile.patch"
 S = "${WORKDIR}/snes9x-sdl-${PV}"
 
 FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}:${FILE_DIRNAME}/snes9x-sdl-${PV}:${FILE_DIRNAME}/snes9x-sdl:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
diff --git a/recipes/snes9x/snes9x-sdl_1.39.bb b/recipes/snes9x/snes9x-sdl_1.39.bb
index 1390d0b03d..df712f5905 100644
--- a/recipes/snes9x/snes9x-sdl_1.39.bb
+++ b/recipes/snes9x/snes9x-sdl_1.39.bb
@@ -6,8 +6,8 @@ LICENSE = "snes9x"
 PR = "r3"
 
 SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \
-	   file://compile.patch;patch=1 \
-	   file://gcc-4.1.patch;patch=1"
+	   file://compile.patch \
+	   file://gcc-4.1.patch"
 S = "${WORKDIR}/snes9x-sdl-${PV}"
 
 do_compile() {
diff --git a/recipes/snes9x/snes9x_1.43-WIP1.bb b/recipes/snes9x/snes9x_1.43-WIP1.bb
index 07f68ddd3d..1b9091c672 100644
--- a/recipes/snes9x/snes9x_1.43-WIP1.bb
+++ b/recipes/snes9x/snes9x_1.43-WIP1.bb
@@ -6,11 +6,11 @@ DEPENDS_append_i686 = " nasm-native"
 RDEPENDS_epia = "kernel-module-joydev"
 
 SRC_URI = "http://www.lysator.liu.se/snes9x/1.43-WIP1/snes9x-1.43-WIP1-src.tar.gz \
-	file://makefile.patch;patch=1;pnum=2 \
-	file://private.patch;patch=1;pnum=0 \
-	file://64bit.patch;patch=1 \
-        file://configure.patch;patch=1;pnum=0 \
-        file://linkage.patch;patch=1;pnum=0"
+	file://makefile.patch;striplevel=2 \
+	file://private.patch;striplevel=0 \
+	file://64bit.patch \
+        file://configure.patch;striplevel=0 \
+        file://linkage.patch;striplevel=0"
 
 S = "${WORKDIR}/snes9x-1.43-dev-src/snes9x"
 
diff --git a/recipes/snort/snort_2.8.5.3.bb b/recipes/snort/snort_2.8.5.3.bb
index f72b8b30aa..ca9130f650 100644
--- a/recipes/snort/snort_2.8.5.3.bb
+++ b/recipes/snort/snort_2.8.5.3.bb
@@ -7,7 +7,7 @@ RDEPENDS = "libpcap libnet libpcre barnyard"
 PR = "r1"
 
 SRC_URI = " http://dl.snort.org/snort-current/${P}.tar.gz;name=tarball \
-            file://snort.fix.configure.in.HACK;patch=1 \
+            file://snort.fix.configure.in.HACK;apply=yes \
           "
 SRC_URI[tarball.md5sum] = "ef02aaad54746603f2cb3236fe962128"
 SRC_URI[tarball.sha256sum] = "a7d9eb16427514d00926e9892c4a92b6ff1fd0f79555d8f8dce91dfa14112e6a"
diff --git a/recipes/socat/socat_1.7.1.2.bb b/recipes/socat/socat_1.7.1.2.bb
index 0a2ab544ad..e3accb6377 100644
--- a/recipes/socat/socat_1.7.1.2.bb
+++ b/recipes/socat/socat_1.7.1.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2;name=src \
-           file://compile.patch;patch=1"
+           file://compile.patch"
 SRC_URI[src.md5sum] = "9c0c5e83ce665f38d4d3aababad275eb"
 SRC_URI[src.sha256sum] = "f7395b154914bdaa49805603aac2a90fb3d60255f95691d7779ab4680615e167"
 EXTRA_OECONF = " --disable-termios "
diff --git a/recipes/socketcan/socketcan-utils-test_svn.bb b/recipes/socketcan/socketcan-utils-test_svn.bb
index ca4c23a501..e04c3c2e4f 100644
--- a/recipes/socketcan/socketcan-utils-test_svn.bb
+++ b/recipes/socketcan/socketcan-utils-test_svn.bb
@@ -7,7 +7,7 @@ SRCREV = "917"
 PV = "0.0+svnr${SRCPV}"
 
 SRC_URI = "svn://svn.berlios.de/socketcan;module=trunk;proto=svn \
-           file://autotoolize.patch;patch=1;pnum=0 \
+           file://autotoolize.patch;striplevel=0 \
           "
 
 S = "${WORKDIR}/trunk"
diff --git a/recipes/sox/sox_12.17.5.bb b/recipes/sox/sox_12.17.5.bb
index f98c482552..2ac22f2d90 100644
--- a/recipes/sox/sox_12.17.5.bb
+++ b/recipes/sox/sox_12.17.5.bb
@@ -9,7 +9,7 @@ LICENSE="GPL"
 HOMEPAGE="http://sox.sourceforge.net"
 
 SRC_URI="${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz; \
-	file://uclibc-fixes.patch;patch=1"
+	file://uclibc-fixes.patch"
 
 inherit autotools
 
diff --git a/recipes/sox/sox_13.0.0.bb b/recipes/sox/sox_13.0.0.bb
index 514a1f46fa..39e04172f6 100644
--- a/recipes/sox/sox_13.0.0.bb
+++ b/recipes/sox/sox_13.0.0.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \
-         file://src-Makefile.am.patch;patch=1"
+         file://src-Makefile.am.patch"
 
 inherit autotools
 
diff --git a/recipes/spamassassin/spamassassin_3.3.1.bb b/recipes/spamassassin/spamassassin_3.3.1.bb
index 057891de98..77ec567bf1 100644
--- a/recipes/spamassassin/spamassassin_3.3.1.bb
+++ b/recipes/spamassassin/spamassassin_3.3.1.bb
@@ -85,14 +85,14 @@ SRC_URI = " \
 	${APACHE_MIRROR}/spamassassin/source/Mail-SpamAssassin-${PV}.tar.bz2;name=spamassassin-${PV} \
 	file://spamassassin.default \
 	file://spamassassin.init \
-	file://10_change_config_paths;patch=1 \
-	file://20_edit_spamc_pod;patch=1 \
-	file://30_edit_README;patch=1 \
-	file://50_sa-learn_fix_empty_list_handling;patch=1 \
-	file://60_fix-pod;patch=1 \
-	file://70_fix-whatis;patch=1 \
-	file://80_fix_man_warnings;patch=1 \
-	file://spamassassin-spamc-configure.patch;patch=1 \
+	file://10_change_config_paths;apply=yes \
+	file://20_edit_spamc_pod;apply=yes \
+	file://30_edit_README;apply=yes \
+	file://50_sa-learn_fix_empty_list_handling;apply=yes \
+	file://60_fix-pod;apply=yes \
+	file://70_fix-whatis;apply=yes \
+	file://80_fix_man_warnings;apply=yes \
+	file://spamassassin-spamc-configure.patch \
 	"
 SRC_URI[spamassassin-3.3.1.md5sum] = "bb977900c3b2627db13e9f44f9b5bfc8"
 SRC_URI[spamassassin-3.3.1.sha256sum] = "4c348cd951fc2c5688e9713fcbc6ba453df51d32a1ab332a63800d20ff18bdb4"
diff --git a/recipes/sparse/sparse_snapshot.bb b/recipes/sparse/sparse_snapshot.bb
index 03503fecdd..4485e62ac3 100644
--- a/recipes/sparse/sparse_snapshot.bb
+++ b/recipes/sparse/sparse_snapshot.bb
@@ -15,8 +15,8 @@ preprocessor (although it contains as a part of it a preprocessing phase)."
 PV = "0.0+${SRCDATE}"
 LICENSE = "OSL"
 SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/sparse/sparse-${@get_snapshot_date(d)}.tar.gz \
-	   file://compile.patch;patch=1 \
-	   file://vars.patch;patch=1"
+	   file://compile.patch \
+	   file://vars.patch"
 S = "${WORKDIR}/sparse-bk"
 
 do_install () {
diff --git a/recipes/spca5xx/spca5xx_20060501.bb b/recipes/spca5xx/spca5xx_20060501.bb
index 314271bd1a..550e0fcb32 100644
--- a/recipes/spca5xx/spca5xx_20060501.bb
+++ b/recipes/spca5xx/spca5xx_20060501.bb
@@ -5,7 +5,7 @@ SECTION = "kernel/modules"
 LICENSE = "GPL"
 
 SRC_URI = "http://mxhaard.free.fr/spca50x/Download/spca5xx-${PV}.tar.gz \
-           file://Makefile.patch;patch=1"
+           file://Makefile.patch"
 
 S = "${WORKDIR}/spca5xx-${PV}"
 
diff --git a/recipes/speech-dispatcher/speech-dispatcher_0.6.6.bb b/recipes/speech-dispatcher/speech-dispatcher_0.6.6.bb
index 0b9f3747c7..41280cc3eb 100644
--- a/recipes/speech-dispatcher/speech-dispatcher_0.6.6.bb
+++ b/recipes/speech-dispatcher/speech-dispatcher_0.6.6.bb
@@ -11,9 +11,9 @@ inherit autotools update-rc.d
 
 SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \
 	   file://speech-dispatcher.init \
-           file://srcMakefile.am.patch;patch=1 \
-           file://configure_fix.patch;patch=1 \
-	   file://configSpeechd.conf.in_00.patch;patch=1"
+           file://srcMakefile.am.patch \
+           file://configure_fix.patch \
+	   file://configSpeechd.conf.in_00.patch"
 
 LEAD_SONAME = "libspeechd.so"
 EXTRA_OECONF = " --with-espeak --with-flite --without-ibmtts --without-nas --with-alsa --with-pulse "
diff --git a/recipes/sphinx-speech/pocketsphinx_0.2.1.bb b/recipes/sphinx-speech/pocketsphinx_0.2.1.bb
index d700ff06e3..0821c5be22 100644
--- a/recipes/sphinx-speech/pocketsphinx_0.2.1.bb
+++ b/recipes/sphinx-speech/pocketsphinx_0.2.1.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD"
 DEPENDS = "sphinxbase"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cmusphinx/${PN}-${PV}.tar.bz2 \
-           file://cross-compile.patch;patch=1"
+           file://cross-compile.patch"
 
 inherit autotools
 
diff --git a/recipes/sphinx-speech/pocketsphinx_0.4.1.bb b/recipes/sphinx-speech/pocketsphinx_0.4.1.bb
index d3d316d258..0ac120ee1e 100644
--- a/recipes/sphinx-speech/pocketsphinx_0.4.1.bb
+++ b/recipes/sphinx-speech/pocketsphinx_0.4.1.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD"
 DEPENDS = "sphinxbase"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cmusphinx/${PN}-${PV}.tar.bz2 \
-           file://cross-compile.patch;patch=1"
+           file://cross-compile.patch"
 
 inherit autotools
 
diff --git a/recipes/sqlite/sqlite3.inc b/recipes/sqlite/sqlite3.inc
index fae8966ba2..b13fb1c05d 100644
--- a/recipes/sqlite/sqlite3.inc
+++ b/recipes/sqlite/sqlite3.inc
@@ -5,7 +5,7 @@ DEPENDS = "tcl-native readline ncurses"
 LICENSE = "PD"
 
 SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \
-	   file://libtool.patch;patch=1"
+	   file://libtool.patch"
 
 S = "${WORKDIR}/sqlite-${PV}"
 
diff --git a/recipes/sqlite/sqlite_2.8.17.bb b/recipes/sqlite/sqlite_2.8.17.bb
index 56ac1def88..e6c4fc5773 100644
--- a/recipes/sqlite/sqlite_2.8.17.bb
+++ b/recipes/sqlite/sqlite_2.8.17.bb
@@ -7,8 +7,8 @@ LICENSE = "PD"
 PR = "r5"
 
 SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \
-       file://mainmk_build_dynamic.patch;patch=1 \
-       file://mainmk_no_tcl.patch;patch=1 \
+       file://mainmk_build_dynamic.patch \
+       file://mainmk_no_tcl.patch \
        file://sqlite.pc"
 
 SOURCES = "attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \
diff --git a/recipes/squashfs-tools/squashfs-tools_3.3.bb b/recipes/squashfs-tools/squashfs-tools_3.3.bb
index ce6b7ce0f3..7883ca140d 100644
--- a/recipes/squashfs-tools/squashfs-tools_3.3.bb
+++ b/recipes/squashfs-tools/squashfs-tools_3.3.bb
@@ -1,4 +1,4 @@
 require squashfs-tools.inc
 PR = "${INC_PR}.1"
 
-SRC_URI += " file://Makefile.patch;patch=1"
+SRC_URI += " file://Makefile.patch"
diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb
index c180f4639f..58527ca6f3 100644
--- a/recipes/squashfs-tools/squashfs-tools_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb
@@ -1,7 +1,7 @@
 # This override is required since this has not yet been released
 SRC_URI  = "cvs://anonymous@squashfs.cvs.sourceforge.net/cvsroot/squashfs;module=squashfs;date=${SRCDATE} \
             http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2"
-SRC_URI += " file://Makefile.patch;patch=1"
+SRC_URI += " file://Makefile.patch"
 
 require squashfs-tools.inc
 PR = "${INC_PR}.3"
diff --git a/recipes/squeak/squeakvm_3.10.1.bb b/recipes/squeak/squeakvm_3.10.1.bb
index 0c6e8117b3..d071739950 100644
--- a/recipes/squeak/squeakvm_3.10.1.bb
+++ b/recipes/squeak/squeakvm_3.10.1.bb
@@ -7,7 +7,7 @@ EXTRA_OECONF += " --with-x --without-npsqueak --with-ffi=any-libffi --docdir=${d
 
 
 SRC_URI = "http://www.squeakvm.org/unix/release/Squeak-3.10-1.src.tar.gz \
-           file://configure-fixes.patch;patch=1"
+           file://configure-fixes.patch"
 S = "${WORKDIR}/Squeak-3.10-1/platforms/unix/config"
 
 inherit autotools
diff --git a/recipes/squeezeclient/squeezeslave_svn.bb b/recipes/squeezeclient/squeezeslave_svn.bb
index 10b38997c3..b59b93f518 100644
--- a/recipes/squeezeclient/squeezeslave_svn.bb
+++ b/recipes/squeezeclient/squeezeslave_svn.bb
@@ -7,9 +7,9 @@ SRCREV=30572
 PV = "7.6+svnr${SRCPV}"
 
 SRC_URI = "svn://svn.slimdevices.com/repos/slim/7.6/trunk/;module=softsqueeze;proto=http \
-           file://varinit.patch;patch=1 \
-           file://runfix.patch;patch=1 \
-           file://makefile.patch;patch=1"
+           file://varinit.patch \
+           file://runfix.patch \
+           file://makefile.patch"
 
 
 S = "${WORKDIR}/softsqueeze/SlimProtoLib"
diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc
index 93b6800af5..49d084f628 100644
--- a/recipes/squid/squid.inc
+++ b/recipes/squid/squid.inc
@@ -4,7 +4,7 @@ INC_PR = "r7"
 DEPENDS = "squid-native-${PV} openssl openldap"
 
 SRC_URI = "http://www.squid-cache.org/Versions/v2/${SQUID_MAJOR}/squid-${PV}.tar.bz2;name=squid-${PV} \
-           file://fix_epoll_check.patch;patch=1 \
+           file://fix_epoll_check.patch \
            file://squid.init \
 	   file://squid-volatiles \
 	   "
diff --git a/recipes/squidguard/squidguard-1.4/squidguard-fix-CVE-2009-3700.patch b/recipes/squidguard/squidguard-1.4/squidguard-fix-CVE-2009-3700.patch
new file mode 100644
index 0000000000..6f0d9a817d
--- /dev/null
+++ b/recipes/squidguard/squidguard-1.4/squidguard-fix-CVE-2009-3700.patch
@@ -0,0 +1,46 @@
+Index: squidGuard-1.4/src/sgLog.c
+===================================================================
+--- squidGuard-1.4.orig/src/sgLog.c
++++ squidGuard-1.4/src/sgLog.c
+@@ -2,7 +2,7 @@
+   By accepting this notice, you agree to be bound by the following
+   agreements:
+   
+-  This software product, squidGuard, is copyrighted (C) 1998-2007
++  This software product, squidGuard, is copyrighted (C) 1998-2009
+   by Christine Kronberg, Shalla Secure Services. All rights reserved.
+  
+   This program is free software; you can redistribute it and/or modify it
+@@ -55,8 +55,8 @@ void sgLog(log, format, va_alist)
+   char msg[MAX_BUF];
+   va_list ap;
+   VA_START(ap, format);
+-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
+-    fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno));
++  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
++    fprintf(stderr,"overflow in vsnprintf (sgLog): %s",strerror(errno));
+   va_end(ap);
+   date = niso(0);
+   if(globalDebug || log == NULL) {
+@@ -87,8 +87,8 @@ void sgLogError(format, va_alist)
+   char msg[MAX_BUF];
+   va_list ap;
+   VA_START(ap, format);
+-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
+-    sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno));
++  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
++    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));
+   va_end(ap);
+   sgLog(globalErrorLog,"%s",msg);
+ }
+@@ -104,8 +104,8 @@ void sgLogFatalError(format, va_alist)
+   char msg[MAX_BUF];
+   va_list ap;
+   VA_START(ap, format);
+-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
+-    return;
++  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
++    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));
+   va_end(ap);
+   sgLog(globalErrorLog,"%s",msg);
+   sgEmergency();
diff --git a/recipes/squidguard/squidguard-1.4/squidguard-fix-CVE-2009-3826.patch b/recipes/squidguard/squidguard-1.4/squidguard-fix-CVE-2009-3826.patch
new file mode 100644
index 0000000000..8d2b6230cc
--- /dev/null
+++ b/recipes/squidguard/squidguard-1.4/squidguard-fix-CVE-2009-3826.patch
@@ -0,0 +1,26 @@
+Index: squidGuard-1.4/src/sg.h.in
+===================================================================
+--- squidGuard-1.4.orig/src/sg.h.in
++++ squidGuard-1.4/src/sg.h.in
+@@ -73,7 +73,7 @@ int tolower();
+ #define REQUEST_TYPE_REDIRECT   2
+ #define REQUEST_TYPE_PASS       3
+ 
+-#define MAX_BUF 4096
++#define MAX_BUF 12288
+ 
+ #define DEFAULT_LOGFILE "squidGuard.log"
+ #define WARNING_LOGFILE "squidGuard.log"
+Index: squidGuard-1.4/src/sgDiv.c.in
+===================================================================
+--- squidGuard-1.4.orig/src/sgDiv.c.in
++++ squidGuard-1.4/src/sgDiv.c.in
+@@ -745,7 +745,7 @@ char *sgParseRedirect(redirect, req, acl
+       p++;
+       break;
+     case 'u': /* Requested URL */
+-      strcat(buf, req->orig);
++      strncat(buf, req->orig, 2048);
+       p++;
+       break;
+     default:
diff --git a/recipes/squidguard/squidguard_1.4.bb b/recipes/squidguard/squidguard_1.4.bb
index e77469fbed..8b624bb5ff 100644
--- a/recipes/squidguard/squidguard_1.4.bb
+++ b/recipes/squidguard/squidguard_1.4.bb
@@ -4,13 +4,15 @@ SECTION = "network"
 DEPENDS = "virtual/db openldap mysql5 zlib"
 RDEPENDS += "squid"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = " \
 	http://www.squidguard.org/Downloads/squidGuard-${PV}.tar.gz;name=tar \
-	file://squidguard-1.4-no_header_checks.patch;patch=1 \
-	file://squidguard-1.4-fix-parallel-build.patch;patch=1 \
-	file://squidguard-cross-ldap.patch;patch=1 \
+	file://squidguard-1.4-no_header_checks.patch \
+	file://squidguard-1.4-fix-parallel-build.patch \
+	file://squidguard-cross-ldap.patch \
+	file://squidguard-fix-CVE-2009-3700.patch \
+	file://squidguard-fix-CVE-2009-3826.patch \
 	file://squidGuard.conf \
 	"
 SRC_URI[tar.md5sum] = "de834150998c1386c30feae196f16b06"
diff --git a/recipes/sscep/sscep_0.0.20081211.bb b/recipes/sscep/sscep_0.0.20081211.bb
index ef865aa188..f330eecea7 100644
--- a/recipes/sscep/sscep_0.0.20081211.bb
+++ b/recipes/sscep/sscep_0.0.20081211.bb
@@ -4,9 +4,9 @@ LICENSE = "BSD"
 
 SRC_URI = " \
 	http://www.klake.org/~jt/sscep/sscep.tgz \
-	file://memleak.patch;patch=1 \
-	file://httphost.patch;patch=1 \
-	file://ca_segfault.patch;patch=1 \
+	file://memleak.patch \
+	file://httphost.patch \
+	file://ca_segfault.patch \
 "
 
 S = "${WORKDIR}/${PN}"
diff --git a/recipes/ssmtp/ssmtp_2.61.bb b/recipes/ssmtp/ssmtp_2.61.bb
index c34ae74499..a8350a0327 100644
--- a/recipes/ssmtp/ssmtp_2.61.bb
+++ b/recipes/ssmtp/ssmtp_2.61.bb
@@ -5,10 +5,10 @@ LICENSE = "GPL"
 PR = "r6"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \
-           file://ldflags.patch;patch=1 \
-           file://configure.patch;patch=1 \
-           file://libs-lcrypto.patch;patch=1 \
-           file://dont-strip.patch;patch=1 \
+           file://ldflags.patch \
+           file://configure.patch \
+           file://libs-lcrypto.patch \
+           file://dont-strip.patch \
            file://ssmtp.conf"
 S = "${WORKDIR}/${PN}-${PV}"
 
diff --git a/recipes/stage-manager/stagemanager-native_0.0.1.bb b/recipes/stage-manager/stagemanager-native_0.0.1.bb
index 5708045e73..733cc837ce 100644
--- a/recipes/stage-manager/stagemanager-native_0.0.1.bb
+++ b/recipes/stage-manager/stagemanager-native_0.0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Helper script for packaged-staging.bbclass"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "file://stage-manager \
            file://stage-manager-ipkg \
@@ -15,13 +15,12 @@ PACKAGE_DEPENDS = " "
 PATCHDEPENDENCY = ""
 INHIBIT_DEFAULT_DEPS = "1"
 
+PSTAGING_DISABLED = "1"
+
+NATIVE_INSTALL_WORKS = "1"
 do_install() {
 	install -d ${STAGING_BINDIR}
 	install -m 0755 ${WORKDIR}/stage-manager ${STAGING_BINDIR}
 	install -m 0755 ${WORKDIR}/stage-manager-ipkg ${STAGING_BINDIR}
 	install -m 0755 ${WORKDIR}/stage-manager-ipkg-build ${STAGING_BINDIR}
 }
-
-do_stage() {
-	:
-}
diff --git a/recipes/starling/starling_0.9.bb b/recipes/starling/starling_0.9.bb
index 4fc5689d18..bc1f3694bf 100644
--- a/recipes/starling/starling_0.9.bb
+++ b/recipes/starling/starling_0.9.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Starling audio player for GPE"
 SECTION = "gpe/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "gtk+ gstreamer gst-plugins-good gst-plugins-bad esound sqlite libsoup libhandoff"
-PR = "r0"
+DEPENDS = "gtk+ gstreamer gst-plugins-good gst-plugins-bad ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)} esound sqlite libsoup libhandoff"
+PR = "r1"
 
 inherit gpe autotools
 
diff --git a/recipes/startup-monitor/startup-monitor_0.18-2.bb b/recipes/startup-monitor/startup-monitor_0.18-2.bb
index c73ab17f15..81bf9c43d7 100644
--- a/recipes/startup-monitor/startup-monitor_0.18-2.bb
+++ b/recipes/startup-monitor/startup-monitor_0.18-2.bb
@@ -9,7 +9,7 @@ inherit gpe pkgconfig
 
 #SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${P}.tar.gz"
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 SRC_URI[md5sum] = "2ac92d4deda518558036a5685fc28814"
 SRC_URI[sha256sum] = "0d1570843bd479ad6183f5014c3da3f68915f9c2626f11d96b422852a9991d86"
diff --git a/recipes/strace/strace_4.5.11.bb b/recipes/strace/strace_4.5.11.bb
index 5efec9d7df..2386b44384 100644
--- a/recipes/strace/strace_4.5.11.bb
+++ b/recipes/strace/strace_4.5.11.bb
@@ -5,8 +5,8 @@ PR = "r2"
 DESCRIPTION = "strace is a system call tracing tool."
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
-	   file://arm-syscallent.patch;patch=1 \
-	   file://quota.patch;patch=1"
+	   file://arm-syscallent.patch \
+	   file://quota.patch"
 
 inherit autotools
 
diff --git a/recipes/strace/strace_4.5.12.bb b/recipes/strace/strace_4.5.12.bb
index 558327d5d5..3832091b1c 100644
--- a/recipes/strace/strace_4.5.12.bb
+++ b/recipes/strace/strace_4.5.12.bb
@@ -5,9 +5,9 @@ PR = "r1"
 DESCRIPTION = "strace is a system call tracing tool."
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
-	   file://arm-syscallent.patch;patch=1 \
-	   file://quota.patch;patch=1 \
-	   file://strace-fix-arm-bad-syscall.patch;patch=1"
+	   file://arm-syscallent.patch \
+	   file://quota.patch \
+	   file://strace-fix-arm-bad-syscall.patch"
 
 inherit autotools
 
diff --git a/recipes/strace/strace_4.5.14.bb b/recipes/strace/strace_4.5.14.bb
index 8a98c765af..8526c91d72 100644
--- a/recipes/strace/strace_4.5.14.bb
+++ b/recipes/strace/strace_4.5.14.bb
@@ -4,15 +4,15 @@ LICENSE = "GPL"
 PR = "r9"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
-           file://glibc-2.5.patch;patch=1 \
-           file://arm-eabi.patch;patch=1 \
-           file://sh-arch-update.patch;patch=1 \
-           file://sh-syscall-update.patch;patch=1 \
-           file://strace-fix-arm-bad-syscall.patch;patch=1 \
-           file://strace-undef-syscall.patch;patch=1 \
-           file://strace-arm-no-cachectl.patch;patch=1 \
-           file://strace-dont-include-linux-dirent-h.patch;patch=1 \
-           file://mips-sigcontext.patch;patch=1 \
+           file://glibc-2.5.patch \
+           file://arm-eabi.patch \
+           file://sh-arch-update.patch \
+           file://sh-syscall-update.patch \
+           file://strace-fix-arm-bad-syscall.patch \
+           file://strace-undef-syscall.patch \
+           file://strace-arm-no-cachectl.patch \
+           file://strace-dont-include-linux-dirent-h.patch \
+           file://mips-sigcontext.patch \
           "
 
 # The strace-4.5.14-avr32.patch conflicts with some other patches.
@@ -21,8 +21,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
 # The avr32 patch also includes the drop-ctl-proc.patch
 # The AVR32 patches are from http://avr32linux.org/twiki/bin/view/Main/STrace
 SRC_URI_avr32 = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
-     file://strace-4.5.14-avr32.patch;patch=1 \
-     file://strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch;patch=1 \
+     file://strace-4.5.14-avr32.patch \
+     file://strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch \
     "
 
 inherit autotools
diff --git a/recipes/strace/strace_4.5.15.bb b/recipes/strace/strace_4.5.15.bb
index 97f73df9a9..ae12146f2f 100644
--- a/recipes/strace/strace_4.5.15.bb
+++ b/recipes/strace/strace_4.5.15.bb
@@ -8,11 +8,11 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_avr32 = "1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
-	   file://strace-dont-include-linux-dirent-h.patch;patch=1 \
+	   file://strace-dont-include-linux-dirent-h.patch \
           "
 
 SRC_URI_avr32 = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
-           file://strace-4.5.15.atmel.1.patch;patch=1 \  
+           file://strace-4.5.15.atmel.1.patch \  
           "
 
 inherit autotools
diff --git a/recipes/strace/strace_4.5.18.bb b/recipes/strace/strace_4.5.18.bb
index 87da2ace70..de025ea916 100644
--- a/recipes/strace/strace_4.5.18.bb
+++ b/recipes/strace/strace_4.5.18.bb
@@ -13,7 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
           "
 
 SRC_URI_avr32 = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
-           file://strace-4.5.15.atmel.1.patch;patch=1 \  
+           file://strace-4.5.15.atmel.1.patch \  
           "
 
 inherit autotools
diff --git a/recipes/stunnel/stunnel_4.09.bb b/recipes/stunnel/stunnel_4.09.bb
index 9e299a139a..02fd67c61e 100644
--- a/recipes/stunnel/stunnel_4.09.bb
+++ b/recipes/stunnel/stunnel_4.09.bb
@@ -1,8 +1,8 @@
 require stunnel.inc
 
 SRC_URI = "http://www.stunnel.org/download/stunnel/src/stunnel-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://automake.patch;patch=1 \
+	   file://configure.patch \
+	   file://automake.patch \
 	   file://init \
 	   file://stunnel.conf"
 
diff --git a/recipes/subapplet/subapplet_1.0.8.bb b/recipes/subapplet/subapplet_1.0.8.bb
index 3bd445221e..3ebed9b42c 100644
--- a/recipes/subapplet/subapplet_1.0.8.bb
+++ b/recipes/subapplet/subapplet_1.0.8.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://sourceforge.net/projects/subapplet/"
 PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/subapplet-1.0.8.tar.gz \
-	file://toolbar-resize-fix.patch;patch=1"
+	file://toolbar-resize-fix.patch"
 
 S = "${WORKDIR}/SubApplet-1.0.8"
 
diff --git a/recipes/subversion/subversion_1.4.3.bb b/recipes/subversion/subversion_1.4.3.bb
index db5305f8ba..addb43ee25 100644
--- a/recipes/subversion/subversion_1.4.3.bb
+++ b/recipes/subversion/subversion_1.4.3.bb
@@ -8,8 +8,8 @@ HOMEPAGE = "http://subversion.tigris.org"
 PR = "r1"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
-           file://disable-revision-install.patch;patch=1 \
-	   file://neon-detection.patch;patch=1"
+           file://disable-revision-install.patch \
+	   file://neon-detection.patch"
 
 EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
                 --without-berkeley-db --without-apxs --without-apache \
diff --git a/recipes/subversion/subversion_1.6.5.bb b/recipes/subversion/subversion_1.6.5.bb
index 6da6e9a58a..c26a4830e8 100644
--- a/recipes/subversion/subversion_1.6.5.bb
+++ b/recipes/subversion/subversion_1.6.5.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://subversion.tigris.org/"
 PR = "r0"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
-	   file://disable-revision-install.patch;patch=1"
+	   file://disable-revision-install.patch"
 
 EXTRA_OECONF = "--without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
diff --git a/recipes/sudo/sudo_1.6.8p12.bb b/recipes/sudo/sudo_1.6.8p12.bb
index 2ee656ae61..d0e56cf7d3 100644
--- a/recipes/sudo/sudo_1.6.8p12.bb
+++ b/recipes/sudo/sudo_1.6.8p12.bb
@@ -1,10 +1,10 @@
 PR = "r3"
 
 SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
-           file://nonrootinstall.patch;patch=1 \
-           file://nostrip.patch;patch=1 \
-           file://autofoo.patch;patch=1 \
-           file://noexec-link.patch;patch=1"
+           file://nonrootinstall.patch \
+           file://nostrip.patch \
+           file://autofoo.patch \
+           file://noexec-link.patch"
 
 require sudo.inc
 
diff --git a/recipes/sugar/etoys_3.0.2076.bb b/recipes/sugar/etoys_3.0.2076.bb
index 96dff196fb..0bbe352c7e 100644
--- a/recipes/sugar/etoys_3.0.2076.bb
+++ b/recipes/sugar/etoys_3.0.2076.bb
@@ -7,7 +7,7 @@ DEPENDS = "sugar"
 RDEPENDS = "sugar shared-mime-info"
 
 SRC_URI = "http://dev.laptop.org/pub/sugar/sources/etoys/etoys-${PV}.tar.gz \
-           file://etoys.diff;patch=1"
+           file://etoys.diff"
 
 inherit autotools distutils-base
 
diff --git a/recipes/sugar/etoys_4.0.2212.bb b/recipes/sugar/etoys_4.0.2212.bb
index a582fd4784..123ceae460 100644
--- a/recipes/sugar/etoys_4.0.2212.bb
+++ b/recipes/sugar/etoys_4.0.2212.bb
@@ -7,7 +7,7 @@ DEPENDS = "sugar"
 RDEPENDS = "sugar shared-mime-info"
 
 SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/etoys/etoys-${PV}.tar.gz \
-           file://etoys.diff;patch=1"
+           file://etoys.diff"
 
 inherit autotools distutils-base
 
diff --git a/recipes/sugar/sugar-artwork_0.82.0.bb b/recipes/sugar/sugar-artwork_0.82.0.bb
index 7f108a113c..0f5a22946a 100644
--- a/recipes/sugar/sugar-artwork_0.82.0.bb
+++ b/recipes/sugar/sugar-artwork_0.82.0.bb
@@ -6,7 +6,7 @@ PR = "r1"
 DEPENDS = "sugar icon-slicer-native"
 
 SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-artwork/${PN}-${PV}.tar.bz2 \
-           file://icon-slicer.diff;patch=1"
+           file://icon-slicer.diff"
 
 inherit autotools distutils-base
 
diff --git a/recipes/supertux/supertux-qvga_0.1.3.bb b/recipes/supertux/supertux-qvga_0.1.3.bb
index 6d2e6197a5..aad255b5a9 100644
--- a/recipes/supertux/supertux-qvga_0.1.3.bb
+++ b/recipes/supertux/supertux-qvga_0.1.3.bb
@@ -14,7 +14,7 @@ PACKAGES_prepend = " ${PN}-levels-bonus1 ${PN}-levels-bonus2 "
 SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \
 #           file://supertux-qvga-gfx.tar.bz2 \
            file://supertux-smallsize-data.tar.bz2 \
-	   file://gp2x.patch;patch=1 \
+	   file://gp2x.patch \
 	   file://img-resize.sh \
 	   file://supertux.png \
 	   file://supertux.desktop \
diff --git a/recipes/supertux/supertux_0.1.2.bb b/recipes/supertux/supertux_0.1.2.bb
index 313d00064b..4d88eefa50 100644
--- a/recipes/supertux/supertux_0.1.2.bb
+++ b/recipes/supertux/supertux_0.1.2.bb
@@ -9,7 +9,7 @@ APPIMAGE = "${WORKDIR}/supertux.png"
 APPDESKTOP = "${WORKDIR}/supertux.desktop"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2;name=archive \
-           http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;patch=1;name=patch \
+           http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;name=patch \
 	   file://supertux.png"
 
 export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
diff --git a/recipes/supertux/supertux_0.1.3.bb b/recipes/supertux/supertux_0.1.3.bb
index f77de9c365..0006a2b8b0 100644
--- a/recipes/supertux/supertux_0.1.3.bb
+++ b/recipes/supertux/supertux_0.1.3.bb
@@ -9,7 +9,7 @@ APPIMAGE = "${WORKDIR}/supertux.png"
 APPDESKTOP = "${WORKDIR}/supertux.desktop"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \
-#           http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;patch=1 \
+#           http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz \
 	   file://supertux.png \
 	   file://supertux.desktop \
 	   "
diff --git a/recipes/svgalib/files/gtfcalc-round.patch b/recipes/svgalib/files/gtfcalc-round.patch
new file mode 100644
index 0000000000..076c350953
--- /dev/null
+++ b/recipes/svgalib/files/gtfcalc-round.patch
@@ -0,0 +1,17 @@
+Index: svgalib-1.9.25/utils/gtf/gtfcalc.c
+===================================================================
+--- svgalib-1.9.25.orig/utils/gtf/gtfcalc.c
++++ svgalib-1.9.25/utils/gtf/gtfcalc.c
+@@ -64,10 +64,12 @@ static GTF_constants GC = {
+ 
+ /*-------------------------- Implementation -------------------------------*/
+ 
++#ifndef HAVE_ROUND
+ static double round(double v)
+ {
+ 	return floor(v + 0.5);
+ }
++#endif
+ 
+ static void GetInternalConstants(GTF_constants *c)
+ /****************************************************************************
diff --git a/recipes/svgalib/files/makefiles-ldconfig.patch b/recipes/svgalib/files/makefiles-ldconfig.patch
new file mode 100644
index 0000000000..2802f17ad9
--- /dev/null
+++ b/recipes/svgalib/files/makefiles-ldconfig.patch
@@ -0,0 +1,26 @@
+Index: svgalib-1.9.25/Makefile
+===================================================================
+--- svgalib-1.9.25.orig/Makefile
++++ svgalib-1.9.25/Makefile
+@@ -100,7 +100,7 @@ installsharedlib: $(SHAREDLIBS) $(SVGALI
+ 		 ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \
+ 	done
+ 	@./fixldsoconf
+-	-ldconfig
++#	-ldconfig
+ 
+ installstaticlib: static
+ 	@echo Installing static libraries in $(libdir).
+Index: svgalib-1.9.25/threeDKit/Makefile
+===================================================================
+--- svgalib-1.9.25.orig/threeDKit/Makefile
++++ svgalib-1.9.25/threeDKit/Makefile
+@@ -58,7 +58,7 @@ lib3dkit.so.$(VERSION): $(OBJECTS)
+ $(sharedlibdir)/lib3dkit.so.$(VERSION): lib3dkit.so.$(VERSION)
+ 	$(INSTALL_SHLIB) $< $(sharedlibdir)/$<
+ 	(cd $(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'` )
+-	-ldconfig
++#	-ldconfig
+ 
+ install: $(sharedlibdir)/lib3dkit.so.$(VERSION) installheaders
+ 
diff --git a/recipes/svgalib/files/svgalib-1.9.25-linux2.6.patch b/recipes/svgalib/files/svgalib-1.9.25-linux2.6.patch
new file mode 100644
index 0000000000..20ab1fe1ed
--- /dev/null
+++ b/recipes/svgalib/files/svgalib-1.9.25-linux2.6.patch
@@ -0,0 +1,289 @@
+        - get rid of warning when linux/device.h doesnt exist
+        - touch up the Makefile to let the ebuild handle the module details
+        - fix support with io remap stuff in newer kernels
+        - dont include headers that dont exist in 2.4.x kernels
+        - use module_param() for 2.6.x and MODULE_PARM() for all others
+        - dont declare all_devices as static since it is exported
+        - dont include <linux/config.h> as the build system does it for us
+        - in lrmi, map old flag names to new names for versions >= 2.6.26
+
+--- svgalib/kernel/svgalib_helper/Makefile
++++ svgalib/kernel/svgalib_helper/Makefile
+@@ -25,7 +25,7 @@
+ endif
+ 
+ 
+-CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h)
++CLASS_SIMPLE := $(shell grep -s class_simple_create $(KDIR)/include/linux/device.h)
+ 
+ ifneq ($(CLASS_SIMPLE),)
+   CLASS_CFLAGS = -DCLASS_SIMPLE=1
+--- svgalib/kernel/svgalib_helper/Makefile.alt
++++ svgalib/kernel/svgalib_helper/Makefile.alt
+@@ -37,7 +37,7 @@
+ CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
+ 
+ ifeq (1,$(findstring 1,$(MODVER)))
+-	CFLAGS += -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h
++	CFLAGS += -DMODVERSIONS -DCONFIG_MODVERSIONS=1
+ endif
+ 
+ TARGET = svgalib_helper
+@@ -50,7 +50,8 @@
+ 	endif
+ endif
+ 
+-all: .depend $(OBJS)
++modules: $(OBJS)
++all: .depend modules
+ 
+ $(TARGET).o: $(SRC:.c=.o)
+ 	$(LD) -r $^ -o $@
+@@ -61,8 +62,8 @@
+ install: device modules_install
+ 
+ modules_install: $(OBJS)
+-	mkdir -p /lib/modules/$(VER)/kernel/misc 
+-	install -m 0644 -c $(OBJS) /lib/modules/$(VER)/kernel/misc
++	mkdir -p $(TOPDIR)/lib/modules/$(VER)/kernel/misc
++	install -m 0644 -c $(OBJS) $(TOPDIR)/lib/modules/$(VER)/kernel/misc
+ 
+ device:
+ 	rm -f /dev/svgalib_helper* /dev/svga_helper* /dev/svga /dev/svga?
+--- svgalib/kernel/svgalib_helper/kernel26compat.h
++++ svgalib/kernel/svgalib_helper/kernel26compat.h
+@@ -10,7 +10,7 @@
+ # define PCI_GET_CLASS pci_find_class
+ # define PCI_GET_DEVICE pci_find_device
+ 
+-# if defined (PG_chainlock)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,3)
+ #  define my_io_remap_page_range(vma, start, ofs, len, prot) \
+ 		io_remap_page_range(vma,start,ofs,len,prot)
+ # else
+@@ -70,6 +70,7 @@
+ 
+ /* These are also not present in 2.6 kernels ... */
+ #if (!defined _LINUX_DEVFS_FS_KERNEL_H) || (defined KERNEL_2_6)
++#include <linux/fs.h>
+ static inline int devfs_register_chrdev (unsigned int major, const char *name,
+                                          struct file_operations *fops)
+ {
+@@ -77,7 +78,12 @@
+ }
+ static inline int devfs_unregister_chrdev (unsigned int major,const char *name)
+ {
+-    return unregister_chrdev (major, name);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)    
++   return unregister_chrdev (major, name);
++#else
++    unregister_chrdev (major, name);
++    return 0;
++#endif
+ }
+ #endif
+ 
+@@ -99,7 +105,8 @@
+      class_device_create(svgalib_helper_class,                      	\
+                              MKDEV(SVGALIB_HELPER_MAJOR, _minor),       \
+                              &sh_pci_devs[_minor]->dev->dev, _name);
+-#else /* 2.6.15 changed class_device_create */
++/* 2.6.15 changed class_device_create */
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+ #  define SLH_SYSFS_ADD_CONTROL                                         \
+      class_device_create(svgalib_helper_class, NULL,                	\
+                              MKDEV(SVGALIB_HELPER_MAJOR, 0),            \
+@@ -109,7 +116,30 @@
+      class_device_create(svgalib_helper_class, NULL,                	\
+                              MKDEV(SVGALIB_HELPER_MAJOR, _minor),       \
+                              &sh_pci_devs[_minor]->dev->dev, _name);
+-#endif /* 2.6.15 */
++/* 2.6.26 changed class_device_create to device_create */
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
++#  define SLH_SYSFS_ADD_CONTROL                                          \
++     device_create(svgalib_helper_class, NULL,                           \
++                             MKDEV(SVGALIB_HELPER_MAJOR, 0),             \
++                             "svga");
++
++#  define SLH_SYSFS_ADD_DEVICE(_name, _minor)                            \
++     device_create(svgalib_helper_class, &sh_pci_devs[_minor]->dev->dev, \
++                             MKDEV(SVGALIB_HELPER_MAJOR, _minor),        \
++                             _name);
++/* 2.6.27 changed device_create to device_create_drvdata */
++#else
++#  define SLH_SYSFS_ADD_CONTROL                                          \
++     device_create_drvdata(svgalib_helper_class, NULL,                   \
++                           MKDEV(SVGALIB_HELPER_MAJOR, 0),               \
++                           "%s%d", "svga", 0);
++
++#  define SLH_SYSFS_ADD_DEVICE(_name, _minor)                            \
++     device_create_drvdata(svgalib_helper_class,                         \
++                           &sh_pci_devs[_minor]->dev->dev,               \
++                           MKDEV(SVGALIB_HELPER_MAJOR, _minor),          \
++                           "%s%d", _name, _minor);
++#endif
+ 
+ #  define SLH_SYSFS_REMOVE_DEVICE(i)                                    \
+      class_destroy(svgalib_helper_class);
+@@ -161,3 +191,7 @@
+ #ifndef PCI_VENDOR_ID_RENDITION 
+ #define PCI_VENDOR_ID_RENDITION               0x1163
+ #endif
++
++#ifndef IRQF_SHARED
++# define IRQF_SHARED SA_SHIRQ
++#endif
+--- svgalib/kernel/svgalib_helper/main.c
++++ svgalib/kernel/svgalib_helper/main.c
+@@ -1,5 +1,3 @@
+-#include <linux/config.h>
+-
+ #if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
+ # define MODVERSIONS
+ #endif
+@@ -17,15 +15,22 @@
+ #include <linux/ioport.h>
+ #include <linux/interrupt.h>
+ #include <linux/pci.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+ #include <linux/devfs_fs_kernel.h>
++#endif
+ #include <linux/mm.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ #include <linux/thread_info.h>
++#endif
+ #include <linux/smp.h>
+ #include <linux/smp_lock.h>
+ 
+ #include <linux/sched.h>
+ #include <linux/wait.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ #include <linux/syscalls.h>
++#endif
+ 
+ #define __KERNEL_SYSCALLS__
+ #include <linux/unistd.h>
+@@ -50,7 +55,7 @@
+ #include "displaystart.h"
+ 
+ int debug=0;
+-static int all_devices=0;
++int all_devices=0;
+ int num_devices=0;
+ 
+ static char *sdev_id="svgalib_helper";
+@@ -98,7 +103,11 @@
+ static volatile int vsync=0;
+ static wait_queue_head_t vsync_wait;
+ 
+-static irqreturn_t vsync_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++static irqreturn_t vsync_interrupt(int irq, void *dev_id
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++, struct pt_regs *regs
++#endif
++)
+ {
+     struct sh_pci_device *dev = (struct sh_pci_device *)dev_id;
+ 
+@@ -355,7 +364,7 @@
+                 vsync=1;
+                 i=0;
+                 while(irqs[i]!=-1)
+-                    request_irq(irqs[i++], vsync_interrupt, SA_SHIRQ, "svgalib_helper", sdev_id);
++                    request_irq(irqs[i++], vsync_interrupt, IRQF_SHARED, "svgalib_helper", sdev_id);
+                 vga_enable_vsync((void *)sdev_id);
+ 				wait_event_interruptible(vsync_wait, !vsync);
+                 i=0;
+@@ -443,7 +452,7 @@
+ 		int i=sh_pci_devs[minor]->dev->irq;
+ 		sh_pci_devs[minor]->opencount++;
+ 		if(sh_pci_devs[minor]->opencount==1 && i!=0 && i!=-1 && i!=255)
+-			request_irq(i, vsync_interrupt, SA_SHIRQ, "svgalib_helper", sh_pci_devs[minor]);
++			request_irq(i, vsync_interrupt, IRQF_SHARED, "svgalib_helper", sh_pci_devs[minor]);
+ 	}
+ 
+ #ifndef KERNEL_2_6
+@@ -763,10 +772,15 @@
+ 
+ }
+ 
++#ifdef KERNEL_2_6
++module_param(debug, int, 0);
++module_param(all_devices, int, 0);
++#else
+ MODULE_PARM(debug, "i");
+-MODULE_PARM_DESC(debug, "Debug output level.");
+-
+ MODULE_PARM(all_devices, "i");
++#endif
++
++MODULE_PARM_DESC(debug, "Debug output level.");
+ MODULE_PARM_DESC(all_devices, "Give access to all PCI devices, regardless of class.");
+ 
+
+--- svgalib/src/lrmi.6.c
++++ svgalib/src/lrmi.6.c
+@@ -169,6 +169,13 @@
+ 		}
+ 	}
+ 
++#ifndef TF_MASK
++#define TF_MASK X86_EFLAGS_TF
++#define IF_MASK X86_EFLAGS_IF
++#define IOPL_MASK X86_EFLAGS_IOPL
++#define VIF_MASK X86_EFLAGS_VIF
++#define VIP_MASK X86_EFLAGS_VIP
++#endif
+ 
+ #define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
+ #define DEFAULT_STACK_SIZE 	0x1000
+--- svgalib/src/lrmi.9.c
++++ svgalib/src/lrmi.9.c
+@@ -206,6 +206,13 @@
+ 
+ 
+ #if defined(__linux__)
++#ifndef TF_MASK
++#define TF_MASK X86_EFLAGS_TF
++#define IF_MASK X86_EFLAGS_IF
++#define IOPL_MASK X86_EFLAGS_IOPL
++#define VIF_MASK X86_EFLAGS_VIF
++#define VIP_MASK X86_EFLAGS_VIP
++#endif
+ #define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
+ #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #define DEFAULT_VM86_FLAGS  (PSL_I | PSL_IOPL)
+--- svgalib/lrmi-0.6m/lrmi.c
++++ svgalib/lrmi-0.6m/lrmi.c
+@@ -170,6 +170,14 @@
+ 	}
+ 
+ 
++#ifndef TF_MASK
++#define TF_MASK X86_EFLAGS_TF
++#define IF_MASK X86_EFLAGS_IF
++#define IOPL_MASK X86_EFLAGS_IOPL
++#define VIF_MASK X86_EFLAGS_VIF
++#define VIP_MASK X86_EFLAGS_VIP
++#endif
++
+ #define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
+ #define DEFAULT_STACK_SIZE 	0x1000
+ #define RETURN_TO_32_INT 	255
+--- svgalib/lrmi-0.9/lrmi.c
++++ svgalib/lrmi-0.9/lrmi.c
+@@ -203,6 +203,13 @@
+ 
+ 
+ #if defined(__linux__)
++#ifndef TF_MASK
++#define TF_MASK X86_EFLAGS_TF
++#define IF_MASK X86_EFLAGS_IF
++#define IOPL_MASK X86_EFLAGS_IOPL
++#define VIF_MASK X86_EFLAGS_VIF
++#define VIP_MASK X86_EFLAGS_VIP
++#endif
+ #define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
+ #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #define DEFAULT_VM86_FLAGS  (PSL_I | PSL_IOPL)
diff --git a/recipes/svgalib/svgalib_1.9.25.bb b/recipes/svgalib/svgalib_1.9.25.bb
new file mode 100644
index 0000000000..ac552b2302
--- /dev/null
+++ b/recipes/svgalib/svgalib_1.9.25.bb
@@ -0,0 +1,129 @@
+#
+#  Created on: 25-Jul-2006
+#      Author: Christopher Lang, <christopher.lang@acurana.de>
+#      Copyright (C) 2006 acurana GmbH, http://www.acurana.de/
+#      All rights reserved.
+#
+#  Updated on 29-Apr-2010
+#	Eric Benard - <eric@eukrea.com>
+#
+#  Description: svgalib VGA graphics library
+#
+
+DESCRIPTION = "Linux Super VGA graphics library"
+AUTHOR = "The svgalib contributors"
+HOMEPAGE = "http://www.svgalib.org/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+PR = "r0"
+
+PARALLEL_MAKE = ""
+
+SRC_URI = "http://my.arava.co.il/~matan/svgalib/svgalib-${PV}.tar.gz;name=tarball \
+	file://makefiles-ldconfig.patch \
+	file://gtfcalc-round.patch \
+	file://svgalib-1.9.25-linux2.6.patch \
+	"
+
+S = "${WORKDIR}/svgalib-${PV}"
+
+LEAD_SONAME = "libvga"
+
+PACKAGES += "${PN}-utils ${PN}-demos"
+
+FILES_${PN} = "${libdir}/*.so.*"
+
+FILES_${PN}-demos = "${bindir}/${PN}"
+FILES_${PN}-utils = "${sbindir}/${PN}"
+
+FILES_${PN}-dbg += "${bindir}/${PN}/.debug \
+    ${sbindir}/${PN}/.debug"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+LDFLAGS_append = " -L${D}/usr/lib"
+
+# this HAVE_ROUND thing is not ideal, but since svgalib doesn't use autoconf...
+# see also gtfcalc-round.patch
+CFLAGS_append = " -L${D}/usr/lib -DHAVE_ROUND "
+
+# see Makefile.cfg
+ADDITIONAL_SVGA_DRIVER_TESTS = "INCLUDE_FBDEV_DRIVER_TEST=y"
+
+EXTRA_OEMAKE = "install demoprogs \
+    prefix=${D}/usr \
+    TOPDIR=${D} \
+    INSTALL_PROGRAM='install -c -s -m 755' \
+    INSTALL_SCRIPT='install -c -m 755' \
+    INSTALL_SHLIB='install -c -m 755' \
+    INSTALL_DATA='install -c -m 644' \
+    NO_HELPER=y \
+    ${ADDITIONAL_SVGA_DRIVER_TESTS} \
+    INCLUDES='-I. -I../include -I../src -I../gl -I${STAGING_INCDIR}' \
+    mandir=${D}/usr/share/man \
+    SVGALIB_CONFIG_FILE=/etc/vga/libvga.config \
+    "
+
+do_compile_prepend () {
+    install -d ${D}/{usr/lib,etc}
+}
+
+do_install_append () {
+    oe_libinstall -C sharedlib -so libvga ${D}${libdir}
+    oe_libinstall -C sharedlib -so libvgagl ${D}${libdir}
+    oe_libinstall -C threeDKit -so lib3dkit ${D}${libdir}
+    install -d ${D}${includedir}
+    install -m 0644 ${S}/include/* ${D}${includedir}
+    install -m 0644 ${S}/gl/vgagl.h ${D}${includedir}
+
+    install -d ${D}${mandir}/man{1,3,5,6,7,8}
+
+    for files in `ls -1 ${S}/doc/man1` ; do gzip ${S}/doc/man1/$files ; done
+    install -m 0644 ${S}/doc/man1/* ${D}${mandir}/man1
+
+    for files in `ls -1 ${S}/doc/man3` ; do gzip ${S}/doc/man3/$files ; done
+    install -m 0644 ${S}/doc/man3/* ${D}${mandir}/man3
+
+    for files in `ls -1 ${S}/doc/man5` ; do gzip ${S}/doc/man5/$files ; done
+    install -m 0644 ${S}/doc/man5/* ${D}${mandir}/man5
+
+    for files in `ls -1 ${S}/doc/man6` ; do gzip ${S}/doc/man6/$files ; done
+    install -m 0644 ${S}/doc/man6/* ${D}${mandir}/man6
+
+    for files in `ls -1 ${S}/doc/man7` ; do gzip ${S}/doc/man7/$files ; done
+    install -m 0644 ${S}/doc/man7/* ${D}${mandir}/man7
+
+    for files in `ls -1 ${S}/doc/man8` ; do gzip ${S}/doc/man8/$files ; done
+    install -m 0644 ${S}/doc/man8/* ${D}${mandir}/man8
+
+    install -d ${D}${bindir}/${PN}
+    install -d ${D}${sbindir}/${PN}
+
+    for files in `find ${S}/demos -type d -o -executable -print` ; do \
+        install -m 755 $files ${D}${bindir}/${PN} ; \
+    done
+
+    install -m 755 ${S}/threeDKit/plane ${D}${bindir}/${PN}
+    install -m 755 ${S}/threeDKit/wrapdemo ${D}${bindir}/${PN}
+
+    for files in `find ${S}/utils -type d -o -executable -print` ; do \
+        install -m 755 $files ${D}${sbindir}/${PN} ; \
+    done
+
+    install -d ${D}${docdir}/${PN}
+
+    for files in `find ${S}/doc -maxdepth 1 -type f` ; do \
+        install -m 644 $files ${D}${docdir}/${PN} ; \
+    done
+}
+
+do_stage () {
+    install -m 0644 ${S}/include/* ${STAGING_INCDIR}/
+    install -m 0644 ${S}/gl/vgagl.h ${STAGING_INCDIR}/
+    oe_libinstall -C sharedlib -so libvga ${STAGING_LIBDIR}
+    oe_libinstall -C sharedlib -so libvgagl ${STAGING_LIBDIR}
+    oe_libinstall -C threeDKit -so lib3dkit ${STAGING_LIBDIR}
+}
+
+SRC_URI[tarball.md5sum] = "4dda7e779e550b7404cfe118f1d74222"
+SRC_URI[tarball.sha256sum] = "2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602"
diff --git a/recipes/swfdec/swfdec_0.4.0.bb b/recipes/swfdec/swfdec_0.4.0.bb
index c651edc890..570ac57b4d 100644
--- a/recipes/swfdec/swfdec_0.4.0.bb
+++ b/recipes/swfdec/swfdec_0.4.0.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.4/${P}.tar.gz \
            file://jsautocfg.h \
-	   file://fix-cross-build.patch;patch=1"
+	   file://fix-cross-build.patch"
 
 inherit autotools pkgconfig lib_package
 
diff --git a/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb b/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb
index d834a58157..e94462f07f 100644
--- a/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb
+++ b/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb
@@ -4,4 +4,4 @@ PR = "r1"
 
 DEPENDS += "libhildon libhildonfm"
 
-SRC_URI += "file://swt-hildon.patch;patch=1"
+SRC_URI += "file://swt-hildon.patch"
diff --git a/recipes/sylpheed/claws-mail_3.6.1.bb b/recipes/sylpheed/claws-mail_3.6.1.bb
index ee9e244369..6a89263839 100644
--- a/recipes/sylpheed/claws-mail_3.6.1.bb
+++ b/recipes/sylpheed/claws-mail_3.6.1.bb
@@ -9,10 +9,10 @@ inherit autotools pkgconfig
 # translation patch: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1774
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2;name=archive \
-	http://www.penguin.cz/~utx/ftp/claws-mail/claws-mail-${PV}-po-update.patch;patch=1;name=patch \
-	file://desktop.patch;patch=1 \
-	file://claws-mail-g_strcmp0.patch;patch=1 \
-	file://duplicate-header.patch;patch=1 \
+	http://www.penguin.cz/~utx/ftp/claws-mail/claws-mail-${PV}-po-update.patch;name=patch \
+	file://desktop.patch \
+	file://claws-mail-g_strcmp0.patch \
+	file://duplicate-header.patch \
 	"
 
 do_configure_append() {
diff --git a/recipes/sylpheed/claws-plugin-mailmbox_1.14.bb b/recipes/sylpheed/claws-plugin-mailmbox_1.14.bb
index fd11d209a8..d31e32f8ad 100644
--- a/recipes/sylpheed/claws-plugin-mailmbox_1.14.bb
+++ b/recipes/sylpheed/claws-plugin-mailmbox_1.14.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz\
-           file://claws-plugin-mailmbox-fixup.patch;patch=1"
+           file://claws-plugin-mailmbox-fixup.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/sylpheed/sylpheed_2.2.9.bb b/recipes/sylpheed/sylpheed_2.2.9.bb
index 849e637e7b..28a088f6ba 100644
--- a/recipes/sylpheed/sylpheed_2.2.9.bb
+++ b/recipes/sylpheed/sylpheed_2.2.9.bb
@@ -5,9 +5,9 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \
-	file://sylpheed-2.2.2-libsylph-Makefile-am.patch;patch=1 \
-	file://sylpheed-2.2.2-src-Makefile-am.patch;patch=1 \
-	file://sylpheed-gnutls_2.2.4.patch;patch=1"
+	file://sylpheed-2.2.2-libsylph-Makefile-am.patch \
+	file://sylpheed-2.2.2-src-Makefile-am.patch \
+	file://sylpheed-gnutls_2.2.4.patch"
 
 
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
diff --git a/recipes/synergy/synergy_1.3.1.bb b/recipes/synergy/synergy_1.3.1.bb
index fa1588f281..58f0e26c71 100644
--- a/recipes/synergy/synergy_1.3.1.bb
+++ b/recipes/synergy/synergy_1.3.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "libx11 libxtst"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz \
-           file://synergy-1.3.1+gcc-4.3.patch;patch=1"
+           file://synergy-1.3.1+gcc-4.3.patch"
 
 do_configure_prepend() {
 	grep -l -- -Werror "${S}/"* | xargs sed -i 's:-Werror::'
diff --git a/recipes/sysfsutils/sysfsutils_2.1.0.bb b/recipes/sysfsutils/sysfsutils_2.1.0.bb
index 7917865b90..482db587af 100644
--- a/recipes/sysfsutils/sysfsutils_2.1.0.bb
+++ b/recipes/sysfsutils/sysfsutils_2.1.0.bb
@@ -1,7 +1,7 @@
 require sysfsutils.inc
 
 PR = "${INC_PR}"
-SRC_URI += "file://get_mnt_path_check.patch;patch=1"
+SRC_URI += "file://get_mnt_path_check.patch"
 
 SRC_URI[md5sum] = "14e7dcd0436d2f49aa403f67e1ef7ddc"
 SRC_URI[sha256sum] = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"
diff --git a/recipes/sysklogd/files/sysklogd b/recipes/sysklogd/files/sysklogd
new file mode 100755
index 0000000000..e0fa7a8e1e
--- /dev/null
+++ b/recipes/sysklogd/files/sysklogd
@@ -0,0 +1,140 @@
+#! /bin/sh
+# /etc/init.d/sysklogd: start the system log daemon.
+
+### BEGIN INIT INFO
+# Provides:             sysklogd
+# Required-Start:       $remote_fs $time
+# Required-Stop:        $remote_fs $time
+# Should-Start:         $network
+# Should-Stop:          $network
+# Default-Start:        2 3 4 5
+# Default-Stop:         0 1 6
+# Short-Description:    System logger
+### END INIT INFO
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+pidfile_syslogd=/var/run/syslogd.pid
+pidfile_klogd=/var/run/syslogd.pid
+binpath_syslogd=/sbin/syslogd
+binpath_klogd=/sbin/klogd
+
+test -x $binpath || exit 0
+
+test ! -r /etc/default/syslogd || . /etc/default/syslogd
+
+create_xconsole()
+{
+    # Only proceed if /dev/xconsole is used at all
+    if ! grep -q '^[^#].*/dev/xconsole' /etc/syslog.conf
+    then
+	return
+    fi
+
+    if [ ! -e /dev/xconsole ]; then
+	mknod -m 640 /dev/xconsole p
+    else
+	chmod 0640 /dev/xconsole
+    fi
+    chown root:adm /dev/xconsole
+    test ! -x /sbin/restorecon || /sbin/restorecon /dev/xconsole
+}
+
+log_begin_msg () {
+    echo -n $1
+}
+
+log_end_msg () {
+    echo $1
+}
+
+log_success_msg () {
+    echo $1
+}
+
+running()
+{
+    # No pidfile, probably no daemon present
+    #
+    if [ ! -f $pidfile ]
+    then
+	return 1
+    fi
+
+    pid=`cat $pidfile_syslogd`
+
+    # No pid, probably no daemon present
+    #
+    if [ -z "$pid" ]
+    then
+	return 1
+    fi
+
+    if [ ! -d /proc/$pid ]
+    then
+	return 1
+    fi
+
+    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1`
+
+    # No syslogd?
+    #
+    if [ "$cmd" != "$binpath" ]
+    then
+	return 1
+    fi
+
+    return 0
+}
+
+case "$1" in
+  start)
+    log_begin_msg "Starting system log daemon..."
+    create_xconsole
+    start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD
+    log_end_msg $?
+    log_begin_msg "Starting kernel log daemon..."
+    start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD
+    log_end_msg $?
+    ;;
+  stop)
+    log_begin_msg "Stopping system log daemon..."
+    start-stop-daemon --stop --quiet --pidfile $pidfile_syslogd --name syslogd
+    log_end_msg $?
+    log_begin_msg "Stopping kernel log daemon..."
+    start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd
+    log_end_msg $?
+    ;;
+  reload|force-reload)
+    log_begin_msg "Reloading system log daemon..."
+    start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile_syslogd --name syslogd
+    log_end_msg $?
+    log_begin_msg "Reloading kernel log daemon..."
+    start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd
+    start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD
+    log_end_msg $?
+    ;;
+  restart)
+    log_begin_msg "Restarting system log daemon..."
+    start-stop-daemon --stop --retry 5 --quiet --pidfile $pidfile_syslogd --name syslogd
+    start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD
+    log_end_msg $?
+    log_begin_msg "Reloading kernel log daemon..."
+    start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd
+    start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD
+    log_end_msg $?
+    ;;
+  reload-or-restart)
+    if running
+    then
+	$0 reload
+    else
+	$0 start
+    fi
+    ;;
+  *)
+    log_success_msg "Usage: /etc/init.d/sysklogd {start|stop|reload|restart|force-reload|reload-or-restart}"
+    exit 1
+esac
+
+exit 0
diff --git a/recipes/sysklogd/sysklogd.inc b/recipes/sysklogd/sysklogd.inc
index 5eb85a2943..f25af532dc 100644
--- a/recipes/sysklogd/sysklogd.inc
+++ b/recipes/sysklogd/sysklogd.inc
@@ -1,12 +1,20 @@
 LICENSE = "GPL"
 SECTION = "base"
 DESCRIPTION = "The sysklogd package implements two system log daemons."
+INC_PR = "r3"
 
 SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-${PV}.tar.gz \
-	   file://nonrootinstall.patch;patch=1"
+	       file://nonrootinstall.patch \
+           file://sysklogd"
+
+# syslog initscript is handled explicitly because order of
+# update-rc.d and update-alternatives is important (see below)
+DEPENDS_append = " update-rc.d update-rc.d-native"
+RDEPENDS_${PN}_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
+
+INITSCRIPT_NAME = "syslog"
 
 CFLAGS_append = " -DSYSV"
-RCONFLICTS = "busybox-syslog"
 
 do_install () {
 	install -d ${D}${mandir}/man8 \
@@ -18,13 +26,56 @@ do_install () {
     mv ${D}${base_sbindir}/klogd ${D}${base_sbindir}/klogd.${PN}
     install -d ${D}${sysconfdir}
     install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf
+    install -d ${D}${sysconfdir}/init.d
+    install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog.${PN}
 }
+
+pkg_preinst_${PN} () {
+    # all this is needed to avoid sysmlink errors,
+    # because update-rc.d runs before pkg_postinst :(
+    if [ -e ${sysconfdir}/init.d/syslog -a ! -L ${sysconfdir}/init.d/syslog ]; then
+        echo "WARNING:" "non symlink ${sysconfdir}/init.d/syslog exist -> backup to ${sysconfdir}/init.d/syslog.old"
+        mv ${sysconfdir}/init.d/syslog ${sysconfdir}/init.d/syslog.old
+    fi
+    if [ ! -e ${sysconfdir}/init.d/syslog ]; then
+        ln -s dummy ${sysconfdir}/init.d/syslog
+    fi
+}
+
 pkg_postinst_${PN} () {
     update-alternatives --install ${base_sbindir}/syslogd syslogd syslogd.${PN} 100
     update-alternatives --install ${base_sbindir}/klogd klogd klogd.${PN} 100
+    update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 100
+
+    if test "x$D" != "x"; then
+	OPT="-r $D"
+    else
+	OPT="-s"
+    fi
+    update-rc.d $OPT syslog defaults
 }
+
 pkg_prerm_${PN} () {
     update-alternatives --remove syslogd syslogd.${PN}
     update-alternatives --remove klogd klogd.${PN}
+
+    if test "x$D" = "x"; then
+	if test "$1" = "upgrade" -o "$1" = "remove"; then
+	    /etc/init.d/syslog stop
+	fi
+    fi
+    update-alternatives --remove syslog-init syslog.${PN}
 }
 
+pkg_postrm_${PN} () {
+    if test "x$D" != "x"; then
+	OPT="-r $D"
+    else
+	OPT=""
+    fi
+    if test "$1" = "remove" -o "$1" = "purge"; then
+	if ! test -e "/etc/init.d/syslog"; then
+	    update-rc.d $OPT syslog remove
+	fi
+    fi
+}
diff --git a/recipes/sysklogd/sysklogd_1.4.1.bb b/recipes/sysklogd/sysklogd_1.4.1.bb
index 3d938f5316..e02dd3e876 100644
--- a/recipes/sysklogd/sysklogd_1.4.1.bb
+++ b/recipes/sysklogd/sysklogd_1.4.1.bb
@@ -1,5 +1,5 @@
 require sysklogd.inc
-PR = "r1"
+PR = "${INC_PR}.1"
 
 
 SRC_URI[md5sum] = "d214aa40beabf7bdb0c9b3c64432c774"
diff --git a/recipes/sysklogd/sysklogd_1.5.bb b/recipes/sysklogd/sysklogd_1.5.bb
index 70e55c3eea..946cbd4410 100644
--- a/recipes/sysklogd/sysklogd_1.5.bb
+++ b/recipes/sysklogd/sysklogd_1.5.bb
@@ -1,7 +1,7 @@
 require sysklogd.inc
-PR = "r2"
+PR = "${INC_PR}.2"
 
-SRC_URI += "file://no-strip-install.patch;patch=1"
+SRC_URI += "file://no-strip-install.patch"
 
 SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b"
 SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773"
diff --git a/recipes/sysvinit/sysvinit/hipox/rcS-default b/recipes/sysvinit/sysvinit/hipox/rcS-default
new file mode 100644
index 0000000000..3fb4e53fa1
--- /dev/null
+++ b/recipes/sysvinit/sysvinit/hipox/rcS-default
@@ -0,0 +1,25 @@
+#
+#	Defaults for the boot scripts in /etc/rcS.d
+#
+
+# Time files in /tmp are kept in days.
+TMPTIME=0
+# Set to yes if you want sulogin to be spawned on bootup
+SULOGIN=no
+# Set to no if you want to be able to login over telnet/rlogin
+# before system startup is complete (as soon as inetd is started)
+DELAYLOGIN=no
+# Set UTC=yes if your system clock is set to UTC (GMT), and UTC=no if not.
+# UTC=yes
+# Set VERBOSE to "no" if you would like a more quiet bootup.
+VERBOSE=no
+# Set EDITMOTD to "no" if you don't want /etc/motd to be editted automatically
+EDITMOTD=no
+# Whether to fsck root on boot
+ENABLE_ROOTFS_FSCK=no
+# Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup.
+FSCKFIX=yes
+# Set TICKADJ to the correct tick value for this specific machine
+#TICKADJ=10000
+# Enable caching in populate-volatile.sh
+#VOLATILE_ENABLE_CACHE=yes
diff --git a/recipes/sysvinit/sysvinit_2.86.bb b/recipes/sysvinit/sysvinit_2.86.bb
index 145ca4c32f..40c642ab45 100644
--- a/recipes/sysvinit/sysvinit_2.86.bb
+++ b/recipes/sysvinit/sysvinit_2.86.bb
@@ -19,7 +19,7 @@ USE_VT ?= "1"
 SYSVINIT_ENABLED_GETTYS ?= "1"
 
 SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-${PV}.tar.gz \
-           file://install.patch;patch=1 \
+           file://install.patch \
            file://need \
            file://provide \
            file://inittab \
diff --git a/recipes/t1lib/t1lib_5.0.2.bb b/recipes/t1lib/t1lib_5.0.2.bb
index 86453bd705..923973406b 100644
--- a/recipes/t1lib/t1lib_5.0.2.bb
+++ b/recipes/t1lib/t1lib_5.0.2.bb
@@ -7,9 +7,9 @@ PR = "r6"
 
 LICENSE = "LGPL GPL"
 SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \
-           file://configure.patch;patch=1 \
-           file://install.patch;patch=1 \
-	   file://libtool.patch;patch=1"
+           file://configure.patch \
+           file://install.patch \
+	   file://libtool.patch"
 
 inherit autotools
 
diff --git a/recipes/taglib/taglib_1.4.bb b/recipes/taglib/taglib_1.4.bb
index e36d952b5b..c398dda3a1 100644
--- a/recipes/taglib/taglib_1.4.bb
+++ b/recipes/taglib/taglib_1.4.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 PR = "r2"
 
 SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \
-           file://taglib_1.4-8.diff.gz;patch=1"
+           file://taglib_1.4-8.diff.gz"
 S = "${WORKDIR}/taglib-${PV}"
 
 inherit autotools pkgconfig binconfig
diff --git a/recipes/taglib/taglib_1.5.bb b/recipes/taglib/taglib_1.5.bb
index 5f46278ccd..54bf126bd6 100644
--- a/recipes/taglib/taglib_1.5.bb
+++ b/recipes/taglib/taglib_1.5.bb
@@ -5,9 +5,9 @@ LICENSE = "LGPL"
 PR = "r2"
 
 SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \
-           file://add_missing_exports_fix.diff;patch=1 \
-	   file://gcc_visibility_feature.diff;patch=1 \
-	   file://link_interface_libraries_fix.diff;patch=1 \
+           file://add_missing_exports_fix.diff \
+	   file://gcc_visibility_feature.diff \
+	   file://link_interface_libraries_fix.diff \
 	  "
 
 S = "${WORKDIR}/taglib-${PV}"
diff --git a/recipes/tango/tango-icon-theme-extras_0.1.0.bb b/recipes/tango/tango-icon-theme-extras_0.1.0.bb
index b63b177be3..01332e142d 100644
--- a/recipes/tango/tango-icon-theme-extras_0.1.0.bb
+++ b/recipes/tango/tango-icon-theme-extras_0.1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "http://creativecommons.org/licenses/by-sa/2.5/"
 inherit autotools pkgconfig
 
 SRC_URI = "http://tango-project.org/releases/${PN}-${PV}.tar.gz \
-	   file://no-icon-naming-utils.patch;patch=1"
+	   file://no-icon-naming-utils.patch"
 EXTRA_OECONF = "--disable-icon-framing"
 FILES_${PN} += "${datadir}/icons"
 
diff --git a/recipes/tango/tango-icon-theme_0.7.2.bb b/recipes/tango/tango-icon-theme_0.7.2.bb
index 8e0a41c2fa..d8ef7bcb46 100644
--- a/recipes/tango/tango-icon-theme_0.7.2.bb
+++ b/recipes/tango/tango-icon-theme_0.7.2.bb
@@ -3,7 +3,7 @@ LICENSE = "http://creativecommons.org/licenses/by-sa/2.5/"
 inherit autotools pkgconfig
 
 SRC_URI = "http://tango.freedesktop.org/releases/${PN}-${PV}.tar.gz \
-	   file://no-icon-naming-utils.patch;patch=1"
+	   file://no-icon-naming-utils.patch"
 EXTRA_OECONF = "--disable-icon-framing"
 
 PACKAGE_ARCH = "all"
diff --git a/recipes/tango/tango-icon-theme_0.8.1.bb b/recipes/tango/tango-icon-theme_0.8.1.bb
index ec00e8ec3e..1775005446 100644
--- a/recipes/tango/tango-icon-theme_0.8.1.bb
+++ b/recipes/tango/tango-icon-theme_0.8.1.bb
@@ -3,7 +3,7 @@ LICENSE = "http://creativecommons.org/licenses/by-sa/2.5/"
 inherit autotools pkgconfig
 
 SRC_URI = "http://tango.freedesktop.org/releases/${PN}-${PV}.tar.gz \
-	   file://no-icon-naming-utils.patch;patch=1"
+	   file://no-icon-naming-utils.patch"
 EXTRA_OECONF = "--disable-icon-framing"
 
 PACKAGE_ARCH = "all"
diff --git a/recipes/tango/tango-icon-theme_0.8.90.bb b/recipes/tango/tango-icon-theme_0.8.90.bb
index 9e6f6ccf9d..186c82148a 100644
--- a/recipes/tango/tango-icon-theme_0.8.90.bb
+++ b/recipes/tango/tango-icon-theme_0.8.90.bb
@@ -4,7 +4,7 @@ LICENSE = "http://creativecommons.org/licenses/by-sa/2.5/"
 inherit gnome
 
 SRC_URI = "http://tango.freedesktop.org/releases/${PN}-${PV}.tar.gz \
-	   file://no-icon-naming-utils.patch;patch=1"
+	   file://no-icon-naming-utils.patch"
 EXTRA_OECONF = "--disable-icon-framing"
 
 PACKAGE_ARCH = "all"
diff --git a/recipes/tar/tar_1.13.93.bb b/recipes/tar/tar_1.13.93.bb
index 556f78209e..bd72a66d04 100644
--- a/recipes/tar/tar_1.13.93.bb
+++ b/recipes/tar/tar_1.13.93.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/tar/tar-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
-           file://m4.patch;patch=1"
+           file://configure.patch \
+           file://m4.patch"
 
 SRC_URI[md5sum] = "71bfeab35c9935631fc133f9d272b041"
 SRC_URI[sha256sum] = "0ef70273b6a54357c7823ed1f11015523f5cc5fe16df097e0b5300ae725c44e1"
diff --git a/recipes/tasks/angstrom-task-gnome.bb b/recipes/tasks/angstrom-task-gnome.bb
index 8b3f09bb4a..22c44589d3 100644
--- a/recipes/tasks/angstrom-task-gnome.bb
+++ b/recipes/tasks/angstrom-task-gnome.bb
@@ -12,7 +12,7 @@ XSERVER ?= "xserver-xorg \
            xf86-input-keyboard \
 "
 
-PR = "r11"
+PR = "r12"
 
 PACKAGES += "task-gnome-apps task-gnome-fonts task-gnome task-gnome-gstreamer task-gnome-perl task-gnome-pulseaudio task-gnome-themes task-gnome-totem task-gnome-xserver-base task-gnome-xserver"
 
@@ -200,7 +200,6 @@ RDEPENDS_task-gnome-xserver = " \
 PACKAGE_ARCH_task-gnome-xserver = "${MACHINE_ARCH}"
 
 RDEPENDS_${PN} = " \
-  task-gnome-apps \
   task-gnome-fonts \
   task-gnome \
   task-gnome-gstreamer \
diff --git a/recipes/tasks/angstrom-task-lxde.bb b/recipes/tasks/angstrom-task-lxde.bb
new file mode 100644
index 0000000000..eb474775af
--- /dev/null
+++ b/recipes/tasks/angstrom-task-lxde.bb
@@ -0,0 +1,59 @@
+DESCRIPTION = "Tasks for an LXDE based image"
+
+inherit task
+
+# Most of these tasks are arch independant
+PACKAGE_ARCH = "all"
+
+XSERVER ?= "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-fbdev \
+           xf86-input-keyboard \
+"
+
+PACKAGES += "task-lxde-apps task-lxde-xserver task-lxde-xserver-base"
+
+RDEPENDS_task-lxde-apps = " \
+  pcmanfm \
+  lxpanel \
+  lxsession-lite \
+  lxde-common \
+  openbox \
+  leafpad \
+  gpicview \
+"
+
+RDEPENDS_task-lxde-xserver-base = " \
+  dbus-x11 \
+  desktop-file-utils \
+  iso-codes \
+  mime-support \
+  notification-daemon inotify-tools \
+  xauth \
+  xdg-utils \
+  xhost \
+  xinetd \
+  xinit \
+  xlsfonts \
+  xrandr \
+  xrdb \
+  xrefresh \
+  xset \
+  xvinfo \
+ "
+
+RDEPENDS_task-lxde-xserver = " \
+  ${XSERVER} \
+"
+
+PACKAGE_ARCH_task-lxde-xserver = "${MACHINE_ARCH}"
+
+RDEPENDS_${PN} = " \
+	task-lxde-xserver-base \
+"
+
+RRECOMMENDS_${PN} = " \
+   task-lxde-xserver \
+"
+
diff --git a/recipes/tasks/task-beagleboard-demo.bb b/recipes/tasks/task-beagleboard-demo.bb
index f9867afeea..e0177e2611 100644
--- a/recipes/tasks/task-beagleboard-demo.bb
+++ b/recipes/tasks/task-beagleboard-demo.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Task for Beagleboard-demo-image"
 
-PR = "r15"
+PR = "r16"
 
 inherit task 
 
-ECONFIG ?= "places e-wm-config-angstrom e-wm-config-angstrom-touchscreen e-wm-config-angstrom-widescreen e-wm-config-default"
+ECONFIG ?= "places e-wm-config-angstrom e-wm-config-angstrom-widescreen e-wm-config-default"
 EMENU ?= "e-wm-menu"
 
 RDEPENDS_${PN} = "\
diff --git a/recipes/tasks/task-cli-tools.bb b/recipes/tasks/task-cli-tools.bb
index 4f367faeee..0d2aa009f4 100644
--- a/recipes/tasks/task-cli-tools.bb
+++ b/recipes/tasks/task-cli-tools.bb
@@ -3,13 +3,14 @@ DESCRIPTION_${PN}-debug = "A set of command line tools useful for debugging"
 SECTION = "console"
 LICENSE = "MIT"
 PV = "1.0"
-PR = "r15"
+PR = "r18"
 
 inherit task
 
 PACKAGES += "${PN}-debug"
 
 RDEPENDS_${PN} = "\
+  dbus-daemon-proxy \
   dosfstools \
   htop \
   iptables \
@@ -20,6 +21,7 @@ RDEPENDS_${PN} = "\
   mterm2 \
   nano \
   nfs-utils-client \
+  nmon \
   powertop \
   screen \
   socat \
@@ -32,6 +34,7 @@ RDEPENDS_${PN}-debug = "\
   i2c-tools \
   gdb \
   ltrace \
+  mkdump \
   mioctl \
   procps \
   pxaregs \
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 1fa929efcf..79ef8ed156 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Feed"
-PR = "r52"
+PR = "r56"
 PV = "1.0"
 LICENSE = "GPL"
 
@@ -64,7 +64,6 @@ RDEPENDS_${PN} += "\
 		pingus \
 		openmoocow \
 		python-pygame \
-		mokoko \
 #		exhibit \
 		obexpush \
 		obexftp \
@@ -95,7 +94,7 @@ RDEPENDS_${PN} += "\
 		intone \
 		vim \
 		vpnc \
-#		emacs \
+		emacs-x11 \
 		mcabber \
 		gdb \
 		oh-puzzles \
@@ -206,7 +205,6 @@ RDEPENDS_${PN} += "\
 #		msn-pecan \
 		qwo \
 		fso-apm \
-		fso-abyss \
 		fsousaged \
 		fsodeviced \
 		fsonetworkd \
@@ -286,6 +284,8 @@ RDEPENDS_${PN} += "\
 		podboy \
 		mcnavi \
 		neolight \
+		spojegui \
+		dbus-daemon-proxy \
 "
 
 # this is only usefull on gta02 and on other devices it's trying to pull mesa-dri (not respecting DEFAULT_PROVIDER for virtual/libgl)
diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index d3c4713421..d4be115db1 100644
--- a/recipes/tasks/task-shr-minimal.bb
+++ b/recipes/tasks/task-shr-minimal.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Lite Image Feed"
-PR = "r30"
+PR = "r31"
 PV = "2.0"
 LICENSE = "GPL"
 
@@ -121,7 +121,6 @@ RDEPENDS_${PN}-x = "\
 "
 
 RDEPENDS_${PN}-apps = "\
-  fso-abyss \
   task-fso2-compliance \
   phoneui-apps-messages \
   phoneui-apps-contacts \
diff --git a/recipes/tasks/task-shr.bb b/recipes/tasks/task-shr.bb
index dfa5c7cafb..c5b5b3e9ff 100644
--- a/recipes/tasks/task-shr.bb
+++ b/recipes/tasks/task-shr.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Fat Image Feed"
-PR = "r7"
+PR = "r8"
 PV = "2.0"
 LICENSE = "GPL"
 
@@ -25,7 +25,7 @@ RDEPENDS_${PN}-gtk = "\
 RDEPENDS_${PN}-apps += "\
    task-shr-minimal-apps \
 	opimd-utils-notes \
-	mokonnect \
+	iliwi \
 	ventura \
 	intone \
 "
diff --git a/recipes/tasks/task-x11.bb b/recipes/tasks/task-x11.bb
index db45ab9380..5eeb8bafbf 100644
--- a/recipes/tasks/task-x11.bb
+++ b/recipes/tasks/task-x11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b
 SECTION = "x11/server"
 LICENSE = "MIT"
 PV = "1.0"
-PR = "r3"
+PR = "r4"
 
 # WORK IN PROGRESS
 
@@ -21,6 +21,8 @@ RRECOMMENDS_${PN} = "\
 # Some machines don't set a *runtime* provider for X, so default to Xfbdev here
 # virtual/xserver won't work, since the kdrive recipes will build multiple xserver packages
 XSERVER ?= "xserver-kdrive-fbdev"
+XSERVER_COMMON ?= "xserver-kdrive-common"
+XSERVER_COMMON_shr = "xserver-common"
 
 # This is also the reason why we have to make this package machine specific :/
 PACKAGE_ARCH_${PN}-server = "${MACHINE_ARCH}"
@@ -30,7 +32,7 @@ RDEPENDS_${PN}-server = "\
 "
 
 RDEPENDS_${PN}-utils = "\
-  xserver-kdrive-common \
+  ${XSERVER_COMMON} \
   xserver-nodm-init \
   xauth \
   xhost \
diff --git a/recipes/tcltk/tcl-8.5.8/confsearch.diff b/recipes/tcltk/tcl-8.5.8/confsearch.diff
new file mode 100644
index 0000000000..f38dbca3c4
--- /dev/null
+++ b/recipes/tcltk/tcl-8.5.8/confsearch.diff
@@ -0,0 +1,22 @@
+Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
+and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
+installation.
+
+--- tcl8.5-8.5.8.orig/unix/tcl.m4
++++ tcl8.5-8.5.8/unix/tcl.m4
+@@ -93,6 +93,7 @@
+ 			`ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` \
+ 			`ls -d /usr/contrib/lib 2>/dev/null` \
++			`ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			; do
+ 		    if test -f "$i/tclConfig.sh" ; then
+@@ -223,6 +224,7 @@
+ 			`ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` \
+ 			`ls -d /usr/contrib/lib 2>/dev/null` \
++			`ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			; do
+ 		    if test -f "$i/tkConfig.sh" ; then
diff --git a/recipes/tcltk/tcl-8.5.8/manpages.diff b/recipes/tcltk/tcl-8.5.8/manpages.diff
new file mode 100644
index 0000000000..3dd75b8408
--- /dev/null
+++ b/recipes/tcltk/tcl-8.5.8/manpages.diff
@@ -0,0 +1,23 @@
+Patch by Chris Waters fixes installing of several manual pages which
+aren't installed by upstream script but are referenced inside other
+manual pages.
+
+--- tcl8.5-8.5.8.orig/unix/installManPage
++++ tcl8.5-8.5.8/unix/installManPage
+@@ -48,8 +48,16 @@
+     *.n) SECTION=n ;;
+ esac
+ 
++NAME=`basename $MANPAGE .$SECTION`
+ SRCDIR=`dirname $MANPAGE`
+ 
++SPECIALS="DString Thread Notifier RegExp"
++for n in $SPECIALS; do
++    if [ "$NAME" = "$n" ] ; then
++	NAMES="$n $NAMES"
++    fi
++done
++
+ FIRST=""
+ for f in $NAMES; do
+     f=$f.$SECTION$SUFFIX
diff --git a/recipes/tcltk/tcl-8.5.8/mips.diff b/recipes/tcltk/tcl-8.5.8/mips.diff
new file mode 100644
index 0000000000..59f3e3251f
--- /dev/null
+++ b/recipes/tcltk/tcl-8.5.8/mips.diff
@@ -0,0 +1,23 @@
+Patch by Sergei Golovan "fixes" building Tcl 8.5.8 for MIPS architectures
+until a proper solution isn't suggested.
+
+--- tcl8.5-8.5.8.orig/generic/tclStrToD.c
++++ tcl8.5-8.5.8/generic/tclStrToD.c
+@@ -73,7 +73,7 @@
+  * MIPS floating-point units need special settings in control registers
+  * to use gradual underflow as we expect.
+  */
+-#if defined(__mips)
++#if 0 && defined(__mips)
+ #include <sys/fpu.h>
+ #endif
+ /*
+@@ -2166,7 +2166,7 @@
+     } bitwhack;
+ #endif
+ 
+-#if defined(__mips)
++#if 0 && defined(__mips)
+     union fpc_csr mipsCR;
+ 
+     mipsCR.fc_word = get_fpc_csr();
diff --git a/recipes/tcltk/tcl-8.5.8/non-linux.diff b/recipes/tcltk/tcl-8.5.8/non-linux.diff
new file mode 100644
index 0000000000..bfc755b643
--- /dev/null
+++ b/recipes/tcltk/tcl-8.5.8/non-linux.diff
@@ -0,0 +1,55 @@
+Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
+building on non-linux Debian architectures.
+
+--- tcl8.5-8.5.8.orig/unix/configure
++++ tcl8.5-8.5.8/unix/configure
+@@ -6536,6 +6536,9 @@
+ 		if test "`uname -s`" = "AIX" ; then
+ 		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
+ 		fi
++		if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
++		    system=NetBSD-Debian
++		fi
+ 	    fi
+ 	fi
+ 
+@@ -7340,7 +7343,7 @@
+ fi
+ 
+ 	    ;;
+-	Linux*)
++	Linux*|GNU*|NetBSD-Debian)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+--- tcl8.5-8.5.8.orig/unix/Makefile.in
++++ tcl8.5-8.5.8/unix/Makefile.in
+@@ -172,6 +172,7 @@
+ SHLIB_LD		= @SHLIB_LD@
+ SHLIB_CFLAGS		= @SHLIB_CFLAGS@
+ SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
++SHLIB_LD_FLAGS		= @SHLIB_LD_FLAGS@
+ TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
+ 
+ SHLIB_SUFFIX		= @SHLIB_SUFFIX@
+--- tcl8.5-8.5.8.orig/unix/tcl.m4
++++ tcl8.5-8.5.8/unix/tcl.m4
+@@ -962,6 +962,9 @@
+ 		if test "`uname -s`" = "AIX" ; then
+ 		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
+ 		fi
++		if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
++		    tcl_cv_sys_version=NetBSD-Debian
++		fi
+ 	    fi
+ 	fi
+     ])
+@@ -1422,7 +1425,7 @@
+ 	        ])
+ 	    ])
+ 	    ;;
+-	Linux*)
++	Linux*|GNU*|NetBSD-Debian)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
diff --git a/recipes/tcltk/tcl-8.5.8/rpath.diff b/recipes/tcltk/tcl-8.5.8/rpath.diff
new file mode 100644
index 0000000000..beab6508ca
--- /dev/null
+++ b/recipes/tcltk/tcl-8.5.8/rpath.diff
@@ -0,0 +1,41 @@
+Patch by Chris Waters removes -rpath from search flags and adds -soname
+to library build options.
+
+--- tcl8.5-8.5.8.orig/unix/configure
++++ tcl8.5-8.5.8/unix/configure
+@@ -7351,6 +7351,9 @@
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
++	    # following line added by CW for Debian GNU/Linux
++	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
++
+ 	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+--- tcl8.5-8.5.8.orig/unix/Makefile.in
++++ tcl8.5-8.5.8/unix/Makefile.in
+@@ -729,7 +729,10 @@
+ 	    fi
+ 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+ 	@@INSTALL_LIB@
+-	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
++	mv "$(LIB_INSTALL_DIR)"/$(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0
++	ln -sf $(LIB_FILE).0 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
++	ln -sf "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0 ./
++	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0
+ 	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
+ 	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
+--- tcl8.5-8.5.8.orig/unix/tcl.m4
++++ tcl8.5-8.5.8/unix/tcl.m4
+@@ -1433,6 +1433,9 @@
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
++	    # following line added by CW for Debian GNU/Linux
++	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
++
+ 	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
diff --git a/recipes/tcltk/tcl-8.5.8/tcllibrary.diff b/recipes/tcltk/tcl-8.5.8/tcllibrary.diff
new file mode 100644
index 0000000000..f61e788019
--- /dev/null
+++ b/recipes/tcltk/tcl-8.5.8/tcllibrary.diff
@@ -0,0 +1,22 @@
+--- tcl8.5-8.5.8.orig/unix/configure
++++ tcl8.5-8.5.8/unix/configure
+@@ -18808,7 +18808,7 @@
+ 
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+ 
+-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ 
+--- tcl8.5-8.5.8.orig/unix/configure.in
++++ tcl8.5-8.5.8/unix/configure.in
+@@ -734,7 +734,7 @@
+ 
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+ 
+-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ 
diff --git a/recipes/tcltk/tcl-8.5.8/tclpackagepath.diff b/recipes/tcltk/tcl-8.5.8/tclpackagepath.diff
new file mode 100644
index 0000000000..a9511566e7
--- /dev/null
+++ b/recipes/tcltk/tcl-8.5.8/tclpackagepath.diff
@@ -0,0 +1,32 @@
+Patch by Sergei Golovan allows to specify TCL_PACKAGE_PATH at configure stage
+without adding /usr/lib to it. It helps to put the policy compliant value to
+::tcl_pkgPath variable and to TCL_PACKAGE_PATH variable in tclConfig.sh.
+
+--- tcl8.5-8.5.8.orig/unix/configure
++++ tcl8.5-8.5.8/unix/configure
+@@ -18945,9 +18945,9 @@
+     test -z "$TCL_MODULE_PATH"  && \
+ 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
+ elif test "$prefix/lib" != "$libdir"; then
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
++    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+ else
+-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib"
+ fi
+ 
+ #--------------------------------------------------------------------
+--- tcl8.5-8.5.8.orig/unix/configure.in
++++ tcl8.5-8.5.8/unix/configure.in
+@@ -833,9 +833,9 @@
+     test -z "$TCL_MODULE_PATH"  && \
+ 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
+ elif test "$prefix/lib" != "$libdir"; then
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
++    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+ else
+-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib"
+ fi
+ 
+ #--------------------------------------------------------------------
diff --git a/recipes/tcltk/tcl-8.5.8/tclport.diff b/recipes/tcltk/tcl-8.5.8/tclport.diff
new file mode 100644
index 0000000000..d434663d0c
--- /dev/null
+++ b/recipes/tcltk/tcl-8.5.8/tclport.diff
@@ -0,0 +1,14 @@
+Patch by Stanislav Maslovski <stanislav.maslovski@gmail.com>.
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488491
+
+--- tcl8.5-8.5.8.orig/generic/tclPort.h
++++ tcl8.5-8.5.8/generic/tclPort.h
+@@ -24,7 +24,7 @@
+ #if defined(__WIN32__)
+ #   include "tclWinPort.h"
+ #else
+-#   include "tclUnixPort.h"
++#   include "../unix/tclUnixPort.h"
+ #endif
+ 
+ #if !defined(LLONG_MIN)
diff --git a/recipes/tcltk/tcl-8.5.8/tclprivate.diff b/recipes/tcltk/tcl-8.5.8/tclprivate.diff
new file mode 100644
index 0000000000..3d4ca57c8c
--- /dev/null
+++ b/recipes/tcltk/tcl-8.5.8/tclprivate.diff
@@ -0,0 +1,41 @@
+Patch by Chris Waters sets paths which are normally point to a directory
+with Tcl sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
+puts private Tcl headers there).
+
+--- tcl8.5-8.5.8.orig/unix/tclConfig.sh.in
++++ tcl8.5-8.5.8/unix/tclConfig.sh.in
+@@ -111,7 +111,7 @@
+ 
+ # String to pass to linker to pick up the Tcl library from its
+ # build directory.
+-TCL_BUILD_LIB_SPEC='@TCL_BUILD_LIB_SPEC@'
++TCL_BUILD_LIB_SPEC='@TCL_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the Tcl library from its
+ # installed directory.
+@@ -146,7 +146,7 @@
+ # different place than the directory containing the source files, this
+ # points to the location of the sources, not the location where Tcl was
+ # compiled.
+-TCL_SRC_DIR='@TCL_SRC_DIR@'
++TCL_SRC_DIR='@includedir@/tcl-private'
+ 
+ # List of standard directories in which to look for packages during
+ # "package require" commands.  Contains the "prefix" directory plus also
+@@ -164,14 +164,14 @@
+ 
+ # String to pass to linker to pick up the Tcl stub library from its
+ # build directory.
+-TCL_BUILD_STUB_LIB_SPEC='@TCL_BUILD_STUB_LIB_SPEC@'
++TCL_BUILD_STUB_LIB_SPEC='@TCL_STUB_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the Tcl stub library from its
+ # installed directory.
+ TCL_STUB_LIB_SPEC='@TCL_STUB_LIB_SPEC@'
+ 
+ # Path to the Tcl stub library in the build directory.
+-TCL_BUILD_STUB_LIB_PATH='@TCL_BUILD_STUB_LIB_PATH@'
++TCL_BUILD_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
+ 
+ # Path to the Tcl stub library in the install directory.
+ TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
diff --git a/recipes/tcltk/tcl_8.4.19.bb b/recipes/tcltk/tcl_8.4.19.bb
index da044051df..a4a92a121f 100644
--- a/recipes/tcltk/tcl_8.4.19.bb
+++ b/recipes/tcltk/tcl_8.4.19.bb
@@ -6,8 +6,8 @@ PR = "r4"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
-  file://tcl-add-soname.patch;patch=1;pnum=2 \
-#  file://fix-configure.patch;patch=1;pnum=2 \
+  file://tcl-add-soname.patch;striplevel=2 \
+#  file://fix-configure.patch;striplevel=2 \
 "
 S = "${WORKDIR}/tcl${PV}/unix"
 
diff --git a/recipes/tcltk/tcl_8.5.8.bb b/recipes/tcltk/tcl_8.5.8.bb
new file mode 100644
index 0000000000..2209ca4948
--- /dev/null
+++ b/recipes/tcltk/tcl_8.5.8.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "Tool Command Language"
+LICENSE = "tcl"
+SECTION = "devel/tcltk"
+HOMEPAGE = "http://tcl.sourceforge.net"
+
+PR = "r6"
+
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
+  file://confsearch.diff;striplevel=2 \
+  file://manpages.diff;striplevel=2 \
+  file://non-linux.diff;striplevel=2 \
+  file://rpath.diff;striplevel=2 \
+  file://tcllibrary.diff;striplevel=2 \
+  file://tclpackagepath.diff;striplevel=2 \
+  file://tclprivate.diff;striplevel=2 \
+"
+
+SRC_URI[md5sum] = "7f123e53b3daaaba2478d3af5a0752e3"
+SRC_URI[sha256sum] = "6b090c1024038d0381e1ccfbd6d5c0f0e6ef205269ceb9d28bd7bd7ac5bbf4a7"
+
+S = "${WORKDIR}/tcl${PV}/unix"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "--enable-threads"
+
+do_compile_prepend() {
+	echo > ../compat/fixstrtod.c
+	sed -i -e 's:./tclsh :tclsh :g' Makefile
+}
+
+BINCONFIG_GLOB = "*Config.sh"
+
+do_install() {
+	autotools_do_install
+	# Stage a few extra headers to make tk happy
+	install -d ${D}${includedir}/tcl-${PV}/generic
+	install -m 0644 ../generic/*.h ${D}${includedir}/tcl-${PV}/generic
+	install -m 0644 *.h ${D}${includedir}/tcl-${PV}/generic
+	install -d ${D}${includedir}/tcl-${PV}/unix
+	install -m 0644 *Unix*.h ${D}${includedir}/tcl-${PV}/unix/
+	rm -f ${D}${includedir}/regex.h
+	ln -sf tclsh8.5 ${D}${bindir}/tclsh
+}
+
+SYSROOT_PREPROCESS_FUNCS =+ "tcl_sysroot"
+
+tcl_sysroot() {
+	sed -i 's:/usr/include/tcl-private:${STAGING_INCDIR}/tcl-${PV}:' tclConfig.sh
+}
+
+PACKAGES =+ "${PN}-lib"
+FILES_${PN}-lib = "${libdir}/libtcl8.5.so.*"
+FILES_${PN} += "${libdir}/tcl*"
+FILES_${PN}-dev += "${libdir}/tclConfig.sh"
+
diff --git a/recipes/tcltk/tk-8.5.8/canvasps.diff b/recipes/tcltk/tk-8.5.8/canvasps.diff
new file mode 100644
index 0000000000..5cb9a6ae43
--- /dev/null
+++ b/recipes/tcltk/tk-8.5.8/canvasps.diff
@@ -0,0 +1,23 @@
+Patch by Sergei Golovan.
+
+It ensures that font size is positive (measured in pixels). This fixes
+mirrored text problem in canvas postscript output.
+
+--- tk8.5-8.5.5.orig/unix/tkUnixRFont.c
++++ tk8.5-8.5.5/unix/tkUnixRFont.c
+@@ -260,6 +260,7 @@
+     ftFont = GetFont(fontPtr, 0);
+     fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
+     GetTkFontAttributes(ftFont, &fontPtr->font.fa);
++    fontPtr->font.fa.size = TkFontGetPoints(tkwin, fontPtr->font.fa.size);
+     GetTkFontMetrics(ftFont, &fontPtr->font.fm);
+ 
+     return fontPtr;
+@@ -518,6 +519,7 @@
+ 
+     GetTkFontAttributes(ftFont, faPtr);
+     faPtr->underline = fontPtr->font.fa.underline;
++    faPtr->size = TkFontGetPoints(tkwin, faPtr->size);
+     faPtr->overstrike = fontPtr->font.fa.overstrike;
+ }
+ 
diff --git a/recipes/tcltk/tk-8.5.8/confsearch.diff b/recipes/tcltk/tk-8.5.8/confsearch.diff
new file mode 100644
index 0000000000..c51e475426
--- /dev/null
+++ b/recipes/tcltk/tk-8.5.8/confsearch.diff
@@ -0,0 +1,32 @@
+Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
+and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
+installation.
+
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -1431,6 +1431,7 @@
+ 			`ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` \
+ 			`ls -d /usr/contrib/lib 2>/dev/null` \
++			`ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			; do
+ 		    if test -f "$i/tclConfig.sh" ; then
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.5-8.5.8/unix/tcl.m4
+@@ -93,6 +93,7 @@
+ 			`ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` \
+ 			`ls -d /usr/contrib/lib 2>/dev/null` \
++			`ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			; do
+ 		    if test -f "$i/tclConfig.sh" ; then
+@@ -223,6 +224,7 @@
+ 			`ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` \
+ 			`ls -d /usr/contrib/lib 2>/dev/null` \
++			`ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			; do
+ 		    if test -f "$i/tkConfig.sh" ; then
diff --git a/recipes/tcltk/tk-8.5.8/fix-xft.diff b/recipes/tcltk/tk-8.5.8/fix-xft.diff
new file mode 100644
index 0000000000..d1bb7105c6
--- /dev/null
+++ b/recipes/tcltk/tk-8.5.8/fix-xft.diff
@@ -0,0 +1,16 @@
+--- /tmp/configure.in	2010-05-19 13:29:03.000000000 +0200
++++ unix/configure.in	2010-05-19 13:42:05.000000000 +0200
+@@ -526,13 +526,9 @@
+ 	found_xft="yes"
+ 	dnl make sure package configurator (xft-config or pkg-config
+ 	dnl says that xft is present.
+-	XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
+-	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
+-	if test "$found_xft" = "no" ; then
+ 	    found_xft=yes
+ 	    XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+ 	    XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
+-	fi
+ 	AC_MSG_RESULT([$found_xft])
+ 	dnl make sure that compiling against Xft header file doesn't bomb
+ 	if test "$found_xft" = "yes" ; then
diff --git a/recipes/tcltk/tk-8.5.8/fontsize.diff b/recipes/tcltk/tk-8.5.8/fontsize.diff
new file mode 100644
index 0000000000..a3df0bc29a
--- /dev/null
+++ b/recipes/tcltk/tk-8.5.8/fontsize.diff
@@ -0,0 +1,21 @@
+Patch by Sergei Golovan fixes mirroring font in canvas postscript when its
+size is specified in pixels (negative).
+
+--- tk8.5-8.5.4.orig/unix/tkUnixRFont.c
++++ tk8.5-8.5.4/unix/tkUnixRFont.c
+@@ -260,6 +260,7 @@
+     ftFont = GetFont(fontPtr, 0);
+     fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
+     GetTkFontAttributes(ftFont, &fontPtr->font.fa);
++    fontPtr->font.fa.size = TkFontGetPoints(tkwin, fontPtr->font.fa.size);
+     GetTkFontMetrics(ftFont, &fontPtr->font.fm);
+ 
+     return fontPtr;
+@@ -517,6 +518,7 @@
+ 				/* Actual font used to render the character */
+ 
+     GetTkFontAttributes(ftFont, faPtr);
++    faPtr->size = TkFontGetPoints(tkwin, faPtr->size);
+     faPtr->underline = fontPtr->font.fa.underline;
+     faPtr->overstrike = fontPtr->font.fa.overstrike;
+ }
diff --git a/recipes/tcltk/tk-8.5.8/manpages.diff b/recipes/tcltk/tk-8.5.8/manpages.diff
new file mode 100644
index 0000000000..a0620bd2ce
--- /dev/null
+++ b/recipes/tcltk/tk-8.5.8/manpages.diff
@@ -0,0 +1,23 @@
+Patch by Chris Waters fixes installing of several manual pages which
+aren't installed by upstream script but are referenced inside other
+manual pages.
+
+--- tk8.5-8.5.8.orig/unix/installManPage
++++ tk8.5-8.5.8/unix/installManPage
+@@ -51,7 +51,16 @@
+     }' $MANPAGE`
+ 
+ SECTION=`echo $MANPAGE | sed 's/.*\(.\)$/\1/'`
++NAME=`basename $MANPAGE .$SECTION`
+ SRCDIR=`dirname $MANPAGE`
++
++SPECIALS="FindPhoto"
++for n in $SPECIALS; do
++    if [ "$NAME" = "$n" ] ; then
++	NAMES="$n $NAMES"
++    fi
++done
++
+ FIRST=""
+ for f in $NAMES; do
+     f=$f.$SECTION$SUFFIX
diff --git a/recipes/tcltk/tk-8.5.8/non-linux.diff b/recipes/tcltk/tk-8.5.8/non-linux.diff
new file mode 100644
index 0000000000..9309fc48e1
--- /dev/null
+++ b/recipes/tcltk/tk-8.5.8/non-linux.diff
@@ -0,0 +1,45 @@
+Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
+building on non-linux Debian architectures.
+
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -4742,6 +4742,9 @@
+ 		if test "`uname -s`" = "AIX" ; then
+ 		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
+ 		fi
++		if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
++		    tcl_cv_sys_version=NetBSD-Debian
++		fi
+ 	    fi
+ 	fi
+ 
+@@ -5546,7 +5549,7 @@
+ fi
+ 
+ 	    ;;
+-	Linux*)
++	Linux*|GNU*|NetBSD-Debian)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.5-8.5.8/unix/tcl.m4
+@@ -962,6 +962,9 @@
+ 		if test "`uname -s`" = "AIX" ; then
+ 		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
+ 		fi
++		if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
++		    tcl_cv_sys_version=NetBSD-Debian
++		fi
+ 	    fi
+ 	fi
+     ])
+@@ -1422,7 +1425,7 @@
+ 	        ])
+ 	    ])
+ 	    ;;
+-	Linux*)
++	Linux*|GNU*|NetBSD-Debian)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
diff --git a/recipes/tcltk/tk-8.5.8/rpath.diff b/recipes/tcltk/tk-8.5.8/rpath.diff
new file mode 100644
index 0000000000..81169aab25
--- /dev/null
+++ b/recipes/tcltk/tk-8.5.8/rpath.diff
@@ -0,0 +1,40 @@
+Patch by Chris Waters removes -rpath from search flags and adds -soname
+to library build options.
+
+Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
+
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -5557,6 +5557,9 @@
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
++	    # following line added by CW for Debian GNU/Linux
++	    TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0"
++
+ 	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+--- tk8.5-8.5.8.orig/unix/Makefile.in
++++ tk8.5-8.5.8/unix/Makefile.in
+@@ -713,7 +713,7 @@
+ 	    echo "if {[catch {package present Tcl 8.5.0}]} { return }";\
+ 	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
+ 	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
+-		[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
++		[list load [file join $(LIB_RUNTIME_DIR) $(TK_LIB_FILE).0] Tk]";\
+ 	    ) > "$(PKG_INDEX)"; \
+ 	    fi
+ 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.5-8.5.8/unix/tcl.m4
+@@ -1433,6 +1433,9 @@
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
++	    # following line added by CW for Debian GNU/Linux
++	    TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0"
++
+ 	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
diff --git a/recipes/tcltk/tk-8.5.8/tklibrary.diff b/recipes/tcltk/tk-8.5.8/tklibrary.diff
new file mode 100644
index 0000000000..ee38c2a1a5
--- /dev/null
+++ b/recipes/tcltk/tk-8.5.8/tklibrary.diff
@@ -0,0 +1,22 @@
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -11070,7 +11070,7 @@
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+ 
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)'
+--- tk8.5-8.5.8.orig/unix/configure.in
++++ tk8.5-8.5.8/unix/configure.in
+@@ -607,7 +607,7 @@
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+ 
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)'
diff --git a/recipes/tcltk/tk-8.5.8/tkport.diff b/recipes/tcltk/tk-8.5.8/tkport.diff
new file mode 100644
index 0000000000..1f7d072d26
--- /dev/null
+++ b/recipes/tcltk/tk-8.5.8/tkport.diff
@@ -0,0 +1,14 @@
+Patch by Stanislav Maslovski <stanislav.maslovski@gmail.com>.
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488501
+
+--- tk8.5-8.5.8.orig/generic/tkPort.h
++++ tk8.5-8.5.8/generic/tkPort.h
+@@ -29,7 +29,7 @@
+ #   if defined(MAC_OSX_TK)
+ #	include "tkMacOSXPort.h"
+ #   else
+-#	include "tkUnixPort.h"
++#	include "../unix/tkUnixPort.h"
+ #   endif
+ #endif
+ 
diff --git a/recipes/tcltk/tk-8.5.8/tkprivate.diff b/recipes/tcltk/tk-8.5.8/tkprivate.diff
new file mode 100644
index 0000000000..4e15469736
--- /dev/null
+++ b/recipes/tcltk/tk-8.5.8/tkprivate.diff
@@ -0,0 +1,41 @@
+Patch by Chris Waters sets path which are normally point to a directory
+with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
+puts private Tk headers there).
+
+--- tk8.5-8.5.8.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.8/unix/tkConfig.sh.in
+@@ -55,7 +55,7 @@
+ 
+ # String to pass to linker to pick up the Tk library from its
+ # build directory.
+-TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@'
++TK_BUILD_LIB_SPEC='@TK_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the Tk library from its
+ # installed directory.
+@@ -71,7 +71,7 @@
+ # different place than the directory containing the source files, this
+ # points to the location of the sources, not the location where Tk was
+ # compiled.
+-TK_SRC_DIR='@TK_SRC_DIR@'
++TK_SRC_DIR='@includedir@/tk-private'
+ 
+ # Needed if you want to make a 'fat' shared library library
+ # containing tk objects or link a different wish.
+@@ -86,14 +86,14 @@
+ 
+ # String to pass to linker to pick up the Tk stub library from its
+ # build directory.
+-TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@'
++TK_BUILD_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the Tk stub library from its
+ # installed directory.
+ TK_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@'
+ 
+ # Path to the Tk stub library in the build directory.
+-TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@'
++TK_BUILD_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
+ 
+ # Path to the Tk stub library in the install directory.
+ TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
diff --git a/recipes/tcltk/tk_8.4.19.bb b/recipes/tcltk/tk_8.4.19.bb
index bc4b477f71..68a89254b1 100644
--- a/recipes/tcltk/tk_8.4.19.bb
+++ b/recipes/tcltk/tk_8.4.19.bb
@@ -7,9 +7,9 @@ PR = "r0"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
-  file://disable-xim.patch;patch=1;pnum=0 \
-  file://tk-add-soname.patch;patch=1;pnum=2 \
-#  file://fix-configure.patch;patch=1;pnum=2 \
+  file://disable-xim.patch;striplevel=0 \
+  file://tk-add-soname.patch;striplevel=2 \
+#  file://fix-configure.patch;striplevel=2 \
 "
 S = "${WORKDIR}/tk${PV}/unix"
 
diff --git a/recipes/tcltk/tk_8.5.8.bb b/recipes/tcltk/tk_8.5.8.bb
new file mode 100644
index 0000000000..7637b7b5f2
--- /dev/null
+++ b/recipes/tcltk/tk_8.5.8.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "Tool Command Language ToolKit Extension"
+LICENSE = "tcl"
+SECTION = "devel/tcltk"
+HOMEPAGE = "http://tcl.sourceforge.net"
+DEPENDS = "tcl virtual/libx11 libxt"
+
+PR = "r1"
+
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
+  file://confsearch.diff;striplevel=2 \
+  file://manpages.diff;striplevel=2 \
+  file://non-linux.diff;striplevel=2 \
+  file://rpath.diff;striplevel=2 \
+  file://tklibrary.diff;striplevel=2 \
+  file://tkprivate.diff;striplevel=2 \
+  file://fix-xft.diff \
+"
+
+SRC_URI[md5sum] = "13bf90602e16fc530e05196431021dc6"
+SRC_URI[sha256sum] = "9737da5c30e631281062b6acbb4753840f9e95657c78e37657d9c520589ab2d4"
+
+S = "${WORKDIR}/tk${PV}/unix"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+  --enable-threads \
+  --with-tcl=${STAGING_BINDIR_CROSS} \
+  --x-includes=${STAGING_INCDIR} \
+  --x-libraries=${STAGING_LIBDIR} \
+"
+
+BINCONFIG_GLOB = "*Config.sh"
+
+do_install() {
+	autotools_do_install
+	mv libtk8.5.so libtk8.5.so.0
+	oe_libinstall -so libtk8.5 ${D}${libdir}
+	ln -sf wish8.5 ${D}${bindir}/wish
+}
+
+PACKAGES =+ "${PN}-lib"
+FILES_${PN}-lib = "${libdir}/libtk8.5.so.*"
+FILES_${PN} += "${libdir}/tk*"
+
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/01_man_portability b/recipes/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
index 4963f82eb8..4963f82eb8 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/01_man_portability
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching b/recipes/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
index a168f6d5a5..a168f6d5a5 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname b/recipes/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
index d06aaef13b..d06aaef13b 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6 b/recipes/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
index 5c8be5c27c..5c8be5c27c 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist b/recipes/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
index 0238e35208..0238e35208 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix b/recipes/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
index 88a2b5e43b..88a2b5e43b 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config b/recipes/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
index 60ca594bee..60ca594bee 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym b/recipes/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
index c089b33257..c089b33257 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support b/recipes/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
index 0e1ecf5b4a..0e1ecf5b4a 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify b/recipes/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
index 913ed987d6..913ed987d6 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port b/recipes/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
index e35fc7ecd9..e35fc7ecd9 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/have_strerror b/recipes/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
index 31c2b92278..31c2b92278 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/have_strerror
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags b/recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
index 2e897650e0..2e897650e0 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/man_fromhost b/recipes/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
index afaa9c8ac3..afaa9c8ac3 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/man_fromhost
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm b/recipes/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
index ece7da35fe..ece7da35fe 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/safe_finger b/recipes/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
index 5c8c9a1548..5c8c9a1548 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/safe_finger
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/sig_fix b/recipes/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
index f286605bfd..f286605bfd 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/sig_fix
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/siglongjmp b/recipes/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
index 71be340a07..71be340a07 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/siglongjmp
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/size_t b/recipes/tcp-wrappers/tcp-wrappers-7.6/size_t.patch
index 4db40f4c7b..4db40f4c7b 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/size_t
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/size_t.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped b/recipes/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
index 3beae39306..3beae39306 100644
--- a/recipes/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped
+++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
diff --git a/recipes/tcp-wrappers/tcp-wrappers_7.6.bb b/recipes/tcp-wrappers/tcp-wrappers_7.6.bb
index ebe8638b6e..2ed951ccc4 100644
--- a/recipes/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/recipes/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -14,28 +14,28 @@ FILES_tcp-wrappers = "${bindir}"
 FILES_tcp-wrappers-doc = "${mandir}/man8"
 
 SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \
-           file://00_man_quoting.diff;patch=1 \
-           file://01_man_portability;patch=1 \
-           file://05_wildcard_matching;patch=1 \
-           file://06_fix_gethostbyname;patch=1 \
-           file://10_usagi-ipv6;patch=1 \
-           file://11_tcpd_blacklist;patch=1 \
-           file://11_usagi_fix;patch=1 \
-           file://12_makefile_config;patch=1 \
-           file://13_shlib_weaksym;patch=1 \
-           file://14_cidr_support;patch=1 \
-           file://15_match_clarify;patch=1 \
-           file://expand_remote_port;patch=1 \
-           file://have_strerror;patch=1 \
-           file://man_fromhost;patch=1 \
-           file://restore_sigalarm;patch=1 \
-           file://rfc931.diff;patch=1 \
-           file://safe_finger;patch=1 \
-           file://sig_fix;patch=1 \
-           file://siglongjmp;patch=1 \
-           file://size_t;patch=1 \
-           file://tcpdchk_libwrapped;patch=1 \
-           file://ldflags;patch=1 \
+           file://00_man_quoting.diff \
+           file://01_man_portability.patch \
+           file://05_wildcard_matching.patch \
+           file://06_fix_gethostbyname.patch \
+           file://10_usagi-ipv6.patch \
+           file://11_tcpd_blacklist.patch \
+           file://11_usagi_fix.patch \
+           file://12_makefile_config.patch \
+           file://13_shlib_weaksym.patch \
+           file://14_cidr_support.patch \
+           file://15_match_clarify.patch \
+           file://expand_remote_port.patch \
+           file://have_strerror.patch \
+           file://man_fromhost.patch \
+           file://restore_sigalarm.patch \
+           file://rfc931.diff \
+           file://safe_finger.patch \
+           file://sig_fix.patch \
+           file://siglongjmp.patch \
+           file://size_t.patch \
+           file://tcpdchk_libwrapped.patch \
+           file://ldflags.patch \
            \
            file://try-from.8 \
            file://safe_finger.8"
diff --git a/recipes/tcpdump/tcpdump_3.9.7.bb b/recipes/tcpdump/tcpdump_3.9.7.bb
index 17bf5ddd14..a72ef762a4 100644
--- a/recipes/tcpdump/tcpdump_3.9.7.bb
+++ b/recipes/tcpdump/tcpdump_3.9.7.bb
@@ -9,8 +9,8 @@ PR = "r1"
 
 SRC_URI = " \
 	http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
-	file://tcpdump_configure_no_-O2.patch;patch=1 \
-	file://ipv6-cross.patch;patch=1 \
+	file://tcpdump_configure_no_-O2.patch \
+	file://ipv6-cross.patch \
 "
 
 inherit autotools
diff --git a/recipes/tcpdump/tcpdump_4.0.0.bb b/recipes/tcpdump/tcpdump_4.0.0.bb
index d652b3a623..fa8388267c 100644
--- a/recipes/tcpdump/tcpdump_4.0.0.bb
+++ b/recipes/tcpdump/tcpdump_4.0.0.bb
@@ -8,11 +8,11 @@ PR = "r3"
 
 SRC_URI = " \
 	http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
-	file://tcpdump_configure_no_-O2.patch;patch=1 \
-	file://no-ipv6-tcpdump4.patch;patch=1 \
-	file://0001-minimal-IEEE802.15.4-allowed.patch;patch=1 \
-	file://ipv6-cross.patch;patch=1 \
-	file://configure.patch;patch=1 \
+	file://tcpdump_configure_no_-O2.patch \
+	file://no-ipv6-tcpdump4.patch \
+	file://0001-minimal-IEEE802.15.4-allowed.patch \
+	file://ipv6-cross.patch \
+	file://configure.patch \
 "
 
 inherit autotools
diff --git a/recipes/tcptraceroute/tcptraceroute_1.5beta6.bb b/recipes/tcptraceroute/tcptraceroute_1.5beta6.bb
index b6461661b2..5466395e0b 100644
--- a/recipes/tcptraceroute/tcptraceroute_1.5beta6.bb
+++ b/recipes/tcptraceroute/tcptraceroute_1.5beta6.bb
@@ -9,7 +9,7 @@ DEPENDS = "libnet-1.1"
 PR = "r0"
 
 SRC_URI = "http://michael.toren.net/code/tcptraceroute/tcptraceroute-${PV}.tar.gz \
-	   file://configure.ac.patch;patch=1"
+	   file://configure.ac.patch"
 
 inherit autotools
 
diff --git a/recipes/tcptrack/tcptrack_1.1.2.bb b/recipes/tcptrack/tcptrack_1.1.2.bb
index 386b3e411e..efcdb4bdfa 100644
--- a/recipes/tcptrack/tcptrack_1.1.2.bb
+++ b/recipes/tcptrack/tcptrack_1.1.2.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 DEPENDS = "ncurses libpcap"
 
 SRC_URI = "http://www.rhythm.cx/~steve/devel/tcptrack/release/${PV}/source/tcptrack-${PV}.tar.gz \
-	   file://macros.patch;patch=1"
+	   file://macros.patch"
 S = "${WORKDIR}/tcptrack-${PV}"
 
 inherit autotools
diff --git a/recipes/tea/tea_17.3.5.bb b/recipes/tea/tea_17.3.5.bb
index 478970308d..593fcfd7a7 100644
--- a/recipes/tea/tea_17.3.5.bb
+++ b/recipes/tea/tea_17.3.5.bb
@@ -7,7 +7,7 @@ PR = "r2"
 inherit autotools
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tea-editor/${P}.tar.bz2 \
-           file://move-endif.patch;patch=1;pnum=0"
+           file://move-endif.patch;striplevel=0"
 
 EXTRA_OECONF = "--enable-legacy"
 
diff --git a/recipes/telepathy/empathy_0.1.bb b/recipes/telepathy/empathy_0.1.bb
index d8c488c882..7dcc29d1af 100644
--- a/recipes/telepathy/empathy_0.1.bb
+++ b/recipes/telepathy/empathy_0.1.bb
@@ -8,7 +8,7 @@ RRECOMMENDS = "telepathy-gabble"
 PR ="r1"
 
 SRC_URI = "http://projects.collabora.co.uk/~xclaesse/empathy-0.1.tar.gz \
-        file://no-gnome.diff;patch=1"
+        file://no-gnome.diff"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/telepathy/empathy_0.5.bb b/recipes/telepathy/empathy_0.5.bb
index 43b328b4ed..bc47e09cde 100644
--- a/recipes/telepathy/empathy_0.5.bb
+++ b/recipes/telepathy/empathy_0.5.bb
@@ -10,7 +10,7 @@ PR ="r1"
 inherit gnome
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.5/empathy-${PV}.tar.bz2 \
-           file://no-gnome.diff;patch=1;pnum=0"
+           file://no-gnome.diff;striplevel=0"
 
 FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
         ${datadir}/dbus-1/services/*.service \
diff --git a/recipes/telepathy/empathy_2.28.2.bb b/recipes/telepathy/empathy_2.28.2.bb
index f5e498060c..0a838517de 100644
--- a/recipes/telepathy/empathy_2.28.2.bb
+++ b/recipes/telepathy/empathy_2.28.2.bb
@@ -10,7 +10,7 @@ RRECOMMENDS = "telepathy-gabble"
 
 inherit gnome
 
-SRC_URI += "file://fix-xml-threadbreakage.patch;patch=1"
+SRC_URI += "file://fix-xml-threadbreakage.patch"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/telepathy/libtelepathy_0.3.3.bb b/recipes/telepathy/libtelepathy_0.3.3.bb
index c013afb502..25567cf2c3 100644
--- a/recipes/telepathy/libtelepathy_0.3.3.bb
+++ b/recipes/telepathy/libtelepathy_0.3.3.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
 PR = "r0"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \
-           file://duplicate-header.patch;patch=1 \
+           file://duplicate-header.patch \
           "
 
 inherit autotools pkgconfig
diff --git a/recipes/telepathy/telepathy-inspector_0.5.0.bb b/recipes/telepathy/telepathy-inspector_0.5.0.bb
index 0ea9a8b29f..5064dad9c4 100644
--- a/recipes/telepathy/telepathy-inspector_0.5.0.bb
+++ b/recipes/telepathy/telepathy-inspector_0.5.0.bb
@@ -3,7 +3,7 @@ DEPENDS = "glib-2.0 gtk+ libglade dbus-glib"
 LICENSE = "LGPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tapioca-voip/telepathy-inspector-0.5.0.tar.gz \
-           file://scons-workaround.patch;patch=1"
+           file://scons-workaround.patch"
 
 inherit scons
 
diff --git a/recipes/telepathy/telepathy-salut_0.3.4.bb b/recipes/telepathy/telepathy-salut_0.3.4.bb
index c9095864a1..1dac4507c6 100644
--- a/recipes/telepathy/telepathy-salut_0.3.4.bb
+++ b/recipes/telepathy/telepathy-salut_0.3.4.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 
 #salut.manager changes every release, don't copy it over blindly!
 SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz \
-           file://keep-manager-file.diff;patch=1 \
+           file://keep-manager-file.diff \
 	   file://salut.manager"
 
 inherit autotools pkgconfig
diff --git a/recipes/teleport/teleport_0.34.bb b/recipes/teleport/teleport_0.34.bb
index 56e35b3f39..415ce61484 100644
--- a/recipes/teleport/teleport_0.34.bb
+++ b/recipes/teleport/teleport_0.34.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Teleport app"
 DEPENDS = "gtk+ libgpewidget libdisplaymigration libgcrypt sqlite"
 PRIORITY = "optional"
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 
 SRC_URI[md5sum] = "ae571a20333f90d4b79b68c446387925"
diff --git a/recipes/thc/thcrut_1.2.5.bb b/recipes/thc/thcrut_1.2.5.bb
index a362089a85..adf4082209 100644
--- a/recipes/thc/thcrut_1.2.5.bb
+++ b/recipes/thc/thcrut_1.2.5.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://packetstorm.linuxsecurity.com/groups/thc/thcrut-1.2.5.tar.gz \
-	   file://configure_in.patch;patch=1;pnum=0"
+	   file://configure_in.patch;striplevel=0"
 
 S = "${WORKDIR}/thcrut-${PV}"
 
diff --git a/recipes/thttpd/thttpd_2.25b.bb b/recipes/thttpd/thttpd_2.25b.bb
index 1b3826c3c2..8e9011c17d 100644
--- a/recipes/thttpd/thttpd_2.25b.bb
+++ b/recipes/thttpd/thttpd_2.25b.bb
@@ -4,10 +4,10 @@ HOMEPAGE = "http://www.acme.com/software/thttpd/"
 PR ="r7"
 
 SRC_URI = "http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz \
-	   file://install.patch;patch=1 \
+	   file://install.patch \
 	   file://acinclude.m4 \
 	   file://init \
-	   file://htpasswd_shared.diff;patch=1"
+	   file://htpasswd_shared.diff"
 S = "${WORKDIR}/thttpd-${PV}"
 
 PARALLEL_MAKE = ""
diff --git a/recipes/ti/README b/recipes/ti/README
index eed00f0253..2fbb9f1bbc 100644
--- a/recipes/ti/README
+++ b/recipes/ti/README
@@ -30,7 +30,7 @@ The complete unpacked trees are staged to staging/machine/usr/share/ti/${PN}(-tr
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 BASEPKG_HOST_SYS = "${MULTIMACH_HOST_SYS}"
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 The 'BASEPKG_HOST_SYS' bit is what makes it work, but cause trouble is you want to read from it, so ti-paths.inc does:
 
diff --git a/recipes/ti/am-benchmarks_svn.bb b/recipes/ti/am-benchmarks_svn.bb
new file mode 100644
index 0000000000..51ac6afa02
--- /dev/null
+++ b/recipes/ti/am-benchmarks_svn.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "AM Benchmarks"
+HOMEPAGE = "https://gforge.ti.com/gf/project/am_benchmarks/"
+LICENSE = "BSD"
+SECTION = "system"
+PRIORITY = "optional"
+
+SRCREV = "33"
+PV = "1.0"
+PR = "r1+svnr${SRCPV}"
+
+INSANE_SKIP_${PN} = "True"
+
+SRC_URI = "svn://gforge.ti.com/svn/am_benchmarks/;module=trunk;proto=https;user=anonymous;pswd=''"
+
+S = "${WORKDIR}/trunk"
+
+do_compile() {
+	# don't build debug version
+	touch debug
+	export CROSS_COMPILE=${TARGET_PREFIX}
+	make release
+}
+
+do_install() {
+	make DESTDIR=${D} install
+}
diff --git a/recipes/ti/am-sysinfo_svn.bb b/recipes/ti/am-sysinfo_svn.bb
new file mode 100644
index 0000000000..9193836d71
--- /dev/null
+++ b/recipes/ti/am-sysinfo_svn.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "AM SysInfo"
+HOMEPAGE = "https://gforge.ti.com/gf/project/am_sysinfo/"
+LICENSE = "BSD"
+SECTION = "system"
+PRIORITY = "optional"
+
+SRCREV = "2"
+PV = "1.0"
+PR = "r1+svnr${SRCPV}"
+
+SRC_URI = "svn://gforge.ti.com/svn/am_sysinfo/;module=trunk;proto=https;user=anonymous;pswd=''"
+
+S = "${WORKDIR}/trunk"
+
+do_compile() {
+	${CC} ${CFLAGS} ${LDFLAGS} -o mem_util/mem_util mem_util/mem_util.c
+}
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755 ${S}/mem_util/mem_util ${D}/${bindir}
+}
diff --git a/recipes/ti/bitblit_svn.bb b/recipes/ti/bitblit_svn.bb
index d4ae18ce8e..3d6d4f0601 100644
--- a/recipes/ti/bitblit_svn.bb
+++ b/recipes/ti/bitblit_svn.bb
@@ -8,7 +8,7 @@ DEPENDS = "ti-codec-engine ti-dmai"
 # Fetch source from svn repo
 SRCREV = "2"
 SRC_URI = "svn://gforge.ti.com/svn/${PN};module=trunk;proto=https;user=anonymous;pswd='' \
-           file://recent-linux.diff;patch=1 \
+           file://recent-linux.diff \
 "
 
 # Again, no '.' in PWD allowed :(
diff --git a/recipes/ti/gstreamer-ti/mpeg2-caps.patch b/recipes/ti/gstreamer-ti/mpeg2-caps.patch
new file mode 100644
index 0000000000..c8246579f2
--- /dev/null
+++ b/recipes/ti/gstreamer-ti/mpeg2-caps.patch
@@ -0,0 +1,61 @@
+From 5e5fe9fa15ceb0abae90c8f857f40d1791e7d2d4 Mon Sep 17 00:00:00 2001
+From: don.darling <don.darling@24075187-2e39-4e88-bbb8-bc8aa768f540>
+Date: Mon, 24 May 2010 21:24:12 +0000
+Subject: Create source caps information for MPEG-2 streams in TIVidenc1.
+
+If you don't generate this caps information, you will also get errors while
+encoding that look like this:
+
+(gst-launch-0.10:1580): GStreamer-CRITICAL **: gst_caps_unref: assertion `caps != NULL' failed
+
+The fact that source caps information was never generated for MPEG-2 looks like
+an oversight -- the static caps for TIVidenc1 already allowed MPEG-2.
+
+git-svn-id: https://gstreamer.ti.com/svn/gstreamer_ti/trunk@647 24075187-2e39-4e88-bbb8-bc8aa768f540
+---
+diff --git a/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c b/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c
+index 2e1fb31..9749459 100644
+--- a/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c
++++ b/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c
+@@ -724,10 +724,13 @@ static gboolean gst_tividenc1_set_source_caps(
+     gboolean              ret;
+     GstPad               *pad;
+     char                 *string;
+-    GstTICodec           *h264Codec = NULL, *mpeg4Codec = NULL;
++    GstTICodec           *h264Codec  = NULL;
++    GstTICodec           *mpeg4Codec = NULL;
++    GstTICodec           *mpeg2Codec = NULL;
+ 
+     h264Codec  =  gst_ticodec_get_codec("H.264 Video Encoder");
+     mpeg4Codec  =  gst_ticodec_get_codec("MPEG4 Video Encoder");
++    mpeg2Codec  =  gst_ticodec_get_codec("MPEG2 Video Encoder");
+ 
+     pad = videnc1->srcpad;
+ 
+@@ -754,6 +757,24 @@ static gboolean gst_tividenc1_set_source_caps(
+         g_free(string);
+     }
+  
++    /* Create MPEG-2 source cap */
++    if (mpeg2Codec && (!strcmp(mpeg2Codec->CE_CodecName, videnc1->codecName))) {
++        gint mpegversion = 2;
++
++        caps =
++            gst_caps_new_simple("video/mpeg",
++                "mpegversion",  G_TYPE_INT,         mpegversion,
++                "framerate",    GST_TYPE_FRACTION,  videnc1->framerateNum,
++                                                    videnc1->framerateDen,
++                "width",        G_TYPE_INT,         dim.width,
++                "height",       G_TYPE_INT,         dim.height,
++                NULL);
++
++        string =  gst_caps_to_string(caps); 
++        GST_LOG("setting source caps to mpeg2: %s", string);
++        g_free(string);
++    }
++
+     /* Create MPEG4 source cap */
+     if (mpeg4Codec && (!strcmp(mpeg4Codec->CE_CodecName, videnc1->codecName))) {
+         gint mpegversion = 4;
+--
+cgit v0.8.3.1-30-gff3a
diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb
index 1a7ba3be70..df0705c2ba 100644
--- a/recipes/ti/gstreamer-ti_svn.bb
+++ b/recipes/ti/gstreamer-ti_svn.bb
@@ -18,7 +18,7 @@ PROVIDES += "gstreamer-ti-demo-script"
 
 PV = "svnr${SRCREV}"
 # Rebuild on kernel change since it links statically to ti-dmai, ti-codec-engine, etc
-PR = "r49+${MACHINE_KERNEL_PR}"
+PR = "r50+${MACHINE_KERNEL_PR}"
 
 
 S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin"
@@ -34,25 +34,26 @@ GST_TI_RC_SCRIPT_omapl138 = "gstreamer-ti-omapl138-rc.sh"
 SRCREV = "573"
 
 SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \
-           file://gstreamer-ti-tracker-462.patch;patch=1 \
-           file://gstreamer-ti-remove-mp3-decode-support-from-auddec1.patch;patch=1 \
+           file://gstreamer-ti-tracker-462.patch \
+           file://gstreamer-ti-remove-mp3-decode-support-from-auddec1.patch \
+           file://mpeg2-caps.patch;striplevel=4\
            file://${GST_TI_RC_SCRIPT} \
 "
 
 SRC_URI_append_omap3 = " \
-           file://gstreamer-ti-add-omapfb.patch;patch=1 \
+           file://gstreamer-ti-add-omapfb.patch \
 "
 
 SRC_URI_append_omapl137 = " \
-           file://gstreamer-ti-omapl137.patch;patch=1 \
+           file://gstreamer-ti-omapl137.patch \
 "
 
 SRC_URI_append_omapl138 = " \
-           file://gstreamer-ti-omapl138.patch;patch=1 \
+           file://gstreamer-ti-omapl138.patch \
 "
 
 SRC_URI_append_dm6467 = " \
-           file://gstreamer-ti-dm6467-usesinglecsserver.patch;patch=1 \
+           file://gstreamer-ti-dm6467-usesinglecsserver.patch \
 "
 
 DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly"
diff --git a/recipes/ti/matrix-gui/dm365-evm/init b/recipes/ti/matrix-gui/dm365-evm/init
new file mode 100755
index 0000000000..b0e56ffd32
--- /dev/null
+++ b/recipes/ti/matrix-gui/dm365-evm/init
@@ -0,0 +1,26 @@
+#! /bin/sh
+matrixgui="/usr/bin/matrix_gui"
+GUI_OPTS="-qws -geometry 720x480+0+10 -display transformed:Rot0 /usr/share/matrix/html/menu_main.html"
+
+test -x "$matrixgui" || exit 0
+
+case "$1" in
+  start)
+    # switch to component 480p mode
+    echo 480P-60 > /sys/class/davinci_display/ch0/mode
+    echo COMPONENT > /sys/class/davinci_display/ch0/output
+    echo -n "Starting Matrix GUI application"
+    start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui.pid --exec $matrixgui -- $GUI_OPTS
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping Matrix GUI application"
+    start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui.pid
+    echo "."
+    ;;
+  *)
+    echo "Usage: /etc/init.d/matrix-gui {start|stop}"
+    exit 1
+esac
+
+exit 0
diff --git a/recipes/ti/matrix-gui/init b/recipes/ti/matrix-gui/init
new file mode 100755
index 0000000000..8259417cca
--- /dev/null
+++ b/recipes/ti/matrix-gui/init
@@ -0,0 +1,32 @@
+#! /bin/sh
+
+matrixgui="/usr/bin/matrix_gui"
+GUI_OPTS="-qws -display transformed:Rot90 /usr/share/matrix/html/menu_main.html"
+
+test -x "$matrixgui" || exit 0
+
+export TSLIB_TSDEVICE=/dev/input/touchscreen0
+export QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
+
+case "$1" in
+  start)
+    if [ ! -f /etc/pointercal ] ; then
+        echo -n "Calibrating touchscreen (first time only)"
+        ts_calibrate
+        echo "."
+    fi
+    echo -n "Starting Matrix GUI application"
+    start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui.pid --exec $matrixgui -- $GUI_OPTS
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping Matrix GUI application"
+    start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui.pid
+    echo "."
+    ;;
+  *)
+    echo "Usage: /etc/init.d/matrix-gui {start|stop}"
+    exit 1
+esac
+
+exit 0
diff --git a/recipes/ti/matrix-gui_svn.bb b/recipes/ti/matrix-gui_svn.bb
new file mode 100644
index 0000000000..79f5d24c58
--- /dev/null
+++ b/recipes/ti/matrix-gui_svn.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "Matrix GUI"
+HOMEPAGE = "https://gforge.ti.com/gf/project/matrix_gui/"
+LICENSE = "BSD"
+SECTION = "multimedia"
+PRIORITY = "optional"
+
+SRCREV = "57"
+PV = "1.0"
+PR = "r6+svnr${SRCPV}"
+
+SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
+	file://init \
+"
+
+S = "${WORKDIR}/trunk"
+
+INITSCRIPT_NAME = "matrix-gui"
+INITSCRIPT_PARAMS = "defaults 99"
+
+inherit qt4e update-rc.d
+
+MATRIX_EXTRA_BINS = " \
+	memInfo \
+	networkSettings \
+	runOGLES2Coverflow \
+	runOGLES2Shaders \
+	runOGLESChameleonMan \
+	runOGLESVase \
+	setopp1 \
+	setopp2 \
+	setopp3 \
+	setopp4 \
+	standby \
+	sysSettings \
+	taskInfo \
+"
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755 ${S}/matrix_gui ${D}/${bindir}
+	for i in ${MATRIX_EXTRA_BINS}; do
+		install -m 0755 ${S}/bin/${i} ${D}/${bindir}
+	done
+	install -d ${D}/${datadir}/matrix/html
+	install -m 0644 ${S}/*.html ${D}/${datadir}/matrix/html/
+	install -d ${D}/${datadir}/matrix/images
+	install -m 0644 ${S}/images/*.png ${D}/${datadir}/matrix/images/
+	install -d ${D}${sysconfdir}/init.d/
+	install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui
+}
+
+RRECOMMENDS_${PN} = "qt4-embedded-plugin-mousedriver-tslib"
+FILES_${PN} += "${datadir}/matrix/*"
diff --git a/recipes/ti/matrix-tui/init b/recipes/ti/matrix-tui/init
new file mode 100755
index 0000000000..e5813825dc
--- /dev/null
+++ b/recipes/ti/matrix-tui/init
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+matrixtui="/usr/bin/matrix_tui"
+TUI_OPTS="/usr/share/matrix/xml/matrix.xml"
+
+test -x "$matrixtui" || exit 0
+
+case "$1" in
+  start)
+    echo -n "Starting Matrix TUI application"
+    start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-tui.pid --exec $matrixtui -- $TUI_OPTS
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping Matrix TUI application"
+    start-stop-daemon --stop --quiet --pidfile /var/run/matrix-tui.pid
+    echo "."
+    ;;
+  *)
+    echo "Usage: /etc/init.d/matrix-tui {start|stop}"
+    exit 1
+esac
+
+exit 0
diff --git a/recipes/ti/matrix-tui_svn.bb b/recipes/ti/matrix-tui_svn.bb
new file mode 100644
index 0000000000..8331c3037d
--- /dev/null
+++ b/recipes/ti/matrix-tui_svn.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "Matrix TUI"
+HOMEPAGE = "https://gforge.ti.com/gf/project/matrix_tui/"
+LICENSE = "BSD"
+SECTION = "multimedia"
+PRIORITY = "optional"
+
+SRCREV = "29"
+PV = "1.0"
+PR = "r1+svnr${SRCPV}"
+
+INSANE_SKIP_${PN} = "True"
+
+SRC_URI = "svn://gforge.ti.com/svn/matrix_tui/;module=trunk;proto=https;user=anonymous;pswd='' \
+	file://init \
+"
+
+S = "${WORKDIR}/trunk"
+
+# Do not auto-start TUI by default, uncomment otherwise
+#inherit update-rc.d
+#INITSCRIPT_NAME = "matrix-tui"
+#INITSCRIPT_PARAMS = "defaults 99"
+
+do_configure() {
+	sed -i -e 's:PATH=${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:PATH ?= ${LINUX_DEVKIT_PATH}/arm-none-linux-gnueabi:' makefile.init
+}
+
+do_compile() {
+	# don't build debug version
+	touch debug
+	export CROSS_COMPILE=${TARGET_PREFIX}
+	export TUI_INCLUDE_PATH=${STAGING_INCDIR}
+	export XML_INCLUDE_PATH=${STAGING_INCDIR}/libxml2
+	export TUI_LIB_PATH=${STAGING_LIBDIR}
+	make release
+}
+
+do_install() {
+	make DESTDIR=${D} install
+	install -d ${D}${sysconfdir}/init.d/
+	install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-tui
+}
+
+FILES_${PN} += "${datadir}/matrix/*"
diff --git a/recipes/ti/ti-cgt6x_6.1.14.bb b/recipes/ti/ti-cgt6x_6.1.14.bb
new file mode 100644
index 0000000000..13e6a37d0b
--- /dev/null
+++ b/recipes/ti/ti-cgt6x_6.1.14.bb
@@ -0,0 +1,9 @@
+require ti-cgt6x.inc
+
+PE = "1"
+PV = "6_1_14"
+PVwithdots = "6.1.14"
+
+SRC_URI[cgt6xbin.md5sum] = "966499f31b05e31c05ff5deecd19d53b"
+SRC_URI[cgt6xbin.sha256sum] = "dc477a206c3e0b3090504dbcdd78618bc453993a0110e5a20092f98cdff1c0c1"
+
diff --git a/recipes/ti/ti-cgt6x_6.1.5.bb b/recipes/ti/ti-cgt6x_6.1.5.bb
new file mode 100644
index 0000000000..fadc4cb095
--- /dev/null
+++ b/recipes/ti/ti-cgt6x_6.1.5.bb
@@ -0,0 +1,9 @@
+require ti-cgt6x.inc
+
+PE = "1"
+PV = "6_1_5"
+PVwithdots = "6.1.5"
+
+SRC_URI[cgt6xbin.md5sum] = "65cca91db9c5498ee267755087d0c8fc"
+SRC_URI[cgt6xbin.sha256sum] = "9e2392e0ae4ba60c8b9998068c443936ebbc2ea93206b1f15323a4c8a229bbe5"
+
diff --git a/recipes/ti/ti-codec-engine_2.25.02.11.bb b/recipes/ti/ti-codec-engine_2.25.02.11.bb
new file mode 100644
index 0000000000..b1131cbb86
--- /dev/null
+++ b/recipes/ti/ti-codec-engine_2.25.02.11.bb
@@ -0,0 +1,7 @@
+require ti-codec-engine.inc
+
+PV = "2_25_02_11"
+
+SRC_URI[cetarball.md5sum] = "a696df6d38c27cfba993a2cf617060ef" 
+SRC_URI[cetarball.sha256sum] = "928d90603ac8942db2d9d975a3635921b1b4a7b2fd88c922ff3a2cdc31052a93" 
+
diff --git a/recipes/ti/ti-codecs-dm6467_1.0.0.bb b/recipes/ti/ti-codecs-dm6467_1.0.0.bb
index 9454b94ee4..709b21f0a3 100644
--- a/recipes/ti/ti-codecs-dm6467_1.0.0.bb
+++ b/recipes/ti/ti-codecs-dm6467_1.0.0.bb
@@ -38,4 +38,4 @@ do_install () {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
diff --git a/recipes/ti/ti-codecs-omapl137_1.00.00.bb b/recipes/ti/ti-codecs-omapl137_1.00.00.bb
index c350191502..44fdeb11bc 100644
--- a/recipes/ti/ti-codecs-omapl137_1.00.00.bb
+++ b/recipes/ti/ti-codecs-omapl137_1.00.00.bb
@@ -22,7 +22,7 @@ PROVIDES += "ti-codecs-omapl137-server"
 S = "${WORKDIR}/OMAP_L138_arm_1_00_00_08/cs1omapl138_${PV}"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/sdk/omap_l138/1_00/latest/exports/${BINFILE};name=l137codecsbin \
-           file://ti-codecs-omapl138-1-00-00-fixDman3Config.patch;patch=1"
+           file://ti-codecs-omapl138-1-00-00-fixDman3Config.patch"
 
 BINFILE = "cs1omapl138_${PV}-v2_setup_linux.bin"
 TI_BIN_UNPK_CMDS = "y:Y: qY:workdir"
diff --git a/recipes/ti/ti-codecs-omapl138_1.00.00.bb b/recipes/ti/ti-codecs-omapl138_1.00.00.bb
index 204396f2a4..3da65cb941 100644
--- a/recipes/ti/ti-codecs-omapl138_1.00.00.bb
+++ b/recipes/ti/ti-codecs-omapl138_1.00.00.bb
@@ -21,7 +21,7 @@ PROVIDES += "ti-codecs-omapl138-server"
 S = "${WORKDIR}/OMAP_L138_arm_1_00_00_08/cs1omapl138_${PV}"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/sdk/omap_l138/1_00/latest/exports/${BINFILE};name=l138codecsbin \
-           file://ti-codecs-omapl138-1-00-00-fixDman3Config.patch;patch=1"
+           file://ti-codecs-omapl138-1-00-00-fixDman3Config.patch"
 
 BINFILE = "cs1omapl138_${PV}-v2_setup_linux.bin"
 TI_BIN_UNPK_CMDS = "y:Y: qY:workdir"
diff --git a/recipes/ti/ti-devshell.bb b/recipes/ti/ti-devshell.bb
new file mode 100644
index 0000000000..0eba7991a8
--- /dev/null
+++ b/recipes/ti/ti-devshell.bb
@@ -0,0 +1,73 @@
+DESCRIPTION = "Runs a shell in an environment as emitted by BitBake to execute tasks"
+LICENSE = "GPL"
+
+PR = "r1"
+
+inherit autotools pkgconfig
+
+require ti-paths.inc 
+
+do_configure() {
+	:
+}
+
+def tidevshell_emit_env(o, d, all=False, funcwhitelist=None):
+    """Emits all items in the data store in a format such that it can be sourced by a shell."""
+
+    env = bb.data.keys(d)
+
+    for e in env:
+        if bb.data.getVarFlag(e, "func", d):
+            continue
+        bb.data.emit_var(e, o, d, all) and o.write('\n')
+
+    for e in env:
+        if not bb.data.getVarFlag(e, "func", d):
+            continue
+        if not funcwhitelist:
+            bb.data.emit_var(e, o, d) and o.write('\n')
+            continue
+        for i in funcwhitelist:
+            if e.startswith(i):
+                bb.data.emit_var(e, o, d) and o.write('\n')
+                break
+
+python do_compile() {
+	import os
+	import os.path
+
+	workdir = bb.data.getVar('WORKDIR', d, 1)
+	shellfile = os.path.join(workdir, bb.data.expand("${TARGET_PREFIX}${DISTRO}-${MACHINE}-ti-devshell", d))
+
+	f = open(shellfile, "w")
+
+	# emit variables and shell functions
+        tidevshell_emit_env(f, d, False, ["die", "oe", "autotools_do_configure"])
+
+	f.close()
+}
+
+do_install() {
+	:
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_deploy() {
+	shellfile="${TARGET_PREFIX}${DISTRO}-${MACHINE}-ti-devshell"
+
+	cd ${WORKDIR}
+
+	cp $shellfile tmpfile
+	echo "#!/bin/bash --rcfile" > $shellfile
+	sed -e "s:${S}:.:g" -e "s:exit 1:true:" tmpfile >> $shellfile
+
+	echo "export PS1='[OE::${TARGET_PREFIX}${DISTRO}-${MACHINE}]:\w\$ '" >> $shellfile
+	echo "alias ./configure=oe_runconf" >> $shellfile
+	echo "alias make=oe_runmake" >> $shellfile
+
+	mkdir -p ${DEPLOY_DIR}/addons
+	install -m 755 $shellfile ${DEPLOY_DIR}/addons
+}
+
+addtask deploy after do_install before do_package
diff --git a/recipes/ti/ti-dm355mm-module_1.13.bb b/recipes/ti/ti-dm355mm-module_1.13.bb
index f7bd83123a..49ffc17a4d 100644
--- a/recipes/ti/ti-dm355mm-module_1.13.bb
+++ b/recipes/ti/ti-dm355mm-module_1.13.bb
@@ -11,7 +11,7 @@ inherit module
 PV = "1_13_000"
 
 SRC_URI	= "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/codecs/dm355_codecs_setuplinux_${PV}.bin \
-		   file://dm355mm.patch;patch=1 \
+		   file://dm355mm.patch \
 	      "
 S = "${WORKDIR}/dm355_codecs_${PV}"
 BINFILE="dm355_codecs_setuplinux_${PV}.bin"
@@ -39,7 +39,7 @@ do_install () {
     install -m 0755 ${S}/dm355mm/module/dm350mmap.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
 }
 
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 SRC_URI[md5sum] = "f6221188bea76b7aaf0c45e9bcf26329"
 SRC_URI[sha256sum] = "f1a6dea51be9798903a0543fb50f463b0594b1f11b897bc50e40825fb7527c61"
diff --git a/recipes/ti/ti-dm365mm-module.inc b/recipes/ti/ti-dm365mm-module.inc
index 6b0497bc9e..caf0441a99 100644
--- a/recipes/ti/ti-dm365mm-module.inc
+++ b/recipes/ti/ti-dm365mm-module.inc
@@ -25,5 +25,5 @@ do_install () {
     install -m 0755 ${S}/module/dm365mmap.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
 }
 
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 INSANE_SKIP_${PN} = True
diff --git a/recipes/ti/ti-dmai.inc b/recipes/ti/ti-dmai.inc
deleted file mode 100644
index d2fb3cadf3..0000000000
--- a/recipes/ti/ti-dmai.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "DMAI for TI ARM/DSP processors"
-
-BRANCH = "BRANCH_BRIJESH_DMAI_DEV_2_xx"
-BRANCH_6467 = "GITPSP_INT_101009"
-
-SRCREV = "364"
-
-SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=${BRANCH};proto=https;user=anonymous;pswd='' \
-		file://loadmodules-ti-dmai-dm355_al.sh \
-		file://loadmodules-ti-dmai-dm365_al.sh \
-		file://loadmodules-ti-dmai-dm6446_al.sh \
-		file://loadmodules-ti-dmai-o3530_al.sh \
-	"
-
-S = "${WORKDIR}/${BRANCH}/davinci_multimedia_application_interface"
-
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PE = "1"
-PV = "svnr${SRCPV}"
-
-INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes/ti/ti-dmai_svn.bb b/recipes/ti/ti-dmai_svn.bb
index 9a2ec4b8d0..91c1b4b268 100644
--- a/recipes/ti/ti-dmai_svn.bb
+++ b/recipes/ti/ti-dmai_svn.bb
@@ -47,7 +47,7 @@ SRC_URI = "svn://gforge.ti.com/svn/dmai/;module=${DMAIBRANCH};proto=https;user=a
 		file://loadmodules-ti-dmai-ol138_al.sh \
 	"
 
-SRC_URI_append_omapl137 = " file://dmai-r423-add-omapl137-support.patch;patch=1 "
+SRC_URI_append_omapl137 = " file://dmai-r423-add-omapl137-support.patch "
 
 DEPENDS = "virtual/kernel alsa-lib ti-framework-components ti-codec-engine ti-xdctools"
 
diff --git a/recipes/ti/ti-dsplink.inc b/recipes/ti/ti-dsplink.inc
index 1b1f91383d..aec2742f87 100644
--- a/recipes/ti/ti-dsplink.inc
+++ b/recipes/ti/ti-dsplink.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "DSPLINK Inter-Processor Communications (IPC) for TI ARM/DSP processors"
-HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/DSPLink"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/DSPLink/index.html"
 SECTION = "devel"
 LICENSE = "GPLv2"
 
@@ -16,11 +16,11 @@ PROVIDES += "ti-dsplink-examples"
 
 # This package builds a kernel module, use kernel PR as base and append a local version
 PR = "${MACHINE_KERNEL_PR}"
-PR_append = "e"
+PR_append = "f"
 
 S = "${WORKDIR}/dsplink_linux_${PV}"
 
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/DSPLink/${PV}/exports/dsplink_linux_${PV}.tar.gz;name=dsplinktarball \
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/${PV_DL_PATH}/dsplink_linux_${PV}.tar.gz;name=dsplinktarball \
            file://ti-dsplink-examples-run.sh \
            file://ti-dsplink-examples-loadmodules.sh \
            file://ti-dsplink-examples-unloadmodules.sh "
@@ -44,6 +44,13 @@ DSPLINKDSPCFG_omapl138    = "OMAPL138GEMSHMEM"
 DSPLINKDSPCFG_omap3       = "OMAP3530SHMEM"
 DSPLINKDSPCFG            ?= "<UNDEFINED_DSPLINKDSPCFG>"
 
+DSPLINKDSP_dm6446         = "DM6446GEM_0"
+DSPLINKDSP_dm6467         = "DM6467GEM_0"
+DSPLINKDSP_omapl137       = "OMAPL1XXGEM_0"
+DSPLINKDSP_omapl138       = "OMAPL138GEM_0"
+DSPLINKDSP_omap3          = "OMAP3530_0"
+DSPLINKDSP               ?= "<UNDEFINED_DSPLINKDSP>"
+
 DSPLINKGPPOS_dm6446       = "DM6446LSP"
 DSPLINKGPPOS_dm6467       = "DM6467LSP"
 DSPLINKGPPOS_omapl137     = "ARM"
@@ -57,13 +64,6 @@ export DSPLINK
 
 do_configure() {
 
-    # asm/page.h is gone with linux-libc-headers 2.6.31.
-    # We can safely sed it out since it has been empty for the past 2 years
-    sed -i /page.h/d ${S}/dsplink/gpp/src/api/Linux/drv_api.c || true 
-
-    # Makefile passes hardcoded CROSS_COMPILE - rename so this doesnt get passed to kbuild
-    sed -i -e s:CROSS_COMPILE:BOGUS_CROSS_COMPILE:g ${S}/dsplink/gpp/src/Rules.mk
-
     # Run perl script to create appropriate makefiles (v1.60 and up)
     (
     cd ${DSPLINK}
@@ -79,59 +79,6 @@ do_prepsources () {
     XDCPATH=${DSPLINK} ${XDC_INSTALL_DIR}/xdc .make -PR .
     XDCPATH=${DSPLINK} ${XDC_INSTALL_DIR}/xdc clean -PR .
     XDCPATH=${DSPLINK} ${XDC_INSTALL_DIR}/xdc .interfaces -PR .
-
-    # Clean the gpp user space library
-    cd ${DSPLINK}/gpp/src/api && make \
-      CROSS_COMPILE="${TARGET_PREFIX}" \
-      CC="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}gcc" \
-      AR="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ar" \
-      LD="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ld" \
-      COMPILER="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}gcc" \
-      ARCHIVER="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ar" \
-      KERNEL_DIR="${STAGING_KERNEL_DIR}" \
-      clean
-
-    # Clean the gpp kernel space (debug and release)
-    cd ${DSPLINK}/gpp/src && make \
-      OBJDUMP="${TARGET_PREFIX}objdump" \
-      CROSS_COMPILE="${TARGET_PREFIX}" \
-      CC="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}gcc" \
-      AR="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ar" \
-      LD="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ld" \
-      COMPILER="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}gcc" \
-      ARCHIVER="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ar" \
-      KERNEL_DIR="${STAGING_KERNEL_DIR}" \
-      BASE_BUILDOS="${STAGING_KERNEL_DIR}" \
-      clean
-
-    # Clean the gpp samples
-    cd ${DSPLINK}/gpp/src/samples && make \
-      BASE_TOOLCHAIN="${TOOLCHAIN_PATH}" \
-      BASE_CGTOOLS="${BASE_TOOLCHAIN}/bin" \
-      OSINC_PLATFORM="${TOOLCHAIN_PATH}/lib/gcc/${TARGET_SYS}/$(${TARGET_PREFIX}gcc -dumpversion)/include" \
-      OSINC_TARGET="${BASE_TOOLCHAIN}/target/usr/include" \
-      CROSS_COMPILE="${TARGET_PREFIX}" \
-      CC="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}gcc" \
-      AR="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ar" \
-      LD="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ld" \
-      COMPILER="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}gcc" \
-      LINKER="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ld" \
-      ARCHIVER="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ar" \
-      KERNEL_DIR="${STAGING_KERNEL_DIR}" \
-      clean
-
-    # Clean the dsp library (debug and release)
-     cd ${DSPLINK}/dsp/src && make \
-      BASE_CGTOOLS="${CODEGEN_INSTALL_DIR}" \
-      BASE_SABIOS="${BIOS_INSTALL_DIR}" \
-      clean
-
-    # Clean the dsp samples (debug and release)
-    cd ${DSPLINK}/dsp/src/samples && make \
-      BASE_CGTOOLS="${CODEGEN_INSTALL_DIR}" \
-      BASE_SABIOS="${BIOS_INSTALL_DIR}" \
-      clean
-	
 }
 
 addtask prepsources after do_configure before do_compile
@@ -205,13 +152,10 @@ do_install () {
     install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
     install -m 0755 ${DSPLINK}/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/RELEASE/dsplinkk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/ 
 
-    # Install the example apps
+    # Install the example apps (gpp and dsp)
     install -d ${D}/${installdir}/ti-dsplink-examples/
     cp ${DSPLINK}/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/RELEASE/*gpp ${D}/${installdir}/ti-dsplink-examples
-    
-    for i in $(find ${DSPLINK}/dsp/BUILD/ -name "*.out") ; do
-        cp ${i} ${D}/${installdir}/ti-dsplink-examples
-    done
+    cp ${DSPLINK}/dsp/export/BIN/DspBios/${DSPLINKPLATFORM}/${DSPLINKDSP}/RELEASE/*.out ${D}/${installdir}/ti-dsplink-examples    
 
     # Install the example apps module un/load scripts
     install ${WORKDIR}/ti-dsplink-examples-loadmodules.sh ${D}/${installdir}/ti-dsplink-examples
@@ -242,6 +186,6 @@ pkg_postrm_ti-dsplink-module_append () {
 
 PACKAGES += "ti-dsplink-examples"
 RDEPENDS_ti-dsplink-examples_append = " ti-dsplink-module"
-RDEPENDS_ti-dsplink-examples_append_omap3 += " ti-lpm-module"
+RDEPENDS_ti-dsplink-examples_append_omap3 += " ti-lpm-module ti-lpm-utils"
 FILES_ti-dsplink-examples = "${installdir}/ti-dsplink-examples/*"
 INSANE_SKIP_ti-dsplink-examples = True
diff --git a/recipes/ti/ti-dsplink_1.64.bb b/recipes/ti/ti-dsplink_1.64.bb
index 3f1332bd9b..9a13f208fa 100644
--- a/recipes/ti/ti-dsplink_1.64.bb
+++ b/recipes/ti/ti-dsplink_1.64.bb
@@ -3,12 +3,27 @@ require ti-dsplink.inc
 PE = "1"
 PV = "1_64"
 
+PV_DL_PATH = "sdo_sb/targetcontent/DSPLink/${PV}/exports"
+
 SRC_URI[dsplinktarball.md5sum] = "90223da7c88af57d12936adeba1a0661"
 SRC_URI[dsplinktarball.sha256sum] = "32b6fbae2b61f5f71ab3eae9d2f5ad6b75d682ad8bde9963152830be1f8d286b"
 
-SRC_URI_append = "file://dsplink_1_64_kernel_2_6_33_autoconf.patch;patch=1 \
-                  file://dsplink_1_64_add_dm6446_build_support.patch;patch=1 \
-                  file://dsplink_1_64_add_omapl137_build_support.patch;patch=1 "
+SRC_URI_append = "file://dsplink_1_64_kernel_2_6_33_autoconf.patch \
+                  file://dsplink_1_64_add_dm6446_build_support.patch \
+                  file://dsplink_1_64_add_omapl137_build_support.patch "
+
+
+# Fix-up headers for latest kernels and remove bogus CROSS_COMPILE configuration
+
+do_configure_prepend() {
+
+    # asm/page.h is gone with linux-libc-headers 2.6.31.
+    # We can safely sed it out since it has been empty for the past 2 years
+    sed -i /page.h/d ${S}/dsplink/gpp/src/api/Linux/drv_api.c || true
+
+    # Makefile passes hardcoded CROSS_COMPILE - rename so this doesnt get passed to kbuild
+    sed -i -e s:CROSS_COMPILE:BOGUS_CROSS_COMPILE:g ${S}/dsplink/gpp/src/Rules.mk
+}
 
 # Cheat a bit with includes
 # SZ_1k = 0x00000400
@@ -18,4 +33,3 @@ do_compile_prepend() {
     sed -i s:SZ_2K:0x00000800:g ${S}/dsplink/gpp/src/arch/OMAP3530/shmem/Linux/omap3530_phy_shmem.c
 }
 
-
diff --git a/recipes/ti/ti-dsplink_1.65.00.02.bb b/recipes/ti/ti-dsplink_1.65.00.02.bb
new file mode 100644
index 0000000000..5d0ccf514d
--- /dev/null
+++ b/recipes/ti/ti-dsplink_1.65.00.02.bb
@@ -0,0 +1,12 @@
+require ti-dsplink.inc
+
+PE = "1"
+PV = "1_65_00_02"
+PV_dot = "1.65.00.02"
+PV_major = "1_65"
+
+PV_DL_PATH = "DSPLink/${PV_major}/${PV}/${PV_dot}"
+
+SRC_URI[dsplinktarball.md5sum] = "e05b1f2b2b4a1a92c15746e9c541a80f"
+SRC_URI[dsplinktarball.sha256sum] = "49cce94fb9e0ba103c48802c9203611d9101f08858d8cd91fb162c998f7190d3"
+
diff --git a/recipes/ti/ti-dvsdk-demos.inc b/recipes/ti/ti-dvsdk-demos.inc
index 99e9875dd1..af1ecd8b97 100644
--- a/recipes/ti/ti-dvsdk-demos.inc
+++ b/recipes/ti/ti-dvsdk-demos.inc
@@ -64,5 +64,5 @@ FILES_${PN} = "${installdir}/dvsdk-demos/*"
 
 BASE_SRC_URI ?= "http://install.source.dir.local"
 
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 INSANE_SKIP_${PN} = "True"
diff --git a/recipes/ti/ti-eula-unpack.inc b/recipes/ti/ti-eula-unpack.inc
index 1c5a776e0b..947ca143ea 100644
--- a/recipes/ti/ti-eula-unpack.inc
+++ b/recipes/ti/ti-eula-unpack.inc
@@ -39,7 +39,13 @@ python ti_bin_do_unpack() {
     os.chmod(binfile, 0755)
 
     # Run the InstallJammer binary and accept the EULA
-    filename = "HOME=%s ./%s" % (workdir, binfile)
+    filename = "HOME=%s ./%s --mode console" % (workdir, binfile)
+    
+    # Test executable by printing installer version
+    if os.system(filename + " --version") != 0:
+        print "ERROR: ti-eula-unpack: failed to execute binary installer"
+        raise bb.build.FuncFailed()
+ 
     f = os.popen(filename,'w')
     for cmd in cmd_list:
         if cmd == "workdir":
@@ -54,7 +60,9 @@ python ti_bin_do_unpack() {
     if bool(tarfile) == True:
         tarfile  = bb.data.expand(tarfile, localdata)
         tcmd = 'tar xz --no-same-owner -f %s -C %s' % (tarfile, workdir)
-        os.system(tcmd)
+        if os.system(tcmd) != 0:
+            print "ERROR: ti-eula-unpack: failed to extract tarfile"
+            raise bb.build.FuncFailed()
 
     # Return to the previous directory
     os.chdir(save_cwd)
diff --git a/recipes/ti/ti-linuxutils.inc b/recipes/ti/ti-linuxutils.inc
index 3482d707ab..209299deea 100644
--- a/recipes/ti/ti-linuxutils.inc
+++ b/recipes/ti/ti-linuxutils.inc
@@ -83,4 +83,4 @@ FILES_ti-irq-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/irq*.ko
 FILES_ti-linuxutils-app = "${installdir}/ti-linuxutils-app/*/*"
 
 INSANE_SKIP_ti-linuxutils-app = "True"
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
diff --git a/recipes/ti/ti-linuxutils_2.25.02.08.bb b/recipes/ti/ti-linuxutils_2.25.02.08.bb
new file mode 100644
index 0000000000..fbb1114110
--- /dev/null
+++ b/recipes/ti/ti-linuxutils_2.25.02.08.bb
@@ -0,0 +1,7 @@
+require ti-linuxutils.inc
+
+PE = "1"
+PV = "2_25_02_08"
+
+SRC_URI[md5sum] = "9bddf6cfb6d76ba5f096438f3ebb9694"
+SRC_URI[sha256sum] = "c037d5646061805da5d9254c2f5a4e4f03767a12a2f1ac7984bfa1cbd02d03f9"
diff --git a/recipes/ti/ti-local-power-manager.inc b/recipes/ti/ti-local-power-manager.inc
index 4a2fb91af4..a0e3bfd3ec 100644
--- a/recipes/ti/ti-local-power-manager.inc
+++ b/recipes/ti/ti-local-power-manager.inc
@@ -13,7 +13,7 @@ PROVIDES += "ti-lpm-utils"
 
 # This package builds a kernel module, use kernel PR as base and append a local version
 PR = "${MACHINE_KERNEL_PR}"
-PR_append = "c"
+PR_append = "d"
 
 S = "${WORKDIR}/local_power_manager_linux_${PV}"
 
diff --git a/recipes/ti/ti-local-power-manager/lpm-1_24_01-replace-define-OPT.patch b/recipes/ti/ti-local-power-manager/lpm-1_24_01-replace-define-OPT.patch
new file mode 100644
index 0000000000..120792b891
--- /dev/null
+++ b/recipes/ti/ti-local-power-manager/lpm-1_24_01-replace-define-OPT.patch
@@ -0,0 +1,24 @@
+diff -uNr local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/dm6446/lpm/Makefile local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/dm6446/lpm/Makefile
+--- local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/dm6446/lpm/Makefile	2009-07-22 23:10:04.000000000 -0500
++++ local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/dm6446/lpm/Makefile	2010-04-16 15:26:14.000000000 -0500
+@@ -54,7 +54,7 @@
+ endif
+ 
+ MAKE_OPTS = ARCH=arm CROSS_COMPILE=$(MVTOOL_PREFIX)
+-CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL \
++CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL -DOPT="" \
+          $(LINK_DEFS) $(LINK_INCS) $(LINK_INCS_INTERNAL)
+ 
+ # Invoke the kernel build system
+diff -uNr local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/omap3530/lpm/Makefile local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/omap3530/lpm/Makefile
+--- local_power_manager_linux_1_24_01_orig/packages/ti/bios/power/modules/omap3530/lpm/Makefile	2009-07-22 23:10:05.000000000 -0500
++++ local_power_manager_linux_1_24_01/packages/ti/bios/power/modules/omap3530/lpm/Makefile	2010-04-16 15:26:38.000000000 -0500
+@@ -54,7 +54,7 @@
+ endif
+ 
+ MAKE_OPTS = ARCH=arm CROSS_COMPILE=$(MVTOOL_PREFIX)
+-CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL \
++CFLAGS = -DUSE_UDEV -DOS_LINUX -DLINUX_KERNEL -DOPT="" \
+          $(LINK_DEFS) $(LINK_INCS) $(LINK_INCS_INTERNAL)
+ 
+ # Invoke the kernel build system
diff --git a/recipes/ti/ti-local-power-manager_1.24.01.bb b/recipes/ti/ti-local-power-manager_1.24.01.bb
index 7af4cb0b95..8c9681979e 100644
--- a/recipes/ti/ti-local-power-manager_1.24.01.bb
+++ b/recipes/ti/ti-local-power-manager_1.24.01.bb
@@ -3,6 +3,8 @@ require ti-local-power-manager.inc
 PV = "1_24_01"
 PE = "1"
 
+SRC_URI_append = " file://lpm-1_24_01-replace-define-OPT.patch"
+
 SRC_URI[lpmtarball.md5sum] = "6699861c8d0195654c539798ec428124"
 SRC_URI[lpmtarball.sha256sum] = "052b31b09e6d85bc1e980f5e3d2350019c2d8d7430d24db60854dc926df9a1f2"
 
diff --git a/recipes/ti/ti-local-power-manager_1.24.02.09.bb b/recipes/ti/ti-local-power-manager_1.24.02.09.bb
new file mode 100644
index 0000000000..9c8b4df4e2
--- /dev/null
+++ b/recipes/ti/ti-local-power-manager_1.24.02.09.bb
@@ -0,0 +1,8 @@
+require ti-local-power-manager.inc
+
+PV = "1_24_02_09"
+PE = "1"
+
+SRC_URI[lpmtarball.md5sum] = "3d05453df26dfc811de04839d74c2f2b" 
+SRC_URI[lpmtarball.sha256sum] = "7335959a6217df17289f81839e6c6948f31cc0797ebc5389edef7190ed3ea589"
+
diff --git a/recipes/ti/ti-msp430-chronos_1.05.00.00.bb b/recipes/ti/ti-msp430-chronos_1.05.00.00.bb
new file mode 100644
index 0000000000..089cd7f28f
--- /dev/null
+++ b/recipes/ti/ti-msp430-chronos_1.05.00.00.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "eZ430 Chronos Tools - MSP430 Development Kit/Watch"
+HOMEPAGE = "http://processors.wiki.ti.com/index.php/EZ430-Chronos"
+LICENCE = "unknown"
+SECTION = "multimedia"
+
+PV = "1_05_00_00"
+PR = "1"
+
+SRC_URI = "http://focus.ti.com/lit/sw/slac388/slac388.zip;name=slac388zip"
+
+SRC_URI[slac388zip.md5sum] = "22d4104a07af584222828fb377793796"
+SRC_URI[slac388zip.sha256sum] = "1c9cd1e36015e8db3b36c98be41907628144b76002b3f76b27fd310f4bd35ad7"
+
+require ti-paths.inc
+require ti-staging.inc
+require ti-eula-unpack.inc
+
+S = "${WORKDIR}/ti/eZ430-Chronos"
+
+BINFILE="Chronos-Setup"
+TI_BIN_UNPK_CMDS="Y:workdir:"
+
+do_unpack_append() {
+    os.system('mv "Texas Instruments" ti')
+}
+
+do_compile() {
+    echo "Do Nothing for Now"
+}
+
+do_install() {
+
+    install -d ${D}/${installdir}/ti-msp430-chronos-apps
+    cp -pPrf "${S}"/"Control Center"/* ${D}/${installdir}/ti-msp430-chronos-apps
+
+    # Remove dos formatting
+    dos2unix "${D}/${installdir}/ti-msp430-chronos-apps/Chronos Data Logger"/*
+    dos2unix "${D}/${installdir}/ti-msp430-chronos-apps/Chronos Control Center"/*
+
+    # Should probably also remove hardcoded script reference to tcl8.5
+}
+
+PACKAGES += "ti-msp430-chronos-apps"
+FILES_ti-msp430-chronos-apps = "${installdir}/ti-msp430-chronos-apps/*"
+
+RDEPENDS_ti-msp430-chronos-apps += " tcl tk xdotool"
diff --git a/recipes/ti/ti-staging.inc b/recipes/ti/ti-staging.inc
index faa24616cd..593f094969 100644
--- a/recipes/ti/ti-staging.inc
+++ b/recipes/ti/ti-staging.inc
@@ -6,7 +6,7 @@ BASEPKG_HOST_SYS = "${MULTIMACH_HOST_SYS}"
 # Search archdir for shlibs instead of machine dir due to above BASEPKG_HOST_SYS
 SHLIBSDIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}/shlibs"
 
-INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_STRIP = "no"
 
 ALLOW_EMPTY_${PN} = "1"
 ALLOW_EMPTY_${PN}-dev = "1"
diff --git a/recipes/ti/ti-xdais_6.24.bb b/recipes/ti/ti-xdais_6.24.bb
index 1c2ca8bfbd..aae7770b2a 100644
--- a/recipes/ti/ti-xdais_6.24.bb
+++ b/recipes/ti/ti-xdais_6.24.bb
@@ -2,6 +2,6 @@ require ti-xdais.inc
 
 PV = "6_24"
 
-SRC_URI[xdaisgz.md5sum] = "a336c79bc86bd345436e482b3def5e47"
-SRC_URI[xdaisgz.sha256sum] = "85eebf29bb4a2add2a7c2335880bad6262be87d3fd3d79ae9c47dea611ebbf13"
+SRC_URI[xdaistarball.md5sum] = "a336c79bc86bd345436e482b3def5e47"
+SRC_URI[xdaistarball.sha256sum] = "85eebf29bb4a2add2a7c2335880bad6262be87d3fd3d79ae9c47dea611ebbf13"
 
diff --git a/recipes/ti/ti-xdais_6.25.02.11.bb b/recipes/ti/ti-xdais_6.25.02.11.bb
new file mode 100644
index 0000000000..76e426051e
--- /dev/null
+++ b/recipes/ti/ti-xdais_6.25.02.11.bb
@@ -0,0 +1,7 @@
+require ti-xdais.inc
+
+PV = "6_25_02_11"
+
+SRC_URI[xdaistarball.md5sum] = "33dea671988fa63123f667fd6c0c435d" 
+SRC_URI[xdaistarball.sha256sum] = "4a71ec361197bbfc49d592afd17b83d21547c6c12a1f5d6fe48f9539f72d951e" 
+
diff --git a/recipes/ti/ti-xdctools_3.16.00.18.bb b/recipes/ti/ti-xdctools_3.16.00.18.bb
index de2a71532a..4f33f87a86 100644
--- a/recipes/ti/ti-xdctools_3.16.00.18.bb
+++ b/recipes/ti/ti-xdctools_3.16.00.18.bb
@@ -1,6 +1,6 @@
 require ti-xdctools.inc
 
-PV = "3_16_00_80"
+PV = "3_16_00_18"
 
 SRC_URI[xdcbin.md5sum] = "1b4fa459713d94c10297094ecb7cef1e"
 SRC_URI[xdcbin.sha256sum] = "0c50b47de965bffc03f209659c87d6c8561cd76c58e794634857c7b69f4754b6"
diff --git a/recipes/tickypip/tickypip_0.1.2.bb b/recipes/tickypip/tickypip_0.1.2.bb
index f93e9a4abe..28c05c5d32 100644
--- a/recipes/tickypip/tickypip_0.1.2.bb
+++ b/recipes/tickypip/tickypip_0.1.2.bb
@@ -8,7 +8,7 @@ RRECOMMENDS = "tickypip-levels"
 PR = "r5"
 
 SRC_URI = "http://www.openzaurus.org/download/3.5.4/sources/tickypip-0.1.2.tar.gz \
-           file://path_fix.patch;patch=1 \
+           file://path_fix.patch \
            file://tickypip.desktop \
            file://tickypip.png"
 
diff --git a/recipes/time/time_1.7.bb b/recipes/time/time_1.7.bb
index f21e6d32df..6e0253ff4e 100644
--- a/recipes/time/time_1.7.bb
+++ b/recipes/time/time_1.7.bb
@@ -1,9 +1,9 @@
 require time.inc
 
 SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \
-	   file://debian.patch;patch=1"
-#	   file://autofoo.patch;patch=1 \
-#	   file://compile.patch;patch=1"
+	   file://debian.patch"
+#	   file://autofoo.patch \
+#	   file://compile.patch"
 S = "${WORKDIR}/time-${PV}"
 
 inherit autotools
diff --git a/recipes/tin/tin_1.9.1.bb b/recipes/tin/tin_1.9.1.bb
index 62bebf4d62..e38d4bf08b 100644
--- a/recipes/tin/tin_1.9.1.bb
+++ b/recipes/tin/tin_1.9.1.bb
@@ -3,7 +3,7 @@ require tin.inc
 PR = "r1"
 
 SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/v1.9/tin-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
+	   file://m4.patch"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/tinc/tinc_1.0.2.bb b/recipes/tinc/tinc_1.0.2.bb
index 712113cf7b..c1c57b114e 100644
--- a/recipes/tinc/tinc_1.0.2.bb
+++ b/recipes/tinc/tinc_1.0.2.bb
@@ -5,8 +5,8 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI="http://www.tinc-vpn.org/packages/tinc-1.0.2.tar.gz \
-	file://mtu-vlan.diff;patch=1 \
-	file://public-key-fix.diff;patch=1 \
+	file://mtu-vlan.diff \
+	file://public-key-fix.diff \
 	file://init"
 
 DEPENDS = "openssl lzo zlib"
diff --git a/recipes/tinylogin/tinylogin_1.4.bb b/recipes/tinylogin/tinylogin_1.4.bb
index d55f03d942..40171ff123 100644
--- a/recipes/tinylogin/tinylogin_1.4.bb
+++ b/recipes/tinylogin/tinylogin_1.4.bb
@@ -4,15 +4,15 @@ changing passwords, and otherwise maintaining users \
 and groups on an embedded system."
 HOMEPAGE = "http://tinylogin.busybox.net/"
 SECTION = "base"
-LICENSE = "GPL"
-PR = "r6"
+LICENSE = "GPLv2"
+PR = "r7"
 
 #SRC_URI = "http://tinylogin.busybox.net/downloads/tinylogin-${PV}.tar.bz2 \
 SRC_URI = "http://limpens.net/trac/at91-kit-trac/export/4/trunk/sources/tinylogin-${PV}.tar.bz2 \
-	file://cvs-20040608.patch;patch=1;pnum=1 \
-	file://add-system.patch;patch=1;pnum=1 \
-	file://adduser-empty_pwd.patch;patch=1 \
-	file://remove-index.patch;patch=1"
+	file://cvs-20040608.patch \
+	file://add-system.patch \
+	file://adduser-empty_pwd.patch \
+	file://remove-index.patch"
 
 EXTRA_OEMAKE = ""
 
diff --git a/recipes/tinymail/libtinymail.inc b/recipes/tinymail/libtinymail.inc
index 7abb8a6df7..1eefc6e763 100644
--- a/recipes/tinymail/libtinymail.inc
+++ b/recipes/tinymail/libtinymail.inc
@@ -6,7 +6,7 @@ DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf libgnomeui"
 EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none"
 
 SRC_URI = "http://tinymail.org/files/releases/pre-releases/v${PV}/libtinymail-${PV}.tar.bz2 \
-	   file://no-iconv-detect.patch;patch=1 \
+	   file://no-iconv-detect.patch \
 	   file://iconv-detect.h \
 	   file://gtk-doc.m4 \
            file://gtk-doc.make"
diff --git a/recipes/tinymail/libtinymail_0.0.1.bb b/recipes/tinymail/libtinymail_0.0.1.bb
index 3e432022fd..5519345b0e 100644
--- a/recipes/tinymail/libtinymail_0.0.1.bb
+++ b/recipes/tinymail/libtinymail_0.0.1.bb
@@ -7,7 +7,7 @@ PR = "r1"
 EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none"
 
 SRC_URI = "http://tinymail.org/files/releases/pre-releases/v0.0.1/libtinymail-0.0.1.tar.bz2 \
-	   file://no-iconv-detect.patch;patch=1 \
+	   file://no-iconv-detect.patch \
 	   file://iconv-detect.h \
 	   file://gtk-doc.m4 \
            file://gtk-doc.make"
diff --git a/recipes/tinymail/libtinymail_svn.bb b/recipes/tinymail/libtinymail_svn.bb
index 1aa7931206..c0097dd5e2 100644
--- a/recipes/tinymail/libtinymail_svn.bb
+++ b/recipes/tinymail/libtinymail_svn.bb
@@ -10,8 +10,8 @@ DEFAULT_PREFERENCE = "-1"
 EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none"
 
 SRC_URI = "svn://svn.tinymail.org/svn/tinymail/;module=trunk;proto=http \
-	   file://camel-lite-configure-hack.patch;patch=1;maxdate=20061113 \
-	   file://no-iconv-detect.patch;patch=1;mindate=20061114 \
+	   file://camel-lite-configure-hack.patch;maxdate=20061113 \
+	   file://no-iconv-detect.patch;mindate=20061114 \
 	   file://iconv-detect.h \
 	   file://gtk-doc.m4 \
            file://gtk-doc.make"
diff --git a/recipes/tmdns/tmdns_20030116.bb b/recipes/tmdns/tmdns_20030116.bb
index 4833adaac0..11665d7a37 100644
--- a/recipes/tmdns/tmdns_20030116.bb
+++ b/recipes/tmdns/tmdns_20030116.bb
@@ -3,9 +3,9 @@ SECTION = "console/network"
 DESCRIPTION = "tmdns is a multicast DNS server."
 
 SRC_URI = "cvs://anonymous:@zeroconf.cvs.sourceforge.net/cvsroot/zeroconf;module=tmdns;date=${PV} \
-	   file://install-init.d.patch;patch=1 \
-	   file://busybox-init.d.patch;patch=1 \
-	   file://char-signed-idiocy.patch;patch=1"
+	   file://install-init.d.patch \
+	   file://busybox-init.d.patch \
+	   file://char-signed-idiocy.patch"
 S = "${WORKDIR}/tmdns"
 
 inherit autotools
diff --git a/recipes/tn5250/tn5250_0.16.5.bb b/recipes/tn5250/tn5250_0.16.5.bb
index 1e52e96de0..4cab03d7ca 100644
--- a/recipes/tn5250/tn5250_0.16.5.bb
+++ b/recipes/tn5250/tn5250_0.16.5.bb
@@ -7,7 +7,7 @@ DEPENDS = "ncurses openssl"
 PR ="r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tn5250/tn5250-${PV}.tar.gz \
-	   file://compile.patch;patch=1"
+	   file://compile.patch"
 
 inherit autotools
 
diff --git a/recipes/tofrodos/tofrodos_1.7.8.bb b/recipes/tofrodos/tofrodos_1.7.8.bb
index b829f851f6..3047c45e80 100644
--- a/recipes/tofrodos/tofrodos_1.7.8.bb
+++ b/recipes/tofrodos/tofrodos_1.7.8.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tofrodos is a text file conversion utility that converts ASCII fi
 LICENSE = "GPLv2"
 
 SRC_URI = "http://tofrodos.sourceforge.net/download/tofrodos-${PV}.tar.gz \
-           file://cross.patch;patch=1;pnum=2"
+           file://cross.patch;striplevel=2"
 
 S = "${WORKDIR}/${PN}/src"
 
diff --git a/recipes/tor/tor_0.1.1.26.bb b/recipes/tor/tor_0.1.1.26.bb
index b5033ca231..1045c0b6b6 100644
--- a/recipes/tor/tor_0.1.1.26.bb
+++ b/recipes/tor/tor_0.1.1.26.bb
@@ -7,9 +7,9 @@ LICENSE = "BSD"
 DEPENDS = "libevent openssl zlib"
 
 SRC_URI = "http://tor.eff.org/dist/${P}.tar.gz \
-          file://configure.patch;patch=1;pnum=1 \
-          file://make.patch;patch=1;pnum=1 \
-          file://compat.patch;patch=1;pnum=1 \
+          file://configure.patch \
+          file://make.patch \
+          file://compat.patch \
           file://tor.init"
 
 
diff --git a/recipes/toscoterm/toscoterm_git.bb b/recipes/toscoterm/toscoterm_git.bb
index ed21c86a6c..e902486df2 100644
--- a/recipes/toscoterm/toscoterm_git.bb
+++ b/recipes/toscoterm/toscoterm_git.bb
@@ -4,8 +4,7 @@ LICENSE = "GPLv3"
 DEPENDS = "vte"
 HOMEPAGE = "https://projetos.ossystems.com.br/projects/show/toscoterm"
 SRCREV = "f02add76f365a2fecd2dbefc230ceaab20244f96"
-PV = "0.0+gitr${SRCPV}"
-PE = "1"
+PV = "0.0+gitr${SRCREV}"
 PR = "r3"
 
 SRC_URI = "git://projetos.ossystems.com.br/git/toscoterm.git;protocol=git"
diff --git a/recipes/totem/totem_2.28.1.bb b/recipes/totem/totem_2.28.1.bb
index 1a2d0156a6..aa329003d4 100644
--- a/recipes/totem/totem_2.28.1.bb
+++ b/recipes/totem/totem_2.28.1.bb
@@ -33,7 +33,7 @@ RRECOMMENDS_${PN} += "gst-plugin-playbin \
 
 inherit gnome
 
-SRC_URI += "file://gst-detect.diff;patch=1"
+SRC_URI += "file://gst-detect.diff"
 
 EXTRA_OECONF=" --disable-schemas-install \
                --enable-gtk \
diff --git a/recipes/totem/totem_2.28.5.bb b/recipes/totem/totem_2.28.5.bb
index c6302f5729..98dafa710c 100644
--- a/recipes/totem/totem_2.28.5.bb
+++ b/recipes/totem/totem_2.28.5.bb
@@ -33,7 +33,7 @@ RRECOMMENDS_${PN} += "gst-plugin-playbin \
 
 inherit gnome
 
-SRC_URI += "file://gst-detect.diff;patch=1"
+SRC_URI += "file://gst-detect.diff"
 
 EXTRA_OECONF=" --enable-shared \
            --disable-static \
diff --git a/recipes/totem/totem_2.30.0.bb b/recipes/totem/totem_2.30.0.bb
index e6367b6490..bbd08714f7 100644
--- a/recipes/totem/totem_2.30.0.bb
+++ b/recipes/totem/totem_2.30.0.bb
@@ -31,7 +31,7 @@ RRECOMMENDS_${PN} += "gst-plugin-playbin \
 
 inherit gnome
 
-SRC_URI += "file://gst-detect.diff;patch=1"
+SRC_URI += "file://gst-detect.diff"
 
 SRC_URI[archive.md5sum] = "ecee18e876f6adf5845f71ace87549ca"
 SRC_URI[archive.sha256sum] = "9d8edd266bd2546e4c8034de1196b79855e24a3634d05cc4f8a07fd3edc7b1af"
diff --git a/recipes/tracker/tracker_0.5.4.bb b/recipes/tracker/tracker_0.5.4.bb
index f05f9100cd..9ab3974276 100644
--- a/recipes/tracker/tracker_0.5.4.bb
+++ b/recipes/tracker/tracker_0.5.4.bb
@@ -5,7 +5,7 @@ DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf libgno
 PR = "r3"
 
 SRC_URI = "http://www.gnome.org/~jamiemcc/tracker/tracker-${PV}.tar.gz \
-           file://no-ioprio.patch;patch=1 \
+           file://no-ioprio.patch \
            file://90tracker " 
 
 inherit autotools pkgconfig
diff --git a/recipes/tracker/tracker_0.6.95.bb b/recipes/tracker/tracker_0.6.95.bb
index 2052f15c6b..20bd80c81c 100644
--- a/recipes/tracker/tracker_0.6.95.bb
+++ b/recipes/tracker/tracker_0.6.95.bb
@@ -8,12 +8,12 @@ PR = "r2"
 inherit autotools pkgconfig gnome
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/0.6/tracker-${PV}.tar.bz2 \
-           file://munge-configure.ac-cross-compile.patch;patch=1 \
-           file://05-tracker-ioprio-cross.patch;patch=1 \
-           file://10-drop-bogus-version-info.patch;patch=1 \
-           file://20-tracker-defaults.patch;patch=1 \
-           file://30-gmime-2.4.patch;patch=1 \
-           file://99-autoreconf.patch;patch=1 \           
+           file://munge-configure.ac-cross-compile.patch \
+           file://05-tracker-ioprio-cross.patch \
+           file://10-drop-bogus-version-info.patch \
+           file://20-tracker-defaults.patch \
+           file://30-gmime-2.4.patch \
+           file://99-autoreconf.patch \           
            file://90tracker \
 " 
 
diff --git a/recipes/transmission/transmission_1.61.bb b/recipes/transmission/transmission_1.61.bb
index 955c9aa147..dd17bcab21 100644
--- a/recipes/transmission/transmission_1.61.bb
+++ b/recipes/transmission/transmission_1.61.bb
@@ -1,6 +1,6 @@
 require transmission.inc
 
-SRC_URI_append = " file://webupload.patch;patch=1;pnum=0"
+SRC_URI_append = " file://webupload.patch;striplevel=0"
 
 PR = "r5"
 
diff --git a/recipes/treecc/treecc_0.3.6.bb b/recipes/treecc/treecc_0.3.6.bb
index 365127945d..f8ba1fff3b 100644
--- a/recipes/treecc/treecc_0.3.6.bb
+++ b/recipes/treecc/treecc_0.3.6.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.southern-storm.com.au/treecc.html"
 PRIORITY = "optional"
 
 SRC_URI = "http://www.southern-storm.com.au/download/treecc-${PV}.tar.gz \
-           file://dont-make-in-examples.patch;patch=1"
+           file://dont-make-in-examples.patch"
 
 inherit autotools
 
diff --git a/recipes/tsclient/tsclient_0.132.bb b/recipes/tsclient/tsclient_0.132.bb
index ef85d1bafa..31232a7141 100644
--- a/recipes/tsclient/tsclient_0.132.bb
+++ b/recipes/tsclient/tsclient_0.132.bb
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnomepro.com/tsclient/"
 LICENSE="GPL"
 
 SRC_URI="http://www.gnomepro.com/tsclient/tsclient-${PV}.tar.gz \
-	 file://fixes.patch;patch=1"
+	 file://fixes.patch"
 
 DEPENDS="gtk+ intltool-native"
 
diff --git a/recipes/tslib/tslib.inc b/recipes/tslib/tslib.inc
index 4d75c5a45f..715b7e7670 100644
--- a/recipes/tslib/tslib.inc
+++ b/recipes/tslib/tslib.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://tslib.berlios.de/"
 AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPLv2"
-INC_PR = "r23"
+INC_PR = "r24"
 
 SRC_URI += "\
   file://ts.conf \
@@ -12,8 +12,8 @@ SRC_URI += "\
   file://tslib.sh \
 "
 SRC_URI_append_mnci += "\
-  file://devfs.patch;patch=1 \
-  file://event1.patch;patch=1 \
+  file://devfs.patch \
+  file://event1.patch \
 "
 
 inherit autotools pkgconfig
@@ -21,12 +21,7 @@ inherit autotools pkgconfig
 EXTRA_OECONF        = "--enable-shared"
 EXTRA_OECONF_mnci   = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
 
-do_stage () {
-	autotools_stage_all
-}
-
-do_install () {
-	autotools_do_install
+do_install_append () {
 	install -d ${D}${sysconfdir}/profile.d/
 	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
 	install -m 0644 ${WORKDIR}/ts.conf ${D}${sysconfdir}/ts.conf
diff --git a/recipes/tslib/tslib_1.0.bb b/recipes/tslib/tslib_1.0.bb
index f0a778fe9f..0a23bce900 100644
--- a/recipes/tslib/tslib_1.0.bb
+++ b/recipes/tslib/tslib_1.0.bb
@@ -1,8 +1,8 @@
 SRC_URI = "http://download.berlios.de/tslib/${BP}.tar.bz2 \
-           file://fix_version.patch;patch=1 \
-           file://tslib-nopressure.patch;patch=1 \
-           file://tslib-pluginsld.patch;patch=1 \
-           file://newer-libtool-fix.patch;patch=1 "
+           file://fix_version.patch \
+           file://tslib-nopressure.patch \
+           file://tslib-pluginsld.patch \
+           file://newer-libtool-fix.patch "
 PR = "${INC_PR}.5"
 
 include tslib.inc
diff --git a/recipes/ttyrec/ttyrec_1.0.8.bb b/recipes/ttyrec/ttyrec_1.0.8.bb
index 387be54e06..d577d39fda 100644
--- a/recipes/ttyrec/ttyrec_1.0.8.bb
+++ b/recipes/ttyrec/ttyrec_1.0.8.bb
@@ -17,7 +17,7 @@ PR = "r0"
 ######################################################################################
 
 SRC_URI = "http://0xcc.net/ttyrec/${PN}-${PV}.tar.gz \
-	   file://Makefile.patch;patch=1"
+	   file://Makefile.patch"
 
 ######################################################################################
 
diff --git a/recipes/twin/twin_0.4.6.bb b/recipes/twin/twin_0.4.6.bb
index 6490e57600..c6c3fbdc5a 100644
--- a/recipes/twin/twin_0.4.6.bb
+++ b/recipes/twin/twin_0.4.6.bb
@@ -4,7 +4,7 @@ SECTION = "console/utils"
 DEPENDS = "coreutils-native"
 LICENSE = "GPL LGPL"
 SRC_URI = "http://linuz.sns.it/~max/twin/twin-0.4.6.tar.gz \
-	   file://cross_compile.patch;patch=1"
+	   file://cross_compile.patch"
 
 EXTRA_OECONF = " --disable-tt-hw-x11 --disable-hw-x11 --disable-tt-hw-gtk"
 
diff --git a/recipes/tximage/tximage_0.2.bb b/recipes/tximage/tximage_0.2.bb
index 33509e44ba..ab2a59a3da 100644
--- a/recipes/tximage/tximage_0.2.bb
+++ b/recipes/tximage/tximage_0.2.bb
@@ -6,8 +6,8 @@ HOMEPAGE = "http://community.zaurus.com/projects/tximage/"
 PR = "r2"
 
 SRC_URI = "http://www.openzaurus.org/mirror/tximage-${PV}.tar.gz \
-           file://gcc3.patch;patch=1 \
-           file://gcc4.patch;patch=1"
+           file://gcc3.patch \
+           file://gcc4.patch"
 
 inherit palmtop
 
diff --git a/recipes/tzcode/tzcode-native_2010f.bb b/recipes/tzcode/tzcode-native_2010f.bb
deleted file mode 100644
index f2fbffdb70..0000000000
--- a/recipes/tzcode/tzcode-native_2010f.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require tzcode-native.inc
-
-# Note that elsie.nci.nih.gov removes old versions when new is coming out
-# So if this doesn't build for you because of missing source file, just
-# bump it to the latest available version, removing old one
-# Also, tzdata (and it is needed to build tzcode) version can differ from
-# tzcode version, thus this variable
-
-TZDATA_PV = "2010h"
-
-SRC_URI[tzcode-2010f.md5sum] = "e530cc9bbdfd5e8c1eac21a68f4d5656"
-SRC_URI[tzcode-2010f.sha256sum] = "651d866c91ada925b4ac9491e69ebd5c355c46b2c01dd1741b5e6a609d93eb1e"
-SRC_URI[tzdata-2010h.md5sum] = "d384ac091e6d56802f9b3e6b3d3f0f2e"
-SRC_URI[tzdata-2010h.sha256sum] = "a4918d60f63440ba9b6050205881e8a98d718dc0c2b7df5955f43e781eab6e7d"
-
-PR = "${INC_PR}.2"
diff --git a/recipes/tzcode/tzcode-native_2010j.bb b/recipes/tzcode/tzcode-native_2010j.bb
new file mode 100644
index 0000000000..7e1ae7786c
--- /dev/null
+++ b/recipes/tzcode/tzcode-native_2010j.bb
@@ -0,0 +1,16 @@
+require tzcode-native.inc
+
+# Note that elsie.nci.nih.gov removes old versions when new is coming out
+# So if this doesn't build for you because of missing source file, just
+# bump it to the latest available version, removing old one
+# Also, tzdata (and it is needed to build tzcode) version can differ from
+# tzcode version, thus this variable
+
+TZDATA_PV = "2010j"
+
+SRC_URI[tzcode-2010j.md5sum] = "5ba8345720296d3a659b349b2052d139"
+SRC_URI[tzcode-2010j.sha256sum] = "f32b46405190e3a5f1ee4db9fb50aaf1379e6af4e5493402ebfc8ee757058e97"
+SRC_URI[tzdata-2010j.md5sum] = "f668f66b260e14b477eac3f48bcfb5f4"
+SRC_URI[tzdata-2010j.sha256sum] = "dcf2101d0c5bb20a7f182866ea3e52b54c8f4d129c025a96c9a31377676f554b"
+
+PR = "${INC_PR}.0"
diff --git a/recipes/tzdata/tzdata_2010h.bb b/recipes/tzdata/tzdata_2010j.bb
index 1e00fd3d88..79b776978b 100644
--- a/recipes/tzdata/tzdata_2010h.bb
+++ b/recipes/tzdata/tzdata_2010j.bb
@@ -6,5 +6,5 @@ require tzdata.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI[tar.md5sum] = "d384ac091e6d56802f9b3e6b3d3f0f2e"
-SRC_URI[tar.sha256sum] = "a4918d60f63440ba9b6050205881e8a98d718dc0c2b7df5955f43e781eab6e7d"
+SRC_URI[tar.md5sum] = "f668f66b260e14b477eac3f48bcfb5f4"
+SRC_URI[tar.sha256sum] = "dcf2101d0c5bb20a7f182866ea3e52b54c8f4d129c025a96c9a31377676f554b"
diff --git a/recipes/u-boot/u-boot-1.3.2/gcc4-weak-inline.patch b/recipes/u-boot/u-boot-1.3.2/gcc4-weak-inline.patch
new file mode 100644
index 0000000000..10a3c38b23
--- /dev/null
+++ b/recipes/u-boot/u-boot-1.3.2/gcc4-weak-inline.patch
@@ -0,0 +1,13 @@
+Index: u-boot-1.3.2/common/main.c
+===================================================================
+--- u-boot-1.3.2.orig/common/main.c	2010-05-11 19:56:47.620373909 -0700
++++ u-boot-1.3.2/common/main.c	2010-05-11 19:57:36.060364465 -0700
+@@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR;
+  * Board-specific Platform code can reimplement show_boot_progress () if needed
+  */
+ void inline __show_boot_progress (int val) {}
+-void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
++void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+ 
+ #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
+ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);		/* for do_reset() prototype */
diff --git a/recipes/u-boot/u-boot-1.3.2/linker-script-sort-rodata-sections.patch b/recipes/u-boot/u-boot-1.3.2/linker-script-sort-rodata-sections.patch
new file mode 100644
index 0000000000..cb6a3e9f36
--- /dev/null
+++ b/recipes/u-boot/u-boot-1.3.2/linker-script-sort-rodata-sections.patch
@@ -0,0 +1,16 @@
+Index: u-boot-1.3.2/cpu/mpc83xx/u-boot.lds
+===================================================================
+--- u-boot-1.3.2.orig/cpu/mpc83xx/u-boot.lds	2010-05-11 21:18:24.130376212 -0700
++++ u-boot-1.3.2/cpu/mpc83xx/u-boot.lds	2010-05-11 21:19:46.870376132 -0700
+@@ -55,10 +55,8 @@ SECTIONS
+     *(.fixup)
+     *(.got1)
+     . = ALIGN(16);
+-    *(.rodata)
+-    *(.rodata1)
+-    *(.rodata.str1.4)
+     *(.eh_frame)
++    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+   }
+   .fini      : { *(.fini)    } =0
+   .ctors     : { *(.ctors)   }
diff --git a/recipes/u-boot/u-boot-2009.03/hipox/10-hipox-boot-abort-key.patch b/recipes/u-boot/u-boot-2009.03/hipox/10-hipox-boot-abort-key.patch
new file mode 100644
index 0000000000..86838d676d
--- /dev/null
+++ b/recipes/u-boot/u-boot-2009.03/hipox/10-hipox-boot-abort-key.patch
@@ -0,0 +1,73 @@
+diff -Nurd u-boot-2009.03.orig//common/main.c u-boot-2009.03/common/main.c
+--- u-boot-2009.03.orig//common/main.c	2010-05-25 08:10:52.000000000 +0200
++++ u-boot-2009.03/common/main.c	2010-05-25 08:16:03.000000000 +0200
+@@ -62,6 +62,9 @@
+ 
+ #define MAX_DELAY_STOP_STR 32
+ 
++/* The boot abort character '.' */
++#define BOOT_ABORT_CHAR 0x2E
++
+ #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
+ static int abortboot(int);
+ #endif
+@@ -214,11 +217,18 @@
+ static __inline__ int abortboot(int bootdelay)
+ {
+ 	int abort = 0;
++	// flush 16 byte UART read fifo
++	int i;
++	for(i=0; (i<16) && tstc(); ++i)
++	{
++		int dropbyte = getc();  /* consume input        */
++		printf("drop UART byte: 0x%02X\n", dropbyte);
++	}
+ 
+ #ifdef CONFIG_MENUPROMPT
+ 	printf(CONFIG_MENUPROMPT);
+ #else
+-	printf("Hit any key to stop autoboot: %2d ", bootdelay);
++	printf("Hit '%c' to stop autoboot: %2d ", BOOT_ABORT_CHAR, bootdelay);
+ #endif
+ 
+ #if defined CONFIG_ZERO_BOOTDELAY_CHECK
+@@ -228,9 +238,12 @@
+ 	 */
+ 	if (bootdelay >= 0) {
+ 		if (tstc()) {	/* we got a key press	*/
+-			(void) getc();  /* consume input	*/
+-			puts ("\b\b\b 0");
+-			abort = 1;	/* don't auto boot	*/
++			int currkey = getc();  /* consume input	*/
++			if(BOOT_ABORT_CHAR == currkey)
++			{
++				puts ("\b\b\b 0");
++				abort = 1;	/* don't auto boot	*/
++			}
+ 		}
+ 	}
+ #endif
+@@ -242,14 +255,20 @@
+ 		/* delay 100 * 10ms */
+ 		for (i=0; !abort && i<100; ++i) {
+ 			if (tstc()) {	/* we got a key press	*/
++# ifdef CONFIG_MENUKEY
+ 				abort  = 1;	/* don't auto boot	*/
+ 				bootdelay = 0;	/* no more delay	*/
+-# ifdef CONFIG_MENUKEY
+ 				menukey = getc();
++				break;
+ # else
+-				(void) getc();  /* consume input	*/
++				int currkey = getc();  /* consume input	*/
++				if(BOOT_ABORT_CHAR == currkey)
++				{
++					abort  = 1;	/* don't auto boot	*/
++					bootdelay = 0;	/* no more delay	*/
++					break;
++				}
+ # endif
+-				break;
+ 			}
+ 			udelay(10000);
+ 		}
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0001-OMAP3-enable-i2c-bus-switching-for-Beagle-and-Overo.patch b/recipes/u-boot/u-boot-git/beagleboard/0001-OMAP3-enable-i2c-bus-switching-for-Beagle-and-Overo.patch
new file mode 100644
index 0000000000..921ca10cfe
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0001-OMAP3-enable-i2c-bus-switching-for-Beagle-and-Overo.patch
@@ -0,0 +1,52 @@
+From fc313d72cbfd788f23a7623d0b8cd9c2af329b7b Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Wed, 10 Feb 2010 13:39:40 -0800
+Subject: [PATCH 01/37] OMAP3: enable i2c bus switching for Beagle and Overo
+
+---
+ drivers/i2c/omap24xx_i2c.c     |    6 ++++++
+ include/configs/omap3_beagle.h |    1 +
+ include/configs/omap3_overo.h  |    1 +
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
+index ff18991..30a8b4c 100644
+--- a/drivers/i2c/omap24xx_i2c.c
++++ b/drivers/i2c/omap24xx_i2c.c
+@@ -435,3 +435,9 @@ int i2c_set_bus_num(unsigned int bus)
+ 
+ 	return 0;
+ }
++
++int i2c_get_bus_num(void)
++{
++	return (int) current_bus;
++}
++
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index 08d79ac..87e3dd0 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -146,6 +146,7 @@
+ #define CONFIG_SYS_I2C_BUS		0
+ #define CONFIG_SYS_I2C_BUS_SELECT	1
+ #define CONFIG_DRIVER_OMAP34XX_I2C	1
++#define CONFIG_I2C_MULTI_BUS		1
+ 
+ /*
+  * TWL4030
+diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
+index a43500b..0d24758 100644
+--- a/include/configs/omap3_overo.h
++++ b/include/configs/omap3_overo.h
+@@ -117,6 +117,7 @@
+ #define CONFIG_SYS_I2C_BUS		0
+ #define CONFIG_SYS_I2C_BUS_SELECT	1
+ #define CONFIG_DRIVER_OMAP34XX_I2C	1
++#define CONFIG_I2C_MULTI_BUS		1
+ 
+ /*
+  * TWL4030
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0002-OMAP3-add-board-revision-detection-for-Overo.patch b/recipes/u-boot/u-boot-git/beagleboard/0002-OMAP3-add-board-revision-detection-for-Overo.patch
new file mode 100644
index 0000000000..255d72574c
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0002-OMAP3-add-board-revision-detection-for-Overo.patch
@@ -0,0 +1,187 @@
+From 59c9245c9a52954c8c084e257bbe55443201614b Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Wed, 10 Feb 2010 14:40:56 -0800
+Subject: [PATCH 02/37] OMAP3: add board revision detection for Overo
+
+---
+ board/overo/overo.c |   90 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ board/overo/overo.h |   43 +++++++++++++++++++++---
+ 2 files changed, 127 insertions(+), 6 deletions(-)
+
+diff --git a/board/overo/overo.c b/board/overo/overo.c
+index e85be7d..3df1a12 100644
+--- a/board/overo/overo.c
++++ b/board/overo/overo.c
+@@ -61,11 +61,101 @@ int board_init(void)
+ }
+ 
+ /*
++ * Routine: get_sdio2_config
++ * Description: Return information about the wifi module connection
++ *              Returns 0 if the module connects though a level translator
++ *              Returns 1 if the module connects directly
++ */
++int get_sdio2_config(void) {
++	int sdio_direct;
++
++	if (!omap_request_gpio(130) && !omap_request_gpio(139)){
++
++		omap_set_gpio_direction(130, 0);
++		omap_set_gpio_direction(139, 1);
++
++		sdio_direct = 1;
++		omap_set_gpio_dataout(130, 0);
++		if (omap_get_gpio_datain(139) == 0) {
++			omap_set_gpio_dataout(130, 1);
++			if (omap_get_gpio_datain(139) == 1)
++				sdio_direct = 0;
++		}
++
++		omap_free_gpio(130);
++		omap_free_gpio(139);
++	} else {
++		printf("Error: unable to acquire sdio2 clk GPIOs\n");
++		sdio_direct=-1;
++	}
++
++	return sdio_direct;
++}
++
++/*
++ * Routine: get_board_revision
++ * Description: Returns the board revision
++ */
++int get_board_revision(void) {
++	int revision;
++
++	if (!omap_request_gpio(126) && !omap_request_gpio(127) &&
++	    !omap_request_gpio(128) && !omap_request_gpio(129)){
++
++		omap_set_gpio_direction(126, 1);
++		omap_set_gpio_direction(127, 1);
++		omap_set_gpio_direction(128, 1);
++		omap_set_gpio_direction(129, 1);
++
++		revision = 0;
++		if (omap_get_gpio_datain(126) == 0)
++			revision += 1;
++		if (omap_get_gpio_datain(127) == 0)
++			revision += 2;
++		if (omap_get_gpio_datain(128) == 0)
++			revision += 4;
++		if (omap_get_gpio_datain(129) == 0)
++			revision += 8;
++
++		omap_free_gpio(126);
++		omap_free_gpio(127);
++		omap_free_gpio(128);
++		omap_free_gpio(129);
++	} else {
++		printf("Error: unable to acquire board revision GPIOs\n");
++		revision=-1;
++	}
++
++	return revision;
++}
++
++/*
+  * Routine: misc_init_r
+  * Description: Configure board specific parts
+  */
+ int misc_init_r(void)
+ {
++	printf("Board revision: ");
++	switch (get_board_revision()) {
++		case 0:
++		case 1:
++			switch (get_sdio2_config()) {
++				case 0:
++					printf(" 0\n");
++					MUX_OVERO_SDIO2_TRANSCEIVER();
++					break;
++				case 1:
++					printf(" 1\n");
++					MUX_OVERO_SDIO2_DIRECT();
++					break;
++				default:
++					printf(" unknown\n");
++			}
++			break;
++		default:
++			printf(" unsupported\n");
++	}
++
+ 	twl4030_power_init();
+ 	twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
+ 
+diff --git a/board/overo/overo.h b/board/overo/overo.h
+index 1873523..e120e09 100644
+--- a/board/overo/overo.h
++++ b/board/overo/overo.h
+@@ -206,12 +206,12 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(MMC1_DAT1),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT1*/\
+ 	MUX_VAL(CP(MMC1_DAT2),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT2*/\
+ 	MUX_VAL(CP(MMC1_DAT3),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT3*/\
+-	MUX_VAL(CP(MMC1_DAT4),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT4*/\
+-	MUX_VAL(CP(MMC1_DAT5),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT5*/\
+-	MUX_VAL(CP(MMC1_DAT6),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT6*/\
+-	MUX_VAL(CP(MMC1_DAT7),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT7*/\
++	MUX_VAL(CP(MMC1_DAT4),		(IEN  | PTU | EN  | M4)) /*GPIO_126*/\
++	MUX_VAL(CP(MMC1_DAT5),		(IEN  | PTU | EN  | M4)) /*GPIO_127*/\
++	MUX_VAL(CP(MMC1_DAT6),		(IEN  | PTU | EN  | M4)) /*GPIO_128*/\
++	MUX_VAL(CP(MMC1_DAT7),		(IEN  | PTU | EN  | M4)) /*GPIO_129*/\
+  /*Wireless LAN */\
+-	MUX_VAL(CP(MMC2_CLK),		(IEN  | PTU | EN  | M0)) /*MMC2_CLK*/\
++	MUX_VAL(CP(MMC2_CLK),		(IEN  | PTU | EN  | M4)) /*GPIO_130*/\
+ 	MUX_VAL(CP(MMC2_CMD),		(IEN  | PTU | EN  | M0)) /*MMC2_CMD*/\
+ 	MUX_VAL(CP(MMC2_DAT0),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT0*/\
+ 	MUX_VAL(CP(MMC2_DAT1),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT1*/\
+@@ -220,7 +220,7 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(MMC2_DAT4),		(IEN  | PTU | EN  | M1)) /*MMC2_DIR_DAT0*/\
+ 	MUX_VAL(CP(MMC2_DAT5),		(IEN  | PTU | EN  | M1)) /*MMC2_DIR_DAT1*/\
+ 	MUX_VAL(CP(MMC2_DAT6),		(IEN  | PTU | EN  | M1)) /*MMC2_DIR_CMD*/\
+-	MUX_VAL(CP(MMC2_DAT7),		(IEN  | PTU | EN  | M1)) /*MMC2_CLKIN*/\
++	MUX_VAL(CP(MMC2_DAT7),		(IEN  | PTU | EN  | M4)) /*GPIO_139*/\
+  /*Bluetooth*/\
+ 	MUX_VAL(CP(MCBSP3_DX),		(IEN  | PTD | DIS | M1)) /*UART2_CTS*/\
+ 	MUX_VAL(CP(MCBSP3_DR),		(IDIS | PTD | DIS | M1)) /*UART2_RTS*/\
+@@ -387,5 +387,36 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(SDRC_CKE0),		(IDIS | PTU | EN  | M0)) /*sdrc_cke0*/\
+ 	MUX_VAL(CP(SDRC_CKE1),		(IDIS | PTU | EN  | M0)) /*sdrc_cke1*/
+ 
++#define MUX_OVERO_SDIO2_DIRECT() \
++	MUX_VAL(CP(MMC2_CLK),		(IEN  | PTU | EN  | M0)) /*MMC2_CLK*/\
++	MUX_VAL(CP(MMC2_CMD),		(IEN  | PTU | EN  | M0)) /*MMC2_CMD*/\
++	MUX_VAL(CP(MMC2_DAT0),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT0*/\
++	MUX_VAL(CP(MMC2_DAT1),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT1*/\
++	MUX_VAL(CP(MMC2_DAT2),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT2*/\
++	MUX_VAL(CP(MMC2_DAT3),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT3*/\
++	MUX_VAL(CP(MMC2_DAT4),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT4*/\
++	MUX_VAL(CP(MMC2_DAT5),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT5*/\
++	MUX_VAL(CP(MMC2_DAT6),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT6*/\
++	MUX_VAL(CP(MMC2_DAT7),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT7*/\
++	MUX_VAL(CP(MMC1_DAT4),		(IEN  | PTD | EN  | M4)) /*GPIO_126*/\
++	MUX_VAL(CP(MMC1_DAT5),		(IEN  | PTU | EN  | M4)) /*GPIO_127*/\
++	MUX_VAL(CP(MMC1_DAT6),		(IEN  | PTU | EN  | M4)) /*GPIO_128*/\
++	MUX_VAL(CP(MMC1_DAT7),		(IEN  | PTU | EN  | M4)) /*GPIO_129*/
++
++#define MUX_OVERO_SDIO2_TRANSCEIVER() \
++	MUX_VAL(CP(MMC2_CLK),		(IEN  | PTU | EN  | M0)) /*MMC2_CLK*/\
++	MUX_VAL(CP(MMC2_CMD),		(IEN  | PTU | EN  | M0)) /*MMC2_CMD*/\
++	MUX_VAL(CP(MMC2_DAT0),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT0*/\
++	MUX_VAL(CP(MMC2_DAT1),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT1*/\
++	MUX_VAL(CP(MMC2_DAT2),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT2*/\
++	MUX_VAL(CP(MMC2_DAT3),		(IEN  | PTU | EN  | M0)) /*MMC2_DAT3*/\
++	MUX_VAL(CP(MMC2_DAT4),		(IEN  | PTU | EN  | M1)) /*MMC2_DIR_DAT0*/\
++	MUX_VAL(CP(MMC2_DAT5),		(IEN  | PTU | EN  | M1)) /*MMC2_DIR_DAT1*/\
++	MUX_VAL(CP(MMC2_DAT6),		(IEN  | PTU | EN  | M1)) /*MMC2_DIR_CMD*/\
++	MUX_VAL(CP(MMC2_DAT7),		(IEN  | PTU | EN  | M1)) /*MMC2_CLKIN*/\
++	MUX_VAL(CP(MMC1_DAT4),		(IEN  | PTU | EN  | M4)) /*GPIO_126*/\
++	MUX_VAL(CP(MMC1_DAT5),		(IEN  | PTU | EN  | M4)) /*GPIO_127*/\
++	MUX_VAL(CP(MMC1_DAT6),		(IEN  | PTU | EN  | M4)) /*GPIO_128*/\
++	MUX_VAL(CP(MMC1_DAT7),		(IEN  | PTU | EN  | M4)) /*GPIO_129*/
+ 
+ #endif
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch b/recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch
new file mode 100644
index 0000000000..d12ff7a1ed
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch
@@ -0,0 +1,165 @@
+From 9db5da6e8a0d6fb973b71902525ad3298faa39d9 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Wed, 10 Feb 2010 14:51:48 -0800
+Subject: [PATCH 03/37] OMAP3: update Beagle revision detection to recognize C4 boards
+
+---
+ board/ti/beagle/beagle.c |   77 +++++++++++++++++++++++++++-------------------
+ board/ti/beagle/beagle.h |    7 +++-
+ 2 files changed, 51 insertions(+), 33 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index 3b4c9e7..ba16dd7 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -38,7 +38,7 @@
+ #include <asm/mach-types.h>
+ #include "beagle.h"
+ 
+-static int beagle_revision_c;
++static int beagle_revision;
+ 
+ /*
+  * Routine: board_init
+@@ -60,41 +60,38 @@ int board_init(void)
+ /*
+  * Routine: beagle_get_revision
+  * Description: Return the revision of the BeagleBoard this code is running on.
+- *              If it is a revision Ax/Bx board, this function returns 0,
+- *              on a revision C board you will get a 1.
+  */
+ int beagle_get_revision(void)
+ {
+-	return beagle_revision_c;
++	return beagle_revision;
+ }
+ 
+ /*
+  * Routine: beagle_identify
+- * Description: Detect if we are running on a Beagle revision Ax/Bx or
+- *              Cx. This can be done by GPIO_171. If this is low, we are
+- *              running on a revision C board.
++ * Description: Detect if we are running on a Beagle revision Ax/Bx,
++ *		C1/2/3, C4 or D. This can be done by reading
++ *		the level of GPIO173, GPIO172 and GPIO171. This should
++ *		result in
++ *		GPIO173, GPIO172, GPIO171: 1 1 1 => Ax/Bx
++ *		GPIO173, GPIO172, GPIO171: 1 1 0 => C1/2/3
++ *		GPIO173, GPIO172, GPIO171: 1 0 1 => C4
++ *		GPIO173, GPIO172, GPIO171: 0 0 0 => D
+  */
+ void beagle_identify(void)
+ {
+-	beagle_revision_c = 0;
+-	if (!omap_request_gpio(171)) {
+-		unsigned int val;
+-
+-		omap_set_gpio_direction(171, 1);
+-		val = omap_get_gpio_datain(171);
+-		omap_free_gpio(171);
+-
+-		if (val)
+-			beagle_revision_c = 0;
+-		else
+-			beagle_revision_c = 1;
+-	}
+-
+-	printf("Board revision ");
+-	if (beagle_revision_c)
+-		printf("C\n");
+-	else
+-		printf("Ax/Bx\n");
++	omap_request_gpio(171);
++	omap_request_gpio(172);
++	omap_request_gpio(173);
++	omap_set_gpio_direction(171, 1);
++	omap_set_gpio_direction(172, 1);
++	omap_set_gpio_direction(173, 1);
++
++	beagle_revision = omap_get_gpio_datain(173) << 2 |
++			  omap_get_gpio_datain(172) << 1 |
++			  omap_get_gpio_datain(171);
++	omap_free_gpio(171);
++	omap_free_gpio(172);
++	omap_free_gpio(173);
+ }
+ 
+ /*
+@@ -106,9 +103,31 @@ int misc_init_r(void)
+ 	struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE;
+ 	struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE;
+ 
++	beagle_identify();
++
+ 	twl4030_power_init();
+ 	twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
+ 
++	printf("Board revision ");
++	switch (beagle_revision) {
++	case REVISION_AXBX:
++		printf("Ax/Bx\n");
++		break;
++	case REVISION_CX:
++		printf("C1/C2/C3\n");
++		MUX_BEAGLE_C();
++		break;
++	case REVISION_C4:
++		printf("C4\n");
++		MUX_BEAGLE_C();
++		break;
++	case REVISION_D:
++		printf("D\n");
++		break;
++	default:
++		printf("unknown 0x%02x\n", beagle_revision);
++	}
++
+ 	/* Configure GPIOs to output */
+ 	writel(~(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1), &gpio6_base->oe);
+ 	writel(~(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 |
+@@ -120,8 +139,6 @@ int misc_init_r(void)
+ 	writel(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 |
+ 		GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout);
+ 
+-	beagle_identify();
+-
+ 	dieid_num_r();
+ 
+ 	return 0;
+@@ -136,8 +153,4 @@ int misc_init_r(void)
+ void set_muxconf_regs(void)
+ {
+ 	MUX_BEAGLE();
+-
+-	if (beagle_revision_c) {
+-		MUX_BEAGLE_C();
+-	}
+ }
+diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
+index 7fe6275..d95fd78 100644
+--- a/board/ti/beagle/beagle.h
++++ b/board/ti/beagle/beagle.h
+@@ -34,6 +34,11 @@ const omap3_sysinfo sysinfo = {
+ };
+ 
+ #define BOARD_REVISION_MASK	(0x1 << 11)
++/* BeagleBoard revisions */
++#define REVISION_AXBX	0x7
++#define REVISION_CX	0x6
++#define REVISION_C4	0x5
++#define REVISION_D	0x0
+ 
+ /*
+  * IEN  - Input Enable
+@@ -264,7 +269,7 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(HDQ_SIO),		(IDIS | PTU | EN  | M4)) /*GPIO_170*/\
+ 	MUX_VAL(CP(MCSPI1_CLK),		(IEN  | PTU | EN  | M4)) /*GPIO_171*/\
+ 	MUX_VAL(CP(MCSPI1_SIMO),	(IEN  | PTU | EN  | M4)) /*GPIO_172*/\
+-	MUX_VAL(CP(MCSPI1_SOMI),	(IEN  | PTD | DIS | M0)) /*McSPI1_SOMI*/\
++	MUX_VAL(CP(MCSPI1_SOMI),	(IEN  | PTU | EN  | M4)) /*GPIO_173*/\
+ 	MUX_VAL(CP(MCSPI1_CS0),		(IEN  | PTD | EN  | M0)) /*McSPI1_CS0*/\
+ 	MUX_VAL(CP(MCSPI1_CS1),		(IDIS | PTD | EN  | M0)) /*McSPI1_CS1*/\
+ 	MUX_VAL(CP(MCSPI1_CS2),		(IDIS | PTD | DIS | M4)) /*GPIO_176*/\
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch b/recipes/u-boot/u-boot-git/beagleboard/0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch
new file mode 100644
index 0000000000..549b3fbddf
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch
@@ -0,0 +1,143 @@
+From efc587fb24a5246f5a436a057320687a1b7847c6 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Wed, 10 Feb 2010 15:23:19 -0800
+Subject: [PATCH 04/37] OMAP3: Set VAUX2 to 1.8V for EHCI PHY on Beagle Rev C4 boards
+
+---
+ board/ti/beagle/beagle.c |    5 +++++
+ drivers/power/twl4030.c  |   45 +++++++++++++++++++++++++--------------------
+ include/twl4030.h        |   15 +++++++++++++++
+ 3 files changed, 45 insertions(+), 20 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index ba16dd7..b4ea7e6 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -120,6 +120,11 @@ int misc_init_r(void)
+ 	case REVISION_C4:
+ 		printf("C4\n");
+ 		MUX_BEAGLE_C();
++		/* Set VAUX2 to 1.8V for EHCI PHY */
++		twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
++					TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
++					TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
++					TWL4030_PM_RECEIVER_DEV_GRP_P1);
+ 		break;
+ 	case REVISION_D:
+ 		printf("D\n");
+diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
+index eb066cb..f354834 100644
+--- a/drivers/power/twl4030.c
++++ b/drivers/power/twl4030.c
+@@ -59,57 +59,62 @@ void twl4030_power_reset_init(void)
+ 	}
+ }
+ 
+-
+-/*
+- * Power Init
+- */
+-#define DEV_GRP_P1		0x20
+-#define VAUX3_VSEL_28		0x03
+-#define DEV_GRP_ALL		0xE0
+-#define VPLL2_VSEL_18		0x05
+-#define VDAC_VSEL_18		0x03
+-
+ void twl4030_power_init(void)
+ {
+ 	unsigned char byte;
+ 
+ 	/* set VAUX3 to 2.8V */
+-	byte = DEV_GRP_P1;
++	byte = TWL4030_PM_RECEIVER_DEV_GRP_P1;
+ 	twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte,
+ 			     TWL4030_PM_RECEIVER_VAUX3_DEV_GRP);
+-	byte = VAUX3_VSEL_28;
++	byte = TWL4030_PM_RECEIVER_VAUX3_VSEL_28;
+ 	twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte,
+ 			     TWL4030_PM_RECEIVER_VAUX3_DEDICATED);
+ 
+ 	/* set VPLL2 to 1.8V */
+-	byte = DEV_GRP_ALL;
++	byte = TWL4030_PM_RECEIVER_DEV_GRP_ALL;
+ 	twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte,
+ 			     TWL4030_PM_RECEIVER_VPLL2_DEV_GRP);
+-	byte = VPLL2_VSEL_18;
++	byte = TWL4030_PM_RECEIVER_VPLL2_VSEL_18;
+ 	twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte,
+ 			     TWL4030_PM_RECEIVER_VPLL2_DEDICATED);
+ 
+ 	/* set VDAC to 1.8V */
+-	byte = DEV_GRP_P1;
++	byte = TWL4030_PM_RECEIVER_DEV_GRP_P1;
+ 	twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte,
+ 			     TWL4030_PM_RECEIVER_VDAC_DEV_GRP);
+-	byte = VDAC_VSEL_18;
++	byte = TWL4030_PM_RECEIVER_VDAC_VSEL_18;
+ 	twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte,
+ 			     TWL4030_PM_RECEIVER_VDAC_DEDICATED);
+ }
+ 
+-#define VMMC1_VSEL_30		0x02
+-
+ void twl4030_power_mmc_init(void)
+ {
+ 	unsigned char byte;
+ 
+-	byte = DEV_GRP_P1;
++	byte = TWL4030_PM_RECEIVER_DEV_GRP_P1;
+ 	twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte,
+ 			     TWL4030_PM_RECEIVER_VMMC1_DEV_GRP);
+ 
+ 	/* 3 Volts */
+-	byte = VMMC1_VSEL_30;
++	byte = TWL4030_PM_RECEIVER_VMMC1_VSEL_30;
+ 	twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte,
+ 			     TWL4030_PM_RECEIVER_VMMC1_DEDICATED);
+ }
++
++/*
++ * Generic function to select Device Group and Voltage
++ */
++void twl4030_pmrecv_vsel_cfg(u8 vsel_reg, u8 vsel_val,
++				u8 dev_grp, u8 dev_grp_sel)
++{
++	/* Select the Device Group */
++	twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, dev_grp_sel,
++				dev_grp);
++
++	/* Select the Voltage */
++	twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, vsel_val,
++				vsel_reg);
++}
++
++
+diff --git a/include/twl4030.h b/include/twl4030.h
+index 2b2f5ae..cc99403 100644
+--- a/include/twl4030.h
++++ b/include/twl4030.h
+@@ -471,6 +471,21 @@
+ #define TWL4030_USB_PHY_CLK_CTRL_STS			0xFF
+ 
+ /*
++ * Voltage Selection in PM Receiver Module
++ */
++#define TWL4030_PM_RECEIVER_VAUX2_VSEL_18		0x05
++#define TWL4030_PM_RECEIVER_VAUX3_VSEL_28		0x03
++#define TWL4030_PM_RECEIVER_VPLL2_VSEL_18		0x05
++#define TWL4030_PM_RECEIVER_VDAC_VSEL_18		0x03
++#define TWL4030_PM_RECEIVER_VMMC1_VSEL_30		0x02
++
++/*
++ * Device Selection in PM Receiver Module
++ */
++#define TWL4030_PM_RECEIVER_DEV_GRP_P1			0x20
++#define TWL4030_PM_RECEIVER_DEV_GRP_ALL			0xE0
++
++/*
+  * Convience functions to read and write from TWL4030
+  *
+  * chip_no is the i2c address, it must be one of the chip addresses
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch b/recipes/u-boot/u-boot-git/beagleboard/0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch
new file mode 100644
index 0000000000..783fe279dc
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch
@@ -0,0 +1,105 @@
+From 27072274450ea8de1994744782397452b99814cc Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Wed, 3 Feb 2010 12:26:30 -0800
+Subject: [PATCH 05/37] OMAP3: add entry for rev 3.1.2, check and display max cpu clock for rev > 3.0
+
+---
+ cpu/arm_cortexa8/omap3/sys_info.c  |   24 ++++++++++++++++++++++--
+ include/asm-arm/arch-omap3/cpu.h   |    8 +++++++-
+ include/asm-arm/arch-omap3/omap3.h |    3 ++-
+ 3 files changed, 31 insertions(+), 4 deletions(-)
+
+diff --git a/cpu/arm_cortexa8/omap3/sys_info.c b/cpu/arm_cortexa8/omap3/sys_info.c
+index 08fb32e..e227f67 100644
+--- a/cpu/arm_cortexa8/omap3/sys_info.c
++++ b/cpu/arm_cortexa8/omap3/sys_info.c
+@@ -39,7 +39,10 @@ static char *rev_s[CPU_3XX_MAX_REV] = {
+ 				"2.0",
+ 				"2.1",
+ 				"3.0",
+-				"3.1"};
++				"3.1",
++				"UNKNOWN",
++				"UNKNOWN",
++				"3.1.2"};
+ 
+ /*****************************************************************
+  * dieid_num_r(void) - read and set die ID
+@@ -104,6 +107,16 @@ u32 get_cpu_rev(void)
+ 	}
+ }
+ 
++/*****************************************************************
++ * get_sku_id(void) - read sku_id to get info on max clock rate
++ *****************************************************************/
++u32 get_sku_id(void)
++{
++	struct ctrl_id *id_base = (struct ctrl_id *)OMAP34XX_ID_L4_IO_BASE;
++	return (readl(&id_base->sku_id) & SKUID_CLK_MASK);
++}
++
++
+ /****************************************************
+  * is_mem_sdr() - return 1 if mem type in use is SDR
+  ****************************************************/
+@@ -291,9 +304,16 @@ int print_cpuinfo (void)
+ 		sec_s = "?";
+ 	}
+ 
+-	printf("OMAP%s-%s ES%s, CPU-OPP2 L3-165MHz\n",
++	printf("OMAP%s-%s ES%s, CPU-OPP2, L3-165MHz, ",
+ 			cpu_s, sec_s, rev_s[get_cpu_rev()]);
+ 
++	printf("Max clock-");
++	if ((get_cpu_rev() >= CPU_3XX_ES31) && (get_sku_id() == SKUID_CLK_720MHZ))
++		printf("720Mhz\n");
++	else	printf("600Mhz\n");
++	
++
++
+ 	return 0;
+ }
+ #endif	/* CONFIG_DISPLAY_CPUINFO */
+diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h
+index aa8de32..f769571 100644
+--- a/include/asm-arm/arch-omap3/cpu.h
++++ b/include/asm-arm/arch-omap3/cpu.h
+@@ -72,7 +72,8 @@ struct ctrl_id {
+ 	u8 res1[0x4];
+ 	u32 idcode;		/* 0x04 */
+ 	u32 prod_id;		/* 0x08 */
+-	u8 res2[0x0C];
++	u32 sku_id;		/* 0x0c */
++	u8 res2[0x08];
+ 	u32 die_id_0;		/* 0x18 */
+ 	u32 die_id_1;		/* 0x1C */
+ 	u32 die_id_2;		/* 0x20 */
+@@ -89,6 +90,11 @@ struct ctrl_id {
+ #define HS_DEVICE		0x2
+ #define GP_DEVICE		0x3
+ 
++/* device speed */
++#define SKUID_CLK_MASK		0xf
++#define SKUID_CLK_600MHZ	0x0
++#define SKUID_CLK_720MHZ	0x8
++
+ #define GPMC_BASE		(OMAP34XX_GPMC_BASE)
+ #define GPMC_CONFIG_CS0		0x60
+ #define GPMC_CONFIG_CS0_BASE	(GPMC_BASE + GPMC_CONFIG_CS0)
+diff --git a/include/asm-arm/arch-omap3/omap3.h b/include/asm-arm/arch-omap3/omap3.h
+index 12815f6..1349b8b 100644
+--- a/include/asm-arm/arch-omap3/omap3.h
++++ b/include/asm-arm/arch-omap3/omap3.h
+@@ -176,7 +176,8 @@ struct gpio {
+ #define CPU_3XX_ES21		2
+ #define CPU_3XX_ES30		3
+ #define CPU_3XX_ES31		4
+-#define CPU_3XX_MAX_REV		(CPU_3XX_ES31 + 1)
++#define CPU_3XX_ES312		7
++#define CPU_3XX_MAX_REV		8
+ 
+ #define CPU_3XX_ID_SHIFT	28
+ 
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch b/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch
new file mode 100644
index 0000000000..de3b4845b0
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch
@@ -0,0 +1,70 @@
+From 1b082bb4a8ba5b7bee727baf3cd048e1785c8abd Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Wed, 3 Feb 2010 14:39:14 -0800
+Subject: [PATCH 06/37] OMAP3: add mpurate boot arg for overo and beagle
+
+allows one to set the omap clock rate via "setenv mpurate 720" for example
+---
+ include/configs/omap3_beagle.h |    3 +++
+ include/configs/omap3_overo.h  |    3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index 87e3dd0..ce347cd 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -182,6 +182,7 @@
+ 	"loadaddr=0x82000000\0" \
+ 	"usbtty=cdc_acm\0" \
+ 	"console=ttyS2,115200n8\0" \
++	"mpurate=500\0" \
+ 	"vram=12M\0" \
+ 	"dvimode=1024x768MR-16@60\0" \
+ 	"defaultdisplay=dvi\0" \
+@@ -190,6 +191,7 @@
+ 	"nandroot=/dev/mtdblock4 rw\0" \
+ 	"nandrootfstype=jffs2\0" \
+ 	"mmcargs=setenv bootargs console=${console} " \
++		"mpurate=${mpurate} " \
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+ 		"omapfb.debug=y " \
+@@ -197,6 +199,7 @@
+ 		"root=${mmcroot} " \
+ 		"rootfstype=${mmcrootfstype}\0" \
+ 	"nandargs=setenv bootargs console=${console} " \
++		"mpurate=${mpurate} " \
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+ 		"omapfb.debug=y " \
+diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
+index 0d24758..295cce6 100644
+--- a/include/configs/omap3_overo.h
++++ b/include/configs/omap3_overo.h
+@@ -152,6 +152,7 @@
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"loadaddr=0x82000000\0" \
+ 	"console=ttyS2,115200n8\0" \
++	"mpurate=500\0" \
+ 	"vram=12M\0" \
+ 	"dvimode=1024x768MR-16@60\0" \
+ 	"defaultdisplay=dvi\0" \
+@@ -160,6 +161,7 @@
+ 	"nandroot=/dev/mtdblock4 rw\0" \
+ 	"nandrootfstype=jffs2\0" \
+ 	"mmcargs=setenv bootargs console=${console} " \
++		"mpurate=${mpurate} " \
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+ 		"omapfb.debug=y " \
+@@ -167,6 +169,7 @@
+ 		"root=${mmcroot} " \
+ 		"rootfstype=${mmcrootfstype}\0" \
+ 	"nandargs=setenv bootargs console=${console} " \
++		"mpurate=${mpurate} " \
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+ 		"omapfb.debug=y " \
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-remove-ES1-cache-workaround-it-falsely-trigger.patch b/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-remove-ES1-cache-workaround-it-falsely-trigger.patch
deleted file mode 100644
index b1c228f66d..0000000000
--- a/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-remove-ES1-cache-workaround-it-falsely-trigger.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From afcb8e0076e2b1e8c78d7c8c34c29ec2447dc02a Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 14 Apr 2010 12:23:31 +0200
-Subject: [PATCH 6/6] OMAP3: remove ES1 cache workaround, it falsely triggers on xM37xx ES1 silicon
-
----
- cpu/arm_cortexa8/omap3/cache.S |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/cpu/arm_cortexa8/omap3/cache.S b/cpu/arm_cortexa8/omap3/cache.S
-index 0f63815..a2d1b09 100644
---- a/cpu/arm_cortexa8/omap3/cache.S
-+++ b/cpu/arm_cortexa8/omap3/cache.S
-@@ -134,7 +134,6 @@ l2_cache_enable:
- 	@ ES2 onwards we can disable/enable L2 ourselves
- 	bl	get_cpu_rev
- 	cmp	r0, #CPU_3XX_ES20
--	blt	l2_cache_disable_EARLIER_THAN_ES2
- 	mrc	15, 0, r3, cr1, cr0, 1
- 	orr	r3, r3, #2
- 	mcr	15, 0, r3, cr1, cr0, 1
-@@ -165,7 +164,6 @@ l2_cache_disable:
- 	@ ES2 onwards we can disable/enable L2 ourselves
- 	bl	get_cpu_rev
- 	cmp	r0, #CPU_3XX_ES20
--	blt	l2_cache_disable_EARLIER_THAN_ES2
- 	mrc	15, 0, r3, cr1, cr0, 1
- 	bic	r3, r3, #2
- 	mcr	15, 0, r3, cr1, cr0, 1
--- 
-1.6.6.1
-
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch b/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch
new file mode 100644
index 0000000000..13da414cd0
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch
@@ -0,0 +1,129 @@
+From 129dccd106ea5862f3ff25c368102bf656472f7f Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Fri, 12 Feb 2010 12:17:48 -0800
+Subject: [PATCH 07/37] OMAP3: detect expansion board type/version using eeprom contents
+
+---
+ board/overo/overo.c |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 92 insertions(+), 0 deletions(-)
+
+diff --git a/board/overo/overo.c b/board/overo/overo.c
+index 3df1a12..2838a1f 100644
+--- a/board/overo/overo.c
++++ b/board/overo/overo.c
+@@ -39,6 +39,31 @@
+ #include <asm/mach-types.h>
+ #include "overo.h"
+ 
++static struct {
++	unsigned int device_vendor;
++	unsigned char revision;
++	unsigned char content;
++	unsigned char data[6];
++} expansion_config;
++
++#define TWL4030_I2C_BUS			0
++
++#define EXPANSION_EEPROM_I2C_BUS	2
++#define EXPANSION_EEPROM_I2C_ADDRESS	0x50
++
++#define GUMSTIX_VENDORID		0x0200
++
++#define GUMSTIX_SUMMIT			0x01000200
++#define GUMSTIX_TOBI			0x02000200
++#define GUMSTIX_TOBI_DUO		0x03000200
++#define GUMSTIX_PALO35			0x04000200
++#define GUMSTIX_PALO43			0x05000200
++#define GUMSTIX_CHESTNUT43		0x06000200
++#define GUMSTIX_PINTO			0x07000200
++
++#define GUMSTIX_NO_EEPROM		0xfffffffe
++#define GUMSTIX_UNKNOWN			0xffffffff
++
+ #if defined(CONFIG_CMD_NET)
+ static void setup_net_chip(void);
+ #endif
+@@ -130,6 +155,31 @@ int get_board_revision(void) {
+ }
+ 
+ /*
++ * Routine: get_expansion_id
++ * Description: This function checks for expansion board by checking I2C
++ *		bus 2 for the availability of an AT24C01B serial EEPROM.
++ *		returns the device_vendor field from the EEPROM
++ */
++unsigned int get_expansion_id(void)
++{
++	i2c_set_bus_num(EXPANSION_EEPROM_I2C_BUS);
++
++	/* return GUMSTIX_NO_EEPROM if eeprom doesn't respond */
++	if (i2c_probe(EXPANSION_EEPROM_I2C_ADDRESS) == 1)
++		return GUMSTIX_NO_EEPROM;
++
++	/* read configuration data */
++	i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, (u8 *)&expansion_config,
++		 sizeof(expansion_config));
++
++	if ( (expansion_config.device_vendor & 0xffff) != GUMSTIX_VENDORID )
++		return GUMSTIX_UNKNOWN;
++	else
++		return expansion_config.device_vendor;
++}
++
++
++/*
+  * Routine: misc_init_r
+  * Description: Configure board specific parts
+  */
+@@ -156,6 +206,48 @@ int misc_init_r(void)
+ 			printf(" unsupported\n");
+ 	}
+ 
++	switch (get_expansion_id()) {
++		case GUMSTIX_SUMMIT:
++			printf("Recognized Summit expansion board (rev %d %s)\n",
++				expansion_config.revision, expansion_config.data);
++			setenv("defaultdisplay", "dvi");
++			break;
++		case GUMSTIX_TOBI:
++			printf("Recognized Tobi expansion board (rev %d %s)\n",
++				expansion_config.revision, expansion_config.data);
++			setenv("defaultdisplay", "dvi");
++			break;
++		case GUMSTIX_TOBI_DUO:
++			printf("Recognized Tobi Duo expansion board (rev %d %s)\n",
++				expansion_config.revision, expansion_config.data);
++			break;
++		case GUMSTIX_PALO35:
++			printf("Recognized Palo 35 expansion board (rev %d %s)\n",
++				expansion_config.revision, expansion_config.data);
++			setenv("defaultdisplay", "lcd35");
++			break;
++		case GUMSTIX_PALO43:
++			printf("Recognized Palo 43 expansion board (rev %d %s)\n",
++				expansion_config.revision, expansion_config.data);
++			setenv("defaultdisplay", "lcd43");
++			break;
++		case GUMSTIX_CHESTNUT43:
++			printf("Recognized Chestnut 43 expansion board (rev %d %s)\n",
++				expansion_config.revision, expansion_config.data);
++			setenv("defaultdisplay", "lcd43");
++			break;
++		case GUMSTIX_PINTO:
++			printf("Recognized Pinto expansion board (rev %d %s)\n",
++				expansion_config.revision, expansion_config.data);
++			break;
++		case GUMSTIX_NO_EEPROM:
++			printf("No EEPROM on expansion board\n");
++			break;
++		case GUMSTIX_UNKNOWN:
++			printf("Unrecognized expansion board\n");
++	}
++
++	i2c_set_bus_num(TWL4030_I2C_BUS);
+ 	twl4030_power_init();
+ 	twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
+ 
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch b/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch
new file mode 100644
index 0000000000..c7aea042a7
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch
@@ -0,0 +1,81 @@
+From 4fb2bbcae8f283c46e762aa93b25cbbd55bab8b6 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Tue, 16 Feb 2010 09:58:01 -0800
+Subject: [PATCH 08/37] OMAP3: Overo: enable config eeprom to set u-boot env variable
+
+---
+ board/overo/overo.c |   21 +++++++++++++--------
+ 1 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/board/overo/overo.c b/board/overo/overo.c
+index 2838a1f..f6093d2 100644
+--- a/board/overo/overo.c
++++ b/board/overo/overo.c
+@@ -43,7 +43,9 @@ static struct {
+ 	unsigned int device_vendor;
+ 	unsigned char revision;
+ 	unsigned char content;
+-	unsigned char data[6];
++	unsigned char fab_revision[8];
++	unsigned char env_var[16];
++	unsigned char env_setting[64];
+ } expansion_config;
+ 
+ #define TWL4030_I2C_BUS			0
+@@ -209,36 +211,36 @@ int misc_init_r(void)
+ 	switch (get_expansion_id()) {
+ 		case GUMSTIX_SUMMIT:
+ 			printf("Recognized Summit expansion board (rev %d %s)\n",
+-				expansion_config.revision, expansion_config.data);
++				expansion_config.revision, expansion_config.fab_revision);
+ 			setenv("defaultdisplay", "dvi");
+ 			break;
+ 		case GUMSTIX_TOBI:
+ 			printf("Recognized Tobi expansion board (rev %d %s)\n",
+-				expansion_config.revision, expansion_config.data);
++				expansion_config.revision, expansion_config.fab_revision);
+ 			setenv("defaultdisplay", "dvi");
+ 			break;
+ 		case GUMSTIX_TOBI_DUO:
+ 			printf("Recognized Tobi Duo expansion board (rev %d %s)\n",
+-				expansion_config.revision, expansion_config.data);
++				expansion_config.revision, expansion_config.fab_revision);
+ 			break;
+ 		case GUMSTIX_PALO35:
+ 			printf("Recognized Palo 35 expansion board (rev %d %s)\n",
+-				expansion_config.revision, expansion_config.data);
++				expansion_config.revision, expansion_config.fab_revision);
+ 			setenv("defaultdisplay", "lcd35");
+ 			break;
+ 		case GUMSTIX_PALO43:
+ 			printf("Recognized Palo 43 expansion board (rev %d %s)\n",
+-				expansion_config.revision, expansion_config.data);
++				expansion_config.revision, expansion_config.fab_revision);
+ 			setenv("defaultdisplay", "lcd43");
+ 			break;
+ 		case GUMSTIX_CHESTNUT43:
+ 			printf("Recognized Chestnut 43 expansion board (rev %d %s)\n",
+-				expansion_config.revision, expansion_config.data);
++				expansion_config.revision, expansion_config.fab_revision);
+ 			setenv("defaultdisplay", "lcd43");
+ 			break;
+ 		case GUMSTIX_PINTO:
+ 			printf("Recognized Pinto expansion board (rev %d %s)\n",
+-				expansion_config.revision, expansion_config.data);
++				expansion_config.revision, expansion_config.fab_revision);
+ 			break;
+ 		case GUMSTIX_NO_EEPROM:
+ 			printf("No EEPROM on expansion board\n");
+@@ -247,6 +249,9 @@ int misc_init_r(void)
+ 			printf("Unrecognized expansion board\n");
+ 	}
+ 
++	if (expansion_config.content == 1)
++		setenv(expansion_config.env_var, expansion_config.env_setting);
++
+ 	i2c_set_bus_num(TWL4030_I2C_BUS);
+ 	twl4030_power_init();
+ 	twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch b/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch
new file mode 100644
index 0000000000..b690a6c831
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch
@@ -0,0 +1,34 @@
+From 0ddd7f44f04b47d16d33a6b232b288ebdb1c9992 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Tue, 16 Feb 2010 10:00:45 -0800
+Subject: [PATCH 09/37] OMAP3: Overo: enable input on MMC1_CLK and MMC3_CLK pinmux
+
+---
+ board/overo/overo.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/board/overo/overo.h b/board/overo/overo.h
+index e120e09..ff936dd 100644
+--- a/board/overo/overo.h
++++ b/board/overo/overo.h
+@@ -200,7 +200,7 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(MCBSP2_DR),		(IEN  | PTD | DIS | M0)) /*McBSP2_DR*/\
+ 	MUX_VAL(CP(MCBSP2_DX),		(IDIS | PTD | DIS | M0)) /*McBSP2_DX*/\
+  /*Expansion card */\
+-	MUX_VAL(CP(MMC1_CLK),		(IDIS | PTU | EN  | M0)) /*MMC1_CLK*/\
++	MUX_VAL(CP(MMC1_CLK),		(IEN  | PTU | EN  | M0)) /*MMC1_CLK*/\
+ 	MUX_VAL(CP(MMC1_CMD),		(IEN  | PTU | EN  | M0)) /*MMC1_CMD*/\
+ 	MUX_VAL(CP(MMC1_DAT0),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT0*/\
+ 	MUX_VAL(CP(MMC1_DAT1),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT1*/\
+@@ -301,7 +301,7 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(SYS_OFF_MODE),	(IEN  | PTD | DIS | M0)) /*SYS_OFF_MODE*/\
+ 	MUX_VAL(CP(SYS_CLKOUT1),	(IEN  | PTD | DIS | M0)) /*SYS_CLKOUT1*/\
+ 	MUX_VAL(CP(SYS_CLKOUT2),	(IEN  | PTU | EN  | M4)) /*GPIO_186*/\
+-	MUX_VAL(CP(ETK_CLK_ES2),	(IDIS | PTU | EN  | M2)) /*MMC3_CLK*/\
++	MUX_VAL(CP(ETK_CLK_ES2),	(IEN  | PTU | EN  | M2)) /*MMC3_CLK*/\
+ 	MUX_VAL(CP(ETK_CTL_ES2),	(IEN  | PTU | EN  | M2)) /*MMC3_CMD*/\
+ 	MUX_VAL(CP(ETK_D0_ES2),		(IEN  | PTU | EN  | M4)) /*GPIO_14*/\
+ 	MUX_VAL(CP(ETK_D1_ES2),		(IEN  | PTD | EN  | M4)) /*GPIO_15 - X_GATE*/\
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch b/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch
new file mode 100644
index 0000000000..53e12b3ee0
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch
@@ -0,0 +1,25 @@
+From 405a5a151c8d42f157dc48731f6e607675156774 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Tue, 16 Feb 2010 10:03:14 -0800
+Subject: [PATCH 10/37] OMAP3: Overo: set CONFIG_SYS_I2C_SPEED to 400Khz
+
+---
+ include/configs/omap3_overo.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
+index 295cce6..fdbeb67 100644
+--- a/include/configs/omap3_overo.h
++++ b/include/configs/omap3_overo.h
+@@ -112,7 +112,7 @@
+ 
+ #define CONFIG_SYS_NO_FLASH
+ #define CONFIG_HARD_I2C			1
+-#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_SYS_I2C_SPEED		400000
+ #define CONFIG_SYS_I2C_SLAVE		1
+ #define CONFIG_SYS_I2C_BUS		0
+ #define CONFIG_SYS_I2C_BUS_SELECT	1
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch b/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch
new file mode 100644
index 0000000000..6a3a5d9354
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch
@@ -0,0 +1,52 @@
+From 991f54c9da846ab9571c256adf42d8d80d044bdc Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Tue, 16 Feb 2010 10:04:30 -0800
+Subject: [PATCH 11/37] OMAP3:  trim excessively long delays in i2c driver
+
+---
+ drivers/i2c/omap24xx_i2c.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
+index 30a8b4c..ba47fc4 100644
+--- a/drivers/i2c/omap24xx_i2c.c
++++ b/drivers/i2c/omap24xx_i2c.c
+@@ -148,7 +148,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value)
+ 	if (status & I2C_STAT_XRDY) {
+ 		/* Important: have to use byte access */
+ 		writeb (regoffset, &i2c_base->data);
+-		udelay (20000);
++		udelay (2000);
+ 		if (readw (&i2c_base->stat) & I2C_STAT_NACK) {
+ 			i2c_error = 1;
+ 		}
+@@ -160,7 +160,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value)
+ 		/* free bus, otherwise we can't use a combined transction */
+ 		writew (0, &i2c_base->con);
+ 		while (readw (&i2c_base->stat) || (readw (&i2c_base->con) & I2C_CON_MST)) {
+-			udelay (10000);
++			udelay (1000);
+ 			/* Have to clear pending interrupt to clear I2C_STAT */
+ 			writew (0xFFFF, &i2c_base->stat);
+ 		}
+@@ -181,7 +181,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value)
+ #else
+ 			*value = readw (&i2c_base->data);
+ #endif
+-			udelay (20000);
++			udelay (2000);
+ 		} else {
+ 			i2c_error = 1;
+ 		}
+@@ -190,7 +190,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value)
+ 			writew (I2C_CON_EN, &i2c_base->con);
+ 			while (readw (&i2c_base->stat)
+ 			       || (readw (&i2c_base->con) & I2C_CON_MST)) {
+-				udelay (10000);
++				udelay (1000);
+ 				writew (0xFFFF, &i2c_base->stat);
+ 			}
+ 		}
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch b/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch
new file mode 100644
index 0000000000..b554d254e3
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch
@@ -0,0 +1,47 @@
+From ad1a2c047554deae2e1608d025c4f6891cf8f116 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Fri, 26 Feb 2010 12:40:26 -0800
+Subject: [PATCH 12/37] OMAP3: Overo: allow expansion boards with any vendor ID
+
+---
+ board/overo/overo.c |   10 +++-------
+ 1 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/board/overo/overo.c b/board/overo/overo.c
+index f6093d2..ec186ec 100644
+--- a/board/overo/overo.c
++++ b/board/overo/overo.c
+@@ -63,8 +63,7 @@ static struct {
+ #define GUMSTIX_CHESTNUT43		0x06000200
+ #define GUMSTIX_PINTO			0x07000200
+ 
+-#define GUMSTIX_NO_EEPROM		0xfffffffe
+-#define GUMSTIX_UNKNOWN			0xffffffff
++#define GUMSTIX_NO_EEPROM		0xffffffff
+ 
+ #if defined(CONFIG_CMD_NET)
+ static void setup_net_chip(void);
+@@ -174,10 +173,7 @@ unsigned int get_expansion_id(void)
+ 	i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, (u8 *)&expansion_config,
+ 		 sizeof(expansion_config));
+ 
+-	if ( (expansion_config.device_vendor & 0xffff) != GUMSTIX_VENDORID )
+-		return GUMSTIX_UNKNOWN;
+-	else
+-		return expansion_config.device_vendor;
++	return expansion_config.device_vendor;
+ }
+ 
+ 
+@@ -245,7 +241,7 @@ int misc_init_r(void)
+ 		case GUMSTIX_NO_EEPROM:
+ 			printf("No EEPROM on expansion board\n");
+ 			break;
+-		case GUMSTIX_UNKNOWN:
++		default:
+ 			printf("Unrecognized expansion board\n");
+ 	}
+ 
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch b/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch
new file mode 100644
index 0000000000..4bbddcbd50
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch
@@ -0,0 +1,25 @@
+From 305e2cb16f4f6e8c7f13120e6a98bb1e999c764f Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Fri, 26 Feb 2010 12:42:30 -0800
+Subject: [PATCH 13/37] OMAP3: Overo: change address of expansion eeprom to 0x51 so as to not conflict with EDID address
+
+---
+ board/overo/overo.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/board/overo/overo.c b/board/overo/overo.c
+index ec186ec..f96e7ff 100644
+--- a/board/overo/overo.c
++++ b/board/overo/overo.c
+@@ -51,7 +51,7 @@ static struct {
+ #define TWL4030_I2C_BUS			0
+ 
+ #define EXPANSION_EEPROM_I2C_BUS	2
+-#define EXPANSION_EEPROM_I2C_ADDRESS	0x50
++#define EXPANSION_EEPROM_I2C_ADDRESS	0x51
+ 
+ #define GUMSTIX_VENDORID		0x0200
+ 
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch b/recipes/u-boot/u-boot-git/beagleboard/0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch
new file mode 100644
index 0000000000..2936dffc17
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch
@@ -0,0 +1,49 @@
+From 63de99ce613bbfce792ee46d14b324273e6a0d29 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Tue, 23 Mar 2010 09:04:50 -0700
+Subject: [PATCH 14/37] OMAP3: board.c: don't attempt to set up second RAM bank, assume x-load has already done this
+
+---
+ cpu/arm_cortexa8/omap3/board.c |   19 +++++++++----------
+ 1 files changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c
+index 7b78fa4..0126152 100644
+--- a/cpu/arm_cortexa8/omap3/board.c
++++ b/cpu/arm_cortexa8/omap3/board.c
+@@ -232,6 +232,7 @@ void s_init(void)
+ 
+ 	per_clocks_enable();
+ 
++	/* FIXME: u-boot's sdrc setup is broken	*/
+ 	if (!in_sdram)
+ 		sdrc_init();
+ }
+@@ -281,16 +282,14 @@ int dram_init(void)
+ {
+ 	DECLARE_GLOBAL_DATA_PTR;
+ 	unsigned int size0 = 0, size1 = 0;
+-
+-	/*
+-	 * If a second bank of DDR is attached to CS1 this is
+-	 * where it can be started.  Early init code will init
+-	 * memory on CS0.
+-	 */
+-	if ((sysinfo.mtype == DDR_COMBO) || (sysinfo.mtype == DDR_STACKED)) {
+-		do_sdrc_init(CS1, NOT_EARLY);
+-		make_cs1_contiguous();
+-	}
++	struct sdrc *sdrc_base = (struct sdrc *)OMAP34XX_SDRC_BASE;
++	struct sdrc_actim *sdrc_actim_base = (struct sdrc_actim *)SDRC_ACTIM_CTRL1_BASE;
++
++	/* x-load sets up the second bank but */
++	/* doesn't test to see if it is there */
++	/* do so now, disable if not present  */
++	if (!mem_ok(CS1))
++		writel(0, &sdrc_base->cs[1].mcfg);
+ 
+ 	size0 = get_sdr_cs_size(CS0);
+ 	size1 = get_sdr_cs_size(CS1);
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0015-OMAP3-mem.c-enhance-the-RAM-test.patch b/recipes/u-boot/u-boot-git/beagleboard/0015-OMAP3-mem.c-enhance-the-RAM-test.patch
new file mode 100644
index 0000000000..ce3c3b85e6
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0015-OMAP3-mem.c-enhance-the-RAM-test.patch
@@ -0,0 +1,52 @@
+From f2e3d22fb1963d08844edee45f7d7d6beba32152 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Tue, 23 Mar 2010 09:06:49 -0700
+Subject: [PATCH 15/37] OMAP3: mem.c: enhance the RAM test
+
+---
+ cpu/arm_cortexa8/omap3/mem.c |   28 +++++++++++++++-------------
+ 1 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/cpu/arm_cortexa8/omap3/mem.c b/cpu/arm_cortexa8/omap3/mem.c
+index dfb7e4c..b828097 100644
+--- a/cpu/arm_cortexa8/omap3/mem.c
++++ b/cpu/arm_cortexa8/omap3/mem.c
+@@ -106,21 +106,23 @@ void make_cs1_contiguous(void)
+  *******************************************************/
+ u32 mem_ok(u32 cs)
+ {
+-	u32 val1, val2, addr;
++	u32 i, val1, val2, addr, size;
+ 	u32 pattern = 0x12345678;
+ 
+-	addr = OMAP34XX_SDRC_CS0 + get_sdr_cs_offset(cs);
+-
+-	writel(0x0, addr + 0x400);	/* clear pos A */
+-	writel(pattern, addr);		/* pattern to pos B */
+-	writel(0x0, addr + 4);		/* remove pattern off the bus */
+-	val1 = readl(addr + 0x400);	/* get pos A value */
+-	val2 = readl(addr);		/* get val2 */
++	size = get_sdr_cs_offset(cs);
++	addr = OMAP34XX_SDRC_CS0 + size;
++	
++	for (i = 0; i < size; i+=1024) {
++		writel(pattern - i, addr + i);
++	}
+ 
+-	if ((val1 != 0) || (val2 != pattern))	/* see if pos A val changed */
+-		return 0;
+-	else
+-		return 1;
++	for (i = 0; i < size; i+=1024) {
++		val1 = readl(addr + i);
++		if (val1 != (pattern - i)) {
++			return 0;
++		}
++	}
++	return 1;
+ }
+ 
+ /********************************************************
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch b/recipes/u-boot/u-boot-git/beagleboard/0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch
new file mode 100644
index 0000000000..5e83125e35
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch
@@ -0,0 +1,27 @@
+From 794e4aa6a5aa5fbe71b08bfe8f5f5f65078fbc68 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Tue, 23 Mar 2010 09:12:16 -0700
+Subject: [PATCH 16/37] env_nand.c:  fail gracefully if no nand is present
+
+---
+ common/env_nand.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/common/env_nand.c b/common/env_nand.c
+index a15a950..325f112 100644
+--- a/common/env_nand.c
++++ b/common/env_nand.c
+@@ -268,6 +268,10 @@ int readenv (size_t offset, u_char * buf)
+ 
+ 	u_char *char_ptr;
+ 
++	/* fail if no nand detected */
++	if (nand_info[0].type == 0)
++		return 1;
++
+ 	blocksize = nand_info[0].erasesize;
+ 	len = min(blocksize, CONFIG_ENV_SIZE);
+ 
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch b/recipes/u-boot/u-boot-git/beagleboard/0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch
new file mode 100644
index 0000000000..ad5a2131b0
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch
@@ -0,0 +1,68 @@
+From 34622e1e89b615c999480ab48ec004c16f8ca2d5 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Tue, 23 Mar 2010 09:15:29 -0700
+Subject: [PATCH 17/37] OMAP3: add definitions to support sysinfo cpu and cpu family detection
+
+---
+ include/asm-arm/arch-omap3/cpu.h   |    6 ------
+ include/asm-arm/arch-omap3/omap3.h |   29 +++++++++++++++++++++++++++++
+ 2 files changed, 29 insertions(+), 6 deletions(-)
+
+diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h
+index f769571..d9eec7e 100644
+--- a/include/asm-arm/arch-omap3/cpu.h
++++ b/include/asm-arm/arch-omap3/cpu.h
+@@ -60,12 +60,6 @@ struct ctrl {
+ #endif /* __ASSEMBLY__ */
+ #endif /* __KERNEL_STRICT_NAMES */
+ 
+-/* cpu type */
+-#define OMAP3503		0x5c00
+-#define OMAP3515		0x1c00
+-#define OMAP3525		0x4c00
+-#define OMAP3530		0x0c00
+-
+ #ifndef __KERNEL_STRICT_NAMES
+ #ifndef __ASSEMBLY__
+ struct ctrl_id {
+diff --git a/include/asm-arm/arch-omap3/omap3.h b/include/asm-arm/arch-omap3/omap3.h
+index 1349b8b..3957c79 100644
+--- a/include/asm-arm/arch-omap3/omap3.h
++++ b/include/asm-arm/arch-omap3/omap3.h
+@@ -184,4 +184,33 @@ struct gpio {
+ #define WIDTH_8BIT		0x0000
+ #define WIDTH_16BIT		0x1000	/* bit pos for 16 bit in gpmc */
+ 
++/*
++ * Hawkeye values
++ */
++#define HAWKEYE_OMAP34XX	0xb7ae
++#define HAWKEYE_AM35XX		0xb868
++#define HAWKEYE_OMAP36XX	0xb891
++
++#define HAWKEYE_SHIFT		12
++
++/*
++ * Define CPU families
++ */
++#define CPU_OMAP34XX		0x3400	/* OMAP34xx/OMAP35 devices */
++#define CPU_AM35XX		0x3500	/* AM35xx devices          */
++#define CPU_OMAP36XX		0x3600	/* OMAP36xx devices        */
++
++/*
++ * Control status register values corresponding to cpu variants
++ */
++#define OMAP3503		0x5c00
++#define OMAP3515		0x1c00
++#define OMAP3525		0x4c00
++#define OMAP3530		0x0c00
++
++#define AM3505			0x5c00
++#define AM3517			0x1c00
++
++#define OMAP3730		0x0c00
++
+ #endif
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch b/recipes/u-boot/u-boot-git/beagleboard/0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch
new file mode 100644
index 0000000000..65f606b442
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch
@@ -0,0 +1,196 @@
+From 8480eb0272865078290146031e09eb70baed3f6e Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Tue, 23 Mar 2010 09:17:59 -0700
+Subject: [PATCH 18/37] OMAP3 sys_info: update cpu detection for 36XX/37XX
+
+---
+ cpu/arm_cortexa8/omap3/sys_info.c |  137 ++++++++++++++++++++++++++++---------
+ 1 files changed, 105 insertions(+), 32 deletions(-)
+
+diff --git a/cpu/arm_cortexa8/omap3/sys_info.c b/cpu/arm_cortexa8/omap3/sys_info.c
+index e227f67..e32a846 100644
+--- a/cpu/arm_cortexa8/omap3/sys_info.c
++++ b/cpu/arm_cortexa8/omap3/sys_info.c
+@@ -79,32 +79,72 @@ u32 get_cpu_type(void)
+ }
+ 
+ /******************************************
+- * get_cpu_rev(void) - extract version info
++ * get_cpu_id(void) - extract cpu id
++ * returns 0 for ES1.0, cpuid otherwise
+  ******************************************/
+-u32 get_cpu_rev(void)
++u32 get_cpu_id(void)
+ {
+-	u32 cpuid = 0;
+ 	struct ctrl_id *id_base;
++	u32 cpuid = 0;
+ 
+ 	/*
+ 	 * On ES1.0 the IDCODE register is not exposed on L4
+ 	 * so using CPU ID to differentiate between ES1.0 and > ES1.0.
+ 	 */
+ 	__asm__ __volatile__("mrc p15, 0, %0, c0, c0, 0":"=r"(cpuid));
+-	if ((cpuid & 0xf) == 0x0)
+-		return CPU_3XX_ES10;
+-	else {
++	if ((cpuid & 0xf) == 0x0) {
++		return 0;
++	} else {
+ 		/* Decode the IDs on > ES1.0 */
+ 		id_base = (struct ctrl_id *) OMAP34XX_ID_L4_IO_BASE;
+ 
+-		cpuid = (readl(&id_base->idcode) >> CPU_3XX_ID_SHIFT) & 0xf;
++		cpuid = readl(&id_base->idcode);
++	}
+ 
+-		/* Some early ES2.0 seem to report ID 0, fix this */
+-		if(cpuid == 0)
+-			cpuid = CPU_3XX_ES20;
++	return cpuid;
++}
+ 
+-		return cpuid;
++/******************************************
++ * get_cpu_family(void) - extract cpu info
++ ******************************************/
++u32 get_cpu_family(void)
++{
++	u16 hawkeye;
++	u32 cpu_family;
++	u32 cpuid = get_cpu_id();
++
++	if (cpuid == 0)
++		return CPU_OMAP34XX;
++
++	hawkeye = (cpuid >> HAWKEYE_SHIFT) & 0xffff;
++	switch(hawkeye) {
++		case HAWKEYE_OMAP34XX:
++			cpu_family = CPU_OMAP34XX;
++			break;
++		case HAWKEYE_AM35XX:
++			cpu_family = CPU_AM35XX;
++			break;
++		case HAWKEYE_OMAP36XX:
++			cpu_family = CPU_OMAP36XX;
++			break;
++		default:
++			cpu_family = CPU_OMAP34XX;
+ 	}
++
++	return cpu_family;
++}
++
++/******************************************
++ * get_cpu_rev(void) - extract version info
++ ******************************************/
++u32 get_cpu_rev(void)
++{
++	u32 cpuid = get_cpu_id();
++
++	if (cpuid == 0)
++		return CPU_3XX_ES10;
++	else
++		return (cpuid >> CPU_3XX_ID_SHIFT) & 0xf;
+ }
+ 
+ /*****************************************************************
+@@ -267,24 +307,57 @@ u32 get_device_type(void)
+  */
+ int print_cpuinfo (void)
+ {
+-	char *cpu_s, *sec_s;
+-
+-	switch (get_cpu_type()) {
+-	case OMAP3503:
+-		cpu_s = "3503";
+-		break;
+-	case OMAP3515:
+-		cpu_s = "3515";
++	char *cpu_family_s, *cpu_s, *sec_s;
++
++	switch(get_cpu_family()) {
++	case CPU_OMAP34XX:
++		cpu_family_s = "OMAP";
++		switch (get_cpu_type()) {
++		case OMAP3503:
++			cpu_s = "3503";
++			break;
++		case OMAP3515:
++			cpu_s = "3515";
++			break;
++		case OMAP3525:
++			cpu_s = "3525";
++			break;
++		case OMAP3530:
++			cpu_s = "3530";
++			break;
++		default:
++			cpu_s = "35XX";
++			break;
++		}
+ 		break;
+-	case OMAP3525:
+-		cpu_s = "3525";
++	case CPU_AM35XX:
++		cpu_family_s = "AM";
++		switch (get_cpu_type()) {
++		case AM3505:
++			cpu_s = "3505";
++			break;
++		case AM3517:
++			cpu_s = "3517";
++			break;
++		default:
++			cpu_s = "35XX";
++			break;
++		}
+ 		break;
+-	case OMAP3530:
+-		cpu_s = "3530";
++	case CPU_OMAP36XX:
++		cpu_family_s = "OMAP";
++		switch (get_cpu_type()) {
++		case OMAP3730:
++			cpu_s = "3630/3730";
++			break;
++		default:
++			cpu_s = "36XX/37XX";
++			break;
++		}
+ 		break;
+ 	default:
++		cpu_family_s = "OMAP";
+ 		cpu_s = "35XX";
+-		break;
+ 	}
+ 
+ 	switch (get_device_type()) {
+@@ -304,16 +377,16 @@ int print_cpuinfo (void)
+ 		sec_s = "?";
+ 	}
+ 
+-	printf("OMAP%s-%s ES%s, CPU-OPP2, L3-165MHz, ",
+-			cpu_s, sec_s, rev_s[get_cpu_rev()]);
++	printf("%s%s-%s ES%s, CPU-OPP2, L3-165MHz, ",
++			cpu_family_s, cpu_s, sec_s, rev_s[get_cpu_rev()]);
+ 
+-	printf("Max clock-");
+-	if ((get_cpu_rev() >= CPU_3XX_ES31) && (get_sku_id() == SKUID_CLK_720MHZ))
+-		printf("720Mhz\n");
+-	else	printf("600Mhz\n");
++	if (get_cpu_family() == CPU_OMAP34XX)
++		if ((get_cpu_rev() >= CPU_3XX_ES31) && 
++		    (get_sku_id() == SKUID_CLK_720MHZ))
++			printf("Max clock-720Mhz\n");
++		else printf("Max clock-600Mhz\n");
++	else printf("\n");
+ 	
+-
+-
+ 	return 0;
+ }
+ #endif	/* CONFIG_DISPLAY_CPUINFO */
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch b/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch
new file mode 100644
index 0000000000..03da8ce662
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch
@@ -0,0 +1,826 @@
+From 0bf419a0faa8c9dc73d7a84f93d7fcb89be3ea21 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Tue, 23 Mar 2010 09:20:56 -0700
+Subject: [PATCH 19/37] OMAP3: clocks: update clock setup for 36XX/37XX
+
+---
+ cpu/arm_cortexa8/omap3/clock.c            |  559 +++++++++++++++++++++--------
+ cpu/arm_cortexa8/omap3/lowlevel_init.S    |   69 ++++
+ include/asm-arm/arch-omap3/clocks.h       |   17 +
+ include/asm-arm/arch-omap3/clocks_omap3.h |   27 ++
+ 4 files changed, 525 insertions(+), 147 deletions(-)
+
+diff --git a/cpu/arm_cortexa8/omap3/clock.c b/cpu/arm_cortexa8/omap3/clock.c
+index 6330c9e..538a183 100644
+--- a/cpu/arm_cortexa8/omap3/clock.c
++++ b/cpu/arm_cortexa8/omap3/clock.c
+@@ -47,17 +47,12 @@ u32 get_osc_clk_speed(void)
+ 	struct s32ktimer *s32k_base = (struct s32ktimer *)SYNC_32KTIMER_BASE;
+ 
+ 	val = readl(&prm_base->clksrc_ctrl);
+-
+ 	if (val & SYSCLKDIV_2)
+ 		cdiv = 2;
+-	else if (val & SYSCLKDIV_1)
+-		cdiv = 1;
+ 	else
+-		/*
+-		 * Should never reach here! (Assume divider as 1)
+-		 */
+ 		cdiv = 1;
+ 
++
+ 	/* enable timer2 */
+ 	val = readl(&prcm_base->clksel_wkup) | CLKSEL_GPT1;
+ 
+@@ -67,7 +62,6 @@ u32 get_osc_clk_speed(void)
+ 	/* Enable I and F Clocks for GPT1 */
+ 	val = readl(&prcm_base->iclken_wkup) | EN_GPT1 | EN_32KSYNC;
+ 	writel(val, &prcm_base->iclken_wkup);
+-
+ 	val = readl(&prcm_base->fclken_wkup) | EN_GPT1;
+ 	writel(val, &prcm_base->fclken_wkup);
+ 
+@@ -87,13 +81,10 @@ u32 get_osc_clk_speed(void)
+ 
+ 	/* wait for 40 cycles */
+ 	while (readl(&s32k_base->s32k_cr) < (start + 20)) ;
++
+ 	cend = readl(&gpt1_base->tcrr);		/* get end sys_clk count */
+ 	cdiff = cend - cstart;			/* get elapsed ticks */
+-
+-	if (cdiv == 2)
+-	{
+-		cdiff *= 2;
+-	}
++	cdiff *= cdiv;
+ 
+ 	/* based on number of ticks assign speed */
+ 	if (cdiff > 19000)
+@@ -135,65 +126,25 @@ void get_sys_clkin_sel(u32 osc_clk, u32 *sys_clkin_sel)
+ 	}
+ }
+ 
++/*
++ * OMAP3530 specific functions
++ */
++
+ /******************************************************************************
+- * prcm_init() - inits clocks for PRCM as defined in clocks.h
+- *               called from SRAM, or Flash (using temp SRAM stack).
++ * Initialize CORE DPLL for OMAP34x/35x
+  *****************************************************************************/
+-void prcm_init(void)
++static void dpll3_init_34xx(u32 sil_index, u32 clk_index)
+ {
++	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
++	dpll_param *ptr = (dpll_param *) get_core_dpll_param();
+ 	void (*f_lock_pll) (u32, u32, u32, u32);
+ 	int xip_safe, p0, p1, p2, p3;
+-	u32 osc_clk = 0, sys_clkin_sel;
+-	u32 clk_index, sil_index = 0;
+-	struct prm *prm_base = (struct prm *)PRM_BASE;
+-	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
+-	dpll_param *dpll_param_p;
+-
+-	f_lock_pll = (void *) ((u32) &_end_vect - (u32) &_start +
+-				SRAM_VECT_CODE);
+ 
+ 	xip_safe = is_running_in_sram();
+ 
+-	/*
+-	 * Gauge the input clock speed and find out the sys_clkin_sel
+-	 * value corresponding to the input clock.
+-	 */
+-	osc_clk = get_osc_clk_speed();
+-	get_sys_clkin_sel(osc_clk, &sys_clkin_sel);
++	/* Moving to the right sysclk and ES rev base */
++	ptr = ptr + (3 * clk_index) + sil_index;
+ 
+-	/* set input crystal speed */
+-	sr32(&prm_base->clksel, 0, 3, sys_clkin_sel);
+-
+-	/* If the input clock is greater than 19.2M always divide/2 */
+-	if (sys_clkin_sel > 2) {
+-		/* input clock divider */
+-		sr32(&prm_base->clksrc_ctrl, 6, 2, 2);
+-		clk_index = sys_clkin_sel / 2;
+-	} else {
+-		/* input clock divider */
+-		sr32(&prm_base->clksrc_ctrl, 6, 2, 1);
+-		clk_index = sys_clkin_sel;
+-	}
+-
+-	/*
+-	 * The DPLL tables are defined according to sysclk value and
+-	 * silicon revision. The clk_index value will be used to get
+-	 * the values for that input sysclk from the DPLL param table
+-	 * and sil_index will get the values for that SysClk for the
+-	 * appropriate silicon rev.
+-	 */
+-	if (get_cpu_rev())
+-		sil_index = 1;
+-
+-	/* Unlock MPU DPLL (slows things down, and needed later) */
+-	sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOW_POWER_BYPASS);
+-	wait_on_value(ST_MPU_CLK, 0, &prcm_base->idlest_pll_mpu, LDELAY);
+-
+-	/* Getting the base address of Core DPLL param table */
+-	dpll_param_p = (dpll_param *) get_core_dpll_param();
+-
+-	/* Moving it to the right sysclk and ES rev base */
+-	dpll_param_p = dpll_param_p + 3 * clk_index + sil_index;
+ 	if (xip_safe) {
+ 		/*
+ 		 * CORE DPLL
+@@ -208,34 +159,38 @@ void prcm_init(void)
+ 		 * work. write another value and then default value.
+ 		 */
+ 
+-		/* m3x2 */
+-		sr32(&prcm_base->clksel1_emu, 16, 5, CORE_M3X2 + 1);
+-		/* m3x2 */
++		/* CM_CLKSEL1_EMU[DIV_DPLL3] */
++		sr32(&prcm_base->clksel1_emu, 16, 5, (CORE_M3X2 + 1)) ;
+ 		sr32(&prcm_base->clksel1_emu, 16, 5, CORE_M3X2);
+-		/* Set M2 */
+-		sr32(&prcm_base->clksel1_pll, 27, 2, dpll_param_p->m2);
+-		/* Set M */
+-		sr32(&prcm_base->clksel1_pll, 16, 11, dpll_param_p->m);
+-		/* Set N */
+-		sr32(&prcm_base->clksel1_pll, 8, 7, dpll_param_p->n);
+-		/* 96M Src */
++
++		/* M2 (CORE_DPLL_CLKOUT_DIV): CM_CLKSEL1_PLL[27:31] */
++		sr32(&prcm_base->clksel1_pll, 27, 5, ptr->m2);
++
++		/* M (CORE_DPLL_MULT): CM_CLKSEL1_PLL[16:26] */
++		sr32(&prcm_base->clksel1_pll, 16, 11, ptr->m);
++
++		/* N (CORE_DPLL_DIV): CM_CLKSEL1_PLL[8:14] */
++		sr32(&prcm_base->clksel1_pll, 8, 7, ptr->n);
++
++		/* Source is the CM_96M_FCLK: CM_CLKSEL1_PLL[6] */
+ 		sr32(&prcm_base->clksel1_pll, 6, 1, 0);
+-		/* ssi */
++
++		/* SSI */
+ 		sr32(&prcm_base->clksel_core, 8, 4, CORE_SSI_DIV);
+-		/* fsusb */
++		/* FSUSB */
+ 		sr32(&prcm_base->clksel_core, 4, 2, CORE_FUSB_DIV);
+-		/* l4 */
++		/* L4 */
+ 		sr32(&prcm_base->clksel_core, 2, 2, CORE_L4_DIV);
+-		/* l3 */
++		/* L3 */
+ 		sr32(&prcm_base->clksel_core, 0, 2, CORE_L3_DIV);
+-		/* gfx */
+-		sr32(&prcm_base->clksel_gfx, 0, 3, GFX_DIV);
+-		/* reset mgr */
++		/* GFX */
++		sr32(&prcm_base->clksel_gfx,  0, 3, GFX_DIV);
++		/* RESET MGR */
+ 		sr32(&prcm_base->clksel_wkup, 1, 2, WKUP_RSM);
+-		/* FREQSEL */
+-		sr32(&prcm_base->clken_pll, 4, 4, dpll_param_p->fsel);
+-		/* lock mode */
+-		sr32(&prcm_base->clken_pll, 0, 3, PLL_LOCK);
++		/* FREQSEL (CORE_DPLL_FREQSEL): CM_CLKEN_PLL[4:7] */
++		sr32(&prcm_base->clken_pll,   4, 4, ptr->fsel);
++		/* LOCK MODE */
++		sr32(&prcm_base->clken_pll,   0, 3, PLL_LOCK);
+ 
+ 		wait_on_value(ST_CORE_CLK, 1, &prcm_base->idlest_ckgen,
+ 				LDELAY);
+@@ -244,102 +199,411 @@ void prcm_init(void)
+ 		 * if running from flash, jump to small relocated code
+ 		 * area in SRAM.
+ 		 */
++		f_lock_pll = (void *) ((u32) &_end_vect - (u32) &_start +
++				SRAM_VECT_CODE);
++
+ 		p0 = readl(&prcm_base->clken_pll);
+ 		sr32(&p0, 0, 3, PLL_FAST_RELOCK_BYPASS);
+-		sr32(&p0, 4, 4, dpll_param_p->fsel);	/* FREQSEL */
++		/* FREQSEL (CORE_DPLL_FREQSEL): CM_CLKEN_PLL[4:7] */
++		sr32(&p0, 4, 4, ptr->fsel);
+ 
+ 		p1 = readl(&prcm_base->clksel1_pll);
+-		sr32(&p1, 27, 2, dpll_param_p->m2);	/* Set M2 */
+-		sr32(&p1, 16, 11, dpll_param_p->m);	/* Set M */
+-		sr32(&p1, 8, 7, dpll_param_p->n);		/* Set N */
+-		sr32(&p1, 6, 1, 0);	/* set source for 96M */
++		/* M2 (CORE_DPLL_CLKOUT_DIV): CM_CLKSEL1_PLL[27:31] */
++		sr32(&p1, 27, 5, ptr->m2);
++		/* M (CORE_DPLL_MULT): CM_CLKSEL1_PLL[16:26] */
++		sr32(&p1, 16, 11, ptr->m);
++		/* N (CORE_DPLL_DIV): CM_CLKSEL1_PLL[8:14] */
++		sr32(&p1, 8, 7, ptr->n);
++		/* Source is the CM_96M_FCLK: CM_CLKSEL1_PLL[6] */
++		sr32(&p1, 6, 1, 0);
+ 
+ 		p2 = readl(&prcm_base->clksel_core);
+-		sr32(&p2, 8, 4, CORE_SSI_DIV);	/* ssi */
+-		sr32(&p2, 4, 2, CORE_FUSB_DIV);	/* fsusb */
+-		sr32(&p2, 2, 2, CORE_L4_DIV);	/* l4 */
+-		sr32(&p2, 0, 2, CORE_L3_DIV);	/* l3 */
++		/* SSI */
++		sr32(&p2, 8, 4, CORE_SSI_DIV);
++		/* FSUSB */
++		sr32(&p2, 4, 2, CORE_FUSB_DIV);
++		/* L4 */
++		sr32(&p2, 2, 2, CORE_L4_DIV);
++		/* L3 */
++		sr32(&p2, 0, 2, CORE_L3_DIV);
+ 
+ 		p3 = (u32)&prcm_base->idlest_ckgen;
+ 
+ 		(*f_lock_pll) (p0, p1, p2, p3);
+ 	}
++}
+ 
+-	/* PER DPLL */
+-	sr32(&prcm_base->clken_pll, 16, 3, PLL_STOP);
+-	wait_on_value(ST_PERIPH_CLK, 0, &prcm_base->idlest_ckgen, LDELAY);
+-
+-	/* Getting the base address to PER DPLL param table */
+-
+-	/* Set N */
+-	dpll_param_p = (dpll_param *) get_per_dpll_param();
++/******************************************************************************
++ * Initialize PER DPLL for OMAP34x/35x
++ *****************************************************************************/
++static void dpll4_init_34xx(u32 sil_index, u32 clk_index)
++{
++	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
++	dpll_param *ptr = (dpll_param *) get_per_dpll_param();
+ 
+ 	/* Moving it to the right sysclk base */
+-	dpll_param_p = dpll_param_p + clk_index;
++	ptr = ptr + clk_index;
++
++	/* EN_PERIPH_DPLL: CM_CLKEN_PLL[16:18] */
++	sr32(&prcm_base->clken_pll, 16, 3, PLL_STOP);
++	wait_on_value(ST_PERIPH_CLK, 0, &prcm_base->idlest_ckgen, LDELAY);
+ 
+ 	/*
+ 	 * Errata 1.50 Workaround for OMAP3 ES1.0 only
+ 	 * If using default divisors, write default divisor + 1
+ 	 * and then the actual divisor value
+ 	 */
+-	sr32(&prcm_base->clksel1_emu, 24, 5, PER_M6X2 + 1);	/* set M6 */
+-	sr32(&prcm_base->clksel1_emu, 24, 5, PER_M6X2);		/* set M6 */
+-	sr32(&prcm_base->clksel_cam, 0, 5, PER_M5X2 + 1);	/* set M5 */
+-	sr32(&prcm_base->clksel_cam, 0, 5, PER_M5X2);		/* set M5 */
+-	sr32(&prcm_base->clksel_dss, 0, 5, PER_M4X2 + 1);	/* set M4 */
+-	sr32(&prcm_base->clksel_dss, 0, 5, PER_M4X2);		/* set M4 */
+-	sr32(&prcm_base->clksel_dss, 8, 5, PER_M3X2 + 1);	/* set M3 */
+-	sr32(&prcm_base->clksel_dss, 8, 5, PER_M3X2);		/* set M3 */
+-	sr32(&prcm_base->clksel3_pll, 0, 5, dpll_param_p->m2 + 1); /* set M2 */
+-	sr32(&prcm_base->clksel3_pll, 0, 5, dpll_param_p->m2);	/* set M2 */
++	/* M6 */
++	sr32(&prcm_base->clksel1_emu, 24, 5, (PER_M6X2 + 1));
++	sr32(&prcm_base->clksel1_emu, 24, 5, PER_M6X2);
++	/* M5 */
++	sr32(&prcm_base->clksel_cam, 0, 5, (PER_M5X2 + 1));
++	sr32(&prcm_base->clksel_cam, 0, 5, PER_M5X2);
++	/* M4 */
++	sr32(&prcm_base->clksel_dss, 0, 5, (PER_M4X2 + 1));
++	sr32(&prcm_base->clksel_dss, 0, 5, PER_M4X2);
++	/* M3 */
++	sr32(&prcm_base->clksel_dss, 8, 5, (PER_M3X2 + 1));
++	sr32(&prcm_base->clksel_dss, 8, 5, PER_M3X2);
++	/* M2 (DIV_96M): CM_CLKSEL3_PLL[0:4] */
++	sr32(&prcm_base->clksel3_pll, 0, 5, (ptr->m2 + 1));
++	sr32(&prcm_base->clksel3_pll, 0, 5, ptr->m2);
+ 	/* Workaround end */
+ 
+-	sr32(&prcm_base->clksel2_pll, 8, 11, dpll_param_p->m);	/* set m */
+-	sr32(&prcm_base->clksel2_pll, 0, 7, dpll_param_p->n);	/* set n */
+-	sr32(&prcm_base->clken_pll, 20, 4, dpll_param_p->fsel);	/* FREQSEL */
+-	sr32(&prcm_base->clken_pll, 16, 3, PLL_LOCK);		/* lock mode */
++	/* M (PERIPH_DPLL_MULT): CM_CLKSEL2_PLL[8:18] */
++	sr32(&prcm_base->clksel2_pll, 8, 11, ptr->m);
++
++	/* N (PERIPH_DPLL_DIV): CM_CLKSEL2_PLL[0:6] */
++	sr32(&prcm_base->clksel2_pll, 0, 7, ptr->n);
++
++	/* FREQSEL (PERIPH_DPLL_FREQSEL): CM_CLKEN_PLL[20:23] */
++	sr32(&prcm_base->clken_pll, 20, 4, ptr->fsel);
++
++	/* LOCK MODE (EN_PERIPH_DPLL): CM_CLKEN_PLL[16:18] */
++	sr32(&prcm_base->clken_pll, 16, 3, PLL_LOCK);
+ 	wait_on_value(ST_PERIPH_CLK, 2, &prcm_base->idlest_ckgen, LDELAY);
++}
+ 
+-	/* Getting the base address to MPU DPLL param table */
+-	dpll_param_p = (dpll_param *) get_mpu_dpll_param();
++static void mpu_init_34xx(u32 sil_index, u32 clk_index)
++{
++	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
++	dpll_param *ptr = (dpll_param *) get_mpu_dpll_param();
+ 
+-	/* Moving it to the right sysclk and ES rev base */
+-	dpll_param_p = dpll_param_p + 3 * clk_index + sil_index;
++	/* Moving to the right sysclk and ES rev base */
++	ptr = ptr + (3 * clk_index) + sil_index;
+ 
+ 	/* MPU DPLL (unlocked already) */
+ 
+-	/* Set M2 */
+-	sr32(&prcm_base->clksel2_pll_mpu, 0, 5, dpll_param_p->m2);
+-	/* Set M */
+-	sr32(&prcm_base->clksel1_pll_mpu, 8, 11, dpll_param_p->m);
+-	/* Set N */
+-	sr32(&prcm_base->clksel1_pll_mpu, 0, 7, dpll_param_p->n);
+-	/* FREQSEL */
+-	sr32(&prcm_base->clken_pll_mpu, 4, 4, dpll_param_p->fsel);
+-	/* lock mode */
+-	sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOCK);
+-	wait_on_value(ST_MPU_CLK, 1, &prcm_base->idlest_pll_mpu, LDELAY);
+-
+-	/* Getting the base address to IVA DPLL param table */
+-	dpll_param_p = (dpll_param *) get_iva_dpll_param();
+-
+-	/* Moving it to the right sysclk and ES rev base */
+-	dpll_param_p = dpll_param_p + 3 * clk_index + sil_index;
+-
+-	/* IVA DPLL (set to 12*20=240MHz) */
++	/* M2 (MPU_DPLL_CLKOUT_DIV) : CM_CLKSEL2_PLL_MPU[0:4] */
++	sr32(&prcm_base->clksel2_pll_mpu, 0, 5, ptr->m2);
++
++	/* M (MPU_DPLL_MULT) : CM_CLKSEL2_PLL_MPU[8:18] */
++	sr32(&prcm_base->clksel1_pll_mpu, 8, 11, ptr->m);
++
++	/* N (MPU_DPLL_DIV) : CM_CLKSEL2_PLL_MPU[0:6] */
++	sr32(&prcm_base->clksel1_pll_mpu, 0, 7, ptr->n);
++
++	/* FREQSEL (MPU_DPLL_FREQSEL) : CM_CLKEN_PLL_MPU[4:7] */
++	sr32(&prcm_base->clken_pll_mpu, 4, 4, ptr->fsel);
++}
++
++static void iva_init_34xx(u32 sil_index, u32 clk_index)
++{
++	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
++	dpll_param *ptr = (dpll_param *) get_iva_dpll_param();
++
++	/* Moving to the right sysclk and ES rev base */
++	ptr = ptr + (3 * clk_index) + sil_index;
++
++	/* IVA DPLL */
++	/* EN_IVA2_DPLL : CM_CLKEN_PLL_IVA2[0:2] */
+ 	sr32(&prcm_base->clken_pll_iva2, 0, 3, PLL_STOP);
+ 	wait_on_value(ST_IVA2_CLK, 0, &prcm_base->idlest_pll_iva2, LDELAY);
+-	/* set M2 */
+-	sr32(&prcm_base->clksel2_pll_iva2, 0, 5, dpll_param_p->m2);
+-	/* set M */
+-	sr32(&prcm_base->clksel1_pll_iva2, 8, 11, dpll_param_p->m);
+-	/* set N */
+-	sr32(&prcm_base->clksel1_pll_iva2, 0, 7, dpll_param_p->n);
+-	/* FREQSEL */
+-	sr32(&prcm_base->clken_pll_iva2, 4, 4, dpll_param_p->fsel);
+-	/* lock mode */
++
++	/* M2 (IVA2_DPLL_CLKOUT_DIV) : CM_CLKSEL2_PLL_IVA2[0:4] */
++	sr32(&prcm_base->clksel2_pll_iva2, 0, 5, ptr->m2);
++
++	/* M (IVA2_DPLL_MULT) : CM_CLKSEL1_PLL_IVA2[8:18] */
++	sr32(&prcm_base->clksel1_pll_iva2, 8, 11, ptr->m);
++
++	/* N (IVA2_DPLL_DIV) : CM_CLKSEL1_PLL_IVA2[0:6] */
++	sr32(&prcm_base->clksel1_pll_iva2, 0, 7, ptr->n);
++
++	/* FREQSEL (IVA2_DPLL_FREQSEL) : CM_CLKEN_PLL_IVA2[4:7] */
++	sr32(&prcm_base->clken_pll_iva2, 4, 4, ptr->fsel);
++
++	/* LOCK MODE (EN_IVA2_DPLL) : CM_CLKEN_PLL_IVA2[0:2] */
+ 	sr32(&prcm_base->clken_pll_iva2, 0, 3, PLL_LOCK);
++
+ 	wait_on_value(ST_IVA2_CLK, 1, &prcm_base->idlest_pll_iva2, LDELAY);
++}
++
++/*
++ * OMAP3630 specific functions
++ */
++
++/******************************************************************************
++ * Initialize PER DPLL for OMAP36x/37x
++ *****************************************************************************/
++static void dpll3_init_36xx(u32 sil_index, u32 clk_index)
++{
++	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
++	dpll_param *ptr = (dpll_param *) get_36x_core_dpll_param();
++	void (*f_lock_pll) (u32, u32, u32, u32);
++	int xip_safe, p0, p1, p2, p3;
++
++	xip_safe = is_running_in_sram();
++
++	/* Moving it to the right sysclk base */
++	ptr += clk_index;
++
++	if (xip_safe) {
++		/* CORE DPLL */
++
++		/* Select relock bypass: CM_CLKEN_PLL[0:2] */
++		sr32(&prcm_base->clken_pll, 0, 3, PLL_FAST_RELOCK_BYPASS);
++		wait_on_value(ST_CORE_CLK, 0, &prcm_base->idlest_ckgen,
++				LDELAY);
++
++		/* CM_CLKSEL1_EMU[DIV_DPLL3] */
++		sr32(&prcm_base->clksel1_emu, 16, 5, CORE_M3X2);
++
++		/* M2 (CORE_DPLL_CLKOUT_DIV): CM_CLKSEL1_PLL[27:31] */
++		sr32(&prcm_base->clksel1_pll, 27, 5, ptr->m2);
++
++		/* M (CORE_DPLL_MULT): CM_CLKSEL1_PLL[16:26] */
++		sr32(&prcm_base->clksel1_pll, 16, 11, ptr->m);
++
++		/* N (CORE_DPLL_DIV): CM_CLKSEL1_PLL[8:14] */
++		sr32(&prcm_base->clksel1_pll, 8, 7, ptr->n);
++
++		/* Source is the CM_96M_FCLK: CM_CLKSEL1_PLL[6] */
++		sr32(&prcm_base->clksel1_pll, 6, 1, 0);
++
++		/* SSI */
++		sr32(&prcm_base->clksel_core, 8, 4, CORE_SSI_DIV);
++		/* FSUSB */
++		sr32(&prcm_base->clksel_core, 4, 2, CORE_FUSB_DIV);
++		/* L4 */
++		sr32(&prcm_base->clksel_core, 2, 2, CORE_L4_DIV);
++		/* L3 */
++		sr32(&prcm_base->clksel_core, 0, 2, CORE_L3_DIV);
++		/* GFX */
++		sr32(&prcm_base->clksel_gfx,  0, 3, GFX_DIV);
++		/* RESET MGR */
++		sr32(&prcm_base->clksel_wkup, 1, 2, WKUP_RSM);
++		/* FREQSEL (CORE_DPLL_FREQSEL): CM_CLKEN_PLL[4:7] */
++		sr32(&prcm_base->clken_pll,   4, 4, ptr->fsel);
++		/* LOCK MODE */
++		sr32(&prcm_base->clken_pll,   0, 3, PLL_LOCK);
++
++		wait_on_value(ST_CORE_CLK, 1, &prcm_base->idlest_ckgen,
++				LDELAY);
++	} else if (is_running_in_flash()) {
++		/*
++		 * if running from flash, jump to small relocated code
++		 * area in SRAM.
++		 */
++		f_lock_pll = (void *) ((u32) &_end_vect - (u32) &_start +
++				SRAM_VECT_CODE);
++
++		p0 = readl(&prcm_base->clken_pll);
++		sr32(&p0, 0, 3, PLL_FAST_RELOCK_BYPASS);
++		/* FREQSEL (CORE_DPLL_FREQSEL): CM_CLKEN_PLL[4:7] */
++		sr32(&p0, 4, 4, ptr->fsel);
++
++		p1 = readl(&prcm_base->clksel1_pll);
++		/* M2 (CORE_DPLL_CLKOUT_DIV): CM_CLKSEL1_PLL[27:31] */
++		sr32(&p1, 27, 5, ptr->m2);
++		/* M (CORE_DPLL_MULT): CM_CLKSEL1_PLL[16:26] */
++		sr32(&p1, 16, 11, ptr->m);
++		/* N (CORE_DPLL_DIV): CM_CLKSEL1_PLL[8:14] */
++		sr32(&p1, 8, 7, ptr->n);
++		/* Source is the CM_96M_FCLK: CM_CLKSEL1_PLL[6] */
++		sr32(&p1, 6, 1, 0);
++
++		p2 = readl(&prcm_base->clksel_core);
++		/* SSI */
++		sr32(&p2, 8, 4, CORE_SSI_DIV);
++		/* FSUSB */
++		sr32(&p2, 4, 2, CORE_FUSB_DIV);
++		/* L4 */
++		sr32(&p2, 2, 2, CORE_L4_DIV);
++		/* L3 */
++		sr32(&p2, 0, 2, CORE_L3_DIV);
++
++		p3 = (u32)&prcm_base->idlest_ckgen;
++
++		(*f_lock_pll) (p0, p1, p2, p3);
++	}
++}
++
++static void dpll4_init_36xx(u32 sil_index, u32 clk_index)
++{
++	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
++	struct dpll_per_36x_param *ptr;
++
++	ptr = (struct dpll_per_36x_param *)get_36x_per_dpll_param();
++
++	/* Moving it to the right sysclk base */
++	ptr += clk_index;
++
++	/* EN_PERIPH_DPLL: CM_CLKEN_PLL[16:18] */
++	sr32(&prcm_base->clken_pll, 16, 3, PLL_STOP);
++	wait_on_value(ST_PERIPH_CLK, 0, &prcm_base->idlest_ckgen, LDELAY);
++
++	/* M6 (DIV_DPLL4): CM_CLKSEL1_EMU[24:29] */
++	sr32(&prcm_base->clksel1_emu, 24, 6, ptr->m6);
++
++	/* M5 (CLKSEL_CAM): CM_CLKSEL1_EMU[0:5] */
++	sr32(&prcm_base->clksel_cam, 0, 6, ptr->m5);
++
++	/* M4 (CLKSEL_DSS1): CM_CLKSEL_DSS[0:5] */
++	sr32(&prcm_base->clksel_dss, 0, 6, ptr->m4);
++
++	/* M3 (CLKSEL_DSS1): CM_CLKSEL_DSS[8:13] */
++	sr32(&prcm_base->clksel_dss, 8, 6, ptr->m3);
++
++	/* M2 (DIV_96M): CM_CLKSEL3_PLL[0:4] */
++	sr32(&prcm_base->clksel3_pll, 0, 5, ptr->m2);
++
++	/* M (PERIPH_DPLL_MULT): CM_CLKSEL2_PLL[8:19] */
++	sr32(&prcm_base->clksel2_pll, 8, 12, ptr->m);
++
++	/* N (PERIPH_DPLL_DIV): CM_CLKSEL2_PLL[0:6] */
++	sr32(&prcm_base->clksel2_pll, 0, 7, ptr->n);
++
++	/* M2DIV (CLKSEL_96M): CM_CLKSEL_CORE[12:13] */
++	sr32(&prcm_base->clksel_core, 12, 2, ptr->m2div);
++
++	/* LOCK MODE (EN_PERIPH_DPLL): CM_CLKEN_PLL[16:18] */
++	sr32(&prcm_base->clken_pll, 16, 3, PLL_LOCK);
++	wait_on_value(ST_PERIPH_CLK, 2, &prcm_base->idlest_ckgen, LDELAY);
++}
++
++static void mpu_init_36xx(u32 sil_index, u32 clk_index)
++{
++	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
++	dpll_param *ptr = (dpll_param *) get_36x_mpu_dpll_param();
++
++	/* Moving to the right sysclk */
++	ptr += clk_index;
++
++	/* MPU DPLL (unlocked already */
++
++	/* M2 (MPU_DPLL_CLKOUT_DIV) : CM_CLKSEL2_PLL_MPU[0:4] */
++	sr32(&prcm_base->clksel2_pll_mpu, 0, 5, ptr->m2);
++
++	/* M (MPU_DPLL_MULT) : CM_CLKSEL2_PLL_MPU[8:18] */
++	sr32(&prcm_base->clksel1_pll_mpu, 8, 11, ptr->m);
++
++	/* N (MPU_DPLL_DIV) : CM_CLKSEL2_PLL_MPU[0:6] */
++	sr32(&prcm_base->clksel1_pll_mpu, 0, 7, ptr->n);
++}
++
++static void iva_init_36xx(u32 sil_index, u32 clk_index)
++{
++	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
++	dpll_param *ptr = (dpll_param *)get_36x_iva_dpll_param();
++
++	/* Moving to the right sysclk */
++	ptr += clk_index;
++
++	/* IVA DPLL */
++	/* EN_IVA2_DPLL : CM_CLKEN_PLL_IVA2[0:2] */
++	sr32(&prcm_base->clken_pll_iva2, 0, 3, PLL_STOP);
++	wait_on_value(ST_IVA2_CLK, 0, &prcm_base->idlest_pll_iva2, LDELAY);
++
++	/* M2 (IVA2_DPLL_CLKOUT_DIV) : CM_CLKSEL2_PLL_IVA2[0:4] */
++	sr32(&prcm_base->clksel2_pll_iva2, 0, 5, ptr->m2);
++
++	/* M (IVA2_DPLL_MULT) : CM_CLKSEL1_PLL_IVA2[8:18] */
++	sr32(&prcm_base->clksel1_pll_iva2, 8, 11, ptr->m);
++
++	/* N (IVA2_DPLL_DIV) : CM_CLKSEL1_PLL_IVA2[0:6] */
++	sr32(&prcm_base->clksel1_pll_iva2, 0, 7, ptr->n);
++
++	/* LOCK (MODE (EN_IVA2_DPLL) : CM_CLKEN_PLL_IVA2[0:2] */
++	sr32(&prcm_base->clken_pll_iva2, 0, 3, PLL_LOCK);
++
++	wait_on_value(ST_IVA2_CLK, 1, &prcm_base->idlest_pll_iva2, LDELAY);
++}
++
++/******************************************************************************
++ * prcm_init() - inits clocks for PRCM as defined in clocks.h
++ *               called from SRAM, or Flash (using temp SRAM stack).
++ *****************************************************************************/
++void prcm_init(void)
++{
++	u32 osc_clk = 0, sys_clkin_sel;
++	u32 clk_index, sil_index = 0;
++	struct prm *prm_base = (struct prm *)PRM_BASE;
++	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
++
++	/*
++	 * Gauge the input clock speed and find out the sys_clkin_sel
++	 * value corresponding to the input clock.
++	 */
++	osc_clk = get_osc_clk_speed();
++	get_sys_clkin_sel(osc_clk, &sys_clkin_sel);
++
++	/* set input crystal speed */
++	sr32(&prm_base->clksel, 0, 3, sys_clkin_sel);
++
++	/* If the input clock is greater than 19.2M always divide/2 */
++	if (sys_clkin_sel > 2) {
++		/* input clock divider */
++		sr32(&prm_base->clksrc_ctrl, 6, 2, 2);
++		clk_index = sys_clkin_sel / 2;
++	} else {
++		/* input clock divider */
++		sr32(&prm_base->clksrc_ctrl, 6, 2, 1);
++		clk_index = sys_clkin_sel;
++	}
++
++	if (get_cpu_family() == CPU_OMAP36XX) {
++		/* Unlock MPU DPLL (slows things down, and needed later) */
++		sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOW_POWER_BYPASS);
++		wait_on_value(ST_MPU_CLK, 0, &prcm_base->idlest_pll_mpu,
++				LDELAY);
++
++		dpll3_init_36xx(0, clk_index);
++		dpll4_init_36xx(0, clk_index);
++		iva_init_36xx(0, clk_index);
++		mpu_init_36xx(0, clk_index);
++
++		/* Lock MPU DPLL to set frequency */
++		sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOCK);
++		wait_on_value(ST_MPU_CLK, 1, &prcm_base->idlest_pll_mpu,
++				LDELAY);
++	} else {
++		/*
++		 * The DPLL tables are defined according to sysclk value and
++		 * silicon revision. The clk_index value will be used to get
++		 * the values for that input sysclk from the DPLL param table
++		 * and sil_index will get the values for that SysClk for the
++		 * appropriate silicon rev.
++		 */
++		if (((get_cpu_family() == CPU_OMAP34XX)
++				&& (get_cpu_rev() >= CPU_3XX_ES20)) ||
++			(get_cpu_family() == CPU_AM35XX))
++			sil_index = 1;
++
++		/* Unlock MPU DPLL (slows things down, and needed later) */
++		sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOW_POWER_BYPASS);
++		wait_on_value(ST_MPU_CLK, 0, &prcm_base->idlest_pll_mpu,
++				LDELAY);
++
++		dpll3_init_34xx(sil_index, clk_index);
++		dpll4_init_34xx(sil_index, clk_index);
++		iva_init_34xx(sil_index, clk_index);
++		mpu_init_34xx(sil_index, clk_index);
++
++		/* Lock MPU DPLL to set frequency */
++		sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOCK);
++		wait_on_value(ST_MPU_CLK, 1, &prcm_base->idlest_pll_mpu,
++				LDELAY);
++	}
+ 
+ 	/* Set up GPTimers to sys_clk source only */
+ 	sr32(&prcm_base->clksel_per, 0, 8, 0xff);
+@@ -414,3 +678,4 @@ void per_clocks_enable(void)
+ 
+ 	sdelay(1000);
+ }
++
+diff --git a/cpu/arm_cortexa8/omap3/lowlevel_init.S b/cpu/arm_cortexa8/omap3/lowlevel_init.S
+index 73063ec..2045e4e 100644
+--- a/cpu/arm_cortexa8/omap3/lowlevel_init.S
++++ b/cpu/arm_cortexa8/omap3/lowlevel_init.S
+@@ -359,3 +359,72 @@ per_dpll_param:
+ get_per_dpll_param:
+ 	adr	r0, per_dpll_param
+ 	mov	pc, lr
++
++/*
++ * Tables for 36x/37x devices
++ *
++ */
++mpu_36x_dpll_param:
++/* 12MHz */
++.word 50, 0, 0, 1
++/* 13MHz */
++.word 600, 12, 0, 1
++/* 19.2MHz */
++.word 125, 3, 0, 1
++/* 26MHz */
++.word 300, 12, 0, 1
++/* 38.4MHz */
++.word 125, 7, 0, 1
++
++iva_36x_dpll_param:
++/* 12MHz */
++.word 130, 2, 0, 1
++/* 13MHz */
++.word 40, 0, 0, 1
++/* 19.2MHz */
++.word 325, 11, 0, 1
++/* 26MHz */
++.word 20, 0, 0, 1
++/* 38.4MHz */
++.word 325, 23, 0, 1
++
++core_36x_dpll_param:
++/* 12MHz */
++.word 100, 2, 0, 1
++/* 13MHz */
++.word 400, 12, 0, 1
++/* 19.2MHz */
++.word 375, 17, 0, 1
++/* 26MHz */
++.word 200, 12, 0, 1
++/* 38.4MHz */
++.word 375, 35, 0, 1
++
++per_36x_dpll_param:
++/*    SYSCLK    M       N      M2      M3      M4     M5      M6      m2DIV */
++.word 12000,    360,    4,     9,      16,     5,     4,      3,      1
++.word 13000,   1728,   12,     9,      32,     18,    8,      6,      2
++.word 19200,    360,    7,     9,      16,     5,     4,      3,      1
++.word 26000,   1728,   12,     9,      32,     18,    8,      6,      2
++.word 38400,    360,   15,     9,      16,     5,     4,      3,      1
++
++.globl get_36x_mpu_dpll_param
++get_36x_mpu_dpll_param:
++	adr	r0, mpu_36x_dpll_param
++	mov	pc, lr
++
++.globl get_36x_iva_dpll_param
++get_36x_iva_dpll_param:
++	adr	r0, iva_36x_dpll_param
++	mov	pc, lr
++
++.globl get_36x_core_dpll_param
++get_36x_core_dpll_param:
++	adr	r0, core_36x_dpll_param
++	mov	pc, lr
++
++.globl get_36x_per_dpll_param
++get_36x_per_dpll_param:
++	adr	r0, per_36x_dpll_param
++	mov	pc, lr
++
+diff --git a/include/asm-arm/arch-omap3/clocks.h b/include/asm-arm/arch-omap3/clocks.h
+index 71a0cb6..a5f2d08 100644
+--- a/include/asm-arm/arch-omap3/clocks.h
++++ b/include/asm-arm/arch-omap3/clocks.h
+@@ -51,12 +51,29 @@ typedef struct {
+ 	unsigned int m2;
+ } dpll_param;
+ 
++struct dpll_per_36x_param {
++        unsigned int sys_clk;
++        unsigned int m;
++        unsigned int n;
++        unsigned int m2;
++        unsigned int m3;
++        unsigned int m4;
++        unsigned int m5;
++        unsigned int m6;
++        unsigned int m2div;
++};
++
+ /* Following functions are exported from lowlevel_init.S */
+ extern dpll_param *get_mpu_dpll_param(void);
+ extern dpll_param *get_iva_dpll_param(void);
+ extern dpll_param *get_core_dpll_param(void);
+ extern dpll_param *get_per_dpll_param(void);
+ 
++extern dpll_param *get_36x_mpu_dpll_param(void);
++extern dpll_param *get_36x_iva_dpll_param(void);
++extern dpll_param *get_36x_core_dpll_param(void);
++extern dpll_param *get_36x_per_dpll_param(void);
++
+ extern void *_end_vect, *_start;
+ 
+ #endif
+diff --git a/include/asm-arm/arch-omap3/clocks_omap3.h b/include/asm-arm/arch-omap3/clocks_omap3.h
+index 661407b..30ef690 100644
+--- a/include/asm-arm/arch-omap3/clocks_omap3.h
++++ b/include/asm-arm/arch-omap3/clocks_omap3.h
+@@ -282,4 +282,31 @@
+ #define PER_FSEL_38P4		0x07
+ #define PER_M2_38P4		0x09
+ 
++/* 36XX PER DPLL */
++
++#define PER_36XX_M_12		0x1B0
++#define PER_36XX_N_12		0x05
++#define PER_36XX_FSEL_12	0x07
++#define PER_36XX_M2_12		0x09
++
++#define PER_36XX_M_13		0x360
++#define PER_36XX_N_13		0x0C
++#define PER_36XX_FSEL_13	0x03
++#define PER_36XX_M2_13		0x09
++
++#define PER_36XX_M_19P2		0x1C2
++#define PER_36XX_N_19P2		0x09
++#define PER_36XX_FSEL_19P2	0x07
++#define PER_36XX_M2_19P2	0x09
++
++#define PER_36XX_M_26		0x1B0
++#define PER_36XX_N_26		0x0C
++#define PER_36XX_FSEL_26	0x07
++#define PER_36XX_M2_26		0x09
++
++#define PER_36XX_M_38P4		0x1C2
++#define PER_36XX_N_38P4		0x13
++#define PER_36XX_FSEL_38P4	0x07
++#define PER_36XX_M2_38P4	0x09
++
+ #endif	/* endif _CLOCKS_OMAP3_H_ */
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0020-OMAP3-beagle-add-support-for-Beagle-xM.patch b/recipes/u-boot/u-boot-git/beagleboard/0020-OMAP3-beagle-add-support-for-Beagle-xM.patch
new file mode 100644
index 0000000000..e6ae0dc748
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0020-OMAP3-beagle-add-support-for-Beagle-xM.patch
@@ -0,0 +1,137 @@
+From 27c6c30dbb5de0c0ed30ceaf69bb0e9f12149c03 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Tue, 23 Mar 2010 09:21:49 -0700
+Subject: [PATCH 20/37] OMAP3: beagle: add support for Beagle xM
+
+---
+ board/ti/beagle/beagle.c       |   23 +++++++++++++++--------
+ board/ti/beagle/beagle.h       |   34 ++++++++++++++++++++++++++++++----
+ include/configs/omap3_beagle.h |    1 +
+ 3 files changed, 46 insertions(+), 12 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index b4ea7e6..d357588 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -75,7 +75,7 @@ int beagle_get_revision(void)
+  *		GPIO173, GPIO172, GPIO171: 1 1 1 => Ax/Bx
+  *		GPIO173, GPIO172, GPIO171: 1 1 0 => C1/2/3
+  *		GPIO173, GPIO172, GPIO171: 1 0 1 => C4
+- *		GPIO173, GPIO172, GPIO171: 0 0 0 => D
++ *		GPIO173, GPIO172, GPIO171: 0 0 0 => XM
+  */
+ void beagle_identify(void)
+ {
+@@ -108,29 +108,36 @@ int misc_init_r(void)
+ 	twl4030_power_init();
+ 	twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
+ 
+-	printf("Board revision ");
+ 	switch (beagle_revision) {
+ 	case REVISION_AXBX:
+-		printf("Ax/Bx\n");
++		printf("Beagle Rev Ax/Bx\n");
+ 		break;
+ 	case REVISION_CX:
+-		printf("C1/C2/C3\n");
++		printf("Beagle Rev C1/C2/C3\n");
+ 		MUX_BEAGLE_C();
+ 		break;
+ 	case REVISION_C4:
+-		printf("C4\n");
++		printf("Beagle Rev C4\n");
+ 		MUX_BEAGLE_C();
+ 		/* Set VAUX2 to 1.8V for EHCI PHY */
+ 		twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
+ 					TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
+ 					TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
+ 					TWL4030_PM_RECEIVER_DEV_GRP_P1);
++		setenv("mpurate", "720");
+ 		break;
+-	case REVISION_D:
+-		printf("D\n");
++	case REVISION_XM:
++		printf("Beagle xM Rev A\n");
++		MUX_BEAGLE_XM();
++		/* Set VAUX2 to 1.8V for EHCI PHY */
++		twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
++					TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
++					TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
++					TWL4030_PM_RECEIVER_DEV_GRP_P1);
++		setenv("mpurate", "720");
+ 		break;
+ 	default:
+-		printf("unknown 0x%02x\n", beagle_revision);
++		printf("Beagle unknown 0x%02x\n", beagle_revision);
+ 	}
+ 
+ 	/* Configure GPIOs to output */
+diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
+index d95fd78..fd06d46 100644
+--- a/board/ti/beagle/beagle.h
++++ b/board/ti/beagle/beagle.h
+@@ -38,7 +38,7 @@ const omap3_sysinfo sysinfo = {
+ #define REVISION_AXBX	0x7
+ #define REVISION_CX	0x6
+ #define REVISION_C4	0x5
+-#define REVISION_D	0x0
++#define REVISION_XM	0x0
+ 
+ /*
+  * IEN  - Input Enable
+@@ -379,11 +379,37 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(SDRC_CKE1),		(IDIS | PTU | EN  | M0)) /*sdrc_cke1*/
+ 
+ #define MUX_BEAGLE_C() \
+-	MUX_VAL(CP(MCBSP3_DX),		(IEN | PTD | DIS | M4)) /*GPIO_140*/\
+-	MUX_VAL(CP(MCBSP3_DR),		(IEN | PTD | DIS | M4)) /*GPIO_142*/\
+-	MUX_VAL(CP(MCBSP3_CLKX),	(IEN | PTD | DIS | M4)) /*GPIO_141*/\
++	MUX_VAL(CP(MCBSP3_DX),		(IEN  | PTD | DIS | M4)) /*GPIO_140*/\
++	MUX_VAL(CP(MCBSP3_DR),		(IEN  | PTD | DIS | M4)) /*GPIO_142*/\
++	MUX_VAL(CP(MCBSP3_CLKX),	(IEN  | PTD | DIS | M4)) /*GPIO_141*/\
+ 	MUX_VAL(CP(UART2_CTS),		(IEN  | PTU | EN  | M0)) /*UART2_CTS*/\
+ 	MUX_VAL(CP(UART2_RTS),		(IDIS | PTD | DIS | M0)) /*UART2_RTS*/\
+ 	MUX_VAL(CP(UART2_TX),		(IDIS | PTD | DIS | M0)) /*UART2_TX*/
+ 
++#define MUX_BEAGLE_XM() \
++	MUX_VAL(CP(MCBSP3_DX),		(IEN  | PTD | DIS | M4)) /*GPIO_140*/\
++	MUX_VAL(CP(MCBSP3_DR),		(IEN  | PTD | DIS | M4)) /*GPIO_142*/\
++	MUX_VAL(CP(MCBSP3_CLKX),	(IEN  | PTD | DIS | M4)) /*GPIO_141*/\
++	MUX_VAL(CP(UART2_CTS),		(IEN  | PTU | EN  | M0)) /*UART2_CTS*/\
++	MUX_VAL(CP(UART2_RTS),		(IDIS | PTD | DIS | M0)) /*UART2_RTS*/\
++	MUX_VAL(CP(UART2_TX),		(IDIS | PTD | DIS | M0)) /*UART2_TX*/\
++	MUX_VAL(CP(DSS_DATA0),		(IDIS | PTD | DIS | M7)) /*safe_mode*/\
++	MUX_VAL(CP(DSS_DATA1),		(IDIS | PTD | DIS | M7)) /*safe_mode*/\
++	MUX_VAL(CP(DSS_DATA2),		(IDIS | PTD | DIS | M7)) /*safe_mode*/\
++	MUX_VAL(CP(DSS_DATA3),		(IDIS | PTD | DIS | M7)) /*safe_mode*/\
++	MUX_VAL(CP(DSS_DATA4),		(IDIS | PTD | DIS | M7)) /*safe_mode*/\
++	MUX_VAL(CP(DSS_DATA5),		(IDIS | PTD | DIS | M7)) /*safe_mode*/\
++	MUX_VAL(CP(DSS_DATA18),		(IDIS | PTD | DIS | M3)) /*DSS_DATA0*/\
++	MUX_VAL(CP(DSS_DATA19),		(IDIS | PTD | DIS | M3)) /*DSS_DATA1*/\
++	MUX_VAL(CP(DSS_DATA20),		(IDIS | PTD | DIS | M3)) /*DSS_DATA2*/\
++	MUX_VAL(CP(DSS_DATA21),		(IDIS | PTD | DIS | M3)) /*DSS_DATA3*/\
++	MUX_VAL(CP(DSS_DATA22),		(IDIS | PTD | DIS | M3)) /*DSS_DATA4*/\
++	MUX_VAL(CP(DSS_DATA23),		(IDIS | PTD | DIS | M3)) /*DSS_DATA5*/\
++	MUX_VAL(CP(SYS_BOOT0),		(IDIS | PTD | DIS | M3)) /*DSS_DATA18*/\
++	MUX_VAL(CP(SYS_BOOT1),		(IDIS | PTD | DIS | M3)) /*DSS_DATA19*/\
++	MUX_VAL(CP(SYS_BOOT3),		(IDIS | PTD | DIS | M3)) /*DSS_DATA20*/\
++	MUX_VAL(CP(SYS_BOOT4),		(IDIS | PTD | DIS | M3)) /*DSS_DATA21*/\
++	MUX_VAL(CP(SYS_BOOT5),		(IDIS | PTD | DIS | M3)) /*DSS_DATA22*/\
++	MUX_VAL(CP(SYS_BOOT6),		(IDIS | PTD | DIS | M3)) /*DSS_DATA23*/ 
++
+ #endif
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index ce347cd..bba36df 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -157,6 +157,7 @@
+ /*
+  * Board NAND Info.
+  */
++#define CONFIG_SYS_NAND_QUIET_TEST	1
+ #define CONFIG_NAND_OMAP_GPMC
+ #define CONFIG_SYS_NAND_ADDR		NAND_BASE	/* physical address */
+ 							/* to access nand */
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch b/recipes/u-boot/u-boot-git/beagleboard/0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch
new file mode 100644
index 0000000000..01aedc8760
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch
@@ -0,0 +1,53 @@
+From e26b222adeea78777a89e9b0d0aefed67cde7d55 Mon Sep 17 00:00:00 2001
+From: Steve Sakoman <steve@sakoman.com>
+Date: Thu, 25 Mar 2010 06:54:47 -0700
+Subject: [PATCH 21/37] OMAP3: Beagle, Overo: remove omapfb.debug=y from default env
+
+---
+ include/configs/omap3_beagle.h |    2 --
+ include/configs/omap3_overo.h  |    2 --
+ 2 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index bba36df..c156cea 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -195,7 +195,6 @@
+ 		"mpurate=${mpurate} " \
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+-		"omapfb.debug=y " \
+ 		"omapdss.def_disp=${defaultdisplay} " \
+ 		"root=${mmcroot} " \
+ 		"rootfstype=${mmcrootfstype}\0" \
+@@ -203,7 +202,6 @@
+ 		"mpurate=${mpurate} " \
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+-		"omapfb.debug=y " \
+ 		"omapdss.def_disp=${defaultdisplay} " \
+ 		"root=${nandroot} " \
+ 		"rootfstype=${nandrootfstype}\0" \
+diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
+index fdbeb67..418e2ea 100644
+--- a/include/configs/omap3_overo.h
++++ b/include/configs/omap3_overo.h
+@@ -164,7 +164,6 @@
+ 		"mpurate=${mpurate} " \
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+-		"omapfb.debug=y " \
+ 		"omapdss.def_disp=${defaultdisplay} " \
+ 		"root=${mmcroot} " \
+ 		"rootfstype=${mmcrootfstype}\0" \
+@@ -172,7 +171,6 @@
+ 		"mpurate=${mpurate} " \
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+-		"omapfb.debug=y " \
+ 		"omapdss.def_disp=${defaultdisplay} " \
+ 		"root=${nandroot} " \
+ 		"rootfstype=${nandrootfstype}\0" \
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0022-OMAP3-beagle-implement-expansionboard-detection-base.patch b/recipes/u-boot/u-boot-git/beagleboard/0022-OMAP3-beagle-implement-expansionboard-detection-base.patch
new file mode 100644
index 0000000000..91d09abea9
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0022-OMAP3-beagle-implement-expansionboard-detection-base.patch
@@ -0,0 +1,157 @@
+From 851d35fab7f93400a1d714524b5e986206d9b0c4 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Thu, 25 Mar 2010 16:07:23 +0100
+Subject: [PATCH 22/37] OMAP3: beagle: implement expansionboard detection based on board/overo.c code
+
+---
+ board/ti/beagle/beagle.c |   78 ++++++++++++++++++++++++++++++++++++++++++++++
+ board/ti/beagle/beagle.h |   25 +++++++++++++-
+ 2 files changed, 101 insertions(+), 2 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index d357588..8c5b88c 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -38,6 +38,31 @@
+ #include <asm/mach-types.h>
+ #include "beagle.h"
+ 
++static struct {
++	unsigned int device_vendor;
++	unsigned char revision;
++	unsigned char content;
++	unsigned char fab_revision[8];
++	unsigned char env_var[16];
++	unsigned char env_setting[64];
++} expansion_config;
++
++#define TWL4030_I2C_BUS			0
++
++#define EXPANSION_EEPROM_I2C_BUS	1
++#define EXPANSION_EEPROM_I2C_ADDRESS	0x50
++
++#define TINCANTOOLS_VENDORID	0x0100
++#define GUMSTIX_VENDORID		0x0200
++#define SPECIALCOMP_VENDORID	0x0300
++
++#define TINCANTOOLS_ZIPPY		0x01000100
++#define TINCANTOOLS_ZIPPY2		0x02000100
++#define TINCANTOOLS_TRAINER		0x03000100
++#define TINCANTOOLS_SHOWDOG		0x04000100
++
++#define BEAGLE_NO_EEPROM		0xffffffff
++
+ static int beagle_revision;
+ 
+ /*
+@@ -95,6 +120,27 @@ void beagle_identify(void)
+ }
+ 
+ /*
++ * Routine: get_expansion_id
++ * Description: This function checks for expansion board by checking I2C
++ *		bus 2 for the availability of an AT24C01B serial EEPROM.
++ *		returns the device_vendor field from the EEPROM
++ */
++unsigned int get_expansion_id(void)
++{
++	i2c_set_bus_num(EXPANSION_EEPROM_I2C_BUS);
++
++	/* return BEAGLE_NO_EEPROM if eeprom doesn't respond */
++	if (i2c_probe(EXPANSION_EEPROM_I2C_ADDRESS) == 1)
++		return BEAGLE_NO_EEPROM;
++
++	/* read configuration data */
++	i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, (u8 *)&expansion_config,
++		 sizeof(expansion_config));
++
++	return expansion_config.device_vendor;
++}
++
++/*
+  * Routine: misc_init_r
+  * Description: Configure board specific parts
+  */
+@@ -104,6 +150,38 @@ int misc_init_r(void)
+ 	struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE;
+ 
+ 	beagle_identify();
++	switch (get_expansion_id()) {
++		case TINCANTOOLS_ZIPPY:
++			printf("Recognized Tincantools Zippy expansion board (rev %d %s)\n",
++				expansion_config.revision, expansion_config.fab_revision);
++			MUX_TINCANTOOLS_ZIPPY();
++			break;
++		case TINCANTOOLS_ZIPPY2:
++			printf("Recognized Tincantools Zippy2 expansion board (rev %d %s)\n",
++				expansion_config.revision, expansion_config.fab_revision);
++			MUX_TINCANTOOLS_ZIPPY();
++			break;
++		case TINCANTOOLS_TRAINER:
++			printf("Recognized Tincantools Trainer expansion board (rev %d %s)\n",
++				expansion_config.revision, expansion_config.fab_revision);
++			break;
++		case TINCANTOOLS_SHOWDOG:
++			printf("Recognized Tincantools Showdow expansion board (rev %d %s)\n",
++				expansion_config.revision, expansion_config.fab_revision);
++			/* Place holder for DSS2 definition for showdog lcd */
++			setenv("defaultdisplay", "showdoglcd");
++			break;
++		case BEAGLE_NO_EEPROM:
++			printf("No EEPROM on expansion board\n");
++			break;
++		default:
++			printf("Unrecognized expansion board: %x\n", expansion_config.device_vendor);
++	}
++
++	if (expansion_config.content == 1)
++		setenv(expansion_config.env_var, expansion_config.env_setting);
++
++	i2c_set_bus_num(TWL4030_I2C_BUS);
+ 
+ 	twl4030_power_init();
+ 	twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
+diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
+index fd06d46..ec4f831 100644
+--- a/board/ti/beagle/beagle.h
++++ b/board/ti/beagle/beagle.h
+@@ -260,8 +260,8 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(HSUSB0_DATA7),	(IEN  | PTD | DIS | M0)) /*HSUSB0_DATA7*/\
+ 	MUX_VAL(CP(I2C1_SCL),		(IEN  | PTU | EN  | M0)) /*I2C1_SCL*/\
+ 	MUX_VAL(CP(I2C1_SDA),		(IEN  | PTU | EN  | M0)) /*I2C1_SDA*/\
+-	MUX_VAL(CP(I2C2_SCL),		(IEN  | PTU | EN  | M4)) /*GPIO_168*/\
+-	MUX_VAL(CP(I2C2_SDA),		(IEN  | PTU | EN  | M4)) /*GPIO_183*/\
++	MUX_VAL(CP(I2C2_SCL),       (IEN  | PTU | EN  | M0)) /*I2C2_SCL*/\
++	MUX_VAL(CP(I2C2_SDA),       (IEN  | PTU | EN  | M0)) /*I2C2_SDA*/\
+ 	MUX_VAL(CP(I2C3_SCL),		(IEN  | PTU | EN  | M0)) /*I2C3_SCL*/\
+ 	MUX_VAL(CP(I2C3_SDA),		(IEN  | PTU | EN  | M0)) /*I2C3_SDA*/\
+ 	MUX_VAL(CP(I2C4_SCL),		(IEN  | PTU | EN  | M0)) /*I2C4_SCL*/\
+@@ -412,4 +412,25 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(SYS_BOOT5),		(IDIS | PTD | DIS | M3)) /*DSS_DATA22*/\
+ 	MUX_VAL(CP(SYS_BOOT6),		(IDIS | PTD | DIS | M3)) /*DSS_DATA23*/ 
+ 
++#define MUX_TINCANTOOLS_ZIPPY() \
++	MUX_VAL(CP(MMC2_CLK),       (IEN  | PTU | EN  | M0)) /*MMC2_CLK*/\
++	MUX_VAL(CP(MMC2_CMD),       (IEN  | PTU | EN  | M0)) /*MMC2_CMD*/\
++	MUX_VAL(CP(MMC2_DAT0),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT0*/\
++	MUX_VAL(CP(MMC2_DAT1),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT1*/\
++	MUX_VAL(CP(MMC2_DAT2),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT2*/\
++	MUX_VAL(CP(MMC2_DAT3),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT3*/\
++	MUX_VAL(CP(MMC2_DAT4),      (IEN  | PTU | EN  | M1)) /*MMC2_DIR_DAT0*/\
++	MUX_VAL(CP(MMC2_DAT5),      (IEN  | PTU | EN  | M1)) /*MMC2_DIR_DAT1*/\
++	MUX_VAL(CP(MMC2_DAT6),      (IEN  | PTU | EN  | M1)) /*MMC2_DIR_CMD*/\
++	MUX_VAL(CP(MMC2_DAT7),      (IEN  | PTU | EN  | M1)) /*MMC2_CLKIN*/\
++	MUX_VAL(CP(MCBSP1_CLKR),    (IEN  | PTU | EN  | M1)) /*MCSPI4_CLK*/\
++	MUX_VAL(CP(MCBSP1_FSR),     (IEN  | PTU | EN  | M4)) /*GPIO_157*/\
++	MUX_VAL(CP(MCBSP1_DX),      (IEN  | PTD | EN  | M1)) /*MCSPI4_SIMO*/\
++	MUX_VAL(CP(MCBSP1_DR),      (IEN  | PTD | DIS | M1)) /*MCSPI4_SOMI*/\
++	MUX_VAL(CP(MCBSP1_FSX),     (IEN  | PTD | EN  | M1)) /*MCSPI4_CS0*/\
++	MUX_VAL(CP(MCBSP1_CLKX),    (IEN  | PTD | DIS | M4)) /*GPIO_162*/\
++	MUX_VAL(CP(MCBSP3_DX),      (IEN  | PTD | DIS | M4)) /*GPIO_140*/\
++	MUX_VAL(CP(MCBSP3_DR),      (IEN  | PTD | DIS | M4)) /*GPIO_142*/\
++	MUX_VAL(CP(MCBSP3_CLKX),    (IEN  | PTD | DIS | M4)) /*GPIO_141*/\
++
+ #endif
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-display-message-about-I2C-errors-being-e.patch b/recipes/u-boot/u-boot-git/beagleboard/0023-beagleboard-display-message-about-I2C-errors-being-e.patch
index 18eeb3d6fc..d7ac71317d 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-display-message-about-I2C-errors-being-e.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0023-beagleboard-display-message-about-I2C-errors-being-e.patch
@@ -1,7 +1,7 @@
-From 59d34641c947f3b0a0c3757ced675245ae344012 Mon Sep 17 00:00:00 2001
+From 4b07f3a9f045453e5e7b5950e721ed35d9bd308a Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Wed, 31 Mar 2010 14:24:25 +0200
-Subject: [PATCH 1/6] beagleboard: display message about I2C errors being expected when no expansion boards are present
+Subject: [PATCH 23/37] beagleboard: display message about I2C errors being expected when no expansion boards are present
 
 ---
  board/ti/beagle/beagle.c |    3 +++
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0002-beagleboard-fix-TCT-expansionboard-IDs.patch b/recipes/u-boot/u-boot-git/beagleboard/0024-beagleboard-fix-TCT-expansionboard-IDs.patch
index 0d75f3cffc..dc5e69a23e 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0002-beagleboard-fix-TCT-expansionboard-IDs.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0024-beagleboard-fix-TCT-expansionboard-IDs.patch
@@ -1,7 +1,7 @@
-From 4397cc2f9b55471b4d90e7327bf65e1a610dcabb Mon Sep 17 00:00:00 2001
+From a4fa85edf5ff6aa6a06f437acc8694dd866f6618 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Sun, 11 Apr 2010 12:14:43 +0200
-Subject: [PATCH 2/6] beagleboard: fix TCT expansionboard IDs
+Subject: [PATCH 24/37] beagleboard: fix TCT expansionboard IDs
 
 ---
  board/ti/beagle/beagle.c |    4 ++--
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0003-Add-DSS-driver-for-OMAP3.patch b/recipes/u-boot/u-boot-git/beagleboard/0025-Add-DSS-driver-for-OMAP3.patch
index 0a2a47f224..da517b254f 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0003-Add-DSS-driver-for-OMAP3.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0025-Add-DSS-driver-for-OMAP3.patch
@@ -1,7 +1,7 @@
-From fe23f2e29f4d6f4f20ed268d8060f897392a47f7 Mon Sep 17 00:00:00 2001
+From 10bffe78f0ef6cb450ecea717dce8d636982bc86 Mon Sep 17 00:00:00 2001
 From: Syed Mohammed Khasim <khasim@ti.com>
 Date: Tue, 12 Jan 2010 23:57:28 +0530
-Subject: [PATCH 3/6] Add DSS driver for OMAP3
+Subject: [PATCH 25/37] Add DSS driver for OMAP3
 
 Supports dynamic panel configuration
 Supports dynamic tv standard selection
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0004-Enable-DSS-driver-for-Beagle.patch b/recipes/u-boot/u-boot-git/beagleboard/0026-Enable-DSS-driver-for-Beagle.patch
index a391dbd9d8..7e7bea83df 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0004-Enable-DSS-driver-for-Beagle.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0026-Enable-DSS-driver-for-Beagle.patch
@@ -1,7 +1,7 @@
-From 492fac657a2e53f4714e24471a01ed0462edb8fc Mon Sep 17 00:00:00 2001
+From a8adb8e29aba9d2c83731839063f1381fce3906c Mon Sep 17 00:00:00 2001
 From: Syed Mohammed Khasim <khasim@ti.com>
 Date: Sun, 11 Apr 2010 17:44:39 +0200
-Subject: [PATCH 4/6] Enable DSS driver for Beagle
+Subject: [PATCH 26/37] Enable DSS driver for Beagle
 
 Configures DSS to display color bar on Svideo
 Configures DSS to display background color on DVID
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch b/recipes/u-boot/u-boot-git/beagleboard/0027-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch
index 020bbe15a1..90d71a8a5f 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0027-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch
@@ -1,7 +1,7 @@
-From 2a567cdc062d65e175f7bf0324d5d41d803fb2c5 Mon Sep 17 00:00:00 2001
+From 85d4ffbc3a12b28cae00fc88d4adba7df4907fe4 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 13 Apr 2010 22:04:07 +0200
-Subject: [PATCH 5/6] beagleboardXM: don't set mpurate on xM in bootargs
+Subject: [PATCH 27/37] beagleboardXM: don't set mpurate on xM in bootargs
 
 ---
  board/ti/beagle/beagle.c |    1 -
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch b/recipes/u-boot/u-boot-git/beagleboard/0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch
new file mode 100644
index 0000000000..d2c6abba75
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch
@@ -0,0 +1,112 @@
+From c18bda32fdb048ea38b7ff579f365ea8858053d7 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans@mansr.com>
+Date: Wed, 14 Apr 2010 12:08:00 +0100
+Subject: [PATCH 28/37] OMAP3: fix and clean up L2 cache enable/disable functions
+
+On OMAP34xx ES1.0, the L2 enable bit can only be set in secure mode,
+so an SMC call to the ROM monitor is required.  On later versions,
+and on newer devices, this bit is banked and we can set it directly.
+
+The code checked only the ES revision of the chip, and hence incorrectly
+used the ROM call on ES1.0 versions of other devices.
+
+This patch adds a check for chip family as well as revision, and also
+removes some code duplication between the enable and disable functions.
+
+Signed-off-by: Mans Rullgard <mans@mansr.com>
+---
+ cpu/arm_cortexa8/omap3/cache.S |   74 +++++++++++-----------------------------
+ 1 files changed, 20 insertions(+), 54 deletions(-)
+
+diff --git a/cpu/arm_cortexa8/omap3/cache.S b/cpu/arm_cortexa8/omap3/cache.S
+index 0f63815..16afb5d 100644
+--- a/cpu/arm_cortexa8/omap3/cache.S
++++ b/cpu/arm_cortexa8/omap3/cache.S
+@@ -128,64 +128,30 @@ finished_inval:
+ 
+ 	ldmfd	r13!, {r0 - r5, r7, r9 - r12, pc}
+ 
+-
+-l2_cache_enable:
+-	push	{r0, r1, r2, lr}
+-	@ ES2 onwards we can disable/enable L2 ourselves
++l2_cache_set:
++	push	{r4-r6, lr}
++	mov	r5,  r0
+ 	bl	get_cpu_rev
+-	cmp	r0, #CPU_3XX_ES20
+-	blt	l2_cache_disable_EARLIER_THAN_ES2
+-	mrc	15, 0, r3, cr1, cr0, 1
+-	orr	r3, r3, #2
+-	mcr	15, 0, r3, cr1, cr0, 1
+-	b	l2_cache_enable_END
+-l2_cache_enable_EARLIER_THAN_ES2:
+-	@ Save r0, r12 and restore them after usage
+-	mov	r3, ip
+-	str	r3, [sp, #4]
+-	mov	r3, r0
+-	@
++	mov	r4,  r0
++	bl	get_cpu_family
++	@ ES2 onwards we can disable/enable L2 ourselves
++	cmp	r0,  #CPU_OMAP34XX
++	cmpeq	r4,  #CPU_3XX_ES10
++	mrc	15, 0, r0, cr1, cr0, 1
++	bic	r0, r0, #2
++	orr	r0, r0, r5, lsl #1
++	mcreq	15, 0, r0, cr1, cr0, 1
+ 	@ GP Device ROM code API usage here
+ 	@ r12 = AUXCR Write function and r0 value
+-	@
+ 	mov	ip, #3
+-	mrc	15, 0, r0, cr1, cr0, 1
+-	orr	r0, r0, #2
+-	@ SMI instruction to call ROM Code API
+-	.word	0xe1600070
+-	mov	r0, r3
+-	mov	ip, r3
+-	str	r3, [sp, #4]
+-l2_cache_enable_END:
+-	pop	{r1, r2, r3, pc}
++	@ SMCNE instruction to call ROM Code API
++	.word	0x11600070
++	pop	{r4-r6, pc}
+ 
++l2_cache_enable:
++	mov	r0, #1
++	b	l2_cache_set
+ 
+ l2_cache_disable:
+-	push	{r0, r1, r2, lr}
+-	@ ES2 onwards we can disable/enable L2 ourselves
+-	bl	get_cpu_rev
+-	cmp	r0, #CPU_3XX_ES20
+-	blt	l2_cache_disable_EARLIER_THAN_ES2
+-	mrc	15, 0, r3, cr1, cr0, 1
+-	bic	r3, r3, #2
+-	mcr	15, 0, r3, cr1, cr0, 1
+-	b	l2_cache_disable_END
+-l2_cache_disable_EARLIER_THAN_ES2:
+-	@ Save r0, r12 and restore them after usage
+-	mov	r3, ip
+-	str	r3, [sp, #4]
+-	mov	r3, r0
+-	@
+-	@ GP Device ROM code API usage here
+-	@ r12 = AUXCR Write function and r0 value
+-	@
+-	mov	ip, #3
+-	mrc	15, 0, r0, cr1, cr0, 1
+-	bic	r0, r0, #2
+-	@ SMI instruction to call ROM Code API
+-	.word	0xe1600070
+-	mov	r0, r3
+-	mov	ip, r3
+-	str	r3, [sp, #4]
+-l2_cache_disable_END:
+-	pop	{r1, r2, r3, pc}
++	mov	r0, #0
++	b	l2_cache_set
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch b/recipes/u-boot/u-boot-git/beagleboard/0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch
new file mode 100644
index 0000000000..e1ffdca727
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch
@@ -0,0 +1,99 @@
+From 6ddb5d4e28801907af7be39e47d502fd5c8e73e1 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans@mansr.com>
+Date: Wed, 14 Apr 2010 16:49:57 +0100
+Subject: [PATCH 29/37] OMAP3: convert setup_auxcr() to pure asm
+
+This function consists entirely of inline asm statements, so writing
+it directly in a .S file is simpler. Additionally, the inline asm is
+not safe as is, since registers are not guaranteed to be preserved
+between asm() statements.
+
+Signed-off-by: Mans Rullgard <mans@mansr.com>
+---
+ cpu/arm_cortexa8/omap3/board.c |   35 -----------------------------------
+ cpu/arm_cortexa8/omap3/cache.S |   19 +++++++++++++++++++
+ 2 files changed, 19 insertions(+), 35 deletions(-)
+
+diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c
+index 0126152..7f49199 100644
+--- a/cpu/arm_cortexa8/omap3/board.c
++++ b/cpu/arm_cortexa8/omap3/board.c
+@@ -122,41 +122,6 @@ void secureworld_exit()
+ }
+ 
+ /******************************************************************************
+- * Routine: setup_auxcr()
+- * Description: Write to AuxCR desired value using SMI.
+- *              general use.
+- *****************************************************************************/
+-void setup_auxcr()
+-{
+-	unsigned long i;
+-	volatile unsigned int j;
+-	/* Save r0, r12 and restore them after usage */
+-	__asm__ __volatile__("mov %0, r12":"=r"(j));
+-	__asm__ __volatile__("mov %0, r0":"=r"(i));
+-
+-	/*
+-	 * GP Device ROM code API usage here
+-	 * r12 = AUXCR Write function and r0 value
+-	 */
+-	__asm__ __volatile__("mov r12, #0x3");
+-	__asm__ __volatile__("mrc p15, 0, r0, c1, c0, 1");
+-	/* Enabling ASA */
+-	__asm__ __volatile__("orr r0, r0, #0x10");
+-	/* Enable L1NEON */
+-	__asm__ __volatile__("orr r0, r0, #1 << 5");
+-	/* SMI instruction to call ROM Code API */
+-	__asm__ __volatile__(".word 0xE1600070");
+-	/* Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround) */
+-	__asm__ __volatile__("mov r12, #0x2");
+-	__asm__ __volatile__("mrc p15, 1, r0, c9, c0, 2");
+-	__asm__ __volatile__("orr r0, r0, #1 << 27");
+-	/* SMI instruction to call ROM Code API */
+-	__asm__ __volatile__(".word 0xE1600070");
+-	__asm__ __volatile__("mov r0, %0":"=r"(i));
+-	__asm__ __volatile__("mov r12, %0":"=r"(j));
+-}
+-
+-/******************************************************************************
+  * Routine: try_unlock_sram()
+  * Description: If chip is GP/EMU(special) type, unlock the SRAM for
+  *              general use.
+diff --git a/cpu/arm_cortexa8/omap3/cache.S b/cpu/arm_cortexa8/omap3/cache.S
+index 16afb5d..61e6946 100644
+--- a/cpu/arm_cortexa8/omap3/cache.S
++++ b/cpu/arm_cortexa8/omap3/cache.S
+@@ -43,6 +43,7 @@
+ .global invalidate_dcache
+ .global l2_cache_enable
+ .global l2_cache_disable
++.global setup_auxcr
+ 
+ /*
+  *	invalidate_dcache()
+@@ -155,3 +156,21 @@ l2_cache_enable:
+ l2_cache_disable:
+ 	mov	r0, #0
+ 	b	l2_cache_set
++
++/******************************************************************************
++ * Routine: setup_auxcr()
++ * Description: Write to AuxCR desired value using SMI.
++ *              general use.
++ *****************************************************************************/
++setup_auxcr:
++	mov	r12, #0x3
++	mrc	p15, 0, r0, c1, c0, 1
++	orr	r0, r0, #0x10			@ Enable ASA
++	orr	r0, r0, #1 << 5			@ Enable L1NEON
++	.word 0xE1600070			@ SMC
++	mov	r12, #0x2
++	mrc	p15, 1, r0, c9, c0, 2
++	@ Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround)
++	orr	r0, r0, #1 << 27
++	.word 0xE1600070			@ SMC
++	bx	lr
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch b/recipes/u-boot/u-boot-git/beagleboard/0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch
new file mode 100644
index 0000000000..af669ec07e
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch
@@ -0,0 +1,46 @@
+From 4e7bc59affc2a71de40259330e27e62181993968 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans@mansr.com>
+Date: Wed, 14 Apr 2010 17:10:28 +0100
+Subject: [PATCH 30/37] OMAP3: apply Cortex-A8 errata workarounds only on affected revisions
+
+The workarounds for errata 621766 and 725233 should only be applied
+on affected Cortex-A8 revisions.  Recent chips use r3px cores where
+these have been fixed.
+
+Signed-off-by: Mans Rullgard <mans@mansr.com>
+---
+ cpu/arm_cortexa8/omap3/cache.S |   13 ++++++++++---
+ 1 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/cpu/arm_cortexa8/omap3/cache.S b/cpu/arm_cortexa8/omap3/cache.S
+index 61e6946..932e4eb 100644
+--- a/cpu/arm_cortexa8/omap3/cache.S
++++ b/cpu/arm_cortexa8/omap3/cache.S
+@@ -163,14 +163,21 @@ l2_cache_disable:
+  *              general use.
+  *****************************************************************************/
+ setup_auxcr:
++	mrc	p15, 0, r0, c0, c0, 0		@ read main ID register
++	and	r2, r0, #0x00f00000		@ variant
++	and	r3, r0, #0x0000000f		@ revision
++	orr	r1, r3, r2, lsr #20-4		@ combine variant and revision
+ 	mov	r12, #0x3
+ 	mrc	p15, 0, r0, c1, c0, 1
+ 	orr	r0, r0, #0x10			@ Enable ASA
+-	orr	r0, r0, #1 << 5			@ Enable L1NEON
++	@ Enable L1NEON on pre-r2p1 (erratum 621766 workaround)
++	cmp	r1, #0x21
++	orrlt	r0, r0, #1 << 5
+ 	.word 0xE1600070			@ SMC
+ 	mov	r12, #0x2
+ 	mrc	p15, 1, r0, c9, c0, 2
+-	@ Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround)
+-	orr	r0, r0, #1 << 27
++	@ Set PLD_FWD bit in L2AUXCR on pre-r2p1 (erratum 725233 workaround)
++	cmp	r1, #0x21
++	orrlt	r0, r0, #1 << 27
+ 	.word 0xE1600070			@ SMC
+ 	bx	lr
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch b/recipes/u-boot/u-boot-git/beagleboard/0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch
new file mode 100644
index 0000000000..9ea19123fc
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch
@@ -0,0 +1,61 @@
+From bbfb38ccd1e2bb19a1eb698bd37cd1ab50c87b37 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 23 Apr 2010 10:50:43 +0200
+Subject: [PATCH 31/37] OMAP3: beagle: add more expansionboards, based on http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs
+
+---
+ board/ti/beagle/beagle.c |    8 ++++++++
+ board/ti/beagle/beagle.h |    6 ++++++
+ 2 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index 974a72c..0544178 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -55,11 +55,15 @@ static struct {
+ #define TINCANTOOLS_VENDORID	0x0100
+ #define GUMSTIX_VENDORID		0x0200
+ #define SPECIALCOMP_VENDORID	0x0300
++#define HYR_VENDORID			0x0400
++#define MENTOREL_VENDORID		0x0500
++#define KBADC_VENDORID			0x0600
+ 
+ #define TINCANTOOLS_ZIPPY		0x01000100
+ #define TINCANTOOLS_ZIPPY2		0x02000100
+ #define TINCANTOOLS_TRAINER		0x04000100
+ #define TINCANTOOLS_SHOWDOG		0x03000100
++#define KBADC_BEAGLEFPGA		0x01000600
+ 
+ #define BEAGLE_NO_EEPROM		0xffffffff
+ 
+@@ -184,6 +188,10 @@ int misc_init_r(void)
+ 			/* Place holder for DSS2 definition for showdog lcd */
+ 			setenv("defaultdisplay", "showdoglcd");
+ 			break;
++		case KBADC_BEAGLEFPGA:
++			printf("Recognized KBADC Beagle FPGA board\n");
++			MUX_KBADC_BEAGLEFPGA();
++			break;
+ 		case BEAGLE_NO_EEPROM:
+ 			printf("No EEPROM on expansion board\n");
+ 			break;
+diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
+index 69f9398..90a0ebf 100644
+--- a/board/ti/beagle/beagle.h
++++ b/board/ti/beagle/beagle.h
+@@ -435,6 +435,12 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(MCBSP3_DR),      (IEN  | PTD | DIS | M4)) /*GPIO_142*/\
+ 	MUX_VAL(CP(MCBSP3_CLKX),    (IEN  | PTD | DIS | M4)) /*GPIO_141*/\
+ 
++#define MUX_KBADC_BEAGLEFPGA() \
++	MUX_VAL(CP(MCBSP1_CLKR),    (IEN  | PTU | DIS | M1)) /*MCSPI4_CLK*/\
++	MUX_VAL(CP(MCBSP1_DX),      (IDIS | PTU | DIS | M1)) /*MCSPI4_SIMO*/\
++	MUX_VAL(CP(MCBSP1_DR),      (IEN  | PTU | EN  | M1)) /*MCSPI4_SOMI*/\
++	MUX_VAL(CP(MCBSP1_FSX),     (IDIS | PTU | DIS | M1)) /*MCSPI4_CS0*/\
++
+ /*
+  * Display Configuration
+  */
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch b/recipes/u-boot/u-boot-git/beagleboard/0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch
new file mode 100644
index 0000000000..c99d3d982e
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch
@@ -0,0 +1,29 @@
+From ae05ca488390671516bd4ed021eb43901fee740f Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 27 Apr 2010 13:44:16 +0200
+Subject: [PATCH 32/37] OMAP3: beagle: set mpurate to 600 for revB and revC1-3
+
+---
+ board/ti/beagle/beagle.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index 0544178..6778499 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -211,10 +211,12 @@ int misc_init_r(void)
+ 	switch (beagle_revision) {
+ 	case REVISION_AXBX:
+ 		printf("Beagle Rev Ax/Bx\n");
++		setenv("mpurate", "600");
+ 		break;
+ 	case REVISION_CX:
+ 		printf("Beagle Rev C1/C2/C3\n");
+ 		MUX_BEAGLE_C();
++		setenv("mpurate", "600");
+ 		break;
+ 	case REVISION_C4:
+ 		printf("Beagle Rev C4\n");
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch b/recipes/u-boot/u-boot-git/beagleboard/0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch
new file mode 100644
index 0000000000..a7b2c0172d
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch
@@ -0,0 +1,25 @@
+From caf18bc716d77d7bf2c75bc58ffbcbf09ae79f2b Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 27 Apr 2010 13:45:28 +0200
+Subject: [PATCH 33/37] OMAP3: beagle: prettify expansionboard message a bit
+
+---
+ board/ti/beagle/beagle.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index 6778499..58fb7c3 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -165,7 +165,7 @@ int misc_init_r(void)
+ 
+ 	beagle_identify();
+ 
+-	printf("\nProbing for expansion boards, if none are connected you'll see a harmless I2C error.\n");
++	printf("\nProbing for expansion boards, if none are connected you'll see a harmless I2C error.\n\n");
+ 
+ 	switch (get_expansion_id()) {
+ 		case TINCANTOOLS_ZIPPY:
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch b/recipes/u-boot/u-boot-git/beagleboard/0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch
new file mode 100644
index 0000000000..5caa6f0f1f
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch
@@ -0,0 +1,53 @@
+From 8580a3eafe3351e3c0f1ca3d0bc959bbeec40e28 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 27 Apr 2010 18:25:57 +0200
+Subject: [PATCH 34/37] OMAP3: beagle: add pinmux for Tincantools Trainer expansionboard
+
+---
+ board/ti/beagle/beagle.c |    2 ++
+ board/ti/beagle/beagle.h |   16 +++++++++++++++-
+ 2 files changed, 17 insertions(+), 1 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index 58fb7c3..39c53f2 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -181,6 +181,8 @@ int misc_init_r(void)
+ 		case TINCANTOOLS_TRAINER:
+ 			printf("Recognized Tincantools Trainer expansion board (rev %d %s)\n",
+ 				expansion_config.revision, expansion_config.fab_revision);
++			MUX_TINCANTOOLS_ZIPPY();
++			MUX_TINCANTOOLS_TRAINER();
+ 			break;
+ 		case TINCANTOOLS_SHOWDOG:
+ 			printf("Recognized Tincantools Showdow expansion board (rev %d %s)\n",
+diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
+index 90a0ebf..7774855 100644
+--- a/board/ti/beagle/beagle.h
++++ b/board/ti/beagle/beagle.h
+@@ -433,7 +433,21 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(MCBSP1_CLKX),    (IEN  | PTD | DIS | M4)) /*GPIO_162*/\
+ 	MUX_VAL(CP(MCBSP3_DX),      (IEN  | PTD | DIS | M4)) /*GPIO_140*/\
+ 	MUX_VAL(CP(MCBSP3_DR),      (IEN  | PTD | DIS | M4)) /*GPIO_142*/\
+-	MUX_VAL(CP(MCBSP3_CLKX),    (IEN  | PTD | DIS | M4)) /*GPIO_141*/\
++	MUX_VAL(CP(MCBSP3_CLKX),    (IEN  | PTD | DIS | M4)) /*GPIO_141*/
++
++#define MUX_TINCANTOOLS_TRAINER() \
++	MUX_VAL(CP(MMC2_CLK),       (IEN  | PTU | EN  | M4)) /*GPIO_130*/\
++	MUX_VAL(CP(MMC2_CMD),       (IEN  | PTU | EN  | M4)) /*GPIO_131*/\
++	MUX_VAL(CP(MMC2_DAT0),      (IEN  | PTU | EN  | M4)) /*GPIO_132*/\
++	MUX_VAL(CP(MMC2_DAT1),      (IEN  | PTU | EN  | M4)) /*GPIO_133*/\
++	MUX_VAL(CP(MMC2_DAT2),      (IEN  | PTU | EN  | M4)) /*GPIO_134*/\
++	MUX_VAL(CP(MMC2_DAT3),      (IEN  | PTU | EN  | M4)) /*GPIO_135*/\
++	MUX_VAL(CP(MMC2_DAT4),      (IEN  | PTU | EN  | M4)) /*GPIO_136*/\
++	MUX_VAL(CP(MMC2_DAT5),      (IEN  | PTU | EN  | M4)) /*GPIO_137*/\
++	MUX_VAL(CP(MMC2_DAT6),      (IEN  | PTU | EN  | M4)) /*GPIO_138*/\
++	MUX_VAL(CP(MMC2_DAT7),      (IEN  | PTU | EN  | M4)) /*GPIO_139*/\
++	MUX_VAL(CP(MCBSP3_DX),      (IEN  | PTU | EN  | M4)) /*GPIO_140*/\
++	MUX_VAL(CP(MCBSP3_CLKX),    (IEN  | PTU | EN  | M4)) /*GPIO_141*/
+ 
+ #define MUX_KBADC_BEAGLEFPGA() \
+ 	MUX_VAL(CP(MCBSP1_CLKR),    (IEN  | PTU | DIS | M1)) /*MCSPI4_CLK*/\
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch b/recipes/u-boot/u-boot-git/beagleboard/0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch
new file mode 100644
index 0000000000..5c02fcb6c1
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch
@@ -0,0 +1,24 @@
+From c45e93aef4d54b262f0d8e1ecf6b111f5e1c2a4c Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 30 Apr 2010 13:25:41 +0200
+Subject: [PATCH 35/37] OMAP3: Beagle: set mpurate to 1000 for xM
+
+---
+ board/ti/beagle/beagle.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index 39c53f2..9300984 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -238,6 +238,7 @@ int misc_init_r(void)
+ 					TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
+ 					TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
+ 					TWL4030_PM_RECEIVER_DEV_GRP_P1);
++		setenv("mpurate", "1000");
+ 		break;
+ 	default:
+ 		printf("Beagle unknown 0x%02x\n", beagle_revision);
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch b/recipes/u-boot/u-boot-git/beagleboard/0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch
new file mode 100644
index 0000000000..5f89f1ae42
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch
@@ -0,0 +1,34 @@
+From 39f15722db5595411ec085e36b7fd7657415a554 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 30 Apr 2010 13:26:01 +0200
+Subject: [PATCH 36/37] OMAP3: Beagle: decrease bootdelay to 3, use VGA for default resolution
+
+---
+ include/configs/omap3_beagle.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index 7bcbe9b..93a6a5a 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -178,7 +178,7 @@
+ 							/* partition */
+ 
+ /* Environment information */
+-#define CONFIG_BOOTDELAY		10
++#define CONFIG_BOOTDELAY		3
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"loadaddr=0x82000000\0" \
+@@ -186,7 +186,7 @@
+ 	"console=ttyS2,115200n8\0" \
+ 	"mpurate=500\0" \
+ 	"vram=12M\0" \
+-	"dvimode=1024x768MR-16@60\0" \
++	"dvimode=640x480MR-16@60\0" \
+ 	"defaultdisplay=dvi\0" \
+ 	"mmcroot=/dev/mmcblk0p2 rw\0" \
+ 	"mmcrootfstype=ext3 rootwait\0" \
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch b/recipes/u-boot/u-boot-git/beagleboard/0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch
new file mode 100644
index 0000000000..2ee844b9ff
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch
@@ -0,0 +1,87 @@
+From 8ad472139f7b8b7c59c0192f3e2f50a20beadf59 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Mon, 3 May 2010 10:17:41 +0200
+Subject: [PATCH 37/37] OMAP3: beagle: pass expansionboard name in bootargs
+
+This makes it possible to do in-kernel fixups for expansionboards like reclaiming GPIOs
+---
+ board/ti/beagle/beagle.c       |    7 +++++++
+ include/configs/omap3_beagle.h |    3 +++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index 9300984..556e995 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -172,33 +172,40 @@ int misc_init_r(void)
+ 			printf("Recognized Tincantools Zippy expansion board (rev %d %s)\n",
+ 				expansion_config.revision, expansion_config.fab_revision);
+ 			MUX_TINCANTOOLS_ZIPPY();
++			setenv("buddy", "zippy");
+ 			break;
+ 		case TINCANTOOLS_ZIPPY2:
+ 			printf("Recognized Tincantools Zippy2 expansion board (rev %d %s)\n",
+ 				expansion_config.revision, expansion_config.fab_revision);
+ 			MUX_TINCANTOOLS_ZIPPY();
++			setenv("buddy", "zippy2");
+ 			break;
+ 		case TINCANTOOLS_TRAINER:
+ 			printf("Recognized Tincantools Trainer expansion board (rev %d %s)\n",
+ 				expansion_config.revision, expansion_config.fab_revision);
+ 			MUX_TINCANTOOLS_ZIPPY();
+ 			MUX_TINCANTOOLS_TRAINER();
++			setenv("buddy", "trainer");
+ 			break;
+ 		case TINCANTOOLS_SHOWDOG:
+ 			printf("Recognized Tincantools Showdow expansion board (rev %d %s)\n",
+ 				expansion_config.revision, expansion_config.fab_revision);
+ 			/* Place holder for DSS2 definition for showdog lcd */
+ 			setenv("defaultdisplay", "showdoglcd");
++			setenv("buddy", "showdog");
+ 			break;
+ 		case KBADC_BEAGLEFPGA:
+ 			printf("Recognized KBADC Beagle FPGA board\n");
+ 			MUX_KBADC_BEAGLEFPGA();
++			setenv("buddy", "beaglefpga");
+ 			break;
+ 		case BEAGLE_NO_EEPROM:
+ 			printf("No EEPROM on expansion board\n");
++			setenv("buddy", "none");
+ 			break;
+ 		default:
+ 			printf("Unrecognized expansion board: %x\n", expansion_config.device_vendor);
++			setenv("buddy", "unknown");
+ 	}
+ 
+ 	if (expansion_config.content == 1)
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index 93a6a5a..affabf1 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -185,6 +185,7 @@
+ 	"usbtty=cdc_acm\0" \
+ 	"console=ttyS2,115200n8\0" \
+ 	"mpurate=500\0" \
++	"buddy=none\0" \
+ 	"vram=12M\0" \
+ 	"dvimode=640x480MR-16@60\0" \
+ 	"defaultdisplay=dvi\0" \
+@@ -194,6 +195,7 @@
+ 	"nandrootfstype=jffs2\0" \
+ 	"mmcargs=setenv bootargs console=${console} " \
+ 		"mpurate=${mpurate} " \
++		"buddy=${buddy} "\
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+ 		"omapdss.def_disp=${defaultdisplay} " \
+@@ -201,6 +203,7 @@
+ 		"rootfstype=${mmcrootfstype}\0" \
+ 	"nandargs=setenv bootargs console=${console} " \
+ 		"mpurate=${mpurate} " \
++		"buddy=${buddy} "\
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+ 		"omapdss.def_disp=${defaultdisplay} " \
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-mkimage-native-1.3.2/fix-arm920t-eabi.patch b/recipes/u-boot/u-boot-mkimage-1.3.2/fix-arm920t-eabi.patch
index 69cb75891d..69cb75891d 100644
--- a/recipes/u-boot/u-boot-mkimage-native-1.3.2/fix-arm920t-eabi.patch
+++ b/recipes/u-boot/u-boot-mkimage-1.3.2/fix-arm920t-eabi.patch
diff --git a/recipes/u-boot/u-boot-mkimage-native_1.3.2.bb b/recipes/u-boot/u-boot-mkimage-native_1.3.2.bb
deleted file mode 100644
index cf135a5231..0000000000
--- a/recipes/u-boot/u-boot-mkimage-native_1.3.2.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "U-boot bootloader mkimage tool"
-LICENSE = "GPLv2"
-SECTION = "bootloader"
-
-SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-           file://fix-arm920t-eabi.patch;patch=1"
-
-S = "${WORKDIR}/u-boot-${PV}"
-
-inherit native
-
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-
-do_compile () {
- 	oe_runmake smdk2410_config
-        oe_runmake tools STRIP='/bin/true'
-}
-
-do_stage () {
-        install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
-        ln -sf ${STAGING_BINDIR_NATIVE}/uboot-mkimage ${STAGING_BINDIR_NATIVE}/mkimage
-}
-
-SRC_URI[md5sum] = "78b1c2722d3907b5fae2cd219dbaf927"
-SRC_URI[sha256sum] = "8ab07cd758a1775642629e624f70e376fa8e84a2f879dee4544158d9c90cde2a"
diff --git a/recipes/u-boot/u-boot-mkimage-openmoko-native_oe.bb b/recipes/u-boot/u-boot-mkimage-openmoko-native_oe.bb
index 4005c376d8..0256ef318c 100644
--- a/recipes/u-boot/u-boot-mkimage-openmoko-native_oe.bb
+++ b/recipes/u-boot/u-boot-mkimage-openmoko-native_oe.bb
@@ -6,59 +6,59 @@ PV = "1.2.0+git9912121f7ed804ea58fd62f3f230b5dcfc357d88svn2238"
 PR = "r1"
 
 SRC_URI = "git://git.denx.de/u-boot.git;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \
-file://uboot-machtypes.patch;patch=1 \
-file://ext2load_hex.patch;patch=1 \
-file://uboot-s3c2410-warnings-fix.patch;patch=1 \
-file://uboot-strtoul.patch;patch=1 \
-file://uboot-cramfs_but_no_jffs2.patch;patch=1 \
-file://nand-read_write_oob.patch;patch=1 \
-file://uboot-arm920t-gd_in_irq.patch;patch=1 \
-file://uboot-arm920_s3c2410_irq_demux.patch;patch=1 \
-file://uboot-s3c2410-nand.patch;patch=1 \
-file://uboot-cmd_s3c2410.patch;patch=1 \
-file://uboot-s3c2410-mmc.patch;patch=1 \
-file://env_nand_oob.patch;patch=1 \
-file://dynenv-harden.patch;patch=1 \
-file://uboot-s3c2410_fb.patch;patch=1 \
-file://uboot-20061030-qt2410.patch;patch=1 \
-file://uboot-20061030-neo1973.patch;patch=1 \
-file://uboot-s3c2410-misccr-definitions.patch;patch=1 \
-file://boot-from-ram-reloc.patch;patch=1 \
-file://boot-from-ram-and-nand.patch;patch=1 \
-file://wakeup-reason-nand-only.patch;patch=1 \
-file://uboot-neo1973-resume.patch;patch=1 \
-file://nand-dynamic_partitions.patch;patch=1 \
-file://uboot-s3c2410-norelocate_irqvec_cpy.patch;patch=1 \
-file://uboot-usbtty-acm.patch;patch=1 \
-file://uboot-s3c2410_udc.patch;patch=1 \
-file://bbt-create-optional.patch;patch=1 \
-file://nand-createbbt.patch;patch=1 \
-file://dontask.patch;patch=1 \
-file://nand-badisbad.patch;patch=1 \
-file://uboot-bbt-quiet.patch;patch=1 \
-file://raise-limits.patch;patch=1 \
-file://splashimage-command.patch;patch=1 \
-file://cmd-unzip.patch;patch=1 \
-file://enable-splash-bmp.patch;patch=1 \
-file://preboot-override.patch;patch=1 \
-file://lowlevel_foo.patch;patch=1 \
-file://default-env.patch;patch=1 \
-file://console-ansi.patch;patch=1 \
-file://boot-menu.patch;patch=1 \
-file://uboot-dfu.patch;patch=1 \
-file://uboot-neo1973-defaultenv.patch;patch=1 \
-file://uboot-nand-markbad-reallybad.patch;patch=1 \
-file://usbdcore-multiple_configs.patch;patch=1 \
-file://neo1973-chargefast.patch;patch=1 \
-file://uboot-s3c2440.patch;patch=1 \
-file://uboot-smdk2440.patch;patch=1 \
-file://uboot-hxd8.patch;patch=1 \
-file://uboot-license.patch;patch=1 \
-file://uboot-gta02.patch;patch=1 \
-file://uboot-s3c2443.patch;patch=1 \
-file://uboot-smdk2443.patch;patch=1 \
-file://unbusy-i2c.patch;patch=1 \
-file://makefile-no-dirafter.patch;patch=1 \
+file://uboot-machtypes.patch \
+file://ext2load_hex.patch \
+file://uboot-s3c2410-warnings-fix.patch \
+file://uboot-strtoul.patch \
+file://uboot-cramfs_but_no_jffs2.patch \
+file://nand-read_write_oob.patch \
+file://uboot-arm920t-gd_in_irq.patch \
+file://uboot-arm920_s3c2410_irq_demux.patch \
+file://uboot-s3c2410-nand.patch \
+file://uboot-cmd_s3c2410.patch \
+file://uboot-s3c2410-mmc.patch \
+file://env_nand_oob.patch \
+file://dynenv-harden.patch \
+file://uboot-s3c2410_fb.patch \
+file://uboot-20061030-qt2410.patch \
+file://uboot-20061030-neo1973.patch \
+file://uboot-s3c2410-misccr-definitions.patch \
+file://boot-from-ram-reloc.patch \
+file://boot-from-ram-and-nand.patch \
+file://wakeup-reason-nand-only.patch \
+file://uboot-neo1973-resume.patch \
+file://nand-dynamic_partitions.patch \
+file://uboot-s3c2410-norelocate_irqvec_cpy.patch \
+file://uboot-usbtty-acm.patch \
+file://uboot-s3c2410_udc.patch \
+file://bbt-create-optional.patch \
+file://nand-createbbt.patch \
+file://dontask.patch \
+file://nand-badisbad.patch \
+file://uboot-bbt-quiet.patch \
+file://raise-limits.patch \
+file://splashimage-command.patch \
+file://cmd-unzip.patch \
+file://enable-splash-bmp.patch \
+file://preboot-override.patch \
+file://lowlevel_foo.patch \
+file://default-env.patch \
+file://console-ansi.patch \
+file://boot-menu.patch \
+file://uboot-dfu.patch \
+file://uboot-neo1973-defaultenv.patch \
+file://uboot-nand-markbad-reallybad.patch \
+file://usbdcore-multiple_configs.patch \
+file://neo1973-chargefast.patch \
+file://uboot-s3c2440.patch \
+file://uboot-smdk2440.patch \
+file://uboot-hxd8.patch \
+file://uboot-license.patch \
+file://uboot-gta02.patch \
+file://uboot-s3c2443.patch \
+file://uboot-smdk2443.patch \
+file://unbusy-i2c.patch \
+file://makefile-no-dirafter.patch \
 "
 
 PROVIDES = ""
diff --git a/recipes/u-boot/u-boot-mkimage_1.3.2.bb b/recipes/u-boot/u-boot-mkimage_1.3.2.bb
new file mode 100644
index 0000000000..d2bf7e5926
--- /dev/null
+++ b/recipes/u-boot/u-boot-mkimage_1.3.2.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "U-boot bootloader mkimage tool"
+LICENSE = "GPLv2"
+SECTION = "bootloader"
+
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
+           file://fix-arm920t-eabi.patch"
+
+PR = "r3"
+
+S = "${WORKDIR}/u-boot-${PV}"
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_compile () {
+	oe_runmake smdk2410_config
+	sed -i -e 's:img2srec$(SFX) mkimage$(SFX) envcrc$(SFX) ubsha1$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX):mkimage$(SFX):' tools/Makefile
+	oe_runmake HOSTCC="${CC}" LOGO_H="" tools STRIP='/bin/true'
+}
+
+do_install () {
+	install -d ${D}${bindir}
+	install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage
+	ln -sf uboot-mkimage ${D}${bindir}/mkimage
+}
+
+NATIVE_INSTALL_WORKS = "1"
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "78b1c2722d3907b5fae2cd219dbaf927"
+SRC_URI[sha256sum] = "8ab07cd758a1775642629e624f70e376fa8e84a2f879dee4544158d9c90cde2a"
diff --git a/recipes/u-boot/u-boot-omap2430sdp_1.1.4.bb b/recipes/u-boot/u-boot-omap2430sdp_1.1.4.bb
index d29fbbe98c..2114a83ace 100644
--- a/recipes/u-boot/u-boot-omap2430sdp_1.1.4.bb
+++ b/recipes/u-boot/u-boot-omap2430sdp_1.1.4.bb
@@ -3,7 +3,7 @@ PR ="r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://linux.omap.com/pub/bootloader/2430sdp/source/u-boot-SEP1106.tar.gz \
-           file://u-boot-makefile-3.81.patch;patch=1 \
+           file://u-boot-makefile-3.81.patch \
           "
 
 S = "${WORKDIR}/u-boot"
diff --git a/recipes/u-boot/u-boot-omap3_git.bb b/recipes/u-boot/u-boot-omap3_git.bb
index 27c8314655..b8f95f5744 100644
--- a/recipes/u-boot/u-boot-omap3_git.bb
+++ b/recipes/u-boot/u-boot-omap3_git.bb
@@ -4,9 +4,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${M
 
 SRCREV = "08d7fdcce5dde5c2dc968fac5b2facf17cbabb5"
 
-PV = "2008.10+${PR}+gitr${SRCPV}"
-PR ="r0"
-PE = "2"
+PV = "2008.10+${PR}+gitr${SRCREV}"
+PR ="r2"
+PE = "1"
 
 SRC_URI = "git://www.sakoman.net/git/u-boot-omap3.git;branch=common;protocol=git \
           "
diff --git a/recipes/u-boot/u-boot-omap3beagleboard_1.1.4.bb b/recipes/u-boot/u-boot-omap3beagleboard_1.1.4.bb
index 9817f0c4e1..d88d3d226a 100644
--- a/recipes/u-boot/u-boot-omap3beagleboard_1.1.4.bb
+++ b/recipes/u-boot/u-boot-omap3beagleboard_1.1.4.bb
@@ -3,11 +3,11 @@ PR ="r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://www.sakoman.net/omap3/u-boot.tar.gz \
-           file://name.patch;patch=1 \
-           file://armv7-a.patch;patch=1 \
-           file://500mhz-l2enable.patch;patch=1 \
-           file://disable-tone-logo.patch;patch=1 \
-           file://env.patch;patch=1 \
+           file://name.patch \
+           file://armv7-a.patch \
+           file://500mhz-l2enable.patch \
+           file://disable-tone-logo.patch \
+           file://env.patch \
           "
 
 S = "${WORKDIR}/u-boot"
diff --git a/recipes/u-boot/u-boot-omap3pandora_git.bb b/recipes/u-boot/u-boot-omap3pandora_git.bb
index 19d402e47c..773eb18ea2 100644
--- a/recipes/u-boot/u-boot-omap3pandora_git.bb
+++ b/recipes/u-boot/u-boot-omap3pandora_git.bb
@@ -7,9 +7,9 @@ SRCREV = "c71d8dbe09d69feda7e57745bd3909727d3cc33f"
 
 PROVIDES = "u-boot"
 
-PV = "pandora+${PR}+gitr${SRCPV}"
+PV = "pandora+${PR}+gitr${SRCREV}"
 PR ="r4"
-PE = "2"
+PE = "1"
 
 SRC_URI = "git://git.openpandora.org/pandora-u-boot.git;branch=master;protocol=git \
 "
diff --git a/recipes/u-boot/u-boot-openmoko_git.bb b/recipes/u-boot/u-boot-openmoko_git.bb
index 18b3811433..bd7b6714ae 100644
--- a/recipes/u-boot/u-boot-openmoko_git.bb
+++ b/recipes/u-boot/u-boot-openmoko_git.bb
@@ -3,6 +3,6 @@ require u-boot-openmoko.inc
 SRCREV = "650149a53dbdd48bf6dfef90930c8ab182adb512"
 SRC_URI = "\
   git://git.openmoko.org/git/u-boot.git;protocol=git;branch=stable \
-  file://makefile-no-dirafter.patch;patch=1 \
+  file://makefile-no-dirafter.patch \
 "
 S = "${WORKDIR}/git"
diff --git a/recipes/u-boot/u-boot-utils_1.2.0.bb b/recipes/u-boot/u-boot-utils_1.2.0.bb
index 828c43b00a..7cf77b8416 100644
--- a/recipes/u-boot/u-boot-utils_1.2.0.bb
+++ b/recipes/u-boot/u-boot-utils_1.2.0.bb
@@ -6,9 +6,9 @@ DEPENDS = "mtd-utils"
 PR = "r9"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-        file://fw_env.c.patch;patch=1 \
-        file://tools-Makefile.patch;patch=1 \
-        file://env-Makefile.patch;patch=1 \
+        file://fw_env.c.patch \
+        file://tools-Makefile.patch \
+        file://env-Makefile.patch \
         file://fw_env.config"
 
 S = "${WORKDIR}/u-boot-${PV}"
diff --git a/recipes/u-boot/u-boot_1.1.2.bb b/recipes/u-boot/u-boot_1.1.2.bb
index 2cfebe2eef..127be68f90 100644
--- a/recipes/u-boot/u-boot_1.1.2.bb
+++ b/recipes/u-boot/u-boot_1.1.2.bb
@@ -2,17 +2,17 @@ PR = "r3"
 require u-boot.inc
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-	   file://arm_flags.patch;patch=1 "
+	   file://arm_flags.patch "
 # Override whole URI fr Neon since Neon patch is incompatible with arm_flags patch.
 SRC_URI_bd-neon = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-                   file://u-boot-1.1.2-neon.patch;patch=1"
-SRC_URI_append_vibren = "ftp://bec-systems.com/pub/pxa255_idp/u-boot/uboot_pxa255-idp_2005-03-23.patch;patch=1"
-SRC_URI_append_mnci   = "file://mnci.patch;patch=1 \
-                         file://mnci-jffs2.patch;patch=1 \
-                         file://cmd-arm-linux.patch;patch=1 \
-                         file://command-names.patch;patch=1"
-
-SRC_URI_append_magicbox  = "file://u-boot-emetec.patch;patch=1 "
+                   file://u-boot-1.1.2-neon.patch"
+SRC_URI_append_vibren = "ftp://bec-systems.com/pub/pxa255_idp/u-boot/uboot_pxa255-idp_2005-03-23.patch"
+SRC_URI_append_mnci   = "file://mnci.patch \
+                         file://mnci-jffs2.patch \
+                         file://cmd-arm-linux.patch \
+                         file://command-names.patch"
+
+SRC_URI_append_magicbox  = "file://u-boot-emetec.patch "
 
 
 # TODO: SRC_URI_append_rt3000
diff --git a/recipes/u-boot/u-boot_1.1.4.bb b/recipes/u-boot/u-boot_1.1.4.bb
index 3bfddd43ae..78d607b469 100644
--- a/recipes/u-boot/u-boot_1.1.4.bb
+++ b/recipes/u-boot/u-boot_1.1.4.bb
@@ -5,46 +5,46 @@ PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2;name=archive \
-          file://u-boot-make381-fix.patch;patch=1"
+          file://u-boot-make381-fix.patch"
 
 SRC_URI_append_gumstix = "\
-	file://u-boot-autoscript.patch;patch=1 \
-	file://u-boot-base.patch;patch=1 \
-	file://u-boot-crc-warning-not-so-scary.patch;patch=1 \
-	file://u-boot-flash-protect-fixup.patch;patch=1 \
-	file://u-boot-fw_printenv.patch;patch=1 \
-	file://u-boot-install.patch;patch=1 \
-	file://u-boot-jerase-cmd.patch;patch=1 \
-	file://u-boot-jffs2-new-nodetypes.patch;patch=1 \
-	file://u-boot-loadb-safe.patch;patch=1 \
-	file://u-boot-mmc-init.patch;patch=1 \
-	file://u-boot-mmcclk-alternate.patch;patch=1 \
-	file://u-boot-smc91x-multi.patch;patch=1 \
-	file://u-boot-zzz-osx.patch;patch=1"
+	file://u-boot-autoscript.patch \
+	file://u-boot-base.patch \
+	file://u-boot-crc-warning-not-so-scary.patch \
+	file://u-boot-flash-protect-fixup.patch \
+	file://u-boot-fw_printenv.patch \
+	file://u-boot-install.patch \
+	file://u-boot-jerase-cmd.patch \
+	file://u-boot-jffs2-new-nodetypes.patch \
+	file://u-boot-loadb-safe.patch \
+	file://u-boot-mmc-init.patch \
+	file://u-boot-mmcclk-alternate.patch \
+	file://u-boot-smc91x-multi.patch \
+	file://u-boot-zzz-osx.patch"
 
 SRC_URI_append_amsdelta = "\
-	http://the.earth.li/pub/e3/u-boot-amsdelta-20060519.diff;patch=1;name=amspatch"
+	http://the.earth.li/pub/e3/u-boot-amsdelta-20060519.diff;name=amspatch"
 
 SRC_URI_append_dht-walnut= "\
-        file://u-boot-dht-walnut-df2.patch;patch=1"
+        file://u-boot-dht-walnut-df2.patch"
 
 SRC_URI_append_avr32= "\
-	http://avr32linux.org/twiki/pub/Main/UbootPatches/u-boot-1.1.4-avr1.patch.bz2;patch=1;name=avrpatch \
-	file://avr32-boards-fix-flash-read.patch;patch=1 \
-	file://lcdc-driver-for-avr32.patch;patch=1 \
-	file://spi-driver-for-avr32.patch;patch=1 \
-	file://at32ap-add-framebuffer-address.patch;patch=1 \
-	file://at32ap-add-spi-initcalls.patch;patch=1 \
-	file://at32ap-add-system-manager-header-file.patch;patch=1 \
-	file://ap7000-add-spi-device-and-lcdc-base-address.patch;patch=1 \
-	file://libavr32-add-spi-and-lcd-board-support.patch;patch=1 \
-	file://cmd-bmp-add-gzip-compressed-bmp.patch;patch=1 \
-	file://lcd-add-24-bpp-support-and-atmel-lcdc-support.patch;patch=1 \
-	file://atstk1000-spi-support.patch;patch=1 \
-	file://atstk1000-ltv350qv-display-support.patch;patch=1 \
-	file://atstk1000-add-lcd-and-spi-to-config.patch;patch=1 \
-	file://at32ap-add-define-for-sdram-test.patch;patch=1 \
-	file://fix-mmc-data-timeout.patch;patch=1 \
+	http://avr32linux.org/twiki/pub/Main/UbootPatches/u-boot-1.1.4-avr1.patch.bz2;name=avrpatch \
+	file://avr32-boards-fix-flash-read.patch \
+	file://lcdc-driver-for-avr32.patch \
+	file://spi-driver-for-avr32.patch \
+	file://at32ap-add-framebuffer-address.patch \
+	file://at32ap-add-spi-initcalls.patch \
+	file://at32ap-add-system-manager-header-file.patch \
+	file://ap7000-add-spi-device-and-lcdc-base-address.patch \
+	file://libavr32-add-spi-and-lcd-board-support.patch \
+	file://cmd-bmp-add-gzip-compressed-bmp.patch \
+	file://lcd-add-24-bpp-support-and-atmel-lcdc-support.patch \
+	file://atstk1000-spi-support.patch \
+	file://atstk1000-ltv350qv-display-support.patch \
+	file://atstk1000-add-lcd-and-spi-to-config.patch \
+	file://at32ap-add-define-for-sdram-test.patch \
+	file://fix-mmc-data-timeout.patch \
 "
 
 EXTRA_OEMAKE_gumstix = "CROSS_COMPILE=${TARGET_PREFIX} GUMSTIX_400MHZ=${GUMSTIX_400MHZ}"
diff --git a/recipes/u-boot/u-boot_1.1.6.bb b/recipes/u-boot/u-boot_1.1.6.bb
index f7f62ecdd2..7342c973aa 100644
--- a/recipes/u-boot/u-boot_1.1.6.bb
+++ b/recipes/u-boot/u-boot_1.1.6.bb
@@ -3,19 +3,19 @@ require u-boot.inc
 PR = "r3"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2 \
-           file://devkit-idp.patch;patch=1 \
+           file://devkit-idp.patch \
 "
 
-SRC_URI_append_sarge-at91 = " file://sarge-uboot.patch;patch=1"
+SRC_URI_append_sarge-at91 = " file://sarge-uboot.patch"
 
-SRC_URI_append_mpc8323e-rdb = "  file://u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch;patch=1 \
-                                 file://u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch;patch=1 \
-                                 file://u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch;patch=1 \
-                                 file://u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch;patch=1 \
-                                 file://u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch;patch=1 \
-                                 file://u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch;patch=1 \
-                                 file://u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch;patch=1 \
-                                 file://u-boot-1.1.6-83xx-optimizations.patch;patch=1 \ 
+SRC_URI_append_mpc8323e-rdb = "  file://u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch \
+                                 file://u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch \
+                                 file://u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch \
+                                 file://u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch \
+                                 file://u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch \
+                                 file://u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch \
+                                 file://u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch \
+                                 file://u-boot-1.1.6-83xx-optimizations.patch \ 
 "
 
 
diff --git a/recipes/u-boot/u-boot_1.2.0.bb b/recipes/u-boot/u-boot_1.2.0.bb
index e4b0efc5a7..b05c18114a 100644
--- a/recipes/u-boot/u-boot_1.2.0.bb
+++ b/recipes/u-boot/u-boot_1.2.0.bb
@@ -4,17 +4,17 @@ PR = "r3"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.2.0.tar.bz2 \
 	"
-SRC_URI_append_turbostation = "file://qnap.diff;patch=1"
+SRC_URI_append_turbostation = "file://qnap.diff"
 
-SRC_URI_append_lsppchg = "file://u-boot-kurobox.patch;patch=1 \
-			  file://u-boot-kurobox-fdt.patch;patch=1 \
+SRC_URI_append_lsppchg = "file://u-boot-kurobox.patch \
+			  file://u-boot-kurobox-fdt.patch \
 			  file://defconfig_lsppchg"
 
-SRC_URI_append_lsppchd = "file://u-boot-kurobox.patch;patch=1 \ 
-                          file://u-boot-kurobox-fdt.patch;patch=1 \ 
+SRC_URI_append_lsppchd = "file://u-boot-kurobox.patch \ 
+                          file://u-boot-kurobox-fdt.patch \ 
                           file://defconfig_lsppchg"
 
-SRC_URI_append_dm355-leopard = " file://dm355-leopard.diff;patch=1"
+SRC_URI_append_dm355-leopard = " file://dm355-leopard.diff"
 
 do_compile_prepend_lsppchg () {
         cp ${WORKDIR}/defconfig_lsppchg ${S}/include/configs/linkstation.h
@@ -25,20 +25,20 @@ do_compile_prepend_lsppchd () {
 }
 
 SRC_URI_append_mpc8315e-rdb = " \
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-pre.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-soc.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-PHY.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-platform.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-nand-controller.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-nand-boot.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-serdes.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-pcie.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-fsl-1.3.0-MPC83xx-CW.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-silicon-1.1-1.2.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-extra-config-for-333-266MHz.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-resume-deep-sleep.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-improve-ddr-performance.patch;patch=1 \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-fix-PCI-IO-base.patch;patch=1 \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-pre.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-soc.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-PHY.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-platform.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-nand-controller.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-nand-boot.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-serdes.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-pcie.patch \ 
+http://www.bitshrine.org/gpp/u-boot-fsl-1.3.0-MPC83xx-CW.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-silicon-1.1-1.2.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-extra-config-for-333-266MHz.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-resume-deep-sleep.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-improve-ddr-performance.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-fix-PCI-IO-base.patch \ 
 "
 
 
diff --git a/recipes/u-boot/u-boot_1.3.1.bb b/recipes/u-boot/u-boot_1.3.1.bb
index 3c6d642af8..930e96fb07 100644
--- a/recipes/u-boot/u-boot_1.3.1.bb
+++ b/recipes/u-boot/u-boot_1.3.1.bb
@@ -5,9 +5,9 @@ DEFAULT_PREFERENCE = "-1"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-           file://mpc8313e-rdb-autoboot.patch;patch=1 \
-           file://mpc8313e-rdb-mtdparts.patch;patch=1 \
-           file://mpc8313e-rdb-nand.patch;patch=1"
+           file://mpc8313e-rdb-autoboot.patch \
+           file://mpc8313e-rdb-mtdparts.patch \
+           file://mpc8313e-rdb-nand.patch"
 
 
 SRC_URI[md5sum] = "8fbd29c7e70c524a42d18b9c3f3a4aa1"
diff --git a/recipes/u-boot/u-boot_1.3.2.bb b/recipes/u-boot/u-boot_1.3.2.bb
index 7a2f28c52c..dc3122dfb1 100644
--- a/recipes/u-boot/u-boot_1.3.2.bb
+++ b/recipes/u-boot/u-boot_1.3.2.bb
@@ -2,41 +2,43 @@ require u-boot.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
 
 SRC_URI_append_mpc8313e-rdb = "\
-           file://mpc8313e-rdb-autoboot.patch;patch=1 \
-           file://mpc8313e-rdb-nand.patch;patch=1 \
-           file://mpc8313e-rdb-mtdparts.patch;patch=1 \
-           file://mpc8313e-rdb-eeprom.patch;patch=1 \
-           file://mpc8313e-rdb-lm75.patch;patch=1 \
-           file://u-boot-fsl-1.3.0-mpc8313erdb-vsc7385-support.patch;patch=1 \
-           file://u-boot-fsl-1.3.0-mpc8313erdb-fix-vitesse-7385-firmware.patch;patch=1 \
-           file://u-boot-fsl-1.3.0-mpc8313erdb-performance-tuning-for-TSEC.patch;patch=1 \
+           file://mpc8313e-rdb-autoboot.patch \
+           file://mpc8313e-rdb-nand.patch \
+           file://mpc8313e-rdb-mtdparts.patch \
+           file://mpc8313e-rdb-eeprom.patch \
+           file://mpc8313e-rdb-lm75.patch \
+           file://u-boot-fsl-1.3.0-mpc8313erdb-vsc7385-support.patch \
+           file://u-boot-fsl-1.3.0-mpc8313erdb-fix-vitesse-7385-firmware.patch \
+           file://u-boot-fsl-1.3.0-mpc8313erdb-performance-tuning-for-TSEC.patch \
+           file://gcc4-weak-inline.patch \
+           file://linker-script-sort-rodata-sections.patch \
            "
 
 SRC_URI_append_boc01 = "\
-           file://mpc8313e-rdb-autoboot.patch;patch=1 \
-           file://mpc8313e-rdb-nand.patch;patch=1 \
-           file://mpc8313e-rdb-mtdparts.patch;patch=1 \
-           file://mpc8313e-rdb-eeprom.patch;patch=1 \
-           file://001-090205-SPI.patch;patch=1 \
-           file://002-081212-GPIO.patch;patch=1 \
-           file://003-081205-DTT_LM73.patch;patch=1 \
-           file://004-081205-WATCHDOG.patch;patch=1 \
-           file://006-081211-EEPROM_M24C32.patch;patch=1 \
-           file://007-090217-CAPSENSE.patch;patch=1 \
-           file://008-090107-TSEC.patch;patch=1 \
-           file://009-081212-EXIO.patch;patch=1 \
-           file://010-081212-LCD.patch;patch=1 \
-           file://011-081211-CMD_TEST.patch;patch=1 \
-           file://012-081209-BUG_SETENV.patch;patch=1 \
-           file://013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch;patch=1 \
-           file://014-081211-BOOT_RESCUE.patch;patch=1 \
-           file://015-090205-EMC.patch;patch=1 \
-           file://016-090209-PM.patch;patch=1 \
+           file://mpc8313e-rdb-autoboot.patch \
+           file://mpc8313e-rdb-nand.patch \
+           file://mpc8313e-rdb-mtdparts.patch \
+           file://mpc8313e-rdb-eeprom.patch \
+           file://001-090205-SPI.patch \
+           file://002-081212-GPIO.patch \
+           file://003-081205-DTT_LM73.patch \
+           file://004-081205-WATCHDOG.patch \
+           file://006-081211-EEPROM_M24C32.patch \
+           file://007-090217-CAPSENSE.patch \
+           file://008-090107-TSEC.patch \
+           file://009-081212-EXIO.patch \
+           file://010-081212-LCD.patch \
+           file://011-081211-CMD_TEST.patch \
+           file://012-081209-BUG_SETENV.patch \
+           file://013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch \
+           file://014-081211-BOOT_RESCUE.patch \
+           file://015-090205-EMC.patch \
+           file://016-090209-PM.patch \
            "
 
 
diff --git a/recipes/u-boot/u-boot_2009.01.bb b/recipes/u-boot/u-boot_2009.01.bb
index ca82df2d40..4e5ca483b3 100644
--- a/recipes/u-boot/u-boot_2009.01.bb
+++ b/recipes/u-boot/u-boot_2009.01.bb
@@ -19,14 +19,14 @@ PR = "r1"
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
 
 SRC_URI_append_at91sam9263ek = "\
-	   file://u-boot-2009.01-exp-002-at91sam9g20ek.patch;patch=1 \
-	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch;patch=1 \
+	   file://u-boot-2009.01-exp-002-at91sam9g20ek.patch \
+	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch \
            "
 
 SRC_URI_append_at91sam9g20ek = "\
-	   file://u-boot-2009.01-exp-002-at91sam9g20ek.patch;patch=1 \
-	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch;patch=1 \
-           file://at91sam9g20-fix-config.patch;patch=1 \
+	   file://u-boot-2009.01-exp-002-at91sam9g20ek.patch \
+	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch \
+           file://at91sam9g20-fix-config.patch \
            "
 
 
diff --git a/recipes/u-boot/u-boot_2009.03.bb b/recipes/u-boot/u-boot_2009.03.bb
index 2b65948b6c..2cbded9a3f 100644
--- a/recipes/u-boot/u-boot_2009.03.bb
+++ b/recipes/u-boot/u-boot_2009.03.bb
@@ -1,16 +1,19 @@
-PR = "r2"
+PR = "r3"
 require u-boot.inc
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_hipox = "1"
 
+DEPENDS_append_hipox = " oxnas-boot-tools oxnas-boot-tools-native "
+
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 "
 
-SRC_URI_append_hipox = "file://00-hipox.patch;patch=1 \
-	file://01-hipox-fix-gmac-reset.patch;patch=1 \
-	file://02-hipox-enable-mmu.patch;patch=1 \
-	file://03-hipox-direct-switch.patch;patch=1 \
-	file://04-hipox-env.patch;patch=1 \
+SRC_URI_append_hipox = "file://00-hipox.patch \
+	file://01-hipox-fix-gmac-reset.patch \
+	file://02-hipox-enable-mmu.patch \
+	file://03-hipox-direct-switch.patch \
+	file://04-hipox-env.patch \
+	file://10-hipox-boot-abort-key.patch \
 "
 
 TARGET_LDFLAGS = ""
@@ -24,5 +27,10 @@ do_compile () {
 	oe_runmake all
 }
 
+do_deploy_append_hipox () {
+	cat ${STAGING_DATADIR}/oxnas-boot-tools/arm/oxnasbt_header.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} > ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}.wrapped
+	oxnasbt_update_header ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}.wrapped
+}
+
 SRC_URI[md5sum] = "285e2184d2efef50e0fe43b71d2a7b11"
 SRC_URI[sha256sum] = "a2889bee9c45575b284564dbc27cf3dc6cb9833d4ff643976a1b3dba2d763f86"
diff --git a/recipes/u-boot/u-boot_2009.08.bb b/recipes/u-boot/u-boot_2009.08.bb
index f5277a5576..32037f2e9e 100644
--- a/recipes/u-boot/u-boot_2009.08.bb
+++ b/recipes/u-boot/u-boot_2009.08.bb
@@ -9,8 +9,8 @@ DEFAULT_PREFERENCE_igep0020 = "1"
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 "
 
 SRC_URI_append_igep0020 = " \
-	file://update-mach-types.patch;patch=1 \
-	file://add-board-support-for-IGEP-v2-series-rev-B.patch;patch=1 \
+	file://update-mach-types.patch \
+	file://add-board-support-for-IGEP-v2-series-rev-B.patch \
 "
 
 TARGET_LDFLAGS = ""
diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index e2a3c16d89..8dca7cfd53 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -1,5 +1,5 @@
 require u-boot.inc
-PR ="r46"
+PR ="r49"
 
 FILESPATHPKG =. "u-boot-git:"
 
@@ -14,93 +14,124 @@ SRCREV_palmpre = "6b8edfde22acc574b5532e9f086e6a7287a9bc78"
 SRCREV_cm-t35 = "3c014f1586d5bfe30dca7549396915c83f31cd30"
 SRCREV_mpc8641-hpcn = "f20393c5e787b3776c179d20f82a86bda124d651"
 SRCREV_p2020ds = "f20393c5e787b3776c179d20f82a86bda124d651"
-SRC_URI_append_afeb9260 = " file://AFEB9260-network-fix.patch;patch=1"
-SRC_URI_append_afeb9260-180 = " file://AFEB9260-network-fix.patch;patch=1"
-SRC_URI_append_cm-t35 = "file://cm-t35/cm-t35.patch;patch=1"
-
-SRC_URI_beagleboard = "git://www.sakoman.com/git/u-boot.git;branch=omap3-v2010.3;protocol=git \
-                       file://0001-beagleboard-display-message-about-I2C-errors-being-e.patch;patch=1 \
-                       file://0002-beagleboard-fix-TCT-expansionboard-IDs.patch;patch=1 \
-                       file://0003-Add-DSS-driver-for-OMAP3.patch;patch=1 \
-                       file://0004-Enable-DSS-driver-for-Beagle.patch;patch=1 \
-                       file://0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch;patch=1 \
-                       file://0006-OMAP3-remove-ES1-cache-workaround-it-falsely-trigger.patch;patch=1 \
+SRC_URI_append_afeb9260 = " file://AFEB9260-network-fix.patch"
+SRC_URI_append_afeb9260-180 = " file://AFEB9260-network-fix.patch"
+SRC_URI_append_cm-t35 = "file://cm-t35/cm-t35.patch"
+
+SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \
+                       file://0001-OMAP3-enable-i2c-bus-switching-for-Beagle-and-Overo.patch \
+                       file://0002-OMAP3-add-board-revision-detection-for-Overo.patch \
+                       file://0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch \
+                       file://0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch \
+                       file://0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch \
+                       file://0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch \
+                       file://0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch \
+                       file://0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch \
+                       file://0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch \
+                       file://0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch \
+                       file://0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch \
+                       file://0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch \
+                       file://0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch \
+                       file://0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch \
+                       file://0015-OMAP3-mem.c-enhance-the-RAM-test.patch \
+                       file://0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch \
+                       file://0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch \
+                       file://0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch \
+                       file://0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch \
+                       file://0020-OMAP3-beagle-add-support-for-Beagle-xM.patch \
+                       file://0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch \
+                       file://0022-OMAP3-beagle-implement-expansionboard-detection-base.patch \
+                       file://0023-beagleboard-display-message-about-I2C-errors-being-e.patch \
+                       file://0024-beagleboard-fix-TCT-expansionboard-IDs.patch \
+                       file://0025-Add-DSS-driver-for-OMAP3.patch \
+                       file://0026-Enable-DSS-driver-for-Beagle.patch \
+                       file://0027-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch \
+                       file://0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch \
+                       file://0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch \
+                       file://0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch \
+                       file://0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch \
+                       file://0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch \
+                       file://0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch \
+                       file://0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch \
+                       file://0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch \
+                       file://0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch \
+                       file://0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch \
                        file://fw_env.config \
 "
-SRCREV_beagleboard = "946351081bd14e8bf5816fc38b82e004a0e6b4fe"
-PV_beagleboard = "2010.03-rc1+${PR}+gitr${SRCPV}"
+SRCREV_beagleboard = "ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55"
+PV_beagleboard = "2010.03+${PR}+gitr${SRCREV}"
 
 SRCREV_calamari = "533cf3a024947aaf74c16573a6d951cd0c3d0a7d"
 
-PV_calamari = "2009.11+${PR}+gitr${SRCPV}"
+PV_calamari = "2009.11+${PR}+gitr${SRCREV}"
 SRC_URI_calamari = " \
         git://git.denx.de/u-boot-mpc85xx.git;protocol=git \
-	file://0002-cmd_itest.c-fix-pointer-dereferencing.patch;patch=1 \
-	file://0001-cmd_i2c.c-reduced-subaddress-length-to-3-bytes.patch;patch=1 \
-	file://0002-cmd_bootm.c-made-subcommand-array-static.patch;patch=1 \
-	file://0003-cmd_i2c.c-reworked-subcommand-handling.patch;patch=1 \
-	file://0004-cmd_i2c.c-sorted-commands-alphabetically.patch;patch=1 \
-	file://0005-cmd_i2c.c-added-i2c-read-to-memory-function.patch;patch=1 \
-	file://0007-cmd_setexpr-allow-memory-addresses-and-env-vars-in-e.patch;patch=1 \
+	file://0002-cmd_itest.c-fix-pointer-dereferencing.patch \
+	file://0001-cmd_i2c.c-reduced-subaddress-length-to-3-bytes.patch \
+	file://0002-cmd_bootm.c-made-subcommand-array-static.patch \
+	file://0003-cmd_i2c.c-reworked-subcommand-handling.patch \
+	file://0004-cmd_i2c.c-sorted-commands-alphabetically.patch \
+	file://0005-cmd_i2c.c-added-i2c-read-to-memory-function.patch \
+	file://0007-cmd_setexpr-allow-memory-addresses-and-env-vars-in-e.patch \
         "
 
 UBOOT_MACHINE_calamari = "MPC8536DS_config"
 
 SRC_URI_omap3-touchbook = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev;protocol=git \
                  file://fw_env.config \
-                 file://dss2.patch;patch=1 \
-                 file://600mhz.patch;patch=1 \
-                 file://new-pinmux.patch;patch=1 \
-                 file://spi3.patch;patch=1 \
-                 file://spi4.patch;patch=1 \
-                 file://headphone.patch;patch=1 \
-                 file://power.patch;patch=1 \
-                 file://ai-logo.patch;patch=1 \
-                 file://mmcinit.patch;patch=1 \
-                 file://touchbook-config.patch;patch=1 \
+                 file://dss2.patch \
+                 file://600mhz.patch \
+                 file://new-pinmux.patch \
+                 file://spi3.patch \
+                 file://spi4.patch \
+                 file://headphone.patch \
+                 file://power.patch \
+                 file://ai-logo.patch \
+                 file://mmcinit.patch \
+                 file://touchbook-config.patch \
 "
 SRCREV_omap3-touchbook = "d363f9cb0918a1b6b92e2e20d01543d0c4f53274"
-PV_omap3-touchbook = "2009.05+${PR}+gitr${SRCPV}"
+PV_omap3-touchbook = "2009.05+${PR}+gitr${SRCREV}"
 
 
 SRC_URI_omap3evm = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev;protocol=git"
 SRCREV_omap3evm = "2dea1db2a3b7c12ed70bbf8ee50755089c5e5170"
-PV_omap3evm = "2009.03+${PR}+gitr${SRCPV}"
+PV_omap3evm = "2009.03+${PR}+gitr${SRCREV}"
 
 SRC_URI_dm3730-am3715-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git"
 # This tag is v2009.11_OMAPPSP_03.00.00.05
 SRCREV_dm3730-am3715-evm = "9df15c53c9a9bc1ec9c68c33821c50dc26797d6c"
-PV_dm3730-am3715-evm = "2009.11+${PR}+gitr{SRCPV}"
+PV_dm3730-am3715-evm = "2009.11+${PR}+gitr${SRCREV}"
 
 SRCREV_am3517-evm = "e60beb13cf0"
 SRC_URI_append_am3517-evm = " \
-file://omap3evm/0001-Changes-for-making-a-NAND-build.patch;patch=1 \
-file://omap3evm/0002-Fix-for-NFS-boot-for-OMAP3-EVM.patch;patch=1 \
-file://omap3evm/0003-OMAP3-timer-handling-to-1ms-tick-and-CONFIG_SYS_HZ-t.patch;patch=1 \
-file://omap3evm/0004-Reverse-patch-for-NFS-boot-to-fix-comments-provided.patch;patch=1 \
-file://omap3evm/0005-SMC911x-driver-fixed-for-NFS-boot.patch;patch=1 \
-file://omap3evm/0006-Added-OMAP3517-3505-support.patch;patch=1 \
-file://omap3evm/0007-OMAP3517TEB-validated-on-OMAP3517TEB-board.patch;patch=1 \
-file://omap3evm/0008-OMAP3517PRE-ALPHA-validated-on-OMAP3517PRE_ALPHA-bo.patch;patch=1 \
-file://omap3evm/0009-OMAP3517PRE-ALPHA-DDR-size-issue-fixed.patch;patch=1 \
-file://omap3evm/0010-OMAP3517PRE-ALPHA-Mux-configuration-for-MMC-CD-and.patch;patch=1 \
-file://omap3evm/0011-Ethernet-driver-functional-no-need-for-time-delay.patch;patch=1 \
-file://omap3evm/0012-EMAC-driver-Implement-GPIO-driven-PHY-reset.patch;patch=1 \
-file://omap3evm/0013-Cleaned-up-during-EVM-hang-issue.patch;patch=1 \
-file://omap3evm/0014-EMAC-driver-cleanup-removed-debug-prints.patch;patch=1 \
-file://omap3evm/0015-EMAC-driver-Check-for-link-status-in-packet-send-lo.patch;patch=1 \
-file://omap3evm/0016-Config-option-and-name-changed-to-omap3517_evm.patch;patch=1 \
+file://omap3evm/0001-Changes-for-making-a-NAND-build.patch \
+file://omap3evm/0002-Fix-for-NFS-boot-for-OMAP3-EVM.patch \
+file://omap3evm/0003-OMAP3-timer-handling-to-1ms-tick-and-CONFIG_SYS_HZ-t.patch \
+file://omap3evm/0004-Reverse-patch-for-NFS-boot-to-fix-comments-provided.patch \
+file://omap3evm/0005-SMC911x-driver-fixed-for-NFS-boot.patch \
+file://omap3evm/0006-Added-OMAP3517-3505-support.patch \
+file://omap3evm/0007-OMAP3517TEB-validated-on-OMAP3517TEB-board.patch \
+file://omap3evm/0008-OMAP3517PRE-ALPHA-validated-on-OMAP3517PRE_ALPHA-bo.patch \
+file://omap3evm/0009-OMAP3517PRE-ALPHA-DDR-size-issue-fixed.patch \
+file://omap3evm/0010-OMAP3517PRE-ALPHA-Mux-configuration-for-MMC-CD-and.patch \
+file://omap3evm/0011-Ethernet-driver-functional-no-need-for-time-delay.patch \
+file://omap3evm/0012-EMAC-driver-Implement-GPIO-driven-PHY-reset.patch \
+file://omap3evm/0013-Cleaned-up-during-EVM-hang-issue.patch \
+file://omap3evm/0014-EMAC-driver-cleanup-removed-debug-prints.patch \
+file://omap3evm/0015-EMAC-driver-Check-for-link-status-in-packet-send-lo.patch \
+file://omap3evm/0016-Config-option-and-name-changed-to-omap3517_evm.patch \
 "
-PV_am3517-evm = "2009.03+${PR}+gitr${SRCPV}"
+PV_am3517-evm = "2009.03+${PR}+gitr${SRCREV}"
 
 SRC_URI_omapzoom = "git://www.sakoman.net/git/u-boot-omap3.git;branch=omap3-dev;protocol=git"
 SRCREV_omapzoom = "d691b424f1f5bf7eea3a4131dfc578d272e8f335"
-PV_omapzoom = "2009.01+${PR}+gitr${SRCPV}"
+PV_omapzoom = "2009.01+${PR}+gitr${SRCREV}"
 
 SRC_URI_omapzoom2 = "git://dev.omapzoom.org/pub/scm/bootloader/u-boot.git;branch=master;protocol=git \
-                     file://0001-OMAP3-set-L1NEON-bit-in-aux-control-register.patch;patch=1"
+                     file://0001-OMAP3-set-L1NEON-bit-in-aux-control-register.patch"
 SRCREV_omapzoom2 = "78e778e0ea884306841c6499851a1e35177d81d0"
-PV_omapzoom2 = "1.1.4+${PR}+gitr${SRCPV}"
+PV_omapzoom2 = "1.1.4+${PR}+gitr${SRCREV}"
 PE_omapzoom2 = "1"
 
 do_compile_omapzoom2 () {
@@ -114,7 +145,7 @@ do_compile_omapzoom2 () {
 
 SRC_URI_omapzoom36x = "git://dev.omapzoom.org/pub/scm/bootloader/u-boot.git;branch=master;protocol=git"
 SRCREV_omapzoom36x = "ab45d2a787a9674bed30542139175d8e090e0749"
-PV_omapzoom36x = "1.1.4+${PR}+gitr{SRCPV}"
+PV_omapzoom36x = "1.1.4+${PR}+gitr${SRCREV}"
 PE_omapzoom36x = "1"
 
 do_compile_omapzoom36x () {
@@ -127,57 +158,57 @@ do_compile_omapzoom36x () {
 }
 
 SRC_URI_overo = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev;protocol=git \
-                 file://fw-env.patch;patch=1 \
-                 file://dss2.patch;patch=1 \
+                 file://fw-env.patch \
+                 file://dss2.patch \
 "
 SRCREV_overo = "2dea1db2a3b7c12ed70bbf8ee50755089c5e5170"
-PV_overo = "2009.03+${PR}+gitr${SRCPV}"
+PV_overo = "2009.03+${PR}+gitr${SRCREV}"
 
 # DaVinci dm355-evm/dm365-evm/dm6446-evm/dm6467-evm/dm6467t-evm - PSP 3.1.0/3.2.0 (build 35)
 
 SRC_URI_dm355-evm    = "git://arago-project.org/git/projects/u-boot-davinci.git;protocol=git;branch=u-boot-davinci-2009.06"
 SRCREV_dm355-evm     = "ea7387c9511ac92a46d3d147adffe36f868820e4"
-PV_dm355-evm         = "2009.05+2009.06-rc0+${PR}+gitr{SRCPV}"
+PV_dm355-evm         = "2009.05+2009.06-rc0+${PR}+gitr${SRCREV}"
 PE_dm355-evm         = "1"
 
 SRC_URI_dm365-evm    = "git://arago-project.org/git/projects/u-boot-davinci.git;protocol=git;branch=u-boot-davinci-2009.06"
 SRCREV_dm365-evm     = "ea7387c9511ac92a46d3d147adffe36f868820e4"
-PV_dm365-evm         = "2009.05+2009.06-rc0+${PR}+gitr{SRCPV}"
+PV_dm365-evm         = "2009.05+2009.06-rc0+${PR}+gitr${SRCREV}"
 PE_dm365-evm         = "1"
 
 SRC_URI_dm6446-evm   = "git://arago-project.org/git/projects/u-boot-davinci.git;protocol=git;branch=u-boot-davinci-2009.06"
 SRCREV_dm6446-evm    = "ea7387c9511ac92a46d3d147adffe36f868820e4"
-PV_dm6446-evm        = "2009.05+2009.06-rc0+${PR}+gitr{SRCPV}"
+PV_dm6446-evm        = "2009.05+2009.06-rc0+${PR}+gitr${SRCREV}"
 PE_dm6446-evm        = "1"
 
 SRC_URI_dm6467-evm   = "git://arago-project.org/git/projects/u-boot-dm646x.git;protocol=git"
 SRCREV_dm6467-evm    = "98b31e3aae3e3fb772f8d06c18ccdd6265aa0d38"
-PV_dm6467-evm        = "2009.08+${PR}+gitr{SRCPV}"
+PV_dm6467-evm        = "2009.08+${PR}+gitr${SRCREV}"
 
 SRC_URI_dm6467t-evm  = "git://arago-project.org/git/projects/u-boot-dm646x.git;protocol=git"
 SRCREV_dm6467t-evm   = "98b31e3aae3e3fb772f8d06c18ccdd6265aa0d38"
-PV_dm6467t-evm       = "2009.08+${PR}+gitr{SRCPV}"
+PV_dm6467t-evm       = "2009.08+${PR}+gitr${SRCREV}"
 
 # OMAPL1 da380-omapl137/da850-omapl138-evm - PSP 3.20.0.11
 
 SRC_URI_da830-omapl137-evm = "git://arago-project.org/git/projects/u-boot-omapl1.git;protocol=git"
 SRCREV_da830-omapl137-evm  = "5f16b8551b125f16cd8d58f278cb25b94272fd9f"
-PV_da830-omapl137-evm      = "2009.11+${PR}+gitr{SRCPV}"
+PV_da830-omapl137-evm      = "2009.11+${PR}+gitr${SRCREV}"
 
 SRC_URI_da850-omapl138-evm = "git://arago-project.org/git/projects/u-boot-omapl1.git;protocol=git"
 SRCREV_da850-omapl138-evm  = "5f16b8551b125f16cd8d58f278cb25b94272fd9f"
-PV_da850-omapl138-evm      = "2009.11+${PR}+gitr{SRCPV}"
+PV_da850-omapl138-evm      = "2009.11+${PR}+gitr${SRCREV}"
 
 # hawkboard - master branch (hawk still .07beta)
 
 SRC_URI_hawkboard          = "git://arago-project.org/git/people/sekhar/u-boot-omapl1.git;protocol=git;branch=master"
 SRCREV_hawkboard           = "0d291f2f255e6d66a78b3dc2445362a96ae39a57"
-PV_hawkboard               = "2009.08+gitr${SRCPV}"
+PV_hawkboard               = "2009.08+gitr${SRCREV}"
 
 SRC_URI_dm355-leopard = "git://www.denx.de/git/u-boot-arm.git;protocol=git;branch=master \
 "
 SRCREV_dm355-leopard = "d650da2dd4af99967aabc43cccbd8f160eb4cea6"
-PV_dm355-leopard = "2009.05+2010.03-rc1+gitr{SRCPV}"
+PV_dm355-leopard = "2009.05+2010.03-rc1+gitr${SRCREV}"
 
 SRC_URI_neuros-osd2 = "git://github.com/neuros/u-boot.git;protocol=git;branch=neuros"
 SRCREV_neuros-osd2 = "8de979d346624c0e4cfe2e5c0f08ce20ca4b5d14"
@@ -193,18 +224,18 @@ SRCREV_mini2440 = "3516c35fb777ca959e5cadf2156a792ca10e1cff"
 SRC_URI_micro2440 = "git://repo.or.cz/u-boot-openmoko/mini2440.git;protocol=git;branch=dev-mini2440-stable"
 SRCREV_micro2440 = "3516c35fb777ca959e5cadf2156a792ca10e1cff"
 
-SRC_URI_neuros-osd2 += "file://Makefile-fix.patch;patch=1"
-SRC_URI_append_akita = "file://pdaXrom-u-boot.patch;patch=1 \
-                        file://uboot-eabi-fix-HACK2.patch;patch=1 \
-                        file://akita-standard-partitioning.patch;patch=1 \
+SRC_URI_neuros-osd2 += "file://Makefile-fix.patch"
+SRC_URI_append_akita = "file://pdaXrom-u-boot.patch \
+                        file://uboot-eabi-fix-HACK2.patch \
+                        file://akita-standard-partitioning.patch \
                        "
-SRC_URI_append_spitz = "file://pdaXrom-u-boot.patch;patch=1 \
-                        file://uboot-eabi-fix-HACK2.patch;patch=1 \
-                        file://spitz-standard-partitioning.patch;patch=1 \
+SRC_URI_append_spitz = "file://pdaXrom-u-boot.patch \
+                        file://uboot-eabi-fix-HACK2.patch \
+                        file://spitz-standard-partitioning.patch \
                        "
-SRC_URI_append_c7x0 = "file://pdaXrom-u-boot.patch;patch=1 \
-                       file://uboot-eabi-fix-HACK2.patch;patch=1 \
-                       file://corgi-standard-partitioning.patch;patch=1 \
+SRC_URI_append_c7x0 = "file://pdaXrom-u-boot.patch \
+                       file://uboot-eabi-fix-HACK2.patch \
+                       file://corgi-standard-partitioning.patch \
                        "
 SRC_URI_sheevaplug = "git://git.denx.de/u-boot-marvell.git;protocol=git;branch=testing"
 SRCREV_sheevaplug = "119b9942da2e450d4e525fc004208dd7f7d062e0"
diff --git a/recipes/u2nl/u2nl_1.3.bb b/recipes/u2nl/u2nl_1.3.bb
index 240c5485d9..8390e384e5 100644
--- a/recipes/u2nl/u2nl_1.3.bb
+++ b/recipes/u2nl/u2nl_1.3.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 
 SRC_URI = "http://www.reitwiessner.de/programs/u2nl-${PV}.tar.gz \
-	   file://buildsystem.patch;patch=1"
+	   file://buildsystem.patch"
 S = "${WORKDIR}/u2nl-${PV}"
 
 do_install () {
diff --git a/recipes/uae/e-uae_0.8.28.bb b/recipes/uae/e-uae_0.8.28.bb
index 3de6a8628a..cb662e3f8e 100644
--- a/recipes/uae/e-uae_0.8.28.bb
+++ b/recipes/uae/e-uae_0.8.28.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://rcdrummond.net/uae/e-uae-${PV}/e-uae-${PV}.tar.bz2 \
-           file://configure.patch;patch=1"
+           file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/ubahnnav/ubahnnav_0.4.1.bb b/recipes/ubahnnav/ubahnnav_0.4.1.bb
index 07f6fca948..72f882b5f2 100644
--- a/recipes/ubahnnav/ubahnnav_0.4.1.bb
+++ b/recipes/ubahnnav/ubahnnav_0.4.1.bb
@@ -13,7 +13,7 @@ APPDESKTOP = "${S}/src/ubahnnav"
 PR = "r0"
 
 SRC_URI = "http://ubahnstation.net/source/ubahnnav-${PV}.tar.gz \
-	   file://qmake.patch;patch=1"
+	   file://qmake.patch"
 S = "${WORKDIR}/ubahnnav-${PV}"
 
 inherit opie
diff --git a/recipes/uclibc++/uclibc++_0.1.9.bb b/recipes/uclibc++/uclibc++_0.1.9.bb
index f2530a4a15..1222a4aadd 100644
--- a/recipes/uclibc++/uclibc++_0.1.9.bb
+++ b/recipes/uclibc++/uclibc++_0.1.9.bb
@@ -8,7 +8,7 @@ SECTION = "libs"
 PR = "r1"
 
 SRC_URI = "http://cxx.uclibc.org/src/uClibc++-${PV}.tbz2 \
-	   file://nobash.patch;patch=1 \
+	   file://nobash.patch \
 	   file://defconfig"
 S = "${WORKDIR}/uClibc++"
 
diff --git a/recipes/uclibc/uclibc-git/arm/uClibc.config b/recipes/uclibc/uclibc-git/arm/uClibc.config
deleted file mode 100644
index 34b0f2137e..0000000000
--- a/recipes/uclibc/uclibc-git/arm/uClibc.config
+++ /dev/null
@@ -1,198 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Wed Sep 20 13:47:37 2006
-#
-# TARGET_alpha is not set
-TARGET_arm=y
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="arm"
-FORCE_OPTIONS_FOR_ARCH=y
-CONFIG_ARM_EABI=y
-CONFIG_GENERIC_ARM=y
-# CONFIG_ARM610 is not set
-# CONFIG_ARM710 is not set
-# CONFIG_ARM7TDMI is not set
-# CONFIG_ARM720T is not set
-# CONFIG_ARM920T is not set
-# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
-# CONFIG_ARM1136JF_S is not set
-# CONFIG_ARM_SA110 is not set
-# CONFIG_ARM_SA1100 is not set
-# CONFIG_ARM_XSCALE is not set
-ARCH_ANY_ENDIAN=y
-ARCH_LITTLE_ENDIAN=y
-# ARCH_WANTS_BIG_ENDIAN is not set
-ARCH_WANTS_LITTLE_ENDIAN=y
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-# UCLIBC_HAS_FPU is not set
-UCLIBC_HAS_SOFT_FLOAT=y
-DO_C99_MATH=y
-KERNEL_SOURCE="/data/build/koen/OE/build/tmp/angstrom/staging/h2200-linux-uclibcgnueabi/kernel"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-LDSO_PRELOAD_FILE_SUPPORT=y
-LDSO_BASE_FILENAME="ld.so"
-UCLIBC_STATIC_LDCONFIG=y
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-# LINUXTHREADS_OLD is not set
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-# UCLIBC_SUSV3_LEGACY is not set
-UCLIBC_SUSV4_LEGACY=y
-UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
-# UCLIBC_USE_NETLINK is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-UCLIBC_HAS_LOCALE=y
-UCLIBC_PREGENERATED_LOCALE_DATA=y
-UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y
-# UCLIBC_HAS_XLOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-UCLIBC_HAS_SYS_ERRLIST=y
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-UCLIBC_HAS_SYS_SIGLIST=y
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-EXTRA_WARNINGS=y
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-git/arm/uClibc.machine b/recipes/uclibc/uclibc-git/arm/uClibc.machine
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/recipes/uclibc/uclibc-git/arm/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/recipes/uclibc/uclibc-git/armeb/uClibc.config b/recipes/uclibc/uclibc-git/armeb/uClibc.config
deleted file mode 100644
index 5f9fe16afb..0000000000
--- a/recipes/uclibc/uclibc-git/armeb/uClibc.config
+++ /dev/null
@@ -1,182 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-# TARGET_alpha is not set
-TARGET_arm=y
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="arm"
-ARCH_SUPPORTS_BIG_ENDIAN=y
-ARCH_SUPPORTS_LITTLE_ENDIAN=y
-FORCE_OPTIONS_FOR_ARCH=y
-CONFIG_GENERIC_ARM=y
-# CONFIG_ARM610 is not set
-# CONFIG_ARM710 is not set
-# CONFIG_ARM720T is not set
-# CONFIG_ARM920T is not set
-# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
-# CONFIG_ARM1136JF_S is not set
-# CONFIG_ARM_SA110 is not set
-# CONFIG_ARM_SA1100 is not set
-# CONFIG_ARM_XSCALE is not set
-# ARCH_LITTLE_ENDIAN is not set
-ARCH_BIG_ENDIAN=y
-# ARCH_HAS_NO_MMU is not set
-ARCH_HAS_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# UCLIBC_HAS_FENV is not set
-KERNEL_SOURCE="<path/to/kernel/sources>"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
-# UCLIBC_USE_NETLINK is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-WARNINGS="-Wall"
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-git/armeb/uClibc.machine b/recipes/uclibc/uclibc-git/armeb/uClibc.machine
new file mode 100644
index 0000000000..7a6ad8b5d0
--- /dev/null
+++ b/recipes/uclibc/uclibc-git/armeb/uClibc.machine
@@ -0,0 +1,53 @@
+#
+# Automatically generated make config: don't edit
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+ARCH_SUPPORTS_BIG_ENDIAN=y
+ARCH_SUPPORTS_LITTLE_ENDIAN=y
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_GENERIC_ARM=y
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# ARCH_LITTLE_ENDIAN is not set
+ARCH_BIG_ENDIAN=y
+# ARCH_HAS_NO_MMU is not set
+ARCH_HAS_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+# UCLIBC_HAS_FENV is not set
+KERNEL_HEADERS="<path/to/kernel/headers>" 
+HAVE_DOT_CONFIG=y
diff --git a/recipes/uclibc/uclibc-nptl/uClibc.machine.armv5te b/recipes/uclibc/uclibc-git/armv5te/uClibc.machine
index ec0385bc0f..ec0385bc0f 100644
--- a/recipes/uclibc/uclibc-nptl/uClibc.machine.armv5te
+++ b/recipes/uclibc/uclibc-git/armv5te/uClibc.machine
diff --git a/recipes/uclibc/uclibc-git/dht-walnut/uClibc.config b/recipes/uclibc/uclibc-git/dht-walnut/uClibc.config
deleted file mode 100644
index 6e606f6be3..0000000000
--- a/recipes/uclibc/uclibc-git/dht-walnut/uClibc.config
+++ /dev/null
@@ -1,181 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Wed Dec 20 21:41:18 2006
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-TARGET_powerpc=y
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="powerpc"
-FORCE_OPTIONS_FOR_ARCH=y
-ARCH_BIG_ENDIAN=y
-
-#
-# Using Big Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-# UCLIBC_HAS_FPU is not set
-UCLIBC_HAS_SOFT_FLOAT=y
-DO_C99_MATH=y
-KERNEL_SOURCE="/usr/src/oplinux/oplinux-0.2/dht/build/tmp/cross/powerpc-linux-uclibc"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-UCLIBC_SUSV3_LEGACY=y
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-# UCLIBC_HAS_GNU_GLOB is not set
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-# UCLIBC_BUILD_NOW is not set
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-git/dht-walnut/uClibc.machine b/recipes/uclibc/uclibc-git/dht-walnut/uClibc.machine
new file mode 100644
index 0000000000..b956eb19a0
--- /dev/null
+++ b/recipes/uclibc/uclibc-git/dht-walnut/uClibc.machine
@@ -0,0 +1,46 @@
+#
+# Automatically generated make config: don't edit
+# Wed Dec 20 21:41:18 2006
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="<path/to/kernel/headers>" 
+HAVE_DOT_CONFIG=y
diff --git a/recipes/uclibc/uclibc-git/efika/uClibc.config b/recipes/uclibc/uclibc-git/efika/uClibc.config
deleted file mode 100644
index 23b221d662..0000000000
--- a/recipes/uclibc/uclibc-git/efika/uClibc.config
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Wed Dec 20 11:05:48 2006
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-TARGET_powerpc=y
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="powerpc"
-FORCE_OPTIONS_FOR_ARCH=y
-ARCH_BIG_ENDIAN=y
-
-#
-# Using Big Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-KERNEL_SOURCE="/usr/src/oplinux/oplinux-0.2/dht/build/tmp/staging/dht-walnut-linux-uclibc/kernel"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-# COMPAT_ATEXIT is not set
-# UCLIBC_SUSV3_LEGACY is not set
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-# UCLIBC_HAS_GNU_GLOB is not set
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-# UCLIBC_BUILD_NOW is not set
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-git/efika/uClibc.machine b/recipes/uclibc/uclibc-git/efika/uClibc.machine
new file mode 100644
index 0000000000..5ed7b517a3
--- /dev/null
+++ b/recipes/uclibc/uclibc-git/efika/uClibc.machine
@@ -0,0 +1,45 @@
+#
+# Automatically generated make config: don't edit
+# Wed Dec 20 11:05:48 2006
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_HEADERS="<path/to/kernel/headers>" 
+HAVE_DOT_CONFIG=y
diff --git a/recipes/uclibc/uclibc-git/i386/uClibc.config b/recipes/uclibc/uclibc-git/i386/uClibc.config
deleted file mode 100644
index bc6e72debf..0000000000
--- a/recipes/uclibc/uclibc-git/i386/uClibc.config
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-TARGET_i386=y
-# TARGET_i960 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="i386"
-# ARCH_SUPPORTS_BIG_ENDIAN is not set
-ARCH_SUPPORTS_LITTLE_ENDIAN=y
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_GENERIC_386 is not set
-# CONFIG_386 is not set
-# CONFIG_486 is not set
-# CONFIG_586 is not set
-# CONFIG_586MMX is not set
-# CONFIG_686 is not set
-# CONFIG_PENTIUMII is not set
-# CONFIG_PENTIUMIII is not set
-CONFIG_PENTIUM4=y
-# CONFIG_K6 is not set
-# CONFIG_K7 is not set
-# CONFIG_ELAN is not set
-# CONFIG_CRUSOE is not set
-# CONFIG_WINCHIPC6 is not set
-# CONFIG_WINCHIP2 is not set
-# CONFIG_CYRIXIII is not set
-# CONFIG_NEHEMIAH is not set
-ARCH_LITTLE_ENDIAN=y
-# ARCH_BIG_ENDIAN is not set
-# ARCH_HAS_NO_MMU is not set
-ARCH_HAS_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# UCLIBC_HAS_FENV is not set
-KERNEL_SOURCE="<path/to/kernel/sources>"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
-# UCLIBC_USE_NETLINK is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-WARNINGS="-Wall"
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-git/i386/uClibc.machine b/recipes/uclibc/uclibc-git/i386/uClibc.machine
new file mode 100644
index 0000000000..3909ccc9e1
--- /dev/null
+++ b/recipes/uclibc/uclibc-git/i386/uClibc.machine
@@ -0,0 +1,59 @@
+#
+# Automatically generated make config: don't edit
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+# ARCH_SUPPORTS_BIG_ENDIAN is not set
+ARCH_SUPPORTS_LITTLE_ENDIAN=y
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_GENERIC_386 is not set
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+CONFIG_PENTIUM4=y
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+ARCH_LITTLE_ENDIAN=y
+# ARCH_BIG_ENDIAN is not set
+# ARCH_HAS_NO_MMU is not set
+ARCH_HAS_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+# UCLIBC_HAS_FENV is not set
+KERNEL_HEADERS="<path/to/kernel/headers>"
+HAVE_DOT_CONFIG=y
diff --git a/recipes/uclibc/uclibc-git/i486/uClibc.config b/recipes/uclibc/uclibc-git/i486/uClibc.config
deleted file mode 100644
index 896d65ab20..0000000000
--- a/recipes/uclibc/uclibc-git/i486/uClibc.config
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Fri Dec 22 23:09:11 2006
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-TARGET_i386=y
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="i386"
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_GENERIC_386 is not set
-# CONFIG_386 is not set
-CONFIG_486=y
-# CONFIG_586 is not set
-# CONFIG_586MMX is not set
-# CONFIG_686 is not set
-# CONFIG_PENTIUMII is not set
-# CONFIG_PENTIUMIII is not set
-# CONFIG_PENTIUM4 is not set
-# CONFIG_K6 is not set
-# CONFIG_K7 is not set
-# CONFIG_ELAN is not set
-# CONFIG_CRUSOE is not set
-# CONFIG_WINCHIPC6 is not set
-# CONFIG_WINCHIP2 is not set
-# CONFIG_CYRIXIII is not set
-# CONFIG_NEHEMIAH is not set
-ARCH_LITTLE_ENDIAN=y
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-KERNEL_SOURCE="/usr/src/oplinux/oplinux-0.2/dht/build/tmp/cross/i486-linux-uclibc"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-UCLIBC_SUSV3_LEGACY=y
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-# UCLIBC_HAS_GNU_GLOB is not set
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-nptl/qemux86/uClibc.machine b/recipes/uclibc/uclibc-git/i486/uClibc.machine
index 44fec169c8..776e00d6dc 100644
--- a/recipes/uclibc/uclibc-nptl/qemux86/uClibc.machine
+++ b/recipes/uclibc/uclibc-git/i486/uClibc.machine
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Fri Nov 23 15:49:33 2007
+# Fri Dec 22 23:09:11 2006
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -31,9 +31,9 @@ TARGET_i386=y
 #
 TARGET_ARCH="i386"
 FORCE_OPTIONS_FOR_ARCH=y
-CONFIG_GENERIC_386=y
+# CONFIG_GENERIC_386 is not set
 # CONFIG_386 is not set
-# CONFIG_486 is not set
+CONFIG_486=y
 # CONFIG_586 is not set
 # CONFIG_586MMX is not set
 # CONFIG_686 is not set
@@ -48,11 +48,6 @@ CONFIG_GENERIC_386=y
 # CONFIG_WINCHIP2 is not set
 # CONFIG_CYRIXIII is not set
 # CONFIG_NEHEMIAH is not set
-TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
 ARCH_LITTLE_ENDIAN=y
 
 #
@@ -63,6 +58,5 @@ ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 DO_C99_MATH=y
-KERNEL_HEADERS="/usr/include"
+KERNEL_HEADERS="<path/to/kernel/headers>" 
 HAVE_DOT_CONFIG=y
-
diff --git a/recipes/uclibc/uclibc-git/i586/uClibc.config b/recipes/uclibc/uclibc-git/i586/uClibc.config
deleted file mode 100644
index d1bf538902..0000000000
--- a/recipes/uclibc/uclibc-git/i586/uClibc.config
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Sat Feb 24 08:24:11 2007
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-TARGET_i386=y
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="i386"
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_GENERIC_386 is not set
-# CONFIG_386 is not set
-# CONFIG_486 is not set
-# CONFIG_586 is not set
-# CONFIG_586MMX is not set
-# CONFIG_686 is not set
-# CONFIG_PENTIUMII is not set
-CONFIG_PENTIUMIII=y
-# CONFIG_PENTIUM4 is not set
-# CONFIG_K6 is not set
-# CONFIG_K7 is not set
-# CONFIG_ELAN is not set
-# CONFIG_CRUSOE is not set
-# CONFIG_WINCHIPC6 is not set
-# CONFIG_WINCHIP2 is not set
-# CONFIG_CYRIXIII is not set
-# CONFIG_NEHEMIAH is not set
-ARCH_LITTLE_ENDIAN=y
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-KERNEL_SOURCE="/work/oplinux-0.2/tmp/uclibc/cross/i586-linux-uclibc"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-# UCLIBC_SUSV3_LEGACY is not set
-UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
-# UCLIBC_USE_NETLINK is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-# UCLIBC_HAS_GNU_GLOB is not set
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-git/i586/uClibc.machine b/recipes/uclibc/uclibc-git/i586/uClibc.machine
new file mode 100644
index 0000000000..2e98e5c7e1
--- /dev/null
+++ b/recipes/uclibc/uclibc-git/i586/uClibc.machine
@@ -0,0 +1,62 @@
+#
+# Automatically generated make config: don't edit
+# Sat Feb 24 08:24:11 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_GENERIC_386 is not set
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
+CONFIG_PENTIUMIII=y
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_HEADERS="<path/to/kernel/headers>" 
+HAVE_DOT_CONFIG=y
diff --git a/recipes/uclibc/uclibc-git/i686/uClibc.config b/recipes/uclibc/uclibc-git/i686/uClibc.config
deleted file mode 100644
index bc6e72debf..0000000000
--- a/recipes/uclibc/uclibc-git/i686/uClibc.config
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-TARGET_i386=y
-# TARGET_i960 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="i386"
-# ARCH_SUPPORTS_BIG_ENDIAN is not set
-ARCH_SUPPORTS_LITTLE_ENDIAN=y
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_GENERIC_386 is not set
-# CONFIG_386 is not set
-# CONFIG_486 is not set
-# CONFIG_586 is not set
-# CONFIG_586MMX is not set
-# CONFIG_686 is not set
-# CONFIG_PENTIUMII is not set
-# CONFIG_PENTIUMIII is not set
-CONFIG_PENTIUM4=y
-# CONFIG_K6 is not set
-# CONFIG_K7 is not set
-# CONFIG_ELAN is not set
-# CONFIG_CRUSOE is not set
-# CONFIG_WINCHIPC6 is not set
-# CONFIG_WINCHIP2 is not set
-# CONFIG_CYRIXIII is not set
-# CONFIG_NEHEMIAH is not set
-ARCH_LITTLE_ENDIAN=y
-# ARCH_BIG_ENDIAN is not set
-# ARCH_HAS_NO_MMU is not set
-ARCH_HAS_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# UCLIBC_HAS_FENV is not set
-KERNEL_SOURCE="<path/to/kernel/sources>"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
-# UCLIBC_USE_NETLINK is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-WARNINGS="-Wall"
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-git/i686/uClibc.machine b/recipes/uclibc/uclibc-git/i686/uClibc.machine
new file mode 100644
index 0000000000..3909ccc9e1
--- /dev/null
+++ b/recipes/uclibc/uclibc-git/i686/uClibc.machine
@@ -0,0 +1,59 @@
+#
+# Automatically generated make config: don't edit
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+# ARCH_SUPPORTS_BIG_ENDIAN is not set
+ARCH_SUPPORTS_LITTLE_ENDIAN=y
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_GENERIC_386 is not set
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+CONFIG_PENTIUM4=y
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+ARCH_LITTLE_ENDIAN=y
+# ARCH_BIG_ENDIAN is not set
+# ARCH_HAS_NO_MMU is not set
+ARCH_HAS_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+# UCLIBC_HAS_FENV is not set
+KERNEL_HEADERS="<path/to/kernel/headers>"
+HAVE_DOT_CONFIG=y
diff --git a/recipes/uclibc/uclibc-git/magicbox/uClibc.config b/recipes/uclibc/uclibc-git/magicbox/uClibc.config
deleted file mode 100644
index 6542d49fd0..0000000000
--- a/recipes/uclibc/uclibc-git/magicbox/uClibc.config
+++ /dev/null
@@ -1,181 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Thu May  3 00:20:29 2007
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-TARGET_powerpc=y
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="powerpc"
-FORCE_OPTIONS_FOR_ARCH=y
-ARCH_BIG_ENDIAN=y
-
-#
-# Using Big Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-# UCLIBC_HAS_FPU is not set
-UCLIBC_HAS_SOFT_FLOAT=y
-DO_C99_MATH=y
-KERNEL_SOURCE="/proj/oplinux-0.2/tmp/uclibc/cross/powerpc-linux-uclibc"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-UCLIBC_SUSV3_LEGACY=y
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-# UCLIBC_HAS_GNU_GLOB is not set
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-# UCLIBC_BUILD_NOW is not set
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-git/magicbox/uClibc.machine b/recipes/uclibc/uclibc-git/magicbox/uClibc.machine
new file mode 100644
index 0000000000..2454d71661
--- /dev/null
+++ b/recipes/uclibc/uclibc-git/magicbox/uClibc.machine
@@ -0,0 +1,46 @@
+#
+# Automatically generated make config: don't edit
+# Thu May  3 00:20:29 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="<path/to/kernel/headers>" 
+HAVE_DOT_CONFIG=y
diff --git a/recipes/uclibc/uclibc-git/mipsel/uClibc.config b/recipes/uclibc/uclibc-git/mipsel/uClibc.config
deleted file mode 100644
index 4389c9b8c2..0000000000
--- a/recipes/uclibc/uclibc-git/mipsel/uClibc.config
+++ /dev/null
@@ -1,178 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-TARGET_mips=y
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="mips"
-ARCH_SUPPORTS_BIG_ENDIAN=y
-ARCH_SUPPORTS_LITTLE_ENDIAN=y
-FORCE_OPTIONS_FOR_ARCH=y
-ARCH_CFLAGS="-mno-split-addresses"
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-CONFIG_MIPS_ISA_MIPS32=y
-# CONFIG_MIPS_ISA_MIPS64 is not set
-ARCH_LITTLE_ENDIAN=y
-# ARCH_BIG_ENDIAN is not set
-# ARCH_HAS_NO_MMU is not set
-ARCH_HAS_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# UCLIBC_HAS_FENV is not set
-KERNEL_SOURCE="<path/to/kernel/sources>"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-UCLIBC_STATIC_LDCONFIG=y
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
-# UCLIBC_USE_NETLINK is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-WARNINGS="-Wall"
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-nptl/qemumips/uClibc.machine b/recipes/uclibc/uclibc-git/mipsel/uClibc.machine
index 1cf1addca9..e5db62c81e 100644
--- a/recipes/uclibc/uclibc-nptl/qemumips/uClibc.machine
+++ b/recipes/uclibc/uclibc-git/mipsel/uClibc.machine
@@ -1,10 +1,8 @@
 #
 # Automatically generated make config: don't edit
-# Wed Jul  9 13:37:36 2008
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
-# TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
@@ -13,7 +11,6 @@
 # TARGET_hppa is not set
 # TARGET_i386 is not set
 # TARGET_i960 is not set
-# TARGET_ia64 is not set
 # TARGET_m68k is not set
 # TARGET_microblaze is not set
 TARGET_mips=y
@@ -24,40 +21,29 @@ TARGET_mips=y
 # TARGET_sh64 is not set
 # TARGET_sparc is not set
 # TARGET_v850 is not set
-# TARGET_vax is not set
 # TARGET_x86_64 is not set
-# TARGET_xtensa is not set
 
 #
 # Target Architecture Features and Options
 #
 TARGET_ARCH="mips"
+ARCH_SUPPORTS_BIG_ENDIAN=y
+ARCH_SUPPORTS_LITTLE_ENDIAN=y
 FORCE_OPTIONS_FOR_ARCH=y
 ARCH_CFLAGS="-mno-split-addresses"
-CONFIG_MIPS_O32_ABI=y
-# CONFIG_MIPS_N32_ABI is not set
-# CONFIG_MIPS_N64_ABI is not set
 # CONFIG_MIPS_ISA_1 is not set
 # CONFIG_MIPS_ISA_2 is not set
 # CONFIG_MIPS_ISA_3 is not set
 # CONFIG_MIPS_ISA_4 is not set
 CONFIG_MIPS_ISA_MIPS32=y
 # CONFIG_MIPS_ISA_MIPS64 is not set
-TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
-ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
 # ARCH_BIG_ENDIAN is not set
-ARCH_WANTS_BIG_ENDIAN=y
-# ARCH_WANTS_LITTLE_ENDIAN=y
+# ARCH_HAS_NO_MMU is not set
 ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
-# DO_C99_MATH is not set
+DO_C99_MATH=y
 # UCLIBC_HAS_FENV is not set
-KERNEL_HEADERS="/usr/include"
+KERNEL_HEADERS="<path/to/kernel/headers>"
 HAVE_DOT_CONFIG=y
-
diff --git a/recipes/uclibc/uclibc-git/powerpc/uClibc.config b/recipes/uclibc/uclibc-git/powerpc/uClibc.config
deleted file mode 100644
index 8a12c10961..0000000000
--- a/recipes/uclibc/uclibc-git/powerpc/uClibc.config
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Tue Feb  6 19:17:06 2007
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-TARGET_powerpc=y
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="powerpc"
-FORCE_OPTIONS_FOR_ARCH=y
-ARCH_BIG_ENDIAN=y
-
-#
-# Using Big Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-KERNEL_SOURCE="/proj/oplinux-0.2/op-linux/branches/oplinux-0.2/efika/build/tmp/cross/powerpc-linux-uclibc"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-# UCLIBC_SUSV3_LEGACY is not set
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-# UCLIBC_HAS_GNU_GLOB is not set
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-# UCLIBC_BUILD_NOW is not set
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-git/powerpc/uClibc.machine b/recipes/uclibc/uclibc-git/powerpc/uClibc.machine
new file mode 100644
index 0000000000..d49bf6af53
--- /dev/null
+++ b/recipes/uclibc/uclibc-git/powerpc/uClibc.machine
@@ -0,0 +1,46 @@
+#
+# Automatically generated make config: don't edit
+# Tue Feb  6 19:17:06 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/recipes/uclibc/uclibc-git/sh3/uClibc.config b/recipes/uclibc/uclibc-git/sh3/uClibc.config
deleted file mode 100644
index 1e2710715f..0000000000
--- a/recipes/uclibc/uclibc-git/sh3/uClibc.config
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-TARGET_sh=y
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="sh"
-ARCH_SUPPORTS_BIG_ENDIAN=y
-ARCH_SUPPORTS_LITTLE_ENDIAN=y
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_SH2A is not set
-# CONFIG_SH2 is not set
-CONFIG_SH3=y
-# CONFIG_SH4 is not set
-ARCH_LITTLE_ENDIAN=y
-# ARCH_BIG_ENDIAN is not set
-# ARCH_HAS_NO_MMU is not set
-ARCH_HAS_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# UCLIBC_HAS_FENV is not set
-KERNEL_SOURCE="<path/to/kernel/sources>"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-FORCE_SHAREABLE_TEXT_SEGMENTS=y
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
-# UCLIBC_USE_NETLINK is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-WARNINGS="-Wall"
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-git/sh3/uClibc.machine b/recipes/uclibc/uclibc-git/sh3/uClibc.machine
new file mode 100644
index 0000000000..84e948c048
--- /dev/null
+++ b/recipes/uclibc/uclibc-git/sh3/uClibc.machine
@@ -0,0 +1,48 @@
+#
+# Automatically generated make config: don't edit
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+TARGET_sh=y
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="sh"
+ARCH_SUPPORTS_BIG_ENDIAN=y
+ARCH_SUPPORTS_LITTLE_ENDIAN=y
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_SH2A is not set
+# CONFIG_SH2 is not set
+CONFIG_SH3=y
+# CONFIG_SH4 is not set
+ARCH_LITTLE_ENDIAN=y
+# ARCH_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+# ARCH_HAS_NO_MMU is not set
+ARCH_HAS_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+# UCLIBC_HAS_FENV is not set
+KERNEL_HEADERS="<path/to/kernel/headers>"
+HAVE_DOT_CONFIG=y
diff --git a/recipes/uclibc/uclibc-git/sh4/uClibc.config b/recipes/uclibc/uclibc-git/sh4/uClibc.config
deleted file mode 100644
index 0b9a3c48b2..0000000000
--- a/recipes/uclibc/uclibc-git/sh4/uClibc.config
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-TARGET_sh=y
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="sh"
-ARCH_SUPPORTS_BIG_ENDIAN=y
-ARCH_SUPPORTS_LITTLE_ENDIAN=y
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_SH2A is not set
-# CONFIG_SH2 is not set
-# CONFIG_SH3 is not set
-CONFIG_SH4=y
-ARCH_LITTLE_ENDIAN=y
-# ARCH_BIG_ENDIAN is not set
-# ARCH_HAS_NO_MMU is not set
-ARCH_HAS_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# UCLIBC_HAS_FENV is not set
-KERNEL_SOURCE="<path/to/kernel/sources>"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-FORCE_SHAREABLE_TEXT_SEGMENTS=y
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-UCLIBC_STATIC_LDCONFIG=y
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
-# UCLIBC_USE_NETLINK is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-WARNINGS="-Wall"
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/recipes/uclibc/uclibc-nptl/uClibc.machine.sh4 b/recipes/uclibc/uclibc-git/sh4/uClibc.machine
index 33ad38411f..65f1c4c3c1 100644
--- a/recipes/uclibc/uclibc-nptl/uClibc.machine.sh4
+++ b/recipes/uclibc/uclibc-git/sh4/uClibc.machine
@@ -1,11 +1,8 @@
 #
 # Automatically generated make config: don't edit
-# Version: 0.9.30-git
-# Mon Feb  1 20:33:27 2010
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
-# TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_cris is not set
 # TARGET_e1 is not set
@@ -14,7 +11,6 @@
 # TARGET_hppa is not set
 # TARGET_i386 is not set
 # TARGET_i960 is not set
-# TARGET_ia64 is not set
 # TARGET_m68k is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
@@ -25,37 +21,28 @@ TARGET_sh=y
 # TARGET_sh64 is not set
 # TARGET_sparc is not set
 # TARGET_v850 is not set
-# TARGET_vax is not set
 # TARGET_x86_64 is not set
-# TARGET_xtensa is not set
 
 #
 # Target Architecture Features and Options
 #
 TARGET_ARCH="sh"
+ARCH_SUPPORTS_BIG_ENDIAN=y
+ARCH_SUPPORTS_LITTLE_ENDIAN=y
 FORCE_OPTIONS_FOR_ARCH=y
 # CONFIG_SH2A is not set
 # CONFIG_SH2 is not set
 # CONFIG_SH3 is not set
 CONFIG_SH4=y
-ARCH_HAS_BWD_MEMCPY=y
-TARGET_SUBARCH="sh4"
-
-#
-# Using ELF file format
-#
-ARCH_ANY_ENDIAN=y
 ARCH_LITTLE_ENDIAN=y
+# ARCH_BIG_ENDIAN is not set
 ARCH_WANTS_LITTLE_ENDIAN=y
 # ARCH_WANTS_BIG_ENDIAN is not set
+# ARCH_HAS_NO_MMU is not set
 ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 DO_C99_MATH=y
-# DO_XSI_MATH is not set
 # UCLIBC_HAS_FENV is not set
-UCLIBC_HAS_LONG_DOUBLE_MATH=y
-KERNEL_HEADERS="/usr/include"
+KERNEL_HEADERS="<path/to/kernel/headers>"
 HAVE_DOT_CONFIG=y
-
diff --git a/recipes/uclibc/uclibc-git/uClibc.distro b/recipes/uclibc/uclibc-git/uClibc.distro
index 8d1f1d1872..a48c74e22c 100644
--- a/recipes/uclibc/uclibc-git/uClibc.distro
+++ b/recipes/uclibc/uclibc-git/uClibc.distro
@@ -17,8 +17,9 @@ UCLIBC_CTOR_DTOR=y
 LDSO_GNU_HASH_SUPPORT=y
 # HAS_NO_THREADS is not set
 UCLIBC_HAS_THREADS=y
+UCLIBC_HAS_THREADS_NATIVE=y
 PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
+# LINUXTHREADS_OLD is not set
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
 # MALLOC_SIMPLE is not set
@@ -33,8 +34,8 @@ UCLIBC_HAS_SHADOW=y
 UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
 UCLIBC_HAS___PROGNAME=y
 UNIX98PTY_ONLY=y
-UCLIBC_HAS_LIBUTIL=y
 ASSUME_DEVPTS=y
+UCLIBC_HAS_LIBUTIL=y
 UCLIBC_HAS_TM_EXTENSIONS=y
 UCLIBC_HAS_TZ_CACHING=y
 UCLIBC_HAS_TZ_FILE=y
@@ -56,6 +57,8 @@ UCLIBC_HAS_FULL_RPC=y
 # UCLIBC_HAS_REENTRANT_RPC is not set
 # UCLIBC_USE_NETLINK is not set
 # UCLIBC_HAS_BSD_RES_CLOSE is not set
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBNSL_STUB=y
 
 #
 # String and Stdio Support
@@ -136,7 +139,7 @@ CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
 # DODEBUG_PT is not set
-DOSTRIP=n
+# DOSTRIP is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
diff --git a/recipes/uclibc/uclibc-initial_git.bb b/recipes/uclibc/uclibc-initial_git.bb
index 00330e2439..8c582e0e1d 100644
--- a/recipes/uclibc/uclibc-initial_git.bb
+++ b/recipes/uclibc/uclibc-initial_git.bb
@@ -15,7 +15,7 @@ do_install() {
 	rm -f ${D}${includedir}/bits/atomicity.h
 	install -d ${D}${libdir}/
 	install -m 644 lib/crt[1in].o ${D}${libdir}/
-	install -m 644 lib/libc.so ${D}${libdir}/
+	install -m 755 lib/lib[cm].so ${D}${libdir}/
 }
 
 do_compile () {
@@ -23,4 +23,6 @@ do_compile () {
 		lib/crt1.o lib/crti.o lib/crtn.o
 	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
 		-o lib/libc.so
+	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o lib/libm.so
 }
diff --git a/recipes/uclibc/uclibc-initial_nptl.bb b/recipes/uclibc/uclibc-initial_nptl.bb
deleted file mode 100644
index a7c079b458..0000000000
--- a/recipes/uclibc/uclibc-initial_nptl.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SECTION = "base"
-require uclibc_nptl.bb
-
-DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-PACKAGES = ""
-
-do_install() {
-	# Install initial headers into the cross dir
-	make V=1 PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
-		install_headers
-	#ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-
-	# This conflicts with the c++ version of this header
-	rm -f ${D}${includedir}/bits/atomicity.h
-	install -d ${D}${libdir}/
-	install -m 644 lib/crt[1in].o ${D}${libdir}/
-	install -m 644 lib/libc.so ${D}${libdir}/
-}
-
-do_compile () {
-	make V=1 PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
-		lib/crt1.o lib/crti.o lib/crtn.o
-	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-		-o lib/libc.so
-}
diff --git a/recipes/uclibc/uclibc-nptl/arm_fix_alignment.patch b/recipes/uclibc/uclibc-nptl/arm_fix_alignment.patch
deleted file mode 100644
index 982afe9a6e..0000000000
--- a/recipes/uclibc/uclibc-nptl/arm_fix_alignment.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-ARMV5 can use STRD and LDRD access instructions but these accesses need to be 
-8 byte aligned. The dynamic linker's malloc needs to match this so structures
-become 8 byte aligned to void unaligned accesses.
-
-RP - 14/02/2008
-
-Index: uClibc-nptl/ldso/ldso/arm/dl-sysdep.h
-===================================================================
---- uClibc-nptl.orig/ldso/ldso/arm/dl-sysdep.h	2008-08-08 16:52:28.000000000 -0700
-+++ uClibc-nptl/ldso/ldso/arm/dl-sysdep.h	2008-08-08 23:51:39.000000000 -0700
-@@ -18,6 +18,8 @@
-   GOT_BASE[1] = (unsigned long) MODULE; \
- }
- 
-+#define DL_MALLOC_ALIGN 8  /* EABI needs 8 byte alignment for STRD LDRD*/
-+
- static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p)
- {
- 	unsigned long i,t,inc;
diff --git a/recipes/uclibc/uclibc-nptl/ldso_hash.patch b/recipes/uclibc/uclibc-nptl/ldso_hash.patch
deleted file mode 100644
index 974f564396..0000000000
--- a/recipes/uclibc/uclibc-nptl/ldso_hash.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: uClibc-nptl/Rules.mak
-===================================================================
---- uClibc-nptl/Rules.mak	(revision 24450)
-+++ uClibc-nptl/Rules.mak	(working copy)
-@@ -522,7 +522,8 @@
- 
- ifeq ($(LDSO_GNU_HASH_SUPPORT),y)
- # Be sure that binutils support it
--LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
-+#LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
-+LDFLAGS_GNUHASH:=--hash-style=gnu
- ifeq ($(LDFLAGS_GNUHASH),)
- $(error Your binutils don't support --hash-style option, while you want to use it)
- else
diff --git a/recipes/uclibc/uclibc-nptl/uClibc.distro b/recipes/uclibc/uclibc-nptl/uClibc.distro
deleted file mode 100644
index a48c74e22c..0000000000
--- a/recipes/uclibc/uclibc-nptl/uClibc.distro
+++ /dev/null
@@ -1,153 +0,0 @@
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-# DOPIC is not set
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-LDSO_GNU_HASH_SUPPORT=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-UCLIBC_HAS_THREADS_NATIVE=y
-PTHREADS_DEBUG_SUPPORT=y
-# LINUXTHREADS_OLD is not set
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-UCLIBC_SUSV3_LEGACY=y
-UCLIBC_SUSV3_LEGACY_MACROS=y
-UCLIBC_SUSV4_LEGACY=y
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_LIBUTIL=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
-# UCLIBC_USE_NETLINK is not set
-# UCLIBC_HAS_BSD_RES_CLOSE is not set
-UCLIBC_HAS_LIBRESOLV_STUB=y
-UCLIBC_HAS_LIBNSL_STUB=y
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_REGEX_OLD is not set
-UCLIBC_HAS_FNMATCH=y
-# UCLIBC_HAS_FNMATCH_OLD is not set
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_NFTW=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-# DOSTRIP is not set
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
-
-# math stuff for perl
-DO_C99_MATH=y
diff --git a/recipes/uclibc/uclibc-nptl/uclibc_arm_remove_duplicate_sysdep_defs.patch b/recipes/uclibc/uclibc-nptl/uclibc_arm_remove_duplicate_sysdep_defs.patch
deleted file mode 100644
index ffcc62d698..0000000000
--- a/recipes/uclibc/uclibc-nptl/uclibc_arm_remove_duplicate_sysdep_defs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h.orig	2009-09-30 17:12:46.571672582 -0700
-+++ a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h	2009-09-30 17:10:12.255037520 -0700
-@@ -273,37 +273,6 @@ __local_syscall_error:						\
- #undef INTERNAL_SYSCALL_ERRNO
- #define INTERNAL_SYSCALL_ERRNO(val, err)	(-(val))
- 
--#define LOAD_ARGS_0()
--#define ASM_ARGS_0
--#define LOAD_ARGS_1(a1)				\
--  _a1 = (int) (a1);				\
--  LOAD_ARGS_0 ()
--#define ASM_ARGS_1	ASM_ARGS_0, "r" (_a1)
--#define LOAD_ARGS_2(a1, a2)			\
--  register int _a2 __asm__ ("a2") = (int) (a2);	\
--  LOAD_ARGS_1 (a1)
--#define ASM_ARGS_2	ASM_ARGS_1, "r" (_a2)
--#define LOAD_ARGS_3(a1, a2, a3)			\
--  register int _a3 __asm__ ("a3") = (int) (a3);	\
--  LOAD_ARGS_2 (a1, a2)
--#define ASM_ARGS_3	ASM_ARGS_2, "r" (_a3)
--#define LOAD_ARGS_4(a1, a2, a3, a4)		\
--  register int _a4 __asm__ ("a4") = (int) (a4);	\
--  LOAD_ARGS_3 (a1, a2, a3)
--#define ASM_ARGS_4	ASM_ARGS_3, "r" (_a4)
--#define LOAD_ARGS_5(a1, a2, a3, a4, a5)		\
--  register int _v1 __asm__ ("v1") = (int) (a5);	\
--  LOAD_ARGS_4 (a1, a2, a3, a4)
--#define ASM_ARGS_5	ASM_ARGS_4, "r" (_v1)
--#define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6)	\
--  register int _v2 __asm__ ("v2") = (int) (a6);	\
--  LOAD_ARGS_5 (a1, a2, a3, a4, a5)
--#define ASM_ARGS_6	ASM_ARGS_5, "r" (_v2)
--#define LOAD_ARGS_7(a1, a2, a3, a4, a5, a6, a7)	\
--  register int _v3 __asm__ ("v3") = (int) (a7);	\
--  LOAD_ARGS_6 (a1, a2, a3, a4, a5, a6)
--#define ASM_ARGS_7	ASM_ARGS_6, "r" (_v3)
--
- #if defined(__ARM_EABI__)
- #undef INTERNAL_SYSCALL_NCS
- #define INTERNAL_SYSCALL_NCS(number, err, nr, args...)		\
diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc
index 9d854afdb4..4686d3427f 100644
--- a/recipes/uclibc/uclibc.inc
+++ b/recipes/uclibc/uclibc.inc
@@ -2,8 +2,7 @@ DESCRIPTION = "C library for embedded systems"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
-INC_PR = "r33"
-PE = "1"
+INC_PR = "r34"
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
 # and our build is not a uclibc one, and we skip a glibc one if our build
diff --git a/recipes/uclibc/uclibc_0.9.28.bb b/recipes/uclibc/uclibc_0.9.28.bb
index ec2d0720f3..a43d5ed462 100644
--- a/recipes/uclibc/uclibc_0.9.28.bb
+++ b/recipes/uclibc/uclibc_0.9.28.bb
@@ -16,22 +16,22 @@ S = "${WORKDIR}/uClibc-${PV}"
 # functioning correct now so the patch is not included.  It may
 # be necessary to add this for architectures which do not initially
 # have a 'good' set of kernel header files in the cross directory.
-#SRC_URI += "file://nokernelheadercheck.patch;patch=1"
+#SRC_URI += "file://nokernelheadercheck.patch"
 #
 # Thumb support
 #
 # Thumb interworking support
 THUMBSTUFF = " \
-              file://thumb-defined-arm-or-thumb.patch;patch=1 \
-              file://thumb-mov-pc-bx.patch;patch=1 \
-              file://thumb-swi-r7.patch;patch=1 \
-              file://thumb-sysnum-h.patch;patch=1 \
-              file://thumb-asm-swi.patch;patch=1 \
-              file://thumb-call-via-rx.patch;patch=1 \
-              file://dl-startup.h.patch;patch=1 \
-              file://dl-string.h.patch;patch=1 \
-              file://dl-sysdep.h.patch;patch=1 \
-              file://uclibc-libgcc-eh.patch;patch=1 \
+              file://thumb-defined-arm-or-thumb.patch \
+              file://thumb-mov-pc-bx.patch \
+              file://thumb-swi-r7.patch \
+              file://thumb-sysnum-h.patch \
+              file://thumb-asm-swi.patch \
+              file://thumb-call-via-rx.patch \
+              file://dl-startup.h.patch \
+              file://dl-string.h.patch \
+              file://dl-sysdep.h.patch \
+              file://uclibc-libgcc-eh.patch \
              "
 
 SRC_URI_append_arm = " ${THUMBSTUFF} "
@@ -40,37 +40,37 @@ SRC_URI_append_arm = " ${THUMBSTUFF} "
 # This is a core change and is controversial, maybe even wrong
 # on some architectures
 THUMB_INTERWORK_RESOLVE_PATCH = ""
-THUMB_INTERWORK_RESOLVE_PATCH_thumb-interwork = " file://thumb-resolve.patch;patch=1"
+THUMB_INTERWORK_RESOLVE_PATCH_thumb-interwork = " file://thumb-resolve.patch"
 SRC_URI += " ${THUMB_INTERWORK_RESOLVE_PATCH}"
 
 
 DEFAULT_PREFERENCE_avr32 = "6000"
 SRC_URI_append_avr32 = " \
-                        file://uclibc-makefile.patch;patch=1 \
-                        file://remove-bogus-version-hack-and-just-use-asm-generic-if-it-exists.patch;patch=1 \
-                        file://let-optimized-stringops-override-default-ones.patch;patch=1 \
-                        file://fix-getrusage-argument-type.patch;patch=1 \
-                        file://fix-__libc_fcntl64-varargs-prototype.patch;patch=1 \
-                        file://fix-broken-__libc_open-declaration.patch;patch=1 \
-                        file://avr32-arch-2.patch;patch=1 \
-                        file://avr32-linkrelax-option.patch;patch=1 \
-                        file://avr32-string-ops.patch;patch=1 \
-                        file://no-create_module-on-avr32.patch;patch=1 \
-                        file://ldso-always-inline-_dl_memcpy.patch;patch=1 \
-                        file://ldso-define-MAP_FAILED.patch;patch=1 \
-                        file://ldso-always-inline-syscalls.patch;patch=1 \
-                        file://ldso-avr32-2.patch;patch=1 \
-                        file://ldso-avr32-needs-CONSTANT_STRING_GOT_FIXUP.patch;patch=1 \
-                        file://ldso-avr32-startup-hack.patch;patch=1 \
-                        file://ldd-avr32-support.patch;patch=1 \
-                        file://libpthread-avr32.patch;patch=1 \
-                        file://sync-fcntl-h-with-linux-kernel.patch;patch=1 \
+                        file://uclibc-makefile.patch \
+                        file://remove-bogus-version-hack-and-just-use-asm-generic-if-it-exists.patch \
+                        file://let-optimized-stringops-override-default-ones.patch \
+                        file://fix-getrusage-argument-type.patch \
+                        file://fix-__libc_fcntl64-varargs-prototype.patch \
+                        file://fix-broken-__libc_open-declaration.patch \
+                        file://avr32-arch-2.patch \
+                        file://avr32-linkrelax-option.patch \
+                        file://avr32-string-ops.patch \
+                        file://no-create_module-on-avr32.patch \
+                        file://ldso-always-inline-_dl_memcpy.patch \
+                        file://ldso-define-MAP_FAILED.patch \
+                        file://ldso-always-inline-syscalls.patch \
+                        file://ldso-avr32-2.patch \
+                        file://ldso-avr32-needs-CONSTANT_STRING_GOT_FIXUP.patch \
+                        file://ldso-avr32-startup-hack.patch \
+                        file://ldd-avr32-support.patch \
+                        file://libpthread-avr32.patch \
+                        file://sync-fcntl-h-with-linux-kernel.patch \
                        "
  
  
-#file://uClibc-0.9.28-avr32-20060621.patch;patch=1 \
-#file://uClibc-0.9.28-avr32-20061019.patch;patch=1 \
-#file://uclibc-avr32-no-msoft-float.patch;patch=1 \
+#file://uClibc-0.9.28-avr32-20060621.patch \
+#file://uClibc-0.9.28-avr32-20061019.patch \
+#file://uclibc-avr32-no-msoft-float.patch \
 
 SRC_URI[uClibc-0.9.28.md5sum] = "1ada58d919a82561061e4741fb6abd29"
 SRC_URI[uClibc-0.9.28.sha256sum] = "c8bc5383eafaa299e9874ae50acc6549f8b54bc29ed64a9a3387b3e4cd7f4bcb"
diff --git a/recipes/uclibc/uclibc_0.9.29.bb b/recipes/uclibc/uclibc_0.9.29.bb
index 1fd71d85a9..b83cd2efe4 100644
--- a/recipes/uclibc/uclibc_0.9.29.bb
+++ b/recipes/uclibc/uclibc_0.9.29.bb
@@ -14,22 +14,22 @@ PR = "${INC_PR}.0"
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 
 SRC_URI += "file://uClibc.machine file://uClibc.distro \
-		file://errno_values.h.patch;patch=1 \
-		file://termios.h.patch;patch=1 \
-		file://unistd_arm.patch;patch=1 \
-		file://build_wcs_upper_buffer.patch;patch=1 \
-		file://uClibc-0.9.29-001-fix-mmap.patch;patch=1 \
-		file://uClibc-0.9.29-002-atmel.1.patch;patch=1 \
-		file://uClibc-0.9.29-avr32-fix-sa_onstack.patch;patch=1 \
-		file://uClibc-0.9.29-conditional-sched_affinity.patch;patch=1 \
-		file://uClibc-0.9.29-fix-gethostent_r-failure-retval.patch;patch=1 \
-		file://uClibc-0.9.29-fix-internal_function-definition.patch;patch=1 \
-		file://uClibc-0.9.29-rm-whitespace.patch;patch=1 \
-		file://uClibc-0.9.29-avr32-bzero.patch;patch=1 \
-		file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \
-		file://arm_fix_alignment.patch;patch=1 \
-		file://uclibc-arm-ftruncate64.patch;patch=1 \
-		file://uclibc-use-fgnu89-inline.patch;patch=1 \
+		file://errno_values.h.patch \
+		file://termios.h.patch \
+		file://unistd_arm.patch \
+		file://build_wcs_upper_buffer.patch \
+		file://uClibc-0.9.29-001-fix-mmap.patch \
+		file://uClibc-0.9.29-002-atmel.1.patch \
+		file://uClibc-0.9.29-avr32-fix-sa_onstack.patch \
+		file://uClibc-0.9.29-conditional-sched_affinity.patch \
+		file://uClibc-0.9.29-fix-gethostent_r-failure-retval.patch \
+		file://uClibc-0.9.29-fix-internal_function-definition.patch \
+		file://uClibc-0.9.29-rm-whitespace.patch \
+		file://uClibc-0.9.29-avr32-bzero.patch \
+		file://uClibc-0.9.29-nonposix_bashisms.patch \
+		file://arm_fix_alignment.patch \
+		file://uclibc-arm-ftruncate64.patch \
+		file://uclibc-use-fgnu89-inline.patch \
 		"
 
 #recent versions uclibc require real kernel headers
diff --git a/recipes/uclibc/uclibc_0.9.30.1.bb b/recipes/uclibc/uclibc_0.9.30.1.bb
index 74af3c6c99..ea6924977a 100644
--- a/recipes/uclibc/uclibc_0.9.30.1.bb
+++ b/recipes/uclibc/uclibc_0.9.30.1.bb
@@ -14,16 +14,16 @@ PR = "${INC_PR}.4"
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 
 SRC_URI += "file://uClibc.machine file://uClibc.distro \
-            file://arm-linuxthreads.patch;patch=1 \
-            file://linuxthreads-changes.patch;patch=1 \
-	    file://pthread_atfork.patch;patch=1 \
-	    file://uclibc_ldso_use_O0.patch;patch=1 \
-	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
-	    file://gcc-4.4-fixlet.patch;patch=1 \
-	    file://uclibc-c99-ldbl-math.patch;patch=1 \
-	    file://Use-__always_inline-instead-of-__inline__.patch;patch=1 \
-            file://installfix.patch;patch=1 \
-            file://o_cloexec.patch;patch=1 \
+            file://arm-linuxthreads.patch \
+            file://linuxthreads-changes.patch \
+	    file://pthread_atfork.patch \
+	    file://uclibc_ldso_use_O0.patch \
+	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \
+	    file://gcc-4.4-fixlet.patch \
+	    file://uclibc-c99-ldbl-math.patch \
+	    file://Use-__always_inline-instead-of-__inline__.patch \
+            file://installfix.patch \
+            file://o_cloexec.patch \
 	   "
 #recent versions uclibc require real kernel headers
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes/uclibc/uclibc_0.9.30.2.bb b/recipes/uclibc/uclibc_0.9.30.2.bb
index 703b5cd73c..f3ba501a0a 100644
--- a/recipes/uclibc/uclibc_0.9.30.2.bb
+++ b/recipes/uclibc/uclibc_0.9.30.2.bb
@@ -14,11 +14,11 @@ PR = "${INC_PR}.0"
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 
 SRC_URI += "file://uClibc.machine file://uClibc.distro \
-	    file://pthread_atfork.patch;patch=1 \
-	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
-            file://installfix.patch;patch=1 \
-            file://o_cloexec.patch;patch=1 \
-            file://uclibc_fix_mips_crt.patch;patch=1 \
+	    file://pthread_atfork.patch \
+	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \
+            file://installfix.patch \
+            file://o_cloexec.patch \
+            file://uclibc_fix_mips_crt.patch \
 	   "
 SRC_URI[uClibc-0.9.30.2.md5sum] = "e759ec855500082ac3e671dd6cacfdb0"
 SRC_URI[uClibc-0.9.30.2.sha256sum] = "ab6e92c91e2f8fad182d3b624b87d6cbf53072678d8fc31ad73e6abd3c852473"
diff --git a/recipes/uclibc/uclibc_0.9.30.3.bb b/recipes/uclibc/uclibc_0.9.30.3.bb
index 00a079f2c2..2f5f23c05d 100644
--- a/recipes/uclibc/uclibc_0.9.30.3.bb
+++ b/recipes/uclibc/uclibc_0.9.30.3.bb
@@ -14,7 +14,7 @@ PR = "${INC_PR}.0"
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 
 SRC_URI += "file://uClibc.machine file://uClibc.distro \
-	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
+	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \
 	   "
 
 #recent versions uclibc require real kernel headers
diff --git a/recipes/uclibc/uclibc_0.9.30.bb b/recipes/uclibc/uclibc_0.9.30.bb
index 0495e85cda..5d267b560c 100644
--- a/recipes/uclibc/uclibc_0.9.30.bb
+++ b/recipes/uclibc/uclibc_0.9.30.bb
@@ -14,13 +14,13 @@ PR = "${INC_PR}.1"
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 
 SRC_URI += "file://uClibc.machine file://uClibc.distro \
-            file://arm-linuxthreads.patch;patch=1 \
-            file://linuxthreads-changes.patch;patch=1 \
-	    file://pthread_atfork.patch;patch=1 \
-	    file://uclibc_ldso_use_O0.patch;patch=1 \
-	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
-            file://unifdef-fix.patch;patch=1 \
-	    file://Use-__always_inline-instead-of-__inline__.patch;patch=1 \
+            file://arm-linuxthreads.patch \
+            file://linuxthreads-changes.patch \
+	    file://pthread_atfork.patch \
+	    file://uclibc_ldso_use_O0.patch \
+	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \
+            file://unifdef-fix.patch \
+	    file://Use-__always_inline-instead-of-__inline__.patch \
 	   "
 #recent versions uclibc require real kernel headers
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb
index 7484de99c0..31e8924328 100644
--- a/recipes/uclibc/uclibc_git.bb
+++ b/recipes/uclibc/uclibc_git.bb
@@ -6,9 +6,9 @@
 # UCLIBC_BASE can be set in a distro file, but whether this works depends
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
-UCLIBC_BASE ?= "0.9.30"
-SRCREV="63859f89f327e48037a4cdba982cd6afa3007da7"
-PV = "${UCLIBC_BASE}+gitr${SRCPV}"
+UCLIBC_BASE ?= "0.9.31"
+SRCREV="b2c4199f0fd53c009858e7ce27f932a4ac92bc60"
+PV = "${UCLIBC_BASE}+gitr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
@@ -30,8 +30,8 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
 	file://uClibc.config \
 	file://uClibc.machine \
 	file://uClibc.distro \
-	file://uclibc-arm-ftruncate64.patch;patch=1 \
-	file://uclibc_enable_log2_test.patch;patch=1 \
-	file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
+	file://uclibc-arm-ftruncate64.patch \
+	file://uclibc_enable_log2_test.patch \
+	file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \
 	"
 S = "${WORKDIR}/git"
diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
deleted file mode 100644
index eac8d59e36..0000000000
--- a/recipes/uclibc/uclibc_nptl.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-# UCLIBC_BASE should be the latest released revision of uclibc (that way
-# the config files will typically be correct!)  uclibc-svn takes precedence
-# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-svn is out of date
-# try removing it
-#
-# UCLIBC_BASE can be set in a distro file, but whether this works depends
-# on whether the base patches apply to the selected (SRCDATE) svn release.
-#
-UCLIBC_BASE ?= "0.9.30"
-SRCREV="96fa7bff588054885379286a5e8cf2cdd3ba0ab0"
-PV = "${UCLIBC_BASE}+gitr${SRCPV}"
-DEFAULT_PREFERENCE = "-1"
-#DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
-# precedence.
-
-require uclibc.inc
-PR = "${INC_PR}.0"
-
-PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
-
-#recent versions uclibc require real kernel headers
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILESPATHPKG =. "uclibc-nptl:uclibc-${UCLIBC_BASE}:"
-
-#as stated above, uclibc needs real kernel-headers
-#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
-KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
-
-SRC_URI = "git://uclibc.org/uClibc.git;protocol=git;branch=nptl \
-	${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
-	file://uClibc.config \
-	file://uClibc.machine \
-	file://uClibc.distro \
-	file://uclibc-arm-ftruncate64.patch;patch=1 \
-	file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
-	file://uclibc_arm_remove_duplicate_sysdep_defs.patch;patch=1 \
-	"
-
-S = "${WORKDIR}/git"
-
-ARM_INSTRUCTION_SET = "arm"
-
diff --git a/recipes/udev/acl_2.2.49.bb b/recipes/udev/acl_2.2.49.bb
index 0dd88347b5..aeec4942e8 100644
--- a/recipes/udev/acl_2.2.49.bb
+++ b/recipes/udev/acl_2.2.49.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Commands for Manipulating POSIX Access Control Lists"
 LICENSE = "GPLv2"
 
-PR = "r1" 
+PR = "r2"
 
 DEPENDS = "attr"
 
@@ -9,6 +9,8 @@ SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/acl/acl-${PV}.src.tar.gz"
 
 inherit autotools lib_package
 
+TOPDIR[unexport] = "1"
+
 EXTRA_OECONF = " --enable-gettext=yes \
                 ac_cv_path_XGETTEXT=${STAGING_BINDIR_NATIVE}/xgettext \
                 ac_cv_path_MSGFMT=${STAGING_BINDIR_NATIVE}/msgfmt \
diff --git a/recipes/udev/attr_2.4.44.bb b/recipes/udev/attr_2.4.44.bb
index d1ca5089ab..ee48693243 100644
--- a/recipes/udev/attr_2.4.44.bb
+++ b/recipes/udev/attr_2.4.44.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Commands for Manipulating Filesystem Extended Attributes"
 LICENSE = "GPLv2"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/attr/attr-${PV}.src.tar.gz"
 
@@ -14,6 +14,8 @@ EXTRA_OECONF = " --enable-gettext=yes \
 
 LDFLAGS_append_libc-uclibc += " -lintl"
 
+TOPDIR[unexport] = "1"
+
 do_configure_append() {
 	# gettext hack
 	echo "#define _(str) str" >> ${S}/include/config.h
diff --git a/recipes/udev/udev-static_124.bb b/recipes/udev/udev-static_124.bb
index 1ea088a6b5..7348a6ca63 100644
--- a/recipes/udev/udev-static_124.bb
+++ b/recipes/udev/udev-static_124.bb
@@ -1,15 +1,18 @@
 DESCRIPTION = "Static version of udev for devices with an old (e.g. <2.6.27) kernel"
 
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch;patch=1 \
-	   file://flags.patch;patch=1 \
-	   file://vol_id_ld.patch;patch=1 \
-	   file://udevtrigger_add_devname_filtering.patch;patch=1 \
-	   file://libvolume-id-soname.patch;patch=1 \
-	   file://mtd-exclude-persistent.patch;patch=1 \
+require udev.inc
+
+SRC_URI += "file://noasmlinkage.patch \
+	    file://flags.patch \
+	    file://vol_id_ld.patch \
+	    file://udevtrigger_add_devname_filtering.patch \
+	    file://libvolume-id-soname.patch \
+	    file://mtd-exclude-persistent.patch \
 	   "
 
-require udev.inc
+PR = "${INC_PR}.0"
+
+LD = "${CC}"
 
 S = "${WORKDIR}/udev-${PV}"
 
diff --git a/recipes/udev/udev.inc b/recipes/udev/udev.inc
index 14d10b45cc..1fb75fe1b0 100644
--- a/recipes/udev/udev.inc
+++ b/recipes/udev/udev.inc
@@ -1,8 +1,9 @@
 DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
+
 LICENSE = "GPLv2+"
 
-SRC_URI += " \
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://udev.rules \
 	   file://devfs-udev.rules \
 	   file://links.conf \
@@ -12,25 +13,30 @@ SRC_URI += " \
 	   file://local.rules \
            file://init"
 
+INC_PR = "r27"
+
 inherit update-rc.d autotools pkgconfig
 
 PARALLEL_MAKE = ""
 UDEV_DEVFS_RULES ?= "0"
 PKG_libvolume-id-dev = "libvolume-id-dev"
 
+RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
+
 INITSCRIPT_NAME = "udev"
-INITSCRIPT_PARAMS = "start 04 S ."
+INITSCRIPT_PARAMS = "start 03 S ."
 
 export CROSS = "${TARGET_PREFIX}"
 export HOSTCC = "${BUILD_CC}"
 export udevdir ?= "/dev"
+# Put stuff in /lib and /sbin
+export bindir := "${base_bindir}"
+export sbindir := "${base_sbindir}"
 export usrbindir := "${bindir}"
 export usrsbindir := "${sbindir}"
-export etcdir = "${sysconfdir}"
-LD = "${CC}"
-bindir = "/bin"
-sbindir = "/sbin"
+export etcdir := "${sysconfdir}"
 
+TARGET_CC_ARCH += "${LDFLAGS}"
 UDEV_EXTRAS = "<override me>"
 EXTRA_OEMAKE = "-e \
 		'EXTRAS=${UDEV_EXTRAS}' \
@@ -56,17 +62,13 @@ do_install () {
 
 	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
 	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
-}
-
-do_stage () {
-	autotools_stage_all
-        install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
-        oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
+        install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${D}${includedir}
+        oe_libinstall -C extras/volume_id/lib -so libvolume_id ${D}${libdir}
 }
 
 PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
 FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
-FILES_udev-utils = "${usrbindir}/udevinfo ${sbindir}/udevadm ${usrbindir}/udevtest"
+FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest ${sbindir}/udevadm"
 FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
 FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
 FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
diff --git a/recipes/udev/udev_092.bb b/recipes/udev/udev_092.bb
index 6e4d0252f4..3ed05d138c 100644
--- a/recipes/udev/udev_092.bb
+++ b/recipes/udev/udev_092.bb
@@ -3,21 +3,20 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
 
-PR = "r25"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch;patch=1 \
-	   file://flags.patch;patch=1 \
-	   file://udevsynthesize.patch;patch=1 \
-	   file://udevsynthesize.sh \
-           file://arm_inotify_fix.patch;patch=1 \
-	   file://mtd-exclude-persistent.patch;patch=1 \
-	   file://mount.blacklist \
-	   "
-
 require udev.inc
 
-INITSCRIPT_PARAMS = "start 03 S ."
+LD = "${CC}"
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://noasmlinkage.patch;patch=1 \
+	    file://flags.patch;patch=1 \
+	    file://udevsynthesize.patch;patch=1 \
+	    file://udevsynthesize.sh \
+            file://arm_inotify_fix.patch;patch=1 \
+	    file://mtd-exclude-persistent.patch;patch=1 \
+	    file://mount.blacklist \
+	   "
 
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
diff --git a/recipes/udev/udev_097.bb b/recipes/udev/udev_097.bb
index 4e49e4a05f..8757794048 100644
--- a/recipes/udev/udev_097.bb
+++ b/recipes/udev/udev_097.bb
@@ -8,17 +8,16 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r13"
+require udev.inc
 
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch;patch=1 \
-	   file://flags.patch;patch=1 \
-	   file://mount.blacklist \
-	   "
+PR = "${INC_PR}.0"
 
-require udev.inc
+LD = "${CC}"
 
-INITSCRIPT_PARAMS = "start 03 S ."
+SRC_URI += "file://noasmlinkage.patch;patch=1 \
+	    file://flags.patch;patch=1 \
+	    file://mount.blacklist \
+	   "
 
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
diff --git a/recipes/udev/udev_100.bb b/recipes/udev/udev_100.bb
index b74ae6954f..7261483d49 100644
--- a/recipes/udev/udev_100.bb
+++ b/recipes/udev/udev_100.bb
@@ -9,19 +9,18 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r16"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch;patch=1 \
-	   file://flags.patch;patch=1 \
-	   file://mtd-exclude-persistent.patch;patch=1 \
-	   file://mount.blacklist \
-	   file://mount.sh \
-	   "
-
 require udev.inc
 
-INITSCRIPT_PARAMS = "start 03 S ."
+PR = "${INC_PR}.0"
+
+LD = "${CC}"
+
+SRC_URI += "file://noasmlinkage.patch;patch=1 \
+	    file://flags.patch;patch=1 \
+	    file://mtd-exclude-persistent.patch;patch=1 \
+	    file://mount.blacklist \
+	    file://mount.sh \
+	   "
 
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
diff --git a/recipes/udev/udev_118.bb b/recipes/udev/udev_118.bb
index d4f6fe25a7..aeebbe9392 100644
--- a/recipes/udev/udev_118.bb
+++ b/recipes/udev/udev_118.bb
@@ -3,24 +3,23 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
 
-PR = "r6"
+require udev.inc
+
+PR = "${INC_PR}.0"
+
+LD = "${CC}"
 
 DEFAULT_PREFERENCE = "-118"
 
-SRC_URI = "\
- http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
- file://flags.patch;patch=1 \
- file://vol_id_ld.patch;patch=1 \
- file://udevtrigger_add_devname_filtering.patch;patch=1 \
- file://mtd-exclude-persistent.patch;patch=1 \
+SRC_URI += "\
+ file://flags.patch \
+ file://vol_id_ld.patch \
+ file://udevtrigger_add_devname_filtering.patch \
+ file://mtd-exclude-persistent.patch \
  file://mount.blacklist \
 "
 TARGET_CC_ARCH += "${LDFLAGS}"
 
-require udev.inc
-
-INITSCRIPT_PARAMS = "start 03 S ."
-
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
diff --git a/recipes/udev/udev_124.bb b/recipes/udev/udev_124.bb
index ed405943d6..30b049976d 100644
--- a/recipes/udev/udev_124.bb
+++ b/recipes/udev/udev_124.bb
@@ -2,28 +2,28 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
-PR = "r19"
-
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch;patch=1 \
-	   file://flags.patch;patch=1 \
-	   file://vol_id_ld.patch;patch=1 \
-	   file://udevtrigger_add_devname_filtering.patch;patch=1 \
-	   file://libvolume-id-soname.patch;patch=1 \
-	   file://mtd-exclude-persistent.patch;patch=1 \
-	   file://mount.blacklist \
-	   file://run.rules \
-	   file://default \
-	   file://local.rules \
+
+require udev.inc
+
+PR = "${INC_PR}.0"
+
+LD = "${CC}"
+
+SRC_URI += "file://noasmlinkage.patch \
+	    file://flags.patch \
+	    file://vol_id_ld.patch \
+	    file://udevtrigger_add_devname_filtering.patch \
+	    file://libvolume-id-soname.patch \
+	    file://mtd-exclude-persistent.patch \
+	    file://mount.blacklist \
+	    file://run.rules \
+	    file://default \
+	    file://local.rules \
 	   "
 
 SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
 PACKAGE_ARCH_h2200 = "h2200"
 
-require udev.inc
-
-INITSCRIPT_PARAMS = "start 03 S ."
-
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb
index 4be7ae51e1..27055beac9 100644
--- a/recipes/udev/udev_141.bb
+++ b/recipes/udev/udev_141.bb
@@ -1,33 +1,19 @@
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
-LICENSE = "GPLv2+"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r21"
+require udev.inc
 
-# needed for init.d script
-RDEPENDS_${PN} += "udev-utils"
+PR = "${INC_PR}.0"
 
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://mount.blacklist \
-	   file://run.rules \
+SRC_URI += "file://mount.blacklist \
+	    file://run.rules \
+	    file://default \
+	    file://cache \
 	   "
-SRC_URI += " \
-       file://udev.rules \
-       file://devfs-udev.rules \
-       file://links.conf \
-       file://permissions.rules \
-       file://mount.sh \
-       file://network.sh \
-       file://local.rules \
-       file://default \
-       file://init \
-       file://cache \
-"
-
 SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
 PACKAGE_ARCH_h2200 = "h2200"
 
@@ -39,26 +25,16 @@ SRC_URI_append_bug = " \
 
 PACKAGE_ARCH_bug = "bug"
 
-inherit update-rc.d autotools_stage
-
-# Put stuff in /lib and /sbin
-export sbindir="${base_sbindir}"
-export exec_prefix=""
 EXTRA_OECONF += " --with-udev-prefix= \
                   --with-libdir-name=${base_libdir} \
 "
 
-INITSCRIPT_NAME = "udev"
-INITSCRIPT_PARAMS = "start 03 S ."
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
 
-PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
-
-FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
-FILES_udev-utils = "${usrbindir}/udevinfo ${sbindir}/udevadm ${usrbindir}/udevtest"
-FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
+LEAD_SONAME = "libudev.so.0"
 
 RPROVIDES_${PN} = "hotplug"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd ${sbindir}/udevadm"
 FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
 
 # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
@@ -103,6 +79,8 @@ do_install () {
 
 	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
 	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
+        oe_libinstall -C udev/lib -so libudev ${D}${libdir}
+        install ${S}/udev/lib/libudev.h ${D}${includedir}
 }
 
 do_install_append_h2200() {
@@ -132,19 +110,5 @@ if [ -d $D/lib/udev/rules.d ] ; then
 fi
 }
 
-do_stage_append() {
-        install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
-        oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
-        oe_libinstall -C udev/lib -so libudev ${STAGING_LIBDIR}
-        # Since we change exec_prefix above, autotools_stage_all will not see the .pc files
-        # When we upgrade to 145 with the path bugs fixed we can drop all this (see poky)
-        install -d ${STAGING_DIR_TARGET}${prefix}${libdir}/pkgconfig/
-        install ${S}/extras/volume_id/lib/libvolume_id.pc ${STAGING_DIR_TARGET}${prefix}${libdir}/pkgconfig/
-        install ${S}/udev/lib/libudev.pc ${STAGING_DIR_TARGET}${prefix}${libdir}/pkgconfig/
-	install -d ${STAGING_DIR_TARGET}${prefix}${includedir}/
-        install ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_DIR_TARGET}${prefix}${includedir}/
-        install ${S}/udev/lib/libudev.h ${STAGING_DIR_TARGET}${prefix}${includedir}/
-}
-
 SRC_URI[md5sum] = "86382b7bbc64459e714c65a2a4e10916"
 SRC_URI[sha256sum] = "001be4a8963c48e7debc82c6078562d087a2979da63e558a5e3613c03725c377"
diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb
index d7df81a268..9bf0872b8a 100644
--- a/recipes/udev/udev_151.bb
+++ b/recipes/udev/udev_151.bb
@@ -3,16 +3,14 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 LICENSE = "GPLv2+"
 
-PR = "r9"
+PR = "r11"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"
 
 # Needed for udev-extras
 DEPENDS = "gperf-native usbutils acl glib-2.0"
-
-# needed for init.d script
-RDEPENDS_${PN} += "udev-utils"
+RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://mount.blacklist \
@@ -63,7 +61,7 @@ PACKAGES =+ "libudev libgudev udev-utils"
 FILES_libudev = "${libdir}/libudev.so.*"
 FILES_libgudev = "${libdir}/libgudev*.so.*"
 
-FILES_udev-utils = "${bindir}/udevinfo ${base_sbindir}/udevadm ${bindir}/udevtest"
+FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm"
 
 RPROVIDES_${PN} = "hotplug"
 FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
diff --git a/recipes/udhcp/udhcp_0.9.8.bb b/recipes/udhcp/udhcp_0.9.8.bb
index 2b36560e67..941935af9d 100644
--- a/recipes/udhcp/udhcp_0.9.8.bb
+++ b/recipes/udhcp/udhcp_0.9.8.bb
@@ -4,9 +4,9 @@ HOMEPAGE = "http://udhcp.busybox.net/"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.mirrorservice.org/sites/ftp.locustworld.com/udhcp-${PV}.tar.gz;name=udhcp \
-	   file://install.patch;patch=1 \
-	   file://nostrip.patch;patch=1 \
-	   file://gcc3.patch;patch=1"
+	   file://install.patch \
+	   file://nostrip.patch \
+	   file://gcc3.patch"
 
 inherit autotools
 
diff --git a/recipes/udns/udns_0.0.9.bb b/recipes/udns/udns_0.0.9.bb
index ba95652855..b69d6b12e4 100644
--- a/recipes/udns/udns_0.0.9.bb
+++ b/recipes/udns/udns_0.0.9.bb
@@ -4,7 +4,7 @@ PR = "r0"
 
 SRC_URI = " \
 	    http://www.corpit.ru/mjt/${PN}/${PN}_${PV}.tar.gz;name=udns \
-        file://fix-cc-check.patch;patch=1 \
+        file://fix-cc-check.patch \
 "
 SRC_URI[udns.md5sum] = "78843added6f6b690bc6019ab8ef03c9"
 SRC_URI[udns.sha256sum] = "cfc5f9b5387f96e48fc9c7aa5ef6511809e6c72c0df0d533cf150016816eaad2"
diff --git a/recipes/uicmoc/uicmoc-native_2.3.10.bb b/recipes/uicmoc/uicmoc-native_2.3.10.bb
index 781ad58c9c..c161571d82 100644
--- a/recipes/uicmoc/uicmoc-native_2.3.10.bb
+++ b/recipes/uicmoc/uicmoc-native_2.3.10.bb
@@ -6,12 +6,12 @@ LICENSE = "GPL QPL"
 PR = "r4"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
-           file://fix-makefile.patch;patch=1 \
-           file://gcc3_4.patch;patch=1 \
-           file://gcc4.patch;patch=1 \
-           file://gcc4_1.patch;patch=1 \
-           file://64bit-cleanup.patch;patch=1 \
-	   file://kernel-asm-page.patch;patch=1"
+           file://fix-makefile.patch \
+           file://gcc3_4.patch \
+           file://gcc4.patch \
+           file://gcc4_1.patch \
+           file://64bit-cleanup.patch \
+	   file://kernel-asm-page.patch"
 S = "${WORKDIR}/qt-${PV}"
 
 inherit native qmake_base
diff --git a/recipes/uicmoc/uicmoc3-native_3.3.5.bb b/recipes/uicmoc/uicmoc3-native_3.3.5.bb
index ac2484cc5d..ab4ab80d88 100644
--- a/recipes/uicmoc/uicmoc3-native_3.3.5.bb
+++ b/recipes/uicmoc/uicmoc3-native_3.3.5.bb
@@ -7,8 +7,8 @@ DEPENDS = "qmake-native"
 PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \
-           file://no-examples.patch;patch=1 \
-           file://64bit-cleanup.patch;patch=1"
+           file://no-examples.patch \
+           file://64bit-cleanup.patch"
 S = "${WORKDIR}/qt-embedded-free-${PV}"
 
 inherit native qmake_base qt3e
diff --git a/recipes/uicmoc/uicmoc4-native.inc b/recipes/uicmoc/uicmoc4-native.inc
index 1a3e06988b..1124226199 100644
--- a/recipes/uicmoc/uicmoc4-native.inc
+++ b/recipes/uicmoc/uicmoc4-native.inc
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://configure-fix.patch;patch=1"
+           file://configure-fix.patch"
 S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
 
 EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \
diff --git a/recipes/uim/uim_1.3.1.bb b/recipes/uim/uim_1.3.1.bb
index 788fbf1dfa..dad686520e 100644
--- a/recipes/uim/uim_1.3.1.bb
+++ b/recipes/uim/uim_1.3.1.bb
@@ -3,7 +3,7 @@ DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses"
 SECTION_uim-gtk2.0 = "x11/inputmethods"
 PR = "r3"
 
-SRC_URI += "file://uim-module-manager.patch;patch=1"
+SRC_URI += "file://uim-module-manager.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/ulogd/ulogd_1.24.bb b/recipes/ulogd/ulogd_1.24.bb
index 6e2329fae2..4245c8cf0c 100644
--- a/recipes/ulogd/ulogd_1.24.bb
+++ b/recipes/ulogd/ulogd_1.24.bb
@@ -4,8 +4,8 @@ DEPENDS = "libpcap"
 
 SRC_URI = " \
 	http://www.netfilter.org/projects/ulogd/files/ulogd-${PV}.tar.bz2;name=tar \
-	file://ulogd-kill-uname-in-rules.patch;patch=1 \
-	file://ulogd-hash-style-gnu.patch;patch=1 \
+	file://ulogd-kill-uname-in-rules.patch \
+	file://ulogd-hash-style-gnu.patch \
 	file://init \
 	"
 SRC_URI[tar.md5sum] = "05b4ed2926b9a22aaeaf642917bbf8ff"
diff --git a/recipes/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb b/recipes/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb
index 37bff946e6..b5ca1cd775 100644
--- a/recipes/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb
+++ b/recipes/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb
@@ -6,8 +6,8 @@ DEPENDS = "expat"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ulxmlrpcpp/ulxmlrpcpp-${PV}-src.tar.bz2 \
-           file://disable-docs.patch;patch=1 \
-           file://remove-local-includes.patch;patch=1"
+           file://disable-docs.patch \
+           file://remove-local-includes.patch"
 
 inherit autotools
 
diff --git a/recipes/uml-utilities/uml-utilities_20040406.bb b/recipes/uml-utilities/uml-utilities_20040406.bb
index 280d29ff68..0d26b7a68d 100644
--- a/recipes/uml-utilities/uml-utilities_20040406.bb
+++ b/recipes/uml-utilities/uml-utilities_20040406.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "zlib ncurses readline"
 
 SRC_URI = "http://mirror.usermodelinux.org/uml/uml_utilities_${PV}.tar.bz2 \
-           file://fix-ldflags.patch;patch=1"
+           file://fix-ldflags.patch"
 SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a"
 SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41"
 
diff --git a/recipes/unicap/ucview_0.22.bb b/recipes/unicap/ucview_0.22.bb
index 1f02363d73..38137b9629 100644
--- a/recipes/unicap/ucview_0.22.bb
+++ b/recipes/unicap/ucview_0.22.bb
@@ -5,7 +5,7 @@ DEPENDS = "intltool-native gtk+ libpng unicap gconf libglade gdk-pixbuf-csource-
 PR = "r1"
 
 SRC_URI = "http://www.unicap-imaging.org/downloads/${P}.tar.gz \
-           file://cross.patch;patch=1"
+           file://cross.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/unicap/ucview_0.30.bb b/recipes/unicap/ucview_0.30.bb
index 89b96ef861..859c8b0e79 100644
--- a/recipes/unicap/ucview_0.30.bb
+++ b/recipes/unicap/ucview_0.30.bb
@@ -5,7 +5,7 @@ DEPENDS = "intltool-native gtk+ libpng unicap gconf libglade gdk-pixbuf-csource-
 PR = "r1"
 
 SRC_URI = "http://www.unicap-imaging.org/downloads/${P}.tar.gz \
-           file://cross.patch;patch=1"
+           file://cross.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/unicap/unicap_0.9.3.bb b/recipes/unicap/unicap_0.9.3.bb
index a28ce9fa99..4a47bc408e 100644
--- a/recipes/unicap/unicap_0.9.3.bb
+++ b/recipes/unicap/unicap_0.9.3.bb
@@ -5,7 +5,7 @@ DEPENDS = "intltool-native gtk+ libpng libxv"
 PR = "r2"
 
 SRC_URI = "http://www.unicap-imaging.org/downloads/unicap-${PV}.tar.gz \
-           file://pkgconfig.patch;patch=1"
+           file://pkgconfig.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/unicap/unicap_0.9.4.bb b/recipes/unicap/unicap_0.9.4.bb
index a15f660602..8b6f8c38e0 100644
--- a/recipes/unicap/unicap_0.9.4.bb
+++ b/recipes/unicap/unicap_0.9.4.bb
@@ -5,7 +5,7 @@ DEPENDS = "intltool-native gtk+ libpng libxv"
 PR = "r0"
 
 SRC_URI = "http://www.unicap-imaging.org/downloads/tisCMOS/unicap-${PV}.tar.gz \
-           file://pkgconfig.patch;patch=1"
+           file://pkgconfig.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/unifdef/unifdef-native_2.6.18+git.bb b/recipes/unifdef/unifdef-native_2.6.18+git.bb
index f2992ca709..ae3eb4f13a 100644
--- a/recipes/unifdef/unifdef-native_2.6.18+git.bb
+++ b/recipes/unifdef/unifdef-native_2.6.18+git.bb
@@ -10,11 +10,9 @@ do_compile() {
 	${CC} ${CFLAGS} ${LDFLAGS} -o unifdef ${WORKDIR}/unifdef.c
 }
 
-do_stage() {
-	install -m 0755 unifdef ${STAGING_BINDIR}
-}
+NATIVE_INSTALL_WORKS = "1"
 
 do_install() {
-	:
+	install -d ${D}${bindir}/
+	install -m 0755 unifdef ${D}${bindir}
 }
-
diff --git a/recipes/units/units_1.80.bb b/recipes/units/units_1.80.bb
index d76e58dd9a..1121522e5a 100644
--- a/recipes/units/units_1.80.bb
+++ b/recipes/units/units_1.80.bb
@@ -5,8 +5,8 @@ PR = "r1"
 
 LICENSE = "GPL"
 SRC_URI = "${GNU_MIRROR}/units/units-${PV}.tar.gz \
-	   file://units.c.patch;patch=1 \
-	   file://makefile.patch;patch=1"
+	   file://units.c.patch \
+	   file://makefile.patch"
 
 inherit autotools
 
diff --git a/recipes/unrar/unrar_3.9.9.bb b/recipes/unrar/unrar_3.9.9.bb
index 21e1f23d53..f0a7ae5dd6 100644
--- a/recipes/unrar/unrar_3.9.9.bb
+++ b/recipes/unrar/unrar_3.9.9.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.rarlab.com/"
 PR = "r0"
 
 SRC_URI = "http://www.rarlab.com/rar/unrarsrc-${PV}.tar.gz;name=unrar \
-		file://makefile.unix.patch;patch=1"
+		file://makefile.unix.patch"
 SRC_URI[unrar.md5sum] = "4271fc8710d299341c969666492b305c"
 SRC_URI[unrar.sha256sum] = "460d4c014f5aaaa9b1c810dca180f07e155678b322169e20f4e51c616fa0e7ff"
 
diff --git a/recipes/unzip/unzip-native_552.bb b/recipes/unzip/unzip-native_552.bb
deleted file mode 100644
index fcd5930368..0000000000
--- a/recipes/unzip/unzip-native_552.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "console/utils"
-inherit native
-require unzip_${PV}.bb
-
-do_stage() {
-	install -d ${STAGING_BINDIR}
-	install unzip ${STAGING_BINDIR}
-}
-
-SRC_URI[md5sum] = "9d23919999d6eac9217d1f41472034a9"
-SRC_URI[sha256sum] = "145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9"
diff --git a/recipes/unzip/unzip_552.bb b/recipes/unzip/unzip_552.bb
index 87c284305e..6e3497e7bb 100644
--- a/recipes/unzip/unzip_552.bb
+++ b/recipes/unzip/unzip_552.bb
@@ -5,7 +5,11 @@ PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/infozip/UnZip%205.x%20and%20earlier/5.52/unzip${PV}.tar.gz"
 S = "${WORKDIR}/unzip-5.52"
 
-export LD = "${CC} ${LDFLAGS}"
+BBCLASSEXTEND = "native"
+
+NATIVE_INSTALL_WORKS = "1"
+
+EXTRA_OEMAKE += "'LD=${CCLD} ${LDFLAGS}'"
 
 do_compile() {
         oe_runmake -f unix/Makefile generic
@@ -17,7 +21,5 @@ do_install() {
 	mv ${D}${prefix}/man/* ${D}${mandir}
 }
 
-
-
 SRC_URI[md5sum] = "9d23919999d6eac9217d1f41472034a9"
 SRC_URI[sha256sum] = "145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9"
diff --git a/recipes/update-alternatives/update-alternatives-cworth.inc b/recipes/update-alternatives/update-alternatives-cworth.inc
index 2d8ebb49b0..7fe7795b33 100644
--- a/recipes/update-alternatives/update-alternatives-cworth.inc
+++ b/recipes/update-alternatives/update-alternatives-cworth.inc
@@ -1,8 +1,8 @@
 LICENSE = "GPL"
 SECTION = "base"
 SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://update-alternatives.use.last.patch;patch=1 \
-           file://use-opkg-dir-instead-of-ipkg.patch;patch=1 "
+           file://update-alternatives.use.last.patch \
+           file://use-opkg-dir-instead-of-ipkg.patch "
 S = "${WORKDIR}/ipkg/C"
 PACKAGE_ARCH = "all"
 
diff --git a/recipes/update-alternatives/update-alternatives-dpkg.inc b/recipes/update-alternatives/update-alternatives-dpkg.inc
index e3cdb53257..e7bd90d7f4 100644
--- a/recipes/update-alternatives/update-alternatives-dpkg.inc
+++ b/recipes/update-alternatives/update-alternatives-dpkg.inc
@@ -4,7 +4,7 @@ SRC_URI += "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
 S = "${WORKDIR}/dpkg-${PV}"
 PACKAGE_ARCH = "all"
 
-SRC_URI += "file://paths.patch;patch=1"
+SRC_URI += "file://paths.patch"
 
 do_patch_append () {
 	import shutil
diff --git a/recipes/update-rc.d/update-rc.d_0.7.bb b/recipes/update-rc.d/update-rc.d_0.7.bb
index 3217dc19f9..d2d22ab0ff 100644
--- a/recipes/update-rc.d/update-rc.d_0.7.bb
+++ b/recipes/update-rc.d/update-rc.d_0.7.bb
@@ -9,7 +9,7 @@ PR = "r1"
 BBCLASSEXTEND = "native"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_7 \
-           file://add-verbose.patch;patch=1"
+           file://add-verbose.patch"
 
 PACKAGE_ARCH = "all"
 
diff --git a/recipes/upnp/gupnp-av_0.5.2.bb b/recipes/upnp/gupnp-av_0.5.2.bb
index fca4c24ad2..053d71e41c 100644
--- a/recipes/upnp/gupnp-av_0.5.2.bb
+++ b/recipes/upnp/gupnp-av_0.5.2.bb
@@ -2,7 +2,7 @@ LICENSE = "LGPL"
 DEPENDS = "gupnp"
 
 SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz \
-           file://nodoc.patch;patch=1"
+           file://nodoc.patch"
 
 inherit autotools_stage pkgconfig
 
diff --git a/recipes/upnp/gupnp_0.13.1.bb b/recipes/upnp/gupnp_0.13.1.bb
index e9f56f8360..cd49b66435 100644
--- a/recipes/upnp/gupnp_0.13.1.bb
+++ b/recipes/upnp/gupnp_0.13.1.bb
@@ -2,7 +2,7 @@ LICENSE = "LGPL"
 DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2 gtk-doc-native libgee"
 
 SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz \
-           file://nodoc.patch;patch=1"
+           file://nodoc.patch"
 
 inherit autotools_stage pkgconfig
 
diff --git a/recipes/upnp/libdlna_0.2.3.bb b/recipes/upnp/libdlna_0.2.3.bb
index ee89cbed22..c623724319 100644
--- a/recipes/upnp/libdlna_0.2.3.bb
+++ b/recipes/upnp/libdlna_0.2.3.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1"
 DEPENDS = "sqlite3 ffmpeg"
 
 SRC_URI = "http://libdlna.geexbox.org/releases/libdlna-${PV}.tar.bz2 \
-           file://dlna.diff;patch=1"
+           file://dlna.diff"
 
 inherit autotools
 
diff --git a/recipes/upstart/upstart_0.3.8.bb b/recipes/upstart/upstart_0.3.8.bb
index 1dbbfacb5c..1b2cfb55f9 100644
--- a/recipes/upstart/upstart_0.3.8.bb
+++ b/recipes/upstart/upstart_0.3.8.bb
@@ -1,7 +1,7 @@
 require upstart.inc
 
 SRC_URI = "http://upstart.ubuntu.com/download/0.3/upstart-${PV}.tar.bz2 \
-file://autoconf_version.patch;patch=1"
+file://autoconf_version.patch"
 
 PR = "r1"
 
diff --git a/recipes/uqm/uqm_0.3.bb b/recipes/uqm/uqm_0.3.bb
index 020ee0f6d4..65dbe589e6 100644
--- a/recipes/uqm/uqm_0.3.bb
+++ b/recipes/uqm/uqm_0.3.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/uqm-${PV}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sc2/uqm-${PV}-source.tgz \
            file://build-opts.sh \
-           file://build-oe.patch;patch=1;pnum=0"
+           file://build-oe.patch;striplevel=0"
 
 do_configure() {
 	install ${WORKDIR}/build-opts.sh ${S}/
diff --git a/recipes/uqm/uqm_0.5.0.bb b/recipes/uqm/uqm_0.5.0.bb
index e59b74dd2f..ad315ea740 100644
--- a/recipes/uqm/uqm_0.5.0.bb
+++ b/recipes/uqm/uqm_0.5.0.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/uqm-${PV}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sc2/uqm-${PV}-source.tar.gz \
            file://build-opts.sh \
-           file://build-oe.patch;patch=1;pnum=0 \
+           file://build-oe.patch;striplevel=0 \
 "
 
 do_configure() {
diff --git a/recipes/usb-gadget-mode/files/beagleboard/usb-gadget.conf b/recipes/usb-gadget-mode/files/beagleboard/usb-gadget.conf
index 35ff0d4fa9..717687d4c3 100644
--- a/recipes/usb-gadget-mode/files/beagleboard/usb-gadget.conf
+++ b/recipes/usb-gadget-mode/files/beagleboard/usb-gadget.conf
@@ -1,3 +1,3 @@
-USB_MODE="composite"
+USB_MODE="networking"
 MODULE_OPTIONS=""
 
diff --git a/recipes/usb-gadget-mode/usb-gadget-mode.bb b/recipes/usb-gadget-mode/usb-gadget-mode.bb
index c8de395660..f6693645d6 100644
--- a/recipes/usb-gadget-mode/usb-gadget-mode.bb
+++ b/recipes/usb-gadget-mode/usb-gadget-mode.bb
@@ -9,7 +9,7 @@ DESCRIPTION = "Manage the default USB gadget mode"
 SECTION = "console/network"
 LICENSE = "GPL"
 PV = "0.0.2"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "\
   file://usb-gadget.conf \
diff --git a/recipes/usbview/usbview_1.0.bb b/recipes/usbview/usbview_1.0.bb
index 569c27ed27..2240da3beb 100644
--- a/recipes/usbview/usbview_1.0.bb
+++ b/recipes/usbview/usbview_1.0.bb
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.kroah.com/linux-usb/"
 LICENSE="GPL"
 
 SRC_URI="http://www.kroah.com/linux-usb/${PN}-${PV}.tar.gz \
-	file://gtk2.patch;patch=1"
+	file://gtk2.patch"
 
 DEPENDS="gtk+ pango glib-2.0 cairo atk"
 
diff --git a/recipes/usrp/usrp_0.12.bb b/recipes/usrp/usrp_0.12.bb
index 774520c712..a4708b64e1 100644
--- a/recipes/usrp/usrp_0.12.bb
+++ b/recipes/usrp/usrp_0.12.bb
@@ -7,13 +7,13 @@ RDEPENDS = "python-core"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/old/usrp-${PV}.tar.gz \
-           file://fix_compile_h.patch;patch=1;pnum=3 \
-           file://install_test.patch;patch=1"
+           file://fix_compile_h.patch;striplevel=3 \
+           file://install_test.patch"
 
 SRC_URI[md5sum] = "41ee5d5f1ef440fdd880f99c53fccf69"
 SRC_URI[sha256sum] = "c9be448984840ae960874c3c536942ba63c79a7f6a0dff3970540190b1500804"
 
-SRC_URI_append_omap5912osk = "file://usb11.patch;patch=1"
+SRC_URI_append_omap5912osk = "file://usb11.patch"
 
 S = "${WORKDIR}/usrp-${PV}"
 
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 6f8e9b3c06..10d4116262 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -2,20 +2,20 @@ DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux sys
 SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "udev zlib ncurses virtual/libintl"
-DEPENDS_virtclass-native = "zlib-native ncurses-native lzo-native"
+DEPENDS_virtclass-native = "zlib-native ncurses-native lzo-native gettext-native"
 
-inherit autotools
+inherit autotools gettext
 
 DEFAULT_PREFERENCE = "-1"
 
-INC_PR = "r21"
+INC_PR = "r24"
 
 # allows for a release candidate
 RC ?= ""
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2;name=archive"
 
-SRC_URI_append_chinook-compat = " file://chinook_libtool.patch;patch=1 "
+SRC_URI_append_chinook-compat = " file://chinook_libtool.patch "
 
 PACKAGES =+ "${PN}-fdisk ${PN}-cfdisk ${PN}-sfdisk ${PN}-swaponoff \
 	     ${PN}-losetup ${PN}-umount ${PN}-mount ${PN}-readprofile \
@@ -71,7 +71,7 @@ EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \
 --with-fsprobe=builtin --enable-libuuid --enable-libblkid \
 --enable-fsck --enable-reset"
 
-LDFLAGS_append_libc-uclibc = " -lintl"
+LDFLAGS_append_libc-uclibc = "${@['',' -lintl'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
 LDFLAGS_virtclass-native = "${BUILD_LDFLAGS}"
 
 S = "${WORKDIR}/util-linux-ng-${PV}${RC}"
@@ -125,7 +125,7 @@ do_install () {
 
         sbinprogs="agetty blockdev ctrlaltdel cfdisk vipw vigr"
         sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid"
-        usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall"
+        usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt"
         binprogs_a="dmesg kill more umount mount login reset"
 
         if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -208,6 +208,8 @@ pkg_postinst_${PN} () {
 	update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 100
 	update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 100
 	update-alternatives --install ${bindir}/reset reset reset.${PN} 100
+	update-alternatives --install ${bindir}/setsid setsid setsid.${PN} 100
+	update-alternatives --install ${bindir}/chrt chrt chrt.${PN} 100
 	
 	# There seems to be problem, atleast on nslu2, with these, until they are
 	# fixed the busybox ones have higher priority
diff --git a/recipes/util-linux-ng/util-linux-ng_2.14.bb b/recipes/util-linux-ng/util-linux-ng_2.14.bb
index 02556686b0..c13526d688 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.14.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.14.bb
@@ -2,8 +2,8 @@ require util-linux-ng.inc
 
 PR = "${INC_PR}"
 
-SRC_URI += "file://util-linux-ng-uclibc-versionsort.patch;patch=1 \
-	    file://util-linux-ng-replace-siginterrupt.patch;patch=1 \
+SRC_URI += "file://util-linux-ng-uclibc-versionsort.patch \
+	    file://util-linux-ng-replace-siginterrupt.patch \
 	   "
 
 SRC_URI[archive.md5sum] = "23f227da49df36f33fe47e917e332cd8"
diff --git a/recipes/util-linux-ng/util-linux-ng_2.15.bb b/recipes/util-linux-ng/util-linux-ng_2.15.bb
index 95677eb584..dc52fa618a 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.15.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.15.bb
@@ -2,9 +2,9 @@ require util-linux-ng.inc
 
 PR = "${INC_PR}"
 
-SRC_URI += "file://fix-make-c.patch;patch=1 \
-            file://optional-uuid.patch;patch=1 \
-            file://uclibc-compile.patch;patch=1 \
+SRC_URI += "file://fix-make-c.patch \
+            file://optional-uuid.patch \
+            file://uclibc-compile.patch \
 "
 
 do_compile_prepend() {
diff --git a/recipes/util-linux-ng/util-linux-ng_2.16.bb b/recipes/util-linux-ng/util-linux-ng_2.16.bb
index 67c253195b..614e40e77c 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.16.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.16.bb
@@ -2,9 +2,9 @@ require util-linux-ng.inc
 
 PR = "${INC_PR}"
 
-SRC_URI += "file://uclibc-compile.patch;patch=1 \
-            file://tls.patch;patch=1 \
-	    file://util-linux-ng-replace-siginterrupt.patch;patch=1 \
+SRC_URI += "file://uclibc-compile.patch \
+            file://tls.patch \
+	    file://util-linux-ng-replace-siginterrupt.patch \
            "
 
 SRC_URI[archive.md5sum] = "9623380641b0c2e0449f5b1ecc567663"
diff --git a/recipes/util-linux-ng/util-linux-ng_2.17.bb b/recipes/util-linux-ng/util-linux-ng_2.17.bb
index 9b40ee1fd7..b4352118d0 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.17.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.17.bb
@@ -2,8 +2,8 @@ require util-linux-ng.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://uclibc-compile.patch;patch=1 \
-	    file://util-linux-ng-replace-siginterrupt.patch;patch=1 \
+SRC_URI += "file://uclibc-compile.patch \
+	    file://util-linux-ng-replace-siginterrupt.patch \
            "
 
 # fallocate is glibc 2.10, fallocate64 is glibc 2.11
diff --git a/recipes/util-linux/util-linux-native_2.12r.bb b/recipes/util-linux/util-linux-native_2.12r.bb
index 9ac76b11f5..c583883b5a 100644
--- a/recipes/util-linux/util-linux-native_2.12r.bb
+++ b/recipes/util-linux/util-linux-native_2.12r.bb
@@ -6,11 +6,11 @@ DEPENDS = "zlib-native ncurses-native"
 inherit autotools native
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \
-           file://gcc34.patch;patch=1 \
+           file://gcc34.patch \
            file://MCONFIG \
            file://make_include \
            file://swapargs.h \
-	   file://fdiskbsdlabel_thumb.diff;patch=1 \
+	   file://fdiskbsdlabel_thumb.diff \
            file://defines.h"
 
 S="${WORKDIR}/util-linux-${PV}"
diff --git a/recipes/util-linux/util-linux.inc b/recipes/util-linux/util-linux.inc
index 2b527678c4..01b0ad6698 100644
--- a/recipes/util-linux/util-linux.inc
+++ b/recipes/util-linux/util-linux.inc
@@ -6,12 +6,12 @@ DEPENDS = "zlib ncurses"
 inherit autotools
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \
-           file://gcc34.patch;patch=1 \
+           file://gcc34.patch \
            file://MCONFIG \
            file://make_include \
            file://swapargs.h \
-	   file://fdiskbsdlabel_thumb.diff;patch=1 \
-	   file://umount.diff;patch=1 \
+	   file://fdiskbsdlabel_thumb.diff \
+	   file://umount.diff \
            file://defines.h"
 
 PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile "
diff --git a/recipes/util-linux/util-linux_2.12.bb b/recipes/util-linux/util-linux_2.12.bb
index 3b7bd5e33f..79a5572cc6 100644
--- a/recipes/util-linux/util-linux_2.12.bb
+++ b/recipes/util-linux/util-linux_2.12.bb
@@ -7,8 +7,8 @@ SRC_URI = "http://ftp.cwi.nl/aeb/util-linux/util-linux-${PV}.tar.gz \
            file://make_include \
            file://swapargs.h \
            file://defines.h \
-           file://my_dev_t.h.diff;patch=1 \
-           file://ioctl.diff;patch=1;pnum=1"
+           file://my_dev_t.h.diff \
+           file://ioctl.diff"
 
 SRC_URI[md5sum] = "997adf78b98d9d1c5db4f37ea982acff"
 SRC_URI[sha256sum] = "9c239b947b9a7352d88625073ab512d601da92a00703f73dc1e1b83b78b4ca1d"
diff --git a/recipes/util-linux/util-linux_2.12r.bb b/recipes/util-linux/util-linux_2.12r.bb
index ddd23b92a9..0a7f69c636 100644
--- a/recipes/util-linux/util-linux_2.12r.bb
+++ b/recipes/util-linux/util-linux_2.12r.bb
@@ -1,10 +1,10 @@
 require util-linux.inc
 
-SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
-SRC_URI += "file://glibc-fix.patch;patch=1"
-SRC_URI += "file://glibc-umount2.patch;patch=1"
-SRC_URI += "file://fdiskbsdlabel-avr32.patch;patch=1" 
-SRC_URI += "file://util-linux-2.12r-cramfs-1.patch;patch=1" 
+SRC_URI += "file://util-linux_2.12r-12.diff.gz"
+SRC_URI += "file://glibc-fix.patch"
+SRC_URI += "file://glibc-umount2.patch"
+SRC_URI += "file://fdiskbsdlabel-avr32.patch" 
+SRC_URI += "file://util-linux-2.12r-cramfs-1.patch" 
 
 PR = "r15"
 
diff --git a/recipes/uucp/uucp_1.07.bb b/recipes/uucp/uucp_1.07.bb
index 4680b4cc51..b8a62e83e7 100644
--- a/recipes/uucp/uucp_1.07.bb
+++ b/recipes/uucp/uucp_1.07.bb
@@ -7,7 +7,7 @@ PR = "r2"
 inherit autotools
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/uucp/uucp-${PV}.tar.gz \
-           file://policy.patch;patch=1"
+           file://policy.patch"
 
 do_configure() {
 	libtoolize --force
diff --git a/recipes/vagalume/vagalume_0.5.1.bb b/recipes/vagalume/vagalume_0.5.1.bb
index 62c3990e12..cefe6e95ff 100644
--- a/recipes/vagalume/vagalume_0.5.1.bb
+++ b/recipes/vagalume/vagalume_0.5.1.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 SRC_URI = "\
   http://people.igalia.com/berto/files/vagalume/source/vagalume_0.5.1-1.tar.gz \
-  file://use-png-icons.patch;patch=1 \
+  file://use-png-icons.patch \
 "
 
 inherit autotools
diff --git a/recipes/vala-terminal/vala-terminal_git.bb b/recipes/vala-terminal/vala-terminal_git.bb
index a782bf7115..a4c519d50d 100644
--- a/recipes/vala-terminal/vala-terminal_git.bb
+++ b/recipes/vala-terminal/vala-terminal_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A lightweight Terminal Emulator based on libvte, written in Vala."
 SECTION = "x11/applications"
 DEPENDS = "vala-native vte"
-SRCREV = "fda5f26710acfc0befe04c8f2e58b35bdba297f7"
+SRCREV = "0241cf2f19710b885dc060d03ec80af438e8246e"
 PV = "1.1.1+gitr${SRCPV}"
 PE = "1"
 PR = "r0"
diff --git a/recipes/vala/vala-native_0.7.10.281-f8b8-dirty.bb b/recipes/vala/vala-native_0.7.10.281-f8b8-dirty.bb
deleted file mode 100644
index d6c239f7bf..0000000000
--- a/recipes/vala/vala-native_0.7.10.281-f8b8-dirty.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require vala_${PV}.bb
-inherit native
-DEPENDS = "glib-2.0-native"
diff --git a/recipes/vala/vala-native_0.7.8.2.bb b/recipes/vala/vala-native_0.7.8.2.bb
deleted file mode 100644
index d6c239f7bf..0000000000
--- a/recipes/vala/vala-native_0.7.8.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require vala_${PV}.bb
-inherit native
-DEPENDS = "glib-2.0-native"
diff --git a/recipes/vala/vala-native_0.7.9.7.bb b/recipes/vala/vala-native_0.7.9.7.bb
deleted file mode 100644
index d6c239f7bf..0000000000
--- a/recipes/vala/vala-native_0.7.9.7.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require vala_${PV}.bb
-inherit native
-DEPENDS = "glib-2.0-native"
diff --git a/recipes/vala/vala-native_0.8.0.69-35df9.bb b/recipes/vala/vala-native_0.8.0.69-35df9.bb
deleted file mode 100644
index d6c239f7bf..0000000000
--- a/recipes/vala/vala-native_0.8.0.69-35df9.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require vala_${PV}.bb
-inherit native
-DEPENDS = "glib-2.0-native"
diff --git a/recipes/vala/vala.inc b/recipes/vala/vala.inc
index 5815866e71..7324eab4f0 100644
--- a/recipes/vala/vala.inc
+++ b/recipes/vala/vala.inc
@@ -2,13 +2,22 @@ DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming.
 Vala compiles to plain C and has no runtime environment nor penalities whatsoever."
 SECTION = "devel"
 DEPENDS = "glib-2.0 dbus"
+BBCLASSEXTEND = "native"
+DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
 HOMEPAGE = "http://vala-project.org"
 LICENSE = "LGPL"
 INC_PR = "r0"
 
-SRC_URI = "http://downloads.freesmartphone.org/sources/vala-${PV}.tar.bz2;name=archive"
+#
+# WARNING: This source release has specifically been built for OpenEmbedded.
+# Don't update to any upstream release without consulting the recipe maintainer.
+#
 
-inherit autotools_stage
+SRC_URI = "\
+  http://downloads.freesmartphone.org/sources/vala-${PV}.tar.bz2;name=archive \
+"
+
+inherit autotools
 
 EXTRA_OECONF = "--disable-vapigen"
 
diff --git a/recipes/vala/vala_0.7.10.281-f8b8-dirty.bb b/recipes/vala/vala_0.7.10.281-f8b8-dirty.bb
deleted file mode 100644
index fc72eee9b6..0000000000
--- a/recipes/vala/vala_0.7.10.281-f8b8-dirty.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require vala.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "142bac4b488bfb828f9e215c46fadcdf"
-SRC_URI[archive.sha256sum] = "3a31a1d3c275769d0a6b99aabcbd86d4b66e9c3a72868762e9e7c39ac2bc5cff"
diff --git a/recipes/vala/vala_0.7.8.2.bb b/recipes/vala/vala_0.7.8.2.bb
deleted file mode 100644
index 86fddbc51f..0000000000
--- a/recipes/vala/vala_0.7.8.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require vala.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "02ff1049f0fadf6cd384414c9c714f67"
-SRC_URI[archive.sha256sum] = "8cb781887fd91ecfa2ea2089942bb113d85ce78b5059d02278e907eef261f1b5"
diff --git a/recipes/vala/vala_0.7.9.7.bb b/recipes/vala/vala_0.7.9.7.bb
deleted file mode 100644
index 28b26ff221..0000000000
--- a/recipes/vala/vala_0.7.9.7.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require vala.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b05fd8f4420152ca0080a99750863f3f"
-SRC_URI[archive.sha256sum] = "46805e1c19707de043820a1474a8b3775ea3b698a0b539eabd7b86f0f3ad888a"
diff --git a/recipes/vala/vala_0.8.0.69-35df9.bb b/recipes/vala/vala_0.8.0.69-35df9.bb
deleted file mode 100644
index a330a73d0d..0000000000
--- a/recipes/vala/vala_0.8.0.69-35df9.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require vala.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "17df64cc716969453e43c09910746abd"
-SRC_URI[archive.sha256sum] = "0830b1f7f3001a28d4014d60183dedc7f9f8a299d04747ed9b274639c84d8184"
-
diff --git a/recipes/vala/vala_0.8.1.1.bb b/recipes/vala/vala_0.8.1.1.bb
new file mode 100644
index 0000000000..600a533432
--- /dev/null
+++ b/recipes/vala/vala_0.8.1.1.bb
@@ -0,0 +1,5 @@
+require vala.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5135c4ea472269de59121b3380bcf1cd"
+SRC_URI[archive.sha256sum] = "07fcd4140ef24dc9977aef89eab023e9e2814be4baee5e210dcdce64d084743e"
diff --git a/recipes/vblade/vblade_19.bb b/recipes/vblade/vblade_19.bb
index 0e4298c2d6..f100a46966 100644
--- a/recipes/vblade/vblade_19.bb
+++ b/recipes/vblade/vblade_19.bb
@@ -4,7 +4,7 @@ PR = "r1"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/aoetools/${PN}-${PV}.tgz \
-	   file://cross.patch;patch=1"
+	   file://cross.patch"
 
 inherit autotools
 
diff --git a/recipes/vdr/vdr_1.7.10.bb b/recipes/vdr/vdr_1.7.10.bb
index 7ac47072e2..8cc5757091 100644
--- a/recipes/vdr/vdr_1.7.10.bb
+++ b/recipes/vdr/vdr_1.7.10.bb
@@ -1,14 +1,14 @@
 require vdr.inc
 PR = "r3"
 
-SRC_URI += " file://fixpaths.patch;patch=1 \
-           file://cplusplus.patch;patch=1 \
-           file://disable_plugin.patch;patch=1 \
-           file://linkerflags.patch;patch=1 \
+SRC_URI += " file://fixpaths.patch \
+           file://cplusplus.patch \
+           file://disable_plugin.patch \
+           file://linkerflags.patch \
           "
 
-SRC_URI_append_linux-uclibceabi = " file://libintl.patch;patch=1 "
-SRC_URI_append_uclinux-uclibc = " file://libintl.patch;patch=1 "
+SRC_URI_append_linux-uclibceabi = " file://libintl.patch "
+SRC_URI_append_uclinux-uclibc = " file://libintl.patch "
 
 CFLAGS_append += " -I${STAGING_INCDIR}/freetype2"
 
diff --git a/recipes/viking/viking_0.9.6.bb b/recipes/viking/viking_0.9.6.bb
index 36d0693920..02170e7086 100644
--- a/recipes/viking/viking_0.9.6.bb
+++ b/recipes/viking/viking_0.9.6.bb
@@ -6,8 +6,8 @@ LICENSE = "GPLv2"
 PRIORITY = "optional"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/viking/viking-${PV}.tar.gz \
-	file://viking-openaerialmap.patch;patch=1 \
-	file://viking-parallel-build.patch;patch=1"
+	file://viking-openaerialmap.patch \
+	file://viking-parallel-build.patch"
 
 # libgps is linked with c++
 #export CC='${CC} -lstdc++'
diff --git a/recipes/vim/vim_7.2.bb b/recipes/vim/vim_7.2.bb
index b1d71a22b4..d79f787b07 100644
--- a/recipes/vim/vim_7.2.bb
+++ b/recipes/vim/vim_7.2.bb
@@ -14,7 +14,7 @@ require vim.inc
 PR = "${INC_PR}.1"
 
 # 001-411.diff contains 411 patches fetched from upstream
-SRC_URI += "file://001-411.diff"
+SRC_URI += "file://001-411.diff;apply=no"
 
 # we need to apply patches in other dir then ${S}
 do_applypatch() {
diff --git a/recipes/vlc/vlc-davinci_0.8.6h.bb b/recipes/vlc/vlc-davinci_0.8.6h.bb
index 4477330c0c..71520bbb9b 100644
--- a/recipes/vlc/vlc-davinci_0.8.6h.bb
+++ b/recipes/vlc/vlc-davinci_0.8.6h.bb
@@ -8,8 +8,7 @@ SRCREV = "e712a114e04a1070f1afdf31ec668cb28eda513c"
 
 PR = "r6"
 
-PV = "0.8.6h+${PR}+gitr${SRCPV}"
-PE = "1"
+PV = "0.8.6h+${PR}+gitr${SRCREV}"
 
 DEPENDS = "codec-engine dbus libxml2 gnutls tremor faad2 ffmpeg flac  \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
diff --git a/recipes/vlc/vlc-gpe_0.8.1.bb b/recipes/vlc/vlc-gpe_0.8.1.bb
index 9bc5db2eb5..9d2ead0744 100644
--- a/recipes/vlc/vlc-gpe_0.8.1.bb
+++ b/recipes/vlc/vlc-gpe_0.8.1.bb
@@ -9,8 +9,8 @@ DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz \
-	file://fix-pda.patch;patch=1 \
-	file://vlc-tremor.patch;patch=1"
+	file://fix-pda.patch \
+	file://vlc-tremor.patch"
 S = "${WORKDIR}/vlc-${PV}"
 
 inherit autotools
diff --git a/recipes/vlc/vlc-gpe_0.8.4.bb b/recipes/vlc/vlc-gpe_0.8.4.bb
index 951d0ac04a..b09566e2ee 100644
--- a/recipes/vlc/vlc-gpe_0.8.4.bb
+++ b/recipes/vlc/vlc-gpe_0.8.4.bb
@@ -9,7 +9,7 @@ DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz \
-	file://pda-interface.patch;patch=1"
+	file://pda-interface.patch"
 S = "${WORKDIR}/vlc-${PV}"
 
 export GTK2_CFLAGS  = "`${STAGING_BINDIR_NATIVE}/pkg-config --cflags gtk+-2.0 gthread-2.0`"
diff --git a/recipes/vlc/vlc_1.0.6.bb b/recipes/vlc/vlc_1.0.6.bb
new file mode 100644
index 0000000000..81d621d19a
--- /dev/null
+++ b/recipes/vlc/vlc_1.0.6.bb
@@ -0,0 +1,48 @@
+# This recipe packages vlc as a library as well, so qt4 dependencies
+# can be avoided when ony the library is installed.
+# Would be cool if when newer vlc is added to OE and older ones are phased
+# out that could be made the default.
+
+require vlc.inc
+
+SRC_URI[md5sum] = "246a3865ec037f8f5757ef6b973a80fc"
+SRC_URI[sha256sum] = "f521933e7a1021746d8ecde6caa2f9d1b43187ab2e13df6abc07540e415e1842"
+
+# ffmpeg from git (library version => 52) is required
+# libtool-native must be >= 2.2.4
+DEPENDS += "libdvdcss libdvdread"
+
+EXTRA_OECONF += "\
+	--enable-dvdread \
+"
+
+LEAD_SONAME = "libvlc.so.2"
+
+PACKAGES =+ "libvlc-dbg libvlc-dev libvlc"
+
+FILES_libvlc-dev = "${libdir}/lib*.so"
+
+FILES_libvlc-dbg = "\
+	${libdir}/.debug \
+	${libdir}/vlc/meta_engine/.debug \
+	${libdir}/vlc/audio_filter/.debug ${libdir}/vlc/audio_output/.debug \
+	${libdir}/vlc/demux/.debug ${libdir}/vlc/control/.debug \
+	${libdir}/vlc/gui/.debug ${libdir}/vlc/packetizer/.debug \
+	${libdir}/vlc/audio_mixer/.debug ${libdir}/vlc/stream_out/.debug \
+	${libdir}/vlc/mux/.debug ${libdir}/vlc/access/.debug \
+	${libdir}/vlc/visualization/.debug ${libdir}/vlc/access_filter/.debug \
+	${libdir}/vlc/access_output/.debug ${libdir}/vlc/video_output/.debug \
+	${libdir}/vlc/services_discovery/.debug ${libdir}/vlc/video_chroma/.debug \
+	${libdir}/vlc/video_codec/.debug ${libdir}/vlc/video_filter/.debug \
+	${libdir}/vlc/misc/.debug ${libdir}/vlc/codec/.debug \
+	"
+
+FILES_libvlc = "${libdir}/lib*.so.*"
+
+FILES_${PN} += "${bindir}/vlc \
+	${datadir}/applications \
+	${datadir}/vlc/ \
+	"
+
+FILES_${PN}-dbg	+= "${libdir}/vlc/*/.debug"
+
diff --git a/recipes/vlc/x264_r2245.bb b/recipes/vlc/x264_r2245.bb
index f460a00156..b8bf89d0f3 100644
--- a/recipes/vlc/x264_r2245.bb
+++ b/recipes/vlc/x264_r2245.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "H.264 encoder"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
 X264PV = "snapshot-20090928-2245"
 
@@ -12,6 +12,7 @@ inherit autotools lib_package pkgconfig
 
 # default --extra-cflags
 X264_ECFLAGS = ""
+X264_ECFLAGS_mips = "-fPIC"
 
 # disable use of assembler written functions
 X264_DISABLE_ASM = "--disable-asm"
diff --git a/recipes/vnc/fbvncserver-kmodule_0.9.4.bb b/recipes/vnc/fbvncserver-kmodule_0.9.4.bb
index 80751a8b25..15a4102301 100644
--- a/recipes/vnc/fbvncserver-kmodule_0.9.4.bb
+++ b/recipes/vnc/fbvncserver-kmodule_0.9.4.bb
@@ -4,10 +4,10 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
-           file://libvncs0.6.patch;patch=1 \
-	   file://paths.patch;patch=1 \
-	   file://kernelinclude.patch;patch=1 \
-           file://ipaq.patch;patch=1"
+           file://libvncs0.6.patch \
+	   file://paths.patch \
+	   file://kernelinclude.patch \
+           file://ipaq.patch"
 
 S = "${WORKDIR}/fbvncserver-${PV}"
 
diff --git a/recipes/vnc/fbvncserver_0.9.4.bb b/recipes/vnc/fbvncserver_0.9.4.bb
index e1744f942b..7a913bbe47 100644
--- a/recipes/vnc/fbvncserver_0.9.4.bb
+++ b/recipes/vnc/fbvncserver_0.9.4.bb
@@ -7,11 +7,11 @@ RDEPENDS = "fbvncserver-kmodule libvncserver-storepasswd libvncserver-javaapplet
 PR = "r3"
 
 SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
-           file://libvncs0.6.patch;patch=1 \
-           file://paths.patch;patch=1 \
-           file://kernelinclude.patch;patch=1 \
-	   file://buildfix.patch;patch=1 \
-	   file://ipaq.patch;patch=1 \
+           file://libvncs0.6.patch \
+           file://paths.patch \
+           file://kernelinclude.patch \
+	   file://buildfix.patch \
+	   file://ipaq.patch \
            file://init"
 
 S = "${WORKDIR}/fbvncserver-${PV}"
diff --git a/recipes/vnc/libvncserver_0.9.1.bb b/recipes/vnc/libvncserver_0.9.1.bb
index f23af16ffb..958f0a2069 100644
--- a/recipes/vnc/libvncserver_0.9.1.bb
+++ b/recipes/vnc/libvncserver_0.9.1.bb
@@ -10,9 +10,9 @@ PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI  = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz \
-            file://configure_ac.patch;patch=1 \
-            file://clientlogger.patch;patch=1 \
-            file://autoreconf.patch;patch=1"
+            file://configure_ac.patch \
+            file://clientlogger.patch \
+            file://autoreconf.patch"
 S = "${WORKDIR}/LibVNCServer-${PV}"
 
 # => create libvncserver only
diff --git a/recipes/vnc/x11vnc_0.9.8.bb b/recipes/vnc/x11vnc_0.9.8.bb
index a7ecde75f6..7374c1324a 100644
--- a/recipes/vnc/x11vnc_0.9.8.bb
+++ b/recipes/vnc/x11vnc_0.9.8.bb
@@ -7,7 +7,7 @@ DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib"
 
 PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz \
-	   file://x11vnc-0.9.8-xshm-header-fix.patch;patch=1"
+	   file://x11vnc-0.9.8-xshm-header-fix.patch"
 
 inherit autotools
 
diff --git a/recipes/void11/void11_0.2.0.bb b/recipes/void11/void11_0.2.0.bb
index 3ef1e18bfc..3ae12a9d0b 100644
--- a/recipes/void11/void11_0.2.0.bb
+++ b/recipes/void11/void11_0.2.0.bb
@@ -6,7 +6,7 @@ FILES_${PN} += "${libdir}/libvoid11.so"
 
 SRC_URI = "http://www.wirelessdefence.org/Contents/Files/void11-0.2.0.tar.bz2;name=archive \
            http://hostap.epitest.fi/releases/hostapd-0.1.3.tar.gz;name=hostapd \
-           file://oezc.patch;patch=1;pnum=1"
+           file://oezc.patch"
 
 S = "${WORKDIR}/void11-0.2.0"
 
diff --git a/recipes/vorbis-tools/vorbis-tools_1.0.1.bb b/recipes/vorbis-tools/vorbis-tools_1.0.1.bb
index 3c77ad97f2..e9c01da4a6 100644
--- a/recipes/vorbis-tools/vorbis-tools_1.0.1.bb
+++ b/recipes/vorbis-tools/vorbis-tools_1.0.1.bb
@@ -7,8 +7,8 @@ SECTION = "console/multimedia"
 PR = "r1"
 
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/vorbis-tools-${PV}.tar.gz \
-           file://m4.patch;patch=1 \
-           file://remove-deprecated-curl-option.patch;patch=1"
+           file://m4.patch \
+           file://remove-deprecated-curl-option.patch"
 
 inherit autotools
 
diff --git a/recipes/vpnc/vpnc_0.3.3.bb b/recipes/vpnc/vpnc_0.3.3.bb
index f9c305fc7b..10802d6844 100644
--- a/recipes/vpnc/vpnc_0.3.3.bb
+++ b/recipes/vpnc/vpnc_0.3.3.bb
@@ -3,7 +3,7 @@ require vpnc.inc
 PR = "r2"
 
 SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \
-           file://vpnc-script.patch;patch=1 \
+           file://vpnc-script.patch \
            file://default.conf"
 
 SRC_URI[md5sum] = "e7518cff21326fe7eb9795b60c25ae6a"
diff --git a/recipes/vpnc/vpnc_0.5.1.bb b/recipes/vpnc/vpnc_0.5.1.bb
index 852826daa7..59f191f61f 100644
--- a/recipes/vpnc/vpnc_0.5.1.bb
+++ b/recipes/vpnc/vpnc_0.5.1.bb
@@ -3,7 +3,7 @@ require vpnc.inc
 PR = "r0"
 
 SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \
-           file://makeman.patch;patch=1 \
+           file://makeman.patch \
            file://vpnc${PV}--long-help \
            file://default.conf"
 
diff --git a/recipes/vpnc/vpnc_0.5.3.bb b/recipes/vpnc/vpnc_0.5.3.bb
index b5045ad5bb..2c5fc3d9e7 100644
--- a/recipes/vpnc/vpnc_0.5.3.bb
+++ b/recipes/vpnc/vpnc_0.5.3.bb
@@ -3,8 +3,8 @@ require vpnc.inc
 PR = "r1"
 
 SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \
-           file://makeman.patch;patch=1 \
-           file://vpnc-install.patch;patch=1 \
+           file://makeman.patch \
+           file://vpnc-install.patch \
            file://vpnc${PV}--long-help \
            file://default.conf"
 
diff --git a/recipes/vsftpd/vsftpd-charconv_2.0.5.bb b/recipes/vsftpd/vsftpd-charconv_2.0.5.bb
index 39e5712406..6b9709e5f9 100644
--- a/recipes/vsftpd/vsftpd-charconv_2.0.5.bb
+++ b/recipes/vsftpd/vsftpd-charconv_2.0.5.bb
@@ -6,10 +6,10 @@ PR = "r1"
 FILESPATH_append = ":${@os.path.dirname(bb.data.getVar('FILE',d,1))}/vsftpd-2.0.5"
 
 SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \
-           file://vsftpd-charconv.patch;patch=1 \
-           file://makefile.patch;patch=1 \
-           file://nopam.patch;patch=1 \
-           file://syscall.patch;patch=1 \
+           file://vsftpd-charconv.patch \
+           file://makefile.patch \
+           file://nopam.patch \
+           file://syscall.patch \
            file://init \
            file://vsftpd.conf"
 	   
diff --git a/recipes/vsftpd/vsftpd_2.0.5.bb b/recipes/vsftpd/vsftpd_2.0.5.bb
index 00f4fd86cc..0b9e75dbb5 100644
--- a/recipes/vsftpd/vsftpd_2.0.5.bb
+++ b/recipes/vsftpd/vsftpd_2.0.5.bb
@@ -4,9 +4,9 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \
-           file://makefile.patch;patch=1 \
-           file://nopam.patch;patch=1 \
-           file://syscall.patch;patch=1 \
+           file://makefile.patch \
+           file://nopam.patch \
+           file://syscall.patch \
            file://init \
            file://vsftpd.conf"
 
diff --git a/recipes/vte/vte.inc b/recipes/vte/vte.inc
index 08642287d5..490792e41d 100644
--- a/recipes/vte/vte.inc
+++ b/recipes/vte/vte.inc
@@ -5,7 +5,7 @@ DEPENDS += "glib-2.0 gtk+ intltool-native ncurses"
 inherit gnome
 
 SRC_URI += "\
-  file://vte-pkgconfig-fixes.patch;patch=1 \
+  file://vte-pkgconfig-fixes.patch \
   file://vte.desktop.in \
 "
 
diff --git a/recipes/vtun/vtun_2.6.bb b/recipes/vtun/vtun_2.6.bb
index fc9a752079..ddb988da81 100644
--- a/recipes/vtun/vtun_2.6.bb
+++ b/recipes/vtun/vtun_2.6.bb
@@ -8,7 +8,7 @@ PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/vtun/vtun-${PV}.tar.gz \
 	file://init \
-	file://makefile.in-ldflags.patch;patch=1;pnum=0"
+	file://makefile.in-ldflags.patch;striplevel=0"
 
 S = "${WORKDIR}/vtun"
 
diff --git a/recipes/w3cam/w3cam_0.7.2.bb b/recipes/w3cam/w3cam_0.7.2.bb
index e60f3ab9cd..5ec857b87b 100644
--- a/recipes/w3cam/w3cam_0.7.2.bb
+++ b/recipes/w3cam/w3cam_0.7.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLV2"
 PR = "r0"
 
 SRC_URI = "http://mpx.freeshell.net/w3cam-0.7.2.tar.gz \
-	   file://staticpaths.patch;patch=1"
+	   file://staticpaths.patch"
 
 S = "${WORKDIR}/w3cam-0.7.2/"
 
diff --git a/recipes/webkit/qtwebkit-performance-utilities.inc b/recipes/webkit/qtwebkit-performance-utilities.inc
index eca18da6fe..1fc7edbaab 100644
--- a/recipes/webkit/qtwebkit-performance-utilities.inc
+++ b/recipes/webkit/qtwebkit-performance-utilities.inc
@@ -5,7 +5,7 @@ INC_PR = "r1"
 
 SRC_URI = "git://gitorious.org/qtwebkit/performance.git;protocol=git"
 S = "${WORKDIR}/git"
-PV = "0.1+gitr${SRCPV}"
+PV = "0.1+gitr${SRCREV}"
 
 EXTRA_QMAKEVARS_PRE += "INSTALL_DIR=${bindir}"
 
diff --git a/recipes/webkit/webkit-efl_git.bb b/recipes/webkit/webkit-efl_git.bb
index 3f437cabf9..99942c3636 100644
--- a/recipes/webkit/webkit-efl_git.bb
+++ b/recipes/webkit/webkit-efl_git.bb
@@ -9,8 +9,8 @@ PV = "1.1.11+gitr${SRCPV}"
 PR = "r5"
 
 SRC_URI = "git://gitorious.org/webkit-efl/webkit-efl.git;protocol=git;branch=master \
-           file://fix-build-with-newer-evas.patch;patch=1 \
-           file://fix-build-with-newer-ecore.patch;patch=1"
+           file://fix-build-with-newer-evas.patch \
+           file://fix-build-with-newer-ecore.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/wget/wget_1.9.1.bb b/recipes/wget/wget_1.9.1.bb
index 0c3343b29b..900921de5c 100644
--- a/recipes/wget/wget_1.9.1.bb
+++ b/recipes/wget/wget_1.9.1.bb
@@ -2,9 +2,9 @@ PR = "${INC_PR}.0"
 
 SRC_URI = " \
 	${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
-	file://m4macros.patch;patch=1 \
-	file://autotools.patch;patch=1 \
-        file://ipv6-fix.patch;patch=1 \
+	file://m4macros.patch \
+	file://autotools.patch \
+        file://ipv6-fix.patch \
 "
 
 S = "${WORKDIR}/wget-${PV}"
diff --git a/recipes/wifi-radar/wifi-radar_1.9.6.bb b/recipes/wifi-radar/wifi-radar_1.9.6.bb
index 59c72893cc..a50f6027c9 100644
--- a/recipes/wifi-radar/wifi-radar_1.9.6.bb
+++ b/recipes/wifi-radar/wifi-radar_1.9.6.bb
@@ -10,8 +10,8 @@ PACKAGE_ARCH = "all"
 RDEPENDS = "python-core python-pygtk python-re python-io python-pygobject python-pycairo"
 
 SRC_URI="http://wifi-radar.systemimager.org/pub/${PN}-${PV}.tar.bz2 \
-        file://wifi-radar.patch;patch=1 \
-        file://wifi-radar_destktop.patch;patch=1 "
+        file://wifi-radar.patch \
+        file://wifi-radar_destktop.patch "
 
 
 S = "${WORKDIR}/${PN}-${PV}"
diff --git a/recipes/wifistix/wifistix-modules_5.0.16.p0.bb b/recipes/wifistix/wifistix-modules_5.0.16.p0.bb
index 4a7fb37805..c97bc9e6ea 100644
--- a/recipes/wifistix/wifistix-modules_5.0.16.p0.bb
+++ b/recipes/wifistix/wifistix-modules_5.0.16.p0.bb
@@ -13,18 +13,18 @@ PR = "r0"
 SRC_URI = "http://files.gumstix.com/cf8385-5.0.16.p0-26306.tbz \
 			file://wifistix.conf \
 			file://mcf25 \
-			file://marvell-devicename.patch;patch=1 \
-			file://marvell-devicetable.patch;patch=1 \
-			file://marvell-gumstix.patch;patch=1 \
-			file://sbi-no-inline.patch;patch=1 \
-			file://2.6.17-new-pcmcia-layer.patch;patch=1 \
-			file://bad-cast.patch;patch=1 \
-			file://sk_buff.patch;patch=1 \
-			file://struct-changes.patch;patch=1 \
-			file://no-more-config-h.patch;patch=1 \
-			file://realtime-kernel.patch;patch=1 \
-			file://install-properly.patch;patch=1 \
-			file://fix-essid-truncation.patch;patch=1"
+			file://marvell-devicename.patch \
+			file://marvell-devicetable.patch \
+			file://marvell-gumstix.patch \
+			file://sbi-no-inline.patch \
+			file://2.6.17-new-pcmcia-layer.patch \
+			file://bad-cast.patch \
+			file://sk_buff.patch \
+			file://struct-changes.patch \
+			file://no-more-config-h.patch \
+			file://realtime-kernel.patch \
+			file://install-properly.patch \
+			file://fix-essid-truncation.patch"
 
 S = "${WORKDIR}/src_cf8385"
 
diff --git a/recipes/wiggle/wiggle_0.6.bb b/recipes/wiggle/wiggle_0.6.bb
index 4cfcf8cc68..ea1ac77ced 100644
--- a/recipes/wiggle/wiggle_0.6.bb
+++ b/recipes/wiggle/wiggle_0.6.bb
@@ -5,11 +5,11 @@ SECTION = "console/utils"
 PR = "r1"
 
 SRC_URI = "http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/wiggle-${PV}.tar.gz \
-	   file://001NoQuietTime;patch=1 \
-	   file://002SpecFile;patch=1 \
-	   file://003Recommit;patch=1 \
-	   file://004ExtractFix;patch=1 \
-	   file://005Pchanges;patch=1"
+	   file://001NoQuietTime;apply=yes \
+	   file://002SpecFile;apply=yes \
+	   file://003Recommit;apply=yes \
+	   file://004ExtractFix;apply=yes \
+	   file://005Pchanges;apply=yes"
 S = "${WORKDIR}/wiggle-${PV}"
 
 export MANDIR = "${mandir}"
diff --git a/recipes/wireless-tools/wireless-tools.inc b/recipes/wireless-tools/wireless-tools.inc
index c52e01aa7f..a6bc6a8373 100644
--- a/recipes/wireless-tools/wireless-tools.inc
+++ b/recipes/wireless-tools/wireless-tools.inc
@@ -6,8 +6,8 @@ LICENSE = "GPL"
 
 SRC_URI = "\
   http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \
-  file://man.patch;patch=1 \
-  file://shared_lib_ldflags.patch;patch=1 \
+  file://man.patch \
+  file://shared_lib_ldflags.patch \
   file://wireless-tools.if-pre-up \
   file://zzz-wireless.if-pre-up"
 S = "${WORKDIR}/wireless_tools.${PV}"
diff --git a/recipes/wireshark/wireshark.inc b/recipes/wireshark/wireshark.inc
index 13715ea273..4ffe8fa313 100644
--- a/recipes/wireshark/wireshark.inc
+++ b/recipes/wireshark/wireshark.inc
@@ -4,10 +4,10 @@ LICENSE = "GPL"
 DEPENDS = "perl-native gnutls libpcap pcre expat glib-2.0 net-snmp"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wireshark/wireshark-${PV}.tar.bz2 \
-           file://use-our-lemon.patch;patch=1 \
-           file://acinclude-net-snmp-fix.patch;patch=1 \
-           file://libtool-fix.patch;patch=1 \
-	   file://no-host-includes.patch;patch=1"
+           file://use-our-lemon.patch \
+           file://acinclude-net-snmp-fix.patch \
+           file://libtool-fix.patch \
+	   file://no-host-includes.patch"
 
 S=${WORKDIR}/wireshark-${PV}
 
diff --git a/recipes/wireshark/wireshark_1.2.6.bb b/recipes/wireshark/wireshark_1.2.6.bb
index 1af48e8577..610db05e02 100644
--- a/recipes/wireshark/wireshark_1.2.6.bb
+++ b/recipes/wireshark/wireshark_1.2.6.bb
@@ -9,8 +9,8 @@ EXTRA_OECONF = "--enable-usr-local=no --with-pcap=${STAGING_DIR_HOST}${layout_pr
 PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wireshark/wireshark-${PV}.tar.bz2;name=src \
-           file://ieee80215.4.patch;patch=1 \
-           file://fix-configure.patch;patch=1 "
+           file://ieee80215.4.patch \
+           file://fix-configure.patch "
 SRC_URI[src.md5sum] = "f3e0917ed393366bbf96c53b58cb0931"
 SRC_URI[src.sha256sum]= "72c8178dd0614d963173d667d5ecb39bc7102453ea09da7ef3302daee7733f3c"
 
diff --git a/recipes/wlags-modules/wlags-modules_718.inc b/recipes/wlags-modules/wlags-modules_718.inc
index c3f49872d6..0bc20d1c41 100644
--- a/recipes/wlags-modules/wlags-modules_718.inc
+++ b/recipes/wlags-modules/wlags-modules_718.inc
@@ -24,10 +24,10 @@ TARFILE = "wl_lkm_${PV}_release.tar.gz"
 
 SRC_URI = "ftp://ftp.elmeg.de/artem/ClientCards/11b/linux/${TARFILE} \
 	file://Makefile \
-	file://includes.patch \
-	file://kernel-pcmcia.patch \
-	file://bugs.patch \
-	file://fixes.patch \
+	file://includes.patch;apply=no \
+	file://kernel-pcmcia.patch;apply=no \
+	file://bugs.patch;apply=no \
+	file://fixes.patch;apply=no \
 	file://wlags_h${COMPILE_HERMES}.conf"
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/wlan-ng/wlan-ng-modules.inc b/recipes/wlan-ng/wlan-ng-modules.inc
index 585c33919c..c974394302 100644
--- a/recipes/wlan-ng/wlan-ng-modules.inc
+++ b/recipes/wlan-ng/wlan-ng-modules.inc
@@ -7,13 +7,13 @@ SECTION = "kernel/modules"
 DEPENDS = "virtual/kernel"
 LICENSE = "GPL"
 
-SRC_URI = "file://no-compat.patch;patch=1 \
-	file://msleep-vs-mdelay.patch;patch=1 \
-	file://might-sleep.patch;patch=1 \
-	file://only-the-modules.patch;patch=1 \
-#	file://module_param_array.patch;patch=1 \
-	file://scripts-makefile-hostcc.patch;patch=1 \
-	file://pcmciasrc.patch;patch=1 \
+SRC_URI = "file://no-compat.patch \
+	file://msleep-vs-mdelay.patch \
+	file://might-sleep.patch \
+	file://only-the-modules.patch \
+#	file://module_param_array.patch \
+	file://scripts-makefile-hostcc.patch \
+	file://pcmciasrc.patch \
 	file://config.in"
 
 inherit module
diff --git a/recipes/wlan-ng/wlan-ng-modules_0.2.7.bb b/recipes/wlan-ng/wlan-ng-modules_0.2.7.bb
index ae66dccba2..6dea4e83d0 100644
--- a/recipes/wlan-ng/wlan-ng-modules_0.2.7.bb
+++ b/recipes/wlan-ng/wlan-ng-modules_0.2.7.bb
@@ -3,7 +3,7 @@ require wlan-ng-modules.inc
 PR = "r2"
 
 SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-	    file://2.6.22-fixes.patch;patch=1"
+	    file://2.6.22-fixes.patch"
 
 S = "${WORKDIR}/linux-wlan-ng-${PV}"
 
diff --git a/recipes/wlan-ng/wlan-ng-utils.inc b/recipes/wlan-ng/wlan-ng-utils.inc
index 736e12b942..0624bd4b03 100644
--- a/recipes/wlan-ng/wlan-ng-utils.inc
+++ b/recipes/wlan-ng/wlan-ng-utils.inc
@@ -7,7 +7,7 @@ SECTION = "kernel/userland"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
 
-SRC_URI = "file://only-the-utils.patch;patch=1 \
+SRC_URI = "file://only-the-utils.patch \
 	file://wlan-ng.modutils \
 	file://wlan.agent \
 	file://resume \
diff --git a/recipes/wlan-ng/wlan-ng-utils_0.2.7.bb b/recipes/wlan-ng/wlan-ng-utils_0.2.7.bb
index 56f5a0afbd..dced11c2e3 100644
--- a/recipes/wlan-ng/wlan-ng-utils_0.2.7.bb
+++ b/recipes/wlan-ng/wlan-ng-utils_0.2.7.bb
@@ -1,9 +1,9 @@
 require wlan-ng-utils.inc
 
 SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-        file://scripts-makefile-hostcc.patch;patch=1 \
-	file://pcmciasrc.patch;patch=1 \
-	file://hostldflags.patch;patch=1"
+        file://scripts-makefile-hostcc.patch \
+	file://pcmciasrc.patch \
+	file://hostldflags.patch"
 
 S = "${WORKDIR}/linux-wlan-ng-${PV}"
 
diff --git a/recipes/wlan-ng/wlan-ng-utils_0.2.8.bb b/recipes/wlan-ng/wlan-ng-utils_0.2.8.bb
index 21262b9386..42fafab2cf 100644
--- a/recipes/wlan-ng/wlan-ng-utils_0.2.8.bb
+++ b/recipes/wlan-ng/wlan-ng-utils_0.2.8.bb
@@ -1,9 +1,9 @@
 require wlan-ng-utils.inc
 
 SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-        file://scripts-makefile-hostcc.patch;patch=1 \
-	file://pcmciasrc.patch;patch=1 \
-	file://hostldflags.patch;patch=1"
+        file://scripts-makefile-hostcc.patch \
+	file://pcmciasrc.patch \
+	file://hostldflags.patch"
 
 S = "${WORKDIR}/linux-wlan-ng-${PV}"
 
diff --git a/recipes/wlan-ng/wlan-ng-utils_svn.bb b/recipes/wlan-ng/wlan-ng-utils_svn.bb
index 059dc0ee2b..9a9c1c745a 100644
--- a/recipes/wlan-ng/wlan-ng-utils_svn.bb
+++ b/recipes/wlan-ng/wlan-ng-utils_svn.bb
@@ -6,8 +6,8 @@ PR = "r0"
 PV = "0.2.8+svnr${SRCPV}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
-        file://scripts-makefile-hostcc.patch;patch=1 \
-	file://pcmciasrc.patch;patch=1 \
-	file://hostldflags.patch;patch=1"
+        file://scripts-makefile-hostcc.patch \
+	file://pcmciasrc.patch \
+	file://hostldflags.patch"
 
 S = "${WORKDIR}/trunk"
diff --git a/recipes/wpa-supplicant/wpa-gui_0.6.9.bb b/recipes/wpa-supplicant/wpa-gui_0.6.9.bb
index 95f316113e..3a230c0bfe 100644
--- a/recipes/wpa-supplicant/wpa-gui_0.6.9.bb
+++ b/recipes/wpa-supplicant/wpa-gui_0.6.9.bb
@@ -11,10 +11,10 @@ RRECOMMENDS = "${LIBC}-gconv-utf-16"
 PR = "r1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz;name=archive\
-         file://icons.patch;patch=1 \
-         file://session_manager.patch;patch=1 "
+         file://icons.patch \
+         file://session_manager.patch "
 
-SRC_URI_append_shr = "file://desktop.patch;patch=1 \
+SRC_URI_append_shr = "file://desktop.patch \
 	              file://style"
 
 S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant/wpa_gui-qt4"
diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.6.inc b/recipes/wpa-supplicant/wpa-supplicant-0.6.inc
index bb43612c50..371f2769b0 100644
--- a/recipes/wpa-supplicant/wpa-supplicant-0.6.inc
+++ b/recipes/wpa-supplicant/wpa-supplicant-0.6.inc
@@ -16,7 +16,7 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 	file://ifupdown.sh \
 	file://functions.sh"
 
-#	file://gnutlsfix.patch;patch=1 \
+#	file://gnutlsfix.patch \
 
 S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant"
 
diff --git a/recipes/wpa-supplicant/wpa-supplicant_0.4.7.bb b/recipes/wpa-supplicant/wpa-supplicant_0.4.7.bb
index abfd42e16d..00aa45dffd 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_0.4.7.bb
+++ b/recipes/wpa-supplicant/wpa-supplicant_0.4.7.bb
@@ -8,10 +8,10 @@ DEPENDS_append_mtx-2 = " madwifi-modules"
 PR = "r1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
-	file://madwifi-bsd-fix.diff;patch=1;pnum=0 \
+	file://madwifi-bsd-fix.diff;striplevel=0 \
 	file://defconfig \
-        file://driver-hermes.patch;patch=1 \
-	file://driver-zd1211.patch;patch=1 \
+        file://driver-hermes.patch \
+	file://driver-zd1211.patch \
 	file://wpa_supplicant.conf"
 
 S = "${WORKDIR}/wpa_supplicant-${PV}"
diff --git a/recipes/wpa-supplicant/wpa-supplicant_0.4.8.bb b/recipes/wpa-supplicant/wpa-supplicant_0.4.8.bb
index 6c7466e018..17f7497b3c 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_0.4.8.bb
+++ b/recipes/wpa-supplicant/wpa-supplicant_0.4.8.bb
@@ -8,10 +8,10 @@ RREPLACES_${PN} = "wpa-supplicant-nossl"
 PR = "r8"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
-	file://madwifi-bsd-fix.diff;patch=1;pnum=0 \
+	file://madwifi-bsd-fix.diff;striplevel=0 \
 	file://defconfig \
-        file://driver-hermes.patch;patch=1 \
-	file://driver-zd1211.patch;patch=1 \
+        file://driver-hermes.patch \
+	file://driver-zd1211.patch \
 	file://wpa-supplicant.sh \
 	file://wpa_supplicant.conf"
 
diff --git a/recipes/wpa-supplicant/wpa-supplicant_0.4.9.bb b/recipes/wpa-supplicant/wpa-supplicant_0.4.9.bb
index 366f4fa275..8c56521616 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_0.4.9.bb
+++ b/recipes/wpa-supplicant/wpa-supplicant_0.4.9.bb
@@ -8,10 +8,10 @@ RREPLACES_${PN} = "wpa-supplicant-nossl"
 PR = "r0"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
-	file://madwifi-bsd-fix.diff;patch=1;pnum=0 \
+	file://madwifi-bsd-fix.diff;striplevel=0 \
 	file://defconfig \
-        file://driver-hermes.patch;patch=1 \
-	file://driver-zd1211.patch;patch=1 \
+        file://driver-hermes.patch \
+	file://driver-zd1211.patch \
 	file://wpa-supplicant.sh \
 	file://wpa_supplicant.conf"
 
diff --git a/recipes/wrt/loader_0.04.bb b/recipes/wrt/loader_0.04.bb
index 6cfbd4c87c..55b7e4ed7f 100644
--- a/recipes/wrt/loader_0.04.bb
+++ b/recipes/wrt/loader_0.04.bb
@@ -1,5 +1,5 @@
 SRC_URI = "http://wl500g.dyndns.org/loader/loader-${PV}.tar.gz \
-	file://toolchain.patch;patch=1"
+	file://toolchain.patch"
 
 S = "${WORKDIR}/${P}"
 
diff --git a/recipes/wrt/wrt-utils.bb b/recipes/wrt/wrt-utils.bb
index 7e02f6830c..e5145ea3f6 100644
--- a/recipes/wrt/wrt-utils.bb
+++ b/recipes/wrt/wrt-utils.bb
@@ -3,8 +3,8 @@ SECTION = "base"
 LICENSE = "broadcom"
 SRC_URI = "cvs://anonymous@openwrt.org/openwrt;module=openwrt/package/openwrt;tag=TESTED \
 	http://openwrt.inf.fh-brs.de/mirror/linksys-wlconf.tar.gz \
-	file://nvram-makefile.diff;patch=1;pnum=0 \
-	file://libshared-makefile.diff;patch=1;pnum=0"
+	file://nvram-makefile.diff;striplevel=0 \
+	file://libshared-makefile.diff;striplevel=0"
 
 S = "${WORKDIR}/openwrt"
 
diff --git a/recipes/wt/wt3.inc b/recipes/wt/wt3.inc
index db4e95dcbb..9cda6aee7f 100644
--- a/recipes/wt/wt3.inc
+++ b/recipes/wt/wt3.inc
@@ -11,8 +11,8 @@ INC_PR = "r1"
 # the api of these versions is incompatible with 2.*
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz;name=tarball \
-	file://ext.patch;patch=1 \
-	file://wgooglemap.patch;patch=1"
+	file://ext.patch \
+	file://wgooglemap.patch"
 
 CXXFLAGS += "-Dsinl=sin -Dcosl=cos -Dasinl=asin"
 
diff --git a/recipes/wt/wt3_2.99.0.bb b/recipes/wt/wt3_2.99.0.bb
index 76b4630eec..0f4e7a6cb5 100644
--- a/recipes/wt/wt3_2.99.0.bb
+++ b/recipes/wt/wt3_2.99.0.bb
@@ -2,7 +2,7 @@ require wt3.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://src.patch;patch=1 \
+SRC_URI += "file://src.patch \
            "
 
 do_configure_append() {
diff --git a/recipes/wt/wt3_3.0.0.bb b/recipes/wt/wt3_3.0.0.bb
index 69c9abd62e..50027d2bd3 100644
--- a/recipes/wt/wt3_3.0.0.bb
+++ b/recipes/wt/wt3_3.0.0.bb
@@ -2,7 +2,7 @@ require wt3.inc
 
 PR = "${INC_PR}.2"
 
-SRC_URI += "file://noqt.patch;patch=1"
+SRC_URI += "file://noqt.patch"
 
 SRC_URI[tarball.md5sum] = "ba03acf8089dff38e106661aa1ecdcb9"
 SRC_URI[tarball.sha256sum] = "d439e96d2de8c22f682b5d3d5894974d50b3a36057a002bda1ad1cb858cd3b28"
diff --git a/recipes/wt/wt3_3.1.0a.bb b/recipes/wt/wt3_3.1.0a.bb
index 8072ba98b7..43a113226e 100644
--- a/recipes/wt/wt3_3.1.0a.bb
+++ b/recipes/wt/wt3_3.1.0a.bb
@@ -2,7 +2,7 @@ require wt3.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://noqt.patch;patch=1"
+SRC_URI += "file://noqt.patch"
 
 SRC_URI[tarball.md5sum] = "9b2f4abc2e50d1fa15648834f5830d87"
 SRC_URI[tarball.sha256sum] = "97c8ddcd690381c4cd787b0099e753954c11016321fa991268c92276351fbc4c"
diff --git a/recipes/wt/wt_2.2.0.bb b/recipes/wt/wt_2.2.0.bb
index 8918a954d0..3fb2d18f6f 100644
--- a/recipes/wt/wt_2.2.0.bb
+++ b/recipes/wt/wt_2.2.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "boost"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \
-	file://cmakelist.patch;patch=1"
+	file://cmakelist.patch"
 
 FILES_${PN} += "${datadir}/Wt"
 FILES_${PN}-dev += "${datadir}/cmake-2.*"
diff --git a/recipes/wt/wt_2.2.3.bb b/recipes/wt/wt_2.2.3.bb
index 2dff0fb159..c25864ae29 100644
--- a/recipes/wt/wt_2.2.3.bb
+++ b/recipes/wt/wt_2.2.3.bb
@@ -7,7 +7,7 @@ DEPENDS = "boost zlib openssl"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \
-	file://cmakelist.patch;patch=1"
+	file://cmakelist.patch"
 
 FILES_${PN} += "${datadir}/Wt"
 FILES_${PN}-dev += "${datadir}/cmake-2.*"
diff --git a/recipes/wv/wv_1.2.4.bb b/recipes/wv/wv_1.2.4.bb
index 8b773270c5..89d05041dc 100644
--- a/recipes/wv/wv_1.2.4.bb
+++ b/recipes/wv/wv_1.2.4.bb
@@ -5,7 +5,7 @@ DEPENDS = "libgsf glib-2.0"
 PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz;name=src \
-           file://pkgconfig.patch;patch=1"
+           file://pkgconfig.patch"
 SRC_URI[src.md5sum] = "c1861c560491f121e12917fa76970ac5"
 SRC_URI[src.sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6"
 
diff --git a/recipes/wvdial/wvdial_1.56.bb b/recipes/wvdial/wvdial_1.56.bb
index af9275fad8..c6af1af0c2 100644
--- a/recipes/wvdial/wvdial_1.56.bb
+++ b/recipes/wvdial/wvdial_1.56.bb
@@ -5,7 +5,7 @@ PR = "r1"
 
 LICENSE = "LGPL"
 SRC_URI = "http://www.alumnit.ca/download/wvdial-1.56.tar.gz \
-           file://fixmakefile.patch;patch=1"
+           file://fixmakefile.patch"
 
 DEPENDS = "wvstreams"
 RDEPENDS = "ppp"
diff --git a/recipes/wview/wview-common.inc b/recipes/wview/wview-common.inc
index c9bdc805b9..713c455220 100644
--- a/recipes/wview/wview-common.inc
+++ b/recipes/wview/wview-common.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.wviewweather.com/"
 DEPENDS += " bash util-linux gd openssl curl update-rc.d"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wview/wview-${PV}.tar.gz \
-	file://Makefile.am.patch;patch=1"
+	file://Makefile.am.patch"
 
 S = "${WORKDIR}/wview-${PV}"
 
diff --git a/recipes/wvstreams/wvstreams_4.2.2.bb b/recipes/wvstreams/wvstreams_4.2.2.bb
index 5e0471b340..83f97be0a8 100644
--- a/recipes/wvstreams/wvstreams_4.2.2.bb
+++ b/recipes/wvstreams/wvstreams_4.2.2.bb
@@ -6,9 +6,9 @@ DEPENDS = "zlib openssl (>= 0.9.8)"
 PR = "r1"
 
 SRC_URI = "http://ftp.de.debian.org/debian/pool/main/w/wvstreams/${PN}_${PV}.orig.tar.gz;name=archive \
-           http://ftp.de.debian.org/debian/pool/main/w/wvstreams/wvstreams_4.2.2-2.2.diff.gz;patch=1;name=patch22 \
-           file://wvstreams-debian.patch;patch=1 \
-           file://build-fixes-and-sanity.patch;patch=1 "
+           http://ftp.de.debian.org/debian/pool/main/w/wvstreams/wvstreams_4.2.2-2.2.diff.gz;name=patch22 \
+           file://wvstreams-debian.patch \
+           file://build-fixes-and-sanity.patch "
 
 inherit autotools pkgconfig
 
diff --git a/recipes/wvstreams/wvstreams_4.4.1.bb b/recipes/wvstreams/wvstreams_4.4.1.bb
index 1e0011d111..fa865c7338 100644
--- a/recipes/wvstreams/wvstreams_4.4.1.bb
+++ b/recipes/wvstreams/wvstreams_4.4.1.bb
@@ -6,9 +6,9 @@ DEPENDS = "zlib openssl (>= 0.9.8)"
 PR = "r3"
 
 SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
-	file://build-fixes-and-sanity.patch;patch=1 \
-	file://dont-forget-header.patch;patch=1 \
-	file://gcc4.3.patch;patch=1 \
+	file://build-fixes-and-sanity.patch \
+	file://dont-forget-header.patch \
+	file://gcc4.3.patch \
 	"
 
 
diff --git a/recipes/wxsqlite3/wxsqlite3_1.9.7.bb b/recipes/wxsqlite3/wxsqlite3_1.9.7.bb
index 5f7d3c9cdd..06a1804f1b 100644
--- a/recipes/wxsqlite3/wxsqlite3_1.9.7.bb
+++ b/recipes/wxsqlite3/wxsqlite3_1.9.7.bb
@@ -7,8 +7,8 @@ DEPENDS = "sqlite3 wxwidgets"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wxcode/wxsqlite3-${PV}.tar.gz;name=wxsqlite3 \
-	file://gcc-inline.patch;patch=1 \
-	file://wxtranslate.patch;patch=1 \
+	file://gcc-inline.patch \
+	file://wxtranslate.patch \
 	"
 SRC_URI[wxsqlite3.md5sum] = "2e1bec387bbdf50c632649d041b32a4a"
 SRC_URI[wxsqlite3.sha256sum] = "eaee8290c1f386413f5cb1e1af9ec4e7573c1dcce2760d79f4276497a75c4f64"
diff --git a/recipes/wxwidgets/wxbase_2.8.9.bb b/recipes/wxwidgets/wxbase_2.8.9.bb
index 4531a726cd..fb18710fed 100644
--- a/recipes/wxwidgets/wxbase_2.8.9.bb
+++ b/recipes/wxwidgets/wxbase_2.8.9.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
 
 PR = "r0"
 
-SRC_URI += "file://Makefile.in.patch;patch=1"
+SRC_URI += "file://Makefile.in.patch"
 
 EXTRA_OECONF = " --disable-gui \
                  --enable-largefile \
diff --git a/recipes/wxwidgets/wxwidgets-2.9.0.inc b/recipes/wxwidgets/wxwidgets-2.9.0.inc
index cb6a971e7a..677ef38a30 100644
--- a/recipes/wxwidgets/wxwidgets-2.9.0.inc
+++ b/recipes/wxwidgets/wxwidgets-2.9.0.inc
@@ -15,7 +15,7 @@ LEAD_SONAME = "libwx_.*_core-.*\.so"
 
 # Patch and regenerate configure script so that it finds staging root.
 FILESDIR = "${FILE_DIRNAME}/wxwidgets-${PV}"
-SRC_URI += "file://configure-cross_root.patch;patch=1"
+SRC_URI += "file://configure-cross_root.patch"
 
 do_configure_prepend() {
 	./autogen.sh
diff --git a/recipes/wxwidgets/wxwidgets_2.8.10.bb b/recipes/wxwidgets/wxwidgets_2.8.10.bb
index feb0394bb4..e343b277a9 100644
--- a/recipes/wxwidgets/wxwidgets_2.8.10.bb
+++ b/recipes/wxwidgets/wxwidgets_2.8.10.bb
@@ -2,7 +2,7 @@ require wxwidgets.inc
 
 PR = "r1"
 
-SRC_URI += "file://gsockgtk-cpp-wx2810.diff;patch=1"
+SRC_URI += "file://gsockgtk-cpp-wx2810.diff"
 
 LEAD_SONAME = "libwx_gtk2_core-2.8.so"
 
diff --git a/recipes/x-load/signgp-native.bb b/recipes/x-load/signgp-native.bb
index 1cbd001932..3b17be3b81 100644
--- a/recipes/x-load/signgp-native.bb
+++ b/recipes/x-load/signgp-native.bb
@@ -1,6 +1,8 @@
 LICENSE = "unknown"
 DESCRIPTION = "Tool to sign omap3 x-loader images"
 
+PR = "r1"
+
 inherit native 
 SRC_URI = "file://signGP.c"
 
@@ -8,7 +10,9 @@ do_compile() {
 	${CC} ${WORKDIR}/signGP.c -o signGP
 }
 
-do_stage() {
-	install -d ${STAGING_BINDIR_NATIVE}
-	install -m 0755 signGP ${STAGING_BINDIR_NATIVE}
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 signGP ${D}${bindir}
 }
+
+NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/x-load/x-load-omap3pandora_git.bb b/recipes/x-load/x-load-omap3pandora_git.bb
index 531a2abea7..05dfc2073c 100644
--- a/recipes/x-load/x-load-omap3pandora_git.bb
+++ b/recipes/x-load/x-load-omap3pandora_git.bb
@@ -8,9 +8,9 @@ SRCREV = "b3646a83f9e67ec9a2de3182fd254557fd6ad9aa"
 
 PROVIDES = "x-load"
 
-PV = "1.42+${PR}+gitr${SRCPV}"
+PV = "1.42+${PR}+gitr${SRCREV}"
 PR ="r2"
-PE = "2"
+PE = "1"
 
 SRC_URI = "git://git.openpandora.org/pandora-x-loader.git;branch=master;protocol=git"
 
diff --git a/recipes/x-load/x-load_1.41.bb b/recipes/x-load/x-load_1.41.bb
index 6995e66e5a..042188bb2b 100644
--- a/recipes/x-load/x-load_1.41.bb
+++ b/recipes/x-load/x-load_1.41.bb
@@ -3,14 +3,14 @@ require x-load.inc
 COMPATIBLE_MACHINE = "am3517-evm"
 
 SRC_URI = "file://x-loader-03.00.00.01.tar.gz \
-file://0013-board.c-print-boot-method-mmc-onenand-nand.patch;patch=1 \
-file://0014-board.c-check-for-u-boot-on-mmc-on-all-configurati.patch;patch=1 \
-file://0015-OMAP3EVM-Build-issue-fixed.patch;patch=1 \
-file://0016-mmc-fix-infinite-loop-in-mmc_init_stream.patch;patch=1 \
-file://0017-lib-board.c-add-missing-call-to-misc_init_r.patch;patch=1 \
-file://0018-omap3evm-provide-missing-udelay-function.patch;patch=1 \
-file://0019-lib-board.c-Specify-where-u-boot-is-being-loaded-fr.patch;patch=1 \
-file://streen-fix.diff;patch=1 \
+file://0013-board.c-print-boot-method-mmc-onenand-nand.patch \
+file://0014-board.c-check-for-u-boot-on-mmc-on-all-configurati.patch \
+file://0015-OMAP3EVM-Build-issue-fixed.patch \
+file://0016-mmc-fix-infinite-loop-in-mmc_init_stream.patch \
+file://0017-lib-board.c-add-missing-call-to-misc_init_r.patch \
+file://0018-omap3evm-provide-missing-udelay-function.patch \
+file://0019-lib-board.c-Specify-where-u-boot-is-being-loaded-fr.patch \
+file://streen-fix.diff \
 "
 
 S = "${WORKDIR}/xloader-03.00.00.01"
diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb
index cf27f1d48a..d40e094916 100644
--- a/recipes/x-load/x-load_git.bb
+++ b/recipes/x-load/x-load_git.bb
@@ -8,26 +8,26 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE
 SRCREV = "319b26586fafb86f919f514bcd175838aaab96b3"
 SRCREV_beagleboard = "1c9276af4d6a5b7014a7630a1abeddf3b3177563"
 
-PV = "1.42+${PR}+gitr${SRCPV}"
-PV_beagleboard = "1.44+${PR}+gitr${SRCPV}"
+PV = "1.42+${PR}+gitr${SRCREV}"
+PV_beagleboard = "1.44+${PR}+gitr${SRCREV}"
 PR ="r10"
 PE = "1"
 
 SRC_URI = "git://gitorious.org/x-load-omap3/mainline.git;branch=master;protocol=git"
 
 SRC_URI_append_beagleboard = " \
-                              file://name.patch;patch=1 \
-                              file://bb8547fcbc54ecc7a75f9ad45a31042a04d8a2ce.patch;patch=1 \
+                              file://name.patch \
+                              file://bb8547fcbc54ecc7a75f9ad45a31042a04d8a2ce.patch \
                              "
 
 SRC_URI_append_omap3-touchbook = " \
-                              file://name.patch;patch=1 \
-                              file://screen-off.patch;patch=1 \
+                              file://name.patch \
+                              file://screen-off.patch \
                              "
 
 
 SRC_URI_append_am3517-evm = " \
-                                 file://xload-shiva.diff;patch=1 \
+                                 file://xload-shiva.diff \
 "
 
 SRC_URI_omapzoom2 = "git://dev.omapzoom.org/pub/scm/bootloader/x-loader.git;protocol=git \
diff --git a/recipes/xalan-j/xalan-j-native_2.7.1.bb b/recipes/xalan-j/xalan-j-native_2.7.1.bb
index 371362a286..c71a4054e8 100644
--- a/recipes/xalan-j/xalan-j-native_2.7.1.bb
+++ b/recipes/xalan-j/xalan-j-native_2.7.1.bb
@@ -7,8 +7,3 @@ DEPENDS = "\
 
 inherit java-native
 
-
-do_install_append() {
-	:
-}
-
diff --git a/recipes/xalan-j/xalan-j_2.7.1.bb b/recipes/xalan-j/xalan-j_2.7.1.bb
index e48bfb6c71..714ec982cc 100644
--- a/recipes/xalan-j/xalan-j_2.7.1.bb
+++ b/recipes/xalan-j/xalan-j_2.7.1.bb
@@ -41,14 +41,6 @@ do_compile() {
 
 do_install_append() {
   oe_jarinstall serializer-${PV}.jar serializer.jar
-
-  # Like Debian we provide a symlink called xml-apis pointing to the JAXP
-  # classes.
-  ln -sf ${D}${datadir_java}/xml-apis.jar jaxp-1.3.jar
-}
-
-do_stage_append() {
-	oe_jarinstall -s serializer-${PV}.jar serializer.jar
 }
 
 PACKAGES = "libxalan2-serializer-java ${JPN}"
diff --git a/recipes/xaos/xaos_3.2.3.bb b/recipes/xaos/xaos_3.2.3.bb
index 4be3a15050..8217c6268c 100644
--- a/recipes/xaos/xaos_3.2.3.bb
+++ b/recipes/xaos/xaos_3.2.3.bb
@@ -7,8 +7,8 @@ RDEPENDS += "libxxf86dga"
 PR = "r0"
 
 SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.3.tar.gz \
-           file://fix-build.patch;patch=1 \
-           file://fix-aalib-configure.patch;patch=1"
+           file://fix-build.patch \
+           file://fix-aalib-configure.patch"
 
 S = "${WORKDIR}/XaoS-${PV}"
 
diff --git a/recipes/xapian/xapian-quickstart.inc b/recipes/xapian/xapian-quickstart.inc
index aab599f64b..920a48bfcd 100644
--- a/recipes/xapian/xapian-quickstart.inc
+++ b/recipes/xapian/xapian-quickstart.inc
@@ -14,7 +14,7 @@ do_compile() {
 }
 
 do_install() {
-        install -d ${D}$
+        install -d ${D}
         install -d ${D}${bindir}
         install -m 0755 ${WORKDIR}/${BINARY_NAME} ${D}${bindir}/
 }
diff --git a/recipes/xautomation/xautomation.inc b/recipes/xautomation/xautomation.inc
index 0157ace914..fdd9b9ff5d 100644
--- a/recipes/xautomation/xautomation.inc
+++ b/recipes/xautomation/xautomation.inc
@@ -4,6 +4,6 @@ SECTION = "console"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.hoopajoo.net/static/projects/${PN}-${PV}.tar.gz \
-           file://remove-man.patch;patch=1"
+           file://remove-man.patch"
 
 inherit autotools pkgconfig
diff --git a/recipes/xawtv/xawtv_3.93.bb b/recipes/xawtv/xawtv_3.93.bb
index 8b5f6c6f96..f61a2b427b 100644
--- a/recipes/xawtv/xawtv_3.93.bb
+++ b/recipes/xawtv/xawtv_3.93.bb
@@ -6,7 +6,7 @@ grabbing images and AVI movies, tuning in TV stations, etc."
 DEPENDS = "libxaw libxmu libxt libxpm libxext virtual/libx11 ncurses libxft fs jpeg"
 
 SRC_URI = "http://dl.bytesex.org/releases/xawtv/xawtv-${PV}.tar.gz \
-	   file://make.patch;patch=1"
+	   file://make.patch"
 S = "${WORKDIR}/xawtv-${PV}"
 
 inherit autotools
diff --git a/recipes/xbmc/libmms_0.5.bb b/recipes/xbmc/libmms_0.5.bb
new file mode 100644
index 0000000000..a898c4bc5e
--- /dev/null
+++ b/recipes/xbmc/libmms_0.5.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "LibMMS is a common library for parsing mms:// and mmsh:// type network streams."
+LICENSE = "LGPLv2.1"
+
+DEPENDS = "glib-2.0"
+
+SRC_URI = "http://launchpad.net/libmms/trunk/${PV}/+download/libmms-${PV}.tar.gz"
+SRC_URI[md5sum] = "cf83053ec891f14e73a04c84d9de08ee"
+SRC_URI[sha256sum] = "02d9ca2b16b1517b84edb6c1c378a1f447679a831ba708a0396b30852aa6f091"
+
+inherit autotools
+
diff --git a/recipes/xboard/xboard_4.4.1.bb b/recipes/xboard/xboard_4.4.1.bb
index 385c1d3f3b..f245b8e462 100644
--- a/recipes/xboard/xboard_4.4.1.bb
+++ b/recipes/xboard/xboard_4.4.1.bb
@@ -4,7 +4,7 @@ SECTION = "games"
 LICENSE = "GPL"
 DEPENDS = "libxaw libsm libx11 libxt libxmu libxext libice"
 SRC_URI = "http://ftp.gnu.org/gnu/xboard/xboard-${PV}.tar.gz;name=archive \
-	   file://no-strip.patch;patch=1;pnum=2"
+	   file://no-strip.patch;striplevel=2"
 
 SRC_URI[archive.md5sum] = "4623a83fdd43f410bfcc8a20e2eb1474"
 SRC_URI[archive.sha256sum] = "74184fa7d5ea4ce963f7108e01256e6eb7bb2269ff6f780599fdaaf2d913950e"
diff --git a/recipes/xcb/libxcb.inc b/recipes/xcb/libxcb.inc
index 4029decb05..3676b3c00d 100644
--- a/recipes/xcb/libxcb.inc
+++ b/recipes/xcb/libxcb.inc
@@ -8,7 +8,7 @@ DEPENDS = "xcb-proto xproto libxau libxslt-native"
 # DEPENDS += "xsltproc-native gperf-native"
 
 SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
-        file://configure.patch;patch=1;pnum=0"
+        file://configure.patch;striplevel=0"
 
 PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \
              libxcb-randr libxcb-record libxcb-render libxcb-res \
diff --git a/recipes/xchat/xchat_2.8.6.bb b/recipes/xchat/xchat_2.8.6.bb
index 9e203fb682..9909e616ab 100644
--- a/recipes/xchat/xchat_2.8.6.bb
+++ b/recipes/xchat/xchat_2.8.6.bb
@@ -7,8 +7,8 @@ DEPENDS += "gdk-pixbuf-csource-native"
 PR = "r2"
 
 SRC_URI = "http://www.xchat.org/files/source/2.8/xchat-${PV}.tar.bz2 \
-	 file://46_CVE-2009-0315.dpatch;patch=1 \
-	 file://53_fix_deprecated_widgets.dpatch;patch=1 \
+	 file://46_CVE-2009-0315.dpatch;apply=yes \
+	 file://53_fix_deprecated_widgets.dpatch;apply=yes \
 	 "
 
 inherit autotools
diff --git a/recipes/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/recipes/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
index 163594b39b..ef746a825a 100644
--- a/recipes/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ b/recipes/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
@@ -4,8 +4,8 @@ SECTION = "x11/base"
 PR ="r2"
 
 SRC_URI = "http://matchbox-project.org/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
-	   file://use-relative-symlinks.patch;patch=1 \
-	   file://fix_watch_cursor.patch;patch=1"
+	   file://use-relative-symlinks.patch \
+	   file://fix_watch_cursor.patch"
 FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
 
 inherit autotools
diff --git a/recipes/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb b/recipes/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
index 59265df1c6..512c5fe215 100644
--- a/recipes/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
+++ b/recipes/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
@@ -6,8 +6,8 @@ RPROVIDES = "xcursor-transparent-theme"
 PR ="r4"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
-	   file://use-relative-symlinks.patch;patch=1 \
-	   file://skip_watch_cursor.patch;patch=1 \
+	   file://use-relative-symlinks.patch \
+	   file://skip_watch_cursor.patch \
 	   file://20xcursor-transparent"
 S = "${WORKDIR}/xcursor-transparent-theme-${PV}"
 
diff --git a/recipes/xdg-user-dirs/xdg-user-dirs_0.10.bb b/recipes/xdg-user-dirs/xdg-user-dirs_0.10.bb
index e528e30289..5a1edf845c 100644
--- a/recipes/xdg-user-dirs/xdg-user-dirs_0.10.bb
+++ b/recipes/xdg-user-dirs/xdg-user-dirs_0.10.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the desktop folder and the music folder"
 SRC_URI = "http://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.10.tar.gz \
-           file://configurefix.patch;patch=1 "
+           file://configurefix.patch "
 PR = "r1"
 
 inherit autotools_stage
diff --git a/recipes/xdiskusage/xdiskusage_1.48.bb b/recipes/xdiskusage/xdiskusage_1.48.bb
index b22626a845..e9f4ba4331 100644
--- a/recipes/xdiskusage/xdiskusage_1.48.bb
+++ b/recipes/xdiskusage/xdiskusage_1.48.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 DEPENDS = "fltk"
 
 SRC_URI = "http://xdiskusage.sourceforge.net/xdiskusage-${PV}.tgz \
-           file://running_from_menu.patch;patch=1 \
+           file://running_from_menu.patch \
            file://xdiskusage.desktop \
            file://xdiskusage.png"
 
diff --git a/recipes/xdotool/xdotool_1.20100416.2809.bb b/recipes/xdotool/xdotool_1.20100416.2809.bb
new file mode 100644
index 0000000000..b62b897ddb
--- /dev/null
+++ b/recipes/xdotool/xdotool_1.20100416.2809.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "xdotool - command-line X11 automation tool - utilising X11 XTEST interface"
+HOMEPAGE = "http://www.semicomplete.com/projects/xdotool"
+LICENSE = "MIT"
+SECTION = "x11"
+PRIORITY = "optional"
+DEPENDS = "virtual/libx11 libxtst"
+
+PR = "1"
+
+SRC_URI = "http://semicomplete.googlecode.com/files/xdotool-${PV}.tar.gz"
+
+EXTRA_OEMAKE = "PREFIX=${prefix}"
+
+do_install() {
+	oe_runmake -e install DESTDIR=${D} PREFIX=${prefix}
+}
+
+SRC_URI[md5sum] = "1d5be641e512c343abfe5f78b39e6f19"
+SRC_URI[sha256sum] = "42d7271fbc796e53db71bb221f311b9ff3c51d90a71c9487a9bd3101ca39894f"
+
diff --git a/recipes/xfce-base/exo_0.3.105.bb b/recipes/xfce-base/exo_0.3.105.bb
index a9dd7f2ee7..eedbe10acb 100644
--- a/recipes/xfce-base/exo_0.3.105.bb
+++ b/recipes/xfce-base/exo_0.3.105.bb
@@ -1,16 +1,16 @@
 DESCRIPTION="XFCE extensions and framework library with session management support"
 DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
 SECTION = "x11"
-PR = "r1"
+PR = "r2"
 
 inherit xfce46 python-dir
 
 XFCE_VERSION = "4.6.1"
 
 SRC_URI += " \
-    file://exo-0.3.105-iocharset.patch;patch=1 \
-    file://exo-no-tests.patch;patch=1 \
-    file://configure.patch;patch=1 \
+    file://exo-0.3.105-iocharset.patch \
+    file://exo-no-tests.patch \
+    file://configure.patch \
 "
 
 # Note: Python checking is broken
@@ -18,10 +18,6 @@ do_configure_prepend() {
 	sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
 }
 
-do_stage() {
-    autotools_stage_all
-}
-
 FILES_${PN} += "${datadir}/xfce4/ \
                 ${PYTHON_SITEPACKAGES_DIR}/* \
                 ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
diff --git a/recipes/xfce-base/exo_0.3.4.bb b/recipes/xfce-base/exo_0.3.4.bb
index a378f345ba..f48c9bb069 100644
--- a/recipes/xfce-base/exo_0.3.4.bb
+++ b/recipes/xfce-base/exo_0.3.4.bb
@@ -1,20 +1,18 @@
 DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
 
+PR = "r1"
+
 inherit xfce
 XFCE_VERSION = 4.4.2
 
-SRC_URI += " file://configure.patch;patch=1"
-SRC_URI += " file://exo-no-tests.patch;patch=1"
+SRC_URI += " file://configure.patch"
+SRC_URI += " file://exo-no-tests.patch"
 
 # Note: Python checking is broken
 do_configure_prepend() {
 	sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
 }
 
-do_stage() {
-    autotools_stage_all
-}
-
 FILES_${PN} += "${datadir}/xfce4/ \
                 ${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so"
 FILES_${PN}-dev += "${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.*"
diff --git a/recipes/xfce-base/libxfce4mcs_4.4.2.bb b/recipes/xfce-base/libxfce4mcs_4.4.2.bb
index aa25a1fae3..c0a5886983 100644
--- a/recipes/xfce-base/libxfce4mcs_4.4.2.bb
+++ b/recipes/xfce-base/libxfce4mcs_4.4.2.bb
@@ -8,15 +8,5 @@ SECTION = "x11/libs"
 
 inherit xfce pkgconfig
 
-do_stage() {
-	install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs
-	    
-	install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs
-	install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs
-	install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs    
-	oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR}	
-	oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR}	
-}
-
 SRC_URI[md5sum] = "5ffe66a3eeb884839806ce929e5d2776"
 SRC_URI[sha256sum] = "192843e8fdd63e10ba431ca12265c654dbce9677ec9d330038eea462ca0e5c8e"
diff --git a/recipes/xfce-base/libxfce4menu_4.6.1.bb b/recipes/xfce-base/libxfce4menu_4.6.1.bb
index f9249d4112..f8edcb6c59 100644
--- a/recipes/xfce-base/libxfce4menu_4.6.1.bb
+++ b/recipes/xfce-base/libxfce4menu_4.6.1.bb
@@ -4,13 +4,9 @@ DEPENDS = "gettext pkgconfig libxfce4util intltool"
 RDEPENDS = "gtk+ libxfce4util"
 
 LICENSE="LGPL-2 FDL-1.1"
-PR = "r1"
+PR = "r2"
 
 inherit xfce46
 
-do_stage() {
-   autotools_stage_all
-}
-
 SRC_URI[md5sum] = "5dc9343885c2c6f931318b2a1cdcc9db"
 SRC_URI[sha256sum] = "5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da"
diff --git a/recipes/xfce-base/libxfce4util_4.4.2.bb b/recipes/xfce-base/libxfce4util_4.4.2.bb
index 80edcf2550..43b4c3f969 100644
--- a/recipes/xfce-base/libxfce4util_4.4.2.bb
+++ b/recipes/xfce-base/libxfce4util_4.4.2.bb
@@ -7,22 +7,12 @@ SECTION = "x11/libs"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 xfce4-dev-tools"
 
+PR = "r1"
+
 inherit xfce pkgconfig
 
 MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
 
-do_stage() {
-	install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util
-	# The line below expands to the list of headers that native makefile
-	# would install.  Complain and/or fix if it's not portable enough
-	for file in  $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do 
-		install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util
-	done
-
-	oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR}
-
-}
-
 FILES_${PN}-dev += " ${datadir}/xfce4/m4"
 
 SRC_URI[md5sum] = "261e7a5df039493ad746e0c359211092"
diff --git a/recipes/xfce-base/libxfce4util_4.6.1.bb b/recipes/xfce-base/libxfce4util_4.6.1.bb
index 0e5e12f744..de8bf539f8 100644
--- a/recipes/xfce-base/libxfce4util_4.6.1.bb
+++ b/recipes/xfce-base/libxfce4util_4.6.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Basic utility library for Xfce4"
 SECTION = "x11/libs"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 xfce4-dev-tools "
-PR = "r1"
+PR = "r2"
 
 inherit xfce46
 
@@ -12,18 +12,6 @@ EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-broken-pu
 
 MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
 
-do_stage() {
-	install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util
-	# The line below expands to the list of headers that native makefile
-	# would install.  Complain and/or fix if it's not portable enough
-	for file in  $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do 
-		install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util
-	done
-
-	oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR}
-
-}
-
 FILES_${PN}-dev += " ${datadir}/xfce4/m4"
 
 SRC_URI[md5sum] = "eac51d58179cbcadc3f802450a8ec9cd"
diff --git a/recipes/xfce-base/libxfcegui4_4.4.2.bb b/recipes/xfce-base/libxfcegui4_4.4.2.bb
index 4213c4020f..5a75d4053f 100644
--- a/recipes/xfce-base/libxfcegui4_4.4.2.bb
+++ b/recipes/xfce-base/libxfcegui4_4.4.2.bb
@@ -6,11 +6,9 @@ DESCRIPTION = "XFCE Widget library and X Window System interaction"
 DEPENDS = "libxfce4util dbh libxml2 gtk+"
 SECTION = "x11/libs"
 
-inherit xfce
+PR = "r1"
 
-do_stage() {
-autotools_stage_all
-}
+inherit xfce
 
 FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
 
diff --git a/recipes/xfce-base/libxfcegui4_4.6.1.bb b/recipes/xfce-base/libxfcegui4_4.6.1.bb
index c014637699..e8582196ef 100644
--- a/recipes/xfce-base/libxfcegui4_4.6.1.bb
+++ b/recipes/xfce-base/libxfcegui4_4.6.1.bb
@@ -5,14 +5,10 @@ DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh lib
 RDEPENDS = "xfconf startup-notification "
 
 SECTION = "x11/libs"
-PR = "r4"
+PR = "r5"
 
 inherit xfce46
 
-do_stage() {
-   autotools_stage_all
-}
-
 LEAD_SONAME = "libxfcegui4.so.4"
 
 FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
diff --git a/recipes/xfce-base/thunar_0.9.0.bb b/recipes/xfce-base/thunar_0.9.0.bb
index 54de213c80..68951645ef 100644
--- a/recipes/xfce-base/thunar_0.9.0.bb
+++ b/recipes/xfce-base/thunar_0.9.0.bb
@@ -5,7 +5,7 @@ RRECOMMENDS = "shared-mime-info"
 inherit xfce pkgconfig
 
 SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-${PV}.tar.bz2"
-PR = 'r3'
+PR = "r4"
 
 S = "${WORKDIR}/Thunar-${PV}/"
 
@@ -16,9 +16,5 @@ FILES_${PN} += "${libdir}/thunarx-1/*.so \
                 ${datadir}/xfce4"
 FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/"
 
-do_stage () {
-	autotools_stage_all
-}
-
 SRC_URI[md5sum] = "0fc5008858661c0abd0399acbe30ef28"
 SRC_URI[sha256sum] = "26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037"
diff --git a/recipes/xfce-base/thunar_1.0.1.bb b/recipes/xfce-base/thunar_1.0.1.bb
index a4d0fb254c..502831f787 100644
--- a/recipes/xfce-base/thunar_1.0.1.bb
+++ b/recipes/xfce-base/thunar_1.0.1.bb
@@ -4,7 +4,7 @@ DEPENDS = "exo dbus-glib libexif xfce4-panel libice libsm gamin"
 RDEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm gamin"
 RRECOMMENDS = "shared-mime-info"
 SECTION = "x11"
-PR = "r1"
+PR = "r2"
 
 inherit xfce46
 
@@ -24,9 +24,5 @@ FILES_${PN} += "${libdir}/thunarx-1/*.so \
                 ${datadir}/xfce4"
 FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/"
 
-do_stage () {
- 	autotools_stage_all
-}
-
 SRC_URI[md5sum] = "218373aa45d74b6ba8c69c4d5af3bb19"
 SRC_URI[sha256sum] = "7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d"
diff --git a/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb b/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb
index ec9aa02ca3..1ec9fe6562 100644
--- a/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb
+++ b/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb
@@ -5,23 +5,16 @@
 DESCRIPTION="XFCE4 Settings manager."
 DEPENDS="libxfcegui4 libxfce4mcs intltool-native"
 SECTION = "x11"
-PR = "r1"
+PR = "r3"
 
 inherit xfce 
 
-do_stage() {
-	install -d ${STAGING_INCDIR}/xfce4
-	install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
-	install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
-}
-
 # xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live
 # the standard pkgconfig mangling was confusing us.  Mangling is not required
 # for this particular .pc, so the following will suffice:
 
-do_stage_append () {
-	install -d ${PKG_CONFIG_DIR}
-	sed -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc
+do_install_append () {
+	sed -i -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc
 }
 
 SRC_URI[md5sum] = "876a4b5d582de8fdc01457df2e7e1339"
diff --git a/recipes/xfce-base/xfce-terminal_0.2.8.bb b/recipes/xfce-base/xfce-terminal_0.2.8.bb
index 0f672594e4..1a23241cfe 100644
--- a/recipes/xfce-base/xfce-terminal_0.2.8.bb
+++ b/recipes/xfce-base/xfce-terminal_0.2.8.bb
@@ -6,7 +6,7 @@ PR = "r2"
 inherit xfce
 
 SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-${PV}.tar.bz2 \
-           file://into-support.patch;patch=1"
+           file://into-support.patch"
 
 S = "${WORKDIR}/Terminal-${PV}"
 
diff --git a/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb b/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb
index 4748792c36..c154ffe56e 100644
--- a/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb
+++ b/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb
@@ -2,14 +2,17 @@ DESCRIPTION = "Xfce4 development tools"
 SECTION = "x11/libs"
 LICENSE = "GPL"
 
+PR = "r2"
+
 inherit xfce
 XFCE_VERSION = 4.4.2
 
-do_stage() {
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/
+do_install_append() {
+       install -d ${D}${datadir}/aclocal
+       install -m 644 m4macros/*.m4 ${D}${datadir}/aclocal/
 }
 
+
 FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4"
 
 SRC_URI[md5sum] = "7d09d161efc7ef86b3b48791d98c8ae8"
diff --git a/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb b/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb
index f940132a4f..0037f99478 100644
--- a/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb
+++ b/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb
@@ -1,20 +1,20 @@
 DESCRIPTION = "Xfce4 development tools"
 SECTION = "x11/libs"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r3"
 
 inherit xfce46
 
-inherit autotools autotools_stage
+inherit autotools
+
+do_install_append() {
+       install -d ${D}${datadir}/aclocal
+       install -m 644 m4macros/*.m4 ${D}${datadir}/aclocal/
+}
 
 XFCE_VERSION = ${PV}
 SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
 
-do_stage() {
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/
-}
-
 FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4"
 
 SRC_URI[md5sum] = "c9587fa78e877eee858a33391d0afd62"
diff --git a/recipes/xfce-base/xfce4-panel_4.4.2.bb b/recipes/xfce-base/xfce4-panel_4.4.2.bb
index cbb86444d6..5264503593 100644
--- a/recipes/xfce-base/xfce4-panel_4.4.2.bb
+++ b/recipes/xfce-base/xfce4-panel_4.4.2.bb
@@ -8,12 +8,9 @@ DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-
 
 inherit pkgconfig xfce
 
-EXTRA_OECONF += " --enable-startup-notification"
-
+PR = "r1"
 
-do_stage() {
-autotools_stage_all
-}
+EXTRA_OECONF += " --enable-startup-notification"
 
 do_install() {
     oe_runmake DESTDIR=${D} install
diff --git a/recipes/xfce-base/xfce4-panel_4.6.1.bb b/recipes/xfce-base/xfce4-panel_4.6.1.bb
index 738284cc40..e048c18867 100644
--- a/recipes/xfce-base/xfce4-panel_4.6.1.bb
+++ b/recipes/xfce-base/xfce4-panel_4.6.1.bb
@@ -3,16 +3,12 @@
 DESCRIPTION = "Xfce4 Panel"
 DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck"
 SECTION = "x11"
-PR = "r2"
+PR = "r3"
 
 inherit xfce46
 
 EXTRA_OECONF += " --enable-startup-notification"
 
-do_stage() {
-    autotools_stage_all
-}
-
 do_install() {
     oe_runmake DESTDIR=${D} install
 }
diff --git a/recipes/xfce-base/xfce4-panel_4.6.2.bb b/recipes/xfce-base/xfce4-panel_4.6.2.bb
index 001b037c89..4e4f1769b6 100644
--- a/recipes/xfce-base/xfce4-panel_4.6.2.bb
+++ b/recipes/xfce-base/xfce4-panel_4.6.2.bb
@@ -3,16 +3,12 @@
 DESCRIPTION = "Xfce4 Panel"
 DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck"
 SECTION = "x11"
-PR = "r1"
+PR = "r2"
 
 inherit xfce46
 
 EXTRA_OECONF += " --enable-startup-notification"
 
-do_stage() {
-    autotools_stage_all
-}
-
 do_install() {
     oe_runmake DESTDIR=${D} install
 }
diff --git a/recipes/xfce-base/xfce4-panel_4.6.3.bb b/recipes/xfce-base/xfce4-panel_4.6.3.bb
new file mode 100644
index 0000000000..bdfa7d687f
--- /dev/null
+++ b/recipes/xfce-base/xfce4-panel_4.6.3.bb
@@ -0,0 +1,30 @@
+# xfce4-panel OE build file
+
+DESCRIPTION = "Xfce4 Panel"
+DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck"
+SECTION = "x11"
+PR = "r2"
+
+inherit xfce46
+
+SRC_URI[archive.md5sum] = "0b715abb929220f136483ccd7303ff62"
+SRC_URI[archive.sha256sum] = "4f5e19187ddf9f812303b77479124562079d25c6263674040aba4395c6b2e41c"
+
+EXTRA_OECONF += " --enable-startup-notification"
+
+do_install() {
+    oe_runmake DESTDIR=${D} install
+}
+
+python populate_packages_prepend() {
+	plugin_dir = bb.data.expand('${libdir}/xfce4/panel-plugins/', d)
+	plugin_name = bb.data.expand('${PN}-plugin-%s', d)
+	do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name,
+	                  '${PN} plugin for %s', extra_depends='', prepend=True,
+	                  aux_files_pattern=['${datadir}/xfce4/panel-plugins/%s.desktop',
+	                                     '${sysconfdir}/xdg/xfce/panel/%s-*',
+	                                     '${datadir}/icons/hicolor/48x48/apps/*-%s.png',
+	                                     '${bindir}/*%s*'])
+}
+
+PACKAGES_DYNAMIC = "${PN}-plugin-*"
diff --git a/recipes/xfce-base/xfce4-settings-4.6.4/0001-Port-to-libxklavier-5.0-API.patch b/recipes/xfce-base/xfce4-settings-4.6.4/0001-Port-to-libxklavier-5.0-API.patch
new file mode 100644
index 0000000000..2a849aff25
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings-4.6.4/0001-Port-to-libxklavier-5.0-API.patch
@@ -0,0 +1,34 @@
+From 8e1ce14a33351f2664678f945c7050e42529c5d4 Mon Sep 17 00:00:00 2001
+From: Lionel Le Folgoc <mrpouit@ubuntu.com>
+Date: Mon, 25 Jan 2010 21:02:53 +0100
+Subject: [PATCH] Port to libxklavier 5.0 API.
+
+Patch slightly modified for Xubuntu to add POTFILES.skip.
+
+---
+ dialogs/keyboard-settings/xfce-keyboard-settings.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+index 631dc69..0e36375 100644
+--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
++++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+@@ -395,7 +395,7 @@ xfce_keyboard_settings_finalize (GObject *object)
+ 
+ #ifdef HAVE_LIBXKLAVIER
+   /* Stop xklavier engine */
+-  xkl_engine_stop_listen (settings->priv->xkl_engine);
++  xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
+ #endif /* HAVE_LIBXKLAVIER */
+ 
+   g_object_unref (G_OBJECT (settings->priv->provider));
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+new file mode 100644
+index 0000000..0e36375
+--- /dev/null
++++ b/po/POTFILES.skip
+@@ -0,0 +1,1 @@
++.pc/0001-Port-to-libxklavier-5.0-API.patch/dialogs/keyboard-settings/xfce-keyboard-settings.c
+-- 
+1.6.3.3
+
diff --git a/recipes/xfce-base/xfce4-settings_4.6.1.bb b/recipes/xfce-base/xfce4-settings_4.6.1.bb
index 5b936b9844..7ac82cf1d4 100644
--- a/recipes/xfce-base/xfce4-settings_4.6.1.bb
+++ b/recipes/xfce-base/xfce4-settings_4.6.1.bb
@@ -6,18 +6,14 @@ LICENSE = "GPL-2"
 DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util"
 RDEPENDS = "gtk+ libxfce4util libxfcegui4 xfconf exo"
 
-PR = "r1"
+PR = "r2"
 
 inherit xfce46
 
 SRC_URI += " \
-    file://xfce4-settings-4.6.1-libxklavier.patch;patch=1 \
-    file://xfce4-settings-4.6.1-configure.patch;patch=1 \
+    file://xfce4-settings-4.6.1-libxklavier.patch \
+    file://xfce4-settings-4.6.1-configure.patch \
 "
 
-do_stage() {
-autotools_stage_all
-}
-
 SRC_URI[md5sum] = "dc1c8704471c5b0104fa10c30eb60cb6"
 SRC_URI[sha256sum] = "36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d"
diff --git a/recipes/xfce-base/xfce4-settings_4.6.4.bb b/recipes/xfce-base/xfce4-settings_4.6.4.bb
new file mode 100644
index 0000000000..121098896d
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings_4.6.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xfce4 settings"
+HOMEPAGE = "http://www.xfce.org"
+SECTION = "x11/wm"
+LICENSE = "GPL-2"
+
+DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util"
+
+inherit xfce46
+
+SRC_URI += "file://0001-Port-to-libxklavier-5.0-API.patch" 
+
+SRC_URI[archive.md5sum] = "04985407e8e5b916c44780314a177e96"
+SRC_URI[archive.sha256sum] = "a5e3f0d959b0d424355414769250473785043c3977446a73b36fa3a5ce44ecdb"
+
+RDEPENDS_${PN} = "xfconf exo"
+
diff --git a/recipes/xfce-base/xfconf_4.6.1.bb b/recipes/xfce-base/xfconf_4.6.1.bb
index d74df60bbf..ce091cafa2 100644
--- a/recipes/xfce-base/xfconf_4.6.1.bb
+++ b/recipes/xfce-base/xfconf_4.6.1.bb
@@ -6,14 +6,10 @@ LICENSE = "GPL-2"
 DEPENDS = "libxfce4util"
 RDEPENDS = "libxfce4util"
 
-PR = "r1"
+PR = "r2"
 
 inherit xfce46
 
-do_stage() {
-autotools_stage_all
-}
-
 FILES_${PN} += "${datadir}/dbus-1/services/org.xfce.Xfconf.service"
 
 SRC_URI[md5sum] = "d4d3018767ea9eb4b57cc57d4038023b"
diff --git a/recipes/xfce-base/xfdesktop_4.4.2.bb b/recipes/xfce-base/xfdesktop_4.4.2.bb
index 3238e49c03..201f2e38c2 100644
--- a/recipes/xfce-base/xfdesktop_4.4.2.bb
+++ b/recipes/xfce-base/xfdesktop_4.4.2.bb
@@ -9,8 +9,8 @@ PR = "r2"
 
 inherit xfce
 
-SRC_URI += " file://relocation-and-memleak.patch;patch=1 \
-             file://fix-segfault-when-removable-icons-are-disabled.patch;patch=1"
+SRC_URI += " file://relocation-and-memleak.patch \
+             file://fix-segfault-when-removable-icons-are-disabled.patch"
 
 PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins"
 
diff --git a/recipes/xinetd/xinetd_2.3.13.bb b/recipes/xinetd/xinetd_2.3.13.bb
index 7e47883df4..4baaac88b9 100644
--- a/recipes/xinetd/xinetd_2.3.13.bb
+++ b/recipes/xinetd/xinetd_2.3.13.bb
@@ -5,7 +5,7 @@ PR ="r4"
 SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
 	  file://xinetd.init \
 	  file://xinetd.conf \
-	  file://service.c.patch;patch=1 \
+	  file://service.c.patch \
 	  "
 
 EXTRA_OECONF="--disable-nls"
diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb
index fb43231e24..0e2c435795 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb
@@ -1,7 +1,7 @@
 require xinput-calibrator.inc
 
 SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
-           file://0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch;patch=1"
+           file://0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch"
 
 SRCREV = "d6e01d780001948f55006698e8e9e48c12894810"
 S = "${WORKDIR}/git/"
diff --git a/recipes/xkbd/xkbd_0.8.15.bb b/recipes/xkbd/xkbd_0.8.15.bb
index a30d69df66..309d7d8962 100644
--- a/recipes/xkbd/xkbd_0.8.15.bb
+++ b/recipes/xkbd/xkbd_0.8.15.bb
@@ -1,9 +1,9 @@
 SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/xkbd-${PV}-CVS.tar.gz \
-           file://libtool-lossage.patch;patch=1;pnum=1 \
-	   file://fix-equalsign.patch;patch=1 \
-	   file://fix-circumkey.patch;patch=1 \
-	   file://add-default-common-slides.patch;patch=1 \
-	   file://differentiate-desktop-name.patch;patch=1 \
+           file://libtool-lossage.patch \
+	   file://fix-equalsign.patch \
+	   file://fix-circumkey.patch \
+	   file://add-default-common-slides.patch \
+	   file://differentiate-desktop-name.patch \
 	   file://xkbd.png"
 LICENSE = "GPL"
 PR = "r4"
diff --git a/recipes/xkeyboard-config/xkeyboard-config_1.4.bb b/recipes/xkeyboard-config/xkeyboard-config_1.4.bb
index bd62e1e55f..fb7f5fcb89 100644
--- a/recipes/xkeyboard-config/xkeyboard-config_1.4.bb
+++ b/recipes/xkeyboard-config/xkeyboard-config_1.4.bb
@@ -2,17 +2,13 @@ DESCRIPTION = "Common X11 Keyboard layouts"
 LICENSE = "MIT"
 DEPENDS = "intltool xkbcomp-native"
 RDEPENDS = "xkbcomp"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2 \
-           file://abnt2-fixes.patch;patch=1"
+           file://abnt2-fixes.patch"
 
 inherit autotools
 
-do_stage() {
-        autotools_stage_all
-}
-
 do_install_append () {
     install -d ${D}/usr/share/X11/xkb/compiled
     cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
diff --git a/recipes/xml-commons/dom4j_1.6.1.bb b/recipes/xml-commons/dom4j_1.6.1.bb
index 45f4ebe42b..94bd807270 100644
--- a/recipes/xml-commons/dom4j_1.6.1.bb
+++ b/recipes/xml-commons/dom4j_1.6.1.bb
@@ -8,7 +8,7 @@ DEPENDS = "fastjar-native xerces-j xalan-j xpp2 xpp3 jaxen"
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/dom4j/${P}.tar.gz;name=archive \
 	http://apache.org/dist/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz;name=jaxme \
-	file://debian.patch;patch=1 \
+	file://debian.patch \
 	"
 
 inherit java-library
diff --git a/recipes/xml-commons/xom_1.1.bb b/recipes/xml-commons/xom_1.1.bb
index c9acd19ee6..697e01d18d 100644
--- a/recipes/xml-commons/xom_1.1.bb
+++ b/recipes/xml-commons/xom_1.1.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://xom.nu"
 SRC_URI = "\
 	http://www.cafeconleche.org/XOM/${P}-src.tar.gz;name=archive \
 	http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.1-src.tar.gz;name=jaxen \
-	file://04_remove_sun_import.patch;patch=1 \
+	file://04_remove_sun_import.patch \
 	"
 
 S = "${WORKDIR}/XOM"
diff --git a/recipes/xmlpull/xmlpull_1.1.3.4c.bb b/recipes/xmlpull/xmlpull_1.1.3.4c.bb
index fd53440303..11b6453ce8 100644
--- a/recipes/xmlpull/xmlpull_1.1.3.4c.bb
+++ b/recipes/xmlpull/xmlpull_1.1.3.4c.bb
@@ -13,7 +13,7 @@ JAR = "${PN}-${PV}.jar"
 
 SRC_URI = "\
     http://xmlpull.org/v1/download/xmlpull_1_1_3_4c_src.tgz \
-    file://makefile.patch;patch=1 \
+    file://makefile.patch \
     "
 
 do_compile() {
diff --git a/recipes/xmltv/xmltv_0.5.56.bb b/recipes/xmltv/xmltv_0.5.56.bb
index 2e6b317268..dc55bb710b 100644
--- a/recipes/xmltv/xmltv_0.5.56.bb
+++ b/recipes/xmltv/xmltv_0.5.56.bb
@@ -2,7 +2,7 @@ DESCRIPTION="xmltv; epg grabbers for e.g. mythtv"
 
 PARALLEL_MAKE = ""
 SRC_URI="http://downloads.sourceforge.net/xmltv/xmltv-${PV}.tar.bz2 \
-         file://Makefile.PL.patch;patch=1"
+         file://Makefile.PL.patch"
 
 RDEPENDS = "perl \
             libarchive-zip-perl \
diff --git a/recipes/xmms-embedded/xmms-embedded_20040327.bb b/recipes/xmms-embedded/xmms-embedded_20040327.bb
index 48c543948c..baffdb8252 100644
--- a/recipes/xmms-embedded/xmms-embedded_20040327.bb
+++ b/recipes/xmms-embedded/xmms-embedded_20040327.bb
@@ -6,16 +6,16 @@ LICENSE = "GPL"
 PR = "r6"
 
 SRC_URI = "cvs://anonymous@xmms-embedded.cvs.sourceforge.net/cvsroot/xmms-embedded;module=xmms-embedded;date=${PV} \
-           file://bogusincdir.patch;patch=1 \
-           file://gtkremoval.patch;patch=1 \
-           file://removenativeincdir.patch;patch=1 \
-           file://glib2.patch;patch=1 \
-           file://tremorlib.patch;patch=1 \
-           file://bufferdefaults.patch;patch=1 \
-           file://gcc34.patch;patch=1 \
-           file://gcc34-enum.patch;patch=1 \
-           file://mikmod-endian.patch;patch=1 \
-           file://mikmod-update.patch;patch=1 \
+           file://bogusincdir.patch \
+           file://gtkremoval.patch \
+           file://removenativeincdir.patch \
+           file://glib2.patch \
+           file://tremorlib.patch \
+           file://bufferdefaults.patch \
+           file://gcc34.patch \
+           file://gcc34-enum.patch \
+           file://mikmod-endian.patch \
+           file://mikmod-update.patch \
            file://xmms.png"
 S = "${WORKDIR}/xmms-embedded"
 
diff --git a/recipes/xmms/xmms_1.2.10.bb b/recipes/xmms/xmms_1.2.10.bb
index 0a35f5bc85..c0a9a316fc 100644
--- a/recipes/xmms/xmms_1.2.10.bb
+++ b/recipes/xmms/xmms_1.2.10.bb
@@ -6,8 +6,8 @@ SECTION = "x11/multimedia"
 DEPENDS = "gtk+-1.2 libvorbis mikmod alsa-lib libsm esound"
 
 SRC_URI = "http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2 \
-           file://gcc4.patch;patch=1 \
-           file://xmms-config-dequote.patch;patch=1 \
+           file://gcc4.patch \
+           file://xmms-config-dequote.patch \
 	   file://acinclude.m4 \
            file://xmms.sh"
 PR = "r5"
diff --git a/recipes/xorg-app/xdm_1.1.10.bb b/recipes/xorg-app/xdm_1.1.10.bb
new file mode 100644
index 0000000000..28202b7dfb
--- /dev/null
+++ b/recipes/xorg-app/xdm_1.1.10.bb
@@ -0,0 +1,17 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "r1"
+
+DESCRIPTION = "X display manager"
+
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt libxaw"
+
+EXTRA_OECONF += "\
+	--with-random-device=/dev/urandom --with-utmp-file=/var/run/utmp \
+	--with-wtmp-file=/var/log/wtmp \
+	"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
+
+SRC_URI[archive.md5sum] = "329383040cdbda5b5c8ce6c7e1120c97"
+SRC_URI[archive.sha256sum] = "1487f7168e65fb7ea8cf21e99cdec412e643680c5dac9688aad5f87beba4f97f"
diff --git a/recipes/xorg-app/xdpyinfo_1.0.2.bb b/recipes/xorg-app/xdpyinfo_1.0.2.bb
index ecd7a57990..60cb11b9d8 100644
--- a/recipes/xorg-app/xdpyinfo_1.0.2.bb
+++ b/recipes/xorg-app/xdpyinfo_1.0.2.bb
@@ -6,7 +6,7 @@ DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender
 PR = "r1"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 EXTRA_OECONF = "--disable-xkb"
 
diff --git a/recipes/xorg-app/xdpyinfo_1.0.3.bb b/recipes/xorg-app/xdpyinfo_1.0.3.bb
index 8f5ad00eee..c515c77ef9 100644
--- a/recipes/xorg-app/xdpyinfo_1.0.3.bb
+++ b/recipes/xorg-app/xdpyinfo_1.0.3.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 EXTRA_OECONF = "--disable-xkb"
 
diff --git a/recipes/xorg-app/xdpyinfo_1.1.0.bb b/recipes/xorg-app/xdpyinfo_1.1.0.bb
index 62ae800377..d9641b24ff 100644
--- a/recipes/xorg-app/xdpyinfo_1.1.0.bb
+++ b/recipes/xorg-app/xdpyinfo_1.1.0.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 EXTRA_OECONF = "--disable-xkb"
 
diff --git a/recipes/xorg-app/xev_1.0.2.bb b/recipes/xorg-app/xev_1.0.2.bb
index 0342415c9e..8c22a1418c 100644
--- a/recipes/xorg-app/xev_1.0.2.bb
+++ b/recipes/xorg-app/xev_1.0.2.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X Event Viewer"
 LICENSE = "MIT"
 PE = "1"
 
-SRC_URI += "file://diet-x11.patch;patch=1"
+SRC_URI += "file://diet-x11.patch"
 
 SRC_URI[archive.md5sum] = "e3008eb0655da3026c162a5597d70869"
 SRC_URI[archive.sha256sum] = "cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053"
diff --git a/recipes/xorg-app/xev_1.0.3.bb b/recipes/xorg-app/xev_1.0.3.bb
index 1b7dde3d4e..cb6e7cdd0f 100644
--- a/recipes/xorg-app/xev_1.0.3.bb
+++ b/recipes/xorg-app/xev_1.0.3.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X Event Viewer"
 LICENSE = "MIT"
 PE = "1"
 
-SRC_URI += "file://diet-x11.patch;patch=1"
+SRC_URI += "file://diet-x11.patch"
 
 SRC_URI[archive.md5sum] = "a9532c3d1683c99bb5df1895cb3a60b1"
 SRC_URI[archive.sha256sum] = "d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a"
diff --git a/recipes/xorg-app/xev_1.0.4.bb b/recipes/xorg-app/xev_1.0.4.bb
index 92986a8b29..4823517a7b 100644
--- a/recipes/xorg-app/xev_1.0.4.bb
+++ b/recipes/xorg-app/xev_1.0.4.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X Event Viewer"
 LICENSE = "MIT"
 PE = "1"
 
-SRC_URI += "file://diet-x11.patch;patch=1"
+SRC_URI += "file://diet-x11.patch"
 
 SRC_URI[archive.md5sum] = "5f98c0a2725a33d60ef4956befe078fb"
 SRC_URI[archive.sha256sum] = "7fad9c9755a624e677f44633dee218e9c22b4ba9a83e6709a6cbf8c1a501fde8"
diff --git a/recipes/xorg-app/xrandr_1.2.2.bb b/recipes/xorg-app/xrandr_1.2.2.bb
index 28e439400d..bac668e12c 100644
--- a/recipes/xorg-app/xrandr_1.2.2.bb
+++ b/recipes/xorg-app/xrandr_1.2.2.bb
@@ -5,7 +5,7 @@ LICENSE= "BSD-X"
 DEPENDS += "libxrandr libxrender"
 PE = "1"
 
-SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
+SRC_URI += "file://resolve_symbol_clash.patch"
 
 SRC_URI[archive.md5sum] = "c6ec9dc42396e3b3a2da932f3feca6ec"
 SRC_URI[archive.sha256sum] = "632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303"
diff --git a/recipes/xorg-app/xrandr_1.2.3.bb b/recipes/xorg-app/xrandr_1.2.3.bb
index 902faee6ee..a972f55944 100644
--- a/recipes/xorg-app/xrandr_1.2.3.bb
+++ b/recipes/xorg-app/xrandr_1.2.3.bb
@@ -5,7 +5,7 @@ LICENSE= "BSD-X"
 DEPENDS += "libxrandr libxrender"
 PE = "1"
 
-SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
+SRC_URI += "file://resolve_symbol_clash.patch"
 
 SRC_URI[archive.md5sum] = "41a9d0cc073fa6165a31fbf9e85f68a6"
 SRC_URI[archive.sha256sum] = "ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207"
diff --git a/recipes/xorg-app/xrandr_1.3.2.bb b/recipes/xorg-app/xrandr_1.3.2.bb
index 7c2e87f60b..0c937c663a 100644
--- a/recipes/xorg-app/xrandr_1.3.2.bb
+++ b/recipes/xorg-app/xrandr_1.3.2.bb
@@ -5,7 +5,7 @@ LICENSE= "BSD-X"
 DEPENDS += "libxrandr libxrender"
 PE = "1"
 
-SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
+SRC_URI += "file://resolve_symbol_clash.patch"
 
 SRC_URI[archive.md5sum] = "2cb19bb1c19ccf77c40032b03dbe06f0"
 SRC_URI[archive.sha256sum] = "34d4334644a6494573141bb8647feb8f91c0ce8c8d3b6883b4861e038e912249"
diff --git a/recipes/xorg-app/xset_1.0.2.bb b/recipes/xorg-app/xset_1.0.2.bb
index 499bb0ee64..19dbaa9280 100644
--- a/recipes/xorg-app/xset_1.0.2.bb
+++ b/recipes/xorg-app/xset_1.0.2.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xset_1.0.3.bb b/recipes/xorg-app/xset_1.0.3.bb
index 9a67ea006b..303489fd69 100644
--- a/recipes/xorg-app/xset_1.0.3.bb
+++ b/recipes/xorg-app/xset_1.0.3.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xset_1.0.4.bb b/recipes/xorg-app/xset_1.0.4.bb
index adb1a4a54f..ac6e5bb705 100644
--- a/recipes/xorg-app/xset_1.0.4.bb
+++ b/recipes/xorg-app/xset_1.0.4.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xset_1.1.0.bb b/recipes/xorg-app/xset_1.1.0.bb
index 824a281d7a..e568597544 100644
--- a/recipes/xorg-app/xset_1.1.0.bb
+++ b/recipes/xorg-app/xset_1.1.0.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb
index 32a39c5346..e025998f09 100644
--- a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb
+++ b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb
@@ -6,10 +6,10 @@ DESCRIPTION = "X.Org X server -- evtouch input driver"
 
 SRC_URI = "http://www.conan.de/touchscreen/xf86-input-evtouch-${PV}.tar.bz2;name=archive \
            file://fdi/*.fdi \
-           file://udev-ett-tc5uh.patch;patch=1 \
-           file://02_calibration_1.6.patch;patch=1 \
-           file://03_server-1.6-ftbfs.diff;patch=1 \
-           file://04_server-1.7-ftbfs.diff;patch=1 \
+           file://udev-ett-tc5uh.patch \
+           file://02_calibration_1.6.patch \
+           file://03_server-1.6-ftbfs.diff \
+           file://04_server-1.7-ftbfs.diff \
 "
 
 EXTRA_OECONF = "--enable-evcalibrate \
diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb
index 01f41d1ef4..693c70363d 100644
--- a/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb
+++ b/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb
@@ -7,10 +7,10 @@ DEPENDS += "tslib"
 PR = "r8"
 
 SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \
-           file://use-hal-for-device.diff;patch=1 \
-           file://01_fix-wrong-value-range-for-the-axises.diff;patch=1 \
-           file://dynamic-xy.patch;patch=1 \
-           file://xserver16.patch;patch=1 \
+           file://use-hal-for-device.diff \
+           file://01_fix-wrong-value-range-for-the-axises.diff \
+           file://dynamic-xy.patch \
+           file://xserver16.patch \
            file://10-x11-input-tslib.fdi"
 
 do_configure_prepend() {
diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
index 9ede07df20..c75edb7a6f 100644
--- a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
+++ b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
@@ -1,15 +1,16 @@
 require xorg-driver-input.inc
 
 DESCRIPTION = "X.Org X server -- tslib input driver"
-RRECOMMENDS += "hal tslib-calibrate"
+RRECOMMENDS_${PN} += "tslib-calibrate"
+RSUGGESTS_${PN} += "hal"
 DEPENDS += "tslib"
 
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \
-           file://double-free-crash.patch;patch=1 \
+           file://double-free-crash.patch \
            file://10-x11-input-tslib.fdi \
-           file://xserver-174-XGetPointerControl.patch;patch=1 \
+           file://xserver-174-XGetPointerControl.patch \
            file://99-xf86-input-tslib.rules \
 "
 
diff --git a/recipes/xorg-driver/xf86-video-apm_1.2.0.bb b/recipes/xorg-driver/xf86-video-apm_1.2.0.bb
index 8f56390f73..58570c0279 100644
--- a/recipes/xorg-driver/xf86-video-apm_1.2.0.bb
+++ b/recipes/xorg-driver/xf86-video-apm_1.2.0.bb
@@ -5,6 +5,6 @@ DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+"
 
 DEPENDS += " xf86rushproto"
 
-SRC_URI += "file://get-rid-of-host-includes.patch;patch=1"
+SRC_URI += "file://get-rid-of-host-includes.patch"
 SRC_URI[archive.md5sum] = "4f78650d79656dc803a720049d65682e"
 SRC_URI[archive.sha256sum] = "f0fe020f892e6e3a696a490c86312a1b32672bffb7dead153c24f103540a6185"
diff --git a/recipes/xorg-driver/xf86-video-apm_1.2.2.bb b/recipes/xorg-driver/xf86-video-apm_1.2.2.bb
index 8a1ded8cbb..c352dd0559 100644
--- a/recipes/xorg-driver/xf86-video-apm_1.2.2.bb
+++ b/recipes/xorg-driver/xf86-video-apm_1.2.2.bb
@@ -5,6 +5,6 @@ DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+"
 
 DEPENDS += " xf86rushproto"
 
-SRC_URI += "file://get-rid-of-host-includes.patch;patch=1"
+SRC_URI += "file://get-rid-of-host-includes.patch"
 SRC_URI[archive.md5sum] = "48441a19aaf015570b267f2a8e67d8ab"
 SRC_URI[archive.sha256sum] = "678edd063e1d5e7c7f72ccdda2388c5857559847b3d313c94d659f9bd51c1752"
diff --git a/recipes/xorg-driver/xf86-video-ark_0.7.0.bb b/recipes/xorg-driver/xf86-video-ark_0.7.0.bb
index e88ff5fdd8..e078ce428c 100644
--- a/recipes/xorg-driver/xf86-video-ark_0.7.0.bb
+++ b/recipes/xorg-driver/xf86-video-ark_0.7.0.bb
@@ -3,6 +3,6 @@ PE = "1"
 
 DESCRIPTION = "X.Org X server -- ark display driver"
 
-SRC_URI += "file://get-rid-of-host-includes.patch;patch=1"
+SRC_URI += "file://get-rid-of-host-includes.patch"
 SRC_URI[archive.md5sum] = "6826c556ebe9a1248cbc7f7edd44f956"
 SRC_URI[archive.sha256sum] = "8e65e73045fabe37c15f6d4895baa09346bdac2f7537607b523aacd7bcf57594"
diff --git a/recipes/xorg-driver/xf86-video-ark_0.7.2.bb b/recipes/xorg-driver/xf86-video-ark_0.7.2.bb
index ef029e11b2..2261ec0907 100644
--- a/recipes/xorg-driver/xf86-video-ark_0.7.2.bb
+++ b/recipes/xorg-driver/xf86-video-ark_0.7.2.bb
@@ -3,6 +3,6 @@ PE = "1"
 
 DESCRIPTION = "X.Org X server -- ark display driver"
 
-SRC_URI += "file://get-rid-of-host-includes.patch;patch=1"
+SRC_URI += "file://get-rid-of-host-includes.patch"
 SRC_URI[archive.md5sum] = "4745f5c722b030962cc56eb2443894a0"
 SRC_URI[archive.sha256sum] = "db1ef3e15ebd382837f16c1143035dfd9fa6465a77ae2e850201f71508065741"
diff --git a/recipes/xorg-driver/xf86-video-displaylink_0.3.bb b/recipes/xorg-driver/xf86-video-displaylink_0.3.bb
index 23c0ff2b08..aa29c4d566 100644
--- a/recipes/xorg-driver/xf86-video-displaylink_0.3.bb
+++ b/recipes/xorg-driver/xf86-video-displaylink_0.3.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "X.Org X server -- displaylink driver"
 RRECOMMENDS_${PN} = "kernel-module-udlfb"
 
 SRC_URI = "http://projects.unbit.it/downloads/udlfb-0.2.3_and_xf86-video-displaylink-${PV}.tar.gz;name=archive \
-           file://xf86-video-displaylink-0.3-xorg-abi-fix.patch;patch=1 \
+           file://xf86-video-displaylink-0.3-xorg-abi-fix.patch \
 "
 
 S = "${WORKDIR}/${PN}"
diff --git a/recipes/xorg-driver/xf86-video-dummy_0.3.0.bb b/recipes/xorg-driver/xf86-video-dummy_0.3.0.bb
index eff49fc2ed..e221e73ae6 100644
--- a/recipes/xorg-driver/xf86-video-dummy_0.3.0.bb
+++ b/recipes/xorg-driver/xf86-video-dummy_0.3.0.bb
@@ -3,6 +3,6 @@ PE = "1"
 
 DESCRIPTION = "X.Org X server -- dummy display driver"
 
-SRC_URI += "file://get-rid-of-host-includes.patch;patch=1"
+SRC_URI += "file://get-rid-of-host-includes.patch"
 SRC_URI[archive.md5sum] = "3d96297556846bee02a74166ffb5d052"
 SRC_URI[archive.sha256sum] = "5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278"
diff --git a/recipes/xorg-driver/xf86-video-dummy_0.3.2.bb b/recipes/xorg-driver/xf86-video-dummy_0.3.2.bb
index c7dc8301ec..ce13df2198 100644
--- a/recipes/xorg-driver/xf86-video-dummy_0.3.2.bb
+++ b/recipes/xorg-driver/xf86-video-dummy_0.3.2.bb
@@ -3,6 +3,6 @@ PE = "1"
 
 DESCRIPTION = "X.Org X server -- dummy display driver"
 
-SRC_URI += "file://get-rid-of-host-includes.patch;patch=1"
+SRC_URI += "file://get-rid-of-host-includes.patch"
 SRC_URI[archive.md5sum] = "2a6f1f07462fbe336865068cd69c8593"
 SRC_URI[archive.sha256sum] = "9389cbc21b0b5f90920fdfaad4466f4ec07674bb1ddbbf63cbb8759ace5c45fa"
diff --git a/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb b/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb
index e4fca58a42..e64174c5f9 100644
--- a/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb
+++ b/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb
@@ -3,6 +3,6 @@ PE = "1"
 
 DESCRIPTION = "X.Org X server -- dummy display driver"
 
-SRC_URI += "file://get-rid-of-host-includes.patch;patch=1"
+SRC_URI += "file://get-rid-of-host-includes.patch"
 SRC_URI[archive.md5sum] = "3ffe3a28f4452e66bf56180e7da9cbc5"
 SRC_URI[archive.sha256sum] = "df3f55de7953dba6d7ce10cc5f355da1a6164f781ad9393a38dae502dba4955d"
diff --git a/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb b/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb
index 11b04a2172..39c3edbbe6 100644
--- a/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb
+++ b/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb
@@ -3,7 +3,7 @@ PE = "1"
 
 DESCRIPTION = "X.Org X server -- fbdev display driver"
 
-FILES_${PN} += " file://use-staged-headers.patch;patch=1"
+FILES_${PN} += " file://use-staged-headers.patch"
 
 #DEPENDS += " "
 SRC_URI[archive.md5sum] = "6572b39fec77b8e6de1c858a93992924"
diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb b/recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb
index 6e45aa3419..8e66ca85dd 100644
--- a/recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb
+++ b/recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb
@@ -5,6 +5,6 @@ PR = "r1"
 COMPATIBLE_HOST = 'i.86.*-linux'
 DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
 
-SRC_URI += "file://fixes.patch;patch=1"
+SRC_URI += "file://fixes.patch"
 SRC_URI[archive.md5sum] = "05f85d897ef41d13de354ac0252bf923"
 SRC_URI[archive.sha256sum] = "d739f6762fe3aa7ef7ca74f87fbe4d6ec3bb13a735e5dfb82b6748eda2b31138"
diff --git a/recipes/xorg-driver/xf86-video-glamo_git.bb b/recipes/xorg-driver/xf86-video-glamo_git.bb
index c88948565c..91fd549084 100644
--- a/recipes/xorg-driver/xf86-video-glamo_git.bb
+++ b/recipes/xorg-driver/xf86-video-glamo_git.bb
@@ -3,15 +3,10 @@ SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=m
 
 S = "${WORKDIR}/git"
 
-SRCREV = "77b6d1b7363d3ff28f063ed92c9ed47194f70b20"
+SRCREV = "a5ef0525ab34d7d5590aba51651ae1a6f40858bc"
 PV = "1.0.0+gitr${SRCPV}"
 PE = "2"
-PR = "r4"
-
-do_configure_prepend() {
-  # pedantic emits warning about GCC extension used in xserver header file edid.h (from version 1.8) and because of -Werror it fill fail
-  sed -i 's/ -pedantic / /g' ${S}/src/Makefile.am
-}
+PR = "r5"
 
 RDEPENDS = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx mesa-dri"
 DEPENDS += "libdrm"
diff --git a/recipes/xorg-driver/xf86-video-intel_2.9.1.bb b/recipes/xorg-driver/xf86-video-intel_2.9.1.bb
index df31aef361..e79e113ceb 100644
--- a/recipes/xorg-driver/xf86-video-intel_2.9.1.bb
+++ b/recipes/xorg-driver/xf86-video-intel_2.9.1.bb
@@ -4,6 +4,6 @@ DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
 DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
 PE = "1"
 
-SRC_URI += " file://nodolt.patch;patch=1 "
+SRC_URI += " file://nodolt.patch "
 SRC_URI[archive.md5sum] = "8951d0366c16991badb7f9050556f4f3"
 SRC_URI[archive.sha256sum] = "95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76"
diff --git a/recipes/xorg-driver/xf86-video-msm_git.bb b/recipes/xorg-driver/xf86-video-msm_git.bb
index a7d7d6f106..594e421e2a 100644
--- a/recipes/xorg-driver/xf86-video-msm_git.bb
+++ b/recipes/xorg-driver/xf86-video-msm_git.bb
@@ -9,10 +9,10 @@ PV = "1.1.0+${PR}+gitr${SRCREV}"
 PE = "1"
 
 SRC_URI = "git://codeaurora.org/quic/xwin/xf86-video-msm.git;protocol=git;branch=chromium \
-           file://compile_cfbbd17f0d4ab0f30915594d74e1b2b12c4ff8a1.patch;patch=1 \
+           file://compile_cfbbd17f0d4ab0f30915594d74e1b2b12c4ff8a1.patch \
            file://kgsl_drm.h "
 
-SRC_URI_append_htcdream = "file://no_neon_cfbbd17f0d4ab0f30915594d74e1b2b12c4ff8a1.patch;patch=1"
+SRC_URI_append_htcdream = "file://no_neon_cfbbd17f0d4ab0f30915594d74e1b2b12c4ff8a1.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/xorg-driver/xf86-video-omapfb_git.bb b/recipes/xorg-driver/xf86-video-omapfb_git.bb
index 4d993d7a04..7c723fa466 100644
--- a/recipes/xorg-driver/xf86-video-omapfb_git.bb
+++ b/recipes/xorg-driver/xf86-video-omapfb_git.bb
@@ -5,8 +5,8 @@ DESCRIPTION = "X.Org X server -- OMAP display driver"
 PR_append = "e"
 
 SRCREV = "db636c8436265c3d86c5b8e00785e45d55825c80"
-PV = "0.1.1+${PR}+gitr${SRCPV}"
-PE = "2"
+PV = "0.1.1+${PR}+gitr${SRCREV}"
+PE = "1"
 
 SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
           "
diff --git a/recipes/xorg-driver/xf86-video-s3c64xx_git.bb b/recipes/xorg-driver/xf86-video-s3c64xx_git.bb
index 934c2195b4..d1cbb835d5 100644
--- a/recipes/xorg-driver/xf86-video-s3c64xx_git.bb
+++ b/recipes/xorg-driver/xf86-video-s3c64xx_git.bb
@@ -8,9 +8,9 @@ SRCREV = "79c2402ba26e57f4c9fd27f75f8a0324c72c13be"
 PV = "0.0.2+${PR}+gitr${SRCREV}"
 
 SRC_URI = "git://git.gitorious.org/xf86-video-s3c64xx/xf86-video-s3c64xx.git;protocol=http \
-           file://0001-s3c64xx-update-for-resources-RAC-API-removal.patch;patch=1 \
-           file://0002-DPMS-header-was-split-into-dpms.h-client-and-dpmscon.patch;patch=1 \
-           file://0003-s3c64xx-lcd-include-cursorstr.h-to-get-CursorRec-and.patch;patch=1 \
+           file://0001-s3c64xx-update-for-resources-RAC-API-removal.patch \
+           file://0002-DPMS-header-was-split-into-dpms.h-client-and-dpmscon.patch \
+           file://0003-s3c64xx-lcd-include-cursorstr.h-to-get-CursorRec-and.patch \
           "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/xorg-driver/xf86-video-vesa_1.3.0.bb b/recipes/xorg-driver/xf86-video-vesa_1.3.0.bb
index 7b1163560e..3c67e1ca5f 100644
--- a/recipes/xorg-driver/xf86-video-vesa_1.3.0.bb
+++ b/recipes/xorg-driver/xf86-video-vesa_1.3.0.bb
@@ -1,7 +1,7 @@
 require xorg-driver-video.inc
 PE = "1"
 
-SRC_URI += "file://fix-includepath.patch;patch=1"
+SRC_URI += "file://fix-includepath.patch"
 
 #DESCRIPTION = ""
 
diff --git a/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb
index 641fc61b66..b1f62f3f75 100644
--- a/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb
+++ b/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb
@@ -1,8 +1,8 @@
 require xorg-driver-video.inc
 PE = "1"
 
-SRC_URI += "file://fix-includepath.patch;patch=1 \
-            file://fix-configure-includes.patch;patch=1"
+SRC_URI += "file://fix-includepath.patch \
+            file://fix-configure-includes.patch"
 
 #DESCRIPTION = ""
 
diff --git a/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb
index ce89f5f608..b5ffdfe6d1 100644
--- a/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb
+++ b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb
@@ -1,8 +1,8 @@
 require xorg-driver-video.inc
 PE = "1"
 
-SRC_URI += "file://fix-includepath.patch;patch=1 \
-            file://fix-configure-includes.patch;patch=1"
+SRC_URI += "file://fix-includepath.patch \
+            file://fix-configure-includes.patch"
 
 #DESCRIPTION = ""
 
diff --git a/recipes/xorg-driver/xf86-video-vesa_2.2.1.bb b/recipes/xorg-driver/xf86-video-vesa_2.2.1.bb
index 1e08bc484a..b01a81047d 100644
--- a/recipes/xorg-driver/xf86-video-vesa_2.2.1.bb
+++ b/recipes/xorg-driver/xf86-video-vesa_2.2.1.bb
@@ -1,8 +1,8 @@
 require xorg-driver-video.inc
 PE = "1"
 
-SRC_URI += "file://fix-includepath.patch;patch=1 \
-            file://fix-configure-includes.patch;patch=1"
+SRC_URI += "file://fix-includepath.patch \
+            file://fix-configure-includes.patch"
 
 #DESCRIPTION = ""
 
diff --git a/recipes/xorg-font/font-misc-misc_1.0.0.bb b/recipes/xorg-font/font-misc-misc_1.0.0.bb
index f8833e6ba3..43bfa950ee 100644
--- a/recipes/xorg-font/font-misc-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-misc-misc_1.0.0.bb
@@ -4,7 +4,7 @@ require xorg-font-common.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += " file://configure-mapdir.patch;patch=1"
+SRC_URI += " file://configure-mapdir.patch"
 
 SRC_URI[archive.md5sum] = "2a57f6188c41d4bc1b88ca3d08ad011d"
 SRC_URI[archive.sha256sum] = "26a02560ad1f1648e7c36be6daf42910762131d3974422d1b306e6cae13f17db"
diff --git a/recipes/xorg-font/xfonts-xorg_6.8.bb b/recipes/xorg-font/xfonts-xorg_6.8.bb
index 78068e0534..08620f1e5c 100644
--- a/recipes/xorg-font/xfonts-xorg_6.8.bb
+++ b/recipes/xorg-font/xfonts-xorg_6.8.bb
@@ -6,7 +6,7 @@ LICENSE = "XFree86"
 PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;tag=XORG-6_8_0;method=pserver \
-	file://lexer.patch;patch=1"
+	file://lexer.patch"
 
 
 PACKAGES = "${PN}-dbg ${PN}-75dpi ${PN}-100dpi ${PN}-type1 ${PN}-cyrillic ${PN}-ttf ${PN}"
diff --git a/recipes/xorg-lib/diet-x11_1.1.1.bb b/recipes/xorg-lib/diet-x11_1.1.1.bb
index 4219b0c997..486faf033f 100644
--- a/recipes/xorg-lib/diet-x11_1.1.1.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.1.bb
@@ -6,8 +6,8 @@ CFLAGS += "-D_GNU_SOURCE"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
-SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
-	    file://fix-disable-xlocale.diff;patch=1 \
-            file://fix-utf8-wrong-define.patch;patch=1 \
-	    file://xim.patch;patch=1 \
-	    file://xchar2b.patch;patch=1"
+SRC_URI += "file://X18NCMSstubs.diff \
+	    file://fix-disable-xlocale.diff \
+            file://fix-utf8-wrong-define.patch \
+	    file://xim.patch \
+	    file://xchar2b.patch"
diff --git a/recipes/xorg-lib/diet-x11_1.1.2.bb b/recipes/xorg-lib/diet-x11_1.1.2.bb
index d06bda596f..0d8dbd5a8e 100644
--- a/recipes/xorg-lib/diet-x11_1.1.2.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.2.bb
@@ -1,8 +1,8 @@
 require libx11_${PV}.bb
 
-SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
-	    file://fix-disable-xlocale.diff;patch=1 \
-            file://fix-utf8-wrong-define.patch;patch=1"
+SRC_URI += "file://X18NCMSstubs.diff \
+	    file://fix-disable-xlocale.diff \
+            file://fix-utf8-wrong-define.patch"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
diff --git a/recipes/xorg-lib/diet-x11_1.1.3.bb b/recipes/xorg-lib/diet-x11_1.1.3.bb
index b6f05cb7e9..149d543008 100644
--- a/recipes/xorg-lib/diet-x11_1.1.3.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.3.bb
@@ -1,8 +1,8 @@
 require libx11_${PV}.bb
 
-SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
-	    file://fix-disable-xlocale.diff;patch=1 \
-            file://fix-utf8-wrong-define.patch;patch=1"
+SRC_URI += "file://X18NCMSstubs.diff \
+	    file://fix-disable-xlocale.diff \
+            file://fix-utf8-wrong-define.patch"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
diff --git a/recipes/xorg-lib/diet-x11_1.1.4.bb b/recipes/xorg-lib/diet-x11_1.1.4.bb
index 701cb45ee3..516ca034f7 100644
--- a/recipes/xorg-lib/diet-x11_1.1.4.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.4.bb
@@ -1,8 +1,8 @@
 require libx11_${PV}.bb
 
-SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
-            file://fix-disable-xlocale.diff;patch=1 \
-            file://fix-utf8-wrong-define.patch;patch=1"
+SRC_URI += "file://X18NCMSstubs.diff \
+            file://fix-disable-xlocale.diff \
+            file://fix-utf8-wrong-define.patch"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
diff --git a/recipes/xorg-lib/diet-x11_1.1.5.bb b/recipes/xorg-lib/diet-x11_1.1.5.bb
index 19a9efecbf..4f7e51b99e 100644
--- a/recipes/xorg-lib/diet-x11_1.1.5.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.5.bb
@@ -1,8 +1,8 @@
 require libx11_${PV}.bb
 
-SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
-            file://fix-disable-xlocale.diff;patch=1 \
-            file://fix-utf8-wrong-define.patch;patch=1"
+SRC_URI += "file://X18NCMSstubs.diff \
+            file://fix-disable-xlocale.diff \
+            file://fix-utf8-wrong-define.patch"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
diff --git a/recipes/xorg-lib/libdmx_1.1.0.bb b/recipes/xorg-lib/libdmx_1.1.0.bb
index 27f429bc4f..60183fe5e8 100644
--- a/recipes/xorg-lib/libdmx_1.1.0.bb
+++ b/recipes/xorg-lib/libdmx_1.1.0.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Distributed Multihead extension library"
 DEPENDS += "libxext dmxproto"
-PR = "r1"
+PR = "r3"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "a2fcf0382837888d3781b714489a8999"
diff --git a/recipes/xorg-lib/liblbxutil_1.0.1.bb b/recipes/xorg-lib/liblbxutil_1.0.1.bb
index ec561b3811..fc6e612174 100644
--- a/recipes/xorg-lib/liblbxutil_1.0.1.bb
+++ b/recipes/xorg-lib/liblbxutil_1.0.1.bb
@@ -5,7 +5,7 @@ DEPENDS += " xextproto xproto zlib"
 PROVIDES = "lbxutil"
 PE = "1"
 
-SRC_URI += "file://mkg3states.patch;patch=1"
+SRC_URI += "file://mkg3states.patch"
 
 export CC_FOR_BUILD = "gcc"
 
diff --git a/recipes/xorg-lib/liblbxutil_1.1.0.bb b/recipes/xorg-lib/liblbxutil_1.1.0.bb
index e0157f5465..a00f15ffe0 100644
--- a/recipes/xorg-lib/liblbxutil_1.1.0.bb
+++ b/recipes/xorg-lib/liblbxutil_1.1.0.bb
@@ -5,7 +5,7 @@ DEPENDS += " xextproto xproto zlib"
 PROVIDES = "lbxutil"
 PE = "1"
 
-SRC_URI += "file://mkg3states-1.1.patch;patch=1"
+SRC_URI += "file://mkg3states-1.1.patch"
 
 export CC_FOR_BUILD = "gcc"
 
diff --git a/recipes/xorg-lib/libpciaccess_0.10.3.bb b/recipes/xorg-lib/libpciaccess_0.10.3.bb
index d3ac10cea6..826397101b 100644
--- a/recipes/xorg-lib/libpciaccess_0.10.3.bb
+++ b/recipes/xorg-lib/libpciaccess_0.10.3.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DEPENDS += "xproto virtual/libx11"
 
-SRC_URI += "file://fix-mtrr-check.patch;patch=1"
+SRC_URI += "file://fix-mtrr-check.patch"
 
 SRC_URI[archive.md5sum] = "6d5468debf76fac84576ca26c9535821"
 SRC_URI[archive.sha256sum] = "2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc"
diff --git a/recipes/xorg-lib/libx11-trim_1.1.5.bb b/recipes/xorg-lib/libx11-trim_1.1.5.bb
index 5b22475ade..f7c40e2963 100644
--- a/recipes/xorg-lib/libx11-trim_1.1.5.bb
+++ b/recipes/xorg-lib/libx11-trim_1.1.5.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X11 protocol and utility library"
 DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto"
 
 #FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-#SRC_URI += "file://X18NCMSstubs.diff;patch=1 "
+#SRC_URI += "file://X18NCMSstubs.diff "
 
 PROVIDES = "virtual/libx11"
 
@@ -14,8 +14,8 @@ PR = "r1"
 XORG_PN = "libX11"
 LEAD_SONAME = "libX11.so"
 
-SRC_URI += "file://include_fix.patch;patch=1 \
-            file://makekeys-update.patch;patch=1"
+SRC_URI += "file://include_fix.patch \
+            file://makekeys-update.patch"
 
 EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 #EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.1.bb b/recipes/xorg-lib/libx11_1.1.1.bb
index 55946963fa..0ecf6cd214 100644
--- a/recipes/xorg-lib/libx11_1.1.1.bb
+++ b/recipes/xorg-lib/libx11_1.1.1.bb
@@ -11,7 +11,7 @@ XORG_PN = "libX11"
 
 EXTRA_OECONF += "--without-xcb"
 
-SRC_URI += " file://ruutf8.patch;patch=1"
+SRC_URI += " file://ruutf8.patch"
 
 do_compile() {
         (
diff --git a/recipes/xorg-lib/libx11_1.1.2.bb b/recipes/xorg-lib/libx11_1.1.2.bb
index 680ffbe948..a02fb0ef9b 100644
--- a/recipes/xorg-lib/libx11_1.1.2.bb
+++ b/recipes/xorg-lib/libx11_1.1.2.bb
@@ -9,7 +9,7 @@ PR = "r3"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://include_fix.patch;patch=1" 
+SRC_URI += "file://include_fix.patch" 
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.1.3.bb b/recipes/xorg-lib/libx11_1.1.3.bb
index fe9f4b55d9..8100baa9e8 100644
--- a/recipes/xorg-lib/libx11_1.1.3.bb
+++ b/recipes/xorg-lib/libx11_1.1.3.bb
@@ -9,7 +9,7 @@ PR = "r3"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://include_fix.patch;patch=1" 
+SRC_URI += "file://include_fix.patch" 
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.1.4.bb b/recipes/xorg-lib/libx11_1.1.4.bb
index c3dd46795b..6949a3f2fa 100644
--- a/recipes/xorg-lib/libx11_1.1.4.bb
+++ b/recipes/xorg-lib/libx11_1.1.4.bb
@@ -9,8 +9,8 @@ PR = "r3"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
-            file://include_fix.patch;patch=1" 
+SRC_URI += "file://x11_disable_makekeys.patch \
+            file://include_fix.patch" 
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.1.5.bb b/recipes/xorg-lib/libx11_1.1.5.bb
index 9b6ddaad64..fa33157ff0 100644
--- a/recipes/xorg-lib/libx11_1.1.5.bb
+++ b/recipes/xorg-lib/libx11_1.1.5.bb
@@ -9,8 +9,8 @@ PR = "r4"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
-            file://keysymdef_include.patch;patch=1"
+SRC_URI += "file://x11_disable_makekeys.patch \
+            file://keysymdef_include.patch"
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb
index 7d8643b542..b496563301 100644
--- a/recipes/xorg-lib/libx11_1.2.bb
+++ b/recipes/xorg-lib/libx11_1.2.bb
@@ -8,8 +8,8 @@ PE = "1"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
-            file://keysymdef_include.patch;patch=1"
+SRC_URI += "file://x11_disable_makekeys.patch \
+            file://keysymdef_include.patch"
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb
index f8cb84a4fb..855dfa2f83 100644
--- a/recipes/xorg-lib/libx11_1.3.2.bb
+++ b/recipes/xorg-lib/libx11_1.3.2.bb
@@ -9,9 +9,9 @@ PR = "r3"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://x11_disable_makekeys.1.6.3.patch;patch=1 \
-            file://dolt-fix.patch;patch=1 \
-            file://keysymdef_include.patch;patch=1"
+SRC_URI += "file://x11_disable_makekeys.1.6.3.patch \
+            file://dolt-fix.patch \
+            file://keysymdef_include.patch"
 
 EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb
index cde27208e7..37ef559011 100644
--- a/recipes/xorg-lib/libx11_1.3.3.bb
+++ b/recipes/xorg-lib/libx11_1.3.3.bb
@@ -9,9 +9,9 @@ PR = "r7"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
-            file://dolt-fix.patch;patch=1 \
-            ${@['file://keysymdef_include.patch;patch=1', ''][(bb.data.inherits_class('native', d))]} \
+SRC_URI += "file://x11_disable_makekeys.patch \
+            file://dolt-fix.patch \
+            ${@['file://keysymdef_include.patch', ''][(bb.data.inherits_class('native', d))]} \
 "
 
 # --with-keysymdef has intentionally no effect in native build without without keysymdef_include.patch
diff --git a/recipes/xorg-lib/libxcomposite_0.3.1.bb b/recipes/xorg-lib/libxcomposite_0.3.1.bb
index e78b0ffab8..928e805e5e 100644
--- a/recipes/xorg-lib/libxcomposite_0.3.1.bb
+++ b/recipes/xorg-lib/libxcomposite_0.3.1.bb
@@ -9,7 +9,7 @@ PROVIDES = "xcomposite"
 
 XORG_PN = "libXcomposite"
 
-SRC_URI += " file://change-include-order.patch;patch=1"
+SRC_URI += " file://change-include-order.patch"
 
 SRC_URI[archive.md5sum] = "a80650d660486ea7bb2e5fd84a83799a"
 SRC_URI[archive.sha256sum] = "d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b"
diff --git a/recipes/xorg-lib/libxcomposite_0.4.0.bb b/recipes/xorg-lib/libxcomposite_0.4.0.bb
index d72939fb17..e6feafdf9c 100644
--- a/recipes/xorg-lib/libxcomposite_0.4.0.bb
+++ b/recipes/xorg-lib/libxcomposite_0.4.0.bb
@@ -8,7 +8,7 @@ PE = "1"
 
 XORG_PN = "libXcomposite"
 
-SRC_URI += " file://change-include-order.patch;patch=1"
+SRC_URI += " file://change-include-order.patch"
 
 SRC_URI[archive.md5sum] = "7e95395dea89be21bae929b9b7f16641"
 SRC_URI[archive.sha256sum] = "7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510"
diff --git a/recipes/xorg-lib/libxfont_1.2.7.bb b/recipes/xorg-lib/libxfont_1.2.7.bb
index e68c973999..c6cbff8a3d 100644
--- a/recipes/xorg-lib/libxfont_1.2.7.bb
+++ b/recipes/xorg-lib/libxfont_1.2.7.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "X font library (used by the X server)."
 LICENSE= "BSD-X"
 PRIORITY = "optional"
 
-SRC_URI += "file://no-scalable-crash.patch;patch=1"
+SRC_URI += "file://no-scalable-crash.patch"
 
 DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
diff --git a/recipes/xorg-lib/libxfont_1.2.8.bb b/recipes/xorg-lib/libxfont_1.2.8.bb
index 9e8d2ea625..9d9847980e 100644
--- a/recipes/xorg-lib/libxfont_1.2.8.bb
+++ b/recipes/xorg-lib/libxfont_1.2.8.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "X font library (used by the X server)."
 LICENSE= "BSD-X"
 PRIORITY = "optional"
 
-SRC_URI += "file://no-scalable-crash.patch;patch=1"
+SRC_URI += "file://no-scalable-crash.patch"
 
 DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
diff --git a/recipes/xorg-lib/libxfont_1.3.0.bb b/recipes/xorg-lib/libxfont_1.3.0.bb
index 04229abc2e..6f63f7b5f1 100644
--- a/recipes/xorg-lib/libxfont_1.3.0.bb
+++ b/recipes/xorg-lib/libxfont_1.3.0.bb
@@ -7,8 +7,8 @@ PROVIDES = "xfont"
 PR = "r2"
 PE = "1"
 
-SRC_URI += "file://no-scalable-crash.patch;patch=1 \
-            file://builtinreaddirectory-no-side-effect.patch;patch=1"
+SRC_URI += "file://no-scalable-crash.patch \
+            file://builtinreaddirectory-no-side-effect.patch"
 
 XORG_PN = "libXfont"
 
diff --git a/recipes/xorg-lib/libxfont_1.3.1.bb b/recipes/xorg-lib/libxfont_1.3.1.bb
index 9e0e596e19..a6be89f338 100644
--- a/recipes/xorg-lib/libxfont_1.3.1.bb
+++ b/recipes/xorg-lib/libxfont_1.3.1.bb
@@ -6,7 +6,7 @@ DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
 PE = "1"
 
-SRC_URI += "file://no-scalable-crash.patch;patch=1"
+SRC_URI += "file://no-scalable-crash.patch"
 
 XORG_PN = "libXfont"
 
diff --git a/recipes/xorg-lib/libxfont_1.3.2.bb b/recipes/xorg-lib/libxfont_1.3.2.bb
index 33db11ef8f..5c9f08b051 100644
--- a/recipes/xorg-lib/libxfont_1.3.2.bb
+++ b/recipes/xorg-lib/libxfont_1.3.2.bb
@@ -6,7 +6,7 @@ DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
 PE = "1"
 
-SRC_URI += "file://no-scalable-crash.patch;patch=1"
+SRC_URI += "file://no-scalable-crash.patch"
 
 XORG_PN = "libXfont"
 
diff --git a/recipes/xorg-lib/libxfont_1.3.3.bb b/recipes/xorg-lib/libxfont_1.3.3.bb
index 3b0d648f2f..17cf158eed 100644
--- a/recipes/xorg-lib/libxfont_1.3.3.bb
+++ b/recipes/xorg-lib/libxfont_1.3.3.bb
@@ -6,7 +6,7 @@ DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
 PE = "1"
 
-#SRC_URI += "file://no-scalable-crash.patch;patch=1"
+#SRC_URI += "file://no-scalable-crash.patch"
 
 XORG_PN = "libXfont"
 
diff --git a/recipes/xorg-lib/libxfont_1.4.1.bb b/recipes/xorg-lib/libxfont_1.4.1.bb
index 1fae80ad6d..4ec9e23794 100644
--- a/recipes/xorg-lib/libxfont_1.4.1.bb
+++ b/recipes/xorg-lib/libxfont_1.4.1.bb
@@ -6,7 +6,7 @@ DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
 PE = "1"
 
-#SRC_URI += "file://no-scalable-crash.patch;patch=1"
+#SRC_URI += "file://no-scalable-crash.patch"
 
 # disable docs
 EXTRA_OECONF += " --disable-devel-docs "
diff --git a/recipes/xorg-lib/libxft_2.1.14.bb b/recipes/xorg-lib/libxft_2.1.14.bb
index b70f90e789..bb8be59245 100644
--- a/recipes/xorg-lib/libxft_2.1.14.bb
+++ b/recipes/xorg-lib/libxft_2.1.14.bb
@@ -6,7 +6,7 @@ PROVIDES = "xft"
 PR = "r1"
 PE = "1"
 
-SRC_URI += "file://autotools.patch;patch=1"
+SRC_URI += "file://autotools.patch"
 
 XORG_PN = "libXft"
 
diff --git a/recipes/xorg-lib/libxt_1.0.4.bb b/recipes/xorg-lib/libxt_1.0.4.bb
index 0b47a7cab8..4038a171e2 100644
--- a/recipes/xorg-lib/libxt_1.0.4.bb
+++ b/recipes/xorg-lib/libxt_1.0.4.bb
@@ -9,7 +9,7 @@ PROVIDES = "xt"
 
 XORG_PN = "libXt"
 
-SRC_URI += "file://pr10970-header-fix.patch;patch=1"
+SRC_URI += "file://pr10970-header-fix.patch"
 
 PR = "r1"
 
diff --git a/recipes/xorg-lib/libxt_1.0.5.bb b/recipes/xorg-lib/libxt_1.0.5.bb
index 9fadd96cf7..f002b73edd 100644
--- a/recipes/xorg-lib/libxt_1.0.5.bb
+++ b/recipes/xorg-lib/libxt_1.0.5.bb
@@ -8,7 +8,7 @@ PE = "1"
 
 XORG_PN = "libXt"
 
-SRC_URI += "file://pr10970-header-fix.patch;patch=1"
+SRC_URI += "file://pr10970-header-fix.patch"
 
 EXTRA_OECONF += "--disable-install-makestrs --disable-xkb"
 
diff --git a/recipes/xorg-lib/pixman-0.18.0/565-scanline.patch b/recipes/xorg-lib/pixman-0.18.0/565-scanline.patch
new file mode 100644
index 0000000000..8461a46a12
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.18.0/565-scanline.patch
@@ -0,0 +1,257 @@
+From deef1daf5896062f47fa61b94e1e77c7c0041820 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 04 Dec 2009 16:49:19 +0000
+Subject: A copy-paste version of 16bpp bilinear scanline fetcher
+
+---
+diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
+index 3d78ff0..1656975 100644
+--- a/pixman/pixman-bits-image.c
++++ b/pixman/pixman-bits-image.c
+@@ -535,6 +535,212 @@ bits_image_fetch_bilinear_no_repeat_8888 (pixman_image_t * ima,
+ 	*buffer++ = 0;
+ }
+ 
++static void
++bits_image_fetch_bilinear_no_repeat_0565 (pixman_image_t * ima,
++					  int              offset,
++					  int              line,
++					  int              width,
++					  uint32_t *       buffer,
++					  const uint32_t * mask,
++					  uint32_t         mask_bits)
++{
++    bits_image_t *bits = &ima->bits;
++    pixman_fixed_t x_top, x_bottom, x;
++    pixman_fixed_t ux_top, ux_bottom, ux;
++    pixman_vector_t v;
++    uint32_t top_mask, bottom_mask;
++    uint16_t *top_row;
++    uint16_t *bottom_row;
++    uint32_t *end;
++    uint16_t zero[2] = { 0, 0 };
++    int y, y1, y2;
++    int disty;
++    int mask_inc;
++    int w;
++
++    /* reference point is the center of the pixel */
++    v.vector[0] = pixman_int_to_fixed (offset) + pixman_fixed_1 / 2;
++    v.vector[1] = pixman_int_to_fixed (line) + pixman_fixed_1 / 2;
++    v.vector[2] = pixman_fixed_1;
++
++    if (!pixman_transform_point_3d (bits->common.transform, &v))
++	return;
++
++    ux = ux_top = ux_bottom = bits->common.transform->matrix[0][0];
++    x = x_top = x_bottom = v.vector[0] - pixman_fixed_1/2;
++
++    y = v.vector[1] - pixman_fixed_1/2;
++    disty = (y >> 8) & 0xff;
++
++    /* Load the pointers to the first and second lines from the source
++     * image that bilinear code must read.
++     *
++     * The main trick in this code is about the check if any line are
++     * outside of the image;
++     *
++     * When I realize that a line (any one) is outside, I change
++     * the pointer to a dummy area with zeros. Once I change this, I
++     * must be sure the pointer will not change, so I set the
++     * variables to each pointer increments inside the loop.
++     */
++    y1 = pixman_fixed_to_int (y);
++    y2 = y1 + 1;
++
++    if (y1 < 0 || y1 >= bits->height)
++    {
++	top_row = zero;
++	x_top = 0;
++	ux_top = 0;
++    }
++    else
++    {
++	top_row = bits->bits + y1 * bits->rowstride;
++	x_top = x;
++	ux_top = ux;
++    }
++
++    if (y2 < 0 || y2 >= bits->height)
++    {
++	bottom_row = zero;
++	x_bottom = 0;
++	ux_bottom = 0;
++    }
++    else
++    {
++	bottom_row = bits->bits + y2 * bits->rowstride;
++	x_bottom = x;
++	ux_bottom = ux;
++    }
++
++    /* Instead of checking whether the operation uses the mast in
++     * each loop iteration, verify this only once and prepare the
++     * variables to make the code smaller inside the loop.
++     */
++    if (!mask)
++    {
++        mask_inc = 0;
++        mask_bits = 1;
++        mask = &mask_bits;
++    }
++    else
++    {
++        /* If have a mask, prepare the variables to check it */
++        mask_inc = 1;
++    }
++
++    /* If both are zero, then the whole thing is zero */
++    if (top_row == zero && bottom_row == zero)
++    {
++	memset (buffer, 0, width * sizeof (uint32_t));
++	return;
++    }
++    else
++    {
++	if (top_row == zero)
++	{
++	    top_mask = 0;
++	    bottom_mask = 0xff000000;
++	}
++	else if (bottom_row == zero)
++	{
++	    top_mask = 0xff000000;
++	    bottom_mask = 0;
++	}
++	else
++	{
++	    top_mask = 0xff000000;
++	    bottom_mask = 0xff000000;
++	}
++    }
++
++    end = buffer + width;
++
++    /* Zero fill to the left of the image */
++    while (buffer < end && x < pixman_fixed_minus_1)
++    {
++	*buffer++ = 0;
++	x += ux;
++	x_top += ux_top;
++	x_bottom += ux_bottom;
++	mask += mask_inc;
++    }
++
++    /* Left edge
++     */
++    while (buffer < end && x < 0)
++    {
++	uint32_t tr, br;
++	int32_t distx;
++
++	tr = CONVERT_0565_TO_0888 (top_row[pixman_fixed_to_int (x_top) + 1]) | top_mask;
++	br = CONVERT_0565_TO_0888 (bottom_row[pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
++
++	distx = (x >> 8) & 0xff;
++
++	*buffer++ = bilinear_interpolation (0, tr, 0, br, distx, disty);
++
++	x += ux;
++	x_top += ux_top;
++	x_bottom += ux_bottom;
++	mask += mask_inc;
++    }
++
++    /* Main part */
++    w = pixman_int_to_fixed (bits->width - 1);
++
++    while (buffer < end  &&  x < w)
++    {
++	if (*mask)
++	{
++	    uint32_t tl, tr, bl, br;
++	    int32_t distx;
++
++	    tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
++	    tr = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top) + 1]) | top_mask;
++	    bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
++	    br = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
++
++	    distx = (x >> 8) & 0xff;
++
++	    *buffer = bilinear_interpolation (tl, tr, bl, br, distx, disty);
++	}
++
++	buffer++;
++	x += ux;
++	x_top += ux_top;
++	x_bottom += ux_bottom;
++	mask += mask_inc;
++    }
++
++    /* Right Edge */
++    w = pixman_int_to_fixed (bits->width);
++    while (buffer < end  &&  x < w)
++    {
++	if (*mask)
++	{
++	    uint32_t tl, bl;
++	    int32_t distx;
++
++	    tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
++	    bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
++
++	    distx = (x >> 8) & 0xff;
++
++	    *buffer = bilinear_interpolation (tl, 0, bl, 0, distx, disty);
++	}
++
++	buffer++;
++	x += ux;
++	x_top += ux_top;
++	x_bottom += ux_bottom;
++	mask += mask_inc;
++    }
++
++    /* Zero fill to the left of the image */
++    while (buffer < end)
++	*buffer++ = 0;
++}
++
+ static force_inline uint32_t
+ bits_image_fetch_pixel_convolution (bits_image_t   *image,
+ 				    pixman_fixed_t  x,
+@@ -917,14 +1123,26 @@ bits_image_property_changed (pixman_image_t *image)
+ 	     (bits->common.filter == PIXMAN_FILTER_BILINEAR ||
+ 	      bits->common.filter == PIXMAN_FILTER_GOOD	    ||
+ 	      bits->common.filter == PIXMAN_FILTER_BEST)		&&
+-	     bits->common.repeat == PIXMAN_REPEAT_NONE			&&
+-	     (bits->format == PIXMAN_a8r8g8b8	||
+-	      bits->format == PIXMAN_x8r8g8b8))
++	     bits->common.repeat == PIXMAN_REPEAT_NONE)
+     {
+ 	image->common.get_scanline_64 =
+ 	    _pixman_image_get_scanline_generic_64;
+-	image->common.get_scanline_32 =
+-	    bits_image_fetch_bilinear_no_repeat_8888;
++
++	if (bits->format == PIXMAN_a8r8g8b8 || bits->format == PIXMAN_x8r8g8b8)
++	{
++	    image->common.get_scanline_32 =
++		bits_image_fetch_bilinear_no_repeat_8888;
++	}
++	else if (bits->format == PIXMAN_r5g6b5)
++	{
++	    image->common.get_scanline_32 =
++		bits_image_fetch_bilinear_no_repeat_0565;
++	}
++	else
++	{
++	    image->common.get_scanline_32 =
++		bits_image_fetch_transformed;
++	}
+     }
+     else
+     {
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.18.0/missing-cache-preload.diff b/recipes/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
new file mode 100644
index 0000000000..475bb35495
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
@@ -0,0 +1,28 @@
+From 4f45c7688e6b767a5f7b7f5cced51b4797a3c288 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 21 May 2010 13:31:03 +0000
+Subject: ARM: added missing cache preload
+
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index 51bc347..a99555a 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -388,6 +388,7 @@ generate_composite_function \
+     vld1.16     {d4, d5}, [DST_R, :128]!
+     vst1.16     {d28, d29}, [DST_W, :128]!
+     pixman_composite_over_n_0565_process_pixblock_head
++    cache_preload 8, 8
+ .endm
+ 
+ .macro pixman_composite_over_n_0565_init
+@@ -660,6 +661,7 @@ generate_composite_function_single_scanline \
+     vld4.8      {d4, d5, d6, d7}, [DST_R, :128]!
+     vst4.8      {d28, d29, d30, d31}, [DST_W, :128]!
+     pixman_composite_over_8888_8888_process_pixblock_head
++    cache_preload 8, 8
+ .endm
+ 
+ .macro pixman_composite_over_n_8888_init
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.18.2/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman-0.18.2/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
new file mode 100644
index 0000000000..b2488de4dd
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.18.2/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
@@ -0,0 +1,114 @@
+From 05875eca09ee23ea04ccb32f87c7c355fd1b88f3 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Tue, 16 Mar 2010 16:55:28 +0100
+Subject: [PATCH 1/7] Generic C implementation of pixman_blt with overlapping support
+
+Uses memcpy/memmove functions to copy pixels, can handle the
+case when both source and destination areas are in the same
+image (this is useful for scrolling).
+
+It is assumed that copying direction is only important when
+using the same image for both source and destination (and
+src_stride == dst_stride). Copying direction is undefined
+for the images with different source and destination stride
+which happen to be in the overlapped areas (but this is an
+unrealistic case anyway).
+---
+ pixman/pixman-general.c |   21 ++++++++++++++++++---
+ pixman/pixman-private.h |   43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+), 3 deletions(-)
+
+diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
+index bddf79a..f525744 100644
+--- a/pixman/pixman-general.c
++++ b/pixman/pixman-general.c
+@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp,
+              int                      width,
+              int                      height)
+ {
+-    /* We can't blit unless we have sse2 or mmx */
+-
+-    return FALSE;
++    uint8_t *dst_bytes = (uint8_t *)dst_bits;
++    uint8_t *src_bytes = (uint8_t *)src_bits;
++    int bpp;
++
++    if (src_bpp != dst_bpp || src_bpp & 7)
++	return FALSE;
++
++    bpp = src_bpp >> 3;
++    width *= bpp;
++    src_stride *= 4;
++    dst_stride *= 4;
++    pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
++                       dst_bytes + dst_y * dst_stride + dst_x * bpp,
++                       src_stride,
++                       dst_stride,
++                       width,
++                       height);
++    return TRUE;
+ }
+ 
+ static pixman_bool_t
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index d5767af..eeb677d 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -10,6 +10,7 @@
+ 
+ #include "pixman.h"
+ #include <time.h>
++#include <string.h>
+ #include <assert.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -867,4 +868,46 @@ void pixman_timer_register (pixman_timer_t *timer);
+ 
+ #endif /* PIXMAN_TIMERS */
+ 
++/* a helper function, can blit 8-bit images with src/dst overlapping support */
++static inline void
++pixman_blt_helper (uint8_t *src_bytes,
++                   uint8_t *dst_bytes,
++                   int      src_stride,
++                   int      dst_stride,
++                   int      width,
++                   int      height)
++{
++    /*
++     * The second part of this check is not strictly needed, but it prevents
++     * unnecessary upside-down processing of areas which belong to different
++     * images. Upside-down processing can be slower with fixed-distance-ahead
++     * prefetch and perceived as having more tearing.
++     */
++    if (src_bytes < dst_bytes + width &&
++	src_bytes + src_stride * height > dst_bytes)
++    {
++	src_bytes += src_stride * height - src_stride;
++	dst_bytes += dst_stride * height - dst_stride;
++	dst_stride = -dst_stride;
++	src_stride = -src_stride;
++	/* Horizontal scrolling to the left needs memmove */
++	if (src_bytes + width > dst_bytes)
++	{
++	    while (--height >= 0)
++	    {
++		memmove (dst_bytes, src_bytes, width);
++		dst_bytes += dst_stride;
++		src_bytes += src_stride;
++	    }
++	    return;
++	}
++    }
++    while (--height >= 0)
++    {
++	memcpy (dst_bytes, src_bytes, width);
++	dst_bytes += dst_stride;
++	src_bytes += src_stride;
++    }
++}
++
+ #endif /* PIXMAN_PRIVATE_H */
+-- 
+1.6.6.1
+
diff --git a/recipes/xorg-lib/pixman-0.18.2/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman-0.18.2/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
new file mode 100644
index 0000000000..ca6a3c5220
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.18.2/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
@@ -0,0 +1,91 @@
+From 8aca14948a43f5cfd478e22cef745e55960d68cb Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:47 +0300
+Subject: [PATCH 2/7] Support of overlapping src/dst for pixman_blt_mmx
+
+---
+ pixman/pixman-mmx.c |   55 +++++++++++++++++++++++++++++---------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
+index d51b40c..6e0296b 100644
+--- a/pixman/pixman-mmx.c
++++ b/pixman/pixman-mmx.c
+@@ -2996,34 +2996,43 @@ pixman_blt_mmx (uint32_t *src_bits,
+ {
+     uint8_t *   src_bytes;
+     uint8_t *   dst_bytes;
+-    int byte_width;
++    int         bpp;
+ 
+-    if (src_bpp != dst_bpp)
++    if (src_bpp != dst_bpp || src_bpp & 7)
+ 	return FALSE;
+ 
+-    if (src_bpp == 16)
+-    {
+-	src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+-	dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+-	src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+-	dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+-	byte_width = 2 * width;
+-	src_stride *= 2;
+-	dst_stride *= 2;
+-    }
+-    else if (src_bpp == 32)
++    bpp = src_bpp >> 3;
++    width *= bpp;
++    src_stride *= 4;
++    dst_stride *= 4;
++    src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++    dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++    if (src_bpp != 16 && src_bpp != 32)
+     {
+-	src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+-	dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+-	src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+-	dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+-	byte_width = 4 * width;
+-	src_stride *= 4;
+-	dst_stride *= 4;
++	pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++	                   width, height);
++	return TRUE;
+     }
+-    else
++
++    if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+     {
+-	return FALSE;
++	src_bytes += src_stride * height - src_stride;
++	dst_bytes += dst_stride * height - dst_stride;
++	dst_stride = -dst_stride;
++	src_stride = -src_stride;
++
++	if (src_bytes + width > dst_bytes)
++	{
++	    /* TODO: reverse scanline copy using MMX */
++	    while (--height >= 0)
++	    {
++		memmove (dst_bytes, src_bytes, width);
++		dst_bytes += dst_stride;
++		src_bytes += src_stride;
++	    }
++	    return TRUE;
++	}
+     }
+ 
+     while (height--)
+@@ -3033,7 +3042,7 @@ pixman_blt_mmx (uint32_t *src_bits,
+ 	uint8_t *d = dst_bytes;
+ 	src_bytes += src_stride;
+ 	dst_bytes += dst_stride;
+-	w = byte_width;
++	w = width;
+ 
+ 	while (w >= 2 && ((unsigned long)d & 3))
+ 	{
+-- 
+1.6.6.1
+
diff --git a/recipes/xorg-lib/pixman-0.18.2/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman-0.18.2/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
new file mode 100644
index 0000000000..faeb6e67ab
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.18.2/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
@@ -0,0 +1,91 @@
+From 56c446d6912936eabcc6bdd583f37ee1209eff8c Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:54 +0300
+Subject: [PATCH 3/7] Support of overlapping src/dst for pixman_blt_sse2
+
+---
+ pixman/pixman-sse2.c |   55 +++++++++++++++++++++++++++++--------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
+index d5349d7..aa34012 100644
+--- a/pixman/pixman-sse2.c
++++ b/pixman/pixman-sse2.c
+@@ -5328,34 +5328,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ {
+     uint8_t *   src_bytes;
+     uint8_t *   dst_bytes;
+-    int byte_width;
++    int         bpp;
+ 
+-    if (src_bpp != dst_bpp)
++    if (src_bpp != dst_bpp || src_bpp & 7)
+ 	return FALSE;
+ 
+-    if (src_bpp == 16)
+-    {
+-	src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+-	dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+-	src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+-	dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+-	byte_width = 2 * width;
+-	src_stride *= 2;
+-	dst_stride *= 2;
+-    }
+-    else if (src_bpp == 32)
++    bpp = src_bpp >> 3;
++    width *= bpp;
++    src_stride *= 4;
++    dst_stride *= 4;
++    src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++    dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++    if (src_bpp != 16 && src_bpp != 32)
+     {
+-	src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+-	dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+-	src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+-	dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+-	byte_width = 4 * width;
+-	src_stride *= 4;
+-	dst_stride *= 4;
++	pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++	                   width, height);
++	return TRUE;
+     }
+-    else
++
++    if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+     {
+-	return FALSE;
++	src_bytes += src_stride * height - src_stride;
++	dst_bytes += dst_stride * height - dst_stride;
++	dst_stride = -dst_stride;
++	src_stride = -src_stride;
++
++	if (src_bytes + width > dst_bytes)
++	{
++	    /* TODO: reverse scanline copy using SSE2 */
++	    while (--height >= 0)
++	    {
++		memmove (dst_bytes, src_bytes, width);
++		dst_bytes += dst_stride;
++		src_bytes += src_stride;
++	    }
++	    return TRUE;
++	}
+     }
+ 
+     cache_prefetch ((__m128i*)src_bytes);
+@@ -5368,7 +5377,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ 	uint8_t *d = dst_bytes;
+ 	src_bytes += src_stride;
+ 	dst_bytes += dst_stride;
+-	w = byte_width;
++	w = width;
+ 
+ 	cache_prefetch_next ((__m128i*)s);
+ 	cache_prefetch_next ((__m128i*)d);
+-- 
+1.6.6.1
+
diff --git a/recipes/xorg-lib/pixman-0.18.2/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman-0.18.2/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
new file mode 100644
index 0000000000..d56fd99c6f
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.18.2/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
@@ -0,0 +1,94 @@
+From 80c1eae677a6ea10d67bb7328230626cd8fce08e Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Wed, 18 Nov 2009 06:08:48 +0200
+Subject: [PATCH 4/7] Support of overlapping src/dst for pixman_blt_neon
+
+---
+ pixman/pixman-arm-neon.c |   62 +++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 51 insertions(+), 11 deletions(-)
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 6808b36..7feee1d 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -168,26 +168,66 @@ pixman_blt_neon (uint32_t *src_bits,
+                  int       width,
+                  int       height)
+ {
+-    if (src_bpp != dst_bpp)
++    uint8_t *   src_bytes;
++    uint8_t *   dst_bytes;
++    int         bpp;
++
++    if (src_bpp != dst_bpp || src_bpp & 7)
+ 	return FALSE;
+ 
++    bpp = src_bpp >> 3;
++    width *= bpp;
++    src_stride *= 4;
++    dst_stride *= 4;
++    src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++    dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++    if (src_bpp != 16 && src_bpp != 32)
++    {
++	pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++	                   width, height);
++	return TRUE;
++    }
++
++    if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
++    {
++	src_bytes += src_stride * height - src_stride;
++	dst_bytes += dst_stride * height - dst_stride;
++	dst_stride = -dst_stride;
++	src_stride = -src_stride;
++
++	if (src_bytes + width > dst_bytes)
++	{
++	    /* TODO: reverse scanline copy using NEON */
++	    while (--height >= 0)
++	    {
++		memmove (dst_bytes, src_bytes, width);
++		dst_bytes += dst_stride;
++		src_bytes += src_stride;
++	    }
++	    return TRUE;
++	}
++    }
++
+     switch (src_bpp)
+     {
+     case 16:
+ 	pixman_composite_src_0565_0565_asm_neon (
+-		width, height,
+-		(uint16_t *)(((char *) dst_bits) +
+-		dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
+-		(uint16_t *)(((char *) src_bits) +
+-		src_y * src_stride * 4 + src_x * 2), src_stride * 2);
++		width >> 1,
++		height,
++		(uint16_t *) dst_bytes,
++		dst_stride >> 1,
++		(uint16_t *) src_bytes,
++		src_stride >> 1);
+ 	return TRUE;
+     case 32:
+ 	pixman_composite_src_8888_8888_asm_neon (
+-		width, height,
+-		(uint32_t *)(((char *) dst_bits) +
+-		dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
+-		(uint32_t *)(((char *) src_bits) +
+-		src_y * src_stride * 4 + src_x * 4), src_stride);
++		width >> 2,
++		height,
++		(uint32_t *) dst_bytes,
++		dst_stride >> 2,
++		(uint32_t *) src_bytes,
++		src_stride >> 2);
+ 	return TRUE;
+     default:
+ 	return FALSE;
+-- 
+1.6.6.1
+
diff --git a/recipes/xorg-lib/pixman-0.18.2/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch b/recipes/xorg-lib/pixman-0.18.2/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
new file mode 100644
index 0000000000..39eda8b546
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.18.2/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
@@ -0,0 +1,169 @@
+From 2f5774db49521e990c5e9f7cac684a06f4e67a43 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 10 Dec 2009 00:51:50 +0200
+Subject: [PATCH 5/7] ARM: added NEON optimizations for fetch/store r5g6b5 scanline
+
+---
+ pixman/pixman-access.c       |   23 ++++++++++++++++++++++-
+ pixman/pixman-arm-neon-asm.S |   20 ++++++++++++++++++++
+ pixman/pixman-arm-neon.c     |   41 +++++++++++++++++++++++++++++++++++++++++
+ pixman/pixman-private.h      |    5 +++++
+ 4 files changed, 88 insertions(+), 1 deletions(-)
+
+diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
+index fa0a267..5bb3e09 100644
+--- a/pixman/pixman-access.c
++++ b/pixman/pixman-access.c
+@@ -2748,7 +2748,7 @@ typedef struct
+ 	    store_scanline_ ## format, store_scanline_generic_64	\
+     }
+ 
+-static const format_info_t accessors[] =
++static format_info_t accessors[] =
+ {
+ /* 32 bpp formats */
+     FORMAT_INFO (a8r8g8b8),
+@@ -2891,6 +2891,27 @@ _pixman_bits_image_setup_raw_accessors (bits_image_t *image)
+ 	setup_accessors (image);
+ }
+ 
++void
++_pixman_bits_override_accessors (pixman_format_code_t format,
++                                 fetch_scanline_t     fetch_func,
++                                 store_scanline_t     store_func)
++{
++    format_info_t *info = accessors;
++
++    while (info->format != PIXMAN_null)
++    {
++	if (info->format == format)
++	{
++	    if (fetch_func)
++		info->fetch_scanline_raw_32 = fetch_func;
++	    if (store_func)
++		info->store_scanline_raw_32 = store_func;
++	    return;
++	}
++	info++;
++    }
++}
++
+ #else
+ 
+ void
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index 51bc347..f30869e 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -458,6 +458,16 @@ generate_composite_function \
+     pixman_composite_src_8888_0565_process_pixblock_tail, \
+     pixman_composite_src_8888_0565_process_pixblock_tail_head
+ 
++generate_composite_function_single_scanline \
++    pixman_store_scanline_r5g6b5_asm_neon, 32, 0, 16, \
++    FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
++    8, /* number of pixels, processed in a single block */ \
++    default_init, \
++    default_cleanup, \
++    pixman_composite_src_8888_0565_process_pixblock_head, \
++    pixman_composite_src_8888_0565_process_pixblock_tail, \
++    pixman_composite_src_8888_0565_process_pixblock_tail_head
++
+ /******************************************************************************/
+ 
+ .macro pixman_composite_src_0565_8888_process_pixblock_head
+@@ -493,6 +503,16 @@ generate_composite_function \
+     pixman_composite_src_0565_8888_process_pixblock_tail, \
+     pixman_composite_src_0565_8888_process_pixblock_tail_head
+ 
++generate_composite_function_single_scanline \
++    pixman_fetch_scanline_r5g6b5_asm_neon, 16, 0, 32, \
++    FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
++    8, /* number of pixels, processed in a single block */ \
++    default_init, \
++    default_cleanup, \
++    pixman_composite_src_0565_8888_process_pixblock_head, \
++    pixman_composite_src_0565_8888_process_pixblock_tail, \
++    pixman_composite_src_0565_8888_process_pixblock_tail_head
++
+ /******************************************************************************/
+ 
+ .macro pixman_composite_add_8000_8000_process_pixblock_head
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 7feee1d..fda7a09 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -375,6 +375,43 @@ neon_combine_##name##_u (pixman_implementation_t *imp,                   \
+ BIND_COMBINE_U (over)
+ BIND_COMBINE_U (add)
+ 
++void
++pixman_fetch_scanline_r5g6b5_asm_neon (int             width,
++                                       uint32_t       *buffer,
++                                       const uint16_t *pixel);
++void
++pixman_store_scanline_r5g6b5_asm_neon (int             width,
++                                       uint16_t       *pixel,
++                                       const uint32_t *values);
++
++static void
++neon_fetch_scanline_r5g6b5 (pixman_image_t *image,
++                            int             x,
++                            int             y,
++                            int             width,
++                            uint32_t *      buffer,
++                            const uint32_t *mask,
++                            uint32_t        mask_bits)
++{
++    const uint32_t *bits = image->bits.bits + y * image->bits.rowstride;
++    const uint16_t *pixel = (const uint16_t *)bits + x;
++
++    pixman_fetch_scanline_r5g6b5_asm_neon (width, buffer, pixel);
++}
++
++static void
++neon_store_scanline_r5g6b5 (bits_image_t *  image,
++                            int             x,
++                            int             y,
++                            int             width,
++                            const uint32_t *values)
++{
++    uint32_t *bits = image->bits + image->rowstride * y;
++    uint16_t *pixel = ((uint16_t *) bits) + x;
++
++    pixman_store_scanline_r5g6b5_asm_neon (width, pixel, values);
++}
++
+ pixman_implementation_t *
+ _pixman_implementation_create_arm_neon (void)
+ {
+@@ -385,6 +422,10 @@ _pixman_implementation_create_arm_neon (void)
+     imp->combine_32[PIXMAN_OP_OVER] = neon_combine_over_u;
+     imp->combine_32[PIXMAN_OP_ADD] = neon_combine_add_u;
+ 
++    _pixman_bits_override_accessors (PIXMAN_r5g6b5,
++                                     neon_fetch_scanline_r5g6b5,
++                                     neon_store_scanline_r5g6b5);
++
+     imp->blt = arm_neon_blt;
+     imp->fill = arm_neon_fill;
+ 
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index eeb677d..ba2d401 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -220,6 +220,11 @@ void
+ _pixman_bits_image_setup_raw_accessors (bits_image_t *image);
+ 
+ void
++_pixman_bits_override_accessors (pixman_format_code_t format,
++                                 fetch_scanline_t     fetch_func,
++                                 store_scanline_t     store_func);
++
++void
+ _pixman_image_get_scanline_generic_64  (pixman_image_t *image,
+                                         int             x,
+                                         int             y,
+-- 
+1.6.6.1
+
diff --git a/recipes/xorg-lib/pixman-0.18.2/0006-A-copy-paste-version-of-16bpp-bilinear-scanline-fetc.patch b/recipes/xorg-lib/pixman-0.18.2/0006-A-copy-paste-version-of-16bpp-bilinear-scanline-fetc.patch
new file mode 100644
index 0000000000..dd0e0f6d4e
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.18.2/0006-A-copy-paste-version-of-16bpp-bilinear-scanline-fetc.patch
@@ -0,0 +1,261 @@
+From fc24a2d8d0039cd10de4175da40bb784e2c3bf49 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 4 Dec 2009 16:49:19 +0000
+Subject: [PATCH 6/7] A copy-paste version of 16bpp bilinear scanline fetcher
+
+---
+ pixman/pixman-bits-image.c |  228 +++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 223 insertions(+), 5 deletions(-)
+
+diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
+index 3d78ff0..1656975 100644
+--- a/pixman/pixman-bits-image.c
++++ b/pixman/pixman-bits-image.c
+@@ -535,6 +535,212 @@ bits_image_fetch_bilinear_no_repeat_8888 (pixman_image_t * ima,
+ 	*buffer++ = 0;
+ }
+ 
++static void
++bits_image_fetch_bilinear_no_repeat_0565 (pixman_image_t * ima,
++					  int              offset,
++					  int              line,
++					  int              width,
++					  uint32_t *       buffer,
++					  const uint32_t * mask,
++					  uint32_t         mask_bits)
++{
++    bits_image_t *bits = &ima->bits;
++    pixman_fixed_t x_top, x_bottom, x;
++    pixman_fixed_t ux_top, ux_bottom, ux;
++    pixman_vector_t v;
++    uint32_t top_mask, bottom_mask;
++    uint16_t *top_row;
++    uint16_t *bottom_row;
++    uint32_t *end;
++    uint16_t zero[2] = { 0, 0 };
++    int y, y1, y2;
++    int disty;
++    int mask_inc;
++    int w;
++
++    /* reference point is the center of the pixel */
++    v.vector[0] = pixman_int_to_fixed (offset) + pixman_fixed_1 / 2;
++    v.vector[1] = pixman_int_to_fixed (line) + pixman_fixed_1 / 2;
++    v.vector[2] = pixman_fixed_1;
++
++    if (!pixman_transform_point_3d (bits->common.transform, &v))
++	return;
++
++    ux = ux_top = ux_bottom = bits->common.transform->matrix[0][0];
++    x = x_top = x_bottom = v.vector[0] - pixman_fixed_1/2;
++
++    y = v.vector[1] - pixman_fixed_1/2;
++    disty = (y >> 8) & 0xff;
++
++    /* Load the pointers to the first and second lines from the source
++     * image that bilinear code must read.
++     *
++     * The main trick in this code is about the check if any line are
++     * outside of the image;
++     *
++     * When I realize that a line (any one) is outside, I change
++     * the pointer to a dummy area with zeros. Once I change this, I
++     * must be sure the pointer will not change, so I set the
++     * variables to each pointer increments inside the loop.
++     */
++    y1 = pixman_fixed_to_int (y);
++    y2 = y1 + 1;
++
++    if (y1 < 0 || y1 >= bits->height)
++    {
++	top_row = zero;
++	x_top = 0;
++	ux_top = 0;
++    }
++    else
++    {
++	top_row = bits->bits + y1 * bits->rowstride;
++	x_top = x;
++	ux_top = ux;
++    }
++
++    if (y2 < 0 || y2 >= bits->height)
++    {
++	bottom_row = zero;
++	x_bottom = 0;
++	ux_bottom = 0;
++    }
++    else
++    {
++	bottom_row = bits->bits + y2 * bits->rowstride;
++	x_bottom = x;
++	ux_bottom = ux;
++    }
++
++    /* Instead of checking whether the operation uses the mast in
++     * each loop iteration, verify this only once and prepare the
++     * variables to make the code smaller inside the loop.
++     */
++    if (!mask)
++    {
++        mask_inc = 0;
++        mask_bits = 1;
++        mask = &mask_bits;
++    }
++    else
++    {
++        /* If have a mask, prepare the variables to check it */
++        mask_inc = 1;
++    }
++
++    /* If both are zero, then the whole thing is zero */
++    if (top_row == zero && bottom_row == zero)
++    {
++	memset (buffer, 0, width * sizeof (uint32_t));
++	return;
++    }
++    else
++    {
++	if (top_row == zero)
++	{
++	    top_mask = 0;
++	    bottom_mask = 0xff000000;
++	}
++	else if (bottom_row == zero)
++	{
++	    top_mask = 0xff000000;
++	    bottom_mask = 0;
++	}
++	else
++	{
++	    top_mask = 0xff000000;
++	    bottom_mask = 0xff000000;
++	}
++    }
++
++    end = buffer + width;
++
++    /* Zero fill to the left of the image */
++    while (buffer < end && x < pixman_fixed_minus_1)
++    {
++	*buffer++ = 0;
++	x += ux;
++	x_top += ux_top;
++	x_bottom += ux_bottom;
++	mask += mask_inc;
++    }
++
++    /* Left edge
++     */
++    while (buffer < end && x < 0)
++    {
++	uint32_t tr, br;
++	int32_t distx;
++
++	tr = CONVERT_0565_TO_0888 (top_row[pixman_fixed_to_int (x_top) + 1]) | top_mask;
++	br = CONVERT_0565_TO_0888 (bottom_row[pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
++
++	distx = (x >> 8) & 0xff;
++
++	*buffer++ = bilinear_interpolation (0, tr, 0, br, distx, disty);
++
++	x += ux;
++	x_top += ux_top;
++	x_bottom += ux_bottom;
++	mask += mask_inc;
++    }
++
++    /* Main part */
++    w = pixman_int_to_fixed (bits->width - 1);
++
++    while (buffer < end  &&  x < w)
++    {
++	if (*mask)
++	{
++	    uint32_t tl, tr, bl, br;
++	    int32_t distx;
++
++	    tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
++	    tr = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top) + 1]) | top_mask;
++	    bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
++	    br = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
++
++	    distx = (x >> 8) & 0xff;
++
++	    *buffer = bilinear_interpolation (tl, tr, bl, br, distx, disty);
++	}
++
++	buffer++;
++	x += ux;
++	x_top += ux_top;
++	x_bottom += ux_bottom;
++	mask += mask_inc;
++    }
++
++    /* Right Edge */
++    w = pixman_int_to_fixed (bits->width);
++    while (buffer < end  &&  x < w)
++    {
++	if (*mask)
++	{
++	    uint32_t tl, bl;
++	    int32_t distx;
++
++	    tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
++	    bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
++
++	    distx = (x >> 8) & 0xff;
++
++	    *buffer = bilinear_interpolation (tl, 0, bl, 0, distx, disty);
++	}
++
++	buffer++;
++	x += ux;
++	x_top += ux_top;
++	x_bottom += ux_bottom;
++	mask += mask_inc;
++    }
++
++    /* Zero fill to the left of the image */
++    while (buffer < end)
++	*buffer++ = 0;
++}
++
+ static force_inline uint32_t
+ bits_image_fetch_pixel_convolution (bits_image_t   *image,
+ 				    pixman_fixed_t  x,
+@@ -917,14 +1123,26 @@ bits_image_property_changed (pixman_image_t *image)
+ 	     (bits->common.filter == PIXMAN_FILTER_BILINEAR ||
+ 	      bits->common.filter == PIXMAN_FILTER_GOOD	    ||
+ 	      bits->common.filter == PIXMAN_FILTER_BEST)		&&
+-	     bits->common.repeat == PIXMAN_REPEAT_NONE			&&
+-	     (bits->format == PIXMAN_a8r8g8b8	||
+-	      bits->format == PIXMAN_x8r8g8b8))
++	     bits->common.repeat == PIXMAN_REPEAT_NONE)
+     {
+ 	image->common.get_scanline_64 =
+ 	    _pixman_image_get_scanline_generic_64;
+-	image->common.get_scanline_32 =
+-	    bits_image_fetch_bilinear_no_repeat_8888;
++
++	if (bits->format == PIXMAN_a8r8g8b8 || bits->format == PIXMAN_x8r8g8b8)
++	{
++	    image->common.get_scanline_32 =
++		bits_image_fetch_bilinear_no_repeat_8888;
++	}
++	else if (bits->format == PIXMAN_r5g6b5)
++	{
++	    image->common.get_scanline_32 =
++		bits_image_fetch_bilinear_no_repeat_0565;
++	}
++	else
++	{
++	    image->common.get_scanline_32 =
++		bits_image_fetch_transformed;
++	}
+     }
+     else
+     {
+-- 
+1.6.6.1
+
diff --git a/recipes/xorg-lib/pixman-0.18.2/0007-ARM-added-missing-cache-preload.patch b/recipes/xorg-lib/pixman-0.18.2/0007-ARM-added-missing-cache-preload.patch
new file mode 100644
index 0000000000..f601d2ce26
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.18.2/0007-ARM-added-missing-cache-preload.patch
@@ -0,0 +1,32 @@
+From af8a33d3b132c0192d59c47426bb3a201cb64b32 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 21 May 2010 13:31:03 +0000
+Subject: [PATCH 7/7] ARM: added missing cache preload
+
+---
+ pixman/pixman-arm-neon-asm.S |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index f30869e..dc7fd69 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -388,6 +388,7 @@ generate_composite_function \
+     vld1.16     {d4, d5}, [DST_R, :128]!
+     vst1.16     {d28, d29}, [DST_W, :128]!
+     pixman_composite_over_n_0565_process_pixblock_head
++    cache_preload 8, 8
+ .endm
+ 
+ .macro pixman_composite_over_n_0565_init
+@@ -680,6 +681,7 @@ generate_composite_function_single_scanline \
+     vld4.8      {d4, d5, d6, d7}, [DST_R, :128]!
+     vst4.8      {d28, d29, d30, d31}, [DST_W, :128]!
+     pixman_composite_over_8888_8888_process_pixblock_head
++    cache_preload 8, 8
+ .endm
+ 
+ .macro pixman_composite_over_n_8888_init
+-- 
+1.6.6.1
+
diff --git a/recipes/xorg-lib/pixman.inc b/recipes/xorg-lib/pixman.inc
index a5987bb86f..539a33a888 100644
--- a/recipes/xorg-lib/pixman.inc
+++ b/recipes/xorg-lib/pixman.inc
@@ -3,6 +3,8 @@ PRIORITY = "optional"
 DESCRIPTION = "Low-level pixel manipulation library."
 LICENSE = "X11"
 
+DEPENDS = "perl-native"
+
 BBCLASSEXTEND = "native"
 
 SRC_URI = "http://cairographics.org/releases/${BPN}-${PV}.tar.gz;name=archive "
diff --git a/recipes/xorg-lib/pixman_0.11.8.bb b/recipes/xorg-lib/pixman_0.11.8.bb
index ae3fa5518b..1a507aedb5 100644
--- a/recipes/xorg-lib/pixman_0.11.8.bb
+++ b/recipes/xorg-lib/pixman_0.11.8.bb
@@ -2,8 +2,8 @@ require pixman.inc
 PR = "${INC_PR}.0"
 
 SRC_URI += " \
-           file://pixman-arm.patch;patch=1 \
-	   file://pixman-x888-565.patch;patch=1 \
+           file://pixman-arm.patch \
+	   file://pixman-x888-565.patch \
 	  "
 
 SRC_URI[archive.md5sum] = "7b5db768c51337b5e5e954fc9c961cd3"
diff --git a/recipes/xorg-lib/pixman_0.12.0.bb b/recipes/xorg-lib/pixman_0.12.0.bb
index 811d56db91..cb9bfc2e27 100644
--- a/recipes/xorg-lib/pixman_0.12.0.bb
+++ b/recipes/xorg-lib/pixman_0.12.0.bb
@@ -2,8 +2,8 @@ require pixman.inc
 PR = "${INC_PR}.0"
 
 SRC_URI += " \
-           file://pixman-arm.patch;patch=1 \
-	   file://pixman-x888-565.patch;patch=1 \
+           file://pixman-arm.patch \
+	   file://pixman-x888-565.patch \
 	  "
 
 SRC_URI[archive.md5sum] = "09357cc74975b01714e00c5899ea1881"
diff --git a/recipes/xorg-lib/pixman_0.13.2.bb b/recipes/xorg-lib/pixman_0.13.2.bb
index 8baef17339..a35b452327 100644
--- a/recipes/xorg-lib/pixman_0.13.2.bb
+++ b/recipes/xorg-lib/pixman_0.13.2.bb
@@ -4,7 +4,7 @@ PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += " \
-            file://pixman-0.13.2-neon1.patch;patch=1 \
+            file://pixman-0.13.2-neon1.patch \
 	   "
 
 # We have NEON
diff --git a/recipes/xorg-lib/pixman_0.17.12.bb b/recipes/xorg-lib/pixman_0.17.12.bb
index dbaf36a561..cad36e6d2e 100644
--- a/recipes/xorg-lib/pixman_0.17.12.bb
+++ b/recipes/xorg-lib/pixman_0.17.12.bb
@@ -6,14 +6,14 @@ DEFAULT_PREFERENCE_angstrom = "2"
 DEFAULT_PREFERENCE_shr = "2"
  
 SRC_URI += "\
-           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;patch=1 \
-           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;patch=1 \
-           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;patch=1 \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;patch=1 \
-           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch;patch=1 \
-           file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch;patch=1 \ 
-           file://over-n-8-0565.patch;patch=1 \
-           file://src-8888-0565.patch;patch=1 \
+           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+           file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \ 
+           file://over-n-8-0565.patch \
+           file://src-8888-0565.patch \
 "
 
 SRC_URI[archive.md5sum] = "331415d7a110145cf27aa00e11d0a683"
diff --git a/recipes/xorg-lib/pixman_0.17.8.bb b/recipes/xorg-lib/pixman_0.17.8.bb
index eb3fe85a20..8613e991da 100644
--- a/recipes/xorg-lib/pixman_0.17.8.bb
+++ b/recipes/xorg-lib/pixman_0.17.8.bb
@@ -6,13 +6,13 @@ DEFAULT_PREFERENCE_angstrom = "2"
 DEFAULT_PREFERENCE_shr = "2"
 
 SRC_URI += " \
-           file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;patch=1 \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;patch=1 \
-           file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;patch=1 \
-           file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;patch=1 \
-           file://1-composite.patch;patch=1 \
-           file://2-composite.patch;patch=1 \          
-           file://3-composite.patch;patch=1 \          
+           file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+           file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+           file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+           file://1-composite.patch \
+           file://2-composite.patch \          
+           file://3-composite.patch \          
           "
 
 SRC_URI[archive.md5sum] = "a7deb2ff6b286b676d67aa6ae91317ae"
diff --git a/recipes/xorg-lib/pixman_0.18.0.bb b/recipes/xorg-lib/pixman_0.18.0.bb
index 07966f86a5..ce44da4aac 100644
--- a/recipes/xorg-lib/pixman_0.18.0.bb
+++ b/recipes/xorg-lib/pixman_0.18.0.bb
@@ -1,18 +1,19 @@
 require pixman.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.3"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "2"
-DEFAULT_PREFERENCE_angstrom = "2"
  
 SRC_URI += "\
-           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;patch=1 \
-           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;patch=1 \
-           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;patch=1 \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;patch=1 \
-           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch;patch=1 \
-           file://calloc.patch;patch=1 \
-           file://tls.patch;patch=1 \
+           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+           file://calloc.patch \
+           file://tls.patch \
+           file://565-scanline.patch \
+           file://missing-cache-preload.diff \
 "
 
 SRC_URI[archive.md5sum] = "a4fb870fc325be258089f1683642e976"
diff --git a/recipes/xorg-lib/pixman_0.18.2.bb b/recipes/xorg-lib/pixman_0.18.2.bb
new file mode 100644
index 0000000000..d07084015e
--- /dev/null
+++ b/recipes/xorg-lib/pixman_0.18.2.bb
@@ -0,0 +1,23 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "2"
+
+SRC_URI[archive.md5sum] = "5d1378fa61610dd5d3c7e0111b2c5253"
+SRC_URI[archive.sha256sum] = "80aee833b429d105d2c7593ef96993da04441b3b747084f1f3bfd7be594e1c45"
+ 
+SRC_URI += "\
+           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch\
+           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch\
+           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch\
+           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch\
+           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch\
+           file://0006-A-copy-paste-version-of-16bpp-bilinear-scanline-fetc.patch\
+           file://0007-ARM-added-missing-cache-preload.patch\
+"
+
+NEON = " --disable-arm-neon "
+NEON_armv7a = " "
+
+EXTRA_OECONF = "${NEON} --disable-gtk"
diff --git a/recipes/xorg-lib/pixman_0.9.5.bb b/recipes/xorg-lib/pixman_0.9.5.bb
index 2403a740b5..e538113877 100644
--- a/recipes/xorg-lib/pixman_0.9.5.bb
+++ b/recipes/xorg-lib/pixman_0.9.5.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "Library for lowlevel pixel operations"
 DEPENDS = "virtual/libx11"
 
-SRC_URI += "file://dont-copy-unused-bits-to-alpha-channel.patch;patch=1"
+SRC_URI += "file://dont-copy-unused-bits-to-alpha-channel.patch"
 
 SRC_URI[archive.md5sum] = "f9fea77e46ec7a3a16e925e137f146e7"
 SRC_URI[archive.sha256sum] = "a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8"
diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb
index 983a0ac74c..160819a910 100644
--- a/recipes/xorg-lib/pixman_git.bb
+++ b/recipes/xorg-lib/pixman_git.bb
@@ -8,16 +8,16 @@ SRCREV = "69f1ec9a7827aeb522fcae99846237ef0f896e7b"
 DEFAULT_PREFERENCE = "-1"
  
 SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git;branch=master \
-           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;patch=1 \
-           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;patch=1 \
-           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;patch=1 \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;patch=1 \
-           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch;patch=1 \
-           file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch;patch=1 \ 
-           file://over-n-8-0565.patch;patch=1 \
-           file://src-8888-0565.patch;patch=1 \
-           file://calloc.patch;patch=1 \
-           file://tls.patch;patch=1 \
+           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+           file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \ 
+           file://over-n-8-0565.patch \
+           file://src-8888-0565.patch \
+           file://calloc.patch \
+           file://tls.patch \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/xorg-lib/xorg-headers-native.bb b/recipes/xorg-lib/xorg-headers-native.bb
index 555a737f0a..ccc36432b5 100644
--- a/recipes/xorg-lib/xorg-headers-native.bb
+++ b/recipes/xorg-lib/xorg-headers-native.bb
@@ -1,6 +1,6 @@
 inherit native
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "file://X11"
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/CallbackI.h b/recipes/xorg-lib/xorg-headers-native/X11/CallbackI.h
index 4ae08ab019..64e8152566 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/CallbackI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/CallbackI.h
@@ -58,6 +58,8 @@ typedef XrmResource **CallbackTable;
 #define _XtCBCalling 1
 #define _XtCBFreeAfterCalling 2
 
+_XFUNCPROTOBEGIN
+
 typedef struct internalCallbackRec {
     unsigned short count;
     char	   is_padded;	/* contains NULL padding for external form */
@@ -115,3 +117,5 @@ extern void _XtCallConditionalCallbackList(
     XtPointer			/* call_data */,
     _XtConditionProc		/* cond_proc */
 );
+
+_XFUNCPROTOEND
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Composite.h b/recipes/xorg-lib/xorg-headers-native/X11/Composite.h
index 0a58332be5..c3c982868b 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Composite.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Composite.h
@@ -97,7 +97,7 @@ extern void XtChangeManagedSet(
 
 _XFUNCPROTOEND
 
-#ifndef XT_COMPOSITE
+#ifndef VMS
 externalref WidgetClass compositeWidgetClass;
 #endif
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/CompositeP.h b/recipes/xorg-lib/xorg-headers-native/X11/CompositeP.h
index ed055b21fa..e93275ace2 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/CompositeP.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/CompositeP.h
@@ -52,6 +52,8 @@ SOFTWARE.
 
 #include <X11/Composite.h>
 
+_XFUNCPROTOBEGIN
+
 /************************************************************************
  *
  * Additional instance fields for widgets of (sub)class 'Composite' 
@@ -101,6 +103,8 @@ typedef struct _CompositeClassRec {
 
 externalref CompositeClassRec compositeClassRec;
 
+_XFUNCPROTOEND
+
 #define XtCompositeExtensionVersion 2L
 #define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit)
 #define XtInheritChangeManaged ((XtWidgetProc) _XtInherit)
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/ConstrainP.h b/recipes/xorg-lib/xorg-headers-native/X11/ConstrainP.h
index a90d19ac6c..7030a3411a 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/ConstrainP.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/ConstrainP.h
@@ -52,6 +52,8 @@ SOFTWARE.
 
 #include <X11/Constraint.h>
 
+_XFUNCPROTOBEGIN
+
 typedef struct _ConstraintPart {
     XtPointer   mumble;		/* No new fields, keep C compiler happy */
 } ConstraintPart;
@@ -88,6 +90,8 @@ typedef struct _ConstraintClassRec {
 
 externalref ConstraintClassRec constraintClassRec;
 
+_XFUNCPROTOEND
+
 #define XtConstraintExtensionVersion 1L
 
 #endif /* _XtConstraintP_h */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Constraint.h b/recipes/xorg-lib/xorg-headers-native/X11/Constraint.h
index 9bb962e0d2..977e7eeac2 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Constraint.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Constraint.h
@@ -50,11 +50,15 @@ SOFTWARE.
 #ifndef _XtConstraint_h
 #define _XtConstraint_h
 
+_XFUNCPROTOBEGIN
+
 typedef struct _ConstraintClassRec *ConstraintWidgetClass;
 
-#ifndef CONSTRAINT
+#ifndef VMS
 externalref WidgetClass constraintWidgetClass;
 #endif
 
+_XFUNCPROTOEND
+
 #endif /* _XtConstraint_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/ConvertI.h b/recipes/xorg-lib/xorg-headers-native/X11/ConvertI.h
index 02c0e5ca08..f3f7fb0bae 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/ConvertI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/ConvertI.h
@@ -48,6 +48,8 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
 
+_XFUNCPROTOBEGIN
+
 /* Representation types */
 
 extern	XrmQuark  _XtQString;
@@ -94,3 +96,4 @@ extern Boolean _XtConvert(
 
 void _XtConvertInitialize(void);
 
+_XFUNCPROTOEND
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Core.h b/recipes/xorg-lib/xorg-headers-native/X11/Core.h
index ff6cb75356..5127b501ad 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Core.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Core.h
@@ -53,14 +53,18 @@ SOFTWARE.
 #ifndef _XtCore_h
 #define _XtCore_h
 
+_XFUNCPROTOBEGIN
+
 typedef struct _WidgetClassRec *CoreWidgetClass;
 typedef struct _WidgetRec *CoreWidget;
 externalref WidgetClass coreWidgetClass;
 
-#ifndef _XT_CORE_C
+#ifndef VMS
 externalref WidgetClass widgetClass;
 
 #endif
 
+_XFUNCPROTOEND
+
 #endif /* _XtCore_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/CoreP.h b/recipes/xorg-lib/xorg-headers-native/X11/CoreP.h
index e07f085e6e..57836e615a 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/CoreP.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/CoreP.h
@@ -55,6 +55,8 @@ SOFTWARE.
 
 #include <X11/Core.h>
 
+_XFUNCPROTOBEGIN
+
 externalref int _XtInheritTranslations;
 
 #define XtInheritTranslations  ((String) &_XtInheritTranslations)
@@ -167,5 +169,7 @@ typedef struct _WidgetClassRec {
 externalref WidgetClassRec widgetClassRec;
 #define coreClassRec widgetClassRec
 
+_XFUNCPROTOEND
+
 #endif /* _XtCoreP_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/CreateI.h b/recipes/xorg-lib/xorg-headers-native/X11/CreateI.h
index 87abb1d2d5..e0ca9a3a60 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/CreateI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/CreateI.h
@@ -3,6 +3,8 @@
 #ifndef _XtcreateI_h
 #define _XtcreateI_h
 
+_XFUNCPROTOBEGIN
+
 extern Widget _XtCreateWidget(String name, WidgetClass widget_class,
 			      Widget parent, ArgList args, Cardinal num_args,
 			      XtTypedArgList typed_args,
@@ -18,9 +20,12 @@ extern Widget _XtAppCreateShell(String name, String class,
 				Cardinal num_typed_args);
 extern Widget _XtCreateHookObj(Screen *screen);
 
+_XFUNCPROTOEND
 
 #include <stdarg.h>
 
+_XFUNCPROTOBEGIN
+
 /* VarCreate.c */
 extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,
 			_Xconst char* application_class,
@@ -34,4 +39,6 @@ extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
 			int *argc_in_out, String *argv_in_out,
 			String *fallback_resources, va_list var_args);
 
+_XFUNCPROTOEND
+
 #endif /* _XtcreateI_h */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/DECkeysym.h b/recipes/xorg-lib/xorg-headers-native/X11/DECkeysym.h
index 6ab103e5df..07307169d3 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/DECkeysym.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/DECkeysym.h
@@ -1,5 +1,3 @@
-/* $Xorg: DECkeysym.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-
 /***********************************************************
 
 Copyright 1988, 1998  The Open Group
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/EventI.h b/recipes/xorg-lib/xorg-headers-native/X11/EventI.h
index 00858e71ea..d2d1d0f439 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/EventI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/EventI.h
@@ -65,6 +65,8 @@ typedef struct _XtGrabRec  *XtGrabList;
 
 #include "PassivGraI.h"
 
+_XFUNCPROTOBEGIN
+
 extern void _XtEventInitialize(
     void
 );
@@ -131,4 +133,6 @@ extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,
 /* NextEvent.c */
 extern Boolean XtAppPeekEvent_SkipTimer;
 
+_XFUNCPROTOEND
+
 #endif /* _Event_h_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/HPkeysym.h b/recipes/xorg-lib/xorg-headers-native/X11/HPkeysym.h
index 2d09277d83..ed000b167b 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/HPkeysym.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/HPkeysym.h
@@ -1,4 +1,3 @@
-/* $Xorg: HPkeysym.h,v 1.5 2001/02/09 02:03:22 xorgcvs Exp $ */
 /*
 
 Copyright 1987, 1998  The Open Group
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/HookObjI.h b/recipes/xorg-lib/xorg-headers-native/X11/HookObjI.h
index c9a22a2565..c0858c2b56 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/HookObjI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/HookObjI.h
@@ -29,6 +29,8 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XtHookObjI_h
 #define _XtHookObjI_h
 
+_XFUNCPROTOBEGIN
+
 /* This object is implementation-dependent and private to the library. */
 
 typedef struct _HookObjRec *HookObject;
@@ -66,6 +68,8 @@ typedef struct _HookObjClassRec {
 
 externalref HookObjClassRec hookObjClassRec;
 
+_XFUNCPROTOEND
+
 #endif /* ifndef _Xt_HookObjI_h */
 
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/ImUtil.h b/recipes/xorg-lib/xorg-headers-native/X11/ImUtil.h
index 89f0381177..5b62571acb 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/ImUtil.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/ImUtil.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/ImUtil.h,v 1.2 2003/04/15 22:10:07 herrb Exp $ */
 
 #ifndef _IMUTIL_H_
 #define _IMUTIL_H_
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/InitialI.h b/recipes/xorg-lib/xorg-headers-native/X11/InitialI.h
index c2fe47c1ba..2ae9b743cb 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/InitialI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/InitialI.h
@@ -84,6 +84,8 @@ SOFTWARE.
 #include <X11/Xos.h>
 #include <X11/Xpoll.h>
 
+_XFUNCPROTOBEGIN
+
 typedef struct _TimerEventRec {
         struct timeval        te_timer_value;
 	struct _TimerEventRec *te_next;
@@ -426,4 +428,6 @@ extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
 			String *applName, String *displayName,
 			String *language);
 
+_XFUNCPROTOEND
+
 #endif /* _XtinitialI_h */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/IntrinsicI.h b/recipes/xorg-lib/xorg-headers-native/X11/IntrinsicI.h
index d749867b85..d88166fc36 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/IntrinsicI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/IntrinsicI.h
@@ -194,6 +194,8 @@ SOFTWARE.
 #define ERRORDB "/usr/lib/X11/XtErrorDB"
 #endif
 
+_XFUNCPROTOBEGIN
+
 extern String XtCXtToolkitError;
 
 extern void _XtAllocError(
@@ -257,5 +259,7 @@ extern char* __XtCalloc (
 #define __XtCalloc XtCalloc
 #endif
 
+_XFUNCPROTOEND
+
 #endif /* _XtintrinsicI_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Object.h b/recipes/xorg-lib/xorg-headers-native/X11/Object.h
index 96723b16e5..5ef65de3c4 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Object.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Object.h
@@ -50,11 +50,16 @@ SOFTWARE.
 #ifndef _XtObject_h
 #define _XtObject_h
 
+_XFUNCPROTOBEGIN
+
 typedef struct _ObjectRec *Object;
 typedef struct _ObjectClassRec *ObjectClass;
 
-#ifndef OBJECT
+#ifndef VMS
 externalref WidgetClass objectClass;
 #endif
+
+_XFUNCPROTOEND
+
 #endif /* _XtObject_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/ObjectP.h b/recipes/xorg-lib/xorg-headers-native/X11/ObjectP.h
index a24564ef29..0f484d2fd5 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/ObjectP.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/ObjectP.h
@@ -52,6 +52,8 @@ SOFTWARE.
 
 #include <X11/Object.h>
 
+_XFUNCPROTOBEGIN
+
 /**********************************************************
  * Object Instance Data Structures
  *
@@ -132,6 +134,8 @@ typedef struct _ObjectClassRec {
 
 externalref ObjectClassRec objectClassRec;
 
+_XFUNCPROTOEND
+
 #define XtObjectExtensionVersion 1L
 #define XtInheritAllocate ((XtAllocateProc) _XtInherit)
 #define XtInheritDeallocate ((XtDeallocateProc) _XtInherit)
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/PassivGraI.h b/recipes/xorg-lib/xorg-headers-native/X11/PassivGraI.h
index 02e2964845..10591ac4d2 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/PassivGraI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/PassivGraI.h
@@ -60,6 +60,8 @@ in this Software without prior written authorization from The Open Group.
 #define KEYBOARD TRUE
 #define POINTER  FALSE
 
+_XFUNCPROTOBEGIN
+
 typedef enum {
     XtNoServerGrab, 
     XtPassiveServerGrab,
@@ -183,4 +185,6 @@ extern void _XtClearAncestorCache(
     Widget		/* widget */
 );
 
+_XFUNCPROTOEND
+
 #endif /* _PDI_h_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/RectObj.h b/recipes/xorg-lib/xorg-headers-native/X11/RectObj.h
index 07615fab74..81e43a5e24 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/RectObj.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/RectObj.h
@@ -50,11 +50,16 @@ SOFTWARE.
 #ifndef _XtRect_h
 #define _XtRect_h
 
+_XFUNCPROTOBEGIN
+
 typedef struct _RectObjRec *RectObj;
 typedef struct _RectObjClassRec *RectObjClass;
 
-#ifndef RECTOBJ
+#ifndef VMS
 externalref WidgetClass rectObjClass;
 #endif
+
+_XFUNCPROTOEND
+
 #endif /* _XtRect_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/RectObjP.h b/recipes/xorg-lib/xorg-headers-native/X11/RectObjP.h
index ca3b8ade78..d6ffb78233 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/RectObjP.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/RectObjP.h
@@ -53,6 +53,8 @@ SOFTWARE.
 #include <X11/RectObj.h>
 #include <X11/ObjectP.h>
 
+_XFUNCPROTOBEGIN
+
 /**********************************************************
  * Rectangle Object Instance Data Structures
  *
@@ -126,4 +128,6 @@ typedef struct _RectObjClassRec {
 
 externalref RectObjClassRec rectObjClassRec;
 
+_XFUNCPROTOEND
+
 #endif /*_Xt_RectObjP_h_*/
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/ResourceI.h b/recipes/xorg-lib/xorg-headers-native/X11/ResourceI.h
index d6ed1df237..3db97f83e9 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/ResourceI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/ResourceI.h
@@ -61,6 +61,8 @@ SOFTWARE.
 #define StringToName(string) XrmStringToName(string)
 #define StringToClass(string) XrmStringToClass(string)
 
+_XFUNCPROTOBEGIN
+
 extern void _XtDependencies(
     XtResourceList  * /* class_resp */,
     Cardinal	    * /* class_num_resp */,
@@ -96,5 +98,6 @@ extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,
 						  Cardinal num_resources);
 extern void _XtResourceListInitialize(void);
 
+_XFUNCPROTOEND
 
 #endif /* _XtresourceI_h */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/ShellP.h b/recipes/xorg-lib/xorg-headers-native/X11/ShellP.h
index 2b08c3f5ce..7297d33216 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/ShellP.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/ShellP.h
@@ -67,6 +67,8 @@ SOFTWARE.
  * *****
  */
 
+_XFUNCPROTOBEGIN
+
 /***********************************************************************
  *
  * Shell Widget Private Data
@@ -214,8 +216,12 @@ typedef  struct {
 	WMShellPart	wm;
 } WMShellRec, *WMShellWidget;
 
+_XFUNCPROTOEND
+
 #include <X11/VendorP.h>
 
+_XFUNCPROTOBEGIN
+
 /***********************************************************************
  *
  * TransientShell Widget Private Data
@@ -425,4 +431,6 @@ typedef  struct {
 	SessionShellPart session;
 } SessionShellRec, *SessionShellWidget;
 
+_XFUNCPROTOEND
+
 #endif /* _XtShellPrivate_h */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Sunkeysym.h b/recipes/xorg-lib/xorg-headers-native/X11/Sunkeysym.h
index e723444406..be1b21d363 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Sunkeysym.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Sunkeysym.h
@@ -1,5 +1,3 @@
-/* $Xorg: Sunkeysym.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-
 /************************************************************
 
 Copyright 1991, 1998  The Open Group
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/ThreadsI.h b/recipes/xorg-lib/xorg-headers-native/X11/ThreadsI.h
index 1492d7711b..b1c51e73fc 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/ThreadsI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/ThreadsI.h
@@ -1,30 +1,27 @@
 /* $Xorg: ThreadsI.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */
 
 /************************************************************
-Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA.
-
-                    All Rights Reserved
-
-Permission  to  use,  copy,  modify,  and  distribute   this
-software  and  its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright no-
-tice  appear  in all copies and that both that copyright no-
-tice and this permission notice appear in  supporting  docu-
-mentation,  and  that the name Sun not be used in advertising 
-or publicity pertaining to distribution  of  the software  
-without specific prior written permission. Sun makes no 
-representations about the suitability of this software for 
-any purpose. It is provided "as is" without any express or 
-implied warranty.
-
-SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO  THIS  SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
-NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE  LI-
-ABLE  FOR  ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,  DATA  OR
-PROFITS,  WHETHER  IN  AN  ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 1993 Sun Microsystems, Inc.  All rights reserved.
+
+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 (including the next
+paragraph) 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.
 
 ********************************************************/
 
@@ -81,6 +78,8 @@ typedef void (*ThreadAppRestoreLockProc)(
     Boolean* /* pushed_thread */
 );
 
+_XFUNCPROTOBEGIN
+
 extern void (*_XtProcessLock)(
     void
 );
@@ -93,6 +92,8 @@ extern void (*_XtInitAppLock)(
     XtAppContext /* app */
 );
 
+_XFUNCPROTOEND
+
 #define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app)
 #define FREE_APP_LOCK(app) if(app && app->free_lock)(*app->free_lock)(app)
 
@@ -111,7 +112,7 @@ extern void (*_XtInitAppLock)(
 	XtWidgetToApplicationContext(w) : NULL)
 
 #define DPY_TO_APPCON(d) \
-    XtAppContext app = (_XtProcessLock ? XtDisplayToApplicationContext(d): 0)
+    XtAppContext app = (_XtProcessLock ? XtDisplayToApplicationContext(d): NULL)
 
 #else /* defined(XTHREADS) */
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/TranslateI.h b/recipes/xorg-lib/xorg-headers-native/X11/TranslateI.h
index 122487523c..6cc3099cf6 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/TranslateI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/TranslateI.h
@@ -342,6 +342,8 @@ typedef struct _TMGlobalRec{
 #endif /* TRACE_TM */
 }TMGlobalRec;
 
+_XFUNCPROTOBEGIN
+
 extern TMGlobalRec _XtGlobalTM;
 
 #define TM_MOD_SEGMENT_SIZE 	16
@@ -604,3 +606,4 @@ extern void _XtUnmergeTranslations(
 /* TMKey.c */
 extern void _XtAllocTMContext(XtPerDisplay pd);
 
+_XFUNCPROTOEND
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/VarargsI.h b/recipes/xorg-lib/xorg-headers-native/X11/VarargsI.h
index e15404aab5..76ce9bc7ea 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/VarargsI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/VarargsI.h
@@ -34,6 +34,8 @@ in this Software without prior written authorization from The Open Group.
  
 /* private routines */
 
+_XFUNCPROTOBEGIN
+
 extern void _XtCountVaList(
     va_list /*var*/, int* /*total_count*/, int* /*typed_count*/
 );
@@ -62,4 +64,6 @@ extern void _XtGetSubresources(
     Widget /*w*/, XtPointer /*base*/, const char* /*name*/, const char* /*class*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/
 );
 
+_XFUNCPROTOEND
+
 #endif /* _VarargsI_h_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Vendor.h b/recipes/xorg-lib/xorg-headers-native/X11/Vendor.h
index 65e7c38b09..633d17aa14 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Vendor.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Vendor.h
@@ -65,7 +65,11 @@ SOFTWARE.
 
 typedef struct _VendorShellClassRec *VendorShellWidgetClass;
 
+_XFUNCPROTOBEGIN
+
 externalref WidgetClass vendorShellWidgetClass;
 
+_XFUNCPROTOEND
+
 #endif /* _XtVendor_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/VendorP.h b/recipes/xorg-lib/xorg-headers-native/X11/VendorP.h
index 2e5a9759e6..e60857d9ea 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/VendorP.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/VendorP.h
@@ -68,14 +68,12 @@ SOFTWARE.
 #ifndef  _XtVendorPrivate_h
 #define _XtVendorPrivate_h
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <X11/Vendor.h>
 
 /* New fields for the VendorShell widget class record */
 
+_XFUNCPROTOBEGIN
+
 typedef struct {
     XtPointer       extension;          /* pointer to extension record      */
 } VendorShellClassPart;
@@ -104,8 +102,6 @@ typedef  struct {
 	VendorShellPart	vendor;
 } VendorShellRec, *VendorShellWidget;
 
-#ifdef __cplusplus
-}
-#endif
+_XFUNCPROTOEND
 
 #endif  /* _XtVendorPrivate_h */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/X.h b/recipes/xorg-lib/xorg-headers-native/X11/X.h
index 0a9c501fb2..5cf695d7b7 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/X.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/X.h
@@ -1,7 +1,3 @@
-/*
- *	$Xorg: X.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $
- */
-
 /* Definitions for the X window system likely to be used by applications */
 
 #ifndef X_H
@@ -53,7 +49,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/X.h,v 1.6 2003/07/09 15:27:28 tsi Exp $ */
 
 #define X_PROTOCOL	11		/* current protocol version */
 #define X_PROTOCOL_REVISION 0		/* current minor version */
@@ -216,7 +211,8 @@ are reserved in the protocol for errors and replies. */
 #define ColormapNotify		32
 #define ClientMessage		33
 #define MappingNotify		34
-#define LASTEvent		35	/* must be bigger than any event # */
+#define GenericEvent		35
+#define LASTEvent		36	/* must be bigger than any event # */
 
 
 /* Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer,
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/XF86keysym.h b/recipes/xorg-lib/xorg-headers-native/X11/XF86keysym.h
index fdb8fd6d2b..96eefdb71e 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/XF86keysym.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/XF86keysym.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/include/XF86keysym.h,v 1.16 2003/02/11 02:51:10 dawes Exp $ */
-
 /*
  * XFree86 vendor specific keysyms.
  *
@@ -19,7 +17,7 @@
 #define XF86XK_ModeLock		0x1008FF01	/* Mode Switch Lock */
 
 /*
- * Note, 0x1008FF02 - 0x1008FF0F are free and should be used for misc new
+ * Note, 0x1008FF07 - 0x1008FF0F are free and should be used for misc new
  * keysyms that don't fit into any of the groups below.
  *
  * 0x1008FF64, 0x1008FF6F, 0x1008FF71, 0x1008FF83 are no longer used,
@@ -27,147 +25,190 @@
  *
  * Check in keysymdef.h for generic symbols before adding new XFree86-specific
  * symbols here.
+ *
+ * X.Org will not be adding to the XF86 set of keysyms, though they have
+ * been adopted and are considered a "standard" part of X keysym definitions.
+ * XFree86 never properly commented these keysyms, so we have done our
+ * best to explain the semantic meaning of these keys.
+ *
+ * XFree86 has removed their mail archives of the period, that might have
+ * shed more light on some of these definitions. Until/unless we resurrect
+ * these archives, these are from memory and usage.
  */
 
 
+/* Backlight controls. */
+#define XF86XK_MonBrightnessUp   0x1008FF02  /* Monitor/panel brightness */
+#define XF86XK_MonBrightnessDown 0x1008FF03  /* Monitor/panel brightness */
+#define XF86XK_KbdLightOnOff     0x1008FF04  /* Keyboards may be lit     */
+#define XF86XK_KbdBrightnessUp   0x1008FF05  /* Keyboards may be lit     */
+#define XF86XK_KbdBrightnessDown 0x1008FF06  /* Keyboards may be lit     */
+
 /*
  * Keys found on some "Internet" keyboards.
  */
-#define XF86XK_Standby		0x1008FF10
-#define XF86XK_AudioLowerVolume	0x1008FF11
-#define XF86XK_AudioMute	0x1008FF12
-#define XF86XK_AudioRaiseVolume	0x1008FF13
-#define XF86XK_AudioPlay	0x1008FF14
-#define XF86XK_AudioStop	0x1008FF15
-#define XF86XK_AudioPrev	0x1008FF16
-#define XF86XK_AudioNext	0x1008FF17
-#define XF86XK_HomePage		0x1008FF18
-#define XF86XK_Mail		0x1008FF19
-#define XF86XK_Start		0x1008FF1A
-#define XF86XK_Search		0x1008FF1B
-#define XF86XK_AudioRecord	0x1008FF1C
-
-/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */
-#define XF86XK_Calculator	0x1008FF1D
-#define XF86XK_Memo		0x1008FF1E
-#define XF86XK_ToDoList		0x1008FF1F
-#define XF86XK_Calendar		0x1008FF20
-#define XF86XK_PowerDown	0x1008FF21
-#define XF86XK_ContrastAdjust	0x1008FF22
-#define XF86XK_RockerUp		0x1008FF23
-#define XF86XK_RockerDown	0x1008FF24
-#define XF86XK_RockerEnter	0x1008FF25
+#define XF86XK_Standby		0x1008FF10   /* System into standby mode   */
+#define XF86XK_AudioLowerVolume	0x1008FF11   /* Volume control down        */
+#define XF86XK_AudioMute	0x1008FF12   /* Mute sound from the system */
+#define XF86XK_AudioRaiseVolume	0x1008FF13   /* Volume control up          */
+#define XF86XK_AudioPlay	0x1008FF14   /* Start playing of audio >   */
+#define XF86XK_AudioStop	0x1008FF15   /* Stop playing audio         */
+#define XF86XK_AudioPrev	0x1008FF16   /* Previous track             */
+#define XF86XK_AudioNext	0x1008FF17   /* Next track                 */
+#define XF86XK_HomePage		0x1008FF18   /* Display user's home page   */
+#define XF86XK_Mail		0x1008FF19   /* Invoke user's mail program */
+#define XF86XK_Start		0x1008FF1A   /* Start application          */
+#define XF86XK_Search		0x1008FF1B   /* Search                     */
+#define XF86XK_AudioRecord	0x1008FF1C   /* Record audio application   */
+
+/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere)   */
+#define XF86XK_Calculator	0x1008FF1D   /* Invoke calculator program  */
+#define XF86XK_Memo		0x1008FF1E   /* Invoke Memo taking program */
+#define XF86XK_ToDoList		0x1008FF1F   /* Invoke To Do List program  */
+#define XF86XK_Calendar		0x1008FF20   /* Invoke Calendar program    */
+#define XF86XK_PowerDown	0x1008FF21   /* Deep sleep the system      */
+#define XF86XK_ContrastAdjust	0x1008FF22   /* Adjust screen contrast     */
+#define XF86XK_RockerUp		0x1008FF23   /* Rocker switches exist up   */
+#define XF86XK_RockerDown	0x1008FF24   /* and down                   */
+#define XF86XK_RockerEnter	0x1008FF25   /* and let you press them     */
 
 /* Some more "Internet" keyboard symbols */
-#define XF86XK_Back		0x1008FF26
-#define XF86XK_Forward		0x1008FF27
-#define XF86XK_Stop		0x1008FF28
-#define XF86XK_Refresh		0x1008FF29
-#define XF86XK_PowerOff		0x1008FF2A
-#define XF86XK_WakeUp		0x1008FF2B
-#define XF86XK_Eject            0x1008FF2C
-#define XF86XK_ScreenSaver      0x1008FF2D
-#define XF86XK_WWW              0x1008FF2E
-#define XF86XK_Sleep            0x1008FF2F
-#define XF86XK_Favorites	0x1008FF30
-#define XF86XK_AudioPause	0x1008FF31
-#define XF86XK_AudioMedia	0x1008FF32
-#define XF86XK_MyComputer	0x1008FF33
-#define XF86XK_VendorHome	0x1008FF34
-#define XF86XK_LightBulb	0x1008FF35
-#define XF86XK_Shop		0x1008FF36
-#define XF86XK_History		0x1008FF37
-#define XF86XK_OpenURL		0x1008FF38
-#define XF86XK_AddFavorite	0x1008FF39
-#define XF86XK_HotLinks		0x1008FF3A
-#define XF86XK_BrightnessAdjust	0x1008FF3B
-#define XF86XK_Finance		0x1008FF3C
-#define XF86XK_Community	0x1008FF3D
-#define XF86XK_AudioRewind	0x1008FF3E
-#define XF86XK_XF86BackForward	0x1008FF3F
-#define XF86XK_Launch0		0x1008FF40
-#define XF86XK_Launch1		0x1008FF41
-#define XF86XK_Launch2		0x1008FF42
-#define XF86XK_Launch3		0x1008FF43
-#define XF86XK_Launch4		0x1008FF44
-#define XF86XK_Launch5		0x1008FF45
-#define XF86XK_Launch6		0x1008FF46
-#define XF86XK_Launch7		0x1008FF47
-#define XF86XK_Launch8		0x1008FF48
-#define XF86XK_Launch9		0x1008FF49
-#define XF86XK_LaunchA		0x1008FF4A
-#define XF86XK_LaunchB		0x1008FF4B
-#define XF86XK_LaunchC		0x1008FF4C
-#define XF86XK_LaunchD		0x1008FF4D
-#define XF86XK_LaunchE		0x1008FF4E
-#define XF86XK_LaunchF		0x1008FF4F
-
-#define XF86XK_ApplicationLeft	0x1008FF50
-#define XF86XK_ApplicationRight	0x1008FF51
-#define XF86XK_Book		0x1008FF52
-#define XF86XK_CD		0x1008FF53
-#define XF86XK_Calculater	0x1008FF54
-#define XF86XK_Clear		0x1008FF55
-#define XF86XK_Close		0x1008FF56
-#define XF86XK_Copy		0x1008FF57
-#define XF86XK_Cut		0x1008FF58
-#define XF86XK_Display		0x1008FF59
-#define XF86XK_DOS		0x1008FF5A
-#define XF86XK_Documents	0x1008FF5B
-#define XF86XK_Excel		0x1008FF5C
-#define XF86XK_Explorer		0x1008FF5D
-#define XF86XK_Game		0x1008FF5E
-#define XF86XK_Go		0x1008FF5F
-#define XF86XK_iTouch		0x1008FF60
-#define XF86XK_LogOff		0x1008FF61
-#define XF86XK_Market		0x1008FF62
-#define XF86XK_Meeting		0x1008FF63
-#define XF86XK_MenuKB		0x1008FF65
-#define XF86XK_MenuPB		0x1008FF66
-#define XF86XK_MySites		0x1008FF67
-#define XF86XK_New		0x1008FF68
-#define XF86XK_News		0x1008FF69
-#define XF86XK_OfficeHome	0x1008FF6A
-#define XF86XK_Open		0x1008FF6B
-#define XF86XK_Option		0x1008FF6C
-#define XF86XK_Paste		0x1008FF6D
-#define XF86XK_Phone		0x1008FF6E
-#define XF86XK_Q		0x1008FF70
-#define XF86XK_Reply		0x1008FF72
-#define XF86XK_Reload		0x1008FF73
-#define XF86XK_RotateWindows	0x1008FF74
-#define XF86XK_RotationPB	0x1008FF75
-#define XF86XK_RotationKB	0x1008FF76
-#define XF86XK_Save		0x1008FF77
-#define XF86XK_ScrollUp		0x1008FF78
-#define XF86XK_ScrollDown	0x1008FF79
-#define XF86XK_ScrollClick	0x1008FF7A
-#define XF86XK_Send		0x1008FF7B
-#define XF86XK_Spell		0x1008FF7C
-#define XF86XK_SplitScreen	0x1008FF7D
-#define XF86XK_Support		0x1008FF7E
-#define XF86XK_TaskPane		0x1008FF7F
-#define XF86XK_Terminal		0x1008FF80
-#define XF86XK_Tools		0x1008FF81
-#define XF86XK_Travel		0x1008FF82
-#define XF86XK_UserPB		0x1008FF84
-#define XF86XK_User1KB		0x1008FF85
-#define XF86XK_User2KB		0x1008FF86
-#define XF86XK_Video		0x1008FF87
-#define XF86XK_WheelButton	0x1008FF88
-#define XF86XK_Word		0x1008FF89
+#define XF86XK_Back		0x1008FF26   /* Like back on a browser     */
+#define XF86XK_Forward		0x1008FF27   /* Like forward on a browser  */
+#define XF86XK_Stop		0x1008FF28   /* Stop current operation     */
+#define XF86XK_Refresh		0x1008FF29   /* Refresh the page           */
+#define XF86XK_PowerOff		0x1008FF2A   /* Power off system entirely  */
+#define XF86XK_WakeUp		0x1008FF2B   /* Wake up system from sleep  */
+#define XF86XK_Eject            0x1008FF2C   /* Eject device (e.g. DVD)    */
+#define XF86XK_ScreenSaver      0x1008FF2D   /* Invoke screensaver         */
+#define XF86XK_WWW              0x1008FF2E   /* Invoke web browser         */
+#define XF86XK_Sleep            0x1008FF2F   /* Put system to sleep        */
+#define XF86XK_Favorites	0x1008FF30   /* Show favorite locations    */
+#define XF86XK_AudioPause	0x1008FF31   /* Pause audio playing        */
+#define XF86XK_AudioMedia	0x1008FF32   /* Launch media collection app */
+#define XF86XK_MyComputer	0x1008FF33   /* Display "My Computer" window */
+#define XF86XK_VendorHome	0x1008FF34   /* Display vendor home web site */
+#define XF86XK_LightBulb	0x1008FF35   /* Light bulb keys exist       */
+#define XF86XK_Shop		0x1008FF36   /* Display shopping web site   */
+#define XF86XK_History		0x1008FF37   /* Show history of web surfing */
+#define XF86XK_OpenURL		0x1008FF38   /* Open selected URL           */
+#define XF86XK_AddFavorite	0x1008FF39   /* Add URL to favorites list   */
+#define XF86XK_HotLinks		0x1008FF3A   /* Show "hot" links            */
+#define XF86XK_BrightnessAdjust	0x1008FF3B   /* Invoke brightness adj. UI   */
+#define XF86XK_Finance		0x1008FF3C   /* Display financial site      */
+#define XF86XK_Community	0x1008FF3D   /* Display user's community    */
+#define XF86XK_AudioRewind	0x1008FF3E   /* "rewind" audio track        */
+#define XF86XK_BackForward	0x1008FF3F   /* ??? */
+#define XF86XK_Launch0		0x1008FF40   /* Launch Application          */
+#define XF86XK_Launch1		0x1008FF41   /* Launch Application          */
+#define XF86XK_Launch2		0x1008FF42   /* Launch Application          */
+#define XF86XK_Launch3		0x1008FF43   /* Launch Application          */
+#define XF86XK_Launch4		0x1008FF44   /* Launch Application          */
+#define XF86XK_Launch5		0x1008FF45   /* Launch Application          */
+#define XF86XK_Launch6		0x1008FF46   /* Launch Application          */
+#define XF86XK_Launch7		0x1008FF47   /* Launch Application          */
+#define XF86XK_Launch8		0x1008FF48   /* Launch Application          */
+#define XF86XK_Launch9		0x1008FF49   /* Launch Application          */
+#define XF86XK_LaunchA		0x1008FF4A   /* Launch Application          */
+#define XF86XK_LaunchB		0x1008FF4B   /* Launch Application          */
+#define XF86XK_LaunchC		0x1008FF4C   /* Launch Application          */
+#define XF86XK_LaunchD		0x1008FF4D   /* Launch Application          */
+#define XF86XK_LaunchE		0x1008FF4E   /* Launch Application          */
+#define XF86XK_LaunchF		0x1008FF4F   /* Launch Application          */
+
+#define XF86XK_ApplicationLeft	0x1008FF50   /* switch to application, left */
+#define XF86XK_ApplicationRight	0x1008FF51   /* switch to application, right*/
+#define XF86XK_Book		0x1008FF52   /* Launch bookreader           */
+#define XF86XK_CD		0x1008FF53   /* Launch CD/DVD player        */
+#define XF86XK_Calculater	0x1008FF54   /* Launch Calculater           */
+#define XF86XK_Clear		0x1008FF55   /* Clear window, screen        */
+#define XF86XK_Close		0x1008FF56   /* Close window                */
+#define XF86XK_Copy		0x1008FF57   /* Copy selection              */
+#define XF86XK_Cut		0x1008FF58   /* Cut selection               */
+#define XF86XK_Display		0x1008FF59   /* Output switch key           */
+#define XF86XK_DOS		0x1008FF5A   /* Launch DOS (emulation)      */
+#define XF86XK_Documents	0x1008FF5B   /* Open documents window       */
+#define XF86XK_Excel		0x1008FF5C   /* Launch spread sheet         */
+#define XF86XK_Explorer		0x1008FF5D   /* Launch file explorer        */
+#define XF86XK_Game		0x1008FF5E   /* Launch game                 */
+#define XF86XK_Go		0x1008FF5F   /* Go to URL                   */
+#define XF86XK_iTouch		0x1008FF60   /* Logitch iTouch- don't use   */
+#define XF86XK_LogOff		0x1008FF61   /* Log off system              */
+#define XF86XK_Market		0x1008FF62   /* ??                          */
+#define XF86XK_Meeting		0x1008FF63   /* enter meeting in calendar   */
+#define XF86XK_MenuKB		0x1008FF65   /* distingush keyboard from PB */
+#define XF86XK_MenuPB		0x1008FF66   /* distinuish PB from keyboard */
+#define XF86XK_MySites		0x1008FF67   /* Favourites                  */
+#define XF86XK_New		0x1008FF68   /* New (folder, document...    */
+#define XF86XK_News		0x1008FF69   /* News                        */
+#define XF86XK_OfficeHome	0x1008FF6A   /* Office home (old Staroffice)*/
+#define XF86XK_Open		0x1008FF6B   /* Open                        */
+#define XF86XK_Option		0x1008FF6C   /* ?? */
+#define XF86XK_Paste		0x1008FF6D   /* Paste                       */
+#define XF86XK_Phone		0x1008FF6E   /* Launch phone; dial number   */
+#define XF86XK_Q		0x1008FF70   /* Compaq's Q - don't use      */
+#define XF86XK_Reply		0x1008FF72   /* Reply e.g., mail            */
+#define XF86XK_Reload		0x1008FF73   /* Reload web page, file, etc. */
+#define XF86XK_RotateWindows	0x1008FF74   /* Rotate windows e.g. xrandr  */
+#define XF86XK_RotationPB	0x1008FF75   /* don't use                   */
+#define XF86XK_RotationKB	0x1008FF76   /* don't use                   */
+#define XF86XK_Save		0x1008FF77   /* Save (file, document, state */
+#define XF86XK_ScrollUp		0x1008FF78   /* Scroll window/contents up   */
+#define XF86XK_ScrollDown	0x1008FF79   /* Scrool window/contentd down */
+#define XF86XK_ScrollClick	0x1008FF7A   /* Use XKB mousekeys instead   */
+#define XF86XK_Send		0x1008FF7B   /* Send mail, file, object     */
+#define XF86XK_Spell		0x1008FF7C   /* Spell checker               */
+#define XF86XK_SplitScreen	0x1008FF7D   /* Split window or screen      */
+#define XF86XK_Support		0x1008FF7E   /* Get support (??)            */
+#define XF86XK_TaskPane		0x1008FF7F   /* Show tasks */
+#define XF86XK_Terminal		0x1008FF80   /* Launch terminal emulator    */
+#define XF86XK_Tools		0x1008FF81   /* toolbox of desktop/app.     */
+#define XF86XK_Travel		0x1008FF82   /* ?? */
+#define XF86XK_UserPB		0x1008FF84   /* ?? */
+#define XF86XK_User1KB		0x1008FF85   /* ?? */
+#define XF86XK_User2KB		0x1008FF86   /* ?? */
+#define XF86XK_Video		0x1008FF87   /* Launch video player       */
+#define XF86XK_WheelButton	0x1008FF88   /* button from a mouse wheel */
+#define XF86XK_Word		0x1008FF89   /* Launch word processor     */
 #define XF86XK_Xfer		0x1008FF8A
-#define XF86XK_ZoomIn		0x1008FF8B
-#define XF86XK_ZoomOut		0x1008FF8C
+#define XF86XK_ZoomIn		0x1008FF8B   /* zoom in view, map, etc.   */
+#define XF86XK_ZoomOut		0x1008FF8C   /* zoom out view, map, etc.  */
+
+#define XF86XK_Away		0x1008FF8D   /* mark yourself as away     */
+#define XF86XK_Messenger	0x1008FF8E   /* as in instant messaging   */
+#define XF86XK_WebCam		0x1008FF8F   /* Launch web camera app.    */
+#define XF86XK_MailForward	0x1008FF90   /* Forward in mail           */
+#define XF86XK_Pictures		0x1008FF91   /* Show pictures             */
+#define XF86XK_Music		0x1008FF92   /* Launch music application  */
+
+#define XF86XK_Battery		0x1008FF93   /* Display battery information */
+#define XF86XK_Bluetooth	0x1008FF94   /* Enable/disable Bluetooth    */
+#define XF86XK_WLAN		0x1008FF95   /* Enable/disable WLAN         */
+#define XF86XK_UWB		0x1008FF96   /* Enable/disable UWB	    */
+
+#define XF86XK_AudioForward	0x1008FF97   /* fast-forward audio track    */
+#define XF86XK_AudioRepeat	0x1008FF98   /* toggle repeat mode          */
+#define XF86XK_AudioRandomPlay	0x1008FF99   /* toggle shuffle mode         */
+#define XF86XK_Subtitle		0x1008FF9A   /* cycle through subtitle      */
+#define XF86XK_AudioCycleTrack	0x1008FF9B   /* cycle through audio tracks  */
+#define XF86XK_CycleAngle	0x1008FF9C   /* cycle through angles        */
+#define XF86XK_FrameBack	0x1008FF9D   /* video: go one frame back    */
+#define XF86XK_FrameForward	0x1008FF9E   /* video: go one frame forward */
+#define XF86XK_Time		0x1008FF9F   /* display, or shows an entry for time seeking */
+#define XF86XK_Select		0x1008FFA0   /* Select button on joypads and remotes */
+#define XF86XK_View		0x1008FFA1   /* Show a view options/properties */
+#define XF86XK_TopMenu		0x1008FFA2   /* Go to a top-level menu in a video */
+
+#define XF86XK_Red		0x1008FFA3   /* Red button                  */
+#define XF86XK_Green		0x1008FFA4   /* Green button                */
+#define XF86XK_Yellow		0x1008FFA5   /* Yellow button               */
+#define XF86XK_Blue             0x1008FFA6   /* Blue button                 */
 
-#define XF86XK_Away		0x1008FF8D
-#define XF86XK_Messenger	0x1008FF8E
-#define XF86XK_WebCam		0x1008FF8F
-#define XF86XK_MailForward	0x1008FF90
-#define XF86XK_Pictures		0x1008FF91
-#define XF86XK_Music		0x1008FF92
+#define XF86XK_Suspend		0x1008FFA7   /* Sleep to RAM                */
+#define XF86XK_Hibernate	0x1008FFA8   /* Sleep to disk               */
 
 /* Keys for special action keys (hot keys) */
+/* Virtual terminals on some operating systems */
 #define XF86XK_Switch_VT_1	0x1008FE01
 #define XF86XK_Switch_VT_2	0x1008FE02
 #define XF86XK_Switch_VT_3	0x1008FE03
@@ -181,8 +222,8 @@
 #define XF86XK_Switch_VT_11	0x1008FE0B
 #define XF86XK_Switch_VT_12	0x1008FE0C
 
-#define XF86XK_Ungrab		0x1008FE20
-#define XF86XK_ClearGrab	0x1008FE21
-#define XF86XK_Next_VMode	0x1008FE22
-#define XF86XK_Prev_VMode	0x1008FE23
+#define XF86XK_Ungrab		0x1008FE20   /* force ungrab               */
+#define XF86XK_ClearGrab	0x1008FE21   /* kill application with grab */
+#define XF86XK_Next_VMode	0x1008FE22   /* next video mode available  */
+#define XF86XK_Prev_VMode	0x1008FE23   /* prev. video mode available */
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/XKBlib.h b/recipes/xorg-lib/xorg-headers-native/X11/XKBlib.h
index 6a5dc8a7c6..291fc05154 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/XKBlib.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/XKBlib.h
@@ -1,4 +1,3 @@
-/* $Xorg: XKBlib.h,v 1.6 2000/08/17 19:45:03 cpqbld Exp $ */
 /************************************************************
 Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
 
@@ -7,24 +6,23 @@ software and its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright
 notice appear in all copies and that both that copyright
 notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
 of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
+Silicon Graphics makes no representation about the suitability
 of this software for any purpose. It is provided "as is"
 without any express or implied warranty.
 
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/X11/XKBlib.h,v 3.5 2003/04/17 02:06:31 dawes Exp $ */
 
 #ifndef _XKBLIB_H_
 #define _XKBLIB_H_
@@ -78,7 +76,7 @@ typedef struct _XkbMapNotifyEvent {
 	KeyCode		first_key_act;
 	KeyCode		first_key_behavior;
 	KeyCode		first_key_explicit;
-	KeyCode		first_modmap_key;  
+	KeyCode		first_modmap_key;
 	KeyCode		first_vmodmap_key;
 	int		num_key_syms;
 	int		num_key_acts;
@@ -215,7 +213,7 @@ typedef struct _XkbActionMessage {
 	Bool 		key_event_follows;/* true if key event also generated */
 	int		group;		/* effective group */
 	unsigned int	mods;		/* effective mods */
-	char 		message[XkbActionMessageLength+1]; 
+	char 		message[XkbActionMessageLength+1];
 					/* message -- leave space for NUL */
 } XkbActionMessageEvent;
 
@@ -241,8 +239,8 @@ typedef struct _XkbExtensionDeviceNotify {
 	Time 		time;		/* milliseconds */
 	int 		xkb_type;	/* XkbExtensionDeviceNotify */
 	int	 	device;		/* device ID */
-	unsigned int	reason;		/* reason for the event */	
-	unsigned int	supported;	/* mask of supported features */	
+	unsigned int	reason;		/* reason for the event */
+	unsigned int	supported;	/* mask of supported features */
 	unsigned int	unsupported;	/* mask of unsupported features */
 					/* that some app tried to use */
 	int	 	first_btn;	/* first button that changed */
@@ -531,7 +529,7 @@ extern	Bool	 XkbSetIndicatorMap(
 #define	XkbNoteIndicatorStateChanges(o,n,w)\
 				((o)->state_changes|=((n)->state_changes&(w)))
 #define	XkbGetIndicatorMapChanges(d,x,c) \
-				(XkbGetIndicatorMap((d),(c)->map_changes,x)
+				(XkbGetIndicatorMap((d),(c)->map_changes,x))
 #define	XkbChangeIndicatorMaps(d,x,c) \
 				(XkbSetIndicatorMap((d),(c)->map_changes,x))
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/XWDFile.h b/recipes/xorg-lib/xorg-headers-native/X11/XWDFile.h
index 0ce22e1a8d..50e17df3d6 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/XWDFile.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/XWDFile.h
@@ -1,4 +1,3 @@
-/* $Xorg: XWDFile.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
 /*
 
 Copyright 1985, 1986, 1998  The Open Group
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xalloca.h b/recipes/xorg-lib/xorg-headers-native/X11/Xalloca.h
index 67f2671e94..1919884bb8 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xalloca.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xalloca.h
@@ -1,5 +1,3 @@
-/* $Xorg: Xalloca.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-
 /*
 
 Copyright 1995, 1998  The Open Group
@@ -27,8 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/include/Xalloca.h,v 3.10 2001/12/14 19:53:25 dawes Exp $ */
-
 /*
  * The purpose of this header is to define the macros ALLOCATE_LOCAL and
  * DEALLOCATE_LOCAL appropriately for the platform being compiled on.
@@ -62,7 +58,8 @@ from The Open Group.
 #define XALLOCA_H 1
 
 #ifndef INCLUDE_ALLOCA_H
-# if defined(__SUNPRO_C)  /* Need to add more here to match Imake *.cf's */
+/* Need to add more here to match Imake *.cf's */
+# if defined(HAVE_ALLOCA_H) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 #  define INCLUDE_ALLOCA_H
 # endif
 #endif
@@ -77,19 +74,6 @@ from The Open Group.
  * If you want something other than (DE)ALLOCATE_LOCAL_FALLBACK
  * for ALLOCATE/DEALLOCATE_LOCAL then you add that in here.
  */
-#  if defined(__HIGHC__)
-#    ifndef NCR
-       extern char *alloca();
-#      if HCVERSION < 21003
-#        define ALLOCATE_LOCAL(size)	alloca((int)(size))
-         pragma on(alloca);
-#      else /* HCVERSION >= 21003 */
-#        define	ALLOCATE_LOCAL(size)	_Alloca((int)(size))
-#      endif /* HCVERSION < 21003 */
-#    else /* NCR */
-#      define ALLOCATE_LOCAL(size)	alloca(size)
-#    endif
-#  endif /* defined(__HIGHC__) */
 
 
 #  ifdef __GNUC__
@@ -104,26 +88,18 @@ from The Open Group.
  * Test is easy, the new one is named __builtin_alloca and comes
  * from alloca.h which #defines alloca.
  */
-#    ifndef NCR
-#      if defined(vax) || defined(sun) || defined(apollo) || defined(stellar) || defined(alloca)
+#      if defined(__sun) || defined(alloca)
 /*
  * Some System V boxes extract alloca.o from /lib/libPW.a; if you
  * decide that you don't want to use alloca, you might want to fix it here.
  */
 /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
-#        ifndef __sgi			/* IRIX 5/6 has definition */
-#         ifndef __QNX__
+#        if !defined(__cplusplus)
 #          define __Xnullarg		/* as nothing */
-#          ifndef X_NOT_STDC_ENV
-             extern void *alloca(__Xnullarg);
-#          else
-             extern char *alloca(__Xnullarg);
-#          endif
-#         endif /* __QNX__ */
-#        endif /* __sgi */
+           extern void *alloca(__Xnullarg);
+#        endif
 #        define ALLOCATE_LOCAL(size) alloca((int)(size))
 #      endif /* who does alloca */
-#    endif /* NCR */
 #  endif /* __GNUC__ */
 
 #endif /* NO_ALLOCA */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xarch.h b/recipes/xorg-lib/xorg-headers-native/X11/Xarch.h
index 6e04e53f6f..58fb9a5d88 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xarch.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xarch.h
@@ -1,5 +1,5 @@
 #ifndef _XARCH_H_
-#define _XARCH_H_
+# define _XARCH_H_
 
 /*
  * Copyright 1997 Metro Link Incorporated
@@ -25,7 +25,6 @@
  * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/include/Xarch.h,v 1.10tsi Exp $ */
 
 
 /*
@@ -33,94 +32,62 @@
  */
 
 /* See if it is set in the imake config first */
-#ifdef X_BYTE_ORDER
+# ifdef X_BYTE_ORDER
 
-#define X_BIG_ENDIAN 4321
-#define X_LITTLE_ENDIAN 1234
+#  define X_BIG_ENDIAN 4321
+#  define X_LITTLE_ENDIAN 1234
 
-#else
+# else
 
-#ifdef SVR4
-#if defined(NCR) || defined(Mips) || defined(__sgi)
-#include <sys/endian.h>
-#else
-#if !defined(sun)
-#include <sys/byteorder.h>
-#endif
-#endif
-#elif defined(CSRG_BASED)
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-#include <sys/types.h>
-#endif
-#include <machine/endian.h>
-#elif defined(linux)
-#if defined __STRICT_ANSI__
-#undef __STRICT_ANSI__
-#include <endian.h>
-#define __STRICT_ANSI__
-#else
-#include <endian.h>
-#endif
+#  if defined(SVR4) || defined(__SVR4)
+#   include <sys/byteorder.h>
+#  elif defined(CSRG_BASED)
+#   if defined(__NetBSD__) || defined(__OpenBSD__)
+#    include <sys/types.h>
+#   endif
+#   include <machine/endian.h>
+#  elif defined(linux)
+#   if defined __STRICT_ANSI__
+#    undef __STRICT_ANSI__
+#    include <endian.h>
+#    define __STRICT_ANSI__
+#   else
+#    include <endian.h>
+#   endif
 /* 'endian.h' might have been included before 'Xarch.h' */
-#if !defined(LITTLE_ENDIAN) && defined(__LITTLE_ENDIAN)
-#define LITTLE_ENDIAN __LITTLE_ENDIAN
-#endif
-#if !defined(BIG_ENDIAN) && defined(__BIG_ENDIAN)
-#define BIG_ENDIAN __BIG_ENDIAN
-#endif
-#if !defined(PDP_ENDIAN) && defined(__PDP_ENDIAN)
-#define PDP_ENDIAN __PDP_ENDIAN
-#endif
-#if !defined(BYTE_ORDER) && defined(__BYTE_ORDER)
-#define BYTE_ORDER __BYTE_ORDER
-#endif
-#elif defined(Lynx)
-#if 0
-/* LynxOS 2.4.0 has wrong defines in bsd/ip.h */
-#include <bsd/in.h>
-#include <bsd/in_systm.h>
-#include <bsd/ip.h>
-#endif
-#endif
+#   if !defined(LITTLE_ENDIAN) && defined(__LITTLE_ENDIAN)
+#    define LITTLE_ENDIAN __LITTLE_ENDIAN
+#   endif
+#   if !defined(BIG_ENDIAN) && defined(__BIG_ENDIAN)
+#    define BIG_ENDIAN __BIG_ENDIAN
+#   endif
+#   if !defined(PDP_ENDIAN) && defined(__PDP_ENDIAN)
+#    define PDP_ENDIAN __PDP_ENDIAN
+#   endif
+#   if !defined(BYTE_ORDER) && defined(__BYTE_ORDER)
+#    define BYTE_ORDER __BYTE_ORDER
+#   endif
+#  endif
 
-#ifndef BYTE_ORDER
-#define LITTLE_ENDIAN 1234
-#define BIG_ENDIAN    4321
+#  ifndef BYTE_ORDER
+#   define LITTLE_ENDIAN 1234
+#   define BIG_ENDIAN    4321
 
-#if defined(__QNX__) && !defined(__QNXNTO__)
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
+#   if defined(__sun) && defined(__SVR4)
+#    include <sys/isa_defs.h>
+#    ifdef _LITTLE_ENDIAN
+#     define BYTE_ORDER LITTLE_ENDIAN
+#    endif
+#    ifdef _BIG_ENDIAN
+#     define BYTE_ORDER BIG_ENDIAN
+#    endif
+#   endif /* sun */
+#  endif /* BYTE_ORDER */
 
-#if defined(__QNXNTO__)
-#if defined(i386) || defined(__i386__) || defined(__x86__)
-#define BYTE_ORDER LITTLE_ENDIAN
-#else
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#endif
+#  define X_BYTE_ORDER BYTE_ORDER
+#  define X_BIG_ENDIAN BIG_ENDIAN
+#  define X_LITTLE_ENDIAN LITTLE_ENDIAN
 
-#ifdef Lynx
-#if defined(i386) || defined(__i386__) || defined(__x86__)
-#define BYTE_ORDER LITTLE_ENDIAN
-#else
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#endif
-#if (defined(sun) && defined(SVR4)) && !defined(Lynx)
-#include <sys/isa_defs.h>
-#ifdef _LITTLE_ENDIAN
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-#ifdef _BIG_ENDIAN
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#endif /* sun */
-#endif /* BYTE_ORDER */
-
-#define X_BYTE_ORDER BYTE_ORDER
-#define X_BIG_ENDIAN BIG_ENDIAN
-#define X_LITTLE_ENDIAN LITTLE_ENDIAN
-
-#endif /* not in imake config */
+# endif /* not in imake config */
 
 #endif /* _XARCH_H_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xauth.h b/recipes/xorg-lib/xorg-headers-native/X11/Xauth.h
index 181618ac2b..ace975d84f 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xauth.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xauth.h
@@ -128,23 +128,6 @@ void XauDisposeAuth(
 Xauth*		/* auth */
 );
 
-#ifdef K5AUTH
-#include <krb5/krb5.h>
-/* 9/93: krb5.h leaks some symbols */
-#undef BITS32
-#undef xfree
-
-int XauKrb5Encode(
-     krb5_principal	/* princ */,
-     krb5_data *	/* outbuf */
-);
-
-int XauKrb5Decode(
-     krb5_data		/* inbuf */,
-     krb5_principal *	/* princ */
-);
-#endif /* K5AUTH */
-
 _XFUNCPROTOEND
 
 /* Return values from XauLockAuth */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xcms.h b/recipes/xorg-lib/xorg-headers-native/X11/Xcms.h
index 779bc52ffd..cea11ab488 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xcms.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xcms.h
@@ -1,9 +1,8 @@
-/* $Xorg: Xcms.h,v 1.6 2000/08/17 19:45:04 cpqbld Exp $ */
 
 /*
  * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
  * 	All Rights Reserved
- * 
+ *
  * This file is a component of an X Window System-specific implementation
  * of Xcms based on the TekColor Color Management System.  Permission is
  * hereby granted to use, copy, modify, sell, and otherwise distribute this
@@ -11,10 +10,10 @@
  * that this copyright, permission, and disclaimer notice is reproduced in
  * all copies of this software and in supporting documentation.  TekColor
  * is a trademark of Tektronix, Inc.
- * 
+ *
  * Tektronix makes no representation about the suitability of this software
  * for any purpose.  It is provided "as is" and with all faults.
- * 
+ *
  * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
  * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
@@ -27,7 +26,6 @@
  *	DESCRIPTION
  *		Public include file for X Color Management System
  */
-/* $XFree86: xc/lib/X11/Xcms.h,v 1.7 2003/11/03 03:46:26 dawes Exp $ */
 #ifndef _XCMS_H_
 #define _XCMS_H_
 
@@ -252,7 +250,7 @@ typedef void (*XcmsScreenFreeProc)(
  * XXX:  The use of the XcmsConversionProc type is broken.  The
  *       device-independent colour conversion code uses it as:
 
-typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *, 
+typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *,
 				     unsigned int);
 
  *       while the device-dependent code uses it as:
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xdefs.h b/recipes/xorg-lib/xorg-headers-native/X11/Xdefs.h
index 5ee2d8949f..46ffdad883 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xdefs.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xdefs.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/include/Xdefs.h,v 1.2 1999/08/22 06:21:20 dawes Exp $ */
-
 /***********************************************************
 
 Copyright (c) 1999  The XFree86 Project Inc.
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xdmcp.h b/recipes/xorg-lib/xorg-headers-native/X11/Xdmcp.h
index 6d7619a902..2548485657 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xdmcp.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xdmcp.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: lib/Xdmcp/include/X11/Xdmcp.h,v 1.3 2005/07/03 07:00:56 daniels Exp $ */
+/* $XdotOrg: xc/lib/Xdmcp/Xdmcp.h,v 1.2 2004/04/23 18:43:41 eich Exp $ */
 /* $Xorg: Xdmcp.h,v 1.7 2001/04/13 14:43:00 steve Exp $ */
 /*
  * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xfuncproto.h b/recipes/xorg-lib/xorg-headers-native/X11/Xfuncproto.h
index 7b2b7ca98e..22bb7992f6 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xfuncproto.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xfuncproto.h
@@ -1,5 +1,4 @@
-/* Xfuncproto.h.  Generated by configure.  */
-/* $Xorg: Xfuncproto.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
+/* Xfuncproto.h.  Generated from Xfuncproto.h.in by configure.  */
 /*
  *
 Copyright 1989, 1991, 1998  The Open Group
@@ -25,7 +24,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  *
  */
-/* $XFree86: xc/include/Xfuncproto.h,v 3.4 2001/12/14 19:53:25 dawes Exp $ */
 
 /* Definitions to make function prototypes manageable */
 
@@ -52,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
 
 /* Function prototype configuration (see configure for more info) */
 #ifndef NARROWPROTO
-#define NARROWPROTO 
+#define NARROWPROTO /**/
 #endif
 #ifndef FUNCPROTO
 #define FUNCPROTO 15
@@ -86,7 +84,7 @@ in this Software without prior written authorization from The Open Group.
 # define _X_ATTRIBUTE_PRINTF(x,y)
 #endif /* GNUC >= 4 */
 
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
+#if defined(__GNUC__) && (__GNUC__ >= 4)
 # define _X_EXPORT      __attribute__((visibility("default")))
 # define _X_HIDDEN      __attribute__((visibility("hidden")))
 # define _X_INTERNAL    __attribute__((visibility("internal")))
@@ -94,10 +92,24 @@ in this Software without prior written authorization from The Open Group.
 # define _X_EXPORT      __global
 # define _X_HIDDEN      __hidden
 # define _X_INTERNAL    __hidden
-#else /* not gcc >= 3.3 and not Sun Studio >= 8 */
+#else /* not gcc >= 4 and not Sun Studio >= 8 */
 # define _X_EXPORT
 # define _X_HIDDEN
 # define _X_INTERNAL
+#endif /* GNUC >= 4 */
+
+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
+# define _X_LIKELY(x)   __builtin_expect(!!(x), 1)
+# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
+# define _X_INLINE      inline
+#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+# define _X_LIKELY(x)   (x)
+# define _X_UNLIKELY(x) (x)
+# define _X_INLINE      inline
+#else /* not gcc >= 3.3 and not Sun Studio >= 8 */
+# define _X_LIKELY(x)   (x)
+# define _X_UNLIKELY(x) (x)
+# define _X_INLINE
 #endif
 
 #if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xfuncs.h b/recipes/xorg-lib/xorg-headers-native/X11/Xfuncs.h
index ca9d29e34e..354b663269 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xfuncs.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xfuncs.h
@@ -1,7 +1,4 @@
 /*
- * $XdotOrg: proto/X11/Xfuncs.h,v 1.4 2005/11/08 06:33:25 jkj Exp $
- * $Xorg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $
- * 
  * 
 Copyright 1990, 1998  The Open Group
 
@@ -26,69 +23,47 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  *
  */
-/* $XFree86: xc/include/Xfuncs.h,v 3.10 2002/05/31 18:45:38 dawes Exp $ */
 
 #ifndef _XFUNCS_H_
-#define _XFUNCS_H_
+# define _XFUNCS_H_
 
-#include <X11/Xosdefs.h>
+# include <X11/Xosdefs.h>
 
 /* the old Xfuncs.h, for pre-R6 */
-#if !(defined(XFree86LOADER) && defined(IN_MODULE))
+# if !(defined(XFree86LOADER) && defined(IN_MODULE))
 
-#ifdef X_USEBFUNCS
+#  ifdef X_USEBFUNCS
 void bcopy();
 void bzero();
 int bcmp();
-#else
-#if defined(SYSV) && !defined(__SCO__) && !defined(sun) && !defined(__UNIXWARE__)
-#include <memory.h>
+#  else
+#   if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__)
+#    include <memory.h>
 void bcopy();
-#define bzero(b,len) memset(b, 0, len)
-#define bcmp(b1,b2,len) memcmp(b1, b2, len)
-#else
-#include <string.h>
-#if defined(__SCO__) || defined(sun) || defined(__UNIXWARE__)
-#include <strings.h>
-#endif
-#define _XFUNCS_H_INCLUDED_STRING_H
-#if defined(sun)
-#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
-#define bzero(b,len) memset(b, 0, (size_t)(len))
-#define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len))
-#endif
-#endif
-#endif /* X_USEBFUNCS */
+#    define bzero(b,len) memset(b, 0, len)
+#    define bcmp(b1,b2,len) memcmp(b1, b2, len)
+#   else
+#    include <string.h>
+#    if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__)
+#     include <strings.h>
+#    endif
+#    define _XFUNCS_H_INCLUDED_STRING_H
+#   endif
+#  endif /* X_USEBFUNCS */
 
 /* the new Xfuncs.h */
 
-#if !defined(X_NOT_STDC_ENV) && (!defined(sun) || defined(SVR4))
 /* the ANSI C way */
-#ifndef _XFUNCS_H_INCLUDED_STRING_H
-#include <string.h>
-#endif
-#undef bzero
-#define bzero(b,len) memset(b,0,len)
-#else /* else X_NOT_STDC_ENV or SunOS 4 */
-#if defined(SYSV) || defined(luna) || defined(sun) || defined(__sxg__)
-#include <memory.h>
-#define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-#if defined(SYSV) && defined(_XBCOPYFUNC)
-#undef memmove
-#define memmove(dst,src,len) _XBCOPYFUNC((char *)(src),(char *)(dst),(int)(len))
-#define _XNEEDBCOPYFUNC
-#endif
-#else /* else vanilla BSD */
-#define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-#define memcpy(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-#define memcmp(b1,b2,len) bcmp((char *)(b1),(char *)(b2),(int)(len))
-#endif /* SYSV else */
-#endif /* ! X_NOT_STDC_ENV else */
+#  ifndef _XFUNCS_H_INCLUDED_STRING_H
+#   include <string.h>
+#  endif
+#  undef bzero
+#  define bzero(b,len) memset(b,0,len)
 
-#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4))
-#define atexit(f) on_exit(f, 0)
-#endif
+#  if defined WIN32 && defined __MINGW32__
+#   define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
+#  endif
 
-#endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
+# endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
 
 #endif /* _XFUNCS_H_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xlib.h b/recipes/xorg-lib/xorg-headers-native/X11/Xlib.h
index a26789b1d0..7c8bc51549 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xlib.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xlib.h
@@ -1,6 +1,4 @@
-/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.6 2005-11-08 06:33:25 jkj Exp $ */
-/* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */
-/* 
+/*
 
 Copyright 1985, 1986, 1987, 1991, 1998  The Open Group
 
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/Xlib.h,v 3.25 2003/11/17 22:20:10 dawes Exp $ */
 
 
 /*
@@ -38,20 +35,7 @@ in this Software without prior written authorization from The Open Group.
 
 #define XlibSpecificationRelease 6
 
-#ifdef USG
-#ifndef __TYPES__
-#include <sys/types.h>			/* forgot to protect it... */
-#define __TYPES__
-#endif /* __TYPES__ */
-#else
-#if defined(_POSIX_SOURCE) && defined(MOTOROLA)
-#undef _POSIX_SOURCE
 #include <sys/types.h>
-#define _POSIX_SOURCE
-#else
-#include <sys/types.h>
-#endif
-#endif /* USG */
 
 #if defined(__SCO__) || defined(__UNIXWARE__)
 #include <stdint.h>
@@ -64,14 +48,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xosdefs.h>
 
 #ifndef X_WCHAR
-#ifdef X_NOT_STDC_ENV
-#ifndef ISC
-#define X_WCHAR
-#endif
-#endif
-#endif
-
-#ifndef X_WCHAR
 #include <stddef.h>
 #else
 #ifdef __UNIXOS2__
@@ -84,7 +60,7 @@ typedef unsigned long wchar_t;
 
 #if defined(ISC) && defined(USE_XMBTOWC)
 #define wctomb(a,b)	_Xwctomb(a,b)
-#define mblen(a,b)	_Xmblen(a,b) 
+#define mblen(a,b)	_Xmblen(a,b)
 #ifndef USE_XWCHAR_STRING
 #define mbtowc(a,b,c)	_Xmbtowc(a,b,c)
 #endif
@@ -217,10 +193,10 @@ typedef struct {
 	unsigned long background;/* background pixel */
 	int line_width;		/* line width */
 	int line_style;	 	/* LineSolid, LineOnOffDash, LineDoubleDash */
-	int cap_style;	  	/* CapNotLast, CapButt, 
+	int cap_style;	  	/* CapNotLast, CapButt,
 				   CapRound, CapProjecting */
 	int join_style;	 	/* JoinMiter, JoinRound, JoinBevel */
-	int fill_style;	 	/* FillSolid, FillTiled, 
+	int fill_style;	 	/* FillSolid, FillTiled,
 				   FillStippled, FillOpaeueStippled */
 	int fill_rule;	  	/* EvenOddRule, WindingRule */
 	int arc_mode;		/* ArcChord, ArcPieSlice */
@@ -271,7 +247,7 @@ typedef struct {
 
 /*
  * Depth structure; contains information for each possible depth.
- */	
+ */
 typedef struct {
 	int depth;		/* this depth (Z) of the depth */
 	int nvisuals;		/* number of Visual types at this depth */
@@ -302,7 +278,7 @@ typedef struct {
 	unsigned long black_pixel;	/* White and Black pixel values */
 	int max_maps, min_maps;	/* max and min color maps */
 	int backing_store;	/* Never, WhenMapped, Always */
-	Bool save_unders;	
+	Bool save_unders;
 	long root_input_mask;	/* initial root input mask */
 } Screen;
 
@@ -425,7 +401,7 @@ typedef struct _XImage {
 	} f;
 } XImage;
 
-/* 
+/*
  * Data structure for XReconfigureWindow
  */
 typedef struct {
@@ -446,7 +422,7 @@ typedef struct {
 	char pad;
 } XColor;
 
-/* 
+/*
  * Data structures for graphics operations.  On most machines, these are
  * congruent with the wire protocol structures, so reformatting the data
  * can be avoided on these architectures.
@@ -458,12 +434,12 @@ typedef struct {
 typedef struct {
     short x, y;
 } XPoint;
-    
+
 typedef struct {
     short x, y;
     unsigned short width, height;
 } XRectangle;
-    
+
 typedef struct {
     short x, y;
     unsigned short width, height;
@@ -522,7 +498,7 @@ typedef struct _XDisplay Display;
 struct _XPrivate;		/* Forward declare before use for C++ */
 struct _XrmHashBucketRec;
 
-typedef struct 
+typedef struct
 #ifdef XLIB_ILLEGAL_ACCESS
 _XDisplay
 #endif
@@ -577,7 +553,7 @@ _XDisplay
 	/* there is more to this structure, but it is private to Xlib */
 }
 #ifdef XLIB_ILLEGAL_ACCESS
-Display, 
+Display,
 #endif
 *_XPrivDisplay;
 
@@ -653,7 +629,7 @@ typedef struct {
 	int mode;		/* NotifyNormal, NotifyGrab, NotifyUngrab */
 	int detail;
 	/*
-	 * NotifyAncestor, NotifyVirtual, NotifyInferior, 
+	 * NotifyAncestor, NotifyVirtual, NotifyInferior,
 	 * NotifyNonlinear,NotifyNonlinearVirtual
 	 */
 	Bool same_screen;	/* same screen flag */
@@ -673,9 +649,9 @@ typedef struct {
 				   NotifyGrab, NotifyUngrab */
 	int detail;
 	/*
-	 * NotifyAncestor, NotifyVirtual, NotifyInferior, 
+	 * NotifyAncestor, NotifyVirtual, NotifyInferior,
 	 * NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,
-	 * NotifyPointerRoot, NotifyDetailNone 
+	 * NotifyPointerRoot, NotifyDetailNone
 	 */
 } XFocusChangeEvent;
 typedef XFocusChangeEvent XFocusInEvent;
@@ -689,7 +665,7 @@ typedef struct {
 	Display *display;	/* Display the event was read from */
 	Window window;
 	char key_vector[32];
-} XKeymapEvent;	
+} XKeymapEvent;
 
 typedef struct {
 	int type;
@@ -971,6 +947,33 @@ typedef struct {
 	Window window;	/* window on which event was requested in event mask */
 } XAnyEvent;
 
+
+/***************************************************************
+ *
+ * GenericEvent.  This event is the standard event for all newer extensions.
+ */
+
+typedef struct
+    {
+    int            type;         /* of event. Always GenericEvent */
+    unsigned long  serial;       /* # of last request processed */
+    Bool           send_event;   /* true if from SendEvent request */
+    Display        *display;     /* Display the event was read from */
+    int            extension;    /* major opcode of extension that caused the event */
+    int            evtype;       /* actual event type. */
+    } XGenericEvent;
+
+typedef struct {
+    int            type;         /* of event. Always GenericEvent */
+    unsigned long  serial;       /* # of last request processed */
+    Bool           send_event;   /* true if from SendEvent request */
+    Display        *display;     /* Display the event was read from */
+    int            extension;    /* major opcode of extension that caused the event */
+    int            evtype;       /* actual event type. */
+    unsigned int   cookie;
+    void           *data;
+} XGenericEventCookie;
+
 /*
  * this union is defined so Xlib can always use the same sized
  * event structure internally, to avoid memory fragmentation.
@@ -1008,6 +1011,8 @@ typedef union _XEvent {
 	XMappingEvent xmapping;
 	XErrorEvent xerror;
 	XKeymapEvent xkeymap;
+	XGenericEvent xgeneric;
+	XGenericEventCookie xcookie;
 	long pad[24];
 } XEvent;
 #endif
@@ -1248,7 +1253,7 @@ typedef struct {
 typedef unsigned long XIMFeedback;
 
 #define XIMReverse		1L
-#define XIMUnderline		(1L<<1) 
+#define XIMUnderline		(1L<<1)
 #define XIMHighlight		(1L<<2)
 #define XIMPrimary	 	(1L<<5)
 #define XIMSecondary		(1L<<6)
@@ -1260,11 +1265,11 @@ typedef unsigned long XIMFeedback;
 typedef struct _XIMText {
     unsigned short length;
     XIMFeedback *feedback;
-    Bool encoding_is_wchar; 
+    Bool encoding_is_wchar;
     union {
 	char *multi_byte;
 	wchar_t *wide_char;
-    } string; 
+    } string;
 } XIMText;
 
 typedef	unsigned long	 XIMPreeditState;
@@ -1294,11 +1299,11 @@ typedef unsigned long XIMStringConversionFeedback;
 typedef struct _XIMStringConversionText {
     unsigned short length;
     XIMStringConversionFeedback *feedback;
-    Bool encoding_is_wchar; 
+    Bool encoding_is_wchar;
     union {
 	char *mbs;
 	wchar_t *wcs;
-    } string; 
+    } string;
 } XIMStringConversionText;
 
 typedef	unsigned short	XIMStringConversionPosition;
@@ -1320,7 +1325,7 @@ typedef enum {
     XIMForwardWord, XIMBackwardWord,
     XIMCaretUp, XIMCaretDown,
     XIMNextLine, XIMPreviousLine,
-    XIMLineStart, XIMLineEnd, 
+    XIMLineStart, XIMLineEnd,
     XIMAbsolutePosition,
     XIMDontChange
 } XIMCaretDirection;
@@ -1341,7 +1346,7 @@ typedef struct _XIMPreeditDrawCallbackStruct {
 } XIMPreeditDrawCallbackStruct;
 
 typedef enum {
-    XIMIsInvisible,	/* Disable caret feedback */ 
+    XIMIsInvisible,	/* Disable caret feedback */
     XIMIsPrimary,	/* UI defined caret feedback */
     XIMIsSecondary	/* UI defined caret feedback */
 } XIMCaretStyle;
@@ -1356,7 +1361,7 @@ typedef enum {
     XIMTextType,
     XIMBitmapType
 } XIMStatusDataType;
-	
+
 typedef struct _XIMStatusDrawCallbackStruct {
     XIMStatusDataType type;
     union {
@@ -1434,7 +1439,7 @@ extern XModifierKeymap	*XInsertModifiermapEntry(
 #else
     KeyCode		/* keycode_entry */,
 #endif
-    int			/* modifier */    
+    int			/* modifier */
 );
 
 extern XModifierKeymap *XNewModifiermap(
@@ -1480,7 +1485,7 @@ extern XImage *XGetSubImage(
     int			/* dest_y */
 );
 
-/* 
+/*
  * X function declarations.
  */
 extern Display *XOpenDisplay(
@@ -1513,7 +1518,7 @@ extern Status XGetAtomNames(
 extern char *XGetDefault(
     Display*		/* display */,
     _Xconst char*	/* program */,
-    _Xconst char*	/* option */		  
+    _Xconst char*	/* option */
 );
 extern char *XDisplayName(
     _Xconst char*	/* string */
@@ -1539,7 +1544,7 @@ extern int (*XSetAfterFunction(
 extern Atom XInternAtom(
     Display*		/* display */,
     _Xconst char*	/* atom_name */,
-    Bool		/* only_if_exists */		 
+    Bool		/* only_if_exists */
 );
 extern Status XInternAtoms(
     Display*		/* dpy */,
@@ -1556,7 +1561,7 @@ extern Colormap XCreateColormap(
     Display*		/* display */,
     Window		/* w */,
     Visual*		/* visual */,
-    int			/* alloc */			 
+    int			/* alloc */
 );
 extern Cursor XCreatePixmapCursor(
     Display*		/* display */,
@@ -1565,7 +1570,7 @@ extern Cursor XCreatePixmapCursor(
     XColor*		/* foreground_color */,
     XColor*		/* background_color */,
     unsigned int	/* x */,
-    unsigned int	/* y */			   
+    unsigned int	/* y */
 );
 extern Cursor XCreateGlyphCursor(
     Display*		/* display */,
@@ -1602,7 +1607,7 @@ extern Pixmap XCreatePixmap(
     Drawable		/* d */,
     unsigned int	/* width */,
     unsigned int	/* height */,
-    unsigned int	/* depth */		        
+    unsigned int	/* depth */
 );
 extern Pixmap XCreateBitmapFromData(
     Display*		/* display */,
@@ -1649,7 +1654,7 @@ extern Window XCreateWindow(
     Visual*		/* visual */,
     unsigned long	/* valuemask */,
     XSetWindowAttributes*	/* attributes */
-); 
+);
 extern Colormap *XListInstalledColormaps(
     Display*		/* display */,
     Window		/* w */,
@@ -1944,7 +1949,7 @@ extern int XAddHost(
 extern int XAddHosts(
     Display*		/* display */,
     XHostAddress*	/* hosts */,
-    int			/* num_hosts */    
+    int			/* num_hosts */
 );
 
 extern int XAddToExtensionList(
@@ -2167,7 +2172,7 @@ extern int XConfigureWindow(
     Display*		/* display */,
     Window		/* w */,
     unsigned int	/* value_mask */,
-    XWindowChanges*	/* values */		 
+    XWindowChanges*	/* values */
 );
 
 extern int XConnectionNumber(
@@ -2253,7 +2258,7 @@ extern int XDestroySubwindows(
 );
 
 extern int XDoesBackingStore(
-    Screen*		/* screen */    
+    Screen*		/* screen */
 );
 
 extern Bool XDoesSaveUnders(
@@ -2538,7 +2543,7 @@ extern int XFreeCursor(
 );
 
 extern int XFreeExtensionList(
-    char**		/* list */    
+    char**		/* list */
 );
 
 extern int XFreeFont(
@@ -2912,7 +2917,7 @@ extern int XPutImage(
     int			/* dest_x */,
     int			/* dest_y */,
     unsigned int	/* width */,
-    unsigned int	/* height */	  
+    unsigned int	/* height */
 );
 
 extern int XQLength(
@@ -3002,7 +3007,7 @@ extern int XQueryTextExtents(
     int*		/* direction_return */,
     int*		/* font_ascent_return */,
     int*		/* font_descent_return */,
-    XCharStruct*	/* overall_return */    
+    XCharStruct*	/* overall_return */
 );
 
 extern int XQueryTextExtents16(
@@ -3067,7 +3072,7 @@ extern int XRecolorCursor(
 );
 
 extern int XRefreshKeyboardMapping(
-    XMappingEvent*	/* event_map */    
+    XMappingEvent*	/* event_map */
 );
 
 extern int XRemoveFromSaveSet(
@@ -3223,7 +3228,7 @@ extern int XSetFont(
 extern int XSetFontPath(
     Display*		/* display */,
     char**		/* directories */,
-    int			/* ndirs */	     
+    int			/* ndirs */
 );
 
 extern int XSetForeground(
@@ -3522,7 +3527,7 @@ extern int XWarpPointer(
     unsigned int	/* src_width */,
     unsigned int	/* src_height */,
     int			/* dest_x */,
-    int			/* dest_y */	     
+    int			/* dest_y */
 );
 
 extern int XWidthMMOfScreen(
@@ -3547,7 +3552,7 @@ extern int XWriteBitmapFile(
     unsigned int	/* width */,
     unsigned int	/* height */,
     int			/* x_hot */,
-    int			/* y_hot */		     
+    int			/* y_hot */
 );
 
 extern Bool XSupportsLocale (void);
@@ -3955,7 +3960,7 @@ typedef void (*XConnectionWatchProc)(
     Bool			/* opening */,	 /* open or close flag */
     XPointer*			/* watch_data */ /* open sets, close uses */
 );
-    
+
 
 extern Status XInternalConnectionNumbers(
     Display*			/* dpy */,
@@ -3982,7 +3987,7 @@ extern void XRemoveConnectionWatch(
 
 extern void XSetAuthorization(
     char *			/* name */,
-    int				/* namelen */, 
+    int				/* namelen */,
     char *			/* data */,
     int				/* datalen */
 );
@@ -4003,6 +4008,16 @@ extern int _Xwctomb(
     wchar_t			/* wc */
 );
 
+extern Bool XGetEventData(
+    Display*			/* dpy */,
+    XGenericEventCookie*	/* cookie*/
+);
+
+extern void XFreeEventData(
+    Display*			/* dpy */,
+    XGenericEventCookie*	/* cookie*/
+);
+
 _XFUNCPROTOEND
 
 #endif /* _XLIB_H_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/XlibConf.h b/recipes/xorg-lib/xorg-headers-native/X11/XlibConf.h
index c6c180a5ed..9f9b940310 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/XlibConf.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/XlibConf.h
@@ -1,7 +1,5 @@
-/* include/X11/XlibConf.h.  Generated by configure.  */
+/* include/X11/XlibConf.h.  Generated from XlibConf.h.in by configure.  */
 /*
- * $Id: $
- *
  * Copyright © 2005 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -32,9 +30,9 @@
  */
 
 /* Threading support? */
-#define XTHREADS 
+#define XTHREADS 1
 
 /* Use multi-threaded libc functions? */
-#define XUSE_MTSAFE_API 
+#define XUSE_MTSAFE_API 1
 
 #endif /* _XLIBCONF_H_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xlibint.h b/recipes/xorg-lib/xorg-headers-native/X11/Xlibint.h
index 6b1e0c918c..767b083846 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xlibint.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xlibint.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xlibint.h,v 1.5 2001/02/09 02:03:38 xorgcvs Exp $ */
 
 /*
 
@@ -27,7 +26,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/Xlibint.h,v 3.27 2003/05/27 22:26:26 tsi Exp $ */
 
 #ifndef _XLIBINT_H_
 #define _XLIBINT_H_ 1
@@ -108,7 +106,7 @@ struct _XDisplay
 	int nscreens;		/* number of screens on this server*/
 	Screen *screens;	/* pointer to list of screens */
 	unsigned long motion_buffer;	/* size of motion buffer */
-	unsigned long flags;	   /* internal connection flags */
+	volatile unsigned long flags;	   /* internal connection flags */
 	int min_keycode;	/* minimum defined keycode */
 	int max_keycode;	/* maximum defined keycode */
 	KeySym *keysyms;	/* This server's keysyms */
@@ -121,7 +119,7 @@ struct _XDisplay
 	struct _XExten *ext_procs; /* extensions initialized on this display */
 	/*
 	 * the following can be fixed size, as the protocol defines how
-	 * much address space is available. 
+	 * much address space is available.
 	 * While this could be done using the extension vector, there
 	 * may be MANY events processed, so a search through the extension
 	 * list to find the right procedure for each event might be
@@ -184,6 +182,21 @@ struct _XDisplay
 	int xcmisc_opcode;	/* major opcode for XC-MISC */
 	struct _XkbInfoRec *xkb_info; /* XKB info */
 	struct _XtransConnInfo *trans_conn; /* transport connection object */
+	struct _X11XCBPrivate *xcb; /* XCB glue private data */
+
+	/* Generic event cookie handling */
+	unsigned int next_cookie; /* next event cookie */
+	/* vector for wire to generic event, index is (extension - 128) */
+	Bool (*generic_event_vec[128])(
+		Display *	/* dpy */,
+		XGenericEventCookie *	/* Xlib event */,
+		xEvent *	/* wire event */);
+	/* vector for event copy, index is (extension - 128) */
+	Bool (*generic_event_copy_vec[128])(
+		Display *	/* dpy */,
+		XGenericEventCookie *	/* in */,
+		XGenericEventCookie *   /* out*/);
+	void *cookiejar;  /* cookie events returned but not claimed */
 };
 
 #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n)
@@ -416,7 +429,7 @@ extern LockInfoPtr _Xglobal_lock;
 
 /*
  * GetReq - Get the next available X request packet in the buffer and
- * return it. 
+ * return it.
  *
  * "name" is the name of the request, e.g. CreatePixmap, OpenFont, etc.
  * "req" is the name of the request pointer.
@@ -473,9 +486,9 @@ extern LockInfoPtr _Xglobal_lock;
 
 
 /*
- * GetResReq is for those requests that have a resource ID 
+ * GetResReq is for those requests that have a resource ID
  * (Window, Pixmap, GContext, etc.) as their single argument.
- * "rid" is the name of the resource. 
+ * "rid" is the name of the resource.
  */
 
 #if !defined(UNIXCPP) || defined(ANSICPP)
@@ -504,7 +517,7 @@ extern LockInfoPtr _Xglobal_lock;
 
 /*
  * GetEmptyReq is for those requests that have no arguments
- * at all. 
+ * at all.
  */
 #if !defined(UNIXCPP) || defined(ANSICPP)
 #define GetEmptyReq(name, req) \
@@ -610,7 +623,7 @@ extern void _XFlushGCCache(Display *dpy, GC gc);
  * "ptr" is the pointer being assigned to.
  * "n" is the number of bytes to allocate.
  *
- * Example: 
+ * Example:
  *    xTextElt *elt;
  *    BufAlloc (xTextElt *, elt, nbytes)
  */
@@ -660,7 +673,7 @@ extern void _XRead32(
 			     (((cs)->rbearing|(cs)->lbearing| \
 			       (cs)->ascent|(cs)->descent) == 0))
 
-/* 
+/*
  * CI_GET_CHAR_INFO_1D - return the charinfo struct for the indicated 8bit
  * character.  If the character is in the column and exists, then return the
  * appropriate metrics (note that fonts with common per-character metrics will
@@ -686,7 +699,7 @@ extern void _XRead32(
 
 
 /*
- * CI_GET_CHAR_INFO_2D - return the charinfo struct for the indicated row and 
+ * CI_GET_CHAR_INFO_2D - return the charinfo struct for the indicated row and
  * column.  This is used for fonts that have more than row zero.
  */
 #define CI_GET_CHAR_INFO_2D(fs,row,col,def,cs) \
@@ -1004,6 +1017,19 @@ extern Bool _XUnknownWireEvent(
     XEvent*	/* re */,
     xEvent*	/* event */
 );
+
+extern Bool _XUnknownWireEventCookie(
+    Display*	/* dpy */,
+    XGenericEventCookie*	/* re */,
+    xEvent*	/* event */
+);
+
+extern Bool _XUnknownCopyEventCookie(
+    Display*	/* dpy */,
+    XGenericEventCookie*	/* in */,
+    XGenericEventCookie*	/* out */
+);
+
 extern Status _XUnknownNativeEvent(
     Display*	/* dpy */,
     XEvent*	/* re */,
@@ -1041,7 +1067,7 @@ extern int (*XESetCopyGC(
 	      Display*			/* display */,
               GC			/* gc */,
               XExtCodes*		/* codes */
-            )		/* proc */	      
+            )		/* proc */
 ))(
     Display*, GC, XExtCodes*
 );
@@ -1053,7 +1079,7 @@ extern int (*XESetFlushGC(
 	      Display*			/* display */,
               GC			/* gc */,
               XExtCodes*		/* codes */
-            )		/* proc */	     
+            )		/* proc */
 ))(
     Display*, GC, XExtCodes*
 );
@@ -1065,7 +1091,7 @@ extern int (*XESetFreeGC(
 	      Display*			/* display */,
               GC			/* gc */,
               XExtCodes*		/* codes */
-            )		/* proc */	     
+            )		/* proc */
 ))(
     Display*, GC, XExtCodes*
 );
@@ -1077,7 +1103,7 @@ extern int (*XESetCreateFont(
 	      Display*			/* display */,
               XFontStruct*		/* fs */,
               XExtCodes*		/* codes */
-            )		/* proc */    
+            )		/* proc */
 ))(
     Display*, XFontStruct*, XExtCodes*
 );
@@ -1089,10 +1115,10 @@ extern int (*XESetFreeFont(
 	      Display*			/* display */,
               XFontStruct*		/* fs */,
               XExtCodes*		/* codes */
-            )		/* proc */    
+            )		/* proc */
 ))(
     Display*, XFontStruct*, XExtCodes*
-); 
+);
 
 extern int (*XESetCloseDisplay(
     Display*		/* display */,
@@ -1100,7 +1126,7 @@ extern int (*XESetCloseDisplay(
     int (*) (
 	      Display*			/* display */,
               XExtCodes*		/* codes */
-            )		/* proc */    
+            )		/* proc */
 ))(
     Display*, XExtCodes*
 );
@@ -1113,7 +1139,7 @@ extern int (*XESetError(
               xError*			/* err */,
               XExtCodes*		/* codes */,
               int*			/* ret_code */
-            )		/* proc */    
+            )		/* proc */
 ))(
     Display*, xError*, XExtCodes*, int*
 );
@@ -1127,7 +1153,7 @@ extern char* (*XESetErrorString(
                 XExtCodes*		/* codes */,
                 char*			/* buffer */,
                 int			/* nbytes */
-              )		/* proc */	       
+              )		/* proc */
 ))(
     Display*, int, XExtCodes*, char*, int
 );
@@ -1151,11 +1177,36 @@ extern Bool (*XESetWireToEvent(
 	       Display*			/* display */,
                XEvent*			/* re */,
                xEvent*			/* event */
-             )		/* proc */    
+             )		/* proc */
 ))(
     Display*, XEvent*, xEvent*
 );
 
+extern Bool (*XESetWireToEventCookie(
+    Display*		/* display */,
+    int			/* extension */,
+    Bool (*) (
+	       Display*			/* display */,
+               XGenericEventCookie*	/* re */,
+               xEvent*			/* event */
+             )		/* proc */
+))(
+    Display*, XGenericEventCookie*, xEvent*
+);
+
+extern Bool (*XESetCopyEventCookie(
+    Display*		/* display */,
+    int			/* extension */,
+    Bool (*) (
+	       Display*			/* display */,
+               XGenericEventCookie*	/* in */,
+               XGenericEventCookie*	/* out */
+             )		/* proc */
+))(
+    Display*, XGenericEventCookie*, XGenericEventCookie*
+);
+
+
 extern Status (*XESetEventToWire(
     Display*		/* display */,
     int			/* event_number */,
@@ -1163,7 +1214,7 @@ extern Status (*XESetEventToWire(
 	      Display*			/* display */,
               XEvent*			/* re */,
               xEvent*			/* event */
-            )		/* proc */   
+            )		/* proc */
 ))(
     Display*, XEvent*, xEvent*
 );
@@ -1175,7 +1226,7 @@ extern Bool (*XESetWireToError(
 	       Display*			/* display */,
 	       XErrorEvent*		/* he */,
 	       xError*			/* we */
-            )		/* proc */   
+            )		/* proc */
 ))(
     Display*, XErrorEvent*, xError*
 );
@@ -1188,7 +1239,7 @@ extern void (*XESetBeforeFlush(
 	       XExtCodes*		/* codes */,
 	       _Xconst char*		/* data */,
 	       long			/* len */
-            )		/* proc */   
+            )		/* proc */
 ))(
     Display*, XExtCodes*, _Xconst char*, long
 );
@@ -1214,6 +1265,11 @@ extern void _XUnregisterInternalConnection(
     int				/* fd */
 );
 
+extern void _XProcessInternalConnection(
+    Display*			/* dpy */,
+    struct _XConnectionInfo*	/* conn_info */
+);
+
 /* Display structure has pointers to these */
 
 struct _XConnectionInfo {	/* info from _XRegisterInternalConnection */
@@ -1312,9 +1368,29 @@ Status _XGetWindowAttributes(
     XWindowAttributes *attr);
 
 int _XPutBackEvent (
-    register Display *dpy, 
+    register Display *dpy,
     register XEvent *event);
 
+extern Bool _XIsEventCookie(
+        Display *dpy,
+        XEvent *ev);
+
+extern void _XFreeEventCookies(
+        Display *dpy);
+
+extern void _XStoreEventCookie(
+        Display *dpy,
+        XEvent *ev);
+
+extern Bool _XFetchEventCookie(
+        Display *dpy,
+        XGenericEventCookie *ev);
+
+extern Bool _XCopyEventCookie(
+        Display *dpy,
+        XGenericEventCookie *in,
+        XGenericEventCookie *out);
+
 _XFUNCPROTOEND
 
 #endif /* _XLIBINT_H_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xlocale.h b/recipes/xorg-lib/xorg-headers-native/X11/Xlocale.h
index 61d2f7a846..baa13353b0 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xlocale.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xlocale.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xlocale.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/Xlocale.h,v 1.4 2001/12/14 19:54:09 dawes Exp $ */
 
 #ifndef _XLOCALE_H_
 #define _XLOCALE_H_
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xmd.h b/recipes/xorg-lib/xorg-headers-native/X11/Xmd.h
index 06fd2bf300..f3868b36db 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xmd.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xmd.h
@@ -1,5 +1,3 @@
-/* $XdotOrg: proto/X11/Xmd.h,v 1.4 2006/04/20 01:24:25 alanc Exp $ */
-/* $XFree86: xc/include/Xmd.h,v 3.18tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -47,8 +45,7 @@ SOFTWARE.
 
 ******************************************************************/
 #ifndef XMD_H
-#define XMD_H 1
-/* $Xorg: Xmd.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
+# define XMD_H 1
 /*
  *  Xmd.h: MACHINE DEPENDENT DECLARATIONS.
  */
@@ -56,32 +53,27 @@ SOFTWARE.
 /*
  * Special per-machine configuration flags.
  */
-#if defined(sun) && defined(__SVR4)
-# include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
-#endif
-
-#ifdef CRAY
-#define WORD64				/* 64-bit architecture */
-#endif
-#if defined (_LP64) || \
-    defined(__alpha) || defined(__alpha__) || \
-    defined(__ia64__) || defined(ia64) || \
-    defined(__sparc64__) || \
-    defined(__s390x__) || \
-    (defined(__hppa__) && defined(__LP64__)) || \
-    defined(__amd64__) || defined(amd64) || \
-    defined(__powerpc64__) || \
-    (defined(sgi) && (_MIPS_SZLONG == 64))
-#define LONG64				/* 32/64-bit architecture */
-#endif
+# if defined(__sun) && defined(__SVR4)
+#  include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
+# endif
+
+# if defined (_LP64) || defined(__LP64__) || \
+     defined(__alpha) || defined(__alpha__) || \
+     defined(__ia64__) || defined(ia64) || \
+     defined(__sparc64__) || \
+     defined(__s390x__) || \
+     defined(__amd64__) || defined(amd64) || \
+     defined(__powerpc64__)
+#  define LONG64				/* 32/64-bit architecture */
+# endif
 
 /*
  * Stuff to handle large architecture machines; the constants were generated
  * on a 32-bit machine and must correspond to the protocol.
  */
-#ifdef WORD64
-#define MUSTCOPY
-#endif /* WORD64 */
+# ifdef WORD64
+#  define MUSTCOPY
+# endif /* WORD64 */
 
 
 /*
@@ -95,114 +87,99 @@ SOFTWARE.
  * symbols are no more than 32 characters long (which causes problems for some
  * compilers and preprocessors).
  *
- * The extra indirection in the __STDC__ case is to get macro arguments to
- * expand correctly before the concatenation, rather than afterward.
+ * The extra indirection is to get macro arguments to expand correctly before
+ * the concatenation, rather than afterward.
  */
-#if ((defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)) && !defined(UNIXCPP)) || defined(ANSICPP)
-#define _SIZEOF(x) sz_##x
-#define SIZEOF(x) _SIZEOF(x)
-#else
-#define SIZEOF(x) sz_/**/x
-#endif /* if ANSI C compiler else not */
+# define _SIZEOF(x) sz_##x
+# define SIZEOF(x) _SIZEOF(x)
 
 /*
  * Bitfield suffixes for the protocol structure elements, if you
  * need them.  Note that bitfields are not guaranteed to be signed
  * (or even unsigned) according to ANSI C.
  */
-#ifdef WORD64
+# ifdef WORD64
 typedef long INT64;
 typedef unsigned long CARD64;
-#define B32 :32
-#define B16 :16
-#ifdef UNSIGNEDBITFIELDS
+#  define B32 :32
+#  define B16 :16
+#  ifdef UNSIGNEDBITFIELDS
 typedef unsigned int INT32;
 typedef unsigned int INT16;
-#else
-#ifdef __STDC__
+#  else
 typedef signed int INT32;
 typedef signed int INT16;
-#else
-typedef int INT32;
-typedef int INT16;
-#endif
-#endif
-#else
-#define B32
-#define B16
-#ifdef LONG64
+#  endif
+# else
+#  define B32
+#  define B16
+#  ifdef LONG64
 typedef long INT64;
 typedef int INT32;
-#else
+#  else
 typedef long INT32;
-#endif
+#  endif
 typedef short INT16;
-#endif
+# endif
 
-#if defined(__STDC__) || defined(sgi) || defined(AIXV3)
 typedef signed char    INT8;
-#else
-typedef char           INT8;
-#endif
 
-#ifdef LONG64
+# ifdef LONG64
 typedef unsigned long CARD64;
 typedef unsigned int CARD32;
-#else
+# else
 typedef unsigned long CARD32;
-#endif
+# endif
+# if !defined(WORD64) && !defined(LONG64)
+typedef unsigned long long CARD64;
+# endif
 typedef unsigned short CARD16;
 typedef unsigned char  CARD8;
 
 typedef CARD32		BITS32;
 typedef CARD16		BITS16;
 
-#ifndef I_NEED_OS2_H
 typedef CARD8		BYTE;
 typedef CARD8		BOOL;
-#else
-#define BYTE	CARD8
-#define BOOL	CARD8
-#endif
 
 /*
  * definitions for sign-extending bitfields on 64-bit architectures
  */
-#if defined(WORD64) && defined(UNSIGNEDBITFIELDS)
-#define cvtINT8toInt(val)   (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val))
-#define cvtINT16toInt(val)  (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val))
-#define cvtINT32toInt(val)  (((val) & 0x80000000) ? ((val) | 0xffffffff00000000) : (val))
-#define cvtINT8toShort(val)  cvtINT8toInt(val)
-#define cvtINT16toShort(val) cvtINT16toInt(val)
-#define cvtINT32toShort(val) cvtINT32toInt(val)
-#define cvtINT8toLong(val)  cvtINT8toInt(val)
-#define cvtINT16toLong(val) cvtINT16toInt(val)
-#define cvtINT32toLong(val) cvtINT32toInt(val)
-#else
-#define cvtINT8toInt(val) (val)
-#define cvtINT16toInt(val) (val)
-#define cvtINT32toInt(val) (val)
-#define cvtINT8toShort(val) (val)
-#define cvtINT16toShort(val) (val)
-#define cvtINT32toShort(val) (val)
-#define cvtINT8toLong(val) (val)
-#define cvtINT16toLong(val) (val)
-#define cvtINT32toLong(val) (val)
-#endif /* WORD64 and UNSIGNEDBITFIELDS */
-
-
-
-#ifdef MUSTCOPY
+# if defined(WORD64) && defined(UNSIGNEDBITFIELDS)
+#  define cvtINT8toInt(val)   (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val))
+#  define cvtINT16toInt(val)  (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val))
+#  define cvtINT32toInt(val)  (((val) & 0x80000000) ? ((val) | 0xffffffff00000000) : (val))
+#  define cvtINT8toShort(val)  cvtINT8toInt(val)
+#  define cvtINT16toShort(val) cvtINT16toInt(val)
+#  define cvtINT32toShort(val) cvtINT32toInt(val)
+#  define cvtINT8toLong(val)  cvtINT8toInt(val)
+#  define cvtINT16toLong(val) cvtINT16toInt(val)
+#  define cvtINT32toLong(val) cvtINT32toInt(val)
+# else
+#  define cvtINT8toInt(val) (val)
+#  define cvtINT16toInt(val) (val)
+#  define cvtINT32toInt(val) (val)
+#  define cvtINT8toShort(val) (val)
+#  define cvtINT16toShort(val) (val)
+#  define cvtINT32toShort(val) (val)
+#  define cvtINT8toLong(val) (val)
+#  define cvtINT16toLong(val) (val)
+#  define cvtINT32toLong(val) (val)
+# endif /* WORD64 and UNSIGNEDBITFIELDS */
+
+
+
+# ifdef MUSTCOPY
 /*
  * This macro must not cast or else pointers will get aligned and be wrong
  */
-#define NEXTPTR(p,t)  (((char *) p) + SIZEOF(t))
-#else /* else not MUSTCOPY, this is used for 32-bit machines */
+#  define NEXTPTR(p,t)  (((char *) p) + SIZEOF(t))
+# else /* else not MUSTCOPY, this is used for 32-bit machines */
 /*
  * this version should leave result of type (t *), but that should only be
  * used when not in MUSTCOPY
  */
-#define NEXTPTR(p,t) (((t *)(p)) + 1)
-#endif /* MUSTCOPY - used machines whose C structs don't line up with proto */
+#  define NEXTPTR(p,t) (((t *)(p)) + 1)
+# endif /* MUSTCOPY - used machines whose C structs don't line up with proto */
 
 #endif /* XMD_H */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xos.h b/recipes/xorg-lib/xorg-headers-native/X11/Xos.h
index 83be4c638b..646716b4fe 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xos.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xos.h
@@ -1,8 +1,5 @@
 /*
- * $XdotOrg: proto/X11/Xos.h,v 1.9 2006/04/20 01:24:25 alanc Exp $
- * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $
- * 
- * 
+ *
 Copyright 1987, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -28,53 +25,26 @@ in this Software without prior written authorization from The Open Group.
  * The X Window System is a Trademark of The Open Group.
  *
  */
-/* $XFree86: xc/include/Xos.h,v 3.41tsi Exp $ */
 
 /* This is a collection of things to try and minimize system dependencies
  * in a "significant" number of source files.
  */
 
 #ifndef _XOS_H_
-#define _XOS_H_
+# define _XOS_H_
 
-#include <X11/Xosdefs.h>
+# include <X11/Xosdefs.h>
 
 /*
  * Get major data types (esp. caddr_t)
  */
 
-#ifdef USG
-#ifndef __TYPES__
-#ifdef CRAY
-#define word word_t
-#endif /* CRAY */
-#include <sys/types.h>			/* forgot to protect it... */
-#define __TYPES__
-#endif /* __TYPES__ */
-#else /* USG */
-#if defined(_POSIX_SOURCE) && defined(MOTOROLA)
-#undef _POSIX_SOURCE
-#include <sys/types.h>
-#define _POSIX_SOURCE
-#else
 # include <sys/types.h>
-#endif
-#endif /* USG */
 
-#ifndef sgi
-#if defined(__SCO__) || defined(__UNIXWARE__)
-#include <stdint.h>
-#endif
-#endif
+# if defined(__SCO__) || defined(__UNIXWARE__)
+#  include <stdint.h>
+# endif
 
-#ifdef _SEQUENT_
-/*
- * in_systm.h compatibility between SysV and BSD types u_char u_short u_long
- * select.h  for typedef of args to select, fd_set, may use SVR4 later
- */
-#include <netinet/in_systm.h>
-#include <sys/select.h>
-#endif /* _SEQUENT_ */
 
 /*
  * Just about everyone needs the strings routines.  We provide both forms here,
@@ -89,208 +59,90 @@ in this Software without prior written authorization from The Open Group.
  * which can be really inconvenient. :-(
  */
 
-#ifndef X_NOT_STDC_ENV
-
-#include <string.h>
-#if defined(__SCO__) || defined(__UNIXWARE__)
-#include <strings.h>
-#else
-#if (defined(sun) && defined(__SVR4))
-#include <strings.h>
-#endif
-#ifdef __STDC__
-#ifndef index
-#define index(s,c) (strchr((s),(c)))
-#endif
-#ifndef rindex
-#define rindex(s,c) (strrchr((s),(c)))
-#endif
-#else
-#ifndef index
-#define index strchr
-#endif
-#ifndef rindex
-#define rindex strrchr
-#endif
-#endif
-#endif
-
-#else
-
-#ifdef SYSV
-#if defined(clipper) || defined(__clipper__)
-#include <malloc.h>
-#endif
-#include <string.h>
-#define index strchr
-#define rindex strrchr
-#else
-#include <strings.h>
-#define strchr index
-#define strrchr rindex
-#endif
-
-#endif /* X_NOT_STDC_ENV */
-
-/*
- * strerror()
- */
-#if (defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII)) && !defined(__GLIBC__)
-#ifndef strerror
-extern char *sys_errlist[];
-extern int sys_nerr;
-#define strerror(n) \
-    (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error")
-#endif
-#endif
+# include <string.h>
+# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun)
+#  include <strings.h>
+# else
+#  ifndef index
+#   define index(s,c) (strchr((s),(c)))
+#  endif
+#  ifndef rindex
+#   define rindex(s,c) (strrchr((s),(c)))
+#  endif
+# endif
 
 /*
  * Get open(2) constants
  */
-#if defined(X_NOT_POSIX)
-#include <fcntl.h>
-#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__)
-#include <unistd.h>
-#endif
-#ifdef WIN32
-#include <X11/Xw32defs.h>
-#else
-#include <sys/file.h>
-#endif
-#else /* X_NOT_POSIX */
-#if !defined(_POSIX_SOURCE) && defined(macII)
-#define _POSIX_SOURCE
-#include <fcntl.h>
-#include <unistd.h>
-#undef _POSIX_SOURCE
-#else
-#include <fcntl.h>
-#include <unistd.h>
-#endif
-#endif /* X_NOT_POSIX else */
+# if defined(X_NOT_POSIX)
+#  include <fcntl.h>
+#  if defined(USL) || defined(__i386__) && (defined(SYSV) || defined(SVR4))
+#   include <unistd.h>
+#  endif
+#  ifdef WIN32
+#   include <X11/Xw32defs.h>
+#  else
+#   include <sys/file.h>
+#  endif
+# else /* X_NOT_POSIX */
+#  include <fcntl.h>
+#  include <unistd.h>
+# endif /* X_NOT_POSIX else */
 
 /*
  * Get struct timeval and struct tm
  */
 
-#if defined(SYSV) && !defined(_SEQUENT_)
-
-#ifndef USL
-#include <sys/time.h>
-#endif
-#include <time.h>
-#ifdef CRAY
-#undef word
-#endif /* CRAY */
-#if defined(USG) && !defined(CRAY) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__) && !defined(clipper) && !defined(__clipper__)
-struct timeval {
-    long tv_sec;
-    long tv_usec;
-};
-#ifndef USL_SHARELIB
-struct timezone {
-    int tz_minuteswest;
-    int tz_dsttime;
-};
-#endif /* USL_SHARELIB */
-#endif /* USG */
-
-#ifdef _SEQUENT_
-struct timezone {
-    int tz_minuteswest;
-    int tz_dsttime;
-};
-#endif /* _SEQUENT_ */
-
-#else /* not SYSV */
-
-#if defined(_POSIX_SOURCE) && defined(SVR4)
+# if defined(_POSIX_SOURCE) && defined(SVR4)
 /* need to omit _POSIX_SOURCE in order to get what we want in SVR4 */
-#undef _POSIX_SOURCE
-#include <sys/time.h>
-#define _POSIX_SOURCE
-#elif defined(WIN32)
-#include <time.h>
-#if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL)
+#  undef _POSIX_SOURCE
+#  include <sys/time.h>
+#  define _POSIX_SOURCE
+# elif defined(WIN32)
+#  include <time.h>
+#  if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL)
 struct timeval {
     long    tv_sec;         /* seconds */
     long    tv_usec;        /* and microseconds */
 };
-#define _TIMEVAL_DEFINED
-#endif
-#include <sys/timeb.h>
-#define gettimeofday(t) \
+#   define _TIMEVAL_DEFINED
+#  endif
+#  include <sys/timeb.h>
+#  define gettimeofday(t) \
 { \
     struct _timeb _gtodtmp; \
     _ftime (&_gtodtmp); \
     (t)->tv_sec = _gtodtmp.time; \
     (t)->tv_usec = _gtodtmp.millitm * 1000; \
 }
-#elif defined(_SEQUENT_) || defined(Lynx)
-#include <time.h>
-#elif defined (__QNX__)
-typedef unsigned long fd_mask;
-/* Make sure we get 256 bit select masks */
-#define FD_SETSIZE 256
-#include <sys/select.h>
-#include <sys/time.h>
-#include <time.h>
-#else
-#include <sys/time.h>
-#include <time.h>
-#endif /* defined(_POSIX_SOURCE) && defined(SVR4) */
-
-#endif /* SYSV */
+# else
+#  include <sys/time.h>
+#  include <time.h>
+# endif /* defined(_POSIX_SOURCE) && defined(SVR4) */
 
 /* define X_GETTIMEOFDAY macro, a portable gettimeofday() */
-#if defined(_XOPEN_XPG4) || defined(_XOPEN_UNIX) /* _XOPEN_UNIX is XPG4.2 */
-#define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
-#else
-#if defined(SVR4) || defined(VMS) || defined(WIN32)
-#define X_GETTIMEOFDAY(t) gettimeofday(t)
-#else
-#define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
-#endif
-#endif /* XPG4 else */
-
-#ifdef __UNIXOS2__
-typedef unsigned long fd_mask;
-#include <limits.h>
-#define MAX_PATH _POSIX_PATH_MAX
-#endif
-
-#ifdef __GNU__
-#define PATH_MAX 4096
-#define MAXPATHLEN 4096
-#define OPEN_MAX 256 /* We define a reasonable limit.  */
-#endif
+# if defined(_XOPEN_XPG4) || defined(_XOPEN_UNIX) /* _XOPEN_UNIX is XPG4.2 */
+#  define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
+# else
+#  if defined(SVR4) || defined(__SVR4) || defined(WIN32)
+#   define X_GETTIMEOFDAY(t) gettimeofday(t)
+#  else
+#   define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
+#  endif
+# endif /* XPG4 else */
+
+
+# ifdef __GNU__
+#  define PATH_MAX 4096
+#  define MAXPATHLEN 4096
+#  define OPEN_MAX 256 /* We define a reasonable limit.  */
+# endif
 
 /* use POSIX name for signal */
-#if defined(X_NOT_POSIX) && defined(SYSV) && !defined(SIGCHLD) && !defined(ISC)
-#define SIGCHLD SIGCLD
-#endif
-
-#ifdef ISC
-#include <sys/bsdtypes.h>
-#include <sys/limits.h>
-#define NGROUPS 16
-#endif
-
-#if defined(ISC) || defined(__UNIXOS2__) || \
-    (defined(__linux__) && !defined(__GLIBC__)) || \
-    (defined(__QNX__) && !defined(UNIXCONN))
-/*
- *	Some OS's may not have this
- */
-
-#define X_NO_SYS_UN 1
-
-struct sockaddr_un {
-	short	sun_family;
-	char	sun_path[108];
-};
-#endif
+# if defined(X_NOT_POSIX) && defined(SYSV) && !defined(SIGCHLD)
+#  define SIGCHLD SIGCLD
+# endif
 
-#include <X11/Xarch.h>
+# include <X11/Xarch.h>
 
 #endif /* _XOS_H_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xos_r.h b/recipes/xorg-lib/xorg-headers-native/X11/Xos_r.h
index 694f7a0efa..f963b64100 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xos_r.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xos_r.h
@@ -1,5 +1,3 @@
-/* $Xorg: Xos_r.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-/* $XdotOrg: proto/X11/Xos_r.h,v 1.6 2006/04/20 01:24:25 alanc Exp $ */
 /*
 Copyright 1996, 1998  The Open Group
 
@@ -23,7 +21,6 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 */
-/* $XFree86: xc/include/Xos_r.h,v 1.18tsi Exp $ */
 
 /*
  * Various and sundry Thread-Safe functions used by X11, Motif, and CDE.
@@ -40,13 +37,13 @@ in this Software without prior written authorization from The Open Group.
  *
  * If you are on a platform that defines XTHREADS but does not have
  * MT-safe system API (e.g. UnixWare) you must define _Xos_processLock
- * and _Xos_processUnlock macros before including this header.  If
- * you are on OSF/1 V3.2 and plan to use readdir(), you must also define
- * _Xos_isThreadInitialized.  For convenience XOS_USE_XLIB_LOCKING or
- * XOS_USE_XT_LOCKING may be defined to obtain either Xlib-only or
- * Xt-based versions of these macros.  These macros won't result in
- * truly thread-safe calls, but they are better than nothing.  If you
- * do not want locking in this situation define XOS_USE_NO_LOCKING.
+ * and _Xos_processUnlock macros before including this header.
+ *
+ * For convenience XOS_USE_XLIB_LOCKING or XOS_USE_XT_LOCKING may be defined
+ * to obtain either Xlib-only or Xt-based versions of these macros.  These
+ * macros won't result in truly thread-safe calls, but they are better than
+ * nothing.  If you do not want locking in this situation define
+ * XOS_USE_NO_LOCKING.
  *
  * NOTE: On systems lacking appropriate _r functions Gethostbyname(),
  *	Gethostbyaddr(), and Getservbyname() do NOT copy the host or
@@ -195,20 +192,11 @@ extern void XtProcessUnlock(
  * uses the older SVR4 thread-safe functions unless the POSIX ones
  * are specifically requested.  Fix the feature test macro.
  */
-#if defined(sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && \
+#if defined(__sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && \
 	(_POSIX_C_SOURCE - 0 < 199506L) && !defined(_POSIX_PTHREAD_SEMANTICS)
 # undef _POSIX_THREAD_SAFE_FUNCTIONS
 #endif
 
-/*
- * LynxOS 3.1 defines _POSIX_THREAD_SAFE_FUNCTIONS but
- * getpwuid_r has different semantics than defined by POSIX
- */
-#if defined(Lynx) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-# undef _POSIX_THREAD_SAFE_FUNCTIONS
-#endif
-
-
 /***** <pwd.h> wrappers *****/
 
 /*
@@ -237,7 +225,7 @@ extern void XtProcessUnlock(
 
 #elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
 /* Use regular, unsafe API. */
-# if defined(X_NOT_POSIX) && !defined(i386) && !defined(SYSV)
+# if defined(X_NOT_POSIX) && !defined(__i386__) && !defined(SYSV)
 extern struct passwd *getpwuid(), *getpwnam();
 # endif
 typedef int _Xgetpwparams;	/* dummy */
@@ -331,24 +319,16 @@ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
   (p).pwp )
 
 #elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__)
-/* SVR4 threads, AIX 4.2.0 and earlier and OSF/1 3.2 and earlier pthreads */
 # define X_NEEDS_PWPARAMS
 typedef struct {
   struct passwd pws;
   char pwbuf[X_LINE_MAX];
 } _Xgetpwparams;
-# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx)
-#  ifndef Lynx
+# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4)
 #   define _XGetpwuid(u,p) \
 ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
 #   define _XGetpwnam(u,p) \
 ((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-#  else /* Lynx */
-#   define _XGetpwuid(u,p) \
-((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-#   define _XGetpwnam(u,p) \
-((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-#  endif
 # else /* SVR4 */
 #  define _XGetpwuid(u,p) \
 ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == NULL) ? NULL : &(p).pws)
@@ -357,12 +337,6 @@ typedef struct {
 # endif /* SVR4 */
 
 #else /* _POSIX_THREAD_SAFE_FUNCTIONS */
-/* Digital UNIX 4.0, but not (beta) T4.0-1 */
-# if defined(__osf__)
-/* OSF/1 V4.0 <pwd.h> doesn't declare the _P routines, breaking under C++. */
-extern int _Pgetpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
-extern int _Pgetpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **);
-# endif
 # define X_NEEDS_PWPARAMS
 typedef struct {
   struct passwd pws;
@@ -427,7 +401,6 @@ typedef int _Xgetservbynameparams; /* dummy */
 # define _XGetservbyname(s,p,sp)	getservbyname((s),(p))
 
 #elif !defined(XOS_USE_MTSAFE_NETDBAPI) || defined(XNO_MTSAFE_NETDBAPI)
-/* UnixWare 2.0, or other systems with thread support but no _r API. */
 /* WARNING:  The h_addr_list and s_aliases values are *not* copied! */
 
 #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
@@ -485,9 +458,6 @@ typedef struct {
  */
 # ifdef _POSIX_REENTRANT_FUNCTIONS
 #  ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-#   if defined(AIXV3) || defined(AIXV4) || defined(__osf__)
-#    define X_POSIX_THREAD_SAFE_FUNCTIONS 1
-#   endif
 #  endif
 # endif
 # ifdef _POSIX_THREAD_SAFE_FUNCTIONS
@@ -565,7 +535,7 @@ typedef int _Xgetservbynameparams; /* dummy */
 
 #if defined(X_INCLUDE_DIRENT_H) && !defined(_XOS_INCLUDED_DIRENT_H)
 # include <sys/types.h>
-# if !defined(X_NOT_POSIX) || defined(SYSV) || defined(USG)
+# if !defined(X_NOT_POSIX) || defined(SYSV)
 #  include <dirent.h>
 # else
 #  include <sys/dir.h>
@@ -622,32 +592,10 @@ typedef struct {
 # endif
 } _Xreaddirparams;
 
-# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(AIXV3) || \
-     defined(AIXV4) || defined(__APPLE__)
-/* AIX defines the draft POSIX symbol, but uses the final API. */
+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(__APPLE__)
 /* POSIX final API, returns (int)0 on success. */
-#  if defined(__osf__)
-/* OSF/1 V4.0 <dirent.h> doesn't declare _Preaddir_r, breaking under C++. */
-extern int _Preaddir_r(DIR *, struct dirent *, struct dirent **);
-#  endif
 #  define _XReaddir(d,p)						\
     (readdir_r((d), &((p).dir_entry), &((p).result)) ? NULL : (p).result)
-# elif defined(_POSIX_REENTRANT_FUNCTIONS) && defined(__osf__)
-/*
- * OSF/1 V3.2 readdir_r() will SEGV if the main program is not
- * explicitly linked with -lc_r.  The library REQUIREDLIBS don't help.
- * Assume that if threads have been initialized we're linked properly.
- */
-#  define _XReaddir(d,p)						\
- ( (_Xos_isThreadInitialized) ?						\
-   (readdir_r((d), &((p).dir_entry)) ? NULL : &((p).dir_entry)) :	\
-   ((_Xos_processLock),							\
-    (((p).result = readdir((d))) ?					\
-     (memcpy(&((p).dir_entry), (p).result, (p).result->d_reclen),	\
-      ((p).result = &(p).dir_entry), 0) :				\
-     0),								\
-    (_Xos_processUnlock),						\
-    (p).result) )
 # elif defined(_POSIX_REENTRANT_FUNCTIONS)
 /* POSIX draft API, returns (int)0 on success. */
 #  define _XReaddir(d,p)	\
@@ -945,8 +893,8 @@ typedef struct {
    (_Xos_processUnlock), \
    (p).result )
 
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(__osf__) || defined(hpV4))
-/* Returns (int)0 on success.  OSF/1 v3.2, HP/UX 10
+#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) &&  defined(hpV4)
+/* Returns (int)0 on success.
  *
  * extern int asctime_r(const struct tm *timeptr, char *buffer, int buflen);
  * extern int ctime_r(const time_t *timer, char *buffer, int buflen);
@@ -967,7 +915,7 @@ typedef struct tm _Xltimeparams;
 # define _XGmtime(t,p)		(gmtime_r((t),&(p)) ? NULL : &(p))
 # define _XLocaltime(t,p)	(localtime_r((t),&(p)) ? NULL : &(p))
 
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(sun)
+#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(__sun)
 /* Returns NULL on failure.  Solaris 2.5
  *
  * extern char *asctime_r(const struct tm *tm,char *buf, int buflen);
@@ -990,19 +938,12 @@ typedef struct tm _Xltimeparams;
 # define _XLocaltime(t,p)	localtime_r((t),&(p))
 
 #else /* defined(_POSIX_THREAD_SAFE_FUNCTIONS) */
-/* POSIX final API.  OSF/1 v4.0, AIX, etc.
- *
+/* POSIX final API.
  * extern char *asctime_r(const struct tm *timeptr, char *buffer);
  * extern char *ctime_r(const time_t *timer, char *buffer);
  * extern struct tm *gmtime_r(const time_t *timer, struct tm *result);
  * extern struct tm *localtime_r(const time_t *timer, struct tm *result);
  */
-# if defined(__osf__)
-/* OSF/1 V4.0 <time.h> doesn't declare the _P routines, breaking under C++. */
-extern char *_Pasctime_r(const struct tm *, char *);
-extern char *_Pctime_r(const time_t *, char *);
-extern struct tm *_Plocaltime_r(const time_t *, struct tm *);
-# endif
 # ifdef TIMELEN
 typedef char _Xatimeparams[TIMELEN];
 typedef char _Xctimeparams[TIMELEN];
@@ -1097,8 +1038,8 @@ typedef struct {
    (_Xos_processUnlock), \
    (p).pgrp )
 
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(sun) || defined(__osf__))
-/* Non-POSIX API.  Solaris, DEC v3.2.
+#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(__sun)
+/* Non-POSIX API.  Solaris.
  *
  * extern struct group *getgrgid_r(gid_t, struct group *, char *, int);
  * extern struct group *getgrnam_r(const char *, struct group *, char *, int);
@@ -1111,8 +1052,7 @@ typedef struct {
 #define _XGetgrnam(n,p)	getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf))
 
 #elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-/* Non-POSIX API.  HP/UX 10, AIX 4.
- *
+/* Non-POSIX API.
  * extern int getgrgid_r(gid_t, struct group *, char *, int);
  * extern int getgrnam_r(const char *, struct group *, char *, int);
  */
@@ -1126,16 +1066,11 @@ typedef struct {
  ((getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf)) ? NULL : &(p).grp))
 
 #else
-/* POSIX final API.  DEC v4.0, IRIX 6.2.
+/* POSIX final API.
  *
  * int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **);
  * int getgrnam_r(const char *, struct group *, char *, size_t, struct group **);
  */
-# if defined(__osf__)
-/* OSF/1 V4.0 <grp.h> doesn't declare the _P routines, breaking under C++. */
-extern int _Pgetgrgid_r(gid_t, struct group *, char *, size_t, struct group **);
-extern int _Pgetgrnam_r(const char *, struct group *, char *, size_t, struct group **);
-# endif
 typedef struct {
   struct group grp;
   char buf[X_LINE_MAX];	/* Should be sysconf(_SC_GETGR_R_SIZE_MAX)? */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xosdefs.h b/recipes/xorg-lib/xorg-headers-native/X11/Xosdefs.h
index d6c76826db..33eaee4360 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xosdefs.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xosdefs.h
@@ -1,9 +1,6 @@
 /*
  * O/S-dependent (mis)feature macro definitions
  *
- * $XdotOrg: proto/X11/Xosdefs.h,v 1.7 2005/11/08 06:33:25 jkj Exp $
- * $Xorg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
- *
 Copyright 1991, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -26,141 +23,94 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
-/* $XFree86: xc/include/Xosdefs.h,v 3.20 2002/05/31 18:45:39 dawes Exp $ */
 
 #ifndef _XOSDEFS_H_
-#define _XOSDEFS_H_
+# define _XOSDEFS_H_
 
 /*
- * X_NOT_STDC_ENV means does not have ANSI C header files.  Lack of this
- * symbol does NOT mean that the system has stdarg.h.
- *
  * X_NOT_POSIX means does not have POSIX header files.  Lack of this
  * symbol does NOT mean that the POSIX environment is the default.
  * You may still have to define _POSIX_SOURCE to get it.
  */
 
-#ifdef NOSTDHDRS
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-
-#ifdef sony
-#if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV)
-#define X_NOT_POSIX
-#endif
-#endif
-
-#ifdef UTEK
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-
-#ifdef vax
-#ifndef ultrix			/* assume vanilla BSD */
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-#endif
-
-#ifdef luna
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-
-#ifdef Mips
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-  
-#ifdef USL
-#ifdef SYSV /* (release 3.2) */
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-#endif
-
-#ifdef _SCO_DS
-#ifndef __SCO__
-#define __SCO__
-#endif
-#endif
-
-#ifdef i386
-#ifdef SYSV
-#if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) && \
-	!defined(__UNIXWARE__) && !defined(sun)
-#if !defined(_POSIX_SOURCE)
-#define X_NOT_POSIX
-#endif
-#define X_NOT_STDC_ENV
-#endif
-#endif
-#endif
-
-#ifdef MOTOROLA
-#ifdef SYSV
-#define X_NOT_STDC_ENV
-#endif
-#endif
-
-#ifdef sun
+
+# ifdef _SCO_DS
+#  ifndef __SCO__
+#   define __SCO__
+#  endif
+# endif
+
+# ifdef __i386__
+#  ifdef SYSV
+#   if !defined(__SCO__) && \
+	!defined(__UNIXWARE__) && !defined(__sun)
+#    if !defined(_POSIX_SOURCE)
+#     define X_NOT_POSIX
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef __sun
 /* Imake configs define SVR4 on Solaris, but cc & gcc only define __SVR4
  * This check allows non-Imake configured programs to build correctly.
  */
-#if defined(__SVR4) && !defined(SVR4)
-#define SVR4 1
-#endif
-#ifdef SVR4
+#  if defined(__SVR4) && !defined(SVR4)
+#   define SVR4 1
+#  endif
+#  ifdef SVR4
 /* define this to whatever it needs to be */
-#define X_POSIX_C_SOURCE 199300L
-#endif
-#endif
-
-#ifdef WIN32
-#ifndef _POSIX_
-#define X_NOT_POSIX
-#endif
-#endif
-
-#if defined(nec_ews_svr2) || defined(SX) || defined(PC_UX)
-#define X_NOT_POSIX
-#define X_NOT_STDC_ENV
-#endif
-
-#ifdef __UNIXOS2__
-#define USGISH
-#define NULL_NOT_ZERO
-#endif
-
-#ifdef __DARWIN__
-#define NULL_NOT_ZERO
-#endif
-
-#ifdef __GNU__
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 4096
-#endif
-#endif
-
-#if defined(__SCO__) || defined(__UNIXWARE__)
-# ifndef PATH_MAX
-#  define PATH_MAX	1024
+#   define X_POSIX_C_SOURCE 199300L
+#  endif
+# endif
+
+# ifdef WIN32
+#  ifndef _POSIX_
+#   define X_NOT_POSIX
+#  endif
 # endif
-# ifndef MAXPATHLEN
-#  define MAXPATHLEN	1024
+
+
+# ifdef __APPLE__
+#  define NULL_NOT_ZERO
+
+/* Defining any of these will sanitize the namespace to JUST want is defined by
+ * that particular standard.  If that happens, we don't get some expected
+ * prototypes, typedefs, etc (like fd_mask).  We can define _DARWIN_C_SOURCE to
+ * loosen our belts a tad.
+ */
+#  if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE)
+#   ifndef _DARWIN_C_SOURCE
+#    define _DARWIN_C_SOURCE
+#   endif
+#  endif
+
+# endif
+
+# ifdef __GNU__
+#  ifndef PATH_MAX
+#   define PATH_MAX 4096
+#  endif
+#  ifndef MAXPATHLEN
+#   define MAXPATHLEN 4096
+#  endif
+# endif
+
+# if defined(__SCO__) || defined(__UNIXWARE__)
+#  ifndef PATH_MAX
+#   define PATH_MAX	1024
+#  endif
+#  ifndef MAXPATHLEN
+#   define MAXPATHLEN	1024
+#  endif
 # endif
-#endif
 
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \
-	|| defined(__Darwin__) || defined(__DragonFly__)
-# ifndef CSRG_BASED
-#  define CSRG_BASED
+# if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \
+	|| defined(__APPLE__) || defined(__DragonFly__)
+#  ifndef CSRG_BASED
+#   define CSRG_BASED
+#  endif
 # endif
-#endif
 
 #endif /* _XOSDEFS_H_ */
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xpoll.h b/recipes/xorg-lib/xorg-headers-native/X11/Xpoll.h
index e483c21e13..e96ea12bbe 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xpoll.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xpoll.h
@@ -1,5 +1,3 @@
-/* $Xorg: Xpoll.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
 /*
 
 Copyright 1994, 1998  The Open Group
@@ -49,8 +47,6 @@ from The Open Group.
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-/* $XFree86: xc/include/Xpoll.h,v 3.8 2001/01/17 17:53:11 dawes Exp $ */
-
 #ifndef _XPOLL_H_
 #define _XPOLL_H_
 
@@ -60,32 +56,7 @@ from The Open Group.
 
 #include <X11/Xos.h>
 
-/* Below is the monster branch from hell.  Basically, most systems will drop to
- * 'the branch below is the fallthrough for halfway modern systems', and include
- * <sys/select.h>, so we get the FD_* macros. */
-#if !defined(DGUX)
-# if (defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE)
-#  include <sys/select.h>
-#  ifdef luna
-#   include <sysent.h>
-#  endif
-# else /* not SVR4/CRAY/AIXv3 */
-#  if defined(AIXV4) /* AIX 4.2 fubar-ed <sys/select.h>, so try really hard. */
-#   if !defined(NFDBITS)
-#    include <sys/select.h>
-#   endif
-#  else /* the branch below is the fallthrough for halfway modern systems */
-#   ifdef __QNX__  /* Make sure we get 256 bit select masks */
-#    define FD_SETSIZE 256
-#   endif
-#   include <sys/select.h>
-#  endif
-# endif
-#else /* DGUX  -- No sys/select in Intel DG/ux */
-# include <sys/time.h> 
-# include <sys/types.h>
-# include <unistd.h>
-#endif
+#include <sys/select.h>  /* Get the FD_* macros. */
 
 #include <X11/Xmd.h>
 
@@ -114,21 +85,13 @@ typedef long fd_mask;
 #define howmany(x,y)	(((x)+((y)-1))/(y))
 #endif
 
-#if defined(BSD) && BSD < 198911 && !defined(luna)
+#if defined(BSD) && BSD < 198911 
 typedef struct fd_set {
 	fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)];
 } fd_set;
 #endif
 
-#ifndef hpux /* and perhaps old BSD ??? */
 # define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-#else
-# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */
-#  define Select(n,r,w,e,t) select(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t)
-# else
-#  define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-# endif
-#endif
 
 #define __X_FDS_BITS __fds_bits
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xproto.h b/recipes/xorg-lib/xorg-headers-native/X11/Xproto.h
index e5bba70082..495d441947 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xproto.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xproto.h
@@ -1,7 +1,3 @@
-/*
- *	$Xorg: Xproto.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $
- */
-
 /* Definitions for the X window system used by server and c bindings */
 
 /*
@@ -1212,6 +1208,38 @@ typedef struct _xEvent {
     } u;
 } xEvent;
 
+/*********************************************************
+ *
+ * Generic event
+ * 
+ * Those events are not part of the core protocol spec and can be used by
+ * various extensions.
+ * type is always GenericEvent
+ * extension is the minor opcode of the extension the event belongs to.
+ * evtype is the actual event type, unique __per extension__. 
+ *
+ * GenericEvents can be longer than 32 bytes, with the length field
+ * specifying the number of 4 byte blocks after the first 32 bytes. 
+ *
+ *
+ */
+typedef struct 
+{
+    BYTE    type;
+    CARD8   extension;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD16  evtype B16;
+    CARD16  pad2 B16;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+    CARD32  pad5 B32;
+    CARD32  pad6 B32;
+    CARD32  pad7 B32;
+} xGenericEvent;
+
+
+
 /* KeymapNotify events are not included in the above union because they
    are different from all other events: they do not have a "detail"
    or "sequenceNumber", so there is room for a 248-bit key mask. */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xprotostr.h b/recipes/xorg-lib/xorg-headers-native/X11/Xprotostr.h
index f343d98498..a9e854d370 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xprotostr.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xprotostr.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xprotostr.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
 #ifndef XPROTOSTRUCTS_H
 #define XPROTOSTRUCTS_H
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xregion.h b/recipes/xorg-lib/xorg-headers-native/X11/Xregion.h
index 2ddf12caca..7b376e556a 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xregion.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xregion.h
@@ -1,4 +1,3 @@
-/* $Xorg: region.h,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */
 /************************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -28,13 +27,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -69,7 +68,7 @@ typedef struct {
 #endif
 
 
-/* 
+/*
  *   clip region
  */
 
@@ -80,13 +79,13 @@ typedef struct _XRegion {
     BOX extents;
 } REGION;
 
-/* Xutil.h contains the declaration: 
- * typedef struct _XRegion *Region; 
- */   
+/* Xutil.h contains the declaration:
+ * typedef struct _XRegion *Region;
+ */
 
 /*  1 if two BOXs overlap.
  *  0 if two BOXs do not overlap.
- *  Remember, x2 and y2 are not in the region 
+ *  Remember, x2 and y2 are not in the region
  */
 #define EXTENTCHECK(r1, r2) \
 	((r1)->x2 > (r2)->x1 && \
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xresource.h b/recipes/xorg-lib/xorg-headers-native/X11/Xresource.h
index ce1213748c..dbb144c273 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xresource.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xresource.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xresource.h,v 1.7 2001/02/09 02:03:39 xorgcvs Exp $ */
 
 /***********************************************************
 
@@ -29,13 +28,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/X11/Xresource.h,v 3.8 2001/12/14 19:54:10 dawes Exp $ */
 
 #ifndef _XRESOURCE_H_
 #define _XRESOURCE_H_
@@ -178,7 +176,7 @@ typedef struct _XrmHashBucketRec *XrmDatabase;
 
 
 extern void XrmDestroyDatabase(
-    XrmDatabase		/* database */    
+    XrmDatabase		/* database */
 );
 
 extern void XrmQPutResource(
@@ -333,7 +331,7 @@ typedef enum {
     XrmoptionResArg,	/* Resource and value in next argument in argv      */
     XrmoptionSkipArg,   /* Ignore this option and the next argument in argv */
     XrmoptionSkipLine,  /* Ignore this option and the rest of argv	    */
-    XrmoptionSkipNArgs	/* Ignore this option and the next 
+    XrmoptionSkipNArgs	/* Ignore this option and the next
 			   OptionDescRes.value arguments in argv */
 } XrmOptionKind;
 
@@ -351,7 +349,7 @@ extern void XrmParseCommand(
     int			/* table_count */,
     _Xconst char*	/* name */,
     int*		/* argc_in_out */,
-    char**		/* argv_in_out */		     
+    char**		/* argv_in_out */
 );
 
 _XFUNCPROTOEND
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xthreads.h b/recipes/xorg-lib/xorg-headers-native/X11/Xthreads.h
index 54b5440ad8..3d4420825e 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xthreads.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xthreads.h
@@ -1,7 +1,5 @@
 /*
- * $Xorg: Xthreads.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
  *
- * 
 Copyright 1993, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -25,80 +23,79 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * *
  */
-/* $XFree86: Xthreads.h,v 3.10 2001/12/14 19:53:26 dawes Exp $ */
 
 #ifndef _XTHREADS_H_
-#define _XTHREADS_H_
+# define _XTHREADS_H_
 
 /* Redefine these to XtMalloc/XtFree or whatever you want before including
  * this header file.
  */
-#ifndef xmalloc
-#define xmalloc malloc
-#endif
-#ifndef xfree
-#define xfree free
-#endif
+# ifndef xmalloc
+#  define xmalloc malloc
+# endif
+# ifndef xfree
+#  define xfree free
+# endif
 
-#ifdef CTHREADS
-#include <cthreads.h>
+# ifdef CTHREADS
+#  include <cthreads.h>
 typedef cthread_t xthread_t;
 typedef struct condition xcondition_rec;
 typedef struct mutex xmutex_rec;
-#define xthread_init() cthread_init()
-#define xthread_self cthread_self
-#define xthread_fork(func,closure) cthread_fork(func,closure)
-#define xthread_yield() cthread_yield()
-#define xthread_exit(v) cthread_exit(v)
-#define xthread_set_name(t,str) cthread_set_name(t,str)
-#define xmutex_init(m) mutex_init(m)
-#define xmutex_clear(m) mutex_clear(m)
-#define xmutex_lock(m) mutex_lock(m)
-#define xmutex_unlock(m) mutex_unlock(m)
-#define xmutex_set_name(m,str) mutex_set_name(m,str)
-#define xcondition_init(cv) condition_init(cv)
-#define xcondition_clear(cv) condition_clear(cv)
-#define xcondition_wait(cv,m) condition_wait(cv,m)
-#define xcondition_signal(cv) condition_signal(cv)
-#define xcondition_broadcast(cv) condition_broadcast(cv)
-#define xcondition_set_name(cv,str) condition_set_name(cv,str)
-#else /* !CTHREADS */
-#if defined(SVR4) && !defined(__sgi) && !defined(_SEQUENT_)
-#include <thread.h>
-#include <synch.h>
+#  define xthread_init() cthread_init()
+#  define xthread_self cthread_self
+#  define xthread_fork(func,closure) cthread_fork(func,closure)
+#  define xthread_yield() cthread_yield()
+#  define xthread_exit(v) cthread_exit(v)
+#  define xthread_set_name(t,str) cthread_set_name(t,str)
+#  define xmutex_init(m) mutex_init(m)
+#  define xmutex_clear(m) mutex_clear(m)
+#  define xmutex_lock(m) mutex_lock(m)
+#  define xmutex_unlock(m) mutex_unlock(m)
+#  define xmutex_set_name(m,str) mutex_set_name(m,str)
+#  define xcondition_init(cv) condition_init(cv)
+#  define xcondition_clear(cv) condition_clear(cv)
+#  define xcondition_wait(cv,m) condition_wait(cv,m)
+#  define xcondition_signal(cv) condition_signal(cv)
+#  define xcondition_broadcast(cv) condition_broadcast(cv)
+#  define xcondition_set_name(cv,str) condition_set_name(cv,str)
+# else /* !CTHREADS */
+#  if defined(SVR4)
+#   include <thread.h>
+#   include <synch.h>
 typedef thread_t xthread_t;
 typedef thread_key_t xthread_key_t;
 typedef cond_t xcondition_rec;
 typedef mutex_t xmutex_rec;
-#if defined(__UNIXWARE__)
+#   if defined(__UNIXWARE__)
 extern xthread_t (*_x11_thr_self)();
-#define xthread_self  (_x11_thr_self)
-#else
-#define xthread_self thr_self
-#endif
-#define xthread_fork(func,closure) thr_create(NULL,0,func,closure,THR_NEW_LWP|THR_DETACHED,NULL)
-#define xthread_yield() thr_yield()
-#define xthread_exit(v) thr_exit(v)
-#define xthread_key_create(kp,d) thr_keycreate(kp,d)
-#ifdef sun
-#define xthread_key_delete(k) 0
-#else
-#define xthread_key_delete(k) thr_keydelete(k)
-#endif
-#define xthread_set_specific(k,v) thr_setspecific(k,v)
-#define xthread_get_specific(k,vp) thr_getspecific(k,vp)
-#define xmutex_init(m) mutex_init(m,USYNC_THREAD,0)
-#define xmutex_clear(m) mutex_destroy(m)
-#define xmutex_lock(m) mutex_lock(m)
-#define xmutex_unlock(m) mutex_unlock(m)
-#define xcondition_init(cv) cond_init(cv,USYNC_THREAD,0)
-#define xcondition_clear(cv) cond_destroy(cv)
-#define xcondition_wait(cv,m) cond_wait(cv,m)
-#define xcondition_signal(cv) cond_signal(cv)
-#define xcondition_broadcast(cv) cond_broadcast(cv)
-#else /* !SVR4 */
-#ifdef WIN32
-#include <X11/Xwindows.h>
+#    define xthread_self  (_x11_thr_self)
+#   else
+#    define xthread_self thr_self
+#   endif
+#   define xthread_fork(func,closure) thr_create(NULL,0,func,closure,THR_NEW_LWP|THR_DETACHED,NULL)
+#   define xthread_yield() thr_yield()
+#   define xthread_exit(v) thr_exit(v)
+#   define xthread_key_create(kp,d) thr_keycreate(kp,d)
+#   ifdef __sun
+#    define xthread_key_delete(k) 0
+#   else
+#    define xthread_key_delete(k) thr_keydelete(k)
+#   endif
+#   define xthread_set_specific(k,v) thr_setspecific(k,v)
+#   define xthread_get_specific(k,vp) thr_getspecific(k,vp)
+#   define xmutex_init(m) mutex_init(m,USYNC_THREAD,0)
+#   define xmutex_clear(m) mutex_destroy(m)
+#   define xmutex_lock(m) mutex_lock(m)
+#   define xmutex_unlock(m) mutex_unlock(m)
+#   define xcondition_init(cv) cond_init(cv,USYNC_THREAD,0)
+#   define xcondition_clear(cv) cond_destroy(cv)
+#   define xcondition_wait(cv,m) cond_wait(cv,m)
+#   define xcondition_signal(cv) cond_signal(cv)
+#   define xcondition_broadcast(cv) cond_broadcast(cv)
+#  else /* !SVR4 */
+#   ifdef WIN32
+#    include <X11/Xwindows.h>
 typedef DWORD xthread_t;
 typedef DWORD xthread_key_t;
 struct _xthread_waiter {
@@ -110,31 +107,31 @@ typedef struct {
     struct _xthread_waiter *waiters;
 } xcondition_rec;
 typedef CRITICAL_SECTION xmutex_rec;
-#define xthread_init() _Xthread_init()
-#define xthread_self GetCurrentThreadId
-#define xthread_fork(func,closure) { \
+#    define xthread_init() _Xthread_init()
+#    define xthread_self GetCurrentThreadId
+#    define xthread_fork(func,closure) { \
     DWORD _tmptid; \
     CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, (LPVOID)closure, 0, \
 		 &_tmptid); \
 }
-#define xthread_yield() Sleep(0)
-#define xthread_exit(v) ExitThread((DWORD)(v))
-#define xthread_key_create(kp,d) *(kp) = TlsAlloc()
-#define xthread_key_delete(k) TlsFree(k)
-#define xthread_set_specific(k,v) TlsSetValue(k,v)
-#define xthread_get_specific(k,vp) TlsGetValue(k)
-#define xmutex_init(m) InitializeCriticalSection(m)
-#define xmutex_clear(m) DeleteCriticalSection(m)
-#define _XMUTEX_NESTS
-#define xmutex_lock(m) EnterCriticalSection(m)
-#define xmutex_unlock(m) LeaveCriticalSection(m)
-#define xcondition_init(cv) { \
+#    define xthread_yield() Sleep(0)
+#    define xthread_exit(v) ExitThread((DWORD)(v))
+#    define xthread_key_create(kp,d) *(kp) = TlsAlloc()
+#    define xthread_key_delete(k) TlsFree(k)
+#    define xthread_set_specific(k,v) TlsSetValue(k,v)
+#    define xthread_get_specific(k,vp) TlsGetValue(k)
+#    define xmutex_init(m) InitializeCriticalSection(m)
+#    define xmutex_clear(m) DeleteCriticalSection(m)
+#    define _XMUTEX_NESTS
+#    define xmutex_lock(m) EnterCriticalSection(m)
+#    define xmutex_unlock(m) LeaveCriticalSection(m)
+#    define xcondition_init(cv) { \
     InitializeCriticalSection(&(cv)->cs); \
     (cv)->waiters = NULL; \
 }
-#define xcondition_clear(cv) DeleteCriticalSection(&(cv)->cs)
+#    define xcondition_clear(cv) DeleteCriticalSection(&(cv)->cs)
 extern struct _xthread_waiter *_Xthread_waiter();
-#define xcondition_wait(cv,m) { \
+#    define xcondition_wait(cv,m) { \
     struct _xthread_waiter *_tmpthr = _Xthread_waiter(); \
     EnterCriticalSection(&(cv)->cs); \
     _tmpthr->next = (cv)->waiters; \
@@ -144,7 +141,7 @@ extern struct _xthread_waiter *_Xthread_waiter();
     WaitForSingleObject(_tmpthr->sem, INFINITE); \
     EnterCriticalSection(m); \
 }
-#define xcondition_signal(cv) { \
+#    define xcondition_signal(cv) { \
     EnterCriticalSection(&(cv)->cs); \
     if ((cv)->waiters) { \
         ReleaseSemaphore((cv)->waiters->sem, 1, NULL); \
@@ -152,7 +149,7 @@ extern struct _xthread_waiter *_Xthread_waiter();
     } \
     LeaveCriticalSection(&(cv)->cs); \
 }
-#define xcondition_broadcast(cv) { \
+#    define xcondition_broadcast(cv) { \
     struct _xthread_waiter *_tmpthr; \
     EnterCriticalSection(&(cv)->cs); \
     for (_tmpthr = (cv)->waiters; _tmpthr; _tmpthr = _tmpthr->next) \
@@ -160,157 +157,157 @@ extern struct _xthread_waiter *_Xthread_waiter();
     (cv)->waiters = NULL; \
     LeaveCriticalSection(&(cv)->cs); \
 }
-#else /* !WIN32 */
-#ifdef USE_TIS_SUPPORT
+#   else /* !WIN32 */
+#    ifdef USE_TIS_SUPPORT
 /*
  * TIS support is intended for thread safe libraries.
  * This should not be used for general client programming.
  */
-#include <tis.h>
+#     include <tis.h>
 typedef pthread_t xthread_t;
 typedef pthread_key_t xthread_key_t;
 typedef pthread_cond_t xcondition_rec;
 typedef pthread_mutex_t xmutex_rec;
-#define xthread_self tis_self
-#define xthread_fork(func,closure) { pthread_t _tmpxthr; \
+#     define xthread_self tis_self
+#     define xthread_fork(func,closure) { pthread_t _tmpxthr; \
         pthread_create(&_tmpxthr,NULL,func,closure); }
-#define xthread_yield() pthread_yield_np()
-#define xthread_exit(v) pthread_exit(v)
-#define xthread_key_create(kp,d) tis_key_create(kp,d)
-#define xthread_key_delete(k) tis_key_delete(k)
-#define xthread_set_specific(k,v) tis_setspecific(k,v)
-#define xthread_get_specific(k,vp) *(vp) = tis_getspecific(k)
-#define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#define xmutex_init(m) tis_mutex_init(m)
-#define xmutex_clear(m) tis_mutex_destroy(m)
-#define xmutex_lock(m) tis_mutex_lock(m)
-#define xmutex_unlock(m) tis_mutex_unlock(m)
-#define xcondition_init(c) tis_cond_init(c)
-#define xcondition_clear(c) tis_cond_destroy(c)
-#define xcondition_wait(c,m) tis_cond_wait(c,m)
-#define xcondition_signal(c) tis_cond_signal(c)
-#define xcondition_broadcast(c) tis_cond_broadcast(c)
-#else
-#ifdef USE_NBSD_THREADLIB
+#     define xthread_yield() pthread_yield_np()
+#     define xthread_exit(v) pthread_exit(v)
+#     define xthread_key_create(kp,d) tis_key_create(kp,d)
+#     define xthread_key_delete(k) tis_key_delete(k)
+#     define xthread_set_specific(k,v) tis_setspecific(k,v)
+#     define xthread_get_specific(k,vp) *(vp) = tis_getspecific(k)
+#     define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
+#     define xmutex_init(m) tis_mutex_init(m)
+#     define xmutex_clear(m) tis_mutex_destroy(m)
+#     define xmutex_lock(m) tis_mutex_lock(m)
+#     define xmutex_unlock(m) tis_mutex_unlock(m)
+#     define xcondition_init(c) tis_cond_init(c)
+#     define xcondition_clear(c) tis_cond_destroy(c)
+#     define xcondition_wait(c,m) tis_cond_wait(c,m)
+#     define xcondition_signal(c) tis_cond_signal(c)
+#     define xcondition_broadcast(c) tis_cond_broadcast(c)
+#    else
+#     ifdef USE_NBSD_THREADLIB
 /*
  * NetBSD threadlib support is intended for thread safe libraries.
  * This should not be used for general client programming.
  */
-#include <threadlib.h>
+#      include <threadlib.h>
 typedef thr_t xthread_t;
 typedef thread_key_t xthread_key_t;
 typedef cond_t xcondition_rec;
 typedef mutex_t xmutex_rec;
-#define xthread_self thr_self
-#define xthread_fork(func,closure) { thr_t _tmpxthr; \
+#      define xthread_self thr_self
+#      define xthread_fork(func,closure) { thr_t _tmpxthr; \
 	/* XXX Create it detached?  --thorpej */ \
 	thr_create(&_tmpxthr,NULL,func,closure); }
-#define xthread_yield() thr_yield()
-#define xthread_exit(v) thr_exit(v)
-#define xthread_key_create(kp,d) thr_keycreate(kp,d)
-#define xthread_key_delete(k) thr_keydelete(k)
-#define xthread_set_specific(k,v) thr_setspecific(k,v)
-#define xthread_get_specific(k,vp) *(vp) = thr_getspecific(k)
-#define XMUTEX_INITIALIZER MUTEX_INITIALIZER
-#define xmutex_init(m) mutex_init(m, 0)
-#define xmutex_clear(m) mutex_destroy(m)
-#define xmutex_lock(m) mutex_lock(m)
-#define xmutex_unlock(m) mutex_unlock(m)
-#define xcondition_init(c) cond_init(c, 0, 0)
-#define xcondition_clear(c) cond_destroy(c)
-#define xcondition_wait(c,m) cond_wait(c,m)
-#define xcondition_signal(c) cond_signal(c)
-#define xcondition_broadcast(c) cond_broadcast(c)
-#else
-#include <pthread.h>
+#      define xthread_yield() thr_yield()
+#      define xthread_exit(v) thr_exit(v)
+#      define xthread_key_create(kp,d) thr_keycreate(kp,d)
+#      define xthread_key_delete(k) thr_keydelete(k)
+#      define xthread_set_specific(k,v) thr_setspecific(k,v)
+#      define xthread_get_specific(k,vp) *(vp) = thr_getspecific(k)
+#      define XMUTEX_INITIALIZER MUTEX_INITIALIZER
+#      define xmutex_init(m) mutex_init(m, 0)
+#      define xmutex_clear(m) mutex_destroy(m)
+#      define xmutex_lock(m) mutex_lock(m)
+#      define xmutex_unlock(m) mutex_unlock(m)
+#      define xcondition_init(c) cond_init(c, 0, 0)
+#      define xcondition_clear(c) cond_destroy(c)
+#      define xcondition_wait(c,m) cond_wait(c,m)
+#      define xcondition_signal(c) cond_signal(c)
+#      define xcondition_broadcast(c) cond_broadcast(c)
+#     else
+#      include <pthread.h>
 typedef pthread_t xthread_t;
 typedef pthread_key_t xthread_key_t;
 typedef pthread_cond_t xcondition_rec;
 typedef pthread_mutex_t xmutex_rec;
-#define xthread_self pthread_self
-#define xthread_yield() pthread_yield()
-#define xthread_exit(v) pthread_exit(v)
-#define xthread_set_specific(k,v) pthread_setspecific(k,v)
-#define xmutex_clear(m) pthread_mutex_destroy(m)
-#define xmutex_lock(m) pthread_mutex_lock(m)
-#define xmutex_unlock(m) pthread_mutex_unlock(m)
-#ifndef XPRE_STANDARD_API
-#define xthread_key_create(kp,d) pthread_key_create(kp,d)
-#define xthread_key_delete(k) pthread_key_delete(k)
-#define xthread_get_specific(k,vp) *(vp) = pthread_getspecific(k)
-#define xthread_fork(func,closure) { pthread_t _tmpxthr; \
+#      define xthread_self pthread_self
+#      define xthread_yield() pthread_yield()
+#      define xthread_exit(v) pthread_exit(v)
+#      define xthread_set_specific(k,v) pthread_setspecific(k,v)
+#      define xmutex_clear(m) pthread_mutex_destroy(m)
+#      define xmutex_lock(m) pthread_mutex_lock(m)
+#      define xmutex_unlock(m) pthread_mutex_unlock(m)
+#      ifndef XPRE_STANDARD_API
+#       define xthread_key_create(kp,d) pthread_key_create(kp,d)
+#       define xthread_key_delete(k) pthread_key_delete(k)
+#       define xthread_get_specific(k,vp) *(vp) = pthread_getspecific(k)
+#       define xthread_fork(func,closure) { pthread_t _tmpxthr; \
 	pthread_create(&_tmpxthr,NULL,func,closure); }
-#define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#define xmutex_init(m) pthread_mutex_init(m, NULL)
-#define xcondition_init(c) pthread_cond_init(c, NULL)
-#else /* XPRE_STANDARD_API */
-#define xthread_key_create(kp,d) pthread_keycreate(kp,d)
-#define xthread_key_delete(k) 0
-#define xthread_get_specific(k,vp) pthread_getspecific(k,vp)
-#define xthread_fork(func,closure) { pthread_t _tmpxthr; \
+#       define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
+#       define xmutex_init(m) pthread_mutex_init(m, NULL)
+#       define xcondition_init(c) pthread_cond_init(c, NULL)
+#      else /* XPRE_STANDARD_API */
+#       define xthread_key_create(kp,d) pthread_keycreate(kp,d)
+#       define xthread_key_delete(k) 0
+#       define xthread_get_specific(k,vp) pthread_getspecific(k,vp)
+#       define xthread_fork(func,closure) { pthread_t _tmpxthr; \
 	pthread_create(&_tmpxthr,pthread_attr_default,func,closure); }
-#define xmutex_init(m) pthread_mutex_init(m, pthread_mutexattr_default)
-#define xcondition_init(c) pthread_cond_init(c, pthread_condattr_default)
-#endif /* XPRE_STANDARD_API */
-#define xcondition_clear(c) pthread_cond_destroy(c)
-#define xcondition_wait(c,m) pthread_cond_wait(c,m)
-#define xcondition_signal(c) pthread_cond_signal(c)
-#define xcondition_broadcast(c) pthread_cond_broadcast(c)
-#if defined(_DECTHREADS_)
+#       define xmutex_init(m) pthread_mutex_init(m, pthread_mutexattr_default)
+#       define xcondition_init(c) pthread_cond_init(c, pthread_condattr_default)
+#      endif /* XPRE_STANDARD_API */
+#      define xcondition_clear(c) pthread_cond_destroy(c)
+#      define xcondition_wait(c,m) pthread_cond_wait(c,m)
+#      define xcondition_signal(c) pthread_cond_signal(c)
+#      define xcondition_broadcast(c) pthread_cond_broadcast(c)
+#      if defined(_DECTHREADS_)
 static xthread_t _X_no_thread_id;
-#define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id)
-#define xthread_clear_id(id) id = _X_no_thread_id
-#define xthread_equal(id1,id2) pthread_equal(id1, id2)
-#endif /* _DECTHREADS_ */
-#if defined(__linux__)
-#define xthread_have_id(id) !pthread_equal(id, 0)
-#define xthread_clear_id(id) id = 0
-#define xthread_equal(id1,id2) pthread_equal(id1, id2)
-#endif /* linux */
-#if defined(_CMA_VENDOR_) && defined(_CMA__IBM) && (_CMA_VENDOR_ == _CMA__IBM)
-#ifdef DEBUG			/* too much of a hack to enable normally */
+#       define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id)
+#       define xthread_clear_id(id) id = _X_no_thread_id
+#       define xthread_equal(id1,id2) pthread_equal(id1, id2)
+#      endif /* _DECTHREADS_ */
+#      if defined(__linux__)
+#       define xthread_have_id(id) !pthread_equal(id, 0)
+#       define xthread_clear_id(id) id = 0
+#       define xthread_equal(id1,id2) pthread_equal(id1, id2)
+#      endif /* linux */
+#      if defined(_CMA_VENDOR_) && defined(_CMA__IBM) && (_CMA_VENDOR_ == _CMA__IBM)
+#       ifdef DEBUG		/* too much of a hack to enable normally */
 /* see also cma__obj_set_name() */
-#define xmutex_set_name(m,str) ((char**)(m)->field1)[5] = (str)
-#define xcondition_set_name(cv,str) ((char**)(cv)->field1)[5] = (str)
-#endif /* DEBUG */
-#endif /* _CMA_VENDOR_ == _CMA__IBM */
-#endif /* USE_NBSD_THREADLIB */
-#endif /* USE_TIS_SUPPORT */
-#endif /* WIN32 */
-#endif /* SVR4 */
-#endif /* CTHREADS */
+#        define xmutex_set_name(m,str) ((char**)(m)->field1)[5] = (str)
+#        define xcondition_set_name(cv,str) ((char**)(cv)->field1)[5] = (str)
+#       endif /* DEBUG */
+#      endif /* _CMA_VENDOR_ == _CMA__IBM */
+#     endif /* USE_NBSD_THREADLIB */
+#    endif /* USE_TIS_SUPPORT */
+#   endif /* WIN32 */
+#  endif /* SVR4 */
+# endif /* CTHREADS */
 typedef xcondition_rec *xcondition_t;
 typedef xmutex_rec *xmutex_t;
-#ifndef xcondition_malloc
-#define xcondition_malloc() (xcondition_t)xmalloc(sizeof(xcondition_rec))
-#endif
-#ifndef xcondition_free
-#define xcondition_free(c) xfree((char *)c)
-#endif
-#ifndef xmutex_malloc
-#define xmutex_malloc() (xmutex_t)xmalloc(sizeof(xmutex_rec))
-#endif
-#ifndef xmutex_free
-#define xmutex_free(m) xfree((char *)m)
-#endif
-#ifndef xthread_have_id
-#define xthread_have_id(id) id
-#endif
-#ifndef xthread_clear_id
-#define xthread_clear_id(id) id = 0
-#endif
-#ifndef xthread_equal
-#define xthread_equal(id1,id2) ((id1) == (id2))
-#endif
+# ifndef xcondition_malloc
+#  define xcondition_malloc() (xcondition_t)xmalloc(sizeof(xcondition_rec))
+# endif
+# ifndef xcondition_free
+#  define xcondition_free(c) xfree((char *)c)
+# endif
+# ifndef xmutex_malloc
+#  define xmutex_malloc() (xmutex_t)xmalloc(sizeof(xmutex_rec))
+# endif
+# ifndef xmutex_free
+#  define xmutex_free(m) xfree((char *)m)
+# endif
+# ifndef xthread_have_id
+#  define xthread_have_id(id) id
+# endif
+# ifndef xthread_clear_id
+#  define xthread_clear_id(id) id = 0
+# endif
+# ifndef xthread_equal
+#  define xthread_equal(id1,id2) ((id1) == (id2))
+# endif
 /* aids understood by some debuggers */
-#ifndef xthread_set_name
-#define xthread_set_name(t,str)
-#endif
-#ifndef xmutex_set_name
-#define xmutex_set_name(m,str)
-#endif
-#ifndef xcondition_set_name
-#define xcondition_set_name(cv,str)
-#endif
+# ifndef xthread_set_name
+#  define xthread_set_name(t,str)
+# endif
+# ifndef xmutex_set_name
+#  define xmutex_set_name(m,str)
+# endif
+# ifndef xcondition_set_name
+#  define xcondition_set_name(cv,str)
+# endif
 
 #endif /* _XTHREADS_H_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xutil.h b/recipes/xorg-lib/xorg-headers-native/X11/Xutil.h
index 9f2ef63048..8ff34d9f06 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xutil.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xutil.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xutil.h,v 1.8 2001/02/09 02:03:39 xorgcvs Exp $ */
 
 /***********************************************************
 
@@ -29,13 +28,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/X11/Xutil.h,v 3.6 2003/04/13 19:22:20 dawes Exp $ */
 
 #ifndef _XUTIL_H_
 #define _XUTIL_H_
@@ -55,7 +53,7 @@ SOFTWARE.
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 
-/* 
+/*
  * Bitmask returned by XParseGeometry().  Each bit tells if the corresponding
  * value (x, y, width, height) was found in the parsed string.
  */
@@ -151,7 +149,7 @@ IconPositionHint|IconMaskHint|WindowGroupHint)
 
 
 /*
- * new structure for manipulating TEXT properties; used with WM_NAME, 
+ * new structure for manipulating TEXT properties; used with WM_NAME,
  * WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND.
  */
 typedef struct {
@@ -262,16 +260,16 @@ typedef struct _XComposeStatus {
    || ((KeySym)(keysym) == XK_Num_Lock))
 #endif
 /*
- * opaque reference to Region data type 
+ * opaque reference to Region data type
  */
-typedef struct _XRegion *Region; 
+typedef struct _XRegion *Region;
 
 /* Return values from XRectInRegion() */
- 
+
 #define RectangleOut 0
 #define RectangleIn  1
 #define RectanglePart 2
- 
+
 
 /*
  * Information used by the visual utility routines to find desired visual
@@ -452,7 +450,7 @@ extern Status XGetStandardColormap(
     Display*		/* display */,
     Window		/* w */,
     XStandardColormap*	/* colormap_return */,
-    Atom		/* property */			    
+    Atom		/* property */
 );
 
 extern Status XGetTextProperty(
@@ -477,7 +475,7 @@ extern Status XGetWMClientMachine(
 
 extern XWMHints *XGetWMHints(
     Display*		/* display */,
-    Window		/* w */		      
+    Window		/* w */
 );
 
 extern Status XGetWMIconName(
@@ -496,7 +494,7 @@ extern Status XGetWMNormalHints(
     Display*		/* display */,
     Window		/* w */,
     XSizeHints*		/* hints_return */,
-    long*		/* supplied_return */ 
+    long*		/* supplied_return */
 );
 
 extern Status XGetWMSizeHints(
@@ -584,7 +582,7 @@ extern int XSetIconSizes(
     Display*		/* display */,
     Window		/* w */,
     XIconSize*		/* size_list */,
-    int			/* count */    
+    int			/* count */
 );
 
 extern int XSetNormalHints(
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xw32defs.h b/recipes/xorg-lib/xorg-headers-native/X11/Xw32defs.h
index 07624fef60..b2e4b33ae8 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xw32defs.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xw32defs.h
@@ -1,81 +1,79 @@
-/* $Xorg: Xw32defs.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
-
 #ifndef _XW32DEFS_H
-#define  _XW32DEFS_H
+# define  _XW32DEFS_H
 
-#ifdef __GNUC__ /* mingw is more close to unix than msvc */
-#if !defined(__daddr_t_defined) 
+# ifdef __GNUC__ /* mingw is more close to unix than msvc */
+#  if !defined(__daddr_t_defined) 
 typedef char *caddr_t;
-#endif
-#define lstat stat
+#  endif
+#  define lstat stat
 
-#else
+# else
 typedef char *caddr_t;
 
-#define access	   _access
-#define alloca	   _alloca
-#define chdir	_chdir
-#define chmod	   _chmod
-#define close	   _close
-#define creat	   _creat
-#define dup	   _dup
-#define dup2	   _dup2
-#define environ     _environ
-#define execl	 _execl
-#define execle	 _execle
-#define execlp	 _execlp
-#define execlpe  _execlpe
-#define execv	 _execv
-#define execve	 _execve
-#define execvp	 _execvp
-#define execvpe  _execvpe
-#define fdopen	  _fdopen
-#define fileno	  _fileno
-#define fstat	 _fstat
-#define getcwd	_getcwd
-#define getpid	 _getpid
-#define hypot		_hypot
-#define isascii __isascii
-#define isatty	   _isatty
-#define lseek	   _lseek
-#define mkdir	_mkdir
-#define mktemp	   _mktemp
-#define open	   _open
-#define putenv	    _putenv
-#define read	   _read
-#define rmdir	_rmdir
-#define sleep(x) _sleep((x) * 1000)
-#define stat	 _stat
-#define sys_errlist _sys_errlist
-#define sys_nerr    _sys_nerr
-#define umask	   _umask
-#define unlink	   _unlink
-#define write	   _write
-#define random   rand
-#define srandom  srand
+#  define access	   _access
+#  define alloca	   _alloca
+#  define chdir	_chdir
+#  define chmod	   _chmod
+#  define close	   _close
+#  define creat	   _creat
+#  define dup	   _dup
+#  define dup2	   _dup2
+#  define environ     _environ
+#  define execl	 _execl
+#  define execle	 _execle
+#  define execlp	 _execlp
+#  define execlpe  _execlpe
+#  define execv	 _execv
+#  define execve	 _execve
+#  define execvp	 _execvp
+#  define execvpe  _execvpe
+#  define fdopen	  _fdopen
+#  define fileno	  _fileno
+#  define fstat	 _fstat
+#  define getcwd	_getcwd
+#  define getpid	 _getpid
+#  define hypot		_hypot
+#  define isascii __isascii
+#  define isatty	   _isatty
+#  define lseek	   _lseek
+#  define mkdir	_mkdir
+#  define mktemp	   _mktemp
+#  define open	   _open
+#  define putenv	    _putenv
+#  define read	   _read
+#  define rmdir	_rmdir
+#  define sleep(x) Sleep((x) * 1000)
+#  define stat	 _stat
+#  define sys_errlist _sys_errlist
+#  define sys_nerr    _sys_nerr
+#  define umask	   _umask
+#  define unlink	   _unlink
+#  define write	   _write
+#  define random   rand
+#  define srandom  srand
 
-#define O_RDONLY    _O_RDONLY
-#define O_WRONLY    _O_WRONLY
-#define O_RDWR	    _O_RDWR
-#define O_APPEND    _O_APPEND
-#define O_CREAT     _O_CREAT
-#define O_TRUNC     _O_TRUNC
-#define O_EXCL	    _O_EXCL
-#define O_TEXT	    _O_TEXT
-#define O_BINARY    _O_BINARY
-#define O_RAW	    _O_BINARY
+#  define O_RDONLY    _O_RDONLY
+#  define O_WRONLY    _O_WRONLY
+#  define O_RDWR	    _O_RDWR
+#  define O_APPEND    _O_APPEND
+#  define O_CREAT     _O_CREAT
+#  define O_TRUNC     _O_TRUNC
+#  define O_EXCL	    _O_EXCL
+#  define O_TEXT	    _O_TEXT
+#  define O_BINARY    _O_BINARY
+#  define O_RAW	    _O_BINARY
 
-#define S_IFMT	 _S_IFMT
-#define S_IFDIR  _S_IFDIR
-#define S_IFCHR  _S_IFCHR
-#define S_IFREG  _S_IFREG
-#define S_IREAD  _S_IREAD
-#define S_IWRITE _S_IWRITE
-#define S_IEXEC  _S_IEXEC
+#  define S_IFMT	 _S_IFMT
+#  define S_IFDIR  _S_IFDIR
+#  define S_IFCHR  _S_IFCHR
+#  define S_IFREG  _S_IFREG
+#  define S_IREAD  _S_IREAD
+#  define S_IWRITE _S_IWRITE
+#  define S_IEXEC  _S_IEXEC
 
-#define	F_OK	0
-#define	X_OK	1
-#define	W_OK	2
-#define	R_OK	4
-#endif /* __GNUC__ */
+#  define	F_OK	0
+#  define	X_OK	1
+#  define	W_OK	2
+#  define	R_OK	4
+# endif /* __GNUC__ */
 #endif
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xwindows.h b/recipes/xorg-lib/xorg-headers-native/X11/Xwindows.h
index 7fb9840bef..6318155e13 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xwindows.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xwindows.h
@@ -1,4 +1,3 @@
-/* $Xorg$ */
 /*
 
 Copyright 1996, 1998  The Open Group
@@ -28,18 +27,29 @@ The Open Group.
 */
 
 /*
- * This header file has for sole purpose to allow to include windows.h
- * without getting any name conflicts with our code.
- * Conflicts come from the fact that including windows.h actually pulls
- * in the whole Windows API...
+ * This header file has the sole purpose of allowing the inclusion of
+ * windows.h without getting any name conflicts with X headers code, by
+ * renaming the conflicting definitions from windows.h
+ *
+ * Some (non-Microsoft) versions of the Windows API headers actually avoid
+ * making the conflicting definitions if XFree86Server is defined, so we
+ * need to remember if that was defined and undefine it during including
+ * windows.h (so the conflicting definitions get wrapped correctly), and
+ * then redefine it afterwards...
+ *
+ * There doesn't seem to be a good way to wrap the min/max macros from
+ * windows.h, so we simply avoid defining them completely, allowing any
+ * pre-existing definition to stand.
+ *
  */
 
 #undef _XFree86Server
-#ifdef XFree86Server 
-#define _XFree86Server
-#undef XFree86Server
+#ifdef XFree86Server
+# define _XFree86Server
+# undef XFree86Server
 #endif
 
+#define NOMINMAX
 #define BOOL wBOOL
 #define INT32 wINT32
 #undef Status
@@ -48,6 +58,7 @@ The Open Group.
 #define BYTE wBYTE
 #define FreeResource wFreeResource
 #include <windows.h>
+#undef NOMINMAX
 #undef Status
 #define Status int
 #undef BYTE
@@ -56,25 +67,25 @@ The Open Group.
 #undef ATOM
 #undef FreeResource
 #undef CreateWindowA
-#undef min
-#undef max
 
 #ifdef RESOURCE_H
-#undef RT_FONT
-#undef RT_CURSOR
-#define RT_FONT         ((RESTYPE)4)
-#define RT_CURSOR       ((RESTYPE)5)
+# undef RT_FONT
+# undef RT_CURSOR
+# define RT_FONT         ((RESTYPE)4)
+# define RT_CURSOR       ((RESTYPE)5)
 #endif
 
-#define sleep(x) Sleep(1000*x)
+#ifndef __CYGWIN__
+#define sleep(x) Sleep((x) * 1000)
+#endif
 
 #if defined(WIN32) && (!defined(PATH_MAX) || PATH_MAX < 1024)
-#undef PATH_MAX
-#define PATH_MAX 1024
+# undef PATH_MAX
+# define PATH_MAX 1024
 #endif
 
 #ifdef _XFree86Server
-#define XFree86Server
-#undef _XFree86Server
+# define XFree86Server
+# undef _XFree86Server
 #endif
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xwinsock.h b/recipes/xorg-lib/xorg-headers-native/X11/Xwinsock.h
index 0278c09b78..e6ca7b54b3 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Xwinsock.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Xwinsock.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xwinsock.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
 /*
 
 Copyright 1996, 1998  The Open Group
@@ -36,8 +35,8 @@ The Open Group.
 
 #undef _XFree86Server
 #ifdef XFree86Server 
-#define _XFree86Server
-#undef XFree86Server
+# define _XFree86Server
+# undef XFree86Server
 #endif
 
 #define BOOL wBOOL
@@ -47,7 +46,7 @@ The Open Group.
 #define ATOM wATOM
 #define BYTE wBYTE
 #define FreeResource wFreeResource
-#include <winsock.h>
+#include <winsock2.h>
 #undef Status
 #define Status int
 #undef BYTE
@@ -60,7 +59,7 @@ The Open Group.
 #undef RT_CURSOR
 
 #ifdef _XFree86Server
-#define XFree86Server
-#undef _XFree86Server
+# define XFree86Server
+# undef _XFree86Server
 #endif
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/cursorfont.h b/recipes/xorg-lib/xorg-headers-native/X11/cursorfont.h
index c6204f1c54..70d71259b2 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/cursorfont.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/cursorfont.h
@@ -1,4 +1,3 @@
-/* $Xorg: cursorfont.h,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */
 /*
 
 Copyright 1987, 1998  The Open Group
@@ -27,6 +26,9 @@ from The Open Group.
 
 */
 
+#ifndef _cursorfont_h_
+#define _cursorfont_h_
+
 #define XC_num_glyphs 154
 #define XC_X_cursor 0
 #define XC_arrow 2
@@ -105,3 +107,5 @@ from The Open Group.
 #define XC_ur_angle 148
 #define XC_watch 150
 #define XC_xterm 152
+
+#endif /* _cursorfont_h_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/keysym.h b/recipes/xorg-lib/xorg-headers-native/X11/keysym.h
index 04e2956a70..641b25bf22 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/keysym.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/keysym.h
@@ -1,5 +1,3 @@
-/* $Xorg: keysym.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/keysym.h,v 1.3 2001/01/17 17:53:12 dawes Exp $ */
 
 /* default keysyms */
 #define XK_MISCELLANY
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/keysymdef.h b/recipes/xorg-lib/xorg-headers-native/X11/keysymdef.h
index dd9fbd98a4..ec125a65a7 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/keysymdef.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/keysymdef.h
@@ -1,5 +1,3 @@
-/* $Xorg: keysymdef.h,v 1.4 2001/02/09 02:03:23 $ */
-
 /***********************************************************
 Copyright 1987, 1994, 1998  The Open Group
 
@@ -47,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: $ */
 
 /*
  * The "X11 Window System Protocol" standard defines in Appendix A the
@@ -56,7 +53,7 @@ SOFTWARE.
  * engraving) of a keyboard layout. This file assigns mnemonic macro
  * names for these keysyms.
  *
- * This file is also compiled (by xc/lib/X11/util/makekeys.c) into
+ * This file is also compiled (by src/util/makekeys.c in libX11) into
  * hash tables that can be accessed with X11 library functions such as
  * XStringToKeysym() and XKeysymToString().
  *
@@ -93,9 +90,26 @@ SOFTWARE.
  *    /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\*\(U+([0-9A-F]{4,6}) (.*)\)\*\/\s*$/
  *    /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*(\/\*\s*(.*)\s*\*\/)?\s*$/
  *
+ * Before adding new keysyms, please do consider the following: In
+ * addition to the keysym names defined in this file, the
+ * XStringToKeysym() and XKeysymToString() functions will also handle
+ * any keysym string of the form "U0020" to "U007E" and "U00A0" to
+ * "U10FFFF" for all possible Unicode characters. In other words,
+ * every possible Unicode character has already a keysym string
+ * defined algorithmically, even if it is not listed here. Therefore,
+ * defining an additional keysym macro is only necessary where a
+ * non-hexadecimal mnemonic name is needed, or where the new keysym
+ * does not represent any existing Unicode character.
+ *
  * When adding new keysyms to this file, do not forget to also update the
- * mappings in xc/lib/X11/KeyBind.c and the protocol specification in
- * xc/doc/specs/XProtocol/X11.keysyms.
+ * following:
+ *
+ *   - the mappings in src/KeyBind.c in the repo
+ *     git://anongit.freedesktop.org/xorg/lib/libX11
+ *
+ *   - the protocol specification in specs/XProtocol/X11.keysyms
+ *     in the repo git://anongit.freedesktop.org/xorg/doc/xorg-docs
+ *
  */
 
 #define XK_VoidSymbol                  0xffffff  /* Void symbol */
@@ -327,6 +341,9 @@ SOFTWARE.
 #define XK_ISO_Level3_Shift              0xfe03
 #define XK_ISO_Level3_Latch              0xfe04
 #define XK_ISO_Level3_Lock               0xfe05
+#define XK_ISO_Level5_Shift              0xfe11
+#define XK_ISO_Level5_Latch              0xfe12
+#define XK_ISO_Level5_Lock               0xfe13
 #define XK_ISO_Group_Shift               0xff7e  /* Alias for mode_switch */
 #define XK_ISO_Group_Latch               0xfe06
 #define XK_ISO_Group_Lock                0xfe07
@@ -365,6 +382,7 @@ SOFTWARE.
 #define XK_dead_acute                    0xfe51
 #define XK_dead_circumflex               0xfe52
 #define XK_dead_tilde                    0xfe53
+#define XK_dead_perispomeni              0xfe53  /* alias for dead_tilde */
 #define XK_dead_macron                   0xfe54
 #define XK_dead_breve                    0xfe55
 #define XK_dead_abovedot                 0xfe56
@@ -381,6 +399,34 @@ SOFTWARE.
 #define XK_dead_hook                     0xfe61
 #define XK_dead_horn                     0xfe62
 #define XK_dead_stroke                   0xfe63
+#define XK_dead_abovecomma               0xfe64
+#define XK_dead_psili                    0xfe64  /* alias for dead_abovecomma */
+#define XK_dead_abovereversedcomma       0xfe65
+#define XK_dead_dasia                    0xfe65  /* alias for dead_abovereversedcomma */
+#define XK_dead_doublegrave              0xfe66
+#define XK_dead_belowring                0xfe67
+#define XK_dead_belowmacron              0xfe68
+#define XK_dead_belowcircumflex          0xfe69
+#define XK_dead_belowtilde               0xfe6a
+#define XK_dead_belowbreve               0xfe6b
+#define XK_dead_belowdiaeresis           0xfe6c
+#define XK_dead_invertedbreve            0xfe6d
+#define XK_dead_belowcomma               0xfe6e
+#define XK_dead_currency                 0xfe6f
+
+/* dead vowels for universal syllable entry */
+#define XK_dead_a                        0xfe80
+#define XK_dead_A                        0xfe81
+#define XK_dead_e                        0xfe82
+#define XK_dead_E                        0xfe83
+#define XK_dead_i                        0xfe84
+#define XK_dead_I                        0xfe85
+#define XK_dead_o                        0xfe86
+#define XK_dead_O                        0xfe87
+#define XK_dead_u                        0xfe88
+#define XK_dead_U                        0xfe89
+#define XK_dead_small_schwa              0xfe8a
+#define XK_dead_capital_schwa            0xfe8b
 
 #define XK_First_Virtual_Screen          0xfed0
 #define XK_Prev_Virtual_Screen           0xfed1
@@ -1465,20 +1511,20 @@ SOFTWARE.
 #define XK_downcaret                     0x0ba8  /*(U+2228 LOGICAL OR)*/
 #define XK_upcaret                       0x0ba9  /*(U+2227 LOGICAL AND)*/
 #define XK_overbar                       0x0bc0  /*(U+00AF MACRON)*/
-#define XK_downtack                      0x0bc2  /* U+22A5 UP TACK */
+#define XK_downtack                      0x0bc2  /* U+22A4 DOWN TACK */
 #define XK_upshoe                        0x0bc3  /*(U+2229 INTERSECTION)*/
 #define XK_downstile                     0x0bc4  /* U+230A LEFT FLOOR */
 #define XK_underbar                      0x0bc6  /*(U+005F LOW LINE)*/
 #define XK_jot                           0x0bca  /* U+2218 RING OPERATOR */
 #define XK_quad                          0x0bcc  /* U+2395 APL FUNCTIONAL SYMBOL QUAD */
-#define XK_uptack                        0x0bce  /* U+22A4 DOWN TACK */
+#define XK_uptack                        0x0bce  /* U+22A5 UP TACK */
 #define XK_circle                        0x0bcf  /* U+25CB WHITE CIRCLE */
 #define XK_upstile                       0x0bd3  /* U+2308 LEFT CEILING */
 #define XK_downshoe                      0x0bd6  /*(U+222A UNION)*/
 #define XK_rightshoe                     0x0bd8  /*(U+2283 SUPERSET OF)*/
 #define XK_leftshoe                      0x0bda  /*(U+2282 SUBSET OF)*/
-#define XK_lefttack                      0x0bdc  /* U+22A2 RIGHT TACK */
-#define XK_righttack                     0x0bfc  /* U+22A3 LEFT TACK */
+#define XK_lefttack                      0x0bdc  /* U+22A3 LEFT TACK */
+#define XK_righttack                     0x0bfc  /* U+22A2 RIGHT TACK */
 #endif /* XK_APL */
 
 /*
diff --git a/recipes/xorg-lib/xtrans_1.0.3.bb b/recipes/xorg-lib/xtrans_1.0.3.bb
index e34e78c2cc..30c3d03ba1 100644
--- a/recipes/xorg-lib/xtrans_1.0.3.bb
+++ b/recipes/xorg-lib/xtrans_1.0.3.bb
@@ -6,7 +6,7 @@ PE = "1"
 
 ALLOW_EMPTY = "1"
 
-SRC_URI += "file://fix-missing-includepath.patch;patch=1"
+SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "bb196907ea1e182dcb396eb22f7d2c1a"
 SRC_URI[archive.sha256sum] = "e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085"
diff --git a/recipes/xorg-lib/xtrans_1.0.4.bb b/recipes/xorg-lib/xtrans_1.0.4.bb
index 71e85f8fa3..de826bb9ba 100644
--- a/recipes/xorg-lib/xtrans_1.0.4.bb
+++ b/recipes/xorg-lib/xtrans_1.0.4.bb
@@ -8,7 +8,7 @@ ALLOW_EMPTY = "1"
 
 XORG_PN = "xtrans"
 
-SRC_URI += "file://fix-missing-includepath.patch;patch=1"
+SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "8b36cdf08df12be96615e3d550236626"
 SRC_URI[archive.sha256sum] = "765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c"
diff --git a/recipes/xorg-lib/xtrans_1.1.bb b/recipes/xorg-lib/xtrans_1.1.bb
index 8aede7cb5d..0ec225f7d7 100644
--- a/recipes/xorg-lib/xtrans_1.1.bb
+++ b/recipes/xorg-lib/xtrans_1.1.bb
@@ -6,7 +6,7 @@ PE = "1"
 
 ALLOW_EMPTY = "1"
 
-SRC_URI += "file://fix-missing-includepath.patch;patch=1"
+SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "8546e3a060aefb42c889eaa4b5db33af"
 SRC_URI[archive.sha256sum] = "16bc4646f105efd3d0dd105899ac19035d67acf50950ca8c70cf68772508272d"
diff --git a/recipes/xorg-lib/xtrans_1.2.bb b/recipes/xorg-lib/xtrans_1.2.bb
index abe168615d..b5d56ac9f6 100644
--- a/recipes/xorg-lib/xtrans_1.2.bb
+++ b/recipes/xorg-lib/xtrans_1.2.bb
@@ -6,7 +6,7 @@ PE = "1"
 
 ALLOW_EMPTY = "1"
 
-SRC_URI += "file://fix-missing-includepath.patch;patch=1"
+SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "a91fef8b932b21992af7dfff7b2643f3"
 SRC_URI[archive.sha256sum] = "d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4"
diff --git a/recipes/xorg-util/imake_1.0.3.bb b/recipes/xorg-util/imake_1.0.3.bb
new file mode 100644
index 0000000000..ce51d59ecb
--- /dev/null
+++ b/recipes/xorg-util/imake_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "C preprocessor interface to the make utility"
+RDEPENDS = "perl xproto"
+
+PR = "r2"
+PE = "1"
+SRC_URI[archive.md5sum] = "579377af36a146913b3429cad1f7e8ab"
+SRC_URI[archive.sha256sum] = "5d149c3cc9a0d7eca2a4bb44e5597f50f6d7ec75b61d7ca2ded842294214012d"
diff --git a/recipes/xorg-util/util-macros_1.1.5.bb b/recipes/xorg-util/util-macros_1.1.5.bb
index f8d0b14c16..bd580ad244 100644
--- a/recipes/xorg-util/util-macros_1.1.5.bb
+++ b/recipes/xorg-util/util-macros_1.1.5.bb
@@ -1,5 +1,5 @@
 require util-macros.inc
-SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
+SRC_URI += "file://unbreak_cross_compile.patch"
 PR = "${INC_PR}.0"
 SRC_URI[archive.md5sum] = "d168aa001b946b58d9aab6088c09d256"
 SRC_URI[archive.sha256sum] = "4f2a8a19e90ad82bc2da4eb52799a299a1c94bf5143bc2711e9e5d4cc5a7cdb4"
diff --git a/recipes/xorg-util/util-macros_1.2.1.bb b/recipes/xorg-util/util-macros_1.2.1.bb
index 4cc3b25019..9c37f50298 100644
--- a/recipes/xorg-util/util-macros_1.2.1.bb
+++ b/recipes/xorg-util/util-macros_1.2.1.bb
@@ -4,7 +4,7 @@ require util-macros.inc
 # Instead, the cross compiler must be used. Whenever upgrading to
 # a new version, please recheck for this problem, otherwise it breaks
 # builds with older gcc versions!
-SRC_URI += " file://cross-compiler-for-checking.patch;patch=1"
+SRC_URI += " file://cross-compiler-for-checking.patch"
 PR = "${INC_PR}.0"
 SRC_URI[archive.md5sum] = "81b9746d6202ccf0b4a498cfd0731e71"
 SRC_URI[archive.sha256sum] = "f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401"
diff --git a/recipes/xorg-util/util-macros_1.4.1.bb b/recipes/xorg-util/util-macros_1.4.1.bb
index 12e6b1e2cb..7d9e60898a 100644
--- a/recipes/xorg-util/util-macros_1.4.1.bb
+++ b/recipes/xorg-util/util-macros_1.4.1.bb
@@ -1,5 +1,5 @@
 require util-macros.inc
-SRC_URI += " file://malloc_zero_returns_null.patch;patch=1"
+SRC_URI += " file://malloc_zero_returns_null.patch"
 PR = "${INC_PR}.0"
 SRC_URI[archive.md5sum] = "8ac38951e753f250aaefbd4ba0afda94"
 SRC_URI[archive.sha256sum] = "d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986"
diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc
index a72812c22f..1ff337e375 100644
--- a/recipes/xorg-xserver/xorg-xserver-common.inc
+++ b/recipes/xorg-xserver/xorg-xserver-common.inc
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/base"
 LICENSE = "MIT-X"
 
-INC_PR = "r14"
+INC_PR = "r16"
 
 PROVIDES = "virtual/xserver"
 
@@ -52,6 +52,8 @@ RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-font
 
 PACKAGES =+ "${PN}-sdl ${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr"
 
+RDEPENDS_${PN}-xvfb += "xkeyboard-config"
+
 FILES_${PN}-fbdev = "${bindir}/Xfbdev"
 FILES_${PN}-sdl = "${bindir}/Xsdl"
 FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
diff --git a/recipes/xorg-xserver/xserver-kdrive-common.inc b/recipes/xorg-xserver/xserver-kdrive-common.inc
index 9df0232f9c..6272a3ae26 100644
--- a/recipes/xorg-xserver/xserver-kdrive-common.inc
+++ b/recipes/xorg-xserver/xserver-kdrive-common.inc
@@ -75,19 +75,19 @@ FILES_${PKGN}-via = "${bindir}/Xvia"
 SRC_URI ?= "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2;name=archive \
 	${KDRIVE_COMMON_PATCHES}"
 KDRIVE_COMMON_PATCHES = " \
-	file://kmode.patch;patch=1 \
-	file://kmode-800_480.patch;patch=1 \
-	file://disable-apm.patch;patch=1 \
-	file://no-serial-probing.patch;patch=1 \
-	file://fbdev-not-fix.patch;patch=1  \
-	file://optional-xkb.patch;patch=1 \
-	file://enable-tslib.patch;patch=1 \
-	file://kmode-palm.patch;patch=1 \
+	file://kmode.patch \
+	file://kmode-800_480.patch \
+	file://disable-apm.patch \
+	file://no-serial-probing.patch \
+	file://fbdev-not-fix.patch  \
+	file://optional-xkb.patch \
+	file://enable-tslib.patch \
+	file://kmode-palm.patch \
 	"
 
-SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
-SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;patch=1"
+SRC_URI_append_mnci   = " file://onlyfb.patch"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch"
+SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch"
 PACKAGE_ARCH_poodle = "${MACHINE_ARCH}"
 PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}"
 
diff --git a/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
index 0fb56022d4..080c6e2d69 100644
--- a/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
@@ -12,18 +12,18 @@ PR = "r8"
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-${PV}:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://kdrive-evdev.patch;patch=1  \
-	file://kdrive-use-evdev.patch;patch=1  \
-	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-        file://fbcompositesrc8888revnpx0565.patch;patch=1 \
-        file://kdrive-vidmemarea.patch;patch=1 \
-        file://kdrive-imageon.patch;patch=1 \
-        file://xcalibrate_coords.patch;patch=1 \
-        file://enable-builtin-fonts.patch;patch=1 \
-	file://fix-picturestr-include-order.patch;patch=1 \
-	file://split_multiple_AC_SUBST.patch;patch=1 \
-	file://report-correct-randr10.patch;patch=1 \
+	file://kdrive-evdev.patch  \
+	file://kdrive-use-evdev.patch  \
+	file://disable-xf86-dga-xorgcfg.patch \
+	file://enable-xcalibrate.patch \
+        file://fbcompositesrc8888revnpx0565.patch \
+        file://kdrive-vidmemarea.patch \
+        file://kdrive-imageon.patch \
+        file://xcalibrate_coords.patch \
+        file://enable-builtin-fonts.patch \
+	file://fix-picturestr-include-order.patch \
+	file://split_multiple_AC_SUBST.patch \
+	file://report-correct-randr10.patch \
 	"
        
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive-nomadik_1.3.0.0.bb b/recipes/xorg-xserver/xserver-kdrive-nomadik_1.3.0.0.bb
index 98f221b58b..490f18a371 100644
--- a/recipes/xorg-xserver/xserver-kdrive-nomadik_1.3.0.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive-nomadik_1.3.0.0.bb
@@ -18,10 +18,10 @@ RDEPENDS_xserver-kdrive-nomadikfb = "sga-init"
 RRECOMMENDS_xserver-kdrive-nomadikfb = "kernel-module-nmdkmod-sva"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
-        file://nomadik_xserver_1300.patch;patch=1 \
-        file://nomadik_xserver_sva_service_cleanup.patch;patch=1 \
-        file://autotools.patch;patch=1 \
-        file://fix-picturestr-include-order.patch;patch=1" 
+        file://nomadik_xserver_1300.patch \
+        file://nomadik_xserver_sva_service_cleanup.patch \
+        file://autotools.patch \
+        file://fix-picturestr-include-order.patch" 
 
 S = "${WORKDIR}/xorg-server-${PV}"
 
diff --git a/recipes/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb b/recipes/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
index fa908ccab0..8f69d4b6ec 100644
--- a/recipes/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
+++ b/recipes/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
@@ -15,24 +15,24 @@ COMPATIBLE_MACHINE = "nokia(800|770)"
 FILES_${PN} = "${libdir}/xserver /etc/dbus-1/* ${bindir}/Xomap"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/xorg-server_1.1.99.3-0osso31.tar.gz \
-	file://kmode.patch;patch=1 \
-	file://disable-apm.patch;patch=1 \
-	file://no-serial-probing.patch;patch=1 \
-	file://fbdev-not-fix.patch;patch=1  \
-	file://enable-builtin-fonts.patch;patch=1 \
-	file://xcalibrate.patch;patch=1 \
-	file://fixups.patch;patch=1 \
-	file://button_only.patch;patch=1 \
-	file://calibrateext.patch;patch=1 \
-        file://fix-picturestr-include-order.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://report-correct-randr10.patch;patch=1"
-#	file://kdrive-evdev.patch;patch=1  \
-#	file://kdrive-use-evdev.patch;patch=1  \
-#	file://optional-xkb.patch;patch=1 \
-#	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-#	file://enable-tslib.patch;patch=1 \
-#	file://xfbdev-fb-opt.patch;patch=1"
+	file://kmode.patch \
+	file://disable-apm.patch \
+	file://no-serial-probing.patch \
+	file://fbdev-not-fix.patch  \
+	file://enable-builtin-fonts.patch \
+	file://xcalibrate.patch \
+	file://fixups.patch \
+	file://button_only.patch \
+	file://calibrateext.patch \
+        file://fix-picturestr-include-order.patch \
+	file://xcalibrate_coords.patch \
+	file://report-correct-randr10.patch"
+#	file://kdrive-evdev.patch  \
+#	file://kdrive-use-evdev.patch  \
+#	file://optional-xkb.patch \
+#	file://disable-xf86-dga-xorgcfg.patch \
+#	file://enable-tslib.patch \
+#	file://xfbdev-fb-opt.patch"
 
 S = "${WORKDIR}/xorg-server-1.1.99.3"
 
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.1.0.bb b/recipes/xorg-xserver/xserver-kdrive_1.1.0.bb
index 13bea4c0c4..df6378230d 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.1.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.1.0.bb
@@ -22,24 +22,24 @@ RDEPENDS_xserver-kdrive-fake = "${PN}"
 RDEPENDS_xserver-kdrive-xephyr = "${PN}"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-1.1.0.tar.bz2 \
-	file://kmode.patch;patch=1 \
-	file://disable-apm.patch;patch=1 \
-	file://no-serial-probing.patch;patch=1 \
-	file://kdrive-evdev.patch;patch=1  \
-	file://kdrive-use-evdev.patch;patch=1  \
-	file://fbdev-not-fix.patch;patch=1  \
-	file://enable-builtin-fonts.patch;patch=1 \
-	file://optional-xkb.patch;patch=1 \
-	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-	file://enable-tslib.patch;patch=1 \
-	file://xcalibrate.patch;patch=1 \
-	file://xfbdev-fb-opt.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://report-correct-randr10.patch;patch=1"
+	file://kmode.patch \
+	file://disable-apm.patch \
+	file://no-serial-probing.patch \
+	file://kdrive-evdev.patch  \
+	file://kdrive-use-evdev.patch  \
+	file://fbdev-not-fix.patch  \
+	file://enable-builtin-fonts.patch \
+	file://optional-xkb.patch \
+	file://disable-xf86-dga-xorgcfg.patch \
+	file://enable-tslib.patch \
+	file://xcalibrate.patch \
+	file://xfbdev-fb-opt.patch \
+	file://hide-cursor-and-ppm-root.patch \
+	file://report-correct-randr10.patch"
 
-SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
-SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;patch=1"
+SRC_URI_append_mnci   = " file://onlyfb.patch"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch"
+SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch"
 PACKAGE_ARCH_poodle = "poodle"
 
 S = "${WORKDIR}/xorg-server-1.1.0"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.2.0.bb b/recipes/xorg-xserver/xserver-kdrive_1.2.0.bb
index 0f85ff5d89..167c8e9e27 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.2.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.2.0.bb
@@ -7,18 +7,18 @@ PR = "r11"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-	file://enable-builtin-fonts.patch;patch=1 \
-	file://kdrive-evdev.patch;patch=1  \
-	file://kdrive-use-evdev.patch;patch=1  \
-	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-        file://w100.patch;patch=1 \
-        file://w100-autofoo.patch;patch=1 \
-        file://w100-fix-offscreen-bmp.patch;patch=1 \
-        file://fbcompositesrc8888revnpx0565.patch;patch=1 \
-        file://xcalibrate_coords.patch;patch=1 \
-	file://report-correct-randr10.patch;patch=1 \
+	file://enable-epson.patch \
+	file://enable-builtin-fonts.patch \
+	file://kdrive-evdev.patch  \
+	file://kdrive-use-evdev.patch  \
+	file://disable-xf86-dga-xorgcfg.patch \
+	file://enable-xcalibrate.patch \
+        file://w100.patch \
+        file://w100-autofoo.patch \
+        file://w100-fix-offscreen-bmp.patch \
+        file://fbcompositesrc8888revnpx0565.patch \
+        file://xcalibrate_coords.patch \
+	file://report-correct-randr10.patch \
 	"
        
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 68af4aac4a..ce5a3fc1bb 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -7,31 +7,31 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-	file://enable-builtin-fonts.patch;patch=1 \
-	file://kdrive-evdev.patch;patch=1  \
-	file://kdrive-use-evdev.patch;patch=1  \
-	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-        file://kdrive-1.3-18bpp.patch;patch=1 \
-        file://linux-keyboard-mediumraw.patch;patch=1 \
-        file://gumstix-kmode.patch;patch=1 \
-        file://fix-picturestr-include-order.patch;patch=1 \
-        file://autotools.patch;patch=1 \
-	file://report-correct-randr12.patch;patch=1 \
+	file://enable-epson.patch \
+	file://enable-builtin-fonts.patch \
+	file://kdrive-evdev.patch  \
+	file://kdrive-use-evdev.patch  \
+	file://disable-xf86-dga-xorgcfg.patch \
+        file://fix_default_mode.patch \
+	file://enable-xcalibrate.patch \
+	file://hide-cursor-and-ppm-root.patch \
+	file://xcalibrate_coords.patch \
+	file://w100.patch \
+	file://w100-autofoo.patch \
+	file://w100-fix-offscreen-bmp.patch \
+        file://kdrive-1.3-18bpp.patch \
+        file://linux-keyboard-mediumraw.patch \
+        file://gumstix-kmode.patch \
+        file://fix-picturestr-include-order.patch \
+        file://autotools.patch \
+	file://report-correct-randr12.patch \
 "
 
 SRC_URI_append_avr32 = " \
-        file://xorg-avr32-support.diff;patch=1 \
+        file://xorg-avr32-support.diff \
 "
 
-SRC_URI_append_tosa = "file://tosa-fbdev.patch;patch=1"
+SRC_URI_append_tosa = "file://tosa-fbdev.patch"
 PACKAGE_ARCH_xserver-kdrive-fbdev_tosa = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
index b8356404c7..42a48ce656 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
@@ -8,26 +8,26 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-	file://w100-new-input-world-order.patch;patch=1 \
-	file://linux-keyboard-mediumraw.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-	file://fbdev-evdev.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://xorg-avr32-support.diff;patch=1 \
-	file://pkgconfig_fix.patch;patch=1 \
-        file://no_xkb.patch;patch=1;pnum=0 \
-	file://xorg-1.4-kdrive-rotation.patch;patch=1 \
-	file://split_multiple_AC_SUBST.patch;patch=1 \
-	file://vm86_masks.patch;patch=1 \
+	file://enable-epson.patch \
+        file://fix_default_mode.patch \
+	file://enable-xcalibrate.patch \
+	file://hide-cursor-and-ppm-root.patch \
+	file://xcalibrate_coords.patch \
+	file://w100.patch \
+	file://w100-autofoo.patch \
+	file://w100-fix-offscreen-bmp.patch \
+	file://w100-new-input-world-order.patch \
+	file://linux-keyboard-mediumraw.patch \
+	file://xcalibrate-new-input-world-order.patch \
+	file://tslib-default-device.patch \
+	file://fbdev-evdev.patch \
+	file://keyboard-resume-workaround.patch \
+	file://xorg-avr32-support.diff \
+	file://pkgconfig_fix.patch \
+        file://no_xkb.patch;striplevel=0 \
+	file://xorg-1.4-kdrive-rotation.patch \
+	file://split_multiple_AC_SUBST.patch \
+	file://vm86_masks.patch \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
index 4f7b460c67..1c63866306 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
@@ -8,24 +8,24 @@ PR = "${INC_PR}.1"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-	file://w100-new-input-world-order.patch;patch=1 \
-	file://linux-keyboard-mediumraw.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-	file://fbdev-evdev.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://xorg-avr32-support.diff;patch=1 \
-	file://pkgconfig_fix.patch;patch=1 \
-        file://no_xkb.patch;patch=1;pnum=0 \
-	file://vm86_masks.patch;patch=1 \
+	file://enable-epson.patch \
+        file://fix_default_mode.patch \
+	file://enable-xcalibrate.patch \
+	file://hide-cursor-and-ppm-root.patch \
+	file://xcalibrate_coords.patch \
+	file://w100.patch \
+	file://w100-autofoo.patch \
+	file://w100-fix-offscreen-bmp.patch \
+	file://w100-new-input-world-order.patch \
+	file://linux-keyboard-mediumraw.patch \
+	file://xcalibrate-new-input-world-order.patch \
+	file://tslib-default-device.patch \
+	file://fbdev-evdev.patch \
+	file://keyboard-resume-workaround.patch \
+	file://xorg-avr32-support.diff \
+	file://pkgconfig_fix.patch \
+        file://no_xkb.patch;striplevel=0 \
+	file://vm86_masks.patch \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
index e658b316b0..483133e8d6 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
@@ -10,22 +10,22 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-#	file://hide-cursor-and-ppm-root.patch;patch=1 \
-#	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-	file://w100-new-input-world-order.patch;patch=1 \
-	file://linux-keyboard-mediumraw.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-#	file://fbdev-evdev.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://xorg-avr32-support.diff;patch=1 \
-#	file://pkgconfig_fix.patch;patch=1 \
-	file://no_xkb.patch;patch=1;pnum=0 \
+	file://enable-epson.patch \
+        file://fix_default_mode.patch \
+#	file://hide-cursor-and-ppm-root.patch \
+#	file://xcalibrate_coords.patch \
+	file://w100.patch \
+	file://w100-autofoo.patch \
+	file://w100-fix-offscreen-bmp.patch \
+	file://w100-new-input-world-order.patch \
+	file://linux-keyboard-mediumraw.patch \
+	file://xcalibrate-new-input-world-order.patch \
+	file://tslib-default-device.patch \
+#	file://fbdev-evdev.patch \
+	file://keyboard-resume-workaround.patch \
+	file://xorg-avr32-support.diff \
+#	file://pkgconfig_fix.patch \
+	file://no_xkb.patch;striplevel=0 \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.bb
index f01de6ef26..a00160ab57 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.bb
@@ -8,22 +8,22 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-	file://w100-new-input-world-order.patch;patch=1 \
-	file://linux-keyboard-mediumraw.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-	file://fbdev-evdev.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://xorg-avr32-support.diff;patch=1 \
-	file://pkgconfig_fix.patch;patch=1 \
+	file://enable-epson.patch \
+        file://fix_default_mode.patch \
+	file://enable-xcalibrate.patch \
+	file://hide-cursor-and-ppm-root.patch \
+	file://xcalibrate_coords.patch \
+	file://w100.patch \
+	file://w100-autofoo.patch \
+	file://w100-fix-offscreen-bmp.patch \
+	file://w100-new-input-world-order.patch \
+	file://linux-keyboard-mediumraw.patch \
+	file://xcalibrate-new-input-world-order.patch \
+	file://tslib-default-device.patch \
+	file://fbdev-evdev.patch \
+	file://keyboard-resume-workaround.patch \
+	file://xorg-avr32-support.diff \
+	file://pkgconfig_fix.patch \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
index af9ebbe53a..f1430fc43b 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
@@ -10,15 +10,15 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-	file://linux-keyboard-mediumraw.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://xorg-avr32-support.diff;patch=1 \
-    file://sysroot_fix.patch;patch=1 \
-    file://drmfix.patch;patch=1 \
+	file://enable-epson.patch \
+        file://fix_default_mode.patch \
+	file://linux-keyboard-mediumraw.patch \
+	file://xcalibrate-new-input-world-order.patch \
+	file://tslib-default-device.patch \
+	file://keyboard-resume-workaround.patch \
+	file://xorg-avr32-support.diff \
+    file://sysroot_fix.patch \
+    file://drmfix.patch \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_git.bb b/recipes/xorg-xserver/xserver-kdrive_git.bb
index 7311fdcc6b..8802d9c54d 100644
--- a/recipes/xorg-xserver/xserver-kdrive_git.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_git.bb
@@ -12,20 +12,20 @@ PR = "${INC_PR}.0"
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-git:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-	file://fix_default_mode.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-	file://w100-new-input-world-order.patch;patch=1 \
-	file://w100-post-1.4-buildfix.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-	file://fbdev-evdev.patch;patch=1 \
-	file://xephyr-post-1.4-buildfix.patch;patch=1 \
+	file://enable-epson.patch \
+	file://fix_default_mode.patch \
+	file://enable-xcalibrate.patch \
+	file://hide-cursor-and-ppm-root.patch \
+	file://xcalibrate_coords.patch \
+	file://w100.patch \
+	file://w100-autofoo.patch \
+	file://w100-fix-offscreen-bmp.patch \
+	file://w100-new-input-world-order.patch \
+	file://w100-post-1.4-buildfix.patch \
+	file://xcalibrate-new-input-world-order.patch \
+	file://tslib-default-device.patch \
+	file://fbdev-evdev.patch \
+	file://xephyr-post-1.4-buildfix.patch \
 	"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.8.1/hack-assume-pixman-supports-overlapped-blt.patch
new file mode 100644
index 0000000000..a947582f15
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.8.1/hack-assume-pixman-supports-overlapped-blt.patch
@@ -0,0 +1,14 @@
+diff --git a/fb/fbcopy.c b/fb/fbcopy.c
+index 07eb663..ba394b7 100644
+--- a/fb/fbcopy.c
++++ b/fb/fbcopy.c
+@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr	pSrcDrawable,
+     while (nbox--)
+     {
+ #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */
+-	if (pm == FB_ALLONES && alu == GXcopy && !reverse &&
+-	    !upsidedown)
++	if (pm == FB_ALLONES && alu == GXcopy)
+ 	{
+ 	    if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
+ 			     (pbox->x1 + dx + srcXoff),
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf
index 0b976fe632..6301d06900 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf
@@ -26,4 +26,12 @@ EndSection
 Section "ServerLayout"                                 
         Identifier      "Builtin Default Layout"                                     
         Screen  "Builtin Default fbdev Screen 0"        
+		InputDevice "bmi-lcd-ts" "CorePointer"
 EndSection                                              
+
+Section "InputDevice"
+		Identifier "bmi-lcd-ts"
+		Driver "tslib"
+		Option "SwapAxes" "1"
+		Option "Device" "/dev/input/touchscreen0"
+EndSection
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf
new file mode 100644
index 0000000000..2950193ce3
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf
@@ -0,0 +1,39 @@
+Section "Monitor"
+	Identifier "LCD Panel"
+EndSection
+
+Section "Device"
+    Identifier  "Xilinx frame buffer"
+    Driver      "fbdev"
+EndSection
+
+Section "Screen"
+    Identifier  "Default Screen"
+    Device      "Xilinx frame buffer"
+    Monitor     "LCD Panel"
+	SubSection "Display"
+		Depth   24
+        Modes   "640x480"
+	EndSubSection
+EndSection
+
+Section "InputDevice"
+    Identifier  "Keyboard"
+    Driver      "kbd"
+#    Option      "XkbLayout" "es"
+#    Option      "XkbModel"  "pc105"
+EndSection
+
+Section "InputDevice"
+    Identifier  "Mouse"
+    Driver      "mouse"
+    Option      "protocol" "auto"
+    Option      "device" "/dev/input/mice"
+EndSection
+
+Section "ServerLayout"
+    Identifier  "Default Layout"
+    Screen      "Default Screen"
+    InputDevice "Keyboard"
+    InputDevice "Mouse"
+EndSection
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index 283bc58f1f..c56aafc656 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r25"
+PR = "r26"
 
 SRC_URI = "file://xorg.conf"
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
index d3b9dde754..0b2e39958c 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
@@ -10,6 +10,6 @@ export LDFLAGS += " -ldl "
 
 #DEPENDS += " "
 
-SRC_URI += "file://report-correct-randr10.patch;patch=1"
+SRC_URI += "file://report-correct-randr10.patch"
 SRC_URI[archive.md5sum] = "ea291c89e68832d570d9d5e007218bd6"
 SRC_URI[archive.sha256sum] = "e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb b/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
index fadcd0d8bd..c2ec4b1084 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -4,9 +4,9 @@ require xorg-xserver-common.inc
 PE = "1"
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://drmfix.patch;patch=1 \
-            file://glyphstr.patch;patch=1 \
-            file://report-correct-randr12.patch;patch=1"
+SRC_URI += "file://drmfix.patch \
+            file://glyphstr.patch \
+            file://report-correct-randr12.patch"
 
 export LDFLAGS += " -ldl "
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb
index cc33b3cf0b..692c6c3825 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -6,9 +6,9 @@ RDEPENDS += "hal"
 PE = "1"
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://drmfix.patch;patch=1 \
-            file://pkgconfig_fix.patch;patch=1 \
-            file://sysroot_fix.patch;patch=1 \
+SRC_URI += "file://drmfix.patch \
+            file://pkgconfig_fix.patch \
+            file://sysroot_fix.patch \
             file://xcalibrate-xorg.diff \
 "
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.bb b/recipes/xorg-xserver/xserver-xorg_1.4.bb
index 8d0fa884be..fcddb1dee9 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.4.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.4.bb
@@ -6,9 +6,9 @@ RDEPENDS += "hal"
 PE = "1"
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://drmfix.patch;patch=1 \
-            file://pkgconfig_fix.patch;patch=1 \
-            file://sysroot_fix.patch;patch=1"
+SRC_URI += "file://drmfix.patch \
+            file://pkgconfig_fix.patch \
+            file://sysroot_fix.patch"
 
 MESA_VER = "7.0.2"
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb
index db30fbeeda..a1af8c39d1 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb
@@ -6,8 +6,8 @@ RDEPENDS += "hal"
 PE = "1"
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://drmfix.patch;patch=1 \
-            file://sysroot_fix.patch;patch=1"
+SRC_URI += "file://drmfix.patch \
+            file://sysroot_fix.patch"
 
 MESA_VER = "7.2"
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
index 3a8ef9a22d..502ad6d60c 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
@@ -6,11 +6,11 @@ RDEPENDS += "hal"
 PE = "2"
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://drmfix.patch;patch=1 \
-            file://sysroot_fix.patch;patch=1 \
-            file://xorg-avr32-support.diff;patch=1 \
-	    file://xorg-server-1.5.3-configure.patch;patch=1 \
-	    file://xorg-server-1.5.3-glcore-prepare-for-dynamic.patch;patch=1 \
+SRC_URI += "file://drmfix.patch \
+            file://sysroot_fix.patch \
+            file://xorg-avr32-support.diff \
+	    file://xorg-server-1.5.3-configure.patch \
+	    file://xorg-server-1.5.3-glcore-prepare-for-dynamic.patch \
 "
 
 MESA_VER = "7.2"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.1.bb b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb
index 14d1a20ab1..d8020cff1b 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb
@@ -5,9 +5,9 @@ DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://sysroot_fix.patch;patch=1 \
-            file://dolt-fix-1.7.0.patch;patch=1 \
-            file://randr-support-1.7.0.patch;patch=1 \
+SRC_URI += "file://sysroot_fix.patch \
+            file://dolt-fix-1.7.0.patch \
+            file://randr-support-1.7.0.patch \
            "
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
index 3424784805..8dbf5f8986 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
@@ -5,14 +5,14 @@ DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://sysroot_fix.patch;patch=1 \
-            file://dolt-fix-1.7.0.patch;patch=1 \
-            file://randr-support-1.7.0.patch;patch=1 \
-	    file://hack-fbdev-ignore-return-mode.patch;patch=1 \
+SRC_URI += "file://sysroot_fix.patch \
+            file://dolt-fix-1.7.0.patch \
+            file://randr-support-1.7.0.patch \
+	    file://hack-fbdev-ignore-return-mode.patch \
            "
 
-SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
-SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
+SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch"
 
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts
diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.0.bb b/recipes/xorg-xserver/xserver-xorg_1.8.0.bb
index 0bd187d794..14d3523ed7 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.8.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.0.bb
@@ -1,3 +1,6 @@
+# Assign it here, since the hal->udev transition happens post 1.7 in angstrom
+DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
+
 require xorg-xserver-common.inc
 
 DESCRIPTION = "the X.Org X server"
@@ -10,15 +13,15 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "1"
 
 SRC_URI += " \
-            file://dolt-fix-1.7.0.patch;patch=1 \
-            file://randr-support-1.7.0.patch;patch=1 \
-	    file://hack-fbdev-ignore-return-mode.patch;patch=1 \
+            file://dolt-fix-1.7.0.patch \
+            file://randr-support-1.7.0.patch \
+	    file://hack-fbdev-ignore-return-mode.patch \
            "
 SRC_URI[archive.md5sum] = "7cec3a11890bb53f4a07854319360348"
 SRC_URI[archive.sha256sum] = "423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77"
 
-SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
-SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
+SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch"
 
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts
diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.1.bb b/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
new file mode 100644
index 0000000000..b1e6257850
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
@@ -0,0 +1,37 @@
+# Assign it here, since the hal->udev transition happens post 1.7 in angstrom
+DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
+
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
+PE = "2"
+PR = "${INC_PR}.1"
+
+# Needs newer mesa-dri, where is D_P = "-1"
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_shr = "1"
+
+SRC_URI += " \
+            file://dolt-fix-1.7.0.patch \
+            file://randr-support-1.7.0.patch \
+	    file://hack-fbdev-ignore-return-mode.patch \
+           "
+SRC_URI[archive.md5sum] = "7c3b873692f4e93938261d774510e78d"
+SRC_URI[archive.sha256sum] = "bddb974d8f21107ab8f79abf92cebb06ec13243f1ffd1ef56b48452c4994659d"
+
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
+SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch"
+
+do_install_prepend() {
+        mkdir -p ${D}/${libdir}/X11/fonts
+}
+
+# The NVidia driver requires Xinerama support in the X server. Ion uses it.
+PACKAGE_ARCH_ion = "${MACHINE_ARCH}"
+XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
+
+EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests "
+
+export LDFLAGS += " -ldl "
diff --git a/recipes/xorg-xserver/xserver-xorg_cvs.bb b/recipes/xorg-xserver/xserver-xorg_cvs.bb
index c120dc713d..ef081d931a 100644
--- a/recipes/xorg-xserver/xserver-xorg_cvs.bb
+++ b/recipes/xorg-xserver/xserver-xorg_cvs.bb
@@ -7,8 +7,8 @@ PV = "6.8.1+cvs${SRCDATE}"
 DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \
-	file://imake-staging.patch;patch=1 \
-	file://dri.patch;patch=1"
+	file://imake-staging.patch \
+	file://dri.patch"
 
 PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
 
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index 20c8b09c58..a0b5f7dd3c 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -11,9 +11,9 @@ DEFAULT_PREFERENCE = "-1"
 
 SRCREV = "67b814d9b2baea6beccfb1625a1e3f0b2ba7218b"
 SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \
-           file://dolt-fix-1.7.0.patch;patch=1 \
-           file://randr-support-1.7.0.patch;patch=1 \
-	   file://hack-fbdev-ignore-return-mode.patch;patch=1 \
+           file://dolt-fix-1.7.0.patch \
+           file://randr-support-1.7.0.patch \
+	   file://hack-fbdev-ignore-return-mode.patch \
            "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/xprint/xprint_0.9.001.bb b/recipes/xprint/xprint_0.9.001.bb
index e0ab98fd4e..fe75f219e9 100644
--- a/recipes/xprint/xprint_0.9.001.bb
+++ b/recipes/xprint/xprint_0.9.001.bb
@@ -2,7 +2,7 @@ SECTION = "x11/base"
 LICENSE = "BSD-X"
 PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/xprint/xprint_mozdev_org_source-2004-07-07-release_009_001.tar.gz \
-	file://imake-staging.patch;patch=1"
+	file://imake-staging.patch"
 
 S = "${WORKDIR}/xprint/src/xprint_main/xc"
 
diff --git a/recipes/xqt/xqt_0.0.9.bb b/recipes/xqt/xqt_0.0.9.bb
index c2673edfc6..a6f8b67343 100644
--- a/recipes/xqt/xqt_0.0.9.bb
+++ b/recipes/xqt/xqt_0.0.9.bb
@@ -8,8 +8,8 @@ SRCDATE = "20041111"
 DEPENDS = "freetype libxi libxmu flex-native virtual/libqte2 libqpe-opie"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xc;method=pserver \
-	   file://imake-staging.patch;patch=1 \
-	   file://moc_call.patch;patch=1 "
+	   file://imake-staging.patch \
+	   file://moc_call.patch "
 
 inherit palmtop
 
diff --git a/recipes/xqt2/xqt2_20060509.bb b/recipes/xqt2/xqt2_20060509.bb
index 58b0ad0308..7634d27830 100644
--- a/recipes/xqt2/xqt2_20060509.bb
+++ b/recipes/xqt2/xqt2_20060509.bb
@@ -15,15 +15,15 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xqt2;method=pse
         ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz;name=archive3 \
         ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-4.tgz;name=archive4 \
         ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-5.tgz;name=archive5 \
-        file://KeyMap.patch;patch=1 \
-        file://moc_call.patch;patch=1 \
-        file://imake-staging.patch;patch=1 \
-        file://cross.patch;patch=1 \
-        file://fephack.patch;patch=1 \
-        file://xchar2b.patch;patch=1 \
-        file://xqt-make.patch;patch=1 \ 
-        file://fix_qtscreen_HACK.patch;patch=1 \
-	file://fix_seqfault_qtscreen.patch;patch=1 "
+        file://KeyMap.patch \
+        file://moc_call.patch \
+        file://imake-staging.patch \
+        file://cross.patch \
+        file://fephack.patch \
+        file://xchar2b.patch \
+        file://xqt-make.patch \ 
+        file://fix_qtscreen_HACK.patch \
+	file://fix_seqfault_qtscreen.patch "
 S = "${WORKDIR}/xc"
 
 QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
diff --git a/recipes/xscreensaver/xscreensaver_4.16.bb b/recipes/xscreensaver/xscreensaver_4.16.bb
index d8b39b2274..2e95adbf47 100644
--- a/recipes/xscreensaver/xscreensaver_4.16.bb
+++ b/recipes/xscreensaver/xscreensaver_4.16.bb
@@ -14,8 +14,8 @@ BROKEN = "1"
 # upstream is at 4.22 now - patches do not apply
 
 SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
-           file://fixes.patch;patch=1 \
-           file://configure.patch;patch=1 \
+           file://fixes.patch \
+           file://configure.patch \
            file://XScreenSaver"
 
 # xscreensaver-demo is a glade app
diff --git a/recipes/xscreensaver/xscreensaver_4.22.bb b/recipes/xscreensaver/xscreensaver_4.22.bb
index d0b09c75c1..367cf97b5f 100644
--- a/recipes/xscreensaver/xscreensaver_4.22.bb
+++ b/recipes/xscreensaver/xscreensaver_4.22.bb
@@ -12,9 +12,9 @@ INC_PR = "r4"
 PR = "${INC_PR}.0"
 
 SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
-           file://fixes.patch;patch=1 \
-           file://configure.in.patch;patch=1 \
-	   file://configure.in-includedir.patch;patch=1 \
+           file://fixes.patch \
+           file://configure.in.patch \
+	   file://configure.in-includedir.patch \
            file://XScreenSaver"
 
 # xscreensaver-demo is a glade app
diff --git a/recipes/xscreensaver/xscreensaver_5.07.bb b/recipes/xscreensaver/xscreensaver_5.07.bb
index e7b31a2369..6a391e3aff 100644
--- a/recipes/xscreensaver/xscreensaver_5.07.bb
+++ b/recipes/xscreensaver/xscreensaver_5.07.bb
@@ -2,9 +2,9 @@ require xscreensaver.inc
 PR = "${INC_PR}.0"
 
 SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
-           file://configure.in.patch;patch=1 \
-           file://glfix.patch;patch=1 \
-           file://dpms-header.patch;patch=1 \
+           file://configure.in.patch \
+           file://glfix.patch \
+           file://dpms-header.patch \
            file://XScreenSaver"
 
 
diff --git a/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch
new file mode 100644
index 0000000000..0409a1faef
--- /dev/null
+++ b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch
@@ -0,0 +1,39 @@
+Index: xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator
+===================================================================
+--- xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator	(revision 0)
++++ xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator	(revision 0)
+@@ -0,0 +1,34 @@
++#!/bin/sh
++
++SYSFS_CALIBRATION_DIR=/sys/bus/i2c/devices/0-0073/s3c2440-ts/calibration
++
++if [ ! -d $SYSFS_CALIBRATION_DIR ]; then
++  # moved in 2.6.31
++  SYSFS_CALIBRATION_DIR=/sys/devices/platform/s3c2440-i2c/i2c-adapter/i2c-0/0-0073/s3c2410-ts/calibration
++fi
++
++if [ ! -d $SYSFS_CALIBRATION_DIR ]; then
++  # moved in 2.6.32
++  SYSFS_CALIBRATION_DIR=/sys/devices/platform/s3c2440-i2c/i2c-0/0-0073/s3c2410-ts/calibration
++fi
++
++if [ -d $SYSFS_CALIBRATION_DIR ]; then
++  echo 0 > $SYSFS_CALIBRATION_DIR/0
++  echo 80000 > $SYSFS_CALIBRATION_DIR/1
++  echo -8000000 > $SYSFS_CALIBRATION_DIR/2
++  echo -81000 > $SYSFS_CALIBRATION_DIR/3
++  echo 0 > $SYSFS_CALIBRATION_DIR/4
++  echo 75000000 > $SYSFS_CALIBRATION_DIR/5
++  echo 65536 > $SYSFS_CALIBRATION_DIR/6
++fi
++
++if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then
++  if [ -e /etc/pointercal.xinput ] ; then
++    if [ -e /usr/bin/fsoraw ] ; then
++      # because ts tap to unblank will be used as first calibration click and then store invalid calibration
++      fsoraw -fr CPU,Display -- /usr/bin/xinput_calibrator_once.sh
++    else
++      /usr/bin/xinput_calibrator_once.sh
++    fi
++  fi
++fi
diff --git a/recipes/xserver-common/files/90xXWindowManager.patch b/recipes/xserver-common/files/90xXWindowManager.patch
new file mode 100644
index 0000000000..be5f5ce70c
--- /dev/null
+++ b/recipes/xserver-common/files/90xXWindowManager.patch
@@ -0,0 +1,11 @@
+Index: xserver-common/X11/Xsession.d/90xXWindowManager
+===================================================================
+--- xserver-common/X11/Xsession.d/90xXWindowManager	(revision 0)
++++ xserver-common/X11/Xsession.d/90xXWindowManager	(revision 0)
+@@ -0,0 +1,6 @@
++#!/bin/sh
++if [ -x $HOME/.Xsession ]; then
++    exec $HOME/.Xsession
++else
++    exec /usr/bin/x-window-manager
++fi
diff --git a/recipes/xserver-common/files/Xserver.add.dpi.for.gta.patch b/recipes/xserver-common/files/Xserver.add.dpi.for.gta.patch
new file mode 100644
index 0000000000..f6e36d9e10
--- /dev/null
+++ b/recipes/xserver-common/files/Xserver.add.dpi.for.gta.patch
@@ -0,0 +1,29 @@
+xdpyinfo returns 96, but 285 is right value (but 280 is used as it renders 4 columns of illume icons instead of 3 and empty space)
+
+diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/xserver-common
+--- xserver-common-1.33.orig//X11/xserver-common	2010-04-28 23:27:10.000000000 +0200
++++ xserver-common-1.33/X11/xserver-common	2010-04-28 23:29:07.000000000 +0200
+@@ -133,19 +133,19 @@
+             ARGS="$ARGS -screen ${SCREEN_SIZE}"
+             DPI="225" ;;
+         "gta01" )
+-            DPI="285"
++            DPI="280"
+             if [ "$XSERVER" != "Xorg" ] ; then
+                 ARGS="$ARGS -screen 480x640"
+             else
+-                ARGS="$ARGS -nocursor"
++                ARGS="$ARGS -dpi ${DPI} -nocursor"
+             fi
+             ;;
+         "gta02")
+-            DPI="285"
++            DPI="280"
+             if [ "$XSERVER" != "Xorg" ] ; then
+                 ARGS="$ARGS -screen ${SCREEN_SIZE}"
+             else
+-                ARGS="$ARGS -nocursor"
++                ARGS="$ARGS -dpi ${DPI} -nocursor"
+             fi
+             ;;
+         "motorola_ezx_platform")
diff --git a/recipes/xserver-common/files/Xserver.add.nocursor.for.gta.patch b/recipes/xserver-common/files/Xserver.add.nocursor.for.gta.patch
new file mode 100644
index 0000000000..bd16efc106
--- /dev/null
+++ b/recipes/xserver-common/files/Xserver.add.nocursor.for.gta.patch
@@ -0,0 +1,20 @@
+diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/xserver-common
+--- xserver-common-1.33.orig//X11/xserver-common	2010-04-28 10:44:23.000000000 +0200
++++ xserver-common-1.33/X11/xserver-common	2010-04-28 10:46:41.000000000 +0200
+@@ -136,12 +136,16 @@
+             DPI="285"
+             if [ "$XSERVER" != "Xorg" ] ; then
+                 ARGS="$ARGS -screen 480x640"
++            else
++                ARGS="$ARGS -nocursor"
+             fi
+             ;;
+         "gta02")
+             DPI="285"
+             if [ "$XSERVER" != "Xorg" ] ; then
+                 ARGS="$ARGS -screen ${SCREEN_SIZE}"
++            else
++                ARGS="$ARGS -nocursor"
+             fi
+             ;;
+         "motorola_ezx_platform")
diff --git a/recipes/xserver-common/files/Xserver.add.xserver-system.patch b/recipes/xserver-common/files/Xserver.add.xserver-system.patch
new file mode 100644
index 0000000000..5d9d5d128d
--- /dev/null
+++ b/recipes/xserver-common/files/Xserver.add.xserver-system.patch
@@ -0,0 +1,12 @@
+diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/xserver-common
+--- xserver-common-1.33.orig//X11/xserver-common        2010-04-28 23:27:10.000000000 +0200
++++ xserver-common-1.33/X11/xserver-common      2010-04-28 23:29:07.000000000 +0200
+@@ -192,3 +196,8 @@
+ if [ "$XSERVER" != "Xorg" ] ; then
+     ARGS="$ARGS $MOUSE"
+ fi
++
++# let a local script modify the variables                    
++if [ -e /etc/X11/xserver-system ] ; then                    
++       . /etc/X11/xserver-system                    
++fi                    
diff --git a/recipes/xserver-common/xserver-common-1.33/loop.patch b/recipes/xserver-common/xserver-common-1.33/loop.patch
new file mode 100644
index 0000000000..1f1ac73ca8
--- /dev/null
+++ b/recipes/xserver-common/xserver-common-1.33/loop.patch
@@ -0,0 +1,33 @@
+From 36b10b27570b8549ee1b75793fddc9bc9aea9081 Mon Sep 17 00:00:00 2001
+From: fboor <fboor@d4735bf7-8e1f-0410-bce4-ef584eb11c25>
+Date: Fri, 29 Jan 2010 14:28:23 +0000
+Subject: Avoid X startup to hang in keymap fixing loop.
+
+git-svn-id: svn://projects.linuxtogo.org/svnroot/gpe/trunk@10072 d4735bf7-8e1f-0410-bce4-ef584eb11c25
+---
+diff --git a/base/xserver-common/ChangeLog b/base/xserver-common/ChangeLog
+index 0f4bf90..2c06f75 100644
+--- a/base/xserver-common/ChangeLog
++++ b/base/xserver-common/ChangeLog
+@@ -1,3 +1,5 @@
++2010-01-29  Florian Boor <florian@kernelconcepts.de>
++	* Avoid X startup to hang in keymap fixing loop.
+ 
+ 2009-11-20  Florian Boor <florian@kernelconcepts.de>
+ 	* Release 1.33
+diff --git a/base/xserver-common/X11/Xinit.d/98keymap-fixup b/base/xserver-common/X11/Xinit.d/98keymap-fixup
+index fcc84d9..6f9c8bf 100755
+--- a/base/xserver-common/X11/Xinit.d/98keymap-fixup
++++ b/base/xserver-common/X11/Xinit.d/98keymap-fixup
+@@ -5,6 +5,9 @@ iter=0
+ while [ $(xmodmap -pke | awk '{if ($2 == 36) { if ($4 == "Return") { print "good" } else {print "bad" }}}') = "bad" ] ; do
+ 	xmodmap - </etc/X11/default.xmodmap
+ 	let iter=iter+1
++	if [ $iter -eq 30 ]; then
++		exit 0
++	fi 
+ done
+ 
+ echo "modmap applied after $iter additional tries"
+--
+cgit v0.8.3.1-30-gff3a
diff --git a/recipes/xserver-common/xserver-common-1.33/rgba.diff b/recipes/xserver-common/xserver-common-1.33/rgba.diff
new file mode 100644
index 0000000000..1c913c94d4
--- /dev/null
+++ b/recipes/xserver-common/xserver-common-1.33/rgba.diff
@@ -0,0 +1,265 @@
+From: Koen Kooi <koen@openembedded.org
+Subject: xserver-common: make rgb params kdrive specific
+
+Also convert stray tabs to spaces
+
+--- /tmp/xserver-common	2010-04-20 19:47:18.000000000 +0200
++++ xserver-common-1.33/X11/xserver-common	2010-04-20 19:47:22.000000000 +0200
+@@ -47,6 +47,7 @@
+ ARGS="-br -pn $INPUT_EXTRA_ARGS"
+ DPI="100"
+ MOUSE=""
++KDRIVEARGS=""
+ 
+ # use ucb 1x00 touchscreen if present
+ if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+@@ -68,127 +69,133 @@
+ else
+     # start off server in conventional location.
+     case `machine_id` in
+-	    "aml_m8050")
+-		    ARGS="$ARGS  -screen 320x240@270"
+-		    DPI="100" ;;
+-	    "hp_ipaq_h3100" | "hp_ipaq_h3800")
+-		    ARGS="$ARGS -rgba vrgb -screen 320x240@90"
+-		    DPI="100" ;;
+-	    "hp_ipaq_h3600" | "hp_ipaq_h3700" | "hp_ipaq_h3900")
+-		    ARGS="$ARGS -rgba vbgr -screen 320x240@270"
+-		    DPI="100" ;;
+-	    "hp_ipaq_h5400" | "hp_ipaq_h2200")
+-		    ARGS="$ARGS -rgba rgb"
+-		    DPI="100" ;;
+-	    "hp_ipaq_hx4700")
+-		    DPI="200" ;;
+-	    "ramses")
+-		    # What is this "vt2" in aid of?
+-		    ARGS="$ARGS -rgba vrgb -screen 320x240@90 vt2"
+-		    DPI="100" ;;
+-	    *poodle)
+-		    ARGS="$ARGS -rgba vrgb -screen 320x240@270"
+-		    DPI="100" ;;
+-	    # both 'Sharp-Collie' and just 'Collie' have been reported
+-	    *collie)
+-		    ARGS="$ARGS -rgba vrgb -screen 320x240@270"
+-		    DPI="100" ;;
+-	    "sharp_shepherd" | "sharp_husky" | "sharp_corgi")
+-		    ARGS="$ARGS -rgba rgb"
+-		    DPI="200" ;;
+-	    "sharp_spitz" | "sharp_akita" | "sharp_borzoi")
+-		    export XSERVER_DEFAULT_ORIENTATION="normal"
+-		    ARGS="$ARGS -rgba rgb -screen 480x640"
+-		    DPI="200" ;;
+-	    "simpad")
+-		    ARGS="$ARGS -rgba rgb"
+-		    DPI="100" ;;
+-	    "generic_omap1510/1610/1710")
+-		    MOUSE="-mouse /dev/input/event0"
+-		    DPI="220" ;;
+-	    "ti-osk")
+-		    DPI="100" ;;
+-	    "cellon_c8000_board")
+-		    ARGS="$ARGS -screen ${SCREEN_SIZE},10,1"
+-		    DPI="100" ;;
+-	    "htc_magician")
+-		    DPI="142" ;;
+-	    "htc_universal")
+-		    ARGS="$ARGS -screen 480x640@270"
+-		    DPI="100" ;;
+-	    "htc_tornado")
+-		    ARGS="$ARGS -hide-cursor"
+-		    DPI="100" ;;
+-	    "generic_omap1510/1610/1710")
+-		    ARGS="$ARGS -screen ${SCREEN_SIZE}"
+-		    DPI="225" ;;
+-	    "nokia_n800" | "nokia_rx-44" | "nokia_n770")
+-		    ARGS="$ARGS -screen ${SCREEN_SIZE}"
+-		    DPI="225" ;;
+-	    "gta01" )
+-		    DPI="285"
+-		    if [ "$XSERVER" != "Xorg" ] ; then
+-			    ARGS="$ARGS -screen 480x640"
+-		    fi
+-		    ;;
+-	    "gta02")
+-		    DPI="285"
+-		    if [ "$XSERVER" != "Xorg" ] ; then
+-			    ARGS="$ARGS -screen ${SCREEN_SIZE}"
+-		    fi
+-		    ;;
+-	    "motorola_ezx_platform")
+-		    ARGS="$ARGS -screen 240x320"
+-		    DPI="170" ;;
+-	    "arm-integratorcp" | "arm-versatile_pb")
+-		    ARGS="$ARGS -rgba vrgb" ;;
+-	    "compulab_cm-x270")
+-		    modprobe mbxfb
+-		    ARGS="$ARGS -fb /dev/fb1" ;;
+-	    "boundary_devices_neon_board")
+-		    ARGS="$ARGS -screen ${SCREEN_SIZE}"
+-		    DPI="100" ;;
+-	    "hoeft&wessel_hw90350")
+-		    ARGS="$ARGS -screen ${SCREEN_SIZE}"
+-		    DPI="100" ;;
+-	    "hoeft&wessel_hw90250")
+-		    ARGS="$ARGS -screen 240x320@90"
+-		    DPI="100" ;;
+-	    "hoeft&wessel_skeye.pad_pos_aka_almex_mobile")
+-		    DPI="100"
+-		    ARGS="$ARGS -screen 640x480@180 -hide-cursor" ;;
+-	    "mini2440")
+-		    ARGS="$ARGS -screen ${SCREEN_SIZE}"
+-		    DPI="100" ;;
+-	    "palm_treo_650")
+-	            DPI="181"
+-		    ARGS="$ARGS -screen 320x320 -hide-cursor" ;;
+-	    "glofiish_m800")
+-	            DPI="285"
+-		    ARGS="$ARGS -screen ${SCREEN_SIZE} -hide-cursor vt1" ;;
+-	    "freescale_mx21ads")
+-	    # That's what /proc/cpuinfo shows as hardware on the chumby
+-	            DPI="121"
+-		    ARGS="$ARGS -screen 320x240 -hide-cursor" ;;
++        "aml_m8050")
++            ARGS="$ARGS  -screen 320x240@270"
++            DPI="100" ;;
++        "hp_ipaq_h3100" | "hp_ipaq_h3800")
++            KDRIVEARGS="-rgba vrgb" 
++            ARGS="$ARGS -screen 320x240@90"
++            DPI="100" ;;
++        "hp_ipaq_h3600" | "hp_ipaq_h3700" | "hp_ipaq_h3900")
++            KDRIVEARGS="-rgba vrgb"
++            ARGS="$ARGS -screen 320x240@270"
++            DPI="100" ;;
++        "hp_ipaq_h5400" | "hp_ipaq_h2200")
++            KDRIVEARGS="-rgba rgb"
++            DPI="100" ;;
++        "hp_ipaq_hx4700")
++            DPI="200" ;;
++        "ramses")
++            # What is this "vt2" in aid of?
++            KDRIVEARGS="-rgba vrgb"
++            ARGS="$ARGS -screen 320x240@90 vt2"
++            DPI="100" ;;
++        *poodle)
++            KDRIVEARGS="-rgba vrgb"
++            ARGS="$ARGS -screen 320x240@270"
++            DPI="100" ;;
++        # both 'Sharp-Collie' and just 'Collie' have been reported
++        *collie)
++            KDRIVEARGS="-rgba vrgb"
++            ARGS="$ARGS -screen 320x240@270"
++            DPI="100" ;;
++        "sharp_shepherd" | "sharp_husky" | "sharp_corgi")
++            KDRIVEARGS="-rgba rgb"
++            DPI="200" ;;
++        "sharp_spitz" | "sharp_akita" | "sharp_borzoi")
++            export XSERVER_DEFAULT_ORIENTATION="normal"
++            KDRIVEARGS="-rgba vrgb"
++            ARGS="$ARGS -screen 480x640"
++            DPI="200" ;;
++        "simpad")
++            KDRIVEARGS="-rgba rgb"
++            DPI="100" ;;
++        "generic_omap1510/1610/1710")
++            MOUSE="-mouse /dev/input/event0"
++            DPI="220" ;;
++        "ti-osk")
++            DPI="100" ;;
++        "cellon_c8000_board")
++            ARGS="$ARGS -screen ${SCREEN_SIZE},10,1"
++            DPI="100" ;;
++        "htc_magician")
++            DPI="142" ;;
++        "htc_universal")
++            ARGS="$ARGS -screen 480x640@270"
++            DPI="100" ;;
++        "htc_tornado")
++            ARGS="$ARGS -hide-cursor"
++            DPI="100" ;;
++        "generic_omap1510/1610/1710")
++            ARGS="$ARGS -screen ${SCREEN_SIZE}"
++            DPI="225" ;;
++        "nokia_n800" | "nokia_rx-44" | "nokia_n770")
++            ARGS="$ARGS -screen ${SCREEN_SIZE}"
++            DPI="225" ;;
++        "gta01" )
++            DPI="285"
++            if [ "$XSERVER" != "Xorg" ] ; then
++                ARGS="$ARGS -screen 480x640"
++            fi
++            ;;
++        "gta02")
++            DPI="285"
++            if [ "$XSERVER" != "Xorg" ] ; then
++                ARGS="$ARGS -screen ${SCREEN_SIZE}"
++            fi
++            ;;
++        "motorola_ezx_platform")
++            ARGS="$ARGS -screen 240x320"
++            DPI="170" ;;
++        "arm-integratorcp" | "arm-versatile_pb")
++            KDRIVEARGS="-rgba vrgb" ;;
++        "compulab_cm-x270")
++            modprobe mbxfb
++            ARGS="$ARGS -fb /dev/fb1" ;;
++        "boundary_devices_neon_board")
++            ARGS="$ARGS -screen ${SCREEN_SIZE}"
++            DPI="100" ;;
++        "hoeft&wessel_hw90350")
++            ARGS="$ARGS -screen ${SCREEN_SIZE}"
++            DPI="100" ;;
++        "hoeft&wessel_hw90250")
++            ARGS="$ARGS -screen 240x320@90"
++            DPI="100" ;;
++        "hoeft&wessel_skeye.pad_pos_aka_almex_mobile")
++            DPI="100"
++            ARGS="$ARGS -screen 640x480@180 -hide-cursor" ;;
++        "mini2440")
++            ARGS="$ARGS -screen ${SCREEN_SIZE}"
++            DPI="100" ;;
++        "palm_treo_650")
++                DPI="181"
++            ARGS="$ARGS -screen 320x320 -hide-cursor" ;;
++        "glofiish_m800")
++                DPI="285"
++            ARGS="$ARGS -screen ${SCREEN_SIZE} -hide-cursor vt1" ;;
++        "freescale_mx21ads")
++        # That's what /proc/cpuinfo shows as hardware on the chumby
++                DPI="121"
++            ARGS="$ARGS -screen 320x240 -hide-cursor" ;;
+ 
+             # this is to rotate X display properly, tested with display TX09D71VM1CCA
+             ronetix*pm9261*  | ronetix*pm9263*)
+-         	    ARGS="$ARGS -screen 240/54x320/81@90x16" ;;
+-	    # This is a fallback for PCs
+-	    "")
+-		    if [ -f $BINDIR/Xvesa ]; then
+-			    ARGS="$ARGS -mode 0x0114"
+-		    else
+-			# It is a device we do not know about, in which case we force
+-			# kdrive to use the current framebuffer geometry -- otherwise
+-			# it will default to trying to achieve 1024x768
+-			if [ "$XSERVER" != "Xorg" ] ; then
+-			    ARGS="$ARGS -screen ${SCREEN_SIZE}"
+-			fi
+-		    fi
++                 ARGS="$ARGS -screen 240/54x320/81@90x16" ;;
++        # This is a fallback for PCs
++        "")
++            if [ -f $BINDIR/Xvesa ]; then
++                ARGS="$ARGS -mode 0x0114"
++            else
++            # It is a device we do not know about, in which case we force
++            # kdrive to use the current framebuffer geometry -- otherwise
++            # it will default to trying to achieve 1024x768
++            if [ "$XSERVER" != "Xorg" ] ; then
++                ARGS="$ARGS -screen ${SCREEN_SIZE}"
++            fi
++            fi
+     esac
+ fi
+ 
+ if [ "$XSERVER" != "Xorg" ] ; then
+-    ARGS="$ARGS $MOUSE"
++    ARGS="$ARGS $MOUSE $KDRIVEARGS"
+ fi
diff --git a/recipes/xserver-common/xserver-common_1.11.bb b/recipes/xserver-common/xserver-common_1.11.bb
index 6b08e1ea31..c3727122f3 100644
--- a/recipes/xserver-common/xserver-common_1.11.bb
+++ b/recipes/xserver-common/xserver-common_1.11.bb
@@ -1,9 +1,9 @@
 require xserver-common.inc
 
 SRC_URI_append = " file://setDPI.sh \
-		   file://calibrate_zaurusd.patch;patch=1 \
-		   file://w100.patch;patch=1 \
-		   file://poodle-xmodmap-2.6.patch;patch=1"
+		   file://calibrate_zaurusd.patch \
+		   file://w100.patch \
+		   file://poodle-xmodmap-2.6.patch"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/recipes/xserver-common/xserver-common_1.12.bb b/recipes/xserver-common/xserver-common_1.12.bb
index 5537a8d3f1..b2661a6ef6 100644
--- a/recipes/xserver-common/xserver-common_1.12.bb
+++ b/recipes/xserver-common/xserver-common_1.12.bb
@@ -3,7 +3,7 @@ require xserver-common.inc
 PR = "r1"
 
 SRC_URI_append = " file://setDPI.sh \
-	           file://rxvt-less-pink.diff;patch=1"
+	           file://rxvt-less-pink.diff"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/recipes/xserver-common/xserver-common_1.13.bb b/recipes/xserver-common/xserver-common_1.13.bb
index ee62356146..a894124179 100644
--- a/recipes/xserver-common/xserver-common_1.13.bb
+++ b/recipes/xserver-common/xserver-common_1.13.bb
@@ -3,8 +3,8 @@ require xserver-common.inc
 PR = "r2"
 
 SRC_URI_append = " file://setDPI.sh \
-                   file://xserver-imageon.patch;patch=1 \
-                   file://calibrate-only-if-ts.patch;patch=1"
+                   file://xserver-imageon.patch \
+                   file://calibrate-only-if-ts.patch"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/recipes/xserver-common/xserver-common_1.14.bb b/recipes/xserver-common/xserver-common_1.14.bb
index 5eea62e361..c55bb2971c 100644
--- a/recipes/xserver-common/xserver-common_1.14.bb
+++ b/recipes/xserver-common/xserver-common_1.14.bb
@@ -10,8 +10,8 @@ PACKAGE_ARCH = "all"
 inherit gpe
 
 SRC_URI_append = " file://setDPI.sh \
-                   file://xserver-imageon.patch;patch=1 \
-                   file://calibrate-only-if-ts.patch;patch=1"
+                   file://xserver-imageon.patch \
+                   file://calibrate-only-if-ts.patch"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/recipes/xserver-common/xserver-common_1.15.bb b/recipes/xserver-common/xserver-common_1.15.bb
index 6b3a02294e..c420049a52 100644
--- a/recipes/xserver-common/xserver-common_1.15.bb
+++ b/recipes/xserver-common/xserver-common_1.15.bb
@@ -10,8 +10,8 @@ PACKAGE_ARCH = "all"
 inherit gpe
 
 SRC_URI_append = " file://setDPI.sh \
-                   file://xserver-imageon.patch;patch=1 \
-                   file://calibrate-only-if-ts.patch;patch=1"
+                   file://xserver-imageon.patch \
+                   file://calibrate-only-if-ts.patch"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/recipes/xserver-common/xserver-common_1.16.bb b/recipes/xserver-common/xserver-common_1.16.bb
index d85baf172f..8d229a5b12 100644
--- a/recipes/xserver-common/xserver-common_1.16.bb
+++ b/recipes/xserver-common/xserver-common_1.16.bb
@@ -10,12 +10,12 @@ PACKAGE_ARCH = "all"
 inherit gpe
 
 SRC_URI_append = " file://setDPI.sh \
-                   file://xserver-imageon.patch;patch=1 \
-                   file://calibrate-only-if-ts.patch;patch=1 \
-		   file://softkeys-c7x0.patch;patch=1 \
-		   file://load-xmodmap-k26.patch;patch=1 \
-		   file://Xserver-udev-input-helper.patch;patch=1 \
-		   file://sl-cxx00-modmap.patch;patch=1 \
+                   file://xserver-imageon.patch \
+                   file://calibrate-only-if-ts.patch \
+		   file://softkeys-c7x0.patch \
+		   file://load-xmodmap-k26.patch \
+		   file://Xserver-udev-input-helper.patch \
+		   file://sl-cxx00-modmap.patch \
 		   "
 
 do_install_append() {
diff --git a/recipes/xserver-common/xserver-common_1.18.bb b/recipes/xserver-common/xserver-common_1.18.bb
index dd1e1c13a1..846093eb3d 100644
--- a/recipes/xserver-common/xserver-common_1.18.bb
+++ b/recipes/xserver-common/xserver-common_1.18.bb
@@ -9,7 +9,7 @@ PACKAGE_ARCH = "all"
 # we are using a gpe-style Makefile
 inherit gpe
 
-SRC_URI_append = " file://ti-osk.patch;patch=1 file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
+SRC_URI_append = " file://ti-osk.patch file://unbreak-simpad.patch file://setDPI.sh"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/recipes/xserver-common/xserver-common_1.22.bb b/recipes/xserver-common/xserver-common_1.22.bb
index a255dd4634..160a3fd301 100644
--- a/recipes/xserver-common/xserver-common_1.22.bb
+++ b/recipes/xserver-common/xserver-common_1.22.bb
@@ -10,9 +10,9 @@ PACKAGE_ARCH = "all"
 inherit gpe
 
 SRC_URI_append = " file://setDPI.sh "
-SRC_URI_append_angstrom = " file://kdrive-1.4-fixes.patch;patch=1 \
-                            file://xorg-fixes.patch;patch=1 \
-			    file://gta-xorg-fixes.patch;patch=1 \
+SRC_URI_append_angstrom = " file://kdrive-1.4-fixes.patch \
+                            file://xorg-fixes.patch \
+			    file://gta-xorg-fixes.patch \
                             file://default.xmodmap \
                             file://98keymap-fixup "
 
diff --git a/recipes/xserver-common/xserver-common_1.25.bb b/recipes/xserver-common/xserver-common_1.25.bb
index 9e66633d2e..ad7824ca9e 100644
--- a/recipes/xserver-common/xserver-common_1.25.bb
+++ b/recipes/xserver-common/xserver-common_1.25.bb
@@ -11,12 +11,12 @@ inherit gpe
 
 SRC_URI_append = " file://setDPI.sh \
                    file://89xdgautostart.sh \
-                   file://avoid-rotated-server.patch;patch=1 \
-                   file://ts-handling-cleanup.diff;patch=1 \
-                   file://Xserver-at91.patch;patch=1 \
+                   file://avoid-rotated-server.patch \
+                   file://ts-handling-cleanup.diff \
+                   file://Xserver-at91.patch \
 "
 
-SRC_URI_append_angstrom = " file://xtscal-fix.patch;patch=1 "
+SRC_URI_append_angstrom = " file://xtscal-fix.patch "
 RDEPENDS_${PN}_append_angstrom = " tslib-calibrate "
 
 do_install_append() {
diff --git a/recipes/xserver-common/xserver-common_1.30.bb b/recipes/xserver-common/xserver-common_1.30.bb
index 56db9fa5e5..a4390ab792 100644
--- a/recipes/xserver-common/xserver-common_1.30.bb
+++ b/recipes/xserver-common/xserver-common_1.30.bb
@@ -13,15 +13,15 @@ inherit gpe
 
 SRC_URI_append = " file://setDPI.sh \
                    file://89xdgautostart.sh \
-file://0018-zaurus-fixed-machine-names.patch;patch=1 \
-file://0019-keymap-fixed-machine-names.patch;patch=1 \
-file://0020-keymap-fixed-machine-names-again.patch;patch=1 \
-file://0021-xserver-introduced-MOUSE-variable-for-mouse-argument.patch;patch=1 \
-file://0022-xserver-fix-syntax-error.patch;patch=1 \
-file://0023-Xserver-provide-screen-argument-only-for-non-X.org-s.patch;patch=1 \
-file://0024-Xserver-move-nearly-whole-functionality-to-xserver-c.patch;patch=1 \
-file://0025-Makefile-move-modmaps-install-xserver-common.patch;patch=1 \
-file://0026-98keymap-fixup-fixed-path-to-xmodmap-file.patch;patch=1 \
+file://0018-zaurus-fixed-machine-names.patch \
+file://0019-keymap-fixed-machine-names.patch \
+file://0020-keymap-fixed-machine-names-again.patch \
+file://0021-xserver-introduced-MOUSE-variable-for-mouse-argument.patch \
+file://0022-xserver-fix-syntax-error.patch \
+file://0023-Xserver-provide-screen-argument-only-for-non-X.org-s.patch \
+file://0024-Xserver-move-nearly-whole-functionality-to-xserver-c.patch \
+file://0025-Makefile-move-modmaps-install-xserver-common.patch \
+file://0026-98keymap-fixup-fixed-path-to-xmodmap-file.patch \
 "
 
 do_install_append() {
diff --git a/recipes/xserver-common/xserver-common_1.32.bb b/recipes/xserver-common/xserver-common_1.32.bb
index d57b38e40f..a0f7709d5a 100644
--- a/recipes/xserver-common/xserver-common_1.32.bb
+++ b/recipes/xserver-common/xserver-common_1.32.bb
@@ -13,7 +13,7 @@ inherit gpe
 SRC_URI_append = " file://setDPI.sh \
                    file://89xdgautostart.sh"
 
-SRC_URI_append_angstrom = " file://xtscal-fix.patch;patch=1 "
+SRC_URI_append_angstrom = " file://xtscal-fix.patch "
 RDEPENDS_${PN}_append_angstrom = " tslib-calibrate "
 
 do_install_append() {
diff --git a/recipes/xserver-common/xserver-common_1.33.bb b/recipes/xserver-common/xserver-common_1.33.bb
new file mode 100644
index 0000000000..f1fcfc337a
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_1.33.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r2"
+
+PACKAGE_ARCH = "all"
+DEFAULT_PREFERENCE = "-1"
+
+RCONFLICTS_${PN} = "xserver-kdrive-common"
+RREPLACES_${PN} = "xserver-kdrive-common"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI[md5sum] = "2df46d6b1bbac9f3e5e7e3191ccdd3e4"
+SRC_URI[sha256sum] = "4576ccca80730f1860a273df38b9f917cf906eca9865e108d76fc5460e006d87"
+
+SRC_URI_append = " file://loop.patch;striplevel=3 \
+                   file://rgba.diff \
+                   file://setDPI.sh \
+                   file://89xdgautostart.sh"
+
+SRC_URI_append_angstrom = " file://xtscal-fix.patch "
+RDEPENDS_${PN}_append_angstrom = " tslib-calibrate "
+
+SRC_URI_append_shr = " file://89xTs_Calibrate.xinput_calibrator.patch \
+                       file://90xXWindowManager.patch \
+                       file://Xserver.add.nocursor.for.gta.patch \
+                       file://Xserver.add.xserver-system.patch \
+                       file://Xserver.add.dpi.for.gta.patch"
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+	install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart"
+	sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/Xserver
+}
+
diff --git a/recipes/xserver-common/xserver-common_svn.bb b/recipes/xserver-common/xserver-common_svn.bb
index 546481d48f..f664cb9bc2 100644
--- a/recipes/xserver-common/xserver-common_svn.bb
+++ b/recipes/xserver-common/xserver-common_svn.bb
@@ -11,10 +11,10 @@ PR = "r2"
 SRC_URI = "${GPE_SVN} \
             file://Makefile.translation \
             file://Makefile.dpkg_ipkg \
-	    file://svn_makefiles.patch;patch=1 \
-	    file://keyboardless-buttonmap.patch;patch=1 \	   
-	    file://softkeys-c7x0.patch;patch=1 \
- 	    file://sl-cxx00-modmap.patch;patch=1 \
-	    file://load-xmodmap-k26.patch;patch=1 \
-	    file://Xserver-udev-input-helper.patch;patch=1"
+	    file://svn_makefiles.patch \
+	    file://keyboardless-buttonmap.patch \	   
+	    file://softkeys-c7x0.patch \
+ 	    file://sl-cxx00-modmap.patch \
+	    file://load-xmodmap-k26.patch \
+	    file://Xserver-udev-input-helper.patch"
 	    
diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/recipes/xserver-nodm-init/xserver-nodm-init-1.0/xserver-nodm
index 1f0fa47be6..1f0fa47be6 100755
--- a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/recipes/xserver-nodm-init/xserver-nodm-init-1.0/xserver-nodm
diff --git a/recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm b/recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
new file mode 100755
index 0000000000..ae6adc58e8
--- /dev/null
+++ b/recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+. /etc/init.d/functions
+
+for x in $(cat /proc/cmdline); do
+        case $x in
+        x11=false)
+		echo "X Server disabled" 
+		exit 0;
+                ;;
+        esac
+done
+
+case "$1" in
+  start)
+    # We don't want this script to block the rest of the boot process
+    if [ "$2" != "background" ]; then
+      $0 $1 background &
+    else
+       . /etc/profile
+
+       echo "Starting Xserver"
+       . /etc/X11/xserver-common
+       xinit /etc/X11/Xsession -- `which $XSERVER` $ARGS >/tmp/x.log 2>&1
+    fi 
+  ;;
+
+  stop)
+        echo "Stopping XServer"
+        killproc xinit
+  ;;
+
+  restart)
+	$0 stop
+        sleep 1
+        $0 start
+  ;;
+
+  *)
+        echo "usage: $0 { start | stop | restart }"
+  ;;
+esac
+
+exit 0
diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init.bb b/recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb
index 01bdd5559c..01bdd5559c 100644
--- a/recipes/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb
diff --git a/recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb b/recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb
new file mode 100644
index 0000000000..b29a86e927
--- /dev/null
+++ b/recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Simple Xserver Init Script (no dm)"
+LICENSE = "GPL"
+SECTION = "x11"
+PRIORITY = "optional"
+RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
+DEFAULT_PREFERENCE = "-1"
+PR = "r1"
+
+SRC_URI = "file://xserver-nodm"
+S = ${WORKDIR}
+
+PACKAGE_ARCH = "all"
+
+do_install() {
+    install -d ${D}/etc
+    install -d ${D}/etc/init.d
+    install xserver-nodm ${D}/etc/init.d
+}    
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "xserver-nodm"
+INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 1 6 ."
diff --git a/recipes/xst/xst_0.15.bb b/recipes/xst/xst_0.15.bb
index cc6ec3a952..310d73b348 100644
--- a/recipes/xst/xst_0.15.bb
+++ b/recipes/xst/xst_0.15.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "GPE configuration utility"
 LICENSE = "GPL"
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
 
-SRC_URI += "file://makefile-fix.patch;patch=1"
+SRC_URI += "file://makefile-fix.patch"
 
 SRC_URI[md5sum] = "cbe38d183fa6cf0d7c29b4befd0d71d6"
 SRC_URI[sha256sum] = "f5d79766715012ea7bb7ef164994963950c3343ef025ee71d1540aa26ab48c8c"
diff --git a/recipes/xstroke/xstroke_0.6.bb b/recipes/xstroke/xstroke_0.6.bb
index 4234e8016f..cd95d3d092 100644
--- a/recipes/xstroke/xstroke_0.6.bb
+++ b/recipes/xstroke/xstroke_0.6.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libx11 xft libxtst libxpm"
 PR = "r2"
 
 SRC_URI = "http://www.oesources.org/source/current/xstroke-0.6.tar.gz \
-	file://auto-disable.patch;patch=1;pnum=0"
+	file://auto-disable.patch;striplevel=0"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/xtscal/xtscal_0.5.1.bb b/recipes/xtscal/xtscal_0.5.1.bb
index 9463995362..36b64a80bb 100644
--- a/recipes/xtscal/xtscal_0.5.1.bb
+++ b/recipes/xtscal/xtscal_0.5.1.bb
@@ -2,7 +2,7 @@ require xtscal.inc
 
 PR = "r1"
 
-SRC_URI += "file://xtscal-poodle.patch;patch=1"
+SRC_URI += "file://xtscal-poodle.patch"
 
 SRC_URI[md5sum] = "9ae79f1c64551a1cacf506fde6d83ef6"
 SRC_URI[sha256sum] = "39c354adb9783fc30d4df6edbe04f68b69d5005b1bd7353dca506ced3b8b594e"
diff --git a/recipes/xtscal/xtscal_0.6.3.bb b/recipes/xtscal/xtscal_0.6.3.bb
index ba2c95e832..01aa007431 100644
--- a/recipes/xtscal/xtscal_0.6.3.bb
+++ b/recipes/xtscal/xtscal_0.6.3.bb
@@ -7,8 +7,8 @@ DEPENDS = "virtual/libx11 libxft libxcalibrate"
 PR = "r7"
 
 SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
-           file://change-cross.patch;patch=1 \
-	   file://cleanup.patch;patch=1"
+           file://change-cross.patch \
+	   file://cleanup.patch"
 
 inherit autotools
 
diff --git a/recipes/yaffs2/yaffs2-utils_cvs.bb b/recipes/yaffs2/yaffs2-utils_cvs.bb
index 3377944d3c..bb974907ca 100644
--- a/recipes/yaffs2/yaffs2-utils_cvs.bb
+++ b/recipes/yaffs2/yaffs2-utils_cvs.bb
@@ -11,7 +11,7 @@ PR = "r0"
 #
 
 SRC_URI = "cvs://anonymous@cvs.aleph1.co.uk/home/aleph1/cvs;module=yaffs2 \
-           file://mkyaffs2image.patch;patch=1"
+           file://mkyaffs2image.patch"
 S = "${WORKDIR}/yaffs2"
 
 CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL"
diff --git a/recipes/yasr/yasr_0.6.9.bb b/recipes/yasr/yasr_0.6.9.bb
index c5bf8649a8..e0a97fd639 100644
--- a/recipes/yasr/yasr_0.6.9.bb
+++ b/recipes/yasr/yasr_0.6.9.bb
@@ -9,8 +9,8 @@ SECTION = "console/utils"
 SUGGESTS = "speech-dispatcher"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/yasr/yasr-${PV}.tar.gz \
-	   file://yasr-0.6.9-gcc43.patch;patch=1 \
-	   file://yasr-0.6.9-remove-m4.patch;patch=1 \
+	   file://yasr-0.6.9-gcc43.patch \
+	   file://yasr-0.6.9-remove-m4.patch \
 	  "
 
 inherit autotools
diff --git a/recipes/yum/createrepo-native_0.9.bb b/recipes/yum/createrepo-native_0.9.bb
index 2d92a67b44..a74dabf784 100644
--- a/recipes/yum/createrepo-native_0.9.bb
+++ b/recipes/yum/createrepo-native_0.9.bb
@@ -1,8 +1,8 @@
 DEPENDS = "python-native"
 
 SRC_URI = "http://createrepo.baseurl.org/download/createrepo-${PV}.tar.gz \
-           file://fix.patch;patch=1 \
-           file://pathfix.patch;patch=1 "
+           file://fix.patch \
+           file://pathfix.patch "
 PR = "r1"
 
 inherit autotools native
diff --git a/recipes/yum/yum-native_3.2.18.bb b/recipes/yum/yum-native_3.2.18.bb
index b78c982eb1..a9af687eb7 100644
--- a/recipes/yum/yum-native_3.2.18.bb
+++ b/recipes/yum/yum-native_3.2.18.bb
@@ -1,8 +1,8 @@
 HOMEPAGE = "http://linux.duke.edu/projects/yum/"
 
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
-           file://hacks.patch;patch=1 \
-           file://paths.patch;patch=1 \
+           file://hacks.patch \
+           file://paths.patch \
 	   file://yum-install-recommends.py \
 	   file://extract-postinst.awk"
 PR = "r7"
diff --git a/recipes/yum/yum_3.2.18.bb b/recipes/yum/yum_3.2.18.bb
index a372b7cbe0..9ae5ce2bf7 100644
--- a/recipes/yum/yum_3.2.18.bb
+++ b/recipes/yum/yum_3.2.18.bb
@@ -2,8 +2,8 @@ HOMEPAGE = "http://linux.duke.edu/projects/yum/"
 PR = "r6"
 
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
-           file://paths.patch;patch=1 \
-           file://paths2.patch;patch=1 \
+           file://paths.patch \
+           file://paths2.patch \
 	   file://yum-install-recommends.py \
 	   file://extract-postinst.awk"
 
diff --git a/recipes/zaurus-utils/zaurus-installer.bb b/recipes/zaurus-utils/zaurus-installer.bb
index 007fe00ebf..16fa43a982 100644
--- a/recipes/zaurus-utils/zaurus-installer.bb
+++ b/recipes/zaurus-utils/zaurus-installer.bb
@@ -1,35 +1,35 @@
 DESCRIPTION = "Installkit for kexecboot-kernel"
 DEPENDS = "${@base_conditional('MACHINE', 'collie', 'linux-kexecboot', 'zaurus-updater linux-kexecboot', d)}"
+DEPENDS += "${@base_conditional('MACHINE', 'spitz', 'zaurus-legacy-tar', '', d)}"
 LICENSE = "zaurus-installer"
-PR = "r1"
+PR = "r3"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = '(collie|poodle|c7x0|spitz|akita|tosa)'
 
-S = "${WORKDIR}"
-
-do_configure() {
-}
-
 do_compile() {
 }
 
 do_deploy() {
 
-	cd ${DEPLOY_DIR_IMAGE}
-	rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/
-	mkdir installkit-${MACHINE}/
+        cd ${DEPLOY_DIR_IMAGE}
+        rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/
+        mkdir installkit-${MACHINE}/
+
+        [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE}
+
+        if [ ! "${MACHINE}" = "collie" ]; then
+                cp updater.sh installkit-${MACHINE}/updater.sh
+        fi
 
-	[ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE}
+        if [ "${MACHINE}" = "spitz" ]; then
+                cp ${DEPLOY_DIR_IMAGE}/gnu-tar installkit-${MACHINE}/gnu-tar
+        fi
 
-	if [ ! "${MACHINE}" = "collie" ]; then
-		cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh
-	fi
- 
-	tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/
-	md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5
-	rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/
+        tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/
+        md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5
+        rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/
 }
 
 addtask deploy before do_build after do_compile
diff --git a/recipes/zaurus-utils/zaurus-legacy-tar.bb b/recipes/zaurus-utils/zaurus-legacy-tar.bb
new file mode 100644
index 0000000000..00d6cce2f0
--- /dev/null
+++ b/recipes/zaurus-utils/zaurus-legacy-tar.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Legacy GNU-tar to unpack hd images on install for Zaurus spitz"
+LICENSE = "GPL"
+PR = "r0"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGES = ""
+COMPATIBLE_MACHINE = "spitz"
+
+SRC_URI = "file://gnu-tar.gz"
+
+S = "${WORKDIR}"
+
+do_compile() {
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar
+        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/gnu-tar
+}
+
+# package_stagefile_shell needs to run before populate_staging for packaged-staging
+addtask deploy before do_populate_sysroot after do_compile
diff --git a/recipes/zaurus-utils/zaurus-updater.bb b/recipes/zaurus-utils/zaurus-updater.bb
index 7621d47e20..ee41182cdb 100644
--- a/recipes/zaurus-utils/zaurus-updater.bb
+++ b/recipes/zaurus-utils/zaurus-updater.bb
@@ -1,39 +1,35 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r24"
+PR = "r25"
 
-PACKAGES = ""
+# even though the package is not machine-specific
+# we have to force it there to allow multimachine builds
+# because DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+# and without this only the first machine built get the right staging ipk
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PACKAGES = ""
 COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
 
-SRC_URI = "file://updater.sh \
-           file://gnu-tar.gz"
+SRC_URI = "file://updater.sh"
+
 S = "${WORKDIR}"
 
 do_configure() {
-	sed -i "s/ZAURUS_UPDATER_VERSION/${PR}/" "${S}/updater.sh"
+        sed -i "s/ZAURUS_UPDATER_VERSION/${PR}/" "${S}/updater.sh"
 }
 
 do_compile() {
-	encdec-updater -e updater.sh
+        encdec-updater -e updater.sh
 }
 
 do_deploy() {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
-        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
-
-	case ${MACHINE} in
-		spitz )
-			install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar
-		        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/gnu-tar
-			;;
-        	*)
-			;;
-	esac
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh
+        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/updater.sh
 }
 
-# package_stagefile_shell need to run before populate_staging for packaged-staging
-addtask deploy before do_populate_staging after do_compile
+# package_stagefile_shell need to run before populate_sysroot for packaged-staging
+addtask deploy before do_populate_sysroot after do_compile
 
diff --git a/recipes/zaurus-utils/zaurus-updater/updater.sh b/recipes/zaurus-utils/zaurus-updater/updater.sh
index 4cdfc873a2..e9857afd35 100644
--- a/recipes/zaurus-utils/zaurus-updater/updater.sh
+++ b/recipes/zaurus-utils/zaurus-updater/updater.sh
@@ -41,7 +41,7 @@
 # - Polish HDD installer messages
 #
 # 2007.12.25 Matthias 'CoreDump' Hentges
-# -Add support for installing / updating u-boot
+# - Add support for installing / updating u-boot
 #
 # 2008.11.23 Dmitry 'lumag' Baryshkov
 # - Add support for reflashing home partitions
@@ -51,6 +51,9 @@
 #   Bug in Sharp original line...
 #   /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
 #   didn't use correctly determined block size
+#
+# 2010.04.18 Andrea 'ant' Adami
+# - Add support for flashing pure jffs2 rootfs, without Sharp headers
 
 # Set to "yes" to enable
 ENABLE_UBOOT_UPDATER="no"
@@ -115,11 +118,11 @@ check_for_hdd()
 {
     IDE1=`get_dev_pcmcia_slot 1`
     if [ "$IDE1" = "" ]; then
-        echo "Error: There is no microdrive. Retrying..."
+        echo 'Error: There is no microdrive. Retrying...'
         while [ "$IDE1" = "" ]; do
             IDE1=`get_dev_pcmcia_slot 1`
         done
-        echo "Microdrive found."
+        echo 'Microdrive found.'
     fi
 
     LINUXFMT=ext3
@@ -157,16 +160,16 @@ do_rootfs_extraction()
     mke2fs $MKE2FSOPT /dev/${IDE1}1 > /dev/null 2>&1
     e2fsck -p /dev/${IDE1}1 > /dev/null
     if [ "$?" != "0" ]; then
-    	echo "FAILED"
-        echo "Error: Unable to create filesystem on microdrive!"
+        echo 'FAILED'
+        echo 'Error: Unable to create filesystem on microdrive!'
         exit "$?"
     else 
-    	echo "Done"
+        echo 'done'
     fi
 
     mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
     if [ "$?" != "0" ]; then
-        echo "Error: Unable to mount microdrive!"
+        echo 'Error: Unable to mount microdrive!'
         exit "$?"
     fi
 
@@ -174,11 +177,11 @@ do_rootfs_extraction()
     echo -n '* Now extracting (this can take over 5m)...'
     gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
     if [ "$?" != "0" ]; then
-    	echo "FAILED"
-        echo "Error: Unable to extract root filesystem archive!"
+        echo 'FAILED'
+        echo 'Error: Unable to extract root filesystem archive!'
         exit "$?"
     else
-    	echo "Done"
+        echo 'done'
     fi
 
     echo 'HDD Installation Finished.'
@@ -191,67 +194,66 @@ do_rootfs_extraction()
 
 do_flashing()
 {
-	if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
-	then
-		echo "Error: File is too big to flash!"
-		echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
-		return
-	fi
-
-	if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
-	then
-		#check version
-		/sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
-		
-		if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
-		then
-		    #no version info...
-		    rm -f $TMPHEAD > /dev/null 2>&1
-		    DATAPOS=0
-		fi
-	fi
-
-	if [ $ISFORMATTED = 0 ]
-	then
-		/sbin/eraseall $TARGET_MTD > /dev/null 2>&1
-		ISFORMATTED=1
-	fi
-
-	if [ -e $TMPHEAD ]
-	then
-		VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
-		MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
-		/sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
-		/sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
-
-		/sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
-		/sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
-	fi
+        if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
+        then
+                echo 'Error: File is too big to flash!'
+                echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
+                return
+        fi
+
+        #check version (common to all models)
+        /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
+        if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
+        then
+            #check for known fake headers
+            if [ `cat $TMPDATA` != "OZ!3.1" ] > /dev/null 2>&1
+            then
+                #no version info...
+                rm -f $TMPHEAD > /dev/null 2>&1
+                DATAPOS=0
+            fi
+        fi
+
+        if [ $ISFORMATTED = 0 ]
+        then
+                echo -n 'Flash erasing...'
+                /sbin/eraseall $TARGET_MTD > /dev/null 2>&1
+                echo 'done'
+                ISFORMATTED=1
+        fi
+
+        if [ -e $TMPHEAD ]
+        then
+                VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
+                MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
+                /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+                /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+
+                /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
+                /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
+        fi
 
         # Looks like Akita and Spitz are unique when it comes to kernel flashing
-        
-       	if [ "$ZAURUS" = "akita" -o "$ZAURUS" = "c3x00" ] && [ "$FLASH_TYPE" = "kernel" ]
-	then 
-#               	echo $TARGETFILE':'$DATASIZE'bytes'
-		echo ""
-		echo -n "Installing SL-Cxx00 kernel..."
-               	echo '                ' > /tmp/data
-               	 test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
-               	/sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
-               	 test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1     
-		 echo "Done"
-	else	
-	
-		echo ''
-		echo '0%                   100%'
-		PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
-		PROGSTEP=`expr 25 / $PROGSTEP`
-		
-		if [ $PROGSTEP = 0 ]
-		then
-			PROGSTEP=1
-		fi	
-			
+        if [ "$ZAURUS" = "akita" -o "$ZAURUS" = "c3x00" ] && [ "$FLASH_TYPE" = "kernel" ]
+        then
+                echo ''
+                echo -n 'Installing SL-Cxx00 kernel...'
+                echo '                ' > /tmp/data
+                test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
+                /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
+                test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1
+                echo 'done'
+        else
+                echo ''
+                echo '0%                   100%'
+                PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
+                PROGSTEP=`expr 25 / $PROGSTEP`
+
+                if [ $PROGSTEP = 0 ]
+                then
+                    PROGSTEP=1
+                fi
+
                 #loop
                 while [ $DATAPOS -lt $DATASIZE ]
                 do
@@ -266,7 +268,7 @@ do_flashing()
                         then
                                 next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD  2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
                                 if [ "$next_addr" = "" ]; then
-                echo "Error: flash write"
+                                        echo 'Error: flash write'
                                         rm $TMPDATA > /dev/null 2>&1
                                         RESULT=3
                                         break;
@@ -288,76 +290,76 @@ do_flashing()
                         done
                 done
         fi
-	echo ''
-
-	#finish
-	rm -f $TMPPATH/*.bin > /dev/null 2>&1
-
-	if [ $RESULT = 0 ]
-	then
-		if [ -e $VTMPNAME ]
-		then
-		    /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
-		    rm -f $VTMPNAME > /dev/null 2>&1
-		fi
-
-		if [ -e $MTMPNAME ]
-		then
-		    /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
-		    rm -f $MTMPNAME > /dev/null 2>&1
-		fi
-	
-		[ "$FLASH_TYPE" != "kernel" ] && echo 'Done.'
-	else
-		echo 'Error!'
-	fi
+        echo ''
+
+        #finish
+        rm -f $TMPPATH/*.bin > /dev/null 2>&1
+
+        if [ $RESULT = 0 ]
+        then
+                if [ -e $VTMPNAME ]
+                then
+                    /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+                    rm -f $VTMPNAME > /dev/null 2>&1
+                fi
+
+                if [ -e $MTMPNAME ]
+                then
+                    /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+                    rm -f $MTMPNAME > /dev/null 2>&1
+                fi
+
+                [ "$FLASH_TYPE" != "kernel" ] && echo 'done.'
+        else
+                echo 'Error!'
+        fi
 }
 
 update_uboot() {
-	# The flashing part of this function is based on pdaXrom's
-	# updater.sh
-	
-	if test "$ENABLE_UBOOT_UPDATER" != "yes" -o -z "$1"
-	then
-		echo "u-boot updates not allowed."
-		return
-	fi
-
-	echo ""
-	echo "Installing u-boot bootloader:"
-
-	DATASIZE=`wc -c $TARGETFILE`
-	FSIZE=`echo $DATASIZE | cut -d' ' -f1`
-
-	echo -n "* Creating backup ($FSIZE Bytes)..."
-	if ( nandlogical /dev/mtd1 READ 0 $FSIZE /tmp/sharploader.bin ) > /dev/null 2>&1
-	then
-		echo "Ok"
-
-		echo -n "* Flashing u-boot..."
-		if ( nandlogical /dev/mtd1 WRITE 0 $FSIZE $1 ) > /dev/null 2>&1
-		then
-			echo "Success"
-		else
-			echo "FAILED"
-			echo "ERROR: Installation of u-boot failed!"
-
-			echo -n "* Trying to restore backup..."			
-			if ( nandlogical /dev/mtd1 WRITE 0 $FSIZE /tmp/sharploader.bin ) > /dev/null 2>&1
-			then
-				echo "Success"
-				echo "Your old bootloader has been restored"
-			else
-				echo "FAILED"
-				echo "Sorry, it's NAND-Restore time for you =("
-			fi
-		fi
-	else
-		echo "FAILED"
-		echo "Could not create backup, aborting!"
-		echo "Your bootloader has not been altered in any way."
-		exit 1
-	fi		
+        # The flashing part of this function is based on pdaXrom's
+        # updater.sh
+
+        if test "$ENABLE_UBOOT_UPDATER" != "yes" -o -z "$1"
+        then
+                echo 'u-boot updates not allowed.'
+                return
+        fi
+
+        echo ''
+        echo 'Installing u-boot bootloader:'
+
+        DATASIZE=`wc -c $TARGETFILE`
+        FSIZE=`echo $DATASIZE | cut -d' ' -f1`
+
+        echo -n '* Creating backup ('$FSIZE' Bytes)...'
+        if ( nandlogical /dev/mtd1 READ 0 $FSIZE /tmp/sharploader.bin ) > /dev/null 2>&1
+        then
+                echo 'Ok'
+
+                echo -n '* Flashing u-boot...'
+                if ( nandlogical /dev/mtd1 WRITE 0 $FSIZE $1 ) > /dev/null 2>&1
+                then
+                        echo 'Success'
+                else
+                        echo 'FAILED'
+                        echo 'Error: Installation of u-boot failed!'
+
+                        echo -n '* Trying to restore backup...'
+                        if ( nandlogical /dev/mtd1 WRITE 0 $FSIZE /tmp/sharploader.bin ) > /dev/null 2>&1
+                        then
+                                echo 'Success'
+                                echo 'Your old bootloader has been restored'
+                        else
+                                echo 'FAILED'
+                                echo "Sorry, it's NAND-Restore time for you =("
+                        fi
+                fi
+        else
+                echo 'FAILED'
+                echo 'Could not create backup, aborting!'
+                echo 'Your bootloader has not been altered in any way.'
+                exit 1
+        fi
 }
 
 ### Check model ###
@@ -392,14 +394,16 @@ case "$MODEL" in
 esac
 
 clear
-echo "---- Universal Zaurus Updater ZAURUS_UPDATER_VERSION ----"
+echo '---- Universal Zaurus Updater ZAURUS_UPDATER_VERSION ----'
 echo 'MODEL: '$MODEL' ('$ZAURUS')'
+echo ''
 
 mkdir -p $TMPPATH > /dev/null 2>&1
 
 cd $DATAPATH/
 
-for TARGETFILE in u-boot.bin U-BOOT.BIN zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ home.bin HOME.BIN
+for TARGETFILE in u-boot.bin U-BOOT.BIN zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN \
+                initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ home.bin HOME.BIN
 do
     if [ ! -e $TARGETFILE ]
     then
@@ -420,6 +424,7 @@ do
         then
             continue
         fi
+        echo 'kernel'
         FLASHED_KERNEL=1
         ISLOGICAL=1
         MODULEID=5
@@ -468,9 +473,9 @@ do
         ISFORMATTED=0
         MTD_PART_SIZE="0x$HOMEFS_SIZE"
         ADDR=0
-        ISFORMATTED=0
         TARGET_MTD=$RW_MTD
-        DATAPOS=0
+        #home should not have headers but one could flash a second rootfs here
+        DATAPOS=16
         ONESIZE=1048576
         FLASH_TYPE="home"
         /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE
@@ -481,18 +486,18 @@ do
     hdimage1.tgz)
         if [ $UNPACKED_ROOTFS = 0 ]
         then
-        	do_rootfs_extraction
+                do_rootfs_extraction
         fi
         ;;
-    
+
     u-boot.bin)
         if [ $FLASHED_UBOOT != 1 ]
-	then
-		update_uboot "$TARGETFILE"
-		FLASHED_UBOOT="1"
-	fi
-	;;	
-	
+        then
+                update_uboot "$TARGETFILE"
+                FLASHED_UBOOT="1"
+        fi
+        ;;
+
     *)
         ;;
     esac
diff --git a/recipes/zaurusd/zaurusd_svn.bb b/recipes/zaurusd/zaurusd_svn.bb
index 354eef5226..47d5106a8f 100644
--- a/recipes/zaurusd/zaurusd_svn.bb
+++ b/recipes/zaurusd/zaurusd_svn.bb
@@ -9,18 +9,18 @@ PR = "r22"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \
-	   file://add-poodle.patch;patch=1 \
-	   file://alsa-cxx00-default.state.patch;patch=1 \
-	   file://alsa-6000x-default.state.patch;patch=1 \
-	   file://disable-alsa-handling.patch;patch=1 \
-	   file://avoid-rotated-server.patch;patch=1 \
+	   file://add-poodle.patch \
+	   file://alsa-cxx00-default.state.patch \
+	   file://alsa-6000x-default.state.patch \
+	   file://disable-alsa-handling.patch \
+	   file://avoid-rotated-server.patch \
 	   file://zaurus-hinge.matchbox-portrait \
 	   file://zaurus-hinge.matchbox-landscape \
 	   file://zaurus-hinge.bl-on \
 	   file://zaurus-hinge.bl-off \
 	   file://01-check-toggle-landscape \
 	   file://01-check-toggle-portait \
-       file://use-ts-symlink-instead-of-hardcoding.diff;patch=1 "
+       file://use-ts-symlink-instead-of-hardcoding.diff "
 
 
 S = "${WORKDIR}/${PN}"
diff --git a/recipes/zbedic/zbedic_1.2.bb b/recipes/zbedic/zbedic_1.2.bb
index 9b555ce7e9..77742866cc 100644
--- a/recipes/zbedic/zbedic_1.2.bb
+++ b/recipes/zbedic/zbedic_1.2.bb
@@ -10,8 +10,8 @@ APPDESKTOP = "${WORKDIR}/misc"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-2.tgz \
-           file://opie-icons.patch;patch=1 \
-           file://qtopia17.patch;patch=1"
+           file://opie-icons.patch \
+           file://qtopia17.patch"
 
 S = "${WORKDIR}"
 
diff --git a/recipes/zcip/zcip_4.bb b/recipes/zcip/zcip_4.bb
index c2d528695c..348e0b1806 100644
--- a/recipes/zcip/zcip_4.bb
+++ b/recipes/zcip/zcip_4.bb
@@ -3,9 +3,9 @@ DEPENDS = "libpcap libnet-1.0.2a"
 DESCRIPTION = "zcip is an implementation of zero configuration networking (zeroconf)."
 LICENSE = "BSD"
 SRC_URI = "${SOURCEFORGE_MIRROR}/zeroconf/zcip-${PV}.tar.gz \
-	   file://compile.patch;patch=1 \
-	   file://linux-types.patch;patch=1 \
-	   file://char-signed-idiocy.patch;patch=1"
+	   file://compile.patch \
+	   file://linux-types.patch \
+	   file://char-signed-idiocy.patch"
 
 CPPFLAGS_append = " -DLIBNET_LIL_ENDIAN"
 do_compile () {
diff --git a/recipes/zd1211/zd1211_r85.bb b/recipes/zd1211/zd1211_r85.bb
index a0ed3e7887..6d85458b42 100644
--- a/recipes/zd1211/zd1211_r85.bb
+++ b/recipes/zd1211/zd1211_r85.bb
@@ -7,7 +7,7 @@ RDEPENDS = "wireless-tools"
 PR = "r1"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
-           file://makefile.patch;patch=1"
+           file://makefile.patch"
 
 S = "${WORKDIR}/zd1211-driver-${PV}"
 
diff --git a/recipes/zddice/zddice_1.0.0.bb b/recipes/zddice/zddice_1.0.0.bb
index 5402d2c312..b8c94ce8ac 100644
--- a/recipes/zddice/zddice_1.0.0.bb
+++ b/recipes/zddice/zddice_1.0.0.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://www.cinlug.org/modules/Static_Docs/data/db/zddice/zddice_${PV}_arm.src.tar.gz \
-           file://qtopia17.patch;patch=1"
+           file://qtopia17.patch"
 S = "${WORKDIR}/zddice-src"
 
 inherit palmtop
diff --git a/recipes/zeroconf/zeroconf_0.6.1.bb b/recipes/zeroconf/zeroconf_0.6.1.bb
index 4806e156d4..093cf3067e 100644
--- a/recipes/zeroconf/zeroconf_0.6.1.bb
+++ b/recipes/zeroconf/zeroconf_0.6.1.bb
@@ -7,8 +7,8 @@ PRIORITY = "optional"
 PR = "r0"
 
 SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \
-	   file://debian-zeroconf.patch;patch=1 \
-	   file://busybox.patch;patch=1 \
+	   file://debian-zeroconf.patch \
+	   file://busybox.patch \
 	   file://zeroconf-default"
 
 do_install () {
diff --git a/recipes/zeroconf/zeroconf_0.9.bb b/recipes/zeroconf/zeroconf_0.9.bb
index 69c7fdb3b2..8ce2309931 100644
--- a/recipes/zeroconf/zeroconf_0.9.bb
+++ b/recipes/zeroconf/zeroconf_0.9.bb
@@ -9,8 +9,8 @@ PR = "r2"
 
 SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \
 	   file://zeroconf-default \
-	   file://zeroconf-ldflags.patch;patch=1 \
-	   file://zeroconf-limits.h.patch;patch=1 \
+	   file://zeroconf-ldflags.patch \
+	   file://zeroconf-limits.h.patch \
 	   file://debian-zeroconf"
 
 do_install () {
diff --git a/recipes/zgscore/zgscore_1.0.2.bb b/recipes/zgscore/zgscore_1.0.2.bb
index b610968e4e..ceb2d7a12f 100644
--- a/recipes/zgscore/zgscore_1.0.2.bb
+++ b/recipes/zgscore/zgscore_1.0.2.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://nuke.cinlug.org/modules/Static_Docs/data/db/zgs/"
 PR = "r0"
 
 SRC_URI = "http://www.cinlug.org/modules/Static_Docs/data/db/zgs/zgscore_${PV}_arm.src.tar.gz \
-           file://qtopia17.patch;patch=1"
+           file://qtopia17.patch"
 S = "${WORKDIR}/zgscore-src"
 
 inherit palmtop
diff --git a/recipes/zile/zile_1.7+2.0beta6.bb b/recipes/zile/zile_1.7+2.0beta6.bb
index fd234a97c9..76c293cfa1 100644
--- a/recipes/zile/zile_1.7+2.0beta6.bb
+++ b/recipes/zile/zile_1.7+2.0beta6.bb
@@ -9,7 +9,7 @@ PR = "r1"
 UV = "${@bb.data.getVar('PV', d, 1).split('+')[1]}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/zile/zile-${UV}.tar.gz \
-	   file://for_build.patch;patch=1"
+	   file://for_build.patch"
 S = "${WORKDIR}/zile-${UV}"
 
 inherit autotools
diff --git a/recipes/zip/zip-native_2.32.bb b/recipes/zip/zip-native_2.32.bb
deleted file mode 100644
index fa5d8210b5..0000000000
--- a/recipes/zip/zip-native_2.32.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require zip_${PV}.bb
-
-inherit native
-
-S = "${WORKDIR}/zip-${PV}"
-
-do_stage() {
-	install -d ${STAGING_BINDIR}
-	install zip zipnote zipsplit zipcloak ${STAGING_BINDIR}
-}
-
-SRC_URI[md5sum] = "8a4da4460386e324debe97f3b7fe4d96"
-SRC_URI[sha256sum] = "d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f"
diff --git a/recipes/zip/zip.inc b/recipes/zip/zip.inc
index 0ac49139f4..3ac8ce8c2a 100644
--- a/recipes/zip/zip.inc
+++ b/recipes/zip/zip.inc
@@ -4,6 +4,10 @@ LICENSE = "Info-ZIP"
 
 SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz"
 
+BBCLASSEXTEND = "native"
+
+NATIVE_INSTALL_WORKS = "1"
+
 EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC} ${LDFLAGS}' 'AS=${CC} -c' 'CPP=${CPP}' \
 		'CFLAGS=-I. -DUNIX ${CFLAGS} ${LDFLAGS}' 'LFLAGS1=${LDFLAGS}' 'INSTALL=install' \
 		'BINFLAGS=0755' 'INSTALL_D=install -d'"
diff --git a/recipes/zipsc/zipsc_0.4.3.bb b/recipes/zipsc/zipsc_0.4.3.bb
index 9e6f090af4..1fb5f98f30 100644
--- a/recipes/zipsc/zipsc_0.4.3.bb
+++ b/recipes/zipsc/zipsc_0.4.3.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.warmi.net/zaurus/zipsc.shtml"
 PR = "r2"
 
 SRC_URI = "http://www.warmi.net/zaurus/files/zipsc_${PV}.tar.gz \
-           file://gcc3.patch;patch=1"
+           file://gcc3.patch"
 S = "${WORKDIR}/zipsc_${PV}"
 
 inherit palmtop
diff --git a/recipes/zlapspeed/zlapspeed_1.0.0.bb b/recipes/zlapspeed/zlapspeed_1.0.0.bb
index 8138f814cc..55cf650062 100644
--- a/recipes/zlapspeed/zlapspeed_1.0.0.bb
+++ b/recipes/zlapspeed/zlapspeed_1.0.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.cinlug.org/modules/Static_Docs/data/db/zlaps/zlaps_${PV}_arm.src.tar.gz \
-           file://qtopia17.patch;patch=1"
+           file://qtopia17.patch"
 S = "${WORKDIR}/zlaps-src"
 
 inherit palmtop
diff --git a/recipes/zlib/files/0001-autotools.patch b/recipes/zlib/files/0001-autotools.patch
new file mode 100644
index 0000000000..6642860651
--- /dev/null
+++ b/recipes/zlib/files/0001-autotools.patch
@@ -0,0 +1,57 @@
+From d6b0c74edb3fc58060d1ab337bcb1f838328ebbf Mon Sep 17 00:00:00 2001
+From: Eric Benard <eric@eukrea.com>
+Date: Sun, 2 May 2010 10:49:05 +0200
+Subject: [PATCH] autotools
+
+---
+ Makefile.am  |   12 ++++++++++++
+ configure.ac |   17 +++++++++++++++++
+ 2 files changed, 29 insertions(+), 0 deletions(-)
+ create mode 100644 Makefile.am
+ create mode 100644 configure.ac
+
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..76976fb
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,12 @@
++lib_LTLIBRARIES = libz.la
++
++libz_la_SOURCES = adler32.c compress.c crc32.c gzclose.c gzlib.c gzread.c gzwrite.c \
++		uncompr.c deflate.c trees.c zutil.c inflate.c infback.c inftrees.c \
++		inffast.c
++
++libz_la_LDFLAGS = -version-number 1:2:5
++
++include_HEADERS = zconf.h zlib.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = zlib.pc
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..177c89a
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,17 @@
++AC_INIT(zlib,1.2.5)
++AC_CONFIG_SRCDIR(adler32.c)
++AM_INIT_AUTOMAKE(zlibs,1.2.5)
++
++AC_PREREQ([2.59])
++
++AC_PROG_CC([gcc])
++AC_PROG_LIBTOOL
++
++AC_HEADER_STDC
++
++AC_CONFIG_FILES([
++Makefile
++zlib.pc
++])
++
++AC_OUTPUT
+\ No newline at end of file
+-- 
+1.6.3.3
+
diff --git a/recipes/zlib/zlib-native_1.2.3.bb b/recipes/zlib/zlib-native_1.2.3.bb
deleted file mode 100644
index 4bb5d28659..0000000000
--- a/recipes/zlib/zlib-native_1.2.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require zlib_${PV}.bb
-ZLIB_EXTRA = ""
-DEPENDS = "libtool-native"
-
-inherit native
-
-SRC_URI[md5sum] = "dee233bf288ee795ac96a98cc2e369b6"
-SRC_URI[sha256sum] = "e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca"
diff --git a/recipes/zlib/zlib-sdk_1.2.3.bb b/recipes/zlib/zlib-sdk_1.2.3.bb
deleted file mode 100644
index 48633950ad..0000000000
--- a/recipes/zlib/zlib-sdk_1.2.3.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require zlib_${PV}.bb
-LIB_EXTRA = ""
-
-inherit sdk
diff --git a/recipes/zlib/zlib.inc b/recipes/zlib/zlib.inc
new file mode 100644
index 0000000000..0f7bea06d5
--- /dev/null
+++ b/recipes/zlib/zlib.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "Zlib Compression Library"
+SECTION = "libs"
+PRIORITY = "required"
+HOMEPAGE = "http://www.gzip.org/zlib/"
+LICENSE = "zlib"
+INC_PR ="r6"
+
+BBCLASSEXTEND = "native sdk"
+
+SRC_URI = "http://www.zlib.net/zlib-${PV}.tar.bz2"
+
+inherit autotools
+
+DEPENDS = "libtool-cross"
diff --git a/recipes/zlib/zlib_1.2.3.bb b/recipes/zlib/zlib_1.2.3.bb
index 541245b9f9..f3736d17c5 100644
--- a/recipes/zlib/zlib_1.2.3.bb
+++ b/recipes/zlib/zlib_1.2.3.bb
@@ -1,23 +1,9 @@
-DESCRIPTION = "Zlib Compression Library"
-SECTION = "libs"
-PRIORITY = "required"
-HOMEPAGE = "http://www.gzip.org/zlib/"
-LICENSE = "zlib"
-PR ="r5"
+include zlib.inc
 
-SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
-		file://visibility.patch;patch=1 \
-		file://autotools.patch;patch=1 "
+PR = "${INC_PR}.0"
 
-S = "${WORKDIR}/zlib-${PV}"
-
-DEPENDS = "libtool-cross"
-
-inherit autotools
-
-do_stage() {
-	autotools_stage_all
-}
+SRC_URI += "	file://visibility.patch \
+		file://autotools.patch "
 
 SRC_URI[md5sum] = "dee233bf288ee795ac96a98cc2e369b6"
 SRC_URI[sha256sum] = "e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca"
diff --git a/recipes/zlib/zlib_1.2.5.bb b/recipes/zlib/zlib_1.2.5.bb
new file mode 100644
index 0000000000..34419f0466
--- /dev/null
+++ b/recipes/zlib/zlib_1.2.5.bb
@@ -0,0 +1,10 @@
+include zlib.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://0001-autotools.patch "
+
+SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
+SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/zrally/zrally_0.90.bb b/recipes/zrally/zrally_0.90.bb
index 22b29b10ff..a2328c0f98 100644
--- a/recipes/zrally/zrally_0.90.bb
+++ b/recipes/zrally/zrally_0.90.bb
@@ -10,7 +10,7 @@ APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/zrally/zrally_0.90_src.tar.gz \
-file://dir.patch;patch=1;pnum=0"
+file://dir.patch;striplevel=0"
 
 S = "${WORKDIR}"
 
diff --git a/recipes/zsh/zsh_4.1.1.bb b/recipes/zsh/zsh_4.1.1.bb
index 8ea23f9789..1026d0a14d 100644
--- a/recipes/zsh/zsh_4.1.1.bb
+++ b/recipes/zsh/zsh_4.1.1.bb
@@ -6,7 +6,7 @@ PR = "r2"
 LICENSE = "zsh"
 
 SRC_URI = "http://www.zsh.org/pub/old/zsh-${PV}.tar.bz2 \
-	 file://configure.patch;patch=1"
+	 file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/zten/zten_1.6.2.bb b/recipes/zten/zten_1.6.2.bb
index 236fc95996..32ec721df2 100644
--- a/recipes/zten/zten_1.6.2.bb
+++ b/recipes/zten/zten_1.6.2.bb
@@ -10,7 +10,7 @@ RCONFLICTS = "ztenv"
 PR = "r1"
 
 SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc932 \
-           file://zten.patch;patch=1"
+           file://zten.patch"
 
 S = "${WORKDIR}/zten"
 
diff --git a/recipes/zuc/zuc_1.1.2ern.bb b/recipes/zuc/zuc_1.1.2ern.bb
index 75ca7a9533..0ac2254632 100644
--- a/recipes/zuc/zuc_1.1.2ern.bb
+++ b/recipes/zuc/zuc_1.1.2ern.bb
@@ -9,7 +9,7 @@ PR = "r4"
 
 SRC_URI = "http://www.linux-solutions.at/projects/zaurus/source/zuc_V${PV}.tar.gz;name=archive \
            http://nick.kreucher.net/zuc/zuc_units;name=units \
-           file://fixed-include.patch;patch=1"
+           file://fixed-include.patch"
 
 S = "${WORKDIR}/zuc_V${PV}"
 
diff --git a/recipes/zziplib/zziplib_0.10.82.bb b/recipes/zziplib/zziplib_0.10.82.bb
index a9424dfe0f..12b6b2f516 100644
--- a/recipes/zziplib/zziplib_0.10.82.bb
+++ b/recipes/zziplib/zziplib_0.10.82.bb
@@ -1,6 +1,6 @@
 require zziplib.inc
 
-SRC_URI += "file://zziplib-0.10-disable-test.patch;patch=1"
+SRC_URI += "file://zziplib-0.10-disable-test.patch"
 
 PR = "r1"
 
diff --git a/recipes/zziplib/zziplib_0.12.83.bb b/recipes/zziplib/zziplib_0.12.83.bb
index 190f3bb4ff..7cb4c48cc8 100644
--- a/recipes/zziplib/zziplib_0.12.83.bb
+++ b/recipes/zziplib/zziplib_0.12.83.bb
@@ -1,6 +1,6 @@
 require zziplib.inc
 
-SRC_URI += "file://zziplib-buildfix.patch;patch=1"
+SRC_URI += "file://zziplib-buildfix.patch"
 
 
 SRC_URI[md5sum] = "4943ab7aa141af2c339266cd66b05c74"
diff --git a/recipes/zziplib/zziplib_0.13.49.bb b/recipes/zziplib/zziplib_0.13.49.bb
index a94b76fd2c..2effd91dea 100644
--- a/recipes/zziplib/zziplib_0.13.49.bb
+++ b/recipes/zziplib/zziplib_0.13.49.bb
@@ -3,8 +3,8 @@ require zziplib.inc
 PR = "r1"
 
 SRC_URI += "\
-  file://zip_c.patch;patch=1 \
-  file://zziplib-autoconf.patch;patch=1 \
+  file://zip_c.patch \
+  file://zziplib-autoconf.patch \
   "
 
 #EXTRA_OECONF = "--srcdir=${S} --enable-builddir=${S}/build"
diff --git a/site/arm-linux b/site/arm-linux
index 18dfb38d14..65d8e014d0 100644
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -178,3 +178,7 @@ rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
 # squeak (forbid unaliged access)
 ac_cv_double_align=${ac_cv_double_align=no}                           
 ac_cv_double_order=${ac_cv_double_order=no}
+
+# TCL
+tcl_cv_api_getaddrinfo=${tcl_cv_api_getaddrinfo=yes}
+tcl_cv_api_serial=${tcl_cv_api_serial=termios}